no message

pages/bigredrnvelope/list.vue

@@ -10,33 +10,33 @@
             <view class="bigRedEnvLCBox">
                 <!-- activeDaiKQ  activeJinXZ activeChaK activeChaKJD-->
                 <view class="bigRedEnvLC" v-for="(item,index) in dataList" :key="index"
-                :class="[{'activeDaiKQ':item.ContractStatus==3&&item.Status==2,
-                'activeJinXZ':(item.ContractStatus==2&&item.Status==2)||item.ContractStatus==1,
-                'activeChaK':(item.ContractStatus==4||item.ContractStatus==5)&&item.Status==2,
+                :class="[{'activeDaiKQ':item.ContractStatus==3&&(item.Status==2||item.Status==4),
+                'activeJinXZ':(item.ContractStatus==2&&(item.Status==2||item.Status==4))||item.ContractStatus==1,
+                'activeChaK':(item.ContractStatus==4||item.ContractStatus==5)&&(item.Status==2||item.Status==4),
                 'activeChaKJD':item.Status==1||item.Status==3}]">
                     <view class="bigRedEnvLCBj">
                         <view class="row items-center">
                             <view class="bigRedEnvLCLeft col">
                                 <view class="bigRedEnvLCLTitle"><text>{{ item.C_ProductName }}</text></view>
                                 <view v-if="item.Status!=1" class="bigRedEnvLCLTime">
-                                    <template v-if="item.ContractStatus==2&&item.Status==2">提交时间：{{ item.C_PayDate }}</template>
-                                    <template v-if="item.ContractStatus==3&&item.Status==2">结算时间：{{ item.JieSuan }}</template>
-                                    <template v-if="(item.ContractStatus==4||item.ContractStatus==5)&&item.Status==2">结算时间：{{ item.C_PayDate }}</template>
+                                   <!-- <template v-if="item.ContractStatus==3&&(item.Status==2||item.Status==4)&&item.C_PayDate">提交时间：{{ item.C_PayDate }}</template>-->
+                                    <template v-if="item.ContractStatus==2&&(item.Status==2||item.Status==4)&&item.JieSuan">结算日期：{{ item.JieSuan }}</template>
+                                    <template v-if="(item.ContractStatus==4||item.ContractStatus==5)&&(item.Status==2||item.Status==4)&&item.C_PayDate">结算时间：{{ item.C_PayDate }}</template>
                                 </view>
                             </view>
                             <view class="bigRedEnvLCRight">
                                 <view class="bigRedEnvLCRBox column" 
                                 v-if="item.Status!=1&&item.Status!=3"
-                                @click="item.ContractStatus==2&&item.Status==2?goDetails(item,3):
-                                item.ContractStatus==3&&item.Status==2?goDetails(item,4):
-                                (item.ContractStatus==4||item.ContractStatus==5)&&item.Status==2?goDetails(item,5):''">
+                                @click="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):''">
                                     <view class="bigRedEnvLCRTitle">- 
                                         <text>
-                                            <template v-if="item.ContractStatus==3&&item.Status==2">待开启</template>
-                                            <template v-if="item.ContractStatus==2&&item.Status==2">进行中</template>
+                                            <template v-if="item.ContractStatus==3&&(item.Status==2||item.Status==4)">待开启</template>
+                                            <template v-if="item.ContractStatus==2&&(item.Status==2||item.Status==4)">进行中</template>
                                             <template v-if="item.ContractStatus==1">待生效</template>
-                                            <template v-if="item.ContractStatus==4&&item.Status==2">结算中</template>
-                                            <template v-if="item.ContractStatus==5&&item.Status==2">已完成</template>
+                                            <template v-if="item.ContractStatus==4&&(item.Status==2||item.Status==4)">结算中</template>
+                                            <template v-if="item.ContractStatus==5&&(item.Status==2||item.Status==4)">已完成</template>
                                         </text> -</view>
                                     <view class="bigRedEnvLCRText">
                                         ¥

pages/bigredrnvelope/signAcontract.vue

@@ -335,7 +335,7 @@
                     </view>
                     <view class="contractSign row justify-center">
                         <view @click="getUrl(2)">重新签字</view>
-                        <view style="margin-left: 50rpx;"  @click="getUrl(1)">查看条款</view>
+                        <view style="margin-left: 50rpx;"  @click="getUrl(3)">查看条款</view>
                     </view>
                 </view>
                 <view class="signAconNext"
@@ -467,9 +467,10 @@ export default {
             let msg = JSON.stringify({ContractId:this.msg.ContractId})
             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 (url && url.length > 0) {
-                if(type==1){
+                if(type==1||type==3){
                     uni.navigateTo({
                         url: "/pages/webbox/webbox?u=" + encodeURIComponent(url),
                     });