新接口优化01

src/views/platformlogin.vue

@@ -13,10 +13,11 @@
       gotosso() {
         var ticket = this.$route.query.ticket;
         this.$store.dispatch('Login', {"ticket": ticket}).then((res) => {
+
           if (res.token != "") {
             // 获取客户是否有审核信息
             getShopInf().then(res => {
-              if(res.code === 1) {
+              //if(res.code === 1) {
                 switch(res.data.state) {
                   case 0:
                     switch(res.data.status){
@@ -45,21 +46,25 @@
                     });
                     break;
                 }
-              }else {
-                if(res && res.msg) {
-                  Notification.error({
-                    title: '提示：',
-                    message: res.msg
-                  })
-                }else {
-                  Notification.error({
-                    title: '提示：',
-                    message: '刷新浏览器后，再次登录，若仍不行，请联系我们！'
-                  })
-                }
-              }
-            });
+              //}
 
+              // else {
+              //   if(res && res.msg) {
+              //     Notification.error({
+              //       title: '提示：',
+              //       message: res.msg
+              //     })
+              //   }else {
+              //     Notification.error({
+              //       title: '提示：',
+              //       message: '刷新浏览器后，再次登录，若仍不行，请联系我们！'
+              //     })
+              //   }
+              // }
+
+
+
+            });
           } else {
             this.$store.dispatch('Statistic')
             this.$store.dispatch('FedLogOut')
@@ -73,8 +78,7 @@
             }, 1000)
           }
           this.loading = false
-        })
-          .catch(() => {
+        }).catch(() => {
             this.$store.dispatch('FedLogOut')
             var ssa = window.location.host
             setTimeout(function () {

src/views/system/asset/balance/index.vue

@@ -34,7 +34,7 @@
       return {
         fullHeight: 0,
         tableHeight: 0,
-        loading: true, // 遮罩层
+        loading: false, // 遮罩层
         ids: [], // 选中数组
         total: 0, // 总条数
         assetList: [], // 商户余额变动日志表格数据
@@ -93,12 +93,9 @@
       },
       /** 查询商户余额变动日志列表 */
       getList() {
-        this.loading = true;
-        //console.log("重点注意shopid", this.queryParams)
-        listAsset(this.queryParams).then(response => {
-          this.assetList = response.data.list;
-          this.total = response.data.total;
-          this.loading = false;
+        listAsset(this.queryParams).then(res => {
+          this.assetList = res.data.list;
+          this.total = res.data.total;
         });
       },
       // 取消按钮

src/views/system/asset/bankcard/index.vue

@@ -152,7 +152,7 @@
         //银行
         bankList: [],
         // 遮罩层
-        loading: true,
+        loading: false,
         // 选中数组
         ids: [],
         // 非单个禁用
@@ -216,8 +216,10 @@
     methods: {
       //获取银行名称列表
       getBankNameList() {
-        listBankname().then(response => {
-          this.bankList = response.data
+        listBankname().then(res => {
+          if(res.data) {
+            this.bankList = res.data
+          }
         });
       },
       //类型改变
@@ -245,17 +247,15 @@
       },
       /** 查询商户银行卡列表 */
       getList() {
-        this.loading = true;
         listBankcard(this.queryParams).then(response => {
-          this.bankcardList = response.data.list;
-          //console.log(this.bankcardList)
-          this.total = response.data.total;
+          this.bankcardList = response.data.data;
+          //this.total = response.data.count;
+          this.total = 1;
           if (this.total >= 3) {
             this.isAddbank = true;
           }else {
             this.isAddbank = false;
           }
-          this.loading = false;
         });
       },
       // 取消按钮

src/views/system/asset/verifyrecord/index.vue

@@ -65,8 +65,8 @@
       <pagination
         v-show="total>0"
         :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
+        :page.sync="queryParams.page"
+        :limit.sync="queryParams.limit"
         @pagination="getList"
       />
       <!-- 添加或修改商户账单对话框 -->
@@ -122,7 +122,7 @@
         isBlance: true,
         billId: 0,
         // 遮罩层
-        loading: true,
+        loading: false,
         // 选中数组
         ids: [],
         // 非单个禁用
@@ -142,8 +142,8 @@
         sellerId: 0,
         // 查询参数
         queryParams: {
-          pageNum: 1,
-          pageSize: 10,
+          page: 1,
+          limit: 10,
           shopId: 0,
           money: null,
           org_money: null,
@@ -209,11 +209,9 @@
       },
       /** 查询商户账单列表 */
       getList() {
-        this.loading = true;
         listVerifyrecord(this.queryParams).then(response => {
           this.verifyrecordList = response.data.list;
           this.total = response.data.total;
-          this.loading = false;
         });
       },
       // 取消按钮
@@ -244,7 +242,7 @@
       },
       /** 搜索按钮操作 */
       handleQuery() {
-        this.queryParams.pageNum = 1;
+        this.queryParams.page = 1;
         this.getList();
       },
       /** 重置按钮操作 */

src/views/system/asset/withdrawlog/index.vue

@@ -23,8 +23,8 @@
       <pagination
         v-show="total>0"
         :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
+        :page.sync="queryParams.page"
+        :limit.sync="queryParams.limit"
         @pagination="getList"
       />
     </el-card>
@@ -48,7 +48,7 @@
         fullHeight: 0,
         tableHeight: 0,
         // 遮罩层
-        loading: true,
+        loading: false,
         // 选中数组
         ids: [],
         // 非单个禁用
@@ -67,8 +67,8 @@
         open: false,
         // 查询参数
         queryParams: {
-          pageNum: 1,
-          pageSize: 10,
+          page: 1,
+          limit: 10,
           sellerId: 0,
         },
         // 表单参数
@@ -128,18 +128,14 @@
       },
       /** 查询商户提现列表 */
       getList() {
-        this.loading = true;
         this.queryParams.sellerId = this.sellerId;
-        //console.log(127, this.queryParams);
         listWithdrawlog(this.queryParams).then(response => {
-
           if (response) {
-            this.withdrawlogList = response.data.list;
-            this.total = response.data.total;
+            this.withdrawlogList = response.data.data;
+            this.total = response.data.count;
           } else {
             this.$message({message: '数据出错啦！', type: 'error'});
           }
-          this.loading = false;
         });
       },
       // 取消按钮

src/views/system/freight/freight_list/index.vue

@@ -85,7 +85,7 @@
         fullHeight: 0,
         tableHeight: 0,
         // 遮罩层
-        loading: true,
+        loading: false,
         // 选中数组
         ids: [],
         // 非单个禁用
@@ -192,11 +192,11 @@
       },
       /** 查询freight列表 */
       getList() {
-        this.loading = true;
-        listFreight(this.queryParams).then(response => {
-          this.freightList = response.data.data.list;
-          this.total = response.data.data.count;
-          this.loading = false;
+        listFreight(this.queryParams).then(res => {
+          if(res.data) {
+            this.freightList = res.data.list;
+            this.total = res.data.count;
+          }
         });
       },
       // 取消按钮
@@ -317,13 +317,14 @@
         }).then(async()=> {
           this.loading = true;
           let delResult = await delFreight(ids);
-          this.loading = false;
           if(delResult.code === 1) {
             this.$message({type: 'success',message: delResult.msg});
+            this.getList();
           }
           if(delResult.code === 0) {
             this.$message({type: 'error',message: delResult.msg});
           }
+          this.loading = false;
         }).catch(()=> {});
       },
     } //methods结束

src/views/system/freight/freight_list/indexbtn.vue

@@ -271,9 +271,10 @@ export default {
         item.fp= Number(item.fp*100).toFixed();
         item.np = Number(item.np*100).toFixed();
       })
-      //console.log(275,this.goodsDate);
-      addFreight(this.goodsDate).then(response => {
-        if(response.data.code === 1) {
+      this.loading = true
+      addFreight(this.goodsDate).then(res => {
+        //console.log(275,res);
+        if(res.code === 1) {
           this.$emit("closeIndexbtn",false);
           if(this.goodsDate.Id === 0) {
             this.$message({ message: '新增成功', type: 'success'});

src/views/system/retreat/address.vue

@@ -175,12 +175,10 @@
     methods: {
       // 获取列表
       getList() {
-        this.loading = true;
         getAddressList(this.queryParams).then(res => {
-          if(res.code === 1 && res.data.data) {
+          if(res.data.data) {
             this.addressList = res.data.data;
             this.total = res.data.count;
-            this.loading = false;
           }
         });
       },
@@ -261,26 +259,26 @@
 
       // 修改
       handleUpdate(row) {
-        this.isOpen = true;
         this.areaList = [];
         const roleIds = row.id || this.ids;
-        //this.loading = true;
+        this.loading = true;
         getAddressDetails(roleIds).then(res => {
-          if(res && res.data) {
+          if(res.data) {
+            this.isOpen = true;
             // 处理 三级联动回显
-            let areaListAry = res.data.address_ids.split(",");
+            let areaListAry = res.data.address_ids ? res.data.address_ids.split(",") : [];
             for(let i = 0; i < areaListAry.length; i++) {
               this.areaList.push(Number(areaListAry[i]));
             }
             this.addressForm = res.data;
           }
+          this.loading = false;
         });
       },
       cancel() {
         this.areaList = [];
         this.resetForm('addressForm');
         this.isOpen = false;
-
       },
       save(form) {
         if(typeof this.addressForm.address_ids === "string") {

src/views/system/retreat/retreat/index.vue

@@ -86,8 +86,8 @@
       <pagination
         v-show="total>0"
         :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
+        :page.sync="queryParams.page"
+        :limit.sync="queryParams.limit"
         @pagination="getList"
       />
       <!-- 售后申请信息对话框 -->
@@ -337,9 +337,10 @@
 
   export default {
     name: "retreat",
-
     data() {
       return {
+        // 遮罩层
+        loading: false,
         fullHeight: 0,
         tableHeight: 0,
         //退货地址
@@ -404,8 +405,6 @@
         reject: false,
         //退货地址
         reback: false,
-        // 遮罩层
-        loading: true,
         // 选中数组
         ids: [],
         // 非单个禁用
@@ -424,11 +423,11 @@
         open: false,
         // 查询参数
         queryParams: {
-          pageNum: 1,
-          pageSize: 10,
+          page: 1,
+          limit: 10,
           applyTime: [],
-          beginTime: 0,
-          endTime: 0,
+          beginTime: '',
+          endTime: '',
           goodsId: null,
           goodsName: null,
           userNeed: null,
@@ -487,8 +486,8 @@
         // select组件，clear的时候，将addTimeInterval的值，初始化为null，判断当其值为null时，赋值为数组
         if(!this.queryParams.applyTime && typeof(this.queryParams.applyTime) !== "undefined") {
           this.queryParams.applyTime = [];
-          this.queryParams.beginTime = 0;
-          this.queryParams.endTime = 0;
+          this.queryParams.beginTime = '';
+          this.queryParams.endTime = '';
         }
       }
     },
@@ -612,13 +611,10 @@
 
       /** 查询售后申请信息列表 */
       getList() {
-        this.loading = true;
         listRetreat(this.queryParams).then(response => {
           //console.log(response.data)
           this.retreatList = response.data.list;
           this.total = response.data.total;
-
-          this.loading = false;
         });
       },
       // 取消按钮
@@ -641,14 +637,14 @@
           this.queryParams.beginTime = new Date(this.queryParams.applyTime[0]).getTime() / 1000;
           this.queryParams.endTime = new Date(this.queryParams.applyTime[1]).getTime() / 1000;
         }
-        this.queryParams.pageNum = 1;
+        this.queryParams.page = 1;
         this.getList();
       },
       /** 重置按钮操作 */
       resetQuery() {
         this.resetForm("queryForm");
-        this.queryParams.beginTime = 0;
-        this.queryParams.endTime = 0;
+        this.queryParams.beginTime = '';
+        this.queryParams.endTime = '';
         this.handleQuery();
       },
       //同意申请并发货