diff --git a/config/baseUrl.js b/config/baseUrl.js index 6018dfc..4ed5682 100644 --- a/config/baseUrl.js +++ b/config/baseUrl.js @@ -6,8 +6,8 @@ if (process.env.NODE_ENV === 'development') { // socketUrl = "ws://localhost:6001/"; // baseUrl = "https://twin-ui.com/demo/"; // baseUrl = "https://testapi.nuttyreading.com/"; // 线上测试环境 - baseUrl = "https://api.nuttyreading.com/"; // 线上正式 - // baseUrl = "http://192.168.110.100:9200/pb/"; // 开发用电脑 + // baseUrl = "https://api.nuttyreading.com/"; // 线上正式 + baseUrl = "http://192.168.110.100:9200/pb/"; // 开发用电脑 // baseUrl = "http://59.110.212.44:9200/pb/"; // baseUrl = "http://192.168.110.100:9100/pb/"; // 开发用电脑 // baseUrl = "http://192.168.110.110:9200/pb/"; @@ -46,6 +46,8 @@ const courtConfig = { // #endif } }; +// 订单编号的正则 +const orderRegular = /[0-9]\d{31}$/; //手机号验证正则表达式 // (中国大陆) const phoneRegular = /^1\d{10}$/; @@ -59,5 +61,6 @@ const passwordRegular = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,20}$/; export default Object.assign({ phoneRegular, mailRegular, - passwordRegular + passwordRegular, + orderRegular }, courtConfig); \ No newline at end of file diff --git a/pages.json b/pages.json index ccba855..89f3694 100644 --- a/pages.json +++ b/pages.json @@ -538,6 +538,14 @@ "navigationBarTitleText": "学术webView预览页面", "enablePullDownRefresh": false } + }, + { + "path" : "pages/user/workOrder", + "style" : + { + "navigationBarTitleText" : "工单提交页面", + "enablePullDownRefresh": true + } } ], "globalStyle": { diff --git a/pages/bookShop/orderLCont.vue b/pages/bookShop/orderLCont.vue index d11f3c6..c504a3b 100644 --- a/pages/bookShop/orderLCont.vue +++ b/pages/bookShop/orderLCont.vue @@ -286,8 +286,11 @@ 发货时间 : {{orderContet.shippingTime}} --> - + + + 订单有问题?去申诉 + @@ -536,6 +539,11 @@ export default { }, methods: { + gotoWorkOrder(){ + uni.navigateTo({ + url:`/pages/user/workOrder?name=order` + }) + }, async goBuyJie(data) { console.log("index at line 532:", data); if (data.text == "继续付款") { diff --git a/pages/mine/mine/index.vue b/pages/mine/mine/index.vue index 674cdd6..5e6064c 100644 --- a/pages/mine/mine/index.vue +++ b/pages/mine/mine/index.vue @@ -380,7 +380,7 @@ export default { url: "/pages/mine/aboutUs/index", type: "pageJump", }, - //{ name: "设置", url: "/pages/mine/set/index", type: "pageJump" }, + { name: "问题反馈/申诉", url: "/pages/user/workOrder", type: "workOrder" }, // { name: "退出登录", type: "quitLogin" }, // { name: "注销帐号", type: "loginOut" }, ], @@ -445,6 +445,12 @@ export default { //注销账号 this.logout(); break; + case "workOrder": + uni.navigateTo({ + url:`${v.url}?name=userPage` + }) + // this.onPageJump(v.url); + break; } }, // 获得操作系统 diff --git a/pages/user/login.vue b/pages/user/login.vue index 138871c..c921059 100644 --- a/pages/user/login.vue +++ b/pages/user/login.vue @@ -97,6 +97,10 @@ + + + 登录遇到问题?去反馈问题 + + + 问题反馈/申诉 + + + + + *问题类型: + + + + + + + + + + *吴门医述账号: + + + + + + + + *订单编号: + + + + 请填写订单编号 + 订单编号格式错误 + + + + + *问题描述: + + +