Merge remote-tracking branch 'origin/test' into test

application/app/view/index/share_detail.html

@@ -197,11 +197,5 @@
 <script src="/app/js/common.js" charset="utf-8"></script>
 <script src="/app/js/detaila_tl.js"></script>
 <script src="/app/js/Tab_min.js" charset="utf-8"></script>
-<script type="text/javascript">
-
-
-
-
-</script>
 </body>
 </html>

application/app/view/index/share_register.html

@@ -26,9 +26,7 @@
             <a class="send1" onclick="sends.send();">获取验证码</a>
         </li>
         <li>
-            <span class="register-span">
-                密码
-            </span>
+            <span class="register-span">注册密码</span>
             <input type="password" id="password" class="infos" placeholder="6-20位数字或字母">
         </li>
         <div class="register-div">

public/app/css/details_tl.css

@@ -283,9 +283,10 @@
 	width: 100%;
 }
 .slide img{
-	width: 3.3rem;
+	width: 7.5rem;
+	height: 4rem;
 	float: left;
-	margin-left: 0.2rem;
+	object-fit: contain;
 }
 
 

public/app/js/customer_gj.js

@@ -226,7 +226,12 @@ require(['vue', 'vconsole', 'css!style/customerinfo_sub_page.css', 'css!style/cu
 					layerTipsX('目前最多只能上传一张');
 					return false;
 				}else{
-					_fd.append('image', e.target.files[0]);
+					if(e.target.files[0].size > 1000000){
+						layerTipsX('图片过大，请重新选择');
+						return false;
+					}else{
+						_fd.append('image', e.target.files[0]);
+					};
 				};
 				$.ajax({
 					url: ServerHostTempC + "/chat/uploadImg",