diff --git a/README.md b/README.md index 40eb1fc..abfc585 100644 --- a/README.md +++ b/README.md @@ -126,3 +126,9 @@ B组件 触发($emit) ```npm install ``` + +``` +{"id":148,"order_no":"SS20220209134238527851","member_id":290,"member_img":"https://thirdwx.qlogo.cn/mmopen/vi_32/0xr8AUjv3nia5XQpHpe8ibNoOe3GVuREbolOicnGBhWxxVWO0wFxjLjvPWEQehCLS5WEEyJYEWqKtNaxfbE7BDqjQ/132","member_name":"Kahing","member_phone":"13500071371","team_charge_man_name":"","score":"12","schedule_son_id":23,"is_set_score":true} + +{"brand_id":63,"order_no":"SS20220209134238527851","member_id":290,"member_img":"https://thirdwx.qlogo.cn/mmopen/vi_32/0xr8AUjv3nia5XQpHpe8ibNoOe3GVuREbolOicnGBhWxxVWO0wFxjLjvPWEQehCLS5WEEyJYEWqKtNaxfbE7BDqjQ/132","member_name":"Kahing","member_phone":"13500071371","team_charge_man_name":"","score":23,"is_set_score":true,"match_id":80} +``` \ No newline at end of file diff --git a/components/no-data/no-data.vue b/components/no-data/no-data.vue new file mode 100644 index 0000000..ba845c3 --- /dev/null +++ b/components/no-data/no-data.vue @@ -0,0 +1,45 @@ + + + + + diff --git a/nxTemp/apis/userAPI.js b/nxTemp/apis/userAPI.js index 50346d7..c2e3336 100644 --- a/nxTemp/apis/userAPI.js +++ b/nxTemp/apis/userAPI.js @@ -25,75 +25,91 @@ export function postSendSMS(data) { * @return: {*} * @author: */ -export function wechatGetPhoneNumber(data) { - return http.post(`${config.baseUrl}/user/wechatGetPhoneNumber`, data,{ +export function wechatGetPhoneNumberLogin(data) { + // return http.post(`${config.baseUrl}/user/wechatGetPhoneNumber`, data,{ + return http.post(`${config.baseUrl}/gaMatchAssistant/getPhoneNumber`, data,{ needLogin:false //未登录前操作取消登录验证 - }); + }); + } -/** -* @description: 赛事列表 -* @param {*} -* token -page -page_size -*/ -export function matchList(data) { - return http.post(`${config.baseUrl}/gaMatchAssistant/match/list`, data); -} + /** -* @description: 赛程列表(赛程打分) +* @description: 赛程-列表 * @param {*} * token match_id page page_size */ -export function matchScheduleList(data) { +export function schedule_matchList(data) { return http.post(`${config.baseUrl}/gaMatchAssistant/matchSchedule/list`, data); } /** -* @description: 赛程打分 +* @description: 赛程-打分 * @param * schedule_id 赛程id order_no 赛事订单号 score 要设置的分数 schedule_son_id 赛程子id */ -export function scoreSave(data) { +export function schedule_scoreSave(data) { return http.post(`${config.baseUrl}/gaMatchAssistant/matchSchedule/scoreSave`, data); } + /** -* @description: 参赛成员(赛程打分) +* @description: 赛事-列表 * @param {*} -* brand_id -match_id -page +* token +page page_size */ -export function matchScoreMemberList(data) { - return http.post(`${config.baseUrl}/gaMatchAssistant/matchScore/memberList`, data); +export function matchList(data) { + return http.post(`${config.baseUrl}/gaMatchAssistant/match/list`, data); } /** -* @description: 赛程打分 +* @description: 赛事打分 * @param {*} * brand_id * order_no * scode */ -export function matchScoreSave(data) { +export function scoreSave(data) { return http.post(`${config.baseUrl}/gaMatchAssistant/match/scoreSave`, data); } /** +* @description: 参赛成员列表 +* @param {*} +* brand_id +match_id +page +page_size +*/ +export function scoreMemberList(data) { + return http.post(`${config.baseUrl}/gaMatchAssistant/matchScore/memberList`, data); +} + + + +/** * @description: 录入数据-数据名称列表 * @param {*} * brand_id, order_no */ -export function randOcondList(data) { +export function rankOcondList(data) { return http.post(`${config.baseUrl}/gaMatchAssistant/rankConf/list`, data); -} \ No newline at end of file +} + +/** +* @description: 录入数据-数据保存 +* @param {*} +* brand_id, order_no , rank_data{id,val} +*/ +export function rankSave(data) { + return http.post(`${config.baseUrl}/gaMatchAssistant/rankData/save`,data); +} diff --git a/nxTemp/config/index.config.js b/nxTemp/config/index.config.js index 4b2fbb9..3e0f88d 100644 --- a/nxTemp/config/index.config.js +++ b/nxTemp/config/index.config.js @@ -4,8 +4,9 @@ const CONFIG = { loginTitleTxt: "development_wx", // 登录页标题 copyrightTxt: "XXXv1.0", // 版本信息 assetsPath: "http://cdn.com/img", // 静态资源路径 - // baseUrl: "http://testmanager.ouxuanzhineng.cn", - baseUrl: "https://testmatch.ouxuanzhineng.cn", + baseUrl: "http://testmanager.ouxuanzhineng.cn", + // baseUrl: "https://testmatch.ouxuanzhineng.cn", + // baseUrl: "http://192.168.1.55:9090", tokenKey: "wxf368fa7316d6952f", // 登录标识 testOpenId: "", // 小程序测试openId forcedLogin: false, // touristMode游客模式下APP是否强制用户登录 场景：当用户进入登录页面后无法后退。 diff --git a/pages/event/event_grade.vue b/pages/event/event_grade.vue index 0e87cd3..73f288c 100644 --- a/pages/event/event_grade.vue +++ b/pages/event/event_grade.vue @@ -2,38 +2,71 @@ - + {{e.name}} - + + - {{i.schedule_name}} + {{match_name}} {{i.schedule_start_date}} - 半决赛 + {{i.schedule_name}} - + - - adjksk + + {{u.member_name}} - 已打分 - 打分 - 数据 + 已打分 + 打分 + 数据 + + + + + + + {{match_name}} + + + + + + + + + {{u.member_name}} + + + + 已打分 + 打分 + 数据 + + + + + + + - + + - - 入围赛数据 - 李静分数录入 + + {{match_name}}数据 + {{gradeDataRank.user.member_name}}分数录入 - - 篮板 - + + {{si.rank_param_name}} + - + 请输入成员该赛程最终得分，非累计 - 保存 + 保存 -