Merge branch 'master' of http://git.jihengcc.cn/liubaiyan/qjd-user-uniapp

pages/index/index.vue

@@ -312,6 +312,9 @@
 				}
 
 				.discount-name {
+					white-space: nowrap;
+					text-overflow: ellipsis;
+					overflow: hidden;
 					height: 12px;
 					margin: 7px 6px 10px 6px;
 					font-size: 12px;

pages/index/login.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="container">
-		<image class="authorize-bg" src="../../static/images/loginBg.png"></image>
+		<image class="authorize-bg" src="../../static/images/loginBg.jpg"></image>
 		<image class="logo" src="../../static/images/loginLogo.png"></image>
 		<view class="authorize-box">
 			<!-- <button class="authorize-button" open-type="getUserInfo" @click="appLoginWx()">

pagesGood/goodDetails.vue

@@ -172,6 +172,7 @@
 			if (this.goodId) {
 				NET.request(API.getCommonGoodDetail + '/' + this.goodId, {}, 'GET').then(res => {
 					this.goodData = res.data
+					if(this.goodData.sellDesc) this.goodData.sellDesc = this.goodData.sellDesc.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
 					if (this.goodData.productType == 2) {
 						this.getAuctionData()
 					}