先货后款,入库,下单.收货,同意

pages/order_details/index.vue

@@ -220,6 +220,8 @@
 						<view class='conter' v-if="orderInfo.pay_type==4 || orderInfo.pay_type==5">支付宝支付</view>
 						<view class='conter'
 							v-if="orderInfo.pay_type==1 || orderInfo.pay_type==2 || orderInfo.pay_type==3">微信支付</view>
+              <view class='conter'
+							v-if="orderInfo.pay_type==8 ">先货后款</view>
 					</view>
 					<view class='item acea-row row-between' v-if="orderInfo.mark">
 						<view>买家留言：</view>

pages/order_details/stay.vue

@@ -131,9 +131,14 @@
 					<view>商品总额：</view>
 					<view class='conter'>￥{{orderInfo.total_price}}</view>
 				</view>
-				<view class='item acea-row row-between' v-if="credit_buy == 1">
+				<view class='item acea-row row-between' v-if="orderInfo.orderList[0].merchant.settle_cycle">
 					<view>支付方式：</view>
-					<view class='conter'>先货后款</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'
+						v-if="orderInfo.pay_type==1 || orderInfo.pay_type==2 || orderInfo.pay_type==3">微信支付</view>
+					  <view class='conter'
+						v-if="orderInfo.pay_type==8 ">先货后款</view>
 				</view>
 			
 			</view>
@@ -161,14 +166,14 @@
 				</view>
 				<view class='item acea-row row-between'>
 					<view>实付款：</view>
-					<view class='conter' style="color: black;"  v-if="credit_buy == 1">先货后款 :  ￥{{orderInfo.pay_price}}</view>
+					<view class='conter' style="color: black;"  v-if="orderInfo.orderList[0].merchant.settle_cycle">先货后款 :  ￥{{orderInfo.pay_price}}</view>
-					<view class='conter' style="color: black;">￥{{orderInfo.pay_price}}</view>
+					<view class='conter' style="color: black;" v-else>￥{{orderInfo.pay_price}}</view>
-					<view class="conters" style="color: black;"  v-if="credit_buy == 1">
+					<view class="conters" style="color: black;"  v-if="orderInfo.orderList[0].merchant.settle_cycle">
-						结算周期到期后付款 ￥{{orderInfo.pay_price}}
+						结算周期到期后付款 ￥{{orderInfo.interest.total_amount}}
 						<image src="@/static/images/wenhao.png" mode="" @click="Settlement"></image>
 					</view>
-					<view class="conters"  v-if="credit_buy == 1">
+					<view class="conters"  v-if="orderInfo.orderList[0].merchant.settle_cycle">
-						结算周期:30天 日利率:0.05%
+						结算周期:{{orderInfo.orderList[0].merchant.settle_cycle}}天 日利率:{{orderInfo.orderList[0].merchant.interest_rate}}%
 					</view>
 				</view>
 				
@@ -283,7 +288,7 @@
 			}
 		},
 		computed: configMap({hide_mer_status:0,alipay_open:0,yue_pay_status:0},
-		mapGetters(['isLogin','uid','viewColor','keyColor'])),
+		mapGetters(['isLogin','uid','viewColor','keyColor',])),
 		onLoad: function(options) {
 			this.credit_buy=options.credit_buy
       if(options.product_type)this.product_type=options.product_type
@@ -446,6 +451,7 @@
 					let _type = 0;
 					uni.hideLoading();
 					that.$set(that, 'orderInfo', res.data);
+          console.log(that.orderInfo.orderList[0].merchant.settle_cycle);
 				}).catch(err => {
 					// console.log(err)
 					uni.hideLoading();

pages/product/list/index.vue

@@ -52,6 +52,11 @@
                     <image mode='widthFix' class="image" src="../static/images/product_specification.png"></image>
                     <text class="text">规格模板</text>
                   </navigator>
+                  <navigator class="item" :url="`/pages/users/online_warehousing/index?mer_id=${mer_id}&product_id=${data.product_id}&unique=${data.unique}`"
+                    hover-class='none'>
+                    <image mode='widthFix' class="image" src="@/static/images/daoru.png"></image>
+                    <text class="text">商品导入</text>
+                  </navigator>
                 </view>
               </swiper-item>
             </block>
@@ -230,7 +235,20 @@
         this.on_line = action
         console.log(this.on_line);
         this.checkboxList1 = rowId
-        this.show = true
+
+        if(!this.checkboxList1[0].sku && action == 0){
+          navigateTo(1, '/pages/users/online_warehousing/index', {
+            mer_id: this.mer_id,
+            product_id: this.data.product_id,
+            unique: this.data.unique,
+          
+          });
+        }else{
+          this.data.product_id = this.checkboxList1[0].product_id
+          this.data.unique = this.checkboxList1[0].unique
+          this.show = true
+          console.log(this.data);
+        }
 
       },
       close() {
@@ -245,6 +263,11 @@
             this.$util.Tips({
               title: res.message
             })
+          }).catch(err=>{
+            this.show=false
+            this.$util.Tips({
+              title: err.message
+            })
           })
         }
         if (this.on_line == 0) {

pages/users/order_list/index.vue

@@ -144,8 +144,8 @@
                 <view class='totalPrice' v-else>共{{item.orderNum || 0}}件商品，总金额
                 	<text class='money p-color'>￥{{item.pay_price}}</text>
                 </view>
-                <view class="totalPrice" >
+                <view class="totalPrice" v-if="product_type == 98">
-                	共{{item.total_num || 0}}件商品，结算周期到期后付款￥{{item.pay_price}}
+                	共{{item.total_num || 0}}件商品，结算周期到期后付款￥{{item.interest.total_amount}}
                 </view>
 								<view class='bottom acea-row row-right row-middle'>
 									<view class='bnt b-color' @click.stop='goPay(item.pay_price,item.group_order_id)'>
@@ -673,9 +673,9 @@
 						}).then(res => {
 							console.log(res);
 							that.isReady = true;
-							let list = res.data.list || [];
+							let list = res.data.return || [];
 							let loadend = list.length < that.limit;
-							// console.log(that.orderList)
+							console.log(that.orderList)
 							that.orderList = that.page == 1 ? list : that.$util.SplitArray(list, that
 								.orderList);
 							that.$set(that, 'orderList', that.orderList);