From 901c4bdd52140d4a70bd053abb8b33c224d991ec Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Mon, 20 Feb 2023 11:38:46 +0800
Subject: [PATCH 01/11] =?UTF-8?q?fix:=20=E6=8A=BD=E5=A5=96=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E5=88=B8=E6=A0=87=E7=AD=BE=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/admin/src/pages/marketing/lottery/addGoods.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/admin/src/pages/marketing/lottery/addGoods.vue b/template/admin/src/pages/marketing/lottery/addGoods.vue
index decf2880e..1ceaccf61 100644
--- a/template/admin/src/pages/marketing/lottery/addGoods.vue
+++ b/template/admin/src/pages/marketing/lottery/addGoods.vue
@@ -223,7 +223,7 @@ export default {
     let keys = Object.keys(this.editData);
     keys.forEach((item) => {
       this.formValidate[item] = this.editData[item];
-      if (item === 'coupon_title') {
+      if (item === 'coupon_title' && this.editData[item]) {
         this.couponName.push({
           title: this.editData[item],
           id: this.editData.coupon_id,

From b7be6716a5e20a118a2e738bc65aa62ca81e2b10 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Mon, 20 Feb 2023 11:39:15 +0800
Subject: [PATCH 02/11] =?UTF-8?q?improve:=20=E5=95=86=E5=93=81=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=89=B9=E9=87=8F=E8=AE=BE=E7=BD=AE=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/admin/src/pages/product/productAdd/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/template/admin/src/pages/product/productAdd/index.vue b/template/admin/src/pages/product/productAdd/index.vue
index 9c7b14351..1721ff892 100644
--- a/template/admin/src/pages/product/productAdd/index.vue
+++ b/template/admin/src/pages/product/productAdd/index.vue
@@ -294,7 +294,7 @@
             >
               <!-- 批量设置-->
 
-              <Col span="24" v-if="!formValidate.is_virtual">
+              <Col span="24" v-if="[0, 3].includes(formValidate.virtual_type)">
                 <FormItem label="批量设置：" class="labeltop">
                   <Table :data="oneFormBatch" :columns="formValidate.is_virtual ? columns3 : columns2" border>
                     <template slot-scope="{ row, index }" slot="pic">
@@ -2137,7 +2137,7 @@ export default {
     },
     end() {
       this.moveIndex = '';
-      this.generate(1)
+      this.generate(1);
     },
     // 单独设置会员设置
     checkAllGroupChange(data) {

From 4cd90eb284f7ca01be2498535d2f699f50b0b6f2 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Mon, 20 Feb 2023 11:39:50 +0800
Subject: [PATCH 03/11] =?UTF-8?q?improve:=20=E6=89=B9=E9=87=8F=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E9=80=89=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/src/pages/product/productList/index.vue    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/template/admin/src/pages/product/productList/index.vue b/template/admin/src/pages/product/productList/index.vue
index 54234602e..e889c1281 100644
--- a/template/admin/src/pages/product/productList/index.vue
+++ b/template/admin/src/pages/product/productList/index.vue
@@ -145,12 +145,12 @@
       v-model="batchModal"
       class="batch-box"
       scrollable
-      closable
+      :closable="false"
       title="批量设置"
       :mask-closable="false"
       width="1000"
       @on-ok="batchSub"
-      @on-visible-change="clearBatchData"
+      @on-cancel="clearBatchData"
     >
       <Form
         class="batchFormData"
@@ -326,7 +326,7 @@ export default {
         limit: 15,
         cate_id: '',
         type: '1',
-        store_name: ''
+        store_name: '',
       },
       list: [],
       tableList: [],
@@ -458,7 +458,9 @@ export default {
         .then((res) => {
           this.$Message.success(res.msg);
           this.getDataList();
-          this.clearBatchData();
+          this.clearBatchData(false);
+          this.ids = [];
+          this.clearAll(false);
         })
         .catch((err) => {
           this.$Message.error(err.msg);
@@ -477,9 +479,7 @@ export default {
           coupon_ids: [],
           recommend: [],
         };
-        this.ids = [];
         this.dataLabel = [];
-        this.clearAll(false);
       }
     },
     // 批量设置商品

From 0725992bd395e6df93a65f347b2c7f38753f56b6 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Mon, 20 Feb 2023 11:40:11 +0800
Subject: [PATCH 04/11] =?UTF-8?q?improve:=20=E7=AD=89=E7=BA=A7=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E9=A1=B5=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/admin/src/pages/setting/membershipLevel/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/template/admin/src/pages/setting/membershipLevel/index.vue b/template/admin/src/pages/setting/membershipLevel/index.vue
index 26fc98d88..4007dfa33 100644
--- a/template/admin/src/pages/setting/membershipLevel/index.vue
+++ b/template/admin/src/pages/setting/membershipLevel/index.vue
@@ -125,7 +125,7 @@
                 <a @click="delTask(row, '删除这条信息', index)">删除</a>
               </template>
             </Table>
-            <div class="acea-row row-right page">
+            <!-- <div class="acea-row row-right page">
               <Page
                 :total="taskTotal"
                 :current="taskData.page"
@@ -134,7 +134,7 @@
                 @on-change="pageTaskChange"
                 :page-size="taskData.limit"
               />
-            </div>
+            </div> -->
           </div>
         </div>
       </Modal>

From 995cd2c39f27c6056ceb7e93ec00f62dfc853932 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Mon, 20 Feb 2023 11:40:57 +0800
Subject: [PATCH 05/11] =?UTF-8?q?improve:=20=E6=BB=91=E5=8A=A8=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../annex/components/verify/verifySlider/verifySlider.vue | 4 ++--
 .../components/verify/verifySlider/verifySliderPc.vue     | 8 ++++----
 .../pages/users/components/verify/verifySlider/index.vue  | 4 ++--
 .../components/verify/verifySlider/verifySliderPc.vue     | 8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/template/uni-app/pages/annex/components/verify/verifySlider/verifySlider.vue b/template/uni-app/pages/annex/components/verify/verifySlider/verifySlider.vue
index c7faeaf65..eb289a2bb 100644
--- a/template/uni-app/pages/annex/components/verify/verifySlider/verifySlider.vue
+++ b/template/uni-app/pages/annex/components/verify/verifySlider/verifySlider.vue
@@ -392,13 +392,13 @@
 		bottom: 0px;
 		width: 100%;
 		height: 30px;
-		background-color: rgb(231, 27, 27, .5);
+		background-color: rgb(197, 150, 63, 0.5);
 		line-height: 30px;
 		color: #fff;
 	}
 
 	.suc-bg {
-		background-color: rgba(92, 184, 92, .5);
+		background-color: rgb(197, 150, 63, 0.5);
 		filter: progid:DXImageTransform.Microsoft.gradient(startcolorstr=#7f5CB85C, endcolorstr=#7f5CB85C);
 	}
 
diff --git a/template/uni-app/pages/annex/components/verify/verifySlider/verifySliderPc.vue b/template/uni-app/pages/annex/components/verify/verifySlider/verifySliderPc.vue
index e1338bc1c..770935571 100644
--- a/template/uni-app/pages/annex/components/verify/verifySlider/verifySliderPc.vue
+++ b/template/uni-app/pages/annex/components/verify/verifySlider/verifySliderPc.vue
@@ -11,7 +11,7 @@
 				</view>
 				<transition name="tips">
 					<text v-if="tipWords" class="verify-tips"
-						:class="passFlag ? 'suc-bg' : 'err-bg'">{{ tipWords }}</text>
+						:class="passFalg ? 'suc-bg' : 'err-bg'">{{ tipWords }}</text>
 				</transition>
 			</view>
 		</view>
@@ -123,7 +123,7 @@ export default {
   data() {
     return {
       secretKey: "", // 后端返回的加密秘钥 字段
-      passFlag: "", // 是否通过的标识
+      passFalg: "", // 是否通过的标识
       backImgBase: "", // 验证码背景图片
       blockBackImgBase: "", // 验证滑块的背景图片
       backToken: "", // 后端返回的唯一token值
@@ -491,13 +491,13 @@ export default {
 		bottom: 0px;
 		width: 100%;
 		height: 30px;
-		background-color: rgb(231, 27, 27, .5);
+		background-color: rgb(197, 150, 63, 0.5);
 		line-height: 30px;
 		color: #fff;
 	}
 
 	.suc-bg {
-		background-color: rgba(92, 184, 92, .5);
+		background-color: rgb(197, 150, 63, 0.5);
 		filter: progid:DXImageTransform.Microsoft.gradient(startcolorstr=#7f5CB85C, endcolorstr=#7f5CB85C);
 	}
 
diff --git a/template/uni-app/pages/users/components/verify/verifySlider/index.vue b/template/uni-app/pages/users/components/verify/verifySlider/index.vue
index c7faeaf65..4581bab9f 100644
--- a/template/uni-app/pages/users/components/verify/verifySlider/index.vue
+++ b/template/uni-app/pages/users/components/verify/verifySlider/index.vue
@@ -392,13 +392,13 @@
 		bottom: 0px;
 		width: 100%;
 		height: 30px;
-		background-color: rgb(231, 27, 27, .5);
+		background-color: rgb(197, 150, 63, 0.5);;
 		line-height: 30px;
 		color: #fff;
 	}
 
 	.suc-bg {
-		background-color: rgba(92, 184, 92, .5);
+		background-color: rgb(197, 150, 63, 0.5);;
 		filter: progid:DXImageTransform.Microsoft.gradient(startcolorstr=#7f5CB85C, endcolorstr=#7f5CB85C);
 	}
 
diff --git a/template/uni-app/pages/users/components/verify/verifySlider/verifySliderPc.vue b/template/uni-app/pages/users/components/verify/verifySlider/verifySliderPc.vue
index e1338bc1c..39160aeaf 100644
--- a/template/uni-app/pages/users/components/verify/verifySlider/verifySliderPc.vue
+++ b/template/uni-app/pages/users/components/verify/verifySlider/verifySliderPc.vue
@@ -11,7 +11,7 @@
 				</view>
 				<transition name="tips">
 					<text v-if="tipWords" class="verify-tips"
-						:class="passFlag ? 'suc-bg' : 'err-bg'">{{ tipWords }}</text>
+						:class="passFalg ? 'suc-bg' : 'err-bg'">{{ tipWords }}</text>
 				</transition>
 			</view>
 		</view>
@@ -123,7 +123,7 @@ export default {
   data() {
     return {
       secretKey: "", // 后端返回的加密秘钥 字段
-      passFlag: "", // 是否通过的标识
+      passFalg: "", // 是否通过的标识
       backImgBase: "", // 验证码背景图片
       blockBackImgBase: "", // 验证滑块的背景图片
       backToken: "", // 后端返回的唯一token值
@@ -491,13 +491,13 @@ export default {
 		bottom: 0px;
 		width: 100%;
 		height: 30px;
-		background-color: rgb(231, 27, 27, .5);
+		background-color: rgb(197, 150, 63, 0.5);;
 		line-height: 30px;
 		color: #fff;
 	}
 
 	.suc-bg {
-		background-color: rgba(92, 184, 92, .5);
+		background-color: rgb(197, 150, 63, 0.5);;
 		filter: progid:DXImageTransform.Microsoft.gradient(startcolorstr=#7f5CB85C, endcolorstr=#7f5CB85C);
 	}
 

From 12cb5beaa648b8377b1cc84d1c71f88ba75174f3 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Mon, 20 Feb 2023 11:41:12 +0800
Subject: [PATCH 06/11] =?UTF-8?q?style:=20=E9=A6=96=E9=A1=B5=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../index/diy/components/activeParty.vue      | 392 +++++++++---------
 1 file changed, 197 insertions(+), 195 deletions(-)

diff --git a/template/uni-app/pages/index/diy/components/activeParty.vue b/template/uni-app/pages/index/diy/components/activeParty.vue
index c58474a3e..b74265e68 100644
--- a/template/uni-app/pages/index/diy/components/activeParty.vue
+++ b/template/uni-app/pages/index/diy/components/activeParty.vue
@@ -1,195 +1,197 @@
-<template>
-	<view v-show="!isSortType">
-		<view class="explosion" :style="'margin-top:' + mbConfig*2 +'rpx;background-color:' + boxColor+';'"
-			v-if="explosiveMoney.length">
-			<view class="hd skeleton-rect">
-				<!-- <image src="/static/images/explosion-title.png" mode=""></image> -->
-				<view class="title" :style="'color:'+themeColor+';'">{{$t(titleConfig)}}</view>
-				<view class="txt"
-					:style="'background: linear-gradient(90deg, '+ bgColor[0].item +' 0%, '+ bgColor[1].item +' 100%);'">
-					{{$t(desConfig)}}
-				</view>
-			</view>
-			<view class="bd">
-				<view class="item skeleton-rect" @click="goDetail(item)" v-for="(item,index) in explosiveMoney" :key="index">
-					<view class="con-box">
-						<view class="title line1">{{$t(item.info[0].value)}}</view>
-						<view class="con line2">{{$t(item.info[1].value)}}</view>
-						<view class="go">GO！<image src="/static/images/right-icon.png" mode=""></image>
-						</view>
-					</view>
-					<image :src="item.img" mode="aspectFill"></image>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: 'activeParty',
-		props: {
-			dataConfig: {
-				type: Object,
-				default: () => {}
-			},
-			isSortType: {
-				type: String | Number,
-				default: 0
-			}
-		},
-		data() {
-			return {
-				titleConfig: this.dataConfig.titleConfig.value,
-				desConfig: this.dataConfig.desConfig.value,
-				explosiveMoney: this.dataConfig.menuConfig.list,
-				themeColor: this.dataConfig.themeColor.color[0].item,
-				bgColor: this.dataConfig.bgColor.color,
-				mbConfig: this.dataConfig.mbConfig.val,
-				boxColor: this.dataConfig.boxColor.color[0].item
-			};
-		},
-		created() {},
-		methods: {
-			goDetail(item) {
-				let urls = item.info[2].value
-				if (['/pages/goods_cate/goods_cate', '/pages/order_addcart/order_addcart', '/pages/user/index']
-					.indexOf(urls) == -1) {
-					uni.navigateTo({
-						url: urls
-					})
-				} else {
-					uni.switchTab({
-						url: urls
-					})
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.explosion {
-		width: 710rpx;
-		margin-top: 20rpx;
-		margin: 20rpx auto 0 auto;
-		padding: 30rpx 20rpx;
-		padding: 30rpx 20rpx 6rpx 20rpx;
-		background-color: #FFE5E3;
-		background-size: 100% 100%;
-		border-radius: 13px;
-		box-sizing: border-box;
-
-		.hd {
-			display: flex;
-			align-items: center;
-
-			.title {
-				font-size: 32rpx;
-				font-weight: bold;
-				margin-right: 12rpx;
-			}
-
-			image {
-				width: 147rpx;
-				height: 35rpx;
-				margin-right: 20rpx;
-			}
-
-			.txt {
-				padding: 0 10rpx;
-				height: 36rpx;
-				// background: linear-gradient(90deg, rgba(255, 168, 0, 1) 0%, rgba(255, 34, 15, 1) 100%);
-				border-radius: 26rpx 0px 26rpx 0px;
-				color: #fff;
-				text-align: center;
-				font-size: 22rpx;
-				box-shadow: 3px 1px 1px 1px var(--view-minorColorT);
-			}
-		}
-
-		.bd {
-			display: flex;
-			flex-wrap: wrap;
-			margin-top: 28rpx;
-
-			.item {
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-				position: relative;
-				width: 325rpx;
-				height: 180rpx;
-				margin-bottom: 20rpx;
-				margin-right: 20rpx;
-				background-color: #fff;
-				border-radius: 16rpx;
-				padding: 0 20rpx;
-				box-sizing: border-box;
-
-				image {
-					width: 140rpx;
-					height: 140rpx;
-				}
-
-				.con-box {
-					display: flex;
-					flex-direction: column;
-					justify-content: center;
-					width: 130rpx;
-					height: 100%;
-
-					.title {
-						color: #282828;
-						font-size: 28rpx;
-					}
-
-					.con {
-						color: #999999;
-						font-size: 20rpx;
-						margin-top: 2rpx;
-					}
-
-					.go {
-						display: flex;
-						align-items: center;
-						justify-content: center;
-						margin-top: 10rpx;
-						width: 112rpx;
-						height: 36rpx;
-						border-radius: 18rpx;
-						color: #fff;
-						font-size: 26rpx;
-						font-weight: bold;
-						font-style: italic;
-
-						image {
-							width: 26rpx;
-							height: 26rpx;
-						}
-					}
-				}
-
-				&:first-child .go {
-					background: linear-gradient(90deg, rgba(75, 196, 255, 1) 0%, rgba(32, 126, 255, 1) 100%);
-				}
-
-				&:nth-child(2) .go {
-					background: linear-gradient(90deg, rgba(255, 144, 67, 1) 0%, rgba(255, 83, 29, 1) 100%);
-				}
-
-				&:nth-child(3) .go {
-					background: linear-gradient(90deg, rgba(150, 225, 135, 1) 0%, rgba(72, 206, 44, 1) 100%);
-				}
-
-				&:nth-child(4) .go {
-					background: linear-gradient(90deg, rgba(255, 197, 96, 1) 0%, rgba(255, 156, 0, 1) 100%);
-				}
-
-				&:nth-child(2n) {
-					margin-right: 0;
-				}
-			}
-		}
-	}
-</style>
\ No newline at end of file
+<template>
+	<view v-show="!isSortType">
+		<view class="explosion" :style="'margin-top:' + mbConfig*2 +'rpx;background-color:' + boxColor+';'"
+			v-if="explosiveMoney.length">
+			<view class="hd skeleton-rect">
+				<!-- <image src="/static/images/explosion-title.png" mode=""></image> -->
+				<view class="title" :style="'color:'+themeColor+';'">{{$t(titleConfig)}}</view>
+				<view class="txt"
+					:style="'background: linear-gradient(90deg, '+ bgColor[0].item +' 0%, '+ bgColor[1].item +' 100%);'">
+					{{$t(desConfig)}}
+				</view>
+			</view>
+			<view class="bd">
+				<view class="item skeleton-rect" @click="goDetail(item)" v-for="(item,index) in explosiveMoney"
+					:key="index">
+					<view class="con-box">
+						<view class="title line1">{{$t(item.info[0].value)}}</view>
+						<view class="con line2">{{$t(item.info[1].value)}}</view>
+						<view class="go">GO！<image src="/static/images/right-icon.png" mode=""></image>
+						</view>
+					</view>
+					<image :src="item.img" mode="aspectFill"></image>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'activeParty',
+		props: {
+			dataConfig: {
+				type: Object,
+				default: () => {}
+			},
+			isSortType: {
+				type: String | Number,
+				default: 0
+			}
+		},
+		data() {
+			return {
+				titleConfig: this.dataConfig.titleConfig.value,
+				desConfig: this.dataConfig.desConfig.value,
+				explosiveMoney: this.dataConfig.menuConfig.list,
+				themeColor: this.dataConfig.themeColor.color[0].item,
+				bgColor: this.dataConfig.bgColor.color,
+				mbConfig: this.dataConfig.mbConfig.val,
+				boxColor: this.dataConfig.boxColor.color[0].item
+			};
+		},
+		created() {},
+		methods: {
+			goDetail(item) {
+				let urls = item.info[2].value
+				if (['/pages/goods_cate/goods_cate', '/pages/order_addcart/order_addcart', '/pages/user/index']
+					.indexOf(urls) == -1) {
+					uni.navigateTo({
+						url: urls
+					})
+				} else {
+					uni.switchTab({
+						url: urls
+					})
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.explosion {
+		width: 710rpx;
+		margin-top: 20rpx;
+		margin: 20rpx auto 0 auto;
+		padding: 30rpx 20rpx;
+		padding: 30rpx 20rpx 6rpx 20rpx;
+		background-color: #FFE5E3;
+		background-size: 100% 100%;
+		border-radius: 13px;
+		box-sizing: border-box;
+
+		.hd {
+			display: flex;
+			align-items: center;
+
+			.title {
+				font-size: 32rpx;
+				font-weight: bold;
+				margin-right: 12rpx;
+			}
+
+			image {
+				width: 147rpx;
+				height: 35rpx;
+				margin-right: 20rpx;
+			}
+
+			.txt {
+				padding: 0 10rpx;
+				height: 36rpx;
+				line-height: 36rpx;
+				// background: linear-gradient(90deg, rgba(255, 168, 0, 1) 0%, rgba(255, 34, 15, 1) 100%);
+				border-radius: 26rpx 0px 26rpx 0px;
+				color: #fff;
+				text-align: center;
+				font-size: 22rpx;
+				box-shadow: 3px 1px 1px 1px var(--view-minorColorT);
+			}
+		}
+
+		.bd {
+			display: flex;
+			flex-wrap: wrap;
+			margin-top: 28rpx;
+
+			.item {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				position: relative;
+				width: 325rpx;
+				height: 180rpx;
+				margin-bottom: 20rpx;
+				margin-right: 20rpx;
+				background-color: #fff;
+				border-radius: 16rpx;
+				padding: 0 20rpx;
+				box-sizing: border-box;
+
+				image {
+					width: 140rpx;
+					height: 140rpx;
+				}
+
+				.con-box {
+					display: flex;
+					flex-direction: column;
+					justify-content: center;
+					width: 130rpx;
+					height: 100%;
+
+					.title {
+						color: #282828;
+						font-size: 28rpx;
+					}
+
+					.con {
+						color: #999999;
+						font-size: 20rpx;
+						margin-top: 2rpx;
+					}
+
+					.go {
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						margin-top: 10rpx;
+						width: 112rpx;
+						height: 36rpx;
+						border-radius: 18rpx;
+						color: #fff;
+						font-size: 26rpx;
+						font-weight: bold;
+						font-style: italic;
+
+						image {
+							width: 26rpx;
+							height: 26rpx;
+						}
+					}
+				}
+
+				&:first-child .go {
+					background: linear-gradient(90deg, rgba(75, 196, 255, 1) 0%, rgba(32, 126, 255, 1) 100%);
+				}
+
+				&:nth-child(2) .go {
+					background: linear-gradient(90deg, rgba(255, 144, 67, 1) 0%, rgba(255, 83, 29, 1) 100%);
+				}
+
+				&:nth-child(3) .go {
+					background: linear-gradient(90deg, rgba(150, 225, 135, 1) 0%, rgba(72, 206, 44, 1) 100%);
+				}
+
+				&:nth-child(4) .go {
+					background: linear-gradient(90deg, rgba(255, 197, 96, 1) 0%, rgba(255, 156, 0, 1) 100%);
+				}
+
+				&:nth-child(2n) {
+					margin-right: 0;
+				}
+			}
+		}
+	}
+</style>

From f00ecc75a632320814fd7ac3f2735b32d7f080a0 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Mon, 20 Feb 2023 11:41:44 +0800
Subject: [PATCH 07/11] =?UTF-8?q?improve:=20=E7=A7=AF=E5=88=86=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=97=E4=BD=93=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/uni-app/pages/users/user_sgin_list/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/uni-app/pages/users/user_sgin_list/index.vue b/template/uni-app/pages/users/user_sgin_list/index.vue
index 100ffed19..02625a131 100644
--- a/template/uni-app/pages/users/user_sgin_list/index.vue
+++ b/template/uni-app/pages/users/user_sgin_list/index.vue
@@ -10,7 +10,7 @@
 		                  <view class='name line1'>{{$t(itemn.title)}}</view>
 		                  <view>{{itemn.add_time}}</view>
 		               </view>
-		               <view class='num font-color'>+{{itemn.number}}</view>
+		               <view class='num'>+{{itemn.number}}</view>
 		            </view>
 		         </view>
 		      </view>

From 799e7cec5d963c071ba3a1fab2e0a835756ec01b Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Mon, 20 Feb 2023 11:42:08 +0800
Subject: [PATCH 08/11] =?UTF-8?q?feat:=20=E7=A7=AF=E5=88=86=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E6=B7=BB=E5=8A=A0=E9=99=90=E5=88=B6=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../points_mall/integral_goods_details.vue    | 2363 +++++++++--------
 1 file changed, 1186 insertions(+), 1177 deletions(-)

diff --git a/template/uni-app/pages/points_mall/integral_goods_details.vue b/template/uni-app/pages/points_mall/integral_goods_details.vue
index 795d816b8..89d3c2441 100644
--- a/template/uni-app/pages/points_mall/integral_goods_details.vue
+++ b/template/uni-app/pages/points_mall/integral_goods_details.vue
@@ -1,1178 +1,1187 @@
-<template>
-	<view :style="colorStyle">
-		<view class="product-con">
-			<!-- 头部 -->
-
-			<!-- #ifndef APP-PLUS -->
-			<view class='navbar' :style="{height:navH+'rpx',opacity:opacity}">
-				<view class='navbarH' :style='"height:"+navH+"rpx;"'>
-					<view class='navbarCon acea-row row-center-wrapper'>
-						<view class="header acea-row row-center-wrapper">
-							<view class="item line1">
-								{{storeInfo.title}}
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view id="home" class="home-nav acea-row row-center-wrapper" :class="[opacity>0.5?'on':'']"
-				:style="{ top: homeTop +'rpx'}">
-				<view class="iconfont icon-fanhui2" @tap="returns"></view>
-				<!-- #ifdef MP -->
-				<view class="line"></view>
-				<view class="iconfont icon-gengduo5" @click="moreNav"></view>
-				<!-- #endif -->
-			</view>
-			<!-- #endif -->
-			<!-- #ifdef H5 -->
-			<view id="home" class="home-nav right acea-row row-center-wrapper" :class="[opacity>0.5?'on':'']"
-				:style="{ top: homeTop +'rpx'}">
-				<!-- #ifdef APP-PLUS || H5 -->
-				<view class="iconfont icon-gengduo2" @click="moreNav"></view>
-			</view>
-			<!-- #endif -->
-			<!-- #endif -->
-			<homeList :navH="navH" :returnShow="returnShow" :currentPage="currentPage" :sysHeight="sysHeight">
-			</homeList>
-			<scroll-view :scroll-top="scrollTop" scroll-y="true" scroll-with-animation="true"
-				:style="'height:' + height + 'px;'" @scroll="scroll">
-				<view id="past0">
-					<!-- #ifdef APP-PLUS || MP -->
-					<view class="" :style="'width:100%;' + 'height:'+sysHeight"></view>
-					<!-- #endif -->
-					<productConSwiper :imgUrls="imgUrls"></productConSwiper>
-					<view class="nav acea-row row-between-wrapper">
-						<view class="share acea-row row-between row-bottom">
-							<view class="money font-color">
-								<image src="./static/my-point.png" mode=""></image>
-								<text class="num" v-text="storeInfo.price || 0"></text>{{$t(`积分`)}}
-							</view>
-							<view></view>
-						</view>
-					</view>
-					<view class="wrapper">
-						<view class="introduce acea-row row-between">
-							<view class="infor"> {{ storeInfo.title }}</view>
-						</view>
-						<view class="label acea-row row-middle">
-							<view class="stock">{{$t(`划线价`)}}：{{ storeInfo.product_price }}</view>
-							<view class="stock">{{$t(`限量`)}}:
-								{{ storeInfo.quota_show }}
-							</view>
-							<view class="stock">{{$t(`已兑换`)}}：{{ storeInfo.sales }} </view>
-						</view>
-					</view>
-					<view class="attribute acea-row row-between-wrapper" @tap="selecAttr"
-						v-if="attribute.productAttr.length">
-						<!-- <view class="df"><text class='atterTxt line1'>{{attr}}：{{attrValue}}</text></view>
-						<view class='iconfont icon-jiantou'></view> -->
-						<view class="flex">
-							<view style="display: flex; align-items: center; width: 90%">
-								<view class="attr-txt"> {{ attr }}： </view>
-								<view class="atterTxt line1" style="width: 82%">{{
-                  attrValue
-                }}</view>
-							</view>
-							<view class="iconfont icon-jiantou"></view>
-						</view>
-						<view class="acea-row row-between-wrapper" style="margin-top: 7px; padding-left: 70px"
-							v-if="skuArr.length > 1">
-							<view class="flexs">
-								<image :src="item.image" v-for="(item, index) in skuArr.slice(0, 4)" :key="index"
-									class="attrImg"></image>
-							</view>
-							<view class="switchTxt">{{$t(`共`)}}{{ skuArr.length }}{{$t(`种规格可选`)}}</view>
-						</view>
-					</view>
-				</view>
-				<view class="product-intro" id="past2">
-					<view class="title">{{$t(`产品介绍`)}}</view>
-					<view class="conter">
-						<jyf-parser :html="storeInfo.description" ref="article" :tag-style="tagStyle"></jyf-parser>
-					</view>
-				</view>
-			</scroll-view>
-			<view class="footer acea-row row-between-wrapper">
-				<navigator hover-class="none" open-type="switchTab" class="item" url="/pages/index/index">
-					<view class="iconfont icon-shouye6"></view>
-					<view class="p_center">{{$t(`首页`)}}</view>
-				</navigator>
-				<view class="bnt acea-row" v-if="
-            attribute.productSelect.quota > 0 &&
-            attribute.productSelect.product_stock > 0
-          ">
-					<view class="buy bnts" @tap="goCat">{{$t(`立即兑换`)}}</view>
-				</view>
-				<view class="bnt acea-row" v-else>
-					<view class="bnts no-goods">{{$t(`无法兑换`)}}</view>
-				</view>
-			</view>
-		</view>
-		<product-window :attr="attribute" :limitNum="1" @myevent="onMyEvent" @ChangeAttr="ChangeAttr"
-			@ChangeCartNum="ChangeCartNum" @attrVal="attrVal" @iptCartNum="iptCartNum" @getImg="showImg">
-		</product-window>
-		<cus-previewImg ref="cusPreviewImg" :list="skuArr" @changeSwitch="changeSwitch"
-			@shareFriend="listenerActionSheet" />
-		<!-- 分享按钮 -->
-		<kefuIcon :ids="storeInfo.product_id" :routineContact="routineContact"></kefuIcon>
-		<!-- 发送给朋友图片 -->
-	</view>
-</template>
-
-<script>
-	const app = getApp();
-	import {
-		mapGetters
-	} from "vuex";
-	import {
-		getIntegralProductDetail
-	} from '@/api/activity.js';
-	import productConSwiper from '@/components/productConSwiper/index.vue'
-	import productWindow from './component/productWindow.vue'
-	import userEvaluation from '@/components/userEvaluation/index.vue'
-	import kefuIcon from '@/components/kefuIcon';
-	// #ifdef MP
-	import authorize from '@/components/Authorize';
-	// #endif
-	import parser from "@/components/jyf-parser/jyf-parser";
-	import countDown from '@/components/countDown';
-	import {
-		imageBase64
-	} from "@/api/public";
-	import {
-		toLogin
-	} from '@/libs/login.js';
-	import {
-		getUserInfo
-	} from '@/api/user.js';
-	// #ifdef APP-PLUS
-	import {
-		TOKENNAME,
-		HTTP_REQUEST_URL
-	} from '@/config/app.js';
-	// #endif
-	import colors from "@/mixins/color";
-	import cusPreviewImg from "@/components/cusPreviewImg/index.vue";
-	import homeList from '@/components/homeList'
-	let sysHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
-	export default {
-		computed: mapGetters(['isLogin']),
-		mixins: [colors],
-		data() {
-			return {
-				dataShow: 0,
-				id: 0,
-				time: 0,
-				countDownHour: "00",
-				countDownMinute: "00",
-				countDownSecond: "00",
-				storeInfo: [],
-				imgUrls: [],
-				parameter: {
-					'navbar': '1',
-					'return': '1',
-					'title': this.$t(`抢购详情页`),
-					'color': false
-				},
-				attribute: {
-					cartAttr: false,
-					productAttr: [],
-					productSelect: {}
-				},
-				productValue: [],
-				isOpen: false,
-				attr: this.$t(`请选择`),
-				attrValue: '',
-				status: 1,
-				isAuto: false,
-				isShowAuth: false,
-				iShidden: false,
-				limitNum: 1, //限制本属性产品的个数；
-				iSplus: false,
-				replyCount: 0, //总评论数量
-				reply: [], //评论列表
-				replyChance: 0,
-				navH: "",
-				navList: [this.$t(`商品`), this.$t(`详情`)],
-				opacity: 0,
-				scrollY: 0,
-				topArr: [],
-				toView: '',
-				height: 0,
-				heightArr: [],
-				lock: false,
-				scrollTop: 0,
-				tagStyle: {
-					img: 'width:100%;display:block;',
-					table: 'width:100%',
-					video: 'width:100%'
-				},
-				datatime: '',
-				navActive: 0,
-				meunHeight: 0,
-				backH: '',
-				posters: false,
-				weixinStatus: false,
-				posterImageStatus: false,
-				storeImage: '', //海报产品图
-				PromotionCode: '', //二维码图片
-				posterImage: '', //海报路径
-				actionSheetHidden: false,
-				cart_num: 1,
-				homeTop: 20,
-				returnShow: true,
-				H5ShareBox: false, //公众号分享图片
-				routineContact: 0,
-				skuArr: [],
-				selectSku: {},
-				currentPage: false,
-				sysHeight: sysHeight,
-			}
-		},
-		components: {
-			productConSwiper,
-			'productWindow': productWindow,
-			userEvaluation,
-			kefuIcon,
-			"jyf-parser": parser,
-			countDown,
-			cusPreviewImg,
-			homeList,
-			// #ifdef MP
-			authorize
-			// #endif
-		},
-		computed: mapGetters(['isLogin']),
-		watch: {
-			isLogin: {
-				handler: function(newV, oldV) {
-					if (newV) {
-						this.getIntegralProductDetail();
-					}
-				},
-				deep: true
-			}
-		},
-		onLoad(options) {
-
-			let that = this
-			let statusBarHeight = ''
-			var pages = getCurrentPages();
-			that.returnShow = pages.length === 1 ? false : true;
-			//设置商品列表高度
-			uni.getSystemInfo({
-				success: function(res) {
-					that.height = res.windowHeight
-					statusBarHeight = res.statusBarHeight
-					//res.windowHeight:获取整个窗口高度为px，*2为rpx；98为头部占据的高度；
-				},
-			});
-			// #ifdef H5
-			that.navH = 96;
-			// #endif
-			// #ifdef APP-PLUS
-			that.navH = 30;
-			// #endif
-			// #ifdef MP
-			this.navH = app.globalData.navHeight;
-			let menuButtonInfo = uni.getMenuButtonBoundingClientRect()
-			this.meunHeight = menuButtonInfo.height
-			this.backH = (that.navH / 2) + (this.meunHeight / 2)
-
-			//扫码携带参数处理
-			if (options.scene) {
-				let value = this.$util.getUrlParams(decodeURIComponent(options.scene));
-				if (value.id) {
-					this.id = value.id;
-				} else {
-					return this.$util.Tips({
-						title: this.$t(`缺少参数无法查看商品`)
-					}, {
-						tab: 3,
-						url: 1
-					});
-				}
-				//记录推广人uid
-				if (value.pid) app.globalData.spid = value.pid;
-				if (value.time) this.datatime = value.time
-			}
-			// #endif
-
-			if (options.id) {
-				this.id = options.id
-				this.datatime = Number(options.time)
-				this.status = options.status
-			}
-			if (this.isLogin) {
-				this.getIntegralProductDetail();
-			} else {
-				toLogin();
-			}
-			this.$nextTick(() => {
-				// #ifdef MP
-				const menuButton = uni.getMenuButtonBoundingClientRect();
-				const query = uni.createSelectorQuery().in(this);
-				query
-					.select('#home')
-					.boundingClientRect(data => {
-						this.homeTop = menuButton.top * 2 + menuButton.height - data.height;
-					})
-					.exec();
-				// #endif
-			})
-		},
-		onNavigationBarButtonTap(e) {
-			this.currentPage = !this.currentPage
-		},
-		methods: {
-			moreNav() {
-				this.currentPage = !this.currentPage
-			},
-			// app分享
-			// #ifdef APP-PLUS
-			appShare(scene) {
-				let that = this
-				let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
-				let curRoute = routes[routes.length - 1].$page.fullPath // 获取当前页面路由，也就是最后一个打开的页面路由
-				uni.share({
-					provider: "weixin",
-					scene: scene,
-					type: 0,
-					href: `${HTTP_REQUEST_URL}${curRoute}`,
-					title: that.storeInfo.title,
-					summary: that.storeInfo.info,
-					imageUrl: that.storeInfo.small_image,
-					success: function(res) {
-						uni.showToast({
-							title: title.$t(`分享成功`),
-							icon: 'success'
-						})
-						that.posters = false;
-					},
-					fail: function(err) {
-						uni.showToast({
-							title: title.$t(`分享失败`),
-							icon: 'none',
-							duration: 2000
-						})
-						that.posters = false;
-					}
-				});
-			},
-			// #endif
-			/**
-			 * 购物车手动填写
-			 * 
-			 */
-			iptCartNum: function(e) {
-				this.$set(this.attribute.productSelect, 'cart_num', e);
-				this.$set(this, "cart_num", e);
-			},
-			// 后退
-			returns() {
-				// #ifdef H5
-				return history.back();
-				// #endif
-				// #ifndef H5
-				return uni.navigateBack({
-					delta: 1,
-				})
-				// #endif
-			},
-			onLoadFun: function(data) {
-				if (this.isAuto) {
-					this.isAuto = false;
-					this.isShowAuth = false;
-					this.getIntegralProductDetail();
-				}
-			},
-			getIntegralProductDetail: function() {
-				let that = this;
-				getIntegralProductDetail(that.id).then(res => {
-					this.dataShow = 1;
-					let title = res.data.storeInfo.title;
-					this.storeInfo = res.data.storeInfo;
-					this.imgUrls = res.data.storeInfo.images;
-					this.storeInfo.description = this.storeInfo.description.replace(/<img/gi,
-						'<img style="max-width:100%;height:auto;float:left;display:block" ');
-					this.attribute.productAttr = res.data.productAttr;
-					this.productValue = res.data.productValue;
-					this.attribute.productSelect.num = res.data.storeInfo.num;
-					this.replyCount = res.data.replyCount;
-					this.reply = res.data.reply ? [res.data.reply] : [];
-					this.replyChance = res.data.replyChance;
-					that.routineContact = res.data.routine_contact_type;
-					for (let key in res.data.productValue) {
-						let obj = res.data.productValue[key];
-						that.skuArr.push(obj);
-					}
-					this.$set(this, "selectSku", that.skuArr[0]);
-					uni.setNavigationBarTitle({
-						title: title.substring(0, 7) + '...'
-					});
-					// #ifdef H5
-					this.PromotionCode = res.data.storeInfo.code_base
-					that.storeImage = that.storeInfo.image
-					// #endif
-					that.DefaultSelect();
-					app.globalData.openPages = '/pages/activity/goods_seckill_details/index?id=' + that.id +
-						'&time=' + that.time +
-						'&status=' + that.status + '&scene=' + that.storeInfo.uid;
-					// wxParse.wxParse('description', 'html', that.data.storeInfo.description || '', that, 0);
-					// wxh.time(that.data.time, that);
-				}).catch(err => {
-					that.$util.Tips({
-						title: err
-					}, {
-						tab: 3
-					})
-				});
-			},
-			setShare: function() {
-				this.$wechat.isWeixin() &&
-					this.$wechat.wechatEvevt([
-						"updateAppMessageShareData",
-						"updateTimelineShareData",
-						"onMenuShareAppMessage",
-						"onMenuShareTimeline"
-					], {
-						desc: this.storeInfo.info,
-						title: this.storeInfo.title,
-						link: location.href,
-						imgUrl: this.storeInfo.image
-					}).then(res => {}).catch(err => {});
-			},
-			/**
-			 * 默认选中属性
-			 * 
-			 */
-			DefaultSelect: function() {
-				let self = this
-				let productAttr = self.attribute.productAttr;
-				let value = [];
-				for (var key in this.productValue) {
-					if (this.productValue[key].quota > 0) {
-						value = this.attribute.productAttr.length ? key.split(",") : [];
-						break;
-					}
-				}
-				for (let i = 0; i < productAttr.length; i++) {
-					this.$set(productAttr[i], "index", value[i]);
-				}
-				//sort();排序函数:数字-英文-汉字；
-				let productSelect = this.productValue[value.join(",")];
-				if (productSelect && productAttr.length) {
-					self.$set(
-						self.attribute.productSelect,
-						"store_name",
-						self.storeInfo.title
-					);
-					self.$set(self.attribute.productSelect, "image", productSelect.image);
-					self.$set(self.attribute.productSelect, "price", productSelect.price);
-					self.$set(self.attribute.productSelect, "stock", productSelect.stock);
-					self.$set(self.attribute.productSelect, "unique", productSelect.unique);
-					self.$set(self.attribute.productSelect, "quota", productSelect.quota);
-					self.$set(self.attribute.productSelect, "quota_show", productSelect.quota_show);
-					self.$set(self.attribute.productSelect, "product_stock", productSelect.product_stock);
-					self.$set(self.attribute.productSelect, "cart_num", 1);
-					self.$set(self, "attrValue", value.join(","));
-					self.attrValue = value.join(",")
-				} else if (!productSelect && productAttr.length) {
-					self.$set(
-						self.attribute.productSelect,
-						"store_name",
-						self.storeInfo.title
-					);
-					self.$set(self.attribute.productSelect, "image", self.storeInfo.image);
-					self.$set(self.attribute.productSelect, "price", self.storeInfo.price);
-					self.$set(self.attribute.productSelect, "quota", 0);
-					self.$set(self.attribute.productSelect, "quota_show", 0);
-					self.$set(self.attribute.productSelect, "product_stock", 0);
-					self.$set(self.attribute.productSelect, "stock", 0);
-					self.$set(self.attribute.productSelect, "unique", "");
-					self.$set(self.attribute.productSelect, "cart_num", 0);
-					self.$set(self, "attrValue", "");
-					self.$set(self, "attrTxt", self.$t(`请选择`));
-				} else if (!productSelect && !productAttr.length) {
-					self.$set(
-						self.attribute.productSelect,
-						"store_name",
-						self.storeInfo.title
-					);
-					self.$set(self.attribute.productSelect, "image", self.storeInfo.image);
-					self.$set(self.attribute.productSelect, "price", self.storeInfo.price);
-					self.$set(self.attribute.productSelect, "stock", self.storeInfo.stock);
-					self.$set(self.attribute.productSelect, "quota", self.storeInfo.quota);
-					self.$set(self.attribute.productSelect, "product_stock", self.storeInfo.product_stock);
-					self.$set(
-						self.attribute.productSelect,
-						"unique",
-						self.storeInfo.unique || ""
-					);
-					self.$set(self.attribute.productSelect, "cart_num", 1);
-					self.$set(self.attribute.productSelect, "quota", productSelect.quota);
-					self.$set(self.attribute.productSelect, "product_stock", productSelect.product_stock);
-					self.$set(self, "attrValue", "");
-					self.$set(self, "attrTxt", self.$t(`请选择`));
-				}
-			},
-			selecAttr: function() {
-				this.attribute.cartAttr = true
-			},
-			onMyEvent: function() {
-				this.$set(this.attribute, 'cartAttr', false);
-				this.$set(this, 'isOpen', false);
-			},
-			/**
-			 * 购物车数量加和数量减
-			 * 
-			 */
-			ChangeCartNum: function(changeValue) {
-				//changeValue:是否 加|减
-				//获取当前变动属性
-				let productSelect = this.productValue[this.attrValue];
-				if (this.cart_num) {
-					productSelect.cart_num = this.cart_num;
-					this.attribute.productSelect.cart_num = this.cart_num;
-				}
-				//如果没有属性,赋值给商品默认库存
-				if (productSelect === undefined && !this.attribute.productAttr.length)
-					productSelect = this.attribute.productSelect;
-				//无属性值即库存为0；不存在加减；
-				if (productSelect === undefined) return;
-				let stock = productSelect.stock || 0;
-				let quotaShow = productSelect.quota_show || 0;
-				let quota = productSelect.quota || 0;
-				let productStock = productSelect.product_stock || 0;
-				let num = this.attribute.productSelect;
-				let nums = this.storeInfo.num || 0;
-				//设置默认数据
-				if (productSelect.cart_num == undefined) productSelect.cart_num = 1;
-				if (changeValue) {
-					if (num.cart_num < this.attribute.productSelect.quota) {
-						num.cart_num++;
-						this.$set(this.attribute.productSelect, "cart_num", num.cart_num);
-						this.$set(this, "cart_num", num.cart_num);
-						this.$set(this.attribute.productSelect, "cart_num", num.cart_num);
-					}
-
-				} else {
-					if (num.cart_num == 1) return
-					num.cart_num--;
-					this.$set(this, "cart_num", num.cart_num);
-					this.$set(this.attribute.productSelect, "cart_num", num.cart_num);
-				}
-			},
-			attrVal(val) {
-				this.attribute.productAttr[val.indexw].index = this.attribute.productAttr[val.indexw].attr_values[val
-					.indexn];
-			},
-			/**
-			 * 属性变动赋值
-			 * 
-			 */
-			ChangeAttr: function(res) {
-				this.$set(this, 'cart_num', 1);
-				let productSelect = this.productValue[res];
-				this.$set(this, "selectSku", productSelect);
-				if (productSelect) {
-					this.$set(this.attribute.productSelect, "image", productSelect.image);
-					this.$set(this.attribute.productSelect, "price", productSelect.price);
-					this.$set(this.attribute.productSelect, "stock", productSelect.stock);
-					this.$set(this.attribute.productSelect, "unique", productSelect.unique);
-					this.$set(this.attribute.productSelect, "cart_num", 1);
-					this.$set(this.attribute.productSelect, "quota", productSelect.quota);
-					this.$set(this.attribute.productSelect, "quota_show", productSelect.quota_show);
-					this.$set(this, "attrValue", res);
-
-					this.attrTxt = this.$t(`已选择`)
-				} else {
-					this.$set(this.attribute.productSelect, "image", this.storeInfo.image);
-					this.$set(this.attribute.productSelect, "price", this.storeInfo.price);
-					this.$set(this.attribute.productSelect, "stock", 0);
-					this.$set(this.attribute.productSelect, "unique", "");
-					this.$set(this.attribute.productSelect, "cart_num", 0);
-					this.$set(this.attribute.productSelect, "quota", 0);
-					this.$set(this.attribute.productSelect, "quota_show", 0);
-					this.$set(this, "attrValue", "");
-					this.attrTxt = this.$t(`已选择`)
-
-				}
-			},
-			scroll: function(e) {
-				var that = this,
-					scrollY = e.detail.scrollTop;
-				var opacity = scrollY / 200;
-				opacity = opacity > 1 ? 1 : opacity;
-				that.opacity = opacity
-				this.currentPage = false
-				that.scrollY = scrollY
-				if (that.lock) {
-					that.lock = false
-					return;
-				}
-				for (var i = 0; i < that.topArr.length; i++) {
-					if (scrollY < that.topArr[i] - (app.globalData.navHeight / 2) + that.heightArr[i]) {
-						that.navActive = i
-						break
-					}
-				}
-			},
-			tap: function(item, index) {
-				var id = item.id;
-				var index = index;
-				var that = this;
-				// if (!this.data.good_list.length && id == "past2") {
-				//   id = "past3"
-				// }
-				this.toView = id;
-				this.navActive = index;
-				this.lock = true;
-				this.scrollTop = index > 0 ? that.topArr[index] - (app.globalData.navHeight / 2) : that.topArr[index]
-			},
-			//点击sku图片打开轮播图
-			showImg(index) {
-				this.$refs.cusPreviewImg.open(this.selectSku.suk);
-			},
-			/**
-			 * 分享打开
-			 *
-			 */
-			listenerActionSheet() {
-				this.currentPage = false
-				if (this.isLogin === false) {
-					toLogin();
-				} else {
-					if (this.posterImage) {
-						this.posters = true;
-						return
-					}
-					// #ifdef H5
-					if (this.$wechat.isWeixin() === true) {
-						this.weixinStatus = true;
-					}
-					// #endif
-					// #ifndef APP-PLUS
-					this.downloadFilePromotionCode();
-					// #endif
-					// #ifdef APP-PLUS
-					if (this.PromotionCode.indexOf("http") == 0) {
-						// this.downloadFilePromotionCode();
-
-					}
-					// #endif
-
-					this.posters = true;
-				}
-			},
-			//滑动轮播图选择商品
-			changeSwitch(e) {
-				let productSelect = this.skuArr[e];
-				this.$set(this, "selectSku", productSelect);
-				var skuList = productSelect.suk.split(",");
-				this.$set(this.attribute.productAttr[0], "index", skuList[0]);
-				if (skuList.length == 2) {
-					this.$set(this.attribute.productAttr[0], "index", skuList[0]);
-					this.$set(this.attribute.productAttr[1], "index", skuList[1]);
-				} else if (skuList.length == 3) {
-					this.$set(this.attribute.productAttr[0], "index", skuList[0]);
-					this.$set(this.attribute.productAttr[1], "index", skuList[1]);
-					this.$set(this.attribute.productAttr[2], "index", skuList[2]);
-				} else if (skuList.length == 4) {
-					this.$set(this.attribute.productAttr[0], "index", skuList[0]);
-					this.$set(this.attribute.productAttr[1], "index", skuList[1]);
-					this.$set(this.attribute.productAttr[2], "index", skuList[2]);
-					this.$set(this.attribute.productAttr[3], "index", skuList[3]);
-				}
-				if (productSelect) {
-					this.$set(this.attribute.productSelect, "image", productSelect.image);
-					this.$set(this.attribute.productSelect, "price", productSelect.price);
-					this.$set(this.attribute.productSelect, "stock", productSelect.stock);
-					this.$set(this.attribute.productSelect, "unique", productSelect.unique);
-					this.$set(this.attribute.productSelect, "vipPrice", productSelect.vipPrice);
-					this.$set(this, "attrTxt", this.$t(`已选择`));
-					this.$set(this, "attrValue", productSelect.suk);
-				}
-			},
-			/*
-			 *  下订单
-			 */
-			goCat: function() {
-				var that = this;
-				this.currentPage = false
-				var productSelect = this.productValue[this.attrValue];
-				//打开属性
-				if (this.isOpen)
-					this.attribute.cartAttr = true
-				else
-					this.attribute.cartAttr = !this.attribute.cartAttr
-				//只有关闭属性弹窗时进行加入购物车
-				if (this.attribute.cartAttr === true && this.isOpen == false) return this.isOpen = true
-				//如果有属性,没有选择,提示用户选择
-				if (this.attribute.productAttr.length && productSelect === undefined && this.isOpen == true) return app
-					.$util.Tips({
-						title: this.$t(`请选择属性`)
-					});
-				if (this.cart_num <= 0) {
-					return app.$util.Tips({
-						title: this.$t(`请选择数量`)
-					});
-				}
-				this.isOpen = false
-				uni.navigateTo({
-					url: `/pages/points_mall/integral_order?unique=${productSelect.unique}&num=${this.cart_num || 1}`
-				});
-			},
-		}
-	}
-</script>
-
-<style lang="scss">
-	.generate-posters {
-		width: 100%;
-		height: 170rpx;
-		background-color: #fff;
-		position: fixed;
-		left: 0;
-		bottom: 0;
-		z-index: 300;
-		transform: translate3d(0, 100%, 0);
-		transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
-		border-top: 1rpx solid #eee;
-	}
-
-	.generate-posters.on {
-		transform: translate3d(0, 0, 0);
-	}
-
-	.generate-posters .item {
-		flex: 1;
-		text-align: center;
-		font-size: 30rpx;
-	}
-
-	.generate-posters .item .iconfont {
-		font-size: 80rpx;
-		color: #5eae72;
-	}
-
-	.generate-posters .item .iconfont.icon-haibao {
-		color: #5391f1;
-	}
-
-	.navbar .header {
-		width: 400rpx;
-		height: 96rpx;
-		font-size: 30rpx;
-		color: #050505;
-		background-color: #fff;
-		/* #ifdef MP */
-		padding-right: 95rpx;
-		/* #endif */
-	}
-
-	.icon-xiangzuo {
-		/* #ifdef H5 */
-		top: 30rpx !important;
-		/* #endif */
-	}
-
-	.navbar .header .item {
-		position: relative;
-		margin: 0 25rpx;
-	}
-
-	.navbar {
-		position: fixed;
-		background-color: #fff;
-		top: 0;
-		left: 0;
-		z-index: 99;
-		width: 100%;
-	}
-
-	.navbar .navbarH {
-		position: relative;
-	}
-
-	.navbar .navbarH .navbarCon {
-		position: absolute;
-		bottom: 0;
-		height: 100rpx;
-		width: 100%;
-	}
-
-	.icon-xiangzuo {
-		/* color: #000;
-		position: fixed;
-		font-size: 40rpx;
-		width: 100rpx;
-		height: 56rpx;
-		line-height: 54rpx;
-		z-index: 1000;
-		left: 33rpx; */
-	}
-
-	.product-con .nav {
-		width: 100%;
-		height: 100rpx;
-		padding: 0 30rpx;
-		box-sizing: border-box;
-		background-color: #fff;
-	}
-
-	.product-con .nav .money {
-		font-size: 28rpx;
-		color: #e93323;
-		font-weight: bold;
-
-		image {
-			width: 34rpx;
-			height: 34rpx;
-		}
-	}
-
-	.product-con .nav .money .num {
-		font-size: 48rpx;
-		padding-left: 16rpx;
-	}
-
-	.product-con .nav .money .y-money {
-		font-size: 26rpx;
-		margin-left: 10rpx;
-		text-decoration: line-through;
-	}
-
-	.product-con .nav .timeItem {
-		font-size: 20rpx;
-		color: #fff;
-		text-align: center;
-	}
-
-	.product-con .nav .timeItem .timeCon {
-		margin-top: 10rpx;
-	}
-
-	.product-con .nav .timeItem .timeCon .num {
-		padding: 0 7rpx;
-		font-size: 22rpx;
-		color: #ff3d3d;
-		background-color: #fff;
-		border-radius: 2rpx;
-	}
-
-	.product-con .nav .timeState {
-		font-size: 28rpx;
-		color: #fff;
-	}
-
-	.product-con .nav .iconfont {
-		color: #fff;
-		font-size: 30rpx;
-		margin-left: 20rpx;
-	}
-
-	.product-con .wrapper {
-		padding: 0 32rpx 32rpx 32rpx;
-		width: 100%;
-		box-sizing: border-box;
-	}
-
-	.product-con .wrapper .introduce {
-		margin: 0;
-	}
-
-	.product-con .wrapper .introduce .infor {
-		// width: 570rpx;
-	}
-
-	.product-con .wrapper .introduce .iconfont {
-		font-size: 37rpx;
-		color: #515151;
-	}
-
-	.product-con .wrapper .label {
-		display: flex;
-		justify-content: space-between;
-		margin: 18rpx 0 0 0;
-		font-size: 24rpx;
-		color: #82848f;
-	}
-
-	.product-con .wrapper .label .stock {}
-
-	.product-con .footer {
-		padding: 0 20rpx 0 30rpx;
-		position: fixed;
-		bottom: 0;
-		width: 100%;
-		box-sizing: border-box;
-		background-color: #fff;
-		z-index: 277;
-		border-top: 1rpx solid #f0f0f0;
-		height: 100rpx;
-		display: flex;
-		align-items: center;
-		flex-wrap: nowrap;
-		height: calc(100rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
-		height: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
-	}
-
-	.product-con .footer .item {
-		width: 100rpx;
-		font-size: 18rpx;
-		color: #666;
-	}
-
-	.product-con .footer .item .iconfont {
-		text-align: center;
-		font-size: 40rpx;
-	}
-
-	.product-con .footer .item .iconfont.icon-shoucang1 {
-		color: var(--view-theme);
-	}
-
-	.product-con .footer .item .iconfont.icon-gouwuche1 {
-		font-size: 40rpx;
-		position: relative;
-	}
-
-	.product-con .footer .item .iconfont.icon-gouwuche1 .num {
-		color: #fff;
-		position: absolute;
-		font-size: 18rpx;
-		padding: 2rpx 8rpx 3rpx;
-		border-radius: 200rpx;
-		top: -10rpx;
-		right: -10rpx;
-	}
-
-	.product-con .footer .bnt {
-		width: 100%;
-		height: 76rpx;
-	}
-
-	.product-con .footer .bnt .bnts {
-		width: 100%;
-		text-align: center;
-		line-height: 76rpx;
-		color: #fff;
-		font-size: 28rpx;
-	}
-
-	.product-con .footer .bnt .joinCart {
-		border-radius: 50rpx 0 0 50rpx;
-		background-image: linear-gradient(to right, #fea10f 0%, #fa8013 100%);
-	}
-
-	.product-con .footer .bnt .buy {
-		border-radius: 50rpx;
-		// background-image: linear-gradient(to right, #fa6514 0%, #e93323 100%);
-		background-color: var(--view-theme);
-	}
-
-	.product-con .footer .bnt .no-goods {
-		border-radius: 50rpx;
-		background-color: #cccccc;
-	}
-
-	.product-con .conter {
-		display: block;
-	}
-
-	.product-con .conter img {
-		display: block;
-	}
-
-	.bg-color-hui {
-		background: #bbbbbb !important;
-	}
-
-	.canvas {
-		width: 750px;
-		height: 1190px;
-	}
-
-	.poster-pop {
-		width: 450rpx;
-		height: 714rpx;
-		position: fixed;
-		left: 50%;
-		transform: translateX(-50%);
-		z-index: 300;
-		top: 50%;
-		margin-top: -377rpx;
-	}
-
-	.poster-pop image {
-		width: 100%;
-		height: 100%;
-		display: block;
-	}
-
-	.poster-pop .close {
-		width: 46rpx;
-		height: 75rpx;
-		position: fixed;
-		right: 0;
-		top: -73rpx;
-		display: block;
-	}
-
-	.poster-pop .save-poster {
-		background-color: #df2d0a;
-		font-size: ：22rpx;
-		color: #fff;
-		text-align: center;
-		height: 76rpx;
-		line-height: 76rpx;
-		width: 100%;
-	}
-
-	.poster-pop .keep {
-		color: #fff;
-		text-align: center;
-		font-size: 25rpx;
-		margin-top: 10rpx;
-	}
-
-	/deep/.mask {
-		z-index: 99 !important;
-	}
-
-	.mask1 {
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		background-color: #000;
-		opacity: 0.5;
-		z-index: 288;
-	}
-
-	.home-nav {
-		/* #ifdef H5 */
-		top: 20rpx !important;
-		/* #endif */
-	}
-
-	.home-nav {
-		color: #333;
-		position: fixed;
-		/* #ifdef MP */
-		width: 126rpx;
-		left: 15rpx;
-		/* #endif */
-		/* #ifndef MP */
-		width: 56rpx;
-		left: 33rpx;
-		/* #endif */
-		height: 56rpx;
-		font-size: 33rpx;
-		z-index: 99;
-		background: rgba(255, 255, 255, 0.3);
-		border: 1px solid rgba(0, 0, 0, 0.1);
-		border-radius: 40rpx;
-
-		&.right {
-			right: 33rpx;
-			left: unset
-		}
-
-		&.on {
-			background: unset;
-			color: #333;
-		}
-
-		&.homeIndex {
-			/* #ifdef MP */
-			width: 98rpx;
-			/* #endif */
-			/* #ifndef MP */
-			border-color: rgba(255, 255, 255, 0);
-			/* #endif */
-		}
-	}
-
-	.home-nav .iconfont {
-		width: 58rpx;
-		text-align: center;
-	}
-
-	.home-nav .line {
-		width: 1rpx;
-		height: 34rpx;
-		background: #B3B3B3;
-	}
-
-	.home-nav .icon-xiangzuo {
-		width: auto;
-		font-size: 28rpx;
-	}
-
-	.share-box {
-		z-index: 1000;
-		position: fixed;
-		left: 0;
-		top: 0;
-		width: 100%;
-		height: 100%;
-	}
-
-	.share-box image {
-		width: 100%;
-		height: 100%;
-	}
-
-	.df {
-		display: flex;
-		align-items: center;
-		flex-wrap: nowrap;
-		width: 100%;
-	}
-
-	.attrImg {
-		width: 66rpx;
-		height: 66rpx;
-		border-radius: 6rpx;
-		display: block;
-		margin-right: 14rpx;
-	}
-
-	.switchTxt {
-		height: 60rpx;
-		flex: 1;
-		line-height: 60rpx;
-		box-sizing: border-box;
-		background: #eeeeee;
-		padding: 0 10rpx;
-		border-radius: 8rpx;
-		text-align: center;
-	}
-
-	.attribute {
-		padding: 10rpx 30rpx;
-
-		.line1 {
-			width: 600rpx;
-		}
-	}
-
-	.flex {
-		display: flex;
-		justify-content: space-between;
-		width: 100%;
-	}
-
-	.flexs {
-		display: flex;
-	}
-
-	.attr-txt {
-		display: flex;
-		flex-wrap: nowrap;
-		width: 130rpx;
-	}
+<template>
+	<view :style="colorStyle">
+		<view class="product-con">
+			<!-- 头部 -->
+
+			<!-- #ifndef APP-PLUS -->
+			<view class='navbar' :style="{height:navH+'rpx',opacity:opacity}">
+				<view class='navbarH' :style='"height:"+navH+"rpx;"'>
+					<view class='navbarCon acea-row row-center-wrapper'>
+						<view class="header acea-row row-center-wrapper">
+							<view class="item line1">
+								{{storeInfo.title}}
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view id="home" class="home-nav acea-row row-center-wrapper" :class="[opacity>0.5?'on':'']"
+				:style="{ top: homeTop +'rpx'}">
+				<view class="iconfont icon-fanhui2" @tap="returns"></view>
+				<!-- #ifdef MP -->
+				<view class="line"></view>
+				<view class="iconfont icon-gengduo5" @click="moreNav"></view>
+				<!-- #endif -->
+			</view>
+			<!-- #endif -->
+			<!-- #ifdef H5 -->
+			<view id="home" class="home-nav right acea-row row-center-wrapper" :class="[opacity>0.5?'on':'']"
+				:style="{ top: homeTop +'rpx'}">
+				<!-- #ifdef APP-PLUS || H5 -->
+				<view class="iconfont icon-gengduo2" @click="moreNav"></view>
+			</view>
+			<!-- #endif -->
+			<!-- #endif -->
+			<homeList :navH="navH" :returnShow="returnShow" :currentPage="currentPage" :sysHeight="sysHeight">
+			</homeList>
+			<scroll-view :scroll-top="scrollTop" scroll-y="true" scroll-with-animation="true"
+				:style="'height:' + height + 'px;'" @scroll="scroll">
+				<view id="past0">
+					<!-- #ifdef APP-PLUS || MP -->
+					<view class="" :style="'width:100%;' + 'height:'+sysHeight"></view>
+					<!-- #endif -->
+					<productConSwiper :imgUrls="imgUrls"></productConSwiper>
+					<view class="nav acea-row row-between-wrapper">
+						<view class="share acea-row row-between row-bottom">
+							<view class="money font-color">
+								<image src="./static/my-point.png" mode=""></image>
+								<text class="num" v-text="storeInfo.price || 0"></text>{{$t(`积分`)}}
+							</view>
+							<view></view>
+						</view>
+					</view>
+					<view class="wrapper">
+						<view class="introduce acea-row row-between">
+							<view class="infor"> {{ storeInfo.title }}</view>
+						</view>
+						<view class="limit_good" v-if="storeInfo.num > 0">
+							{{ $t(`最多可兑换`)}}: {{storeInfo.num}}{{$t(storeInfo.unit_name)}}
+						</view>
+						<view class="label acea-row row-middle">
+							<view class="stock">{{$t(`划线价`)}}：{{ storeInfo.product_price }}</view>
+							<view class="stock">{{$t(`限量`)}}:
+								{{ storeInfo.quota_show }}
+							</view>
+							<view class="stock">{{$t(`已兑换`)}}：{{ storeInfo.sales }} </view>
+						</view>
+					</view>
+					<view class="attribute acea-row row-between-wrapper" @tap="selecAttr"
+						v-if="attribute.productAttr.length">
+						<!-- <view class="df"><text class='atterTxt line1'>{{attr}}：{{attrValue}}</text></view>
+						<view class='iconfont icon-jiantou'></view> -->
+						<view class="flex">
+							<view style="display: flex; align-items: center; width: 90%">
+								<view class="attr-txt"> {{ attr }}： </view>
+								<view class="atterTxt line1" style="width: 82%">{{
+                  attrValue
+                }}</view>
+							</view>
+							<view class="iconfont icon-jiantou"></view>
+						</view>
+						<view class="acea-row row-between-wrapper" style="margin-top: 7px; padding-left: 70px"
+							v-if="skuArr.length > 1">
+							<view class="flexs">
+								<image :src="item.image" v-for="(item, index) in skuArr.slice(0, 4)" :key="index"
+									class="attrImg"></image>
+							</view>
+							<view class="switchTxt">{{$t(`共`)}}{{ skuArr.length }}{{$t(`种规格可选`)}}</view>
+						</view>
+					</view>
+				</view>
+				<view class="product-intro" id="past2">
+					<view class="title">{{$t(`产品介绍`)}}</view>
+					<view class="conter">
+						<jyf-parser :html="storeInfo.description" ref="article" :tag-style="tagStyle"></jyf-parser>
+					</view>
+				</view>
+			</scroll-view>
+			<view class="footer acea-row row-between-wrapper">
+				<navigator hover-class="none" open-type="switchTab" class="item" url="/pages/index/index">
+					<view class="iconfont icon-shouye6"></view>
+					<view class="p_center">{{$t(`首页`)}}</view>
+				</navigator>
+				<view class="bnt acea-row" v-if="
+            attribute.productSelect.quota > 0 &&
+            attribute.productSelect.product_stock > 0
+          ">
+					<view class="buy bnts" @tap="goCat">{{$t(`立即兑换`)}}</view>
+				</view>
+				<view class="bnt acea-row" v-else>
+					<view class="bnts no-goods">{{$t(`无法兑换`)}}</view>
+				</view>
+			</view>
+		</view>
+		<product-window :attr="attribute" :limitNum="1" @myevent="onMyEvent" @ChangeAttr="ChangeAttr"
+			@ChangeCartNum="ChangeCartNum" @attrVal="attrVal" @iptCartNum="iptCartNum" @getImg="showImg">
+		</product-window>
+		<cus-previewImg ref="cusPreviewImg" :list="skuArr" @changeSwitch="changeSwitch"
+			@shareFriend="listenerActionSheet" />
+		<!-- 分享按钮 -->
+		<kefuIcon :ids="storeInfo.product_id" :routineContact="routineContact"></kefuIcon>
+		<!-- 发送给朋友图片 -->
+	</view>
+</template>
+
+<script>
+	const app = getApp();
+	import {
+		mapGetters
+	} from "vuex";
+	import {
+		getIntegralProductDetail
+	} from '@/api/activity.js';
+	import productConSwiper from '@/components/productConSwiper/index.vue'
+	import productWindow from './component/productWindow.vue'
+	import userEvaluation from '@/components/userEvaluation/index.vue'
+	import kefuIcon from '@/components/kefuIcon';
+	// #ifdef MP
+	import authorize from '@/components/Authorize';
+	// #endif
+	import parser from "@/components/jyf-parser/jyf-parser";
+	import countDown from '@/components/countDown';
+	import {
+		imageBase64
+	} from "@/api/public";
+	import {
+		toLogin
+	} from '@/libs/login.js';
+	import {
+		getUserInfo
+	} from '@/api/user.js';
+	// #ifdef APP-PLUS
+	import {
+		TOKENNAME,
+		HTTP_REQUEST_URL
+	} from '@/config/app.js';
+	// #endif
+	import colors from "@/mixins/color";
+	import cusPreviewImg from "@/components/cusPreviewImg/index.vue";
+	import homeList from '@/components/homeList'
+	let sysHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
+	export default {
+		computed: mapGetters(['isLogin']),
+		mixins: [colors],
+		data() {
+			return {
+				dataShow: 0,
+				id: 0,
+				time: 0,
+				countDownHour: "00",
+				countDownMinute: "00",
+				countDownSecond: "00",
+				storeInfo: [],
+				imgUrls: [],
+				parameter: {
+					'navbar': '1',
+					'return': '1',
+					'title': this.$t(`抢购详情页`),
+					'color': false
+				},
+				attribute: {
+					cartAttr: false,
+					productAttr: [],
+					productSelect: {}
+				},
+				productValue: [],
+				isOpen: false,
+				attr: this.$t(`请选择`),
+				attrValue: '',
+				status: 1,
+				isAuto: false,
+				isShowAuth: false,
+				iShidden: false,
+				limitNum: 1, //限制本属性产品的个数；
+				iSplus: false,
+				replyCount: 0, //总评论数量
+				reply: [], //评论列表
+				replyChance: 0,
+				navH: "",
+				navList: [this.$t(`商品`), this.$t(`详情`)],
+				opacity: 0,
+				scrollY: 0,
+				topArr: [],
+				toView: '',
+				height: 0,
+				heightArr: [],
+				lock: false,
+				scrollTop: 0,
+				tagStyle: {
+					img: 'width:100%;display:block;',
+					table: 'width:100%',
+					video: 'width:100%'
+				},
+				datatime: '',
+				navActive: 0,
+				meunHeight: 0,
+				backH: '',
+				posters: false,
+				weixinStatus: false,
+				posterImageStatus: false,
+				storeImage: '', //海报产品图
+				PromotionCode: '', //二维码图片
+				posterImage: '', //海报路径
+				actionSheetHidden: false,
+				cart_num: 1,
+				homeTop: 20,
+				returnShow: true,
+				H5ShareBox: false, //公众号分享图片
+				routineContact: 0,
+				skuArr: [],
+				selectSku: {},
+				currentPage: false,
+				sysHeight: sysHeight,
+			}
+		},
+		components: {
+			productConSwiper,
+			'productWindow': productWindow,
+			userEvaluation,
+			kefuIcon,
+			"jyf-parser": parser,
+			countDown,
+			cusPreviewImg,
+			homeList,
+			// #ifdef MP
+			authorize
+			// #endif
+		},
+		computed: mapGetters(['isLogin']),
+		watch: {
+			isLogin: {
+				handler: function(newV, oldV) {
+					if (newV) {
+						this.getIntegralProductDetail();
+					}
+				},
+				deep: true
+			}
+		},
+		onLoad(options) {
+
+			let that = this
+			let statusBarHeight = ''
+			var pages = getCurrentPages();
+			that.returnShow = pages.length === 1 ? false : true;
+			//设置商品列表高度
+			uni.getSystemInfo({
+				success: function(res) {
+					that.height = res.windowHeight
+					statusBarHeight = res.statusBarHeight
+					//res.windowHeight:获取整个窗口高度为px，*2为rpx；98为头部占据的高度；
+				},
+			});
+			// #ifdef H5
+			that.navH = 96;
+			// #endif
+			// #ifdef APP-PLUS
+			that.navH = 30;
+			// #endif
+			// #ifdef MP
+			this.navH = app.globalData.navHeight;
+			let menuButtonInfo = uni.getMenuButtonBoundingClientRect()
+			this.meunHeight = menuButtonInfo.height
+			this.backH = (that.navH / 2) + (this.meunHeight / 2)
+
+			//扫码携带参数处理
+			if (options.scene) {
+				let value = this.$util.getUrlParams(decodeURIComponent(options.scene));
+				if (value.id) {
+					this.id = value.id;
+				} else {
+					return this.$util.Tips({
+						title: this.$t(`缺少参数无法查看商品`)
+					}, {
+						tab: 3,
+						url: 1
+					});
+				}
+				//记录推广人uid
+				if (value.pid) app.globalData.spid = value.pid;
+				if (value.time) this.datatime = value.time
+			}
+			// #endif
+
+			if (options.id) {
+				this.id = options.id
+				this.datatime = Number(options.time)
+				this.status = options.status
+			}
+			if (this.isLogin) {
+				this.getIntegralProductDetail();
+			} else {
+				toLogin();
+			}
+			this.$nextTick(() => {
+				// #ifdef MP
+				const menuButton = uni.getMenuButtonBoundingClientRect();
+				const query = uni.createSelectorQuery().in(this);
+				query
+					.select('#home')
+					.boundingClientRect(data => {
+						this.homeTop = menuButton.top * 2 + menuButton.height - data.height;
+					})
+					.exec();
+				// #endif
+			})
+		},
+		onNavigationBarButtonTap(e) {
+			this.currentPage = !this.currentPage
+		},
+		methods: {
+			moreNav() {
+				this.currentPage = !this.currentPage
+			},
+			// app分享
+			// #ifdef APP-PLUS
+			appShare(scene) {
+				let that = this
+				let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
+				let curRoute = routes[routes.length - 1].$page.fullPath // 获取当前页面路由，也就是最后一个打开的页面路由
+				uni.share({
+					provider: "weixin",
+					scene: scene,
+					type: 0,
+					href: `${HTTP_REQUEST_URL}${curRoute}`,
+					title: that.storeInfo.title,
+					summary: that.storeInfo.info,
+					imageUrl: that.storeInfo.small_image,
+					success: function(res) {
+						uni.showToast({
+							title: title.$t(`分享成功`),
+							icon: 'success'
+						})
+						that.posters = false;
+					},
+					fail: function(err) {
+						uni.showToast({
+							title: title.$t(`分享失败`),
+							icon: 'none',
+							duration: 2000
+						})
+						that.posters = false;
+					}
+				});
+			},
+			// #endif
+			/**
+			 * 购物车手动填写
+			 * 
+			 */
+			iptCartNum: function(e) {
+				this.$set(this.attribute.productSelect, 'cart_num', e);
+				this.$set(this, "cart_num", e);
+			},
+			// 后退
+			returns() {
+				// #ifdef H5
+				return history.back();
+				// #endif
+				// #ifndef H5
+				return uni.navigateBack({
+					delta: 1,
+				})
+				// #endif
+			},
+			onLoadFun: function(data) {
+				if (this.isAuto) {
+					this.isAuto = false;
+					this.isShowAuth = false;
+					this.getIntegralProductDetail();
+				}
+			},
+			getIntegralProductDetail: function() {
+				let that = this;
+				getIntegralProductDetail(that.id).then(res => {
+					this.dataShow = 1;
+					let title = res.data.storeInfo.title;
+					this.storeInfo = res.data.storeInfo;
+					this.imgUrls = res.data.storeInfo.images;
+					this.storeInfo.description = this.storeInfo.description.replace(/<img/gi,
+						'<img style="max-width:100%;height:auto;float:left;display:block" ');
+					this.attribute.productAttr = res.data.productAttr;
+					this.productValue = res.data.productValue;
+					this.attribute.productSelect.num = res.data.storeInfo.num;
+					this.replyCount = res.data.replyCount;
+					this.reply = res.data.reply ? [res.data.reply] : [];
+					this.replyChance = res.data.replyChance;
+					that.routineContact = Number(res.data.routine_contact_type);
+					for (let key in res.data.productValue) {
+						let obj = res.data.productValue[key];
+						that.skuArr.push(obj);
+					}
+					this.$set(this, "selectSku", that.skuArr[0]);
+					uni.setNavigationBarTitle({
+						title: title.substring(0, 7) + '...'
+					});
+					// #ifdef H5
+					this.PromotionCode = res.data.storeInfo.code_base
+					that.storeImage = that.storeInfo.image
+					// #endif
+					that.DefaultSelect();
+					app.globalData.openPages = '/pages/activity/goods_seckill_details/index?id=' + that.id +
+						'&time=' + that.time +
+						'&status=' + that.status + '&scene=' + that.storeInfo.uid;
+					// wxParse.wxParse('description', 'html', that.data.storeInfo.description || '', that, 0);
+					// wxh.time(that.data.time, that);
+				}).catch(err => {
+					that.$util.Tips({
+						title: err
+					}, {
+						tab: 3
+					})
+				});
+			},
+			setShare: function() {
+				this.$wechat.isWeixin() &&
+					this.$wechat.wechatEvevt([
+						"updateAppMessageShareData",
+						"updateTimelineShareData",
+						"onMenuShareAppMessage",
+						"onMenuShareTimeline"
+					], {
+						desc: this.storeInfo.info,
+						title: this.storeInfo.title,
+						link: location.href,
+						imgUrl: this.storeInfo.image
+					}).then(res => {}).catch(err => {});
+			},
+			/**
+			 * 默认选中属性
+			 * 
+			 */
+			DefaultSelect: function() {
+				let self = this
+				let productAttr = self.attribute.productAttr;
+				let value = [];
+				for (var key in this.productValue) {
+					if (this.productValue[key].quota > 0) {
+						value = this.attribute.productAttr.length ? key.split(",") : [];
+						break;
+					}
+				}
+				for (let i = 0; i < productAttr.length; i++) {
+					this.$set(productAttr[i], "index", value[i]);
+				}
+				//sort();排序函数:数字-英文-汉字；
+				let productSelect = this.productValue[value.join(",")];
+				if (productSelect && productAttr.length) {
+					self.$set(
+						self.attribute.productSelect,
+						"store_name",
+						self.storeInfo.title
+					);
+					self.$set(self.attribute.productSelect, "image", productSelect.image);
+					self.$set(self.attribute.productSelect, "price", productSelect.price);
+					self.$set(self.attribute.productSelect, "stock", productSelect.stock);
+					self.$set(self.attribute.productSelect, "unique", productSelect.unique);
+					self.$set(self.attribute.productSelect, "quota", productSelect.quota);
+					self.$set(self.attribute.productSelect, "quota_show", productSelect.quota_show);
+					self.$set(self.attribute.productSelect, "product_stock", productSelect.product_stock);
+					self.$set(self.attribute.productSelect, "cart_num", 1);
+					self.$set(self, "attrValue", value.join(","));
+					self.attrValue = value.join(",")
+				} else if (!productSelect && productAttr.length) {
+					self.$set(
+						self.attribute.productSelect,
+						"store_name",
+						self.storeInfo.title
+					);
+					self.$set(self.attribute.productSelect, "image", self.storeInfo.image);
+					self.$set(self.attribute.productSelect, "price", self.storeInfo.price);
+					self.$set(self.attribute.productSelect, "quota", 0);
+					self.$set(self.attribute.productSelect, "quota_show", 0);
+					self.$set(self.attribute.productSelect, "product_stock", 0);
+					self.$set(self.attribute.productSelect, "stock", 0);
+					self.$set(self.attribute.productSelect, "unique", "");
+					self.$set(self.attribute.productSelect, "cart_num", 0);
+					self.$set(self, "attrValue", "");
+					self.$set(self, "attrTxt", self.$t(`请选择`));
+				} else if (!productSelect && !productAttr.length) {
+					self.$set(
+						self.attribute.productSelect,
+						"store_name",
+						self.storeInfo.title
+					);
+					self.$set(self.attribute.productSelect, "image", self.storeInfo.image);
+					self.$set(self.attribute.productSelect, "price", self.storeInfo.price);
+					self.$set(self.attribute.productSelect, "stock", self.storeInfo.stock);
+					self.$set(self.attribute.productSelect, "quota", self.storeInfo.quota);
+					self.$set(self.attribute.productSelect, "product_stock", self.storeInfo.product_stock);
+					self.$set(
+						self.attribute.productSelect,
+						"unique",
+						self.storeInfo.unique || ""
+					);
+					self.$set(self.attribute.productSelect, "cart_num", 1);
+					self.$set(self.attribute.productSelect, "quota", productSelect.quota);
+					self.$set(self.attribute.productSelect, "product_stock", productSelect.product_stock);
+					self.$set(self, "attrValue", "");
+					self.$set(self, "attrTxt", self.$t(`请选择`));
+				}
+			},
+			selecAttr: function() {
+				this.attribute.cartAttr = true
+			},
+			onMyEvent: function() {
+				this.$set(this.attribute, 'cartAttr', false);
+				this.$set(this, 'isOpen', false);
+			},
+			/**
+			 * 购物车数量加和数量减
+			 * 
+			 */
+			ChangeCartNum: function(changeValue) {
+				//changeValue:是否 加|减
+				//获取当前变动属性
+				let productSelect = this.productValue[this.attrValue];
+				if (this.cart_num) {
+					productSelect.cart_num = this.cart_num;
+					this.attribute.productSelect.cart_num = this.cart_num;
+				}
+				//如果没有属性,赋值给商品默认库存
+				if (productSelect === undefined && !this.attribute.productAttr.length)
+					productSelect = this.attribute.productSelect;
+				//无属性值即库存为0；不存在加减；
+				if (productSelect === undefined) return;
+				let stock = productSelect.stock || 0;
+				let quotaShow = productSelect.quota_show || 0;
+				let quota = productSelect.quota || 0;
+				let productStock = productSelect.product_stock || 0;
+				let num = this.attribute.productSelect;
+				let nums = this.storeInfo.num || 0;
+				//设置默认数据
+				if (productSelect.cart_num == undefined) productSelect.cart_num = 1;
+				if (changeValue) {
+					if (num.cart_num < this.attribute.productSelect.quota) {
+						num.cart_num++;
+						this.$set(this.attribute.productSelect, "cart_num", num.cart_num);
+						this.$set(this, "cart_num", num.cart_num);
+						this.$set(this.attribute.productSelect, "cart_num", num.cart_num);
+					}
+
+				} else {
+					if (num.cart_num == 1) return
+					num.cart_num--;
+					this.$set(this, "cart_num", num.cart_num);
+					this.$set(this.attribute.productSelect, "cart_num", num.cart_num);
+				}
+			},
+			attrVal(val) {
+				this.attribute.productAttr[val.indexw].index = this.attribute.productAttr[val.indexw].attr_values[val
+					.indexn];
+			},
+			/**
+			 * 属性变动赋值
+			 * 
+			 */
+			ChangeAttr: function(res) {
+				this.$set(this, 'cart_num', 1);
+				let productSelect = this.productValue[res];
+				this.$set(this, "selectSku", productSelect);
+				if (productSelect) {
+					this.$set(this.attribute.productSelect, "image", productSelect.image);
+					this.$set(this.attribute.productSelect, "price", productSelect.price);
+					this.$set(this.attribute.productSelect, "stock", productSelect.stock);
+					this.$set(this.attribute.productSelect, "unique", productSelect.unique);
+					this.$set(this.attribute.productSelect, "cart_num", 1);
+					this.$set(this.attribute.productSelect, "quota", productSelect.quota);
+					this.$set(this.attribute.productSelect, "quota_show", productSelect.quota_show);
+					this.$set(this, "attrValue", res);
+
+					this.attrTxt = this.$t(`已选择`)
+				} else {
+					this.$set(this.attribute.productSelect, "image", this.storeInfo.image);
+					this.$set(this.attribute.productSelect, "price", this.storeInfo.price);
+					this.$set(this.attribute.productSelect, "stock", 0);
+					this.$set(this.attribute.productSelect, "unique", "");
+					this.$set(this.attribute.productSelect, "cart_num", 0);
+					this.$set(this.attribute.productSelect, "quota", 0);
+					this.$set(this.attribute.productSelect, "quota_show", 0);
+					this.$set(this, "attrValue", "");
+					this.attrTxt = this.$t(`已选择`)
+
+				}
+			},
+			scroll: function(e) {
+				var that = this,
+					scrollY = e.detail.scrollTop;
+				var opacity = scrollY / 200;
+				opacity = opacity > 1 ? 1 : opacity;
+				that.opacity = opacity
+				this.currentPage = false
+				that.scrollY = scrollY
+				if (that.lock) {
+					that.lock = false
+					return;
+				}
+				for (var i = 0; i < that.topArr.length; i++) {
+					if (scrollY < that.topArr[i] - (app.globalData.navHeight / 2) + that.heightArr[i]) {
+						that.navActive = i
+						break
+					}
+				}
+			},
+			tap: function(item, index) {
+				var id = item.id;
+				var index = index;
+				var that = this;
+				// if (!this.data.good_list.length && id == "past2") {
+				//   id = "past3"
+				// }
+				this.toView = id;
+				this.navActive = index;
+				this.lock = true;
+				this.scrollTop = index > 0 ? that.topArr[index] - (app.globalData.navHeight / 2) : that.topArr[index]
+			},
+			//点击sku图片打开轮播图
+			showImg(index) {
+				this.$refs.cusPreviewImg.open(this.selectSku.suk);
+			},
+			/**
+			 * 分享打开
+			 *
+			 */
+			listenerActionSheet() {
+				this.currentPage = false
+				if (this.isLogin === false) {
+					toLogin();
+				} else {
+					if (this.posterImage) {
+						this.posters = true;
+						return
+					}
+					// #ifdef H5
+					if (this.$wechat.isWeixin() === true) {
+						this.weixinStatus = true;
+					}
+					// #endif
+					// #ifndef APP-PLUS
+					this.downloadFilePromotionCode();
+					// #endif
+					// #ifdef APP-PLUS
+					if (this.PromotionCode.indexOf("http") == 0) {
+						// this.downloadFilePromotionCode();
+
+					}
+					// #endif
+
+					this.posters = true;
+				}
+			},
+			//滑动轮播图选择商品
+			changeSwitch(e) {
+				let productSelect = this.skuArr[e];
+				this.$set(this, "selectSku", productSelect);
+				var skuList = productSelect.suk.split(",");
+				this.$set(this.attribute.productAttr[0], "index", skuList[0]);
+				if (skuList.length == 2) {
+					this.$set(this.attribute.productAttr[0], "index", skuList[0]);
+					this.$set(this.attribute.productAttr[1], "index", skuList[1]);
+				} else if (skuList.length == 3) {
+					this.$set(this.attribute.productAttr[0], "index", skuList[0]);
+					this.$set(this.attribute.productAttr[1], "index", skuList[1]);
+					this.$set(this.attribute.productAttr[2], "index", skuList[2]);
+				} else if (skuList.length == 4) {
+					this.$set(this.attribute.productAttr[0], "index", skuList[0]);
+					this.$set(this.attribute.productAttr[1], "index", skuList[1]);
+					this.$set(this.attribute.productAttr[2], "index", skuList[2]);
+					this.$set(this.attribute.productAttr[3], "index", skuList[3]);
+				}
+				if (productSelect) {
+					this.$set(this.attribute.productSelect, "image", productSelect.image);
+					this.$set(this.attribute.productSelect, "price", productSelect.price);
+					this.$set(this.attribute.productSelect, "stock", productSelect.stock);
+					this.$set(this.attribute.productSelect, "unique", productSelect.unique);
+					this.$set(this.attribute.productSelect, "vipPrice", productSelect.vipPrice);
+					this.$set(this, "attrTxt", this.$t(`已选择`));
+					this.$set(this, "attrValue", productSelect.suk);
+				}
+			},
+			/*
+			 *  下订单
+			 */
+			goCat: function() {
+				var that = this;
+				this.currentPage = false
+				var productSelect = this.productValue[this.attrValue];
+				//打开属性
+				if (this.isOpen)
+					this.attribute.cartAttr = true
+				else
+					this.attribute.cartAttr = !this.attribute.cartAttr
+				//只有关闭属性弹窗时进行加入购物车
+				if (this.attribute.cartAttr === true && this.isOpen == false) return this.isOpen = true
+				//如果有属性,没有选择,提示用户选择
+				if (this.attribute.productAttr.length && productSelect === undefined && this.isOpen == true) return app
+					.$util.Tips({
+						title: this.$t(`请选择属性`)
+					});
+				if (this.cart_num <= 0) {
+					return app.$util.Tips({
+						title: this.$t(`请选择数量`)
+					});
+				}
+				this.isOpen = false
+				uni.navigateTo({
+					url: `/pages/points_mall/integral_order?unique=${productSelect.unique}&num=${this.cart_num || 1}`
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.generate-posters {
+		width: 100%;
+		height: 170rpx;
+		background-color: #fff;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		z-index: 300;
+		transform: translate3d(0, 100%, 0);
+		transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
+		border-top: 1rpx solid #eee;
+	}
+
+	.generate-posters.on {
+		transform: translate3d(0, 0, 0);
+	}
+
+	.generate-posters .item {
+		flex: 1;
+		text-align: center;
+		font-size: 30rpx;
+	}
+
+	.generate-posters .item .iconfont {
+		font-size: 80rpx;
+		color: #5eae72;
+	}
+
+	.generate-posters .item .iconfont.icon-haibao {
+		color: #5391f1;
+	}
+
+	.navbar .header {
+		width: 400rpx;
+		height: 96rpx;
+		font-size: 30rpx;
+		color: #050505;
+		background-color: #fff;
+		/* #ifdef MP */
+		padding-right: 95rpx;
+		/* #endif */
+	}
+
+	.icon-xiangzuo {
+		/* #ifdef H5 */
+		top: 30rpx !important;
+		/* #endif */
+	}
+
+	.navbar .header .item {
+		position: relative;
+		margin: 0 25rpx;
+	}
+
+	.navbar {
+		position: fixed;
+		background-color: #fff;
+		top: 0;
+		left: 0;
+		z-index: 99;
+		width: 100%;
+	}
+
+	.navbar .navbarH {
+		position: relative;
+	}
+
+	.navbar .navbarH .navbarCon {
+		position: absolute;
+		bottom: 0;
+		height: 100rpx;
+		width: 100%;
+	}
+
+	.icon-xiangzuo {
+		/* color: #000;
+		position: fixed;
+		font-size: 40rpx;
+		width: 100rpx;
+		height: 56rpx;
+		line-height: 54rpx;
+		z-index: 1000;
+		left: 33rpx; */
+	}
+
+	.product-con .nav {
+		width: 100%;
+		height: 100rpx;
+		padding: 0 30rpx;
+		box-sizing: border-box;
+		background-color: #fff;
+	}
+
+	.product-con .nav .money {
+		font-size: 28rpx;
+		color: #e93323;
+		font-weight: bold;
+
+		image {
+			width: 34rpx;
+			height: 34rpx;
+		}
+	}
+
+	.product-con .nav .money .num {
+		font-size: 48rpx;
+		padding-left: 16rpx;
+	}
+
+	.product-con .nav .money .y-money {
+		font-size: 26rpx;
+		margin-left: 10rpx;
+		text-decoration: line-through;
+	}
+
+	.product-con .nav .timeItem {
+		font-size: 20rpx;
+		color: #fff;
+		text-align: center;
+	}
+
+	.product-con .nav .timeItem .timeCon {
+		margin-top: 10rpx;
+	}
+
+	.product-con .nav .timeItem .timeCon .num {
+		padding: 0 7rpx;
+		font-size: 22rpx;
+		color: #ff3d3d;
+		background-color: #fff;
+		border-radius: 2rpx;
+	}
+
+	.product-con .nav .timeState {
+		font-size: 28rpx;
+		color: #fff;
+	}
+
+	.product-con .nav .iconfont {
+		color: #fff;
+		font-size: 30rpx;
+		margin-left: 20rpx;
+	}
+
+	.product-con .wrapper {
+		padding: 0 32rpx 32rpx 32rpx;
+		width: 100%;
+		box-sizing: border-box;
+	}
+
+	.product-con .wrapper .introduce {
+		margin: 0;
+	}
+
+	.limit_good {
+		font-size: 16rpx;
+		margin: 10rpx 0rpx;
+		color: red;
+	}
+
+	.product-con .wrapper .introduce .infor {
+		// width: 570rpx;
+	}
+
+	.product-con .wrapper .introduce .iconfont {
+		font-size: 37rpx;
+		color: #515151;
+	}
+
+	.product-con .wrapper .label {
+		display: flex;
+		justify-content: space-between;
+		margin: 18rpx 0 0 0;
+		font-size: 24rpx;
+		color: #82848f;
+	}
+
+	.product-con .wrapper .label .stock {}
+
+	.product-con .footer {
+		padding: 0 20rpx 0 30rpx;
+		position: fixed;
+		bottom: 0;
+		width: 100%;
+		box-sizing: border-box;
+		background-color: #fff;
+		z-index: 277;
+		border-top: 1rpx solid #f0f0f0;
+		height: 100rpx;
+		display: flex;
+		align-items: center;
+		flex-wrap: nowrap;
+		height: calc(100rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
+		height: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
+	}
+
+	.product-con .footer .item {
+		width: 100rpx;
+		font-size: 18rpx;
+		color: #666;
+	}
+
+	.product-con .footer .item .iconfont {
+		text-align: center;
+		font-size: 40rpx;
+	}
+
+	.product-con .footer .item .iconfont.icon-shoucang1 {
+		color: var(--view-theme);
+	}
+
+	.product-con .footer .item .iconfont.icon-gouwuche1 {
+		font-size: 40rpx;
+		position: relative;
+	}
+
+	.product-con .footer .item .iconfont.icon-gouwuche1 .num {
+		color: #fff;
+		position: absolute;
+		font-size: 18rpx;
+		padding: 2rpx 8rpx 3rpx;
+		border-radius: 200rpx;
+		top: -10rpx;
+		right: -10rpx;
+	}
+
+	.product-con .footer .bnt {
+		width: 100%;
+		height: 76rpx;
+	}
+
+	.product-con .footer .bnt .bnts {
+		width: 100%;
+		text-align: center;
+		line-height: 76rpx;
+		color: #fff;
+		font-size: 28rpx;
+	}
+
+	.product-con .footer .bnt .joinCart {
+		border-radius: 50rpx 0 0 50rpx;
+		background-image: linear-gradient(to right, #fea10f 0%, #fa8013 100%);
+	}
+
+	.product-con .footer .bnt .buy {
+		border-radius: 50rpx;
+		// background-image: linear-gradient(to right, #fa6514 0%, #e93323 100%);
+		background-color: var(--view-theme);
+	}
+
+	.product-con .footer .bnt .no-goods {
+		border-radius: 50rpx;
+		background-color: #cccccc;
+	}
+
+	.product-con .conter {
+		display: block;
+	}
+
+	.product-con .conter img {
+		display: block;
+	}
+
+	.bg-color-hui {
+		background: #bbbbbb !important;
+	}
+
+	.canvas {
+		width: 750px;
+		height: 1190px;
+	}
+
+	.poster-pop {
+		width: 450rpx;
+		height: 714rpx;
+		position: fixed;
+		left: 50%;
+		transform: translateX(-50%);
+		z-index: 300;
+		top: 50%;
+		margin-top: -377rpx;
+	}
+
+	.poster-pop image {
+		width: 100%;
+		height: 100%;
+		display: block;
+	}
+
+	.poster-pop .close {
+		width: 46rpx;
+		height: 75rpx;
+		position: fixed;
+		right: 0;
+		top: -73rpx;
+		display: block;
+	}
+
+	.poster-pop .save-poster {
+		background-color: #df2d0a;
+		font-size: ：22rpx;
+		color: #fff;
+		text-align: center;
+		height: 76rpx;
+		line-height: 76rpx;
+		width: 100%;
+	}
+
+	.poster-pop .keep {
+		color: #fff;
+		text-align: center;
+		font-size: 25rpx;
+		margin-top: 10rpx;
+	}
+
+	/deep/.mask {
+		z-index: 99 !important;
+	}
+
+	.mask1 {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background-color: #000;
+		opacity: 0.5;
+		z-index: 288;
+	}
+
+	.home-nav {
+		/* #ifdef H5 */
+		top: 20rpx !important;
+		/* #endif */
+	}
+
+	.home-nav {
+		color: #333;
+		position: fixed;
+		/* #ifdef MP */
+		width: 126rpx;
+		left: 15rpx;
+		/* #endif */
+		/* #ifndef MP */
+		width: 56rpx;
+		left: 33rpx;
+		/* #endif */
+		height: 56rpx;
+		font-size: 33rpx;
+		z-index: 99;
+		background: rgba(255, 255, 255, 0.3);
+		border: 1px solid rgba(0, 0, 0, 0.1);
+		border-radius: 40rpx;
+
+		&.right {
+			right: 33rpx;
+			left: unset
+		}
+
+		&.on {
+			background: unset;
+			color: #333;
+		}
+
+		&.homeIndex {
+			/* #ifdef MP */
+			width: 98rpx;
+			/* #endif */
+			/* #ifndef MP */
+			border-color: rgba(255, 255, 255, 0);
+			/* #endif */
+		}
+	}
+
+	.home-nav .iconfont {
+		width: 58rpx;
+		text-align: center;
+	}
+
+	.home-nav .line {
+		width: 1rpx;
+		height: 34rpx;
+		background: #B3B3B3;
+	}
+
+	.home-nav .icon-xiangzuo {
+		width: auto;
+		font-size: 28rpx;
+	}
+
+	.share-box {
+		z-index: 1000;
+		position: fixed;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 100%;
+	}
+
+	.share-box image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.df {
+		display: flex;
+		align-items: center;
+		flex-wrap: nowrap;
+		width: 100%;
+	}
+
+	.attrImg {
+		width: 66rpx;
+		height: 66rpx;
+		border-radius: 6rpx;
+		display: block;
+		margin-right: 14rpx;
+	}
+
+	.switchTxt {
+		height: 60rpx;
+		flex: 1;
+		line-height: 60rpx;
+		box-sizing: border-box;
+		background: #eeeeee;
+		padding: 0 10rpx;
+		border-radius: 8rpx;
+		text-align: center;
+	}
+
+	.attribute {
+		padding: 10rpx 30rpx;
+
+		.line1 {
+			width: 600rpx;
+		}
+	}
+
+	.flex {
+		display: flex;
+		justify-content: space-between;
+		width: 100%;
+	}
+
+	.flexs {
+		display: flex;
+	}
+
+	.attr-txt {
+		display: flex;
+		flex-wrap: nowrap;
+		width: 130rpx;
+	}
 </style>

From dba9ce48aab9d7681c18e33425254bf3cf0ce86a Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Mon, 20 Feb 2023 11:42:25 +0800
Subject: [PATCH 09/11] =?UTF-8?q?fix:=20app=E7=99=BB=E5=BD=95=E5=85=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/uni-app/pages/user/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/uni-app/pages/user/index.vue b/template/uni-app/pages/user/index.vue
index 57c2effb7..0eaa34a76 100644
--- a/template/uni-app/pages/user/index.vue
+++ b/template/uni-app/pages/user/index.vue
@@ -52,7 +52,7 @@
 								<!-- #endif -->
 							</view>
 							<view class="info">
-								<!-- #ifdef MP -->
+								<!-- #ifdef MP || APP-PLUS -->
 								<view class="name" v-if="!userInfo.uid" @click="openAuto"
 									style="height: 100%; display: flex; align-items: center;">
 									{{$t('请点击授权')}}

From 9ba5b5332f5fd9a123794857141b842163fafe71 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Mon, 20 Feb 2023 12:22:13 +0800
Subject: [PATCH 10/11] =?UTF-8?q?fix:=20=E8=B4=AD=E7=89=A9=E8=BD=A6?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/uni-app/pages/order_addcart/order_addcart.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/template/uni-app/pages/order_addcart/order_addcart.vue b/template/uni-app/pages/order_addcart/order_addcart.vue
index 046e54633..bcbd84a81 100644
--- a/template/uni-app/pages/order_addcart/order_addcart.vue
+++ b/template/uni-app/pages/order_addcart/order_addcart.vue
@@ -706,18 +706,19 @@
 			addCart: function(index) {
 				let that = this;
 				let item = that.cartList.valid[index];
-				item.cart_num = Number(item.cart_num) + 1;
+				let lastnum = Number(item.cart_num) + 1
 				let productInfo = item.productInfo;
-				if (productInfo.hasOwnProperty('attrInfo') && item.cart_num >= item.productInfo.attrInfo.stock) {
-					item.cart_num = item.productInfo.attrInfo.stock;
+				if (productInfo.hasOwnProperty('attrInfo') && lastnum >= item.productInfo.attrInfo.stock) {
+					lastnum = item.productInfo.attrInfo.stock;
 					item.numAdd = true;
 					item.numSub = false;
 				} else {
 					item.numAdd = false;
 					item.numSub = false;
 				}
-				that.setCartNum(item.id, item.cart_num, function(data) {
+				that.setCartNum(item.id, lastnum, (data) => {
 					that.cartList.valid[index] = item;
+					item.cart_num = Number(item.cart_num) + 1;
 					that.getCartNum();
 					that.switchSelect();
 				});

From dca65c5610db69e8a3ec9440ec01c1f79d66cb73 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Mon, 20 Feb 2023 12:22:29 +0800
Subject: [PATCH 11/11] =?UTF-8?q?style:=20diy=E4=BC=98=E6=83=A0=E5=88=B8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/admin/src/components/mobilePageDiy/home_product.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/template/admin/src/components/mobilePageDiy/home_product.vue b/template/admin/src/components/mobilePageDiy/home_product.vue
index 4f08b641a..0d4ab04ae 100644
--- a/template/admin/src/components/mobilePageDiy/home_product.vue
+++ b/template/admin/src/components/mobilePageDiy/home_product.vue
@@ -53,7 +53,7 @@
                 class="label"
                 :style="'border:1px solid ' + labelColor + ';color:' + labelColor"
                 :class="priceShow ? '' : 'on'"
-                v-if="couponShow && item.checkCoupon"
+                v-if="couponShow"
               >
                 券
               </div>
@@ -408,6 +408,7 @@ export default {
                         text-align center
                         line-height 18px
                         font-size 11px
+                        border-radius 3px
                         &.on
                            margin-left 0;
 </style>