YY 2 years ago
parent
commit
ff8e8cfa5d

+ 2 - 0
.env

@@ -1,2 +1,4 @@
 VUE_APP_AXIOS_BASE_URL = ''
 VUE_APP_ROUTER="pointAdmin"
+VUE_APP_HOST="https://broadcast.waityou24.cn"
+

+ 1 - 1
src/components/usual/c-upload.vue

@@ -73,7 +73,7 @@ export default {
       response = _.omit(response, ['errcode', 'errmsg']);
       let list = _.cloneDeep(this.list);
       if (_.isArray(list)) {
-        list.push({ ...response, name: file.name });
+        list.push({ ...response, name: file.name, url: `${process.env.VUE_APP_HOST}/${response.uri}` });
       } else {
         list = [{ ...response, name: file.name }];
       }

+ 6 - 7
src/views/system/banner/detail.vue

@@ -35,18 +35,18 @@ export default {
     return {
       form: {},
       rules: {
-        name: [{ required: false, message: '请输入名称', trigger: 'blur' }],
-        type: [{ required: false, message: '请选择类型', trigger: 'change' }],
+        name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+        type: [{ required: true, message: '请选择类型', trigger: 'change' }],
         to: [{ required: false, message: '请输入跳转至', trigger: 'blur' }],
-        is_use: [{ required: false, message: '请选择是否正在使用', trigger: 'change' }],
-        url: [{ required: false, message: '请选择路径', trigger: 'change' }],
+        is_use: [{ required: true, message: '请选择是否正在使用', trigger: 'change' }],
+        url: [{ required: true, message: '请选择图片', trigger: 'change' }],
       },
       fields: [
         { label: '名称', model: 'name' },
         { label: '类型', model: 'type', type: 'select' },
         { label: '跳转至', model: 'to' },
         { label: '是否正在使用', model: 'status', type: 'select' },
-        { label: '路径', model: 'url', type: 'upload', url: '/files/point/goods/upload' },
+        { label: '图片', model: 'url', type: 'upload', url: '/files/point/goods/upload' },
       ],
       typeList: [],
       statusList: [],
@@ -71,12 +71,11 @@ export default {
       }
     },
     // 提交
-    async onSubmit(data) {
+    async onSubmit({ data }) {
       let res;
       if (data.id) res = await this.update(data);
       else res = await this.create(data);
       if (this.$checkRes(res)) {
-        console.log(res);
         this.$message({ type: `success`, message: `维护信息成功` });
         this.toBack();
       }

+ 14 - 9
src/views/system/banner/index.vue

@@ -49,18 +49,26 @@ export default {
         { label: '删除', method: 'del', confirm: true, type: 'danger' },
       ],
       fields: [
-        { label: '名称', prop: 'name' },
+        { label: '名称', model: 'name' },
         {
           label: '类型',
-          prop: 'type',
+          model: 'type',
           format: (i) => {
-            let data = that.typeList.find((f) => f.dict_value == i);
-            if (data) return data.dict_label;
+            let data = that.typeList.find((f) => f.value == i);
+            if (data) return data.label;
+            else return '暂无';
+          },
+        },
+        { label: '跳转到', model: 'to' },
+        {
+          label: '是否正在使用',
+          model: 'status',
+          format: (i) => {
+            let data = that.statusList.find((f) => f.value == i);
+            if (data) return data.label;
             else return '暂无';
           },
         },
-        { label: '路径', prop: 'url' },
-        { label: '是否正在使用', prop: 'status' },
       ],
       list: [],
       total: 0,
@@ -86,7 +94,6 @@ export default {
       const condition = _.cloneDeep(this.searchForm);
       let res = await this.query({ skip, limit, ...condition, ...info });
       if (this.$checkRes(res)) {
-        console.log(res.data);
         this.$set(this, 'list', res.data);
         this.$set(this, 'total', res.total);
       }
@@ -121,12 +128,10 @@ export default {
       res = await this.dictQuery({ code: 'banner_type' });
       if (this.$checkRes(res)) {
         this.$set(this, `typeList`, res.data);
-        console.log(res.data);
       }
       res = await this.dictQuery({ code: 'status' });
       if (this.$checkRes(res)) {
         this.$set(this, `statusList`, res.data);
-        console.log(res.data);
       }
     },
   },

+ 1 - 1
src/views/system/banner/parts/search-1.vue

@@ -11,7 +11,7 @@
           <el-col :span="6">
             <el-form-item label="类型" prop="type">
               <el-select v-model="form.type" clearable filterable placeholder="请选择" style="width: 100%" size="small">
-                <el-option v-for="item in typeList" :key="item.dict_label" :label="item.dict_label" :value="item.dict_value"></el-option>
+                <el-option v-for="item in typeList" :key="item.label" :label="item.label" :value="item.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>