From 3a21e2ca7f99f3d894d12cafc83fff621138f89c Mon Sep 17 00:00:00 2001
From: zhengshuiqi <zhengshiqi@xingtongworld.com>
Date: Fri, 11 Nov 2022 16:56:03 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E6=AC=A1=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/index.js                   |    3 +-
 manifest.json                  |  298 +--
 pages.json                     |   31 +-
 pages/account/deleteCount.vue  |    6 +-
 pages/account/index.vue        |   35 +-
 pages/account/message.vue      |  128 +-
 pages/account/myProfile.vue    |   14 +-
 pages/category/index.vue       |    8 +-
 pages/category/productList.vue |   19 +-
 pages/index/address.vue        |    8 +-
 pages/index/index.vue          | 3213 +++++++++++++++++---------------
 pages/index/index2.vue         |    1 -
 pages/index/search.vue         |    1 +
 pages/login/index.vue          |    4 +-
 pages/productDetails/index.vue |   32 +-
 pages/shippingCart/index.vue   |   12 +-
 static/img/message.png         |  Bin 0 -> 8560 bytes
 17 files changed, 2036 insertions(+), 1777 deletions(-)
 create mode 100644 static/img/message.png

diff --git a/api/index.js b/api/index.js
index 0aa6ba0..b9d614c 100644
--- a/api/index.js
+++ b/api/index.js
@@ -73,4 +73,5 @@ export const defaultRequest5 =(query,comments)=>{
 		isLoad:true,
 		comments:comments
 	})
-}
\ No newline at end of file
+}
+// 银行支付
diff --git a/manifest.json b/manifest.json
index 9413c77..dfe9f4c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -43,7 +43,8 @@
             "Payment" : {},
             "VideoPlayer" : {},
             "Contacts" : {},
-            "Speech" : {}
+            "Speech" : {},
+            "iBeacon" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
@@ -53,6 +54,8 @@
                     "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
+                    "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
@@ -67,10 +70,12 @@
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
+                    "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
                 ],
                 "autoSdkPermissions" : true,
-                "minSdkVersion" : 21,
+                "minSdkVersion" : 26,
                 "targetSdkVersion" : 31,
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ]
             },
@@ -106,7 +111,37 @@
                     "xhdpi" : "unpackage/res/icons/dope2.png",
                     "xxhdpi" : "unpackage/res/icons/dope2.png"
                 },
-                "useOriginalMsgbox" : false
+                "useOriginalMsgbox" : false,
+                "iosStyle" : "default",
+                "ios" : {
+                    "iphone" : {
+                        "retina47" : "unpackage/res/icons/dope2.png",
+                        "portrait-896h@3x" : "unpackage/res/icons/dope2.png",
+                        "landscape-896h@3x" : "unpackage/res/icons/dope2.png",
+                        "portrait-896h@2x" : "unpackage/res/icons/dope2.png",
+                        "landscape-896h@2x" : "unpackage/res/icons/dope2.png",
+                        "iphonex" : "unpackage/res/icons/dope2.png",
+                        "iphonexl" : "unpackage/res/icons/dope2.png",
+                        "retina55" : "unpackage/res/icons/dope2.png",
+                        "retina55l" : "unpackage/res/icons/dope2.png",
+                        "retina47l" : "unpackage/res/icons/dope2.png",
+                        "retina40" : "unpackage/res/icons/dope2.png",
+                        "retina40l" : "unpackage/res/icons/dope2.png",
+                        "retina35" : "unpackage/res/icons/dope2.png"
+                    },
+                    "ipad" : {
+                        "portrait-1366h@2x" : "unpackage/res/icons/dope2.png",
+                        "landscape-1366h@2x" : "unpackage/res/icons/dope2.png",
+                        "portrait-1194h@2x" : "unpackage/res/icons/dope2.png",
+                        "landscape-1194h@2x" : "unpackage/res/icons/dope2.png",
+                        "portrait-1112h@2x" : "unpackage/res/icons/dope2.png",
+                        "landscape-1112h@2x" : "unpackage/res/icons/dope2.png",
+                        "portrait-retina7" : "unpackage/res/icons/dope2.png",
+                        "landscape-retina7" : "unpackage/res/icons/dope2.png",
+                        "portrait7" : "unpackage/res/icons/dope2.png",
+                        "landscape7" : "unpackage/res/icons/dope2.png"
+                    }
+                }
             },
             "icons" : {
                 "android" : {
@@ -141,135 +176,134 @@
                 }
             }
         },
-        "nativePlugins" : {
-            "JG-JCore" : {
-                "JPUSH_APPKEY_IOS" : "",
-                "JPUSH_CHANNEL_IOS" : "",
-                "JPUSH_APPKEY_ANDROID" : "f7c642155be0cdfa97fb3d75",
-                "JPUSH_CHANNEL_ANDROID" : "f7c642155be0cdfa97fb3d75",
-                "__plugin_info__" : {
-                    "name" : "JG-JCore",
-                    "description" : "极光推送JCore插件",
-                    "platforms" : "Android,iOS",
-                    "url" : "",
-                    "android_package_name" : "com.lilbeat.dopeplus",
-                    "ios_bundle_id" : "com.lilbeat.dopeplus",
-                    "isCloud" : false,
-                    "bought" : -1,
-                    "pid" : "",
-                    "parameters" : {
-                        "JPUSH_APPKEY_IOS" : {
-                            "des" : "[iOS]极光portal配置应用信息时分配的AppKey",
-                            "key" : "f7c642155be0cdfa97fb3d75",
-                            "value" : ""
-                        },
-                        "JPUSH_CHANNEL_IOS" : {
-                            "des" : "[iOS]用于统计分发渠道，不需要可填默认值developer-default",
-                            "key" : "JCore:CHANNEL",
-                            "value" : ""
-                        },
-                        "JPUSH_APPKEY_ANDROID" : {
-                            "des" : "[Android]极光portal配置应用信息时分配的AppKey",
-                            "key" : "f7c642155be0cdfa97fb3d75",
-                            "value" : ""
-                        },
-                        "JPUSH_CHANNEL_ANDROID" : {
-                            "des" : "[Android]用于统计分发渠道，不需要可填默认值developer-default",
-                            "key" : "JPUSH_CHANNEL",
-                            "value" : ""
-                        }
-                    }
-                }
-            },
-            "JG-JPush" : {
-                "JPUSH_ISPRODUCTION_IOS" : "",
-                "JPUSH_ADVERTISINGID_IOS" : "",
-                "JPUSH_DEFAULTINITJPUSH_IOS" : "",
-                "JPUSH_OPPO_APPKEY" : "",
-                "JPUSH_OPPO_APPID" : "",
-                "JPUSH_OPPO_APPSECRET" : "",
-                "JPUSH_VIVO_APPKEY" : "",
-                "JPUSH_VIVO_APPID" : "",
-                "JPUSH_MEIZU_APPKEY" : "",
-                "JPUSH_MEIZU_APPID" : "",
-                "JPUSH_XIAOMI_APPKEY" : "",
-                "JPUSH_XIAOMI_APPID" : "",
-                "__plugin_info__" : {
-                    "name" : "JG-JPush",
-                    "description" : "极光推送Hbuilder插件",
-                    "platforms" : "Android,iOS",
-                    "url" : "",
-                    "android_package_name" : "com.lilbeat.dopeplus",
-                    "ios_bundle_id" : "com.lilbeat.dopeplus",
-                    "isCloud" : false,
-                    "bought" : -1,
-                    "pid" : "",
-                    "parameters" : {
-                        "JPUSH_ISPRODUCTION_IOS" : {
-                            "des" : "[iOS]是否是生产环境，是填true，不是填false或者不填",
-                            "key" : "JPush:ISPRODUCTION",
-                            "value" : ""
-                        },
-                        "JPUSH_ADVERTISINGID_IOS" : {
-                            "des" : "[iOS]广告标识符（IDFA）如果不需要使用IDFA，可不填",
-                            "key" : "JPush:ADVERTISINGID",
-                            "value" : ""
-                        },
-                        "JPUSH_DEFAULTINITJPUSH_IOS" : {
-                            "des" : "[iOS]是否默认初始化，是填true，不是填false或者不填",
-                            "key" : "JPush:DEFAULTINITJPUSH",
-                            "value" : ""
-                        },
-                        "JPUSH_OPPO_APPKEY" : {
-                            "des" : "厂商OPPO-appkey,示例：OP-12345678",
-                            "key" : "OPPO_APPKEY",
-                            "value" : ""
-                        },
-                        "JPUSH_OPPO_APPID" : {
-                            "des" : "厂商OPPO-appId,示例：OP-12345678",
-                            "key" : "OPPO_APPID",
-                            "value" : ""
-                        },
-                        "JPUSH_OPPO_APPSECRET" : {
-                            "des" : "厂商OPPO-appSecret,示例：OP-12345678",
-                            "key" : "OPPO_APPSECRET",
-                            "value" : ""
-                        },
-                        "JPUSH_VIVO_APPKEY" : {
-                            "des" : "厂商VIVO-appkey,示例：12345678",
-                            "key" : "com.vivo.push.api_key",
-                            "value" : ""
-                        },
-                        "JPUSH_VIVO_APPID" : {
-                            "des" : "厂商VIVO-appId,示例：12345678",
-                            "key" : "com.vivo.push.app_id",
-                            "value" : ""
-                        },
-                        "JPUSH_MEIZU_APPKEY" : {
-                            "des" : "厂商MEIZU-appKey,示例：MZ-12345678",
-                            "key" : "MEIZU_APPKEY",
-                            "value" : ""
-                        },
-                        "JPUSH_MEIZU_APPID" : {
-                            "des" : "厂商MEIZU-appId,示例：MZ-12345678",
-                            "key" : "MEIZU_APPID",
-                            "value" : ""
-                        },
-                        "JPUSH_XIAOMI_APPKEY" : {
-                            "des" : "厂商XIAOMI-appKey,示例：MI-12345678",
-                            "key" : "XIAOMI_APPKEY",
-                            "value" : ""
-                        },
-                        "JPUSH_XIAOMI_APPID" : {
-                            "des" : "厂商XIAOMI-appId,示例：MI-12345678",
-                            "key" : "XIAOMI_APPID",
-                            "value" : ""
-                        }
-                    }
-                }
-            }
-        }
+        "nativePlugins" : {}
     },
+    //           "JG-JCore" : {
+    //               "JPUSH_APPKEY_IOS" : "",
+    //               "JPUSH_CHANNEL_IOS" : "",
+    //               "JPUSH_APPKEY_ANDROID" : "f7c642155be0cdfa97fb3d75",
+    //               "JPUSH_CHANNEL_ANDROID" : "f7c642155be0cdfa97fb3d75",
+    //               "__plugin_info__" : {
+    //                   "name" : "JG-JCore",
+    //                   "description" : "极光推送JCore插件",
+    //                   "platforms" : "Android,iOS",
+    //                   "url" : "",
+    //                   "android_package_name" : "com.lilbeat.dopeplus",
+    //                   "ios_bundle_id" : "com.lilbeat.dopeplus",
+    //                   "isCloud" : false,
+    //                   "bought" : -1,
+    //                   "pid" : "",
+    //                   "parameters" : {
+    //                       "JPUSH_APPKEY_IOS" : {
+    //                           "des" : "[iOS]极光portal配置应用信息时分配的AppKey",
+    //                           "key" : "f7c642155be0cdfa97fb3d75",
+    //                           "value" : ""
+    //                       },
+    //                       "JPUSH_CHANNEL_IOS" : {
+    //                           "des" : "[iOS]用于统计分发渠道，不需要可填默认值developer-default",
+    //                           "key" : "JCore:CHANNEL",
+    //                           "value" : ""
+    //                       },
+    //                       "JPUSH_APPKEY_ANDROID" : {
+    //                           "des" : "[Android]极光portal配置应用信息时分配的AppKey",
+    //                           "key" : "f7c642155be0cdfa97fb3d75",
+    //                           "value" : ""
+    //                       },
+    //                       "JPUSH_CHANNEL_ANDROID" : {
+    //                           "des" : "[Android]用于统计分发渠道，不需要可填默认值developer-default",
+    //                           "key" : "JPUSH_CHANNEL",
+    //                           "value" : ""
+    //                       }
+    //                   }
+    //               }
+    //           },
+    //           "JG-JPush" : {
+    //               "JPUSH_ISPRODUCTION_IOS" : "",
+    //               "JPUSH_ADVERTISINGID_IOS" : "",
+    //               "JPUSH_DEFAULTINITJPUSH_IOS" : "",
+    //               "JPUSH_OPPO_APPKEY" : "",
+    //               "JPUSH_OPPO_APPID" : "",
+    //               "JPUSH_OPPO_APPSECRET" : "",
+    //               "JPUSH_VIVO_APPKEY" : "",
+    //               "JPUSH_VIVO_APPID" : "",
+    //               "JPUSH_MEIZU_APPKEY" : "",
+    //               "JPUSH_MEIZU_APPID" : "",
+    //               "JPUSH_XIAOMI_APPKEY" : "",
+    //               "JPUSH_XIAOMI_APPID" : "",
+    //               "__plugin_info__" : {
+    //                   "name" : "JG-JPush",
+    //                   "description" : "极光推送Hbuilder插件",
+    //                   "platforms" : "Android,iOS",
+    //                   "url" : "",
+    //                   "android_package_name" : "com.lilbeat.dopeplus",
+    //                   "ios_bundle_id" : "com.lilbeat.dopeplus",
+    //                   "isCloud" : false,
+    //                   "bought" : -1,
+    //                   "pid" : "",
+    //                   "parameters" : {
+    //                       "JPUSH_ISPRODUCTION_IOS" : {
+    //                           "des" : "[iOS]是否是生产环境，是填true，不是填false或者不填",
+    //                           "key" : "JPush:ISPRODUCTION",
+    //                           "value" : ""
+    //                       },
+    //                       "JPUSH_ADVERTISINGID_IOS" : {
+    //                           "des" : "[iOS]广告标识符（IDFA）如果不需要使用IDFA，可不填",
+    //                           "key" : "JPush:ADVERTISINGID",
+    //                           "value" : ""
+    //                       },
+    //                       "JPUSH_DEFAULTINITJPUSH_IOS" : {
+    //                           "des" : "[iOS]是否默认初始化，是填true，不是填false或者不填",
+    //                           "key" : "JPush:DEFAULTINITJPUSH",
+    //                           "value" : ""
+    //                       },
+    //                       "JPUSH_OPPO_APPKEY" : {
+    //                           "des" : "厂商OPPO-appkey,示例：OP-12345678",
+    //                           "key" : "OPPO_APPKEY",
+    //                           "value" : ""
+    //                       },
+    //                       "JPUSH_OPPO_APPID" : {
+    //                           "des" : "厂商OPPO-appId,示例：OP-12345678",
+    //                           "key" : "OPPO_APPID",
+    //                           "value" : ""
+    //                       },
+    //                       "JPUSH_OPPO_APPSECRET" : {
+    //                           "des" : "厂商OPPO-appSecret,示例：OP-12345678",
+    //                           "key" : "OPPO_APPSECRET",
+    //                           "value" : ""
+    //                       },
+    //                       "JPUSH_VIVO_APPKEY" : {
+    //                           "des" : "厂商VIVO-appkey,示例：12345678",
+    //                           "key" : "com.vivo.push.api_key",
+    //                           "value" : ""
+    //                       },
+    //                       "JPUSH_VIVO_APPID" : {
+    //                           "des" : "厂商VIVO-appId,示例：12345678",
+    //                           "key" : "com.vivo.push.app_id",
+    //                           "value" : ""
+    //                       },
+    //                       "JPUSH_MEIZU_APPKEY" : {
+    //                           "des" : "厂商MEIZU-appKey,示例：MZ-12345678",
+    //                           "key" : "MEIZU_APPKEY",
+    //                           "value" : ""
+    //                       },
+    //                       "JPUSH_MEIZU_APPID" : {
+    //                           "des" : "厂商MEIZU-appId,示例：MZ-12345678",
+    //                           "key" : "MEIZU_APPID",
+    //                           "value" : ""
+    //                       },
+    //                       "JPUSH_XIAOMI_APPKEY" : {
+    //                           "des" : "厂商XIAOMI-appKey,示例：MI-12345678",
+    //                           "key" : "XIAOMI_APPKEY",
+    //                           "value" : ""
+    //                       },
+    //                       "JPUSH_XIAOMI_APPID" : {
+    //                           "des" : "厂商XIAOMI-appId,示例：MI-12345678",
+    //                           "key" : "XIAOMI_APPID",
+    //                           "value" : ""
+    //                       }
+    //                   }
+    //               }
+    //           }
     /* 快应用特有相关 */
     "quickapp" : {},
     /* 小程序特有相关 */
diff --git a/pages.json b/pages.json
index 9119fd7..1054601 100644
--- a/pages.json
+++ b/pages.json
@@ -6,8 +6,15 @@
 			"style": {
 				"navigationBarTitleText": "uni-app",
 				"enablePullDownRefresh":true,
+				
 				"app-plus":{
-					"titleNView":false
+					"titleNView":false,
+					"bounce": "none",
+					"pullToRefresh": {
+						"style": "circle",
+						"color": "#aa0000"
+					}
+					// "renderer": "native"
 				},
 				"navigationBarTextStyle":"white"
 			}
@@ -17,6 +24,7 @@
 			"style": {
 				"navigationStyle":"custom",
 				"app-plus": {
+					// "renderer": "native",
 					"safearea":{
 						 "background" : "none", 
 						"bottom":{
@@ -145,7 +153,8 @@
 		{
 			"path": "pages/login/index",
 			"style": {
-				"navigationStyle":"custom"
+				"navigationStyle":"custom",
+				"navigationBarBackgroundColor":"#000000"
 				// "navigationBarTextStyle":"white"
 			}
 		},
@@ -365,8 +374,21 @@
 	"globalStyle": {
 		"navigationBarBackgroundColor": "#000000",
 		"navigationBarTextStyle": "white",
-		"navigationBarTitleText": "DOPE PLUS"
-		
+		"navigationBarTitleText": "DOPE PLUS",
+		"enablePullDownRefresh": true,
+		"app-plus": {
+			// 将回弹属性关掉
+			"bounce": "none",
+	        "usingComponents" : false,
+			"optimization": {
+			    "subPackages": true
+			},
+			"pullToRefresh": {
+				"style": "circle",
+				"color": "#aa0000"
+			},
+			"runmode" : "liberate" // 开启分包优化后，必须配置资源释放模式
+		}
 	},
 	"tabBar": {
 		"borderStyle": "white",
@@ -408,6 +430,7 @@
 						"iconPath": "static/img/Account.png",
 						"selectedIconPath": "static/img/Account1.png",
 						"text": "Account"
+						
 				}
 		]
 		
diff --git a/pages/account/deleteCount.vue b/pages/account/deleteCount.vue
index 1122383..6e4e83e 100644
--- a/pages/account/deleteCount.vue
+++ b/pages/account/deleteCount.vue
@@ -1,7 +1,9 @@
 <template>
 	<view>
 		<view class="font">
-			<uni-icons type="arrow-left" size="30" @click="back" color="#fff"></uni-icons>
+			<!-- <uni-icons type="arrow-left" size="30" @click="back" color="#fff"></uni-icons> -->
+			<uni-icons type="back" size="30" @click="back" style="font-weight: 100;" color="#fff"></uni-icons>
+			
 			<text style="margin-left: 30rpx;color: white;">Delete account</text>
 		</view>
 		<view class="text_item">
@@ -103,7 +105,7 @@
 	 text-align: start;
 	 margin-left: 5vw;
 	 margin-right: 3vw;
-	 color:#b5b5b5;
+	 color:#818181;
 	 font-size:26rpx; 
 	}
 	.address_foot{
diff --git a/pages/account/index.vue b/pages/account/index.vue
index c911fcd..b5d2ae1 100644
--- a/pages/account/index.vue
+++ b/pages/account/index.vue
@@ -9,14 +9,14 @@
 			<image src="../../static/icon/nologin2.png" mode="" class="header_img" v-show="!user_info.isLogin||!user_info.user_head"></image>
 			<image :src="user_info.user_head" mode="" class="header_img" v-show="user_info.isLogin&&user_info.user_head" @click="seeImg()"></image>
 			<!-- <image :src="user_info.user_head?user_info.user_head:user_info.headicons[5]" mode="" class="header_img" v-if="user_info.isLogin"></image> -->
-			<view class="info_name" v-if="!user_info.isLogin">
-				<navigator url="/pages/login/index" >
-					LOGIN / SIGUP>
-				</navigator>
-			</view>
+				<view class="info_name" v-if="!user_info.isLogin">
+					<navigator url="/pages/login/index" >
+						LOGIN / SIGUP>
+					</navigator>
+				</view>
 			<view class="info_name" v-else>
 				<navigator url="/pages/account/myProfile" >
-					hi,{{user_info.nickname!=''?user_info.nickname:user_info.email}}>
+					Hey,{{user_info.nickname!=''?user_info.nickname:user_info.email}}>
 				</navigator>
 			</view>
 			
@@ -102,7 +102,12 @@
 				</navigator> -->
 			</view>
 			
-			<scroll-view scroll-x="true"><image :src="item.block_pic" v-for="(item,index) in Imglist" :key="item.block_pic"class="mine_banner allpadding" mode="" @click="imgto(item)"></image></scroll-view>
+			<!-- scroll-x="true" -->
+			<scroll-view >
+				<image :src="item.block_pic" style="width: 90%;padding: 0 20px;" v-for="(item,index) in Imglist" :key="item.block_pic"class="mine_banner " mode="" @click="imgto(item)">
+					<!-- allpadding -->
+				</image>
+			</scroll-view>
 			<view v-if="catList.length!=0" style="background-color: #f4f3f8; padding: 0 23.33rpx;" >
 				<view class="order_title" style="padding-top: 20rpx;">Recommend</view>
 				<scroll-view class="spike1 margin_botoom" style="background-color: #f4f3f8;" scroll-x="true" :show-scrollbar="false">
@@ -286,13 +291,17 @@
 					console.log(res)
 					let url
 					if(res.error == 0){
+						// if(res.data.page_code == 'HOMESALEICON'){
 						if(res.data.page_code == 'HOMESALEICON'){
 							let src = 'https://www.dopeplus.com/images/mapp_customized/202210/1665653173499940520.png'
+							// let src = 'https://www.dopeplus.com/images/mapp_customized/202211/1667961215280331818.png'
 							if(src==res.data.zones[0].blocks[0].block_pic){
+								// this.tarbar[2].src = 'https://www.dopeplus.com/images/mapp_customized/202211/1667961215280331818.png'
 								this.tarbar[2].src = '../../static/img/min.png'
 							}else{
 								src=res.data.zones[0].blocks[0].block_pic
-								
+								// this.tabar[2].src=src
+								this.tarbar[2].src = res.data.zones[0].blocks[0].block_pic
 								uni.setStorageSync('midButton',src)
 							}
 						}
@@ -496,10 +505,12 @@
 			background-color: #000000;
 		}
 		.info_name{
-			font-size: 36rpx;
+			font-size: 20px;
 			font-weight: bold;
 			color: #F7F7F7;
-			margin-bottom: 74.67rpx;
+			margin-bottom: 57px;
+			position: absolute;
+			padding: 50px 50px 0;
 		}
 		.info_like{
 			display: flex;
@@ -507,6 +518,7 @@
 			align-items: center;
 			width: 100%;
 			color: #F7F7F7;
+			padding-top: 18.5%;
 			.info_like_item{
 				font-size: 40rpx;
 				font-weight: 400;
@@ -685,4 +697,7 @@
 			}
 		}
 	}
+	.margin_botoom {
+		padding-bottom: 55px !important;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/account/message.vue b/pages/account/message.vue
index 50d7d5a..7b44970 100644
--- a/pages/account/message.vue
+++ b/pages/account/message.vue
@@ -1,42 +1,19 @@
 <template>
-	<view>
-		<!-- <uni-nav-bar  left-icon="left" :statusBar="true"  title="Message" 
-		color="#fff" backgroundColor="#000000"  @clickLeft="back"  :border="false"/> -->
-		<view class="one">
-			<image src="../../static/img/left_white.png" mode="" @click="back()"></image>
-			<view class="one_text">Message</view>
+	<view class="message">
+		<view class="font">
+			<!-- <uni-icons style="padding-left: 11px;color: white;" type="arrow-left" size="30" @click="back"></uni-icons> -->
+			<uni-icons style="padding-left: 11px;color: white;font-weight: 100;" type="back" size="30" @click="back"></uni-icons>
+			<text style="margin-left: 30%;color: white;">Message</text>
 		</view>
 		<view class="body">
-			<view class="msg_item" v-for="(item,index) in list.blocks" :key="item.block_title" @click="gotopage(item)">
-				
-				<view class="msg_time">{{item.block_avaiable_from | Mes}}</view>
-				<!-- <text class="y_red" v-show="item.block_id">●</text> -->
-				<!-- <view class="msg_content">{{item.}}</view> -->
-				<view class="msg_img" v-if="item.block_pic"><image :src="item.block_pic" class="imagesize"></image></view>
-				<view class="msg_title">{{item.block_title}}</view>
-			</view>
-			<view class="msg_item" v-for="(item,index) in app_Mes" :key ="item.id"@click="gotopage(item)">
-				
-				<view class="msg_time">{{ item.add_time | Mes}}</view>
-				<text class="y_red" v-show="item.unread == 1">●</text>
-				<view class="msg_title">{{ item.mtitle }}</view>
-				<view class="msg_content">
-				</view>
+			<view class="body-i">
+				<!-- <image src="../../static/img/message.png" mode=""></image> -->
 			</view>
-			<!-- <view class="msg_item">
-				<view class="msg_time">21/04/2022 14:42:31</view>
-				<view class="msg_title">Message heading</view>
-				<view class="msg_content">
-					estimated to be deliverd on estimated to be deliverd on estim
-					ated to be deliverd on estimated to be deliverd on
-				</view>
-				<view class="msg_img"></view>
-			</view> -->
+			<button class="body-btn">Continue shopping</button>
 		</view>
 	</view>
 </template>
 
-
 <script>
 	import {defaultRequest} from '../../api/index.js'
 	export default {
@@ -188,63 +165,42 @@
 	}
 </style>
 <style lang="scss" scoped>
-	
-	.uni-navbar{
-		font-size: 32rpx;
-		font-weight: bold;
+	.font {
+	    display: flex;
+	    position: fixed;
+	    background-color: #000;
+	    height: 56px;
+	    width: 100%;
+	    z-index: 999;
+	    // padding-top: 28px;
+	    align-items: center;
+	    text-align: center;
+	    top: 0;
+	    left: 0;
+	    font-size: 20px;
+	    font-weight: bold;
 	}
-	.y_red{
-		font-size: 19rpx;
-		color: #940000;;
-	}
-	.body{
-		// border-top: 13.33rpx #F7F7F7 solid;
-		padding: 50.67rpx 26.67rpx;
-	}
-	.msg_item{
-		padding-top: 17rpx;
-		padding-bottom: 28rpx;
-		padding-left: 10rpx;
-		padding-right: 10rpx;
-		 background-color:#fff ;
-		// border-bottom: 1px solid #E2E2E2;
-		margin-bottom: 30rpx;
-		&:first-child{
-			margin-top: 122.67rpx;
-		}
-		.msg_time{
-			font-size: 25.33rpx;
-			font-weight: 400;
-			text-align: center;
-			// margin-top: 51.33rpx;
-		}
-		.msg_title{
-			font-size: 28rpx;
-			margin-top: 20rpx;
-			margin-left: 10rpx;
-		}
-		.msg_content{
-			color: #555555;
-			font-size: 25.33rpx;
-			font-weight: 400;
-			
+	.body {
+		margin-top: 56px;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		flex-direction: column;
+		height: 100%;
+		.body-i {
+			object-fit: cover;
+			width: 336px;
+			height: 106px;
+			margin-top: 61px;
+			background: url('../../static/img/message.png') center;
+			background-size: auto;
+			background-repeat: no-repeat;
 		}
-		.msg_img{
-			margin-top: 27.33rpx;
-		    border-radius: 10rpx;
-			width: 100%;
-			height: 281.33rpx;
-			background-color: #ffdcd3      ;
-			
-			
+		&-btn {
+			margin-top: 42px;
+			background: #000;
+			border-radius: 8px;
+			color: #fff;
 		}
 	}
-	.msg_item:last-child{
-		border-bottom: none;
-	}
-	.imagesize{
-		width: 100%;
-		height: 100%;
-		 border-radius: 10rpx;
-	}
 </style>
\ No newline at end of file
diff --git a/pages/account/myProfile.vue b/pages/account/myProfile.vue
index 583952a..3991a29 100644
--- a/pages/account/myProfile.vue
+++ b/pages/account/myProfile.vue
@@ -33,21 +33,21 @@
 				</view>
 			</view>
 		</navigator>
-		<view class="profile_item ">
+		<view class="profile_item"  @click="gotoaddress">
 			<text>Ship to</text>
-			<view class="profile_item_right" @click="gotoaddress">
+			<view class="profile_item_right">
 				<!-- <text>{{addressDate.country_name || 'United States'}}</text> -->
 				<text>{{ country }}</text>
 				<image src="../../static/img/right1.png" alt="" class="right_img"></image>
 			</view>
 		</view>
 		<navigator url="/pages/account/deleteCount" >
-		<view class="profile_item ">
-			<text>Delete account</text>
-			<view class="profile_item_right">
-				<image src="../../static/img/right1.png" alt="" class="right_img"></image>
+			<view class="profile_item ">
+				<text>Delete account</text>
+				<view class="profile_item_right">
+					<image src="../../static/img/right1.png" alt="" class="right_img"></image>
+				</view>
 			</view>
-		</view>
 		</navigator>
 		<uni-popup ref="inputDialog" type="dialog">
 			<uni-popup-dialog ref="inputClose"  mode="input" title="Edit Name"  cancelText="Cancel" confirmText="OK"
diff --git a/pages/category/index.vue b/pages/category/index.vue
index 6518013..871d183 100644
--- a/pages/category/index.vue
+++ b/pages/category/index.vue
@@ -215,7 +215,8 @@
 								this.tarbar[2].src = '../../static/img/min.png'
 							}else{
 								src=res.data.zones[0].blocks[0].block_pic
-								
+								// this.tabar[2].src=src
+								this.tarbar[2].src = res.data.zones[0].blocks[0].block_pic
 								uni.setStorageSync('midButton',src)
 							}
 							
@@ -435,7 +436,7 @@
 		
 		box-sizing: border-box;
 		font-family: PingFang SC;
-		
+		white-space: nowrap;
 		display: flex;
 		align-items: center;
 		word-wrap: break-word;
@@ -444,7 +445,8 @@
 
 	.u-tab-item-active {
 		position: relative;
-		font-size: 26rpx;
+		// font-size: 26rpx;
+		font-size: 28.67rpx;
 		font-weight: 600;
 		background-color: black;
 		color: white;
diff --git a/pages/category/productList.vue b/pages/category/productList.vue
index 9dd149c..c7907b5 100644
--- a/pages/category/productList.vue
+++ b/pages/category/productList.vue
@@ -19,7 +19,8 @@
 				</view>
 			</block>
 		</uni-nav-bar>
-		<view class="pets_nav" :style="{display:isCart?'none':''}">
+		<!-- 1 -->
+		<view style="left: 0;position: fixed;" class="pets_nav" :style="{display:isCart?'none':''}">
 			<text :class="query.order_type==0?'active_text':''" @click="selectNav(0)">Synthesis</text>
 			<view class="pets_nav_item" @click="selectNav(1)">
 				<text :class="query.order_type==3 ?'active_text' :query.order_type==4 ?'active_text':''">Sales</text>
@@ -37,12 +38,12 @@
 				
 			</view>
 			<view class="pets_nav_image">
-				<image src="/static/img/pets_nav_white.png" mode="" v-show="pets_index==0" @click="pets_index=1,$refs.waterfallsFlowRef.refresh()"></image>
-				<image src="/static/img/ptes_nav1_white.png" mode="" v-show="pets_index==1" @click="pets_index=0"></image>
+				<image src="/static/img/pets_nav_white.png" mode="" v-show="pets_index==1" @click="pets_index=0,$refs.waterfallsFlowRef.refresh()"></image>
+				<image src="/static/img/ptes_nav1_white.png" mode="" v-show="pets_index==0" @click="pets_index=1"></image>
 			</view>
 		</view>
 		<view class="body" >
-			<view class="product"  v-show="pets_index==0">
+			<view class="product"  v-show="pets_index==1">
 				<view class="product_item" v-for="(item,index) in list" :key="index" @click="goDetails(item,1)">
 					<image class="product_item_image" :src="item.goods_img"></image>
 					<view class="product_item_right">
@@ -62,7 +63,7 @@
 				</view>
 			</view>
 			
-			<view class="product1" v-show="pets_index==1">
+			<view class="product1" v-show="pets_index==0">
 				<custom-waterfalls-flow ref="waterfallsFlowRef" :value="list" imageKey="goods_img" @wapperClick="goDetails" @imageClick="goDetails">
 					<template v-slot:default="item"  >
 							<view class="product1_item">
@@ -578,10 +579,12 @@
 		color: #fff;
 		background: rgba(0, 0, 0,0.6);
 		// opacity: 0.6;
-		top: 0;
-		margin-top: 135rpx;
+		// top: 0;
+		
+		// margin-top: 135rpx;
 		/* #ifdef H5 */
-		margin-top: 95rpx;
+		// margin-top: 95rpx;
+		// margin-top: 11%;
 		/* #endif */
 		width: 100%;
 		box-sizing: border-box;
diff --git a/pages/index/address.vue b/pages/index/address.vue
index 6cbd68a..3957d5f 100644
--- a/pages/index/address.vue
+++ b/pages/index/address.vue
@@ -2,8 +2,9 @@
 	<view>
 		<view class="body">
 		<view class="font">
-			<uni-icons type="arrow-left" size="30" @click="back"></uni-icons>
-			<text style="margin-left: 30%;color: #0b0b0b;">Ship to</text>
+			<!-- <uni-icons style="padding-left: 11px;color: white;" type="arrow-left" size="30" @click="back"></uni-icons> -->
+			<uni-icons style="padding-left: 11px;color: white;font-weight: 100;" type="back" size="30" @click="back"></uni-icons>
+			<text style="margin-left: 30%;color: white;">Ship to</text>
 		</view>
 			<!-- <view class="text_pop">Popular Countries/Regions</view>
 			<view class="address" v-for="(item2,index2) in popularlist" :key="item2.name" >
@@ -148,13 +149,14 @@ async onLoad() {
 	.font{
 		display: flex;
 		position: fixed;
-		background-color: #fff;
+		background-color: #000;
 		height: 100rpx;
 		width: 100%;
 		z-index: 999;
 		padding-top: 50rpx;
 		text-align: center;
 		top:0;
+		left: 0;
 		font-size: 20px;
 		font-weight: bold;
 	}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 262a23c..eb2054e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,1226 +1,887 @@
-<template>
-	
-	<view class="body"  :class="isScrollShow?'body_pad':''">
-		<!-- 进入页面部分 -->
-		<view v-show="!open_img || countdownTime2==0">
-		
-		<!-- 头部导航栏 -->
-		<view class="navigation " >
-			<view class="status_bar"></view>
-			<view style="background-color:black">
-			<view class="page_margin uni-bg-black">
-			<view class="navigation_title" :class="isScrollShow?'isScrollShow':'' ">
-				<template v-if="!isScrollShow ">
-					<navigator url="/pages/account/message" class="order_info_item">
-						<uni-badge :text="mesNum" type="error" absolute="rightTop">
-							<image src="../../static/img/msg_white.png" mode=""></image>
-						</uni-badge>
-					</navigator>
-					
-					<image src="/static/img/dope plus_white.png" mode="" class="index_logo"></image>
-				</template>
-				
-				
-				<view class="navigation_title_right" :class="isScrollShow?'navigation_title_padding':'' ">
-					<navigator>
-						<image src="../../static/img/like_white.png" mode="" @click="Iswish()"></image>
-					</navigator>
-					<navigator url="/pages/shippingCart/index" open-type="switchTab">
-						<uni-badge :text="sum" type="error" absolute="rightTop">
-								<image src="../../static/img/shop_cart1.png" mode=""></image>
-						</uni-badge> 
-					</navigator>
-					 
-				</view>
-			</view>
-			
-			<navigator >
-				<view v-if="isScrollShow " :class="isScrollShow?'isScrollShow3':'' ">
-					<image src="/static/icon/home_white.png" mode=""></image>
-				</view>
-				<view class="navigation_seach" :class="isScrollShow?'isScrollShow1':'' " @click="gotoSearch()">
-					  
-						<image src="../../static/img/seach.png" mode=""></image>
-						<text>search</text>
-				</view>
-			</navigator>
-			</view>
-			</view>
-			<!-- <view class="navigation_scroll " :class="isScrollShow?'isScrollShow2':'' ">
-				<scroll-view class="scroll-view_H" scroll-x="true" :show-scrollbar="false">
-					<view :class="scroll_active==index?'scroll_active':''" v-for="(item,index) in scrollList" @click="scrollChange(item,index)" :key="item.zone_name">{{item.zone_name}}</view>
-				</scroll-view>
-			</view> -->
-		</view>
-		<view class="navigation_scroll " :class="isScrollShow?'isScrollShow2':'' ">
-			<scroll-view class="scroll-view_H" scroll-x="true" :show-scrollbar="true">
-				<view :class="scroll_active==index?'scroll_active':''"  v-for="(item,index) in scrollList" @click="scrollChange(item,index)" :key="item.zone_name">{{item.zone_name}}</view>
-			</scroll-view>
-		</view>
-		
-		<view v-for="(item,index) in indexDate.zones" :key="item.zone_id">
-			
-			<!-- 轮播图 -->
-			<view class="uni-margin-wrap page_padding_left1" v-if="item.zone_code=='BANNER' && item.zone_status=='NORMAL'">
-				<swiper class="swiper" circular :indicator-dots="true" :autoplay="true"  :style="{ height:Swiper_H +'rpx'}">
-					<swiper-item v-for="(item1,index1) in item.blocks" :key="item1.block_id">
-						<view class="swiper-item " v-if="item1.block_status=='NORMAL'" :style="{width:(item.zone_code=='BANNER')?item.zone_colum+'rpx':'',heigth:'auto'}">
-							<image :src="item1.block_pic" mode="" @click="imgTo(item1)" ></image>
-						</view>
-					</swiper-item>
-				</swiper>
-			</view>
-			
-			<!-- 宫格 -->
-			<uni-swiper-dot :info="info" :current="current" field="content" mode="default" 
-			v-if="item.zone_code=='ICON' && item.zone_status=='NORMAL' && item.zone_code!=indexDate.zones[index-1].zone_code">
-				<swiper class="grid_swiper " :style="{height:(len > 4?380+'rpx':190+'rpx')}"@change="gridSwiper">
-					<swiper-item v-for="(item1,index1) in info" :key="item1.zone_id">
-						<view class="grid_content">
-							<view class="grid_item" v-for="(item2, index2) in item1.blocks" :key="item2.block_id">
-								<template v-if="item2.block_status=='NORMAL'">
-									<view class="grid_item_img">
-										<image :src="item2.block_pic" mode="" @click="imgTo(item2)"></image>
-									</view>
-									<text>{{item2.block_title}}</text>
-								</template>
-								
-							</view>
-						</view>
-					</swiper-item>
-				</swiper>
-			</uni-swiper-dot>
-			
-			<!-- ONEPIC -->
-			<view class="ONEPIC" v-if="item.zone_code=='ONEPIC' && item.zone_status=='NORMAL'" >
-				<!-- class="discount page_padding" -->
-				<image :src="item.blocks[0].block_pic" :style="{height:(item.zone_code=='ONEPIC')?item.zone_column+'rpx':''}" mode="" @click="imgTo(item.blocks[0])" ></image>
-			</view>
-			<!-- TWOPIC -->
-			<view class="TWOPIC"  v-if="item.zone_code=='TWOPIC' && item.zone_status=='NORMAL'">
-				<image :src="item1.block_pic" :style="{height:(item.zone_code=='TWOPIC')?item.zone_column+'rpx':''}" @click="imgTo(item1)"mode="" v-for="(item1,index1) in item.blocks" :key="item1.block_id"></image>
-			</view>
-			<!-- THREEPIC -->
-			<view class="THREEPIC" v-if="item.zone_code=='THREEPIC' && item.zone_status=='NORMAL'">
-				<image :src="item1.block_pic" :style="{height:(item.zone_code=='THREEPIC')?item.zone_column+'rpx':''}"    @click="imgTo(item1)" mode="" v-for="(item1,index1) in item.blocks" :key="item1.block_id"></image>
-			</view>
-			<!-- FOURPIC -->
-			<view class="FOURPIC"  v-if="item.zone_code=='FOURPIC' && item.zone_status=='NORMAL'">
-				<image :src="item1.block_pic" :style="{height:(item.zone_code=='FOURPIC')?item.zone_column+'rpx':''}" mode=""  @click="imgTo(item1)" v-for="(item1,index1) in item.blocks" :key="item1.block_id"></image>
-			</view>
-			<!-- FIVEPIC -->
-			<view class="FIVEPIC"   v-if="item.zone_code=='FIVEPIC' && item.zone_status=='NORMAL'">
-				<image :src="item1.block_pic" :style="{height:(item.zone_code=='FIVEPIC')?item.zone_column+'rpx':''}" mode=""  @click="imgTo(item1)" v-for="(item1,index1) in item.blocks" :key="item1.block_id"></image>
-			</view>
-			<!-- SIXPIC -->
-			<view class="SIXPIC" v-if="item.zone_code=='SIXPIC' && item.zone_status=='NORMAL'">
-				<image :src="item1.block_pic" :style="{height:(item.zone_code=='SIXPIC')?item.zone_column+'rpx':''}"mode="" @click="imgTo(item1)" v-for="(item1,index1) in item.blocks" :key="item1.block_id"></image>
-			</view>
-			
-			
-			
-			<!-- 标题 -->
-			<navigator url="/pages/index/flashSale" v-if="item.zone_code=='SPIKE1' && item.zone_status=='NORMAL'">
-				<view class="index_title page_padding">
-					<text>Flash Sale</text>
-					<view class="title_right">
-						<uni-countdown :showDay="false" :hour="curEndTime |hours" :minute="curEndTime|minutes" :second="curEndTime|seconds" color="#FFF" background-color="rgb(178 34 52)" />
-						<image src="../../static/icon/right_white.png" mode="" ></image>
-					</view>
-				</view>
-			</navigator>
-			
-			
-			<!-- SPIKE 1 -->
-			<scroll-view class="spike1 page_padding" scroll-x="true" :show-scrollbar="false" v-if="item.zone_code=='SPIKE1' && item.zone_status=='NORMAL'">
-				<view class="spike1_item" v-for="(item1,index1) in skillList"  :key="item1.goods_id"   >
-					<view class="item_img" @click="gotoSkillpage(item1)">
-						<image :src="item1.goods_img" mode="" :style="{height:(item.zone_code=='SPIKE1')?item.zone_column+'rpx':'',width:200+'rpx'}" ></image>
-					</view>
-					<view class="spike1_item_bottom padding_left">
-						<text>US${{item1.promote_price}}</text>
-						<view class="spike1_item_text">US${{item1.shop_price}}</view>
-					</view>
-					
-				</view>
-			</scroll-view>
-			
-			<!-- 标题 -->
-			<view class="index_title page_padding" v-if="item.zone_code=='TITLE' && item.zone_status=='NORMAL'">
-				<text>{{item.blocks[0].block_title}}</text>
-				<view class="title_right">
-					<image src="../../static/icon/right_white.png" mode="" @click="Hotgoto(item.blocks)"></image>
-				</view>
-			</view>
-			
-			<!-- HOT SELLS 1 -->
-			
-			<view class="hotSells1 page_padding" v-if="item.zone_code=='GOODSTWO1' || item.zone_code=='GOODSTHREE1'">
-				<template v-if="item.zone_code=='GOODSTWO1' && item.zone_status=='NORMAL'">
-					<view class="hotSells1_item" v-for="(item1,index1) in item.blocks"  :key="item1.block_id" >
-						<view class="hotSells1_item_img" >
-							<image :src="item1.block_pic" :style="{height:(item.zone_code=='GOODSTWO1')?item.zone_column+'rpx':''}" mode="" @click="imgTo(item1)"></image>
-						</view>
-						<text>{{item1.block_title}}</text>
-					</view>
-				</template>
-				<template v-if="item.zone_code=='GOODSTHREE1' && item.zone_status=='NORMAL'">
-					<view class="hotSells2_item" v-for="(item1,index1) in item.blocks"  :key="item1.block_id">
-						<view class="hotSells2_item_img" >
-							<image :src="item1.block_pic":style="{height:(item.zone_code=='GOODSTHREE1')?item.zone_column+'rpx':''}" mode="" @click="imgTo(item1)"></image>
-						</view>
-						<text>{{item1.block_title}}</text>
-					</view>
-				</template>
-			</view>
-			
-			<!-- 标题 -->
-			<!-- <view class="index_title page_padding">
-				<text>Hot Selle</text>
-				<view class="title_right">
-					<image src="../../static/img/right.png" mode=""></image>
-				</view>
-			</view> -->
-			
-			
-			<!-- HOT SELLS 2 -->
-			<scroll-view class="spike1 page_padding" scroll-x="true" :show-scrollbar="false" v-if="item.zone_code=='HONLIST2' && item.zone_status=='NORMAL'">
-				<view class="spike1_item padding_honlist2" v-for="(item1,index1) in item.blocks"  :key="item1.block_id">
-					<view class="item_img" >
-						<image :src="item1.block_pic" mode="" 
-						:style="{width:(item.zone_code=='HONLIST2')?420+'rpx':'',height:item.zone_column+'rpx'}"@click="imgTo(item1)"></image>
-					</view>	
-				</view>
-			</scroll-view>
-			
-			<!-- 标题 -->
-			<!-- <view class="index_title page_padding">
-				<text>Hot Selle</text>
-				<view class="title_right">
-					<image src="../../static/img/right.png" mode=""></image>
-				</view>
-			</view> -->
-			
-			<!-- HOT SELLS 3 -->
-			<scroll-view class="spike1 page_padding" scroll-x="true" :show-scrollbar="false"   v-if="item.zone_code=='HONLIST3' && item.zone_status=='NORMAL'" @scroll="scrollhot">
-				<view class="spike1_item" v-for="(item1,index1) in item.blocks"  :key="item1.block_id">
-					<view class="item_img " :style="{width:(item.zone_code=='HONLIST3')?280+'rpx':'',height:item.zone_column +'rpx'}" 
-					>
-						<image :src="item1.block_pic" 
-						 mode="" @click="imgTo(item1)"></image>
-					</view>	
-					<view class="spike1_item_bottom" >
-						<text>{{item1.block_title}}</text>
-						<view class="spike1_item_text1">{{item1.block_title2}}</view>
-					</view>
-					
-				</view>
-			</scroll-view>
-			<!-- HOT SELLS 1 -->
-			<scroll-view class="spike1 page_padding" scroll-x="true" :show-scrollbar="false"   v-if="item.zone_code=='HONLIST1' && item.zone_status=='NORMAL'" @scroll="scrollhot">
-				<view class="spike1_item" style="padding-right: 0;" v-for="(item1,index1) in item.blocks"  :key="item1.block_id" @touchstart="start(index1)" @touchend="end(index1)">
-					<view class="item_img " :style="{width:(item.zone_code=='HONLIST1')?350+'rpx':'',height:item.zone_column +'rpx'}" 
-					 :class="hot_index == index1?'hotmaxW':'hotmaxmin'">
-						<image :src="item1.block_pic" 
-						 mode="" @click="imgTo(item1)"></image>
-					</view>	
-					<!-- <view class="spike1_item_bottom" >
-						<text>{{item1.block_title}}</text>
-						<view class="spike1_item_text1">{{item1.block_title2}}</view>
-					</view> -->
-					
-				</view>
-			</scroll-view>
-			<!-- GOODSTHREE 2 -->
-			<!-- <view class="goodsthree2">
-				<view class="goodsthree2_item" v-for="(item,index) in 3"  :key="index"></view>
-			</view> -->
-			
-			<!-- 轮播图 -->
-			<!-- <view class="uni-margin-wrap">
-				<swiper class="swiper" circular :indicator-dots="true" :autoplay="true" >
-					<swiper-item>
-						<view class="swiper-item uni-bg-red">A</view>
-					</swiper-item>
-					<swiper-item>
-						<view class="swiper-item uni-bg-green">B</view>
-					</swiper-item>
-					<swiper-item>
-						<view class="swiper-item uni-bg-blue">C</view>
-					</swiper-item>
-				</swiper>
-			</view> -->
-			
-			<!-- SPIKE 1 -->
-			<!-- <scroll-view class="spike1 page_padding_left" scroll-x="true" :show-scrollbar="false">
-				<view class="spike1_item" v-for="(item,index) in 8"  :key="index">
-					<view class="spike1_item_img"></view>
-					<view class="spike1_item_bottom1">
-						<view class="spike1_item_text">Adidas Yeezy Boost 350  DazzlingBlue Black</view>
-						<text>US$314.00</text>
-					</view>
-				</view>
-			</scroll-view> -->
-		</view>
-		<!-- 瀑布流标题 -->
-		<!-- <view class="index_title1" v-if="bestlist.length>0">PRODUCTS FRO YOU</view> -->
-		
-		<!-- <view class="waterfall" v-if="bestlist.length>0" >
-			<custom-waterfalls-flow :value="bestlist" imageKey="block_pic"@imageClick="imgTo(bestlist)">
-				<template v-slot:default="item2">
-						<view class="item" @click="imgTo(item2)">
-							<view class="title">{{item2.block_title}}</view>
-								<view >{{item2.block_title2}}</view>
-								<view class="desc">{{item2.block_title3}}</view>
-						</view>
-				</template>
-			</custom-waterfalls-flow>
-		</view>
-		 -->
-		 <view class="container" v-if="bestlist.length>0">
-		 		<view class="left">
-		 			<view v-for="(item,index) in leftList" :key="index" >
-		 				<image :src="item.block_pic" alt="" mode="widthFix" @click="imgTo(item)"
-						:class="item.block_title==0&&!item.block_title2&&!item.block_name&&!item.block_title3?'img_border':''" ></image>
-		 				<view class="item" v-if="item.block_title!=0">
-		 					<view class="title"  v-if="item.block_title!=0">{{item.block_title}}</view>
-		 						<view class="title">{{item.block_title2}}</view>
-								<view class="title1" v-if="item.block_name">{{item.block_name}}</view>
-		 						<view class="desc">
-		 						<view>{{item.block_title3}}</view>
-		 						<view class="desc_img"><image src="../../static/icon/cat_white.png"@click="getDate(item)"></image></view>
-		 						</view>
-		 				</view>
-		 			</view>
-		 		</view>
-		 		<view class="right">
-		 			<view v-for="(item1,index1) in rightList" :key="index1" >
-		 				<image :src="item1.block_pic" alt="" mode="widthFix" @click="imgTo(item1)"
-						:class="item1.block_title==0&&!item1.block_title2&&!item1.block_name&&!item1.block_title3?'img_border':''"></image>
-		 				<view class="item"   v-if="item1.block_title!=0">
-		 					<view class="title" v-if="item1.block_title!=0">{{item1.block_title}}</view>
-		 						<view class="title" >{{item1.block_title2}}</view>
-								<view class="title1" v-if="item1.block_name">{{item1.block_name}}</view>
-		 						<view class="desc">
-								<view>{{item1.block_title3}}</view>
-								<view class="desc_img"><image src="../../static/icon/cat_white.png" @click="getDate(item1)"></image></view>
-								</view>
-		 				</view>
-		 			</view>
-		 			
-		 		</view>
-		 	</view>
-			<!-- //购物车 -->
-			<view class="addCard" v-show="isCart">
-				<image src="/static/img/close1.png" mode="" class="addCard_close" @click="CloseCart()"></image>
-				<scroll-view class="spike1 " scroll-x="true" :show-scrollbar="false">
-					<image :src="item.img_url" mode="" class="addCard_scroll img_border" v-for="(item,index) in goodsDate.gallery_list"  :key="index" @click="clickImg(index)"></image>
-				</scroll-view>
-				<scroll-view class="addCard_body"scroll-y="true">
-					<view >{{goodsDate.goods_name}} </view>
-					<view class="addCard_price">US${{goodsDate.is_promote==0? shop_price :goodsDate.promote_price}}</view>
-					<view v-for="(item,index) in goods_attr_list" :key="item.attr_id">
-						<view >{{item.name}}</view>
-						<view class="color_select variations_select_size">
-							<view class="color_select_item" v-for="(item1,index1) in item.list"  :key="item1.attr_value" 
-							:class="goods_attr_list[index].goods_attr_id==item1.goods_attr_id?'active_color':''" @click="selectAttr(item.attr_id,item1.goods_attr_id,index1,item1.attr_price)">
-								<view class="color_select_item_zoom">
-									<image src="/static/icon/big2.png" @click="clickImg(index1)" mode=""v-if="item1.attr_img!=''"></image>
-								</view>
-								<image :src="item1.attr_img"  mode="" v-if="item1.attr_img!=''" ></image>
-								<view class="color_select_item_bottom" v-if="item1.attr_img!=''">【{{ item1.attr_value}}】</view>
-								<view  class="color_select_item_bottom" v-if="!item1.attr_img">{{ item1.attr_value}}</view>
-							</view>
-						</view>
-					</view>
-
-					<view class="quantity">
-						<text>Quantity</text>
-						<uni-number-box background="#FFFFFF" v-model="cartQuery.goods_number" :min="1"></uni-number-box>
-					</view>
-				</scroll-view>
-				
-				<button @click="addCart">ADD TO CART</button>
-			</view>
-			<view class="mask" @click="isCart=false" v-show="isCart"></view>
-			<!-- //弹窗广告 -->
-			<view v-show="popImg" >
-				<!-- <button @click="open">打开弹窗</button> -->
-				<uni-popup ref="popup" :mask-click="false">
-					
-					<view class="Popup">
-						<view class="popup_close">
-							<image mode=" " @click="close" src="../../static/img/close2.png"></image>
-						</view>
-						<view class="popup_img" >
-							<!-- <view class="popup_text"><text>{{countdownTime }}s跳过</text></view> -->
-							<image :src="popImg" mode=" " @click="popImgto"></image>
-						</view>
-					</view>
-					<!-- <button @click="close">关闭</button> -->
-				</uni-popup>
-			</view>
-		</view>	
-			
-			<!-- 启动页广告 -->
-			<view class="open_bg"  ref="imgRef" v-show="countdownTime2>0?true:false" >
-				<!-- <view class="open_text"><text @click="countdownTime2 =0">{{ countdownTime2 }}s skip</text></view> -->
-				<swiper class ="open_bgimg" circular :indicator-dots="indicatorDots" :autoplay="autoplay" :interval="interval"
-				:duration="duration">
-					<swiper-item v-for="(item,index) in open_img" :key="item.block_pic">
-					<view class="open_text"><text  @click="openClose()"v-if="countdownTime2 >0||countdownTime2 ==0">{{ countdownTime2 }}sskip</text></view>
-					    <image :src="item.block_pic" mode="" @click="imgTo(item)"></image>	
-					</swiper-item>
-				</swiper>
-				
-			</view>
-			<view class="bootom_last" v-if="bootom == 1">-THE END-</view>
-			<view class="tarbar">
-				<view  @click="change(index)" v-for="(item,index) in tarbar" :key="item.name" :class="index==2?'img_m':'tarbar_img'":style="{color:index==0?'#000':''}">
-					<image :src="item.src"></image>
-					<view>{{ item.name}}</view>
-				</view>
-			</view>
-	</view>
-</template>
-
 <script>
-	import {defaultRequest,defaultRequest2,defaultRequest4} from '../../api/index.js'
-	import {tarbar} from '../../tarbar/index.vue'
+	import {
+		defaultRequest,
+		defaultRequest2,
+		defaultRequest4
+	} from '../../api/index.js'
+	import {
+		tarbar
+	} from '../../tarbar/index.vue'
 	export default {
-		
+
 		data() {
 			return {
-				isScrollShow:false,
-				scroll_active:0,
-				scrollList:[
+				isScrollShow: false,
+				scroll_active: 0,
+				scrollList: [
 					// {text:'DOPE'},{text:'VIDEO'},{text:'MEN'},{text:'KIDS'},{text:'PETS'},{text:'MEN'},{text:'PETS'},{text:'MEN'},
 				],
-				current:0,
-				currentAttr:0,
-				list: [
-					{ image: 'https://via.placeholder.com/200x500.png/ff0000', title: 'Adidas Yeezy Boost 350  DazzlingBlue Black', desc: 'US$314.00' }, 
-					{ image: 'https://via.placeholder.com/200x200.png/2878ff', title: 'Adidas Yeezy Boost 350  DazzlingBlue Black', desc: 'US$314.00' }
+				current: 0,
+				currentAttr: 0,
+				list: [{
+						image: 'https://via.placeholder.com/200x500.png/ff0000',
+						title: 'Adidas Yeezy Boost 350  DazzlingBlue Black',
+						desc: 'US$314.00'
+					},
+					{
+						image: 'https://via.placeholder.com/200x200.png/2878ff',
+						title: 'Adidas Yeezy Boost 350  DazzlingBlue Black',
+						desc: 'US$314.00'
+					}
 				],
-				indexDate:{},
-				info:[],
-				banner:{},
-				cat_list:[],
-				sum:0,
-				mesNum:0,
-				skillList:[],
-				backButtonPress:0,
-				catQuery:{
-					_action:'getgoods',
-					page_index:1,
-					page_size:30,
+				indexDate: {},
+				info: [],
+				banner: {},
+				cat_list: [],
+				sum: 0,
+				mesNum: 0,
+				skillList: [],
+				backButtonPress: 0,
+				catQuery: {
+					_action: 'getgoods',
+					page_index: 1,
+					page_size: 30,
 					// type:'best'
-					gid:''
+					gid: ''
 				},
-				bestlist:[],
+				bestlist: [],
 				// 初始化左右盒子
 				leftList: [],
 				rightList: [],
 				// 初始化左右盒子高度
 				leftH: 0,
 				rightH: 0,
-				isbest:0,
-				popImg:'',
+				isbest: 0,
+				popImg: '',
 				countdownTime: 10,
-				countdownTime2:5,
-				popUrl:'',
-				myMes:{
-					_action:'getmessagelist',
-					type:1,
+				countdownTime2: 5,
+				popUrl: '',
+				myMes: {
+					_action: 'getmessagelist',
+					type: 1,
 					// importance:'',
 					// label:'',
-					page_index:1,
-					page_size:100
+					page_index: 1,
+					page_size: 100
 				},
-				Swiper_H:0,
-				open_img:[],
-				 indicatorDots: true,
+				Swiper_H: 826,
+				open_img: [],
+				indicatorDots: true,
 				autoplay: true,
 				interval: 2000,
 				duration: 500,
-				hotheight:0,
-				num:0,
-				bootom:0,
-				hot_index:0,
-				clientX:'',
-				 clientY:'',
-				 isCart:false,
-				 goodsDate:{
-				 	comment_summary:[
-				 		{comment_summary:'',commentlabel: ""}
-				 	],
-				 	gallery_list:[
-				 		{content:''}
-				 	],
-				 	
-				 },
-				 query:{
-				 	_action:'getgoodsdetail',
-				 	goods_id:''
-				 },
-				 // 添加到购物车请求参数
-				 cartQuery:{
-				 	_action:'addtocart',
-				 	goods_id:'',
-				 	goods_parent_id:0,
-				 	goods_number:1,
-				 	goods_attr_id:'',
-				 	goods_is_package:0
-				 },
-				 //选择规格的数组
-				 goods_attr_list:[],
-				 tarbar:[
-				 	{
-				 		src:'../../static/icon/home4.png',
-				 		name:'Home',
-						url:'../index/index'
-				 	},
-				 	{
-				 		src:'../../static/img/Category.png',
-				 		name:'Category',
-						url:'../category/index'
-				 	},
-				 	{
-				 		src:'../../static/img/min.png',
-				 		url:'../index/index2',
-						name:''
-				 	},
-				 	{
-				 		src:'../../static/img/Cart.png',
-				 		name:'Cart',
-						url:'../shippingCart/index'
-				 	},
-				 	{
-				 		src:'../../static/img/Account.png',
-				 		name:'Account',
-						url:'../account/index'
-				 	},
-				 ],
-				 list2:[
-				 	{src:'../../static/icon/home4.png'},
-				 	{src:'../../static/img/Category1.png'},
-				 	{src:''},
-				 	{src:'../../static/img/cart1.png'},
-				 	{src:'../../static/img/Account1.png'}
-				 ],
+				hotheight: 0,
+				num: 0,
+				bootom: 0,
+				hot_index: 0,
+				clientX: '',
+				clientY: '',
+				isCart: false,
+				goodsDate: {
+					comment_summary: [{
+						comment_summary: '',
+						commentlabel: ""
+					}],
+					gallery_list: [{
+						content: ''
+					}],
+
+				},
+				query: {
+					_action: 'getgoodsdetail',
+					goods_id: ''
+				},
+				// 添加到购物车请求参数
+				cartQuery: {
+					_action: 'addtocart',
+					goods_id: '',
+					goods_parent_id: 0,
+					goods_number: 1,
+					goods_attr_id: '',
+					goods_is_package: 0
+				},
+				//选择规格的数组
+				goods_attr_list: [],
+				tarbar: [{
+						src: '../../static/icon/home4.png',
+						name: 'Home',
+						url: '../index/index'
+					},
+					{
+						src: '../../static/img/Category.png',
+						name: 'Category',
+						url: '../category/index'
+					},
+					{
+						src: '../../static/img/min.png',
+						url: '../index/index2',
+						name: ''
+					},
+					{
+						src: '../../static/img/Cart.png',
+						name: 'Cart',
+						url: '../shippingCart/index'
+					},
+					{
+						src: '../../static/img/Account.png',
+						name: 'Account',
+						url: '../account/index'
+					},
+				],
+				list2: [{
+						src: '../../static/icon/home4.png'
+					},
+					{
+						src: '../../static/img/Category1.png'
+					},
+					{
+						src: ''
+					},
+					{
+						src: '../../static/img/cart1.png'
+					},
+					{
+						src: '../../static/img/Account1.png'
+					}
+				],
 			}
 		},
-		onPullDownRefresh() {			
-					setTimeout(()=>{ 
-						 this.getList()
-						uni.stopPullDownRefresh()
-						
-					},2000)
-				},
-		
+		onPullDownRefresh() {
+			setTimeout(() => {
+				this.getList()
+				uni.stopPullDownRefresh()
+
+			}, 2000)
+		},
+
 		onLoad() {
-			
+
 			let home = 'HOME'
 			this.getIndex(home)
 			this.isLogin = uni.getStorageSync('isLogin')
 			// //////console.info(this.curEndTime)
-			 this.getList()
-			 this.getMes()
-			 this.getPullMes()
-			 this.getInfo()	 
-			if(this.countdownTime2!=0){
+			this.getList()
+			this.getMes()
+			this.getPullMes()
+			this.getInfo()
+			if (this.countdownTime2 != 0) {
 				uni.hideTabBar()
-			}else if(this.countdownTime2==0 || !this.popImg){
+			} else if (this.countdownTime2 == 0 || !this.popImg) {
 				//uni.showTabBar()
 				uni.setTabBarStyle({
-				 backgroundColor: "#fff",
-				  borderStyle: "black",
-				  // selectedColor: "#999",
-				  // color: "#999",
+					backgroundColor: "#fff",
+					borderStyle: "black",
+					// selectedColor: "#999",
+					// color: "#999",
 				});
 			}
-		    
-			 
+
+
 		},
-		
+
 		mounted() {
-				this.getimgheight()
-			    this.getimgheight1()
-				console.log(this.open_img)
-				if(this.open_img){
-				setTimeout( () =>{	
-						this.getCountdownTime()
-				},2000)
-				}
-				else if(!this.open_img){
-					this.countdownTime2 = 0
-				}
-				},
-		
+			this.getimgheight()
+			this.getimgheight1()
+			console.log(this.open_img)
+			if (this.open_img) {
+				setTimeout(() => {
+					this.getCountdownTime()
+				}, 2000)
+			} else if (!this.open_img) {
+				this.countdownTime2 = 0
+			}
+		},
+
 
 		created() {
-			this.getPullMes()	
-		    this.getimgheight()
-			
-				},
+			this.getPullMes()
+			this.getimgheight()
+
+		},
 		onShow() {
 			this.isLogin = uni.getStorageSync('isLogin')
 			console.log(this.isLogin)
 			uni.hideTabBar()
 			this.getList()
 			this.getMes()
-			this.sum=0
+			this.sum = 0
 		},
-		computed:{
+		computed: {
 			//当天结束时间
-			curEndTime(){
-				const endtime = new Date(new Date().setHours(23,59,59,999)).getTime()
-				 // 获取当前时间
-				const nowtime=(new Date()).getTime();
-				var date3 = nowtime - endtime;   //时间差的毫秒数      
+			curEndTime() {
+				const endtime = new Date(new Date().setHours(23, 59, 59, 999)).getTime()
+				// 获取当前时间
+				const nowtime = (new Date()).getTime();
+				var date3 = nowtime - endtime; //时间差的毫秒数      
 				date3 = Math.abs(date3)
-			  return date3;
+				return date3;
 			}
 		},
-		filters:{
-			hours (timestamp){
-				var leave1=timestamp%(24*3600*1000)    //计算天数后剩余的毫秒数
-				var hours=Math.floor(leave1/(3600*1000))
+		filters: {
+			hours(timestamp) {
+				var leave1 = timestamp % (24 * 3600 * 1000) //计算天数后剩余的毫秒数
+				var hours = Math.floor(leave1 / (3600 * 1000))
 				return hours
 			},
-			minutes(timestamp){
-				var leave2=(timestamp%(24*3600*1000))%(3600*1000)        //计算小时数后剩余的毫秒数
-				var minutes=Math.floor(leave2/(60*1000))
+			minutes(timestamp) {
+				var leave2 = (timestamp % (24 * 3600 * 1000)) % (3600 * 1000) //计算小时数后剩余的毫秒数
+				var minutes = Math.floor(leave2 / (60 * 1000))
 				return minutes
 			},
-			seconds(timestamp){
-				var leave3=((timestamp%(24*3600*1000))%(3600*1000))%(60*1000)      //计算分钟数后剩余的毫秒数
-				var seconds=Math.round(leave3/1000)
+			seconds(timestamp) {
+				var leave3 = ((timestamp % (24 * 3600 * 1000)) % (3600 * 1000)) % (60 * 1000) //计算分钟数后剩余的毫秒数
+				var seconds = Math.round(leave3 / 1000)
 				return seconds
 			},
-			
-			
+
+
+		},
+		watch: {},
+		onBackPress(options) {
+			this.backButtonPress++;
+			if (this.backButtonPress > 1) {
+				plus.runtime.quit();
+			} else {
+				plus.nativeUI.toast('Click again to exit');
+			}
+			setTimeout(function() {
+				this.backButtonPress = 0;
+			}, 1000);
+			return true;
+
 		},
-		watch:{},
-		onBackPress(options) {  
-		this.backButtonPress++;
-		if (this.backButtonPress > 1) { 
-			plus.runtime.quit();
-		} else {
-			plus.nativeUI.toast('Click again to exit');
-		} 
-		setTimeout(function() {
-			this.backButtonPress = 0;
-		}, 1000);
-		return true;
-					
-	},
 		methods: {
-			change(e){
-				 this.index = e
-				 let tarbar = this.tarbar
-				 // uni.showTabBar()
-				 // for(let i =0; i<this.tarbar.length;i++){
-					//  if(e==i){
-					// 	 this.tarbar[e].src = this.list2[e].src
-					//  }else{
-					// 	this.tarbar = tarbar
-					// 	this.tarbar[i].src = tarbar[i].src
-					//  }
-				 // }
-				if(e!==2){
+			change(e) {
+				this.index = e
+				let tarbar = this.tarbar
+				// uni.showTabBar()
+				// for(let i =0; i<this.tarbar.length;i++){
+				//  if(e==i){
+				// 	 this.tarbar[e].src = this.list2[e].src
+				//  }else{
+				// 	this.tarbar = tarbar
+				// 	this.tarbar[i].src = tarbar[i].src
+				//  }
+				// }
+				if (e !== 2) {
 					uni.switchTab({
-						url:this.tarbar[e].url
+						url: this.tarbar[e].url
 					})
-				}else{
+				} else {
 					uni.navigateTo({
-						url:this.tarbar[e].url
+						url: this.tarbar[e].url
 					})
 				}
 			},
 			open() {
 				this.$refs.popup.open('center')
-					},
+			},
 			close() {
-			this.$refs.popup.close()
+				this.$refs.popup.close()
 				uni.setTabBarStyle({
-				 backgroundColor: "#fff",
-				  borderStyle: "black",
-				  // selectedColor: "#999",
-				  // color: "#999",
+					backgroundColor: "#fff",
+					borderStyle: "black",
+					// selectedColor: "#999",
+					// color: "#999",
 				});
-				
+
 			},
-			openClose(){
+			openClose() {
 				console.log(11)
-			this.countdownTime2 =0
-					//uni.showTabBar()
-					uni.setTabBarStyle({
-					 backgroundColor: "#fff",
-					  borderStyle: "black",
-					  // selectedColor: "#999",
-					  // color: "#999",
-					});
-					uni.switchTab({
-						url:'../index/index'
-					})
-					//uni.showTabBar()
-				},
-			onReachBottom(e){
+				this.countdownTime2 = 0
+				//uni.showTabBar()
+				uni.setTabBarStyle({
+					backgroundColor: "#fff",
+					borderStyle: "black",
+					// selectedColor: "#999",
+					// color: "#999",
+				});
+				uni.switchTab({
+					url: '../index/index'
+				})
+				//uni.showTabBar()
+			},
+			onReachBottom(e) {
 				console.log(111)
 				this.bootom = 1
 			},
-			getimgheight1(item){
+			getimgheight1(item) {
 				// const that = this
 				var height = 0
-					// 获取图片宽高
-					uni.getImageInfo({
-						src: item,
-						success: (image) => {
-					    
+				// 获取图片宽高
+				uni.getImageInfo({
+					src: item,
+					success: (image) => {
+
 						// this.Swiper_H = 0
-						height  = image.height 
+						height = image.height
 						this.hotheight = height
-							// 计算图片渲染高度
+						// 计算图片渲染高度
 						let showH = (50 * image.height) / image.width
-						  // console.log(Swiper_H)	
-						
-						}
-					})
-				return  this.hotheight
+						// console.log(Swiper_H)	
+
+					}
+				})
+				return this.hotheight
 			},
-					//获取广告
-			getPullMes(){
-				let data={_action:'getpagedata',pagecode:'001-STARTPAGE'}
-				defaultRequest(data).then( res =>{
+			//获取广告
+			getPullMes() {
+				let data = {
+					_action: 'getpagedata',
+					pagecode: '001-STARTPAGE'
+				}
+				defaultRequest(data).then(res => {
 					////console.log('1',res)
 					let img
-					let url 
-					if(res.error == 0){
+					let url
+					if (res.error == 0) {
 						console.log(res.data.zones)
-						if(res.data.zones){
-						res.data.zones.map( item =>{
-							
-							if(item.zone_code ==  "KAIPIN"){
-								
-								if(item.blocks){
-									img = item.blocks
-									url = item.blocks[0].block_link
-									this.open_img = img
-									 console.log(this.open_img.length,'0000')
+						if (res.data.zones) {
+							res.data.zones.map(item => {
+
+								if (item.zone_code == "KAIPIN") {
+
+									if (item.blocks) {
+										img = item.blocks
+										url = item.blocks[0].block_link
+										this.open_img = img
+										console.log(this.open_img.length, '0000')
+									}
 								}
-							}
-						});
-						}else{
-							this.open_img  = []
+							});
+						} else {
+							this.open_img = []
 							this.countdownTime2 = 0
 						}
-						 
-						 // this.popUrl = url
+
+						// this.popUrl = url
 					}
 				})
-				let data2={_action:'getpagedata',pagecode:'HOMEPOPUPADS'}
-				defaultRequest(data2).then( res =>{
+				let data2 = {
+					_action: 'getpagedata',
+					pagecode: 'HOMEPOPUPADS'
+				}
+				defaultRequest(data2).then(res => {
 					////console.log('2',res)
-					if(res.error == 0 &&res.data.zones){
-						res.data.zones.map( item =>{
-							if(item.zone_code ==  'HOMEPOPUP'){
+					if (res.error == 0 && res.data.zones) {
+						res.data.zones.map(item => {
+							if (item.zone_code == 'HOMEPOPUP') {
 								this.popImg = item.zone_icon
 								this.popUrl = item.zone_more_link
 								this.open()
 								// console.log(this.popImg,item.zone_code)
-								
+
 							}
 						})
 					}
-					
-					
+
+
 				})
-				let data3 ={
-					_action:'get_splash_ad',appcode:'DOPE+',VERS:'1.0.0'
+				let data3 = {
+					_action: 'get_splash_ad',
+					appcode: 'DOPE+',
+					VERS: '1.0.0'
 				}
-				defaultRequest(data3).then(res =>{
+				defaultRequest(data3).then(res => {
 					////console.log(res)
 				})
 			},
 			//5秒倒计时
 			getCountdownTime() {
-				 uni.hideTabBar();
+				uni.hideTabBar();
 				uni.setTabBarStyle({
-				 backgroundColor: "#ccc",
-				  borderStyle: "black",
+					backgroundColor: "#ccc",
+					borderStyle: "black",
 				});
-							// this.countdownTime = 10
-							// let timer = setInterval(() => {
-							// 	this.countdownTime--;
-							// 	if (this.countdownTime < 1) {
-							// 		clearInterval(timer)
-							// 		this.countdownTime = 0
-									
-							// 	}
-								
-							// }, 1000)
-							    
-								let timer2 = setInterval(() => {
-									// uni.hideTabBar();
-									
-										this.countdownTime2--;
-										
-										console.log(this.countdownTime2)
-									if(this.countdownTime2 <0){
-										clearInterval(timer2)
-										this.countdownTime2 = 0
-									}	
-									
-									if(this.countdownTime2  ==0){
-									  //uni.showTabBar()
-									  uni.setTabBarStyle({
-									   backgroundColor: "#fff",
-									    borderStyle: "black",
-									    // selectedColor: "#999",
-									    // color: "#999",
-									  });
-									  clearInterval(timer2)
-									}
-								}, 1000)
-							
-							
-						},
-		//gaogaoye 跳转
-		popImgto(){
-			const i = this.popUrl.indexOf('?')
-			const url = this.popUrl.substring(i)
-			////console.log(url)
-			if(this.popUrl.includes('dope.dope://?goodslist=1')){
-				
+				// this.countdownTime = 10
+				// let timer = setInterval(() => {
+				// 	this.countdownTime--;
+				// 	if (this.countdownTime < 1) {
+				// 		clearInterval(timer)
+				// 		this.countdownTime = 0
+
+				// 	}
+
+				// }, 1000)
+
+				let timer2 = setInterval(() => {
+					// uni.hideTabBar();
+
+					this.countdownTime2--;
+
+					console.log(this.countdownTime2)
+					if (this.countdownTime2 < 0) {
+						clearInterval(timer2)
+						this.countdownTime2 = 0
+					}
+
+					if (this.countdownTime2 == 0) {
+						//uni.showTabBar()
+						uni.setTabBarStyle({
+							backgroundColor: "#fff",
+							borderStyle: "black",
+							// selectedColor: "#999",
+							// color: "#999",
+						});
+						clearInterval(timer2)
+					}
+				}, 1000)
+
+
+			},
+			//gaogaoye 跳转
+			popImgto() {
+				const i = this.popUrl.indexOf('?')
+				const url = this.popUrl.substring(i)
 				////console.log(url)
-				uni.navigateTo({
-					url:'/pages/category/productList'+url+'&tag=1'
-				})
-			}
-			else{
-				uni.navigateTo({
-					url:'../productDetails/index'+url+'&img=1'
-				})
-			}
-			
-		},
-		  
-		  
-		
-	
-			// 获取首页数据配置
-			getIndex(code){
-				
-				let data={_action:'getpagedata',pagecode:''}
-				data.pagecode = code
-				defaultRequest(data).then(res=>{
-					
-					if(res.error==0){
-						this.indexDate=res.data
-						 // console.log(this.indexDate,'首页配置')
-						 this.len = 0
-						 let height = 0
-						this.indexDate.zones.map(item=>{
-							item.blocks.map(item1 =>{
-								console.log(item.zone_code,item)
-								uni.getImageInfo({
-									src: item1.block_pic,
-									success: (image) => {
-									// console.log(image)
-									// let showH = (500 * image.height) / image.width
-									let showH = (image.height) / 2
-									height = image.height 
-									item1.height = showH
-									// item1.image = image
-									// console.log(height)
+				if (this.popUrl.includes('dope.dope://?goodslist=1')) {
+
+					////console.log(url)
+					uni.navigateTo({
+						url: '/pages/category/productList' + url + '&tag=1'
+					})
+				} else {
+					uni.navigateTo({
+						url: '../productDetails/index' + url + '&img=1'
+					})
+				}
+
+			},
+
+
+
+
+			// 获取首页数据配置
+			getIndex(code) {
+
+				let data = {
+					_action: 'getpagedata',
+					pagecode: ''
+				}
+				data.pagecode = code
+				defaultRequest(data).then(res => {
+
+					if (res.error == 0) {
+						this.indexDate = res.data
+						// console.log(this.indexDate,'首页配置')
+						this.len = 0
+						let height = 0
+						this.indexDate.zones.map(item => {
+							item.blocks.map(item1 => {
+								console.log(item.zone_code, item)
+								uni.getImageInfo({
+									src: item1.block_pic,
+									success: (image) => {
+										// console.log(image)
+										// let showH = (500 * image.height) / image.width
+										let showH = (image.height) / 2
+										height = image.height
+										item1.height = showH
+										// item1.image = image
+										// console.log(height)
 									}
 								})
-								
-								
+
+
 							})
-							if(item.zone_code=='ICON'){
-								item.content=''
+							if (item.zone_code == 'ICON') {
+								item.content = ''
 								this.info.push(item)
-                                this.len =  item.blocks.length
-								
+								this.len = item.blocks.length
+
 								// this.len+= this.info.blocks.length
 								//console.log(this.info,'info')
 							}
-							if(item.zone_code=='BANNER'){
-								item.blocks.map( item1 =>{
-									 this.getimgheight(item1.block_pic)
+							if (item.zone_code == 'BANNER') {
+								item.blocks.map(item1 => {
+									this.getimgheight(item1.block_pic)
 									// console.log(this.Swiper_H)
 								})
 							}
-							if(item.zone_code =='HONLIST3'){
-								item.blocks.map( item1 =>{
+							if (item.zone_code == 'HONLIST3') {
+								item.blocks.map(item1 => {
 									// console.log('HONLIST3',item1)
-									
+
 								})
 							}
-							if(item.zone_code =='HONLIST2'){
-								item.blocks.map( item1 =>{
+							if (item.zone_code == 'HONLIST2') {
+								item.blocks.map(item1 => {
 									// console.log('HONLIST2',item1)
-									
+
 								})
 							}
-							if(this.info.length>1){
-								for(let i =0; i < this.info.length; i++){
-									if(this.info[i].blocks.length > this.len){
+							if (this.info.length > 1) {
+								for (let i = 0; i < this.info.length; i++) {
+									if (this.info[i].blocks.length > this.len) {
 										this.len = this.info[i].blocks.length
 									}
 								}
 							}
-							if(item.zone_code=='LIST1'){
+							if (item.zone_code == 'LIST1') {
 								console.log(item.zone_more_link)
 								const i = item.zone_more_link.indexOf('gid=')
 								// console.log(i)
-								const ids = item.zone_more_link.substring(i+4,item.zone_more_link.length)
+								const ids = item.zone_more_link.substring(i + 4, item.zone_more_link
+									.length)
 								// console.log(ids)
-								 // this.bestlist.push(item.blocks)
+								// this.bestlist.push(item.blocks)
 								// //////console.log(this.bestlist,'精品')
-								 this.isbest = 1
-								 this.catQuery.gid  = ''
-								 this.catQuery.gid = ids
-								 this.getCatList()
-								item.blocks.map( item1 =>{
+								this.isbest = 1
+								this.catQuery.gid = ''
+								this.catQuery.gid = ids
+								this.getCatList()
+								item.blocks.map(item1 => {
 									this.bestlist.push(item1)
-									
+
 								})
-								console.log(this.bestlist,'精品')
+								console.log(this.bestlist, '精品')
 							}
-							
+
 						})
 					}
 				})
 				defaultRequest({
-					_action:'getpagedata',pagecode:'HOMECLASS'
-				}).then(res =>{
+					_action: 'getpagedata',
+					pagecode: 'HOMECLASS'
+				}).then(res => {
 					// //////console.log(res)
-					if(res.error ==0){
+					if (res.error == 0) {
 						this.scrollList = res.data.zones
 					}
 				})
-				
+
 				// 获取tarbar中间
-				let data2={_action:'getpagedata',pagecode:'HOMESALEICON '}
+				let data2 = {
+					_action: 'getpagedata',
+					pagecode: 'HOMESALEICON '
+				}
 				defaultRequest(data2).then(res => {
 					console.log(res)
 					let url
-					if(res.error == 0){
-						if(res.data.page_code == 'HOMESALEICON'){
-							let src = 'https://www.dopeplus.com/images/mapp_customized/202210/1665653173499940520.png'
-							if(src==res.data.zones[0].blocks[0].block_pic){
+					if (res.error == 0) {
+						if (res.data.page_code == 'HOMESALEICON') {
+							let src =
+								'https://www.dopeplus.com/images/mapp_customized/202210/1665653173499940520.png'
+							if (src == res.data.zones[0].blocks[0].block_pic) {
 								this.tarbar[2].src = '../../static/img/min.png'
-							}else{
-								src=res.data.zones[0].blocks[0].block_pic
-								
-								uni.setStorageSync('midButton',src)
+							} else {
+								src = res.data.zones[0].blocks[0].block_pic
+								// this.tabar[2].src=src
+								this.tarbar[2].src = res.data.zones[0].blocks[0].block_pic
+								uni.setStorageSync('midButton', src)
 							}
 						}
 					}
 				});
 			},
 			// 获取商品详情数据
-			getDate(item){
+			getDate(item) {
 				uni.showLoading({
-					title:'loading'
+					title: 'loading'
 				})
-				setTimeout( () =>{
+				setTimeout(() => {
 					uni.hideLoading()
 					this.isCart = true
 					uni.hideTabBar()
-				},1500)
+				}, 1500)
 				console.log(item)
-				
-				if(item.goodid){
+
+				if (item.goodid) {
 					this.query.goods_id = item.goodid
 					this.cartQuery.goods_id = item.goodid
-				}else if(item.block_link){
+				} else if (item.block_link) {
 					const i = item.block_link.indexOf('=')
-					this.query.goods_id = item.block_link.substring(i+1,item.block_link.length)
-					this.cartQuery.goods_id = item.block_link.substring(i+1,item.block_link.length)
+					this.query.goods_id = item.block_link.substring(i + 1, item.block_link.length)
+					this.cartQuery.goods_id = item.block_link.substring(i + 1, item.block_link.length)
 				}
 				console.log(this.query.goods_id)
-				this.info =[]
-				this.goods_attr_list =[]
-			
-				defaultRequest(this.query).then(res=>{
-					if(res.error==0){
+				this.info = []
+				this.goods_attr_list = []
+
+				defaultRequest(this.query).then(res => {
+					if (res.error == 0) {
 						console.log(res.data)
-						this.goodsDate=res.data
+						this.goodsDate = res.data
 						this.shop_price = this.goodsDate.shop_price
-						this.goodsDate.gallery_list.map(item=>{
-							item.content=''
+						this.goodsDate.gallery_list.map(item => {
+							item.content = ''
 							this.info.push(item.img_url)
-							
+
 						})
-						
-						if(this.goodsDate.attr_list){
+
+						if (this.goodsDate.attr_list) {
 							console.log(this.goodsDate.attr_list)
 							this.Is_attr = this.goodsDate.attr_list.length
-							if(this.Is_attr>0){
+							if (this.Is_attr > 0) {
 								let Size_list
-								let Attr_list 
-								
-							
-							this.goodsDate.attr_list.map(item=>{
-								
-								// if(item.attr_name){
-								// 	this.sizenum=item.goods_attrs.length
-								// }
-								
-								// if(item.attr_name=="Color"){
-								// 	this.colorNum=item.goods_attrs.length
-								// 	console.log(this.colorNum)
-								// 	Attr_list = item.goods_attrs
-								// 	let i = 0
-								// 	Attr_list.map( item =>{
-								// 		 this.Attr_list  +=item.attr_value + '、'
-								// 		  i++
-								// 	 })
-								// 	 this.Attr_list= this.Attr_list.substring(0, this.Attr_list.length-1)
-								// 	 console.log(i)
-								// 	 this.max = i
-								// }
-								// else if(item.attr_name=="Size"){
-								// 	Size_list = item.goods_attrs
-									
-								// 	console.log(this.sizenum)
-								// 	Size_list.map( item =>{
-								// 		 this.Size_list  +=item.attr_value + ' '
-										
-								// 	 })
-								// 	  this.Size_list= this.Size_list.substring(0, this.Size_list.length-1)
-								// }
-								let data={name:item.attr_name,goods_attr_id:'',attr_id:item.attr_id,list:item.goods_attrs}
-								this.goods_attr_list.push(data)
-								 console.log(this.goods_attr_list)
-								 let list = []
-								
-								 this.goods_attr_list.map( item =>{
-									 item.list.map(item1 =>{
-										 if(!item1.attr_img){
-											this.tag = 1
-											
-										 }
-										 
-									 })
-								 })
-								// console.log(list)
-								// this.noImgtype = list
-							})
-						}
-						}else{
-							this.goods_attr_list=[]
+								let Attr_list
+
+
+								this.goodsDate.attr_list.map(item => {
+
+									// if(item.attr_name){
+									// 	this.sizenum=item.goods_attrs.length
+									// }
+
+									// if(item.attr_name=="Color"){
+									// 	this.colorNum=item.goods_attrs.length
+									// 	console.log(this.colorNum)
+									// 	Attr_list = item.goods_attrs
+									// 	let i = 0
+									// 	Attr_list.map( item =>{
+									// 		 this.Attr_list  +=item.attr_value + '、'
+									// 		  i++
+									// 	 })
+									// 	 this.Attr_list= this.Attr_list.substring(0, this.Attr_list.length-1)
+									// 	 console.log(i)
+									// 	 this.max = i
+									// }
+									// else if(item.attr_name=="Size"){
+									// 	Size_list = item.goods_attrs
+
+									// 	console.log(this.sizenum)
+									// 	Size_list.map( item =>{
+									// 		 this.Size_list  +=item.attr_value + ' '
+
+									// 	 })
+									// 	  this.Size_list= this.Size_list.substring(0, this.Size_list.length-1)
+									// }
+									let data = {
+										name: item.attr_name,
+										goods_attr_id: '',
+										attr_id: item.attr_id,
+										list: item.goods_attrs
+									}
+									this.goods_attr_list.push(data)
+									console.log(this.goods_attr_list)
+									let list = []
+
+									this.goods_attr_list.map(item => {
+										item.list.map(item1 => {
+											if (!item1.attr_img) {
+												this.tag = 1
+
+											}
+
+										})
+									})
+									// console.log(list)
+									// this.noImgtype = list
+								})
+							}
+						} else {
+							this.goods_attr_list = []
 							this.Is_attr = 0
 						}
-						
+
 						// this.catQuery.cat=res.data.cat_id
-						
+
 					}
 				})
 			},
-			CloseCart(){
-				this.isCart=false
+			CloseCart() {
+				this.isCart = false
 				//uni.showTabBar()
 			},
 			// 选择规格
-			selectAttr(attr_id,goods_attr_id,index1,attr_price){
+			selectAttr(attr_id, goods_attr_id, index1, attr_price) {
 				this.currentAttr = index1
-				let sum  = this.goodsDate.shop_price
-				if(attr_price){
-				   sum = parseInt(sum) + parseInt(attr_price)
-				   console.log(sum)
-				    
+				let sum = this.goodsDate.shop_price
+				if (attr_price) {
+					sum = parseInt(sum) + parseInt(attr_price)
+					console.log(sum)
+
 				}
 				this.shop_price = sum
-				let data={attr_id:attr_id,goods_attr_id:goods_attr_id}
-				if(this.goods_attr_list.length==0){
+				let data = {
+					attr_id: attr_id,
+					goods_attr_id: goods_attr_id
+				}
+				if (this.goods_attr_list.length == 0) {
 					this.goods_attr_list.push(data)
-				}else{
+				} else {
 					// 判断是否有新的规格加入
-					let isNew=false
-					for(let i in this.goods_attr_list){
-						let item=this.goods_attr_list[i]
-						if(item.attr_id==attr_id){
-							if(item.goods_attr_id==goods_attr_id){
-								this.goods_attr_list[i].goods_attr_id=''
-							}else{
-								this.goods_attr_list[i].goods_attr_id=goods_attr_id
+					let isNew = false
+					for (let i in this.goods_attr_list) {
+						let item = this.goods_attr_list[i]
+						if (item.attr_id == attr_id) {
+							if (item.goods_attr_id == goods_attr_id) {
+								this.goods_attr_list[i].goods_attr_id = ''
+							} else {
+								this.goods_attr_list[i].goods_attr_id = goods_attr_id
 							}
-							isNew=false
+							isNew = false
 							break
-						}else{
-							isNew=true
+						} else {
+							isNew = true
 						}
 					}
-					if(isNew){
-						this.goods_attr_list.splice(index,0,data)
+					if (isNew) {
+						this.goods_attr_list.splice(index, 0, data)
 					}
 				}
 			},
 			// 添加到购物车
-			addCart(){
-				 if(this.Is_attr>0){
-					let goods_attr_id=''
-					this.goods_attr_list.map(item=>{
-						if(item.goods_attr_id!=''){
-							goods_attr_id+=item.goods_attr_id+','
+			addCart() {
+				if (this.Is_attr > 0) {
+					let goods_attr_id = ''
+					this.goods_attr_list.map(item => {
+						if (item.goods_attr_id != '') {
+							goods_attr_id += item.goods_attr_id + ','
 						}
-						
+
 					})
 					let isall = 1
-					this.goods_attr_list.map(item =>{
+					this.goods_attr_list.map(item => {
 						//console.log(item.goods_attr_id)
-						if(item.goods_attr_id==''){
+						if (item.goods_attr_id == '') {
 							isall = 0
 						}
 					})
-					
-					if(isall == 0){
+
+					if (isall == 0) {
 						uni.showToast({
-							title:'Please select the product specification',
-							icon:'none'
+							title: 'Please select the product specification',
+							icon: 'none'
 						})
 						return
 					}
-					
-					this.cartQuery.goods_attr_id=goods_attr_id.substring(0,goods_attr_id.lastIndexOf(','));
+
+					this.cartQuery.goods_attr_id = goods_attr_id.substring(0, goods_attr_id.lastIndexOf(','));
 				}
 				console.log(this.cartQuery)
-				if(this.isLogin == 1){
-				defaultRequest2(this.cartQuery).then(res=>{
-					if(res.error==0){
-						this.isCart = false
-		
-						this.cartQuery.goods_attr_id = ''
-						if(res.data[0].success){
-							setTimeout( ()=>{
-								uni.showToast({
-									title:'Successfully added',
-									icon:'none'
-								})
-							},500)
-							
+				if (this.isLogin == 1) {
+					defaultRequest2(this.cartQuery).then(res => {
+						if (res.error == 0) {
+							this.isCart = false
+
+							this.cartQuery.goods_attr_id = ''
+							if (res.data[0].success) {
+								setTimeout(() => {
+									uni.showToast({
+										title: 'Successfully added',
+										icon: 'none'
+									})
+								}, 500)
+
+							}
+							//uni.showTabBar()
+							this.getList()
 						}
-						//uni.showTabBar()
-						this.getList()
-					}
-				})
-				}
-				else if (this.isLogin == 0){
+					})
+				} else if (this.isLogin == 0) {
 					uni.navigateTo({
-						url:'../login/index'
+						url: '../login/index'
 					})
 				}
-				
+
 			},
-			clickImg(index,e){
+			clickImg(index, e) {
 				console.log(e)
 				let list = []
-				if(e){
-					if(typeof(e) ==='object')
-					{
-						
-					for(let i in e ){
-						
-						console.log(e[i].afile)
-						list.push(e[i].afile)
-						console.log(list)
-						}}
-					
-					else{
-						e.map( item =>
-						{
+				if (e) {
+					if (typeof(e) === 'object') {
+
+						for (let i in e) {
+
+							console.log(e[i].afile)
+							list.push(e[i].afile)
+							console.log(list)
+						}
+					} else {
+						e.map(item => {
 							list.push(item.attr_img)
 						})
 					}
-					
-					
+
+
 					wx.previewImage({
 						urls: list, //需要预览的图片http链接列表，多张的时候，url直接写在后面就行了
 						current: index, // 当前显示图片的http链接，默认是第一个
-						indicator:'number',
+						indicator: 'number',
 						success: function(res) {},
 						fail: function(res) {},
 						complete: function(res) {},
 					})
-				}
-				else{
+				} else {
 					wx.previewImage({
 						urls: this.info, //需要预览的图片http链接列表，多张的时候，url直接写在后面就行了
 						current: index, // 当前显示图片的http链接，默认是第一个
-						indicator:'number',
+						indicator: 'number',
 						success: function(res) {},
 						fail: function(res) {},
 						complete: function(res) {},
 					})
 				}
 			},
-			Iswish(){
+			Iswish() {
 				const i = uni.getStorageSync('isLogin')
-				if(i==1){
+				if (i == 1) {
 					uni.navigateTo({
-						url:'../account/wishlist'
+						url: '../account/wishlist'
 					})
-				}else{
+				} else {
 					uni.navigateTo({
-						url:'../login/index'
+						url: '../login/index'
 					})
 				}
 			},
-			getMes(){
-				
-				defaultRequest(this.myMes).then(res =>{
+			getMes() {
+
+				defaultRequest(this.myMes).then(res => {
 					// console.log(res.data.message_list)
 					let i = 0
-					if(res.error ==0){
+					if (res.error == 0) {
 						let list = res.data.message_list
-						list.map( item =>{
+						list.map(item => {
 							// console.log(item)
-							if(item.unread == 1){
+							if (item.unread == 1) {
 								i++
 							}
 						})
 						this.mesNum = i
 						console.log(this.mesNum)
 					}
-				
-				 // ////console.log(sum)
-				
-				
+
+					// ////console.log(sum)
+
+
 				})
 			},
-			gotoSearch(){
+			gotoSearch() {
 				uni.navigateTo({
-					url:'./search'
+					url: './search'
 				})
 			},
-			goDetails(id){
+			goDetails(id) {
 				uni.navigateTo({
-					url:'/pages/productDetails/index?goodid='+id
+					url: '/pages/productDetails/index?goodid=' + id
 				})
 			},
-		
-			getList(){
-				 
-				
-				let data={_action:'getcartgoods'}
-				defaultRequest(data).then(res=>{
+
+			getList() {
+
+
+				let data = {
+					_action: 'getcartgoods'
+				}
+				defaultRequest(data).then(res => {
 					// //////console.info(res.data.goods_list.length,'//////')
-					if(res.error==0){
-						 this.sum = res.data.goods_list.length 
+					if (res.error == 0) {
+						this.sum = res.data.goods_list.length
 					}
 				})
-				
-				let query={
-					_action:'getgoods',type:'promote',order_type:0,page_size:50,page_index:0
+
+				let query = {
+					_action: 'getgoods',
+					type: 'promote',
+					order_type: 0,
+					page_size: 50,
+					page_index: 0
 				}
-				
-				defaultRequest(query).then(res=>{
-					if(res.error==0){
+
+				defaultRequest(query).then(res => {
+					if (res.error == 0) {
 						let skillList = []
 						this.skillList = res.data
 						// for(let i =0;i<3;i++){
@@ -1228,403 +889,863 @@
 						// 	       var mm = res.data[_num]
 						// 			  skillList.push(mm)
 						// 			  this.skillList = skillList
-								  
-							     
+
+
 						// }
-						
+
 					}
 				})
 			},
-			
+
 			// 指定范围内，指定个数，无重复的随机整数
-			getRandomNumber(n,min,max){
-			    let arr=[];
-			    for(let i = 0; i < n; i ++){
-			        arr[i] = parseInt(Math.random() * (max - min + 1) + min);
-			    }
-			    for(let i = 0; i < n; i++){
-			        for(let j = i + 1; j < n; j ++){
-			            if(arr[i] === arr[j]){
-			                this.getRandomNumber(n,min,max);
-			                return false;
-			            }
-			        }
-			    }
-			    return arr
+			getRandomNumber(n, min, max) {
+				let arr = [];
+				for (let i = 0; i < n; i++) {
+					arr[i] = parseInt(Math.random() * (max - min + 1) + min);
+				}
+				for (let i = 0; i < n; i++) {
+					for (let j = i + 1; j < n; j++) {
+						if (arr[i] === arr[j]) {
+							this.getRandomNumber(n, min, max);
+							return false;
+						}
+					}
+				}
+				return arr
 			},
-			
+
 			//获取用户是否登录
-			getInfo(){
+			getInfo() {
 				let data = {
-					_action:'getinfo'
+					_action: 'getinfo'
 				}
-				defaultRequest(data).then(res =>{
-					//////console.log(res,'用户信息')
-					if(res.error == -1){
-						uni.setStorageSync('isLogin',0)
-					}else if(res.error==0){
-						uni.setStorageSync('isLogin',1)
+				defaultRequest(data).then(res => {
+					////console.log(res,'用户信息')
+					if (res.error == -1) {
+						uni.setStorageSync('isLogin', 0)
+					} else if (res.error == 0) {
+						uni.setStorageSync('isLogin', 1)
 					}
 				})
 			},
-			
-			getimgheight(item){
+
+			getimgheight(item) {
 				const that = this
-				
-					// 获取图片宽高
-					uni.getImageInfo({
-						src: item,
-						success: (image) => {
-					    // //console.log(image)
+
+				// 获取图片宽高
+				uni.getImageInfo({
+					src: item,
+					success: (image) => {
+						// //console.log(image)
 						// this.Swiper_H = 0
-						this.Swiper_H = image.height 
-							// 计算图片渲染高度
-							let showH = (50 * image.height) / image.width
+						this.Swiper_H = image.height
+						// 计算图片渲染高度
+						let showH = (50 * image.height) / image.width
 						// //console.log(showH)	
 						return this.Swiper_H
-						}
-					})
-				
+					}
+				})
+
 			},
-			
+
 			// 获取的推荐商品数据
-			getCatList(type){
-				if(this.isbest ==1){
-			defaultRequest4(this.catQuery).then(res=>{
-					//////console.info(res,'最好的')
-					if(res.error==0){
-						if(res.data){
-							
-							res.data.map( item =>{
-								//console.log(item)
-								this.bestlist.push({
-									block_pic:item.goods_img,
-									block_title3:'US$'+item.shop_price,
-									block_name:item.short_name,
-									goodid:item.id
+			getCatList(type) {
+				if (this.isbest == 1) {
+					defaultRequest4(this.catQuery).then(res => {
+						//////console.info(res,'最好的')
+						if (res.error == 0) {
+							if (res.data) {
+
+								res.data.map(item => {
+									//console.log(item)
+									this.bestlist.push({
+										block_pic: item.goods_img,
+										block_title3: 'US$' + item.shop_price,
+										block_name: item.short_name,
+										goodid: item.id
+									})
 								})
-							})
-							//////console.log(this.bestlist,'合并')
-							const that = this
-							this.bestlist.forEach(res => {
-								// 获取图片宽高
-								uni.getImageInfo({
-									src: res.block_pic,
-									success: (image) => {
-										// //////console.log(res.block_pic)
-										// 计算图片渲染高度
-										let showH = (50 * image.height) / image.width
-										// 判断左右盒子高度
-										if(that.leftH <= that.rightH) {
-											that.leftList.push(res)
-											that.leftH += showH
-										} else {
-											that.rightList.push(res)
-											that.rightH += showH
+								//////console.log(this.bestlist,'合并')
+								const that = this
+								this.bestlist.forEach(res => {
+									// 获取图片宽高
+									uni.getImageInfo({
+										src: res.block_pic,
+										success: (image) => {
+											// //////console.log(res.block_pic)
+											// 计算图片渲染高度
+											let showH = (50 * image.height) / image.width
+											// 判断左右盒子高度
+											if (that.leftH <= that.rightH) {
+												that.leftList.push(res)
+												that.leftH += showH
+											} else {
+												that.rightList.push(res)
+												that.rightH += showH
+											}
 										}
-									}
+									})
 								})
-							})
+							}
 						}
-					}
-				})
+					})
 				}
 			},
-			
-			
-			gotoSkillpage(e){
+
+
+			gotoSkillpage(e) {
 				uni.navigateTo({
 					// url:"../productDetails/index?goods_id="+e.id
-					url:'./flashSale'
+					url: './flashSale'
 				})
 			},
-		
-			scrollChange(item,index){
+
+			scrollChange(item, index) {
 				this.info = []
 				// this.isbest = 0
-				this.leftList =[]
+				this.leftList = []
 				this.rightList = []
 				this.bestlist = []
 				////console.log(this.bestlist)
-				this.scroll_active=index
+				this.scroll_active = index
 				let code = item.zone_code
 				this.getIndex(code)
 				// this.getCatList()
-				
+
 			},
-			start(e){   
+			start(e) {
 				// console.log(e)
 				this.hot_index = e
 				return this.hot_index
-			    // this.clientX=e.changedTouches[0].clientX;             
-			    // this.clientY=e.changedTouches[0].clientY;
+				// this.clientX=e.changedTouches[0].clientX;             
+				// this.clientY=e.changedTouches[0].clientY;
 			},
-			
-			end(e){
-			    // console.log(e)
+
+			end(e) {
+				// console.log(e)
 				this.hot_index = e
 				return this.hot_index
-			    // const subX=e.changedTouches[0].clientX-this.clientX;
-			    // const subY=e.changedTouches[0].clientY - this.clientY;
-			    // if(subY>50 || subY<-50){
-			    //     console.log('上下滑')
-			    // }else{
-			    //     if(subX>50){
-			    //         console.log('右滑')
-			    //     }else if(subX<-50){
-			    //         console.log('左滑')
-			    //     }else{
-			    //         console.log('无效')
-			    //     }
-			    // }
+				// const subX=e.changedTouches[0].clientX-this.clientX;
+				// const subY=e.changedTouches[0].clientY - this.clientY;
+				// if(subY>50 || subY<-50){
+				//     console.log('上下滑')
+				// }else{
+				//     if(subX>50){
+				//         console.log('右滑')
+				//     }else if(subX<-50){
+				//         console.log('左滑')
+				//     }else{
+				//         console.log('无效')
+				//     }
+				// }
 			},
-			scrollhot(e){
+			scrollhot(e) {
 				// console.log(e)
 				// let i = e.scrollLeft/200
 				// this.hot_index = i
-			// console.log('滚动了',this.hot_index)	
-			// this.start(this.hot_index)
-			// this.end(this.hot_index)
-			
+				// console.log('滚动了',this.hot_index)	
+				// this.start(this.hot_index)
+				// this.end(this.hot_index)
+
 			},
-			
-			gridSwiper(e){
+
+			gridSwiper(e) {
 				this.current = e.detail.current
 			},
 			//轮播图跳转 // 热卖跳转
-			imgTo(item){
+			imgTo(item) {
 				//console.log(item,'item')
 				////console.log(item.block_link.includes('dope.youhui'))
-				let goodid 
-				
-				if(item.goodid){
-					
+				let goodid
+
+				if (item.goodid) {
+
 					uni.navigateTo({
-						url:'../productDetails/index?goodid='+item.goodid
+						url: '../productDetails/index?goodid=' + item.goodid
 					})
-				}
-				else if(item.block_link){
+				} else if (item.block_link) {
 					const i = item.block_link.indexOf('?')
-					 goodid = item.block_link.substring(i);
+					goodid = item.block_link.substring(i);
 					//////console.log(item.block_link)
-					if(item.block_link.includes('goodslist')){
+					if (item.block_link.includes('goodslist')) {
 						uni.navigateTo({
-							url:'../category/productList'+ goodid+'&tag=1'
+							url: '../category/productList' + goodid + '&tag=1'
 						})
-					}
-					else if(item.block_link.includes('goodid')){
+					} else if (item.block_link.includes('goodid')) {
 						uni.navigateTo({
-							url:'../productDetails/index'+goodid+'&img=1'
+							url: '../productDetails/index' + goodid + '&img=1'
 						})
-					}
-					else if(item.block_link.includes('dope.youhui')){
+					} else if (item.block_link.includes('dope.youhui')) {
 						uni.navigateTo({
-							url:'./pickUpCentre'
+							url: './pickUpCentre'
 						})
 					}
 				}
-			this.countdownTime2 = 0	 
+				this.countdownTime2 = 0
 			},
-			Hotgoto(item1){
+			Hotgoto(item1) {
 				const i = item1[0].block_link.indexOf('?')
 				////console.log(item1)
-				 const url = item1[0].block_link.substring(i)
-				if(url.includes('goodslist')){
+				const url = item1[0].block_link.substring(i)
+				if (url.includes('goodslist')) {
 					uni.navigateTo({
-						url:'../category/productList'+ url +'&tag=1'
+						url: '../category/productList' + url + '&tag=1'
 					})
-				}else{
+				} else {
 					uni.navigateTo({
-						url:'../productDetails/index'+url+'&img=1'
+						url: '../productDetails/index' + url + '&img=1'
 					})
 				}
 			}
 		},
 		onPageScroll(res) {
 			// console.log(res)
-			if(res.scrollTop>40){
-				this.isScrollShow=true
-			}else if(res.scrollTop<40){
-				this.isScrollShow=false
-				
+			if (res.scrollTop > 40) {
+				this.isScrollShow = true
+			} else if (res.scrollTop < 40) {
+				this.isScrollShow = false
+
 			}
 		},
-		
-		
-		
+
+
+
 	}
 </script>
+<template>
+
+	<view class="body" :class="isScrollShow?'body_pad':''">
+		<!-- 进入页面部分 -->
+		<view v-show="!open_img || countdownTime2==0">
+
+			<!-- 头部导航栏 -->
+			<view class="navigation ">
+				<view class="status_bar"></view>
+				<view style="background-color:black">
+					<view class="page_margin uni-bg-black">
+						<view class="navigation_title" :class="isScrollShow?'isScrollShow':'' ">
+							<template v-if="!isScrollShow ">
+								<navigator url="/pages/account/message" class="order_info_item">
+									<uni-badge :text="mesNum" type="error" absolute="rightTop">
+										<image src="../../static/img/msg_white.png" mode=""></image>
+									</uni-badge>
+								</navigator>
+
+								<image src="/static/img/dope plus_white.png" mode="" class="index_logo"></image>
+							</template>
+
+
+							<view class="navigation_title_right" :class="isScrollShow?'navigation_title_padding':'' ">
+								<navigator>
+									<image src="../../static/img/like_white.png" mode="" @click="Iswish()"></image>
+								</navigator>
+								<navigator url="/pages/shippingCart/index" open-type="switchTab">
+									<uni-badge :text="sum" type="error" absolute="rightTop">
+										<image src="../../static/img/shop_cart1.png" mode=""></image>
+									</uni-badge>
+								</navigator>
+
+							</view>
+						</view>
+
+						<navigator>
+							<view v-if="isScrollShow " :class="isScrollShow?'isScrollShow3':'' ">
+								<image src="/static/icon/home_white.png" mode=""></image>
+							</view>
+							<view class="navigation_seach" :class="isScrollShow?'isScrollShow1':'' "
+								@click="gotoSearch()">
+
+								<image src="../../static/img/seach.png" mode=""></image>
+								<text>search</text>
+							</view>
+						</navigator>
+					</view>
+				</view>
+				<!-- <view class="navigation_scroll " :class="isScrollShow?'isScrollShow2':'' ">
+				<scroll-view class="scroll-view_H" scroll-x="true" :show-scrollbar="false">
+					<view :class="scroll_active==index?'scroll_active':''" v-for="(item,index) in scrollList" @click="scrollChange(item,index)" :key="item.zone_name">{{item.zone_name}}</view>
+				</scroll-view>
+			</view> -->
+			</view>
+			<view class="navigation_scroll " :class="isScrollShow?'isScrollShow2':'' ">
+				<scroll-view class="scroll-view_H" scroll-x="true" :show-scrollbar="true">
+					<view :class="scroll_active==index?'scroll_active':''" v-for="(item,index) in scrollList"
+						@click="scrollChange(item,index)" :key="item.zone_name">{{item.zone_name}}</view>
+				</scroll-view>
+			</view>
+
+			<view style="max-width: 100%" v-for="(item,index) in indexDate.zones" :key="item.zone_id">
+
+				<!-- 轮播图 -->
+				<view class="uni-margin-wrap page_padding_left1" style="padding-left: 0; padding-right: 0;"
+					v-if="item.zone_code=='BANNER' && item.zone_status=='NORMAL'">
+					<swiper class="swiper" circular :indicator-dots="true" :autoplay="true"
+						style="height: 455px; display: block !important;" :style="{ height:Swiper_H +'rpx'}">
+						<swiper-item v-for="(item1,index1) in item.blocks" :key="item1.block_id">
+							<view class="swiper-item " v-if="item1.block_status=='NORMAL'"
+								:style="{width:(item.zone_code=='BANNER')?item.zone_colum+'rpx':'',heigth:'auto'}">
+								<image :src="item1.block_pic" mode="" @click="imgTo(item1)"></image>
+							</view>
+						</swiper-item>
+					</swiper>
+				</view>
+
+				<!-- 宫格 -->
+				<uni-swiper-dot :info="info" :current="current" field="content" mode="default"
+					v-if="item.zone_code=='ICON' && item.zone_status=='NORMAL' && item.zone_code!=indexDate.zones[index-1].zone_code">
+					<swiper class="grid_swiper " :style="{height:(len > 4?380+'rpx':190+'rpx')}" @change="gridSwiper">
+						<swiper-item v-for="(item1,index1) in info" :key="item1.zone_id">
+							<view class="grid_content">
+								<view class="grid_item" v-for="(item2, index2) in item1.blocks" :key="item2.block_id">
+									<template v-if="item2.block_status=='NORMAL'">
+										<view class="grid_item_img">
+											<image :src="item2.block_pic" mode="" @click="imgTo(item2)"></image>
+										</view>
+										<text>{{item2.block_title}}</text>
+									</template>
+
+								</view>
+							</view>
+						</swiper-item>
+					</swiper>
+				</uni-swiper-dot>
+
+				<!-- ONEPIC -->
+				<view class="ONEPIC" v-if="item.zone_code=='ONEPIC' && item.zone_status=='NORMAL'">
+					<!-- class="discount page_padding" -->
+					<image :src="item.blocks[0].block_pic"
+						:style="{height:(item.zone_code=='ONEPIC')?item.zone_column+'rpx':''}" mode=""
+						@click="imgTo(item.blocks[0])"></image>
+				</view>
+				<!-- TWOPIC -->
+				<view class="TWOPIC" v-if="item.zone_code=='TWOPIC' && item.zone_status=='NORMAL'">
+					<image :src="item1.block_pic" :style="{height:(item.zone_code=='TWOPIC')?item.zone_column+'rpx':''}"
+						@click="imgTo(item1)" mode="" v-for="(item1,index1) in item.blocks" :key="item1.block_id">
+					</image>
+				</view>
+				<!-- THREEPIC -->
+				<view class="THREEPIC" v-if="item.zone_code=='THREEPIC' && item.zone_status=='NORMAL'">
+					<image :src="item1.block_pic"
+						:style="{height:(item.zone_code=='THREEPIC')?item.zone_column+'rpx':''}" @click="imgTo(item1)"
+						mode="" v-for="(item1,index1) in item.blocks" :key="item1.block_id"></image>
+				</view>
+				<!-- FOURPIC -->
+				<view class="FOURPIC" v-if="item.zone_code=='FOURPIC' && item.zone_status=='NORMAL'">
+					<image :src="item1.block_pic"
+						:style="{height:(item.zone_code=='FOURPIC')?item.zone_column+'rpx':''}" mode=""
+						@click="imgTo(item1)" v-for="(item1,index1) in item.blocks" :key="item1.block_id"></image>
+				</view>
+				<!-- FIVEPIC -->
+				<view class="FIVEPIC" v-if="item.zone_code=='FIVEPIC' && item.zone_status=='NORMAL'">
+					<image :src="item1.block_pic"
+						:style="{height:(item.zone_code=='FIVEPIC')?item.zone_column+'rpx':''}" mode=""
+						@click="imgTo(item1)" v-for="(item1,index1) in item.blocks" :key="item1.block_id"></image>
+				</view>
+				<!-- SIXPIC -->
+				<view class="SIXPIC" v-if="item.zone_code=='SIXPIC' && item.zone_status=='NORMAL'">
+					<image :src="item1.block_pic" :style="{height:(item.zone_code=='SIXPIC')?item.zone_column+'rpx':''}"
+						mode="" @click="imgTo(item1)" v-for="(item1,index1) in item.blocks" :key="item1.block_id">
+					</image>
+				</view>
+
+
+
+				<!-- 标题 -->
+				<navigator url="/pages/index/flashSale" v-if="item.zone_code=='SPIKE1' && item.zone_status=='NORMAL'">
+					<view class="index_title page_padding">
+						<text>Flash Sale</text>
+						<view class="title_right">
+							<uni-countdown :showDay="false" :hour="curEndTime |hours" :minute="curEndTime|minutes"
+								:second="curEndTime|seconds" color="#FFF" background-color="rgb(178 34 52)" />
+							<image src="../../static/icon/right_white.png" mode=""></image>
+						</view>
+					</view>
+				</navigator>
+
+
+				<!-- SPIKE 1 -->
+				<scroll-view class="spike1 page_padding" scroll-x="true" :show-scrollbar="false"
+					v-if="item.zone_code=='SPIKE1' && item.zone_status=='NORMAL'">
+					<view class="spike1_item" v-for="(item1,index1) in skillList" :key="item1.goods_id">
+						<view class="item_img" @click="gotoSkillpage(item1)">
+							<image :src="item1.goods_img" mode=""
+								:style="{height:(item.zone_code=='SPIKE1')?item.zone_column+'rpx':'',width:200+'rpx'}">
+							</image>
+						</view>
+						<view class="spike1_item_bottom padding_left">
+							<text>US${{item1.promote_price}}</text>
+							<view class="spike1_item_text">US${{item1.shop_price}}</view>
+						</view>
+
+					</view>
+				</scroll-view>
+
+				<!-- 标题 -->
+				<view class="index_title page_padding" v-if="item.zone_code=='TITLE' && item.zone_status=='NORMAL'">
+					<text>{{item.blocks[0].block_title}}</text>
+					<view class="title_right">
+						<image src="../../static/icon/right_white.png" mode="" @click="Hotgoto(item.blocks)"></image>
+					</view>
+				</view>
+
+				<!-- HOT SELLS 1 -->
+
+				<view class="hotSells1 page_padding"
+					v-if="item.zone_code=='GOODSTWO1' || item.zone_code=='GOODSTHREE1'">
+					<template v-if="item.zone_code=='GOODSTWO1' && item.zone_status=='NORMAL'">
+						<view class="hotSells1_item" v-for="(item1,index1) in item.blocks" :key="item1.block_id">
+							<view class="hotSells1_item_img">
+								<image :src="item1.block_pic"
+									:style="{height:(item.zone_code=='GOODSTWO1')?item.zone_column+'rpx':''}" mode=""
+									@click="imgTo(item1)"></image>
+							</view>
+							<text>{{item1.block_title}}</text>
+						</view>
+					</template>
+					<template v-if="item.zone_code=='GOODSTHREE1' && item.zone_status=='NORMAL'">
+						<view class="hotSells2_item" v-for="(item1,index1) in item.blocks" :key="item1.block_id">
+							<view class="hotSells2_item_img">
+								<image :src="item1.block_pic"
+									:style="{height:(item.zone_code=='GOODSTHREE1')?item.zone_column+'rpx':''}" mode=""
+									@click="imgTo(item1)"></image>
+							</view>
+							<text>{{item1.block_title}}</text>
+						</view>
+					</template>
+				</view>
+
+				<!-- 标题 -->
+				<!-- <view class="index_title page_padding">
+				<text>Hot Selle</text>
+				<view class="title_right">
+					<image src="../../static/img/right.png" mode=""></image>
+				</view>
+			</view> -->
+
+
+				<!-- HOT SELLS 2 -->
+				<scroll-view class="spike1 page_padding" scroll-x="true" :show-scrollbar="false"
+					v-if="item.zone_code=='HONLIST2' && item.zone_status=='NORMAL'">
+					<view class="spike1_item padding_honlist2" v-for="(item1,index1) in item.blocks"
+						:key="item1.block_id">
+						<view class="item_img">
+							<image :src="item1.block_pic" mode=""
+								:style="{width:(item.zone_code=='HONLIST2')?420+'rpx':'',height:item.zone_column+'rpx'}"
+								@click="imgTo(item1)"></image>
+						</view>
+					</view>
+				</scroll-view>
+
+				<!-- 标题 -->
+				<!-- <view class="index_title page_padding">
+				<text>Hot Selle</text>
+				<view class="title_right">
+					<image src="../../static/img/right.png" mode=""></image>
+				</view>
+			</view> -->
+
+				<!-- HOT SELLS 3 -->
+				<scroll-view class="spike1 page_padding" scroll-x="true" :show-scrollbar="false"
+					v-if="item.zone_code=='HONLIST3' && item.zone_status=='NORMAL'" @scroll="scrollhot">
+					<view class="spike1_item" v-for="(item1,index1) in item.blocks" :key="item1.block_id">
+						<view class="item_img "
+							:style="{width:(item.zone_code=='HONLIST3')?280+'rpx':'',height:item.zone_column +'rpx'}">
+							<image :src="item1.block_pic" mode="" @click="imgTo(item1)"></image>
+						</view>
+						<view class="spike1_item_bottom">
+							<text>{{item1.block_title}}</text>
+							<view class="spike1_item_text1">{{item1.block_title2}}</view>
+						</view>
+
+					</view>
+				</scroll-view>
+				<!-- HOT SELLS 1 -->
+				<scroll-view class="spike1 page_padding" scroll-x="true" :show-scrollbar="false"
+					v-if="item.zone_code=='HONLIST1' && item.zone_status=='NORMAL'" @scroll="scrollhot">
+					<view class="spike1_item" style="padding-right: 0;" v-for="(item1,index1) in item.blocks"
+						:key="item1.block_id" @touchstart="start(index1)" @touchend="end(index1)">
+						<view class="item_img "
+							:style="{width:(item.zone_code=='HONLIST1')?350+'rpx':'',height:item.zone_column +'rpx'}"
+							:class="hot_index == index1?'hotmaxW':'hotmaxmin'">
+							<image :src="item1.block_pic" mode="" @click="imgTo(item1)"></image>
+						</view>
+						<!-- <view class="spike1_item_bottom" >
+						<text>{{item1.block_title}}</text>
+						<view class="spike1_item_text1">{{item1.block_title2}}</view>
+					</view> -->
+
+					</view>
+				</scroll-view>
+				<!-- GOODSTHREE 2 -->
+				<!-- <view class="goodsthree2">
+				<view class="goodsthree2_item" v-for="(item,index) in 3"  :key="index"></view>
+			</view> -->
+
+				<!-- 轮播图 -->
+				<!-- <view class="uni-margin-wrap">
+				<swiper class="swiper" circular :indicator-dots="true" :autoplay="true" >
+					<swiper-item>
+						<view class="swiper-item uni-bg-red">A</view>
+					</swiper-item>
+					<swiper-item>
+						<view class="swiper-item uni-bg-green">B</view>
+					</swiper-item>
+					<swiper-item>
+						<view class="swiper-item uni-bg-blue">C</view>
+					</swiper-item>
+				</swiper>
+			</view> -->
+
+				<!-- SPIKE 1 -->
+				<!-- <scroll-view class="spike1 page_padding_left" scroll-x="true" :show-scrollbar="false">
+				<view class="spike1_item" v-for="(item,index) in 8"  :key="index">
+					<view class="spike1_item_img"></view>
+					<view class="spike1_item_bottom1">
+						<view class="spike1_item_text">Adidas Yeezy Boost 350  DazzlingBlue Black</view>
+						<text>US$314.00</text>
+					</view>
+				</view>
+			</scroll-view> -->
+			</view>
+			<!-- 瀑布流标题 -->
+			<!-- <view class="index_title1" v-if="bestlist.length>0">PRODUCTS FRO YOU</view> -->
+
+			<!-- <view class="waterfall" v-if="bestlist.length>0" >
+			<custom-waterfalls-flow :value="bestlist" imageKey="block_pic"@imageClick="imgTo(bestlist)">
+				<template v-slot:default="item2">
+						<view class="item" @click="imgTo(item2)">
+							<view class="title">{{item2.block_title}}</view>
+								<view >{{item2.block_title2}}</view>
+								<view class="desc">{{item2.block_title3}}</view>
+						</view>
+				</template>
+			</custom-waterfalls-flow>
+		</view>
+		 -->
+			<view class="container" v-if="bestlist.length>0">
+				<view class="left">
+					<view v-for="(item,index) in leftList" :key="index">
+						<image :src="item.block_pic" alt="" mode="widthFix" @click="imgTo(item)"
+							:class="item.block_title==0&&!item.block_title2&&!item.block_name&&!item.block_title3?'img_border':''">
+						</image>
+						<view class="item" v-if="item.block_title!=0">
+							<view class="title" v-if="item.block_title!=0">{{item.block_title}}</view>
+							<view class="title">{{item.block_title2}}</view>
+							<view class="title1" v-if="item.block_name">{{item.block_name}}</view>
+							<view class="desc">
+								<view>{{item.block_title3}}</view>
+								<view class="desc_img">
+									<image src="../../static/icon/cat_white.png" @click="getDate(item)"></image>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="right">
+					<view v-for="(item1,index1) in rightList" :key="index1">
+						<image :src="item1.block_pic" alt="" mode="widthFix" @click="imgTo(item1)"
+							:class="item1.block_title==0&&!item1.block_title2&&!item1.block_name&&!item1.block_title3?'img_border':''">
+						</image>
+						<view class="item" v-if="item1.block_title!=0">
+							<view class="title" v-if="item1.block_title!=0">{{item1.block_title}}</view>
+							<view class="title">{{item1.block_title2}}</view>
+							<view class="title1" v-if="item1.block_name">{{item1.block_name}}</view>
+							<view class="desc">
+								<view>{{item1.block_title3}}</view>
+								<view class="desc_img">
+									<image src="../../static/icon/cat_white.png" @click="getDate(item1)"></image>
+								</view>
+							</view>
+						</view>
+					</view>
+
+				</view>
+			</view>
+			<!-- //购物车 -->
+			<view class="addCard" v-show="isCart">
+				<image src="/static/img/close1.png" mode="" class="addCard_close" @click="CloseCart()"></image>
+				<scroll-view class="spike1 " scroll-x="true" :show-scrollbar="false">
+					<image :src="item.img_url" mode="" class="addCard_scroll img_border"
+						v-for="(item,index) in goodsDate.gallery_list" :key="index" @click="clickImg(index)"></image>
+				</scroll-view>
+				<scroll-view class="addCard_body" scroll-y="true">
+					<view>{{goodsDate.goods_name}} </view>
+					<view class="addCard_price">US${{goodsDate.is_promote==0? shop_price :goodsDate.promote_price}}
+					</view>
+					<view v-for="(item,index) in goods_attr_list" :key="item.attr_id">
+						<view>{{item.name}}</view>
+						<view class="color_select variations_select_size">
+							<view class="color_select_item" v-for="(item1,index1) in item.list" :key="item1.attr_value"
+								:class="goods_attr_list[index].goods_attr_id==item1.goods_attr_id?'active_color':''"
+								@click="selectAttr(item.attr_id,item1.goods_attr_id,index1,item1.attr_price)">
+								<view class="color_select_item_zoom">
+									<image src="/static/icon/big2.png" @click="clickImg(index1)" mode=""
+										v-if="item1.attr_img!=''"></image>
+								</view>
+								<image :src="item1.attr_img" mode="" v-if="item1.attr_img!=''"></image>
+								<view class="color_select_item_bottom" v-if="item1.attr_img!=''">【{{ item1.attr_value}}】
+								</view>
+								<view class="color_select_item_bottom" v-if="!item1.attr_img">{{ item1.attr_value}}
+								</view>
+							</view>
+						</view>
+					</view>
+
+					<view class="quantity">
+						<text>Quantity</text>
+						<uni-number-box background="#FFFFFF" v-model="cartQuery.goods_number" :min="1"></uni-number-box>
+					</view>
+				</scroll-view>
+
+				<button @click="addCart">ADD TO CART</button>
+			</view>
+			<view class="mask" @click="isCart=false" v-show="isCart"></view>
+			<!-- //弹窗广告 -->
+			<view v-show="popImg">
+				<!-- <button @click="open">打开弹窗</button> -->
+				<uni-popup ref="popup" :mask-click="false">
+
+					<view class="Popup">
+						<view class="popup_close">
+							<image mode=" " @click="close" src="../../static/img/close2.png"></image>
+						</view>
+						<view class="popup_img">
+							<!-- <view class="popup_text"><text>{{countdownTime }}s跳过</text></view> -->
+							<image :src="popImg" mode=" " @click="popImgto"></image>
+						</view>
+					</view>
+					<!-- <button @click="close">关闭</button> -->
+				</uni-popup>
+			</view>
+		</view>
+
+		<!-- 启动页广告 -->
+		<view class="open_bg" ref="imgRef" v-show="countdownTime2>0?true:false">
+			<!-- <view class="open_text"><text @click="countdownTime2 =0">{{ countdownTime2 }}s skip</text></view> -->
+			<swiper class="open_bgimg" circular :indicator-dots="indicatorDots" :autoplay="autoplay"
+				:interval="interval" :duration="duration">
+				<swiper-item v-for="(item,index) in open_img" :key="item.block_pic">
+					<view class="open_text">
+						<text style="padding: 100px 15px;" @click="openClose()"
+							v-if="countdownTime2 >0||countdownTime2 ==0">{{ countdownTime2 }}sskip</text>
+					</view>
+					<image :src="item.block_pic" mode="" @click="imgTo(item)"></image>
+				</swiper-item>
+			</swiper>
+
+		</view>
+		<view class="bootom_last" v-if="bootom == 1">-THE END-</view>
+		<view class="tarbar">
+			<view @click="change(index)" v-for="(item,index) in tarbar" :key="item.name"
+				:class="index==2?'img_m':'tarbar_img'" :style="{color:index==0?'#000':''}">
+				<image :src="item.src"></image>
+				<view>{{ item.name}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+
 <style>
-	page{
-		height:100vh;
+	page {
+		height: 100vh;
 	}
 </style>
 <style lang="scss" scoped>
-	page{
+	page {
 		background-color: white;
-		 position: relative;
+		position: relative;
+	}
+
+	.display_none {
+		display: none;
+	}
+
+	@keyframes scaleDraw {
+		/*定义关键帧、scaleDrew是需要绑定到选择器的关键帧名称*/
+
+		0% {
+
+			transform: scale(1);
+			/*开始为原始大小*/
+
+		}
+
+		25% {
+
+			transform: scale(1.1);
+			/*放大1.1倍*/
+
+		}
+
+		50% {
+
+			transform: scale(1);
+
+		}
+
+		75% {
+
+			transform: scale(1.1);
+
+		}
+
 	}
-	.display_none{
-		display: none;
+
+	.bootom_last {
+		height: 300rpx;
+		width: 100%;
+		color: #fff;
+		background-color: #000;
+		margin-bottom: 200rpx;
+		font-size: 25rpx;
+		padding-bottom: 40rpx;
+		line-height: 300rpx;
+		text-align: center;
 	}
-	 @keyframes scaleDraw {  /*定义关键帧、scaleDrew是需要绑定到选择器的关键帧名称*/
-	
-	            0%{
-	
-	                transform: scale(1);  /*开始为原始大小*/
-	
-	            }
-	
-	            25%{
-	
-	                transform: scale(1.1); /*放大1.1倍*/
-	
-	            }
-	
-	            50%{
-	
-	                transform: scale(1);
-	
-	            }
-	
-	            75%{
-	
-	                transform: scale(1.1);
-	
-	            }
-	
-	        }
-			.bootom_last{
-				 height: 300rpx;
-				 width: 100%;
-				 color: #fff;
-				 background-color: #000;
-				 margin-bottom: 200rpx;
-				 font-size: 25rpx;
-				 padding-bottom:40rpx;
-				 line-height: 300rpx;
-				 text-align: center;
-			}
-	.ONEPIC{
-		  width: 100%;
-		  height: 100%;
-		   margin: -12rpx 0;
-		image{
-			 height: 100%;
-			 width: 100%;
+
+	.ONEPIC {
+		width: 100%;
+		height: 100%;
+		margin: -12rpx 0;
+
+		image {
+			height: 100%;
+			width: 100%;
 		}
-		&:nth-last-child(){
+
+		&:nth-last-child() {
 			margin-bottom: 10rpx;
 		}
 	}
-	.TWOPIC{
-		 width: 100%;
+
+	.TWOPIC {
+		width: 100%;
 		display: flex;
-		
-		image{
+
+		image {
 			width: 100%;
 			height: 100%;
 		}
 	}
-	.THREEPIC{
+
+	.THREEPIC {
 		width: 100%;
 		display: flex;
 		justify-content: space-between;
-		image{
+
+		image {
 			width: 100%;
 			height: 100%;
-			
+
 		}
-		
+
 	}
-	.FOURPIC{
+
+	.FOURPIC {
 		width: 100%;
 		display: flex;
 		justify-content: space-between;
-		image{
+
+		image {
 			width: 100%;
 			height: 100%;
 		}
 	}
-	.FIVEPIC{
+
+	.FIVEPIC {
 		width: 100%;
 		display: flex;
 		justify-content: space-between;
-		image{
+
+		image {
 			width: 100%;
 			height: 100%;
 		}
 	}
-	.SIXPIC{
+
+	.SIXPIC {
 		width: 100%;
 		display: flex;
 		justify-content: space-between;
-		image{
+
+		image {
 			width: 100%;
 			height: 100%;
 		}
 	}
-	.body{
+
+	.body {
 		padding-top: 190.33rpx;
 		background-color: #000000;
-		
+
 	}
-	.body_pad{
+
+	.body_pad {
 		padding-top: 147.33rpx;
 		background-color: #000000;
 	}
-	.status_bar{
+
+	.status_bar {
 		background-color: #000000;
 	}
-	.flex{
+
+	.flex {
 		display: flex;
 	}
-	.index_logo{
+
+	.index_logo {
 		width: 270.33rpx !important;
 		height: 50rpx !important;
 		margin-left: 50rpx;
 	}
-	
-	.isScrollShow{
+
+	.isScrollShow {
 		float: right;
-		
-		
-		
+
+
+
 	}
-	.isScrollShow1{
+
+	.isScrollShow1 {
 		float: left;
 		margin-top: 30rpx;
-		
+
 		width: 65% !important;
 	}
-	.isScrollShow2{
+
+	.isScrollShow2 {
 		float: left;
 		position: fixed;
 		background-color: #000;
 		z-index: 99;
-		 background: rgba(0,0,0,0.7) !important;
+		background: rgba(0, 0, 0, 0.7) !important;
 		// margin-top: -150rpx;
-		
+
 	}
-	.isScrollShow3{
+
+	.isScrollShow3 {
 		float: left;
 		width: 60rpx;
 		height: 64rpx;
 		margin-top: 30rpx;
-		
+
 		margin-right: 25rpx;
-		image{
+
+		image {
 			height: 100%;
 			width: 100%;
 		}
 	}
-	.page_padding{
-	padding-left: 26.37rpx;
-	padding-right: 26.67rpx;
+
+	.page_padding {
+		padding-left: 26.37rpx;
+		padding-right: 26.67rpx;
 		box-sizing: border-box;
 		margin-top: 10rpx;
 	}
-	.page_margin{
+
+	.page_margin {
 		margin-left: 26.37rpx;
 		margin-right: 26.67rpx;
 		margin-bottom: 10rpx;
@@ -1632,61 +1753,68 @@
 		margin-top: 10rpx;
 		background-color: #000000;
 	}
-	.page_padding_left{
-		padding-left:  10.67rpx;
+
+	.page_padding_left {
+		padding-left: 10.67rpx;
 		padding-right: 10.67rpx;
 	}
-	.page_padding_left1{
-		padding-left:  5.67rpx;
+
+	.page_padding_left1 {
+		padding-left: 5.67rpx;
 		padding-right: 5.67rpx;
 		// padding-top: 90rpx;
 	}
-	
-	.navigation{
+
+	.navigation {
 		/* display: flex; */
-		background-color:#000000;
+		background-color: #000000;
 		position: fixed;
 		top: 0;
 		z-index: 99;
 		// opacity: 0.8;
 		// height: 260rpx;
 		width: 100%;
-		.navigation_title{
+
+		.navigation_title {
 			display: flex;
 			padding: 16rpx 0;
 			align-items: center;
 			// background-color:#000000;
 			justify-content: space-between;
-			
-			image{
+
+			image {
 				width: 44rpx;
 				height: 44rpx;
 			}
-			text{
+
+			text {
 				font-family: Source Han Sans CN;
 				font-weight: 800;
 				font-style: italic;
 				font-size: 42.67rpx;
-			
+
 			}
-			.navigation_title_padding{
+
+			.navigation_title_padding {
 				margin-top: 25rpx !important;
 				padding: 0 !important;
-				
-				}
-			.navigation_title_right{
-				
+
+			}
+
+			.navigation_title_right {
+
 				display: flex;
 				align-items: center;
-				
-				>uni-navigator:first-child{
+
+				>uni-navigator:first-child {
 					margin-right: 32.67rpx;
 				}
-				
+
 			}
-			
+
 		}
-		.navigation_seach{
+
+		.navigation_seach {
 			width: 100%;
 			background-color: #F5F6FA;
 			border-radius: 35rpx;
@@ -1698,33 +1826,36 @@
 			font-size: 26.67rpx;
 			padding-left: 22rpx;
 			box-sizing: border-box;
-			
-			image{
+
+			image {
 				width: 29.33rpx;
 				height: 29.33rpx;
 				margin-right: 22rpx;
 			}
 		}
-		
+
 	}
-	.navigation_scroll{
+
+	.navigation_scroll {
 		// margin-top: -80rpx;
-		  padding-top: 10rpx;
-		 // margin: 20rpx 0 !important;
-		 // position: fixed;
-		 padding-bottom: 10rpx;
-	     background-color: #000;
-		  z-index: 99;
-		 background: rgba(0,0,0,0.7) !important;
+		// padding-top: 10rpx;
+		padding-top: 10px;
+		// margin: 20rpx 0 !important;
+		// position: fixed;
+		padding-bottom: 10rpx;
+		background-color: #000;
+		z-index: 99;
+		background: rgba(0, 0, 0, 0.7) !important;
 		// padding-right: 13rpx;
-	  padding-left: 24rpx;
-	  padding-right: 24rpx;
-		.scroll-view_H{
+		padding-left: 24rpx;
+		padding-right: 24rpx;
+
+		.scroll-view_H {
 			white-space: nowrap;
 			justify-content: space-between;
 			font-size: 26.67rpx;
 			// color: #484848;
-			color:#fff;
+			color: #fff;
 			width: 100%;
 			// display: flex;
 			// height: 100rpx;
@@ -1733,290 +1864,323 @@
 			// 	height: 0;
 			// 	background-color: #000;
 			// } 
-	
-			view{
+
+			view {
 				margin-left: 46.67rpx;
-				display: inline-block;				
+				display: inline-block;
 				font-weight: 600;
 				padding: 12.67rpx 0;
 			}
-			view:first-child{
+
+			view:first-child {
 				margin-left: 0;
 			}
-			.scroll_active{
+
+			.scroll_active {
 				font-size: 34rpx;
 				font-weight: bold;
-				border-bottom: 2.67rpx solid #000000;
+				border-bottom: 2.67rpx solid rgba(255, 255, 255, .5);
 			}
 		}
 	}
-	.uni-margin-wrap{
+
+	.uni-margin-wrap {
 		width: 100%;
 		height: 100%;
 		// margin-top: 45.33rpx;
 		// margin-top: 10rpx;
 		margin-bottom: 45.33rpx;
+
 		.swiper {
-			   // height: 650.33rpx;
-			  // width: 720rpx;
-			   // height: 100%;
-			 /deep/ .uni-swiper{
-				height: auto; 
-			 }
+
+			// height: 650.33rpx;
+			// width: 720rpx;
+			// height: 100%;
+			/deep/ .uni-swiper {
+				height: auto;
+			}
+
 			.swiper-item {
 				display: block;
-				 // width: 720rpx;
-				 height: 100%;
-				 
-			
+				// width: 720rpx;
+				height: 100%;
+
+
 				// line-height: 373.33rpx;
 				text-align: center;
 				color: white;
-				image{
-				    width: 100%;
+
+				image {
+					width: 100%;
 					height: 100%;
 				}
 			}
-			.uni-bg-red{
+
+			.uni-bg-red {
 				background-color: red;
 			}
-			.uni-bg-green{
+
+			.uni-bg-green {
 				background-color: green;
 			}
-			.uni-bg-blue{
+
+			.uni-bg-blue {
 				background-color: blue;
 			}
 		}
 	}
+
 	.grid_swiper {
 		// height: 380rpx;
 		// margin: 0 10rpx 0 10rpx;
-		
-		.grid_content{
-			display: flex; 
+
+		.grid_content {
+			display: flex;
 			flex-wrap: wrap;
-			 
-			.grid_item{
+
+			.grid_item {
 				// width: 97.33rpx;
 				display: flex;
 				width: 150rpx;
 				height: 150rpx;
 				flex-direction: column;
-				 align-items: center;
+				align-items: center;
 				justify-content: space-between;
 				// color: #1B1B1B;
-				color:#fff;
+				color: #fff;
 				font-size: 24rpx;
 				// margin-right: 6rpx;
-			    margin-bottom: 13.33rpx;
+				margin-bottom: 13.33rpx;
 				font-weight: 500;
-			     background-color: #000000;
+				background-color: #000000;
 				padding-right: 10rpx;
 				margin-left: 25.37rpx;
-				&:last-child(){
+
+				&:last-child() {
 					margin-left: 0;
 				}
-				.grid_item_img{
+
+				.grid_item_img {
 					width: 97.33rpx;
 					height: 97.33rpx;
 					margin-bottom: 6.67rpx;
-					image{
+
+					image {
 						width: 100%;
 						height: 100%;
 					}
 				}
 			}
+
 			// .grid_item:nth-child(n+4){
 			// 	margin-right: 0;
 			// }
-			
+
 		}
 	}
-	.discount{
+
+	.discount {
 		width: 100%;
 		height: 239.33rpx;
 		margin-bottom: 72.67rpx;
 	}
-	
-	.index_title{
+
+	.index_title {
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
 		font-size: 32rpx;
 		// color: #161616;
-		color:#fff;
+		color: #fff;
 		font-weight: bold;
 		margin-bottom: 23rpx;
 		margin-top: 37.37rpx;
-		
-		.title_right{
+
+		.title_right {
 			display: flex;
 			align-items: center;
-			color:white;
-			image{
+			color: white;
+
+			image {
 				width: 22rpx;
 				height: 22rpx;
 				margin-left: 11.33rpx;
 			}
 		}
 	}
-	.item_img{
-		 width: 100%;
+
+	.item_img {
+		width: 100%;
 		margin-left: 4rpx;
 		border-radius: 10rpx;
-		
-		image{
+
+		image {
 			width: 100%;
 			height: 100%;
 			border-radius: 10rpx;
-			
+
 		}
 	}
-	.spike1{
+
+	.spike1 {
 		white-space: nowrap;
 		width: 100%;
-		padding-right:16rpx ;
+		padding-right: 16rpx;
 		padding-left: 16rpx;
 		margin-bottom: 47.67rpx;
+
 		::-webkit-scrollbar {
 			width: 0;
 			height: 0;
 			background-color: transparent;
-		} 
-		
-		.spike1_item{
+		}
+
+		.spike1_item {
 			// color: #191919;
-			color:#fff;
+			color: #fff;
 			font-size: 26.67rpx;
 			// margin-right: 16.67rpx;
 			// width: 200rpx;
 			// margin-left: 16rpx;
-			padding-right:20rpx ;
+			padding-right: 20rpx;
 			display: inline-block;
 			font-weight: 500;
-			&:last-child{
+
+			&:last-child {
 				margin-right: 37rpx;
 			}
-			
-			.spike1_item_img{
+
+			.spike1_item_img {
 				width: 180rpx;
 				height: 180rpx;
-				 background-color: #999999;
-				
-				 padding-right:16rpx ;
-				image{
+				background-color: #999999;
+
+				padding-right: 16rpx;
+
+				image {
 					width: 100%;
 					height: 100%;
-					
+
 				}
 			}
+
 			// .padding_honlist2{
 			// 	margin-right: 280rpx !important;
 			// }
-			.spike1_item_bottom{
+			.spike1_item_bottom {
 				padding-left: 9.33rpx;
 				margin-top: 7.67rpx;
-				
-				.spike1_item_text{
+
+				.spike1_item_text {
 					// color: #9D9D9D;
-					color:#fff;
+					color: #fff;
 					font-size: 21.33rpx;
 					text-decoration: line-through;
 				}
-				.spike1_item_text1{
+
+				.spike1_item_text1 {
 					// color: #9D9D9D;
-					color:#fff;
+					color: #fff;
 					font-size: 21.33rpx;
 				}
 			}
-			.spike1_item_bottom1{
+
+			.spike1_item_bottom1 {
 				padding-left: 9.33rpx;
 				margin-top: 19.33rpx;
 				font-weight: bold;
-				
-				.spike1_item_text{
+
+				.spike1_item_text {
 					// color: #000000;
-					color:#fff;
+					color: #fff;
 					font-size: 16rpx;
 					font-weight: 400;
 					margin-bottom: 20.67rpx;
 					white-space: break-spaces;
-					
+
 				}
 			}
-			
+
 		}
-		.spike1_item:last-child{
+
+		.spike1_item:last-child {
 			margin-right: 0;
 		}
 	}
-	.hotSells1{
+
+	.hotSells1 {
 		display: flex;
 		justify-content: space-between;
 		flex-wrap: wrap;
 		// color: #000000;
-		color:#fff;
+		color: #fff;
 		font-size: 28rpx;
 		font-weight: 400;
 		// margin-bottom: 149.33rpx;
 		margin-bottom: 44rpx;
-		
-		.hotSells1_item{
+
+		.hotSells1_item {
 			width: 340rpx;
 			display: flex;
 			flex-direction: column;
-			
-			.hotSells1_item_img{
+
+			.hotSells1_item_img {
 				width: 100%;
 				// // height: 266.67rpx;
 				// background-color: #999999;
 				margin-bottom: 5.33rpx;
-				image{
+
+				image {
 					width: 100%;
-				   height: 100%;
+					height: 100%;
 				}
 			}
 		}
-		.hotSells2_item{
+
+		.hotSells2_item {
 			width: 224rpx;
 			display: flex;
 			flex-direction: column;
 			// margin-top: 49.33rpx;
 			margin-top: 18.33rpx;
-			.hotSells2_item_img{
+
+			.hotSells2_item_img {
 				// width: 100%;
 				// height: 224rpx;
 				// background-color: #999999;
 				margin-bottom: 5.33rpx;
-				
-				image{
+
+				image {
 					width: 100%;
-					 height: 100%;
+					height: 100%;
 				}
 			}
 		}
 	}
-	.goodsthree2{
+
+	.goodsthree2 {
 		width: 100%;
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
 		margin-bottom: 29.33rpx;
-		
-		.goodsthree2_item{
+
+		.goodsthree2_item {
 			width: 242.67rpx;
 			height: 204.67rpx;
 			background-color: #999999;
 		}
 	}
-	.index_title1{
+
+	.index_title1 {
 		text-align: center;
 		position: relative;
-		font-size: 	29.33rpx;
+		font-size: 29.33rpx;
 		font-weight: bold;
 		margin-top: 116rpx;
 		padding-bottom: 52rpx;
-		&:before{
+
+		&:before {
 			content: '';
 			background-color: #000000;
 			height: 4rpx;
@@ -2027,36 +2191,40 @@
 			margin-left: -26.67rpx;
 		}
 	}
-	.waterfall{
+
+	.waterfall {
 		background-color: #F8F7FB;
-		padding:0 25.33rpx;
+		padding: 0 25.33rpx;
 		box-sizing: border-box;
 		padding-top: 52.67rpx;
-		
-		.item{
+
+		.item {
 			padding: 0 16.67rpx;
 			// background-color: #ffaa7f;
 			padding-bottom: 36.67rpx;
-			.title{
+
+			.title {
 				font-size: 25.33rpx;
 				font-weight: 400;
 				// margin-top: 24.67rpx;
 				margin-top: 14.67rpx;
 				// margin-bottom: 32.67rpx;
-				
+
 			}
-			.title1{
+
+			.title1 {
 				font-size: 20.33rpx;
 				line-height: 40rpx;
-				height:80rpx;
+				height: 80rpx;
 				overflow: hidden;
 				// font-weight: 400;
 				// margin-top: 24.67rpx;
 				margin-top: 14.67rpx;
 				margin-bottom: 14.67rpx;
-				
+
 			}
-			.desc{
+
+			.desc {
 				font-size: 32rpx;
 				height: 50rpx !important;
 				font-weight: bold;
@@ -2065,131 +2233,152 @@
 				display: flex;
 				justify-content: space-between;
 				padding-right: 10rpx;
-				.desc_img{
-						height: 40rpx ;
-						width: 40rpx ;
-						background-color: #55ff7f;
-				
+
+				.desc_img {
+					height: 40rpx;
+					width: 40rpx;
+					background-color: #55ff7f;
+
 				}
 			}
 		}
-		
+
 	}
-	.padding_left{
+
+	.padding_left {
 		margin-left: 17rpx;
 	}
-	.best_item{
+
+	.best_item {
 		display: flex;
-		 flex-wrap: wrap;
+		flex-wrap: wrap;
 		flex-direction: row;
 		align-items: center;
 		margin: 0 10rpx 0 10rpx;
 		//  width: 80vw;
 		//  height:400rpx ;
-		
-		.best_one{
-			 width: 45vw;
-			 height: 400rpx;
-			 margin: 10rpx;
+
+		.best_one {
+			width: 45vw;
+			height: 400rpx;
+			margin: 10rpx;
 			justify-content: center;
 			align-items: center;
 			background-color: #fff;
-			.best_img{
+
+			.best_img {
 				height: 360rpx;
 				width: 360rpx;
-				
-				image{
+
+				image {
 					width: 100%;
 					height: 100%;
 				}
 			}
-			.best_text{
-				line-height:40rpx ;
+
+			.best_text {
+				line-height: 40rpx;
 				text-align: center;
 			}
 		}
-		
-		
+
+
 	}
+
 	.container {
-			padding: 0 30rpx;
-			line-height: 34rpx;
-			font-size: 26rpx;
-			background-color: #000;
-			color:white;
-			padding-bottom: 50rpx;
-			
-			.uni-view {
-				
-			}
-			
-		}
-		.item{
-			 background-color: #1e1e1e; 
-			 padding: 12rpx 20rpx;
-			  margin-top: -10rpx;
-			 border-bottom-left-radius: 10rpx;
-			  border-bottom-right-radius: 10rpx;
-		}
-		.title{
-			font-size: 25.33rpx;
-			line-height: 34rpx;
-			// font-weight: 200;
-			// margin-top: 24.67rpx;
-			 color:#fff;
-			 // margin-bottom: 10.67rpx;
-			
-		}
-		.title1{
-			font-size: 26rpx;
-			line-height:32rpx;
-			height: 64rpx;
-			
-			overflow: hidden;
-			 // margin-top: 4.67rpx;
-			 // margin-top: 4.67rpx;
-			 margin-bottom: 10.67rpx;
-			 // padding-left: 6rpx;
-			 padding-right: 6rpx;
-			
-		}
-		.desc{
-			font-size: 36rpx;
-			line-height: 34rpx;
-			font-weight: bold;
-			margin-bottom: 10.67rpx;
-			margin-top: 20.67rpx;
-			height: 50rpx;
-			font-weight: bold;
-			width: 40vw;
-			text-align: start;
-			// line-height: 50rpx;
-			// padding-top: 10rpx;
-			align-items: center;
-			display: flex;
-			justify-content: space-between;
-			padding-right: 10rpx;
-			.desc_img{
-					height: 40rpx ;
-					width: 40rpx ;
-					// background-color: #ccc;
-					image{
-						// margin-top: -10rpx;
-						height: 100%;
-						width: 100%;
-						margin: 0 auto;
-					}
-			
+		padding: 0 30rpx;
+		line-height: 34rpx;
+		font-size: 26rpx;
+		background-color: #000;
+		color: white;
+		// padding-bottom: 50rpx;
+
+		.uni-view {}
+
+	}
+
+	.item {
+		background-color: #1e1e1e;
+		padding: 12rpx 20rpx;
+		margin-top: -10rpx;
+		border-bottom-left-radius: 10rpx;
+		border-bottom-right-radius: 10rpx;
+	}
+
+	.title {
+		font-size: 25.33rpx;
+		line-height: 34rpx;
+		// font-weight: 200;
+		// margin-top: 24.67rpx;
+		color: #fff;
+		// margin-bottom: 10.67rpx;
+
+	}
+
+	.title1 {
+		font-size: 26rpx;
+		line-height: 32rpx;
+		height: 64rpx;
+
+		overflow: hidden;
+		// margin-top: 4.67rpx;
+		// margin-top: 4.67rpx;
+		margin-bottom: 10.67rpx;
+		// padding-left: 6rpx;
+		padding-right: 6rpx;
+
+	}
+
+	.desc {
+		font-size: 36rpx;
+		line-height: 34rpx;
+		font-weight: bold;
+		margin-bottom: 10.67rpx;
+		margin-top: 20.67rpx;
+		height: 50rpx;
+		font-weight: bold;
+		width: 40vw;
+		text-align: start;
+		// line-height: 50rpx;
+		// padding-top: 10rpx;
+		align-items: center;
+		display: flex;
+		justify-content: space-between;
+		padding-right: 10rpx;
+
+		.desc_img {
+			height: 40rpx;
+			width: 40rpx;
+
+			// background-color: #ccc;
+			image {
+				// margin-top: -10rpx;
+				height: 100%;
+				width: 100%;
+				margin: 0 auto;
 			}
-			// padding-left: 6rpx;
-			padding-right: 6rpx;
-			color: #fff;
+
 		}
-		.right,
-		.left{display: inline-block; width: 49%;vertical-align: top;}
-		.left{margin-right: 2%;}
-		.left image,
-		.right image{width: 100%;
+
+		// padding-left: 6rpx;
+		padding-right: 6rpx;
+		color: #fff;
+	}
+
+	.right,
+	.left {
+		display: inline-block;
+		width: 49%;
+		vertical-align: top;
+	}
+
+	.left {
+		margin-right: 2%;
+	}
+
+	.left image,
+	.right image {
+		width: 100%;
 		// margin-bottom: 8rpx;
 		margin-top: 16rpx;
 		border-top-left-radius: 10rpx;
@@ -2198,115 +2387,123 @@
 		// border-right: #8F9094 1rpx solid;
 		// border-left: #8F9094 1rpx solid;
 		// border: #8F9094 0.5rpx solid;
-		}
-		.Popup{
-			height: 700rpx;
-		    width: 400rpx;
-		  
-		   
-		.popup_close{
+	}
+
+	.Popup {
+		height: 700rpx;
+		width: 400rpx;
+
+
+		.popup_close {
 			height: 50rpx;
 			width: 50rpx;
-			
+
 			margin-left: 400rpx;
+
 			// background-color: #000000;
-			image{
+			image {
 				width: 100%;
 				height: 100%;
 			}
 		}
-		.popup_img{
+
+		.popup_img {
 			height: 600rpx;
 			width: 400rpx;
 			// margin-top: 10rpx;
 			// margin-left: 20rpx;
 			background-size: 100%;
 			padding: 0 !important;
-			
+
 			background-repeat: no-repeat;
-			border-radius:25rpx;
+			border-radius: 25rpx;
 			position: relative;
-			image{
+
+			image {
 				width: 100%;
 				height: 100%;
 				border-radius: 25rpx;
-				
+
 			}
-			.popup_text{
-				right:0;
+
+			.popup_text {
+				right: 0;
 				height: 30rpx;
 				width: 60rpx;
 				font-size: 20rpx;
 				margin-right: 10rpx;
 				margin-top: 10rpx;
-				 background-color:#ccc;
-				background-color:rgba(0,0,0,0.4);
+				background-color: #ccc;
+				background-color: rgba(0, 0, 0, 0.4);
 				line-height: 30rpx;
 				opacity: 0.5;
-				color:white;
+				color: white;
 				text-align: center;
 				position: absolute;
-				z-index:99;
+				z-index: 99;
 				border-radius: 5rpx;
 			}
 		}
+	}
+
+	.open_bg {
+		background-color: #000000;
+		height: 100vh;
+		width: 100%;
+		top: 0;
+		color: white;
+		z-index: 999;
+		position: fixed;
+		// padding-top: 50rpx;
+
+		overflow: hidden;
+		background-size: cover;
+		background-repeat: no-repeat;
+		background-attachment: fixed;
+
+		.open_text {
+			right: 10%;
+			top: 8%;
+			height: 50rpx;
+			width: 120rpx;
+			font-size: 28rpx;
+			margin-right: 10rpx;
+			margin-top: 10rpx;
+			background-color: #ececec;
+			background-color: rgba(0, 0, 0, 0.5);
+			line-height: 50rpx;
+			opacity: 0.5;
+			text-align: center;
+			position: absolute;
+			z-index: 99;
+			border-radius: 5rpx;
 		}
-		.open_bg{
-			background-color: #000000;
+
+		.open_bgimg {
+			top: 0;
 			height: 100vh;
 			width: 100%;
-			top:0;
+			position: relative;
 			color: white;
-			z-index: 999;
-			position: fixed;
-			// padding-top: 50rpx;
-			 
-			 overflow: hidden;
-			 background-size: cover;
-			 background-repeat: no-repeat;
-			 background-attachment:fixed;
-			 .open_text{
-			 	right:0;
-			 	top:50rpx;
-			 	height: 50rpx;
-			 	width: 120rpx;
-			 	font-size: 28rpx;
-			 	margin-right: 10rpx;
-			 	margin-top: 10rpx;
-			 	 background-color:#ececec;
-			 	 background-color:rgba(0,0,0,0.5);
-			 	line-height: 50rpx;
-			 	opacity: 0.5;
-			 	text-align: center;
-			 	position: absolute;
-			 	z-index:99;
-			 	border-radius: 5rpx;
-			 }
-			 
-			.open_bgimg{
-				top:0;
-				height: 100vh;
+
+			image {
 				width: 100%;
-				position: relative;
-				color:white;
-				
-				image{
-					width: 100%;
-					height: 100%;
-			}
-			
-			
-				
+				height: 100%;
 			}
-			
-		}
-		button{
-			width: 100%;
-			height: 73.33rpx;
-			line-height: 73.33rpx;
-			background-color: #191919;
-			 color: white;
-			font-weight: bold;
-			font-size: 26.67rpx;
+
+
+
 		}
+
+	}
+
+	button {
+		width: 100%;
+		height: 73.33rpx;
+		line-height: 73.33rpx;
+		background-color: #191919;
+		color: white;
+		font-weight: bold;
+		font-size: 26.67rpx;
+	}
 </style>
diff --git a/pages/index/index2.vue b/pages/index/index2.vue
index 3ab43b6..f1e668a 100644
--- a/pages/index/index2.vue
+++ b/pages/index/index2.vue
@@ -8,7 +8,6 @@
 			<view class="nav_left">
 				<image src="../../static/img/left_white.png" mode="" @click="back()"></image>
 				<!-- <image src="../../static/img/seach.png" mode="" @click="goPage()"></image> -->
-				
 			</view>
 		</block>
 		<block slot="right">
diff --git a/pages/index/search.vue b/pages/index/search.vue
index 1afd307..b82b216 100644
--- a/pages/index/search.vue
+++ b/pages/index/search.vue
@@ -233,6 +233,7 @@
 				font-size: 24rpx;
 				margin-right: 24.67rpx;
 				border-radius: 5px;
+				margin-bottom: 13.33rpx;
 			}
 			.lable_item:last-child{
 				margin-right:0
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 33db52c..aeb8e50 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -41,8 +41,8 @@
 				<view class="tips" v-show="regErr">{{errMsg}}</view>
 				<button class="login_submit" :disabled="isReg" @click="Reg()">REGISTER</button>
 				<view class="agreement">
-					<image src="../../static/img/select2.png" mode="" class="agreement_image" @click="regSelect=!regSelect" v-show="!regSelect"></image>
-					<image src="../../static/img/select_red.png" mode="" class="agreement_image" @click="regSelect=!regSelect" v-show="regSelect"></image>
+					<image src="../../static/img/select2.png" mode="" style="width: 25px;height: 25px;" class="agreement_image" @click="regSelect=!regSelect" v-show="!regSelect"></image>
+					<image src="../../static/img/select_red.png" mode="" style="width: 25px;height: 25px;" class="agreement_image" @click="regSelect=!regSelect" v-show="regSelect"></image>
 					<view class="agreement_right">
 						by continuong, you agree to be <text class="text"@click="gotonewpage(1)" > terms of use </text> and <text class="text" @click="gotonewpage(2)"> privacy policy</text>.
 					</view>
diff --git a/pages/productDetails/index.vue b/pages/productDetails/index.vue
index 4045d9e..ed96118 100644
--- a/pages/productDetails/index.vue
+++ b/pages/productDetails/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="body">
-		<uni-nav-bar backgroundColor="#000000" :statusBar="true" left-icon="left"   color="#fff" :leftWidth="navWidth" :rightWidth="navWidth"  :fixed="true" @clickLeft="back">
+		<uni-nav-bar backgroundColor="#000000" :statusBar="true" left-icon="left"  color="#fff" :leftWidth="navWidth" :rightWidth="navWidth"  :fixed="true" @clickLeft="back">
 			<view class="input-view">
 				<!-- <uni-icons class="input-uni-icon" type="search" size="18" color="#999" /> -->
 				<view class="input-uni-icon"><image src="../../static/img/seach.png" mode=""></image></view>
@@ -1784,7 +1784,7 @@
 		}
 		.nav_right{
 			padding-right: 30rpx;
-			padding-top: 10rpx;
+			padding-top: 9px;
 			image{
 				width: 44rpx;
 				height: 44rpx;
@@ -2012,7 +2012,8 @@
 			margin-bottom: 0 !important;
 			margin-top: 20rpx;
 			// margin-bottom: 62rpx;
-			 background-color: #fff;
+			background-color: #fff;
+			display: grid;
 			
 			image{
 				width: 100%;
@@ -2021,7 +2022,7 @@
 		}
 		.productImage_image1{
 			width: 100%;
-			height: 532rpx;
+			height: 350px;
 			// background-color: #999999;
 			image{
 				width: 100%;
@@ -2197,14 +2198,33 @@
 		line-height: 52rpx;
 	}
 	.bootom_last{
-		 height: 200rpx;
+		 // height: 200rpx;
+		 height: 60px;
 		 width: 100%;
 		 color: #fff;
 		 font-size: 25rpx;
-		 line-height: 200rpx;
+		 // line-height: 200rpx;
+		 line-height: 50px;
 		 text-align: center;
 	}
 	/deep/.nav_left .uni-image .data-v-af9236d6{
 		background-size: 0% !important;
 	}
+	/deep/ .uni-navbar__header {
+		height: auto !important;
+	}
+	.footer_right uni-button {
+		border-radius: 6px !important;
+	}
+	.uni-navbar .input-uni-icon {
+		height: 16px !important;
+		width: 16px !important;
+	}
+	uni-page-body {
+		padding-bottom: 30px !important;
+		background-color: black !important;
+	}
+	uni-page-wrapper {
+		background: #000;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/shippingCart/index.vue b/pages/shippingCart/index.vue
index d2a884e..8621932 100644
--- a/pages/shippingCart/index.vue
+++ b/pages/shippingCart/index.vue
@@ -687,7 +687,8 @@
          				this.tarbar[2].src = '../../static/img/min.png'
          			}else{
          				src=res.data.zones[0].blocks[0].block_pic
-         				
+         				// this.tabar[2].src=src
+						this.tarbar[2].src = res.data.zones[0].blocks[0].block_pic
          				uni.setStorageSync('midButton',src)
          			}
          		}
@@ -1212,7 +1213,7 @@
 	}
 	.recommend{
 	 color:#000 !important;	
-	 
+	 margin-top: 10px !important;
 	}
 	.recommend_content_item{
 		background-color: #fff !important;
@@ -1472,8 +1473,11 @@
 				
 
 				.cart_select {
-					width: 34.67rpx;
-					height: 34.67rpx;
+					// width: 34.67rpx;
+					// height: 34.67rpx;
+					width: 14px;
+					height: 14px;
+					object-fit: cover;
 					margin-right: 6rpx;
 				}
 
diff --git a/static/img/message.png b/static/img/message.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a51cb29ef2cdcf09b3a648a7d8e6e8c3dd17eae
GIT binary patch
literal 8560
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
F`Cn1WgHQkf

literal 0
HcmV?d00001