From d45ace96c6620d7fc8031a4d9b5ecc7ba271ea76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com> Date: Fri, 24 Mar 2023 10:09:30 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=AD=A3=E5=BC=8F?= =?UTF-8?q?=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apis/index.js b/apis/index.js index bc86f66..917ef93 100644 --- a/apis/index.js +++ b/apis/index.js @@ -10,8 +10,8 @@ import router from '../router' // 基础配置 const config = { - // apiUrl : 'https://douhuo.douhuofalv.com/api/', - apiUrl : 'https://api.douhuotest.douhuofalv.com/api/', //测试环境 + apiUrl : 'https://douhuo.douhuofalv.com/api/', + // apiUrl : 'https://api.douhuotest.douhuofalv.com/api/', //测试环境 timeout : 60000 } From d605b0b0ffed95eab67ea42e4a7970a95a0fcf50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com> Date: Fri, 24 Mar 2023 10:11:48 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E7=A7=BB=E5=87=BA=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E8=B4=A6=E6=88=B7=E5=8E=86=E5=8F=B2=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 20 -------------------- pages/account/cash.vue | 14 -------------- 2 files changed, 34 deletions(-) diff --git a/pages.json b/pages.json index 4df438c..9a84a5d 100644 --- a/pages.json +++ b/pages.json @@ -344,16 +344,6 @@ "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#446EFE", "navigationBarTextStyle": "white", - "app-plus": { - "titleNView": { - "buttons": [{ - "text": "使用账户信息", - "color": "#ffffff", - "fontSize": "30rpx", - "width": "180rpx" - }] - } - } } }, { "path": "pages/work/perfectBasis", @@ -364,16 +354,6 @@ "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#446EFE", "navigationBarTextStyle": "white", - "app-plus": { - "titleNView": { - "buttons": [{ - "text": "使用账户信息", - "color": "#ffffff", - "fontSize": "30rpx", - "width": "180rpx" - }] - } - } } }, { "path": "pages/transfers/lists", diff --git a/pages/account/cash.vue b/pages/account/cash.vue index 405061a..93cb315 100644 --- a/pages/account/cash.vue +++ b/pages/account/cash.vue @@ -64,20 +64,6 @@ - - - From 6acfdb256d302ed486ee05e4196dfaf23d6d1e77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com> Date: Mon, 27 Mar 2023 15:59:20 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/index.js | 1 + pages.json | 4 ++-- pages/account/withdraws.vue | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/apis/index.js b/apis/index.js index 917ef93..9be41a3 100644 --- a/apis/index.js +++ b/apis/index.js @@ -67,6 +67,7 @@ const request = (parameter, hideLoding = true) => { errToast(res.statusCode) }, fail(err) { + console.log(err) uni.showToast({ title: '网络错误，请检查您设备网络状态', icon : 'none' diff --git a/pages.json b/pages.json index 9a84a5d..bc73d54 100644 --- a/pages.json +++ b/pages.json @@ -343,7 +343,7 @@ "navigationBarTitleText": "机构信息", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#446EFE", - "navigationBarTextStyle": "white", + "navigationBarTextStyle": "white" } }, { "path": "pages/work/perfectBasis", @@ -353,7 +353,7 @@ "navigationBarTitleText": "基础信息", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#446EFE", - "navigationBarTextStyle": "white", + "navigationBarTextStyle": "white" } }, { "path": "pages/transfers/lists", diff --git a/pages/account/withdraws.vue b/pages/account/withdraws.vue index 8a3a630..640c337 100644 --- a/pages/account/withdraws.vue +++ b/pages/account/withdraws.vue @@ -94,11 +94,12 @@ this.type = bank.message_type this.isDisabled = has_bank + console.log(bank) + this.name = id_card.name this.idcard = id_card.id_card_no if(has_bank){ let bankIndex = this.banks.findIndex(val => val.name === bank.bank_name) - this.bankNo = bank.bank_no this.mobile = bank.mobile this.bankVal = bankIndex >= 0 ? bankIndex : 0 From b5b3df24f50cf7b4e93ae3d37f236a891d6f00cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com> Date: Mon, 27 Mar 2023 17:03:14 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/interfaces/account.js | 3 +++ pages/account/withdraws.vue | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/apis/interfaces/account.js b/apis/interfaces/account.js index b7cb453..6be342b 100644 --- a/apis/interfaces/account.js +++ b/apis/interfaces/account.js @@ -50,6 +50,9 @@ const withdrawsCreate = () => { // 奖金提现申请 const withdraws = data => { + + console.log(data) + return request({ url: 'withdraws/index', method: 'POST', diff --git a/pages/account/withdraws.vue b/pages/account/withdraws.vue index 640c337..187bda4 100644 --- a/pages/account/withdraws.vue +++ b/pages/account/withdraws.vue @@ -93,9 +93,6 @@ this.identity = id_card this.type = bank.message_type this.isDisabled = has_bank - - console.log(bank) - this.name = id_card.name this.idcard = id_card.id_card_no if(has_bank){ @@ -107,9 +104,6 @@ uni.hideLoading() }).catch(err => { - - console.log(err) - uni.showModal({ content : err.message, showCancel : false, From d5b06534dbec6c1cdf514e70d8923da9f01071f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com> Date: Mon, 27 Mar 2023 17:57:58 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 2 +- pages/account/withdraws.vue | 1 + pages/work/perfectBasis.vue | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/manifest.json b/manifest.json index 5fe86fe..fc009da 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name" : "抖火", "appid" : "__UNI__C305C03", "description" : "纵有疾风起，人生不言弃", - "versionName" : "1.3.7", + "versionName" : "1.3.8", "versionCode" : 103, "transformPx" : false, /* 5+App特有相关 */ diff --git a/pages/account/withdraws.vue b/pages/account/withdraws.vue index 187bda4..ef9b081 100644 --- a/pages/account/withdraws.vue +++ b/pages/account/withdraws.vue @@ -95,6 +95,7 @@ this.isDisabled = has_bank this.name = id_card.name this.idcard = id_card.id_card_no + if(has_bank){ let bankIndex = this.banks.findIndex(val => val.name === bank.bank_name) this.bankNo = bank.bank_no diff --git a/pages/work/perfectBasis.vue b/pages/work/perfectBasis.vue index 0417aa1..ef00543 100644 --- a/pages/work/perfectBasis.vue +++ b/pages/work/perfectBasis.vue @@ -106,21 +106,21 @@ *现居住地址 - + - + - + From 8f5489a8df012a62370854a337f036bfb9142ea7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com> Date: Fri, 31 Mar 2023 22:23:31 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/oct-calendar-picker/oct-calendar-picker.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uni_modules/oct-calendar-picker/components/oct-calendar-picker/oct-calendar-picker.vue b/uni_modules/oct-calendar-picker/components/oct-calendar-picker/oct-calendar-picker.vue index c604c13..7beec5b 100644 --- a/uni_modules/oct-calendar-picker/components/oct-calendar-picker/oct-calendar-picker.vue +++ b/uni_modules/oct-calendar-picker/components/oct-calendar-picker/oct-calendar-picker.vue @@ -248,7 +248,7 @@ let year = moment().get('year') let month = moment().get('month') + 1 let today = moment().get('date') - let start = moment([year, month, today]).month(-(num - 2)).format('YYYY-MM-DD') + let start = moment().subtract(num, 'month').format('YYYY-MM-DD') let ymdArr = start.split('-') let { months, days } = this.getNewYM(ymdArr[0], ymdArr[1]) From 5a0c4e3671b62cf8f5e378934034c0034ca5e09f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com> Date: Tue, 25 Apr 2023 15:54:49 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=88=86=E6=94=AF?= =?UTF-8?q?=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 23 +- pages.json | 1198 +++++++++-------- pages/account/withdraws.vue | 7 +- pages/work/perfectBasis.vue | 92 +- .../oct-calendar-picker.vue | 2 +- 5 files changed, 708 insertions(+), 614 deletions(-) diff --git a/manifest.json b/manifest.json index fc009da..1140d8b 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "抖火", "appid" : "__UNI__C305C03", "description" : "纵有疾风起，人生不言弃", - "versionName" : "1.3.8", - "versionCode" : 103, + "versionName" : "1.4.3", + "versionCode" : 104, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { @@ -43,7 +43,8 @@ "", "" ], - "schemes" : "doufire" + "schemes" : "doufire", + "minSdkVersion" : 21 }, /* ios打包配置 */ "ios" : { @@ -92,6 +93,22 @@ } } } + }, + "nativePlugins" : { + "Pdf-Plugin" : { + "__plugin_info__" : { + "name" : "Pdf-Plugin", + "description" : "此插件为uni小程序Android原生插件,用于加载网络pdf,支持水印和缩放", + "platforms" : "Android", + "url" : "https://ext.dcloud.net.cn/plugin?id=11384", + "android_package_name" : "io.douhuofalv.com", + "ios_bundle_id" : "io.douhuofalv.com", + "isCloud" : true, + "bought" : 1, + "pid" : "11384", + "parameters" : {} + } + } } }, /* 快应用特有相关 */ diff --git a/pages.json b/pages.json index bc73d54..1c05bc6 100644 --- a/pages.json +++ b/pages.json @@ -1,593 +1,609 @@ -{ - "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/free", - "name": "FreeService", - "auth": true, - "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/yunying", - "auth": true, - "name": "YunYing", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#446EFE", - "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", - "app-plus": { - "titleNView": { - "buttons": [{ - "text": "\ue66c", - "float": "left", - "fontSrc": "/static/uniicons.ttf", - "fontSize": "20px" - }] - } - } - } - }, { - "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" - } - }, { - "path": "pages/work/perfectBasis", - "auth": true, - "name": "WorkPerfectBasis", - "style": { - "navigationBarTitleText": "基础信息", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#446EFE", - "navigationBarTextStyle": "white" - } - }, { - "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" - } - }, { - "path": "pages/work/confirmScheme", - "auth": true, - "name": "ConfirmScheme", - "style": { - "navigationBarTitleText": "结案方案", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" - } - }, { - "path": "pages/work/confirmSchemeInfo", - "auth": true, - "name": "ConfirmSchemeInfo", - "style": { - "navigationBarTitleText": "方案详情", - "enablePullDownRefresh": false, - "navigationBarTextStyle": "white", - "navigationBarBackgroundColor": "#446EFE" - } - }, { - "path": "pages/user/salesmanCode", - "auth": true, - "name": "SalesmanCode", - "style": { - "navigationBarTitleText": "业务员邀请码", - "enablePullDownRefresh": false, - "navigationBarTextStyle": "white", - "navigationBarBackgroundColor": "#446EFE" - } - }, { - "path": "pages/user/weChat", - "auth": true, - "name": "WeChat", - "style": { - "navigationBarTitleText": "关注公众号", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#f8f8f8" - } - }, { - "path": "pages/account/withdraws", - "auth": true, - "name": "Withdraws", - "style": { - "navigationBarTitleText": "申请提现", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#FFFFFF" - } - }, { - "path": "pages/work/orderLog", - "auth": true, - "name": "OrderLog", - "style": { - "navigationBarTitleText": "记录", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#FFFFFF" - } - }, { - "path": "pages/im/chat", - "auth": true, - "name": "ImChat", - "style": { - "navigationBarTitleText": "聊天窗口", - "enablePullDownRefresh": false, - "disableScroll": true, - "navigationBarBackgroundColor": "#FFFFFF" - } - }, { - "path": "pages/im/msg", - "name": "ImMsg", +{ + "pages": [{ + "path": "pages/index/index", + "name": "Index", "style": { - "navigationBarTitleText": "消息", + "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", + "auth": true, + "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" - } - }], - "globalStyle": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "抖火", - "navigationBarBackgroundColor": "#F8F8F8", - "backgroundColor": "#F8F8F8" - }, - "tabBar": { - "backgroundColor": "white", - "borderStyle": "white", - "color": "#999999", - "selectedColor": "#446EFE", - "list": [{ - "iconPath": "static/icons/tabs_icon_00.png", - "selectedIconPath": "static/icons/tabs_show_00.png", - "pagePath": "pages/index/index", - "text": "服务包" - }, { - "iconPath": "static/icons/tabs_icon_01.png", - "selectedIconPath": "static/icons/tabs_show_01.png", - "pagePath": "pages/college/test", - "text": "业务考试" - }, { - "iconPath": "static/icons/tabs_icon_02.png", - "selectedIconPath": "static/icons/tabs_show_02.png", - "pagePath": "pages/work/index", - "text": "工作台" - }, { - "iconPath": "static/icons/tabs_icon_03.png", - "selectedIconPath": "static/icons/tabs_show_03.png", - "pagePath": "pages/user/index", - "text": "我的" - }] - }, - "easycom": { - "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" - }, - "uniIdRouter": {} -} + "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/yunying", + "auth": true, + "name": "YunYing", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#446EFE", + "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", + "app-plus": { + "titleNView": { + "buttons": [{ + "text": "\ue66c", + "float": "left", + "fontSrc": "/static/uniicons.ttf", + "fontSize": "20px" + }] + } + } + } + }, { + "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" + } + }, { + "path": "pages/work/perfectBasis", + "auth": true, + "name": "WorkPerfectBasis", + "style": { + "navigationBarTitleText": "基础信息", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#446EFE", + "navigationBarTextStyle": "white" + } + }, { + "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" + } + }, { + "path": "pages/work/confirmScheme", + "auth": true, + "name": "ConfirmScheme", + "style": { + "navigationBarTitleText": "结案方案", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } + }, { + "path": "pages/work/confirmSchemeInfo", + "auth": true, + "name": "ConfirmSchemeInfo", + "style": { + "navigationBarTitleText": "方案详情", + "enablePullDownRefresh": false, + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#446EFE" + } + }, { + "path": "pages/user/salesmanCode", + "auth": true, + "name": "SalesmanCode", + "style": { + "navigationBarTitleText": "业务员邀请码", + "enablePullDownRefresh": false, + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#446EFE" + } + }, { + "path": "pages/user/weChat", + "auth": true, + "name": "WeChat", + "style": { + "navigationBarTitleText": "关注公众号", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#f8f8f8" + } + }, { + "path": "pages/account/withdraws", + "auth": true, + "name": "Withdraws", + "style": { + "navigationBarTitleText": "申请提现", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#FFFFFF" + } + }, { + "path": "pages/work/orderLog", + "auth": true, + "name": "OrderLog", + "style": { + "navigationBarTitleText": "记录", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#FFFFFF" + } + }, { + "path": "pages/im/chat", + "auth": true, + "name": "ImChat", + "style": { + "navigationBarTitleText": "聊天窗口", + "enablePullDownRefresh": false, + "disableScroll": true, + "navigationBarBackgroundColor": "#FFFFFF" + } + }, { + "path": "pages/im/msg", + "name": "ImMsg", + "style": { + "navigationBarTitleText": "消息", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#FFFFFF" + } + }, { + "path": "pages/user/signLog", + "name": "SignLog", + "style": { + "navigationBarTitleText": "合同记录", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#FFFFFF" + } + }, { + "path": "pages/user/contract", + "name": "SignContract", + "style": { + "navigationBarTitleText": "合同", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#FFFFFF" + } + }], + "globalStyle": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "抖火", + "navigationBarBackgroundColor": "#F8F8F8", + "backgroundColor": "#F8F8F8" + }, + "tabBar": { + "backgroundColor": "white", + "borderStyle": "white", + "color": "#999999", + "selectedColor": "#446EFE", + "list": [{ + "iconPath": "static/icons/tabs_icon_00.png", + "selectedIconPath": "static/icons/tabs_show_00.png", + "pagePath": "pages/index/index", + "text": "服务包" + }, { + "iconPath": "static/icons/tabs_icon_01.png", + "selectedIconPath": "static/icons/tabs_show_01.png", + "pagePath": "pages/college/test", + "text": "业务考试" + }, { + "iconPath": "static/icons/tabs_icon_02.png", + "selectedIconPath": "static/icons/tabs_show_02.png", + "pagePath": "pages/work/index", + "text": "工作台" + }, { + "iconPath": "static/icons/tabs_icon_03.png", + "selectedIconPath": "static/icons/tabs_show_03.png", + "pagePath": "pages/user/index", + "text": "我的" + }] + }, + "easycom": { + "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" + }, + "uniIdRouter": {} +} \ No newline at end of file diff --git a/pages/account/withdraws.vue b/pages/account/withdraws.vue index ef9b081..4490367 100644 --- a/pages/account/withdraws.vue +++ b/pages/account/withdraws.vue @@ -48,7 +48,6 @@ 后台提现管理时间 上午11:00-12:00 下午17:00-18:00 - - + \ No newline at end of file diff --git a/pages/work/perfectBasis.vue b/pages/work/perfectBasis.vue index ef00543..2e52d45 100644 --- a/pages/work/perfectBasis.vue +++ b/pages/work/perfectBasis.vue @@ -122,6 +122,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -129,7 +185,6 @@ - - + \ No newline at end of file diff --git a/uni_modules/oct-calendar-picker/components/oct-calendar-picker/oct-calendar-picker.vue b/uni_modules/oct-calendar-picker/components/oct-calendar-picker/oct-calendar-picker.vue index 7beec5b..2a0c8c4 100644 --- a/uni_modules/oct-calendar-picker/components/oct-calendar-picker/oct-calendar-picker.vue +++ b/uni_modules/oct-calendar-picker/components/oct-calendar-picker/oct-calendar-picker.vue @@ -452,4 +452,4 @@ } } } - + \ No newline at end of file