订单列表,订单详情修改

pages/order_details/stay.vue

@@ -36,8 +36,11 @@
       </view>
       <!--预售（代付款）-->
       <view v-else class="presell_bg_header">
-				<view class='header presell_header' :style="{ 'background-image': `url(${domain}/static/diy/presell_header${keyColor}.png)`}">
+        <view class='header presell_header'
-					<view class="presell_payment" v-if="orderInfo.orderList"><text class="iconfont icon-shijian1"></text>{{orderInfo.orderList[0].orderProduct[0].cart_info.productPresell.presell_type==1?'待支付':'待付定金'}}</view>
+          :style="{ 'background-image': `url(${domain}/static/diy/presell_header${keyColor}.png)`}">
+          <view class="presell_payment" v-if="orderInfo.orderList"><text
+              class="iconfont icon-shijian1"></text>{{orderInfo.orderList[0].orderProduct[0].cart_info.productPresell.presell_type==1?'待支付':'待付定金'}}
+          </view>
           <view class='data'>
             <view class='state'>请在{{orderInfo.cancel_time}}前完成支付,超时订单将自动取消</view>
           </view>
@@ -54,7 +57,8 @@
       </view>
       <!-- 店铺商品列表 -->
       <view class="order-wrapper" v-for="(item,index) in orderInfo.orderList" :key="index">
-				<view class="title" @click="goStore(item)">{{item.merchant.mer_name}}<text class="iconfont icon-xiangyou"></text>
+        <view class="title" @click="goStore(item)">{{item.merchant.mer_name}}<text
+            class="iconfont icon-xiangyou"></text>
         </view>
         <view class="goods-box">
           <view v-for="(goods,j) in item.orderProduct" :key="goods.order_product_id" @click="goProduct(goods)">
@@ -62,16 +66,21 @@
               <view class="item">
                 <image :src="goods.cart_info.product.image"></image>
                 <view class="info-box">
-									<view class="name line1"><text class="event_name event_bg">预售</text>{{goods.cart_info.product.store_name}}</view>
+                  <view class="name line1"><text
+                      class="event_name event_bg">预售</text>{{goods.cart_info.product.store_name}}</view>
                   <view class="msg">{{goods.cart_info.productAttr.sku}}</view>
                   <view class="event_ship event_color">发货时间：
                     <!--全款预售-->
-										<text v-if="goods.cart_info.productPresell.presell_type === 1">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
+                    <text
+                      v-if="goods.cart_info.productPresell.presell_type === 1">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
                     <!--定金预售-->
-										<text v-if="goods.cart_info.productPresell.presell_type === 2">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
+                    <text
+                      v-if="goods.cart_info.productPresell.presell_type === 2">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
                   </view>
                 </view>
-								<view class="num"><text class="font-color">￥{{goods.cart_info.productPresellAttr.presell_price}}</text></br>x{{goods.product_num}}</view>
+                <view class="num"><text
+                    class="font-color">￥{{goods.cart_info.productPresellAttr.presell_price}}</text></br>x{{goods.product_num}}
+                </view>
                 <view class="bnt">
                   立即付款
                 </view>
@@ -84,8 +93,10 @@
                 </view>
                 <view class="progress_list">
                   <view class="progress_name">阶段二： 未开始</view>
-									<view class="progress_price">商品尾款  <text class="align_right">￥{{ item.presellOrder.pay_price }}</text></view>
+                  <view class="progress_price">商品尾款 <text class="align_right">￥{{ item.presellOrder.pay_price }}</text>
-									<view class="progress_pay">尾款需付款<text class="align_right gColor">￥{{ item.presellOrder.pay_price }}</text></view>
+                  </view>
+                  <view class="progress_pay">尾款需付款<text
+                      class="align_right gColor">￥{{ item.presellOrder.pay_price }}</text></view>
                 </view>
               </view>
 
@@ -98,9 +109,10 @@
                 <view class="price">￥{{goods.cart_info.productAttr.price}}</view>
               </view>
               <view class="num">x{{goods.product_num}}</view>
-							<view class="bnt" @tap.stop='pay_open(orderInfo.order_id)'>
+              <view class="bnt" @tap.stop='pay_open(orderInfo.order_id)' v-if="item.stauts == 3">
                 立即付款
               </view>
+
             </view>
           </view>
         </view>
@@ -136,19 +148,21 @@
           <view>支付方式：</view>
           <view class='conter' v-if="orderInfo.pay_type==0">余额支付</view>
           <view class='conter' v-if="orderInfo.pay_type==4 || orderInfo.pay_type==5">支付宝支付</view>
-					<view class='conter'
+          <view class='conter' v-if="orderInfo.pay_type==1 || orderInfo.pay_type==2 || orderInfo.pay_type==3">微信支付
-						v-if="orderInfo.pay_type==1 || orderInfo.pay_type==2 || orderInfo.pay_type==3">微信支付</view>
+          </view>
-					  <view class='conter'
+          <view class='conter' v-if="orderInfo.pay_type==8 ">先货后款</view>
-						v-if="orderInfo.pay_type==8 ">先货后款</view>
         </view>
 
       </view>
-			<view v-if="orderInfo.orderList && orderInfo.orderList[0].is_virtual == 1 && orderInfo.orderList[0].order_extend" class='wrapper'>
+      <view v-if="orderInfo.orderList && orderInfo.orderList[0].is_virtual == 1 && orderInfo.orderList[0].order_extend"
-				<view v-for="(item,index) in orderInfo.orderList[0].order_extend" :key="index" v-if="item" class='item acea-row row-between'>
+        class='wrapper'>
+        <view v-for="(item,index) in orderInfo.orderList[0].order_extend" :key="index" v-if="item"
+          class='item acea-row row-between'>
           <view>{{index}}：</view>
           <view v-if="!Array.isArray(item)" class='conter'>{{item}}</view>
           <view v-else class='conter virtual_image'>
-						<image v-for="(pic,i) in item" :key="i" class="picture" :src="pic" @click="getPhotoClickIdx(item,i)"></image>
+            <image v-for="(pic,i) in item" :key="i" class="picture" :src="pic" @click="getPhotoClickIdx(item,i)">
+            </image>
           </view>
         </view>
       </view>
@@ -176,7 +190,8 @@
             <image src="@/static/images/wenhao.png" mode="" @click="Settlement"></image>
           </view>
           <view class="conters" v-if="this.pay_type == 8">
-						结算周期:{{orderInfo.orderList[0].merchant.settle_cycle}}天 日利率:{{orderInfo.orderList[0].merchant.interest_rate}}%
+            结算周期:{{orderInfo.orderList[0].merchant.settle_cycle}}天
+            日利率:{{orderInfo.orderList[0].merchant.interest_rate}}%
           </view>
         </view>
 
@@ -184,7 +199,8 @@
       <view class="content-clip"></view>
       <view class='footer acea-row row-right row-middle'>
         <view class="bnt cancel" @click.stop="cancelOrder">取消订单</view>
-				<view class='bnt bgColor' @tap='pay_open(orderInfo.order_id)'>立即付款</view>
+        <view class='bnt bgColor' @tap='pay_open(orderInfo.order_id)' v-if="orderInfo.pay_type == 8">立即结算</view>
+        <view class='bnt bgColor' @tap='pay_open(orderInfo.order_id)' v-else>立即付款</view>
       </view>
     </view>
     <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
@@ -464,16 +480,16 @@
           uni.hideLoading();
           that.$set(that, 'orderInfo', res.data);
           this.pay_type = this.orderInfo.pay_type
-          if(this.orderInfo.interest.start_time){
+          if (this.orderInfo.interest !== null) {
             this.moerTime(this.orderInfo.interest.start_time)
           }
           console.log(that.orderInfo.interest);
         }).catch(err => {
-					// console.log(err)
+          console.log(err)
           uni.hideLoading();
           that.$util.Tips({
             title: err
-					}, '/pages/users/order_list/index');
+          });
         });
       },
       /**
@@ -552,12 +568,15 @@
   .event_bg {
     background: #FF7F00;
   }
+
   .event_color {
     color: #FF7F00;
   }
+
   .presell_bg_header {
     background: linear-gradient(90deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
   }
+
   .goodCall {
     text-align: center;
     width: 100%;
@@ -568,10 +587,12 @@
     line-height: 86rpx;
     background: #fff;
     color: #282828;
+
     .icon-kefu {
       font-size: 32rpx;
       margin-right: 15rpx;
     }
+
     /* #ifdef MP */
     button {
       display: flex;
@@ -581,18 +602,23 @@
       font-size: 30rpx;
       color: #e93323;
     }
+
     /* #endif */
   }
+
   .order-details .header {
     padding: 0 30rpx;
     height: 150rpx;
     background-image: linear-gradient(to right, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
+
     &.presell_header {
       background-repeat: no-repeat;
       background-size: cover;
       padding: 35rpx 50rpx;
+
       .data {
         margin: 8rpx 0 0 26rpx;
+
         .state {
           font-weight: normal;
           font-size: 24rpx;
@@ -600,70 +626,86 @@
       }
     }
   }
+
   .order-details .header.on {
     background-color: #666 !important;
   }
+
   .order-details .header .pictrue {
     width: 110rpx;
     height: 110rpx;
   }
+
   .order-details .header .pictrue image {
     width: 100%;
     height: 100%;
   }
+
   .order-details .header .data {
     color: rgba(255, 255, 255, 0.8);
     font-size: 24rpx;
     margin-left: 27rpx;
   }
+
   .order-details .header .data.on {
     margin-left: 0;
   }
+
   .order-details .header .data .state {
     font-size: 30rpx;
     font-weight: bold;
     color: #fff;
     margin-bottom: 7rpx;
   }
+
   .presell_header .presell_payment {
     color: #fff;
     font-size: 30rpx;
     font-weight: bold;
     margin-left: 26rpx;
+
     .iconfont {
       font-weight: normal;
       margin-right: 8rpx;
     }
   }
+
   .order-details .nav {
     background-color: #fff;
     font-size: 26rpx;
     color: #282828;
     padding: 25rpx 0;
   }
+
   .order-details .nav .navCon {
     padding: 0 40rpx;
   }
+
   .order-details .nav .on {
     color: var(--view-theme);
   }
+
   .order-details .nav .progress {
     padding: 0 65rpx;
     margin-top: 10rpx;
   }
+
   .order-details .nav .progress .line {
     width: 100rpx;
     height: 2rpx;
     background-color: #939390;
   }
+
   .order-details .nav .progress .iconfont {
     font-size: 25rpx;
     color: #939390;
     margin-top: -2rpx;
+
     &.t-color {
       color: var(--view-theme);
     }
   }
+
   .order-details .address {
     font-size: 26rpx;
     color: #868686;
@@ -671,63 +713,77 @@
     margin-top: 13rpx;
     padding: 35rpx 30rpx;
   }
+
   .order-details .address .name {
     font-size: 30rpx;
     color: #282828;
     margin-bottom: 15rpx;
   }
+
   .order-details .address .name .phone {
     margin-left: 40rpx;
   }
+
   .order-details .line {
     width: 100%;
     height: 3rpx;
   }
+
   .order-details .line image {
     width: 100%;
     height: 100%;
     display: block;
   }
+
   .order-details .wrapper {
     background-color: #fff;
     margin-top: 12rpx;
     padding: 30rpx;
   }
+
   .order-details .wrapper .item {
     font-size: 28rpx;
     color: #282828;
 
   }
+
   .order-details .wrapper .item~.item {
     margin-top: 20rpx;
   }
+
   .order-details .wrapper .item .conter {
     color: #868686;
     width: 460rpx;
     text-align: right;
   }
+
   .order-details .wrapper .item .conters {
     color: #868686;
     width: 100%;
     text-align: right;
+
     image {
       margin-left: 5px;
       width: 15px;
       height: 15px;
     }
   }
+
   .order-details .wrapper .item .virtual_image {
     margin-left: 50rpx;
   }
+
   .order-details .wrapper .item .virtual_image .picture {
     width: 106rpx;
     height: 106rpx;
     border-radius: 8rpx;
     margin-right: 10rpx;
+
     &:last-child {
       margin-right: 0;
     }
   }
+
   .order-details .wrapper .item .conter .copy {
     font-size: 20rpx;
     color: #333;
@@ -736,15 +792,18 @@
     padding: 3rpx 15rpx;
     margin-left: 24rpx;
   }
+
   .order-details .wrapper .actualPay {
     border-top: 1px solid #eee;
     margin-top: 30rpx;
     padding-top: 30rpx;
   }
+
   .order-details .wrapper .actualPay .money {
     font-weight: bold;
     font-size: 30rpx;
   }
+
   .order-details .footer {
     width: 100%;
     position: fixed;
@@ -757,11 +816,13 @@
     height: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
     box-sizing: border-box;
   }
+
   .content-clip {
     height: 120rpx;
     height: calc(120rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
     height: calc(120rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
   }
+
   .order-details .footer .bnt {
     width: 176rpx;
     height: 60rpx;
@@ -771,21 +832,26 @@
     color: #fff;
     font-size: 27rpx;
   }
+
   .bgColor {
     background-color: var(--view-theme);
   }
+
   .order-details .footer .bnt.cancel {
     color: #aaa;
     border: 1px solid #ddd;
   }
+
   .order-details .footer .bnt~.bnt {
     margin-left: 18rpx;
   }
+
   .order-details .writeOff {
     background-color: #fff;
     margin-top: 13rpx;
     padding-bottom: 30rpx;
   }
+
   .order-details .writeOff .title {
     font-size: 30rpx;
     color: #282828;
@@ -794,6 +860,7 @@
     padding: 0 30rpx;
     line-height: 87rpx;
   }
+
   .order-details .writeOff .grayBg {
     background-color: #f2f5f7;
     width: 590rpx;
@@ -802,26 +869,31 @@
     margin: 50rpx auto 0 auto;
     padding-top: 55rpx;
   }
+
   .order-details .writeOff .grayBg .pictrue {
     width: 290rpx;
     height: 290rpx;
     margin: 0 auto;
   }
+
   .order-details .writeOff .grayBg .pictrue image {
     width: 100%;
     height: 100%;
     display: block;
   }
+
   .order-details .writeOff .gear {
     width: 590rpx;
     height: 30rpx;
     margin: 0 auto;
   }
+
   .order-details .writeOff .gear image {
     width: 100%;
     height: 100%;
     display: block;
   }
+
   .order-details .writeOff .num {
     background-color: #f0c34c;
     width: 590rpx;
@@ -833,32 +905,39 @@
     text-align: center;
     padding-top: 4rpx;
   }
+
   .order-details .writeOff .rules {
     margin: 46rpx 30rpx 0 30rpx;
     border-top: 1px solid #f0f0f0;
     padding-top: 10rpx;
   }
+
   .order-details .writeOff .rules .item {
     margin-top: 20rpx;
   }
+
   .order-details .writeOff .rules .item .rulesTitle {
     font-size: 28rpx;
     color: #282828;
   }
+
   .order-details .writeOff .rules .item .rulesTitle .iconfont {
     font-size: 30rpx;
     color: #333;
     margin-right: 8rpx;
     margin-top: 5rpx;
   }
+
   .order-details .writeOff .rules .item .info {
     font-size: 28rpx;
     color: #999;
     margin-top: 7rpx;
   }
+
   .order-details .writeOff .rules .item .info .time {
     margin-left: 20rpx;
   }
+
   .order-details .map {
     height: 86rpx;
     font-size: 30rpx;
@@ -869,6 +948,7 @@
     background-color: #fff;
     padding: 0 30rpx;
   }
+
   .order-details .map .place {
     font-size: 26rpx;
     width: 176rpx;
@@ -877,20 +957,24 @@
     line-height: 50rpx;
     text-align: center;
   }
+
   .order-details .map .place .iconfont {
     font-size: 27rpx;
     height: 27rpx;
     line-height: 27rpx;
     margin: 2rpx 3rpx 0 0;
   }
+
   .order-details .address .name .iconfont {
     font-size: 34rpx;
     margin-left: 10rpx;
   }
+
   .refund {
     padding: 0 30rpx 30rpx;
     margin-top: 24rpx;
     background-color: #fff;
+
     .title {
       display: flex;
       align-items: center;
@@ -898,20 +982,24 @@
       color: #333;
       height: 86rpx;
       border-bottom: 1px solid #f5f5f5;
+
       image {
         width: 32rpx;
         height: 32rpx;
         margin-right: 10rpx;
       }
     }
+
     .con {
       padding-top: 25rpx;
       font-size: 28rpx;
       color: #868686;
     }
   }
+
   .order-wrapper {
     margin-top: 15rpx;
+
     .title {
       display: flex;
       align-items: center;
@@ -919,6 +1007,7 @@
       padding: 0 30rpx;
       border-bottom: 1px solid #f0f0f0;
       background-color: #fff;
+
       .iconfont {
         font-size: 24rpx;
         color: #666;
@@ -926,32 +1015,38 @@
         margin-left: 5rpx;
       }
     }
+
     .goods-box {
       .item {
         display: flex;
         padding: 25rpx 30rpx 25rpx 30rpx;
         background-color: #fff;
         position: relative;
+
         image {
           width: 130rpx;
           height: 130rpx;
           border-radius: 16rpx;
         }
+
         .info-box {
           display: flex;
           flex-direction: column;
           justify-content: space-between;
           margin-left: 25rpx;
           width: 450rpx;
+
           .msg {
             color: #868686;
             font-size: 20rpx;
           }
+
           .price {
             font-size: 26rpx;
             color: var(--view-priceColor);
           }
         }
+
         .num {
           flex: 1;
           text-align: right;
@@ -959,6 +1054,7 @@
           color: #868686;
         }
       }
+
       .event_name {
         display: inline-block;
         margin-right: 9rpx;
@@ -969,14 +1065,17 @@
         text-align: center;
         border-radius: 6rpx;
       }
+
       .event_ship {
         font-size: 20rpx;
         margin-top: 10rpx;
       }
     }
+
     .event_progress {
       margin-top: 20rpx;
       background: #fff;
+
       .progress_name {
         padding-left: 30rpx;
         height: 60rpx;
@@ -985,6 +1084,7 @@
         font-weight: bold;
         position: relative;
         color: var(--view-theme);
+
         &::before {
           content: "";
           display: inline-block;
@@ -996,18 +1096,22 @@
           left: 0;
         }
       }
+
       .align_right {
         float: right;
         font-weight: bold;
       }
+
       .gColor {
         color: var(--view-theme);
       }
+
       .progress_price {
         padding: 20rpx 30rpx;
         color: #999999;
         font-size: 22rpx;
       }
+
       .progress_pay {
         padding: 25rpx 30rpx;
         background: var(--view-minorColor);
@@ -1016,6 +1120,7 @@
       }
     }
   }
+
   .bnt {
     width: 96px;
     height: 35px;
@@ -1035,6 +1140,7 @@
     width: 100vw;
     height: 100vh;
     position: relative;
+
     .warp {
       position: absolute;
       top: 30vh;
@@ -1056,6 +1162,7 @@
       width: 320px;
       padding-bottom: 20px;
       border-radius: 10px;
+
       span {
         display: block;
         width: 290px;
@@ -1085,5 +1192,4 @@
       }
     }
   }
-
 </style>

pages/product/list/index.vue

@@ -207,7 +207,7 @@
         data: {
           product_id: '',
           unique: "",
-          number: ''
+          number: 1
         },
         on_line: ''
       }
@@ -256,7 +256,14 @@
       },
       //导入
       creat() {
+    
         if (this.on_line == 1) {
+          if(this.data.number <1){
+              this.show=false
+            this.$util.Tips({
+                title: '入库数量不得小于一件'
+              })
+          }else{
             postImport(this.mer_id, this.data).then(res => {
               console.log(res);
               this.show = false
@@ -270,6 +277,7 @@
               })
             })
           }
+        }
         if (this.on_line == 0) {
           console.log('12');
           navigateTo(1, '/pages/users/online_warehousing/index', {
@@ -722,6 +730,7 @@
     width: 100%;
     margin: auto;
     padding: 10px;
+    z-index: 0;
 
     h4 {
       font-weight: 400;

pages/users/online_warehousing/index.vue

@@ -3,7 +3,7 @@
     <view class="top">
       <!-- 	 -->
     </view>
-    <view class="bgc_img" v-if="!this.shopList">
+    <view class="bgc_img" v-if="this.shopList == ![]">
       <image src="@/static/images/empty-box.png" mode="widthFix"></image>
      <view class="txt">
         暂无商品订单~

pages/users/order_list/index.vue

@@ -67,7 +67,7 @@
                     {{item.group_order_sn}}
                   </view>
                   <view class='t-color'>
-										{{ item.orderList[0].activity_type === 2 && item.orderList[0].orderProduct[0].cart_info.productPresell.presell_type ==2 ? "待付定金" : "待付款" }}
+                    {{item.pay_type == 3 ? "待付款" : "待结算" }}
                   </view>
                 </view>
                 <view v-for="(order,j) in item.orderList" :key="order.order_id+j">
@@ -86,8 +86,7 @@
                               class="event_name event_bg">预售</text><text>{{goods.cart_info.product.store_name}}</text>
                             <view class="event_ship event_color">发货时间：
                               <!--全款预售-->
-															<text
+                              <text v-if="goods.cart_info.productPresell.presell_type === 1">
-																v-if="goods.cart_info.productPresell.presell_type === 1">
                                 {{ goods.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内
                               </text>
                               <!--定金预售-->
@@ -101,11 +100,9 @@
                             <view>x{{goods.product_num}}</view>
                           </view>
                         </view>
-												<view v-if="goods.cart_info.productPresell.presell_type === 2"
+                        <view v-if="goods.cart_info.productPresell.presell_type === 2" class="event_price">
-													class="event_price">
                           定金待支付 <text class="t-color">￥{{ order.pay_price }}</text>
-													尾款待支付 <text
+                          尾款待支付 <text class="t-color">￥{{ order.presellOrder.pay_price }}</text>
-														class="t-color">￥{{ order.presellOrder.pay_price }}</text>
                         </view>
                       </view>
                     </block>
@@ -144,13 +141,17 @@
                 <view class='totalPrice' v-else>共{{item.orderNum || 0}}件商品，总金额
                   <text class='money p-color'>￥{{item.pay_price}}</text>
                 </view>
-                <view class="totalPrice" v-if="product_type == 98">
+                <view class="totalPrice" v-if="item.pay_type == 8">
                   共{{item.total_num || 0}}件商品，结算周期到期后付款￥{{item.interest.total_amount}}
                 </view>
-								<view class='bottom acea-row row-right row-middle'>
+                <view class='bottom acea-row row-right row-middle' v-if=" item.pay_type == 3 ">
                   <view class='bnt b-color' @click.stop='goPay(item.pay_price,item.group_order_id)'>
                     立即付款</view>
                 </view>
+                <view class='bottom acea-row row-right row-middle' v-else>
+                  <view class='bnt b-color' @click.stop='goPay(item.pay_price,item.group_order_id)'>
+                    去结算</view>
+                </view>
               </view>
             </view>
           </block>
@@ -165,18 +166,19 @@
                     <text class="iconfont icon-xiangyou"></text>
                   </view>
                   <view v-if="item.status == 0" class='t-color'>
-										<text
+                    <text v-if="item.order_type==1">{{item.takeOrderCount > 0 ? '部分核销' : '待核销'}}</text>
-											v-if="item.order_type==1">{{item.takeOrderCount > 0 ? '部分核销' : '待核销'}}</text>
                     <text v-else>待发货</text>
                   </view>
                   <view v-if="item.status == 1" class='t-color'>待收货</view>
-									<view v-if="item.status == 2" class='t-color'>待评价</view>
+                  <view v-if="item.status == 2 && item.pay_type !== 8" class='t-color'>待评价</view>
                   <view v-if="item.status == 3" class='t-color'>已完成</view>
                   <view v-if="item.status == -1" class='t-color'>已退款</view>
+                  <view v-if="item.status == 2 && item.pay_type == 8" class='t-color'>待结算</view>
+
                 </view>
                 <view v-if="item.activity_type === 2">
-									<view class='item-info acea-row row-between row-top'
+                  <view class='item-info acea-row row-between row-top' v-for="(goods,index) in item.orderProduct"
-										v-for="(goods,index) in item.orderProduct" :key="index">
+                    :key="index">
                     <view class='pictrue'>
                       <image
                         :src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
@@ -185,8 +187,7 @@
                     <view class='text acea-row row-between'>
                       <view class='name '>
                         <view class='name' :class="item.status === 0 ? 'line1' : 'line2'">
-													<text
+                          <text class="event_name event_bg">预售</text><text>{{goods.cart_info.product.store_name}}</text>
-														class="event_name event_bg">预售</text><text>{{goods.cart_info.product.store_name}}</text>
                           <view v-if="item.status == 0" class="event_ship event_color">发货时间：
                             <!--全款预售-->
                             <text
@@ -208,8 +209,8 @@
                   </view>
                 </view>
                 <view v-else>
-									<view class='item-info acea-row row-between row-top'
+                  <view class='item-info acea-row row-between row-top' v-for="(goods,index) in item.orderProduct"
-										v-for="(goods,index) in item.orderProduct" :key="index">
+                    :key="index">
                     <view class='pictrue'>
                       <image
                         :src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
@@ -252,23 +253,25 @@
                   <view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view>
                 </block>
                 <block v-if="item.status == 1">
-									<view class='bnt cancelBnt'
+                  <view class='bnt cancelBnt' v-if="item.delivery_type == 1 || item.delivery_type == 2"
-										v-if="item.delivery_type == 1 || item.delivery_type == 2"
                     @click='goOrderDetails(item.order_id)'>查看物流</view>
                   <view class='bnt b-color' @tap='confirmOrder(item,index)'>确认收货</view>
                 </block>
-								<block v-if="item.status == 2">
+                <block v-if="item.status == 2 && item.pay_type !== 8 ">
-									
                   <view class='bnt b-color' @click='goOrderDetails_Evaluation(item.order_id)'>去评价
                   </view>
                 </block>
+                <block v-if="item.status == 2 && item.pay_type == 8">
+                  <view class='bnt b-color' @click='pay_open(item.order_id)'>去结算
+                  </view>
+                </block>
                 <block v-if="item.status == 3">
                   <view class='bnt b-color' @click='goOrderDetails(item.order_id)'
                     v-if="item.activity_type == 2 || item.activity_type == 3 || item.activity_type == 10">
                     查看详情</view>
                   <navigator v-if="community_status == 1 && !item.community_id"
-										:url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id"
+                    :url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id" class='bnt colorBnt'
-										class='bnt colorBnt' hover-class="none">
+                    hover-class="none">
                     <text class="iconfont icon-fabu"></text>
                     发布种草
                   </navigator>
@@ -442,6 +445,12 @@
     onReady() {},
     mounted: function() {},
     methods: {
+      //去结算
+      pay_open: function(order_id) {
+      uni.navigateTo({
+        url: '/pages/order_details/stay?order_id=' + order_id + '&product_type=' + this.product_type
+      })
+      },
       // 去商铺
       goMall(item) {
         if (this.hide_mer_status == 0) {
@@ -1175,5 +1184,4 @@
       color: #999999;
     }
   }
-  
 </style>

pages/users/payment/payment.vue

@@ -176,12 +176,14 @@
         groupOrderDetail(this.order_id, this.product_type).then(res => {
           this.couponData = res.data
           this.$nextTick(()=>{
+            if(this.couponData.interest !== null){
               this.moerTime(this.couponData.interest.start_time)
+            }
           })
         })
       },
       SubOrder() {
-        if (this.product_type == 98) {
+        if (this.couponData.pay_type == 8) {
           postsettle(
             this.mer_id, {
               id:this.order_id,