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/transfers/lists.vue b/pages/transfers/lists.vue index b014b5c..48330c2 100644 --- a/pages/transfers/lists.vue +++ b/pages/transfers/lists.vue @@ -55,10 +55,10 @@ - 拒绝 - 接收 + 拒绝 + 接收 - 查看 + 查看 @@ -98,12 +98,13 @@ // 切换列表 onTabs(e){ this.tabsCurrent = e.index + this.orders = [] this.getList() }, // 变更当前列表状态 removeListVal(id){ let ListArr = this.orders - let ListIndex = ListArr.findIndex(val => val.business_order_id == id) + let ListIndex = ListArr.findIndex(val => val.business_order_transfer_id == id) if(ListIndex >= 0){ this.orders.splice(ListIndex, 1) } @@ -127,6 +128,8 @@ }) // 移出操作后的订单 this.removeItem(id) + }).catch(err => { + console.log(err) }) } } @@ -146,6 +149,8 @@ }) // 移出操作后的订单 this.removeItem(id) + }).catch(err => { + console.log(err) }) } } diff --git a/pages/user/certification.vue b/pages/user/certification.vue index b7dcbd4..0e85f8b 100644 --- a/pages/user/certification.vue +++ b/pages/user/certification.vue @@ -24,13 +24,13 @@ - {{provinces[provincesVal].name}} + {{provinces[provincesVal].name}} - {{citys[citysVal].name}} + {{citys[citysVal].name}} @@ -100,9 +100,12 @@ }, created() { getRegion().then(res => { - this.provinces = res - this.getCity() + this.provinces = [{ + id : '', + name: '请选择经营省份' + }, ...res] this.getCertified() + this.getCity() }).catch(err => { uni.showToast({ title: err.message, @@ -149,7 +152,13 @@ mask : true }) getRegion(this.provinces[this.provincesVal].id).then(res => { - this.citys = res + this.citys = [ + { + id : '', + name: '请选择经营城市' + }, + ...res + ] if(id){ this.citysVal = this.citys.findIndex(val => val.id === id) }else{ @@ -163,7 +172,7 @@ }) }) }, - // 提交真实信息 + // 获取实名信息 getInfo(){ uni.showLoading({ title: '加载中...', @@ -208,7 +217,8 @@ 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://' + app_scheme: 'doufire://', + channel: 'app' }).then(res => { let certificationData = res; this.idCard = true @@ -337,6 +347,9 @@ position: absolute; right: 0; } + &.text-gray{ + color: gray; + } } } } diff --git a/pages/user/code.vue b/pages/user/code.vue index 6a2ddf4..a324ffd 100644 --- a/pages/user/code.vue +++ b/pages/user/code.vue @@ -10,74 +10,220 @@ - - + + 邀请码{{invite}} - + + + - - diff --git a/pages/work/confirmScheme.vue b/pages/work/confirmScheme.vue new file mode 100644 index 0000000..c22de7e --- /dev/null +++ b/pages/work/confirmScheme.vue @@ -0,0 +1,288 @@ + + + + + diff --git a/pages/work/confirmSchemeInfo.vue b/pages/work/confirmSchemeInfo.vue new file mode 100644 index 0000000..e4dc4fc --- /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..765a559 100644 --- a/pages/work/orders.vue +++ b/pages/work/orders.vue @@ -75,11 +75,15 @@ 签约 缴费 完善 - 查看资料 + 查看资料 + + 去确认 查看 + + @@ -128,6 +132,14 @@ actionLevels: [], getSignState: false, getNextTab : false, + // 分页 + page : { + current : 1, + has_more: false, + }, + pagesShow : false, + status : '' + }; }, created() { @@ -150,7 +162,6 @@ this.tabType = this.tabs[this.tabsCurrent].val this.getList() this.getNextTab = false; - this.$store.commit('setOrderId', null) return } this.getList() @@ -162,6 +173,8 @@ onTabs(e){ this.tabsCurrent = e.index this.tabType = e.val + this.page = { current: 1, has_more: false } + this.orders = [] this.getList() }, // 变更当前列表状态 @@ -175,15 +188,27 @@ }, // 获取列表 getList(){ - this.$store.commit('setOrderId', null) + uni.showLoading({ + title: '加载中...', + mask : true + }) + if(this.$store.getters.getOrderId != null){ + this.page = { current: 1, has_more: false } + this.$store.commit('setOrderId', null) + } lists({ - status: this.tabType + status: this.tabType, + page : this.page.current }).then(res => { - let { data } = res; + let { data, page } = res; data.map(val => { val.is_show_type = false }) - this.orders = data + let atList = page.current == 1 ? [] : this.orders + this.orders = atList.concat(data) + this.page = page + this.pagesShow = false + uni.hideLoading() }).catch(err => { uni.showToast({ title: err.message, @@ -310,6 +335,16 @@ phoneNumber: phone }) } + }, + onReachBottom() { + this.pagesShow = true; + if(this.page.has_more){ + this.status = 'loading'; + this.page.current++ + this.getList() + return + } + this.status = 'nomore'; } } diff --git a/pages/work/perfectBasis.vue b/pages/work/perfectBasis.vue index 183d660..334da1f 100644 --- a/pages/work/perfectBasis.vue +++ b/pages/work/perfectBasis.vue @@ -51,7 +51,7 @@ @@ -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}} diff --git a/static/code/back.png b/static/code/back.png new file mode 100644 index 0000000..90f3e5e Binary files /dev/null and b/static/code/back.png differ diff --git a/static/code/btn.png b/static/code/btn.png new file mode 100644 index 0000000..4df7102 Binary files /dev/null and b/static/code/btn.png differ diff --git a/static/code/code.png b/static/code/code.png new file mode 100644 index 0000000..906048c Binary files /dev/null and b/static/code/code.png differ diff --git a/static/code/header.png b/static/code/header.png new file mode 100644 index 0000000..e7ef5c7 Binary files /dev/null and b/static/code/header.png differ diff --git a/static/code/logo.png b/static/code/logo.png new file mode 100644 index 0000000..3a8828b Binary files /dev/null and b/static/code/logo.png differ