wangning 5 лет назад
Родитель
Сommit
2a2bcfe8b8

+ 1 - 1
ghs/src/components/module/item-list-layer.vue

@@ -273,7 +273,7 @@ export default {
         })
         .set('dict', {
           search: {
-            keyWord: 'name'
+            keyWord: 'search'
           }
         })
         .set('search', {

+ 18 - 2
ghs/src/views/item/list.vue

@@ -168,7 +168,15 @@ export default {
       this.app = app
 
       let getItem = () => {
-        return this.$service.product.list({ classId: this.classId, page: 1, pageSize: 20 , showPage: 0})
+        return this.$service.product.list({ classId: this.classId, showPage: 1}).then(res => {
+          return {
+            ...res,
+            pagination: {
+              totalPage: res.totalPage,
+              total: parseInt(res.totalNum)
+            }
+			    };
+		    });
       }
       ctx.service({
         page: getItem
@@ -261,7 +269,15 @@ export default {
         .set('dict', {
           search: {
             keyWord: 'goodsName'
-          }
+          },
+          // 分页参数
+          pagination: {
+            page: 'page', // 页数
+            size: 'pageSize' // 每页显示的条目
+          },
+          size: 20,
+          page: 1,
+          total: 0
         })
         .set('search', {
           key: {

+ 1 - 0
hd/src/cool/components/upload/index.vue

@@ -224,6 +224,7 @@ export default {
 				host().then(subRes => {
 					console.log('subRes', subRes);
 					this.onSuccess(subRes);
+          this.$emit('onFile', subRes)
 				});
 			});
 		},

+ 1 - 1
hd/src/utils/util.js

@@ -24,7 +24,7 @@ const getShortUrl = url => {
 	if (isEmpty(url)) return '';
 	let startIndex = url.indexOf('/uploads');
 	let endIndex = url.indexOf('_small');
-	let urlArr = url.split('.');
+  let urlArr = url.split('.');
 	return url.substring(startIndex, endIndex) + '.' + urlArr[urlArr.length - 1];
 };
 

+ 10 - 3
hd/src/views/goods/category.vue

@@ -73,7 +73,7 @@
 					</el-form-item>
 					<el-form-item label="分类图片" prop="img">
 						{{ adForm.img }}
-						<cl-upload v-model="adForm.img"></cl-upload>
+						<cl-upload  v-model="adForm.img" @onFile="uploadSuccess"></cl-upload>
 					</el-form-item>
 					<el-form-item label="是否启用" prop="status">
 						<el-switch
@@ -131,7 +131,8 @@ export default {
 		addOrModifyFn() {
 			let form = {};
 			form = JSON.parse(JSON.stringify(this.adForm));
-			form.img = this.$util.getShortUrl(form.img);
+      console.log(form.img)
+			// form.img = this.$util.getShortUrl(form.img);
 			let host = null;
 			if (this.addOrModify == 1) {
 				host = () => {
@@ -284,7 +285,13 @@ export default {
 				.catch(err => {
 					this.$message.error(err);
 				});
-		}
+		},
+    uploadSuccess(val) {
+      this.adForm.img = val.smallUrl
+      // http://img.huaml.com/uploads/12360/202104/26/349e474e82c6637d3267a0b3c96bdfd4.jpeg
+      // http://img.huaml.com/uploads/12360/202104/26/349e474e82c6637d3267a0b3c96bdfd4.jpeg
+      // http://img.huaml.com/http://img.huaml.com/uploads/12360/202104/26/349e474e82c6637d3267a0b3c96bdfd4.jpeg
+    }
 	}
 };
 </script>