x

src/page/order/index.vue

@@ -104,7 +104,7 @@
                           </div>
                           <div class="order_info_body_info_item">
                             <span class="order_info_body_info_item_title">发票</span>
-                            <span class="order_info_body_info_item_content fix-order_info_body_info_item_content">{{scope.row.items[0].receive.invoice||'不需要发票'}}</span>
+                            <span class="order_info_body_info_item_content fix-order_info_body_info_item_content">{{scope.row.items[0].receive.invoice ? '需要发票' : '不需要发票'}}</span>
                           </div>
                           <div class="order_info_body_info_item" v-if="scope.row.paymentStatus != 'unpaid'">
                             <span class="order_info_body_info_item_title">快递类别</span>
@@ -264,9 +264,16 @@ export default {
       let orderItemIds = items.map(item => item.id).join(',')
       let expressNum = item.receive.expressNum
       var pattern = /^[\u4E00-\u9FA5]{1,5}$/
+      console.log(item.receive.expressNum)
 
-      if (pattern.test(expressNum)) {
-        this.$alert('快递单号不能为中文', '提示', {
+      if (!expressNum) {
+        return this.$alert('请输入快递单号', '提示', {
+          confirmButtonText: '确定',
+          callback: action => {
+          }
+        });
+      } else if (pattern.test(expressNum)) {
+        return this.$alert('快递单号不能为中文', '提示', {
           confirmButtonText: '确定',
           callback: action => {
 

src/util/http.js

@@ -2,10 +2,10 @@ import axios from 'axios'
 
 // 配置请求域名
 // axios.defaults.baseURL = 'https://pro.4dkankan.com/api'
-axios.defaults.baseURL = 'https://test.4dkankan.com/api'
+// axios.defaults.baseURL = 'https://test.4dkankan.com/api'
 // axios.defaults.baseURL = '/apid'
-// axios.defaults.baseURL = '/api'
-// axios.defaults.baseURL = 'http://192.168.0.10:8080/api'
+axios.defaults.baseURL = '/api'
+// axios.defaults.baseURL = 'http://192.168.0.207:8066/api'
 
 axios.interceptors.request.use(function (config) {
   config.headers['Content-Type'] = 'application/json;charset=UTF-8'