1

.env.development

@@ -3,12 +3,12 @@ ENV = 'development'
 # http://192.168.1.43:8324/admin
 # http://mer.crmeb.net/admin
 # base api
-# VUE_APP_BASE_API = 'http://192.168.1.9:8080'
-VUE_APP_BASE_API = 'https://api.tropjoin.com/'
+VUE_APP_BASE_API = 'http://192.168.1.3:8080'
+# VUE_APP_BASE_API = 'https://api.tropjoin.com/'
 
 # socket 连接地址
-# VUE_APP_WS_URL = 'ws://http://192.168.1.9:8080'
-VUE_APP_WS_URL = 'ws://https://api.tropjoin.com/'
+VUE_APP_WS_URL = 'ws://http://192.168.1.3:8080'
+# VUE_APP_WS_URL = 'ws://https://api.tropjoin.com/'
 
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.

src/views/order/list/orderDetails.vue

@@ -111,7 +111,7 @@
                   </li>
                   <li v-if="orderDetailList.amount_price>0" class="item">
                     <div>抵扣券抵扣：</div>
-                    <div v-if="orderDetailList.amount_price && orderDetailList.amount_price != 0" class="value">使用了{{ orderDetailList.amount_price }}个积分，抵扣了{{ orderDetailList.amount_price }}元</div>
+                    <div v-if="orderDetailList.amount_price && orderDetailList.amount_price != 0" class="value">使用了{{ orderDetailList.amount_price }}个抵扣券，抵扣了{{ orderDetailList.amount_price }}元</div>
                   </li>
                   <li class="item">
                     <div>订单总价：</div>

src/views/promoter/order/index.vue

@@ -499,7 +499,7 @@ export default {
         if (lebData.export.length) {
           data = data.concat(lebData.export)
           excelData.page++
-        }  
+        }
       }
       createWorkBook(lebData.header, lebData.title, data, lebData.foot,lebData.filename);
       return