From 94bedadb9dc21fd316de5f6f8dfd25d0106bfe2b Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com>
Date: Thu, 29 Feb 2024 15:07:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=91=E4=BB=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/cloud_warehouse.js                        |   29 +
 components/emptyPage.vue                      |    6 +-
 pages.json                                    |  508 ++-
 .../big_classification/index.vue              |  194 ++
 .../cloud_warehouse/select_address/index.vue  |  406 +++
 .../small_classification/index.vue            | 1936 +++++++++++
 .../small_classification/index_new.vue        |  630 ++++
 pages/index/index.vue                         | 2532 ++++++++-------
 pages/nongKe/cloud_entrepot/index.vue         | 2866 +++++++++--------
 pages/users/invite_code/index.vue             |   20 +-
 static/cloud_warehouse/dkbl.png               |  Bin 0 -> 2303 bytes
 static/cloud_warehouse/dw.png                 |  Bin 0 -> 1031 bytes
 static/images/dingwei.webp                    |  Bin 0 -> 1170 bytes
 13 files changed, 6188 insertions(+), 2939 deletions(-)
 create mode 100644 api/cloud_warehouse.js
 create mode 100644 pages/cloud_warehouse/big_classification/index.vue
 create mode 100644 pages/cloud_warehouse/select_address/index.vue
 create mode 100644 pages/cloud_warehouse/small_classification/index.vue
 create mode 100644 pages/cloud_warehouse/small_classification/index_new.vue
 create mode 100644 static/cloud_warehouse/dkbl.png
 create mode 100644 static/cloud_warehouse/dw.png
 create mode 100644 static/images/dingwei.webp

diff --git a/api/cloud_warehouse.js b/api/cloud_warehouse.js
new file mode 100644
index 0000000..f3726de
--- /dev/null
+++ b/api/cloud_warehouse.js
@@ -0,0 +1,29 @@
+import request from "@/utils/request.js";
+
+/**
+ * 获取里海云仓大分类
+ * @param 
+ */
+export function getCategory(id, pid) {
+	let par = {};
+	if (pid) {
+		par['pid'] = pid;
+	}
+	return request.get("store/merchant/category/lst/" + id, par);
+}
+
+/**
+ * 获取里海云仓比例
+ * @param 
+ */
+export function getProportion(data) {
+	return request.get("product/spu/storeLabel", data);
+}
+
+/**
+ * 里海云仓商品列表
+ * @param 
+ */
+export function goodsList(data) {
+	return request.get("product/spu/merchant/" + data.mer_id, data);
+}
\ No newline at end of file
diff --git a/components/emptyPage.vue b/components/emptyPage.vue
index 612c5ac..7058503 100644
--- a/components/emptyPage.vue
+++ b/components/emptyPage.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="empty-box">
+	<view class="empty-box" :style="{'margin-top':mt}">
 		<image src="/static/images/empty-box.png"></image>
 		<view class="txt" :style="{color:color}">{{title}}</view>
 	</view>
@@ -24,6 +24,10 @@
 			color: {
 				type: String,
 				default: "#999"
+			},
+			mt: {
+				type: String,
+				default: "200rpx"
 			}
 		},
 	}
diff --git a/pages.json b/pages.json
index 774e89f..f8590cd 100644
--- a/pages.json
+++ b/pages.json
@@ -1,58 +1,58 @@
 {
 	"pages": [
 		//pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-    {
-    	"path": "pages/index/index",
-    	"style": {
-    		"navigationBarTitleText": "首页",
-    		"navigationStyle": "custom",
-    		"enablePullDownRefresh": true,
-        "onReachBottomDistance": 300,
-    		// #ifdef APP-PLUS
-    		"enablePullDownRefresh": true,
-    		// #endif
-    		"app-plus": {
-    			"scrollIndicator": false //禁用原生导航栏
-    		}
-    	}
-    },
+		{
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": "首页",
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": true,
+				"onReachBottomDistance": 300,
+				// #ifdef APP-PLUS
+				"enablePullDownRefresh": true,
+				// #endif
+				"app-plus": {
+					"scrollIndicator": false //禁用原生导航栏
+				}
+			}
+		},
 		{
 			"path": "pages/supply_chains/supply_chains",
 			"style": {
 				"navigationBarTitleText": "供应",
 				"enablePullDownRefresh": true,
 				"navigationStyle": "custom",
-		    "onReachBottomDistance": 300
+				"onReachBottomDistance": 300
 			}
-		
+
 		},
-    //#ifdef APP-PLUS
-    //启动页
-    {
-    	"path": "pages/guide/judge",
-    	"style": {
-    		"enablePullDownRefresh": false,
-    		"onReachBottomDistance": 100,
-    		"navigationStyle": "custom",
-    		"app-plus": {
-    			"contentAdjust": false,
-    			"bounce": "none"
-    		}
-    	}
-    },
-    {
-    	"path": "pages/guide/guide",
-    	"style": {
-    		"enablePullDownRefresh": false,
-    		"onReachBottomDistance": 100,
-    		"navigationStyle": "custom",
-    		"app-plus": {
-    			"contentAdjust": false,
-    			"bounce": "none"
-    		}
-    	}
-    },
-    // #endif
+		//#ifdef APP-PLUS
+		//启动页
+		{
+			"path": "pages/guide/judge",
+			"style": {
+				"enablePullDownRefresh": false,
+				"onReachBottomDistance": 100,
+				"navigationStyle": "custom",
+				"app-plus": {
+					"contentAdjust": false,
+					"bounce": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/guide/guide",
+			"style": {
+				"enablePullDownRefresh": false,
+				"onReachBottomDistance": 100,
+				"navigationStyle": "custom",
+				"app-plus": {
+					"contentAdjust": false,
+					"bounce": "none"
+				}
+			}
+		},
+		// #endif
 		{
 			"path": "pages/gather/gather",
 			"style": {
@@ -88,8 +88,7 @@
 				"navigationStyle": "custom",
 				"navigationBarTitleText": "直播间"
 			}
-		}
-		,{
+		}, {
 			"path": "pages/room/histroyroom",
 			"style": {
 				"navigationBarTitleText": "历史直播间",
@@ -145,8 +144,8 @@
 			"style": {
 				"navigationBarTitleText": "支付提示"
 			}
-		}, 
-     {
+		},
+		{
 			"path": "pages/moreProject/moreProject",
 			"style": {
 				"navigationBarTitleText": "商户平台",
@@ -171,165 +170,147 @@
 				"disableScroll": true,
 				"navigationStyle": "custom"
 			}
+		}, {
+			"path": "pages/margin/margin",
+			"style": {
+				"navigationBarTitleText": "缴纳押金",
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{
+			"path": "pages/select_address/select_address",
+			"style": {
+				"navigationBarTitleText": "选择位置",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/select_address/select_address_n",
+			"style": {
+				"navigationBarTitleText": "选择位置",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/newActivity/activityDetail/activityDetail",
+			"style": {
+				"navigationBarTitleText": "活动",
+				"enablePullDownRefresh": true,
+				"navigationStyle": "custom",
+				"onReachBottomDistance": 300
+			}
+		},
+		{
+			"path": "pages/newActivity/subsidy/subsidy",
+			"style": {
+				"navigationBarTitleText": "补贴记录",
+				"enablePullDownRefresh": true,
+				"navigationStyle": "custom",
+				"onReachBottomDistance": 300
+			}
+		},
+		{
+			"path": "pages/newActivity/invitation/invitation",
+			"style": {
+				"navigationBarTitleText": "拉新活动",
+				"enablePullDownRefresh": true,
+				"navigationStyle": "custom",
+				"onReachBottomDistance": 300
+			}
+		},
+		{
+			"path": "pages/redpacket/redpacket",
+			"style": {
+				"navigationBarTitleText": "补贴",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/redpacket/redpack_type",
+			"style": {
+				"navigationBarTitleText": "补贴余额",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom",
+				"onReachBottomDistance": 300
+			}
+		},
+		{
+			"path": "pages/newActivity/subsidy/subsidy2",
+			"style": {
+				"navigationBarTitleText": "实物通用补贴",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom",
+				"onReachBottomDistance": 300
+			}
+		},
+		{
+			"path": "pages/newActivity/subsidy/subsidy3",
+			"style": {
+				"navigationBarTitleText": "现金抵扣补贴",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom",
+				"onReachBottomDistance": 300
+			}
+		},
+		{
+			"path": "pages/newActivity/towPrice/towPrice",
+			"style": {
+				"navigationBarTitleText": "两元专区",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom",
+				"onReachBottomDistance": 300
+			}
+		},
+		{
+			"path": "pages/order_addcart/order_addcart_t",
+			"style": {
+				"navigationBarTitleText": "购物车",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/newActivity/giftBag/giftBag",
+			"style": {
+				"navigationBarTitleText": "新人礼包",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom",
+				"onReachBottomDistance": 300
+			}
+		},
+		{
+			"path": "pages/helpPeople/helpPeople",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom",
+				"onReachBottomDistance": 300
+			}
+		},
+		{
+			"path": "pages/helpPeople/formTable",
+			"style": {
+				"navigationBarTitleText": "信息收集",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom",
+				"onReachBottomDistance": 300
+			}
+		},
+		{
+			"path": "pages/rich/rich",
+			"style": {
+				"navigationBarTitleText": "政策答疑",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/rich/mp4",
+			"style": {
+				"navigationBarTitleText": "教学视频",
+				"enablePullDownRefresh": false
+			}
 		}
-	    ,{
-            "path" : "pages/margin/margin",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText":"缴纳押金",
-                "enablePullDownRefresh": false
-            }
-            
-        },
-        {
-          "path" : "pages/select_address/select_address",
-          "style" : 
-          {
-            "navigationBarTitleText" : "选择位置",
-            "enablePullDownRefresh" : false
-          }
-        },
-        {
-          "path" : "pages/select_address/select_address_n",
-          "style" : 
-          {
-            "navigationBarTitleText" : "选择位置",
-            "enablePullDownRefresh" : false
-          }
-        },
-        {
-          "path" : "pages/newActivity/activityDetail/activityDetail",
-          "style" : 
-          {
-            "navigationBarTitleText": "活动",
-            "enablePullDownRefresh": true,
-            "navigationStyle": "custom",
-            "onReachBottomDistance": 300
-          }
-        },
-        {
-          "path" : "pages/newActivity/subsidy/subsidy",
-          "style" : 
-          {
-            "navigationBarTitleText": "补贴记录",
-            "enablePullDownRefresh": true,
-            "navigationStyle": "custom",
-            "onReachBottomDistance": 300
-          }
-        },
-        {
-          "path" : "pages/newActivity/invitation/invitation",
-          "style" : 
-          {
-            "navigationBarTitleText": "拉新活动",
-            "enablePullDownRefresh": true,
-            "navigationStyle": "custom",
-            "onReachBottomDistance": 300
-          }
-        },
-        {
-          "path" : "pages/redpacket/redpacket",
-          "style" : 
-          {
-            "navigationBarTitleText" : "补贴",
-            "enablePullDownRefresh" : false
-          }
-        },
-        {
-          "path" : "pages/redpacket/redpack_type",
-          "style" : 
-          {
-            "navigationBarTitleText" : "补贴余额",
-            "enablePullDownRefresh": false,
-            "navigationStyle": "custom",
-            "onReachBottomDistance": 300
-          }
-        },
-        {
-          "path" : "pages/newActivity/subsidy/subsidy2",
-          "style" : 
-          {
-            "navigationBarTitleText" : "实物通用补贴",
-            "enablePullDownRefresh": false,
-            "navigationStyle": "custom",
-            "onReachBottomDistance": 300
-          }
-        },
-        {
-          "path" : "pages/newActivity/subsidy/subsidy3",
-          "style" : 
-          {
-            "navigationBarTitleText" : "现金抵扣补贴",
-            "enablePullDownRefresh": false,
-            "navigationStyle": "custom",
-            "onReachBottomDistance": 300
-          }
-        },
-        {
-          "path" : "pages/newActivity/towPrice/towPrice",
-          "style" : 
-          {
-            "navigationBarTitleText" : "两元专区",
-            "enablePullDownRefresh": false,
-            "navigationStyle": "custom",
-            "onReachBottomDistance": 300
-          }
-        },
-        {
-          "path" : "pages/order_addcart/order_addcart_t",
-          "style" : 
-          {
-            "navigationBarTitleText" : "购物车",
-            "enablePullDownRefresh" : false
-          }
-        },
-        {
-          "path" : "pages/newActivity/giftBag/giftBag",
-          "style" : 
-          {
-            "navigationBarTitleText" : "新人礼包",
-            "enablePullDownRefresh": false,
-            "navigationStyle": "custom",
-            "onReachBottomDistance": 300
-          }
-        },
-        {
-          "path" : "pages/helpPeople/helpPeople",
-          "style" : 
-          {
-            "navigationBarTitleText" : "",
-            "enablePullDownRefresh": false,
-            "navigationStyle": "custom",
-            "onReachBottomDistance": 300
-          }
-        },
-        {
-          "path" : "pages/helpPeople/formTable",
-          "style" : 
-          {
-            "navigationBarTitleText" : "信息收集",
-            "enablePullDownRefresh": false,
-            "navigationStyle": "custom",
-            "onReachBottomDistance": 300
-          }
-        },
-        {
-          "path" : "pages/rich/rich",
-          "style" : 
-          {
-            "navigationBarTitleText" : "政策答疑",
-            "enablePullDownRefresh" : false
-          }
-        },
-        {
-          "path" : "pages/rich/mp4",
-          "style" : 
-          {
-            "navigationBarTitleText" : "教学视频",
-            "enablePullDownRefresh" : false
-          }
-        }
-    ],
+	],
 	"subPackages": [{
 			"root": "pages/goods_cate",
 			"name": "goods_cate",
@@ -352,7 +333,7 @@
 					"navigationBarTextStyle": "#fff"
 					// #endif
 				}
-			},{
+			}, {
 				"path": "index_v",
 				"style": {
 					"navigationStyle": "custom"
@@ -403,6 +384,22 @@
 					}
 				}
 			]
+		}, {
+			"root": "pages/cloud_warehouse",
+			"name": "cloud_warehouse",
+			"pages": [{
+				"path": "big_classification/index",
+				"style": {
+					"navigationBarTitleText": "云仓分类",
+					"enablePullDownRefresh": true
+				}
+			}, {
+				"path": "small_classification/index",
+				"style": {
+					"navigationBarTitleText": "云仓分类",
+					"enablePullDownRefresh": true
+				}
+			}]
 		},
 		{
 			"root": "pages/nongKe",
@@ -454,17 +451,17 @@
 					}
 
 				},
-        {
-        	"path": "supply_chain/supplierB",
-        	"style": {
-        		"enablePullDownRefresh": true,
-        		"navigationBarTitleText": "",
-        		"navigationBarBackgroundColor": "#e93323",
-        		"navigationStyle": "custom",
-            "onReachBottomDistance": 300
-        	}
-        
-        },
+				{
+					"path": "supply_chain/supplierB",
+					"style": {
+						"enablePullDownRefresh": true,
+						"navigationBarTitleText": "",
+						"navigationBarBackgroundColor": "#e93323",
+						"navigationStyle": "custom",
+						"onReachBottomDistance": 300
+					}
+
+				},
 				{
 					"path": "supply_chain/suppliers",
 					"style": {
@@ -527,7 +524,7 @@
 						"enablePullDownRefresh": true
 					}
 
-				},{
+				}, {
 					"path": "cloud_entrepot/indexh",
 					"style": {
 						"navigationStyle": "custom",
@@ -551,7 +548,7 @@
 						"navigationStyle": "custom"
 					}
 
-				},{
+				}, {
 					"path": "specialty/short_index",
 					"style": {
 						"navigationBarTitleText": "集体店铺",
@@ -684,14 +681,13 @@
 						"navigationBarTitleText": "我的账户"
 					}
 				},
-        {
-          "path" : "user_money/money",
-          "style" : 
-          {
-            "navigationBarTitleText" : "我的余额",
-            "enablePullDownRefresh" : false
-          }
-        },
+				{
+					"path": "user_money/money",
+					"style": {
+						"navigationBarTitleText": "我的余额",
+						"enablePullDownRefresh": false
+					}
+				},
 				{
 					"path": "user_bill/index",
 					"style": {
@@ -1223,19 +1219,19 @@
 					"path": "settled/index",
 					"style": {
 						"navigationStyle": "custom",
-						
+
 						"navigationBarTitleText": "商家入驻"
 					}
-				}, 
-        {
-        	"path": "settled/unit",
-        	"style": {
-        		"navigationStyle": "custom",
-        		
-        		"navigationBarTitleText": "种养殖户入驻"
-        	}
-        }, 
-        {
+				},
+				{
+					"path": "settled/unit",
+					"style": {
+						"navigationStyle": "custom",
+
+						"navigationBarTitleText": "种养殖户入驻"
+					}
+				},
+				{
 					"path": "applicationRecord/index",
 					"style": {
 						"navigationBarTitleText": "申请记录"
@@ -1658,7 +1654,7 @@
 						"navigationBarTitleText": "预售列表"
 							// #ifdef MP || APP-PLUS
 							,
-            "navigationStyle": "custom",
+						"navigationStyle": "custom",
 						"navigationBarBackgroundColor": "#F2F2F2"
 						// #endif
 					}
@@ -1863,22 +1859,22 @@
 		"selectedColor": "#E93323",
 		"borderStyle": "white",
 		"backgroundColor": "#ffffff",
-    "iconWidth": "36",
+		"iconWidth": "36",
 
 		"list": [
-      
-      // {
-      // 	"pagePath": "pages/supply_chains/supply_chains",
-      // 	"iconPath": "static/tabbar_icon/d.png",
-      // 	"selectedIconPath": "static/tabbar_icon/d-a.png",
-      // 	"text": "供销"
-      // },
-      {
+
+			// {
+			// 	"pagePath": "pages/supply_chains/supply_chains",
+			// 	"iconPath": "static/tabbar_icon/d.png",
+			// 	"selectedIconPath": "static/tabbar_icon/d-a.png",
+			// 	"text": "供销"
+			// },
+			{
 				"pagePath": "pages/index/index",
 				"iconPath": "static/tabbar_icon/a.png",
 				"selectedIconPath": "static/tabbar_icon/a-a.png"
 				// "text": "泸州"
-        // "text": "供销"
+				// "text": "供销"
 			},
 			{
 				"pagePath": "pages/gather/gather",
@@ -1893,12 +1889,12 @@
 			// 	"text": "发布"
 
 			// },
-      {
-      	"pagePath": "pages/order_addcart/order_addcart_t",
-        "iconPath": "static/tabbar_icon/d.png",
-        "selectedIconPath": "static/tabbar_icon/d-a.png"
-        // "text": "购物车"
-      },
+			{
+				"pagePath": "pages/order_addcart/order_addcart_t",
+				"iconPath": "static/tabbar_icon/d.png",
+				"selectedIconPath": "static/tabbar_icon/d-a.png"
+				// "text": "购物车"
+			},
 			{
 				"pagePath": "pages/user/index",
 				"iconPath": "static/tabbar_icon/e.png",
diff --git a/pages/cloud_warehouse/big_classification/index.vue b/pages/cloud_warehouse/big_classification/index.vue
new file mode 100644
index 0000000..9476cfc
--- /dev/null
+++ b/pages/cloud_warehouse/big_classification/index.vue
@@ -0,0 +1,194 @@
+<!-- 里海云仓大分类 -->
+<template>
+	<view class="bigClassification">
+		<!-- 占位 -->
+		<view style="height: var(--status-bar-height);"></view>
+
+		<!-- 返回 -->
+		<view class="back-icon" @click="handleBack"></view>
+
+		<!-- 分类 -->
+		<view class="classification">
+			<view class="classification-wrap" v-if="list.length >0">
+				<block v-for="(item,indx) in list" :key="indx">
+					<view class="classification-item" @click="goSmallType(item)">
+						<view class="classification-item-name">{{item.cate_name}}</view>
+						<view class="classification-item-btn">立即前往</view>
+						<u-image :src="item.pic" mode="widthFix" width="140rpx" height="130rpx" class="img">
+							<view slot="error" style="font-size: 24rpx;">暂无图片</view>
+						</u-image>
+					</view>
+				</block>
+			</view>
+
+			<view class='empty-box' v-if="list.length == 0">
+				<view class='pictrue'>
+					<u--image src='../../../static/images/empty-box.png' width="414rpx" height="240rpx" />
+					<view class="txt">暂无更多分类~</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getCategory
+	} from "@/api/cloud_warehouse.js";
+	import {
+		getCategoryListLevel
+	} from '@/api/requesta.js'
+	export default {
+		data() {
+			return {
+				list: [],
+				mer_id: ''
+			}
+		},
+
+		onLoad(opt) {
+			// this.mer_id = opt.id || 244;
+			// this.getData();
+
+			this.getCloundShop();
+
+		},
+
+		methods: {
+			getCloundShop() {
+				uni.showLoading({
+					title: "加载中..."
+				})
+				getCategoryListLevel({
+					type: 2
+				}).then(res => {
+					uni.hideLoading();
+					this.list = res.data;
+				}).catch(() => {
+					uni.hideLoading();
+				})
+			},
+
+			// 返回上一页
+			handleBack() {
+				uni.navigateBack({
+					delta: 1
+				})
+			},
+
+			// 小分类
+			goSmallType(e) {
+				uni.setStorageSync("market_type_parent", e);
+				uni.navigateTo({
+					url: "/pages/cloud_warehouse/small_classification/index"
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page {
+		height: 100%;
+		background-color: #F7F7F7;
+	}
+
+	.bigClassification {
+		position: relative;
+		width: 100%;
+		height: 760rpx;
+		background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/def/06e54202402281547535138.webp');
+		background-size: cover;
+		background-repeat: no-repeat;
+		background-position: center;
+	}
+
+	.back-icon {
+		position: absolute;
+		top: 116rpx;
+		left: 20rpx;
+		width: 20rpx;
+		height: 20rpx;
+		border: 2rpx solid #fff;
+		border-bottom-color: transparent;
+		border-right-color: transparent;
+		transform: rotate(-45deg);
+	}
+
+	.classification {
+		margin-left: 20rpx;
+		padding-top: 490rpx;
+
+		.classification-wrap {
+			display: flex;
+			flex-wrap: wrap;
+
+			.classification-item {
+				width: 47%;
+				position: relative;
+				background-color: #fff;
+				margin: 0 20rpx 18rpx 0;
+				border-radius: 30rpx;
+				padding: 26rpx 0 26rpx 24rpx;
+
+				.classification-item-name {
+					position: relative;
+					z-index: 2;
+					display: inline-block;
+					font-size: 36rpx;
+					color: #000;
+					font-weight: bold;
+					margin-bottom: 30rpx;
+
+					&::before {
+						content: "";
+						display: inline-block;
+						position: absolute;
+						z-index: -1;
+						left: 0rpx;
+						bottom: -2rpx;
+						width: 100%;
+						height: 24rpx;
+						border-radius: 24rpx;
+						background: linear-gradient(to right, #FF8259 0%, rgba(255, 255, 255, .8) 80%);
+					}
+				}
+
+				.classification-item-btn {
+					width: 140rpx;
+					height: 48rpx;
+					line-height: 48rpx;
+					border-radius: 48rpx;
+					text-align: center;
+					color: #FFB298;
+					border: 2rpx solid #FFB298;
+				}
+
+				.img {
+					position: absolute;
+					bottom: 0;
+					right: 0;
+				}
+			}
+		}
+	}
+
+	.empty-box {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		margin: 100rpx auto 0;
+
+		image {
+			width: 414rpx;
+			height: 240rpx;
+		}
+
+		.txt {
+			font-size: 26rpx;
+			color: #999;
+			text-align: center;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/cloud_warehouse/select_address/index.vue b/pages/cloud_warehouse/select_address/index.vue
new file mode 100644
index 0000000..3661432
--- /dev/null
+++ b/pages/cloud_warehouse/select_address/index.vue
@@ -0,0 +1,406 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<u-sticky customNavHeight="0">
+			<view class="head_top">
+				<u-tabs :list="tabsList" itemStyle="font-size: 32rpx;height: 74rpx;" :current="current"
+					@change="changeCurrent" lineColor="#FF6D20" lineWidth="105rpx" height="7rpx"></u-tabs>
+				</u-tabs>
+			</view>
+		</u-sticky>
+		<view style="background-color: #f4f4f4;height: 30rpx;"></view>
+		<view class="address-box" v-if="current==0" style="padding: 0;">
+			<map style="width: 750rpx;height: 750rpx;" :longitude="longitude" :latitude="latitude" :markers="[markers]"
+				show-location @tap="handleMapTap"></map>
+			<view class="head_item" style="padding: 10rpx 20rpx;">
+				<view class="re-location">
+					<view style="width: 120rpx;"><text class="text">当前位置: </text></view>
+					<view style="flex: 1;">
+						<text
+							class="text">{{locationInfo.formatted_addresses?locationInfo.formatted_addresses.recommend:locationInfo.address}}</text>
+					</view>
+				</view>
+				<view class="re-btn" @click="reGetLocation">
+					<image class="re-address-img" src="@/static/cloud_warehouse/dw.png"></image><text
+						class="text">重新定位</text>
+				</view>
+			</view>
+			<u-button text="确认" @click="submitAddress"></u-button>
+		</view>
+		<view class="address-box" v-if="current==1">
+			<view class="head_item_tips">
+				<view><text class="text">泸州区县</text></view>
+			</view>
+			<view class="area">
+				<view class="area-item" :class="{'area-item-on': item.code==area_change}"
+					v-for="(item, index) in areaList" :key="index" @click="changeArea(item)">
+					<text class="text">{{item.name}}</text>
+				</view>
+			</view>
+			<view class="head_item_tips">
+				<view><text class="text">选择街道/镇</text></view>
+			</view>
+			<view class="street">
+				<view class="letter-item" v-for="key in mapKey" :key="key">
+					<view class="letter"><text class="text">{{key}}</text></view>
+					<view class="item-box">
+						<view class="street-item" v-for="item in mapList[key]" :key="item.code"
+							@click="changeStreet(item)">
+							<text class="text">{{item.name}}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getGeocoder,
+		merClassifly,
+		getProductslist
+	} from '@/api/store.js';
+	import {
+		getArea,
+		getStreet
+	} from "@/api/article.js";
+	import {
+		Toast
+	} from '@/libs/uniApi';
+	import {
+		wgsToGcj
+	} from "@/utils/wgs.js";
+	export default {
+		data() {
+			return {
+				tabsList: [{
+					name: '地图定位',
+				}, {
+					name: '泸州区县',
+				}],
+				current: 0,
+				latitude: '28.87',
+				longitude: '105.44',
+				markers: {
+					id: 1,
+					longitude: '28.87',
+					latitude: '105.44',
+					iconPath: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/cbbd5202311241523412538.png',
+					width: 28,
+					height: 28
+				},
+				locationInfo: {},
+				town: '',
+				street_id: '',
+				street: '',
+				areaList: [],
+				streetList: [],
+				mapList: {},
+				area_change: '',
+				street_change: '',
+			}
+		},
+		onLoad(options) {
+			this.getLoaction();
+			this.loadArea();
+		},
+		onShow() {},
+		computed: {
+			mapKey() {
+				return Object.keys(this.mapList).sort()
+			}
+		},
+		methods: {
+			changeCurrent(e) {
+				this.current = e.index;
+			},
+			getLoaction() {
+				this.street = '定位中'
+				this.locationInfo = {};
+				this.locationInfo.formatted_addresses = {};
+				this.locationInfo.formatted_addresses.recommend = '定位中'
+				uni.getLocation({
+					type: 'wgs84',
+					success: (res) => {
+						res = wgsToGcj(res);
+						let latitude, longitude;
+						latitude = res.latitude.toString();
+						longitude = res.longitude.toString();
+						this.latitude = res.latitude.toFixed(6);
+						this.longitude = res.longitude.toFixed(6);
+						this.$store.commit('setLocation', {
+							lat: res.latitude.toFixed(6),
+							long: res.longitude.toFixed(6),
+						});
+						getGeocoder({
+							lat: latitude,
+							long: longitude
+						}).then(res => {
+							this.locationInfo = res.data;
+							this.town = res.data.address_reference.town.title
+							this.street_id = res.data.address_reference.town.id
+							this.street = res.data.address_reference.town.title;
+						}).catch(err => {
+							uni.showToast({
+								title: err,
+								icon: 'none'
+							})
+							this.street = '定位失败'
+						})
+					},
+					fail: (err) => {
+						console.log('定位失败');
+						this.isshow = false
+						Toast('定位失败,请检查定位权限是否开启')
+						this.street = '定位失败'
+						this.locationInfo.formatted_addresses.recommend = '定位失败'
+
+						// uni.showToast({
+						// 	title: "获取定位超时",
+						// 	icon: 'none',
+						// 	duration: 2000
+						// });
+					}
+				});
+			},
+			reGetLocation() {
+				this.getLoaction()
+			},
+			loadArea() {
+				getArea({
+					city_code: 510500
+				}).then((res) => {
+					this.areaList = res.data;
+					this.changeArea(this.areaList[0]);
+				})
+			},
+			loadStreet(area_code) {
+				this.street_change = '';
+				getStreet({
+					area_code
+				}).then((res) => {
+					this.streetList = res.data;
+					this.initPinyin();
+				})
+			},
+			initPinyin() {
+				this.mapList = {};
+				this.streetList.forEach((item) => {
+					let str = item.pinyin?.toUpperCase();
+					str = str ? str : '#';
+					if (this.mapList[str]) {
+						this.mapList[str].push(item);
+					} else {
+						this.mapList[str] = [];
+						this.mapList[str].push(item)
+					}
+				})
+			},
+			changeArea(item) {
+				this.area_change = item.code;
+				this.loadStreet(this.area_change);
+			},
+			// 选择位置
+			changeStreet(item) {
+				uni.navigateBack({
+					success: () => {
+						uni.$emit('changeAddress', {
+							area: this.area_change,
+							street: item
+						})
+					}
+				})
+			},
+			// 点击地图
+			handleMapTap(e) {
+				// console.log('点击地图', e);
+				// #ifdef H5
+				return Toast('H5暂不支持选择坐标');
+				// #endif
+				let longitude = e.detail.longitude;
+				let latitude = e.detail.latitude;
+				this.markers.longitude = longitude;
+				this.markers.latitude = latitude;
+				// console.log('修改成功', this.markers);
+				getGeocoder({
+					lat: latitude,
+					long: longitude
+				}).then(res => {
+					// console.log(res);
+					this.locationInfo = res.data;
+				}).catch(err => {
+					uni.showToast({
+						title: err,
+						icon: 'none'
+					})
+					this.locationInfo = {};
+					this.locationInfo.formatted_addresses = {};
+					this.locationInfo.formatted_addresses.recommend = '定位失败'
+				})
+			},
+			submitAddress() {
+				console.log(this.locationInfo);
+				try {
+					this.town = this.locationInfo.address_reference.town.title;
+					this.street_id = this.locationInfo.address_reference.town.id;
+					this.street = this.locationInfo.address_reference.town.title;
+					let obj = {
+						area: this.locationInfo.ad_info.adcode,
+						street: {
+							name: this.street,
+							code: this.street_id
+						},
+						latitude: this.latitude,
+						longitude: this.longitude
+					}
+					console.log({
+						...obj
+					});
+					uni.navigateBack({
+						success: () => {
+							uni.$emit('changeAddress', obj)
+						}
+					})
+				} catch (e) {
+					return Toast('地址有误,请重新选择')
+				}
+			}
+		},
+		onPullDownRefresh() {
+			uni.stopPullDownRefresh()
+		}
+	}
+</script>
+
+<style>
+	/* page {
+    background-color: #fff;
+  } */
+
+	.text {
+		font-size: 28rpx;
+		white-space: normal;
+	}
+
+	.head_top {
+		background-color: #fff;
+		padding: 28rpx;
+	}
+
+	.address-box {
+		border-radius: 21rpx 21rpx 0rpx 0rpx;
+		padding: 30rpx 28rpx;
+		width: 750rpx;
+	}
+
+	.head_item {
+		width: 750rpx;
+		flex-direction: row;
+		justify-content: space-between;
+		padding-bottom: 28rpx;
+		font-size: 28rpx;
+		font-family: PingFang SC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #333333;
+	}
+
+	.re-location {
+		flex-direction: row;
+		flex-wrap: nowrap;
+		width: 480rpx;
+		align-items: center;
+	}
+
+	.re-address-img {
+		width: 38.55rpx;
+		height: 38.55rpx;
+		margin-right: 10rpx;
+	}
+
+	.re-btn {
+		flex-direction: row;
+		padding-left: 10rpx;
+		width: 200rpx;
+		height: 100rpx;
+		align-items: center;
+	}
+
+	.head_item_tips {
+		height: 44rpx;
+		font-size: 32rpx;
+		font-family: PingFang SC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #737373;
+	}
+
+	.address-list {
+		font-size: 28rpx;
+		font-family: PingFang SC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #333333;
+		height: 80rpx;
+		line-height: 75rpx;
+		border-bottom: 1rpx solid rgba(0, 0, 0, 0.1);
+	}
+
+	.area {
+		flex-direction: row;
+		flex-wrap: wrap;
+		padding-top: 30rpx;
+		justify-content: flex-start;
+	}
+
+	.area-item {
+		height: 64rpx;
+		/* width: 100px; */
+		background-color: #fff;
+		border-radius: 11rpx 11rpx 11rpx 11rpx;
+		border: 2rpx solid #B3B3B3;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		padding: 0 20rpx;
+		font-size: 28rpx;
+		font-family: PingFang SC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #737373;
+		margin-bottom: 22rpx;
+		margin-right: 22rpx;
+	}
+
+	.area-item-on {
+		color: #ff6d20;
+		border: 2rpx solid #ff6d20;
+	}
+
+	.street {
+		padding-top: 28rpx;
+	}
+
+	.letter-item {
+		flex-direction: row;
+	}
+
+	.letter {
+		margin-right: 28rpx;
+		font-size: 25rpx;
+		font-family: PingFang SC, PingFang SC;
+		font-weight: 400;
+		width: 40rpx;
+		text-align: center;
+		color: #737373;
+	}
+
+	.item-box {
+		flex: 1;
+	}
+
+	.street-item {
+		width: 100%;
+		padding-bottom: 28rpx;
+		font-size: 28rpx;
+		font-family: PingFang SC, PingFang SC;
+		font-weight: 400;
+		color: #333333;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/cloud_warehouse/small_classification/index.vue b/pages/cloud_warehouse/small_classification/index.vue
new file mode 100644
index 0000000..f1ff176
--- /dev/null
+++ b/pages/cloud_warehouse/small_classification/index.vue
@@ -0,0 +1,1936 @@
+<template>
+	<view style="background-color: #f5f5f5;">
+		<!-- <view style="height: var(--status-bar-height);background-color: red;height: 10vh;">dsfdsfsdfds</view> -->
+		<view class='productList' :style="viewColor">
+			<!-- 顶部 -->
+			<view class="top">
+				<view class="head_tit">
+					<view style="display: flex;align-items: center;width: 100%;justify-content: space-between;">
+						<view style="display: flex;align-items: center;">
+							<i class="iconfont icon-xiangzuo"
+								style="font-size: 31.54rpx;text-align: left;color: #fff;margin-right: 12rpx;"
+								@click='backjJump'></i>
+							<view style="position: relative;width: 494rpx;margin: 0 auto;">
+								<u-search bgColor="white" :showAction="false" placeholder="搜索商品" clearabled
+									v-model="storeParam.keyword" @search="searchSubmit"></u-search>
+							</view>
+						</view>
+						<view style="display: flex;align-items: center;justify-content: right;margin-left: 20rpx;"
+							@click="changeMap">
+							<view class="town_name">{{street||'定位中'}}</view>
+							<u--image :showLoading="true" src="/static/images/dingwei.webp" width="36rpx"
+								height="34rpx"></u--image>
+						</view>
+					</view>
+				</view>
+				<view class="flags"></view>
+			</view>
+
+			<view class="container">
+				<scroll-view scroll-y class="left-panel" @scrolltolower="loadMoreLeft" :style="{'height':leftDomHeight
+					,overflow:'auto'}">
+					<!-- 左侧内容 -->
+					<block v-for="(item,indx) in sideMenuType.children" :key="indx">
+						<view class="left-panel_item" @click="changeMerchantTow(item)">
+							<u--image :src="item.pic" class="image" :showLoading="true" width="100rpx" height="100rpx"
+								shape="circle" />
+							<text
+								:class="{'left-panel_item_active':storeParam.category_id == item.store_category_id}">{{item.cate_name}}</text>
+						</view>
+					</block>
+				</scroll-view>
+
+				<view class="right-panel">
+
+					<!-- 补贴比例标签 -->
+					<view class="con-right-proportion">
+						<image src="../../../static/cloud_warehouse/dkbl.png" />
+						<block v-for="(item,indx) in propotionData" :key="indx">
+							<view class="con-right-proportion-item"
+								:class="{'active':storeParam.deduction_rate == item.product_label_id}"
+								@click="handleChooseProp(item.product_label_id)">
+								{{item.label_name}}
+							</view>
+						</block>
+					</view>
+					<!-- <view class="right-panel-head">
+						<view :class="{'active': storeParam.order==''}" @click="set_where('')">综合</view>
+						<view>
+							<view :class="{'active': storeParam.order=='sales'}" @click="set_where('sales')">销量</view>
+							<view :class="{'active': storeParam.order.includes('price')}"
+								@click="set_where(price_order)">
+								<text style="margin-right: 5rpx;">价格</text>
+								<image class="icon" v-if="price_order=='price_asc'&&storeParam.order.includes('price')"
+									:src="domain+'/static/diy/up'+keyColor+'.png'"></image>
+								<image class="icon"
+									v-else-if="price_order=='price_desc'&&storeParam.order.includes('price')"
+									:src="domain+'/static/diy/down'+keyColor+'.png'"></image>
+								<image class="icon" v-else src='/static/images/horn.png'></image>
+							</view>
+						</view>
+					</view> -->
+
+					<scroll-view scroll-y class="right-panel-view" @scrolltolower="loadMoreRight"
+						:style="{height:goodsListHeight,overflow:'auto'}">
+						<!-- 右侧内容 -->
+						<view class='no-shop' v-if="goodsList.length==0 && !showLoading" v-cloak>
+							<view class='pictrue' style="margin: 0 auto;">
+								<image src='@/static/images/no_short.png'></image>
+								<text>暂无商品, 试试其他分类/位置</text>
+							</view>
+						</view>
+
+						<block>
+							<view v-if="item.product" v-for="(item, index) in goodsList" class="short_item"
+								@click="clickProduct(item)">
+								<image class="image" :src="item.product.image"></image>
+								<view class="short_item_right">
+									<view class="r_name">{{item.product.store_name}}</view>
+									<view class="r_type">
+										<view v-if="item.product.store_info">{{item.product.store_info}}</view>
+										<view v-else-if="getSkuName(item)">{{getSkuName(item)}}</view>
+										<view v-else-if="item.unit_name">{{item.unit_name}}</view>
+									</view>
+									<view class="r_btn" v-if="item.product && item.product.price">
+										<view>￥<text
+												style="font-size: 33rpx;">{{ item.product.price.split('.')[0] }}.</text>{{item.product.price.split('.')[1]}}
+										</view>
+										<image src="@/static/images/icon/plus.png"
+											style="width: 40rpx;height: 40rpx;border-radius: 40rpx;"></image>
+									</view>
+								</view>
+							</view>
+						</block>
+						<u-loadmore v-if="showLoading" status="loading"></u-loadmore>
+						<view style="height: 200rpx;"></view>
+					</scroll-view>
+				</view>
+			</view>
+		</view>
+
+		<view class="cart" @click="navgo('/pages/order_addcart/order_addcart')">
+			<u--image :showLoading="true"
+				src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/b52c6202402291350366422.webp" width="110rpx"
+				height="110rpx"></u--image>
+			<view class="badge" v-show="goodsNum">
+				{{goodsNum}}
+			</view>
+		</view>
+
+		<!-- 购物车 -->
+		<view class="card" @click="navgo('/pages/order_addcart/order_addcart')">
+			<view class="left">
+				<view class="tot_price">
+					<view class="footer-left">
+						<text class="price">￥{{totalMoney}}</text>
+						<text class="desc">支持配送 售后无忧</text>
+					</view>
+				</view>
+			</view>
+			<view class="right">
+				去结算
+			</view>
+		</view>
+
+		<view class="">
+			<u-picker :defaultIndex="defaInd" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
+				@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
+		</view>
+
+		<shortPopup ref="shortPopupRef" @addCart="loadCart"></shortPopup>
+	</view>
+</template>
+
+<script>
+	import {
+		getStoreList,
+		getGeocoder,
+	} from '@/api/store.js';
+	import {
+		wgsToGcj
+	} from "@/utils/wgs.js";
+	import {
+		supMenuApi
+	} from '@/api/requesta.js';
+	import recommend from '../../nongKe/supply_chain/component/recommend';
+	import rightSlider from '../../nongKe/supply_chain/component/rightSlider';
+	import {
+		merClassifly,
+		getStoreTypeApi
+	} from '@/api/store.js';
+	import {
+		mapGetters
+	} from "vuex";
+	import {
+		goShopDetail
+	} from '@/libs/order.js'
+	import {
+		configMap
+	} from '@/utils';
+	import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue';
+	import {
+		getArea,
+		getStreet
+	} from '@/api/article.js';
+	import {
+		getIndexData,
+		getDiy
+	} from '@/api/api.js'
+
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app';
+	import {
+		townCloud,
+		getCityCloundShop,
+		getCategoryListLevel
+	} from '@/api/requesta.js'
+	import {
+		getCartCounts,
+		getCartList,
+	} from '@/api/requesta.js';
+
+	import Cache from '@/utils/cache';
+	import shortPopup from "@/components/shortPopup.vue"
+	import {
+		Toast
+	} from '../../../libs/uniApi';
+	import {
+		getProportion
+	} from "@/api/cloud_warehouse.js";
+	const app = getApp();
+	export default {
+		components: {
+			recommend,
+			rightSlider,
+			easyLoadimage,
+			shortPopup
+		},
+		data() {
+			return {
+				domain: HTTP_REQUEST_URL,
+				defaInd: [0, 0],
+				columnData: [],
+				showSerch: false,
+				headTop: 0,
+				street_id: "",
+				showSelect: false,
+				price: 0,
+				stock: 0,
+				nows: false,
+				loading: false,
+				loadingIcon: true,
+				loadTitle: '加载更多',
+				title: '',
+				hotPage: 1,
+				hotLimit: 10,
+				hotScroll: false,
+				// 筛选框
+				rightBox: false,
+				//品牌列表
+				brandList: [],
+				downKey: 0,
+				downStatus: false,
+				cloudList: [],
+				street: "",
+				showPicker: false,
+				status: "loadmore",
+				price_order: 'price_asc', //价格排序方式(升降), price_asc, price_desc
+				// 下拉菜单
+				downMenu: [{
+						title: '默认',
+						key: 0,
+						order: ""
+					},
+					{
+						title: '销量',
+						key: 1,
+						order: 'sales'
+					},
+					{
+						title: '好评',
+						key: 2,
+						order: 'rate'
+					},
+					{
+						title: '距离',
+						key: 3,
+						order: 'location'
+					}
+				],
+				// 商铺列表
+				storeList: [],
+				storeParam: {
+					keyword: '',
+					page: 1,
+					limit: 10,
+					order: '',
+					category_id: '',
+					type_id: '',
+					street_id: '',
+					is_recommend: false, // 是否为推荐的参数
+					deduction_rate: ''
+				},
+				storeKey: 0,
+				storeScroll: true,
+				merchant: '', // 当前选中一级分类
+				merchantTow: '', //当前选中二级分类
+				mer_id: '',
+				sortId: '',
+				price_on: '',
+				price_off: '',
+				detaile_address: "",
+				recommend_address: "",
+				location_address: "",
+				latitude: "",
+				longitude: "",
+				count: 0,
+				storeTypeArr: [], //店铺类型
+				merList: [], //商户分类
+				product_type: 0,
+				show: false,
+				image: '', //图片,
+				credit_buy: '', //支持先货后款
+				trnList: [],
+				goodsNum: 0,
+				totalMoney: 0,
+				goodsList: [], //商品列表
+				showLoading: false, //是否显示加载
+				allShow: false, //是否显示全部类型弹窗
+				sideMenuType: {}, //左侧
+				leftDomHeight: 0, //左侧分类高度
+				goodsListHeight: 0, //商品列表
+				propotionData: [], //比例
+			};
+		},
+		async onLoad(options) {
+			this.street_id = options.street_id
+			this.street = options.townName
+			this.product_type = options.product_type ?? 0
+			if (this.$store.state.storage?.location?.lat) {
+				this.latitude = this.$store.state.storage.location.lat;
+				this.longitude = this.$store.state.storage.location.long;
+			}
+			if (options.street_id != undefined) {
+				this.storeParam.street_id = options.street_id
+			}
+			this.credit_buy = options.credit_buy
+			this.storeParam.type_id = options.type_id
+			this.storeParam.type_id = options.type_id && options.type_id.split(',').toString() || ''
+			this.storeParam.category_id = options.cate_id && options.cate_id.split(',').toString() || ''
+			this.storeList = [];
+			this.showLoading = true;
+			await this.getCloundShop();
+			if (this.mer_location == 1) {
+				this.selfLocation()
+			}
+			this.getStoreType();
+			this.Area()
+
+			// 左侧 // 初始化查询第一个
+			const sideMenuType = uni.getStorageSync("market_type_parent");
+			this.sideMenuType = sideMenuType;
+			if (sideMenuType && sideMenuType.children && sideMenuType.children.length > 0)
+				this.storeParam.category_id = this.sideMenuType.children[0].store_category_id;
+
+			//初始化左侧类型高度
+			this.initHeight();
+
+			// 商品列表
+			this.initGoodsListHeight();
+
+			// 补贴比例
+			this.getProportionData();
+		},
+		computed: {
+			downMenus: function() {
+				return this.downMenu.filter((item) => {
+					if (this.mer_location) {
+						return item
+					} else {
+						return item.key < 3
+					}
+				})
+			},
+			...configMap({
+				margin_ico_switch: 0,
+				margin_ico: '',
+				mer_location: 0,
+				store_street_theme: 1,
+				hide_mer_status: '',
+			}, mapGetters(['viewColor', 'keyColor'])),
+		},
+		methods: {
+			async getCloundShop() {
+				const {
+					data
+				} = await getCategoryListLevel({
+					type: 2
+				})
+				this.cloudList = data;
+				this.cloudList.unshift({
+					cate_name: '全部',
+					children: [],
+					pic: "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/de2be202312151001024597.png",
+					store_category_id: -1
+				})
+				this.cloudList.forEach((item) => {
+					item.children.unshift({
+						cate_name: '全部',
+						store_category_id: item.store_category_id,
+					});
+				})
+				this.merchant = this.cloudList[0];
+				this.merchantTow = this.merchant?.children[0];
+				this.storeParam.category_id = this.merchantTow.store_category_id;
+				return null;
+			},
+			selectLocation() {
+				this.isSelectPlace ? this.showPicker = true : ''
+			},
+			confirm(e) {
+				this.showPicker = false
+				this.$emit('selectPlce', e)
+				this.$emit('change', e)
+				this.street = e.value[1].name
+				this.$nextTick(() => {
+					this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
+
+				})
+				this.storeParam.street_id = e.value[1].code
+				this.street_id = e.value[1].code
+				this.getStoreList()
+			},
+			changeHandler(e) {
+				const {
+					columnIndex,
+					value,
+					values,
+					index,
+					picker = this.$refs.uPicker
+				} = e;
+				if (columnIndex === 0) {
+					getStreet({
+						area_code: value[0]['code']
+					}).then(res => {
+						picker.setColumnValues(1, res.data);
+					});
+				}
+			},
+			Area() {
+				getArea({
+					city_code: 510500
+				}).then(res => {
+					this.$refs.uPicker.setColumnValues(0, res.data);
+					this.Street(res.data[0]['code']);
+				});
+			},
+			Street(code) {
+				getStreet({
+					area_code: code
+				}).then(res => {
+					this.$refs.uPicker.setColumnValues(1, res.data);
+
+				});
+			},
+
+			onInputConfirm() {
+				this.showSerch = false
+				this.searchSubmit()
+			},
+			// 对象转数组
+			objToArr(data) {
+				let obj = Object.keys(data).sort();
+				let m = obj.map(key => data[key]);
+				return m;
+			},
+
+			navGoto(url) {
+				uni.redirectTo({
+					url
+				})
+			},
+
+			navgo(url) {
+				uni.navigateTo({
+					url
+				})
+			},
+
+			// 获取商户分类
+			getClassfication: function() {
+				let temp = []
+				merClassifly()
+					.then(res => {
+						temp = res.data.map(item => {
+							return {
+								...item,
+								check: false
+							}
+						})
+						if (this.storeParam.category_id.length > 0) {
+							this.storeParam.category_id.forEach((ids, index) => {
+								temp.forEach(el => {
+									if (ids == el.category_id) {
+										el.check = true
+									}
+								})
+							})
+						}
+						this.merList = temp
+					})
+					.catch(res => {
+						this.$util.Tips({
+							title: res
+						});
+					});
+			},
+
+			// 获取店铺类型
+			getStoreType: function() {
+				let temp = []
+				getStoreTypeApi().then(res => {
+						res.data.forEach(item => {
+							if (item.mer_type_id == this.storeParam.type_id) {
+								temp.push({
+									...item,
+									check: true
+								})
+							}
+						})
+						this.storeTypeArr = temp
+					})
+					.catch(res => {
+						this.$util.Tips({
+							title: res
+						});
+					});
+			},
+			/** 打开地图**/
+			showMaoLocation(lat, long) {
+				if (!lat || !long) return this.$util.Tips({
+					title: '请设置允许商城访问您的位置！'
+				});
+				//#ifdef H5
+				if (this.$wechat.isWeixin() === true) {
+					this.$wechat.seeLocation({
+						latitude: Number(lat),
+						longitude: Number(long),
+						name: '当前位置',
+						address: this.location_address
+					}).then(res => {
+						// console.log('success');
+					})
+				} else {
+					//#endif
+					uni.openLocation({
+						latitude: parseFloat(lat),
+						longitude: parseFloat(long),
+						name: '当前位置',
+						address: this.location_address,
+						scale: 8,
+						success: function(res) {
+							// console.log(res)
+						},
+					});
+					// #ifdef H5
+				}
+				//#endif	
+			},
+			showStoreLocation(item) {
+				if (!item.lat || !item.long) return this.$util.Tips({
+					title: '请设置允许商城访问您的位置！'
+				});
+				//#ifdef H5
+				if (this.$wechat.isWeixin() === true) {
+					this.$wechat.seeLocation({
+						latitude: Number(item.lat),
+						longitude: Number(item.long),
+						name: item.mer_name,
+						address: item.mer_address ? item.mer_address : '',
+					}).then(res => {
+						// console.log('success');
+					})
+				} else {
+					//#endif
+					uni.openLocation({
+						latitude: parseFloat(item.lat),
+						longitude: parseFloat(item.long),
+						scale: 8,
+						name: item.mer_name,
+						address: item.mer_address ? item.mer_address : '',
+						success: function(res) {
+							// console.log(res)
+						},
+					});
+					// #ifdef H5
+				}
+				//#endif	
+			},
+			selfLocation() {
+				let self = this
+				if (uni.getStorageSync('RejectTarget')) {
+					this.getStoreList();
+					return;
+				}
+				if (this.$store?.state?.storage?.location?.lat) {
+					this.latitude = this.$store?.state?.storage?.location?.lat;
+					this.longitude = this.$store?.state?.storage?.location?.long;
+					getGeocoder({
+						lat: this.latitude,
+						long: this.longitude
+					}).then(res => {
+						// console.log(res)
+						this.detaile_address = res.data.address;
+						this.location_address = res.data.address;
+						this.recommend_address = res.data.address.length > 4 ? res.data.address
+							.slice(0, 4) + '...' :
+							res.data.address;
+						this.getStoreList();
+					}).catch(err => {
+						uni.showToast({
+							title: err,
+							icon: 'none'
+						})
+						this.getStoreList();
+					})
+				} else uni.getLocation({
+					type: 'wgs84',
+					success: (res) => {
+						res = wgsToGcj(res);
+						console.log('定位');
+						let latitude, longitude;
+						latitude = res.latitude.toString();
+						longitude = res.longitude.toString();
+						this.latitude = res.latitude.toFixed(6);
+						this.longitude = res.longitude.toFixed(6);
+						this.$store.commit('setLocation', {
+							lat: res.latitude.toFixed(6),
+							long: res.longitude.toFixed(6),
+						});
+						getGeocoder({
+							lat: latitude,
+							long: longitude
+						}).then(res => {
+							// console.log(res)
+							this.detaile_address = res.data.address;
+							this.location_address = res.data.address;
+							this.recommend_address = res.data.address.length > 4 ? res.data.address
+								.slice(0, 4) + '...' :
+								res.data.address
+							this.getStoreList();
+						}).catch(err => {
+							uni.showToast({
+								title: err,
+								icon: 'none'
+							})
+							this.getStoreList();
+						})
+					},
+					fail: (res) => {
+						uni.showToast({
+							title: res,
+							icon: 'none',
+							duration: 1000
+						});
+						this.getStoreList();
+					},
+				});
+			},
+			// 进店
+			goStore(id) {
+				if (this.storeParam.type_id == 12) {
+					uni.navigateTo({
+						url: `/pages/nongKe/supply_chain/merchant?id=${id}`
+					})
+				} else {
+					if (this.hide_mer_status != 1) {
+						uni.navigateTo({
+							url: `/pages/store/home/index?id=${id}&type=7`
+						})
+					}
+				}
+			},
+			// 搜索
+			searchSubmit: function() {
+				this.$set(this.storeParam, 'keyword', this.storeParam.keyword);
+				this.set_where('')
+				this.showSerch = false
+			},
+
+			//点击事件处理
+			set_where: function(e) {
+				if (this.loading) return
+				this.storeList = []
+				this.storeParam.page = 1
+				this.storeParam.order = e //选择排序方式
+				this.getStoreList();
+				if (e == 'price_asc') return this.price_order = 'price_desc';
+				if (e == 'price_desc') return this.price_order = 'price_asc';
+			},
+
+			backjJump() {
+				uni.navigateBack({
+					delta: 1
+				})
+			},
+
+			// 点击商品二级分类
+			changeMerchantTow(item) {
+				this.merchantTow = item;
+				this.storeParam.category_id = this.merchantTow.store_category_id;
+				this.storeParam.page = 1;
+				this.getStoreList()
+			},
+
+			// 商品列表
+			getStoreList(load = false) {
+				this.showLoading = true
+				this.status = "loading"
+				if (!load) {
+					this.storeParam.page = 1;
+					this.goodsList = [];
+				}
+				let query = {
+					street_code: this.street_id,
+					order: this.storeParam.order,
+					keyword: this.storeParam.keyword,
+					page: this.storeParam.page,
+					location: this.latitude + ',' + this.longitude,
+					deduction_rate: this.storeParam.deduction_rate
+				}
+				if (this.storeParam.category_id == -1) null;
+				else if (!this.merchantTow.pid) query.cate_pid = this.storeParam.category_id; // 全部是查询一级分类pid
+				else query.category_id = this.storeParam.category_id; // 否则查询二级分类
+				townCloud(query).then(res => {
+					this.goodsList = [...this.goodsList, ...res.data.list]
+					this.showLoading = false
+					this.goodsList.forEach(item => {
+						this.trnList.push({
+							left: 0,
+							bottom: 0
+						})
+					})
+				}).catch(e => {
+					Toast(e.msg || e.message || e)
+					this.showLoading = false;
+				})
+			},
+
+			loadMoreLeft() {
+				// 加载更多左侧内容的逻辑
+			},
+
+			loadMoreRight() {
+				// 加载更多右侧内容的逻辑
+				this.storeParam.page++;
+				this.getStoreList(true);
+			},
+
+			// 购物车信息
+			cartFn() {
+				getCartList().then(res => {
+					this.totalMoney = 0
+					this.cartList = res.data.list
+					this.cartList.forEach(e => {
+						e.list.forEach(item => {
+							this.totalMoney += item.cart_num * item.productAttr.price
+						})
+					})
+					this.totalMoney = this.totalMoney.toFixed(2)
+				})
+				getCartCounts().then(res => {
+					this.goodsNum = res.data[0].count
+				})
+			},
+			// 点击商品
+			clickProduct(data) {
+				this.$refs.shortPopupRef.setDatas(data, this.goodsNum);
+				this.$refs.shortPopupRef.open();
+			},
+			// 点击全部
+			showAllRef() {
+				this.$refs.allRef.open();
+			},
+			changeAllRef(e) {
+				this.allShow = e.show;
+			},
+
+			// 刷新购物车
+			loadCart() {
+				this.cartFn();
+			},
+
+			// 获取规格名称
+			getSkuName(item) {
+				return Object.keys(item.sku).join('/') || null;
+			},
+
+			// 选择位置
+			changeMap() {
+				uni.navigateTo({
+					url: `/pages/select_address/select_address_n`,
+					success: () => {
+						uni.$once('changeAddress', (e) => {
+							this.street_id = e.street.code;
+							this.storeParam.street_id = this.street_id;
+							this.street = e.street.name;
+							if (e.longitude) {
+								this.longitude = e.longitude;
+								this.latitude = e.latitude;
+								this.$store.commit('setLocation', {
+									lat: e.latitude,
+									long: e.longitude,
+								});
+							}
+							this.getStoreList();
+						})
+					}
+				})
+			},
+
+			// 比例
+			handleChooseProp(e) {
+				this.storeParam.deduction_rate = e;
+				this.storeParam.page = 1;
+				this.getStoreList()
+			},
+
+			// 获取比例
+			getProportionData() {
+				getProportion({
+					mer_id: 244
+				}).then(res => {
+					this.propotionData = res.data;
+				})
+			},
+
+			// 具体商品列表高度
+			initGoodsListHeight() {
+				this.$nextTick(async () => {
+					let cardDom = await this.getDomInfo(".card");
+					let rightPanelViewDom = await this.getDomInfo(".right-panel-view");
+					this.goodsListHeight = cardDom.top - rightPanelViewDom.top + "px";
+				})
+			},
+
+			// 农产品类型高度
+			initHeight() {
+				this.$nextTick(async () => {
+					let leftDom = await this.getDomInfo(".left-panel");
+					let flowDom = await this.getDomInfo(".cart");
+					this.leftDomHeight = flowDom.top - leftDom.top - 7 + "px";
+				})
+			},
+
+			// 获取dom布局信息
+			getDomInfo(selector) {
+				return new Promise((resolve, reject) => {
+					uni.createSelectorQuery().in(this).select(selector).boundingClientRect((data) => {
+						resolve(data);
+					}).exec();
+				})
+			}
+		},
+		//刷新
+		onPullDownRefresh() {
+			uni.stopPullDownRefresh()
+		},
+		onShow() {
+			this.showSelect = false;
+			this.cartFn();
+		},
+		// 页面返回
+		onBackPress() {
+			if (this.$refs.shortPopupRef.isShow) {
+				this.$refs.shortPopupRef.close();
+				return true;
+			} else if (this.allShow) {
+				this.$refs.allRef.close();
+				return true;
+			} else return false;
+		}
+
+	}
+</script>
+
+<style lang="scss" scoped>
+	* {
+		margin: 0;
+		padding: 0;
+	}
+
+	page {
+		background-color: #F7F7F7;
+	}
+
+	.all_ref {
+		height: 100vh;
+		width: 510rpx;
+		background-color: #fff;
+		padding: 30rpx;
+
+		.header {
+			height: 100rpx;
+			font-size: 33rpx;
+			font-weight: bold;
+			display: flex;
+			align-items: center;
+		}
+
+		.all_list {
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: flex-start;
+			align-items: flex-start;
+		}
+
+		.menu_li {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			width: 150rpx;
+			height: 150rpx;
+			overflow: hidden;
+
+			// width: 120rpx;
+			// display: inline-block;
+			.image {
+				border-radius: 50%;
+				border: 5rpx solid #fff;
+			}
+
+			.li_text {
+				width: 100%;
+				white-space: nowrap;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				text-align: center;
+				padding: 4rpx 10rpx;
+			}
+		}
+
+		.menu_li_on {
+			.image {
+				border: 5rpx solid #ff6d20;
+				border-radius: 50%;
+			}
+
+			.li_text {
+				background-color: #ff6d20;
+				border-radius: 2em;
+				color: #fff;
+				padding: 4rpx 10rpx;
+			}
+		}
+	}
+
+	.com_name {
+		font-size: 33.29rpx;
+		// background-color: red;
+		// max-width: 45vw;
+		max-width: 40vw;
+		white-space: nowrap;
+		/* 防止文字换行 */
+		overflow: hidden;
+		/* 超出部分隐藏 */
+		text-overflow: ellipsis;
+		/* 使用省略号表示溢出的内容 */
+		// width: 200px;
+		/* 可根据实际情况调整容器宽度 */
+	}
+
+	.head_tit {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		box-sizing: border-box;
+		padding: 0 20rpx;
+
+	}
+
+	.productList {
+		display: flex;
+		flex-direction: column;
+
+		width: 100%;
+		height: 760rpx;
+		background-image: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/def/80b54202402290906142644.webp");
+		background-size: cover;
+		background-repeat: no-repeat;
+		background-position: center;
+
+		.top {
+			padding-top: 102rpx;
+			margin-bottom: 40rpx;
+			width: 100%;
+		}
+
+		.content {
+			flex: 1;
+			padding: 0 20rpx 10rpx 20rpx;
+		}
+
+		.menu_cls {
+			border-radius: 21.03rpx 21.03rpx 21.03rpx 21.03rpx;
+			padding: 10rpx 70rpx 0 0;
+			font-size: 26.29rpx;
+			height: 155rpx;
+			overflow: hidden;
+			position: relative;
+
+			.all {
+				position: absolute;
+				top: 0;
+				right: 0;
+				padding: 0 15rpx;
+				height: 100%;
+				display: flex;
+				justify-content: center;
+				flex-direction: column;
+				background-color: #f5f5f5;
+
+				image {
+					width: 30rpx;
+					height: 30rpx;
+				}
+			}
+
+			.menu_li {
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				min-width: 140rpx;
+				height: auto;
+
+				.image {
+					border-radius: 50%;
+					border: 5rpx solid #fff;
+				}
+
+				.li_text {
+					width: 100%;
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					text-align: center;
+					padding: 1rpx 10rpx 4rpx 10rpx;
+				}
+			}
+
+			.menu_li_on {
+				.image {
+					border: 5rpx solid #ff6d20;
+					border-radius: 50%;
+				}
+
+				.li_text {
+					background-color: #ff6d20;
+					border-radius: 2em;
+					color: #fff;
+					padding: 1rpx 10rpx 4rpx 10rpx;
+				}
+			}
+		}
+
+		.container {
+			display: flex;
+			height: calc(100vh - 320rpx - var(--status-bar-height));
+
+			.left-panel {
+				width: 180rpx;
+				height: 100%;
+				font-size: 29.79rpx;
+				flex-shrink: 0;
+
+				.left-panel_item {
+					display: flex;
+					flex-direction: column;
+					justify-content: center;
+					align-items: center;
+					margin-bottom: 30rpx;
+
+					text {
+						margin-top: 20rpx;
+						font-size: 26rpx;
+						color: #262626;
+					}
+
+					.left-panel_item_active {
+						position: relative;
+						z-index: 1;
+
+						&::after {
+							content: "";
+							display: inline-block;
+							position: absolute;
+							z-index: -1;
+							bottom: -6rpx;
+							left: 50%;
+							transform: translateX(-50%);
+							width: 120%;
+							height: 18rpx;
+							background: linear-gradient(90deg, #FF8158 0%, rgba(255, 255, 255, 0) 90%);
+							border-radius: 10rpx;
+						}
+					}
+				}
+			}
+
+			.right-panel {
+				width: calc(100vw - 180rpx);
+				height: 100%;
+				font-size: 26.29rpx;
+
+				.con-right-proportion {
+					display: flex;
+					align-items: center;
+					height: 38rpx;
+					margin-bottom: 25rpx;
+
+					image {
+						width: 154rpx;
+						height: 28rpx;
+						margin-right: 50rpx;
+					}
+
+					.con-right-proportion-item {
+						margin-right: 22rpx;
+						font-size: 26rpx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #FFFFFF;
+					}
+
+					.active {
+						padding: 7rpx 22rpx;
+						background: #FEE109;
+						border-radius: 17rpx;
+						font-size: 26rpx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #616161;
+					}
+				}
+
+				.right-panel-head {
+					height: 70rpx;
+					box-sizing: border-box;
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					padding-right: 30rpx;
+					color: #737373;
+
+					view {
+						display: flex;
+						align-items: center;
+						margin-left: 40rpx;
+					}
+
+					.active {
+						color: #333;
+						font-weight: bold;
+					}
+
+					.icon {
+						height: 22rpx;
+						width: 18rpx;
+					}
+				}
+
+				.right-panel-view {
+					// height: calc(100vh - 400rpx - var(--status-bar-height) - 100rpx);
+
+					.short_item {
+						padding: 20rpx;
+						display: flex;
+						background: #fff;
+						border-radius: 20rpx;
+						margin: 0 20rpx 20rpx 0;
+
+						.image {
+							height: 145.23rpx;
+							width: 145.23rpx;
+							border-radius: 21.03rpx 21.03rpx 21.03rpx 21.03rpx;
+							margin-right: 20rpx;
+							flex-shrink: 0;
+						}
+
+						.short_item_right {
+							flex: 1;
+							display: flex;
+							flex-direction: column;
+							justify-content: space-between;
+
+							.r_name {
+								width: 100%;
+								height: 64rpx;
+								line-height: 32rpx;
+								text-overflow: ellipsis;
+								display: -webkit-box;
+								-webkit-box-orient: vertical;
+								overflow: hidden;
+								-webkit-line-clamp: 2;
+							}
+
+							.r_type {
+								font-size: 22.78rpx;
+								color: #737373;
+								width: 300rpx;
+
+								view {
+									height: 39rpx;
+									line-height: 39rpx;
+									background: #FEF5F3;
+									display: inline-block;
+									padding: 0 16rpx;
+									border-radius: 39rpx;
+									max-width: 100%;
+									overflow: hidden;
+									white-space: nowrap;
+									text-overflow: ellipsis;
+								}
+							}
+
+							.r_btn {
+								display: flex;
+								justify-content: space-between;
+								font-size: 22.78rpx;
+								color: #F84221;
+								align-items: center;
+							}
+						}
+					}
+				}
+			}
+		}
+
+		.common-hd {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			height: 60rpx;
+			margin-top: 30rpx;
+
+			.title {
+				padding: 0 80rpx;
+				font-size: 34rpx;
+				color: $theme-color;
+				font-weight: bold;
+				background-image: url("~@/static/images/index-title.png");
+				background-repeat: no-repeat;
+				background-size: 100% auto;
+				background-position: left center;
+			}
+		}
+
+		.goods_list {
+			margin-top: 20rpx;
+
+			.goods_card {
+				margin-top: 20rpx;
+				height: auto;
+				background-color: white;
+				padding: 20rpx;
+				display: flex;
+
+				.left {
+					margin-right: 20rpx;
+					width: 158rpx;
+					height: 158rpx;
+					border-radius: 20rpx;
+					overflow: hidden;
+				}
+
+				.right {
+					flex: 1;
+					color: #737373;
+
+					.head {
+						font-weight: bold;
+						color: #333;
+					}
+
+					.li {
+						width: 100%;
+						display: flex;
+						font-size: 28.04rpx;
+						margin-bottom: 10rpx;
+						align-items: center;
+
+						text {
+							margin: 0 20rpx 0 5rpx;
+						}
+					}
+				}
+			}
+		}
+
+		.address {
+			white-space: nowrap;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			width: 200px;
+		}
+	}
+
+	.selects {
+		transform: rotate(180deg);
+	}
+
+	.search-right.styleType2 .right-text,
+	.search-right.styleType3 .right-text {
+		color: #282828;
+	}
+
+	.search-right.styleType2 .icon-xiangyou,
+	.search-right.styleType3 .icon-xiangyou {
+		color: #999999;
+	}
+
+	.search-right.styleType2 .icon-dingwei,
+	.search-right.styleType3 .icon-dingwei {
+		color: #8A8A8A;
+	}
+
+	.productList .search .back {
+		display: flex;
+		align-items: center;
+		width: 40rpx;
+		height: 60rpx;
+
+		.iconfont {
+			color: #fff;
+			font-size: 36rpx;
+		}
+	}
+
+	.town_name {
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		max-width: 4.2em;
+		font-size: 28rpx;
+		color: #fff;
+		margin-right: 4rpx;
+	}
+
+	.productList .search .input {
+		flex: 1;
+		height: 60rpx;
+		background-color: #fff;
+		border-radius: 50rpx;
+		padding: 0 20rpx;
+		box-sizing: border-box;
+	}
+
+	.productList .search.styleType2 .input,
+	.productList .search.styleType3 .input {
+		background: #EDEDED;
+	}
+
+	.productList .search .input input {
+		flex: 1;
+		height: 100%;
+		font-size: 26rpx;
+		margin-left: 10rpx;
+	}
+
+	.productList .search .input .placeholder {
+		color: #999;
+	}
+
+	.productList .search .input .iconfont {
+		font-size: 35rpx;
+		color: #555;
+		margin-right: 10px;
+	}
+
+	.productList .search .icon-pailie,
+	.productList .search .icon-tupianpailie {
+		color: #fff;
+		width: 62rpx;
+		font-size: 40rpx;
+		height: 86rpx;
+		line-height: 86rpx;
+	}
+
+	.productList .nav-wrapper {
+		z-index: 9;
+		position: fixed;
+		left: 0;
+		top: 25px;
+		width: 100%;
+		margin-top: 86rpx;
+		background-color: #fff;
+
+		&.styleType1 {
+			background-color: var(--view-theme);
+		}
+
+		.tab-bar {
+			display: flex;
+			align-items: center;
+
+			.tab-item {
+				position: relative;
+				flex: 1;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				padding: 8rpx 0 20rpx;
+				color: #fff;
+				font-size: 28rpx;
+				font-weight: bold;
+
+				&::after {
+					content: ' ';
+					position: absolute;
+					left: 50%;
+					bottom: 18rpx;
+					width: 30rpx;
+					height: 3rpx;
+					background: transparent;
+					transform: translateX(-50%);
+				}
+
+				&.on {
+					&::after {
+						background: #fff;
+					}
+				}
+			}
+		}
+	}
+
+	.border-picture {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		background: center/cover no-repeat;
+	}
+
+	.productList .nav {
+		height: 86rpx;
+		color: #454545;
+		font-size: 28rpx;
+		display: flex;
+		justify-content: space-between;
+		padding: 0 28rpx;
+	}
+
+	.productList .nav .item {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		color: #FFFFFF;
+		flex: 1;
+	}
+
+	.productList .nav.styleType2 .item,
+	.productList .nav.styleType3 .item {
+		color: #282828;
+	}
+
+	.productList .nav .item.font-colors {
+		font-weight: 500;
+		color: #FFFFFF;
+	}
+
+	.productList .nav.styleType2 .item.font-colors,
+	.productList .nav.styleType3 .item.font-colors {
+		color: var(--view-theme);
+	}
+
+	.productList .nav .item .font-line {
+		height: 4rpx;
+		background-color: #fff;
+		margin-top: 3rpx;
+		width: 28rpx;
+		animation: line 0.3s;
+		-moz-animation: line 0.3s;
+		-webkit-animation: line 0.3s;
+		-o-animation: line 0.3s;
+	}
+
+	.productList .nav.styleType2 .item .font-line,
+	.productList .nav.styleType3 .item .font-line {
+		background-color: var(--view-theme);
+	}
+
+	@keyframes line {
+		from {
+			width: 0rpx;
+		}
+
+		to {
+			width: 28rpx;
+		}
+	}
+
+	.productList .nav .item image {
+		width: 15rpx;
+		height: 19rpx;
+		margin-left: 10rpx;
+	}
+
+	.selected-list {
+		padding: 24rpx 14rpx;
+		border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx;
+		background-color: #fff;
+		position: absolute;
+		left: 100rpx;
+		font-size: 29.79rpx;
+		opacity: 0;
+		transition: 0.5s;
+		height: 0;
+
+		.triangle-up {
+			width: 0;
+			height: 0;
+			border-left: 10rpx solid transparent;
+			border-right: 10rpx solid transparent;
+			border-bottom: 10rpx solid white;
+			position: absolute;
+			top: -10rpx;
+		}
+
+		.selected-li {
+			margin-bottom: 35rpx;
+			color: #F84221;
+			display: flex;
+			align-items: center;
+		}
+	}
+
+	.actSel {
+		opacity: 1;
+		height: auto;
+	}
+
+	.store-wrapper {
+		margin-top: 235rpx;
+		border-top: 1px solid #F6F6F6;
+
+		.store-item {
+			margin: 20rpx auto;
+
+			.head {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				color: #fff;
+
+				.zhezhao {
+					position: absolute;
+					width: 95%;
+					height: 150px;
+					border-radius: 20rpx;
+					z-index: 0;
+					opacity: 0.5;
+					background-color: #999;
+				}
+
+				.bgc_img {
+					position: absolute;
+					width: 95%;
+					height: 150px;
+					background-size: cover;
+					border-radius: 20rpx;
+					z-index: 0;
+				}
+
+				.zhezhao1 {
+					width: 100%;
+					height: 150px;
+					border-radius: 20rpx;
+					z-index: 1;
+
+					.title {
+						display: flex;
+						height: 50px;
+						align-items: center;
+						margin-left: 20px;
+						z-index: 1;
+
+						span {
+							background-color: #F84221;
+							color: white;
+							font-size: 12px;
+							padding: 3px;
+							border-radius: 5px;
+							margin-left: 5px;
+						}
+					}
+
+					.coent {
+						display: flex;
+						margin-left: 20px;
+
+						.avater {
+							width: 60px;
+							height: 80px;
+
+							image {
+								width: 60px;
+								height: 80px;
+							}
+						}
+
+						.text {
+							.text_one {
+								display: flex;
+								height: 30px;
+								line-height: 30px;
+								padding-left: 10px;
+
+								image {
+									width: 20px;
+									height: 20px;
+									margin-right: 10px;
+								}
+
+								.text_one_r {
+									margin-left: 10px;
+								}
+							}
+
+							.text_two {
+								width: 270px;
+								height: 30px;
+								line-height: 30px;
+								padding-left: 10px;
+								white-space: nowrap;
+								overflow: hidden;
+								text-overflow: ellipsis;
+
+								image {
+									width: 20px;
+									height: 20px;
+									margin-right: 10px;
+								}
+							}
+
+							.text_three {
+								width: 270px;
+								height: 30px;
+								line-height: 30px;
+								padding-left: 10px;
+								white-space: nowrap;
+								overflow: hidden;
+								text-overflow: ellipsis;
+
+								image {
+									width: 20px;
+									height: 20px;
+									margin-right: 10px;
+								}
+							}
+						}
+
+					}
+				}
+			}
+
+			.pro-box {
+				white-space: nowrap;
+				display: flex;
+				align-items: center;
+				padding: 20rpx 20rpx 30rpx;
+
+				.pro-item {
+					display: inline-block;
+					width: 218rpx;
+					margin-right: 14rpx;
+
+					.picture,
+					/deep/image,
+					uni-image {
+						width: 100%;
+						height: 214rpx;
+						border-radius: 8rpx;
+						position: relative;
+					}
+
+					.price {
+						margin-top: 5rpx;
+						font-size: 28rpx;
+						color: var(--view-priceColor);
+						font-weight: bold;
+
+						text {
+							font-size: 28rpx;
+						}
+					}
+
+					&:last-child {
+						margin-right: 0;
+					}
+				}
+
+				&.styleType3 {
+					padding: 20rpx;
+
+					.pro-item {
+						display: inline-block;
+						background-color: #fff;
+						border-radius: 16rpx;
+						text-align: center;
+						padding: 10rpx 0 20rpx;
+
+						.picture,
+						/deep/image,
+						uni-image {
+							width: 194rpx;
+							height: 194rpx;
+							text-align: center;
+							border-radius: 8rpx;
+							position: relative;
+							margin: 0 auto;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	.mer-item2 {
+		padding: 20rpx;
+		background: #fff;
+		margin-bottom: 20rpx;
+		border-radius: 16rpx;
+
+		.mer-shop-count {
+			display: flex;
+
+			.mer-avatar {
+				width: 100rpx;
+				height: 100rpx;
+			}
+
+			.mer-top {
+				color: #282828;
+			}
+
+			.mer-shop-right {
+				margin-left: 20rpx;
+
+				.mer-btn {
+					color: #666666;
+				}
+			}
+
+			.pro-box {
+				white-space: nowrap;
+				display: flex;
+				align-items: center;
+				margin-top: 20rpx;
+
+				.pro-item {
+					display: inline-block;
+					width: 170rpx;
+					margin-right: 20rpx;
+
+					.picture,
+					/deep/image,
+					uni-image,
+					/deep/.easy-loadimage {
+						width: 100%;
+						height: 170rpx;
+						border-radius: 8rpx;
+						position: relative;
+					}
+
+					.price {
+						margin-top: 5rpx;
+						font-size: 28rpx;
+						color: var(--view-priceColor);
+						font-weight: bold;
+
+						text {
+							font-size: 28rpx;
+						}
+					}
+
+					&:last-child {
+						margin-right: 0;
+					}
+				}
+			}
+		}
+	}
+
+	.no-shop {
+		.pictrue {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			color: $uni-nothing-text;
+
+			image {
+				width: 500rpx;
+				height: 180rpx;
+			}
+		}
+	}
+
+	.guanbi {
+		width: 20px;
+		height: 20px;
+		margin: 30px auto;
+	}
+
+	.img_cls {
+		position: absolute;
+		top: 50%;
+		right: 7rpx;
+		transform: translateY(-50%);
+	}
+
+	.pop {
+		z-index: 1;
+	}
+
+	.sswz {
+		margin-top: 10rpx;
+		display: flex;
+		justify-content: space-between;
+		box-sizing: border-box;
+		padding: 0 20rpx;
+	}
+
+	.score {
+		display: flex;
+		align-items: center;
+		font-weight: 500;
+		font-size: 24rpx;
+		line-height: 1;
+		color: #000;
+
+		.star {
+			position: relative;
+			width: 111rpx;
+			height: 19rpx;
+			margin-right: 10rpx;
+			background: url(../../columnGoods/images/star.png) left top/100% 100% no-repeat;
+			overflow: hidden;
+
+			view {
+				position: absolute;
+				top: 0;
+				left: 0;
+				width: 100%;
+				height: 100%;
+				background: url(../../columnGoods/images/star_active.png) left top/111rpx 19rpx no-repeat;
+
+				&.star_purple {
+					background: url(../../columnGoods/images/star_active_purple.png) left top/111rpx 19rpx no-repeat;
+				}
+			}
+		}
+	}
+
+	.card {
+		width: 100%;
+		height: 166rpx;
+		z-index: 99;
+		position: fixed;
+		bottom: 0;
+		background-color: #fff;
+		overflow: hidden;
+		color: white;
+		display: flex;
+		justify-content: space-between;
+		box-sizing: border-box;
+
+		.left {
+			display: flex;
+			align-items: center;
+			padding: 10rpx 35rpx;
+
+			.badge {
+				position: absolute;
+				top: 0;
+				right: 0;
+				background-color: #F84221;
+				transform: translate(50%, -50%);
+				// padding: 10rpx 10rpx;
+				border-radius: 35rpx;
+				text-align: center;
+				width: 35rpx;
+				line-height: 35rpx;
+				height: 35rpx;
+			}
+
+			.tot_price {
+				// display: flex;
+				// margin-left: 42rpx;
+				// flex-direction: column;
+				// justify-content: space-between;
+
+				.footer-left {
+					display: flex;
+					flex-direction: column;
+					margin-top: 14rpx;
+
+					.price {
+						width: 131rpx;
+						height: 28rpx;
+						font-size: 30rpx;
+						font-family: PingFang SC;
+						font-weight: 400;
+						color: #1A1A1A;
+						margin-bottom: 18rpx;
+					}
+
+					.desc {
+						font-size: 26rpx;
+						font-family: PingFang SC;
+						font-weight: 400;
+						color: #616161;
+					}
+				}
+			}
+		}
+
+		.right {
+			width: 200rpx;
+			height: 78rpx;
+			line-height: 78rpx;
+			text-align: center;
+			background: linear-gradient(-20deg, #FF8154 0%, #FF8154 100%);
+			border-radius: 39rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #FFFFFF;
+			margin-top: 10rpx;
+		}
+	}
+
+	.cart {
+		position: fixed;
+		bottom: 180rpx;
+		left: 35rpx;
+
+		.badge {
+			position: absolute;
+			top: -3rpx;
+			right: -2rpx;
+			width: 40rpx;
+			height: 40rpx;
+			line-height: 40rpx;
+			background: #FFCE51;
+			border-radius: 50%;
+			font-size: 24rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #616161;
+			text-align: center;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/cloud_warehouse/small_classification/index_new.vue b/pages/cloud_warehouse/small_classification/index_new.vue
new file mode 100644
index 0000000..d7ab5da
--- /dev/null
+++ b/pages/cloud_warehouse/small_classification/index_new.vue
@@ -0,0 +1,630 @@
+<!-- 里海云仓小分类 -->
+<template>
+	<view class="smallClassification">
+		<!-- 占位 -->
+		<view style="height: var(--status-bar-height);"></view>
+
+		<!-- 搜索 -->
+		<view class="search">
+			<view class="icon" @click="handleBack" />
+			<view class="input-wrap">
+				<icon type="search" size="18" />
+				<input type="text" class="uni-input" placeholder="搜索商品" @input="" />
+			</view>
+		</view>
+
+		<!-- goods -->
+		<view class="con">
+			<view class="con-left" :style="{'height':leftDomHeight}">
+				<!-- 侧边栏商品类型 -->
+				<block v-for="(item,indx) in cateData" :key="indx">
+					<view class="con-left-bili_num_2" @click="handleChooseSideBar(item.store_category_id)">
+						<u--image :src="item.pic" width="100rpx" height="100rpx" style="margin-bottom: 20rpx;"
+							shape="circle">
+							<template v-slot:loading>
+								<u-loading-icon color="#999"></u-loading-icon>
+							</template>
+						</u--image>
+						<text class="cate-name"
+							:class="{active:searchParam.mer_cate_id == item.store_category_id?true:false}">{{item.cate_name}}</text>
+					</view>
+				</block>
+			</view>
+
+			<view class="con-right">
+				<!-- 补贴比例标签 -->
+				<view class="con-right-proportion">
+					<image src="../../../static/cloud_warehouse/dkbl.png" />
+					<block v-for="(item,indx) in propotionData" :key="indx">
+						<view class="con-right-proportion-item"
+							:class="{active:searchParam.deduction_rate == item.product_label_id}"
+							@click="handleChooseProp(item.product_label_id)">{{item.label_name}}</view>
+					</block>
+				</view>
+
+				<!-- 商品列表 -->
+				<scroll-view scroll-y="true" class="con-right-goods" :style="{'height':goodsListHeight}"
+					:show-scrollbar="false" :scroll-with-animation="true" @scrolltolower="scrolltolower">
+					<view v-if="goodsData.length > 0">
+						<view class="con-right-goods-item" v-for="(item,indx) in goodsData" :key="indx">
+							<view class="goods-item-left">
+								<u--image :src="item.image" width="190rpx" height="190rpx" radius="10" />
+							</view>
+							<view class="goods-item-right">
+								<view class="goods-item-right-title">
+									<text class="city">同城</text>
+									<text class="name line1">{{item.store_name}}</text>
+								</view>
+								<view class="goods-item-right-redpackat line1">可使用补贴抵扣20%</view>
+								<view class="goods-item-right-rules">
+									<text class="unit">规格：1{{item.unit_name}}</text>
+									<!-- 方山镇 -->
+									<text class="addr"></text>
+								</view>
+								<view class="goods-item-right-purchase">
+									<text class="num">￥{{item.price}}</text>
+									<text class="buy"></text>
+								</view>
+							</view>
+						</view>
+						<view class="loadingicon acea-row row-center-wrapper" style="color: #ccc;">
+							<text class="loading iconfont icon-jiazai" :hidden="hotLoading == false"></text>
+							{{ hotTitle }}
+						</view>
+					</view>
+
+					<view class='empty-box' v-else>
+						<view class='pictrue'>
+							<u--image src='../../../static/images/empty-box.png' width="414rpx"
+								height="240rpx"></u--image>
+							<view class="txt">暂无更多商品~</view>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+		</view>
+
+		<!-- 悬浮购买按钮 -->
+		<view class="flow">
+			<image src="../../../static/cloud_warehouse/gwc.png"></image>
+			<text>11</text>
+		</view>
+
+		<!-- 底部结算 -->
+		<view class="footer">
+			<view class="footer-left">
+				<text class="price">￥184.00</text>
+				<text class="desc">支持配送 售后无忧</text>
+			</view>
+			<view class="footer-right">去结算</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getProportion,
+		getCategory,
+		goodsList
+	} from "@/api/cloud_warehouse.js";
+	export default {
+		data() {
+			return {
+				leftDomHeight: 0, //左侧农产品类型高度
+				goodsListHeight: 0, //右侧商品列表高度
+				propotionData: [], //比例
+				cateData: [], //分类
+				goodsData: [], //商品列表
+				pid: '', //上一级id
+				searchParam: {
+					mer_cate_id: '', //商品类型id
+					mer_id: '', //商铺id
+					deduction_rate: '', //抵扣比例id
+					keyword: '', //关键字查询
+					page: 1,
+					limit: 10
+				},
+				// 滚动加载
+				hotTitle: '加载更多',
+				hotLoading: false,
+				hotScroll: true,
+			}
+		},
+		onLoad(opt) {
+			this.pid = opt.pid;
+			this.searchParam.mer_id = opt.mer_id; //商铺id
+
+			this.initHeight();
+			this.initGoodsListHeight();
+			this.initConfig();
+		},
+		methods: {
+			// 返回
+			handleBack() {
+				uni.navigateBack({
+					delta: 1
+				})
+			},
+
+			// 初始化商品列表参数
+			initConfig() {
+				uni.showLoading({
+					title: "加载中",
+				})
+				Promise.all([getProportion({
+					mer_id: this.searchParam.mer_id
+				}), getCategory(this.searchParam.mer_id, this.pid)]).then(res => {
+					uni.hideLoading();
+					const [proportion, cate] = res;
+					this.cateData = cate.data;
+					this.propotionData = proportion.data;
+
+					//初始化
+					this.searchParam.mer_cate_id = this.cateData[0].store_category_id;
+					// this.searchParam.deduction_rate = this.propotionData[0].product_label_id;
+
+					this.getGoodsList();
+				}).catch(er => {
+					uni.hideLoading();
+				})
+			},
+
+			// 滚动到底部
+			scrolltolower(e) {
+				this.getGoodsList();
+			},
+
+			// 获取商品分类列表
+			getGoodsList() {
+				let that = this;
+				let num = that.searchParam.limit;
+				if (!that.hotScroll) return;
+				if (that.hotLoading) return;
+				that.hotLoading = true;
+				that.hotTitle = '';
+
+				goodsList(this.searchParam).then(res => {
+					let list = res.data.list;
+					let hotScroll;
+					if (list.length < num && list.length != 0 || list.length == 0)
+						hotScroll = true;
+					else
+						hotScroll = false;
+					that.hotScroll = hotScroll;
+					that.hotLoading = false;
+					that.hotTitle = hotScroll ? '已全部加载' : '加载更多';
+					that.goodsData = that.goodsData.concat(list);
+					that.searchParam.page += 1;
+				});
+			},
+
+			// 比例
+			handleChooseProp(e) {
+				this.goodsData = [];
+				this.searchParam.page = 1;
+				this.searchParam.deduction_rate = e;
+				this.getGoodsList();
+			},
+
+			// 侧边栏商品类型
+			handleChooseSideBar(e) {
+				this.goodsData = [];
+				this.searchParam.page = 1;
+				this.searchParam.mer_cate_id = e;
+				this.getGoodsList();
+			},
+
+			// 具体商品列表高度
+			initGoodsListHeight() {
+				this.$nextTick(async () => {
+					let footerDom = await this.getDomInfo(".footer");
+					let goodsDom = await this.getDomInfo(".con-right-goods");
+					this.goodsListHeight = footerDom.top - goodsDom.top + "px";
+				})
+			},
+
+			// 农产品类型高度
+			initHeight() {
+				this.$nextTick(async () => {
+					let leftDom = await this.getDomInfo(".con-left");
+					let flowDom = await this.getDomInfo(".flow");
+					this.leftDomHeight = flowDom.top - leftDom.top + "px";
+				})
+			},
+
+			// 获取dom布局信息
+			getDomInfo(selector) {
+				return new Promise((resolve, reject) => {
+					uni.createSelectorQuery().in(this).select(selector).boundingClientRect((data) => {
+						resolve(data);
+					}).exec();
+				})
+			}
+		}
+	}
+</script>
+<style lang="scss">
+	page {
+		height: 100%;
+		background-color: #F7F7F7;
+	}
+
+	view,
+	text {
+		line-height: 1;
+	}
+
+	.smallClassification {
+		width: 100%;
+		height: 760rpx;
+		background-image: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/def/80b54202402290906142644.webp");
+		background-size: cover;
+		background-repeat: no-repeat;
+		background-position: center;
+
+		.search {
+			display: flex;
+			align-items: center;
+			padding: 102rpx 30rpx 0;
+			box-sizing: border-box;
+			margin-bottom: 42rpx;
+
+			.icon {
+				width: 24rpx;
+				height: 24rpx;
+				border: 2rpx solid #fff;
+				border-bottom-color: transparent;
+				border-right-color: transparent;
+				transform: rotate(-45deg);
+				margin-right: 20rpx;
+			}
+
+			.input-wrap {
+				flex: 1;
+				display: flex;
+				align-items: center;
+				background: #FFFFFF;
+				border-radius: 29rpx;
+				height: 58rpx;
+				padding-left: 16rpx;
+
+				input {
+					width: 494rpx;
+					height: 100%;
+					margin-right: 20rpx;
+					box-sizing: border-box;
+					margin-left: 20rpx;
+					color: #7A7A7A;
+				}
+
+				.uni-input-placeholder {
+					font-size: 28rpx;
+					color: #9f9f9f;
+				}
+			}
+
+			text {
+				width: 100rpx;
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #FFFFFF;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+			}
+
+			image {
+				width: 42rpx;
+				height: 40rpx;
+			}
+		}
+
+		.con {
+			display: flex;
+
+			.con-left {
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				width: 176rpx;
+				overflow: auto;
+
+				.con-left-bili_title {
+					margin-bottom: 40rpx;
+				}
+
+				[class^=con-left-bili_num_] {
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					margin-bottom: 30rpx;
+
+					text {
+						position: relative;
+						display: inline-block;
+						font-size: 26rpx;
+						font-family: PingFang SC;
+						font-weight: 400;
+						color: #262626;
+						text-align: center;
+						width: 80%;
+					}
+
+					.active {
+						font-size: 26rpx;
+						font-family: PingFang SC;
+						font-weight: bold;
+						color: #252525;
+
+						&::after {
+							content: "";
+							display: inline-block;
+							position: absolute;
+							bottom: -10rpx;
+							left: 50%;
+							transform: translateX(-50%);
+							width: 80rpx;
+							height: 18rpx;
+							background: linear-gradient(90deg, #FF8057 0%, rgba(86, 197, 113, 0) 100%);
+							border-radius: 9rpx 0rpx 0rpx 9rpx;
+						}
+					}
+				}
+			}
+
+			.con-right {
+				width: calc(100vw - 176rpx);
+				padding-right: 20rpx;
+				box-sizing: border-box;
+
+				.con-right-proportion {
+					display: flex;
+					align-items: center;
+					height: 38rpx;
+					margin-bottom: 25rpx;
+
+					image {
+						width: 154rpx;
+						height: 28rpx;
+						margin-right: 50rpx;
+					}
+
+					.con-right-proportion-item {
+						margin-right: 22rpx;
+						font-size: 26rpx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #FFFFFF;
+					}
+
+					.active {
+						padding: 7rpx 22rpx;
+						background: #FEE109;
+						border-radius: 17rpx;
+						font-size: 26rpx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #616161;
+					}
+				}
+
+				.con-right-goods {
+					overflow: auto;
+
+					.con-right-goods-item {
+						display: flex;
+						width: 100%;
+						margin-bottom: 20rpx;
+						padding: 20rpx;
+						background: #FFFFFF;
+						border-radius: 30rpx;
+
+						.goods-item-left {
+							background: #A3CAB9;
+							border-radius: 20rpx;
+							margin-right: 20rpx;
+						}
+
+						.goods-item-right {
+							flex: 1;
+
+							.goods-item-right-title {
+								display: flex;
+								margin-bottom: 20rpx;
+
+								.city {
+									margin-right: 10rpx;
+									padding: 4rpx 8rpx;
+									background: #FF8056;
+									border-radius: 6rpx;
+									font-size: 20rpx;
+									font-family: PingFang SC;
+									font-weight: 400;
+									color: #FFFFFF;
+								}
+
+								.name {
+									width: 206rpx;
+									height: 28rpx;
+									font-size: 26rpx;
+									font-family: PingFang SC;
+									color: #1A1A1A;
+									overflow: hidden;
+									white-space: nowrap;
+									text-overflow: ellipsis;
+								}
+							}
+
+							.goods-item-right-redpackat {
+								display: inline-block;
+								margin-bottom: 18rpx;
+								padding: 6rpx 14rpx;
+								background: rgba(246, 68, 39, .28);
+								border-radius: 17rpx;
+								font-size: 22rpx;
+								font-family: PingFang SC;
+								font-weight: 400;
+								color: #F23131;
+							}
+
+							.goods-item-right-rules {
+								display: flex;
+								justify-content: space-between;
+								align-items: center;
+								margin-bottom: 25rpx;
+
+								.unit,
+								.addr {
+									font-size: 22rpx;
+									font-family: PingFang SC;
+									font-weight: 400;
+									color: #7A7A7A;
+								}
+
+								.unit {}
+
+								.addr {}
+							}
+
+							.goods-item-right-purchase {
+								display: flex;
+								justify-content: space-between;
+								align-items: center;
+
+								.num {
+									font-size: 24rpx;
+									font-family: PingFang SC;
+									font-weight: 500;
+									color: #1A1A1A;
+								}
+
+								.buy {
+									position: relative;
+									display: inline-block;
+									width: 40rpx;
+									height: 40rpx;
+									background: #FF8056;
+									border-radius: 50%;
+
+									&::after,
+									&::before {
+										content: "";
+										display: inline-block;
+										position: absolute;
+										top: 50%;
+										left: 50%;
+										transform: translate(-50%, -50%);
+										width: 24rpx;
+										height: 4rpx;
+										background: #FFFFFF;
+									}
+
+									&::before {
+										transform: translate(-50%, -50%) rotate(90deg);
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+		.footer {
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			display: flex;
+			justify-content: space-between;
+			padding: 0 20rpx 0 40rpx;
+			width: 750rpx;
+			height: 166rpx;
+			background: #FFFFFF;
+			box-sizing: border-box;
+
+			.footer-left {
+				display: flex;
+				flex-direction: column;
+				margin-top: 14rpx;
+
+				.price {
+					width: 131rpx;
+					height: 28rpx;
+					font-size: 30rpx;
+					font-family: PingFang SC;
+					font-weight: 400;
+					color: #1A1A1A;
+					margin-bottom: 18rpx;
+				}
+
+				.desc {
+					font-size: 26rpx;
+					font-family: PingFang SC;
+					font-weight: 400;
+					color: #616161;
+				}
+			}
+
+			.footer-right {
+				width: 200rpx;
+				height: 78rpx;
+				line-height: 78rpx;
+				text-align: center;
+				background: linear-gradient(-20deg, #FF8154 0%, #FF8154 100%);
+				border-radius: 39rpx;
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #FFFFFF;
+				margin-top: 10rpx;
+			}
+		}
+
+		.flow {
+			position: fixed;
+			bottom: 180rpx;
+			left: 35rpx;
+
+			image {
+				width: 110rpx;
+				height: 110rpx;
+			}
+
+			text {
+				position: absolute;
+				top: -3rpx;
+				right: -2rpx;
+				width: 40rpx;
+				height: 40rpx;
+				line-height: 40rpx;
+				background: #FFCE51;
+				border-radius: 50%;
+				font-size: 24rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #616161;
+				text-align: center;
+			}
+		}
+
+		.empty-box {
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+			margin: 100rpx auto 0;
+
+			image {
+				width: 414rpx;
+				height: 240rpx;
+			}
+
+			.txt {
+				font-size: 26rpx;
+				color: #999;
+				text-align: center;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6b1f513..c762a62 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,69 +1,84 @@
 <template>
-  <view class="Circle_friends">
-    <view class="circle_friends_wrapper">
-      <view v-if="isFshow">
-        <view class="site-box flex_a_c_j_sb" :style="{'opacity':backColor}">
+	<view class="Circle_friends">
+		<view class="circle_friends_wrapper">
+			<view v-if="isFshow">
+				<view class="site-box flex_a_c_j_sb" :style="{'opacity':backColor}">
 
-          <view :class="['place_wrapper','flex_a_c',isFshow?'sitebox':'']" @click="changeMap">
-            <view :class="['iconfont','icon-weizhi',isFshow?'sitebox':'']" style="margin-left: 20rpx;">
-            </view>
-            <view class="town_name">{{ street||'定位中' }}</view>
-          </view>
-          <navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
-            <view :class="['iconfont','icon-xiaoxi',isFshow?'sitebox':'']" style="color:#fff;"></view>
-          </navigator>
-        </view>
+					<view :class="['place_wrapper','flex_a_c',isFshow?'sitebox':'']" @click="changeMap">
+						<view :class="['iconfont','icon-weizhi',isFshow?'sitebox':'']" style="margin-left: 20rpx;">
+						</view>
+						<view class="town_name">{{ street||'定位中' }}</view>
+					</view>
+					<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
+						<view :class="['iconfont','icon-xiaoxi',isFshow?'sitebox':'']" style="color:#fff;"></view>
+					</navigator>
+				</view>
 
 
-      </view>
+			</view>
 
-      <view class="" v-if="!isFshow">
-        <view class="site-box1">
-          <view class="box flex_a_c_j_sb">
-            <view class="place_wrapper flex_a_c" @click="changeMap">
-              <view class="iconfont icon-weizhi"></view>
-              <view class="town_name">{{street||'定位中' }}</view>
-            </view>
-            <navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
-              <view class="iconfont icon-xiaoxi" style="color:#fff;"> </view>
-            </navigator>
-          </view>
-          <navigator url="/pages/columnGoods/goods_search/index" hover-class="none" class="search_content flex_a_c_j_sb home_search">
-          	<view class="flex_a_c">
-          		<view class="iconfont icon-sousuo" style="font-size: 39rpx;"></view>
-          		<input type="text" v-model="keyword" placeholder="搜索产品或店铺" placeholder-style="font-size: 30rpx;"
-          			disabled>
-          	</view>
-          	<button class="search_btn">搜索</button>
-          </navigator>
-        </view>
-      </view>
+			<view class="" v-if="!isFshow">
+				<view class="site-box1">
+					<view class="box flex_a_c_j_sb">
+						<view class="place_wrapper flex_a_c" @click="changeMap">
+							<view class="iconfont icon-weizhi"></view>
+							<view class="town_name">{{street||'定位中' }}</view>
+						</view>
+						<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
+							<view class="iconfont icon-xiaoxi" style="color:#fff;"> </view>
+						</navigator>
+					</view>
+					<navigator url="/pages/columnGoods/goods_search/index" hover-class="none"
+						class="search_content flex_a_c_j_sb home_search">
+						<view class="flex_a_c">
+							<view class="iconfont icon-sousuo" style="font-size: 39rpx;"></view>
+							<input type="text" v-model="keyword" placeholder="搜索产品或店铺"
+								placeholder-style="font-size: 30rpx;" disabled>
+						</view>
+						<button class="search_btn">搜索</button>
+					</navigator>
+				</view>
+			</view>
 
-      <view class="home_bg">
-        <image class="image" mode="aspectFill" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/home_img/home_bg.webp"></image>
-        <view class="card">
-          <image class="title" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/home_img/home_title.webp"></image>
-        </view>
-      </view>
-      <!-- <zbpSwiper :isSelectPlace="true" :town="street" :streetname="street" :location_Arr="locationArr"
+			<view class="home_bg">
+				<image class="image" mode="aspectFill"
+					src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/home_img/home_bg.webp"></image>
+				<view class="card">
+					<image class="title"
+						src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/home_img/home_title.webp">
+					</image>
+				</view>
+			</view>
+			<!-- <zbpSwiper :isSelectPlace="true" :town="street" :streetname="street" :location_Arr="locationArr"
         @change="dchange">
       </zbpSwiper> -->
-      
-      <view class="home_list" style="padding-bottom: 0;">
-        <image class="left" @click="go_shop" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/home_img/home_yuncang.webp"></image>
-        <view class="right">
-          <image class="top"  @click="navgo(`/pages/nongKe/supply_chain/supplierB?type_id=10,17&street_id=${street_id}&townName=${town}`)" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/home_img/home_shichang.webp"></image>
-          <image class="bottom" @click="navgo('/pages/nongKe/specialty/index?type_code=PersonalStore&street_id='+street_id)" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/home_img/home_my.webp"></image>
-        </view>
-      </view>
-      <view class="home_list">
-        <image class="bottom" style="width: 750rpx;" mode="widthFix" @click="navgo('/pages/activity/presell/index')" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/home_img/nongzinongju_card.webp"></image>
-      </view>
-      <view class="home_recommend">
-        <image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/home_img/home_tuijian.webp"></image>
-      </view>
 
-      <!-- <view class="list">
+			<view class="home_list" style="padding-bottom: 0;">
+				<image class="left" @click="navgo('/pages/cloud_warehouse/big_classification/index')"
+					src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/home_img/home_yuncang.webp">
+				</image>
+				<view class="right">
+					<image class="top"
+						@click="navgo(`/pages/nongKe/supply_chain/supplierB?type_id=10,17&street_id=${street_id}&townName=${town}`)"
+						src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/home_img/home_shichang.webp">
+					</image>
+					<image class="bottom"
+						@click="navgo('/pages/nongKe/specialty/index?type_code=PersonalStore&street_id='+street_id)"
+						src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/home_img/home_my.webp"></image>
+				</view>
+			</view>
+			<view class="home_list">
+				<image class="bottom" style="width: 750rpx;" mode="widthFix"
+					@click="navgo('/pages/activity/presell/index')"
+					src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/home_img/nongzinongju_card.webp">
+				</image>
+			</view>
+			<view class="home_recommend">
+				<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/home_img/home_tuijian.webp">
+				</image>
+			</view>
+
+			<!-- <view class="list">
         <navigator hover-class="none"
           :url="`/pages/nongKe/supply_chain/supplierB?type_id=10,17&street_id=${street_id}&townName=${town}`">
           <view class="list-m">
@@ -113,55 +128,55 @@
         </view>
       </view> -->
 
-      <!-- <view class="list-con">
+			<!-- <view class="list-con">
         <view class="list-con-center" @tap="navgo('/pages/nongKe/specialty/index?type_code=PersonalStore&street_id='+street_id)">
           <image src="@/static/images/f8.png" mode="widthFix"></image>
         </view>
       </view> -->
-      <!-- <view class="list-bon" info="中秋团圆节">
+			<!-- <view class="list-bon" info="中秋团圆节">
         <image src="@/static/images/f4.png" mode="aspectFit"></image>
       </view> -->
-      <view class="goodslist">
-        <WaterfallsFlow v-if="productList.length>0" :wfList="productList" :type="1" />
-        <block v-else>
-          <!-- <view style="display: flex;flex-direction: column;align-items: center;">
+			<view class="goodslist">
+				<WaterfallsFlow v-if="productList.length>0" :wfList="productList" :type="1" />
+				<block v-else>
+					<!-- <view style="display: flex;flex-direction: column;align-items: center;">
             <image src='@/static/images/no_short.png' style="width: 500rpx; height: 180rpx;"></image>
             <text class="pictrue_tips">暂无商品，试试其他位置</text>
           </view> -->
-         <!-- <view class="common-hd">
+					<!-- <view class="common-hd">
             <view class="title">为你推荐</view>
           </view> -->
-          <WaterfallsFlow :wfList="productList2" :type="1" />
-        </block>
-      </view>
-      <view class='loadingicon acea-row row-center-wrapper' v-if='productList.length > 0'>
-        <text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
-      </view>
-      <view class='loadingicon acea-row row-center-wrapper' v-if='productList2.length > 0||loading2'>
-        <text class='loading iconfont icon-jiazai' :hidden='loading2==false'></text>{{loadTitle2}}
-      </view>
-      <view class="empty_wrapper" v-if="emptyShow">
-        <u-empty :show="emptyShow" mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png"></u-empty>
-      </view>
-    </view>
+					<WaterfallsFlow :wfList="productList2" :type="1" />
+				</block>
+			</view>
+			<view class='loadingicon acea-row row-center-wrapper' v-if='productList.length > 0'>
+				<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
+			</view>
+			<view class='loadingicon acea-row row-center-wrapper' v-if='productList2.length > 0||loading2'>
+				<text class='loading iconfont icon-jiazai' :hidden='loading2==false'></text>{{loadTitle2}}
+			</view>
+			<view class="empty_wrapper" v-if="emptyShow">
+				<u-empty :show="emptyShow" mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png"></u-empty>
+			</view>
+		</view>
 
-    <u-picker :defaultIndex="[0, 0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
-      @cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
+		<u-picker :defaultIndex="[0, 0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
+			@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
 
 
-    <view class="location" v-if="isshow">
-      <view class="locationa"> 位置权限使用说明 </view>
-      <view class="locationb"> 用于向你推荐最近门店 </view>
-      <view class="locationx" @click.stop="isshow=false">x</view>
-    </view>
-    
-    <uni-popup ref="activityPopup" :is-mask-click="false">
-      <activityCard @close="closeActivityCard"></activityCard>
-    </uni-popup>
-    
-    <!-- <activityHome :showClose="false" @click="navgo(`/pages/newActivity/towPrice/towPrice?street_id=${street_id}&townName=${street}`)"></activityHome> -->
-    
-    <!-- <m-tabbar native>
+		<view class="location" v-if="isshow">
+			<view class="locationa"> 位置权限使用说明 </view>
+			<view class="locationb"> 用于向你推荐最近门店 </view>
+			<view class="locationx" @click.stop="isshow=false">x</view>
+		</view>
+
+		<uni-popup ref="activityPopup" :is-mask-click="false">
+			<activityCard @close="closeActivityCard"></activityCard>
+		</uni-popup>
+
+		<!-- <activityHome :showClose="false" @click="navgo(`/pages/newActivity/towPrice/towPrice?street_id=${street_id}&townName=${street}`)"></activityHome> -->
+
+		<!-- <m-tabbar native>
 		      <template v-slot:tabbar_index_2>
 		        <view class="custom_style">
 		          <view class="custom_style_icon"></view>
@@ -170,1199 +185,1222 @@
 		          </view> </view>
 		      </template>
 		    </m-tabbar> -->
-  </view>
+	</view>
 </template>
 
 <script>
-  import mTabbar from '@/components/m-tabbar/m-tabbar.vue'
-  import { wgsToGcj } from "@/utils/wgs.js";
-  import zbpSwiper from '@/components/zbpSwiper'
-  import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue';
-  import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlowo.vue'
-  import Cache from '@/utils/cache';
-  import {
-    getSlideAPI
-  } from '@/api/lihai.js'
-  import {
-    graphicLstApi,
-    getTopicList,
-    graphicStartApi
-  } from '@/api/community.js'
-  import {
-    getIndexData,
-    getDiy,
-    spuRecommend
-  } from '@/api/api.js'
+	import mTabbar from '@/components/m-tabbar/m-tabbar.vue'
+	import {
+		wgsToGcj
+	} from "@/utils/wgs.js";
+	import zbpSwiper from '@/components/zbpSwiper'
+	import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue';
+	import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlowo.vue'
+	import Cache from '@/utils/cache';
+	import {
+		getSlideAPI
+	} from '@/api/lihai.js'
+	import {
+		graphicLstApi,
+		getTopicList,
+		graphicStartApi
+	} from '@/api/community.js'
+	import {
+		getIndexData,
+		getDiy,
+		spuRecommend
+	} from '@/api/api.js'
 
-  import {
-    spuInfo
-  } from '@/api/product.js';
-  import {
-    getGeocoder,
-    merClassifly,
-    getProductslist
-  } from '@/api/store.js';
-  import {
-    getArea,
-    getStreet
-  } from '@/api/article.js';
-  import {
-    Toast
-  } from '@/libs/uniApi'
-import { data } from '../../uni_modules/uview-ui/libs/mixin/mixin';
-import activityCard from "@/components/activityCard.vue"
-  export default {
-    components: {
-      mTabbar,
-      zbpSwiper,
-      easyLoadimage,
-      WaterfallsFlow,
-      activityCard
-    },
-    data() {
-      return {
-        activeStyle: {
-          color: '#333333',
-          fontWeight: 'bold',
-          transform: 'scale(1.04)'
-        },
-        isshow: false,
-        locationArr: ({}),
-        latitude: null,
-        longitude: null,
-        bgColor: '',
-        showPicker: false,
-        columnData: [],
-        show: false,
-        tabsData: {
-          list: [],
-          tabsActive: 0
-        },
-        tabsData1: {
-          list: [],
-          tabsActive: 0
-        },
-        where: {
-          category_id: 0,
-          page: 1,
-          limit: 30
-        },
-        where2: {
-          category_id: 0,
-          page: 1,
-          limit: 30
-        },
+	import {
+		spuInfo
+	} from '@/api/product.js';
+	import {
+		getGeocoder,
+		merClassifly,
+		getProductslist
+	} from '@/api/store.js';
+	import {
+		getArea,
+		getStreet
+	} from '@/api/article.js';
+	import {
+		Toast
+	} from '@/libs/uniApi'
+	import {
+		data
+	} from '../../uni_modules/uview-ui/libs/mixin/mixin';
+	import activityCard from "@/components/activityCard.vue"
+	export default {
+		components: {
+			mTabbar,
+			zbpSwiper,
+			easyLoadimage,
+			WaterfallsFlow,
+			activityCard
+		},
+		data() {
+			return {
+				activeStyle: {
+					color: '#333333',
+					fontWeight: 'bold',
+					transform: 'scale(1.04)'
+				},
+				isshow: false,
+				locationArr: ({}),
+				latitude: null,
+				longitude: null,
+				bgColor: '',
+				showPicker: false,
+				columnData: [],
+				show: false,
+				tabsData: {
+					list: [],
+					tabsActive: 0
+				},
+				tabsData1: {
+					list: [],
+					tabsActive: 0
+				},
+				where: {
+					category_id: 0,
+					page: 1,
+					limit: 30
+				},
+				where2: {
+					category_id: 0,
+					page: 1,
+					limit: 30
+				},
 
-        currentItemId: 69, // 默认获取 社区的数据 0 表示推荐 || 69 社区
-        keyword: '',
-        location: '',
-        emptyShow: false,
-        town: '',
-        productList: [], // 当前区域列表
-        productList2: [], // 当前推荐列表
-        recoList: [],
-        articleList: [],
-        street_id: '',
-        street: '',
-        bgColor: '',
-        isFshow: false,
-        backColor: 0,
-        loadend: false,
-        loading: false,
-        loadTitle: '加载更多',
-        loadend2: false,
-        loading2: false,
-        loadTitle2: '加载更多',
-        
-      }
-    },
-    onPullDownRefresh() {
-      this.loadend = false;
-      this.loading = false;
-      this.list(true, this.street_id);
-      // this.Area()
-      this.$u.sleep(1000).then(()=>{
-        uni.stopPullDownRefresh()
-      })
-    },
-    onShow() {
-    },
-    onLoad() {
-      // this.Area()
-      // this.selfLocation()
-      // this.openTongZhi()
-      uni.$on('connectstatusChange', (connectstatus) => {
-        var connectstr = ''
-        if (connectstatus == true) {
-          connectstr = '已连接'
-          this.getRegistrationID()
-        } else {
-          connectstr = '未连接'
-        }
-        this.connectstatus = connectStr
-      })
-      this.selfLocation();
-      
-      // this.$nextTick(()=>{
-      //   this.$refs.activityPopup.open();
-      // })
+				currentItemId: 69, // 默认获取 社区的数据 0 表示推荐 || 69 社区
+				keyword: '',
+				location: '',
+				emptyShow: false,
+				town: '',
+				productList: [], // 当前区域列表
+				productList2: [], // 当前推荐列表
+				recoList: [],
+				articleList: [],
+				street_id: '',
+				street: '',
+				bgColor: '',
+				isFshow: false,
+				backColor: 0,
+				loadend: false,
+				loading: false,
+				loadTitle: '加载更多',
+				loadend2: false,
+				loading2: false,
+				loadTitle2: '加载更多',
 
-    },
+			}
+		},
+		onPullDownRefresh() {
+			this.loadend = false;
+			this.loading = false;
+			this.list(true, this.street_id);
+			// this.Area()
+			this.$u.sleep(1000).then(() => {
+				uni.stopPullDownRefresh()
+			})
+		},
+		onShow() {},
+		onLoad() {
+			// this.Area()
+			// this.selfLocation()
+			// this.openTongZhi()
+			uni.$on('connectstatusChange', (connectstatus) => {
+				var connectstr = ''
+				if (connectstatus == true) {
+					connectstr = '已连接'
+					this.getRegistrationID()
+				} else {
+					connectstr = '未连接'
+				}
+				this.connectstatus = connectStr
+			})
+			this.selfLocation();
 
-    onReachBottom() {
-      if (this.productList.length > 0) {
-        setTimeout(() => {
-          this.list(false, this.street_id);
-          this.productList2 = [];
-        }, 50)
-      } else if (this.productList2.length > 0) {
-        setTimeout(() => {
-          this.list2(false, '');
-        }, 50)
-      }
-    },
-    beforeDestroy() {
-      // 销毁监听事件
-      this.$bus.$off('value-updated')
-    },
-    mounted() {
+			// this.$nextTick(()=>{
+			//   this.$refs.activityPopup.open();
+			// })
 
-      // #ifdef  H5
-      // 监听页面滚动事件
-      window.addEventListener("scroll", this.scrolling);
-      // #endif
+		},
 
-      this.$bus.$on('value-updated', (newValue) => {
-        // 更新父组件的值
-        this.street = newValue.split(',')[0]
-        this.town = newValue.split(',')[0]
-        this.street_id = newValue.split(',')[1]
+		onReachBottom() {
+			if (this.productList.length > 0) {
+				setTimeout(() => {
+					this.list(false, this.street_id);
+					this.productList2 = [];
+				}, 50)
+			} else if (this.productList2.length > 0) {
+				setTimeout(() => {
+					this.list2(false, '');
+				}, 50)
+			}
+		},
+		beforeDestroy() {
+			// 销毁监听事件
+			this.$bus.$off('value-updated')
+		},
+		mounted() {
 
-      });
+			// #ifdef  H5
+			// 监听页面滚动事件
+			window.addEventListener("scroll", this.scrolling);
+			// #endif
+
+			this.$bus.$on('value-updated', (newValue) => {
+				// 更新父组件的值
+				this.street = newValue.split(',')[0]
+				this.town = newValue.split(',')[0]
+				this.street_id = newValue.split(',')[1]
+
+			});
 
 
 
 
-    },
-    // #ifdef APP-PLUS
-    onPageScroll(e) {
+		},
+		// #ifdef APP-PLUS
+		onPageScroll(e) {
 
-      const scrollTop = e.scrollTop;
-      if (scrollTop <= 20) {
-        this.backColor = 0
-        this.isFshow = false
-      } else if (20 < scrollTop && scrollTop <= 100) {
-        this.backColor = 0.5
-        this.isFshow = true
-      } else if (scrollTop > 100) {
-        this.backColor = 1
-        this.isFshow = true
-      }
-    },
-    // #endif
-    methods: {
-      closeActivityCard(){
-        this.$refs.activityPopup.close();
-      },
-      navaction(val) {
-        uni.navigateTo({
-          url: '/pages/nongKe/supply_chain/suppliers?id=' + val
-        })
+			const scrollTop = e.scrollTop;
+			if (scrollTop <= 20) {
+				this.backColor = 0
+				this.isFshow = false
+			} else if (20 < scrollTop && scrollTop <= 100) {
+				this.backColor = 0.5
+				this.isFshow = true
+			} else if (scrollTop > 100) {
+				this.backColor = 1
+				this.isFshow = true
+			}
+		},
+		// #endif
+		methods: {
+			closeActivityCard() {
+				this.$refs.activityPopup.close();
+			},
+			navaction(val) {
+				uni.navigateTo({
+					url: '/pages/nongKe/supply_chain/suppliers?id=' + val
+				})
 
-      },
-      getPositionFn() {
-        this.street = '定位中'
-        this.$store.commit('setLocation', { lat: null, long: null })
-        uni.removeStorageSync('RejectTarget')
-        this.selfLocation()
+			},
+			getPositionFn() {
+				this.street = '定位中'
+				this.$store.commit('setLocation', {
+					lat: null,
+					long: null
+				})
+				uni.removeStorageSync('RejectTarget')
+				this.selfLocation()
 
-      },
-      shuffleArray(array) { // 洗牌算法
-        for (let i = array.length - 1; i > 0; i--) {
-          let j = Math.floor(Math.random() * (i + 1));
-          let temp = array[i];
-          array[i] = array[j];
-          array[j] = temp;
-        }
-        return array;
-      },
-      
-      //获取商品列表
-      list(isPage=false, id) {
-        // if(!id||this.loadend) return this.list2(true, ''); // 定位没有获取到时,直接推荐
-        let that = this;
-        if (that.loadend&&!isPage) return;
-        if (that.loading&&!isPage) return;
-        if (isPage===true){
-          that.$set(that, 'where', {
-            category_id: 0,
-            page: 1,
-            limit: 30
-          })
-        }
-        that.loading = true;
-        that.loadTitle = '';
-        getProductslist({
-          page: that.where.page,
-          limit: that.where.limit,
-          street_id: id,
-          type_id: '17,10',
-          location: `${this.latitude||''},${this.longitude||''}`
-        }).then(async (res) => {
-          if (isPage === true) {
-            that.$set(that, 'productList', []);
-          }
-          that.$set(that, 'productList2', []);
-          // await that.$nextTick();
-          // console.log(222)
-          let list = res.data.list;
-          if(list.length>0) list = this.shuffleArray(list);
-          if (res.data.count == 0 && isPage) {
-            that.list2(true, '');
-          }
-          let productList = that.$util.SplitArray(list, that.productList);
-          let loadend = list.length < that.where.limit;
-          that.loadend = loadend;
-          that.loading = false;
-          that.loadTitle = loadend ? '已全部加载' : '加载更多';
-          that.$set(that, 'productList', productList);
-          // console.log(that.productList)
-          that.$set(that.where, 'page', that.where.page + 1);
-          if (that.where.page == 1 && res.data.list.length <= 0) that.emptyShow = true
-        }).catch(err => {
-          that.loading = false;
-          that.loadTitle = '加载更多';
-        });
+			},
+			shuffleArray(array) { // 洗牌算法
+				for (let i = array.length - 1; i > 0; i--) {
+					let j = Math.floor(Math.random() * (i + 1));
+					let temp = array[i];
+					array[i] = array[j];
+					array[j] = temp;
+				}
+				return array;
+			},
 
-      },
-      list2(isPage=false, id) {
-        let that = this;
-        
-        if (that.loadend2&&!isPage) return;
-        if (that.loading2&&!isPage) return;
+			//获取商品列表
+			list(isPage = false, id) {
+				// if(!id||this.loadend) return this.list2(true, ''); // 定位没有获取到时,直接推荐
+				let that = this;
+				if (that.loadend && !isPage) return;
+				if (that.loading && !isPage) return;
+				if (isPage === true) {
+					that.$set(that, 'where', {
+						category_id: 0,
+						page: 1,
+						limit: 30
+					})
+				}
+				that.loading = true;
+				that.loadTitle = '';
+				getProductslist({
+					page: that.where.page,
+					limit: that.where.limit,
+					street_id: id,
+					type_id: '17,10',
+					location: `${this.latitude||''},${this.longitude||''}`
+				}).then(async (res) => {
+					if (isPage === true) {
+						that.$set(that, 'productList', []);
+					}
+					that.$set(that, 'productList2', []);
+					// await that.$nextTick();
+					// console.log(222)
+					let list = res.data.list;
+					if (list.length > 0) list = this.shuffleArray(list);
+					if (res.data.count == 0 && isPage) {
+						that.list2(true, '');
+					}
+					let productList = that.$util.SplitArray(list, that.productList);
+					let loadend = list.length < that.where.limit;
+					that.loadend = loadend;
+					that.loading = false;
+					that.loadTitle = loadend ? '已全部加载' : '加载更多';
+					that.$set(that, 'productList', productList);
+					// console.log(that.productList)
+					that.$set(that.where, 'page', that.where.page + 1);
+					if (that.where.page == 1 && res.data.list.length <= 0) that.emptyShow = true
+				}).catch(err => {
+					that.loading = false;
+					that.loadTitle = '加载更多';
+				});
 
-        if (isPage === true) {
-          that.$set(that, 'productList2', []);
-          that.$set(that, 'where2', {
-            category_id: 0,
-            page: 1,
-            limit: 30
-          })
-        }
-        that.$set(that, 'productList', []);
+			},
+			list2(isPage = false, id) {
+				let that = this;
 
-        that.loading2 = true;
-        that.loadTitle2 = '';
-        let query = {
-          page: that.where2.page,
-          limit: that.where2.limit,
-        };
-        if(this.latitude&&this.longitude) query.location = this.latitude + ',' + this.longitude
-        spuRecommend(query).then(res => {
-          let list = res.data.list;
-          if(list.length>0) list = this.shuffleArray(list);
-          let productList = that.$util.SplitArray(list, that.productList2);
-          let loadend = list.length < that.where2.limit;
-          that.loadend2 = loadend;
-          that.loading2 = false;
-          that.loadTitle2 = loadend ? '已全部加载' : '加载更多';
-          that.$set(that, 'productList2', productList);
-          // console.log(that.productList)
-          that.$set(that.where2, 'page', that.where2.page + 1);
-          if (that.where.page2 == 1 && res.data.list.length <= 0) that.emptyShow2 = true
-        }).catch(err => {
-          that.loading2 = false;
-          that.loadTitle2 = '加载更多';
-        });
+				if (that.loadend2 && !isPage) return;
+				if (that.loading2 && !isPage) return;
 
-      },
-      scrolling() {
-        // 滚动条距文档顶部的距离
-        let scrollTop =
-          window.pageYOffset ||
-          document.documentElement.scrollTop ||
-          document.body.scrollTop;
-        // 滚动条滚动的距离
-        let scrollStep = scrollTop - this.oldScrollTop;
-        // console.log("header 滚动距离 ", scrollTop);
-        // 更新——滚动前，滚动条距文档顶部的距离
-        this.oldScrollTop = scrollTop;
+				if (isPage === true) {
+					that.$set(that, 'productList2', []);
+					that.$set(that, 'where2', {
+						category_id: 0,
+						page: 1,
+						limit: 30
+					})
+				}
+				that.$set(that, 'productList', []);
 
-        //变量windowHeight是可视区的高度
-        let windowHeight =
-          document.documentElement.clientHeight || document.body.clientHeight;
-        //变量scrollHeight是滚动条的总高度
-        let scrollHeight =
-          document.documentElement.scrollHeight || document.body.scrollHeight;
+				that.loading2 = true;
+				that.loadTitle2 = '';
+				let query = {
+					page: that.where2.page,
+					limit: that.where2.limit,
+				};
+				if (this.latitude && this.longitude) query.location = this.latitude + ',' + this.longitude
+				spuRecommend(query).then(res => {
+					let list = res.data.list;
+					if (list.length > 0) list = this.shuffleArray(list);
+					let productList = that.$util.SplitArray(list, that.productList2);
+					let loadend = list.length < that.where2.limit;
+					that.loadend2 = loadend;
+					that.loading2 = false;
+					that.loadTitle2 = loadend ? '已全部加载' : '加载更多';
+					that.$set(that, 'productList2', productList);
+					// console.log(that.productList)
+					that.$set(that.where2, 'page', that.where2.page + 1);
+					if (that.where.page2 == 1 && res.data.list.length <= 0) that.emptyShow2 = true
+				}).catch(err => {
+					that.loading2 = false;
+					that.loadTitle2 = '加载更多';
+				});
 
-        //滚动条到底部的条件
-        if (scrollTop + windowHeight == scrollHeight) {
-          //你想做的事情
-          // console.log("header  你已经到底部了");
-        }
+			},
+			scrolling() {
+				// 滚动条距文档顶部的距离
+				let scrollTop =
+					window.pageYOffset ||
+					document.documentElement.scrollTop ||
+					document.body.scrollTop;
+				// 滚动条滚动的距离
+				let scrollStep = scrollTop - this.oldScrollTop;
+				// console.log("header 滚动距离 ", scrollTop);
+				// 更新——滚动前，滚动条距文档顶部的距离
+				this.oldScrollTop = scrollTop;
+
+				//变量windowHeight是可视区的高度
+				let windowHeight =
+					document.documentElement.clientHeight || document.body.clientHeight;
+				//变量scrollHeight是滚动条的总高度
+				let scrollHeight =
+					document.documentElement.scrollHeight || document.body.scrollHeight;
+
+				//滚动条到底部的条件
+				if (scrollTop + windowHeight == scrollHeight) {
+					//你想做的事情
+					// console.log("header  你已经到底部了");
+				}
 
 
-        if (scrollTop <= 20) {
-          this.backColor = 0
-          this.isFshow = false
-        } else if (20 < scrollTop && scrollTop <= 100) {
-          this.backColor = 0.5
-          this.isFshow = true
-        } else if (scrollTop > 100) {
-          this.backColor = 1
-          this.isFshow = true
-        }
+				if (scrollTop <= 20) {
+					this.backColor = 0
+					this.isFshow = false
+				} else if (20 < scrollTop && scrollTop <= 100) {
+					this.backColor = 0.5
+					this.isFshow = true
+				} else if (scrollTop > 100) {
+					this.backColor = 1
+					this.isFshow = true
+				}
 
-      },
+			},
 
-      getCloudShopMerId(id) {
-        get_cloud_shop(id).then(res => {
-          res.data.length > 0 ? this.isYunCang = 1 : this.isYunCang = 0
-        })
-      },
-      selectLocation() {
-        this.showPicker = true
-      },
-      confirm(e) {
+			getCloudShopMerId(id) {
+				get_cloud_shop(id).then(res => {
+					res.data.length > 0 ? this.isYunCang = 1 : this.isYunCang = 0
+				})
+			},
+			selectLocation() {
+				this.showPicker = true
+			},
+			confirm(e) {
 
-        this.street = e.value[1].name
-        this.street_id = e.value[1].code
-        this.town = e.value[1].name
-        this.loadend = false;
-        this.loadend2 = false;
-        this.$set(this.where, 'page', 1)
-        this.$set(this.where2, 'page', 1)
-        this.$set(this, 'productList', []);
-        this.$nextTick(() => {
-          this.list(true, this.street_id)
-          this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
+				this.street = e.value[1].name
+				this.street_id = e.value[1].code
+				this.town = e.value[1].name
+				this.loadend = false;
+				this.loadend2 = false;
+				this.$set(this.where, 'page', 1)
+				this.$set(this.where2, 'page', 1)
+				this.$set(this, 'productList', []);
+				this.$nextTick(() => {
+					this.list(true, this.street_id)
+					this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
 
-        })
-        this.showPicker = false
-      },
-      changeHandler(e) {
-        const {
-          columnIndex,
-          value,
-          values,
-          index,
-          picker = this.$refs.uPicker
-        } = e;
-        if (columnIndex === 0) {
-          getStreet({
-            area_code: value[0]['code']
-          }).then(res => {
-            this.$refs.uPicker.setColumnValues(1, res.data);
-          });
-        }
-      },
-      Area() {
-        getArea({
-          city_code: 510500
-        }).then(res => {
-          this.$refs.uPicker.setColumnValues(0, res.data);
-          this.Street(res.data[0]['code']);
-        });
-      },
-      Street(code) {
-        getStreet({
-          area_code: code
-        }).then(res => {
-          this.$refs.uPicker.setColumnValues(1, res.data);
-        });
-      },
-      gogogo(item) {
-        if (item.video_link.length > 0) {
+				})
+				this.showPicker = false
+			},
+			changeHandler(e) {
+				const {
+					columnIndex,
+					value,
+					values,
+					index,
+					picker = this.$refs.uPicker
+				} = e;
+				if (columnIndex === 0) {
+					getStreet({
+						area_code: value[0]['code']
+					}).then(res => {
+						this.$refs.uPicker.setColumnValues(1, res.data);
+					});
+				}
+			},
+			Area() {
+				getArea({
+					city_code: 510500
+				}).then(res => {
+					this.$refs.uPicker.setColumnValues(0, res.data);
+					this.Street(res.data[0]['code']);
+				});
+			},
+			Street(code) {
+				getStreet({
+					area_code: code
+				}).then(res => {
+					this.$refs.uPicker.setColumnValues(1, res.data);
+				});
+			},
+			gogogo(item) {
+				if (item.video_link.length > 0) {
 
-          uni.navigateTo({
-            // #ifdef MP || H5
-            url: `/pages/short_video/nvueSwiper/index?id=${item.community_id}`
-            // #endif
-            // #ifdef APP
-            url: `/pages/short_video/appSwiper/index?id=${item.community_id}`
-            // #endif
-          })
+					uni.navigateTo({
+						// #ifdef MP || H5
+						url: `/pages/short_video/nvueSwiper/index?id=${item.community_id}`
+						// #endif
+						// #ifdef APP
+						url: `/pages/short_video/appSwiper/index?id=${item.community_id}`
+						// #endif
+					})
 
-        } else {
-          uni.navigateTo({
-            url: `/pages/plantGrass/plant_detail/index?id=${item.community_id}`
-          })
-        }
-      },
-      giveStart(item) {
-        let status = item.relevance_id ? 0 : 1
-        graphicStartApi(item.community_id, {
-          status: status
-        }).then(res => {
-          if (item.relevance_id) {
-            item.count_start--;
-            item.count_start = item.count_start == 0 ? 0 : item.count_start
-            item.relevance_id = false
-          } else {
-            item.count_start++;
-            item.relevance_id = true
-          }
-        })
-      },
-      go_shop() {
-        if (this.isYunCang == 0) {
-          return Toast('当前区域没有云仓库')
-        }
-        // uni.navigateTo({
-        // 	url: `/pages/nongKe/cloud_entrepot/index?street=${this.street_id}&town=${this.town}&source=103&location=${this.latitude},${this.longitude}`
-        // })
-        uni.navigateTo({
-          url: `/pages/nongKe/cloud_entrepot/indexh?street_id=${this.street_id}&townName=${this.town}&source=103&location=${this.latitude},${this.longitude}`
-        })
+				} else {
+					uni.navigateTo({
+						url: `/pages/plantGrass/plant_detail/index?id=${item.community_id}`
+					})
+				}
+			},
+			giveStart(item) {
+				let status = item.relevance_id ? 0 : 1
+				graphicStartApi(item.community_id, {
+					status: status
+				}).then(res => {
+					if (item.relevance_id) {
+						item.count_start--;
+						item.count_start = item.count_start == 0 ? 0 : item.count_start
+						item.relevance_id = false
+					} else {
+						item.count_start++;
+						item.relevance_id = true
+					}
+				})
+			},
+			go_shop() {
+				if (this.isYunCang == 0) {
+					return Toast('当前区域没有云仓库')
+				}
+				// uni.navigateTo({
+				// 	url: `/pages/nongKe/cloud_entrepot/index?street=${this.street_id}&town=${this.town}&source=103&location=${this.latitude},${this.longitude}`
+				// })
+				uni.navigateTo({
+					url: `/pages/nongKe/cloud_entrepot/indexh?street_id=${this.street_id}&townName=${this.town}&source=103&location=${this.latitude},${this.longitude}`
+				})
 
-      },
-      navgo(url) {
-        uni.navigateTo({
-          url
-        })
-      },
-      dchange(e) {
-        this.street = e.value[1].name
-        this.street_id = e.value[1].code
-        this.town = e.value[1].name
-        this.loadend = false;
-        this.$set(this.where, 'page', 1)
-        this.list(true, this.street_id)
-      },
-      selfLocation() {
-        if (uni.getStorageSync('RejectTarget')) return this.list(true, '');
-        if (uni.getStorageSync('loction') == true) {
-          this.isshow = false
-          this.list(true, '')
-        } else {
-          this.isshow = true
-          uni.setStorageSync('loction', true);
-        }
-        // console.log(this.$store.state.storage.location);
-        if (this.$store?.state?.storage?.location?.lat) {
-          this.isshow = false
-          this.latitude = this.$store.state.storage.location.lat;
-          this.longitude = this.$store.state.storage.location.long;
-          getGeocoder({
-            lat: this.latitude,
-            long: this.longitude
-          }).then(res => {
-            this.isshow = false;
-            this.town = res.data.address_reference.town.title;
-            this.street_id = res.data.address_reference.town.id;
-            this.street = res.data.address_reference.town.title;
-            this.$store.commit('setAddress', {
-              street_id: this.street_id,
-              townName: this.town
-            });
-            this.list(true, this.street_id)
-            this.$nextTick(() => {
-              this.$bus.$emit('value-updated', this.street + ',' + this
-                .street_id);
-            })
+			},
+			navgo(url) {
+				uni.navigateTo({
+					url,
+					fail(err) {
+						console.log(err);
+					}
+				})
+			},
+			dchange(e) {
+				this.street = e.value[1].name
+				this.street_id = e.value[1].code
+				this.town = e.value[1].name
+				this.loadend = false;
+				this.$set(this.where, 'page', 1)
+				this.list(true, this.street_id)
+			},
+			selfLocation() {
+				if (uni.getStorageSync('RejectTarget')) return this.list(true, '');
+				if (uni.getStorageSync('loction') == true) {
+					this.isshow = false
+					this.list(true, '')
+				} else {
+					this.isshow = true
+					uni.setStorageSync('loction', true);
+				}
+				// console.log(this.$store.state.storage.location);
+				if (this.$store?.state?.storage?.location?.lat) {
+					this.isshow = false
+					this.latitude = this.$store.state.storage.location.lat;
+					this.longitude = this.$store.state.storage.location.long;
+					getGeocoder({
+						lat: this.latitude,
+						long: this.longitude
+					}).then(res => {
+						this.isshow = false;
+						this.town = res.data.address_reference.town.title;
+						this.street_id = res.data.address_reference.town.id;
+						this.street = res.data.address_reference.town.title;
+						this.$store.commit('setAddress', {
+							street_id: this.street_id,
+							townName: this.town
+						});
+						this.list(true, this.street_id)
+						this.$nextTick(() => {
+							this.$bus.$emit('value-updated', this.street + ',' + this
+								.street_id);
+						})
 
-          }).catch(err => {
-            this.isshow = false
-            this.list2(true, '')
-            uni.showToast({
-              title: err,
-              icon: 'none'
-            })
-          })
-        } else uni.getLocation({
-          type: 'wgs84',
-          success: (res) => {
-            res = wgsToGcj(res);
-            this.isshow = false
-            let latitude, longitude;
-            latitude = res.latitude.toString();
-            longitude = res.longitude.toString();
-            this.latitude = res.latitude.toFixed(6);
-            this.longitude = res.longitude.toFixed(6);
-            this.$store.commit('setLocation', {
-              lat: res.latitude.toFixed(6),
-              long: res.longitude.toFixed(6),
-            });
-            getGeocoder({
-              lat: latitude,
-              long: longitude
-            }).then(res => {
-              this.isshow = false
-              this.town = res.data.address_reference.town.title
-              this.street_id = res.data.address_reference.town.id
-              this.street = res.data.address_reference.town.title;
-              this.$store.commit('setAddress', {
-                street_id: this.street_id,
-                townName: this.town
-              });
-              this.list(true, this.street_id)
-              this.$nextTick(() => {
-                this.$bus.$emit('value-updated', this.street + ',' + this
-                  .street_id);
-              })
+					}).catch(err => {
+						this.isshow = false
+						this.list2(true, '')
+						uni.showToast({
+							title: err,
+							icon: 'none'
+						})
+					})
+				} else uni.getLocation({
+					type: 'wgs84',
+					success: (res) => {
+						res = wgsToGcj(res);
+						this.isshow = false
+						let latitude, longitude;
+						latitude = res.latitude.toString();
+						longitude = res.longitude.toString();
+						this.latitude = res.latitude.toFixed(6);
+						this.longitude = res.longitude.toFixed(6);
+						this.$store.commit('setLocation', {
+							lat: res.latitude.toFixed(6),
+							long: res.longitude.toFixed(6),
+						});
+						getGeocoder({
+							lat: latitude,
+							long: longitude
+						}).then(res => {
+							this.isshow = false
+							this.town = res.data.address_reference.town.title
+							this.street_id = res.data.address_reference.town.id
+							this.street = res.data.address_reference.town.title;
+							this.$store.commit('setAddress', {
+								street_id: this.street_id,
+								townName: this.town
+							});
+							this.list(true, this.street_id)
+							this.$nextTick(() => {
+								this.$bus.$emit('value-updated', this.street + ',' + this
+									.street_id);
+							})
 
-            }).catch(err => {
-              this.isshow = false
-              this.list2(true, '')
-              uni.showToast({
-                title: err,
-                icon: 'none'
-              })
-              this.street = '定位失败'
-            })
-          },
-          fail: (err) => {
-            console.log('定位失败');
-            this.isshow = false
-            uni.setStorageSync("RejectTarget", true)
-            Toast('定位失败,请检查定位权限是否开启')
-            this.street = '定位失败'
-            this.list2(true, '')
+						}).catch(err => {
+							this.isshow = false
+							this.list2(true, '')
+							uni.showToast({
+								title: err,
+								icon: 'none'
+							})
+							this.street = '定位失败'
+						})
+					},
+					fail: (err) => {
+						console.log('定位失败');
+						this.isshow = false
+						uni.setStorageSync("RejectTarget", true)
+						Toast('定位失败,请检查定位权限是否开启')
+						this.street = '定位失败'
+						this.list2(true, '')
 
-            // uni.showToast({
-            // 	title: "获取定位超时",
-            // 	icon: 'none',
-            // 	duration: 2000
-            // });
-          }
-        });
-      },
-      // 选择位置
-      changeMap() {
-        uni.navigateTo({
-          url: `/pages/select_address/select_address_n`,
-          success: () => {
-            uni.$once('changeAddress', (e) => {
-              this.street_id = e.street.code;
-              this.street = e.street.name;
-              this.town = e.street.name;
-              this.$store.commit('setAddress', {
-                street_id: this.street_id,
-                townName: this.town
-              });
-              if (e.longitude) {
-                this.longitude = e.longitude;
-                this.latitude = e.latitude;
-                this.$store.commit('setLocation', {
-                  lat: e.latitude,
-                  long: e.longitude,
-                });
-              }
-              this.loadend = false;
-              this.loadend2 = false;
-              this.$set(this.where, 'page', 1)
-              this.$set(this.where2, 'page', 1)
-              this.$set(this, 'productList', []);
-              uni.pageScrollTo({
-                  scrollTop: 0, // 滚动到页面的目标位置（单位px）
-                  duration: 200 // 滚动动画的时长，默认300ms，单位 ms
-              });
-              this.$nextTick(()=>{
-                this.list(true, this.street_id);
-              });
-              this.$bus.$emit('value-updated', e.street.name + ',' + e.street.code);
-            })
-          }
-        })
-      }
+						// uni.showToast({
+						// 	title: "获取定位超时",
+						// 	icon: 'none',
+						// 	duration: 2000
+						// });
+					}
+				});
+			},
+			// 选择位置
+			changeMap() {
+				uni.navigateTo({
+					url: `/pages/select_address/select_address_n`,
+					success: () => {
+						uni.$once('changeAddress', (e) => {
+							this.street_id = e.street.code;
+							this.street = e.street.name;
+							this.town = e.street.name;
+							this.$store.commit('setAddress', {
+								street_id: this.street_id,
+								townName: this.town
+							});
+							if (e.longitude) {
+								this.longitude = e.longitude;
+								this.latitude = e.latitude;
+								this.$store.commit('setLocation', {
+									lat: e.latitude,
+									long: e.longitude,
+								});
+							}
+							this.loadend = false;
+							this.loadend2 = false;
+							this.$set(this.where, 'page', 1)
+							this.$set(this.where2, 'page', 1)
+							this.$set(this, 'productList', []);
+							uni.pageScrollTo({
+								scrollTop: 0, // 滚动到页面的目标位置（单位px）
+								duration: 200 // 滚动动画的时长，默认300ms，单位 ms
+							});
+							this.$nextTick(() => {
+								this.list(true, this.street_id);
+							});
+							this.$bus.$emit('value-updated', e.street.name + ',' + e.street.code);
+						})
+					}
+				})
+			}
 
 
-    }
-  }
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-  /deep/.color-lump {
-    display: none;
-  }
-
-  page {
-    background: #fff7e6;
-    // background: #f4f7fe;
-
-    // background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
-  }
-
-  .site-box1 {
-    width: 706rpx;
-    /* #ifdef MP || APP-PLUS */
-    height: 160rpx;
-    /* #endif */
-    /* #ifdef H5 */
-    height: 120rpx;
-    /* #endif */
-    margin-bottom: 26.32rpx;
-    position: absolute;
-    top: 105rpx;
-    left: 20rpx;
-
-    z-index: 9999 !important;
-
-    .box{
-      // 位置
-      .place_wrapper {
-        color: #fff;
-        margin-right: 0rpx;
-      
-        font-size: 30rpx;
-      
-        .town_name {
-          margin-left: 21rpx;
-        }
-      }
-      
-      .iconfont {
-        font-size: 35.09rpx;
-      }
-      
-    }
-    
-    .search_content {
-    	margin: 0 auto;
-      margin-top: 25rpx;
-    	width: 706rpx;
-    	height: 64rpx;
-    	padding: 2px 2px 2px 21.05rpx;
-    	border-radius: 175rpx;
-    	background: #fff;
-    	margin-bottom: 21rpx;
-    	position: relative;
-    	box-sizing: border-box;
-    
-    	.icon-sousuo {
-    		font-size: 26.32rpx;
-    		font-weight: bold;
-    		color: #c8c7c6;
-    		margin-right: 17.54rpx;
-    	}
-    
-    	.search_btn {
-    		color: #fff;
-    		width: 105.26rpx;
-    		height: 56rpx;
-    		line-height: 56rpx;
-    		background: #f84221;
-    		border-radius: 100px;
-    		font-size: 28.07rpx;
-    	}
-    }
-  }
-
-  .location {
-    background-color: #f6f6f6;
-    width: 680rpx;
-    height: 150rpx;
-    position: absolute;
-    top: 0;
-    z-index: 9999;
-    border-radius: 20rpx;
-    left: 50%;
-    margin-left: -340rpx;
-    margin-top: 80rpx;
-    padding-left: 20rpx;
-
-    .locationa {
-      font-size: 28rpx;
-      color: #000;
-      font-weight: 500;
-      margin-top: 30rpx;
-      margin-bottom: 15rpx;
-    }
-
-    .locationb {
-      font-size: 20rpx;
-      color: #5a5a5a;
-    }
-
-    .locationx {
-      color: #000;
-      position: absolute;
-      top: 10rpx;
-      right: 20rpx;
-    }
-  }
-
-  .Circle_friends {
-    position: relative;
-    padding: 0 0 87.72rpx 0;
-  }
-
-  .sitebox {
-    animation-name: fadeIn;
-    animation-duration: 3s;
-    animation-fill-mode: forwards;
-  }
-
-  @keyframes fadeIn {
-    from {
-      opacity: 0;
-    }
-
-    to {
-      opacity: 1;
-    }
-  }
-
-  .site-box {
-    width: 100%;
-    /* #ifdef MP || APP-PLUS */
-    height: 160rpx;
-    /* #endif */
-    /* #ifdef H5 */
-    height: 120rpx;
-    /* #endif */
-    margin-bottom: 26.32rpx;
-    position: absolute;
-    top: 0rpx;
-    position: fixed;
-    z-index: 999;
-    /* #ifdef MP || APP-PLUS */
-    padding-top: 75rpx;
-    /* #endif */
-    /* #ifdef H5 */
-    padding-top: 25rpx;
-    /* #endif */
-    background: url('@/static/images/bg2.png') no-repeat;
-    background-size: 100% 100%;
-
-    padding-right: 20rpx;
-
-    // 位置
-    .place_wrapper {
-      color: #fff;
-      margin-right: 24.56rpx;
-      font-size: 30rpx;
-
-      opacity: 0;
-
-      .town_name {
-        margin-left: 21rpx;
-      }
-    }
-
-    .iconfont {
-      opacity: 0;
-      font-size: 30rpx;
-      font-size: 35.09rpx;
-    }
-  }
-
-  .circle_friends_wrapper {
-    position: relative;
-
-    z-index: 2;
-  }
-
-  /deep/.u-tabs__wrapper__nav__line {
-    width: 46rpx;
-  }
-
-  /deep/.u-tabs__wrapper__nav__item {
-    padding: 0 0px;
-    padding-right: 10rpx;
-  }
-
-  .search_wrapper {
-    width: 694.74rpx;
-    margin: 0 auto;
-  }
-
-  .tabs_wrapper {
-    width: 720rpx;
-    margin: 0 auto;
-    margin-bottom: 21.05rpx;
-    // margin-left: -20rpx;
-  }
-
-  .empty_wrapper {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-
-  .article_box {
-    height: 100%;
-    width: 694.74rpx;
-    margin: 0 auto;
-    background-color: #fff;
-    border-radius: 16rpx;
-    padding: 0 24.56rpx;
-    box-sizing: border-box;
-
-    .title-box {
-      height: 87.72rpx;
-
-      text {
-        font-size: 28.07rpx;
-      }
-    }
-
-    .article-item {
-      display: flex;
-      // height: 175.44rpx;
-      justify-content: space-between;
-      border-bottom: 1px solid #f0f0f0;
-      padding: 21.05rpx 0;
-
-      .text {
-        flex: 1;
-        height: 122.81rpx;
-        margin-right: 17.54rpx;
-        font-size: 24rpx;
-        color: #999;
-        display: flex;
-        flex-direction: column;
-        justify-content: space-between;
-
-        .name {
-          font-size: 26.32rpx;
-          color: #282828;
-        }
-      }
-
-      .pictrue {
-        width: 175.44rpx;
-        height: 122.81rpx;
-
-        image {
-          width: 100%;
-          height: 100%;
-          border-radius: 8px;
-        }
-      }
-    }
-  }
-
-  .tabs_wrapper {
-    width: 723rpx;
-    margin: 0rpx auto;
-    margin-bottom: 21.05rpx;
-
-    .title {
-      font-size: 31.58rpx;
-      font-weight: bold;
-
-      &::before {
-        content: "";
-        display: inline-block;
-        width: 3px;
-        height: 31.58rpx;
-        background-color: #f84221;
-        margin-right: 7.02rpx;
-      }
-    }
-  }
-
-  .list {
-    display: flex;
-    padding: 12rpx;
-    justify-content: space-between;
-
-    .list-m {
-      width: 356rpx;
-      height: 235rpx;
-      position: relative;
-
-      .list-title {
-        display: flex;
-        position: absolute;
-        top: 20rpx;
-
-        .list-titlea {
-          margin-left: 14rpx;
-          width: 96rpx;
-          height: 117rpx;
-          margin-right: 11rpx;
-          position: relative;
-
-          .titlea-con {
-            width: 96rpx;
-            height: 100rpx;
-
-            color: #f4f7fe;
-
-            .titlea {
-              position: absolute;
-              top: 32rpx;
-              margin-left: 12rpx;
-              font-size: 16rpx;
-              font-family: PingFang SC-Semibold, PingFang SC;
-            }
-
-            .titleb {
-              position: absolute;
-              bottom: 8rpx;
-              font-size: 37rpx;
-              font-family: PingFang SC-Semibold, PingFang SC;
-              font-weight: 600;
-              color: #ffffff;
-              width: 100%;
-              text-align: center;
-              // margin-left: 20rpx;
-            }
-          }
-
-          image {
-            width: 100%;
-            height: 100%;
-          }
-        }
-
-        .list-titleb {
-          .titlea {
-            font-size: 37rpx;
-            font-family: PingFang SC-Semibold, PingFang SC;
-            font-weight: 600;
-            color: #ffffff;
-            margin-top: 10rpx;
-          }
-
-          .titleb {
-            font-size: 33rpx;
-            font-family: PingFang SC-Medium, PingFang SC;
-            font-weight: 500;
-            color: #ffffff;
-          }
-        }
-      }
-
-      .list-title-info {
-        // width: 98rpx;
-        height: 30rpx;
-        line-height: 30rpx;
-        background: #ffffff;
-        padding: 2rpx 2rpx;
-        display: flex;
-
-        font-size: 18rpx;
-        font-family: PingFang SC-Medium, PingFang SC;
-        font-weight: 500;
-        color: #ff6b00;
-        border-radius: 19rpx 19rpx 19rpx 19rpx;
-        position: absolute;
-        bottom: 14rpx;
-        left: 50%;
-        margin-left: -49rpx;
-        padding-left: 15rpx;
-
-        .title-infoimg {
-          width: 18rpx;
-          height: 18rpx;
-          margin: auto 0;
-
-          image {
-            width: 100%;
-            height: 100%;
-          }
-        }
-      }
-
-      image {
-        width: 100%;
-        height: 100%;
-      }
-    }
-  }
-
-  .list-con {
-    display: flex;
-    justify-content: space-between;
-    margin-top: -10rpx;
-    padding: 12rpx;
-
-
-    .list-con-left {
-      width: 357rpx;
-      height: 482rpx;
-      position: relative;
-
-      .list-con-title {
-        position: absolute;
-        top: 0;
-        z-index: 10;
-        padding-left: 14rpx;
-
-        .con-titlea {
-          font-size: 37rpx;
-          font-family: PingFang SC-Semibold, PingFang SC;
-          font-weight: 600;
-          color: #ffffff;
-          margin-top: 10rpx;
-        }
-
-        .con-titleb {
-          margin-top: 5rpx;
-          font-size: 33rpx;
-          font-family: PingFang SC-Medium, PingFang SC;
-          font-weight: 500;
-          color: #ffffff;
-        }
-      }
-
-      image {
-        width: 100%;
-        height: 100%;
-      }
-    }
-
-    .list-con-right {
-      width: 356rpx;
-      height: 482rpx;
-      display: flex;
-      flex-direction: column;
-      justify-content: space-between;
-
-      .con-right {
-        width: 356rpx;
-        height: 235rpx;
-        position: relative;
-
-        .list-con-title {
-          position: absolute;
-          top: 0;
-          z-index: 10;
-          padding-left: 14rpx;
-
-          .con-titlea {
-            font-size: 37rpx;
-            font-family: PingFang SC-Semibold, PingFang SC;
-            font-weight: 600;
-            color: #ffffff;
-            margin-top: 10rpx;
-          }
-
-          .con-titleb {
-            margin-top: 5rpx;
-            font-size: 33rpx;
-            font-family: PingFang SC-Medium, PingFang SC;
-            font-weight: 500;
-            color: #ffffff;
-          }
-        }
-
-        image {
-          width: 100%;
-          height: 100%;
-        }
-      }
-    }
-    .list-con-center{
-      width: 726rpx;
-      image {
-        width: 100%;
-        height: 100%;
-      }
-    }
-  }
-
-  .list-bon {
-    width: 724rpx;
-    height: 128rpx;
-    margin: 0 auto;
-    margin-bottom: 12rpx;
-
-    image {
-      width: 100%;
-      height: 100%;
-    }
-  }
-
-  .goodslist {
-    margin: 0 auto;
-    width: 725rpx;
-
-    .no-more {
-      text-align: center;
-      padding-top: 18rpx;
-    }
-
-    .pictrue_tips {
-      color: $uni-nothing-text;
-    }
-
-    .common-hd {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      height: 118rpx;
-
-      .title {
-        padding: 0 80rpx;
-        font-size: 34rpx;
-        color: $theme-color;
-        font-weight: bold;
-        background-image: url("~@/static/images/index-title.png");
-        background-repeat: no-repeat;
-        background-size: 100% auto;
-        background-position: left center;
-      }
-    }
-  }
-
-  .rotate-box {
-    transform: rotate(0deg);
-    transition: transform .5s ease-out;
-  }
-
-  .rotate-box:active {
-    transform: rotate(360deg);
-  }
-  .home_bg{
-    width: 750rpx;
-    height: 900rpx;
-    position: relative;
-    .image{
-      height: 100%;
-      width: 100%;
-    }
-    .card{
-      position: absolute;
-      bottom: 0;
-      left: 0;
-      width: 100%;
-      height: 100rpx;
-      background-color: #fff7e6;
-      border-radius: 60rpx 60rpx 0 0;
-      .title{
-        position: absolute;
-        top: -50%;
-        left: 50%;
-        
-        transform: translate(-50%);
-        width: 642rpx;
-        height: 139rpx;
-      }
-    }
-  }
-  .home_list{
-    display: flex;
-    justify-content: space-around;
-    padding: 10rpx;
-    padding-bottom: 20rpx;
-    padding-top: 0;
-    .left{
-      height: 491rpx;
-      width: 340rpx;
-    }
-    .right{
-      display: flex;
-      flex-direction: column;
-      .top{
-        width: 390rpx;
-        height: 244rpx;
-      }
-      .bottom{
-        width: 390rpx;
-        height: 244rpx;
-      }
-    }
-  }
-  .home_recommend{
-    display: flex;
-    justify-content: center;
-    image{
-      width: 618rpx;
-      height: 113rpx;
-    }
-  }
+	/deep/.color-lump {
+		display: none;
+	}
+
+	page {
+		background: #fff7e6;
+		// background: #f4f7fe;
+
+		// background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
+	}
+
+	.site-box1 {
+		width: 706rpx;
+		/* #ifdef MP || APP-PLUS */
+		height: 160rpx;
+		/* #endif */
+		/* #ifdef H5 */
+		height: 120rpx;
+		/* #endif */
+		margin-bottom: 26.32rpx;
+		position: absolute;
+		top: 105rpx;
+		left: 20rpx;
+
+		z-index: 9999 !important;
+
+		.box {
+
+			// 位置
+			.place_wrapper {
+				color: #fff;
+				margin-right: 0rpx;
+
+				font-size: 30rpx;
+
+				.town_name {
+					margin-left: 21rpx;
+				}
+			}
+
+			.iconfont {
+				font-size: 35.09rpx;
+			}
+
+		}
+
+		.search_content {
+			margin: 0 auto;
+			margin-top: 25rpx;
+			width: 706rpx;
+			height: 64rpx;
+			padding: 2px 2px 2px 21.05rpx;
+			border-radius: 175rpx;
+			background: #fff;
+			margin-bottom: 21rpx;
+			position: relative;
+			box-sizing: border-box;
+
+			.icon-sousuo {
+				font-size: 26.32rpx;
+				font-weight: bold;
+				color: #c8c7c6;
+				margin-right: 17.54rpx;
+			}
+
+			.search_btn {
+				color: #fff;
+				width: 105.26rpx;
+				height: 56rpx;
+				line-height: 56rpx;
+				background: #f84221;
+				border-radius: 100px;
+				font-size: 28.07rpx;
+			}
+		}
+	}
+
+	.location {
+		background-color: #f6f6f6;
+		width: 680rpx;
+		height: 150rpx;
+		position: absolute;
+		top: 0;
+		z-index: 9999;
+		border-radius: 20rpx;
+		left: 50%;
+		margin-left: -340rpx;
+		margin-top: 80rpx;
+		padding-left: 20rpx;
+
+		.locationa {
+			font-size: 28rpx;
+			color: #000;
+			font-weight: 500;
+			margin-top: 30rpx;
+			margin-bottom: 15rpx;
+		}
+
+		.locationb {
+			font-size: 20rpx;
+			color: #5a5a5a;
+		}
+
+		.locationx {
+			color: #000;
+			position: absolute;
+			top: 10rpx;
+			right: 20rpx;
+		}
+	}
+
+	.Circle_friends {
+		position: relative;
+		padding: 0 0 87.72rpx 0;
+	}
+
+	.sitebox {
+		animation-name: fadeIn;
+		animation-duration: 3s;
+		animation-fill-mode: forwards;
+	}
+
+	@keyframes fadeIn {
+		from {
+			opacity: 0;
+		}
+
+		to {
+			opacity: 1;
+		}
+	}
+
+	.site-box {
+		width: 100%;
+		/* #ifdef MP || APP-PLUS */
+		height: 160rpx;
+		/* #endif */
+		/* #ifdef H5 */
+		height: 120rpx;
+		/* #endif */
+		margin-bottom: 26.32rpx;
+		position: absolute;
+		top: 0rpx;
+		position: fixed;
+		z-index: 999;
+		/* #ifdef MP || APP-PLUS */
+		padding-top: 75rpx;
+		/* #endif */
+		/* #ifdef H5 */
+		padding-top: 25rpx;
+		/* #endif */
+		background: url('@/static/images/bg2.png') no-repeat;
+		background-size: 100% 100%;
+
+		padding-right: 20rpx;
+
+		// 位置
+		.place_wrapper {
+			color: #fff;
+			margin-right: 24.56rpx;
+			font-size: 30rpx;
+
+			opacity: 0;
+
+			.town_name {
+				margin-left: 21rpx;
+			}
+		}
+
+		.iconfont {
+			opacity: 0;
+			font-size: 30rpx;
+			font-size: 35.09rpx;
+		}
+	}
+
+	.circle_friends_wrapper {
+		position: relative;
+
+		z-index: 2;
+	}
+
+	/deep/.u-tabs__wrapper__nav__line {
+		width: 46rpx;
+	}
+
+	/deep/.u-tabs__wrapper__nav__item {
+		padding: 0 0px;
+		padding-right: 10rpx;
+	}
+
+	.search_wrapper {
+		width: 694.74rpx;
+		margin: 0 auto;
+	}
+
+	.tabs_wrapper {
+		width: 720rpx;
+		margin: 0 auto;
+		margin-bottom: 21.05rpx;
+		// margin-left: -20rpx;
+	}
+
+	.empty_wrapper {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.article_box {
+		height: 100%;
+		width: 694.74rpx;
+		margin: 0 auto;
+		background-color: #fff;
+		border-radius: 16rpx;
+		padding: 0 24.56rpx;
+		box-sizing: border-box;
+
+		.title-box {
+			height: 87.72rpx;
+
+			text {
+				font-size: 28.07rpx;
+			}
+		}
+
+		.article-item {
+			display: flex;
+			// height: 175.44rpx;
+			justify-content: space-between;
+			border-bottom: 1px solid #f0f0f0;
+			padding: 21.05rpx 0;
+
+			.text {
+				flex: 1;
+				height: 122.81rpx;
+				margin-right: 17.54rpx;
+				font-size: 24rpx;
+				color: #999;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+
+				.name {
+					font-size: 26.32rpx;
+					color: #282828;
+				}
+			}
+
+			.pictrue {
+				width: 175.44rpx;
+				height: 122.81rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+					border-radius: 8px;
+				}
+			}
+		}
+	}
+
+	.tabs_wrapper {
+		width: 723rpx;
+		margin: 0rpx auto;
+		margin-bottom: 21.05rpx;
+
+		.title {
+			font-size: 31.58rpx;
+			font-weight: bold;
+
+			&::before {
+				content: "";
+				display: inline-block;
+				width: 3px;
+				height: 31.58rpx;
+				background-color: #f84221;
+				margin-right: 7.02rpx;
+			}
+		}
+	}
+
+	.list {
+		display: flex;
+		padding: 12rpx;
+		justify-content: space-between;
+
+		.list-m {
+			width: 356rpx;
+			height: 235rpx;
+			position: relative;
+
+			.list-title {
+				display: flex;
+				position: absolute;
+				top: 20rpx;
+
+				.list-titlea {
+					margin-left: 14rpx;
+					width: 96rpx;
+					height: 117rpx;
+					margin-right: 11rpx;
+					position: relative;
+
+					.titlea-con {
+						width: 96rpx;
+						height: 100rpx;
+
+						color: #f4f7fe;
+
+						.titlea {
+							position: absolute;
+							top: 32rpx;
+							margin-left: 12rpx;
+							font-size: 16rpx;
+							font-family: PingFang SC-Semibold, PingFang SC;
+						}
+
+						.titleb {
+							position: absolute;
+							bottom: 8rpx;
+							font-size: 37rpx;
+							font-family: PingFang SC-Semibold, PingFang SC;
+							font-weight: 600;
+							color: #ffffff;
+							width: 100%;
+							text-align: center;
+							// margin-left: 20rpx;
+						}
+					}
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+
+				.list-titleb {
+					.titlea {
+						font-size: 37rpx;
+						font-family: PingFang SC-Semibold, PingFang SC;
+						font-weight: 600;
+						color: #ffffff;
+						margin-top: 10rpx;
+					}
+
+					.titleb {
+						font-size: 33rpx;
+						font-family: PingFang SC-Medium, PingFang SC;
+						font-weight: 500;
+						color: #ffffff;
+					}
+				}
+			}
+
+			.list-title-info {
+				// width: 98rpx;
+				height: 30rpx;
+				line-height: 30rpx;
+				background: #ffffff;
+				padding: 2rpx 2rpx;
+				display: flex;
+
+				font-size: 18rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 500;
+				color: #ff6b00;
+				border-radius: 19rpx 19rpx 19rpx 19rpx;
+				position: absolute;
+				bottom: 14rpx;
+				left: 50%;
+				margin-left: -49rpx;
+				padding-left: 15rpx;
+
+				.title-infoimg {
+					width: 18rpx;
+					height: 18rpx;
+					margin: auto 0;
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+			}
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+
+	.list-con {
+		display: flex;
+		justify-content: space-between;
+		margin-top: -10rpx;
+		padding: 12rpx;
+
+
+		.list-con-left {
+			width: 357rpx;
+			height: 482rpx;
+			position: relative;
+
+			.list-con-title {
+				position: absolute;
+				top: 0;
+				z-index: 10;
+				padding-left: 14rpx;
+
+				.con-titlea {
+					font-size: 37rpx;
+					font-family: PingFang SC-Semibold, PingFang SC;
+					font-weight: 600;
+					color: #ffffff;
+					margin-top: 10rpx;
+				}
+
+				.con-titleb {
+					margin-top: 5rpx;
+					font-size: 33rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 500;
+					color: #ffffff;
+				}
+			}
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.list-con-right {
+			width: 356rpx;
+			height: 482rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+
+			.con-right {
+				width: 356rpx;
+				height: 235rpx;
+				position: relative;
+
+				.list-con-title {
+					position: absolute;
+					top: 0;
+					z-index: 10;
+					padding-left: 14rpx;
+
+					.con-titlea {
+						font-size: 37rpx;
+						font-family: PingFang SC-Semibold, PingFang SC;
+						font-weight: 600;
+						color: #ffffff;
+						margin-top: 10rpx;
+					}
+
+					.con-titleb {
+						margin-top: 5rpx;
+						font-size: 33rpx;
+						font-family: PingFang SC-Medium, PingFang SC;
+						font-weight: 500;
+						color: #ffffff;
+					}
+				}
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+
+		.list-con-center {
+			width: 726rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+
+	.list-bon {
+		width: 724rpx;
+		height: 128rpx;
+		margin: 0 auto;
+		margin-bottom: 12rpx;
+
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	.goodslist {
+		margin: 0 auto;
+		width: 725rpx;
+
+		.no-more {
+			text-align: center;
+			padding-top: 18rpx;
+		}
+
+		.pictrue_tips {
+			color: $uni-nothing-text;
+		}
+
+		.common-hd {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			height: 118rpx;
+
+			.title {
+				padding: 0 80rpx;
+				font-size: 34rpx;
+				color: $theme-color;
+				font-weight: bold;
+				background-image: url("~@/static/images/index-title.png");
+				background-repeat: no-repeat;
+				background-size: 100% auto;
+				background-position: left center;
+			}
+		}
+	}
+
+	.rotate-box {
+		transform: rotate(0deg);
+		transition: transform .5s ease-out;
+	}
+
+	.rotate-box:active {
+		transform: rotate(360deg);
+	}
+
+	.home_bg {
+		width: 750rpx;
+		height: 900rpx;
+		position: relative;
+
+		.image {
+			height: 100%;
+			width: 100%;
+		}
+
+		.card {
+			position: absolute;
+			bottom: 0;
+			left: 0;
+			width: 100%;
+			height: 100rpx;
+			background-color: #fff7e6;
+			border-radius: 60rpx 60rpx 0 0;
+
+			.title {
+				position: absolute;
+				top: -50%;
+				left: 50%;
+
+				transform: translate(-50%);
+				width: 642rpx;
+				height: 139rpx;
+			}
+		}
+	}
+
+	.home_list {
+		display: flex;
+		justify-content: space-around;
+		padding: 10rpx;
+		padding-bottom: 20rpx;
+		padding-top: 0;
+
+		.left {
+			height: 491rpx;
+			width: 340rpx;
+		}
+
+		.right {
+			display: flex;
+			flex-direction: column;
+
+			.top {
+				width: 390rpx;
+				height: 244rpx;
+			}
+
+			.bottom {
+				width: 390rpx;
+				height: 244rpx;
+			}
+		}
+	}
+
+	.home_recommend {
+		display: flex;
+		justify-content: center;
+
+		image {
+			width: 618rpx;
+			height: 113rpx;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue
index 24c9f7c..5a4045f 100644
--- a/pages/nongKe/cloud_entrepot/index.vue
+++ b/pages/nongKe/cloud_entrepot/index.vue
@@ -1,1528 +1,1544 @@
 <template>
-  <view class="">
-    <view class="">
-      <view class="">
-        <view v-if="showtit">
-          <view :class="{ head: true, show: showtit }" style="padding-top: var(--status-bar-height)">
-            <view style="display: flex; align-items: center">
-              <!-- 	<u--image :showLoading="true" v-if="cloudList.length>0" src="/static/images/LHYC/FH.png"
+	<view class="">
+		<view class="">
+			<view class="">
+				<view v-if="showtit">
+					<view :class="{ head: true, show: showtit }" style="padding-top: var(--status-bar-height)">
+						<view style="display: flex; align-items: center">
+							<!-- 	<u--image :showLoading="true" v-if="cloudList.length>0" src="/static/images/LHYC/FH.png"
 								width="50.82rpx" height="50.82rpx" @click='goBack'></u--image>
 								
 							<u--image v-else :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx"
 								height="50.82rpx" @click='goBack'></u--image> -->
 
-              <i class="iconfont icon-xiangzuo" v-if="cloudList.length > 0" style="font-size: 40rpx; text-align: left"
-                @click="goBack"></i>
-              <i class="iconfont icon-xiangzuo" v-else style="font-size: 40rpx; text-align: left" @click="goBack"></i>
+							<i class="iconfont icon-xiangzuo" v-if="cloudList.length > 0"
+								style="font-size: 40rpx; text-align: left" @click="goBack"></i>
+							<i class="iconfont icon-xiangzuo" v-else style="font-size: 40rpx; text-align: left"
+								@click="goBack"></i>
 
-              <view class="head_tit" v-if="cloudList.length" style="
+							<view class="head_tit" v-if="cloudList.length" style="
                   font-size: 40rpx;
                   transform: skewX(-10deg);
                   font-weight: bold;
                 " :style="{ color: cloudList.length > 0 ? '' : 'black' }">
-                {{ town }}里海云仓
-              </view>
-            </view>
-            <view class="" style="display: flex; align-items: center">
-              <view class="head_r" @click="showPop = true" v-if="cloudList.length > 0">
-                <u--image v-if="cloudList.length > 0" :showLoading="true" src="/static/images/LHYC/QB.png"
-                  width="50.82rpx" height="50.82rpx"></u--image>
-                <u--image v-else :showLoading="true" src="/static/images/LHYC/QB1.png" width="50.82rpx"
-                  height="50.82rpx"></u--image>
-              </view>
-            </view>
-          </view>
-        </view>
+								{{ town }}里海云仓
+							</view>
+						</view>
+						<view class="" style="display: flex; align-items: center">
+							<view class="head_r" @click="showPop = true" v-if="cloudList.length > 0">
+								<u--image v-if="cloudList.length > 0" :showLoading="true"
+									src="/static/images/LHYC/QB.png" width="50.82rpx" height="50.82rpx"></u--image>
+								<u--image v-else :showLoading="true" src="/static/images/LHYC/QB1.png" width="50.82rpx"
+									height="50.82rpx"></u--image>
+							</view>
+						</view>
+					</view>
+				</view>
 
-        <!-- 滚动 -->
-        <view :class="{ heads: true, show: !showtit }" style="padding-top: var(--status-bar-height)">
-          <view style="
+				<!-- 滚动 -->
+				<view :class="{ heads: true, show: !showtit }" style="padding-top: var(--status-bar-height)">
+					<view style="
               align-items: center;
               display: flex;
               justify-content: space-between;
             ">
-            <view class="" style="display: flex; align-items: center">
-              <view class="back" style="margin-right: 17rpx">
-                <!-- <u--image :showLoading="true" src="/static/images/LHYC/FH.png" width="50.82rpx"
+						<view class="" style="display: flex; align-items: center">
+							<view class="back" style="margin-right: 17rpx">
+								<!-- <u--image :showLoading="true" src="/static/images/LHYC/FH.png" width="50.82rpx"
 									height="50.82rpx" @click='goBack'></u--image> -->
-                <i class="iconfont icon-xiangzuo" style="font-size: 40rpx; text-align: left" @click="goBack"></i>
-              </view>
-              <!-- <view class="" style="font-size: 40rpx;transform: skewX(-10deg);font-weight: 700;">
+								<i class="iconfont icon-xiangzuo" style="font-size: 40rpx; text-align: left"
+									@click="goBack"></i>
+							</view>
+							<!-- <view class="" style="font-size: 40rpx;transform: skewX(-10deg);font-weight: 700;">
 						    {town}}
 							</view> -->
-              <view class="head_tit" v-if="cloudList.length" style="
+							<view class="head_tit" v-if="cloudList.length" style="
                   font-size: 40rpx;
                   transform: skewX(-10deg);
                   font-weight: bold;
                 " :style="{ color: cloudList.length > 0 ? '' : 'black' }">
-                {{ town }}里海云仓
-              </view>
-            </view>
+								{{ town }}里海云仓
+							</view>
+						</view>
 
-            <view style="position: relative; width: 289.14rpx">
-              <u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="请输入..." v-model="keyword"
-                class="serch_cls"></u-search>
-              <!-- <u--image class="img_cls" :showLoading="true" src="/static/images/GXSC/SSBT.png"
+						<view style="position: relative; width: 289.14rpx">
+							<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="请输入..."
+								v-model="keyword" class="serch_cls"></u-search>
+							<!-- <u--image class="img_cls" :showLoading="true" src="/static/images/GXSC/SSBT.png"
 								width="115.65rpx" height="56.82rpx" @click="serch"></u--image> -->
 
-              <view class="serchbtn img_cls" @click="serch">搜索</view>
-            </view>
-            <view class="head_r" @click="showPop = true">
-              <u--image :showLoading="true" src="/static/images/LHYC/QB.png" width="50.82rpx"
-                height="50.82rpx"></u--image>
-              <text class="" style="height: 5px"></text>
-              <view class="flags"> </view>
-            </view>
-          </view>
-        </view>
+							<view class="serchbtn img_cls" @click="serch">搜索</view>
+						</view>
+						<view class="head_r" @click="showPop = true">
+							<u--image :showLoading="true" src="/static/images/LHYC/QB.png" width="50.82rpx"
+								height="50.82rpx"></u--image>
+							<text class="" style="height: 5px"></text>
+							<view class="flags"> </view>
+						</view>
+					</view>
+				</view>
 
-        <view class="box" v-if="cloudList.length > 0">
-          <view :class="act_swiper">
-            <swiper :autoplay="false" :active-class="activeClass" :interval="3000" class="swipers" :circular="true"
-              previous-margin="0rpx" next-margin="0rpx" :current="current" :disable-touch="true">
-              <swiper-item v-for="(item, index) in cloudList">
-                <u--image :showLoading="true" :src="item.cover" :class="act_img" width="750rpx"
-                  height="718.46rpx"></u--image>
-              </swiper-item>
-            </swiper>
-          </view>
-          <view class="" style="height: 718.46rpx" v-if="act_swiper"> </view>
+				<view class="box" v-if="cloudList.length > 0">
+					<view :class="act_swiper">
+						<swiper :autoplay="false" :active-class="activeClass" :interval="3000" class="swipers"
+							:circular="true" previous-margin="0rpx" next-margin="0rpx" :current="current"
+							:disable-touch="true">
+							<swiper-item v-for="(item, index) in cloudList">
+								<u--image :showLoading="true" :src="item.cover" :class="act_img" width="750rpx"
+									height="718.46rpx"></u--image>
+							</swiper-item>
+						</swiper>
+					</view>
+					<view class="" style="height: 718.46rpx" v-if="act_swiper"> </view>
 
-          <view class="menu" v-if="showtit" style="transition: 1s">
-            <swiper :autoplay="false" :active-class="activeClass" :interval="3000" class="swiper" :circular="true"
-              previous-margin="280rpx" next-margin="280rpx" :current="current" @change="test">
-              <swiper-item v-for="(item, index) in cloudList" :key="index" @click="clickSwiperFn(index)">
-                <view class="swiper_item" :class="{
+					<view class="menu" v-if="showtit" style="transition: 1s">
+						<swiper :autoplay="false" :active-class="activeClass" :interval="3000" class="swiper"
+							:circular="true" previous-margin="280rpx" next-margin="280rpx" :current="current"
+							@change="test">
+							<swiper-item v-for="(item, index) in cloudList" :key="index" @click="clickSwiperFn(index)">
+								<view class="swiper_item" :class="{
                     swiper_item_act: index == current,
                     swiper_item_act2:
                       index == current - 1 || index == current + 1,
                   }">
-                  <u--image :showLoading="true" :src="item.background" class="swiper_b" width="140.19rpx"
-                    height="140.19rpx"></u--image>
-                </view>
-              </swiper-item>
-            </swiper>
-          </view>
+									<u--image :showLoading="true" :src="item.background" class="swiper_b"
+										width="140.19rpx" height="140.19rpx"></u--image>
+								</view>
+							</swiper-item>
+						</swiper>
+					</view>
 
-          <!-- 商品列表 -->
-          <view class="content">
-            <view class="content_sift" :style="{ position: pocls, top: headtop + 'px' }" v-if="!showtit">
-              <view :class="{ act: item.act, price_sift: true }" v-for="(item, index) in actList" :key="index"
-                @click="screenGoods(item.screen, index)">
-                {{ item.tit }}
-                <view class="" v-if="index == 2" style="margin-left: 10rpx">
-                  <u-icon name="arrow-up" :color="item.price && item.act ? '#FF6D20' : 'black'" size="10"></u-icon>
-                  <u-icon name="arrow-down" :color="!item.price && item.act ? '#FF6D20' : 'black'" size="10"></u-icon>
-                </view>
-              </view>
-            </view>
-            <view class="goods_list" v-if="goodsList.length > 0">
-              <view class="empty" v-if="showLoading">
-                <u-loading-icon v-if="showLoading" text="加载中" textSize="18"></u-loading-icon>
-              </view>
-              <view class="goods" @click="goodDetail(item)" v-else v-for="(item, index) in goodsList">
-                <view class="left">
-                  <!-- <u--image :showLoading="true" :src="item.image" width="192.76rpx" height="192.76rpx"></u--image> -->
-                  <image lazy-load style="height: 192.76rpx;width: 192.76rpx;" :src="item.image"></image>
-                </view>
-                <view class="right">
-                  <view class="tit">
-                    <!-- 亿福馒头粉纯天然无添加小麦粉加工 1000g/袋 -->
-                    {{ item.store_name || item.store_info }}
-                  </view>
-                  <view class="">
-                    <view class="good_score">
-                      <text style="margin-right: 10rpx; color: #f84221">{{
+					<!-- 商品列表 -->
+					<view class="content">
+						<view class="content_sift" :style="{ position: pocls, top: headtop + 'px' }" v-if="!showtit">
+							<view :class="{ act: item.act, price_sift: true }" v-for="(item, index) in actList"
+								:key="index" @click="screenGoods(item.screen, index)">
+								{{ item.tit }}
+								<view class="" v-if="index == 2" style="margin-left: 10rpx">
+									<u-icon name="arrow-up" :color="item.price && item.act ? '#FF6D20' : 'black'"
+										size="10"></u-icon>
+									<u-icon name="arrow-down" :color="!item.price && item.act ? '#FF6D20' : 'black'"
+										size="10"></u-icon>
+								</view>
+							</view>
+						</view>
+						<view class="goods_list" v-if="goodsList.length > 0">
+							<view class="empty" v-if="showLoading">
+								<u-loading-icon v-if="showLoading" text="加载中" textSize="18"></u-loading-icon>
+							</view>
+							<view class="goods" @click="goodDetail(item)" v-else v-for="(item, index) in goodsList">
+								<view class="left">
+									<!-- <u--image :showLoading="true" :src="item.image" width="192.76rpx" height="192.76rpx"></u--image> -->
+									<image lazy-load style="height: 192.76rpx;width: 192.76rpx;" :src="item.image">
+									</image>
+								</view>
+								<view class="right">
+									<view class="tit">
+										<!-- 亿福馒头粉纯天然无添加小麦粉加工 1000g/袋 -->
+										{{ item.store_name || item.store_info }}
+									</view>
+									<view class="">
+										<view class="good_score">
+											<text style="margin-right: 10rpx; color: #f84221">{{
                         item.rate
                       }}</text>
-                      <text>{{ item.reply_count }}评论</text>
-					  <text v-if="item.merchant.distance" style="margin-left: 10rpx;">{{item.merchant.distance}}</text>
-					  
-                    </view>
-                    <view class="good_price">
-                      <view class="good_price_l">
-                        <view class="" style="
+											<text>{{ item.reply_count }}评论</text>
+											<text v-if="item.merchant.distance"
+												style="margin-left: 10rpx;">{{item.merchant.distance}}</text>
+
+										</view>
+										<view class="good_price">
+											<view class="good_price_l">
+												<view class="" style="
                             color: #f84221;
                             font-size: 22.78rpx;
                             font-weight: bold;
                           ">
-                          ￥<text style="font-size: 30rpx">{{
+													￥<text style="font-size: 30rpx">{{
                             item.price
                           }}</text>
-                        </view>
-                        <!-- <view class="old_price"> ￥30.00 </view> -->
-                      </view>
-                      <view class="good_price_r">
-                        <view :class="{ x_tra: trnList[index]?trnList[index].bottom:0 }" :style="`transform:translateY(${
+												</view>
+												<!-- <view class="old_price"> ￥30.00 </view> -->
+											</view>
+											<view class="good_price_r">
+												<view :class="{ x_tra: trnList[index]?trnList[index].bottom:0 }" :style="`transform:translateY(${
                             trnList[index]?trnList[index].bottom:0
                           }px);transition:${
                             trnList[index]?trnList[index].bottom:0 ? 1 : 0
                           }s  cubic-bezier(0.4, -0.9, 0.75, 1);`" @click.stop="addcart(item, index)">
-                          <u--image :class="'act_class' + index" :style="`transform:translateX(${
+													<u--image :class="'act_class' + index" :style="`transform:translateX(${
                               trnList[index]?trnList[index].left:0
                             }px);transition:${trnList[index]?trnList[index].bottom:0 ? 1 : 0}s `"
-                            src="/static/images/LHYC/J.png" width="49.07rpx" height="49.07rpx"></u--image>
-                        </view>
-                      </view>
-                    </view>
-                  </view>
-                </view>
-              </view>
-              <view style="height: 180rpx">
-                <u-loadmore :status="status" />
-              </view>
-            </view>
-            <!-- 空 -->
-            <view v-else>
-              <view class="empty">
-                <view class="info">
-                  <u--image :showLoading="true" src="/static/images/noCart.png" width="400.09rpx"
-                    height="400.09rpx"></u--image>
-                  <view class="" style="text-align: center; color: #999">
-                    暂无商品
-                  </view>
-                </view>
-              </view>
-            </view>
-            <!-- 购物车 -->
-            <view class="card" :style="`bottom:${appInfo.bottom+10}px`"
-              @click="navgo('/pages/order_addcart/order_addcart?product_type=98&source='+source)">
-              <view class="left">
-                <view class="cart" :class="{ act_cart: act_cart }" style="position: relative; z-index: 9999999">
-                  <u--image :showLoading="true" src="/static/images/LHYC/GWC.png" width="63.09rpx"
-                    height="63.09rpx"></u--image>
+														src="/static/images/LHYC/J.png" width="49.07rpx"
+														height="49.07rpx"></u--image>
+												</view>
+											</view>
+										</view>
+									</view>
+								</view>
+							</view>
+							<view style="height: 180rpx">
+								<u-loadmore :status="status" />
+							</view>
+						</view>
+						<!-- 空 -->
+						<view v-else>
+							<view class="empty">
+								<view class="info">
+									<u--image :showLoading="true" src="/static/images/noCart.png" width="400.09rpx"
+										height="400.09rpx"></u--image>
+									<view class="" style="text-align: center; color: #999">
+										暂无商品
+									</view>
+								</view>
+							</view>
+						</view>
+						<!-- 购物车 -->
+						<view class="card" :style="`bottom:${appInfo.bottom+10}px`"
+							@click="navgo('/pages/order_addcart/order_addcart?product_type=98&source='+source)">
+							<view class="left">
+								<view class="cart" :class="{ act_cart: act_cart }"
+									style="position: relative; z-index: 9999999">
+									<u--image :showLoading="true" src="/static/images/LHYC/GWC.png" width="63.09rpx"
+										height="63.09rpx"></u--image>
 
-                  <view class="badge" v-show="goodsNum">
-                    {{ goodsNum }}
-                  </view>
-                </view>
-                <view class="tot_price">
-                  <view class=""> ￥{{ totalMoney }} </view>
-                  <view class=""> 支持配送 售后无忧 </view>
-                </view>
-              </view>
-              <view class="right"> 去结算 </view>
-            </view>
-          </view>
-        </view>
-      </view>
-      <!-- 组件 -->
-      <view class="" v-if="showPop">
-        <u-popup mode="right" :show="showPop" @close="showPop = false" @open="showPop = true">
-          <view class="pop">
-            <view style="height: var(--status-bar-height)"></view>
-            <view class="pop_head" style="display: flex">
-              <u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx" height="50.82rpx"
-                @click="showPop = false"></u--image>
-              <view class="head_tit"> 里海云仓 </view>
-            </view>
-            <view class="pop_content" v-if="cloudList.length">
-              <view class="pop_li" @click="all(index)" v-for="(item, index) in cloudList" :key="index">
-                <u--image :showLoading="true" :src="item.background" width="84.11rpx" height="84.11rpx"></u--image>
-                <view class="" style="margin-left: 20rpx">
-                  <view style="font-size: 33.29rpx; color: black">
-                    {{ item.category_name }}云仓服务
-                  </view>
-                  <view class="" style="font-size: 22.78rpx">
-                    {{ item.description }}
-                  </view>
-                </view>
-              </view>
-            </view>
+									<view class="badge" v-show="goodsNum">
+										{{ goodsNum }}
+									</view>
+								</view>
+								<view class="tot_price">
+									<view class=""> ￥{{ totalMoney }} </view>
+									<view class=""> 支持配送 售后无忧 </view>
+								</view>
+							</view>
+							<view class="right"> 去结算 </view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<!-- 组件 -->
+			<view class="" v-if="showPop">
+				<u-popup mode="right" :show="showPop" @close="showPop = false" @open="showPop = true">
+					<view class="pop">
+						<view style="height: var(--status-bar-height)"></view>
+						<view class="pop_head" style="display: flex">
+							<u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx"
+								height="50.82rpx" @click="showPop = false"></u--image>
+							<view class="head_tit"> 里海云仓 </view>
+						</view>
+						<view class="pop_content" v-if="cloudList.length">
+							<view class="pop_li" @click="all(index)" v-for="(item, index) in cloudList" :key="index">
+								<u--image :showLoading="true" :src="item.background" width="84.11rpx"
+									height="84.11rpx"></u--image>
+								<view class="" style="margin-left: 20rpx">
+									<view style="font-size: 33.29rpx; color: black">
+										{{ item.category_name }}云仓服务
+									</view>
+									<view class="" style="font-size: 22.78rpx">
+										{{ item.description }}
+									</view>
+								</view>
+							</view>
+						</view>
 
-            <view v-else>
-              <!-- <u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx" height="50.82rpx"
+						<view v-else>
+							<!-- <u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx" height="50.82rpx"
 							@click='goBack'></u--image>
 					</view> -->
-              <view class="yuncangempty">
-                <u--image :showLoading="true" src="/static/images/noCart.png" width="400.09rpx"
-                  height="400.09rpx"></u--image>
-                <view class="" style="text-align: center; color: #999">
-                  当前区域暂无云仓
-                </view>
-              </view>
-            </view>
-          </view>
-        </u-popup>
-      </view>
-    </view>
+							<view class="yuncangempty">
+								<u--image :showLoading="true" src="/static/images/noCart.png" width="400.09rpx"
+									height="400.09rpx"></u--image>
+								<view class="" style="text-align: center; color: #999">
+									当前区域暂无云仓
+								</view>
+							</view>
+						</view>
+					</view>
+				</u-popup>
+			</view>
+		</view>
 
-    <view class="empty" style="" v-if="cloudList.length <= 0">
-      <view style="height: var(--status-bar-height)"></view>
+		<view class="empty" style="" v-if="cloudList.length <= 0">
+			<view style="height: var(--status-bar-height)"></view>
 
-      <view style="padding: 10rpx">
-        <view class="info">
-          <u--image :showLoading="true" src="/static/images/noCart.png" width="400.09rpx" height="400.09rpx"></u--image>
-          <view class="" style="text-align: center; color: #999">
-            当前区域暂无云仓
-          </view>
-        </view>
-      </view>
+			<view style="padding: 10rpx">
+				<view class="info">
+					<u--image :showLoading="true" src="/static/images/noCart.png" width="400.09rpx"
+						height="400.09rpx"></u--image>
+					<view class="" style="text-align: center; color: #999">
+						当前区域暂无云仓
+					</view>
+				</view>
+			</view>
 
-      <!-- 多规格购物车 -->
+			<!-- 多规格购物车 -->
 
-      <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse">
-      </authorize>
-      <view class="" :style="`height:${appInfo.bottom+10}px;`"> </view>
-    </view>
+			<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse">
+			</authorize>
+			<view class="" :style="`height:${appInfo.bottom+10}px;`"> </view>
+		</view>
 
-    <view class="">
-      <u-picker :defaultIndex="defaInd" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
-        @cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
-    </view>
-    <view class="" v-if="showcartpop">
-      <u-popup :show="showcartpop" @close="closecartpop" @open="opencartpop">
-        <view class="sku">
-          <view class="sku_head">
-            <view class="sku_head_l">
-              <u--image :showLoading="true" :src="skuform.image" width="200.09rpx" height="200.09rpx"></u--image>
-            </view>
-            <view class="sku_head_r">
-              <view class="sku_goods_tit">
-                {{ skuform.store_info }}
-              </view>
-              <view class="">
-                <view class="sku_goods_price"> ￥ {{ skuform.price }} </view>
-                <view class="sku_goods_num" v-if="this.skusize">
-                  库存:{{ skuform.sku[this.skusize].stock }}
-                </view>
-              </view>
-            </view>
-          </view>
-          <view class="sku_size">
-            <view class="" style="margin-bottom: 10rpx"> 尺码 </view>
-            <view class="">
-              <text class="size_li" :class="{ act_size_li: item.sku == skusize }" v-for="(item, index) in skuform.sku"
-                @click="skusizechange(item.sku)">{{ item.sku }}</text>
-            </view>
-          </view>
-          <view class="sku_num">
-            <view class=""> 数量 </view>
-            <view class="">
-              <u-number-box v-model="skuNumber" @change="valChange"></u-number-box>
-            </view>
-          </view>
-          <view class="skuaddcart" @click="skuaddcart"> 确定 </view>
-        </view>
-      </u-popup>
-    </view>
-  </view>
+		<view class="">
+			<u-picker :defaultIndex="defaInd" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
+				@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
+		</view>
+		<view class="" v-if="showcartpop">
+			<u-popup :show="showcartpop" @close="closecartpop" @open="opencartpop">
+				<view class="sku">
+					<view class="sku_head">
+						<view class="sku_head_l">
+							<u--image :showLoading="true" :src="skuform.image" width="200.09rpx"
+								height="200.09rpx"></u--image>
+						</view>
+						<view class="sku_head_r">
+							<view class="sku_goods_tit">
+								{{ skuform.store_info }}
+							</view>
+							<view class="">
+								<view class="sku_goods_price"> ￥ {{ skuform.price }} </view>
+								<view class="sku_goods_num" v-if="this.skusize">
+									库存:{{ skuform.sku[this.skusize].stock }}
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="sku_size">
+						<view class="" style="margin-bottom: 10rpx"> 尺码 </view>
+						<view class="">
+							<text class="size_li" :class="{ act_size_li: item.sku == skusize }"
+								v-for="(item, index) in skuform.sku"
+								@click="skusizechange(item.sku)">{{ item.sku }}</text>
+						</view>
+					</view>
+					<view class="sku_num">
+						<view class=""> 数量 </view>
+						<view class="">
+							<u-number-box v-model="skuNumber" @change="valChange"></u-number-box>
+						</view>
+					</view>
+					<view class="skuaddcart" @click="skuaddcart"> 确定 </view>
+				</view>
+			</u-popup>
+		</view>
+	</view>
 </template>
 
 <script>
-  import {
-    cloudWarehouse,
-    getCityCloundShop
-  } from '@/api/requesta.js'
-  import {
-    Toast
-  } from '@/libs/uniApi';
-  import {
-    initiateAssistApi
-  } from '@/api/activity.js';
-  import {
-    getCartCounts,
-    getCartList,
+	import {
+		cloudWarehouse,
+		getCityCloundShop
+	} from '@/api/requesta.js'
+	import {
+		Toast
+	} from '@/libs/uniApi';
+	import {
+		initiateAssistApi
+	} from '@/api/activity.js';
+	import {
+		getCartCounts,
+		getCartList,
 
-  } from '@/api/requesta.js';
-  import {
-    goShopDetail
-  } from '@/libs/order.js'
-  // 7200 = 8 = 80000 8616
-  import {
-    postCartAdd,
-  } from '@/api/store.js';
-  import authorize from '@/components/Authorize';
+	} from '@/api/requesta.js';
+	import {
+		goShopDetail
+	} from '@/libs/order.js'
+	// 7200 = 8 = 80000 8616
+	import {
+		postCartAdd,
+	} from '@/api/store.js';
+	import authorize from '@/components/Authorize';
 
-  import {
-    getArea,
-    getStreet
-  } from '@/api/article.js';
-  import {
-    getIndexData,
-    getDiy
-  } from '@/api/api.js'
-  import {
-    getGeocoder
-  } from '@/api/store.js';
-  import {
-    mapGetters
-  } from 'vuex'
-  import Cache from '@/utils/cache';
-  export default {
-    components: {
-      authorize,
-    },
-    data() {
-      let src = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13';
-      return {
-        skuform: {},
-        location: null,
-        source: null,
-        defaInd: [0, 0],
-        showPicker: false,
-        columnData: [],
-        skusize: 0,
-        skuNumber: 1,
-        showcartpop: false,
-        trnList: [],
-        act_cart: false,
-        appInfo: {},
-        pocls: "",
-        type: "",
-        act_swiper: "",
-        current: 3,
-        goodsNum: 0,
-        goodsList: [],
-        isEmpty: false,
-        winHeight: 0,
-        cloudList: [],
-        street: '',
-        street_code: '',
-        totalMoney: 0,
-        town: '',
-        list: [1, 1, 1, 1, 1],
-        showSelect: false,
-        showPop: false,
-        keyword: "",
-        showLoading: false,
-        tot_price: 1,
-        showtit: true,
-        cartList: [],
-        activeClass: 'activeClass',
-        headtop: 0,
-        page_num: 1,
-        act_img: "",
-        cartTagInfo: {},
-        isAuto: false,
-        actList: [{
-          tit: '综合',
-          act: "",
-          screen: ""
-        }, {
-          tit: '销量',
-          act: "",
-          screen: "sales"
-        }, {
-          tit: '价格',
-          act: "",
-          screen: "price_asc",
-          price: true,
-        }],
-        status: "loadmore",
-        flag: false,
-        isShowAuth: false, //是否隐藏授权
+	import {
+		getArea,
+		getStreet
+	} from '@/api/article.js';
+	import {
+		getIndexData,
+		getDiy
+	} from '@/api/api.js'
+	import {
+		getGeocoder
+	} from '@/api/store.js';
+	import {
+		mapGetters
+	} from 'vuex'
+	import Cache from '@/utils/cache';
+	export default {
+		components: {
+			authorize,
+		},
+		data() {
+			let src = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13';
+			return {
+				skuform: {},
+				location: null,
+				source: null,
+				defaInd: [0, 0],
+				showPicker: false,
+				columnData: [],
+				skusize: 0,
+				skuNumber: 1,
+				showcartpop: false,
+				trnList: [],
+				act_cart: false,
+				appInfo: {},
+				pocls: "",
+				type: "",
+				act_swiper: "",
+				current: 3,
+				goodsNum: 0,
+				goodsList: [],
+				isEmpty: false,
+				winHeight: 0,
+				cloudList: [],
+				street: '',
+				street_code: '',
+				totalMoney: 0,
+				town: '',
+				list: [1, 1, 1, 1, 1],
+				showSelect: false,
+				showPop: false,
+				keyword: "",
+				showLoading: false,
+				tot_price: 1,
+				showtit: true,
+				cartList: [],
+				activeClass: 'activeClass',
+				headtop: 0,
+				page_num: 1,
+				act_img: "",
+				cartTagInfo: {},
+				isAuto: false,
+				actList: [{
+					tit: '综合',
+					act: "",
+					screen: ""
+				}, {
+					tit: '销量',
+					act: "",
+					screen: "sales"
+				}, {
+					tit: '价格',
+					act: "",
+					screen: "price_asc",
+					price: true,
+				}],
+				status: "loadmore",
+				flag: false,
+				isShowAuth: false, //是否隐藏授权
 
-      }
-    },
-    computed: {
-      ...mapGetters(['isLogin', 'viewColor', 'uid']),
-    },
-    // ...mapGetters(['isLogin', 'viewColor', 'uid']),
-    onLoad(e) {
-      // this.cartFn()
-      this.location = e.location;
-      this.source = e.source;
-      this.appInfo = this.$appInfo.safeAreaInsets
-      this.winHeight = this.$appInfo.windowHeight
-      this.street_code = e.street
-      this.town = e.town
-      this.getCloundShop()
-      this.street = e.town
-      this.Area()
-      let that = this
-      setTimeout(() => {
+			}
+		},
+		computed: {
+			...mapGetters(['isLogin', 'viewColor', 'uid']),
+		},
+		// ...mapGetters(['isLogin', 'viewColor', 'uid']),
+		onLoad(e) {
+			// this.cartFn()
+			this.location = e.location;
+			this.source = e.source;
+			this.appInfo = this.$appInfo.safeAreaInsets
+			this.winHeight = this.$appInfo.windowHeight
+			this.street_code = e.street
+			this.town = e.town
+			this.getCloundShop()
+			this.street = e.town
+			this.Area()
+			let that = this
+			setTimeout(() => {
 
-        uni.createSelectorQuery()
-          .in(this)
-          .select('.flags')
-          .boundingClientRect(rect => {
-            this.headtop = rect.top
-          })
-          .exec();
-        uni.createSelectorQuery()
-          .in(this)
-          .select('.cart')
-          .boundingClientRect(rect => {
-            // console.log(this.cartTagInfo, 6666)
-            that.cartTagInfo = rect
+				uni.createSelectorQuery()
+					.in(this)
+					.select('.flags')
+					.boundingClientRect(rect => {
+						this.headtop = rect.top
+					})
+					.exec();
+				uni.createSelectorQuery()
+					.in(this)
+					.select('.cart')
+					.boundingClientRect(rect => {
+						// console.log(this.cartTagInfo, 6666)
+						that.cartTagInfo = rect
 
-          })
-          .exec();
-      }, 500)
+					})
+					.exec();
+			}, 500)
 
-      // console.log(this.appInfo, "手机信息")
-    },
-    onShow() {
-      this.cartFn()
-      this.showSelect = false
-    },
-    // 分页
-    onReachBottom() {
-      if (this.flag || !this.goodsList.length) return
-      this.status = "loading"
-      this.page_num += 1
-      // this.flag = true
-      cloudWarehouse({
-        street_code: this.street_code,
-        category_id: this.cloudList[this.current]?.category_id || "",
-        order: this.type,
-        keyword: this.keyword,
-        page: this.page_num,
-        location: this.location
-      }).then(res => {
-        if (res.data.list.length == 0) {
-          this.status = "nomore"
-          this.flag = true
-          return
-        }
-        if (res.data.list[0].product_id == this.goodsList[0].product_id) {
-          this.status = "nomore"
-          this.flag = true
-        } else {
-          this.goodsList = this.goodsList.concat(res.data.list);
-        }
-      })
-      // this.getList().then(res => {
-      // 	// console.log(res)
-      // 	return
-      // 	this.goodsList = this.goodsList.concat(res.data.data)
-      // 	this.flag = false
-      // 	if (!res.data.data.length) {
-      // 		this.status = "nomore"
-      // 		this.flag = true
-      // 	}
-      // })
-    },
-    onPageScroll(e) {
-      let that = this
-      // if (e.scrollTop > 0) {
-      this.showtit = !Boolean(e.scrollTop)
-      // }
-      // console.log(e)
+			// console.log(this.appInfo, "手机信息")
+		},
+		onShow() {
+			this.cartFn()
+			this.showSelect = false
+		},
+		// 分页
+		onReachBottom() {
+			if (this.flag || !this.goodsList.length) return
+			this.status = "loading"
+			this.page_num += 1
+			// this.flag = true
+			cloudWarehouse({
+				street_code: this.street_code,
+				category_id: this.cloudList[this.current]?.category_id || "",
+				order: this.type,
+				keyword: this.keyword,
+				page: this.page_num,
+				location: this.location
+			}).then(res => {
+				if (res.data.list.length == 0) {
+					this.status = "nomore"
+					this.flag = true
+					return
+				}
+				if (res.data.list[0].product_id == this.goodsList[0].product_id) {
+					this.status = "nomore"
+					this.flag = true
+				} else {
+					this.goodsList = this.goodsList.concat(res.data.list);
+				}
+			})
+			// this.getList().then(res => {
+			// 	// console.log(res)
+			// 	return
+			// 	this.goodsList = this.goodsList.concat(res.data.data)
+			// 	this.flag = false
+			// 	if (!res.data.data.length) {
+			// 		this.status = "nomore"
+			// 		this.flag = true
+			// 	}
+			// })
+		},
+		onPageScroll(e) {
+			let that = this
+			// if (e.scrollTop > 0) {
+			this.showtit = !Boolean(e.scrollTop)
+			// }
+			// console.log(e)
 
-      uni.createSelectorQuery()
-        .in(this)
-        .select('.content')
-        .boundingClientRect(rect => {
-          if (rect.top <= (this.headtop)) {
-            this.pocls = 'fixed'
-            this.act_swiper = 'act_swiper'
-            this.act_img = 'act_img'
+			uni.createSelectorQuery()
+				.in(this)
+				.select('.content')
+				.boundingClientRect(rect => {
+					if (rect.top <= (this.headtop)) {
+						this.pocls = 'fixed'
+						this.act_swiper = 'act_swiper'
+						this.act_img = 'act_img'
 
-          } else {
-            this.pocls = ''
-            this.act_swiper = ''
-            this.act_img = ''
+					} else {
+						this.pocls = ''
+						this.act_swiper = ''
+						this.act_img = ''
 
-          }
-        })
-        .exec();
-      uni.createSelectorQuery()
-        .in(this)
-        .select('.cart')
-        .boundingClientRect(rect => {
-          // console.log(this.cartTagInfo, 6666)
-          that.cartTagInfo = rect
-          // console.log(rect)
-        })
-        .exec();
-    },
-    onPullDownRefresh() {
-      this.getCloundShop()
-      this.getList()
-      this.cartFn()
-      uni.stopPullDownRefresh()
-    },
-    methods: {
-      showpick() {
-        this.showPicker = !this.showPicker
+					}
+				})
+				.exec();
+			uni.createSelectorQuery()
+				.in(this)
+				.select('.cart')
+				.boundingClientRect(rect => {
+					// console.log(this.cartTagInfo, 6666)
+					that.cartTagInfo = rect
+					// console.log(rect)
+				})
+				.exec();
+		},
+		onPullDownRefresh() {
+			this.getCloundShop()
+			this.getList()
+			this.cartFn()
+			uni.stopPullDownRefresh()
+		},
+		methods: {
+			showpick() {
+				this.showPicker = !this.showPicker
 
 
-      },
-      swiperClick(item) {
-        const url = item.info[1].value
-        uni.navigateTo({
-          url: url
-        })
-      },
-      selectLocation() {
-        this.isSelectPlace ? this.showPicker = true : ''
+			},
+			swiperClick(item) {
+				const url = item.info[1].value
+				uni.navigateTo({
+					url: url
+				})
+			},
+			selectLocation() {
+				this.isSelectPlace ? this.showPicker = true : ''
 
-      },
+			},
 
-      confirm(e) {
-        this.showPicker = false
-        this.$emit('selectPlce', e)
-        this.$emit('change', e)
-        this.street = e.value[1].name
-        this.$nextTick(() => {
-          this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
+			confirm(e) {
+				this.showPicker = false
+				this.$emit('selectPlce', e)
+				this.$emit('change', e)
+				this.street = e.value[1].name
+				this.$nextTick(() => {
+					this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
 
-        })
+				})
 
-        // this.sotreParam.street_id = e.value[1].code
-        this.street_code = e.value[1].code
-        this.getCloundShop()
-        this.town = e.value[1].name
-        // this.storeMerchantList()
+				// this.sotreParam.street_id = e.value[1].code
+				this.street_code = e.value[1].code
+				this.getCloundShop()
+				this.town = e.value[1].name
+				// this.storeMerchantList()
 
-      },
-      changeHandler(e) {
-        const {
-          columnIndex,
-          value,
-          values,
-          index,
-          picker = this.$refs.uPicker
-        } = e;
-        if (columnIndex === 0) {
-          getStreet({
-            area_code: value[0]['code']
-          }).then(res => {
-            picker.setColumnValues(1, res.data);
-          });
-        }
-      },
-      Area() {
-        let that = this
-        getArea({
-          city_code: 510500
-        }).then(res => {
+			},
+			changeHandler(e) {
+				const {
+					columnIndex,
+					value,
+					values,
+					index,
+					picker = this.$refs.uPicker
+				} = e;
+				if (columnIndex === 0) {
+					getStreet({
+						area_code: value[0]['code']
+					}).then(res => {
+						picker.setColumnValues(1, res.data);
+					});
+				}
+			},
+			Area() {
+				let that = this
+				getArea({
+					city_code: 510500
+				}).then(res => {
 
-          this.$refs.uPicker.setColumnValues(0, res.data);
-          this.Street(res.data[0]['code']);
-          // console.log(res.data, 66666)
-        });
-      },
-      Street(code) {
-        getStreet({
-          area_code: code
-        }).then(res => {
-          this.$refs.uPicker.setColumnValues(1, res.data);
+					this.$refs.uPicker.setColumnValues(0, res.data);
+					this.Street(res.data[0]['code']);
+					// console.log(res.data, 66666)
+				});
+			},
+			Street(code) {
+				getStreet({
+					area_code: code
+				}).then(res => {
+					this.$refs.uPicker.setColumnValues(1, res.data);
 
-        });
-      },
+				});
+			},
 
-      swiperChange(e) {
-        let {
-          current,
-          source
-        } = e.detail;
-        if (source === 'autoplay' || source === 'touch') {
-          this.bgColor = this.swiper.url[e.detail.current]['img']
-          this.$emit('kkchange', this.bgColor)
-        }
-      },
+			swiperChange(e) {
+				let {
+					current,
+					source
+				} = e.detail;
+				if (source === 'autoplay' || source === 'touch') {
+					this.bgColor = this.swiper.url[e.detail.current]['img']
+					this.$emit('kkchange', this.bgColor)
+				}
+			},
 
 
-      // 对象转数组
-      objToArr(data) {
-        let obj = Object.keys(data).sort();
-        let m = obj.map(key => data[key]);
-        return m;
-      },
-      skusizechange(i) {
+			// 对象转数组
+			objToArr(data) {
+				let obj = Object.keys(data).sort();
+				let m = obj.map(key => data[key]);
+				return m;
+			},
+			skusizechange(i) {
 
-        this.skusize = i
-      },
-      skuaddcart() {
-        this.showcartpop = false
-        // this.skuform = {}
-        let res = postCartAdd({
-          cart_num: this.skuNumber,
-          is_new: 0,
-          product_attr_unique: this.skuform.sku[this.skusize].unique,
-          product_id: this.skuform.product_id,
-          product_type: this.skuform.product_type,
-          spread_id: "",
-          source: this.source
-        }).then((res, err) => {
-          this.cartFn()
-          uni.showToast({
-            title: "加入成功",
-            duration: 1000,
+				this.skusize = i
+			},
+			skuaddcart() {
+				this.showcartpop = false
+				// this.skuform = {}
+				let res = postCartAdd({
+					cart_num: this.skuNumber,
+					is_new: 0,
+					product_attr_unique: this.skuform.sku[this.skusize].unique,
+					product_id: this.skuform.product_id,
+					product_type: this.skuform.product_type,
+					spread_id: "",
+					source: this.source
+				}).then((res, err) => {
+					this.cartFn()
+					uni.showToast({
+						title: "加入成功",
+						duration: 1000,
 
-          })
-        }).catch(err => {
-          // this.act_cart = false
-          uni.showToast({
-            title: err,
-            icon: "none",
-            duration: 1000,
-          })
-        })
+					})
+				}).catch(err => {
+					// this.act_cart = false
+					uni.showToast({
+						title: err,
+						icon: "none",
+						duration: 1000,
+					})
+				})
 
-      },
-      valChange(e) {
-        this.skuNumber = e.value
+			},
+			valChange(e) {
+				this.skuNumber = e.value
 
-      },
-      closecartpop() {
-        this.showcartpop = false
-      },
-      opencartpop() {
-        this.showcartpop = true
-      },
-      // 授权关闭
-      authColse: function(e) {
-        this.isShowAuth = e;
-      },
+			},
+			closecartpop() {
+				this.showcartpop = false
+			},
+			opencartpop() {
+				this.showcartpop = true
+			},
+			// 授权关闭
+			authColse: function(e) {
+				this.isShowAuth = e;
+			},
 
-      onLoadFun() {
-        this.isShowAuth = false;
-      },
-      clickSwiperFn(i) {
-        // console.log(i)
-        this.current = i
-      },
-      cartFn() {
-        getCartList().then(res => {
-          // console.log(res)
-          this.totalMoney = 0
-          this.cartList = res.data.list
-          this.cartList.forEach(e => {
+			onLoadFun() {
+				this.isShowAuth = false;
+			},
+			clickSwiperFn(i) {
+				// console.log(i)
+				this.current = i
+			},
+			cartFn() {
+				getCartList().then(res => {
+					// console.log(res)
+					this.totalMoney = 0
+					this.cartList = res.data.list
+					this.cartList.forEach(e => {
 
-            e.list.forEach(item => {
-              this.totalMoney += item.cart_num * item.productAttr.price
-            })
+						e.list.forEach(item => {
+							this.totalMoney += item.cart_num * item.productAttr.price
+						})
 
-          })
-          this.totalMoney = this.totalMoney.toFixed(2)
-        })
-        getCartCounts({product_type: 98}).then(res => {
-          this.goodsNum = res.data[0].count
-        })
-      },
-      goodDetail(item) {
-        uni.navigateTo({
-          url: `/pages/goods_details/index?id=${item.product_id}`
-        })
-        // goShopDetail(item, this.uid).then(res => {
-        //   if (this.isLogin) {
-        //     console.log(res);
-        //     initiateAssistApi(item.activity_id).then(res => {
-        //       let id = res.data.product_assist_set_id;
-        //       uni.hideLoading();
-        //       uni.navigateTo({
-        //         url: '/pages/activity/assist_detail/index?id=' + id
-        //       });
-        //     }).catch((err) => {
-        //       uni.showToast({
-        //         title: err,
-        //         icon: 'none'
-        //       })
-        //     });
-        //   } else {
-        //     this.isAuto = true;
-        //     this.isShowAuth = true
-        //   }
+					})
+					this.totalMoney = this.totalMoney.toFixed(2)
+				})
+				getCartCounts({
+					product_type: 98
+				}).then(res => {
+					this.goodsNum = res.data[0].count
+				})
+			},
+			goodDetail(item) {
+				uni.navigateTo({
+					url: `/pages/goods_details/index?id=${item.product_id}`
+				})
+				// goShopDetail(item, this.uid).then(res => {
+				//   if (this.isLogin) {
+				//     console.log(res);
+				//     initiateAssistApi(item.activity_id).then(res => {
+				//       let id = res.data.product_assist_set_id;
+				//       uni.hideLoading();
+				//       uni.navigateTo({
+				//         url: '/pages/activity/assist_detail/index?id=' + id
+				//       });
+				//     }).catch((err) => {
+				//       uni.showToast({
+				//         title: err,
+				//         icon: 'none'
+				//       })
+				//     });
+				//   } else {
+				//     this.isAuto = true;
+				//     this.isShowAuth = true
+				//   }
 
-        // })
-      },
-      serch() {
-        this.getList()
-      },
-      goBack() {
-        uni.navigateBack()
-      },
-      screenGoods(type, i) {
-        this.actList.forEach(item => {
-          item.act = ""
-        })
-        this.actList[i].act = true
-        this.type = type
-        if (i == 2) {
-          this.actList[i].price = !this.actList[i].price
-          this.type = this.actList[i].price ? 'price_asc' : ''
-        }
-        this.getList()
+				// })
+			},
+			serch() {
+				this.getList()
+			},
+			goBack() {
+				uni.navigateBack()
+			},
+			screenGoods(type, i) {
+				this.actList.forEach(item => {
+					item.act = ""
+				})
+				this.actList[i].act = true
+				this.type = type
+				if (i == 2) {
+					this.actList[i].price = !this.actList[i].price
+					this.type = this.actList[i].price ? 'price_asc' : ''
+				}
+				this.getList()
 
-        // console.log(this.type)
+				// console.log(this.type)
 
-      },
-      navgo(url) {
-        uni.redirectTo({
-          url
-        })
-      },
-      getList() {
-        this.showLoading = true
-        this.status = "loading"
-        this.page_num = 1;
-        cloudWarehouse({
-          street_code: this.street_code,
-          category_id: this.cloudList[this.current]?.category_id || "",
-          order: this.type,
-          keyword: this.keyword,
-          page: this.page_num,
-		  location: this.location
-        }).then(res => {
-          this.goodsList = res.data.list;
-          this.showLoading = false;
-          if (res.data.list.length < 10) this.status = 'nomore';
-          else this.status = 'loadmore';
-          this.goodsList.forEach(item => {
-            this.trnList.push({
-              left: 0,
-              bottom: 0
-            })
-          })
-        })
+			},
+			navgo(url) {
+				uni.redirectTo({
+					url
+				})
+			},
+			getList() {
+				this.showLoading = true
+				this.status = "loading"
+				this.page_num = 1;
+				cloudWarehouse({
+					street_code: this.street_code,
+					category_id: this.cloudList[this.current]?.category_id || "",
+					order: this.type,
+					keyword: this.keyword,
+					page: this.page_num,
+					location: this.location
+				}).then(res => {
+					this.goodsList = res.data.list;
+					this.showLoading = false;
+					if (res.data.list.length < 10) this.status = 'nomore';
+					else this.status = 'loadmore';
+					this.goodsList.forEach(item => {
+						this.trnList.push({
+							left: 0,
+							bottom: 0
+						})
+					})
+				})
 
-      },
-      addcart(item, i) {
-        if (!this.isLogin) {
-          this.isAuto = true;
-          this.isShowAuth = true
-          return
-        }
+			},
+			addcart(item, i) {
+				if (!this.isLogin) {
+					this.isAuto = true;
+					this.isShowAuth = true
+					return
+				}
 
-        if (item.sku['']) {
-          let data = {
-            cart_num: 1,
-            is_new: 0,
-            product_attr_unique: item.sku[''].unique,
-            product_id: item.product_id,
-            product_type: item.product_type,
-            spread_id: "",
-            source: this.source
-          }
-          let that = this
+				if (item.sku['']) {
+					let data = {
+						cart_num: 1,
+						is_new: 0,
+						product_attr_unique: item.sku[''].unique,
+						product_id: item.product_id,
+						product_type: item.product_type,
+						spread_id: "",
+						source: this.source
+					}
+					let that = this
 
-          uni.createSelectorQuery().in(this).select(`.act_class${i}`).boundingClientRect(data1 => {
-            that.trnList[i].left = that.cartTagInfo?.left - data1.left;
-            that.trnList[i].bottom = that.cartTagInfo?.top - data1.top;
+					uni.createSelectorQuery().in(this).select(`.act_class${i}`).boundingClientRect(data1 => {
+						that.trnList[i].left = that.cartTagInfo?.left - data1.left;
+						that.trnList[i].bottom = that.cartTagInfo?.top - data1.top;
 
-            let timer = setTimeout(() => {
-              that.trnList[i].left = 0
-              that.trnList[i].bottom = 0
-              that.act_cart = true
-              setTimeout(() => {
-                that.act_cart = false
-              }, 500)
-            }, 1000)
-          }).exec();
-          let res = postCartAdd({
-            ...data
-          }).then((res, err) => {
-            this.cartFn()
-            uni.showToast({
-              title: "加入成功",
-              duration: 1000,
+						let timer = setTimeout(() => {
+							that.trnList[i].left = 0
+							that.trnList[i].bottom = 0
+							that.act_cart = true
+							setTimeout(() => {
+								that.act_cart = false
+							}, 500)
+						}, 1000)
+					}).exec();
+					let res = postCartAdd({
+						...data
+					}).then((res, err) => {
+						this.cartFn()
+						uni.showToast({
+							title: "加入成功",
+							duration: 1000,
 
-            })
-          }).catch(err => {
-            uni.showToast({
-              title: err,
-              icon: "none",
-              duration: 1000,
-            })
-          })
-          setTimeout(() => {
-            that.act_cart = false
-          }, 500)
-        } else {
-          this.skuform = item
-          this.showcartpop = true
-          const keys = Object.keys(item.sku);
-          const firstKey = keys[0];
-          this.skusize = keys[0]
+						})
+					}).catch(err => {
+						uni.showToast({
+							title: err,
+							icon: "none",
+							duration: 1000,
+						})
+					})
+					setTimeout(() => {
+						that.act_cart = false
+					}, 500)
+				} else {
+					this.skuform = item
+					this.showcartpop = true
+					const keys = Object.keys(item.sku);
+					const firstKey = keys[0];
+					this.skusize = keys[0]
 
-        }
-        return
+				}
+				return
 
 
-      },
-      all(index) {
-        this.showPop = false
-        this.current = index
-        this.getList()
-      },
-      test(e) {
-        // console.log(e.target.current)
-        this.current = e.target.current
-        // console.log(e)
-        this.getList()
-      },
+			},
+			all(index) {
+				this.showPop = false
+				this.current = index
+				this.getList()
+			},
+			test(e) {
+				// console.log(e.target.current)
+				this.current = e.target.current
+				// console.log(e)
+				this.getList()
+			},
 
-      async getCloundShop() {
-        const {
-          data
-        } = await getCityCloundShop({
-          street_code: this.street_code
-        })
-        this.cloudList = data
-        cloudWarehouse({
-          street_code: this.street_code,
-          category_id: this.cloudList[this.current].category_id,
-		location: this.location
-        }).then(res => {
-          this.trnList = []
-          this.goodsList = res.data.list
-          this.goodsList.forEach(item => {
-            this.trnList.push({
-              left: 0,
-              bottom: 0
-            })
-          })
-        })
-      }
-    }
-  }
+			async getCloundShop() {
+				const {
+					data
+				} = await getCityCloundShop({
+					street_code: this.street_code
+				})
+				this.cloudList = data
+				cloudWarehouse({
+					street_code: this.street_code,
+					category_id: this.cloudList[this.current].category_id,
+					location: this.location
+				}).then(res => {
+					this.trnList = []
+					this.goodsList = res.data.list
+					this.goodsList.forEach(item => {
+						this.trnList.push({
+							left: 0,
+							bottom: 0
+						})
+					})
+				})
+			}
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-  @keyframes addcart {
-    from {
-      // background-color: red;
-      opacity: 1;
-    }
-
-    to {
-      // background-color: yellow;
-      opacity: 0;
-    }
-  }
-
-  .serchbtn {
-    // position: absolute;
-    // right: 5rpx;
-    // top: 5rpx;
-    width: 100rpx;
-    height: 50rpx;
-    border-radius: 30rpx;
-    text-align: center;
-    line-height: 50rpx;
-    // background-color: #FEAB00;
-    background: linear-gradient(to right, #f84221, #ff6d20);
-  }
-
-  .selected-list {
-    padding: 24rpx 14rpx;
-    border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx;
-    background-color: #fff;
-    position: absolute;
-    left: 100rpx;
-    font-size: 29.79rpx;
-    z-index: 9999;
-    // top: 100rpx;
-    opacity: 0;
-    transition: 0.5s;
-
-    .triangle-up {
-      width: 0;
-      height: 0;
-      border-left: 10rpx solid transparent;
-      border-right: 10rpx solid transparent;
-      border-bottom: 10rpx solid white;
-      position: absolute;
-      top: -10rpx;
-    }
-
-    .selected-li {
-      margin-top: 35rpx;
-      color: #f84221;
-      display: flex;
-      align-items: center;
-    }
-  }
-
-  .sku {
-    padding: 20rpx;
-
-    .sku_head {
-      display: flex;
-
-      .sku_head_r {
-        margin-left: 20rpx;
-        display: flex;
-        justify-content: space-between;
-        flex-direction: column;
-
-        .sku_goods_tit {
-          font-size: 30rpx;
-          width: 60vw;
-          /* 容器的宽度 */
-          overflow: hidden;
-          text-overflow: ellipsis;
-          white-space: nowrap;
-        }
-
-        .sku_goods_price {
-          color: red;
-          font-size: 30rpx;
-          font-weight: bold;
-        }
-      }
-
-      // justify-content;
-    }
-
-    .sku_size {
-      margin: 40rpx 0;
-
-      .size_li {
-        display: inline-block;
-        // width: 100rpx;
-        padding: 5rpx 20rpx;
-        margin-right: 20rpx;
-        text-align: center;
-        color: black;
-        border: 1px solid #ebecee;
-
-        // height: 2;
-      }
-
-      .act_size_li {
-        background-color: #ff5c2d;
-        color: white;
-        border: #ff5c2d 1px solid;
-      }
-    }
-
-    .sku_num {
-      display: flex;
-      justify-content: space-between;
-    }
-
-    .skuaddcart {
-      width: 50vw;
-      background-color: #feab00;
-      margin: 20rpx auto;
-      height: 80rpx;
-      line-height: 80rpx;
-      text-align: center;
-      color: white;
-      border-radius: 80rpx;
-      // margin-top: 20rpx;
-    }
-  }
-
-  .flags {
-    background-color: red;
-    z-index: 99999999;
-  }
-
-  .swiper_item {
-    display: flex;
-    justify-content: space-around;
-    transition: 0.5s;
-    padding: 40rpx;
-    // transform: scale(1.2);
-  }
-
-  .swiper_item_act {
-    transform: scale(1.2);
-  }
-
-  .swiper_item_act2 {
-    transform: scale(1.1);
-  }
-
-  // .swiper_item:hover {}
-
-  // .swiper_item {
-  // 	transform: scale(1.2);
-  // }
-
-  .swiper_b {
-    transition: 1s;
-  }
-
-  // .swiper_b:active {
-  // 	transform: scale(1.5);
-  // }
-
-  .act_cart {
-    transition: 0.5s;
-    transform: scale(1.1);
-  }
-
-  .box {
-    position: relative;
-
-    .content {
-      width: 100vw;
-      // transform: translateY(-100px);
-      border-radius: 50rpx 50rpx 0 0;
-      // position: absolute;
-      // top: 965rpx;
-      // border-top: 5px solid red;
-      z-index: 9999;
-      background-color: white;
-      // padding: 0 10rpx;
-    }
-
-    .active_swiper {
-      transform: scale(1.3);
-      // transform: translateX() translateY();
-    }
-
-    .pictrue {
-      position: relative;
-      width: 100%;
-      height: 345rpx;
-    }
-
-    .act {
-      color: #ff6d20;
-    }
-
-    .act_content {
-      width: 100vw;
-      // position: absolute;
-      // top: 965rpx;
-      z-index: 99;
-      background-color: #f4f4f4;
-      padding: 0 10rpx;
-
-      // transition: opt\ linear;
-      padding-top: 200rpx;
-    }
-
-    .act_class {
-      transition: 0.5s;
-    }
-
-    .act_class:active {
-      transform: scale(2);
-    }
-
-    .content_act {
-      width: 100vw;
-      position: absolute;
-      top: 165rpx;
-      z-index: 99;
-      background-color: #f4f4f4;
-      padding: 0 10rpx;
-    }
-  }
-
-  .fade-enter-active,
-  .fade-leave-active {
-    transition: opacity 0.5s;
-  }
-
-  .fade-enter,
-  .fade-leave-to {
-    opacity: 0;
-  }
-
-  .head_tits {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    box-sizing: border-box;
-    padding: 0 20rpx;
-    color: white;
-  }
-
-  .img_cls {
-    position: absolute;
-    top: 50%;
-    right: 5rpx;
-    transform: translateY(-50%);
-  }
-
-  .pop {
-    width: 615.07rpx;
-    padding: 30rpx 28rpx;
-
-    .pop_content {
-      width: 559rpx;
-      height: 80vh;
-      background-color: #f4f4f4;
-      padding: 28rpx;
-      border-radius: 21.03rpx 21.03rpx 0rpx 0rpx;
-      margin-top: 47rpx;
-
-      .pop_head {
-        // display: flex;
-      }
-
-      .pop_li {
-        display: flex;
-        margin-bottom: 52rpx;
-      }
-    }
-  }
-
-  .head_tit {
-    margin-left: 20rpx;
-    font-size: 40rpx;
-    // background-color: red;
-    width: 40vw;
-    white-space: nowrap;
-    overflow: hidden;
-
-    text-overflow: ellipsis;
-
-    // font-weight: 700;
-    // transform: skewX(-10deg);
-  }
-
-  .act {
-    color: red;
-  }
-
-  .head {
-    position: fixed;
-    z-index: 999;
-    color: white;
-    display: flex;
-    justify-content: space-between;
-    width: 100%;
-    padding: 0 20rpx;
-    align-items: center;
-    transition: 0.5s;
-  }
-
-  .heads {
-    position: fixed;
-    z-index: 100;
-    color: white;
-    width: 100%;
-    padding: 0 20rpx;
-    transition: 1s;
-    opacity: 0;
-  }
-
-  .show {
-    opacity: 1;
-  }
-
-  .menu {
-    position: absolute;
-    top: 490rpx;
-    width: 750rpx;
-    // background-color: rgba(255, 255, 255, 0.7);
-    height: 250rpx;
-    // height: 140.19rpx;
-    // box-shadow: 0 0 100px 100px rgba(255, 255, 255, 0.5);
-    // box-shadow: 0 0 100rpx 30rpx rgba(255, 255, 255, 0.9);
-  }
-
-  .town_name {
-    margin-right: 50rpx;
-    // background-color: red;
-    max-width: 15vw;
-    white-space: nowrap;
-
-    overflow: hidden;
-
-    text-overflow: ellipsis;
-  }
-
-  .goods_list {
-    min-height: 95vh;
-    padding: 0 10rpx;
-    // background-color: red;
-
-    .goods {
-      display: flex;
-      padding: 21rpx;
-      background-color: white;
-      border-radius: 21.03rpx 21.03rpx 21.03rpx 21.03rpx;
-      margin-bottom: 20rpx;
-
-      .left {
-        width: 192.76rpx;
-        height: 192.76rpx;
-        border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx;
-        margin-right: 21rpx;
-      }
-
-      .right {
-        display: flex;
-        justify-content: space-between;
-        flex-direction: column;
-
-        .tit {
-          font-size: 29.79rpx;
-          color: black;
-          font-weight: bold;
-        }
-
-        .good_score {
-          font-size: 26rpx;
-          color: #b3b3b3;
-          margin-bottom: 15rpx;
-        }
-
-        .good_price {
-          display: flex;
-          justify-content: space-between;
-          align-items: center;
-          width: 60vw;
-
-          .good_price_r {
-            z-index: 9;
-          }
-
-          .good_price_l {
-            display: flex;
-
-            .old_price {
-              color: #b3b3b3;
-              text-decoration: line-through;
-              font-size: 26.29rpx;
-              margin-left: 15rpx;
-            }
-          }
-        }
-      }
-
-      // color: greenyellow;
-    }
-  }
-
-  .activeClass {
-    width: 400rpx;
-    height: 400rpx;
-  }
-
-  .act_swiper {
-    height: 200rpx;
-    position: fixed;
-    z-index: 99;
-    overflow: hidden;
-  }
-
-  .act_img {
-    // transition:t;
-    transform: translateY(-580rpx);
-    /* #ifdef APP-PLUS */
-    transform: translateY(-540rpx);
-    /* #endif */
-  }
-
-  // .act_swiper2 {
-  // 	height: 998rpx;
-  // }
-
-  .content_sift {
-    width: 750rpx;
-    padding: 22rpx 0;
-    // padding-top: 80rpx;
-    background-color: white;
-    display: flex;
-    justify-content: space-around;
-    // background-color: white;
-    // background-color: green;
-    z-index: 99;
-    box-sizing: border-box;
-    margin-bottom: 20rpx;
-  }
-
-  .swipers {
-    width: 750rpx;
-    height: 718.46rpx;
-  }
-
-  .card {
-    width: 720rpx;
-    z-index: 99;
-    // margin:auto;
-    left: 50%;
-    transform: translateX(-50%);
-    position: fixed;
-    // bottom: 0;
-    background-color: #333333;
-    height: 101.64rpx;
-    border-radius: 50.82rpx;
-    overflow: hidden;
-    color: white;
-    display: flex;
-    justify-content: space-between;
-    box-sizing: border-box;
-
-    .left {
-      display: flex;
-      align-items: center;
-      padding: 10rpx 35rpx;
-
-      .tot_price {
-        display: flex;
-        margin-left: 42rpx;
-        flex-direction: column;
-        justify-content: space-between;
-      }
-    }
-
-    .right {
-      font-size: 33.29rpx;
-      line-height: 50px;
-      background: linear-gradient(to right, #f84221, #ff6d20);
-      width: 140.19rpx;
-      text-align: center;
-    }
-  }
-
-  .badge {
-    position: absolute;
-    top: 0;
-    right: 0;
-    background-color: #f84221;
-    transform: translate(50%, -50%);
-    // padding: 10rpx 10rpx;
-    border-radius: 35rpx;
-    text-align: center;
-    width: 35rpx;
-    line-height: 35rpx;
-    height: 35rpx;
-  }
-
-  // .cloud_entrepot {
-  // 	background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/ycbg.png") no-repeat;
-  // 	background-size: cover;
-  // 	padding-bottom: 92.98rpx;
-  // }
-
-  // .head-wrapper {
-  // 	height: 485.96rpx;
-  // 	width: 100%;
-  // 	background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/top.png") no-repeat;
-  // 	background-size: cover;
-  // 	margin-bottom: 49.12rpx;
-  // }
-
-  // .town-title {
-  // 	margin: 0 auto;
-  // 	width: 100%;
-  // 	text-align: center;
-  // 	font-size: 50.88rpx;
-  // 	color: #fff;
-  // 	margin-bottom: 28.07rpx;
-
-  // 	&::after {
-  // 		content: '';
-  // 		display: inline-block;
-  // 		width: 66.67rpx;
-  // 		height: 31.58rpx;
-  // 		background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/you.png") no-repeat;
-  // 		background-size: cover;
-  // 		margin-left: 24.56rpx;
-  // 	}
-
-  // 	&::before {
-  // 		content: '';
-  // 		display: inline-block;
-  // 		width: 66.67rpx;
-  // 		height: 31.58rpx;
-  // 		background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/zuo.png") no-repeat;
-  // 		background-size: cover;
-  // 		margin-right: 24.56rpx;
-  // 	}
-  // }
-
-  // .body-wrapper {
-  // 	width: 694.74rpx;
-  // 	display: flex;
-  // 	justify-content: space-between;
-  // 	flex-wrap: wrap;
-  // 	margin: 0 auto;
-
-  // 	.item {
-  // 		width: 336.84rpx;
-  // 		height: 100%;
-  // 		padding: 24.56rpx 28.07rpx;
-  // 		margin-bottom: 21.05rpx;
-  // 		background-repeat: no-repeat;
-  // 		background-size: 100% 100%;
-  // 		box-sizing: border-box;
-
-  // 		text {
-  // 			display: block;
-  // 			font-size: 24.56rpx;
-  // 			color: #999;
-  // 			margin-bottom: 14.04rpx;
-  // 		}
-
-  // 		.item-title {
-  // 			font-size: 31.58rpx;
-  // 			color: #333;
-  // 		}
-
-  // 		.chakan-btn {
-  // 			width: 114.04rpx;
-  // 			height: 49.12rpx;
-  // 			font-size: 28.07rpx;
-  // 			text-align: center;
-  // 			line-height: 49.12rpx;
-  // 			color: #fff;
-  // 			margin-top: auto;
-  // 			background: linear-gradient(90deg, #FE5300 0%, #F84221 100%);
-  // 			border-radius: 50px;
-  // 		}
-  // 	}
-  // }
-
-  .empty {
-    // display: flex;
-    // justify-content: space-between;
-    // flex-direction: column;
-    // align-items: center;
-    // padding: 20vh 0;
-    position: relative;
-    height: 100vh;
-
-    .info {
-      position: absolute;
-      top: 20%;
-      left: 50%;
-      transform: translate(-50%, -50%);
-    }
-
-    // padding-top: 100px;
-  }
-
-  .head_r {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-  }
-
-  .cart {
-    z-index: 999;
-  }
-
-  .x_tra {
-    // position: relative;
-    z-index: 999999;
-    animation-name: addcatr;
-    animation-duration: 1s;
-    animation-timing-function: ease-in-out;
-    animation-iteration-count: 1;
-    animation-fill-mode: forwards; // animation-iteration-count: 1;
-    /* 设置为1 */
-    // transition: 1s cubic-bezier(0.5, -0.5, 1, 1);
-  }
-
-  .price_sift {
-    display: flex;
-    align-items: center;
-  }
-
-  .sl {
-    margin-left: 20rpx;
-    transform: rotate(180deg);
-    transition: 0.5s;
-  }
-
-  .actsl {
-    transform: rotate(0deg);
-  }
-
-  .actSel {
-    opacity: 1;
-    // transform: translateX(100rpx);
-  }
-
-  .yuncangempty {
-    margin: 20vh 0;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-  }
+	@keyframes addcart {
+		from {
+			// background-color: red;
+			opacity: 1;
+		}
+
+		to {
+			// background-color: yellow;
+			opacity: 0;
+		}
+	}
+
+	.serchbtn {
+		// position: absolute;
+		// right: 5rpx;
+		// top: 5rpx;
+		width: 100rpx;
+		height: 50rpx;
+		border-radius: 30rpx;
+		text-align: center;
+		line-height: 50rpx;
+		// background-color: #FEAB00;
+		background: linear-gradient(to right, #f84221, #ff6d20);
+	}
+
+	.selected-list {
+		padding: 24rpx 14rpx;
+		border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx;
+		background-color: #fff;
+		position: absolute;
+		left: 100rpx;
+		font-size: 29.79rpx;
+		z-index: 9999;
+		// top: 100rpx;
+		opacity: 0;
+		transition: 0.5s;
+
+		.triangle-up {
+			width: 0;
+			height: 0;
+			border-left: 10rpx solid transparent;
+			border-right: 10rpx solid transparent;
+			border-bottom: 10rpx solid white;
+			position: absolute;
+			top: -10rpx;
+		}
+
+		.selected-li {
+			margin-top: 35rpx;
+			color: #f84221;
+			display: flex;
+			align-items: center;
+		}
+	}
+
+	.sku {
+		padding: 20rpx;
+
+		.sku_head {
+			display: flex;
+
+			.sku_head_r {
+				margin-left: 20rpx;
+				display: flex;
+				justify-content: space-between;
+				flex-direction: column;
+
+				.sku_goods_tit {
+					font-size: 30rpx;
+					width: 60vw;
+					/* 容器的宽度 */
+					overflow: hidden;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+				}
+
+				.sku_goods_price {
+					color: red;
+					font-size: 30rpx;
+					font-weight: bold;
+				}
+			}
+
+			// justify-content;
+		}
+
+		.sku_size {
+			margin: 40rpx 0;
+
+			.size_li {
+				display: inline-block;
+				// width: 100rpx;
+				padding: 5rpx 20rpx;
+				margin-right: 20rpx;
+				text-align: center;
+				color: black;
+				border: 1px solid #ebecee;
+
+				// height: 2;
+			}
+
+			.act_size_li {
+				background-color: #ff5c2d;
+				color: white;
+				border: #ff5c2d 1px solid;
+			}
+		}
+
+		.sku_num {
+			display: flex;
+			justify-content: space-between;
+		}
+
+		.skuaddcart {
+			width: 50vw;
+			background-color: #feab00;
+			margin: 20rpx auto;
+			height: 80rpx;
+			line-height: 80rpx;
+			text-align: center;
+			color: white;
+			border-radius: 80rpx;
+			// margin-top: 20rpx;
+		}
+	}
+
+	.flags {
+		background-color: red;
+		z-index: 99999999;
+	}
+
+	.swiper_item {
+		display: flex;
+		justify-content: space-around;
+		transition: 0.5s;
+		padding: 40rpx;
+		// transform: scale(1.2);
+	}
+
+	.swiper_item_act {
+		transform: scale(1.2);
+	}
+
+	.swiper_item_act2 {
+		transform: scale(1.1);
+	}
+
+	// .swiper_item:hover {}
+
+	// .swiper_item {
+	// 	transform: scale(1.2);
+	// }
+
+	.swiper_b {
+		transition: 1s;
+	}
+
+	// .swiper_b:active {
+	// 	transform: scale(1.5);
+	// }
+
+	.act_cart {
+		transition: 0.5s;
+		transform: scale(1.1);
+	}
+
+	.box {
+		position: relative;
+
+		.content {
+			width: 100vw;
+			// transform: translateY(-100px);
+			border-radius: 50rpx 50rpx 0 0;
+			// position: absolute;
+			// top: 965rpx;
+			// border-top: 5px solid red;
+			z-index: 9999;
+			background-color: white;
+			// padding: 0 10rpx;
+		}
+
+		.active_swiper {
+			transform: scale(1.3);
+			// transform: translateX() translateY();
+		}
+
+		.pictrue {
+			position: relative;
+			width: 100%;
+			height: 345rpx;
+		}
+
+		.act {
+			color: #ff6d20;
+		}
+
+		.act_content {
+			width: 100vw;
+			// position: absolute;
+			// top: 965rpx;
+			z-index: 99;
+			background-color: #f4f4f4;
+			padding: 0 10rpx;
+
+			// transition: opt\ linear;
+			padding-top: 200rpx;
+		}
+
+		.act_class {
+			transition: 0.5s;
+		}
+
+		.act_class:active {
+			transform: scale(2);
+		}
+
+		.content_act {
+			width: 100vw;
+			position: absolute;
+			top: 165rpx;
+			z-index: 99;
+			background-color: #f4f4f4;
+			padding: 0 10rpx;
+		}
+	}
+
+	.fade-enter-active,
+	.fade-leave-active {
+		transition: opacity 0.5s;
+	}
+
+	.fade-enter,
+	.fade-leave-to {
+		opacity: 0;
+	}
+
+	.head_tits {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		box-sizing: border-box;
+		padding: 0 20rpx;
+		color: white;
+	}
+
+	.img_cls {
+		position: absolute;
+		top: 50%;
+		right: 5rpx;
+		transform: translateY(-50%);
+	}
+
+	.pop {
+		width: 615.07rpx;
+		padding: 30rpx 28rpx;
+
+		.pop_content {
+			width: 559rpx;
+			height: 80vh;
+			background-color: #f4f4f4;
+			padding: 28rpx;
+			border-radius: 21.03rpx 21.03rpx 0rpx 0rpx;
+			margin-top: 47rpx;
+
+			.pop_head {
+				// display: flex;
+			}
+
+			.pop_li {
+				display: flex;
+				margin-bottom: 52rpx;
+			}
+		}
+	}
+
+	.head_tit {
+		margin-left: 20rpx;
+		font-size: 40rpx;
+		// background-color: red;
+		width: 40vw;
+		white-space: nowrap;
+		overflow: hidden;
+
+		text-overflow: ellipsis;
+
+		// font-weight: 700;
+		// transform: skewX(-10deg);
+	}
+
+	.act {
+		color: red;
+	}
+
+	.head {
+		position: fixed;
+		z-index: 999;
+		color: white;
+		display: flex;
+		justify-content: space-between;
+		width: 100%;
+		padding: 0 20rpx;
+		align-items: center;
+		transition: 0.5s;
+	}
+
+	.heads {
+		position: fixed;
+		z-index: 100;
+		color: white;
+		width: 100%;
+		padding: 0 20rpx;
+		transition: 1s;
+		opacity: 0;
+	}
+
+	.show {
+		opacity: 1;
+	}
+
+	.menu {
+		position: absolute;
+		top: 490rpx;
+		width: 750rpx;
+		// background-color: rgba(255, 255, 255, 0.7);
+		height: 250rpx;
+		// height: 140.19rpx;
+		// box-shadow: 0 0 100px 100px rgba(255, 255, 255, 0.5);
+		// box-shadow: 0 0 100rpx 30rpx rgba(255, 255, 255, 0.9);
+	}
+
+	.town_name {
+		margin-right: 50rpx;
+		// background-color: red;
+		max-width: 15vw;
+		white-space: nowrap;
+
+		overflow: hidden;
+
+		text-overflow: ellipsis;
+	}
+
+	.goods_list {
+		min-height: 95vh;
+		padding: 0 10rpx;
+		// background-color: red;
+
+		.goods {
+			display: flex;
+			padding: 21rpx;
+			background-color: white;
+			border-radius: 21.03rpx 21.03rpx 21.03rpx 21.03rpx;
+			margin-bottom: 20rpx;
+
+			.left {
+				width: 192.76rpx;
+				height: 192.76rpx;
+				border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx;
+				margin-right: 21rpx;
+			}
+
+			.right {
+				display: flex;
+				justify-content: space-between;
+				flex-direction: column;
+
+				.tit {
+					font-size: 29.79rpx;
+					color: black;
+					font-weight: bold;
+				}
+
+				.good_score {
+					font-size: 26rpx;
+					color: #b3b3b3;
+					margin-bottom: 15rpx;
+				}
+
+				.good_price {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					width: 60vw;
+
+					.good_price_r {
+						z-index: 9;
+					}
+
+					.good_price_l {
+						display: flex;
+
+						.old_price {
+							color: #b3b3b3;
+							text-decoration: line-through;
+							font-size: 26.29rpx;
+							margin-left: 15rpx;
+						}
+					}
+				}
+			}
+
+			// color: greenyellow;
+		}
+	}
+
+	.activeClass {
+		width: 400rpx;
+		height: 400rpx;
+	}
+
+	.act_swiper {
+		height: 200rpx;
+		position: fixed;
+		z-index: 99;
+		overflow: hidden;
+	}
+
+	.act_img {
+		// transition:t;
+		transform: translateY(-580rpx);
+		/* #ifdef APP-PLUS */
+		transform: translateY(-540rpx);
+		/* #endif */
+	}
+
+	// .act_swiper2 {
+	// 	height: 998rpx;
+	// }
+
+	.content_sift {
+		width: 750rpx;
+		padding: 22rpx 0;
+		// padding-top: 80rpx;
+		background-color: white;
+		display: flex;
+		justify-content: space-around;
+		// background-color: white;
+		// background-color: green;
+		z-index: 99;
+		box-sizing: border-box;
+		margin-bottom: 20rpx;
+	}
+
+	.swipers {
+		width: 750rpx;
+		height: 718.46rpx;
+	}
+
+	.card {
+		width: 720rpx;
+		z-index: 99;
+		// margin:auto;
+		left: 50%;
+		transform: translateX(-50%);
+		position: fixed;
+		// bottom: 0;
+		background-color: #333333;
+		height: 101.64rpx;
+		border-radius: 50.82rpx;
+		overflow: hidden;
+		color: white;
+		display: flex;
+		justify-content: space-between;
+		box-sizing: border-box;
+
+		.left {
+			display: flex;
+			align-items: center;
+			padding: 10rpx 35rpx;
+
+			.tot_price {
+				display: flex;
+				margin-left: 42rpx;
+				flex-direction: column;
+				justify-content: space-between;
+			}
+		}
+
+		.right {
+			font-size: 33.29rpx;
+			line-height: 50px;
+			background: linear-gradient(to right, #f84221, #ff6d20);
+			width: 140.19rpx;
+			text-align: center;
+		}
+	}
+
+	.badge {
+		position: absolute;
+		top: 0;
+		right: 0;
+		background-color: #f84221;
+		transform: translate(50%, -50%);
+		// padding: 10rpx 10rpx;
+		border-radius: 35rpx;
+		text-align: center;
+		width: 35rpx;
+		line-height: 35rpx;
+		height: 35rpx;
+	}
+
+	// .cloud_entrepot {
+	// 	background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/ycbg.png") no-repeat;
+	// 	background-size: cover;
+	// 	padding-bottom: 92.98rpx;
+	// }
+
+	// .head-wrapper {
+	// 	height: 485.96rpx;
+	// 	width: 100%;
+	// 	background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/top.png") no-repeat;
+	// 	background-size: cover;
+	// 	margin-bottom: 49.12rpx;
+	// }
+
+	// .town-title {
+	// 	margin: 0 auto;
+	// 	width: 100%;
+	// 	text-align: center;
+	// 	font-size: 50.88rpx;
+	// 	color: #fff;
+	// 	margin-bottom: 28.07rpx;
+
+	// 	&::after {
+	// 		content: '';
+	// 		display: inline-block;
+	// 		width: 66.67rpx;
+	// 		height: 31.58rpx;
+	// 		background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/you.png") no-repeat;
+	// 		background-size: cover;
+	// 		margin-left: 24.56rpx;
+	// 	}
+
+	// 	&::before {
+	// 		content: '';
+	// 		display: inline-block;
+	// 		width: 66.67rpx;
+	// 		height: 31.58rpx;
+	// 		background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/zuo.png") no-repeat;
+	// 		background-size: cover;
+	// 		margin-right: 24.56rpx;
+	// 	}
+	// }
+
+	// .body-wrapper {
+	// 	width: 694.74rpx;
+	// 	display: flex;
+	// 	justify-content: space-between;
+	// 	flex-wrap: wrap;
+	// 	margin: 0 auto;
+
+	// 	.item {
+	// 		width: 336.84rpx;
+	// 		height: 100%;
+	// 		padding: 24.56rpx 28.07rpx;
+	// 		margin-bottom: 21.05rpx;
+	// 		background-repeat: no-repeat;
+	// 		background-size: 100% 100%;
+	// 		box-sizing: border-box;
+
+	// 		text {
+	// 			display: block;
+	// 			font-size: 24.56rpx;
+	// 			color: #999;
+	// 			margin-bottom: 14.04rpx;
+	// 		}
+
+	// 		.item-title {
+	// 			font-size: 31.58rpx;
+	// 			color: #333;
+	// 		}
+
+	// 		.chakan-btn {
+	// 			width: 114.04rpx;
+	// 			height: 49.12rpx;
+	// 			font-size: 28.07rpx;
+	// 			text-align: center;
+	// 			line-height: 49.12rpx;
+	// 			color: #fff;
+	// 			margin-top: auto;
+	// 			background: linear-gradient(90deg, #FE5300 0%, #F84221 100%);
+	// 			border-radius: 50px;
+	// 		}
+	// 	}
+	// }
+
+	.empty {
+		// display: flex;
+		// justify-content: space-between;
+		// flex-direction: column;
+		// align-items: center;
+		// padding: 20vh 0;
+		position: relative;
+		height: 100vh;
+
+		.info {
+			position: absolute;
+			top: 20%;
+			left: 50%;
+			transform: translate(-50%, -50%);
+		}
+
+		// padding-top: 100px;
+	}
+
+	.head_r {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+
+	.cart {
+		z-index: 999;
+	}
+
+	.x_tra {
+		// position: relative;
+		z-index: 999999;
+		animation-name: addcatr;
+		animation-duration: 1s;
+		animation-timing-function: ease-in-out;
+		animation-iteration-count: 1;
+		animation-fill-mode: forwards; // animation-iteration-count: 1;
+		/* 设置为1 */
+		// transition: 1s cubic-bezier(0.5, -0.5, 1, 1);
+	}
+
+	.price_sift {
+		display: flex;
+		align-items: center;
+	}
+
+	.sl {
+		margin-left: 20rpx;
+		transform: rotate(180deg);
+		transition: 0.5s;
+	}
+
+	.actsl {
+		transform: rotate(0deg);
+	}
+
+	.actSel {
+		opacity: 1;
+		// transform: translateX(100rpx);
+	}
+
+	.yuncangempty {
+		margin: 20vh 0;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/users/invite_code/index.vue b/pages/users/invite_code/index.vue
index 737d0d8..972861e 100644
--- a/pages/users/invite_code/index.vue
+++ b/pages/users/invite_code/index.vue
@@ -40,7 +40,7 @@
 			</view>
 
 			<view v-if="list.length == 0">
-				<emptyPage title="暂无邀请好友记录哦～"></emptyPage>
+				<emptyPage title="暂无邀请好友记录哦～" mt="60rpx"></emptyPage>
 			</view>
 		</view>
 	</view>
@@ -67,7 +67,7 @@
 				loadTitle: '加载更多',
 				isAuto: false, //没有授权的不会自动授权
 				isShowAuth: false, //是否隐藏授权
-				uid:''
+				uid: ''
 			}
 		},
 		onLoad() {
@@ -81,7 +81,7 @@
 		onReachBottom: function() {
 			this.getList();
 		},
-		
+
 		methods: {
 			// 获取二维码
 			getQrcode() {
@@ -113,15 +113,15 @@
 					that.loadTitle = '加载更多';
 				})
 			},
-			
+
 			getUserInfo() {
 				let userInfo = this.$Cache.get("USER_INFO");
-				if(userInfo){
+				if (userInfo) {
 					userInfo = JSON.parse(userInfo);
 					this.uid = userInfo.uid;
 				}
 			},
-			
+
 			handleSavePic() {
 				// 获取要保存的图片路径或URL
 				let imageUrl = this.qrcodeUrl; // 这里使用了网络上的图片作为示例
@@ -136,7 +136,7 @@
 				// #endif
 
 				// #ifndef H5
-				let that =this;
+				let that = this;
 				uni.downloadFile({
 					url: imageUrl,
 					success(res) {
@@ -273,9 +273,9 @@
 						font-family: PingFang SC, PingFang SC;
 						font-weight: 400;
 						color: #2E2E2E;
-						white-space:nowrap;
-						overflow:hidden;
-						text-overflow:ellipsis;
+						white-space: nowrap;
+						overflow: hidden;
+						text-overflow: ellipsis;
 					}
 
 					.red {
diff --git a/static/cloud_warehouse/dkbl.png b/static/cloud_warehouse/dkbl.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6b2cabe7d4cb0aaa275baf8f783d493bfa42b04
GIT binary patch
literal 2303
zcmV<b2mtqqP)<h;3K|Lk000e1NJLTq005f+0015c1^@s6I~;81000QaNkl<Zc%1EA
zX>1ln7=FImS`k4&D2hfw3jre)(F#WK1_7-W6(xwbA{s&P!U_>JQ7R|_G@ht<&>xCi
z2_E2uRt+9#yn-UNBFL#0Eudhj8S`xN=5=Ow_B&hSlYGg}?Cj3$>^txAyt7}Tv9S@&
z0IdPE7sIRr@QcT=+w<B0YXR(R4iDS}kPqOmbPglmQNLQ1dja@e)y)AgT$C#TRCx5c
zFMvFcc7Foc&f|*!Je)*dcLTUqluH17;c?yG01g1q5kL`-cLR7V;ySr<*8n)gqc2}v
z1z><^I}5-P%eD6dI9Qac04zwNKQrf(04xHq5WuGZ4hw1j4S;%8H=A>5u)-y5hpMuV
zaQNbLH5o2E0^qtd_A6l~t-lbaP5?TvYy_*N<(hRK!WM>80Tjn*U!`7NZvaC@`7OtF
zMj(5N@`@zKdlrB$0B+!KDu7!;+V=xct?J6DTnzSh3EO`i1C*xpK~aixa;35aQFzs&
zDYAt^00Tu|I{++=5H^F!0NU~RUzSG-+ihGuHW+od6~JXVdU%ad04`8<M%|CgV4nr_
z0k>qZkEVi?0PG{i@;U`B3d4ofx<|K_!gd0HGaWZ8r?52@wBb)eY96CSh5_iV+B{C7
ztV{AaY{F)=<WZKkCNLS#W8>d8CzPwPE=tGPb7@AmTQp^FYS>g^e52DX_vj0t#^PIm
zEBALLv?~ET3Sc9EpBT+*l&c^lKpO@!2JfZenbL(5Y3jm)2Ca0K0oa4{c7mv1B9u_1
z#?Pg&?cz&#m*quN*SWwHYN4JCU;-Ecn~|aMn0x;r%AM03h}kfP(dtevye}<ndRqdx
zKN(%WB7|)lfU|kd3sTsOGy1D2x27~_68R$XP1ONU1-p6eW_6E_8SL{yrD5wt<mQ9!
zN_!hl>}|(&d(nlsm}TRC&IeFxaVcD`l))fz{1t#BMEUEeF-u_^CXUSt|5ypz^AYzl
z5ArmCZ=*U*1AKY5xX`Aced@Q&7{>4yV5`NC1-ZWWEWuwf>6J174Wj-W$AFFLJx-L5
zrHlk9iF#0*+Ad)9xu>YB@$jV%B=^%Ts?#jM2x5X<okR)AN*9cF_*tCW&ts@Y@Q>k7
zVuPsvEQfP3DuiWNqhz2{NZWy_S~{E0R-rmHtoRi)vkAqLYjmQ(osuODmoAhGcD#kS
zXFko%E|$&9xmoqOhCdDC7k$!1pV#<`*8_M`)tB)d+i*szooZn-=5vCo`+?DjiDG8b
zT!y85(kXDobeuJX(OLN`bxNhjMR!Xd0VECJlj>^fFbm^+03TV#S>_mfo+5dZf)qAm
zKA%<QGw7%-fae&ce8@aq7}6zhS31o1Fy&)bGhGq|Ls3jib<#XxobnMg#hHj`tCdsk
zL%P1ndDDRqNaCLAxUN(MaDgil@P{VAS|8Q96t)T`+%=34J|V*41XuXrh<oSCq#jO3
zwnRlwps=N)0X57b?7^t4hdNip1!{!g!8G<6pvvNtx?o(N2e@z>9BoclE`)@9*MHHq
zxLwq(h{LlTX)&JxOk(;xQ68_jr~sRp%$CT7z+LYkSp$@CheA3q9l#|K_h~`1pDWbU
zLc9>sf1i+Za<@r76_c#9?LPSz@*L5p3rpy?+3*x6Un7wPvQi?-ud;>cl^kcnl5D<J
zoYU7va!Z8Pdf7y!hoFH1)Qtg9tvc69l_#p`+gsSm9Ol!8t|1d=RP~KY;MUU*Sn0UN
zrM6v|OLB5{NSi2{;mC;d+8k(YEn#EeZ7`-iS8$n48&=WWz8}#}Dv)}Q_W!_KFb}{G
z=Km0~PYT@MR86yJLnC)yO!p8psN86O2Pr9GHbY(mU~EX6FGJ{=88mxgnpQi{VO(37
zW;67{Gt?NyF>lVW<%9#gC8(iL1e3mit8bce{A@63tX2_i#&IV^n4lFZ->L)EbE+`O
z^m_q}wCq+eywYNko|0(E`Ow1F&eAqOKnu;X@Nb*Am@1nP-<HQ9;iwQk&4%M?)y}mD
z-fM9>4`BB6-^2u~#0HwL0AoG3oNRQ|SJ4#KT5^Gg>$;13)n@rVgas2BL9g>{e>8o)
z(JF(02+d}M_GAE8)BH4blyZZki5`FCd)VJ|%-=Bz9j)q@`aZLd<GzzGe+onGhf<u-
z3T`uYC7sQ#f)`WR&YTST(?z()qP06vyS=QoTjv`2oU1#zTc*HcJTl3CAYF>MyMeoi
z<66ZstYK=i#`dv{?-rv*QXX+sZx}8mr4nGhD4)h;@WM3p6$dTpZ|)K=uN}WV7(`$7
zcD70Nv$R&^=>o)^+v!SK^l|Ldld$bmiz{rB^3WzUlvs~TNu=YuzkEe6EVCrXr#h&Z
zgSaIrinq$=i!8L9Ya2mG*Qys##PklB6_}tR)CBL@7V+>hU6<h3+HrLOH*gM7_4?fn
zfE~xue;sYvQM@?jm<zdOJb<?ewGB8M7^*%Ao6Lx2o~Y|;@eRNiwAzE-=*t&)h2`9Q
zemP{rBs%pje-qqAu}PF$3xUZ5cF`}4@~!$i>W5G>&$MXIxWd*?&{c*~dBf6X4wX`)
zc9pU%YzdX?Tp?8P&1&cB#0ZWnSxj_9qu`54IC6&|zc<%$E|c&fO-mypXN{GX?}MWt
z1$uehZ#l9pY=adGUn!2i=a%IFZ9Gyz$)H-~Dr;5htrtzEEzeh@HY;WmVZyeSi{K))
zSfdbEt3hou^2!=WWcwS03&pXCVqQ|`?*ni-Bc*x#C}u<k#$o)f-xy){rr!ug-o+OB
zqk-el{|b;Tye)#3?fh=zHTq1xSqzQ1!q!nKidg;{9KzP1zD00-!naMe^V#BZ8GWV-
z`Vrck)swT@!3iGd$(89`UcG}z4aR83eg}`=;fEYsNF&tn+*%6VCi03Oc#I<qBe_Yy
z7joX~$#1TrpoM9$xgKNP?Gd?Z{K4$a04~twj&^T4BHS->`NuMOA-+?#k@i1P`5y`Z
Z{suT6(58=^#O?q9002ovPDHLkV1h3*RG$C<

literal 0
HcmV?d00001

diff --git a/static/cloud_warehouse/dw.png b/static/cloud_warehouse/dw.png
new file mode 100644
index 0000000000000000000000000000000000000000..67abeb148669223ee672892985078da1d69e5202
GIT binary patch
literal 1031
zcmV+i1o-=jP)<h;3K|Lk000e1NJLTq001Tc001Tk1^@s6s6FYf000BdNkl<ZScUCa
zTZm3k6#o7ZGDyt0jcaCxG=_4G$b;MxC6PDs;z7#8c#@Qa2aQ5<%k@Q3uF<%@@ZgqP
zp`mGp48{nJ+sxq8(s#7m&VM<-^Lvn0tNs6b?X}i-_FiYLbvFLfze0(0&p|TXl6(N=
z0D1%X4B$C{Y5*;%loE-wuG0fc!V^iJCfUs2=_AR*B!?%{|6>X<T0ruM1LZr(J0y>j
zJW2AQBl|{j2g&?g1M5q&T27ltt|nO&0)7z5N@q8(k?fKyVD{8^<>(g4{wa<*;1MKi
zrE`vCn_K`}CkGGwr%%JS%P*z7G;UzM6wnqkBO`zcc#eS8lk5;Du$3}=G|6#QDV{!&
zJVvrOWZezfSP&<$DjA*cIV&gmAtYTikR0Hxt&nU_oWP#S=wQ#;Da~8@C?wg(d5GQK
z+Nqkq5+|^CGTPO1)};ADXKtA0szZ+4=w2qk@-oENq_LAX->R{LGZ*~+=B@4Q*@^{N
zKtsI$RT>Wh7ztnkfSsB<>#Z%-*e0USaMCes*D)OMj%T2gqg<+1>2lXzl6+O1F=ko*
zt5QO#=g<Ov7s<z}la*e~8BY?Zw?T4_3mEj48C@os7a_S?LVYCN)ww81b~G>KU_}IA
zo27G~Wcyro7qjKWGW?JXKuuN|Yw=52+`x?Y3fwifTL|G!Bx|&GjW5sEc`CNxt#jY7
zB)n5=Zjx*p#YZ||R){x|+)uKdC!3<qwOJY6*PSl;7m{V3EKliYb4ZCx39Ki{eI#4;
z#4T!j{B>I-zv}_Fvh_@|l}V2HljIhEhx{%$446IX8!0s_p30N#Xh)~bUhm8w)ZEn+
zF<2%*Elz%$lML8wB~hcZBug@ghw;)e9!GMn^go0o;xHcIbSP$Ho)4_R*{KaA6A^-S
zqti{i((mOF^v%~==~=hZ%LTSff(sErK}qwTQztKGVZ-=@^ef<W7bP04BZ!*)ngJ}*
zm$$VvOR}(GbU|aW3+%DRSy>n~x~-OH9DuqkZOrhn{5;BTBpbDrm1#11+?=Pk+UUKd
zD;JpYOy|qldZ(d(0hF~<XXLXrNEtpbD5Ezxudg+RV{-s#l-j6ZBO0|ap?NIet|~?D
zEzT2_k%ejuqXH??_vBV5DF;b>o8MR>xF2J9weJUDvEI01PxcnT6WxWq)_>PXHvruM
z6iK(h)34Ka!d?KizGJ&PO9kxLIsl^qOam|;z!(5MQYnN`BY>L#t^zm@;CiZ*k}0q-
zvK_Fm9=k=f-?l@+6`>ik9W*fY0BW?W8B-#Wzz+w1#fc!t!}kCH002ovPDHLkV1oMN
B==T5s

literal 0
HcmV?d00001

diff --git a/static/images/dingwei.webp b/static/images/dingwei.webp
new file mode 100644
index 0000000000000000000000000000000000000000..bee49dc0c6287cbeddacdbfe5768b53d6c8503ee
GIT binary patch
literal 1170
zcmWIYbaU%sVPFV%bqWXzu!!JdU|=u+Vr2#fMFs{>XXk(uj6f~};|UPS0+h<lD=7+c
zcT$Lmj8b5Kz`zKEV33$xTmWHVC4s8GU4y8-tcz6zenHNZ)Z%2Ik`F+vQUtUd=q3>$
zTO=LA)&Q}SAZ!~DyS${J1gIte#4ZX6at5+ffNYI)Bz6)KJGr0;q`n8J#wItX6l50&
zfPBZ3nim=jq&a|ChM|}th{2t~3FLnu9|-anF)&zsWnf^QfDlWX$-uC^m4QLx7D7yA
z0Rsbn3j@Qp^9V6Sm=q)yC4!9u#s&jZS{ehxr{xR`ypaqH!WS4AxT3*wKmv!`6o67P
zKzHQ>VLC$&Ln?y;gC|2CLo$ONkYxmnR6_<cU<~`rW@2E_S9ahK=wG@ZSNh~1&-<72
zB%am(ySOd)c7)2#V9}kqw`DGS)-so~0gY@h?JZ{D;W=X|;-J#%z@fl!@7J=!?hMWG
z!e198DJLvkQ&^E5{(8goiQC@)Zs_>z7@(_jEQw)4!tHH}p4)S7Z(F<V6wuslx#8v0
zOWSYAP82k3>G)?{aN8rW{JVtF4^W6QI2<|f_An6mhJ$zvGnFsbeJagO$ap>XeQy=l
z^uK!l(`I#Zbjj^VS(EWHx8SOy=%L3A!BSo!$8v==x!Q}>G$YLX^Y<w+@RnYj{-|Q9
z_Ii_V9PyuKR@A*H7v`Au(>G4|57U9yeed7zDPoy$$gNWLGUow~-92ZH-(*qfDgN}!
zTbbdz3A4>k{TYXNE9VCM_@w)mu|AKP<7v|#KS{;~voFW}(_X{yVXpV5RjJwx%Z(@9
zF=jS6tRu<!exKb=rVZKmZm%>Go_k+Piz7}r{pwPUlJXggRoKs*o1x<xc+ywa^`yw@
z>T<zmfhpV5<6Av%9&+_HY&@t~JoVYOixXFIzuvh>_5Zr!%;gECKYmZ%-XQq(-wQ^E
zz55RNem$}2>s0-1Opd14w=zx^Ue@`h@=0`iZ-(o=4?B-Ww=CFynrXq@&yVhW&#8Da
z--3ZtU#2|FRQ1VMQ;Wv(b*p6hnrnXZe74sKn*7N_u>AZ?jhBmT?nS8<2KfrPrca&|
zHu>9Qfy<}<|8zaHb&*o#zS1d-KacJ@@_&bsj$>TWM~T#3FL}NH`#-gH)}6mytfTT#
zOZTgw2`dlRbc!#kI{AE?L#lh7Z~vY?vGnA-#yjJ`9t>M1UbFV5YJAihRV%lH8v~^G
zPya3D#l`I{RW&`2rEhYQy5xM8l-}40DxO^5^^R|D{(rT3kr2nfAIhrA%3q%^S19(B
HV_*OPb+U#x

literal 0
HcmV?d00001