diff --git a/components/common/down-popup.vue b/components/common/down-popup.vue index 84a631b..ab6d2b9 100644 --- a/components/common/down-popup.vue +++ b/components/common/down-popup.vue @@ -64,7 +64,7 @@ }, methods: { onCancel(){ - this.$emit('click'); + this.$emit('cancel'); }, onOk(){ this.$emit('ok'); @@ -82,7 +82,9 @@ flex-direction: column; background-color: rgba(0,0,0,0.3); position: fixed; - z-index: 2000; + left:0; + top:0; + z-index: 10000; .down-panel{ width:100%; height:764rpx; diff --git a/pages/contract/check.vue b/pages/contract/check.vue index 0f938cb..7b6fb59 100644 --- a/pages/contract/check.vue +++ b/pages/contract/check.vue @@ -4,7 +4,7 @@
- + 消费型合伙人协议 @@ -32,6 +32,7 @@ + diff --git a/pages/contract/index.vue b/pages/contract/index.vue index ba1033a..4461b37 100644 --- a/pages/contract/index.vue +++ b/pages/contract/index.vue @@ -3,12 +3,14 @@
- - - - + + + @@ -34,20 +36,48 @@ export default { signUrl: null, downShow: false, selectItem: null, + tipsShow:false, + userInfo:null }; }, onShow() { + }, + onLoad(){ this.init(); + this.userinfo(); }, methods: { init() { - // this.isSignContract() - this.getSignContract() + this.isSignContract() + + }, + userinfo(){ + getUserInfo().then(res=>{ + if(res.bizcode == 100){ + this.userInfo = res.data; + } + console.log('res',res) + }) + }, + onConfirm(){ + this.onTipsCancel(); + uni.navigateTo({ + url:'/pages/mine_package/mine_authentication/mine_authentication' + }) + }, + onTipsCancel(){ + this.tipsShow =false; + }, + onCancel(){ + this.downShow = false; }, isSignContract() { signContract().then(res => { if (res.bizcode == 100) { this.type = res.data; + if(this.type){ + this.getSignContract() + } } else { this.$refs.uToastRef.show({ type: 'error', @@ -58,7 +88,7 @@ export default { }, getSignContract() { getContractList().then(res => { - if (res.bizcode == 100) { + if (res.bizcode == 100 && res.data.length) { this.obj = res.data[0]; this.obj.time = func.formatDate(new Date(res.data[0].signatureTime), 3) } else { @@ -82,6 +112,18 @@ export default { }, // 发起合同签章 async onSignContract() { + if(this.userInfo.certStatus == 0){ + this.downShow = false; + this.tipsShow = true; + return; + }else if(this.userInfo.certStatus == 1){ + this.downShow = false; + this.$refs.uToastRef.show({ + type: 'success', + message: '请耐心等待审核通过', + }); + return; + } const params = { // 需要的参数 orderId: this.selectItem.id, diff --git a/pages/mine_package/mine_order/mine_order.vue b/pages/mine_package/mine_order/mine_order.vue index 4f4156b..f88e3b7 100644 --- a/pages/mine_package/mine_order/mine_order.vue +++ b/pages/mine_package/mine_order/mine_order.vue @@ -189,20 +189,25 @@ - + + +