diff --git a/apis/interfaces/mailed.js b/apis/interfaces/mailed.js index 351df5c..b01540f 100644 --- a/apis/interfaces/mailed.js +++ b/apis/interfaces/mailed.js @@ -31,8 +31,24 @@ const submitExpresses = (id, data) => { }) } +// 获取订单邮寄列表 +const getExpresses = id => { + return request({ + url : 'business/' + id + '/expresses' + }) +} + +// 查看物流 +const getLogistic = id => { + return request({ + url : 'business/' + id + '/logistic' + }) +} + export { express, orderAddress, - submitExpresses + submitExpresses, + getExpresses, + getLogistic } \ No newline at end of file diff --git a/manifest.json b/manifest.json index 0b30b47..5626432 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name" : "抖火", "appid" : "__UNI__C305C03", "description" : "", - "versionName" : "1.0.4", + "versionName" : "1.0.5", "versionCode" : "100", "transformPx" : false, /* 5+App特有相关 */ diff --git a/pages.json b/pages.json index 135413b..aaf511e 100644 --- a/pages.json +++ b/pages.json @@ -1,474 +1,483 @@ { "pages": [{ - "path": "pages/index/index", - "name": "Index", - "style": { - "navigationBarTitleText": "抖火法务咨询服务", - "navigationBarBackgroundColor": "#FFFFFF" - } - }, { - "path": "pages/index/introduces", - "name": "Introduces", - "style": { - "navigationStyle": "custom", - "navigationBarTitleText": "金法服务包介绍", - "app-plus": { - "titleNView": { - "backgroundColor": "#FFFFFF", - "type": "transparent" - } + "path": "pages/index/index", + "name": "Index", + "style": { + "navigationBarTitleText": "抖火法务咨询服务", + "navigationBarBackgroundColor": "#FFFFFF" + } + }, { + "path": "pages/index/introduces", + "name": "Introduces", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "金法服务包介绍", + "app-plus": { + "titleNView": { + "backgroundColor": "#FFFFFF", + "type": "transparent" } } - }, { - "path": "pages/index/free", - "name": "FreeService", - "style": { - "navigationStyle": "custom", - "navigationBarTitleText": "自由服务包介绍", - "app-plus": { - "titleNView": { - "backgroundColor": "#FFFFFF", - "type": "transparent" - } - } - } - }, { - "path": "pages/index/introduces", - "name": "Introduces", - "style": { - "navigationStyle": "custom", - "navigationBarTitleText": "介绍", - "app-plus": { - "titleNView": { - "backgroundColor": "#FFFFFF", - "type": "transparent" - } - } - } - }, { - "path": "pages/college/index", - "name": "College", - "style": { - "navigationBarTitleText": "商学院", - "navigationStyle": "custom" - } - }, { - "path": "pages/work/index", - "name": "Work", - "style": { - "navigationBarTitleText": "工作台", - "navigationStyle": "custom" - } - }, { - "path": "pages/user/index", - "name": "User", - "style": { - "navigationBarTitleText": "", - "navigationBarBackgroundColor": "#ffffff" - } - }, { - "path": "pages/auth/auth", - "name": "Auth", - "style": { - "navigationBarTitleText": "", - "disableScroll": false, - "navigationStyle": "custom", - "animationType": "slide-in-bottom" - } - }, { - "path": "pages/auth/registered", - "name": "Registered", - "style": { - "navigationBarTitleText": "注册", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" - } - }, { - "path": "pages/auth/resetPassword", - "name": "ResetPassword", - "style": { - "navigationBarTitleText": "重置密码", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" - } - }, { - "path": "pages/college/test", - "name": "CollegeTest", - "auth": true, - "style": { - "navigationBarTitleText": "考试", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" - } - }, { - "path": "pages/richText/richText", - "name": "RichText", - "style": { - "navigationBarTitleText": "-", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" - } - }, { - "path": "pages/work/create", - "name": "OrderCreate", - "auth": true, - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" - } - }, { - "path": "pages/work/orders", - "name": "Orders", - "auth": true, - "style": { - "navigationBarTitleText": "订单管理", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" - } - }, { - "path": "pages/work/service", - "name": "OrdersService", - "auth": true, - "style": { - "navigationBarTitleText": "分配服务包", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff", - "app-plus": { - "titleNView": { - "buttons": [{ - "text": "添加", - "color": "#446EFE", - "fontSize": "32rpx", - "width": "120rpx" - }] - } - } - } - }, { - "path": "pages/work/available", - "name": "OrderAvailable", - "auth": true, - "style": { - "navigationBarTitleText": "搜索用户", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" - } - }, { - "path": "pages/work/generate", - "auth": true, - "name": "WorkGenerate", - "style": { - "navigationBarTitleText": "基础信息", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" - } - }, { - "path": "pages/user/info", - "auth": true, - "name": "UserInfo", - "style": { - "navigationBarTitleText": "编辑", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" - } - }, { - "path": "pages/user/code", - "auth": true, - "name": "UserCode", - "style": { - "navigationBarTitleText": "邀请二维码", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#1F25AE", - "navigationBarTextStyle": "white" - } - }, { - "path": "pages/user/certification", - "auth": true, - "name": "UserCertification", - "style": { - "navigationBarTitleText": "实名认证", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" - } - }, { - "path": "pages/user/team", - "auth": true, - "name": "UserTeam", - "style": { - "navigationBarTitleText": "我的客户", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" - } - }, { - "path": "pages/user/set", - "auth": true, - "name": "UserSet", - "style": { - "navigationBarTitleText": "设置", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" - } - }, { - "path": "pages/account/bonus", - "auth": true, - "name": "AccountBonus", - "style": { - "navigationBarTitleText": "奖金账户", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#926fff", - "navigationBarTextStyle": "white" - } - }, { - "path": "pages/account/cash", - "auth": true, - "name": "AccountCash", - "style": { - "navigationBarTitleText": "业绩账户", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#446EFE", - "navigationBarTextStyle": "white" - } - }, { - "path": "pages/account/integral", - "auth": true, - "name": "AccountIntegral", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff", - "app-plus": { - "titleNView": { - "buttons": [{ - "text": "充值记录", - "color": "#111", - "fontSize": "32rpx", - "width": "180rpx" - }] - } - } - } - }, { - "path": "pages/college/answer", - "auth": true, - "name": "CollegeAnswer", - "style": { - "navigationBarTitleText": "答题", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#446EFE", - "navigationBarTextStyle": "white" - } - }, { - "path": "pages/college/testResults", - "auth": true, - "name": "CollegeResults", - "style": { - "navigationBarTitleText": "考试结果", - "navigationBarBackgroundColor": "#446EFE", - "navigationBarTextStyle": "white", - "enablePullDownRefresh": false - } - }, { - "path": "pages/account/logs", - "auth": true, - "name": "AccountLogs", - "style": { - "navigationBarTitleText": "账户记录", - "enablePullDownRefresh": false - } - - }, { - "path": "pages/pay/pay", - "auth": true, - "name": "Pay", - "style": { - "navigationBarTitleText": "收银台", - "enablePullDownRefresh": false - } - }, { - "path": "pages/work/orderInfo", - "auth": true, - "name": "OrderInfo", - "style": { - "navigationBarTitleText": "详情", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#446EFE", - "navigationBarTextStyle": "white" - } - }, { - "path": "pages/user/eSign", - "auth": true, - "name": "ESign", - "style": { - "navigationBarTitleText": "人脸认证", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#FFFFFF" - } - }, { - "path": "pages/work/perfectChoose", - "auth": true, - "name": "WorkPerfectChoose", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#446EFE", - "navigationBarTextStyle": "white" - } - }, { - "path": "pages/work/perfectInstitutions", - "auth": true, - "name": "WorkPerfectInstitutions", - "style": { - "navigationBarTitleText": "机构信息", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#446EFE", - "navigationBarTextStyle": "white", - "app-plus": { - "titleNView": { - "buttons": [{ - "text": "使用历史", - "color": "#ffffff", - "fontSize": "28rpx", - "width": "180rpx" - }] - } - } - } - }, { - "path": "pages/work/perfectBasis", - "auth": true, - "name": "WorkPerfectBasis", - "style": { - "navigationBarTitleText": "基础信息", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#446EFE", - "navigationBarTextStyle": "white", - "app-plus": { - "titleNView": { - "buttons": [{ - "text": "使用历史", - "color": "#ffffff", - "fontSize": "28rpx", - "width": "180rpx" - }] - } - } - } - }, { - "path": "pages/transfers/lists", - "auth": true, - "name": "TransfersOrders", - "style": { - "navigationBarTitleText": "转让订单", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" - } - }, { - "path": "pages/work/modifyOrder", - "auth": true, - "name": "ModifyOrder", - "style": { - "navigationBarTitleText": "修改资料订单", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" - } - - }, { - "path": "pages/work/poorOrder", - "auth": true, - "name": "PoorOrder", - "style": { - "navigationBarTitleText": "补差价订单", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" - } - - }, { - "path": "pages/work/refundOrder", - "auth": true, - "name": "RefundOrder", - "style": { - "navigationBarTitleText": "退款订单", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" - } - - }, { - "path": "pages/work/mailed", - "auth": true, - "name": "MailedOrder", - "style": { - "navigationBarTitleText": "邮寄材料", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#446EFE", - "navigationBarTextStyle": "white" - } - }, { - "path": "pages/work/mailedInfo", - "auth": true, - "name": "MailedOrderInfo", - "style": { - "navigationBarTitleText": "邮寄信息", - "enablePullDownRefresh": false - } - }, { - "path": "pages/work/schemes", - "auth": true, - "name": "OrderSchemes", - "style": { - "navigationBarTitleText": "预估方案", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#446EFE", - "navigationBarTextStyle": "white" - } - }, { - "path": "pages/work/perfectBasisInfo", - "auth": true, - "name": "OrderPerfectBasisInfo", - "style": { - "navigationBarTitleText": "基础资料信息", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" - } - - }, { - "path": "pages/work/perfectInstitutionsInfo", - "auth": true, - "name": "OrderPerfectInstitutionsInfo", - "style": { - "navigationBarTitleText": "机构资料信息", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" - } - }, { - "path": "pages/user/userdata", - "auth": true, - "name": "UserData", - "style": { - "navigationBarTitleText": "账户信息", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" - } - }, { - "path": "pages/user/userdataBase", - "auth": true, - "name": "UserDataBase", - "style": { - "navigationBarTitleText": "账户信息 - 基础信息", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" - } - }, { - "path": "pages/user/userdataBanks", - "auth": true, - "name": "UserDataBank", - "style": { - "navigationBarTitleText": "账户信息 - 机构信息", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" - } } - ], + }, { + "path": "pages/index/free", + "name": "FreeService", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "自由服务包介绍", + "app-plus": { + "titleNView": { + "backgroundColor": "#FFFFFF", + "type": "transparent" + } + } + } + }, { + "path": "pages/index/introduces", + "name": "Introduces", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "介绍", + "app-plus": { + "titleNView": { + "backgroundColor": "#FFFFFF", + "type": "transparent" + } + } + } + }, { + "path": "pages/college/index", + "name": "College", + "style": { + "navigationBarTitleText": "商学院", + "navigationStyle": "custom" + } + }, { + "path": "pages/work/index", + "name": "Work", + "style": { + "navigationBarTitleText": "工作台", + "navigationStyle": "custom" + } + }, { + "path": "pages/user/index", + "name": "User", + "style": { + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#ffffff" + } + }, { + "path": "pages/auth/auth", + "name": "Auth", + "style": { + "navigationBarTitleText": "", + "disableScroll": false, + "navigationStyle": "custom", + "animationType": "slide-in-bottom" + } + }, { + "path": "pages/auth/registered", + "name": "Registered", + "style": { + "navigationBarTitleText": "注册", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } + }, { + "path": "pages/auth/resetPassword", + "name": "ResetPassword", + "style": { + "navigationBarTitleText": "重置密码", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } + }, { + "path": "pages/college/test", + "name": "CollegeTest", + "auth": true, + "style": { + "navigationBarTitleText": "考试", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } + }, { + "path": "pages/richText/richText", + "name": "RichText", + "style": { + "navigationBarTitleText": "-", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } + }, { + "path": "pages/work/create", + "name": "OrderCreate", + "auth": true, + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } + }, { + "path": "pages/work/orders", + "name": "Orders", + "auth": true, + "style": { + "navigationBarTitleText": "订单管理", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } + }, { + "path": "pages/work/service", + "name": "OrdersService", + "auth": true, + "style": { + "navigationBarTitleText": "分配服务包", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff", + "app-plus": { + "titleNView": { + "buttons": [{ + "text": "添加", + "color": "#446EFE", + "fontSize": "32rpx", + "width": "120rpx" + }] + } + } + } + }, { + "path": "pages/work/available", + "name": "OrderAvailable", + "auth": true, + "style": { + "navigationBarTitleText": "搜索用户", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } + }, { + "path": "pages/work/generate", + "auth": true, + "name": "WorkGenerate", + "style": { + "navigationBarTitleText": "基础信息", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } + }, { + "path": "pages/user/info", + "auth": true, + "name": "UserInfo", + "style": { + "navigationBarTitleText": "编辑", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } + }, { + "path": "pages/user/code", + "auth": true, + "name": "UserCode", + "style": { + "navigationBarTitleText": "邀请二维码", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#1F25AE", + "navigationBarTextStyle": "white" + } + }, { + "path": "pages/user/certification", + "auth": true, + "name": "UserCertification", + "style": { + "navigationBarTitleText": "实名认证", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } + }, { + "path": "pages/user/team", + "auth": true, + "name": "UserTeam", + "style": { + "navigationBarTitleText": "我的客户", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } + }, { + "path": "pages/user/set", + "auth": true, + "name": "UserSet", + "style": { + "navigationBarTitleText": "设置", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } + }, { + "path": "pages/account/bonus", + "auth": true, + "name": "AccountBonus", + "style": { + "navigationBarTitleText": "奖金账户", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#926fff", + "navigationBarTextStyle": "white" + } + }, { + "path": "pages/account/cash", + "auth": true, + "name": "AccountCash", + "style": { + "navigationBarTitleText": "业绩账户", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#446EFE", + "navigationBarTextStyle": "white" + } + }, { + "path": "pages/account/integral", + "auth": true, + "name": "AccountIntegral", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff", + "app-plus": { + "titleNView": { + "buttons": [{ + "text": "充值记录", + "color": "#111", + "fontSize": "32rpx", + "width": "180rpx" + }] + } + } + } + }, { + "path": "pages/college/answer", + "auth": true, + "name": "CollegeAnswer", + "style": { + "navigationBarTitleText": "答题", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#446EFE", + "navigationBarTextStyle": "white" + } + }, { + "path": "pages/college/testResults", + "auth": true, + "name": "CollegeResults", + "style": { + "navigationBarTitleText": "考试结果", + "navigationBarBackgroundColor": "#446EFE", + "navigationBarTextStyle": "white", + "enablePullDownRefresh": false + } + }, { + "path": "pages/account/logs", + "auth": true, + "name": "AccountLogs", + "style": { + "navigationBarTitleText": "账户记录", + "enablePullDownRefresh": false + } + + }, { + "path": "pages/pay/pay", + "auth": true, + "name": "Pay", + "style": { + "navigationBarTitleText": "收银台", + "enablePullDownRefresh": false + } + }, { + "path": "pages/work/orderInfo", + "auth": true, + "name": "OrderInfo", + "style": { + "navigationBarTitleText": "详情", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#446EFE", + "navigationBarTextStyle": "white" + } + }, { + "path": "pages/user/eSign", + "auth": true, + "name": "ESign", + "style": { + "navigationBarTitleText": "人脸认证", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#FFFFFF" + } + }, { + "path": "pages/work/perfectChoose", + "auth": true, + "name": "WorkPerfectChoose", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#446EFE", + "navigationBarTextStyle": "white" + } + }, { + "path": "pages/work/perfectInstitutions", + "auth": true, + "name": "WorkPerfectInstitutions", + "style": { + "navigationBarTitleText": "机构信息", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#446EFE", + "navigationBarTextStyle": "white", + "app-plus": { + "titleNView": { + "buttons": [{ + "text": "使用账户信息", + "color": "#ffffff", + "fontSize": "30rpx", + "width": "180rpx" + }] + } + } + } + }, { + "path": "pages/work/perfectBasis", + "auth": true, + "name": "WorkPerfectBasis", + "style": { + "navigationBarTitleText": "基础信息", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#446EFE", + "navigationBarTextStyle": "white", + "app-plus": { + "titleNView": { + "buttons": [{ + "text": "使用账户信息", + "color": "#ffffff", + "fontSize": "30rpx", + "width": "180rpx" + }] + } + } + } + }, { + "path": "pages/transfers/lists", + "auth": true, + "name": "TransfersOrders", + "style": { + "navigationBarTitleText": "转让订单", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } + }, { + "path": "pages/work/modifyOrder", + "auth": true, + "name": "ModifyOrder", + "style": { + "navigationBarTitleText": "修改资料订单", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } + + }, { + "path": "pages/work/poorOrder", + "auth": true, + "name": "PoorOrder", + "style": { + "navigationBarTitleText": "补差价订单", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } + + }, { + "path": "pages/work/refundOrder", + "auth": true, + "name": "RefundOrder", + "style": { + "navigationBarTitleText": "退款订单", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } + + }, { + "path": "pages/work/mailed", + "auth": true, + "name": "MailedOrder", + "style": { + "navigationBarTitleText": "邮寄材料", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#446EFE", + "navigationBarTextStyle": "white" + } + }, { + "path": "pages/work/schemes", + "auth": true, + "name": "OrderSchemes", + "style": { + "navigationBarTitleText": "预估方案", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#446EFE", + "navigationBarTextStyle": "white" + } + }, { + "path": "pages/work/perfectBasisInfo", + "auth": true, + "name": "OrderPerfectBasisInfo", + "style": { + "navigationBarTitleText": "基础资料信息", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } + + }, { + "path": "pages/work/perfectInstitutionsInfo", + "auth": true, + "name": "OrderPerfectInstitutionsInfo", + "style": { + "navigationBarTitleText": "机构资料信息", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } + }, { + "path": "pages/user/userdata", + "auth": true, + "name": "UserData", + "style": { + "navigationBarTitleText": "账户信息", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } + }, { + "path": "pages/user/userdataBase", + "auth": true, + "name": "UserDataBase", + "style": { + "navigationBarTitleText": "账户信息 - 基础信息", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } + }, { + "path": "pages/user/userdataBanks", + "auth": true, + "name": "UserDataBank", + "style": { + "navigationBarTitleText": "账户信息 - 机构信息", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } + }, { + "path": "pages/work/express", + "auth": true, + "name": "WorkExpress", + "style": { + "navigationBarTitleText": "邮寄状态", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } + }, { + "path": "pages/work/expressInfo", + "auth": true, + "name": "WorkExpressInfo", + "style": { + "navigationBarTitleText": "快递详情", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } + }], "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "抖火", diff --git a/pages/account/bonus.vue b/pages/account/bonus.vue index 2aa954a..d11a24a 100644 --- a/pages/account/bonus.vue +++ b/pages/account/bonus.vue @@ -22,10 +22,10 @@ - xxx奖金收益 - 2022-12-12 10:18 + {{item.remark || '-'}} + {{item.created_at}} - +50000 + {{item.amount}} diff --git a/pages/account/cash.vue b/pages/account/cash.vue index e64d07f..271517b 100644 --- a/pages/account/cash.vue +++ b/pages/account/cash.vue @@ -9,7 +9,7 @@ {{total}} - 个人总业绩 + {{type == 'self' ? '个人总业绩': '团队总业绩'}} diff --git a/pages/auth/registered.vue b/pages/auth/registered.vue index 8268ad2..6123d1d 100644 --- a/pages/auth/registered.vue +++ b/pages/auth/registered.vue @@ -46,7 +46,7 @@ export default { data() { return { - username : '18245180131', + username : '', password : '', confirmation: '', code : '', @@ -115,6 +115,7 @@ }) let smsTime = 60; verifyCaptcha({ + type : 'register', mobileNo : this.username, captcha : this.captcha, captcha_key : this.captchaKey diff --git a/pages/pay/pay.vue b/pages/pay/pay.vue index ae5fd28..daf4bf0 100644 --- a/pages/pay/pay.vue +++ b/pages/pay/pay.vue @@ -101,7 +101,6 @@ title: '支付中...', mask : true }) - console.log(this.orderId) coinPay(this.orderId).then(res => { wx.showModal({ title : '提示', diff --git a/pages/user/certification.vue b/pages/user/certification.vue index 15a1709..ccd7279 100644 --- a/pages/user/certification.vue +++ b/pages/user/certification.vue @@ -99,8 +99,14 @@ mask : true }) identityOcr().then(res => { - this.frontCard.showpath = res.front_card - this.backCard.showpath = res.back_card + this.frontCard = { + showpath: res.front_card, + path : res.front_card_path + } + this.backCard = { + showpath: res.back_card, + path : res.back_card_path + } this.realData = res; uni.hideLoading() }).catch(err => { @@ -116,24 +122,26 @@ uni.showLoading({ title: '提交中信息...', mask : true - }) + }) certification({ front_card: this.frontCard.path, back_card : this.backCard.path, redirect_url: 'http://web.douhuofalv.com/app/e-sign?sign_type=personal', app_scheme: 'doufire://' }).then(res => { - console.log(res) let certificationData = res; + this.isPathChange = false + this.realData = certificationData.certification + this.signUrl = certificationData.sign.authShortUrl wx.showModal({ title : '提示', - content : '您的身份信息已上传,请完成人脸识别以确认您是本人', - showCancel : false, - success : () => { - this.isPathChange = false - this.realData = certificationData.certification - this.signUrl = certificationData.sign.authShortUrl - this.getSignUrl() + content : '您的身份信息已上传,请尽快完成人脸识别以确认您是本人', + cancelText : '稍后认证', + confirmText : '立即认证', + success : ModalRes => { + if(ModalRes.confirm){ + this.getSignUrl() + } } }) }).catch(err => { @@ -148,7 +156,13 @@ getSignUrl(){ if(this.signUrl != ''){ this.isRefresh = true - plus.runtime.openURL(this.signUrl) + this.$Router.push({ + name: 'ESign', + params: { + url: this.signUrl + } + }) + // plus.runtime.openURL(this.signUrl) return } uni.showLoading({ @@ -160,7 +174,13 @@ app_scheme: 'doufire://' }).then(res => { this.isRefresh = true - plus.runtime.openURL(res.authShortUrl) + this.$Router.push({ + name: 'ESign', + params: { + url: res.authShortUrl + } + }) + // plus.runtime.openURL(res.authShortUrl) uni.hideLoading() }).catch(err => { uni.showToast({ @@ -191,7 +211,7 @@ }) } }) - } + }, } } diff --git a/pages/user/eSign.vue b/pages/user/eSign.vue index 9bf82d6..5054e85 100644 --- a/pages/user/eSign.vue +++ b/pages/user/eSign.vue @@ -1,6 +1,6 @@ @@ -13,6 +13,17 @@ }, created() { this.webUrl = this.$Route.query.url + }, + methods: { + onMessage(e){ + let { data } = e.detail + data.map(val => { + if(val.type === 'back'){ + uni.navigateBack() + return + } + }) + } } } diff --git a/pages/work/express.vue b/pages/work/express.vue new file mode 100644 index 0000000..07667a7 --- /dev/null +++ b/pages/work/express.vue @@ -0,0 +1,87 @@ + + + + + diff --git a/pages/work/expressInfo.vue b/pages/work/expressInfo.vue new file mode 100644 index 0000000..734e4ef --- /dev/null +++ b/pages/work/expressInfo.vue @@ -0,0 +1,120 @@ + + + + + diff --git a/pages/work/generate.vue b/pages/work/generate.vue index 6978949..6dcb844 100644 --- a/pages/work/generate.vue +++ b/pages/work/generate.vue @@ -35,7 +35,7 @@ :key="formIndex" v-if="item.subVal[formItem.pre_key] == formItem.pre_value" > - + - + @@ -66,6 +66,15 @@ + + + + + {{formItem.options[item.subVal[formItem.key]]}} + + + +