Merge branch 'dev' into 'test'

Dev

See merge request quanshu/mp-ui-pc!127

src/views/business/banner/components/BannerCreate.vue

@@ -30,7 +30,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="排序">
+        <el-form-item label="排序" prop="sort">
           <el-input
             v-model.number="form.sort"
             style="width: 300px"
@@ -112,6 +112,7 @@ export default {
       form: {
         picUrl: [],
         type: 'link',
+        sort: 0
       },
       bannerLocationList: [],
       goodsTagItemsList: [],
@@ -122,6 +123,14 @@ export default {
         location: [
           { required: true, message: "请选择位置", trigger: "change" },
         ],
+        sort: [
+          { required: true, message: "请输入排序", trigger: "blur" },
+          {
+            pattern: /^([0-9]\d*)$/,
+            message: "请输入合法的数字",
+            trigger: ["blur", "change"],
+          },
+        ],
         picUrl: [
           {
             type: "array",

src/views/business/banner/index.vue

@@ -12,7 +12,10 @@
           v-model="queryParams.location"
           placeholder="请选择位置"
           clearable
-          @change="queryParams.pageNum = 1;getList()"
+          @change="
+            queryParams.pageNum = 1;
+            getList();
+          "
         >
           <el-option
             :label="item.dictLabel"
@@ -27,7 +30,7 @@
           type="primary"
           icon="el-icon-search"
           size="mini"
-          @click="handleQuery"
+          @click="getList()"
           >搜索</el-button
         >
         <el-button icon="el-icon-refresh" size="mini" @click="getList(true)"
@@ -36,7 +39,7 @@
       </el-form-item>
     </el-form>
     <el-row :gutter="10" class="mb8">
-       <el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button
           type="primary"
           icon="el-icon-plus"
@@ -64,7 +67,7 @@
       <el-table-column label="banner图片">
         <div slot-scope="{ row }">
           <el-image
-            style="width: 200px; height: 100px"
+            style="width: 250px; height: 100px"
             :src="row.picUrl"
             :preview-src-list="[row.picUrl]"
           />
@@ -76,18 +79,19 @@
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center">
-        <template>
+        <template slot-scope="{ row }">
           <div>
             <el-button
-              v-hasPermi="['order:deliver:query']"
+              v-hasPermi="['business:banner:edit']"
               type="text"
               disabled
               >编辑</el-button
             >
             <el-button
-              v-hasPermi="['order:deliver:ship']"
+              v-hasPermi="['business:banner:remove']"
               type="text"
-              disabled
+              class="del"
+              @click="del(row)"
               >删除</el-button
             >
           </div>
@@ -110,11 +114,11 @@
 <script>
 import { publicFileGetUrl } from "@/api/common";
 import { goodsBannerList, goodsBannerRemove } from "@/api/business/banner";
-import BannerCreate from './components/BannerCreate'
+import BannerCreate from "./components/BannerCreate";
 export default {
   name: "ListBanner",
   components: {
-    BannerCreate
+    BannerCreate,
   },
   data() {
     return {
@@ -129,7 +133,7 @@ export default {
       total: 0,
       list: [],
       bannerLocationList: [],
-      createShow: false
+      createShow: false,
     };
   },
   created() {
@@ -167,10 +171,26 @@ export default {
           this.loading = false;
         });
     },
-    handleQuery() {},
-    handleAdd(){
-      this.createShow = true
+
+    del(item) {
+      this.$confirm(`确认删除banner “${item.name}” 吗？`, "删除banner", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        goodsBannerRemove({ bannerId: item.bannerId }).then((res) => {
+          if (res.code === 0) {
+            this.$message.success("操作已完成！");
+            this.getList();
+          }
+        });
+      });
+    },
+
+    handleAdd() {
+      this.createShow = true;
     },
+
     // 关闭发货弹框
     close() {
       this.createShow = false;