faiz
/
hy-shop-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
faiz 2024-06-11 15:50:25 +08:00
parent 150e4aaf6d
commit 34662e8c55
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.env.development
View File

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

2
src/views/order/list/orderDetails.vue
View File

@ -111,7 +111,7 @@
</li> </li>
<li v-if="orderDetailList.amount_price>0" class="item"> <li v-if="orderDetailList.amount_price>0" class="item">
<div>抵扣券抵扣：</div> <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>
<li class="item"> <li class="item">
<div>订单总价：</div> <div>订单总价：</div>

2
src/views/promoter/order/index.vue
View File

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