From 66b7af52d974800b27de9ebe58dab95afa0a02ac Mon Sep 17 00:00:00 2001
From: whyneedname <542399163@qq.com>
Date: Fri, 28 Oct 2022 14:14:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF=E7=94=9F?=
 =?UTF-8?q?=E6=97=A5=E5=AE=8C=E5=96=84=E9=97=AE=E9=A2=98;=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=84=E5=88=97=E8=A1=A8=E6=A0=87=E9=A2=98=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?;=E7=A7=AF=E5=88=86=E8=B7=B3=E8=BD=AC=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4;=E6=99=AE=E9=80=9A=E3=80=81=E7=A7=AF?=
 =?UTF-8?q?=E5=88=86=E3=80=81=E7=A7=92=E6=9D=80=E3=80=81=E6=8B=BC=E5=9B=A2?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=E5=AF=8C=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/css/style.css                    | 2 ++
 assets/css/style.less                   | 2 ++
 pages/activity/GroupDetails/index.vue   | 2 +-
 pages/activity/SeckillDetails/index.vue | 2 +-
 pages/shop/Evaluations/index.vue        | 4 ++--
 pages/shop/GoodsCon/index.vue           | 5 ++---
 pages/shop/IntegralGoodsCon/index.vue   | 4 ++--
 pages/user/PersonalData/index.vue       | 3 ++-
 pages/user/User/index.vue               | 3 ++-
 pages/user/signIn/Sign/index.vue        | 3 ++-
 10 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/assets/css/style.css b/assets/css/style.css
index 34e9a40..9144277 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -1591,6 +1591,8 @@ page {
 }
 .product-con .product-intro .conter {
   width: 100%;
+  background-color: #FFFFFF;
+  padding: 0rpx 30rpx;
 }
 .product-con .product-intro .conter * {
   width: 100% !important;
diff --git a/assets/css/style.less b/assets/css/style.less
index 4a7f3ee..5db6b33 100644
--- a/assets/css/style.less
+++ b/assets/css/style.less
@@ -3126,6 +3126,8 @@ page {
 
 .product-con .product-intro .conter {
   width: 100%;
+  background-color: #FFFFFF;
+  padding: 0rpx 30rpx;
 }
 
 .product-con .product-intro .conter * {
diff --git a/pages/activity/GroupDetails/index.vue b/pages/activity/GroupDetails/index.vue
index e425271..81d12aa 100644
--- a/pages/activity/GroupDetails/index.vue
+++ b/pages/activity/GroupDetails/index.vue
@@ -193,7 +193,7 @@
     </view>
 
     <!-- 操作栏 -->
-    <view :style="addBottom?'height: 162rpx;':'height: 122rpx;'"></view>
+    <view :style="(addBottom?'height: 162rpx;':'height: 122rpx;')+'background: #FFFFFF;'"></view>
 
     <!--底部操作栏-->
     <view class="tui-operation acea-row" :style="addBottom?'height: 162rpx;':'height: 122rpx;'">
diff --git a/pages/activity/SeckillDetails/index.vue b/pages/activity/SeckillDetails/index.vue
index 3f10652..68058f3 100644
--- a/pages/activity/SeckillDetails/index.vue
+++ b/pages/activity/SeckillDetails/index.vue
@@ -122,7 +122,7 @@
     </view>
 
     <!-- 操作栏 -->
-    <view :style="addBottom?'height: 162rpx;':'height: 122rpx;'"></view>
+    <view :style="(addBottom?'height: 162rpx;':'height: 122rpx;')+'background: #FFFFFF;'"></view>
 
     <!--底部操作栏-->
     <view class="tui-operation acea-row row-between" :style="addBottom?'height: 162rpx;':'height: 122rpx;'">
diff --git a/pages/shop/Evaluations/index.vue b/pages/shop/Evaluations/index.vue
index e8223a4..081e0da 100644
--- a/pages/shop/Evaluations/index.vue
+++ b/pages/shop/Evaluations/index.vue
@@ -14,8 +14,8 @@
 		</view>
 		
 		<view class="title-box">
-			<view class="en-title">EXPERT EVALUATION</view>
-			<view class="title">权威评测</view>
+			<view class="en-title">SELECTION EVALUATION</view>
+			<view class="title">甄选评测</view>
 		</view>
 		
 		<view class="list-box">
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index 95f09ad..9b414b4 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -414,7 +414,7 @@
 				showEntry: false,
 				tagStyle: {
 					a: 'color:#2DB5AE;text-decoration:underline;',
-					p: 'text-indent:2em;',
+					// p: 'text-indent:2em;',
 					// span: 'padding: 0rpx 30rpx;text-indent:2em;text-align: justify;text-justify: auto;'
 					// span: 'padding: 0rpx 30rpx;display: inline-block;',
 					img: 'padding:0;margin:0;font-size:0;display:block;'
@@ -573,8 +573,7 @@
 					.then(res => {
 						res.data.storeInfo.description = res.data.storeInfo.description.replace(/\<img/gi,
 							'<img style="max-width:100%;height:auto;"')
-						res.data.storeInfo.description = res.data.storeInfo.description.replace(/&nbsp;/gi,
-							' ')
+						// res.data.storeInfo.description = res.data.storeInfo.description.replace(/&nbsp;/gi,'')
 						that.brandInfo = res.data.brandInfo;
 						that.$set(that, 'storeInfo', res.data.storeInfo)
 						// 给 attr 赋值，将请求回来的规格赋值给 attr
diff --git a/pages/shop/IntegralGoodsCon/index.vue b/pages/shop/IntegralGoodsCon/index.vue
index 8d720cf..b4a7085 100644
--- a/pages/shop/IntegralGoodsCon/index.vue
+++ b/pages/shop/IntegralGoodsCon/index.vue
@@ -183,7 +183,7 @@ export default {
       isIntegral: true,
 			tagStyle: {
 				a: 'color:#2DB5AE;text-decoration:underline;',
-				p: 'text-indent:2em;',
+				// p: 'text-indent:2em;',
 				// span: 'padding: 0rpx 32rpx !important;display: inline-block;',
 				img: 'padding:0;margin:0;font-size:0;display:block;'
 			},
@@ -312,7 +312,7 @@ export default {
       getProductDetail(that.id, from)
         .then(res => {
           res.data.storeInfo.description = res.data.storeInfo.description.replace(/\<img/gi, '<img style="max-width:100%;height:auto;"');
-					res.data.storeInfo.description = res.data.storeInfo.description.replace(/&nbsp;/gi, ' ');
+					// res.data.storeInfo.description = res.data.storeInfo.description.replace(/&nbsp;/gi, ' ');
           that.$set(that, 'storeInfo', res.data.storeInfo)
           // 给 attr 赋值，将请求回来的规格赋值给 attr
           that.$set(that.attr, 'productAttr', res.data.productAttr)
diff --git a/pages/user/PersonalData/index.vue b/pages/user/PersonalData/index.vue
index 1685fed..cab9879 100644
--- a/pages/user/PersonalData/index.vue
+++ b/pages/user/PersonalData/index.vue
@@ -42,7 +42,7 @@
 			<view class="item acea-row row-between-wrapper">
 				<view>生日</view>
 				<view class="input">
-					<picker mode="date" :value="birth" @change="bindDateChange()">
+					<picker mode="date" :value="birth" @change="bindDateChange">
 						<view v-if="!birth" class="empty">点击完善生日</view>
 						<view v-else>
 			  		{{birth}}
@@ -200,6 +200,7 @@
 				});
 			},
 			bindDateChange(e) {
+				console.log(e)
 				this.birth = e.detail.value;
 			},
 			// 绑定微信用户手机号
diff --git a/pages/user/User/index.vue b/pages/user/User/index.vue
index 94627b1..bf59558 100644
--- a/pages/user/User/index.vue
+++ b/pages/user/User/index.vue
@@ -349,7 +349,8 @@ export default {
       this.$yrouter.push('/pages/user/coupon/UserCoupon/index')
     },
     goIntegral() {
-      this.$yrouter.push('/pages/user/signIn/Integral/index')
+      this.$yrouter.push('/pages/user/signIn/Sign/index');
+      // this.$yrouter.push('/pages/user/signIn/Integral/index')
     },
     // goUserPromotion() {
     //   this.$yrouter.push('/pages/user/promotion/UserPromotion/index')
diff --git a/pages/user/signIn/Sign/index.vue b/pages/user/signIn/Sign/index.vue
index 220b5c6..babc4b2 100644
--- a/pages/user/signIn/Sign/index.vue
+++ b/pages/user/signIn/Sign/index.vue
@@ -443,7 +443,8 @@
 		},
 		methods: {
 			goSignRecord() {
-				this.$yrouter.push("/pages/user/signIn/SignRecord/index");
+				this.$yrouter.push('/pages/user/signIn/Integral/index');
+				// this.$yrouter.push("/pages/user/signIn/SignRecord/index");
 			},
 			getGoodsList() {
 				getProductsIntegral(this.from).then(res => {