订单列表,订单详情修改

pages/product/list/index.vue

@@ -207,7 +207,7 @@
         data: {
           product_id: '',
           unique: "",
-          number: ''
+          number: 1
         },
         on_line: ''
       }
@@ -256,19 +256,27 @@
       },
       //导入
       creat() {
+    
         if (this.on_line == 1) {
-          postImport(this.mer_id, this.data).then(res => {
-            console.log(res);
-            this.show = false
+          if(this.data.number <1){
+              this.show=false
             this.$util.Tips({
-              title: res.message
+                title: '入库数量不得小于一件'
+              })
+          }else{
+            postImport(this.mer_id, this.data).then(res => {
+              console.log(res);
+              this.show = false
+              this.$util.Tips({
+                title: res.message
+              })
+            }).catch(err=>{
+              this.show=false
+              this.$util.Tips({
+                title: err.message
+              })
             })
-          }).catch(err=>{
-            this.show=false
-            this.$util.Tips({
-              title: err.message
-            })
-          })
+          }
         }
         if (this.on_line == 0) {
           console.log('12');
@@ -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/payment/payment.vue

@@ -65,7 +65,7 @@
           <text class='pColor' v-if="cartArr[4].payStatus == 1">￥0.00</text>
           <text class='pColor' v-else>￥{{couponData.orderList[0].pay_price}}</text>
         </view>
-        <view style="font-size: 14px;color: #F84221;" v-if="this.be_overdue == 0 || this.be_overdue < 0">
+        <view style="font-size: 14px;color: #F84221;" v-if="this.be_overdue == 0 || this.be_overdue < 0 ">
           可结算周期到期后再付款￥{{totalPrice}}
         </view>
       </view>
@@ -176,12 +176,14 @@
         groupOrderDetail(this.order_id, this.product_type).then(res => {
           this.couponData = res.data
           this.$nextTick(()=>{
-            this.moerTime(this.couponData.interest.start_time)
+            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,