Merge branch 'master' of http://git.huaml.com/zhh/front-end

mobile-code/src/admin/goodsManage/category.vue

@@ -52,6 +52,7 @@
 							<app-uploader :multiple="false" ref="appUploader" :imgList.sync="modifyForm.img" />
 						</div>
 					</div>
+					<div class="prompt-text">建议尺寸 500X500</div>
 					<div class="inp-list-line">
 						<div class="line-label">排序</div>
 						<div class="line-input">
@@ -338,6 +339,13 @@ export default {
 	}
 	// 编辑弹窗
 	.modify-modal {
+		.prompt-text {
+			color: red;
+			position: relative;
+			right: 52px;
+			bottom: 24px;
+			// margin-bottom: 10px;
+		}
 		.line-label {
 			width: 140px;
 			flex-shrink: 0;