From fbbaf79080f12d9df58dfda42ba431cae1de6813 Mon Sep 17 00:00:00 2001
From: THK3121 <thk121969318@163.com>
Date: Fri, 14 Jul 2023 11:37:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=88=E8=B4=A7=E5=90=8E=E6=AC=BE,=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B,=E6=A0=B7=E5=BC=8F,=E4=BA=A4=E4=BA=92,=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/orderGoods/index.vue               |   2 +-
 manifest.json                                 |   4 +-
 pages.json                                    | 127 +++++------
 pages/admin/orderDetail/index.vue             |  27 +++
 pages/admin/orderList/index.vue               |  15 +-
 pages/gather/gather.vue                       |  15 ++
 pages/goods_details/index.vue                 |   3 +-
 pages/index/index.vue                         |  81 +++++++
 pages/nongKe/supply_chain/merchant.vue        | 210 ++++++++++++++++--
 .../nongKe/supply_chain/shopping_trolley.vue  |   5 +-
 pages/order_details/index.vue                 |  62 ++++--
 pages/order_details/stay.vue                  |  34 ++-
 pages/product/addGoods/modifyPrice.vue        |  14 --
 .../product/addGoods/singleSpecification.vue  |   8 -
 pages/product/list/index.vue                  |  53 +++--
 pages/users/login/login_copy.vue              |  52 +----
 pages/users/online_warehousing/index.vue      |  19 +-
 pages/users/order_confirm/index.vue           |   6 +-
 pages/users/order_list/index.vue              |  58 ++++-
 pages/users/payment/payment.vue               |  16 +-
 pages/users/trading_hall/index.vue            | 115 ++++++++++
 static/images/diaohuo.png                     | Bin 0 -> 2145 bytes
 static/images/fabu.png                        | Bin 0 -> 2939 bytes
 static/images/weituo.png                      | Bin 0 -> 3678 bytes
 24 files changed, 687 insertions(+), 239 deletions(-)
 create mode 100644 pages/users/trading_hall/index.vue
 create mode 100644 static/images/diaohuo.png
 create mode 100644 static/images/fabu.png
 create mode 100644 static/images/weituo.png

diff --git a/components/orderGoods/index.vue b/components/orderGoods/index.vue
index a9fc3b5..2537e0e 100644
--- a/components/orderGoods/index.vue
+++ b/components/orderGoods/index.vue
@@ -73,7 +73,7 @@
 					<view class="right-btn-box">
 						<view class="btn-item err" v-if="item.is_refund ==1">退款中 x {{item.product_num - item.refund_num}}</view>
 						<view class='btn-item err' v-if="item.is_refund >1">已退款 x {{item.product_num - item.refund_num}}</view>
-						<view class="btn-item" v-if="item.is_refund ==0 && evaluate!=9 && orderData.refund_status || item.refund_num > 0" @click.stop="refund(item)">申请退款</view>
+						<view class="btn-item" v-if="item.is_refund ==0 && evaluate!=9 && evaluate !==2 && orderData.refund_status" @click.stop="refund(item)">申请退款</view>
 						<view class='btn-item' v-if='item.is_reply==0 && evaluate==2 && item.refund_num > 0' @click.stop="evaluateTap(item.order_product_id,orderId)">去评价</view>
 						<view class='btn-item on' v-else-if="item.is_reply==1 && evaluate==2">已评价</view>
 					</view>
diff --git a/manifest.json b/manifest.json
index 4499fe8..df8306c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "惠农生活",
     "appid" : "__UNI__3A527D1",
     "description" : "",
-    "versionName" : "1.0.17",
-    "versionCode" : 140,
+    "versionName" : "1.0.18",
+    "versionCode" : 141,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages.json b/pages.json
index e218497..52240b6 100644
--- a/pages.json
+++ b/pages.json
@@ -227,18 +227,16 @@
             "enablePullDownRefresh": false
           }
 
+        }, {
+          "path": "teach_video/teach_video",
+          "style": {
+            "navigationBarTitleText": "教学视频",
+            "enablePullDownRefresh": false,
+            "navigationStyle": "custom"
+          }
+
         }
-          ,{
-                    "path" : "teach_video/teach_video",
-                    "style" :                                                                                    
-                {
-                    "navigationBarTitleText": "教学视频",
-                    "enablePullDownRefresh": false,
-                    "navigationStyle": "custom"
-                }
-                
-                }
-            ]
+      ]
     },
     {
       "root": "pages/users",
@@ -249,24 +247,24 @@
             "navigationBarTitleText": "忘记密码"
           }
         },
-		{
-			"path": "online_warehousing/index",
-			"style": {
-				"navigationBarTitleText": "采购订单"
-			}
-		},
+        {
+          "path": "online_warehousing/index",
+          "style": {
+            "navigationBarTitleText": "采购订单"
+          }
+        },
         {
           "path": "user_setting/index",
           "style": {
             "navigationBarTitleText": "设置"
           }
         },
-		{
-		  "path": "supply_procurement/index",
-		  "style": {
-		    "navigationBarTitleText": "供货采购"
-		  }
-		},
+        {
+          "path": "supply_procurement/index",
+          "style": {
+            "navigationBarTitleText": "供货采购"
+          }
+        },
         //协议，关于
         {
           "path": "user_about/index",
@@ -392,12 +390,12 @@
             "navigationBarTitleText": "提现"
           }
         },
-		{
-		"path": "gather_list/index"	,
-		"style": {
-			"navigationBarTitleText": "提现流水"
-		}
-		},
+        {
+          "path": "gather_list/index",
+          "style": {
+            "navigationBarTitleText": "提现流水"
+          }
+        },
         {
           "path": "user_address_list/index",
           "style": {
@@ -486,12 +484,12 @@
             "navigationBarTitleText": "我的订单"
           }
         },
-		{
-		  "path": "order_list/order",
-		  "style": {
-		    "navigationBarTitleText": "我的订单"
-		  }
-		},
+        {
+          "path": "order_list/order",
+          "style": {
+            "navigationBarTitleText": "我的订单"
+          }
+        },
         {
           "path": "order_list/search",
           "style": {
@@ -653,20 +651,20 @@
           "style": {
             "navigationBarTitleText": "订单详情"
           }
-        }, 
-		{
-		  "path": "user_invoice_Finance/index",
-		  "style": {
-		    "navigationBarTitleText": "财务公开"
-		  }
-		},
-		{
-		  "path": "user_invoice_order_list/index",
-		  "style": {
-		    "navigationBarTitleText": "财务详情"
-		  }
-		},
-		{
+        },
+        {
+          "path": "user_invoice_Finance/index",
+          "style": {
+            "navigationBarTitleText": "财务公开"
+          }
+        },
+        {
+          "path": "user_invoice_order_list/index",
+          "style": {
+            "navigationBarTitleText": "财务详情"
+          }
+        },
+        {
           "path": "privacy/index",
           "style": {
             "navigationBarTitleText": "",
@@ -679,17 +677,22 @@
             "enablePullDownRefresh": false
           }
 
+        }, {
+          "path": "payment/payment",
+          "style": {
+            "navigationBarTitleText": "",
+            "enablePullDownRefresh": false
+          }
+
+        }, {
+          "path": "trading_hall/index",
+          "style": {
+            "navigationBarTitleText": "",
+            "enablePullDownRefresh": false
+          }
+
         }
-          ,{
-                    "path" : "payment/payment",
-                    "style" :                                                                                    
-                {
-                    "navigationBarTitleText": "",
-                    "enablePullDownRefresh": false
-                }
-                
-                }
-            ]
+      ]
     },
     {
       "root": "pages/store",
@@ -698,7 +701,7 @@
           "path": "index",
           "style": {
             "navigationStyle": "custom",
-			"enablePullDownRefresh": true,
+            "enablePullDownRefresh": true,
             "navigationBarTitleText": "店铺diy首页"
               // #ifdef MP
               ,
@@ -711,7 +714,7 @@
             "navigationStyle": "custom",
             "navigationBarTitleText": "店铺首页"
               // #ifdef MP
-			  ,
+              ,
             "navigationBarTextStyle": "#FFFFFF"
             // #endif
           }
@@ -719,7 +722,7 @@
         {
           "path": "detail/index",
           "style": {
-			  "enablePullDownRefresh": true,
+            "enablePullDownRefresh": true,
             "navigationBarTitleText": "店铺详情"
           }
         },
diff --git a/pages/admin/orderDetail/index.vue b/pages/admin/orderDetail/index.vue
index 1a8f5e8..0dd003f 100644
--- a/pages/admin/orderDetail/index.vue
+++ b/pages/admin/orderDetail/index.vue
@@ -148,6 +148,12 @@
 		<view style="height:120upx;"></view>
 		<view class="footer acea-row row-right row-middle" v-if="goname != 'looks'">
 			<view class="more"></view>
+      <view class="bnt cancel" v-if="orderInfo.pay_type == 8 && orderInfo.status == 12"  @click="tongyi(item.group_order_id,1)">
+      	同意
+      </view>
+      <view class="bnt cancel" v-if="orderInfo.pay_type == 8 && orderInfo.status == 12"  @click="tongyi(item.group_order_id,2)">
+      	拒绝
+      </view>
 			<view class="bnt cancel" @click="modify('0')" v-if="orderInfo.paid == 0">
 				一键改价
 			</view>
@@ -249,6 +255,27 @@
 			
 		},
 		methods: {
+      //同意先货后款订单
+      tongyi(id,number){
+      	let data={
+      		id:id,
+      		type:number
+      	}
+        if(number == 1){
+          this.$nextTick(()=>{
+           this.where.status = 2;
+           delete this.where.is_verify;
+           this.init();
+          })
+        }else if(number == 2){
+         uni.navigateTo({
+           url:`/pages/admin/orderList/index?types=1&merId=${this.merId}`
+         })
+        }
+      	postconfirm(this.merId,data).then(res=>{
+      		console.log(res);
+      	})
+      },
 			more: function() {
 				this.order = !this.order;
 			},
diff --git a/pages/admin/orderList/index.vue b/pages/admin/orderList/index.vue
index 9d66a4c..73daefd 100644
--- a/pages/admin/orderList/index.vue
+++ b/pages/admin/orderList/index.vue
@@ -130,15 +130,22 @@
           </view>
 
         </view>
-        <view class="public-total">
+        <view class="public-total" v-if="item.pay_type !== 8">
           共{{ item.total_num }}件商品，
           <span v-if="where.status <= 1">应</span>
           <span v-else>已</span>
           支付
           <span class="money">￥{{ item.pay_price }}</span> (邮费 ¥{{ item.pay_postage}})
         </view>
-		<view class="public-total" v-if="item.pay_type == 8 && item.status == 12">
-		  共1件商品，结算周期到期后付款￥100
+        <view class="public-total" v-else >
+          先货后款
+          <span v-if="where.status <= 1">应</span>
+          <span v-else>已</span>
+          支付
+          <span class="money">￥{{ item.pay_price }}</span> (邮费 ¥{{ item.pay_postage}})
+        </view>
+		<view class="public-total" v-if="item.pay_type == 8 ">
+		  共1件商品，结算周期到期后付款￥{{ item.pay_price }}
 		</view>
         <view class="operation acea-row row-between-wrapper">
           <view class="more">
@@ -147,7 +154,7 @@
 			  <view class="bnt" v-if="item.pay_type == 8 && item.status == 12" @click="tongyi(item.group_order_id,1)">
 			  	同意
 			  </view>
-			  <view class="bnt" v-if="item.pay_type == 8 && item.status == 12" @click="tongyi(item.group_order_id,2)">
+			  <view class="bnt" v-if="item.pay_type == 8 && item.status == 12 " @click="tongyi(item.group_order_id,2)">
 			  	拒绝
 			  </view>
             <view class="bnt" @click="modify(item, 0)" v-if="where.status == 1 && item.activity_type != 2">
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index 20b86c3..3f4c272 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -117,6 +117,21 @@
 							</image>
 							<text class="text">商户设置</text>
 						</view>
+            <view class="examine" @click="navigator(`/pages/users/trading_hall/index?mer_id=${mer_id}`)">
+            	<image class="icon_img" src="@/static/images/diaohuo.png" mode="aspectFill">
+            	</image>
+            	<text class="text">交易大厅</text>
+            </view>
+            <view class="examine" @click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')">
+            	<image class="icon_img" src="@/static/images/weituo.png" mode="aspectFill">
+            	</image>
+            	<text class="text">委托销售</text>
+            </view>
+            <view class="examine" @click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')">
+            	<image class="icon_img" src="@/static/images/fabu.png" mode="aspectFill">
+            	</image>
+            	<text class="text">发布管理</text>
+            </view>
 						<!-- <view class="examine" @click="navigator(`/pages/users/user_invoice_Finance/index?mer_id=${mer_id}`)">
 							<image class="icon_img" src="@/static/images/cwgk.png" mode="aspectFill">
 							</image>
diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue
index c7c42d9..1ceb559 100644
--- a/pages/goods_details/index.vue
+++ b/pages/goods_details/index.vue
@@ -1349,9 +1349,10 @@
         postCartAdd(q)
           .then(function(res) {
             that.isOpen = that.attr.cartAttr = false;
+            console.log(that.storeInfo);  
             if (news) {
               uni.navigateTo({
-                url: `/pages/users/order_confirm/index?cartId=${res.data.cart_id}`
+                url: `/pages/users/order_confirm/index?cartId=${res.data.cart_id}&type_id=${that.storeInfo.merchant.type_id}`
               });
             } else {
               that.$util.Tips({
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7ad7f35..5743c09 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -108,6 +108,8 @@
       this.getGoods()
       this.selfLocation()
       this.Area()
+      this.setPermissions()
+      // this.openTongZhi()
 	  uni.$on('connectstatusChange',(connectstatus) =>{
 	  var connectstr = ''
 	  if (connectstatus == true) {
@@ -261,6 +263,85 @@
           }
         });
       },
+       
+      /**
+       * 设置手机通知权限
+       */
+     setPermissions() {
+      	// #ifdef APP-PLUS  
+      	if (plus.os.name == 'Android') { // 判断是Android
+      		var main = plus.android.runtimeMainActivity();
+      		var pkName = main.getPackageName();
+      		var uid = main.getApplicationInfo().plusGetAttribute("uid");
+      		var NotificationManagerCompat = plus.android.importClass("android.support.v4.app.NotificationManagerCompat");
+      		//android.support.v4升级为androidx
+      		if (NotificationManagerCompat == null) {
+      			NotificationManagerCompat = plus.android.importClass("androidx.core.app.NotificationManagerCompat");
+      		}
+      		var areNotificationsEnabled = NotificationManagerCompat.from(main).areNotificationsEnabled();
+      		// 未开通‘允许通知’权限，则弹窗提醒开通，并点击确认后，跳转到系统设置页面进行设置  
+      		if (!areNotificationsEnabled) {
+      			uni.showModal({
+      				title: '通知权限开启提醒',
+      				content: '您还没有开启通知权限，无法接受到消息通知，请前往设置！',
+      				showCancel: false,
+      				confirmText: '去设置',
+      				success: function(res) {
+      					if (res.confirm) {
+      						var Intent = plus.android.importClass('android.content.Intent');
+      						var Build = plus.android.importClass("android.os.Build");
+      						//android 8.0引导  
+      						if (Build.VERSION.SDK_INT >= 26) {
+      							var intent = new Intent('android.settings.APP_NOTIFICATION_SETTINGS');
+      							intent.putExtra('android.provider.extra.APP_PACKAGE', pkName);
+      						} else if (Build.VERSION.SDK_INT >= 21) { //android 5.0-7.0  
+      							var intent = new Intent('android.settings.APP_NOTIFICATION_SETTINGS');
+      							intent.putExtra("app_package", pkName);
+      							intent.putExtra("app_uid", uid);
+      						} else { //(<21)其他--跳转到该应用管理的详情页  
+      							intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+      							var uri = Uri.fromParts("package", mainActivity.getPackageName(), null);
+      							intent.setData(uri);
+      						}
+      						// 跳转到该应用的系统通知设置页  
+      						main.startActivity(intent);
+      					}
+      				}
+      			});
+      		}
+      	} else if (plus.os.name == 'iOS') { // 判断是ISO
+      		var isOn = undefined;
+      		var types = 0;
+      		var app = plus.ios.invoke('UIApplication', 'sharedApplication');
+      		var settings = plus.ios.invoke(app, 'currentUserNotificationSettings');
+      		if (settings) {
+      			types = settings.plusGetAttribute('types');
+      			plus.ios.deleteObject(settings);
+      		} else {
+      			types = plus.ios.invoke(app, 'enabledRemoteNotificationTypes');
+      		}
+      		plus.ios.deleteObject(app);
+      		isOn = (0 != types);
+      		if (isOn == false) {
+      			uni.showModal({
+      				title: '通知权限开启提醒',
+      				content: '您还没有开启通知权限，无法接受到消息通知，请前往设置！',
+      				showCancel: false,
+      				confirmText: '去设置',
+      				success: function(res) {
+      					if (res.confirm) {
+      						var app = plus.ios.invoke('UIApplication', 'sharedApplication');
+      						var setting = plus.ios.invoke('NSURL', 'URLWithString:', 'app-settings:');
+      						plus.ios.invoke(app, 'openURL:', setting);
+      						plus.ios.deleteObject(setting);
+      						plus.ios.deleteObject(app);
+      					}
+      				}
+      			});
+      		}
+      	}
+      	// #endif  
+      }
     }
   }
 </script>
diff --git a/pages/nongKe/supply_chain/merchant.vue b/pages/nongKe/supply_chain/merchant.vue
index 5027e61..ea3b095 100644
--- a/pages/nongKe/supply_chain/merchant.vue
+++ b/pages/nongKe/supply_chain/merchant.vue
@@ -41,6 +41,35 @@
     <navigator class="bottom_purchase" url="./shopping_trolley" open-type="navigate">采购清单</navigator>
 
     <goodsPopup :goodsStatu="isPopupShow" @colses="isPopupShow=false" :goods_info="goodsInfo"></goodsPopup>
+    <u-popup :show="show" @close="close">
+      <view>
+        <h3 style=" margin: 15px 5px 5px 24px;">颜色规格</h3>
+        <scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll-Y">
+          <view class="scroll-view-item" v-for="(item,index) in attrValue" :key="index">
+            <view class="scroll_item_top">
+              <image :src="Image" mode=""></image>
+              <view class="text">
+                <view>{{item.sku}}</view>
+                <view>库存: <text>{{item.stock}}</text> </view>
+              </view>
+            </view>
+            <view class="scroll_item_bon">
+              <view class="reduce" @click.stop='subCart(item,index)'>-</view>
+              <input type="text" v-model="goods[index].cart_num" />
+              <view class="plus" :class="goods.numAdd ? 'on' : ''" @click.stop='addCart(item,index)'>+</view>
+              <!-- <u-number-box 
+                    button-size="36"
+                    color="#ffffff"
+                    bgColor="#2979ff"
+                    iconStyle="color: #fff"
+                    v-model="number.cart_num"
+                ></u-number-box> -->
+            </view>
+          </view>
+        </scroll-view>
+        <button class="btn"  @click="addshopcart">确定</button>
+      </view>
+    </u-popup>
   </view>
 </template>
 
@@ -52,6 +81,9 @@
   } from '@/api/store.js'
   import { Toast } from '@/libs/uniApi'
   import goodsPopup from '../cpns/goodsPopup.vue'
+  import {
+    changeCartNum
+  } from '@/api/order.js';
   export default {
     components: {
       goodsPopup
@@ -88,7 +120,16 @@
         },
         id: '',
         order: true,
-        num: ''
+        num: '',
+        show: false,
+        scrollTop: 0,
+        attrValue: [],
+        Image: '',
+        goods: [{
+          cart_num: 0
+        }],
+        goodsLite: {},
+        goodsindexL: ''
       }
     },
     onLoad(e) {
@@ -176,23 +217,27 @@
        * 获取产品详情
        */
       getGoodsDetails(item) {
-        // console.log('e,item',e,item);
-        // let that = this;
-        // const count = e.value
-        // getProductDetail(item.product_id).then(res => {
-        // 	const unique = Object.values(res.data.sku)[0].unique
-        // 	console.log(res.data.product_id, count, unique,'123123');
-        // 	that.goCat(res.data.product_id, count, unique)
-        // })
-        let that = this;
-        const count = '1'
-        // console.log(111);
-        getProductDetail(item.product_id, { product_type: 98 }).then(res => {
-          const unique = Object.values(res.data.sku)[0].unique
-          that.goCat(res.data.product_id, count, unique)
-        }).catch(err => {
-          Toast(err)
-        })
+        console.log(item);
+        if (item.product.attrValue.length == 1) {
+          let that = this;
+          const count = '1'
+          getProductDetail(item.product_id, { product_type: 98 }).then(res => {
+            const unique = Object.values(res.data.sku)[0].unique
+            that.goCat(res.data.product_id, count, unique)
+          }).catch(err => {
+            Toast(err)
+          })
+        } else {
+          this.show = true
+          this.attrValue = item.product.attrValue
+          this.Image = item.image
+          for (let i = 1; i < item.product.attrValue.length; i++) {
+            this.goods.push({
+              cart_num: 0
+            })
+          }
+        }
+
       },
       /*
        * 加入购物车
@@ -220,7 +265,52 @@
             });
           });
       },
-
+      close() {
+        this.show = false
+      },
+      //购物车增加
+      addCart(item, index) {
+        this.goods[index].cart_num = this.goods[index].cart_num + 1
+        this.goods.numAdd = true
+        this.goodsLite = item
+        this.goodsindexL = index
+      },
+      subCart(item, index){
+        if( this.goods[index].cart_num == 0){
+          return
+        }else{
+          this.goods[index].cart_num = this.goods[index].cart_num - 1
+          this.goods.numAdd = true
+          this.goodsLite = item
+          this.goodsindexL = index
+        }
+      },
+      addshopcart() {
+        console.log(this.goodsLite);
+        console.log(this.goodsindexL);
+        let that = this
+        let q = {
+          is_new: 0,
+          product_id: that.goodsLite.product_id,
+          cart_num: that.goods[that.goodsindexL].cart_num,
+          product_attr_unique:  that.goodsLite.unique,
+          // source: this.source,
+          product_type: 98,
+          spread_id: ''
+        };
+        postCartAdd(q).then(res => {
+            this.show = false
+            that.$util.Tips({
+              title: "添加购物车成功",
+            });
+          })
+          .catch(res => {
+            this.show = false
+            return that.$util.Tips({
+              title: res
+            });
+          });
+      }
     },
     onReachBottom() {
       //如果状态为nomore 则不能在触发上拉事件
@@ -395,4 +485,86 @@
     background-color: $uni-theme-color;
     color: #fff;
   }
+
+  .scroll-Y {
+    height: 50vh; 
+    width: 90%;
+    margin: auto;
+
+  }
+
+  .scroll-view-item {
+    font-size: 36rpx;
+    border-bottom: 1px solid #ccc;
+
+    .scroll_item_top {
+      height: 60px;
+      display: flex;
+      justify-content: flex-start;
+      align-items: center;
+
+      image {
+        width: 50px;
+        height: 50px;
+        margin: 5px;
+      }
+
+      .text {
+        width: 300px;
+        height: 60px;
+        float: left;
+
+        view {
+          height: 30px;
+
+          text {
+            color: #F84221;
+          }
+        }
+      }
+    }
+
+    .scroll_item_bon {
+      width: 100%;
+      height: 40px;
+      display: flex;
+      justify-content: flex-end;
+      align-items: center;
+
+      .reduce {
+        width: 30px;
+        height: 30px;
+        text-align: center;
+        color: #BDC4CE;
+        background: #EEEEEE;
+      }
+
+      input {
+        width: 50px;
+        height: 30px;
+        text-align: center;
+      }
+
+      .plus {
+        width: 30px;
+        text-align: center;
+        height: 30px;
+        color: #FFFFFF;
+        background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
+      }
+      .on {
+        background-color: #e3e3e3;
+        color: #dedede;
+      }
+      
+    }
+  }
+  .btn{
+        width: 100%;
+        height: 50px;
+        background: linear-gradient(84deg, #F98649 0%, #F34E45 100%);
+        border-radius: 24px 24px 24px 24px;
+        line-height: 50px;
+        color: white;
+      }
 </style>
\ No newline at end of file
diff --git a/pages/nongKe/supply_chain/shopping_trolley.vue b/pages/nongKe/supply_chain/shopping_trolley.vue
index d6fc4a6..6223186 100644
--- a/pages/nongKe/supply_chain/shopping_trolley.vue
+++ b/pages/nongKe/supply_chain/shopping_trolley.vue
@@ -242,6 +242,7 @@
         currSku: '',
         newData: {},
         activeRouter: '',
+        type_id:''
       };
     },
     computed: configMap({ hide_mer_status: 1, recommend_switch: 0, navigation: {} }, mapGetters(['isLogin',
@@ -568,7 +569,7 @@
         })
         if (selectValue.length > 0) {
           uni.navigateTo({
-            url: `/pages/users/order_confirm/index?product_type=98&cartId=${selectValue.join(',')}`
+            url: `/pages/users/order_confirm/index?product_type=98&cartId=${selectValue.join(',')}&type_id=${this.type_id}`
           });
         } else {
           return this.$util.Tips({
@@ -578,6 +579,7 @@
       },
       // 购物车增加
       addCart: function(goods, index) {
+        console.log(goods.cart_id);
         let that = this;
         changeCartNum(goods.cart_id, {
           cart_num: goods.cart_num + 1
@@ -671,6 +673,7 @@
         let that = this;
         getCartList({ product_type: 98 }).then(res => {
           // console.log("购物车", res)
+          this.type_id=res.data.list[0].type_id
           res.data.list.forEach((item, index) => {
             item.allCheck = true
             item.list.forEach((goods, j) => {
diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue
index e21e7d2..6b67399 100644
--- a/pages/order_details/index.vue
+++ b/pages/order_details/index.vue
@@ -302,8 +302,8 @@
 					<view class='bnt b-color' @tap='confirmOrder'>确认收货</view>
 				</block>
 				<block v-if="orderInfo.status == 2">
-					<view class="bnt cancel" @click="allRefund"
-						v-if="refundNum.length != cartInfo.length && orderInfo.refund_status">批量退款</view>
+					<!-- <view class="bnt cancel" @click="allRefund"
+						v-if="refundNum.length != cartInfo.length && orderInfo.refund_status">批量退款</view> -->
 					<navigator v-if="orderInfo.delivery_type == 1 || orderInfo.delivery_type == 4" class='bnt cancel'
 						hover-class='none' :url="'/pages/users/goods_logistics/index?orderId='+ orderInfo.order_id">查看物流
 					</navigator>
@@ -351,6 +351,18 @@
 				<button class="shouhuobtn" @click="close">知道了</button>
 			</view>
 		</u-popup>
+    <u-popup :show="receivingshow" bgColor='transparent' mode='center'>
+      <view class="warp">
+        <image @click="close" class="guanbi" src="@/static/images/guanbi.png"></image>
+        <image src="@/static/images/shouhuo.png" mode="widthFix"></image>
+      </view>
+      <view class="textp">
+        <h3>确认收到货了吗?</h3>
+        <span>此订单为先货后款订单，确认收货后将开始计算结算周期。为保障售后权益，请检查后再确认收货。</span>
+        <button class="shouhuobtn" @click="queding()">确认收货</button>
+        <view class="cle" @click="close">取消</view>
+      </view>
+    </u-popup>
 	</view>
 </template>
 <script>
@@ -474,6 +486,7 @@
 					add: false,
 				},
 				show: false,
+        receivingshow:false
 			};
 		},
 		computed: {
@@ -887,29 +900,28 @@
 					});
 				});
 			},
+        //收货弹窗
 			confirmOrder: function() {
-				let that = this;
-				uni.showModal({
-					title: '确认收货',
-					content: '为保障权益，请收到货确认无误后，再确认收货',
-					success: function(res) {
-						if (res.confirm) {
-							orderTake(that.order_id).then(res => {
-								return that.$util.Tips({
-									title: '操作成功',
-									icon: 'success'
-								}, function() {
-									that.getOrderInfo();
-								});
-							}).catch(err => {
-								return that.$util.Tips({
-									title: err
-								});
-							})
-						}
-					}
-				})
+        this.receivingshow=true
+		
 			},
+      queding(){
+        	let that = this;
+        				orderTake(that.order_id).then(res => {
+                  this.receivingshow=false
+        					return that.$util.Tips({
+        						title: '成功收货',
+        						icon: 'success'
+        					}, function() {
+        						that.getOrderInfo();
+        					});
+        				}).catch(err => {
+                  this.receivingshow=false
+        					return that.$util.Tips({
+        						title: err
+        					});
+        				})
+      },
 			/**
 			 *
 			 * 删除订单
@@ -984,6 +996,7 @@
 			},
 			close(){
 				this.show=false
+        this.receivingshow=false
 			},
 			open(){
 				this.show=true
@@ -1594,6 +1607,9 @@
 			padding-top: 20px;
 			margin: auto;
 		}
+    h3 {
+      text-align: center;
+    }
 	
 		.shouhuobtn {
 			margin: auto;
diff --git a/pages/order_details/stay.vue b/pages/order_details/stay.vue
index f3d9f57..a4c088d 100644
--- a/pages/order_details/stay.vue
+++ b/pages/order_details/stay.vue
@@ -7,9 +7,14 @@
           <view class='pictrue'>
             <image :src="imgUrl+'/static/order_1.gif'"></image>
           </view>
-          <view class='data'>
+          <view class='data' v-if="!this.be_overday">
             <view class='state'>请在{{this.be_overdue}}天{{this.be_overhours}}时前完成支付!</view>
 
+            <view>{{orderInfo.add_time_y}}<text class='time'>{{orderInfo.create_time}}</text></view>
+          </view>
+          <view class='data' v-else>
+            <view class='state'>已逾期{{this.be_overdue}}天{{this.be_overhours}}时,请尽快前往完成支付!</view>
+          
             <view>{{orderInfo.add_time_y}}<text class='time'>{{orderInfo.create_time}}</text></view>
           </view>
         </view>
@@ -301,6 +306,8 @@
         product_type: 0,
         be_overdue: '', //逾期时间
         be_overhours: '', //逾期小时
+        be_overday:false,
+        
       };
     },
     watch: {
@@ -541,8 +548,11 @@
         if (this.be_overdue == 0 || this.be_overdue < 0) {
           var date1 = (Date.parse(new Date())) / 1000;
           var date2 = (Date.parse(new Date(autoTime))) / 1000;
-          var date3 = (date2 - date1) * 1000;
+          var date3 = (date1 - date2) * 1000;
           this.be_overdue = Math.floor(date3 / (24 * 3600 * 1000));
+          var leave1 = date3 % (24 * 3600 * 1000); //计算天数后剩余的毫秒数
+          this.be_overhours = Math.floor(leave1 / (3600 * 1000));
+          this.be_overday = true 
         }
       }
     }
@@ -1144,7 +1154,11 @@
     .warp {
       position: absolute;
       top: 30vh;
-      left: 30px;
+      left: 60px;
+      width: 70%;
+      image{
+        width: 100%;
+      }
 
       .guanbi {
         position: absolute;
@@ -1157,25 +1171,25 @@
 
     .textp {
       position: absolute;
-      top: 44vh;
-      left: 35px;
-      width: 320px;
+      top: 40vh;
+      left: 90px;
+      width: 210px;
       padding-bottom: 20px;
       border-radius: 10px;
 
       span {
         display: block;
-        width: 290px;
+        width: 210px;
         padding-top: 20px;
         margin: auto;
       }
 
       .shouhuobtn {
         margin: auto;
-        line-height: 54px;
+        line-height: 34px;
         margin-top: 30px;
-        width: 191px;
-        height: 54px;
+        width: 150px;
+        height: 34px;
         color: white;
         background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
         border-radius: 27px 27px 27px 27px;
diff --git a/pages/product/addGoods/modifyPrice.vue b/pages/product/addGoods/modifyPrice.vue
index 15e097b..b85d292 100644
--- a/pages/product/addGoods/modifyPrice.vue
+++ b/pages/product/addGoods/modifyPrice.vue
@@ -39,11 +39,6 @@
 				</view>
 
 				<view v-if="item.more_thanFlag">
-					<view class="multiSpecifica_container_item">
-						<view class="multiSpecifica_container_item_label flex-start">库存</view>
-						<view class="multiSpecifica_container_item_value"><input v-model="item.stock" type="number" placeholder="请填写商品库存" /></view>
-					</view>
-
 					<view class="multiSpecifica_container_item">
 						<view class="multiSpecifica_container_item_label flex-start">商品编号</view>
 						<view class="multiSpecifica_container_item_value"><input v-model="item.bar_code" type="text" placeholder="请填写商品编号" /></view>
@@ -112,12 +107,6 @@
 							<view class="changePopup_container_content_item_label">原价</view>
 							<view class="changePopup_container_content_item_value"><input v-model="batchData.ot_price" type="number" placeholder="0.00" /></view>
 						</view>
-
-						<view class="changePopup_container_content_item">
-							<view class="changePopup_container_content_item_label">库存</view>
-							<view class="changePopup_container_content_item_value"><input v-model="batchData.stock" type="number" placeholder="0.00" /></view>
-						</view>
-
 						<view class="popup_moreThan" @click="popupOpenModel = !popupOpenModel" v-if="!popupOpenModel">
 							<text>展开</text>
 							<text class="iconfont">&#xe8ca;</text>
@@ -182,7 +171,6 @@ export default {
 				price: '', //售价
 				cost: '', // 成本价
 				ot_price: '', // 原价
-				stock: '', // 库存
 				bar_code: '', // 商品编号
 				weight: '', // 重量
 				volume: '', // 体积
@@ -363,7 +351,6 @@ export default {
 											price: 0,
 											cost: 0,
 											ot_price: 0,
-											stock: 0,
 											bar_code: '',
 											weight: 0,
 											volume: 0,
@@ -397,7 +384,6 @@ export default {
 								price: 0,
 								cost: 0,
 								ot_price: 0,
-								stock: 0,
 								bar_code: '',
 								weight: 0,
 								volume: 0,
diff --git a/pages/product/addGoods/singleSpecification.vue b/pages/product/addGoods/singleSpecification.vue
index c2b45ac..5e2ed0f 100644
--- a/pages/product/addGoods/singleSpecification.vue
+++ b/pages/product/addGoods/singleSpecification.vue
@@ -26,7 +26,6 @@
 					price: '', // 售价
 					cost: '', // 成本价
 					ot_price: '', // 原价
-					stock: '', // 库存
 					bar_code: '', // 商品编号
 					weight: '', // 重量
 					volume: '', // 体积
@@ -56,13 +55,6 @@
 						type: 'digit',
 						holder: '请填写原价',
 						model: 'ot_price'
-					},
-					{
-						id: 4,
-						label: '库存',
-						type: 'number',
-						holder: '请填写库存',
-						model: 'stock'
 					}
 				],
 				moreThanList: [
diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue
index e257656..93b361f 100644
--- a/pages/product/list/index.vue
+++ b/pages/product/list/index.vue
@@ -52,7 +52,8 @@
                     <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}`"
+                  <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>
@@ -102,8 +103,6 @@
                 <view v-if="item.is_show == 0 && item.status == 1" class="bnt" @tap.stop="handleShelves(item),1">上架
                 </view>
                 <view @click="editGoods(item)" class="bnt">编辑</view>
-                <navigator :url="'/pages/admin/goods_details/index?product_id='+item.product_id+'&product_type=0'"
-                  class="bnt" hover-class='none'>预览</navigator>
                 <view class="bnt" v-if="item.is_show == 0" @tap.stop="handleRecycle(item,index)">删除
                 </view>
                 <view class="bnt bnt_recommend" v-if="item.is_show == 1" @tap.stop="handleRecommend(item)">
@@ -122,16 +121,16 @@
       <view class="popen">
         <h4 v-if="this.on_line==1">线下入库</h4>
         <h4 v-else>线上入库</h4>
-        <view class="guige" >
+        <view class="guige">
           <u-radio-group v-model="checkboxValue1" placement="column" @change="checkboxChange">
             <u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in checkboxList1"
               @change="radioChange(item)" :key="index" :label="item.sku" :name="item.unique" v-if="item.sku">
             </u-radio>
           </u-radio-group>
         </view>
-      
-        <view class="shuru">
-          数量: <input type="text" v-model="data.number" placeholder="请输入">
+
+        <view class="shuru" v-if="this.on_line == 1">
+          数量: <input type="number" v-model="data.number" placeholder="请输入" >
         </view>
         <view class="btn">
           <button class="btn_l" @click="close()">取消</button>
@@ -196,6 +195,10 @@
           {
             value: '1',
             text: '线下入库'
+          },
+          {
+            value: '2',
+            text: '预览'
           }
         ],
         //线下
@@ -233,19 +236,23 @@
           return
         }
         this.on_line = action
-        console.log(this.on_line);
         this.checkboxList1 = rowId
-
-        if(!this.checkboxList1[0].sku && action == 0){
+        console.log(this.on_line);
+        if (this.checkboxList1.length == 1 && 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{
+        } else {
           this.show = true
           console.log(this.data);
         }
+        if (action == 2) {
+          uni.navigateTo({
+            url: `/pages/admin/goods_details/index?product_id=${this.checkboxList1[0].product_id}&product_type=0`
+          })
+        }
 
       },
       close() {
@@ -254,20 +261,20 @@
       //导入
       creat() {
         if (this.on_line == 1) {
-          if(this.data.number <1){
-              this.show=false
+          if (this.data.number < 1) {
+            this.show = false
             this.$util.Tips({
-                title: '入库数量不得小于一件'
-              })
-          }else{
+              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
+            }).catch(err => {
+              this.show = false
               this.$util.Tips({
                 title: '请选择规格后再次进行入库'
               })
@@ -703,6 +710,10 @@
         }
       }
     }
+
+    .acea-row.row-between-wrapper {
+      justify-content: flex-end;
+    }
   }
 
   .genduo {
@@ -737,10 +748,12 @@
     .guige {
       margin: 10px 0 10px 20px;
     }
-  .guiges {
-    height: 100px;
+
+    .guiges {
+      height: 100px;
       margin: 10px 0 10px 20px;
     }
+
     .shuru {
       display: flex;
       justify-content: flex-start;
diff --git a/pages/users/login/login_copy.vue b/pages/users/login/login_copy.vue
index 5059e40..198c414 100644
--- a/pages/users/login/login_copy.vue
+++ b/pages/users/login/login_copy.vue
@@ -80,39 +80,7 @@
 									class="font_pro">《隐私政策》</text></text>
 						</checkbox-group>
 					</div>
-					<!-- #ifdef MP -->
-					<!-- 	<view class="appLogin">
-					<view class="hds">
-						<span class="line"></span>
-						<p>其他方式登录</p>
-						<span class="line"></span>
-					</view>
-					<view class="btn-wrapper">
-						<button form-type="submit" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
-							<view class="btn wx">
-								<span class="iconfont icon-s-weixindenglu1"></span>
-							</view>
-						</button>
-					</view>
-				</view> -->
-					<!-- #endif -->
-					<!-- #ifdef APP-PLUS -->
-					<!-- <view class="appLogin" v-if="!appLoginStatus && !appleLoginStatus">
-					<view class="hds">
-						<span class="line"></span>
-						<p>其他方式登录</p>
-						<span class="line"></span>
-					</view>
-					<view class="btn-wrapper">
-						<view class="btn wx" @click="wxLogin">
-							<span class="iconfont icon-s-weixindenglu1"></span>
-						</view>
-						<view class="btn wx btn-apple" @click="appleLogin" v-if="appleShow">
-							<span class="iconfont icon-s-pingguo"></span>
-						</view>
-					</view>
-				</view> -->
-					<!-- #endif -->
+					
 				</div>
 				<div class="whiteBg" v-else>
 					<div class="title">注册账号</div>
@@ -168,24 +136,6 @@
 									class="font_pro">《隐私政策》</text></text>
 						</checkbox-group>
 					</div>
-
-					<!-- #ifdef APP-PLUS -->
-					<view class="appLogin" v-if="!appLoginStatus && !appleLoginStatus">
-						<view class="hds">
-							<span class="line"></span>
-							<p>其他方式登录</p>
-							<span class="line"></span>
-						</view>
-						<view class="btn-wrapper">
-							<view class="btn wx" @click="wxLogin">
-								<span class="iconfont icon-s-weixindenglu1"></span>
-							</view>
-							<view class="btn wx btn-apple" @click="appleLogin" v-if="appleShow">
-								<span class="iconfont icon-s-pingguo"></span>
-							</view>
-						</view>
-					</view>
-					<!-- #endif -->
 				</div>
 			</div>
 			<div class="bottom"></div>
diff --git a/pages/users/online_warehousing/index.vue b/pages/users/online_warehousing/index.vue
index f91e6f4..ca732e7 100644
--- a/pages/users/online_warehousing/index.vue
+++ b/pages/users/online_warehousing/index.vue
@@ -52,7 +52,7 @@
               
             </view>
            <view class="totalfooter">
-             <view class='bnt b-color' v-if="items.is_imported == 0"
+             <view class='bnt b-color'  v-if="items.is_imported == 0"
                @click="importshop(items.order_id,items.product_id,items.product_sku)">
                立即导入</view>
            </view>
@@ -68,7 +68,7 @@
           点击确定，商品管理
         </view>
         <view class="btn">
-          <button class="btn_l" @click="close()">取消</button>
+          <button class="btn_l" @click="closeasd()">取消</button>
           <button class="btn_r" @click="getback()">确定</button>
         </view>
       </view>
@@ -117,7 +117,7 @@
     onLoad(option) {
       console.log(option);
       this.mer_id = option.mer_id
-      this.getList(this.mer_id);
+      this.getList();
       this.data.product_id = option.product_id
       this.data.unique = option.unique
     },
@@ -128,7 +128,7 @@
         this.shopList = [];
         this.getList();
       },
-      getList: function(mer_id) {
+      getList: function() {
         if (this.loading || this.loaded) return;
         this.loading = true;
         getOrderList(this.where, this.mer_id).then(res => {
@@ -152,6 +152,15 @@
       },
       close() {
         this.show = false
+      
+      },
+      closeasd:function(){
+        this.show = false
+        getOrderList(this.where, this.mer_id).then(res => {
+          console.log(res);
+          this.shopList = res.data.list
+          console.log(this.shopList);
+        })
       },
       getback() {
         uni.navigateBack({
@@ -220,7 +229,7 @@
 
   .list {
     width: 690rpx;
-    margin: 14rpx auto 0 auto;
+    margin: 50px auto 0 auto;
 
     .title {
       height: 84rpx;
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index 3c272e3..979cec8 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -645,6 +645,7 @@
         product_type: '',
         interest_rate: '', //利率
         settle_cycle: '', // 周期
+        type_id:'',//店铺类型
       };
     },
     computed: {
@@ -662,6 +663,7 @@
     onReady() {},
     mounted: function() {},
     onLoad: function(options) {
+      this.type_id=options.type_id
       this.product_type = options.product_type
       this.seckillId = options.seckillId
       // #ifdef H5
@@ -1068,8 +1070,8 @@
           that.order_key = res.data.key
           that.cartArr[4].title =
             `结算周期：${res.data.order[0].settle_cycle}天 日利率：${res.data.order[0].interest_rate}%`
-          console.log(that.settle_cycle);
-          if (res.data.order[0].credit_buy == 1) {
+          console.log(res.data.order[0]);
+          if (res.data.order[0].credit_buy == 1 && this.type_id ==12){
             this.cartArr[4].payStatus = 1
           } else {
             this.cartArr[4].payStatus = 0
diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue
index ad86716..18c538e 100644
--- a/pages/users/order_list/index.vue
+++ b/pages/users/order_list/index.vue
@@ -67,7 +67,7 @@
                     {{item.group_order_sn}}
                   </view>
                   <view class='t-color'>
-                    {{item.pay_type == 3 ? "待付款" : "待结算" }}
+                    {{item.pay_type == 3 ? "待付款" : "去结算" }}
                   </view>
                 </view>
                 <view v-for="(order,j) in item.orderList" :key="order.order_id+j">
@@ -99,6 +99,14 @@
                             </view>
                             <view>x{{goods.product_num}}</view>
                           </view>
+                          <view class="money" style="margin-left: 117px;" v-if="item.pay_type == 8">
+                           <view>
+                              先货后款   实付:￥0.00
+                           </view>
+                          </view>
+                          <view class="totalPrice" v-if="item.pay_type == 8">
+                            共{{item.total_num || 0}}件商品，结算周期到期后付款￥{{goods.cart_info.productAttr.price || item.interest.total_amount}}
+                          </view>
                         </view>
                         <view v-if="goods.cart_info.productPresell.presell_type === 2" class="event_price">
                           定金待支付 <text class="t-color">￥{{ order.pay_price }}</text>
@@ -120,30 +128,39 @@
                           <view class='name line2'>{{goods.cart_info.product.store_name}}
                           </view>
 
-                          <view class='money' v-if="item.orderList[0].activity_type == 4">
+                          <view class='money' v-if="item.pay_type == 8">
                             <view v-if="goods.cart_info.activeSku">
                               ￥{{goods.cart_info.activeSku.active_price}}</view>
                             <view>x{{goods.product_num}}</view>
+                            <view class="money" style="margin-left: 117px;" v-if="item.pay_type == 8">
+                             <view>
+                                先货后款   实付:￥0.00
+                             </view>
+                            </view>
+                            <view class="totalPrice" v-if="item.pay_type == 8">
+                              共{{item.total_num || 0}}件商品，结算周期到期后付款￥{{goods.cart_info.productAttr.price || item.interest.total_amount}}
+                            </view>
                           </view>
                           <view v-else class='money'>
                             <view>￥{{goods.cart_info.productAttr.price}}</view>
                             <view>x{{goods.product_num}}</view>
+                            
                           </view>
                         </view>
                       </view>
                     </block>
                   </view>
                 </view>
-                <view class='totalPrice' v-if="item.orderList[0].activity_type !== 2">
+                <view class='totalPrice' v-if="item.pay_type !== 8">
                   共{{item.total_num || 0}}件商品，总金额
                   <text class='money p-color'>￥{{item.pay_price}}</text>
                 </view>
-                <view class='totalPrice' v-else>共{{item.orderNum || 0}}件商品，总金额
-                  <text class='money p-color'>￥{{item.pay_price}}</text>
+               <!-- <view class='totalPrice' v-else>先货后款 实付款:
+                  <text class='money p-color'>￥0.00</text>
                 </view>
                 <view class="totalPrice" v-if="item.pay_type == 8">
                   共{{item.total_num || 0}}件商品，结算周期到期后付款￥{{item.interest.total_amount}}
-                </view>
+                </view> -->
                 <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>
@@ -204,6 +221,14 @@
                       <view class='money'>
                         <view>￥{{goods.cart_info.productPresellAttr.presell_price}}</view>
                         <view>x{{goods.product_num}}</view>
+                        <view class="money" style="margin-left: 117px;" v-if="item.pay_type == 0">
+                         <view>
+                            先货后款   实付:￥0.00
+                         </view>
+                        </view>
+                        <view class="totalPrice" v-if="item.pay_type == 8">
+                          共{{item.total_num || 0}}件商品，结算周期到期后付款￥{{goods.cart_info.productAttr.price || item.interest.total_amount}}
+                        </view>
                       </view>
                     </view>
                   </view>
@@ -229,17 +254,33 @@
                         <view v-if="goods.cart_info.productAssistAttr">
                           ￥{{goods.cart_info.productAssistAttr.assist_price}}</view>
                         <view>x{{goods.product_num}}</view>
+                        <view class="money" style="margin-left: 117px;" v-if="item.pay_type == 8">
+                         <view>
+                            先货后款   实付:￥0.00
+                         </view>
+                        </view>
+                        <view class="totalPrice" v-if="item.pay_type == 8">
+                          共{{item.total_num || 0}}件商品，结算周期到期后付款￥{{goods.cart_info.productAttr.price || item.interest.total_amount}}
+                        </view>
                       </view>
                       <view class='money' v-else-if="item.activity_type == 4">
                         <view v-if="goods.cart_info.activeSku">
                           ￥{{goods.cart_info.activeSku.active_price}}</view>
                         <view>x{{goods.product_num}}</view>
+                        <view class="money" style="margin-left: 117px;" v-if="item.pay_type == 8">
+                         <view>
+                            先货后款   实付:￥0.00
+                         </view>
+                        </view>
+                        <view class="totalPrice" v-if="item.pay_type == 8">
+                          共{{item.total_num || 0}}件商品，结算周期到期后付款￥{{goods.cart_info.productAttr.price || item.interest.total_amount}}
+                        </view>
                       </view>
                       <view class='money' v-else>
                         <view>￥{{goods.cart_info.productAttr.price}}</view>
                         <view>x{{goods.product_num}}</view>
                       </view>
-                      <view class="money" style="margin-left: 117px;" v-if="item.pay_type == 8">
+                      <view class="money" style="margin-left: 117px;" v-if="item.pay_type == 8 "> 
                        <view>
                           先货后款   实付:￥0.00
                        </view>
@@ -1149,7 +1190,8 @@
 
   .warp {
     margin: auto;
-
+    image{
+    }
     .guanbi {
       position: absolute;
       right: 0px;
diff --git a/pages/users/payment/payment.vue b/pages/users/payment/payment.vue
index 1fed723..822a45a 100644
--- a/pages/users/payment/payment.vue
+++ b/pages/users/payment/payment.vue
@@ -44,14 +44,14 @@
     <view class="settel">
       <view class='settel-t'>
         <view>总价：</view>
-        <view class='conter'>￥ {{couponData.orderList[0].pay_price}}</view>
+        <view class='conter'>￥ {{couponData.interest.total_price}}</view>
       </view>
     </view>
     <view class="settel"  v-if="this.be_overdue == 0 || this.be_overdue < 0">
       <view class='settel-t'>
         <view>利息合计:</view>
         <view class="conter">
-          <view class='con_text'>￥ {{couponData.orderList[0].pay_price}}</view>
+          <view class='con_text'>￥ {{couponData.interest.interest}}</view>
           <view class='con_text' style="color: #F84221;" v-if="couponData.pay_type == 8">
             已逾期{{this.be_overday}}天</view>
         </view>
@@ -63,11 +63,11 @@
         <view>
           合计:
           <text class='pColor' v-if="cartArr[4].payStatus == 1">￥0.00</text>
-          <text class='pColor' v-else>￥{{couponData.orderList[0].pay_price}}</text>
+          <text class='pColor' v-else>￥{{couponData.interest.total_amount}}</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> -->
       </view>
       <view class='settlement' @tap="SubOrder">
         提交订单
@@ -232,7 +232,7 @@
         if(this.be_overdue == 0 || this.be_overdue < 0 ){
           var date1 = (Date.parse(new Date()))/1000;
           var date2 = (Date.parse(new Date(autoTime)))/1000;
-          var date3 =  (date2- date1)*1000;
+          var date3 =  (date1- date2)*1000;
           this.be_overday =Math.floor(date3 / (24 * 3600 * 1000));
         }
       }
@@ -428,9 +428,9 @@
       .con_text {
         display: flex;
         justify-content: flex-end;
-        height: 35px;
+        height: 20px;
         margin: auto;
-        line-height: 35px;
+        line-height: 30px;
       }
 
 
diff --git a/pages/users/trading_hall/index.vue b/pages/users/trading_hall/index.vue
new file mode 100644
index 0000000..1b1d7cc
--- /dev/null
+++ b/pages/users/trading_hall/index.vue
@@ -0,0 +1,115 @@
+<template>
+  <view>
+    <view class="header">
+      <view class="top-header">
+        <view class="search">
+          <view class="search-content acea-row row-middle">
+            <text class="iconfont icon-sousuo"></text>
+            <input v-model="where.keyword" confirm-type="search" placeholder="请输收货人手机号或订单号搜索" class="input"
+              @confirm="handleSearch" />
+          </view>
+        </view>
+      </view>
+      <view class="recom">
+        <rudon-rowMenuDotDotDot :localdata="options" @change="menuAction($event, 1)">
+          推荐
+        </rudon-rowMenuDotDotDot>
+      </view>
+    </view>
+    <view class="list">
+
+    </view>
+  </view>
+</template>
+
+<script>
+  import { methods } from '../../../uni_modules/uview-ui/libs/mixin/mixin'
+  export default {
+    data() {
+      return {
+        where: {
+          page: 1,
+          limit: 10,
+          status: 20,
+          product_type: 98,
+          keyword: '',
+        },
+        options: [{
+            value: '0',
+            text: '推荐'
+          },
+          {
+            value: '1',
+            text: '调货'
+          },
+          {
+            value: '2',
+            text: '打折专区'
+          }
+        ],
+      }
+    },
+    methods: {
+      menuAction(action, rowId) {
+        // 忽略初始化时的传入的空操作
+        if (action === '') {
+          return
+        }
+      },
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .header {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    .top-header {
+      // position: fixed;
+      // top: 0;
+      // left: 0;
+      z-index: 9999;
+      width: 80%;
+      background-color: #fff;
+
+      .search {
+        padding: 17rpx 30rpx;
+
+        .search-content {
+          width: 100%;
+          height: 60rpx;
+          padding: 0 30rpx;
+          border-radius: 30rpx;
+          background-color: #F5F5F5;
+          font-size: 26rpx;
+        }
+
+        .iconfont {
+          margin-right: 10rpx;
+          font-size: 26rpx;
+          color: #999999;
+        }
+
+        .input-placeholder {
+          font-size: 26rpx;
+          color: #999999;
+        }
+
+        .input {
+          flex: 1;
+        }
+      }
+    }
+
+    .recom {
+      width: 78px;
+      height: 34px;
+      text-align: center;
+      border-radius: 30px;
+      border: 1px solid #F84221;
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/static/images/diaohuo.png b/static/images/diaohuo.png
new file mode 100644
index 0000000000000000000000000000000000000000..132b867aedb0ca0641484990daaf9702ceef47f5
GIT binary patch
literal 2145
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
XDk>VRCa0Le00000NkvXXu0mjf?2rPX

literal 0
HcmV?d00001

diff --git a/static/images/fabu.png b/static/images/fabu.png
new file mode 100644
index 0000000000000000000000000000000000000000..a71d25ba866fd45833f7265cd98cc5288e309ce5
GIT binary patch
literal 2939
zcmV->3xxEEP)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h00001b5ch_0Itp)
z=>Px=HAzH4RCr$Poo#Sb)fvbC&rQhgCL7S1l=8vO$kZA8fsTBDwoc2;GR?lw)|pVD
z<BW6!3o4ih5o3uGi6TlHktp$nHr8!Hr9&;L;|zJD?uX7uYaD5@Q$EmfJ5n28MiH{F
zxqF|^*<@jfo8;beH}^oi_sh;sp65L0Jiqgtm*<?jA-IoH50Fypu5q{k6n6p_fD1se
z2NaukBftfq*aM2qyAj|5Q0xK4=G_Qz0Vwu>V)JeUxBwJ;K(To@0%j9{?C$UltkWtG
zH88M%fI7wPE1P*{3=`oDz^_*sbdcJP{<|E7mn8zuwFl}v72dr}w1x;^Mn22O0A}NN
zFmwjG&grSP`R%b0J0NTWNbihX55nsJt|Jf_j4#pWiBUbZ!rvYnmW5yoK)&Z!df#Nm
zb+Q$>()9=!`XHBHwy-^xmT8ME0GUUAaDZW~kuf}*bO_k(d8oHlrcKfSM%sgmE2-ig
z8KbjMC#`dOq0CSu4ItAVd7KH`#%9{WjQb`21UGtj^gUy>bJ+l};v|C?Sv5FY<q7n<
zr~T+nR@)~HAiX2<F=o*^AAk-}H^B8`MQ7EK0KMyd_~<vS>d6CmC?W=*+3^s1k>Muq
z?!MER9gz-Z+$Yhnxc8CXg;w?C0kmED0Elp!4Q}#2+SglfT)HhX06;{6)hF)V=`?`i
z7${7{g=$~U--*u>YrCr|Q+udArWboU)fV}f7<CsG7UtXIEP&MZ2w#bdA7VsDv*}iU
z#}{|6$@^DaLsk5~OuN8{dv`e*0S`t*%IAt%foj0<9Q5YuU4zFb8(R{sp@s@gJ0jUG
zX91)hxEKNEqjW4m=cqhk7|d<H$NIXb8`Luota#7>KPpo{0^;7s9E^Ze>*YNOQ+`>A
z&QvPB>*~(f+3B1w{+@0PA7M~~8QF<4c>s?)31C}9q&>%T&X?CG5qb$mv*+>tQ&yar
z-WGYEfoo*ir3QeN);S<c!0BAhXs+q#7wK_J&u3c#S9!hO&nzijI-JJ6yPb@HpBILp
z!jx60jq~3L7$L%=9}H)nS{Ri}3#Ye*>zQfbVn|zVPu%wlCjs1FJO?=M^s)69pb-v^
z8tIl&%StP~IemY4D}$aG(~)XV-1kc-0knjR4;~dv0vO_)-c<eM<jcxp03$8I#TBC!
zXMLT$@ls$?Es+BN*4UWT;=YbP=TZ@=`vicZjeyMBO-i4J4RBjc$Mnm}LX|Qt;hS}E
zW~#X%eP8$_1B)bfzy)TC09c80d$Kx#I#as&Wu-7DoNs`Z_&O#(v3hT9z`LN%ld@Gk
zM%=f@$q3jw9s#y$ZBm)gJIdTVcaOzo<<{_K1{#jPoe3_FU7GVLww!1VF3~jYEt9pG
zOw3sT$$P_2<bqBc2Dj97_V-wIPO>??m4Gd|OlGP7*{N?Wr0)&iZ2(<%wlx6az9$`w
zfMoN`MSxgVf_V4vr`bI+%gW@I@Ltl;$fLPs)%&KOq?66zeE=G*LN1mU8!_KrCjo2;
z&&W=gzz12+wpQ<pow4eWHv)mm@7&<o#~SV;(0bqA-WSZ2k!p^-#mq}&cEE)ds~P}i
zT4!2@hR8s(@9EyZm{utg6wd$l;;L5wT17zA*V(tuY&prz;S>m7v+||n@&G!WjDXE$
z8-hMzM(f}Hk%>+<QBLKYk2VGTwR1d&8HfNp^x@~(WoC!2^Y?@nRS=!D<NWc}blmrp
zlK}3q2S8*inb4J?%)@50m8F~{obRvn90l+_0H08nminGAz1b?c0c#4~%0vgt0^n&U
z0W`@2AYgEmxoK{fwPoc*Cyi_hEU2jP4CFUZfNlUQ{QLR_tvEAzPox9PGKcUJ&BUws
zISoMKbVUO_;qB^evErmsvU%rgo;Miy#@G<R+kIXAyR4R*Y77g2_0l`wf<c1A02(DD
zfcb=`(e^h_X8L5u{Pf1i^@heV5EhKLzo)vZZ>3e|3;ASY=re$>lF_|HhY_!S#>oh{
zTN1#<T8pE?gB3(k&oh1hH0ywDQ}_nmfVf7IcRm59&U0qz{AaD-(@!=9u7Tls->mH^
z<ph9dodmGSHh>H5Vek;Z-Pz>m@2`$detej041N~|^#bG{cm9ZO@Qt<4_rELS#Kgu>
z0}&mO(Ji6lFo2Ea18}i1EbiF%Xlz8^Jf$Bi9-<N(>wiel4i%iA*D-i?_5S`p$T~2!
zDYS!`+GX`8=*6p_b1(uDcZHaUz|5GLPn;3EVvV#Yv$2E;QGhB7_5gmO`ni5vlX-Gu
z_y{wLD6riQkqdGdfQSIe8#Ffc2z>mnr?SgrC-FkhP2LqAJA}7cAE8g6c=hv6M!=mR
zbthts6LW~xR_*WmyX^3B?v6lR1$jO$hx5f!K%^q7_d5yT4go;<BPQ=?Haq&#RFikf
zeZ+?E*ArEUi@0TZ@)7VWCjo3w1b}InG)^<)+9J=T3Fsk>yM6lyj+yaj@{aIUW*$F;
zH={ANOg;jB-S6C)aAN&90Ecfu8^G$J)7hSHeZA^OM6{WS1DD))1c{fayEWFMz8C)d
zpUK>o+z@(&8Ml;S2b>?pNbH1_0I=VAER|ruSYF#b7%M1^YzQtU){X*P*cBI*M}q|J
z{!q{UX<~LXu|6a+pk;f-io{0j1t%lmXKIEZgC+o28(2UUo_9(E7-PY}S+S%AQM9JJ
z|Lu=f2mCd2tIk^@KaFr6z;B!caJwP^hOxXhIu-%x+auTOFnVY_A!o*+47^LAvjB_q
zbvd7SjiUh8DFVP_0EF{%YzPn~hMscz)pS|$nirjnfVH6+ITN04PsG65IR*{s#Dn>4
zsG7at7q<_9!vJmzje<~Vx_^{YkfAHHJ$XCgHBl!c;I`0v0It1UI-vS`aLoVPf#p{F
zne=O_iQ7U)m?8BxiPcJ83GxK)s`=eOlhwLP0~q;fa4kSDS~WOp<#V~9|K($r&ZC7d
zqydNvt@CqL|GJP8aCk>tt{v=!4q>DIL>Q_$(7#lsb4ddb#?Gw?HE2M&PLyQouUv;1
zx(;L6yqBiG0$HlEwg89%6SszTGO%5_ClpnH80%|Z?l*M>az+5;A*>1B$p*T_iB-As
z>z8{u1RgO!8){$fKV*l!?Fc9s|9o}ex;d3|L^Oz>tn^-dhrS?TW01`kae3(HZ*BvJ
zSRZZkAC~{IzGAP~0r&-7k?8VPR@D>p0uB7tF#%1Spcl!?e`intM1jeE8<RjiV4NtI
zy+ZwS%>QN0IP>ZMa<PRmxi>LqYzQhV!D$Lh+!ETs;Hhphtn(ilh&ov(JGRO;1lg&C
z72U*7>US_rewD;9ux{>Q7l0L?T9Oq23{ZP<&nbSZ*I*ZbC5KuSPOKV>fXQ+{23!DE
zeQHTw01y#yL21I`h{*+D$)Q4cWL4-^z_^9;cRr`iYZBvHrb})_TxyST3gS0{raLHL
zJ_Y2uYF~ZB^u=Jy4Ktyjd=ftY<KSTsR+*^lOo*fj+~9w8ux};`H&dok0Lh!fH|N-p
zzFcdjfz!+I@X)9F*X&+%oZe1p38er=Rt67n{s%JDJ_hlP^ZqE8OtV{ar2x*a3?2q!
zm7Vu<ryJ@`{T;l#w&&tqBfCzuqOTM{VrB4dgGCZg-9wCY^7GNJ%#T@r!=@ayRtn&~
zK)_o!Z;tqpjI!NOv+5LLZ1KM~@RU`(a>*+NAR2M*ra&E0<xW7Xgvhaf`Xm1HMGnTE
zd9NL_l}@$`LOB4t4Y<<vT>y#+x&T}Nians%yc+>70L30qY~GCk7l2|9C^qj#fD1se
l2NaukBftfq*aM2q{~vPmle@Jdz)%1H002ovPDHLkV1gZ!mh%7r

literal 0
HcmV?d00001

diff --git a/static/images/weituo.png b/static/images/weituo.png
new file mode 100644
index 0000000000000000000000000000000000000000..241aa0a175fe0269ee20427cbb7a3c6ebeb9ffce
GIT binary patch
literal 3678
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

literal 0
HcmV?d00001