Merge branch 'gaoqucodecheck' of...

Merge branch 'gaoqucodecheck' of http://h.gemho.cn:7099/zhaojunbao/gaoquyingjih5-asd into gaoqucodecheck

# Conflicts:
#	src/_consumer_jydetail.html

src/_consumer_jydetail.html

@@ -38,14 +38,14 @@
           <div class="form-input-wrap">
             <!-- <input type="text" v-model="formData.content" class="form-input" :disabled="true"
 							> -->
-            <p class="form-content">{{formData.content}}是快乐的反抗拉萨酱豆腐卢卡斯的反抗拉萨附近；阿斯蒂芬库里Salford；拉是否</p>
+            <p class="form-content">{{formData.content}}</p>
           </div>
         </div>
         <div
           class="form-item"
           style="height: 1.5rem"
         >
-          <ImagePreview
+          <img
             v-for="(imgItem, subIndex) in formData.photos"
             :src="imgItem"
             alt=""

src/_shanghu_detail-edit.css

 	html,
 	body {
 		background-color: #fff;
+		overflow-x: hidden;
 	}
 
 	.wrapper {
@@ -33,7 +34,7 @@
 	}
 
 	.save-btn {
-		width: 98%;
+		width: 48%;
 		background: #1890ff;
 		color: #fff;
 		border: none;
@@ -174,7 +175,7 @@
 				}
 				
 				.selector{
-					width: 5.5rem;
+					width: 5rem;
 					height: 0.6rem;
 					font-size: 0.3rem;
 					border: 1px solid #D7D7D7;