Merge branch 'master' of http://121.37.12.51:13000/huoran/FE_CRM

pages/info/info.vue

@@ -1,14 +1,14 @@
 <template>
 	<view>
 		<view class="search-wrap">
-			<image class="bg" src="@/static/image/info-bg.jpg"></image>
+			<image class="bg" src="@/static/image/info.png"></image>
 			<view class="info">
-				<view class="text">行业资讯与活动</view>
+				<!-- <view class="text">行业资讯与活动</view>
-				<view class="text">速览</view>
+				<view class="text">速览</view> -->
 				<uni-search-bar class="search" radius="30" placeholder="请输入文章名称，标签" v-model="keyword" clearButton="auto" cancelButton="none" bgColor="#fff" />
 			</view>
 		</view>
-		
+	
 		<view class="type">
 			<view v-for="(item, i) in classifications.slice(0, 4)" :key="i" :class="['item', {active: active == item.id}]" @click="classificationClick(item, 1)">{{ item.classificationName }}</view>
 			<image class="unfold" src="@/static/image/unfold.png" mode="widthFix" @click="typeVisible = true"></image>
@@ -191,6 +191,7 @@
 	}
 	.info {
 		position: relative;
+		margin-top: 160rpx;
 	}
 	.text {
 		margin: 0 10px 10rpx;

pages/person/person.vue

@@ -41,14 +41,15 @@
 				</view> -->
 				<view v-if="auth('我的:市场服务费')" class="item">
 					<view class="left">
-						<image class="icon" src="@/static/image/person6.png" mode=""></image>
+						<image class="icon" src="@/static/image/person26.png" mode=""></image>
 						<text class="name">市场服务费：</text>
 					</view>
 					<text class="val">{{ my.teamInfo.annualMarketingFee ? '项目抽成' + my.teamInfo.annualMarketingFee + '%' :'-' }}</text>
 				</view>
 				<view v-if="auth('我的:团队年费')" class="item">
 					<view class="left">
-						<image class="icon" src="@/static/image/person7.png" mode=""></image>
+						<image class="icon" src="@/static/image/person27.png" mode=""></image>
+						
 						<text class="name">团队年费：</text>
 					</view>
 					<text class="val">{{ my.teamInfo.annualTeamFee ? '固定年费' + my.teamInfo.annualTeamFee + 'w' : '-' }}</text>

team/article/article.vue

@@ -65,9 +65,9 @@
 					const newStyle = 'width: 85% !important; height: auto;';
 					const regex = /(<img[^>]*?\s+style=")([^"]*)("[^>]*?>)/g;
 					const newStr = str.replace(regex, `$1${newStyle}$3`);
-					// const brStr = str.replace(/\r\n/g,"<br />")
+					const videoStr = this.replaceAllVideoTagStyles(str, "width: 95%; height: 450rpx;display: block;margin:0 auto")
-					const videoStr = this.replaceAllVideoTagStyles(newStr, "width: 95%; height: 450rpx;display: block;margin:0 auto")
+					// const imgStr = videoStr.replace(regex, `$1${newStyle}$3`);
-					const imgStr = videoStr.replace(regex, `$1${newStyle}$3`);
+					const imgStr = this.addImgStyle(videoStr)
 					message.mainBody = imgStr
 					this.form = message
 					uni.hideLoading()
@@ -103,6 +103,17 @@
 			  }
 			  return newStr;
 			},
+			addImgStyle(str) {
+		      return str.replace(/<(img).*?(\/>|<\/img>)/g, function (a) {
+		        if (a.indexOf('style') < 0) {
+		          // 字符串中没有style
+		          return a.replace(/<\s*img/, '< img style="width:100%"');
+		        } else {
+		          // 字符串中有style
+		          return a.replace(/style=("|')/, 'style=$1width: 85% !important; height: auto;')
+		        }
+		      });
+		    },
 			// 下载附件
 			download(item) {
 				this.$util.to(`../send/send?url=${item.filePath}&copyWriting=${item.fileName}`)
@@ -188,6 +199,9 @@
 	img,image{
 		width: 100% !important;
 	}
+	/deep/ image,img {
+		margin: 0 auto;
+	}
 }
 .files {
 	margin-top: 20rpx;