Merge branch 'sxx' into landong

# Conflicts:
#	pages/shop/Evaluations/EvaluationDetail/index.vue

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

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;

pages/shop/Evaluations/EvaluationDetail/index.vue

@@ -16,7 +16,12 @@
 		<view class="synopsis-box acea-row" v-if="info.synopsis">
 			<view class="left-circle"></view>
 			<view class="info">
+
 				<!-- <text>甄选评测介绍</text> -->{{' ' + info.synopsis}}
+
+				{{' ' + info.synopsis}}
+				<!-- <text>甄选评测介绍</text>{{' ' + info.synopsis}} -->
+
 			</view>
 			<image src="../../../../static/images/evaluation-icon.png" mode=""></image>
 		</view>