Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	ys_vue/src/views/mold/moldDetail.vue

ys_vue/src/views/Home.vue

@@ -299,6 +299,7 @@
 				// background: #f8f8f8;
                 //f1f2f7
 				flex:1;
+                width: 80%;
 				// position: absolute;
 				// right: 0px;
 				// top: 0px;