From a33da0ba1e8b455f6237d90b846860bcb4ba836f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Tue, 29 Nov 2022 10:09:02 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=A8=A1=E7=89=88=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E3=80=91=E6=9B=B4=E6=96=B0=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=BA=90?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/uni-app/components/productConSwiper/index.vue | 2 +-
 template/uni-app/pages/goods_cate/goods_cate1.vue      | 4 ++--
 template/uni-app/pages/goods_details/index.vue         | 3 ++-
 template/uni-app/pages/order_addcart/order_addcart.vue | 4 ++--
 template/uni-app/pages/user/index.vue                  | 4 ++--
 template/uni-app/pages/users/user_address/index.vue    | 4 ++--
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/template/uni-app/components/productConSwiper/index.vue b/template/uni-app/components/productConSwiper/index.vue
index e930b0280..b03e8d2ce 100644
--- a/template/uni-app/components/productConSwiper/index.vue
+++ b/template/uni-app/components/productConSwiper/index.vue
@@ -91,7 +91,7 @@
 				// #endif
 			},
 			videoIsPause() {
-				console.log('stop')
+				this.videoContext = uni.createVideoContext('myVideo', this);
 				this.videoContext.pause();
 			},
 			bindPause: function() {
diff --git a/template/uni-app/pages/goods_cate/goods_cate1.vue b/template/uni-app/pages/goods_cate/goods_cate1.vue
index 407b13694..a432e3089 100644
--- a/template/uni-app/pages/goods_cate/goods_cate1.vue
+++ b/template/uni-app/pages/goods_cate/goods_cate1.vue
@@ -53,8 +53,8 @@
 				</scroll-view>
 			</view>
 		</view>
-		<!-- <tabBar v-if="!is_diy" :pagePath="'/pages/goods_cate/goods_cate'"></tabBar> -->
-		<view class="foot" v-if="newData.menuList && newData.menuList.length">
+		<tabBar v-if="!is_diy" :pagePath="'/pages/goods_cate/goods_cate'"></tabBar>
+		<view class="foot" v-if="is_diy && newData.menuList && newData.menuList.length">
 			<view class="page-footer" id="target" :style="{'background-color':newData.bgColor.color[0].item}">
 				<view class="foot-item" v-for="(item,index) in newData.menuList" :key="index" @click="goRouter(item)">
 					<block v-if="item.link == activeRouter">
diff --git a/template/uni-app/pages/goods_details/index.vue b/template/uni-app/pages/goods_details/index.vue
index 6c28338a4..f534d1028 100644
--- a/template/uni-app/pages/goods_details/index.vue
+++ b/template/uni-app/pages/goods_details/index.vue
@@ -830,7 +830,6 @@
 				);
 			},
 			scroll(e) {
-				this.$refs.proSwiper.videoPause()
 				var that = this,
 					scrollY = e.detail.scrollTop;
 				var opacity = scrollY / 200;
@@ -840,6 +839,7 @@
 				that.$set(that, "showAnimate", false);
 				that.$set(that, "showMenuIcon", false);
 				that.$set(that, 'currentPage', false);
+				this.$refs.proSwiper.videoIsPause()
 				if (that.lock) {
 					that.$set(that, "lock", false);
 					return;
@@ -1213,6 +1213,7 @@
 					this.$set(productAttr[i], "index", value[i]);
 				}
 				//sort();排序函数:数字-英文-汉字；
+				
 				let productSelect = this.productValue[value.join(",")];
 				if (productSelect && productAttr.length) {
 					this.$set(
diff --git a/template/uni-app/pages/order_addcart/order_addcart.vue b/template/uni-app/pages/order_addcart/order_addcart.vue
index 3cdf66168..45d979584 100644
--- a/template/uni-app/pages/order_addcart/order_addcart.vue
+++ b/template/uni-app/pages/order_addcart/order_addcart.vue
@@ -144,8 +144,8 @@
 		<!-- <view class="uni-p-b-96"></view> -->
 		<view class="uni-p-b-98"></view>
 		<!-- <pageFooter :countNum="cartCount"></pageFooter> -->
-		<!-- <tabBar v-if="!is_diy" :pagePath="'/pages/order_addcart/order_addcart'"></tabBar> -->
-		<view class="foot" v-if="newData.menuList && newData.menuList.length">
+		<tabBar v-if="!is_diy" :pagePath="'/pages/order_addcart/order_addcart'"></tabBar>
+		<view class="foot" v-if="is_diy && newData.menuList && newData.menuList.length">
 			<view class="page-footer" id="target" :style="{'background-color':newData.bgColor.color[0].item}">
 				<view class="foot-item" v-for="(item,index) in newData.menuList" :key="index" @click="goRouter(item)">
 					<block v-if="item.link == activeRouter">
diff --git a/template/uni-app/pages/user/index.vue b/template/uni-app/pages/user/index.vue
index 9f97b9a73..cf502705b 100644
--- a/template/uni-app/pages/user/index.vue
+++ b/template/uni-app/pages/user/index.vue
@@ -272,8 +272,8 @@
 				<view class="uni-p-b-98"></view>
 			</scroll-view>
 		</view>
-		<!-- <tabBar v-if="!is_diy" :pagePath="'/pages/user/index'"></tabBar> -->
-		<view class="foot" v-if="newData.menuList && newData.menuList.length">
+		<tabBar v-if="!is_diy" :pagePath="'/pages/user/index'"></tabBar>
+		<view class="foot" v-if="is_diy && newData.menuList && newData.menuList.length">
 			<view class="page-footer" id="target" :style="{'background-color':newData.bgColor.color[0].item}">
 				<view class="foot-item" v-for="(item,index) in newData.menuList" :key="index" @click="goRouter(item)">
 					<block v-if="item.link == activeRouter">
diff --git a/template/uni-app/pages/users/user_address/index.vue b/template/uni-app/pages/users/user_address/index.vue
index 6f5156176..399ef4626 100644
--- a/template/uni-app/pages/users/user_address/index.vue
+++ b/template/uni-app/pages/users/user_address/index.vue
@@ -166,14 +166,14 @@
 				});
 				that.district[this.valueRegion[0]].c.forEach((item, i) => {
 					if (this.region[1] == item.c) {
-						this.valueRegio[1] = i
+						this.valueRegion[1] = i
 						this.multiIndex[1] = i
 					}
 					city.push(item.n);
 				});
 				that.district[this.valueRegion[0]].c[this.valueRegion[1]].c.forEach((item, i) => {
 					if (this.region[2] == item.c) {
-						this.valueRegio[2] = i
+						this.valueRegion[2] = i
 						this.multiIndex[2] = i
 					}
 					area.push(item.n);