Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev

template/admin/src/components/uploadPictures/index.vue

@@ -177,11 +177,6 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="大小" min-width="80">
-              <template slot-scope="scope">
-                <span>{{ scope.row.size }}</span>
-              </template>
-            </el-table-column>
             <el-table-column label="上传时间" min-width="100">
               <template slot-scope="scope">
                 <span>{{ scope.row.time }}</span>

template/uni-app/pages/goods/goods_list/index.vue

@@ -361,6 +361,7 @@
 	}
 
 	.productList .list .item .name {
+		line-height: 42rpx;
 		height: 84rpx;
 	}
 

template/uni-app/pages/goods_cate/goods_cate1.vue

@@ -191,7 +191,8 @@
 			tap: function(index, id) {
 				this.toView = id;
 				this.navActive = index;
-				this.$set(this, 'lock', true);
+				this.$set(this, 'lock', true);
+				uni.$emit('scroll');
 			},
 			getAllCategory: function(type) {
 				let that = this;