From b29f29f005d3ae69dea6ce167c35fdb4dc5eb66f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com> Date: Wed, 4 Jan 2023 15:15:24 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=9E=E5=90=8D?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=9F=8E=E5=B8=82=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E8=AE=A2=E5=8D=95=E7=A1=AE=E8=AE=A4=E6=B5=81?= =?UTF-8?q?=E7=A8=8B,=E8=B0=83=E6=95=B4=E9=80=80=E6=AC=BE=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 62 ++++++- apis/index.js | 2 +- apis/interfaces/order.js | 47 ++++- apis/interfaces/versions.js | 23 +++ manifest.json | 2 +- new_file.json | 0 pages.json | 27 ++- pages/auth/auth.vue | 2 +- pages/auth/registered.vue | 24 ++- pages/auth/resetPassword.vue | 2 +- pages/pay/pay.vue | 2 +- pages/transfers/lists.vue | 13 +- pages/user/certification.vue | 27 ++- pages/user/code.vue | 242 +++++++++++++++++++----- pages/work/confirmScheme.vue | 281 ++++++++++++++++++++++++++++ pages/work/confirmSchemeInfo.vue | 285 +++++++++++++++++++++++++++++ pages/work/orders.vue | 5 +- pages/work/perfectBasis.vue | 49 ++++- pages/work/perfectChoose.vue | 14 +- pages/work/perfectInstitutions.vue | 50 ++++- pages/work/refundOrder.vue | 2 +- 21 files changed, 1078 insertions(+), 83 deletions(-) create mode 100644 apis/interfaces/versions.js delete mode 100644 new_file.json create mode 100644 pages/work/confirmScheme.vue create mode 100644 pages/work/confirmSchemeInfo.vue diff --git a/App.vue b/App.vue index 547e9a3..01129aa 100644 --- a/App.vue +++ b/App.vue @@ -1,4 +1,64 @@ - + diff --git a/pages/work/confirmSchemeInfo.vue b/pages/work/confirmSchemeInfo.vue new file mode 100644 index 0000000..5da9eea --- /dev/null +++ b/pages/work/confirmSchemeInfo.vue @@ -0,0 +1,285 @@ + + + + + diff --git a/pages/work/orders.vue b/pages/work/orders.vue index bd2e65e..f48c4ec 100644 --- a/pages/work/orders.vue +++ b/pages/work/orders.vue @@ -75,7 +75,9 @@ 签约 缴费 完善 - 查看资料 + 查看资料 + + 去确认 查看 @@ -193,6 +195,7 @@ }, // 获取转让对象 onTransfers(index, item){ + console.log(index) levels(item.business_order_id).then(res => { let ActionSheet = [] for(let key in res){ diff --git a/pages/work/perfectBasis.vue b/pages/work/perfectBasis.vue index 183d660..2fcf608 100644 --- a/pages/work/perfectBasis.vue +++ b/pages/work/perfectBasis.vue @@ -110,7 +110,7 @@ diff --git a/pages/work/perfectChoose.vue b/pages/work/perfectChoose.vue index e1de5e7..83ad259 100644 --- a/pages/work/perfectChoose.vue +++ b/pages/work/perfectChoose.vue @@ -7,7 +7,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -81,17 +81,19 @@ }) }, // 资料导航 - onPerfect(name, finish, itemId){ + onPerfect(name, finish, itemId, isMy, user){ if(finish == 1) { - if(name === 'WorkPerfectBasis') this.$Router.push({name: 'OrderPerfectBasisInfo', params: {orderId: this.orderId} }) - if(name === 'WorkPerfectInstitutions') this.$Router.push({name: 'OrderPerfectInstitutionsInfo', params: { itemId } }) + if(name === 'WorkPerfectBasis') this.$Router.push({ name: 'OrderPerfectBasisInfo', params: { orderId: this.orderId, }}) + if(name === 'WorkPerfectInstitutions') this.$Router.push({ name: 'OrderPerfectInstitutionsInfo', params: { itemId }}) return } this.$Router.push({ name, params: { itemId : itemId, - orderId: this.orderId + orderId: this.orderId, + isMy, + userBankId: user, } }) } diff --git a/pages/work/perfectInstitutions.vue b/pages/work/perfectInstitutions.vue index a6637a9..5ea750a 100644 --- a/pages/work/perfectInstitutions.vue +++ b/pages/work/perfectInstitutions.vue @@ -114,7 +114,7 @@ diff --git a/pages/work/refundOrder.vue b/pages/work/refundOrder.vue index 2b397c0..9e12110 100644 --- a/pages/work/refundOrder.vue +++ b/pages/work/refundOrder.vue @@ -9,7 +9,7 @@ 个人 {{item.order_no}} - {{item.status.text}} + {{item.refund_status.text}} From 5dd934729e5f098ef7e03d8046b81958c3b0e316 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com> Date: Wed, 4 Jan 2023 15:26:48 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E4=B8=8E=E9=9A=90=E7=A7=81=E6=94=BF=E7=AD=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/interfaces/public.js | 20 ++++++++++++++++++++ manifest.json | 2 +- pages/auth/auth.vue | 4 ++-- pages/richText/richText.vue | 24 +++++++++++++++++++----- 4 files changed, 42 insertions(+), 8 deletions(-) create mode 100644 apis/interfaces/public.js diff --git a/apis/interfaces/public.js b/apis/interfaces/public.js new file mode 100644 index 0000000..701bd67 --- /dev/null +++ b/apis/interfaces/public.js @@ -0,0 +1,20 @@ + +/** + * Web唐明明 + * 匆匆数载恍如梦,岁月迢迢华发增。 + * 碌碌无为枉半生,一朝惊醒万事空。 + * moduleName: 公共的 + */ + +import { request } from '../index' + +// 协议 +const cms = id => { + return request({ + url : 'cms/pages/' + id, + }) +} + +export { + cms +} \ No newline at end of file diff --git a/manifest.json b/manifest.json index 9c7ea99..77f73cb 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name" : "抖火", "appid" : "__UNI__C305C03", "description" : "", - "versionName" : "1.1.0", + "versionName" : "1.1.1", "versionCode" : "100", "transformPx" : false, /* 5+App特有相关 */ diff --git a/pages/auth/auth.vue b/pages/auth/auth.vue index e73d49a..d5082c5 100644 --- a/pages/auth/auth.vue +++ b/pages/auth/auth.vue @@ -25,8 +25,8 @@ > 我已阅读并同意 - 服务协议、 - 隐私权政策 + 服务协议、 + 隐私权政策 diff --git a/pages/richText/richText.vue b/pages/richText/richText.vue index 2d31121..f707cda 100644 --- a/pages/richText/richText.vue +++ b/pages/richText/richText.vue @@ -1,25 +1,39 @@ From 0755575f087ce596d88faf52a14eca1d0a2c4501 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com> Date: Wed, 4 Jan 2023 16:13:43 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=8C=E8=B0=83=E6=95=B4=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E6=96=B9=E6=A1=88=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 1 + manifest.json | 2 +- pages/work/confirmScheme.vue | 27 ++++++++++++------- pages/work/confirmSchemeInfo.vue | 4 +-- pages/work/orders.vue | 46 +++++++++++++++++++++++++++----- 5 files changed, 60 insertions(+), 20 deletions(-) diff --git a/App.vue b/App.vue index 01129aa..e9f2876 100644 --- a/App.vue +++ b/App.vue @@ -8,6 +8,7 @@ platform: plus.os.name, version : plus.runtime.version }).then(res => { + console.log(res) if (res.update) { uni.showModal({ title : "更新提示", diff --git a/manifest.json b/manifest.json index 77f73cb..c06637e 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name" : "抖火", "appid" : "__UNI__C305C03", "description" : "", - "versionName" : "1.1.1", + "versionName" : "1.1.3", "versionCode" : "100", "transformPx" : false, /* 5+App特有相关 */ diff --git a/pages/work/confirmScheme.vue b/pages/work/confirmScheme.vue index 47c018d..c22de7e 100644 --- a/pages/work/confirmScheme.vue +++ b/pages/work/confirmScheme.vue @@ -1,7 +1,10 @@