From 4749269a0997679e0e7b92dee25e6eb968f9c567 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Fri, 19 Apr 2024 09:35:35 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B4=AD=E7=89=A9?=
 =?UTF-8?q?=E8=BD=A6=E5=A4=9A=E8=A7=84=E6=A0=BCbug,=20=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                            |  4 +-
 pages/columnGoods/goods_search/index.vue | 49 ++++++++++++++----------
 pages/order_addcart/order_addcart.vue    |  7 +++-
 3 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/manifest.json b/manifest.json
index 0eebeee..3b81b26 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "惠农生活",
     "appid" : "__UNI__3A527D1",
     "description" : "",
-    "versionName" : "2.0.34",
-    "versionCode" : 2034,
+    "versionName" : "2.0.35",
+    "versionCode" : 2035,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/columnGoods/goods_search/index.vue b/pages/columnGoods/goods_search/index.vue
index b77e85b..6478b9e 100644
--- a/pages/columnGoods/goods_search/index.vue
+++ b/pages/columnGoods/goods_search/index.vue
@@ -218,22 +218,22 @@
 		},
 		methods: {
       getHistoryList(){
-        userLog({
-          type: this.isShop ? 2 : 1, // 1是商品搜索记录, 2是店铺搜索记录
-        }).then(res=>{
-          this.historyList = res.data;
-        })
-        // try {
-        // 	this.historyList = []
-        // 	this.tempStorage = []
-        // 	let arr = uni.getStorageSync('historyList')
-        // 	if (arr.length > 0) {
-        // 		this.historyList = arr
-        // 	} else {
-        // 		this.historyList = []
-        // 	}
-        // 	this.tempStorage = this.historyList
-        // } catch (e) {}
+        // userLog({
+        //   type: this.isShop ? 2 : 1, // 1是商品搜索记录, 2是店铺搜索记录
+        // }).then(res=>{
+        //   this.historyList = res.data;
+        // })
+        try {
+        	this.historyList = []
+        	this.tempStorage = []
+        	let arr = uni.getStorageSync('historyList')
+        	if (arr.length > 0) {
+        		this.historyList = arr
+        	} else {
+        		this.historyList = []
+        	}
+        	this.tempStorage = this.historyList
+        } catch (e) {}
       },
 			// 清空历史记录
 			remove() {
@@ -245,12 +245,13 @@
 						if (res.confirm) {
 							self.tempStorage = []
 							try {
-								userLogDelete({
-                  type: this.isShop ? 2 : 1,
-                }).then(res=>{
-                  console.log(res);
-                })
+								// userLogDelete({
+        //           type: this.isShop ? 2 : 1,
+        //         }).then(res=>{
+        //           console.log(res);
+        //         })
 								self.historyList = []
+                uni.setStorageSync('historyList', self.historyList);
 							} catch (e) {}
 						} else if (res.cancel) {
 							console.log('用户点击取消');
@@ -292,6 +293,12 @@
 				this.$set(this, 'searchValue', event.detail.value);
 			},
 			searchBut: function() {
+        if(this.searchValue!='') {
+          this.historyList.unshift({
+            word: this.searchValue
+          });
+          uni.setStorageSync('historyList', this.historyList);
+        }
 				if (this.back) {
 					return uni.navigateBack({
 						success: () => {
diff --git a/pages/order_addcart/order_addcart.vue b/pages/order_addcart/order_addcart.vue
index f1abdf0..1f9487d 100644
--- a/pages/order_addcart/order_addcart.vue
+++ b/pages/order_addcart/order_addcart.vue
@@ -176,7 +176,7 @@
 				@ChangCouponsUseState="ChangCouponsUseState"></couponListWindow>
 		</block>
 		<!-- 组件 -->
-		<addcartWindow :attr="attr" :isShow='1' :iSplus='1' :destri='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr"
+		<addcartWindow :key="addcartKey" :attr="attr" :isShow='1' :iSplus='1' :destri='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr"
 			@goCat="goCat" @attrVal="attrVal" id='product-window'></addcartWindow>
 		<Authorize :isShowAuth="isShowAuth"></Authorize>
 		<!--自定义底部tab栏-->
@@ -254,6 +254,7 @@ import { Toast } from '../../libs/uniApi';
 				}],
 				tabsCurr: 1,
 				subsecCurr: 0,
+        addcartKey: 0,
 				domain: HTTP_REQUEST_URL,
 				loading: false, //是否加载中
 				loadend: false, //是否加载完毕
@@ -299,6 +300,7 @@ import { Toast } from '../../libs/uniApi';
 				currSku: '',
 				newData: {},
 				activeRouter: '',
+        attrTxt: '',
 				userInfo: {},
 				mer_info: {
 					mer_settlement_agree_status: 0
@@ -505,7 +507,7 @@ import { Toast } from '../../libs/uniApi';
 					// that.DefaultSelect(goods)
 					cartProductAttr(id).then(res => {
             if(res.data.attr.length==0)return Toast('此商品为单规格商品');
-            const sku = {}
+            const sku = {};
             res.data.attrValue.forEach((itemn) => {
               if(this.tabsCurr==2) itemn.price = itemn.wholesale_price; //把价格设置为批发价
             	sku[itemn.sku] = itemn;
@@ -520,6 +522,7 @@ import { Toast } from '../../libs/uniApi';
 						that.$set(that, 'productValue', sku);
 						let productSelect = sku[that.attrValue];
 						that.isOpen = that.attr.cartAttr = true;
+            this.newVal = sku[goods.productAttr.sku] || Object.keys(sku)[0];
 						that.DefaultSelect(goods)
 					}).catch(err => {
 						return that.$util.Tips({

From 5eff3f8c900c5f3e338b71310bb19ce58ce87cad Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Fri, 19 Apr 2024 13:57:55 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/columnGoods/goods_search/index.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pages/columnGoods/goods_search/index.vue b/pages/columnGoods/goods_search/index.vue
index 6478b9e..636cad2 100644
--- a/pages/columnGoods/goods_search/index.vue
+++ b/pages/columnGoods/goods_search/index.vue
@@ -294,10 +294,13 @@
 			},
 			searchBut: function() {
         if(this.searchValue!='') {
-          this.historyList.unshift({
+          let t =  this.historyList.findIndex(item=>item.word==this.searchValue);
+          let list = [...this.historyList];
+          if(t!=-1) list.splice(t, 1);
+          list.unshift({
             word: this.searchValue
           });
-          uni.setStorageSync('historyList', this.historyList);
+          uni.setStorageSync('historyList', list);
         }
 				if (this.back) {
 					return uni.navigateBack({

From 5fea00c827d8c7a6015dc2ae2f25ff128d8f8f71 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com>
Date: Sat, 20 Apr 2024 14:32:35 +0800
Subject: [PATCH 3/7] 1

---
 components/payment/index.vue     |  24 +++++++++++++-------
 pages/index/index.vue            |  34 ++++++++++++++++------------
 pages/users/order_list/index.vue |  37 ++++++++++++++++---------------
 pages/whole_sale/index.vue       |  24 +++++++++++++++++++-
 static/tabbar_icon/back_a.png    | Bin 0 -> 3332 bytes
 5 files changed, 78 insertions(+), 41 deletions(-)
 create mode 100644 static/tabbar_icon/back_a.png

diff --git a/components/payment/index.vue b/components/payment/index.vue
index 4ac99b3..44e3e26 100644
--- a/components/payment/index.vue
+++ b/components/payment/index.vue
@@ -82,6 +82,10 @@
 			returnUrl: {
 				type: String,
 				default: ''
+			},
+			sale_type: {
+				type: String,
+				default: ''
 			}
 		},
 		data() {
@@ -235,7 +239,7 @@
 								icon: 'success'
 							}, {
 								tab: 5,
-								url: goPages + '?status=1'
+								url: goPages + '?status=1&sale_type=' + that.sale_type
 							});
 							break;
 						case 'alipay':
@@ -267,7 +271,7 @@
 									icon: 'success'
 								}, {
 									tab: 5,
-									url: goPages + 'status=1'
+									url: goPages + 'status=1&sale_type=' + that.saleType
 								});
 							}).catch(res => {
 								console.log('测试支付数据无效的catch：' + res.data)
@@ -281,7 +285,7 @@
 											title: '取消支付'
 										}, {
 											tab: 5,
-											url: goPages + '?status=0'
+											url: goPages + '?status=0&sale_type=' + that.sale_type
 										});
 									}
 								}
@@ -306,7 +310,7 @@
 										icon: 'success'
 									}, {
 										tab: 5,
-										url: goPages + 'status=1'
+										url: goPages + 'status=1&sale_type=' + that.sale_type
 									});
 								},
 								fail: (e) => {
@@ -319,7 +323,8 @@
 											title: '取消支付'
 										}, {
 											tab: 5,
-											url: goPages + '?status=0'
+											url: goPages + '?status=0&sale_type=' + that
+												.sale_type
 										});
 									}
 								},
@@ -354,7 +359,8 @@
 											icon: 'success'
 										}, {
 											tab: 5,
-											url: goPages + '?status=1'
+											url: goPages + '?status=1&sale_type=' + that
+												.sale_type
 										});
 
 									return that.$util.Tips({
@@ -362,7 +368,8 @@
 										icon: 'success'
 									}, {
 										tab: 5,
-										url: goPages + '?status=1'
+										url: goPages + '?status=1&sale_type=' + that
+											.sale_type
 									});
 								},
 								fail: function(e) {
@@ -434,7 +441,8 @@
 										icon: 'success'
 									}, {
 										tab: 5,
-										url: goPages + 'status=1'
+										url: goPages + 'status=1&sale_type=' + that
+											.sale_type
 									});
 
 								},
diff --git a/pages/index/index.vue b/pages/index/index.vue
index bca8934..8405a05 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -521,27 +521,20 @@
 				overflow: false,
 				diyId: 0,
 				preview: false,
-				isSupport: true
+				isSupport: true,
 			};
 		},
 
 		onTabItemTap(e) {
-
+			uni.pageScrollTo({
+				scrollTop: 0,
+				duration: 300
+			});
 		},
 
 		// 滚动监听
 		onPageScroll(e) {
-
 			this.isFixed = e.scrollTop > 40;
-
-			// uni.setTabBarItem({
-			// 	index: 0,
-			// 	text: "123",
-			// 	selectedIconPath: "/static/tabbar_icon/b-a.png"
-			// })
-
-			// this.$forceUpdate();
-
 			if (this.isHeaderSerch) {
 				let isScroll = false
 				isScroll = e.scrollTop > 50
@@ -551,6 +544,21 @@
 			}
 			// 传入scrollTop值并触发所有easy-loadimage组件下的滚动监听事件
 			uni.$emit('scroll');
+
+
+			if (e.scrollTop >= 100) {
+				uni.setTabBarItem({
+					index: 0,
+					text: "首页",
+					selectedIconPath: "/static/tabbar_icon/back_a.png"
+				})
+			} else {
+				uni.setTabBarItem({
+					index: 0,
+					text: "首页",
+					selectedIconPath: "/static/tabbar_icon/a-a.png"
+				})
+			}
 		},
 
 		/**
@@ -627,9 +635,7 @@
 		onHide() {
 			uni.setStorageSync('isIntegral', false)
 		},
-		onReady() {
 
-		},
 		watch: {
 			globalDatas(nVal, oVal) {
 				// #ifdef H5
diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue
index f6121bf..4b3e9e4 100644
--- a/pages/users/order_list/index.vue
+++ b/pages/users/order_list/index.vue
@@ -73,7 +73,8 @@
 					<view class='num'>{{orderData.noComment || 0}}</view>
 				</view>
 			</view> -->
-			<navigator class="search acea-row row-middle" :url="`/pages/users/order_list/search?sale_type=${sale_type}`" hover-class="none">
+			<navigator class="search acea-row row-middle" :url="`/pages/users/order_list/search?sale_type=${sale_type}`"
+				hover-class="none">
 				<text class="iconfont icon-sousuo"></text>
 				搜索我的订单
 			</navigator>
@@ -345,7 +346,7 @@
 		</view>
 		<!-- <home></home> -->
 		<payment :payMode='payMode' :pay_close="pay_close" @onChangeFun='onChangeFun' :order_id="pay_order_id"
-			:totalPrice='totalPrice'></payment>
+			:totalPrice='totalPrice' :sale_type="sale_type"></payment>
 
 		<addInvoicing ref="addInvoicing" @changeInvoiceClose="changeInvoiceClose" :invoice='invoice'></addInvoicing>
 
@@ -511,21 +512,19 @@
 			if (options.status) this.orderStatus = options.status;
 			let user = this.$store.state.app.userInfo;
 			if (user.mer_info) this.initMerInfo(user);
-      if (this.isLogin) {
-      	this.page = 1;
-      	this.loadend = false;
-      	this.loading = false;
-      	this.getOrderData();
-      	this.getOrderList();
-      	this.getUserInfo();
-      	this.getpreSellOrderList();
-      } else {
-      	toLogin()
-      }
-		},
-		onShow() {
-			
+			if (this.isLogin) {
+				this.page = 1;
+				this.loadend = false;
+				this.loading = false;
+				this.getOrderData();
+				this.getOrderList();
+				this.getUserInfo();
+				this.getpreSellOrderList();
+			} else {
+				toLogin()
+			}
 		},
+
 		onReady: function() {
 			// #ifdef H5
 			this.$nextTick(() => {
@@ -731,11 +730,13 @@
 					uni.hideLoading();
 					if (self.orderStatus == 0) {
 						uni.navigateTo({
-							url: '/pages/order_details/stay?order_id=' + order_id + '&sale_type=' + this.sale_type
+							url: '/pages/order_details/stay?order_id=' + order_id + '&sale_type=' +
+								this.sale_type
 						})
 					} else {
 						uni.navigateTo({
-							url: '/pages/order_details/index?order_id=' + order_id + '&sale_type=' + this.sale_type
+							url: '/pages/order_details/index?order_id=' + order_id + '&sale_type=' +
+								this.sale_type
 						})
 					}
 				}).catch(() => {
diff --git a/pages/whole_sale/index.vue b/pages/whole_sale/index.vue
index fe31a5b..9049334 100644
--- a/pages/whole_sale/index.vue
+++ b/pages/whole_sale/index.vue
@@ -571,8 +571,30 @@
 			this.getNav();
 			this.initData();
 		},
-		onPageScroll() {
+
+		onTabItemTap(e) {
+			uni.pageScrollTo({
+				scrollTop: 0,
+				duration: 300
+			});
+		},
+
+		onPageScroll(e) {
 			uni.$emit('scroll');
+
+			if (e.scrollTop >= 100) {
+				uni.setTabBarItem({
+					index: 1,
+					text: "批发",
+					selectedIconPath: "/static/tabbar_icon/back_a.png"
+				})
+			} else {
+				uni.setTabBarItem({
+					index: 1,
+					text: "批发",
+					selectedIconPath: "/static/tabbar_icon/b-a.png"
+				})
+			}
 		},
 		onPullDownRefresh() {
 			this.initData(true, true);
diff --git a/static/tabbar_icon/back_a.png b/static/tabbar_icon/back_a.png
new file mode 100644
index 0000000000000000000000000000000000000000..56faa97ff2c6be99dcd64d9de7863a17f34d9423
GIT binary patch
literal 3332
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
O0000<MNUMnLSTa0sRkzi

literal 0
HcmV?d00001


From ca9dd3db6ff1df627e2ab43b148be5c1eed0fb2e Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Mon, 22 Apr 2024 11:52:49 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E5=8F=B0=E6=93=8D=E4=BD=9C=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/gather/gather.vue | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index f4ea2a0..073ca26 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -130,7 +130,7 @@
   }
 </style>
 <template>
-  <view class="gather">
+  <view class="gather" @click.stop="clickWhite">
     <!--顶部定位-->
     <view class="gather-header">
       <view style="height: var(--status-bar-height);"></view>
@@ -182,18 +182,18 @@
       <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)">
+            <view class="examine" @click.stop="editFlag ? removeMenu(item) : clickMenu(item)"  @longpress="editFlag = true">
               <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>
+              <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">
+          @click.stop="editFlag = true" @longpress="editFlag = true" v-if="!editFlag">
           <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>
@@ -209,7 +209,7 @@
       </view>
       <view class="content">
         <u-transition v-for="(item, index) in AllMenuList" :key="item.name" show>
-          <view class="examine" @click="pushMenu(item)">
+          <view class="examine" @click.stop="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>
@@ -524,6 +524,10 @@
           }
         });
       },
+      // 点击空白区域完成添加
+      clickWhite(){
+        if(this.editFlag) this.editFlag = false;
+      }
     }
   };
 </script>

From eaacdabdc48f0988f6cd4d038241d80204d5376c Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com>
Date: Wed, 24 Apr 2024 15:14:34 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E5=BA=97=E9=93=BA=E4=BA=8C=E7=BA=A7?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                    | 1069 ++++++++++++++++++------------------
 pages/index/index.vue      |   22 +-
 pages/store/home/index.vue |  216 ++++++--
 pages/whole_sale/index.vue |   20 +-
 4 files changed, 744 insertions(+), 583 deletions(-)

diff --git a/App.vue b/App.vue
index e4cda22..3705ce8 100644
--- a/App.vue
+++ b/App.vue
@@ -1,591 +1,598 @@
 <script>
-  // +----------------------------------------------------------------------
-  // | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
-  // +----------------------------------------------------------------------
-  // | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved.
-  // +----------------------------------------------------------------------
-  // | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
-  // +----------------------------------------------------------------------
-  // | Author: CRMEB Team <admin@crmeb.com>
-  // +----------------------------------------------------------------------
-  // #ifdef APP-PLUS
-  import { initEvent } from "@/utils/uniMPevent.js";
-  let jpushModule = uni.requireNativePlugin("JG-JPush");
-  // #endif
-  import {
-    checkLogin
-  } from "./libs/login";
-  import {
-    HTTP_REQUEST_URL
-  } from './config/app';
-  import {
-    getconfig,
-    history
-  } from '@/api/public.js'
-  import Routine from './libs/routine.js';
-  import Cache from '@/utils/cache';
-  export default {
-    data(){
-      return {
-        audioTeam: [],
-      }
-    },
-    globalData: {
-      spid: 0,
-      code: 0,
-      isLogin: false,
-      userInfo: {},
-      MyMenus: [],
-      balance_func_status: 0, //余额开关
-      recharge_switch: 0, // 充值开关
-      store_user_min_recharge: 0, //最小充值
-      yue_pay_status: 0, //余额支付开关
-      alipay_open: 0, //支付宝支付开关
-      routine_logo: '', //首页logo
-      share_pic: '',
-      site_logo: '',
-      site_name: '', //名称
-      fid: '', //一级分类id
-      uid: '',
-      hide_mer_status: 0,
-      member_status: 0,
-      copy_command_status: 0, //是否开启自动获取剪切板内容
-      arrival_notice: 0, //是否开启到货通知
-      is_phone_login: 0,
-      auto_arrival: 0,
-      mer_location: 0,
-      statusBarHeight: 0,
-      mer_location: 0,
-      store_street_theme: 1,
-      sys_intention_agree: '',
-      copyright_status: '',
-      copyright_context: '',
-      copyright_image: '',
-      open_update_info: 0,
-      recommend_switch: 0,
-      svip_switch_status: 0,
-      community_reply_status: 0,
-      community_reply_auth: 0,
-      margin_ico_switch: 0,
-      margin_ico: '',
-      community_app_switch: [],
-      first_avatar_switch: "",
-      wechat_phone_switch: "",
-      navigation: {},
-      imgColor: '',
-      ...uni.getStorageSync('GLOBAL_DATA') || {}
-    },
-    onLaunch: function(option) {
-      uni.hideTabBar();
-      uni.setTabBarItem({
-        index: 1,
-        visible: false
-      })
-      // #ifdef H5
-      uni.setTabBarItem({
-        index: 2,
-        visible: false
-      })
-      // #endif
-      
-      this.globalData.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
-      this.globalData.uid = this.$store.state.app.uid;
+	// +----------------------------------------------------------------------
+	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+	// +----------------------------------------------------------------------
+	// | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved.
+	// +----------------------------------------------------------------------
+	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+	// +----------------------------------------------------------------------
+	// | Author: CRMEB Team <admin@crmeb.com>
+	// +----------------------------------------------------------------------
+	// #ifdef APP-PLUS
+	import {
+		initEvent
+	} from "@/utils/uniMPevent.js";
+	let jpushModule = uni.requireNativePlugin("JG-JPush");
+	// #endif
+	import {
+		checkLogin
+	} from "./libs/login";
+	import {
+		HTTP_REQUEST_URL
+	} from './config/app';
+	import {
+		getconfig,
+		history
+	} from '@/api/public.js'
+	import Routine from './libs/routine.js';
+	import Cache from '@/utils/cache';
+	export default {
+		data() {
+			return {
+				audioTeam: [],
+			}
+		},
+		globalData: {
+			spid: 0,
+			code: 0,
+			isLogin: false,
+			userInfo: {},
+			MyMenus: [],
+			balance_func_status: 0, //余额开关
+			recharge_switch: 0, // 充值开关
+			store_user_min_recharge: 0, //最小充值
+			yue_pay_status: 0, //余额支付开关
+			alipay_open: 0, //支付宝支付开关
+			routine_logo: '', //首页logo
+			share_pic: '',
+			site_logo: '',
+			site_name: '', //名称
+			fid: '', //一级分类id
+			uid: '',
+			hide_mer_status: 0,
+			member_status: 0,
+			copy_command_status: 0, //是否开启自动获取剪切板内容
+			arrival_notice: 0, //是否开启到货通知
+			is_phone_login: 0,
+			auto_arrival: 0,
+			mer_location: 0,
+			statusBarHeight: 0,
+			mer_location: 0,
+			store_street_theme: 1,
+			sys_intention_agree: '',
+			copyright_status: '',
+			copyright_context: '',
+			copyright_image: '',
+			open_update_info: 0,
+			recommend_switch: 0,
+			svip_switch_status: 0,
+			community_reply_status: 0,
+			community_reply_auth: 0,
+			margin_ico_switch: 0,
+			margin_ico: '',
+			community_app_switch: [],
+			first_avatar_switch: "",
+			wechat_phone_switch: "",
+			navigation: {},
+			imgColor: '',
+			...uni.getStorageSync('GLOBAL_DATA') || {}
+		},
+		onLaunch: function(option) {
+			uni.hideTabBar();
+			uni.setTabBarItem({
+				index: 1,
+				visible: false
+			})
+			// #ifdef H5
+			uni.setTabBarItem({
+				index: 2,
+				visible: false
+			})
+			// #endif
 
-      // #ifdef APP-PLUS
-      //初始化uniMP小程序发送的事件以及其他操作
-      initEvent();
-      // #endif
+			this.globalData.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
+			this.globalData.uid = this.$store.state.app.uid;
 
-      //#ifdef APP-PLUS
-      this.checknetwork()
+			// #ifdef APP-PLUS
+			//初始化uniMP小程序发送的事件以及其他操作
+			initEvent();
+			// #endif
 
-      jpushModule.setLoggerEnable(true);
-      jpushModule.initJPushService()
-      jpushModule.addConnectEventListener(result => {
-        let connectEnable = result.connectEnable
-        // console.log("jpush连接", connectEnable)
-      })
+			//#ifdef APP-PLUS
+			this.checknetwork()
+
+			jpushModule.setLoggerEnable(true);
+			jpushModule.initJPushService()
+			jpushModule.addConnectEventListener(result => {
+				let connectEnable = result.connectEnable
+				// console.log("jpush连接", connectEnable)
+			})
 
 
-      // 设置别名
-      // jpushModule.setAlias({
-      // 	'alias': uni.getStorageSync('userId'),
-      // 	'sequence': 1
-      // })
-      //
-      // jpushModule.addTagAliasListener(result => {
-      // 	let code = result.code
-      // 	let sequence = result.sequence
-      // 	let tags = result.tags
-      // 	let tag = result.tag
-      // 	let tagEnable = result.tagEnable
-      // 	let alias = result.alias
-      // 	console.log(alias, '别名')
-      // })
-      // 通知事件回调
-      jpushModule.addNotificationListener(result => {
-        let notificationEventType = result.notificationEventType
-        let messageID = result.messageID
-        let title = result.title
-        let content = result.content
-        let extras = result.extras
+			// 设置别名
+			// jpushModule.setAlias({
+			// 	'alias': uni.getStorageSync('userId'),
+			// 	'sequence': 1
+			// })
+			//
+			// jpushModule.addTagAliasListener(result => {
+			// 	let code = result.code
+			// 	let sequence = result.sequence
+			// 	let tags = result.tags
+			// 	let tag = result.tag
+			// 	let tagEnable = result.tagEnable
+			// 	let alias = result.alias
+			// 	console.log(alias, '别名')
+			// })
+			// 通知事件回调
+			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)
+				console.log("通知", result)
 
-        if (result.extras.type == 'ORDER_CREATE' && result.extras.mp3.length>0) {
-          if(result.extras.mp3[0]=='微信') this.audioTeam.push('/static/audio/wechat.MP3')
-          if(result.extras.mp3[0]=='支付宝') this.audioTeam.push('/static/audio/pay.MP3')
-          result.extras.mp3.map(item=>{
-            if(item=='零') return this.audioTeam.push('/static/audio/0.MP3')
-            if(item=='一') return this.audioTeam.push('/static/audio/1.MP3')
-            if(item=='二') return this.audioTeam.push('/static/audio/2.MP3')
-            if(item=='三') return this.audioTeam.push('/static/audio/3.MP3')
-            if(item=='四') return this.audioTeam.push('/static/audio/4.MP3')
-            if(item=='五') return this.audioTeam.push('/static/audio/5.MP3')
-            if(item=='六') return this.audioTeam.push('/static/audio/6.MP3')
-            if(item=='七') return this.audioTeam.push('/static/audio/7.MP3')
-            if(item=='八') return this.audioTeam.push('/static/audio/8.MP3')
-            if(item=='九') return this.audioTeam.push('/static/audio/9.MP3')
-            if(item=='点') return this.audioTeam.push('/static/audio/dian.MP3')
-            if(item=='元') return this.audioTeam.push('/static/audio/yuan.MP3')
-            if(item=='十') return this.audioTeam.push('/static/audio/shi.MP3')
-            if(item=='百') return this.audioTeam.push('/static/audio/bai.MP3')
-            if(item=='千') return this.audioTeam.push('/static/audio/qian.MP3')
-            if(item=='万') return this.audioTeam.push('/static/audio/wan.MP3')
-            if(item=='亿') return this.audioTeam.push('/static/audio/yi.MP3')
-          })
-          if (this.audioTeam.length > 0) this.audio(this.audioTeam[0]);
-          // if (this.audioTeam.length > 0) {
-          //   this.audioTeam.push(result.extras.type);
-          // } else {
-          //   this.audio(result.extras.mp3)
-          //   this.audioTeam.push(result.extras.type);
-          // }
-        }
-        // 点击事件
-        if (notificationEventType == 'notificationOpened') {
-          uni.navigateTo({
-            url: result.extras.route
-          })
-        }
-      })
+				if (result.extras.type == 'ORDER_CREATE' && result.extras.mp3.length > 0) {
+					if (result.extras.mp3[0] == '微信') this.audioTeam.push('/static/audio/wechat.MP3')
+					if (result.extras.mp3[0] == '支付宝') this.audioTeam.push('/static/audio/pay.MP3')
+					result.extras.mp3.map(item => {
+						if (item == '零') return this.audioTeam.push('/static/audio/0.MP3')
+						if (item == '一') return this.audioTeam.push('/static/audio/1.MP3')
+						if (item == '二') return this.audioTeam.push('/static/audio/2.MP3')
+						if (item == '三') return this.audioTeam.push('/static/audio/3.MP3')
+						if (item == '四') return this.audioTeam.push('/static/audio/4.MP3')
+						if (item == '五') return this.audioTeam.push('/static/audio/5.MP3')
+						if (item == '六') return this.audioTeam.push('/static/audio/6.MP3')
+						if (item == '七') return this.audioTeam.push('/static/audio/7.MP3')
+						if (item == '八') return this.audioTeam.push('/static/audio/8.MP3')
+						if (item == '九') return this.audioTeam.push('/static/audio/9.MP3')
+						if (item == '点') return this.audioTeam.push('/static/audio/dian.MP3')
+						if (item == '元') return this.audioTeam.push('/static/audio/yuan.MP3')
+						if (item == '十') return this.audioTeam.push('/static/audio/shi.MP3')
+						if (item == '百') return this.audioTeam.push('/static/audio/bai.MP3')
+						if (item == '千') return this.audioTeam.push('/static/audio/qian.MP3')
+						if (item == '万') return this.audioTeam.push('/static/audio/wan.MP3')
+						if (item == '亿') return this.audioTeam.push('/static/audio/yi.MP3')
+					})
+					if (this.audioTeam.length > 0) this.audio(this.audioTeam[0]);
+					// if (this.audioTeam.length > 0) {
+					//   this.audioTeam.push(result.extras.type);
+					// } else {
+					//   this.audio(result.extras.mp3)
+					//   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
-      // 	let extras = result.extras
-      // 	console.log("自定义消息", result)
-      // })
-      //#endif
+			// jpushModule.addCustomMessageListener(result => {
+			// 	let messageID = result.messageID
+			// 	let content = result.content
+			// 	let extras = result.extras
+			// 	console.log("自定义消息", result)
+			// })
+			//#endif
 
-      let that = this;
-      // #ifdef MP
-      if (HTTP_REQUEST_URL == '') {
-        console.error(
-          "请配置根目录下的config.js文件中的 'HTTP_REQUEST_URL'\n\n请修改开发者工具中【详情】->【AppID】改为自己的Appid\n\n请前往后台【小程序】->【小程序配置】填写自己的 appId and AppSecret"
-        );
-        return false;
-      }
-      if (option.query.hasOwnProperty('scene')) {
-        switch (option.scene) {
-          //扫描小程序码
-          case 1047:
-            let val = that.$util.getUrlParams(decodeURIComponent(option.query.scene));
-            that.globalData.code = val;
-            that.globalData.uid = val
-            break;
-            //长按图片识别小程序码
-          case 1048:
-            that.globalData.code = option.query.scene;
-            break;
-            //手机相册选取小程序码
-          case 1049:
-            that.globalData.code = option.query.scene;
-            break;
-            //直接进入小程序
-          case 1001:
-            that.globalData.spid = option.query.scene;
-            break;
-        }
-      }
-      // #endif
-      // 获取导航高度；
-      uni.getSystemInfo({
-        success: function(res) {
-          that.globalData.navHeight = res.statusBarHeight * (750 / res.windowWidth) + 91;
-        }
-      });
-      // #ifdef MP
-      let menuButtonInfo = uni.getMenuButtonBoundingClientRect();
-      that.globalData.navH = menuButtonInfo.top * 2 + menuButtonInfo.height / 2;
-      const version = uni.getSystemInfoSync().SDKVersion
-      if (Routine.compareVersion(version, '2.21.2') >= 0) {
-        that.$Cache.set('MP_VERSION_ISNEW', true)
-      } else {
-        that.$Cache.set('MP_VERSION_ISNEW', false)
-      }
-      // #endif
-      that.getConfigData();
-      // setTimeout(()=>{
-      //   let arr = ['一', '点', '零', '九', '元']
-      //   arr.map(item=>{
-      //     if(item=='零') return this.audioTeam.push('/static/audio/0.MP3')
-      //     if(item=='一') return this.audioTeam.push('/static/audio/1.MP3')
-      //     if(item=='二') return this.audioTeam.push('/static/audio/2.MP3')
-      //     if(item=='三') return this.audioTeam.push('/static/audio/3.MP3')
-      //     if(item=='四') return this.audioTeam.push('/static/audio/4.MP3')
-      //     if(item=='五') return this.audioTeam.push('/static/audio/5.MP3')
-      //     if(item=='六') return this.audioTeam.push('/static/audio/6.MP3')
-      //     if(item=='七') return this.audioTeam.push('/static/audio/7.MP3')
-      //     if(item=='八') return this.audioTeam.push('/static/audio/8.MP3')
-      //     if(item=='九') return this.audioTeam.push('/static/audio/9.MP3')
-      //     if(item=='点') return this.audioTeam.push('/static/audio/dian.MP3')
-      //     if(item=='元') return this.audioTeam.push('/static/audio/yuan.MP3')
-      //     if(item=='亿') return this.audioTeam.push('/static/audio/yi.MP3')
-      //     if(item=='十') return this.audioTeam.push('/static/audio/shi.MP3')
-      //     if(item=='百') return this.audioTeam.push('/static/audio/bai.MP3')
-      //     if(item=='千') return this.audioTeam.push('/static/audio/qian.MP3')
-      //     if(item=='万') return this.audioTeam.push('/static/audio/wan.MP3')
-      //     if(item=='微信') return this.audioTeam.push('/static/audio/wechat.MP3')
-      //     if(item=='支付宝') return this.audioTeam.push('/static/audio/pay.MP3')
-      //   })
-      //   this.audio(this.audioTeam[0])
-      //   // this.audio('https://lihai001.oss-cn-chengdu.aliyuncs.com/app/out.wav')
-      // }, 1500)
-    },
-    onShow() {
-      let that = this
-      that.$store.commit('SETUUID', uni.getStorageSync('uuid') || that.randomString());
-      // 记录H5和公众号
-      if (this.$store.state.app.token) {
-        // 浏览记录
-        // #ifdef H5
-        history({
-          page: location.pathname + location.search,
-        }).then(() => {});
-        //#endif
-      };
-      // #ifndef H5
-      setTimeout(() => {
-        if (that.globalData.copy_command_status == 1) {
-          uni.getClipboardData({
-            success: function(res) {
-              if (/^(\/@[1-9]{1}).*\*\//.test(res.data)) {
-                that.$store.commit("PARSE_PWD", res.data)
-              }
-            },
-            fail: function(res) {
-              // 内容获取失败
-            }
-          })   
-        }
-      }, 1500)
-      // #endif	
-    },
-    methods: {
-      //网络检测
-      checknetwork() {
+			let that = this;
+			// #ifdef MP
+			if (HTTP_REQUEST_URL == '') {
+				console.error(
+					"请配置根目录下的config.js文件中的 'HTTP_REQUEST_URL'\n\n请修改开发者工具中【详情】->【AppID】改为自己的Appid\n\n请前往后台【小程序】->【小程序配置】填写自己的 appId and AppSecret"
+				);
+				return false;
+			}
+			if (option.query.hasOwnProperty('scene')) {
+				switch (option.scene) {
+					//扫描小程序码
+					case 1047:
+						let val = that.$util.getUrlParams(decodeURIComponent(option.query.scene));
+						that.globalData.code = val;
+						that.globalData.uid = val
+						break;
+						//长按图片识别小程序码
+					case 1048:
+						that.globalData.code = option.query.scene;
+						break;
+						//手机相册选取小程序码
+					case 1049:
+						that.globalData.code = option.query.scene;
+						break;
+						//直接进入小程序
+					case 1001:
+						that.globalData.spid = option.query.scene;
+						break;
+				}
+			}
+			// #endif
+			// 获取导航高度；
+			uni.getSystemInfo({
+				success: function(res) {
+					that.globalData.navHeight = res.statusBarHeight * (750 / res.windowWidth) + 91;
+				}
+			});
+			// #ifdef MP
+			let menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+			that.globalData.navH = menuButtonInfo.top * 2 + menuButtonInfo.height / 2;
+			const version = uni.getSystemInfoSync().SDKVersion
+			if (Routine.compareVersion(version, '2.21.2') >= 0) {
+				that.$Cache.set('MP_VERSION_ISNEW', true)
+			} else {
+				that.$Cache.set('MP_VERSION_ISNEW', false)
+			}
+			// #endif
+			that.getConfigData();
+			// setTimeout(()=>{
+			//   let arr = ['一', '点', '零', '九', '元']
+			//   arr.map(item=>{
+			//     if(item=='零') return this.audioTeam.push('/static/audio/0.MP3')
+			//     if(item=='一') return this.audioTeam.push('/static/audio/1.MP3')
+			//     if(item=='二') return this.audioTeam.push('/static/audio/2.MP3')
+			//     if(item=='三') return this.audioTeam.push('/static/audio/3.MP3')
+			//     if(item=='四') return this.audioTeam.push('/static/audio/4.MP3')
+			//     if(item=='五') return this.audioTeam.push('/static/audio/5.MP3')
+			//     if(item=='六') return this.audioTeam.push('/static/audio/6.MP3')
+			//     if(item=='七') return this.audioTeam.push('/static/audio/7.MP3')
+			//     if(item=='八') return this.audioTeam.push('/static/audio/8.MP3')
+			//     if(item=='九') return this.audioTeam.push('/static/audio/9.MP3')
+			//     if(item=='点') return this.audioTeam.push('/static/audio/dian.MP3')
+			//     if(item=='元') return this.audioTeam.push('/static/audio/yuan.MP3')
+			//     if(item=='亿') return this.audioTeam.push('/static/audio/yi.MP3')
+			//     if(item=='十') return this.audioTeam.push('/static/audio/shi.MP3')
+			//     if(item=='百') return this.audioTeam.push('/static/audio/bai.MP3')
+			//     if(item=='千') return this.audioTeam.push('/static/audio/qian.MP3')
+			//     if(item=='万') return this.audioTeam.push('/static/audio/wan.MP3')
+			//     if(item=='微信') return this.audioTeam.push('/static/audio/wechat.MP3')
+			//     if(item=='支付宝') return this.audioTeam.push('/static/audio/pay.MP3')
+			//   })
+			//   this.audio(this.audioTeam[0])
+			//   // this.audio('https://lihai001.oss-cn-chengdu.aliyuncs.com/app/out.wav')
+			// }, 1500)
+		},
+		onShow() {
+			let that = this
+			that.$store.commit('SETUUID', uni.getStorageSync('uuid') || that.randomString());
+			// 记录H5和公众号
+			if (this.$store.state.app.token) {
+				// 浏览记录
+				// #ifdef H5
+				history({
+					page: location.pathname + location.search,
+				}).then(() => {});
+				//#endif
+			};
+			// #ifndef H5
+			setTimeout(() => {
+				if (that.globalData.copy_command_status == 1) {
+					uni.getClipboardData({
+						success: function(res) {
+							if (/^(\/@[1-9]{1}).*\*\//.test(res.data)) {
+								that.$store.commit("PARSE_PWD", res.data)
+							}
+						},
+						fail: function(res) {
+							// 内容获取失败
+						}
+					})
+				}
+			}, 1500)
+			// #endif	
+		},
+		methods: {
+			//网络检测
+			checknetwork() {
 
-        uni.onNetworkStatusChange(function(res) {
+				uni.onNetworkStatusChange(function(res) {
 
-          if (res.isConnected) {
+					if (res.isConnected) {
 
-            uni.reLaunch({
-              url: '/pages/index/index'
-            })
+						uni.reLaunch({
+							url: '/pages/index/index'
+						})
 
-          } else {
+					} else {
 
-            uni.showModal({
+						uni.showModal({
 
-              title: '系统提示',
+							title: '系统提示',
 
-              content: '当前设备无网络或网络较差',
+							content: '当前设备无网络或网络较差',
 
-              cancelText: '取消',
+							cancelText: '取消',
 
-              confirmText: '确定',
+							confirmText: '确定',
 
-              success: (res) => {
+							success: (res) => {
 
-                if (res.confirm) {
+								if (res.confirm) {
 
-                  uni.reLaunch({
+									uni.reLaunch({
 
-                    url: '/pages/index/index'
+										url: '/pages/index/index'
 
-                  })
+									})
 
-                } else {
+								} else {
 
-                  // #ifdef H5
+									// #ifdef H5
 
-                  uni.navigateTo({
-                    url: '/pages/users/login/login_copy'
-                  })
+									uni.navigateTo({
+										url: '/pages/users/login/login_copy'
+									})
 
-                  // #endif
+									// #endif
 
-                  // #ifdef APP-PLUS
+									// #ifdef APP-PLUS
 
-                  plus.runtime.quit()
+									plus.runtime.quit()
 
-                  // #endif
+									// #endif
 
-                }
+								}
 
-              }
+							}
 
-            })
+						})
 
-          }
+					}
 
-        })
+				})
 
-      },
-      /**
-       * 语音播报
-       * 
-       * 
-       */
-      async audio(url) {
-      	const innerAudioContext = uni.createInnerAudioContext();
-      	innerAudioContext.src = url || `/static/audio/order.mp3`;
-        innerAudioContext.startTime = 0;
-      	innerAudioContext.autoplay = true;
-      	innerAudioContext.onPlay(() => {
-      		console.log('开始播放')
-      	});
-      	innerAudioContext.onEnded(() => {
-      		console.log('语音播报结束')
-      		innerAudioContext.destroy() //销毁
-      		if (this.audioTeam.length > 1) {
-      			this.audioTeam.splice(0, 1);
-      			console.log('队列中');
-      			this.audio(this.audioTeam[0]);
-      		} else {
-      			console.log('队列为零');
-      			this.audioTeam = []
-      		}
-      	});
-      	innerAudioContext.onError((err) => {
-      		console.log('语音播报失败', err)
-      		innerAudioContext.destroy() // 销毁
-      	});
-      
-      },
-      randomString(len) {
-        // 　　len = len || 32;
-        // 　　var $chars = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678';    /****默认去掉了容易混淆的字符oOLl,9gq,Vv,Uu,I1****/
-        // 　　var maxPos = $chars.length;
-        // 　　var pwd = '';
-        // 　　for (var i = 0; i < len; i++) {
-        // 　　　　pwd += $chars.charAt(Math.floor(Math.random() * maxPos));
-        // 　　}
-        let pwd = (Date.now()).toString();
-        pwd += (Math.random(10)*100000).toFixed(0);
-        uni.setStorageSync('uuid', pwd)
-        return pwd;
-      },
-      setOpenShare: function(data) {
-        let that = this;
-        let href = location.href;
-        href = href.indexOf("?") === -1 ? href + "?spid=" + this.globalData.uid : href + "&spid=" + this
-          .globalData.uid;
-        if (that.$wechat.isWeixin()) {
-          let configAppMessage = {
-            desc: data.share_info,
-            title: data.share_title,
-            link: href,
-            imgUrl: data.share_pic
-          };
-          that.$wechat.wechatEvevt(["updateAppMessageShareData", "updateTimelineShareData"],
-            configAppMessage);
-        }
-      },
-      // 获取配置
-      getConfigData() {
-        getconfig().then(res => {
-          uni.$emit('update', res.data)
-          this.$store.commit('GLOBAL_DATA', res.data);
-          this.globalData.balance_func_status = res.data.balance_func_status
-          this.globalData.recharge_switch = res.data.recharge_switch
-          this.globalData.routine_logo = res.data.routine_logo
-          this.globalData.share_pic = res.data.share_pic
-          this.globalData.community_reply_status = res.data.community_reply_status
-          this.globalData.site_logo = res.data.site_logo
-          this.globalData.login_logo = res.data.login_logo
-          this.globalData.site_name = res.data.site_name
-          this.globalData.store_user_min_recharge = res.data.store_user_min_recharge
-          this.globalData.yue_pay_status = res.data.yue_pay_status
-          this.globalData.sys_intention_agree = res.data.sys_intention_agree
-          this.globalData.mer_intention_open = res.data.mer_intention_open
-          this.globalData.alipay_open = res.data.alipay_open
-          this.globalData.hide_mer_status = res.data.hide_mer_status
-          this.globalData.mer_location = res.data.mer_location
-          this.globalData.procudt_increase_status = res.data.procudt_increase_status
-          this.globalData.auto_arrival = res.data.sys_extension_type
-          this.globalData.member_status = res.data.member_status
-          this.globalData.copy_command_status = res.data.copy_command_status
-          this.globalData.is_phone_login = res.data.is_phone_login
-          this.globalData.mer_location = res.data.mer_location
-          this.globalData.store_street_theme = res.data.store_street_theme
-          this.globalData.copyright_status = res.data.copyright_status
-          this.globalData.copyright_image = res.data.copyright_image
-          this.globalData.copyright_context = res.data.copyright_context
-          this.globalData.open_update_info = res.data.open_update_info
-          this.globalData.recommend_switch = res.data.recommend_switch
-          this.globalData.svip_switch_status = res.data.svip_switch_status
-          this.globalData.navigation = res.data.navigation
-          this.globalData.community_app_switch = res.data.community_app_switch
-          this.globalData.community_reply_auth = res.data.community_reply_auth
-          this.globalData.margin_ico_switch = res.data.margin_ico_switch
-          this.globalData.first_avatar_switch = res.data.first_avatar_switch
-          this.globalData.wechat_phone_switch = res.data.wechat_phone_switch
-          this.$Cache.set('BIND_PHONE', res.data.wechat_phone_switch) //是否开启强制绑定手机号
-          this.globalData.margin_ico = res.data.margin_ico
-          this.globalData.community_auth = res.data.community_auth
-          this.$Cache.set('WECHAT_APPID', res.data.wechat_config_appid)
-          this.$store.commit("VIEW_COLOR", res.data.global_theme.theme)
-          this.$store.commit("KEY_COLOR", '_' + res.data.global_theme.type)
-          try {
-            uni.setStorageSync('SUBSCRIBE_MESSAGE', res.data.tempid);
-          } catch (e) {
-            // error
-          }
-          // #ifdef H5
-          this.setOpenShare(res.data);
-          // #endif
-        }).catch(err => {});
-      }
-    },
-    onHide: function() {
-      //console.log('App Hide')
-    },
-    watch: {
-      // 记录H5和公众号
-      $route(n) {
-        if (this.$store.state.app.token) {
-          // 浏览记录
-          history({
-            page: location.pathname + location.search,
-          }).then(() => {});
-        }
-      },
-    }
-  }
+			},
+			/**
+			 * 语音播报
+			 * 
+			 * 
+			 */
+			async audio(url) {
+				const innerAudioContext = uni.createInnerAudioContext();
+				innerAudioContext.src = url || `/static/audio/order.mp3`;
+				innerAudioContext.startTime = 0;
+				innerAudioContext.autoplay = true;
+				innerAudioContext.onPlay(() => {
+					console.log('开始播放')
+				});
+				innerAudioContext.onEnded(() => {
+					console.log('语音播报结束')
+					innerAudioContext.destroy() //销毁
+					if (this.audioTeam.length > 1) {
+						this.audioTeam.splice(0, 1);
+						console.log('队列中');
+						this.audio(this.audioTeam[0]);
+					} else {
+						console.log('队列为零');
+						this.audioTeam = []
+					}
+				});
+				innerAudioContext.onError((err) => {
+					console.log('语音播报失败', err)
+					innerAudioContext.destroy() // 销毁
+				});
+
+			},
+			randomString(len) {
+				// 　　len = len || 32;
+				// 　　var $chars = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678';    /****默认去掉了容易混淆的字符oOLl,9gq,Vv,Uu,I1****/
+				// 　　var maxPos = $chars.length;
+				// 　　var pwd = '';
+				// 　　for (var i = 0; i < len; i++) {
+				// 　　　　pwd += $chars.charAt(Math.floor(Math.random() * maxPos));
+				// 　　}
+				let pwd = (Date.now()).toString();
+				pwd += (Math.random(10) * 100000).toFixed(0);
+				uni.setStorageSync('uuid', pwd)
+				return pwd;
+			},
+			setOpenShare: function(data) {
+				let that = this;
+				let href = location.href;
+				href = href.indexOf("?") === -1 ? href + "?spid=" + this.globalData.uid : href + "&spid=" + this
+					.globalData.uid;
+				if (that.$wechat.isWeixin()) {
+					let configAppMessage = {
+						desc: data.share_info,
+						title: data.share_title,
+						link: href,
+						imgUrl: data.share_pic
+					};
+					that.$wechat.wechatEvevt(["updateAppMessageShareData", "updateTimelineShareData"],
+						configAppMessage);
+				}
+			},
+			// 获取配置
+			getConfigData() {
+				getconfig().then(res => {
+					uni.$emit('update', res.data)
+					this.$store.commit('GLOBAL_DATA', res.data);
+					this.globalData.balance_func_status = res.data.balance_func_status
+					this.globalData.recharge_switch = res.data.recharge_switch
+					this.globalData.routine_logo = res.data.routine_logo
+					this.globalData.share_pic = res.data.share_pic
+					this.globalData.community_reply_status = res.data.community_reply_status
+					this.globalData.site_logo = res.data.site_logo
+					this.globalData.login_logo = res.data.login_logo
+					this.globalData.site_name = res.data.site_name
+					this.globalData.store_user_min_recharge = res.data.store_user_min_recharge
+					this.globalData.yue_pay_status = res.data.yue_pay_status
+					this.globalData.sys_intention_agree = res.data.sys_intention_agree
+					this.globalData.mer_intention_open = res.data.mer_intention_open
+					this.globalData.alipay_open = res.data.alipay_open
+					this.globalData.hide_mer_status = res.data.hide_mer_status
+					this.globalData.mer_location = res.data.mer_location
+					this.globalData.procudt_increase_status = res.data.procudt_increase_status
+					this.globalData.auto_arrival = res.data.sys_extension_type
+					this.globalData.member_status = res.data.member_status
+					this.globalData.copy_command_status = res.data.copy_command_status
+					this.globalData.is_phone_login = res.data.is_phone_login
+					this.globalData.mer_location = res.data.mer_location
+					this.globalData.store_street_theme = res.data.store_street_theme
+					this.globalData.copyright_status = res.data.copyright_status
+					this.globalData.copyright_image = res.data.copyright_image
+					this.globalData.copyright_context = res.data.copyright_context
+					this.globalData.open_update_info = res.data.open_update_info
+					this.globalData.recommend_switch = res.data.recommend_switch
+					this.globalData.svip_switch_status = res.data.svip_switch_status
+					this.globalData.navigation = res.data.navigation
+					this.globalData.community_app_switch = res.data.community_app_switch
+					this.globalData.community_reply_auth = res.data.community_reply_auth
+					this.globalData.margin_ico_switch = res.data.margin_ico_switch
+					this.globalData.first_avatar_switch = res.data.first_avatar_switch
+					this.globalData.wechat_phone_switch = res.data.wechat_phone_switch
+					this.$Cache.set('BIND_PHONE', res.data.wechat_phone_switch) //是否开启强制绑定手机号
+					this.globalData.margin_ico = res.data.margin_ico
+					this.globalData.community_auth = res.data.community_auth
+					this.$Cache.set('WECHAT_APPID', res.data.wechat_config_appid)
+					this.$store.commit("VIEW_COLOR", res.data.global_theme.theme)
+					this.$store.commit("KEY_COLOR", '_' + res.data.global_theme.type)
+					try {
+						uni.setStorageSync('SUBSCRIBE_MESSAGE', res.data.tempid);
+					} catch (e) {
+						// error
+					}
+					// #ifdef H5
+					this.setOpenShare(res.data);
+					// #endif
+				}).catch(err => {});
+			}
+		},
+		onHide: function() {
+			//console.log('App Hide')
+		},
+		watch: {
+			// 记录H5和公众号
+			$route(n) {
+				if (this.$store.state.app.token) {
+					// 浏览记录
+					history({
+						page: location.pathname + location.search,
+					}).then(() => {});
+				}
+			},
+		}
+	}
 </script>
 <style lang="scss">
-  /* 注意要写在第一行，同时给style标签加入lang="scss"属性 */
-  @import "@/uni_modules/uview-ui/index.scss";
-  /* #ifndef APP-PLUS-NVUE || APP-NVUE */
-  @import "@/plugin/animate/animate.min.css";
-  @import 'static/css/base.css';
-  @import 'static/iconfont/iconfont.css';
-  @import 'static/css/style.scss';
-  
-  .bg-color-red {
-    background-color: #e93323 !important;
-  }
+	/* 注意要写在第一行，同时给style标签加入lang="scss"属性 */
+	@import "@/uni_modules/uview-ui/index.scss";
+	/* #ifndef APP-PLUS-NVUE || APP-NVUE */
+	@import "@/plugin/animate/animate.min.css";
+	@import 'static/css/base.css';
+	@import 'static/iconfont/iconfont.css';
+	@import 'static/css/style.scss';
 
-  .syspadding {
-    padding-top: var(--status-bar-height);
-  }
+	.bg-color-red {
+		background-color: #e93323 !important;
+	}
 
-  .flex {
-    display: flex;
-  }
+	.syspadding {
+		padding-top: var(--status-bar-height);
+	}
 
-  .uni-scroll-view::-webkit-scrollbar {
-    /* 隐藏滚动条，但依旧具备可以滚动的功能 */
-    display: none
-  }
+	.flex {
+		display: flex;
+	}
 
-  ::-webkit-scrollbar {
-    width: 0;
-    height: 0;
-    color: transparent;
-  }
+	.uni-scroll-view::-webkit-scrollbar {
+		/* 隐藏滚动条，但依旧具备可以滚动的功能 */
+		display: none
+	}
 
-  ::-moz-scrollbar {
-    width: 0;
-    height: 0;
-    color: transparent;
-  }
+	::-webkit-scrollbar {
+		width: 0;
+		height: 0;
+		color: transparent;
+	}
 
-  .empty-txt {
-    line-height: 100rpx;
-    font-size: 22rpx;
-    color: #999;
-    text-align: center;
-  }
+	::-moz-scrollbar {
+		width: 0;
+		height: 0;
+		color: transparent;
+	}
 
-  .product-con .conter img {
-    display: block;
-  }
+	.empty-txt {
+		line-height: 100rpx;
+		font-size: 22rpx;
+		color: #999;
+		text-align: center;
+	}
 
-  .open-location {
-    height: 100vh;
-  }
+	.product-con .conter img {
+		display: block;
+	}
 
-  uni-tabbar {
-    bottom: 0;
-  }
+	.open-location {
+		height: 100vh;
+	}
 
-  /*#endif*/
-  // 圆形指示点
-  .circular {
+	uni-tabbar {
+		bottom: 0;
+	}
 
-    /deep/.uni-swiper-dot,
-    /deep/.wx-swiper-dot {
-      width: 10rpx;
-      height: 10rpx;
-      background: rgba(0, 0, 0, .4);
-    }
+	/*#endif*/
+	// 圆形指示点
+	.circular {
 
-    /deep/.uni-swiper-dot-active,
-    /deep/.wx-swiper-dot-active {
-      background: #fff;
-    }
-  }
+		/deep/.uni-swiper-dot,
+		/deep/.wx-swiper-dot {
+			width: 10rpx;
+			height: 10rpx;
+			background: rgba(0, 0, 0, .4);
+		}
 
-  // 方形指示点
-  .square {
+		/deep/.uni-swiper-dot-active,
+		/deep/.wx-swiper-dot-active {
+			background: #fff;
+		}
+	}
 
-    /deep/.uni-swiper-dot,
-    /deep/.wx-swiper-dot {
-      width: 20rpx;
-      height: 5rpx;
-      border-radius: 3rpx;
-      background: rgba(0, 0, 0, .4);
-    }
+	// 方形指示点
+	.square {
 
-    /deep/.uni-swiper-dot-active,
-    /deep/.wx-swiper-dot-active {
-      background: #fff;
-    }
-  }
+		/deep/.uni-swiper-dot,
+		/deep/.wx-swiper-dot {
+			width: 20rpx;
+			height: 5rpx;
+			border-radius: 3rpx;
+			background: rgba(0, 0, 0, .4);
+		}
 
-  .nodoc {
+		/deep/.uni-swiper-dot-active,
+		/deep/.wx-swiper-dot-active {
+			background: #fff;
+		}
+	}
 
-    /deep/.uni-swiper-dot,
-    /deep/.wx-swiper-dot {
-      display: none;
-    }
-  }
+	.nodoc {
 
-  /deep/.swiper.dot0 .uni-swiper-dots,
-  /deep/.swiper.dot0 .wx-swiper-dots {
-    left: 130rpx;
-  }
+		/deep/.uni-swiper-dot,
+		/deep/.wx-swiper-dot {
+			display: none;
+		}
+	}
 
-  /deep/.swiper.dot1 .uni-swiper-dots,
-  /deep/.swiper.dot1 .wx-swiper-dots {
-    left: 50%;
-  }
+	/deep/.swiper.dot0 .uni-swiper-dots,
+	/deep/.swiper.dot0 .wx-swiper-dots {
+		left: 130rpx;
+	}
 
-  /deep/.swiper.dot2 .uni-swiper-dots,
-  /deep/.swiper.dot2 .wx-swiper-dots {
-    right: 130rpx;
-  }
+	/deep/.swiper.dot1 .uni-swiper-dots,
+	/deep/.swiper.dot1 .wx-swiper-dots {
+		left: 50%;
+	}
+
+	/deep/.swiper.dot2 .uni-swiper-dots,
+	/deep/.swiper.dot2 .wx-swiper-dots {
+		right: 130rpx;
+	}
+
+	* {
+		scrollbar-color: #ffffff #f7f7f9;
+		scrollbar-width: thin;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 8405a05..d692330 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -522,18 +522,26 @@
 				diyId: 0,
 				preview: false,
 				isSupport: true,
+				isIndexClick: true,
+				scrollTop: 0
 			};
 		},
 
 		onTabItemTap(e) {
-			uni.pageScrollTo({
-				scrollTop: 0,
-				duration: 300
-			});
+			if (this.isIndexClick) {
+				uni.pageScrollTo({
+					scrollTop: 0,
+					duration: 300
+				});
+			} else {
+				this.isIndexClick = true;
+			}
 		},
 
 		// 滚动监听
 		onPageScroll(e) {
+			this.isIndexClick = true;
+			this.scrollTop = e.scrollTop;
 			this.isFixed = e.scrollTop > 40;
 			if (this.isHeaderSerch) {
 				let isScroll = false
@@ -545,7 +553,6 @@
 			// 传入scrollTop值并触发所有easy-loadimage组件下的滚动监听事件
 			uni.$emit('scroll');
 
-
 			if (e.scrollTop >= 100) {
 				uni.setTabBarItem({
 					index: 0,
@@ -612,7 +619,8 @@
 			this.activeRouter = '/' + curRoute
 		},
 		onShow() {
-			let that = this
+			let that = this;
+
 			that.isIntegral = uni.getStorageSync('isIntegral')
 			// #ifdef APP-PLUS
 			if (that.appUpdate.openUpgrade == '1') {
@@ -628,6 +636,8 @@
 					that.isScrolled = res[0].top <= -60
 				})
 			})
+			this.isIndexClick = false;
+
 			if (this.isLogin) {
 				this.getUserInfo();
 			}
diff --git a/pages/store/home/index.vue b/pages/store/home/index.vue
index b0502f7..859c921 100644
--- a/pages/store/home/index.vue
+++ b/pages/store/home/index.vue
@@ -2,7 +2,6 @@
 	<view class="store-home">
 		<view class="header">
 			<view style="height: var(--status-bar-height);"></view>
-
 			<view class="head-menu">
 				<view class="iconfont icon-xiangzuo" @click="goback" style="color: #fff;"></view>
 				<navigator :url="'/pages/store/list/index?mer_id='+id" hover-class="none"
@@ -86,10 +85,10 @@
 		</view>
 
 		<scroll-view class="main" scroll-y="true" @scroll="scrollHome" catchtouchmove :style="viewColor">
-			<!-- nav的占位 -->
 			<view class="tab-cont"
-				:style="viewColor,{'height':'calc(100vh - '+listHeight + (tabActive == 2?' + 84rpx':'')+' )'}"
+				:style="viewColor,{'height':'calc(100vh - '+(listHeight) + (tabActive == 2?' + 84rpx':'')+' )'}"
 				:class="{noPointer : preview}">
+
 				<!-- 占位 -->
 				<view class="aside-left-placeholder" v-if="tabActive != 2"></view>
 
@@ -151,11 +150,28 @@
 				</view>
 
 				<!-- 首页 -->
-				<view style="margin:0 auto;"
+				<view style="margin:0px auto;"
 					v-show="(tabActive == 3 || tabActive == 7 || diyActive == 1 || diyActive == 2) && tabActive != 5 && tabActive != 2">
+					<!-- 二级分类 -->
+					<scroll-view :scroll-x="true" class="small-classify" :style="{'width':'calc(100vw - 152rpx)'}"
+						v-if="asideCurr">
+						<view class="second-item-con-wrap">
+							<view class="second-item-con" :style="{'flex-wrap':isChangeSecTabStyle?'wrap':''}">
+								<block v-for="item in secondTabList" :key="item.store_category_id">
+									<view class="small-classify-item"
+										:class="{'small-classify-item-active':secondTabCurr == item.store_category_id?true:false}"
+										@click="onSecondTabChange(item.store_category_id)">
+										{{item.cate_name}}
+									</view>
+								</block>
+							</view>
+							<view class="sanjiaoxing" @click="onChangeSecTabStyle"></view>
+						</view>
+					</scroll-view>
+
 					<!-- 商品 -->
 					<view v-if="goods.length" class="goods-wrap" id="goods" @touchmove="onTouchmove"
-						:style="{'width':'calc(100vw - 152rpx)'}">
+						:style="{'width':'calc(100vw - 152rpx)','padding-top':(!!asideCurr?'94rpx' :'')}">
 						<view v-if="isColumn" class="goods column">
 							<view v-for="(item,indx) in goods" :key="indx" class="item" @click="goGoodsDetail(item)">
 								<view class="image" style="width: 180rpx;height: 180rpx;">
@@ -197,7 +213,8 @@
 							<WaterfallsFlow :wfList='goods' @itemTap="goGoodsDetail" :type="1" :isStore="1" />
 						</view>
 					</view>
-					<view v-if="goodsLoading" class="acea-row row-center-wrapper loadingicon">
+					<view v-if="goodsLoading" class="acea-row row-center-wrapper loadingicon"
+						:style="{'margin-top':!!asideCurr?'94rpx':''}">
 						<text :hidden="!goodsLoading" class="iconfont icon-jiazai loading"></text>
 						{{loadTitle}}
 					</view>
@@ -224,7 +241,8 @@
 							</view>
 						</view>
 					</view>
-					<view class="acea-row row-center-wrapper loadingicon">
+					<view class="acea-row row-center-wrapper loadingicon"
+						:style="{'margin-top':!!asideCurr?'94rpx':''}">
 						<text :hidden="!categoryLoading" class="iconfont icon-jiazai loading"></text>
 						{{loadTitle}}
 					</view>
@@ -373,7 +391,7 @@
 				navShow: false,
 				navActive: 0,
 				diyActive: 0,
-				tabActive: '', // 底部切换
+				tabActive: 3, // 底部切换
 				isCoupon: 0,
 				keyword: '',
 				order: '',
@@ -470,7 +488,11 @@
 				asideCurr: '',
 				CartCount: 0,
 				navHeight: 0,
-				listTop: 0
+				listTop: 0,
+				mer_type: '', //区分云仓
+				secondTabList: [],
+				secondTabCurr: '', //二级分类
+				isChangeSecTabStyle: false
 			}
 		},
 		computed: {
@@ -527,6 +549,7 @@
 						break;
 					case 7:
 						this.resetParmas();
+						this.getMerClassifly();
 						this.goods = [];
 						this.getGoods();
 						break;
@@ -557,8 +580,9 @@
 				}
 			}
 			// #endif
+			// 店铺详情
 			this.getStore();
-			this.diyData();
+			// this.diyData();
 			shareScence(this.currSpid, this.isLogin);
 
 			this.initHeight();
@@ -579,6 +603,8 @@
 			})
 
 			this.getMerClassifly();
+
+			// 购物车
 			this.getCart();
 		},
 
@@ -617,31 +643,99 @@
 				getCartCounts({
 					sale_type: this.where.sale_type
 				}).then(res => {
-					console.log(res)
 					that.CartCount = res.data[0].count;
 				});
 			},
 
 			// 修改菜单
 			onChangeAsideMenu(e) {
+				// 获取二级分类
+				this.getMerClassifly(e)
 				this.asideCurr = e;
 				this.resetParmas();
 				this.goods = [];
 				this.loadend = false;
+				//重置二级菜单
+				this.secondTabCurr = '';
+				this.isChangeSecTabStyle = false;
+			},
+
+			// 获取分类
+			getMerClassifly(pid) {
+				const param = {
+					mer_type: 2,
+					sale_type: this.where.sale_type,
+					mer_id: '',
+					mer_type: '',
+					pid: pid
+				};
+
+				// 云商品(不查询分类下边没有商品的分类)
+				if (this.tabActive == 7) {
+					param.mer_type = 1;
+					param.mer_id = '';
+				}
+				//一般商品(不查询分类下边没有商品的分类)
+				if (this.tabActive == 3) {
+					param.mer_id = this.id;
+					param.mer_type = 2;
+				}
+
+				getCategoryIndexList(param).then(res => {
+					//二级分类
+					if (pid) {
+						this.secondTabList = [{
+							cate_name: '全部',
+							store_category_id: ''
+						}, ...res.data];
+					} else { //一级分类
+						this.asideMenu = [{
+							cate_name: '全部',
+							store_category_id: ''
+						}, ...res.data];
+					}
+					this.getGoods();
+				})
+			},
+
+			// 二级分类
+			onSecondTabChange(e) {
+				this.isChangeSecTabStyle = false;
+				this.secondTabCurr = e;
+				this.resetParmas();
+				this.goods = [];
+				this.loadend = false;
 				this.getGoods();
 			},
 
-			// 获取分类
-			getMerClassifly() {
-				getCategoryIndexList({
-					mer_type: 2,
-					sale_type: this.where.sale_type
-				}).then(res => {
-					this.asideMenu = [{
-						cate_name: '全部',
-						store_category_id: ''
-					}, ...res.data];
-				})
+			// 商铺底部切换
+			tab: function(param) {
+				if (param == 9) return uni.switchTab({
+					url: "/pages/order_addcart/order_addcart"
+				});
+
+				this.tabActive = param;
+				this.goodsLoading = this.loadend = this.loading = false;
+
+				// 底部tab切换
+				this.secondTabCurr = '';
+				this.secondTabList = [];
+				this.asideCurr = '';
+				this.asideMenu = [];
+				this.loadend = false;
+				this.getMerClassifly();
+			},
+
+			// 二级类目样式
+			onChangeSecTabStyle() {
+				this.isChangeSecTabStyle = !this.isChangeSecTabStyle;
+			},
+
+			// 商铺首页滚动 navbar 吸顶
+			scrollHome: function(e) {
+				console.log(1)
+				// uni.$emit('scroll');
+				// this.navShow = e.detail.scrollTop >= 50;
 			},
 
 			navTo(url) {
@@ -862,7 +956,6 @@
 			},
 			// 获取商铺商品
 			getGoods: function() {
-				console.log(2)
 				let that = this;
 				if (that.loadend) return;
 				if (that.loading) return;
@@ -870,7 +963,11 @@
 
 				that.goodsLoading = true;
 				that.loadTitle = '';
-				that.where.cate_pid = that.asideCurr;
+
+				if (that.secondTabCurr) //有二级查二级
+					that.where.cate_pid = that.secondTabCurr;
+				else //无二级查一级
+					that.where.cate_pid = that.asideCurr;
 
 				if (this.tabActive == 7) getStoreCloudGoods(that.id, that.where).then(res => {
 					that.goodsLoading = false;
@@ -1079,11 +1176,6 @@
 					}
 				})
 			},
-			// 商铺首页滚动 navbar 吸顶
-			scrollHome: function(e) {
-				// uni.$emit('scroll');
-				// this.navShow = e.detail.scrollTop >= 50;
-			},
 
 			goback: function() {
 				uni.navigateBack();
@@ -1095,16 +1187,6 @@
 				});
 			},
 
-			// 商铺底部切换
-			tab: function(param) {
-				console.log(param)
-				if (param == 9) return uni.switchTab({
-					url: "/pages/order_addcart/order_addcart"
-				})
-				this.tabActive = param;
-				this.goodsLoading = this.loadend = this.loading = false
-			},
-
 			resetParmas() {
 				this.navActive = 0;
 				this.where = {
@@ -1112,7 +1194,8 @@
 					keyword: '',
 					page: 1,
 					limit: 30,
-					sale_type: this.where.sale_type
+					sale_type: this.where.sale_type,
+					cate_pid: ''
 				}
 			},
 
@@ -1163,6 +1246,7 @@
 			}
 		},
 		onPageScroll() {
+			this.isChangeSecTabStyle = false;
 			uni.$emit('scroll');
 		},
 		onPullDownRefresh() {
@@ -1177,6 +1261,56 @@
 </script>
 
 <style lang="scss" scoped>
+	.small-classify {
+		position: fixed;
+		left: 152rpx;
+		min-height: 94rpx;
+		background: #fff;
+		z-index: 100;
+		padding: 20rpx 20rpx 10rpx;
+		box-sizing: border-box;
+
+		.second-item-con-wrap {
+			position: relative;
+			display: flex;
+			align-items: center;
+
+			.second-item-con {
+				display: flex;
+				width: 95%;
+				overflow: auto;
+			}
+
+			.sanjiaoxing {
+				position: absolute;
+				right: -2rpx;
+				top: 20rpx;
+				width: 0;
+				height: 0;
+				border: 12rpx solid;
+				border-color: #333 transparent transparent transparent;
+				margin-left: 4rpx;
+			}
+		}
+
+		.small-classify-item {
+			flex-shrink: 0;
+			padding: 10rpx 40rpx;
+			border-radius: 4rpx;
+			font-size: 24rpx;
+			color: #999;
+			background: #F6F6F6;
+			text-align: center;
+			margin-right: 10rpx;
+			margin-bottom: 10rpx;
+		}
+
+		.small-classify-item-active {
+			background: #ECFFE8;
+			color: #40AE36;
+		}
+	}
+
 	.tab-cont {
 		background: #f5f5f5;
 		min-height: 500rpx;
@@ -2225,7 +2359,7 @@
 		flex-direction: column;
 		justify-content: center;
 		align-items: center;
-		margin-top: 0;
+		margin: 0 auto;
 
 		image {
 			width: 414rpx;
diff --git a/pages/whole_sale/index.vue b/pages/whole_sale/index.vue
index 9049334..389fdc6 100644
--- a/pages/whole_sale/index.vue
+++ b/pages/whole_sale/index.vue
@@ -558,7 +558,8 @@
 					deduction_rate: '', //抵扣比例
 					order: '', // 销量sales, 价格低到高price_asc, 价格高到低price_desc
 					rand: 1,
-				}
+				},
+				isIndexClick: true
 			}
 		},
 		computed: {
@@ -573,10 +574,19 @@
 		},
 
 		onTabItemTap(e) {
-			uni.pageScrollTo({
-				scrollTop: 0,
-				duration: 300
-			});
+			if (this.isIndexClick) {
+				uni.pageScrollTo({
+					scrollTop: 0,
+					duration: 300
+				});
+			} else {
+				this.isIndexClick = true;
+			}
+		},
+
+		onShow() {
+			console.log(this.isIndexClick)
+			this.isIndexClick = false;
 		},
 
 		onPageScroll(e) {

From f37a2255f0fc8f3c0e9651c687473b580c461f4d Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com>
Date: Wed, 24 Apr 2024 17:40:23 +0800
Subject: [PATCH 6/7] 1

---
 manifest.json              | 702 ++++++++++++++++++-------------------
 pages/store/home/index.vue |   8 +-
 2 files changed, 353 insertions(+), 357 deletions(-)

diff --git a/manifest.json b/manifest.json
index 3b81b26..1753aac 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,352 +1,352 @@
 {
-    "name" : "惠农生活",
-    "appid" : "__UNI__3A527D1",
-    "description" : "",
-    "versionName" : "2.0.35",
-    "versionCode" : 2035,
-    "transformPx" : false,
-    /* 5+App特有相关 */
-    "app-plus" : {
-        "titleNView" : true,
-        "usingComponents" : true,
-        "nvueCompiler" : "uni-app",
-        "nvueStyleCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "compatible" : {
-            "ignoreVersion" : true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持 
-        },
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : false,
-            "waiting" : false,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        /* 模块配置 */
-        "modules" : {
-            "VideoPlayer" : {},
-            "OAuth" : {},
-            "Payment" : {},
-            "Share" : {},
-            "iBeacon" : {},
-            "Maps" : {},
-            "Geolocation" : {},
-            "UniMP" : {
-                "description" : "uni小程序"
-            },
-            "Push" : {},
-            "Barcode" : {},
-            "Camera" : {}
-        },
-        "safearea" : {
-            "bottom" : {
-                "offset" : "none"
-            }
-        },
-        /* 应用发布信息 */
-        "distribute" : {
-            /* android打包配置 */
-            "android" : {
-                "permissions" : [
-                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.BATTERY_STATS\"/>",
-                    "<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
-                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_CONFIGURATION\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
-                    "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
-                ],
-                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
-                "permissionExternalStorage" : {
-                    "request" : "none",
-                    "prompt" : "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"
-                },
-                "permissionPhoneState" : {
-                    "request" : "none" //拨打电话权限关闭
-                },
-                "minSdkVersion" : 23,
-                "targetSdkVersion" : 30
-            },
-            /* ios打包配置 */
-            "ios" : {
-                "privacyDescription" : {
-                    "NSPhotoLibraryUsageDescription" : "上传用户头像保存分享海报",
-                    "NSPhotoLibraryAddUsageDescription" : "上传用户头像保存分享海报",
-                    "NSCameraUsageDescription" : "上传用户头像保存分享海报",
-                    "NSLocationWhenInUseUsageDescription" : "根据客户地理位置推荐最近门店",
-                    "NSLocationAlwaysUsageDescription" : "根据客户地理位置推荐最近门店"
-                },
-                "idfa" : false,
-                "dSYMs" : false
-            },
-            /* SDK配置 */
-            "sdkConfigs" : {
-                "maps" : {
-                    "amap" : {
-                        "appkey_ios" : "0a3202688624938fd5d2f37b52c30d5d",
-                        "appkey_android" : "0354f5ddc11e2ea76c5aac647f44d945",
-                        "name" : "amapIvoVHpJR"
-                    }
-                },
-                "payment" : {
-                    "weixin" : {
-                        "__platform__" : [ "ios", "android" ],
-                        "appid" : "wx2e8f79ff281284f5",
-                        "UniversalLinks" : "https://shop.lihaink.cn/"
-                    }
-                },
-                "share" : {
-                    "weixin" : {
-                        "appid" : "wx2e8f79ff281284f5",
-                        "UniversalLinks" : "https://shop.lihaink.cn/"
-                    }
-                },
-                "geolocation" : {
-                    "amap" : {
-                        "name" : "amapIvoVHpJR",
-                        "__platform__" : [ "ios", "android" ],
-                        "appkey_ios" : "0a3202688624938fd5d2f37b52c30d5d",
-                        "appkey_android" : "0354f5ddc11e2ea76c5aac647f44d945"
-                    }
-                },
-                "push" : {},
-                "oauth" : {
-                    "weixin" : {
-                        "appid" : "wx2e8f79ff281284f5",
-                        "UniversalLinks" : "https://shop.lihaink.cn/"
-                    }
-                },
-                "ad" : {}
-            },
-            "icons" : {
-                "android" : {
-                    "hdpi" : "unpackage/res/icons/72x72.png",
-                    "xhdpi" : "unpackage/res/icons/96x96.png",
-                    "xxhdpi" : "unpackage/res/icons/144x144.png",
-                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
-                },
-                "ios" : {
-                    "appstore" : "unpackage/res/icons/1024x1024.png",
-                    "ipad" : {
-                        "app" : "unpackage/res/icons/76x76.png",
-                        "app@2x" : "unpackage/res/icons/152x152.png",
-                        "notification" : "unpackage/res/icons/20x20.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "proapp@2x" : "unpackage/res/icons/167x167.png",
-                        "settings" : "unpackage/res/icons/29x29.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "spotlight" : "unpackage/res/icons/40x40.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
-                    },
-                    "iphone" : {
-                        "app@2x" : "unpackage/res/icons/120x120.png",
-                        "app@3x" : "unpackage/res/icons/180x180.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "notification@3x" : "unpackage/res/icons/60x60.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "settings@3x" : "unpackage/res/icons/87x87.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
-                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
-                    }
-                }
-            },
-            "splashscreen" : {
-                "useOriginalMsgbox" : true,
-                "androidStyle" : "common"
-            }
-        },
-        "nativePlugins" : {
-            "JG-JCore" : {
-                "JPUSH_APPKEY_IOS" : "8a5efd65cda14fafa6e64ad3",
-                "JPUSH_CHANNEL_IOS" : "8a5efd65cda14fafa6e64ad3",
-                "JPUSH_APPKEY_ANDROID" : "b5f679f4357018605ea6fd2e",
-                "JPUSH_CHANNEL_ANDROID" : "",
-                "__plugin_info__" : {
-                    "name" : "JG-JCore",
-                    "description" : "极光推送JCore插件",
-                    "platforms" : "Android,iOS",
-                    "url" : "",
-                    "android_package_name" : "uni.UNI3A527D1",
-                    "ios_bundle_id" : "",
-                    "isCloud" : false,
-                    "bought" : -1,
-                    "pid" : "",
-                    "parameters" : {
-                        "JPUSH_APPKEY_IOS" : {
-                            "des" : "[iOS]极光portal配置应用信息时分配的AppKey",
-                            "key" : "JCore:APP_KEY",
-                            "value" : "daebe19b547c43128796a078"
-                        },
-                        "JPUSH_CHANNEL_IOS" : {
-                            "des" : "[iOS]用于统计分发渠道，不需要可填默认值developer-default",
-                            "key" : "JCore:CHANNEL",
-                            "value" : ""
-                        },
-                        "JPUSH_APPKEY_ANDROID" : {
-                            "des" : "[Android]极光portal配置应用信息时分配的AppKey",
-                            "key" : "JPUSH_APPKEY",
-                            "value" : ""
-                        },
-                        "JPUSH_CHANNEL_ANDROID" : {
-                            "des" : "[Android]用于统计分发渠道，不需要可填默认值developer-default",
-                            "key" : "JPUSH_CHANNEL",
-                            "value" : ""
-                        }
-                    }
-                }
-            },
-            "JG-JPush" : {
-                "JPUSH_ISPRODUCTION_IOS" : "true",
-                "JPUSH_ADVERTISINGID_IOS" : "",
-                "JPUSH_DEFAULTINITJPUSH_IOS" : "true",
-                "JPUSH_OPPO_APPKEY" : "",
-                "JPUSH_OPPO_APPID" : "",
-                "JPUSH_OPPO_APPSECRET" : "",
-                "JPUSH_VIVO_APPKEY" : "",
-                "JPUSH_VIVO_APPID" : "",
-                "JPUSH_MEIZU_APPKEY" : "",
-                "JPUSH_MEIZU_APPID" : "",
-                "JPUSH_XIAOMI_APPKEY" : "",
-                "JPUSH_XIAOMI_APPID" : "",
-                "__plugin_info__" : {
-                    "name" : "JG-JPush",
-                    "description" : "极光推送Hbuilder插件",
-                    "platforms" : "Android,iOS",
-                    "url" : "",
-                    "android_package_name" : "uni.UNI3A527D1",
-                    "ios_bundle_id" : "",
-                    "isCloud" : false,
-                    "bought" : -1,
-                    "pid" : "",
-                    "parameters" : {
-                        "JPUSH_ISPRODUCTION_IOS" : {
-                            "des" : "[iOS]是否是生产环境，是填true，不是填false或者不填",
-                            "key" : "JPush:ISPRODUCTION",
-                            "value" : ""
-                        },
-                        "JPUSH_ADVERTISINGID_IOS" : {
-                            "des" : "[iOS]广告标识符（IDFA）如果不需要使用IDFA，可不填",
-                            "key" : "JPush:ADVERTISINGID",
-                            "value" : ""
-                        },
-                        "JPUSH_DEFAULTINITJPUSH_IOS" : {
-                            "des" : "[iOS]是否默认初始化，是填true，不是填false或者不填",
-                            "key" : "JPush:DEFAULTINITJPUSH",
-                            "value" : ""
-                        },
-                        "JPUSH_OPPO_APPKEY" : {
-                            "des" : "厂商OPPO-appkey,示例：OP-12345678",
-                            "key" : "OPPO_APPKEY",
-                            "value" : ""
-                        },
-                        "JPUSH_OPPO_APPID" : {
-                            "des" : "厂商OPPO-appId,示例：OP-12345678",
-                            "key" : "OPPO_APPID",
-                            "value" : ""
-                        },
-                        "JPUSH_OPPO_APPSECRET" : {
-                            "des" : "厂商OPPO-appSecret,示例：OP-12345678",
-                            "key" : "OPPO_APPSECRET",
-                            "value" : ""
-                        },
-                        "JPUSH_VIVO_APPKEY" : {
-                            "des" : "厂商VIVO-appkey,示例：12345678",
-                            "key" : "com.vivo.push.api_key",
-                            "value" : ""
-                        },
-                        "JPUSH_VIVO_APPID" : {
-                            "des" : "厂商VIVO-appId,示例：12345678",
-                            "key" : "com.vivo.push.app_id",
-                            "value" : ""
-                        },
-                        "JPUSH_MEIZU_APPKEY" : {
-                            "des" : "厂商MEIZU-appKey,示例：MZ-12345678",
-                            "key" : "MEIZU_APPKEY",
-                            "value" : ""
-                        },
-                        "JPUSH_MEIZU_APPID" : {
-                            "des" : "厂商MEIZU-appId,示例：MZ-12345678",
-                            "key" : "MEIZU_APPID",
-                            "value" : ""
-                        },
-                        "JPUSH_XIAOMI_APPKEY" : {
-                            "des" : "厂商XIAOMI-appKey,示例：MI-12345678",
-                            "key" : "XIAOMI_APPKEY",
-                            "value" : ""
-                        },
-                        "JPUSH_XIAOMI_APPID" : {
-                            "des" : "厂商XIAOMI-appId,示例：MI-12345678",
-                            "key" : "XIAOMI_APPID",
-                            "value" : ""
-                        }
-                    }
-                }
-            }
-        }
-    },
-    /* 快应用特有相关 */
-    "quickapp" : {},
-    /* 小程序特有相关 */
-    "mp-weixin" : {
-        "appid" : "wx5fb1cc8edb3f8baa",
-        "setting" : {
-            "urlCheck" : false,
-            "minified" : true,
-            "postcss" : true,
-            "es6" : true
-        },
-        "permission" : {
-            "scope.userLocation" : {
-                "desc" : "获取您的位置"
-            }
-        },
-        "requiredPrivateInfos" : [ "getLocation", "chooseAddress" ],
-        "usingComponents" : true,
-        "__usePrivacyCheck__" : true
-    },
-    "mp-alipay" : {
-        "usingComponents" : true
-    },
-    "mp-baidu" : {
-        "usingComponents" : true
-    },
-    "mp-toutiao" : {
-        "usingComponents" : true
-    },
-    "h5" : {
-        "devServer" : {
-            "https" : false
-        },
-        "router" : {
-            "mode" : "history",
-            "base" : ""
-        },
-        "domain" : "",
-        "sdkConfigs" : {
-            "maps" : {
-                "qqmap" : {
-                    "key" : "SMJBZ-WCHK4-ZPZUA-DSIXI-XDDVQ-XWFX7"
-                }
-            }
-        },
-        "title" : "加载中...",
-        "template" : "template.h5.html",
-        "optimization" : {
-            "treeShaking" : {
-                "enable" : true
-            }
-        }
-    }
-}
+	"name": "惠农生活",
+	"appid": "__UNI__3A527D1",
+	"description": "",
+	"versionName": "2.0.37",
+	"versionCode": 2037,
+	"transformPx": false,
+	/* 5+App特有相关 */
+	"app-plus": {
+		"titleNView": true,
+		"usingComponents": true,
+		"nvueCompiler": "uni-app",
+		"nvueStyleCompiler": "uni-app",
+		"compilerVersion": 3,
+		"compatible": {
+			"ignoreVersion": true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持 
+		},
+		"splashscreen": {
+			"alwaysShowBeforeRender": false,
+			"waiting": false,
+			"autoclose": true,
+			"delay": 0
+		},
+		/* 模块配置 */
+		"modules": {
+			"VideoPlayer": {},
+			"OAuth": {},
+			"Payment": {},
+			"Share": {},
+			"iBeacon": {},
+			"Maps": {},
+			"Geolocation": {},
+			"UniMP": {
+				"description": "uni小程序"
+			},
+			"Push": {},
+			"Barcode": {},
+			"Camera": {}
+		},
+		"safearea": {
+			"bottom": {
+				"offset": "none"
+			}
+		},
+		/* 应用发布信息 */
+		"distribute": {
+			/* android打包配置 */
+			"android": {
+				"permissions": [
+					"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.BATTERY_STATS\"/>",
+					"<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
+					"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_CONFIGURATION\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+					"<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
+				],
+				"abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"],
+				"permissionExternalStorage": {
+					"request": "none",
+					"prompt": "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"
+				},
+				"permissionPhoneState": {
+					"request": "none" //拨打电话权限关闭
+				},
+				"minSdkVersion": 23,
+				"targetSdkVersion": 30
+			},
+			/* ios打包配置 */
+			"ios": {
+				"privacyDescription": {
+					"NSPhotoLibraryUsageDescription": "上传用户头像保存分享海报",
+					"NSPhotoLibraryAddUsageDescription": "上传用户头像保存分享海报",
+					"NSCameraUsageDescription": "上传用户头像保存分享海报",
+					"NSLocationWhenInUseUsageDescription": "根据客户地理位置推荐最近门店",
+					"NSLocationAlwaysUsageDescription": "根据客户地理位置推荐最近门店"
+				},
+				"idfa": false,
+				"dSYMs": false
+			},
+			/* SDK配置 */
+			"sdkConfigs": {
+				"maps": {
+					"amap": {
+						"appkey_ios": "0a3202688624938fd5d2f37b52c30d5d",
+						"appkey_android": "0354f5ddc11e2ea76c5aac647f44d945",
+						"name": "amapIvoVHpJR"
+					}
+				},
+				"payment": {
+					"weixin": {
+						"__platform__": ["ios", "android"],
+						"appid": "wx2e8f79ff281284f5",
+						"UniversalLinks": "https://shop.lihaink.cn/"
+					}
+				},
+				"share": {
+					"weixin": {
+						"appid": "wx2e8f79ff281284f5",
+						"UniversalLinks": "https://shop.lihaink.cn/"
+					}
+				},
+				"geolocation": {
+					"amap": {
+						"name": "amapIvoVHpJR",
+						"__platform__": ["ios", "android"],
+						"appkey_ios": "0a3202688624938fd5d2f37b52c30d5d",
+						"appkey_android": "0354f5ddc11e2ea76c5aac647f44d945"
+					}
+				},
+				"push": {},
+				"oauth": {
+					"weixin": {
+						"appid": "wx2e8f79ff281284f5",
+						"UniversalLinks": "https://shop.lihaink.cn/"
+					}
+				},
+				"ad": {}
+			},
+			"icons": {
+				"android": {
+					"hdpi": "unpackage/res/icons/72x72.png",
+					"xhdpi": "unpackage/res/icons/96x96.png",
+					"xxhdpi": "unpackage/res/icons/144x144.png",
+					"xxxhdpi": "unpackage/res/icons/192x192.png"
+				},
+				"ios": {
+					"appstore": "unpackage/res/icons/1024x1024.png",
+					"ipad": {
+						"app": "unpackage/res/icons/76x76.png",
+						"app@2x": "unpackage/res/icons/152x152.png",
+						"notification": "unpackage/res/icons/20x20.png",
+						"notification@2x": "unpackage/res/icons/40x40.png",
+						"proapp@2x": "unpackage/res/icons/167x167.png",
+						"settings": "unpackage/res/icons/29x29.png",
+						"settings@2x": "unpackage/res/icons/58x58.png",
+						"spotlight": "unpackage/res/icons/40x40.png",
+						"spotlight@2x": "unpackage/res/icons/80x80.png"
+					},
+					"iphone": {
+						"app@2x": "unpackage/res/icons/120x120.png",
+						"app@3x": "unpackage/res/icons/180x180.png",
+						"notification@2x": "unpackage/res/icons/40x40.png",
+						"notification@3x": "unpackage/res/icons/60x60.png",
+						"settings@2x": "unpackage/res/icons/58x58.png",
+						"settings@3x": "unpackage/res/icons/87x87.png",
+						"spotlight@2x": "unpackage/res/icons/80x80.png",
+						"spotlight@3x": "unpackage/res/icons/120x120.png"
+					}
+				}
+			},
+			"splashscreen": {
+				"useOriginalMsgbox": true,
+				"androidStyle": "common"
+			}
+		},
+		"nativePlugins": {
+			"JG-JCore": {
+				"JPUSH_APPKEY_IOS": "8a5efd65cda14fafa6e64ad3",
+				"JPUSH_CHANNEL_IOS": "8a5efd65cda14fafa6e64ad3",
+				"JPUSH_APPKEY_ANDROID": "b5f679f4357018605ea6fd2e",
+				"JPUSH_CHANNEL_ANDROID": "",
+				"__plugin_info__": {
+					"name": "JG-JCore",
+					"description": "极光推送JCore插件",
+					"platforms": "Android,iOS",
+					"url": "",
+					"android_package_name": "uni.UNI3A527D1",
+					"ios_bundle_id": "",
+					"isCloud": false,
+					"bought": -1,
+					"pid": "",
+					"parameters": {
+						"JPUSH_APPKEY_IOS": {
+							"des": "[iOS]极光portal配置应用信息时分配的AppKey",
+							"key": "JCore:APP_KEY",
+							"value": "daebe19b547c43128796a078"
+						},
+						"JPUSH_CHANNEL_IOS": {
+							"des": "[iOS]用于统计分发渠道，不需要可填默认值developer-default",
+							"key": "JCore:CHANNEL",
+							"value": ""
+						},
+						"JPUSH_APPKEY_ANDROID": {
+							"des": "[Android]极光portal配置应用信息时分配的AppKey",
+							"key": "JPUSH_APPKEY",
+							"value": ""
+						},
+						"JPUSH_CHANNEL_ANDROID": {
+							"des": "[Android]用于统计分发渠道，不需要可填默认值developer-default",
+							"key": "JPUSH_CHANNEL",
+							"value": ""
+						}
+					}
+				}
+			},
+			"JG-JPush": {
+				"JPUSH_ISPRODUCTION_IOS": "true",
+				"JPUSH_ADVERTISINGID_IOS": "",
+				"JPUSH_DEFAULTINITJPUSH_IOS": "true",
+				"JPUSH_OPPO_APPKEY": "",
+				"JPUSH_OPPO_APPID": "",
+				"JPUSH_OPPO_APPSECRET": "",
+				"JPUSH_VIVO_APPKEY": "",
+				"JPUSH_VIVO_APPID": "",
+				"JPUSH_MEIZU_APPKEY": "",
+				"JPUSH_MEIZU_APPID": "",
+				"JPUSH_XIAOMI_APPKEY": "",
+				"JPUSH_XIAOMI_APPID": "",
+				"__plugin_info__": {
+					"name": "JG-JPush",
+					"description": "极光推送Hbuilder插件",
+					"platforms": "Android,iOS",
+					"url": "",
+					"android_package_name": "uni.UNI3A527D1",
+					"ios_bundle_id": "",
+					"isCloud": false,
+					"bought": -1,
+					"pid": "",
+					"parameters": {
+						"JPUSH_ISPRODUCTION_IOS": {
+							"des": "[iOS]是否是生产环境，是填true，不是填false或者不填",
+							"key": "JPush:ISPRODUCTION",
+							"value": ""
+						},
+						"JPUSH_ADVERTISINGID_IOS": {
+							"des": "[iOS]广告标识符（IDFA）如果不需要使用IDFA，可不填",
+							"key": "JPush:ADVERTISINGID",
+							"value": ""
+						},
+						"JPUSH_DEFAULTINITJPUSH_IOS": {
+							"des": "[iOS]是否默认初始化，是填true，不是填false或者不填",
+							"key": "JPush:DEFAULTINITJPUSH",
+							"value": ""
+						},
+						"JPUSH_OPPO_APPKEY": {
+							"des": "厂商OPPO-appkey,示例：OP-12345678",
+							"key": "OPPO_APPKEY",
+							"value": ""
+						},
+						"JPUSH_OPPO_APPID": {
+							"des": "厂商OPPO-appId,示例：OP-12345678",
+							"key": "OPPO_APPID",
+							"value": ""
+						},
+						"JPUSH_OPPO_APPSECRET": {
+							"des": "厂商OPPO-appSecret,示例：OP-12345678",
+							"key": "OPPO_APPSECRET",
+							"value": ""
+						},
+						"JPUSH_VIVO_APPKEY": {
+							"des": "厂商VIVO-appkey,示例：12345678",
+							"key": "com.vivo.push.api_key",
+							"value": ""
+						},
+						"JPUSH_VIVO_APPID": {
+							"des": "厂商VIVO-appId,示例：12345678",
+							"key": "com.vivo.push.app_id",
+							"value": ""
+						},
+						"JPUSH_MEIZU_APPKEY": {
+							"des": "厂商MEIZU-appKey,示例：MZ-12345678",
+							"key": "MEIZU_APPKEY",
+							"value": ""
+						},
+						"JPUSH_MEIZU_APPID": {
+							"des": "厂商MEIZU-appId,示例：MZ-12345678",
+							"key": "MEIZU_APPID",
+							"value": ""
+						},
+						"JPUSH_XIAOMI_APPKEY": {
+							"des": "厂商XIAOMI-appKey,示例：MI-12345678",
+							"key": "XIAOMI_APPKEY",
+							"value": ""
+						},
+						"JPUSH_XIAOMI_APPID": {
+							"des": "厂商XIAOMI-appId,示例：MI-12345678",
+							"key": "XIAOMI_APPID",
+							"value": ""
+						}
+					}
+				}
+			}
+		}
+	},
+	/* 快应用特有相关 */
+	"quickapp": {},
+	/* 小程序特有相关 */
+	"mp-weixin": {
+		"appid": "wx5fb1cc8edb3f8baa",
+		"setting": {
+			"urlCheck": false,
+			"minified": true,
+			"postcss": true,
+			"es6": true
+		},
+		"permission": {
+			"scope.userLocation": {
+				"desc": "获取您的位置"
+			}
+		},
+		"requiredPrivateInfos": ["getLocation", "chooseAddress"],
+		"usingComponents": true,
+		"__usePrivacyCheck__": true
+	},
+	"mp-alipay": {
+		"usingComponents": true
+	},
+	"mp-baidu": {
+		"usingComponents": true
+	},
+	"mp-toutiao": {
+		"usingComponents": true
+	},
+	"h5": {
+		"devServer": {
+			"https": false
+		},
+		"router": {
+			"mode": "history",
+			"base": ""
+		},
+		"domain": "",
+		"sdkConfigs": {
+			"maps": {
+				"qqmap": {
+					"key": "SMJBZ-WCHK4-ZPZUA-DSIXI-XDDVQ-XWFX7"
+				}
+			}
+		},
+		"title": "加载中...",
+		"template": "template.h5.html",
+		"optimization": {
+			"treeShaking": {
+				"enable": true
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/pages/store/home/index.vue b/pages/store/home/index.vue
index 859c921..803e8aa 100644
--- a/pages/store/home/index.vue
+++ b/pages/store/home/index.vue
@@ -665,7 +665,7 @@
 				const param = {
 					mer_type: 2,
 					sale_type: this.where.sale_type,
-					mer_id: '',
+					mer_id: this.id,
 					mer_type: '',
 					pid: pid
 				};
@@ -673,11 +673,10 @@
 				// 云商品(不查询分类下边没有商品的分类)
 				if (this.tabActive == 7) {
 					param.mer_type = 1;
-					param.mer_id = '';
 				}
+
 				//一般商品(不查询分类下边没有商品的分类)
 				if (this.tabActive == 3) {
-					param.mer_id = this.id;
 					param.mer_type = 2;
 				}
 
@@ -733,7 +732,6 @@
 
 			// 商铺首页滚动 navbar 吸顶
 			scrollHome: function(e) {
-				console.log(1)
 				// uni.$emit('scroll');
 				// this.navShow = e.detail.scrollTop >= 50;
 			},
@@ -1325,8 +1323,6 @@
 			position: fixed;
 			left: 0;
 			z-index: 2;
-			display: flex;
-			flex-wrap: wrap;
 			width: 152rpx;
 			overflow-y: auto;
 			background-color: #F4F4F4;

From 32ff09e5fd3d64dfed727316854c1a706a7fb6c8 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Wed, 24 Apr 2024 18:00:36 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=AE=9A?=
 =?UTF-8?q?=E4=BD=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/payment/index.vue            |  4 ++--
 pages/cloud_warehouse/market/market.vue | 15 ++++++++++++++-
 utils/uniMP.js                          |  3 ++-
 utils/uniMPevent.js                     |  2 +-
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/components/payment/index.vue b/components/payment/index.vue
index 44e3e26..2024309 100644
--- a/components/payment/index.vue
+++ b/components/payment/index.vue
@@ -84,8 +84,8 @@
 				default: ''
 			},
 			sale_type: {
-				type: String,
-				default: ''
+				type: [Number,String],
+				default: 1
 			}
 		},
 		data() {
diff --git a/pages/cloud_warehouse/market/market.vue b/pages/cloud_warehouse/market/market.vue
index ce8f75a..282a92b 100644
--- a/pages/cloud_warehouse/market/market.vue
+++ b/pages/cloud_warehouse/market/market.vue
@@ -628,7 +628,7 @@
 							long: longitude
 						}).then(res => {
 							let town = res.data.address_reference.town.title
-							let street_id = street_id = res.data.address_reference.town.id
+							let street_id = res.data.address_reference.town.id
 							this.street = res.data.address_reference.town.title;
 							this.$store.commit('setAddress', {
 								street_id: street_id,
@@ -637,6 +637,19 @@
 							uni.$emit('getLocation_succees', {
 								street_id,
 							});
+              uni.$emit('changeAddress', {
+                addr:{
+                  address: res.data.address,
+                  location: `${res.data.location.lat},${res.data.location.lng}`
+                },
+                area: res.data.ad_info.adcode,
+                latitude: res.data.location.lat,
+                longitude: res.data.location.lng,
+                street:{
+                  code: street_id,
+                  name: town
+                }
+              })
 							this.where.location = `${latitude},${longitude}`;
 							this.$nextTick(() => {
 								setTimeout(() => {
diff --git a/utils/uniMP.js b/utils/uniMP.js
index 8ebfd45..7ac5c78 100644
--- a/utils/uniMP.js
+++ b/utils/uniMP.js
@@ -339,7 +339,8 @@ const open = (id = null) => {
 			uniMP: true,
 			token: token,
 			avatar: avatar,
-		}
+		},
+    // path: '/pages/index/index?unimp=true'
 	}, (ret) => {
 		uni.hideLoading();
 		if (0 != ret.code) {
diff --git a/utils/uniMPevent.js b/utils/uniMPevent.js
index 12bd385..5f38d08 100644
--- a/utils/uniMPevent.js
+++ b/utils/uniMPevent.js
@@ -3,7 +3,7 @@ import {
 	uniMPgetLocation,
 	test
 } from "@/utils/uniMPfunction.js"
-console.log(123)
+
 export const initEvent = () => {
 	mp.onUniMPEventReceive(async (ret) => {
 		console.log('小程序事件: ', ret);