12/29

public/js/config.js

@@ -1,4 +1,4 @@
 window.global_config = {
-  BASE_URL: 'http://221.224.53.27:20038/',
-  // BASE_URL: 'http://172.16.0.28:8085/',
+  // BASE_URL: 'http://221.224.53.27:20038/',
+  BASE_URL: 'http://172.16.0.28:8085/',
 }

src/pages/brand/index.vue

@@ -77,7 +77,7 @@
           this.searchForm.pageSize = pageRequest.pageSize;
         }
         list(this.searchForm).then(res => {
-          this.searchForm.total = res.data.total
+          this.searchForm.total = res.data.totalCount
           this.tableLoadData = res.data.list
         })
       },

src/pages/goods/addGoods/index.vue

@@ -228,14 +228,15 @@
                         outProductId: this.outProductId
                     }).then(res => {
                         this.form.title = res.data.title
-                        this.form.third_cat_audit = res.data.third_cat_audit
+                        this.form.third_cat_audit = res.data.third_cat_audit==0?-1:1
                         this.form.out_product_id = res.data.out_product_id
-                        this.form.has_brand = res.data.has_brand
+                        this.form.has_brand = res.data.has_brand==0?-1:1
                         this.form.stock_num = res.data.stock_num
                         this.form.sale_price = res.data.sale_price
                         this.form.market_price = res.data.market_price
                         this.form.path = res.data.path
-                        this.form.third_cat_id = res.data.third_cat_id
+                        this.form.third=res.data.third_cat_audit==0?res.data.third_cat_id:''
+                        this.form.third_cat_id =res.data.third_cat_id
                         this.commodity_id = res.data.commodity_id
                         this.goodsList = [{
                             url: res.data.thumb_img

src/pages/goods/index.vue

@@ -115,7 +115,7 @@
           this.searchForm.sortOrder = pageRequest.order
         }
         list(this.searchForm).then(res => {
-          this.searchForm.total = res.data.total
+          this.searchForm.total = res.data.totalCount
           this.tableLoadData = res.data.list
         })
         this.getCount()

src/pages/qualification/index.vue

@@ -83,7 +83,7 @@
           this.searchForm.pageSize = pageRequest.pageSize;
         }
         list(this.searchForm).then(res => {
-          this.searchForm.total = res.data.total
+          this.searchForm.total = res.data.totalCount
           this.tableLoadData = res.data.list
         })
       },