diff --git a/App.vue b/App.vue
index be66fcb..d75ac5b 100644
--- a/App.vue
+++ b/App.vue
@@ -74,23 +74,23 @@
       uni.hideTabBar();
       this.globalData.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
       this.globalData.uid = this.$store.state.app.uid;
-      
+
       // #ifdef APP-PLUS
       //初始化uniMP小程序发送的事件以及其他操作
       initEvent();
       // #endif
-      
+
       //#ifdef APP-PLUS
       this.checknetwork()
-      
+
       jpushModule.setLoggerEnable(true);
       jpushModule.initJPushService()
       jpushModule.addConnectEventListener(result => {
-      	let connectEnable = result.connectEnable
-      	// console.log("jpush连接", connectEnable)
+        let connectEnable = result.connectEnable
+        // console.log("jpush连接", connectEnable)
       })
-      
-      
+
+
       // 设置别名
       // jpushModule.setAlias({
       // 	'alias': uni.getStorageSync('userId'),
@@ -108,32 +108,32 @@
       // })
       // 通知事件回调
       jpushModule.addNotificationListener(result => {
-      	let notificationEventType = result.notificationEventType
-      	let messageID = result.messageID
-      	let title = result.title
-      	let content = result.content
-      	let extras = result.extras
-      
-      	console.log("通知", result)
-      
-      	if (result.extras.type == 'ORDER_CREATE') {
-      		if (this.audioTeam.length > 0) {
-      			this.audioTeam.push(result.extras.type);
-      		} else {
-      			this.audio()
-      			this.audioTeam.push(result.extras.type);
-      		}
-      
-      
-      	}
-      	// 点击事件
-      	if (notificationEventType == 'notificationOpened') {
-      		uni.navigateTo({
-      			url: result.extras.route
-      		})
-      	}
+        let notificationEventType = result.notificationEventType
+        let messageID = result.messageID
+        let title = result.title
+        let content = result.content
+        let extras = result.extras
+
+        console.log("通知", result)
+
+        if (result.extras.type == 'ORDER_CREATE') {
+          if (this.audioTeam.length > 0) {
+            this.audioTeam.push(result.extras.type);
+          } else {
+            this.audio()
+            this.audioTeam.push(result.extras.type);
+          }
+
+
+        }
+        // 点击事件
+        if (notificationEventType == 'notificationOpened') {
+          uni.navigateTo({
+            url: result.extras.route
+          })
+        }
       })
-      
+
       // jpushModule.addCustomMessageListener(result => {
       // 	let messageID = result.messageID
       // 	let content = result.content
@@ -141,7 +141,7 @@
       // 	console.log("自定义消息", result)
       // })
       //#endif
-      
+
       let that = this;
       // #ifdef MP
       if (HTTP_REQUEST_URL == '') {
@@ -221,6 +221,66 @@
       // #endif	
     },
     methods: {
+      //网络检测
+      checknetwork() {
+
+        uni.onNetworkStatusChange(function(res) {
+
+          if (res.isConnected) {
+
+            uni.reLaunch({
+              url: '/pages/index/index'
+            })
+
+          } else {
+
+            uni.showModal({
+
+              title: '系统提示',
+
+              content: '当前设备无网络或网络较差',
+
+              cancelText: '取消',
+
+              confirmText: '确定',
+
+              success: (res) => {
+
+                if (res.confirm) {
+
+                  uni.reLaunch({
+
+                    url: '/pages/index/index'
+
+                  })
+
+                } else {
+
+                  // #ifdef H5
+
+                  uni.navigateTo({
+                    url: '/pages/users/login/login_copy'
+                  })
+
+                  // #endif
+
+                  // #ifdef APP-PLUS
+
+                  plus.runtime.quit()
+
+                  // #endif
+
+                }
+
+              }
+
+            })
+
+          }
+
+        })
+
+      },
       randomString(len) {
         // 　　len = len || 32;
         // 　　var $chars = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678';    /****默认去掉了容易混淆的字符oOLl,9gq,Vv,Uu,I1****/
diff --git a/api/payment.js b/api/payment.js
new file mode 100644
index 0000000..441e510
--- /dev/null
+++ b/api/payment.js
@@ -0,0 +1,45 @@
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+import request from "@/utils/request.js";
+
+/**
+ * 添加购物车
+ */
+export function addCart(data) {
+	return request.post(`user/cart/create`, data);
+}
+
+/**
+ * 根据店铺id 获取店铺信息
+ */
+export function getProductInfo(data) {
+	return request.get(`scanPay/product`, data);
+}
+
+/**
+ * 订单校验
+ */
+export function orderCheck(data) {
+	return request.post(`v2/order/check`, data);
+}
+
+/**
+ * 生成订单
+ */
+export function orderPay(data) {
+	return request.post(`v2/order/create`, data);
+}
+
+/**
+ * 生成二维码
+ */
+export function qrcode(data) {
+	return request.get(`scanPay/qrcode`, data);
+}
\ No newline at end of file
diff --git a/components/WaterfallsFlow/WaterfallsFlow.vue b/components/WaterfallsFlow/WaterfallsFlow.vue
index cd6531f..a6d6b6b 100644
--- a/components/WaterfallsFlow/WaterfallsFlow.vue
+++ b/components/WaterfallsFlow/WaterfallsFlow.vue
@@ -4,7 +4,7 @@
 		<view>
 			<view id="left" v-if="leftList.length">
 				<view v-for="(item,index) in leftList" :key="index" class="wf-item" @tap="itemTap(item)">
-					<WaterfallsFlowItem :item="item" :isStore="isStore" :type="type" @goShop="goShop" />
+					<WaterfallsFlowItem :item="item" :isStore="isStore" :type="type" @goShop="goShop" :sale_type="sale_type" />
 				</view>
 			</view>
 		</view>
@@ -12,7 +12,7 @@
 		<view>
 			<view id="right" v-if="rightList.length">
 				<view v-for="(item,index) in rightList" :key="index" class="wf-item" @tap="itemTap(item)">
-					<WaterfallsFlowItem :item="item" :isStore="isStore" :type="type" @goShop="goShop" />
+					<WaterfallsFlowItem :item="item" :isStore="isStore" :type="type" @goShop="goShop" :sale_type="sale_type" />
 				</view>
 			</view>
 		</view>
@@ -53,6 +53,10 @@
 				type: [String, Number],
 				default: '1'
 			},
+      sale_type: {
+        type: [String, Number],
+        default: '1'
+      }
 		},
 		data() {
 			return {
diff --git a/components/WaterfallsFlowItem/WaterfallsFlowItem.vue b/components/WaterfallsFlowItem/WaterfallsFlowItem.vue
index 010fe4d..1ff3553 100644
--- a/components/WaterfallsFlowItem/WaterfallsFlowItem.vue
+++ b/components/WaterfallsFlowItem/WaterfallsFlowItem.vue
@@ -8,6 +8,7 @@
 		<view class="text">
 			<view class='name line2'>{{item.store_name}}</view>		
 			<view class="item_tags">
+        <text class="tags_item delivery_yellow" v-if="sale_type == 2">批发价</text>
         <!-- 商品标签 -->
 				<!-- <text v-if="item.product_type == 0 && item.merchant.type_name" class="font-bg-red b-color">{{item.merchant.type_name}}</text>
 				<text v-else-if="item.product_type == 0 && item.merchant.is_trader" class="font-bg-red b-color">自营</text> -->
@@ -36,6 +37,7 @@
 		<view class='text'>
 			<view class='name line2'>{{item.store_name}}</view>
 			<view class="item_tags acea-row">
+        <text class="tags_item delivery_yellow" v-if="sale_type == 2">批发价</text>
         <!-- 商品标签 -->
 				<!-- <text v-if="item.merchant.type_name && item.product_type == 0" class="font-bg-red b-color">{{item.merchant.type_name}}</text>
 				<text v-else-if="item.merchant.is_trader && item.product_type == 0" class="font-bg-red b-color">自营</text> -->
@@ -103,7 +105,11 @@ export default {
 		isLogin: {
 			type: Boolean,
 			require: false
-		}
+		},
+    sale_type: {
+			type: [String, Number],
+			default: '1'
+		},
   },
 	data(){
 		return {
@@ -301,6 +307,10 @@ export default {
 	color: var(--view-theme);
 	border: 1px solid var(--view-theme);
 }
+.item_tags .tags_item.delivery_yellow{
+	color: #FF9000;
+	border: 1px solid #FF9000;
+}
 .item_tags .tags_item.delivery{
 	// color: #FF9000;
 	// border: 1px solid #FF9000;
diff --git a/pages.json b/pages.json
index 459df4a..a9ecdbc 100644
--- a/pages.json
+++ b/pages.json
@@ -56,7 +56,21 @@
 				"navigationBarTitleText": "个人中心",
 				"navigationStyle": "custom"
 			}
-		}, {
+		},
+    {
+    	"path": "pages/payment/get_payment",
+    	"style": {
+    		"navigationBarTitleText": "提货付款",
+    		"navigationStyle": "custom"
+    	}
+    },
+    {
+    	"path": "pages/payment/settlement",
+    	"style": {
+    		"navigationBarTitleText": "支付"
+    	}
+    },
+    {
 			"path": "pages/small_page/index",
 			"style": {
 				"navigationBarTitleText": "微页面"
diff --git a/pages/cloud_warehouse/home/home.vue b/pages/cloud_warehouse/home/home.vue
index 744b1f6..1405a8f 100644
--- a/pages/cloud_warehouse/home/home.vue
+++ b/pages/cloud_warehouse/home/home.vue
@@ -215,15 +215,15 @@
       <view class="wholeSale-nav">
         <!-- <u-icon class="icon" name="arrow-left" size="20" @click="navBack"></u-icon> -->
         <!-- 搜索 -->
-        <navigator url="/pages/columnGoods/goods_search/index" hover-class="none"
+        <view @click="navTo(`/pages/columnGoods/goods_search/index?back=true&searchVal=${where.keyword}`)" hover-class="none"
         	class="search_content flex_a_c_j_sb">
         	<view class="flex_a_c search_content_wrap">
         		<view class="iconfont icon-sousuo" style="font-size: 39rpx;"></view>
-        		<input type="text" placeholder="搜索您需要批发进货的产品名称" placeholder-style="font-size: 30rpx;color:#999;"
+        		<input type="text" placeholder="搜索您需要批发进货的产品名称" :value="where.keyword" placeholder-style="font-size: 30rpx;color:#999;"
         			disabled style="pointer-events: none;">
         	</view>
         	<!-- <button class="search_btn">搜索</button> -->
-        </navigator>
+        </view>
       </view>
 
 			<!-- 商品大分类 -->
@@ -303,7 +303,7 @@
         where:{
           page: 1,
           limit: 20,
-          mer_id: 259,
+          mer_type: 1, //1-里海云仓, 2-云市场, 3-名优特产
           mer_cate_id: '',
           keyword: '',
           deduction_rate: '', //抵扣比例
@@ -321,6 +321,19 @@
       uni.$emit('scroll');
     },
 		methods: {
+      navTo(url){
+        uni.navigateTo({
+          url:url,
+          success: () => {
+            uni.$once('searchValue', (e)=>{
+              this.$nextTick(()=>{
+                this.where.keyword = e;
+                this.getProductslist(true);
+              })
+            })
+          }
+        })        
+      },
       navBack(){ 
         uni.navigateBack();
       },
@@ -369,9 +382,9 @@
         this.isLoading = 1;
         getProductslist(this.where).then(res=>{
           this.hostProduct = [...this.hostProduct, ...res.data.list];
-          this.where.page++;
           this.isLoading = 0;
           if(res.data.list.length<this.where.limit) this.isLoading = -1;
+          this.where.page++;
         })
       },
 			goDetail(item) {
diff --git a/pages/cloud_warehouse/market/market.vue b/pages/cloud_warehouse/market/market.vue
index 3bc55fa..d446dd9 100644
--- a/pages/cloud_warehouse/market/market.vue
+++ b/pages/cloud_warehouse/market/market.vue
@@ -315,14 +315,15 @@
       <view class="wholeSale-nav">
         <!-- <u-icon class="icon" name="arrow-left" size="20" @click="navBack"></u-icon> -->
         <!-- 搜索 -->
-        <navigator url="/pages/columnGoods/goods_search/index" hover-class="none" class="search_content flex_a_c_j_sb">
-          <view class="flex_a_c search_content_wrap">
-            <view class="iconfont icon-sousuo" style="font-size: 39rpx;"></view>
-            <input type="text" placeholder="搜索您需要批发进货的产品名称" placeholder-style="font-size: 30rpx;color:#999;" disabled
-              style="pointer-events: none;">
-          </view>
-          <!-- <button class="search_btn">搜索</button> -->
-        </navigator>
+        <view @click="navTo(`/pages/columnGoods/goods_search/index?back=true&searchVal=${where.keyword}`)" hover-class="none"
+        	class="search_content flex_a_c_j_sb">
+        	<view class="flex_a_c search_content_wrap">
+        		<view class="iconfont icon-sousuo" style="font-size: 39rpx;"></view>
+        		<input type="text" placeholder="搜索您需要批发进货的产品名称" :value="where.keyword" placeholder-style="font-size: 30rpx;color:#999;"
+        			disabled style="pointer-events: none;">
+        	</view>
+        	<!-- <button class="search_btn">搜索</button> -->
+        </view>
       </view>
 
       <!-- 商品大分类 -->
@@ -456,6 +457,19 @@
       uni.$emit('scroll');
     },
     methods: {
+      navTo(url){
+        uni.navigateTo({
+          url:url,
+          success: () => {
+            uni.$once('searchValue', (e)=>{
+              this.$nextTick(()=>{
+                this.where.keyword = e;
+                this.storeMerchantList(true);
+              })
+            })
+          }
+        })        
+      },
       navBack() {
         uni.navigateBack();
       },
@@ -494,6 +508,7 @@
           this.goodsList = [...this.goodsList, ...res.data.list];
           this.isLoading = 0;
           if(res.data.list.length<this.where.limit) this.isLoading = -1;
+          this.where.page++;
         })
       },
       // 选择位置
diff --git a/pages/cloud_warehouse/specialty/specialty.vue b/pages/cloud_warehouse/specialty/specialty.vue
index 5f1a2c3..dffb3c0 100644
--- a/pages/cloud_warehouse/specialty/specialty.vue
+++ b/pages/cloud_warehouse/specialty/specialty.vue
@@ -215,14 +215,15 @@
       <view class="wholeSale-nav">
         <!-- <u-icon class="icon" name="arrow-left" size="20" @click="navBack"></u-icon> -->
         <!-- 搜索 -->
-        <navigator url="/pages/columnGoods/goods_search/index" hover-class="none" class="search_content flex_a_c_j_sb">
-          <view class="flex_a_c search_content_wrap">
-            <view class="iconfont icon-sousuo" style="font-size: 39rpx;"></view>
-            <input type="text" placeholder="搜索您需要批发进货的产品名称" placeholder-style="font-size: 30rpx;color:#999;" disabled
-              style="pointer-events: none;">
-          </view>
-          <!-- <button class="search_btn">搜索</button> -->
-        </navigator>
+        <view @click="navTo(`/pages/columnGoods/goods_search/index?back=true&searchVal=${where.keyword}`)" hover-class="none"
+        	class="search_content flex_a_c_j_sb">
+        	<view class="flex_a_c search_content_wrap">
+        		<view class="iconfont icon-sousuo" style="font-size: 39rpx;"></view>
+        		<input type="text" placeholder="搜索您需要批发进货的产品名称" :value="where.keyword" placeholder-style="font-size: 30rpx;color:#999;"
+        			disabled style="pointer-events: none;">
+        	</view>
+        	<!-- <button class="search_btn">搜索</button> -->
+        </view>
       </view>
 
 			<!-- 商品大分类 -->
@@ -299,12 +300,12 @@
         cate_change: 0,
         cate_change_children: 0,
         isLoading: 0,
-        where:{
+        where: {
           page: 1,
           limit: 20,
           cate_pid: '',
           keyword: '',
-          label_name: '名优特产'
+          mer_type: 3, //1-里海云仓, 2-云市场, 3-名优特产
         }
 			}
 		},
@@ -319,6 +320,19 @@
       uni.$emit('scroll');
     },
 		methods: {
+      navTo(url){
+        uni.navigateTo({
+          url:url,
+          success: () => {
+            uni.$once('searchValue', (e)=>{
+              this.$nextTick(()=>{
+                this.where.keyword = e;
+                this.storeMerchantList(true);
+              })
+            })
+          }
+        })        
+      },
       navBack(){ 
         uni.navigateBack();
       },
diff --git a/pages/columnGoods/goods_search/index.vue b/pages/columnGoods/goods_search/index.vue
index f774a6c..0c345d5 100644
--- a/pages/columnGoods/goods_search/index.vue
+++ b/pages/columnGoods/goods_search/index.vue
@@ -171,10 +171,12 @@
 				hotSearchBox: false,
 				mainWidth: 960,
 				isShow: true,
+        back: false,
 			};
 		},
 		onLoad(options) {
 			this.searchValue = options.searchVal || ''
+      this.back = options.back;
 		},
 		onShow: function() {
 			try {
@@ -246,6 +248,13 @@
 				this.$set(this, 'searchValue', event.detail.value);
 			},
 			searchBut: function() {
+        if(this.back) {
+          return uni.navigateBack({
+            success: () => {
+              uni.$emit('searchValue', this.searchValue)
+            }
+          })
+        }
 				if(/^(\/@[1-9]{1}).*\*\//.test(this.searchValue)){
 					uni.showLoading({
 						title: '加载中',
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index 8e041ee..2db5a2c 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -1,730 +1,768 @@
 <style lang="scss" scoped>
-	.gather {
-		.gather-header {
-			background-color: #40AE36;
+  .gather {
+    .gather-header {
+      background-color: #40AE36;
 
-			.location {
-				height: 98rpx;
-				padding: 0 28rpx;
+      .location {
+        height: 98rpx;
+        padding: 0 28rpx;
 
-				.box {
-					height: 98rpx;
-				}
+        .box {
+          height: 98rpx;
+        }
 
-				.town_name {
-					color: #fff;
-					margin-left: 18rpx;
-					font-size: 30rpx;
-				}
-			}
-		}
+        .town_name {
+          color: #fff;
+          margin-left: 18rpx;
+          font-size: 30rpx;
+        }
+      }
+    }
 
-		.swiperBg {
-			z-index: 1;
+    .swiperBg {
+      z-index: 1;
 
-			.colorBg {
-				position: absolute;
-				left: 0;
-				top: 0;
-				height: 130rpx;
-				width: 100%;
-			}
+      .colorBg {
+        position: absolute;
+        left: 0;
+        top: 0;
+        height: 130rpx;
+        width: 100%;
+      }
 
-			.page_swiper {
-				position: relative;
-				width: 100%;
-				height: auto;
-				margin: 0 auto;
-				border-radius: 10rpx;
-				overflow-x: hidden;
-				z-index: 8;
-				padding: 0 10rpx;
+      .page_swiper {
+        position: relative;
+        width: 100%;
+        height: auto;
+        margin: 0 auto;
+        border-radius: 10rpx;
+        overflow-x: hidden;
+        z-index: 8;
+        padding: 0 10rpx;
 
-				swiper-item {
-					border-radius: 10rpx;
-				}
+        swiper-item {
+          border-radius: 10rpx;
+        }
 
-				.swiper-item,
-				image,
-				.acea-row.row-between-wrapper {
-					width: 100%;
-					margin: 0 auto;
-					border-radius: 10rpx;
-				}
+        .swiper-item,
+        image,
+        .acea-row.row-between-wrapper {
+          width: 100%;
+          margin: 0 auto;
+          border-radius: 10rpx;
+        }
 
-				swiper {
-					width: 100%;
-					display: block;
-					height: auto;
+        swiper {
+          width: 100%;
+          display: block;
+          height: auto;
 
-					&.scalex {
-						/deep/.uni-swiper-slide-frame {
-							transform: translate(0, 0) !important;
-						}
-					}
-				}
+          &.scalex {
+            /deep/.uni-swiper-slide-frame {
+              transform: translate(0, 0) !important;
+            }
+          }
+        }
 
-				image {
-					transform: scale(0.93);
-					transition: all 0.6s ease;
-				}
+        image {
+          transform: scale(0.93);
+          transition: all 0.6s ease;
+        }
 
-				swiper-item.active,
-				swiper-item.scalex {
-					image {
-						transform: scale(1);
-					}
-				}
+        swiper-item.active,
+        swiper-item.scalex {
+          image {
+            transform: scale(1);
+          }
+        }
 
-				/*用来包裹所有的小圆点  */
-				.dots {
-					width: 156rpx;
-					height: 36rpx;
-					display: flex;
-					flex-direction: row;
-					position: absolute;
-					left: 320rpx;
-					bottom: 0;
-				}
+        /*用来包裹所有的小圆点  */
+        .dots {
+          width: 156rpx;
+          height: 36rpx;
+          display: flex;
+          flex-direction: row;
+          position: absolute;
+          left: 320rpx;
+          bottom: 0;
+        }
 
-				/*未选中时的小圆点样式 */
-				.dot {
-					width: 16rpx;
-					height: 6rpx;
-					border-radius: 6rpx;
-					margin-right: 6rpx;
-					background-color: rgba(255, 255, 255, .4);
+        /*未选中时的小圆点样式 */
+        .dot {
+          width: 16rpx;
+          height: 6rpx;
+          border-radius: 6rpx;
+          margin-right: 6rpx;
+          background-color: rgba(255, 255, 255, .4);
 
-					/*选中以后的小圆点样式  */
-					&.active {
-						width: 32rpx;
-						height: 6rpx;
-						background-color: rgba(255, 255, 255, .4);
-					}
-				}
-			}
-		}
+          /*选中以后的小圆点样式  */
+          &.active {
+            width: 32rpx;
+            height: 6rpx;
+            background-color: rgba(255, 255, 255, .4);
+          }
+        }
+      }
+    }
 
-		.title-img {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			height: 68rpx;
-			margin-bottom: 40rpx;
+    .title-img {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      height: 68rpx;
+      margin-bottom: 40rpx;
 
-			image {
-				width: 340rpx;
-				height: 42rpx;
-			}
+      image {
+        width: 340rpx;
+        height: 42rpx;
+      }
 
-			.title {
-				height: 42rpx;
-				padding: 0 80rpx;
-				font-size: 34rpx;
-				color: $theme-color;
-				font-weight: bold;
-				background-repeat: no-repeat;
-				background-size: 100% auto;
-				background-position: left center;
-			}
-		}
-	}
+      .title {
+        height: 42rpx;
+        padding: 0 80rpx;
+        font-size: 34rpx;
+        color: $theme-color;
+        font-weight: bold;
+        background-repeat: no-repeat;
+        background-size: 100% auto;
+        background-position: left center;
+      }
+    }
+  }
 </style>
 <template>
-	<view class="gather">
-		<!--顶部定位-->
-		<view class="gather-header">
-			<view style="height: var(--status-bar-height);"></view>
-			<view class="location">
-				<view class="box flex_a_c_j_sb">
-					<view class="place_wrapper flex_a_c" @click="changeMap">
-						<view class="iconfont icon-weizhi" style="color:#fff;font-size:40rpx;"></view>
-						<view class="town_name">{{street||'定位中' }}</view>
-					</view>
-					<view class="flex_a_c_j_sb">
-						<navigator style="margin-right: 30rpx;" url="/pages/chat/customer_list/index?type=0"
-							hover-class="none">
-							<view class="iconfont icon-saoma" style="color:#fff;font-size:40rpx;"> </view>
-						</navigator>
-						<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
-							<view class="iconfont icon-xiaoxi" style="color:#fff;font-size:40rpx;"> </view>
-						</navigator>
-					</view>
-				</view>
-			</view>
-		</view>
+  <view class="gather">
+    <!--顶部定位-->
+    <view class="gather-header">
+      <view style="height: var(--status-bar-height);"></view>
+      <view class="location">
+        <view class="box flex_a_c_j_sb">
+          <view class="place_wrapper flex_a_c" @click="changeMap">
+            <view class="iconfont icon-weizhi" style="color:#fff;font-size:40rpx;"></view>
+            <view class="town_name">{{street||'定位中' }}</view>
+          </view>
+          <view class="flex_a_c_j_sb">
+            <view style="margin-right: 30rpx;" @click="scanQRcode" hover-class="none">
+              <view class="iconfont icon-saoma" style="color:#fff;font-size:40rpx;"> </view>
+            </view>
+            <navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
+              <view class="iconfont icon-xiaoxi" style="color:#fff;font-size:40rpx;"> </view>
+            </navigator>
+          </view>
+        </view>
+      </view>
+    </view>
 
-		<!--轮播图-->
-		<view class="swiperBg">
-			<view class="swiper page_swiper">
-				<swiper :autoplay="true" loop 
-					indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff" :current="swiperCur"
-					style="height:330rpx;margin: 0 auto;width:710rpx;">
-					<block v-for="(item,index) in imgUrls" :key="index">
-						<swiper-item :class="{ active: index == swiperCur }">
-							<view class='slide-navigator acea-row row-between-wrapper'>
-								<image :src="item.img"
-									class="slide-image aa" style="height:330rpx;" mode="aspectFill">
-								</image>
-							</view>
-						</swiper-item>
-					</block>
-				</swiper>
-				<view class="dots">
-					<block v-for="(item,index) in imgUrls" :key="index">
-						<view class="dot" :class="index == swiperCur ? ' active' : ''"></view>
-					</block>
-				</view>
-			</view>
-		</view>
+    <!--轮播图-->
+    <view class="swiperBg">
+      <view class="swiper page_swiper">
+        <swiper :autoplay="true" loop indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff"
+          :current="swiperCur" style="height:330rpx;margin: 0 auto;width:710rpx;">
+          <block v-for="(item,index) in imgUrls" :key="index">
+            <swiper-item :class="{ active: index == swiperCur }">
+              <view class='slide-navigator acea-row row-between-wrapper'>
+                <image :src="item.img" class="slide-image aa" style="height:330rpx;" mode="aspectFill">
+                </image>
+              </view>
+            </swiper-item>
+          </block>
+        </swiper>
+        <view class="dots">
+          <block v-for="(item,index) in imgUrls" :key="index">
+            <view class="dot" :class="index == swiperCur ? ' active' : ''"></view>
+          </block>
+        </view>
+      </view>
+    </view>
 
-		<view class="title-img">
-			<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/807b8202403111125379295.webp" mode=""></image>
-		</view>
+    <view class="title-img">
+      <image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/807b8202403111125379295.webp" mode=""></image>
+    </view>
 
-		<view class="business com special_work" v-if="jurisdiction == false">
-			<view class="content">
-				<block v-if="nowMenuList.length > 0">
-					<u-transition v-for="(item, index) in nowMenuList" :key="item.name" show>
-						<view class="examine" @click="editFlag ? removeMenu(item) : clickMenu(item)">
-							<image class="icon_img" :src="item.pic" mode="aspectFit">
-							</image>
-							<!-- <u-icon v-if="editFlag" class="icon" name="minus-circle-fill" color="red"></u-icon> -->
+    <view class="business com special_work" v-if="jurisdiction == false">
+      <view class="content">
+        <block v-if="nowMenuList.length > 0">
+          <u-transition v-for="(item, index) in nowMenuList" :key="item.name" show>
+            <view class="examine" @click="editFlag ? removeMenu(item) : clickMenu(item)">
+              <image class="icon_img" :src="item.pic" mode="aspectFit">
+              </image>
+              <!-- <u-icon v-if="editFlag" class="icon" name="minus-circle-fill" color="red"></u-icon> -->
               <view v-if="editFlag" class="icon" style="background-color: red;">隐藏</view>
-							<text class="text">{{ item.name }}</text>
-						</view>
-					</u-transition>
-				</block>
-				<view class="add-box examine"
-					style="display: flex;justify-content: center;flex-direction: column;align-items: center;"
-					@click="editFlag = true">
-					<view class="add-box-icon"
-						style="margin-bottom: 14rpx; width:84rpx;height:84rpx;border: 2rpx solid #40AE36;border-radius: 10rpx;display: flex;justify-content: center;align-items: center;">
-						<u-icon name="plus" size="25" :bold="true" color="#40AE36"></u-icon>
-					</view>
-					<text>添加应用</text>
-				</view>
-			</view>
-		</view>
-		<view v-if="editFlag" class="business com special_work edit_card">
-			<view class="title project" style="padding: 0 28rpx">
-				<view>编辑功能</view>
-				<view class="edit2" @click="editComfirm">完成</view>
-			</view>
-			<view class="content">
-				<u-transition v-for="(item, index) in AllMenuList" :key="item.name" show>
-					<view class="examine" @click="pushMenu(item)">
-						<image class="icon_img" :src="item.pic" mode="aspectFit"> </image>
-						<!-- <u-icon class="icon" name="plus-circle-fill"></u-icon> -->
+              <text class="text">{{ item.name }}</text>
+            </view>
+          </u-transition>
+        </block>
+        <view class="add-box examine"
+          style="display: flex;justify-content: center;flex-direction: column;align-items: center;"
+          @click="editFlag = true">
+          <view class="add-box-icon"
+            style="margin-bottom: 14rpx; width:84rpx;height:84rpx;border: 2rpx solid #40AE36;border-radius: 10rpx;display: flex;justify-content: center;align-items: center;">
+            <u-icon name="plus" size="25" :bold="true" color="#40AE36"></u-icon>
+          </view>
+          <text>添加应用</text>
+        </view>
+      </view>
+    </view>
+    <view v-if="editFlag" class="business com special_work edit_card">
+      <view class="title project" style="padding: 0 28rpx">
+        <view>编辑功能</view>
+        <view class="edit2" @click="editComfirm">完成</view>
+      </view>
+      <view class="content">
+        <u-transition v-for="(item, index) in AllMenuList" :key="item.name" show>
+          <view class="examine" @click="pushMenu(item)">
+            <image class="icon_img" :src="item.pic" mode="aspectFit"> </image>
+            <!-- <u-icon class="icon" name="plus-circle-fill"></u-icon> -->
             <view class="icon">添加</view>
-						<text class="text">{{ item.name }}</text>
-					</view>
-				</u-transition>
-			</view>
-		</view>
+            <text class="text">{{ item.name }}</text>
+          </view>
+        </u-transition>
+      </view>
+    </view>
     <Loading></Loading>
-    
+
     <!--自定义底部tab栏-->
     <customTab :newData="newData" :activeRouter="activeRouter"></customTab>
-	</view>
+  </view>
 </template>
 
 <script>
-	import {
-		mapState,
-		mapGetters
-	} from 'vuex'
-	import {
-		getStoreList,
-		getUserInfo
-	} from '@/api/user.js'
-	import {
-		Toast
-	} from '@/libs/uniApi';
-	import {
-		applet
-	} from '@/api/public.js';
+  import {
+    mapState,
+    mapGetters
+  } from 'vuex'
+  import {
+    getStoreList,
+    getUserInfo
+  } from '@/api/user.js'
+  import {
+    Toast
+  } from '@/libs/uniApi';
+  import {
+    applet
+  } from '@/api/public.js';
   import customTab from '@/components/customTab';
   import {
-  	getVersion,
-  	getNavigation
+    getVersion,
+    getNavigation
   } from "@/api/public";
-	// #ifdef APP-PLUS
-	import uniMP from '@/utils/uniMP.js';
-	// #endif
+  // #ifdef APP-PLUS
+  import uniMP from '@/utils/uniMP.js';
+  // #endif
 
-	export default {
-    components:{
+  export default {
+    components: {
       customTab
     },
-		data() {
-			return {
-				imgUrls: [{
-					img: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e2f0520240203154207556.png'
-				}],
+    data() {
+      return {
+        imgUrls: [{
+          img: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e2f0520240203154207556.png'
+        }],
         swiperCur: 0,
-				locationArr: ({}),
-				isshow: false,
-				emptyText: '暂无可用应用',
-				jurisdiction: false, // 是否有权限
-				mer_id: '',
-				userInfoData: {
-					mer_info: {
-						type_id: 0
-					}
-				},
-				prefix: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/11/',
-				isShow: false,
-				isFshow: false,
-				street: '',
-				// 编辑中标记
-				editFlag: false,
-				// 所有菜单的按钮
-				AllMenuList: [],
-				nowMenuList: [],
-				street: '',
-				showPicker: false,
-				columnData: [],
-				isFshow: false,
-				backColor: 'rgba(252, 252, 252, 0)',
+        locationArr: ({}),
+        isshow: false,
+        emptyText: '暂无可用应用',
+        jurisdiction: false, // 是否有权限
+        mer_id: '',
+        userInfoData: {
+          mer_info: {
+            type_id: 0
+          }
+        },
+        prefix: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/11/',
+        isShow: false,
+        isFshow: false,
+        street: '',
+        // 编辑中标记
+        editFlag: false,
+        // 所有菜单的按钮
+        AllMenuList: [],
+        nowMenuList: [],
+        street: '',
+        showPicker: false,
+        columnData: [],
+        isFshow: false,
+        backColor: 'rgba(252, 252, 252, 0)',
         newData: {},
         activeRouter: '',
-			};
-		},
-		computed: {
-			...mapGetters(['userInfo', 'location', 'isLogin'])
-		},
-		created() {},
-		onLoad() {},
-		onShow() {
+      };
+    },
+    computed: {
+      ...mapGetters(['userInfo', 'location', 'isLogin'])
+    },
+    created() {},
+    onLoad() {},
+    onShow() {
+      this.street = this.$store.state.storage.address.townName;
       this.getNav();
-			if (this.isLogin) {
-				this.emptyText = '暂无可用应用'
-				this.jurisdiction = false
-				this.initAllAppLet();
-			} else {
-				this.emptyText = '请登录'
-				this.jurisdiction = true
-			}
-			this.getUserInfo();
+      if (this.isLogin) {
+        this.emptyText = '暂无可用应用'
+        this.jurisdiction = false
+        this.initAllAppLet();
+      } else {
+        this.emptyText = '请登录'
+        this.jurisdiction = true
+      }
+      this.getUserInfo();
       this.imgUrls = uni.getStorageSync('swiperImgList');
-		},
-		onPullDownRefresh() {
-			this.getUserInfo()
-			uni.stopPullDownRefresh()
-		},
-		beforeDestroy() {},
-		mounted() {
-
-		},
-		// #ifdef APP-PLUS
-		onPageScroll(e) {
-			const scrollTop = e.scrollTop;
-			if (scrollTop <= 20) {
-				this.backColor = 'rgba(252, 252, 252, 0)'
-				this.isFshow = false
-			} else if (20 < scrollTop && scrollTop <= 100) {
-				this.backColor = 'rgba(252, 252, 252, .5)'
-				this.isFshow = true
-			} else if (scrollTop > 100) {
-				this.backColor = 'rgba(252, 252, 252, 1)'
-				this.isFshow = true
-			}
-		},
-		// #endif
-		onHide() {
-			uni.$emit('showLoading', false);
-		},
-		methods: {
+    },
+    onPullDownRefresh() {
+      this.getUserInfo()
+      uni.stopPullDownRefresh()
+    },
+    beforeDestroy() {},
+    mounted() {},
+    // #ifdef APP-PLUS
+    onPageScroll(e) {
+      const scrollTop = e.scrollTop;
+      if (scrollTop <= 20) {
+        this.backColor = 'rgba(252, 252, 252, 0)'
+        this.isFshow = false
+      } else if (20 < scrollTop && scrollTop <= 100) {
+        this.backColor = 'rgba(252, 252, 252, .5)'
+        this.isFshow = true
+      } else if (scrollTop > 100) {
+        this.backColor = 'rgba(252, 252, 252, 1)'
+        this.isFshow = true
+      }
+    },
+    // #endif
+    onHide() {
+      uni.$emit('showLoading', false);
+    },
+    methods: {
       getNav() {
-      	getNavigation().then(res => {
-      		this.newData = res.data
-      		if (this.newData.status && this.newData.status.status) {
-      			uni.hideTabBar()
-      		} else {
-      			uni.showTabBar()
-      		}
-      	})
+        getNavigation().then(res => {
+          this.newData = res.data
+          if (this.newData.status && this.newData.status.status) {
+            uni.hideTabBar()
+          } else {
+            uni.showTabBar()
+          }
+        })
       },
-			initAllAppLet() {
-				applet().then(res => {
-					this.AllMenuList = res.data;
-					this.initMenu();
-					this.showControllerAllLet();
-				}).catch(e => {
-					console.log(e);
-				})
-			},
-			// 根据类型来判断是否显示
-			showControllerAllLet() {
-				let user;
-				if (typeof this.$store.state.app.userInfo == 'string') {
-					user = JSON.parse(this.$store.state.app.userInfo)
-				} else user = JSON.parse(JSON.stringify(this.$store.state.app.userInfo))
-				if (!user?.show_controller_applet) {
-					this.AllMenuList = this.AllMenuList.filter(item=>item.app_id!="__UNI__83ABA97"); //隐藏大屏控制
-				}
-			},
-			// 初始化菜单
-			initMenu() {
-				let nowMenu = uni.getStorageSync('gatherMenuList');
-				try {
-					let list = JSON.parse(nowMenu || '[]');
-					let now = [];
-					let all = [];
-					this.AllMenuList.forEach((item) => {
-						if (list.find(t => t.name == item.name)?.name != item.name) all.push(item);
-						else now.push(item)
-					})
-					this.AllMenuList = all;
-					this.nowMenuList = now;
-				} catch (e) {
-					this.nowMenuList = [];
-				}
-			},
-			clickMenu(data) {
-				this.getUniMp(data);
-			},
-			// 添加菜单
-			pushMenu(data) {
-				this.nowMenuList.push(data);
-				this.AllMenuList = this.AllMenuList.filter((item) => {
-					return item.name != data.name;
-				})
-			},
-			// 移除菜单
-			removeMenu(data) {
-				this.AllMenuList.push(data);
-				this.nowMenuList = this.nowMenuList.filter((item) => {
-					return item.name != data.name;
-				})
-			},
-			// 编辑完成
-			editComfirm() {
-				this.editFlag = false;
-				uni.setStorageSync('gatherMenuList', JSON.stringify(this.nowMenuList));
-			},
-			getUniMp(data) {
-				let that = this;
+      scanQRcode() {
+        uni.scanCode({
+          success: (res) => {
+            console.log(res);
+            if (res.result && res.result.includes('pages/payment/get_payment')) {
+              let url = res.result.replace(/.*lihaink.cn/g, '');
+              uni.navigateTo({
+                url: url,
+                fail: () => {
+                  Toast('跳转页面失败')
+                }
+              })
+            } else {
+              Toast('无效的二维码')
+            }
+          }
+        })
+      },
+      // 选择位置
+      changeMap() {
+        uni.navigateTo({
+          url: `/pages/select_address_n/select_address_n`,
+          success: () => {
+            uni.$once('changeAddress', (e) => {
+              this.street = e.street.name;
+              this.town = e.street.name;
+              this.$store.commit('setAddress', {
+                street_id: e.street.code,
+                townName: this.town
+              });
+              if (e.longitude) {
+                this.longitude = e.longitude;
+                this.latitude = e.latitude;
+                this.$store.commit('setLocation', {
+                  lat: e.latitude,
+                  long: e.longitude,
+                });
+              }
+            })
+          }
+        })
+      },
+      initAllAppLet() {
+        applet().then(res => {
+          this.AllMenuList = res.data;
+          this.initMenu();
+          this.showControllerAllLet();
+        }).catch(e => {
+          console.log(e);
+        })
+      },
+      // 根据类型来判断是否显示
+      showControllerAllLet() {
+        let user;
+        if (typeof this.$store.state.app.userInfo == 'string') {
+          user = JSON.parse(this.$store.state.app.userInfo)
+        } else user = JSON.parse(JSON.stringify(this.$store.state.app.userInfo))
+        if (!user?.show_controller_applet) {
+          this.AllMenuList = this.AllMenuList.filter(item => item.app_id != "__UNI__83ABA97"); //隐藏大屏控制
+        }
+      },
+      // 初始化菜单
+      initMenu() {
+        let nowMenu = uni.getStorageSync('gatherMenuList');
+        try {
+          let list = JSON.parse(nowMenu || '[]');
+          let now = [];
+          let all = [];
+          this.AllMenuList.forEach((item) => {
+            if (list.find(t => t.name == item.name)?.name != item.name) all.push(item);
+            else now.push(item)
+          })
+          this.AllMenuList = all;
+          this.nowMenuList = now;
+        } catch (e) {
+          this.nowMenuList = [];
+        }
+      },
+      clickMenu(data) {
+        this.getUniMp(data);
+      },
+      // 添加菜单
+      pushMenu(data) {
+        this.nowMenuList.push(data);
+        this.AllMenuList = this.AllMenuList.filter((item) => {
+          return item.name != data.name;
+        })
+      },
+      // 移除菜单
+      removeMenu(data) {
+        this.AllMenuList.push(data);
+        this.nowMenuList = this.nowMenuList.filter((item) => {
+          return item.name != data.name;
+        })
+      },
+      // 编辑完成
+      editComfirm() {
+        this.editFlag = false;
+        uni.setStorageSync('gatherMenuList', JSON.stringify(this.nowMenuList));
+      },
+      getUniMp(data) {
+        let that = this;
 
-				// #ifdef APP-PLUS
-				if (data.version) return uniMP.loadAppletMP(data);
-				else switch (data.type) {
-					case 1:
-						uniMP.loadMP(data.data);
-						break;
-					case 2:
-						uniMP.loadMPx(data.data);
-						break;
-					case 3:
-						uniMP.loadMPurl(data.data);
-						break;
-					case 4:
-						uniMP.loadMPdns(data.data);
-						break;
-				}
-				return;
-				// #endif
-				// #ifdef H5
-				// if (type == 2) {
-				// 	this.navigator(`/pages/moreProject/moreProject`);
-				// } else {
-				// 	uni.showToast({
-				// 		icon: 'none',
-				// 		title: 'H5不支持打开小程序'
-				// 	})
-				// }
-				uni.showToast({
-					icon: 'none',
-					title: 'H5不支持打开小程序'
-				})
-				// #endif
+        // #ifdef APP-PLUS
+        if (data.version) return uniMP.loadAppletMP(data);
+        else switch (data.type) {
+          case 1:
+            uniMP.loadMP(data.data);
+            break;
+          case 2:
+            uniMP.loadMPx(data.data);
+            break;
+          case 3:
+            uniMP.loadMPurl(data.data);
+            break;
+          case 4:
+            uniMP.loadMPdns(data.data);
+            break;
+        }
+        return;
+        // #endif
+        // #ifdef H5
+        // if (type == 2) {
+        // 	this.navigator(`/pages/moreProject/moreProject`);
+        // } else {
+        // 	uni.showToast({
+        // 		icon: 'none',
+        // 		title: 'H5不支持打开小程序'
+        // 	})
+        // }
+        uni.showToast({
+          icon: 'none',
+          title: 'H5不支持打开小程序'
+        })
+        // #endif
 
-			},
-			navigator(url, t) {
-				// if (this.userInfoData.is_wsxx === 0 && t != '商户设置') return Toast("请完善商户信息");
-				uni.navigateTo({
-					url: url
-				})
-			},
-			getUserInfo: function() {
-				let that = this;
-				getUserInfo().then(res => {
-					that.userInfoData = res.data;
-					that.$store.commit('SET_USERINFO', res.data);
-					// console.log(res.data.service);
-					if (res.data.service == null) {
-						// console.log('123');
-						this.isShow = false
-					} else {
-						this.isShow = true
-						this.mer_id = res.data.service.mer_id
-					}
+      },
+      navigator(url, t) {
+        // if (this.userInfoData.is_wsxx === 0 && t != '商户设置') return Toast("请完善商户信息");
+        uni.navigateTo({
+          url: url
+        })
+      },
+      getUserInfo: function() {
+        let that = this;
+        getUserInfo().then(res => {
+          that.userInfoData = res.data;
+          that.$store.commit('SET_USERINFO', res.data);
+          // console.log(res.data.service);
+          if (res.data.service == null) {
+            // console.log('123');
+            this.isShow = false
+          } else {
+            this.isShow = true
+            this.mer_id = res.data.service.mer_id
+          }
 
-					if (!res.data.mer_info) {
-						that.$set(this, 'jurisdiction', false);
-					}
-				});
-			},
-		}
-	};
+          if (!res.data.mer_info) {
+            that.$set(this, 'jurisdiction', false);
+          }
+        });
+      },
+    }
+  };
 </script>
 <style lang="scss" scoped>
-	.gather {
-		padding-bottom: 164.91rpx;
-		background: linear-gradient(180deg, #ffffff 0%, #f6f6f6 100%);
-		position: relative;
-	}
+  .gather {
+    padding-bottom: 164.91rpx;
+    background: linear-gradient(180deg, #ffffff 0%, #f6f6f6 100%);
+    position: relative;
+  }
 
-	.sitebox {
-		animation-name: fadeIn;
-		animation-duration: 3s;
-		animation-fill-mode: forwards;
-	}
+  .sitebox {
+    animation-name: fadeIn;
+    animation-duration: 3s;
+    animation-fill-mode: forwards;
+  }
 
-	@keyframes fadeIn {
-		from {
-			opacity: 0;
-		}
+  @keyframes fadeIn {
+    from {
+      opacity: 0;
+    }
 
-		to {
-			opacity: 1;
-		}
-	}
+    to {
+      opacity: 1;
+    }
+  }
 
-	.site-box1 {
-		width: 706rpx;
-		/* #ifdef MP || APP-PLUS */
-		height: 160rpx;
-		/* #endif */
-		/* #ifdef H5 */
-		height: 120rpx;
-		/* #endif */
-		margin-bottom: 26.32rpx;
-		position: absolute;
-		top: 45rpx;
-		left: 20rpx;
+  .site-box1 {
+    width: 706rpx;
+    /* #ifdef MP || APP-PLUS */
+    height: 160rpx;
+    /* #endif */
+    /* #ifdef H5 */
+    height: 120rpx;
+    /* #endif */
+    margin-bottom: 26.32rpx;
+    position: absolute;
+    top: 45rpx;
+    left: 20rpx;
 
-		z-index: 999;
+    z-index: 999;
 
-		// 位置
-		.place_wrapper {
-			color: #fff;
-			margin-right: 0rpx;
+    // 位置
+    .place_wrapper {
+      color: #fff;
+      margin-right: 0rpx;
 
-			font-size: 30rpx;
+      font-size: 30rpx;
 
-			.town_name {
-				margin-left: 21rpx;
-			}
-		}
+      .town_name {
+        margin-left: 21rpx;
+      }
+    }
 
-		.iconfont {
-			font-size: 35.09rpx;
-		}
-	}
+    .iconfont {
+      font-size: 35.09rpx;
+    }
+  }
 
-	.site-box {
-		width: 100%;
-		/* #ifdef MP || APP-PLUS */
-		height: 160rpx;
-		/* #endif */
-		/* #ifdef H5 */
-		height: 120rpx;
-		/* #endif */
-		margin-bottom: 26.32rpx;
-		position: absolute;
-		top: 0rpx;
-		position: fixed;
-		z-index: 999;
-		/* #ifdef MP || APP-PLUS */
-		padding-top: 75rpx;
-		/* #endif */
-		/* #ifdef H5 */
-		padding-top: 25rpx;
-		/* #endif */
-		// background-color: #e5e5e5;
-		// background: url("@/static/images/bg2.png") no-repeat;
-		background-size: 100% 100%;
-		padding-right: 20rpx;
+  .site-box {
+    width: 100%;
+    /* #ifdef MP || APP-PLUS */
+    height: 160rpx;
+    /* #endif */
+    /* #ifdef H5 */
+    height: 120rpx;
+    /* #endif */
+    margin-bottom: 26.32rpx;
+    position: absolute;
+    top: 0rpx;
+    position: fixed;
+    z-index: 999;
+    /* #ifdef MP || APP-PLUS */
+    padding-top: 75rpx;
+    /* #endif */
+    /* #ifdef H5 */
+    padding-top: 25rpx;
+    /* #endif */
+    // background-color: #e5e5e5;
+    // background: url("@/static/images/bg2.png") no-repeat;
+    background-size: 100% 100%;
+    padding-right: 20rpx;
 
-		// 位置
-		.place_wrapper {
-			color: #fff;
-			margin-right: 24.56rpx;
-			font-size: 30rpx;
+    // 位置
+    .place_wrapper {
+      color: #fff;
+      margin-right: 24.56rpx;
+      font-size: 30rpx;
 
-			opacity: 0;
+      opacity: 0;
 
-			.town_name {
-				margin-left: 21rpx;
-			}
-		}
+      .town_name {
+        margin-left: 21rpx;
+      }
+    }
 
-		.iconfont {
-			opacity: 0;
-			font-size: 30rpx;
-			font-size: 35.09rpx;
-		}
-	}
+    .iconfont {
+      opacity: 0;
+      font-size: 30rpx;
+      font-size: 35.09rpx;
+    }
+  }
 
-	.top_box {
-		// padding-top: 180rpx;
-		background: linear-gradient(#36a2ff, #fff);
-	}
+  .top_box {
+    // padding-top: 180rpx;
+    background: linear-gradient(#36a2ff, #fff);
+  }
 
-	.com {
-		margin-left: 50%;
-		transform: translate(-50%);
-	}
+  .com {
+    margin-left: 50%;
+    transform: translate(-50%);
+  }
 
-	.business {
-		width: 694.74rpx;
-		// margin-bottom: 175rpx;
-	}
+  .business {
+    width: 694.74rpx;
+    // margin-bottom: 175rpx;
+  }
 
-	.special_work {
-		// padding: 17.54rpx;
-		width: 694.74rpx;
-		padding-top: 30rpx;
-		border-radius: 17.54rpx;
-		// box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.16);
+  .special_work {
+    // padding: 17.54rpx;
+    width: 694.74rpx;
+    padding-top: 30rpx;
+    border-radius: 17.54rpx;
+    // box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.16);
 
-		.title {
-			font-size: 31.58rpx;
-			font-weight: 700;
-			margin-bottom: 38.6rpx;
-		}
+    .title {
+      font-size: 31.58rpx;
+      font-weight: 700;
+      margin-bottom: 38.6rpx;
+    }
 
-		.project {
-			display: flex;
-			justify-content: space-between;
-			align-items: flex-end;
+    .project {
+      display: flex;
+      justify-content: space-between;
+      align-items: flex-end;
 
-			.edit {
-				font-size: 26rpx;
-				font-weight: 400;
+      .edit {
+        font-size: 26rpx;
+        font-weight: 400;
 
-				&::after {
-					content: ">";
-					margin-left: 10rpx;
-				}
-			}
+        &::after {
+          content: ">";
+          margin-left: 10rpx;
+        }
+      }
 
-			.edit2 {
-				font-size: 26rpx;
-				font-weight: 400;
-			}
-		}
+      .edit2 {
+        font-size: 26rpx;
+        font-weight: 400;
+      }
+    }
 
-		.content {
-			display: flex;
-			align-content: center;
-			flex-wrap: wrap;
-			// justify-content: space-between;
+    .content {
+      display: flex;
+      align-content: center;
+      flex-wrap: wrap;
+      // justify-content: space-between;
 
-			.examine {
-				margin-bottom: 35rpx;
-				width: 173.68rpx;
-				display: flex;
-				flex-direction: column;
-				justify-content: center;
-				align-items: center;
-				position: relative;
-				// margin: 0 0 33.33rpx 33.33rpx !important;
+      .examine {
+        margin-bottom: 35rpx;
+        width: 173.68rpx;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        position: relative;
+        // margin: 0 0 33.33rpx 33.33rpx !important;
 
-				.icon_img {
-					width: 83.16rpx;
-					height: 83.16rpx;
-				}
+        .icon_img {
+          width: 83.16rpx;
+          height: 83.16rpx;
+        }
 
-				.icon {
-					position: absolute;
-					top: -5rpx;
-					right: 25rpx;
+        .icon {
+          position: absolute;
+          top: -5rpx;
+          right: 25rpx;
           background-color: green;
           color: #fff;
           border-radius: 50rpx;
           font-size: 22rpx;
           padding: 5rpx 10rpx;
-				}
+        }
 
-				.text {
-					font-size: 26.32rpx;
-					margin-top: 21.05rpx;
-					color: #000;
-				}
-			}
+        .text {
+          font-size: 26.32rpx;
+          margin-top: 21.05rpx;
+          color: #000;
+        }
+      }
 
-			.text {
-				font-size: 29.82rpx;
-				color: #a4a4a4;
-			}
-		}
+      .text {
+        font-size: 29.82rpx;
+        color: #a4a4a4;
+      }
+    }
 
-		.cont_jus {
-			margin-top: 56.14rpx;
-			justify-content: flex-start;
+    .cont_jus {
+      margin-top: 56.14rpx;
+      justify-content: flex-start;
 
-			&:first-child {
-				// margin-right: 33rpx;
-			}
+      &:first-child {
+        // margin-right: 33rpx;
+      }
 
-			.examine {
-				margin-right: 48rpx;
+      .examine {
+        margin-right: 48rpx;
 
-				&:first-child {
-					margin-right: 48rpx;
-				}
-			}
-		}
-	}
+        &:first-child {
+          margin-right: 48rpx;
+        }
+      }
+    }
+  }
 
-	.edit_card {
-		background-color: #fff;
-		padding-top: 28rpx;
-	}
+  .edit_card {
+    background-color: #fff;
+    padding-top: 28rpx;
+  }
 
-	.rotate-box {
-		transform: rotate(0deg);
-		transition: transform .5s ease-out;
-	}
+  .rotate-box {
+    transform: rotate(0deg);
+    transition: transform .5s ease-out;
+  }
 
-	.rotate-box:active {
-		transform: rotate(360deg);
-	}
+  .rotate-box:active {
+    transform: rotate(360deg);
+  }
 
-	// .location {
-	// 	background-color: #f6f6f6;
-	// 	width: 680rpx;
-	// 	height: 150rpx;
-	// 	position: absolute;
-	// 	top: 0;
-	// 	z-index: 9999;
-	// 	border-radius: 20rpx;
-	// 	left: 50%;
-	// 	margin-left: -340rpx;
-	// 	margin-top: 80rpx;
-	// 	padding-left: 20rpx;
+  // .location {
+  // 	background-color: #f6f6f6;
+  // 	width: 680rpx;
+  // 	height: 150rpx;
+  // 	position: absolute;
+  // 	top: 0;
+  // 	z-index: 9999;
+  // 	border-radius: 20rpx;
+  // 	left: 50%;
+  // 	margin-left: -340rpx;
+  // 	margin-top: 80rpx;
+  // 	padding-left: 20rpx;
 
-	// 	.locationa {
-	// 		font-size: 28rpx;
-	// 		color: #000;
-	// 		font-weight: 500;
-	// 		margin-top: 30rpx;
-	// 		margin-bottom: 15rpx;
-	// 	}
+  // 	.locationa {
+  // 		font-size: 28rpx;
+  // 		color: #000;
+  // 		font-weight: 500;
+  // 		margin-top: 30rpx;
+  // 		margin-bottom: 15rpx;
+  // 	}
 
-	// 	.locationb {
-	// 		font-size: 20rpx;
-	// 		color: #5a5a5a;
-	// 	}
+  // 	.locationb {
+  // 		font-size: 20rpx;
+  // 		color: #5a5a5a;
+  // 	}
 
-	// 	.locationx {
-	// 		color: #000;
-	// 		position: absolute;
-	// 		top: 10rpx;
-	// 		right: 20rpx;
-	// 	}
-	// }
+  // 	.locationx {
+  // 		color: #000;
+  // 		position: absolute;
+  // 		top: 10rpx;
+  // 		right: 20rpx;
+  // 	}
+  // }
 </style>
\ No newline at end of file
diff --git a/pages/index/component/homeComb.vue b/pages/index/component/homeComb.vue
index aaf44fa..a1751c4 100644
--- a/pages/index/component/homeComb.vue
+++ b/pages/index/component/homeComb.vue
@@ -10,10 +10,10 @@
 						<view class="town_name">{{street||'定位中' }}</view>
 					</view>
 					<view class="flex_a_c_j_sb">
-						<navigator style="margin-right: 30rpx;" url="/pages/chat/customer_list/index?type=0"
+						<view style="margin-right: 30rpx;" @click="scanQRcode"
 							hover-class="none">
 							<view class="iconfont icon-saoma" style="color:#fff;font-size:40rpx;"> </view>
-						</navigator>
+						</view>
 						<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
 							<view class="iconfont icon-xiaoxi" style="color:#fff;font-size:40rpx;"> </view>
 						</navigator>
@@ -221,6 +221,24 @@
 			})
 		},
 		methods: {
+      scanQRcode() {
+      	uni.scanCode({
+      		success: (res) => {
+      			console.log(res);
+      			if (res.result && res.result.includes('pages/payment/get_payment')) {
+      				let url = res.result.replace(/.*lihaink.cn/g, '');
+      				uni.navigateTo({
+      					url: url,
+      					fail: () => {
+      						Toast('跳转页面失败')
+      					}
+      				})
+      			} else {
+      				Toast('无效的二维码')
+      			}
+      		}
+      	})
+      },
       // 选择位置
       changeMap() {
       	uni.navigateTo({
diff --git a/pages/index/index.vue b/pages/index/index.vue
index c411f14..5bd3915 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1008,11 +1008,13 @@
       loadGoods(e=1){
         if(e==1) return this.get_host_product();
         if(e==2) return this.get_host_home({
-          mer_id: 259
+          mer_type: 1
+        });
+        if(e==3) return this.get_host_home({
+          mer_type: 2
         });
-        if(e==3) return this.get_host_home();
         if(e==4) return this.get_host_home({
-          label_name: '名优特产'
+          mer_type: 3
         });
       },
 			/**
diff --git a/pages/payment/get_payment.vue b/pages/payment/get_payment.vue
new file mode 100644
index 0000000..78e7720
--- /dev/null
+++ b/pages/payment/get_payment.vue
@@ -0,0 +1,421 @@
+<template>
+	<view class="container">
+		<view v-if="!isWeixin" class="v-navbar">
+			<u-navbar title="提货付款" :safeAreaInsetTop="false" :fixed="false" @leftClick="leftClick" bgColor="transparent"
+				leftIconColor="#fff" :titleStyle="{color:'#fff',fontWeight:'bold',fontSize:'32rpx'}">
+			</u-navbar>
+		</view>
+    <view style="height: 150rpx;"></view>
+		<view v-if="merchantInfo && !isEmpty">
+			<view class="v-desc">
+				<view>
+					<view class="v-desc-main">确认提货付款</view>
+					<view class="v-desc-sub">{{merchantInfo.merchant.mer_name}}</view>
+				</view>
+				<u-image :showLoading="true" :src="merchantInfo.merchant.mer_avatar" width="182rpx" height="182rpx"
+					:radius="10" />
+			</view>
+
+			<!-- 付款金额 -->
+			<view class="v-con">
+				<view class="v-con-text">付款金额</view>
+				<view class="v-con-input" style="margin-right: 10px;">
+					<text style="color: #303133;font-size:46rpx;">￥</text>
+					<u--input type="digit" fontSize="23" v-model="cartForm.total_amount" placeholder="请输入金额"
+						border="none" placeholderStyle="color:#999;font-size:30rpx" @input="validateDecimal">
+					</u--input>
+				</view>
+
+				<view class="v-wrap" v-if="cartForm.total_amount">
+					<view class="v-wrap-money">
+						<text class="icon">￥</text>
+						<text class="num">{{cartForm.total_amount}}</text>
+					</view>
+					<view class="v-wrap-desc">
+						<view class="v-wrap-desc-main">实物提货券</view>
+						<view class="v-wrap-desc-sub">即买即用</view>
+					</view>
+				</view>
+			</view>
+
+			<view class="v-btn-wrap">
+				<view class="v-btn" @click="submitOrder">提交订单</view>
+			</view>
+
+			<!-- 登陆 -->
+			<authorize :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse" @onLoadFun="onLoadFun">
+			</authorize>
+		</view>
+
+		<!-- 无商户信息提示 -->
+		<view v-else class="empty">
+			<image src="/static/images/no_thing.png"></image>
+			<text style="margin-top: 60rpx;">{{tips}}</text>
+			<!-- 登陆 -->
+			<authorize v-show="!isWeixin" ref="authRef" :isAuto="isAuto" :isGoIndex="false" :isShowAuth="isShowAuth" @authColse="authColse"
+				@onLoadFun="onLoadFun">
+			</authorize>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getProductInfo,
+		addCart,
+		orderCheck
+	} from "@/api/payment.js";
+	import Cache from '@/utils/cache';
+	import {
+		mapGetters
+	} from "vuex";
+	import authorize from '@/components/Authorize';
+import { Toast } from "../../libs/uniApi";
+	export default {
+		components: {
+			authorize
+		},
+		computed: {
+			...mapGetters(['isLogin']),
+		},
+		data() {
+			return {
+				isEmpty: false,
+        isWeixin: this.$wechat.isWeixin(),
+				cartForm: {
+					product_id: '',
+					product_attr_unique: '',
+					cart_num: 1,
+					is_new: 1,
+					product_type: 0,
+					source: 999,
+					total_amount: ''
+				},
+				merchantInfo: '',
+				checkForm: {
+					address_id: '',
+					cart_id: [],
+					consumption_id: '',
+					product_type: 0,
+					source: 999,
+					takes: [],
+					use_coupon: {},
+					use_integral: false
+				},
+				isAuto: false, //没有授权的不会自动授权
+				isShowAuth: false, //是否隐藏授权
+				mer_id: '',
+				tips: '暂未登陆~'
+			}
+		},
+
+		onLoad(opt) {
+			this.mer_id = opt.mer_id;
+		},
+		onShow() {
+			if (!this.isLogin) {
+				Cache.set("login_back_url_weixin", "/" + getCurrentPages()[0].route + "?mer_id=" + this.mer_id);
+				this.isAuto = true;
+				this.isShowAuth = true;
+        if(this.isWeixin) {
+          this.tips = '加载中...';
+          this.$nextTick(()=>{
+            this.$refs.authRef.toWecahtAuth();
+          })
+        }
+			} else {
+        this.checkForm.cart_id = [];
+				this.getProductInfoByMerid(this.mer_id);
+			}
+		},
+		methods: {
+			validateDecimal(event) {
+				let val = (this.cartForm.total_amount.match(/^\d*(\.?\d{0,2})/g)[0]) || ''
+				this.$nextTick(() => {
+					this.cartForm.total_amount = val;
+				})
+			},
+
+			leftClick(e) {
+				uni.switchTab({
+					url: '/pages/index/index'
+				})
+			},
+			// 授权关闭
+			authColse: function(e) {
+				this.isShowAuth = e;
+			},
+			onLoadFun() {
+				this.getProductInfoByMerid(this.mer_id);
+				this.isShowAuth = false;
+			},
+
+			// 提交订单
+			submitOrder() {
+				if (!this.cartForm.total_amount) {
+					return this.$util.Tips({
+						title: "请输入付款金额！"
+					})
+				}
+				// 订单
+				this.cartForm.product_id = this.merchantInfo.product_id;
+				this.cartForm.product_type = this.merchantInfo.product_type;
+				this.cartForm.product_attr_unique = this.merchantInfo.sku[''].unique;
+
+				let that = this;
+				addCart(this.cartForm).then(res => {
+					// 购物车ID
+					that.checkForm.cart_id.push(res.data.cart_id);
+					orderCheck(that.checkForm).then(res1 => {
+						uni.navigateTo({
+							url: "/pages/payment/settlement?cartId=" + this.checkForm
+								.cart_id + "&money=" + this.cartForm.total_amount +
+								"&merName=" + this.merchantInfo.merchant.mer_name,
+							success: (res) => {
+								res.eventChannel.emit('datas', res1.data.platformConsumption);
+							}
+						})
+					}).catch(err=>{
+            Toast(err.message || err)
+          });
+				}).catch((err) => {
+					this.$util.Tips({
+						title: err.message || err.msg || err
+					})
+				})
+			},
+
+			getProductInfoByMerid(merid) {
+				let that = this;
+				getProductInfo({
+					mer_id: merid
+				}).then(res => {
+					this.merchantInfo = res.data;
+				}).catch((err) => {
+					this.tips = err.message || err.smg || err;
+					this.$util.Tips({
+						title: err.message || err.msg || err
+					})
+					// #ifdef APP
+					setTimeout(() => {
+						uni.navigateBack({
+							delta: 1
+						})
+					}, 1500)
+					// #endif
+
+					// #ifndef APP
+					that.isEmpty = true;
+					// #endif
+				})
+			},
+
+			// 图片保存
+			handleSavePic() {
+				// 获取要保存的图片路径或URL
+				let imageUrl = this.qrcodeUrl; // 这里使用了网络上的图片作为示例
+
+				// #ifdef H5
+				var a = document.createElement("a");
+				a.download = imageUrl;
+				a.href = imageUrl;
+				document.body.appendChild(a);
+				a.click();
+				a.remove();
+				// #endif
+
+				// #ifndef H5
+				let that = this;
+				uni.downloadFile({
+					url: imageUrl,
+					success(res) {
+						if (res.statusCode === 200) {
+							let tempFilePath = res.tempFilePath; // 临时文件路径
+							uni.saveImageToPhotosAlbum({
+								filePath: tempFilePath,
+								success() {
+									return that.$util.Tips({
+										title: '图片已保存至相册!'
+									});
+								},
+								fail(err) {
+									console.error('保存失败', err);
+								}
+							});
+						} else {
+							console.error('下载失败', res.statusCode);
+						}
+					},
+					fail(err) {
+						console.error('下载失败', err);
+					}
+				});
+				// #endif
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #FCDFAD;
+	}
+
+	.empty {
+		margin: 0;
+		text-align: center;
+
+		image,
+		uni-image {
+			display: inline-block;
+			width: 414rpx;
+			height: 305rpx;
+		}
+
+		text {
+			display: block;
+			color: #666;
+			font-size: 26rpx;
+		}
+	}
+
+	.container {
+		position: relative;
+		height: 100vh;
+		background-image: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/def/c582c202402291601584806.webp");
+		background-size: 100% auto;
+		background-repeat: no-repeat;
+		padding-top: var(--status-bar-height);
+
+		.v-desc {
+			position: absolute;
+			top: 196rpx;
+			z-index: 10;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			width: 100%;
+			padding: 0 20rpx;
+			background: transparent;
+
+			.v-desc-main {
+				margin-bottom: 30rpx;
+				font-weight: 600;
+				font-size: 42rpx;
+				color: #FFFFFF;
+			}
+
+			.v-desc-sub {
+				font-weight: 500;
+				font-size: 24rpx;
+				color: #FFFFFF;
+			}
+		}
+
+		.v-con {
+			position: absolute;
+			top: 436rpx;
+			left: 50%;
+			transform: translateX(-50%);
+			width: 710rpx;
+			height: 680rpx;
+			background: linear-gradient(180deg, #FEB992 0%, #FFFFFF 31%, #FFFFFF 100%);
+			border-radius: 20rpx;
+			margin: 0 auto;
+			box-shadow: 0 -4rpx 0px 0px #fff;
+			padding: 53rpx 30rpx 0 30rpx;
+			box-sizing: border-box;
+
+			.v-con-text {
+				margin-bottom: 60rpx;
+				font-weight: 400;
+				font-size: 32rpx;
+				color: #2E2E2E;
+				line-height: 16rpx;
+			}
+
+			.v-con-input {
+				display: flex;
+				align-items: center;
+				margin-bottom: 83rpx;
+				padding: 0 0 40rpx 12rpx;
+				border-bottom: 1rpx solid #D6D6D6;
+			}
+
+			.v-wrap {
+				display: flex;
+				align-items: center;
+				padding-left: 20rpx;
+				width: 666rpx;
+				height: 210rpx;
+				background-image: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/def/2f9c2202402291652415355.webp");
+				background-size: 100% 100%;
+				background-repeat: no-repeat;
+
+				.v-wrap-money {
+					display: flex;
+					align-items: center;
+					color: #FF5E0C;
+					margin-right: 30rpx;
+
+					.icon {
+						font-size: 34rpx;
+					}
+
+					.num {
+						font-size: 46rpx;
+						display: inline-block;
+						overflow: auto;
+						width: 180rpx;
+					}
+				}
+
+				.v-wrap-desc {
+					.v-wrap-desc-main {
+						margin-bottom: 16rpx;
+						font-weight: 600;
+						font-size: 32rpx;
+						color: #2E2E2E;
+					}
+
+					.v-wrap-desc-sub {
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #2E2E2E;
+					}
+				}
+			}
+		}
+
+		.v-btn-wrap {
+			position: fixed;
+			z-index: 11;
+			bottom: 0;
+			left: 0;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			width: 100%;
+			height: 240rpx;
+			background-color: #FDD6A6;
+
+			.v-btn {
+				width: 650rpx;
+				height: 100rpx;
+				line-height: 100rpx;
+				background: #FF8056;
+				box-shadow: 0rpx 3rpx 3rpx 1rpx rgba(255, 94, 12, 0.4);
+				border-radius: 55rpx 55rpx 55rpx 55rpx;
+				border: 1rpx solid #FF8056;
+				font-weight: 600;
+				font-size: 32rpx;
+				color: #FFFFFF;
+				text-align: center;
+
+				&:active {
+					opacity: .8;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/payment/settlement.vue b/pages/payment/settlement.vue
new file mode 100644
index 0000000..3577856
--- /dev/null
+++ b/pages/payment/settlement.vue
@@ -0,0 +1,967 @@
+<template>
+  <view :style="viewColor">
+    <view class='order-submission'>
+      <!-- 商品信息 -->
+      <view class="storeinfo-wrapper">
+        <view class="store-item">
+          <view class="store-title">
+            <text class="iconfont icon-shangjiadingdan"></text>
+            <view class="txt" @click="goStore(item.mer_id)">{{payForm.merName}}</view>
+            <text class="iconfont icon-xiangyou"></text>
+          </view>
+
+          <view class="product-item">
+            <view class="img-box">
+              <image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/89ad3202402292014108303.jpg" width="170rpx"
+                height="180rpx" />
+            </view>
+            <view class="content event_content">
+              <view class="name line1">
+                {{payForm.money}}元实物提货券
+              </view>
+              <view style="margin-top: 30rpx;color: #FF5C2D;">
+                ￥{{payForm.money}}
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+
+      <view class='wrapper'>
+        <view class='item'>
+          <view style="font-weight: bold;">支付方式</view>
+          <view class='list'>
+            <!-- #ifdef H5 -->
+            <view class='payItem acea-row row-middle' :class='active==index ?"on":""' @tap='payItem(index)'
+              v-for="(item,index) in cartArr" :key='index' v-if="item.payStatus==1">
+              <view class='name acea-row row-center-wrapper'>
+                <view class='iconfont animated'
+                  :class='(item.icon) + " " + (animated==true&&active==index ?"bounceIn":"")'></view>
+                {{item.name}}
+              </view>
+              <view class='tip'>
+                {{item.title}}
+                <block v-if="item.value == 'balance'">
+                  {{userInfo.now_money}}
+                </block>
+              </view>
+            </view>
+            <!-- #endif -->
+            <!-- #ifdef MP || APP-PLUS -->
+            <view class='payItem acea-row row-middle' :class='active==index ?"on":""' @tap='payItem(index)'
+              v-for="(item,index) in cartArr" :key='index' v-if="item.payStatus==1">
+              <view class='name acea-row row-center-wrapper'>
+                <view class='iconfont animated'
+                  :class='(item.icon) + " " + (animated==true&&active==index ?"bounceIn":"")'></view>
+                {{item.name}}
+              </view>
+              <view class='tip'>
+                {{item.title}}
+                <block v-if="item.value == 'balance'">
+                  {{userInfo.now_money}}
+                </block>
+              </view>
+            </view>
+            <!-- #endif -->
+          </view>
+        </view>
+      </view>
+
+      <view class='moneyList'>
+        <view class='item acea-row row-between-wrapper'>
+          <view>商品总价：</view>
+          <view class='money'>￥{{payForm.money}}</view>
+        </view>
+
+        <view class='item acea-row row-between-wrapper'>
+          <view>补贴抵扣</view>
+          <block v-if="platformConsumption.length > 0" >
+            <view class='discount money red_packet' @click="couponTap3()">
+              <text v-if="consumption_id">-￥{{consumption_money||'0.00'}}</text>
+              <text v-else>有补贴补贴未选</text>
+              <text class='iconfont icon-jiantou'></text>
+            </view>
+          </block>
+          <block v-else>
+            <view class='discount'>暂无抵扣红包</view>
+          </block>
+        </view>
+      </view>
+      <view style='height:140rpx;'></view>
+
+      <view class='footer acea-row row-between-wrapper'>
+        <view class="footer_count">
+          <view>
+            合计:
+            <text class='pColor' v-if="cartArr[4].payStatus == 1 && active == 4">￥0.00</text>
+            <text class='pColor' v-else>￥{{ total_coupon }}</text>
+          </view>
+        </view>
+        <view class='settlement' :class='couponData.status != "noAddress" ? "" : "disabled"' style='z-index:100'
+          @tap="SubOrder">{{couponData.status != "noAddress" ? '提交订单':'选择地址'}}</view>
+      </view>
+    </view>
+  </view>
+</template>
+<script>
+  // +----------------------------------------------------------------------
+  // | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+  // +----------------------------------------------------------------------
+  // | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
+  // +----------------------------------------------------------------------
+  // | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+  // +----------------------------------------------------------------------
+  // | Author: CRMEB Team <admin@crmeb.com>
+  // +----------------------------------------------------------------------
+  let app = getApp();
+  import {
+    orderConfirm,
+    createOrder
+  } from '@/api/order.js';
+  import {
+    getUserInfo,
+  } from '@/api/user.js';
+  import {
+    openPaySubscribe
+  } from '@/utils/SubscribeMessage.js';
+  import {
+    mapGetters
+  } from "vuex";
+  import {
+    configMap
+  } from '@/utils';
+  import {
+    orderPay,
+    orderCheck
+  } from "@/api/payment.js";
+
+  export default {
+    data() {
+      return {
+        platformConsumption: [],
+        //支付方式
+        cartArr: [{
+            "name": "微信支付",
+            "icon": "icon-weixin2",
+            value: 'weixin',
+            title: '微信快捷支付',
+            payStatus: 1,
+          },
+          {
+            name: "支付宝支付",
+            icon: "icon-icon34",
+            // #ifdef H5 || APP-PLUS
+            value: 'alipay',
+            // #endif
+            // #ifdef MP
+            value: 'alipayQr',
+            // #endif
+            title: '支付宝支付',
+            payStatus: this.$store.getters.globalData.alipay_open
+          },
+          {
+            "name": "余额支付",
+            "icon": "icon-icon-test",
+            value: 'balance',
+            title: '可用余额:',
+            payStatus: this.$store.getters.globalData.yue_pay_status,
+          },
+          {
+            "name": "线下支付",
+            "icon": "icon-yinhangqia",
+            value: 'offline',
+            title: '线下支付',
+            payStatus: 2,
+          }, {
+            "name": "先货后款",
+            "icon": "tan-a-lujing17324",
+            value: 'creditBuy',
+            title: `结算周期：${this.settle_cycle}天 日利率：${this.interest_rate}%`,
+            payStatus: '',
+          },
+        ],
+        tagStyle: {
+          img: 'width:100%;display:block;',
+          video: 'width:100%;'
+        },
+        radioList: [{
+          title: this.deliveryName,
+          check: true
+        }, {
+          title: '到店核销',
+          check: false
+        }],
+        payType: 'weixin', //支付方式
+        active: 0, //支付方式切换
+        address: {
+          address: false
+        }, //地址组件
+        couponId: 0, //优惠券id
+        cartId: '', //购物车id
+        userInfo: {}, //用户信息
+        coupon_price: 0, //优惠券抵扣金额
+        ChangePrice: 0, //使用积分抵扣变动后的金额
+        formIds: [], //收集formid
+        status: 0,
+        is_address: false,
+        toPay: false, //修复进入支付时页面隐藏从新刷新页面
+        cartInfo: [],
+        priceGroup: {},
+        animated: false,
+        totalPrice: 0,
+        offlinePostage: "",
+
+        from: '',
+        orderStatus: '', //是否有地址
+        couponIndex: 0, //选择商铺优惠券索引
+        subCoupon: {}, //提交订单使用的优惠券
+        couponData: {},
+        orderPay: false,
+        pics: [],
+        extend: [],
+        virtualIndex: 0,
+        platformCoupon: [],
+        total_platform_coupon_price: 0,
+        enabledPlatformCoupon: false,
+        plantCoupon: false,
+        order_key: '',
+        product_type: '',
+        source: null,
+        settle_cycle: '', // 周期
+        type_id: '', //店铺类型
+        consumption_id: '', //补贴id
+        consumption_money: '', //补贴抵扣金额
+        total_coupon: '', //合计
+        payForm: {
+          cart_id: '',
+          address_id: '',
+          consumption_id: '',
+          use_coupon: '',
+          takes: '',
+          use_integral: '',
+          receipt_data: [],
+          mark: '',
+          pay_type: '',
+          money: '',
+          merName: '',
+          return_url: ''
+        },
+        checkForm: {
+        	address_id: '',
+        	cart_id: [],
+        	consumption_id: '',
+        	product_type: 0,
+        	source: 999,
+        	takes: [],
+        	use_coupon: {},
+        	use_integral: false
+        },
+      };
+    },
+    computed: {
+      ...mapGetters(['isLogin', 'viewColor']),
+      ...configMap(['hide_mer_status', 'yue_pay_status']),
+    },
+    watch: {
+      yue_pay_status(n) {
+        this.payMode[2].payStatus = n
+      }
+    },
+    onLoad: function(options) {
+      options.money = parseFloat(options.money).toFixed(2);
+      this.payForm.cart_id = options.cartId;
+      this.payForm.money = options.money;
+      this.payForm.merName = options.merName;
+      this.checkForm.cart_id = options.cartId.split(',');
+      this.total_coupon = options.money;
+      
+      // this.platformConsumption = [{
+      //   balance: "39000.00",
+      //   coupon_price: "50000.00",
+      //   coupon_title: "春耕采购余额",
+      //   coupon_user_id: 178,
+      //   describe: "仅限平台指定商家商品可使用",
+      //   end_time: "2025-07-01 00:00:00",
+      //   start_time: "2024-03-02 14:15:17",
+      //   uid: 889
+      // }]
+
+      const eventChannel = this.getOpenerEventChannel();
+      eventChannel.on('datas', (data) => {
+        this.platformConsumption = data;
+      })
+
+      // #ifdef H5
+      this.from = this.$wechat.isWeixin() ? 'weixin' : 'h5'
+      // #endif
+      // #ifdef MP
+      this.from = 'routine'
+      // #endif
+      // #ifdef APP-PLUS
+      this.from = 'weixin'
+      // #endif
+
+      if (!this.isLogin) {
+        this.isAuto = true;
+        this.isShowAuth = true
+      }
+    },
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function() {
+      this.getUserInfo()
+    },
+
+    methods: {
+      couponTap3: function(item, index) {
+        uni.navigateTo({
+          url: '/pages/redpacket/redpacket',
+          success: (res) => {
+            res.eventChannel.emit('changeRedPacketInfo', this.platformConsumption)
+            uni.$once('changeRedPacket', (data) => {
+              this.consumption_id = data;
+              orderCheck({
+                ...this.checkForm,
+                consumption_id: this.consumption_id
+              }).then(res=>{
+                this.total_coupon = res.data.order_price;
+                this.consumption_money = res.data.consumption_money;
+                this.payForm.consumption_id = this.consumption_id;
+                // this.payForm.money = res.data.order_price;
+              })
+            })
+          }
+        })
+      },
+      // 授权关闭
+      authColse: function(e) {
+        console.log(e, 'authColse')
+        this.isShowAuth = e;
+      },
+      onLoadFun() {
+        this.isShowAuth = false;
+      },
+
+      // 获取个人信息
+      getUserInfo() {
+        getUserInfo().then(res => {
+          this.userInfo = res.data
+        })
+      },
+
+      payItem: function(e) {
+        let that = this;
+        let active = e;
+        that.active = active;
+        // console.log(this.active);
+        that.animated = true;
+        that.payType = that.cartArr[active].value;
+        if (that.payType == 'weixin') {
+          that.payType = that.from
+        }
+      },
+
+      payment: function(data) {
+        let that = this;
+        createOrder(data).then(res => {
+
+          let status = res.data.status,
+            orderId = res.data.result.order_id,
+            jsConfig = res.data.result.config,
+            // 暂不跳转
+            goPages = '/pages/order_pay_status/index?order_id=' + orderId + '&msg=' + res.message +
+            '&product_type=' + that.payForm.product_type + '&source=' + that.payForm.source,
+            goPagesOrder = '/pages/order_details/stay?order_id=' + orderId +
+            '&credit_buy=1&product_type=' + that.payForm.product_type;
+
+          that.orderPay = true;
+          uni.hideLoading();
+          switch (status) {
+            case 'ORDER_EXIST':
+            case 'EXTEND_ORDER':
+            case 'PAY_ERROR':
+            case 'error':
+              return that.$util.Tips({
+                title: res.message
+              }, {
+                tab: 5,
+                url: goPagesOrder
+              });
+              break;
+            case 'success':
+              return that.$util.Tips({
+                title: res.message,
+                icon: 'success'
+              }, {
+                tab: 5,
+                url: goPages
+              });
+              break;
+            case 'alipay':
+            case "alipayQr":
+              return;
+              break;
+              // #ifndef MP
+            case "wechat":
+            case "weixin":
+            case "weixinApp":
+              jsConfig.timeStamp = jsConfig.timestamp;
+              // #ifndef APP-PLUS
+              this.$wechat.pay(jsConfig).then(res => {
+                return that.$util.Tips({
+                  title: res.message,
+                  icon: 'success'
+                }, {
+                  tab: 4,
+                  url: goPages
+                });
+              }).catch(res => {
+                if (res.errMsg == 'chooseWXPay:cancel') return that.$util.Tips({
+                  title: '取消支付'
+                }, {
+                  tab: 5,
+                  url: goPages + '&status=0'
+                });
+              })
+              // #endif
+              // #ifdef APP-PLUS
+              let mp_pay_name = ''
+              if (uni.requestOrderPayment) {
+                mp_pay_name = 'requestOrderPayment'
+              } else {
+                mp_pay_name = 'requestPayment'
+              }
+              uni[mp_pay_name]({
+                provider: 'wxpay',
+                orderInfo: jsConfig,
+                success: (e) => {
+                  // 暂不跳转
+                  let url = '/pages/order_pay_status/index?order_id=' + orderId +
+                    '&msg=支付成功' + '&product_type=' + that.product_type +
+                    '&source=' + that.source;
+
+                  return that.$util.Tips({
+                    title: '支付成功',
+                    icon: 'success'
+                  }, {
+                    tab: 4,
+                    url: url
+                  });
+                },
+                fail: (e) => {
+                  console.log(e, '111111111')
+                  // 暂不跳转
+                  let url = '/pages/order_pay_status/index?order_id=' + orderId +
+                    '&msg=取消支付' + '&product_type=' + that.product_type +
+                    '&source=' + that.source;
+                  return that.$util.Tips({
+                    title: '取消支付',
+                  }, {
+                    tab: 4,
+                    url: url
+                  });
+                },
+                complete: (res) => {
+                  uni.hideLoading();
+                },
+              });
+              // #endif
+              break;
+              // #endif
+              // #ifdef MP
+            case "routine":
+              jsConfig.timeStamp = jsConfig.timestamp;
+              that.toPay = true;
+              let mp_pay_name = ''
+              if (uni.requestOrderPayment) {
+                mp_pay_name = 'requestOrderPayment'
+              } else {
+                mp_pay_name = 'requestPayment'
+              }
+              uni[mp_pay_name]({
+                ...jsConfig,
+                success: function(res) {
+                  uni.hideLoading();
+                  return that.$util.Tips({
+                    title: '支付成功',
+                    icon: 'success'
+                  }, {
+                    tab: 5,
+                    url: goPages
+                  });
+                },
+                fail: function(e) {
+                  // 暂不跳转
+                  let pages = '/pages/order_pay_status/index?order_id=' +
+                    orderId + '&msg=取消支付' + '&product_type=' + that
+                    .product_type + '&source=' + that.source;
+                  return that.$util.Tips({
+                    title: '取消支付'
+                  }, {
+                    tab: 5,
+                    url: pages + '&status=0'
+                  });
+                },
+              })
+              break;
+              // #endif
+            case "balance":
+              //余额
+              return that.$util.Tips({
+                title: res.msg
+              }, {
+                tab: 5,
+                url: goPages + '&status=1'
+              });
+              break;
+              // #ifdef H5
+            case 'h5':
+              let host = window.location.protocol + "//" + window.location.host;
+              let url =
+                `${host}/pages/order_pay_status/index?order_id=${orderId}&msg=${res.message}&product_type=${that.product_type}&source${that.source}`
+              let eUrl = encodeURIComponent(url)
+              let jsurl = jsConfig.mweb_url || jsConfig.h5_url
+              let locations = `${jsurl}&redirect_url=${eUrl}`
+              // 暂不跳转
+              setTimeout(() => {
+                location.href = locations;
+              }, 100);
+              break;
+              // #endif
+            default:
+              // 暂不跳转
+              let pages = '/pages/order_pay_status/index?order_id=' +
+                orderId + '&msg=取消支付' + '&product_type=' + that.product_type + '&source=' +
+                that.source
+
+              return that.$util.Tips({
+                title: '取消支付'
+              }, {
+                tab: 5,
+                url: pages + '&status=0'
+              });
+          }
+        }).catch(err => {
+          return that.$util.Tips({
+            title: err
+          });
+          uni.hideLoading();
+        });
+      },
+
+      SubOrder: function() {
+        let that = this,
+          data = {};
+        if (!that.payType) return that.$util.Tips({
+          title: '请选择支付方式'
+        });
+
+        if (that.payType == 'balance' && this.userInfo.now_money < this.payForm.money) {
+          return that.$util.Tips({
+            title: '余额不足，请选择其他的支付方式！'
+          });
+        }
+        this.payForm.pay_type = that.payType;
+        uni.showLoading({
+          title: '订单支付中',
+          mask: true
+        });
+
+        // #ifdef MP
+        openPaySubscribe().then(() => {
+          that.payment(this.payForm);
+        });
+        // #endif
+
+        // #ifndef MP
+        that.payment(this.payForm);
+        // #endif
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .order-submission .wrapper {
+    margin-bottom: 12rpx;
+    background-color: #fff;
+  }
+
+  .order-submission .wrapper .item {
+    padding: 27rpx 30rpx;
+    font-size: 30rpx;
+    color: #282828;
+  }
+
+  .order-submission .virtual_form {
+    padding: 0 30rpx;
+  }
+
+  /deep/.order-submission .virtual_form .uni-input-wrapper {
+    text-align: right;
+  }
+
+  .order-submission .virtual_form .item-require {
+    color: red;
+    margin-right: 4rpx;
+  }
+
+  .order-submission .virtual_form .item {
+    border-bottom: 1rpx solid #EEEEEE;
+    padding: 27rpx 0;
+  }
+
+  .upload {
+    display: -webkit-box;
+    display: -moz-box;
+    display: -webkit-flex;
+    display: -ms-flexbox;
+    display: flex;
+    -webkit-box-lines: multiple;
+    -moz-box-lines: multiple;
+    -o-box-lines: multiple;
+    -webkit-flex-wrap: wrap;
+    -ms-flex-wrap: wrap;
+    flex-wrap: wrap;
+  }
+
+  .order-submission .virtual_form .pictrue {
+    width: 156rpx;
+    height: 156rpx;
+    margin: 24rpx 20rpx 0 0;
+    position: relative;
+    font-size: 11px;
+    color: #bbb;
+    border-radius: 3rpx;
+
+    &:nth-child(4n) {
+      margin-right: 0;
+    }
+
+    &:nth-last-child(1) {
+      border: 0.5px solid #ddd;
+      box-sizing: border-box;
+    }
+
+    uni-image,
+    image {
+      width: 100%;
+      height: 100%;
+      border-radius: 1px;
+
+      img {
+        -webkit-touch-callout: none;
+        -webkit-user-select: none;
+        -moz-user-select: none;
+        display: block;
+        position: absolute;
+        top: 0;
+        left: 0;
+        opacity: 0;
+        width: 100%;
+        height: 100%;
+      }
+    }
+  }
+
+
+  .order-submission .wrapper .item .discount {
+    font-size: 30rpx;
+    color: #999;
+
+    &.discount_voice {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      width: 500rpx;
+      text-align: right;
+    }
+  }
+
+  .order-submission .wrapper .item .discount .iconfont {
+    color: #515151;
+    font-size: 30rpx;
+    margin-left: 15rpx;
+  }
+
+  .order-submission .wrapper .item .discount .num {
+    font-size: 32rpx;
+    margin-right: 20rpx;
+  }
+
+  .order-submission .wrapper .item input {
+    flex: 1;
+    height: 100%;
+    margin-left: 20rpx;
+    text-align: right;
+  }
+
+  .order-submission .wrapper .item .placeholder {
+    color: #ccc;
+  }
+
+  .order-submission .wrapper .item .list {
+    margin-top: 35rpx;
+  }
+
+  .order-submission .wrapper .item .list .payItem {
+    border: 1px solid #eee;
+    border-radius: 6rpx;
+    height: 86rpx;
+    width: 100%;
+    box-sizing: border-box;
+    margin-top: 20rpx;
+    font-size: 28rpx;
+    color: #282828;
+  }
+
+  .order-submission .wrapper .item .list .payItem.on {
+    border-color: var(--view-theme);
+    color: var(--view-theme);
+  }
+
+  .order-submission .wrapper .item .list .payItem .name {
+    width: 50%;
+    text-align: center;
+    border-right: 1px solid #eee;
+    justify-content: left;
+    padding-left: 80rpx;
+  }
+
+  .order-submission .wrapper .item .list .payItem .name .iconfont {
+    width: 44rpx;
+    height: 44rpx;
+    border-radius: 50%;
+    text-align: center;
+    line-height: 44rpx;
+    background-color: #fe960f;
+    color: #fff;
+    font-size: 30rpx;
+    margin-right: 15rpx;
+  }
+
+  .order-submission .wrapper .item .list .payItem .name .iconfont.icon-weixin2 {
+    background-color: #41b035;
+  }
+
+  .order-submission .wrapper .item .list .payItem .name .iconfont.icon-icon34 {
+    background-color: #4295D5;
+  }
+
+  .order-submission .wrapper .item .list .payItem .tip {
+    width: 49%;
+    text-align: center;
+    font-size: 26rpx;
+    color: #aaa;
+  }
+
+  .order-submission .moneyList {
+    margin-top: 12rpx;
+    background-color: #fff;
+    padding: 30rpx;
+  }
+
+  .order-submission .moneyList .item {
+    font-size: 28rpx;
+    color: #282828;
+  }
+
+  .order-submission .moneyList .item~.item {
+    margin-top: 20rpx;
+  }
+
+  .order-submission .moneyList .item .money {
+    color: #868686;
+  }
+
+  .order-submission .footer {
+    width: 100%;
+    height: 100rpx;
+    height: calc(100rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
+    height: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
+    background-color: #fff;
+    padding: 0 30rpx;
+    font-size: 28rpx;
+    color: #333;
+    box-sizing: border-box;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    z-index: 30;
+
+    .footer_count {
+      font-size: 28rpx;
+    }
+
+    .coupon_price {
+      color: #999999;
+      font-size: 20rpx;
+      margin-top: 10rpx;
+
+      text {
+        color: #282828;
+        padding: 2rpx 10rpx;
+        background: #F5F5F5;
+        border-radius: 26rpx;
+        margin-left: 20rpx;
+        line-height: 30rpx;
+        height: 30rpx;
+        display: inline-block;
+      }
+    }
+  }
+
+  .pColor {
+    color: var(--view-priceColor);
+  }
+
+  .order-submission .footer .settlement {
+    font-size: 30rpx;
+    color: #fff;
+    width: 240rpx;
+    height: 70rpx;
+    background-color: var(--view-theme);
+    border-radius: 50rpx;
+    text-align: center;
+    line-height: 70rpx;
+
+    &.disabled {
+      background-color: #cccccc;
+    }
+  }
+
+  .storeinfo-wrapper {
+    .store-item {
+      margin-top: 12rpx;
+      background-color: #fff;
+
+      .store-title {
+        display: flex;
+        align-items: center;
+        padding: 28rpx 30rpx;
+
+        .icon-shangjiadingdan {
+          font-size: 32rpx;
+        }
+
+        .icon-xiangyou {
+          font-size: 26rpx;
+          color: #999;
+        }
+
+        .txt {
+          margin: 0 8rpx;
+        }
+      }
+
+      .product-item {
+        display: flex;
+        padding: 25rpx 30rpx;
+        border-top: 1px solid #F0F0F0;
+
+        .img-box {
+          width: 130rpx;
+          height: 130rpx;
+
+          image {
+            width: 130rpx;
+            height: 130rpx;
+            border-radius: 16rpx;
+          }
+        }
+
+        .content {
+          position: relative;
+          width: 550rpx;
+          margin-left: 30rpx;
+          font-size: 28rpx;
+          color: #282828;
+          overflow: hidden;
+
+          &.event_content {
+            .line1 {
+              width: 360rpx;
+            }
+
+            .price {
+              position: absolute;
+              top: 0;
+              right: 0;
+              margin-top: 0;
+
+              text {
+                display: block;
+                text-align: right;
+              }
+            }
+          }
+
+          .label {
+            margin-top: 10rpx;
+            color: #868686;
+            font-size: 20rpx;
+          }
+
+          .price {
+            margin-top: 20rpx;
+            color: var(--view-priceColor);
+            position: relative;
+
+            text {
+              margin-left: 10rpx;
+              color: #999;
+            }
+
+            .delivery_type {
+              float: right;
+
+              text {
+                color: var(--view-priceColor);
+                font-size: 20rpx;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  uni-checkbox-group,
+  .checkgroup {
+    width: 100%;
+
+    .checkbox {
+      float: right;
+    }
+  }
+
+  .total {
+    display: flex;
+    justify-content: flex-end;
+    padding-right: 30rpx;
+    padding-bottom: 30rpx;
+    font-size: 26rpx;
+    color: #282828;
+
+    .price {
+      margin-left: 10rpx;
+      color: var(--view-priceColor);
+      font-size: 28rpx;
+      font-weight: bold;
+
+      text {
+        font-size: 20rpx;
+      }
+    }
+  }
+
+  .red_packet {
+    color: #ff5c2d !important;
+    background-color: rgba(#ff5c2d, 0.3);
+    border-radius: 60rpx;
+    padding: 5rpx 10rpx;
+    padding-left: 20rpx;
+    font-size: 25rpx;
+  }
+</style>
\ No newline at end of file
diff --git a/pages/users/login/login_copy.vue b/pages/users/login/login_copy.vue
index d36799b..8adeb35 100644
--- a/pages/users/login/login_copy.vue
+++ b/pages/users/login/login_copy.vue
@@ -1,13 +1,28 @@
 <template>
 	<div :style="viewColor">
+    
 		<div class="register absolute" v-if="!auth_token">
 			<div class="login" style="background-size: 100% 100%;background-repeat: no-repeat;">
-				<div class="shading">
+				<div class="shading" >
 					<div class="pictrue acea-row row-center-wrapper" style="background-color: transparent !important;">
-						<image src="@/static/images/logo1.png" />
+						<image src="@/static/images/logo1.png"  />
 					</div>
 				</div>
-				<div class="whiteBg" v-if="formItem === 1">
+        <div class="whiteBg" v-if="formItem == 0">
+          <div class="logon" style="display: flex;align-items: center;justify-content: center;" @click="wxLogin"> 
+            <u-icon name="weixin-fill" color="#fff" size="30"></u-icon> 微信一键登录
+          </div>
+          
+          <div class="protocol acea-row row-between-wrapper">
+          	<checkbox-group class="checkgroup" @change='isAgree=!isAgree'>
+          		<checkbox class="checkbox" :checked="isAgree ? true : false" />
+          		<text class="protocol_text">我已同意<text @click="userAgree"
+          				class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree"
+          				class="font_pro">《隐私政策》</text></text>
+          	</checkbox-group>
+          </div>
+        </div>
+				<div class="whiteBg" v-else-if="formItem === 1" style="po">
 					<div class="title acea-row row-center-wrapper">
 						<div class="item" :class="current === index ? 'on' : ''" v-for="(item, index) in navList"
 							@click="navTap(index)" :key="index">
@@ -33,7 +48,7 @@
 						</form>
 						<div class="tip">
 							<!-- <span @click="formItem = 2" class="font-color-red">立即注册</span> -->
-							<span> </span>
+              <span> </span>
 							<navigator class="forgetPwd" hover-class="none" url="/pages/users/retrievePassword/index">
 								忘记密码
 							</navigator>
@@ -48,13 +63,13 @@
 									v-model="account" />
 							</div>
 						</div>
-
+						
 						<div class="item">
 							<div class="acea-row row-middle">
 								<image src="/static/images/code_2.png"></image>
-
-								<input type="number" placeholder="填写验证码" placeholder-class="placeholder"
-									class="codeIput" v-model="captcha" maxlength="4" />
+							
+								<input type="number" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput"
+									v-model="captcha" maxlength="4" />
 								<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
 									@click="handleVerify">
 									{{ text }}
@@ -64,8 +79,8 @@
 						<div class="item" v-if="isShowCode">
 							<div class="acea-row row-middle">
 								<image src="/static/images/code_2.png"></image>
-								<input type="number" placeholder="填写验证码" placeholder-class="placeholder"
-									class="codeIput" v-model="codeVal" maxlength="4" />
+								<input type="number" placeholder="填写验证码"  placeholder-class="placeholder" class="codeIput"
+									v-model="codeVal" maxlength="4" />
 								<div class="code" @click="getcaptcha">
 									<image class="code-img" style="width: 100%;height: 100%;" :src="codeUrl" />
 								</div>
@@ -83,7 +98,6 @@
 									class="font_pro">《隐私政策》</text></text>
 						</checkbox-group>
 					</div>
-
 				</div>
 				<div class="whiteBg" v-else>
 					<div class="title">注册账号</div>
@@ -98,9 +112,9 @@
 						<div class="item">
 							<div class="acea-row row-middle">
 								<image src="/static/images/code_2.png"></image>
-								<input type="number" placeholder="填写验证码" maxLength='4' placeholder-class="placeholder"
-									class="codeIput" v-model="captcha" />
-
+								<input type="number" placeholder="填写验证码"   maxLength='4'  placeholder-class="placeholder" class="codeIput"
+									v-model="captcha" />
+									
 								<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
 									@click="handleVerify">
 									{{ text }}
@@ -114,12 +128,12 @@
 									v-model="password" />
 							</div>
 						</div>
-
+						
 						<div class="item" v-if="isShowCode">
 							<div class="acea-row row-middle">
 								<image src="/static/images/code_2.png"></image>
-								<input type="number" placeholder="填写验证码" maxlength="4" placeholder-class="placeholder"
-									class="codeIput" v-model="codeVal" />
+								<input type="number" placeholder="填写验证码" maxlength="4" placeholder-class="placeholder" class="codeIput"
+									v-model="codeVal" />
 								<div class="code" @click="getcaptcha">
 									<image class="code-img" style="width: 100%;height: 100%;" :src="codeUrl" />
 								</div>
@@ -153,26 +167,37 @@
 					</view>
 				</view>
 			</view>
+      
+      <!-- #ifdef APP-PLUS -->
+      <div class="protocol acea-row row-between-wrapper" style="position: fixed; bottom: 160rpx;left: 50%;transform: translate(-50%);">
+      	<text class="protocol_text" v-if="formItem==0" @click="formItem = 1 ">其他方式登录</text>
+        <text class="protocol_text" v-else @click="formItem = 0 ">微信快捷登录</text>
+      </div>
+      <!-- #endif -->
 		</div>
 		<form report-submit='true' v-if="auth_token">
 			<view class="ChangePassword">
+        <view class="title">
+          <view>首次登录</view>
+          <view style="font-size: 36rpx;">需要绑定手机号码</view>
+        </view>
 				<view class="list">
 					<view class="item">
 						<input type='number' placeholder='填写手机号码' placeholder-class='placeholder'
 							v-model="account"></input>
 					</view>
-
+					
 					<view class="item acea-row row-between-wrapper">
-						<input type='number' placeholder='填写验证码' maxlength="4" placeholder-class='placeholder'
-							class="codeIput" v-model="captcha"></input>
-
+						<input type='number' placeholder='填写验证码' maxlength="4" placeholder-class='placeholder' class="codeIput"
+							v-model="captcha"></input>
+							
 						<button class="code" :class="disabled === true ? 'on' : ''" :disabled='disabled'
 							@click="handleVerify">
 							{{ text }}
 						</button>
 					</view>
 					<view class="item">
-						<input type='password' placeholder='填写登录密码' placeholder-class='placeholder'
+						<input type='password' placeholder='填写登录密码'  placeholder-class='placeholder'
 							v-model="password"></input>
 					</view>
 					<view class="protocol acea-row row-between-wrapper">
@@ -184,7 +209,7 @@
 						</checkbox-group>
 					</view>
 				</view>
-				<button form-type="submit" @click="register" class="confirmBnt">确认绑定</button>
+				<button form-type="submit" @click="weixinMerge" class="confirmBnt">确认绑定</button>
 				<button form-type="submit" @click="auth_token = ''" class="confirmBnt back">返回</button>
 			</view>
 		</form>
@@ -194,6 +219,7 @@
 
 		<Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }"
 			ref="verify"></Verify>
+      
 	</div>
 </template>
 <script>
@@ -248,12 +274,14 @@
 	} from "@/utils";
 	import parser from "@/components/jyf-parser/jyf-parser";
 	import {
-		commonAuth
+		commonAuth,
+    userMerge
 	} from '../../../api/public';
 	import {
 		mapGetters
 	} from "vuex";
 	import Verify from '@/components/verify/verify.vue';
+import { Toast } from "../../../libs/uniApi";
 	const BACK_URL = "login_back_url";
 	// #ifdef APP-PLUS
 	var jpushModule = uni.requireNativePlugin("JG-JPush");
@@ -267,12 +295,17 @@
 		},
 		data: function() {
 			return {
-				navList: ["快速登录", "账号登录"],
+				navList: ["快速登录","账号登录"],
 				current: 0,
 				account: "",
 				password: "",
 				captcha: "",
-				formItem: 1,
+				// #ifdef APP-PLUS
+				formItem: 0,
+				// #endif
+        // #ifndef APP-PLUS
+        formItem: 1,
+        // #endif
 				type: "login",
 				keyCode: "",
 				codeUrl: "",
@@ -303,10 +336,14 @@
 				} else {
 					this.type = 'register'
 				}
-			}
+			},
+      isAgree: function(n, o){
+        uni.setStorageSync('isAgree', n);
+      }
 		},
 		onLoad() {
 			let self = this
+      this.isAgree = uni.getStorageSync('isAgree')
 			uni.getSystemInfo({
 				success: function(res) {
 					if (res.platform.toLowerCase() == 'ios' && self.getSystem(res.system) >= 13) {
@@ -317,7 +354,7 @@
 			this.getVersion();
 		},
 		mounted: function() {
-
+      
 		},
 		onReady() {
 			let that = this
@@ -346,8 +383,9 @@
 					}).then(({
 						data
 					}) => {
-						const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
+						const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) || "/pages/index/index";
 						that.$Cache.clear(BACK_URL);
+						that.$Cache.clear('login_back_url_weixin');
 						that.$store.commit("LOGIN", {
 							'token': data.token,
 							'time': data.exp
@@ -464,8 +502,9 @@
 				}).then(res => {
 					const data = res.data;
 					if (res.data.status == 200) {
-						const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
+						const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) || "/pages/index/index";
 						that.$Cache.clear(BACK_URL);
+						that.$Cache.clear('login_back_url_weixin');
 						that.$store.commit("LOGIN", {
 							'token': data.result.token,
 							'time': data.result.exp
@@ -518,12 +557,15 @@
 				})
 				uni.login({
 					provider: 'weixin',
-					// onlyAuthorize: true,
+					onlyAuthorize: true,
 					success: function(loginRes) {
-						self.appUserInfo = loginRes
-						self.wxLoginApi()
+            console.log(loginRes);
+            uni.hideLoading()
+						self.appUserInfo = loginRes;
+						self.weixinLoginApi()
 					},
 					fail(error) {
+            console.log(error);
 						uni.showToast({
 							title: '登录失败',
 							icon: 'none',
@@ -544,17 +586,18 @@
 				commonAuth({
 					auth: {
 						type: 'app_wechat',
-						auth: {
-							code: that.appUserInfo.authResult.access_token,
-							openid: that.appUserInfo.authResult.openid,
-							phone: this.account,
-						}
+            auth: {
+            	code: that.appUserInfo.authResult.access_token,
+            	openid: that.appUserInfo.authResult.openid,
+            	phone: this.account,
+            }
 					}
 				}).then(res => {
 					const data = res.data;
 					if (res.data.status == 200) {
-						const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
+						const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) || "/pages/index/index";
 						that.$Cache.clear(BACK_URL);
+						that.$Cache.clear('login_back_url_weixin');
 						that.$store.commit("LOGIN", {
 							'token': data.result.token,
 							'time': data.result.exp
@@ -586,6 +629,7 @@
 					}
 					uni.hideLoading();
 				}).catch(res => {
+          console.log(res);
 					uni.hideLoading();
 					uni.showToast({
 						title: res.message || res,
@@ -594,6 +638,62 @@
 					});
 				});
 			},
+      weixinLoginApi() {
+      	const that = this
+      	commonAuth({
+      		auth: {
+      			type: 'app_wechat',
+            auth: {
+            	code: that.appUserInfo.code
+            }
+      		}
+      	}).then(res => {
+          console.log('--', res);
+      		const data = res.data;
+      		if (res.data.status == 200) {
+      			const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) || "/pages/index/index";
+      			that.$Cache.clear(BACK_URL);
+      			that.$Cache.clear('login_back_url_weixin');
+      			that.$store.commit("LOGIN", {
+      				'token': data.result.token,
+      				'time': data.result.exp
+      			});
+      			that.$store.commit("SETUID", data.result.user.uid);
+      			that.$store.commit('UPDATE_USERINFO', data.result.user);
+      			let method
+      			let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
+      				'/pages/goods_cate/goods_cate',
+      				'/pages/user/index', '/pages/plant_grass/index'
+      			]
+      			if (indexPat.includes(this.getPath(backUrl))) {
+      				method = 'switchTab'
+      			} else {
+      				method = 'navigateTo'
+      			}
+      			if (this.getPath(backUrl) === '/pages/users/login/index') {
+      				uni.switchTab({
+      					url: '/pages/index/index'
+      				});
+      				return
+      			}
+      			uni[method]({
+      				url: backUrl
+      			});
+      		} else {
+      			that.auth_token = res.data.result.key;
+      			that.bindStatus = true;
+      		}
+      		uni.hideLoading();
+      	}).catch(res => {
+          console.log( '错误', res);
+      		uni.hideLoading();
+      		uni.showToast({
+      			title: res.message || res,
+      			icon: 'none',
+      			duration: 2000
+      		});
+      	});
+      },
 			getAgreement() {
 				let that = this
 				getAgreementApi('sys_user_agree').then(res => {
@@ -647,22 +747,23 @@
 						data
 					}) => {
 						this.checkOpenId(data.user)
-						const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
-						that.$Cache.clear(BACK_URL);
+						const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) || "/pages/index/index";
 						that.$store.commit("LOGIN", {
 							'token': data.token,
 							'time': data.exp
 						});
 						that.$store.commit("SETUID", data.user.uid);
 						that.$store.commit('UPDATE_USERINFO', data.user);
-
-
-						if (data.is_new_user) {
-							return uni.navigateTo({
-								url: '/pages/helpPeople/helpPeople'
-							})
-						}
-
+              
+            if(data.is_new_user && !that.$Cache.get('login_back_url_weixin')){
+              return uni.navigateTo({
+                url: '/pages/helpPeople/helpPeople'
+              })
+            }
+            
+            that.$Cache.clear(BACK_URL);
+            that.$Cache.clear('login_back_url_weixin');
+            
 						let method
 						let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
 							'/pages/goods_cate/goods_cate',
@@ -726,17 +827,31 @@
 						// #endif
 					})
 					.then(res => {
-						const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
-						that.$Cache.clear(BACK_URL);
 						that.$store.commit("LOGIN", {
 							'token': res.data.token,
 							'time': res.data.exp
 						});
 						that.$store.commit("SETUID", res.data.user.uid);
 						that.$store.commit('UPDATE_USERINFO', res.data.user);
-						uni.switchTab({
-							url: '/pages/user/index'
-						})
+						const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) || "/pages/index/index";
+						that.$Cache.clear(BACK_URL);
+						that.$Cache.clear('login_back_url_weixin');
+            let method
+            let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
+            	'/pages/goods_cate/goods_cate',
+            	'/pages/user/index'
+            ]
+            if (indexPat.includes(this.getPath(backUrl))) {
+            	method = 'switchTab'
+            } else {
+            	method = 'navigateTo'
+            }
+            uni[method]({
+            	url: backUrl,
+              success:()=>{
+                this.auth_token = ''
+              }
+            });
 					})
 					.catch(res => {
 						that.$util.Tips({
@@ -744,6 +859,90 @@
 						});
 					});
 			},
+      async weixinMerge() {
+      	let that = this;
+      	if (!that.account) return that.$util.Tips({
+      		title: '请输入手机号码'
+      	});
+      	if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.account)) return that.$util.Tips({
+      		title: '请输入正确的手机号码'
+      	});
+      	if (!that.captcha) return that.$util.Tips({
+      		title: '请输入验证码'
+      	});
+      	if (!/^[\w\d]+$/i.test(that.captcha)) return that.$util.Tips({
+      		title: '请输入正确的验证码'
+      	});
+      	if (!that.password) return that.$util.Tips({
+      		title: '请输入密码'
+      	});
+      	if (!/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$/i.test(that.password)) return that.$util.Tips({
+      		title: '请输入6-16位字母加数字组合'
+      	});
+      	if (!that.isAgree) return that.$util.Tips({
+      		title: '请勾选用户协议与隐私政策'
+      	});
+        console.log('绑定前', {
+      			auth_token: this.auth_token || uni.getStorageSync('auth_token'),
+      			phone: that.account,
+      			sms_code: that.captcha,
+      			pwd: that.password,
+      			spread: that.$Cache.get("spread"),
+      			// #ifdef APP-PLUS
+      			user_type: 'app',
+      			// #endif
+      			// #ifdef H5
+      			user_type: 'h5',
+      			// #endif
+      		});
+      	userMerge({
+      			auth_token: this.auth_token || uni.getStorageSync('auth_token'),
+      			phone: that.account,
+      			sms_code: that.captcha,
+      			pwd: that.password,
+      			spread: that.$Cache.get("spread"),
+      			// #ifdef APP-PLUS
+      			user_type: 'app',
+      			// #endif
+      			// #ifdef H5
+      			user_type: 'h5',
+      			// #endif
+      		})
+      		.then(res => {
+            console.log(res);
+      			that.$store.commit("LOGIN", {
+      				'token': res.data.token,
+      				'time': res.data.exp
+      			});
+      			that.$store.commit("SETUID", res.data.user.uid);
+      			that.$store.commit('UPDATE_USERINFO', res.data.user);
+      			const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) || "/pages/index/index";
+      			that.$Cache.clear(BACK_URL);
+      			that.$Cache.clear('login_back_url_weixin');
+            let method
+            let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
+            	'/pages/goods_cate/goods_cate',
+            	'/pages/user/index'
+            ]
+            if (indexPat.includes(this.getPath(backUrl))) {
+            	method = 'switchTab'
+            } else {
+            	method = 'navigateTo'
+            }
+            uni[method]({
+            	url: backUrl,
+              success:()=>{
+                this.auth_token = ''
+              }
+            });
+      		})
+      		.catch(res => {
+            console.log('error', err);
+      			that.$util.Tips({
+      				title: res
+      			});
+      		});
+      },
 			async code(data) {
 				let that = this;
 				if (!that.account) return that.$util.Tips({
@@ -816,8 +1015,7 @@
 						data
 					}) => {
 						this.checkOpenId(data.user)
-						const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
-						that.$Cache.clear(BACK_URL);
+						const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) || "/pages/index/index";
 						that.$store.commit("LOGIN", {
 							'token': data.token,
 							'time': data.exp
@@ -825,12 +1023,15 @@
 						that.$store.commit("SETUID", data.user.uid);
 						that.$store.commit('UPDATE_USERINFO', data.user);
 
-						if (data.is_new_user) {
-							return uni.navigateTo({
-								url: '/pages/helpPeople/helpPeople'
-							})
-						}
-
+            if(data.is_new_user && !that.$Cache.get('login_back_url_weixin')){
+              return uni.navigateTo({
+                url: '/pages/helpPeople/helpPeople'
+              })
+            }
+            
+            that.$Cache.clear(BACK_URL);
+            that.$Cache.clear('login_back_url_weixin');
+            
 						let method
 						let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
 							'/pages/goods_cate/goods_cate',
@@ -841,7 +1042,7 @@
 						} else {
 							method = 'navigateTo'
 						}
-
+            
 						if (this.getPath(backUrl) === '/pages/users/login/index') {
 							uni.switchTab({
 								url: '/pages/index/index'
@@ -883,42 +1084,42 @@
 			checkOpenId(user) {
 				if (user.wechat_user_id === 0) {
 					let that = this
-					try {
-						wx.getUserInfo({
-							success: function(res) {
-								const encryptedData = res.encryptedData
-								const iv = res.iv
-								wx.login({
-									success(res) {
-										if (res.code) {
-											bindMp({
-												code: res.code,
-												iv: iv,
-												encryptedData: encryptedData,
-												phone: that.account
-											}).then(res => {
-												// console.log(res);
-											})
-										} else {
-											// console.log('登录失败！' + res.errMsg)
-										}
-									}
-								})
-							},
-							fail(e) {
-								// console.log('登录失败！' + res.errMsg)
-							}
-						})
-					} catch (e) {
-						console.log(e);
+					try{
+					  wx.getUserInfo({
+					  	success: function(res) {
+					  		const encryptedData = res.encryptedData
+					  		const iv = res.iv
+					  		wx.login({
+					  			success(res) {
+					  				if (res.code) {
+					  					bindMp({
+					  						code: res.code,
+					  						iv: iv,
+					  						encryptedData: encryptedData,
+					  						phone: that.account
+					  					}).then(res => {
+					  						// console.log(res);
+					  					})
+					  				} else {
+					  					// console.log('登录失败！' + res.errMsg)
+					  				}
+					  			}
+					  		})
+					  	},
+					  	fail(e) {
+					  		// console.log('登录失败！' + res.errMsg)
+					  	}
+					  })
+					}catch(e){
+					  console.log(e);
 					}
 				}
 				// #ifdef APP-PLUS
 				jpushModule.initJPushService()
 				jpushModule.getRegistrationID(result => {
-
+					
 					if (result.registerID) {
-
+					
 						bindJG({
 							phone: this.account,
 							jg_register_id: result.registerID
@@ -939,6 +1140,15 @@
 	/deep/uni-checkbox .uni-checkbox-input {
 		border-radius: 100%;
 	}
+  
+  .ChangePassword{
+    .title{
+      width: 580rpx;
+      margin: 180rpx auto 0 auto;
+      font-size: 46rpx;
+      color: #7f7f7f;
+    }
+  }
 
 	.ChangePassword .phone {
 		font-size: 32rpx;
@@ -1117,7 +1327,7 @@
 
 	.protocol_text {
 		.font_pro {
-			color: #20A162;
+			color: var(--view-theme);
 		}
 	}
 
@@ -1240,7 +1450,8 @@
 
 		.whiteBg {
 			margin-top: 100rpx;
-
+      transition: 300ms;
+      
 			.list {
 				border-radius: 16rpx;
 				overflow: hidden;
diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue
index 1c0a8ac..07cfec8 100644
--- a/pages/users/order_list/index.vue
+++ b/pages/users/order_list/index.vue
@@ -588,6 +588,7 @@
 							limit: that.limit,
               sale_type: 1 //1-零售, 2-批发
 						}).then(res => {
+              console.log(res);
 							let list = res.data.list || [];
 							let loadend = list.length < that.limit;
 							that.orderList = that.page == 1 ? list : that.$util.SplitArray(list, that.orderList);
@@ -614,6 +615,7 @@
 					status: 10,
 					page: 1,
 					limit: 1,
+          sale_type: 1 //1-零售, 2-批发
 				}).then(res => {
 					let list = res.data.list || [];
 					that.presellOrderCount = res.data.count;
diff --git a/pages/whole_sale/index.vue b/pages/whole_sale/index.vue
index 6eae85d..13e0685 100644
--- a/pages/whole_sale/index.vue
+++ b/pages/whole_sale/index.vue
@@ -82,44 +82,52 @@
 			.category {
 				width: 100%;
 				overflow: auto;
-				// margin-bottom: 70rpx;
-
+				margin-bottom: 20rpx;
+			
 				.category-wrap {
-					display: flex;
-					padding-bottom: 20rpx;
-
-					.category-item {
-						display: flex;
-						flex-direction: column;
-						justify-content: center;
-						align-items: center;
-						margin-right: 38rpx;
-
-						text {
-							margin-top: 16rpx;
-							font-size: 24rpx;
-							color: #666666;
-							white-space: nowrap;
-						}
-					}
-
-					.category-item-active {
-						position: relative;
-
-						&::after {
-							content: "";
-							display: inline-block;
-							position: absolute;
-							bottom: -6rpx;
-							width: 100%;
-							height: 6rpx;
-							background-color: #40AE36;
-							border-radius: 4rpx;
-						}
-					}
+				  display: flex;
+				  padding-bottom: 20rpx;
+				
+				  .category-item {
+				    display: flex;
+				    flex-direction: column;
+				    justify-content: center;
+				    align-items: center;
+				    margin-right: 38rpx;
+				
+				    text {
+				      margin-top: 16rpx;
+				      font-size: 24rpx;
+				      color: #666666;
+				      white-space: nowrap;
+				    }
+				
+				    .category-item-text {
+				      width: 120rpx;
+				      text-align: center;
+				      overflow: hidden;
+				      white-space: nowrap;
+				      text-overflow: ellipsis;
+				    }
+				  }
+				
+				  .category-item-active {
+				    position: relative;
+				
+				    .category-item-img {
+				      border: 2px solid #40AE36;
+				      border-radius: 50%;
+				    }
+				
+				    text {
+				      background-color: #40AE36;
+				      color: #fff;
+				      padding: 2rpx 10rpx 6rpx 10rpx;
+				      border-radius: 50rpx;
+				    }
+				  }
 				}
 			}
-
 			.cate {
 				width: 100%;
 				overflow: auto;
@@ -204,15 +212,15 @@
 		  <view class="wholeSale-nav">
 		    <!-- <u-icon class="icon" name="arrow-left" size="20" @click="navBack"></u-icon> -->
 		    <!-- 搜索 -->
-		    <navigator url="/pages/columnGoods/goods_search/index" hover-class="none"
+		    <view @click="navTo(`/pages/columnGoods/goods_search/index?back=true&searchVal=${where.keyword}`)" hover-class="none"
 		    	class="search_content flex_a_c_j_sb">
 		    	<view class="flex_a_c search_content_wrap">
 		    		<view class="iconfont icon-sousuo" style="font-size: 39rpx;"></view>
-		    		<input type="text" placeholder="搜索您需要批发进货的产品名称" placeholder-style="font-size: 30rpx;color:#999;"
+		    		<input type="text" placeholder="搜索您需要批发进货的产品名称" :value="where.keyword" placeholder-style="font-size: 30rpx;color:#999;"
 		    			disabled style="pointer-events: none;">
 		    	</view>
 		    	<!-- <button class="search_btn">搜索</button> -->
-		    </navigator>
+		    </view>
 		  </view>
 		
 			<!-- 商品大分类 -->
@@ -262,7 +270,7 @@
 			</view>
 		
 			<!-- 流水瀑布 -->
-			<WaterfallsFlow :wfList='hostProduct' @itemTap="goDetail" :type="0" />
+			<WaterfallsFlow :wfList='hostProduct' @itemTap="goDetail" :type="0" :sale_type="2"/>
 		  <loadmore :type="isLoading" style="padding: 40rpx 0 150rpx; 0"></loadmore>
 		</view>
     
@@ -316,7 +324,7 @@
           page: 1,
           limit: 20,
           sale_type: 2, //1为零售, 2为批发
-          mer_id: 259,
+          mer_type: 1,
           mer_cate_id: '', //
           cate_id: '',
           keyword: '',
@@ -331,8 +339,24 @@
     },
     onPageScroll() {
       uni.$emit('scroll');
+    },
+    onReachBottom() {
+      this.getProductslist();
     },
 		methods: {
+      navTo(url){
+        uni.navigateTo({
+          url:url,
+          success: () => {
+            uni.$once('searchValue', (e)=>{
+              this.$nextTick(()=>{
+                this.where.keyword = e;
+                this.getProductslist(true);
+              })
+            })
+          }
+        })        
+      },
       getNav() {
       	getNavigation().then(res => {
       		this.newData = res.data
@@ -347,17 +371,13 @@
 				this.tabsCurr = e;
         this.where = {
           page: 1,
-          limit: 20,
-          sale_type: 1
+          limit: this.where.limit,
+          sale_type: 2,
+          keyword: this.where.keyword
         }
         this.cate_change = 0;
         this.cate_change_children = 0;
-        if(e==1) {
-          this.where.mer_id = 259;
-        }
-        if(e==3){
-          this.where.label_name = '名优特产';
-        }
+        this.where.mer_type = e;
         this.getStoreCategory();
         this.getProductslist(true);
 			},
@@ -412,9 +432,9 @@
         this.isLoading = 1;
         getProductslist(this.where).then(res=>{
           this.hostProduct = [...this.hostProduct, ...res.data.list];
-          this.where.page++;
           this.isLoading = 0;
           if(res.data.list.length<this.where.limit) this.isLoading = -1;
+          this.where.page++;
         })
       },
 			goDetail(item) {
@@ -424,7 +444,7 @@
 							let id = res.data.product_assist_set_id;
 							uni.hideLoading();
 							uni.navigateTo({
-								url: '/pages/activity/assist_detail/index?id=' + id
+								url: `/pages/activity/assist_detail/index?id=${id}&sale_type=2`
 							});
 						}).catch((err) => {
 							uni.showToast({