11

src/components/tradePavilion/VehicleManagement.vue

@@ -232,6 +232,7 @@
         checkedCities: [],
         cities: [],
         cityOptions: [],
+        loading:false,
         isIndeterminate: false,
         downLoadLoading: false, //导出Loading
         download_timer: null, //下载文件timer
@@ -267,7 +268,6 @@
           this.msg.EndOpenTime = "";
         }
         this.apipost("/api/Trade/GetCarrierPageList", this.msg, (res) => {
-          this.loading = false;
           if (res.data.resultCode == 1) {
             this.total = res.data.data.count;
             let pageData = res.data.data.pageData;
@@ -277,6 +277,7 @@
               x.LogoList.push(x.Logo);
             });
           }
+          this.loading = false;
         });
       },
       handleCheckAllChange(val) {
@@ -368,11 +369,11 @@
           });
         });
       },
-
       //删除
       delManage(obj) {
         let that = this;
-        that.Confirm("是否删除?", function () {
+        let tipStr="是否删除【"+obj.CarrierName+"】?"
+        that.Confirm(tipStr, function () {
           that.apipost(
             "/api/Trade/RemoveCarrier", {
               CarrierId: obj.ID,

src/components/tradePavilion/brandClassification.vue

@@ -97,7 +97,7 @@
           </el-input>
         </el-form-item>
         <!--class="is-required" prop="Logo"-->
-        <el-form-item label="Logo" >
+        <el-form-item label="Logo">
           <el-button @click="isShowImage = true" size="small">选择文件</el-button>
           <div style="position: relative; width: 100px; margin-top: 10px; border: none">
             <img v-if="!addMsg.Logo || addMsg.Logo == ''" src="../../assets/img/default.png"
@@ -240,7 +240,8 @@
       },
       delNews(item) {
         let that = this;
-        that.Confirm("删除一级分类会对应删除相应的二级分类,是否继续?", function () {
+        let tipStr = "删除【" + item.ClassName + "】分类,会删除相对应的二级分类,是否继续?";
+        that.Confirm(tipStr, function () {
           that.apipost(
             "/api/Trade/RemoveBrandClass", {
               Id: item.ID,
@@ -280,7 +281,8 @@
       },
       delChildNews(item) {
         let that = this;
-        that.Confirm("是否删除?", function () {
+        let tipStr = "是否删除【" + item.ClassName + "】分类?";
+        that.Confirm(tipStr, function () {
           that.apipost(
             "/api/Trade/RemoveBrandClass", {
               Id: item.ID,
@@ -341,7 +343,6 @@
 </script>
 
 <style>
- 
   .brandClassification .cat-container {
     display: flex;
     gap: 16px;

src/components/tradePavilion/brandManagement.vue

@@ -115,11 +115,11 @@
             <!-- <el-option label="否" :value="0"></el-option> -->
           </el-select>
         </div>
-
       </div>
     </div>
     <div style="padding: 20px; background: #fff">
-      <el-table :data="dataList" header-cell-class-name="headClass" style="width: 100%"  height="540" border>
+      <el-table :data="dataList" v-loading="loading" header-cell-class-name="headClass" style="width: 100%" height="540"
+        border>
         <el-table-column prop="Id" label="ID" width="70">
           <template slot-scope="scope">
             <span @click="goRecruit(scope.row.ID)">{{ scope.row.ID }}</span>
@@ -164,7 +164,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="UserName" width="100" label="认证用户"></el-table-column>
-        <el-table-column prop="IsRecommend" width="110" label="推荐" >
+        <el-table-column prop="IsRecommend" width="110" label="推荐">
           <template slot-scope="scope">
             <el-switch v-model="scope.row.IsRecommend" :active-value="1" :inactive-value="0"
               @change="changeRecommend(scope.row, $event)">
@@ -295,7 +295,6 @@
       if (this.$route.query && this.$route.query.PrizeId) {
         this.msg.PrizeId = this.$route.query.PrizeId;
       }
-
       this.getList();
     },
     methods: {
@@ -419,6 +418,7 @@
           checkedCount > 0 && checkedCount < this.cities.length;
       },
       getList() {
+        this.loading = true;
         this.apipost("/api/Trade/GetBrandPageList", this.msg, (res) => {
           if (res.data.resultCode == 1) {
             this.dataList = res.data.data.pageData;
@@ -430,6 +430,7 @@
           } else {
             this.Error(res.data.message);
           }
+          this.loading = false;
         });
       },
       getBrandClassTree() {
@@ -454,7 +455,8 @@
       //删除品牌
       delete_b(row) {
         let that = this;
-        that.Confirm("是否删除?", function () {
+        let tipStr = "是否删除【" + row.BrandName + "】?";
+        that.Confirm(tipStr, function () {
           that.apipost(
             "/api/Trade/RemoveBrand", {
               Id: row.ID,