From acafce7c6b7380ae7c30c49a534f8b830c60c6bf Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Fri, 27 Oct 2023 17:15:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=91=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/order/buyorder.vue          | 16 +++++---
 src/views/modules/order/buyorderdetail.vue    | 38 +++++++++----------
 .../shop/shopproduct-add-or-update.vue        |  6 +--
 static/config/index.js                        |  4 +-
 4 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/src/views/modules/order/buyorder.vue b/src/views/modules/order/buyorder.vue
index 6d59491..26f80f6 100644
--- a/src/views/modules/order/buyorder.vue
+++ b/src/views/modules/order/buyorder.vue
@@ -394,6 +394,7 @@
       title="修改收货信息"
       :visible.sync="changeAddVisible"
       width="500"
+      v-loading="addressLoad"
       :close="changeAddHandleClose">
       <div>
         <el-form ref="addressFormRef" :model="addressForm" label-width="120px" :rules="addressFormRule">
@@ -598,7 +599,8 @@ export default {
             { required: true, message: '请选择要修改的省市区', trigger: 'blur' } 
           ]      
       },
-      SheetSelectionList:[]
+      SheetSelectionList:[],
+      addressLoad:false,    // 省份加载动画
     }
   },
   components: {
@@ -699,7 +701,8 @@ export default {
       console.log('关闭了', this.addressForm)
     },
     changeAddressShow(val){  
-      console.log(val,'val')    
+      console.log(val,'val')   
+      this.addressLoad = true 
       this.$http({
         url: this.$http.adornUrl('/api/province/getProvince'),
         method: 'post',
@@ -726,10 +729,13 @@ export default {
         this.countyEntity = this.cityEntity.cityList.find((val,index,arr)=>{         
           return val.regionCode == this.addressForm.cityCode
         })
-          console.log(this.provinceEntity,addressForm,'this.provinceEntity')
+          console.log(this.provinceEntity,this.addressForm,'this.provinceEntity')
         }
-      }).catch( e => {
-        console.log(e,'e')
+        this.addressLoad = false
+      }).catch((err) => {
+        console.log(err,'e')
+        this.$message.error('初始化地址信息失败！')
+        this.addressLoad = false
       })
       
       this.changeAddVisible = true
diff --git a/src/views/modules/order/buyorderdetail.vue b/src/views/modules/order/buyorderdetail.vue
index 892e04a..5a5c53b 100644
--- a/src/views/modules/order/buyorderdetail.vue
+++ b/src/views/modules/order/buyorderdetail.vue
@@ -416,25 +416,25 @@ export default {
     },
    
     // 获取订单下的快递单
-    getOrderSheetList(){
-      this.$http({        
-        url: this.$http.adornUrl('/express/getPrintTemplateList'),
-        method: 'get',
-        params: this.$http.adornParams({          
-          'expressOrderSn': this.query.orderSn,          
-        })
-        /// data: {}
-      }).then(({ data }) => {
-        console.log(data.result,'面单列表')
-        if (data && data.code === 0) {
-          this.sheetList = data.result.data
-          // this.MDtotalPage = data.result.totalDataSize
-        } else {
-          // this.PrintSheetList = []
-          // this.totalPage = 0
-        }       
-      })
-    },    
+    // getOrderSheetList(){
+    //   this.$http({        
+    //     url: this.$http.adornUrl('/express/getPrintTemplateList'),
+    //     method: 'get',
+    //     params: this.$http.adornParams({          
+    //       'expressOrderSn': this.query.orderSn,          
+    //     })
+    //     /// data: {}
+    //   }).then(({ data }) => {
+    //     console.log(data.result,'面单列表')
+    //     if (data && data.code === 0) {
+    //       this.sheetList = data.result.data
+    //       // this.MDtotalPage = data.result.totalDataSize
+    //     } else {
+    //       // this.PrintSheetList = []
+    //       // this.totalPage = 0
+    //     }       
+    //   })
+    // },    
     // 获取数据列表
     getData() {
       this.dataListLoading = true   
diff --git a/src/views/modules/shop/shopproduct-add-or-update.vue b/src/views/modules/shop/shopproduct-add-or-update.vue
index e993735..27b15ff 100644
--- a/src/views/modules/shop/shopproduct-add-or-update.vue
+++ b/src/views/modules/shop/shopproduct-add-or-update.vue
@@ -130,8 +130,8 @@
       <div style="clear: both;">
         <el-form-item label="是否包邮" prop="isFreeMail">
           <el-radio-group v-model="dataForm.isFreeMail">
-            <el-radio :label="'0'">是</el-radio>
-            <el-radio :label="'1'">否</el-radio>
+            <el-radio :label="0">是</el-radio>
+            <el-radio :label="1">否</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="是否为新书上市" prop="isNew" label-width="200">
@@ -219,7 +219,7 @@
           weight: '',
           pubDate: '',
           // format: '', // 开本
-          isFreeMail: '1', // 是否包邮
+          isFreeMail: 1, // 是否包邮
           // pageNum: '',
           // quality: '', // 内文用纸
           isNew:0,
diff --git a/static/config/index.js b/static/config/index.js
index 1498d37..dc5c9f1 100644
--- a/static/config/index.js
+++ b/static/config/index.js
@@ -7,9 +7,9 @@
   // api接口请求地址
   // window.SITE_CONFIG['baseUrl'] = 'http://192.168.110.100:9200/pb';
   // window.SITE_CONFIG['baseUrl'] = 'http://59.110.212.44:9200/pb';
-  // window.SITE_CONFIG['baseUrl'] = 'https://testapi.nuttyreading.com';         // 线上测试环境
+  window.SITE_CONFIG['baseUrl'] = 'https://testapi.nuttyreading.com';         // 线上测试环境
   // window.SITE_CONFIG['baseUrl'] = 'https://api.nuttyreading.com';         // 线上正式环境
-  window.SITE_CONFIG['baseUrl'] = 'http://192.168.110.38:9200/pb';
+  // window.SITE_CONFIG['baseUrl'] = 'http://192.168.110.38:9200/pb';
   // window.SITE_CONFIG['baseUrl'] = 'http://59.110.212.44:9200/pb';
 
   // cdn地址 = 域名 + 版本号