修复

pages/bigredrnvelope/list.vue

@@ -27,7 +27,7 @@
                             </view>
                             <view class="bigRedEnvLCRight">
                                 <view class="bigRedEnvLCRBox column" 
-                                v-if="item.Status!=1&&item.Status!=3"
+                                v-if="item.Status!=1&&item.Status!=3&&item.Status!=0"
                                 @click.stop="item.ContractStatus==2&&(item.Status==2||item.Status==4)?goDetails(item,3):
                                 item.ContractStatus==3&&(item.Status==2||item.Status==4)?goDetails(item,4):
                                 (item.ContractStatus==4||item.ContractStatus==5)&&(item.Status==2||item.Status==4)?goDetails(item,5):''">
@@ -48,7 +48,7 @@
                                 <view v-if="item.Status==1" class="bigRedEnvLCRBut" @click.stop="goDetails(item,2)">
                                     查看进度
                                 </view>
-                                <view v-if="item.Status==3" class="bigRedEnvLCRBut" @click.stop="goDetails(item,1)">
+                                <view v-if="item.Status==0||item.Status==3" class="bigRedEnvLCRBut" @click.stop="goDetails(item,1)">
                                     重新填写
                                 </view>
                             </view>   

pages/bigredrnvelope/signAcontract.vue

@@ -184,10 +184,14 @@
                     <view class="signAconNext signAconNextL col" @click="Prev(1)">
                         上一步
                     </view>
-                    <view class="signAconNext col"
+                    <view v-if="!msg.Tourists_Sign" class="signAconNext col"
                     :class="[validate(3)?'':'active']" @click="Next(3)">
                         下一步
                     </view>
+                    <view v-else class="signAconNext col"
+                    :class="[validate(4)?'':'active']" @click="Next(4)">
+                        下一步
+                    </view>
                 </view>
             </view>
             <view class="signAconForm column" v-if="msg.StepNum==3">
@@ -266,10 +270,14 @@
                     <view v-if="msg.StepNum<4&&!loading" class="signAconNext signAconNextL col" @click="Prev(2)">
                         上一步
                     </view>
+                    <view class="signAconNext col active" @click="Next(4)">
+                        下一步
+                    </view>
+                    <!--
                     <view class="signAconNext col"
                     :class="[msg.StepNum==4||loading?'':'active']" @click="Next(4)">
-                        提交
-                    </view>
+                        签字
+                    </view>-->
                 </view>
                 
             </view>
@@ -285,7 +293,10 @@
                     </view>
                 </view>
                 <view class="row-sbs-n">
-                    <view v-if="msg.StepNum<5&&!loading" class="signAconNext signAconNextL col" @click="Prev(3)">
+                    <view v-if="msg.Tourists_Sign&&!loading" class="signAconNext signAconNextL col" @click="Prev(2)">
+                        上一步
+                    </view>
+                    <view v-if="!msg.Tourists_Sign&&msg.StepNum<5&&!loading" class="signAconNext signAconNextL col" @click="Prev(3)">
                         上一步
                     </view>
                     <view class="signAconNext col"
@@ -423,7 +434,7 @@ export default {
             if(type==1) url = `https://activity.oytour.com/html/contract/index.html?msg=${encodeURIComponent(msg)}`
             if(type==2) url = `https://activity.oytour.com/html/contract/sign.html?msg=${encodeURIComponent(msg)}`
             if(type==3) url = `https://activity.oytour.com/html/contract/index.html?ContractId=${this.msg.ContractId}`
-            // if(process.env.NODE_ENV=="development") return console.log(url,"-----url")
+            if(process.env.NODE_ENV=="development") return console.log(url,"-----url")
             if (url && url.length > 0) {
                 if(type==1||type==3){
                     uni.navigateTo({
@@ -521,9 +532,9 @@ export default {
                     msg = '请输入银行账户'
                 }
             }else if(type==4){
-                if(!this.isSign){
-                    msg = '请仔细阅读条款，并签字确认'
-                }
+                // if(!this.isSign){
+                //     msg = '请仔细阅读条款，并签字确认'
+                // }
             }
             return msg
         },
@@ -575,11 +586,16 @@ export default {
                     console.log(res,'--------提交')
                     uni.hideLoading()
                     this.loading = false
-                    this.msg.StepNum = type
-                    if(this.msg.StepNum==5){
+                    if(type<5)this.msg.StepNum = type
+                    if(type==4){
                         this.msg.ContractId = res.data.ContractId
                         this.goWebUrl(2)
                     }
+                    if(type==5){
+                        uni.redirectTo({
+                            url: `/pages/bigredrnvelope/list`
+                        })
+                    }
                 }
             },err=>{
                 uni.hideLoading()
@@ -663,22 +679,25 @@ export default {
                         C_EndDate:data.RenewalContractEtime,//	合同结束时间
                     }
                     if(this.IsRenewalContract||this.ContractId){
-                        if(this.isSign){
+                        if(this.isSign&&this.ContractId>0){
                             this.msg.StepNum = 4
                         }else this.msg.StepNum = 0
                         
                         if(this.IsRenewalContract==1) this.msg.ContractId = 0
                         if(this.ContractId) {
+                            this.msg.ContractId = this.ContractId
                             let ContractList = data.ContractList.filter(x=>{
                                 return x.ContractId==this.ContractId
                             })
                             if(ContractList.length>0) {
                                 this.msg.C_StartDate = ContractList[0].StartTime
                                 this.msg.C_EndDate = ContractList[0].EndTime
+                                this.msg.Tourists_Sign = ContractList[0].Tourists_Sign
                             }
-                            this.msg.ContractId = this.ContractId
+                            console.log(ContractList,'--------')
                         }
                     }
+                   
                     this.oldMsg = JSON.parse(JSON.stringify(this.msg))
                     uni.hideLoading()
                 }