From a3686c83898ff39118b2f5500ff64b8cec9fb9d2 Mon Sep 17 00:00:00 2001
From: ld0104 <3037885725@qq.com>
Date: Mon, 31 Oct 2022 18:12:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=92=E6=9D=80=E6=96=87=E6=9C=AC=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/index.js                                   | 8 ++++----
 pages/activity/activity/index.vue                 | 8 +++++---
 pages/shop/Evaluations/EvaluationDetail/index.vue | 6 +++---
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/config/index.js b/config/index.js
index e2ada4c..c081c7e 100644
--- a/config/index.js
+++ b/config/index.js
@@ -1,8 +1,8 @@
 // export const VUE_APP_API_URL = 'http://192.168.10.129:48080/bxgApp'
-// export const VUE_APP_API_URL = 'http://192.168.10.113:48080/bxgApp'
-export const VUE_APP_API_URL = 'https://farm.lotus-wallet.com/bxgApp'
+export const VUE_APP_API_URL = 'http://192.168.10.113:48080/bxgApp'
+// export const VUE_APP_API_URL = 'https://farm.lotus-wallet.com/bxgApp'
 // export const VUE_APP_API_URL = 'https://xiaohui.shop.cyjyyjy.com/xiaohuiapp'
 export const VUE_APP_RESOURCES_URL = 'https://h5.yixiang.co/static'
-export const BXG_TENANT_ID = 129
-// export const BXG_TENANT_ID = 138
+// export const BXG_TENANT_ID = 129
+export const BXG_TENANT_ID = 138
 // export const BXG_TENANT_ID = 128
\ No newline at end of file
diff --git a/pages/activity/activity/index.vue b/pages/activity/activity/index.vue
index a137b63..99b0433 100644
--- a/pages/activity/activity/index.vue
+++ b/pages/activity/activity/index.vue
@@ -89,7 +89,7 @@
 		<!-- 提示弹窗 -->
 		<view class="mask" @touchmove.stop.prevent :hidden="active === false && isShowRule === false" @click="close">
 				<view class="bargainTip" style="padding-bottom: 0;" :class="isShowRule === true ? 'on' : ''">
-					<view class="rule-content">111111111111111111</view>
+					<view class="rule-content" v-html="timeList.rule"></view>
 				</view>
 		</view>
 	</view>
@@ -146,8 +146,7 @@
 		onLoad() {
 			getBanner(3).then(
 				res => {
-					console.log(res,777777777777777777);
-				// this.$set(this,'banner',res.data.banner)
+					this.$set(this,'banner',res.data.banner)
 				})
 		},
 		methods: {
@@ -224,6 +223,9 @@
 				});
 				getSeckillConfig().then(res => {
 					this.timeList = res.data.seckillTime;
+					this.timeList.forEach(res=>{
+						res.rule=res.rule.replace(/\<img/gi, '<img style="max-width:100%;height:auto;"')
+					})
 					this.seckillTimeIndex = res.data.seckillTimeIndex;
 					this.seckillActive = res.data.seckillTimeIndex;
 					this.datatime = this.timeList[this.seckillActive].stop;
diff --git a/pages/shop/Evaluations/EvaluationDetail/index.vue b/pages/shop/Evaluations/EvaluationDetail/index.vue
index 84e379a..1f13b20 100644
--- a/pages/shop/Evaluations/EvaluationDetail/index.vue
+++ b/pages/shop/Evaluations/EvaluationDetail/index.vue
@@ -16,12 +16,12 @@
 		<view class="synopsis-box acea-row" v-if="info.synopsis">
 			<view class="left-circle"></view>
 			<view class="info">
-<<<<<<< HEAD
+
 				<!-- <text>甄选评测介绍</text> -->{{' ' + info.synopsis}}
-=======
+
 				{{' ' + info.synopsis}}
 				<!-- <text>甄选评测介绍</text>{{' ' + info.synopsis}} -->
->>>>>>> sxx
+
 			</view>
 			<image src="../../../../static/images/evaluation-icon.png" mode=""></image>
 		</view>