czg_team/cashier_weapp
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: czg_team:gaohao
Branches Tags
czg_team:master czg_team:dev czg_team:test czg_team:gaohao czg_team:gaohao2.0.0 czg_team:wwz_x czg_team:gh1.0.0 czg_team:wwz_d czg_team:wwz
...
pull from: czg_team:test
Branches Tags
czg_team:dev czg_team:test czg_team:gaohao czg_team:gaohao2.0.0 czg_team:wwz_x czg_team:gh1.0.0 czg_team:wwz_d czg_team:wwz czg_team:master

1 Commits
gaohao ... test

Author SHA1 Message Date
GaoHao
8ba90c8963 会员价格显示优化 2025-01-16 16:23:17 +08:00
2 changed files with 6 additions and 6 deletions
Expand all files Collapse all files

8
framework/0-conf.js
View File

@@ -6,12 +6,12 @@ const proxyApi = "/api"
// const proxyApi = 'http://192.168.1.15:9888/cashierService' // 王伟 // const proxyApi = 'http://192.168.1.15:9888/cashierService' // 王伟
// const proxyApi = 'http://192.168.1.27:9888/cashierService' // 帆哥 // const proxyApi = 'http://192.168.1.27:9888/cashierService' // 帆哥
// const proxyApiwws = 'ws://192.168.1.15:9888/netty' // 测试 // const proxyApiwws = 'ws://192.168.1.15:9888/netty' // 测试
// const proxyApi = 'https://wxcashiertest.sxczgkj.cn/cashierService' // 测试 const proxyApi = 'https://wxcashiertest.sxczgkj.cn/cashierService' // 测试
// const proxyApiwws = 'wss://wxcashiertest.sxczgkj.cn/netty' // 测试 const proxyApiwws = 'wss://wxcashiertest.sxczgkj.cn/netty' // 测试
// const proxyApi = 'https://pre-cashier.sxczgkj.cn/cashierService' // 预发布 // const proxyApi = 'https://pre-cashier.sxczgkj.cn/cashierService' // 预发布
// const proxyApiwws = 'wss://pre-cashier.sxczgkj.cn/netty' // 预发布 // const proxyApiwws = 'wss://pre-cashier.sxczgkj.cn/netty' // 预发布
const proxyApi = 'https://cashier.sxczgkj.cn/cashierService' // 线上 // const proxyApi = 'https://cashier.sxczgkj.cn/cashierService' // 线上
const proxyApiwws = 'wss://cashier.sxczgkj.cn/netty' // 线上 // const proxyApiwws = 'wss://cashier.sxczgkj.cn/netty' // 线上
// #endif // #endif
// #ifdef H5 // #ifdef H5

4
pagesOrder/confirm_order/index.vue
View File

@@ -70,7 +70,7 @@
<text class="num" > X{{ item.totalNumber || ""}} </text> <text class="num" > X{{ item.totalNumber || ""}} </text>
</view> </view>
</view> </view>
<view class="price"> ￥{{ item.memberPrice*item.totalNumber || item.salePrice*item.totalNumber || 0}} </view> <view class="price"> ￥{{ amountVIP.isVip == 1 ? item.memberPrice*item.totalNumber : item.salePrice*item.totalNumber }} </view>
</view> </view>
<view class="cell-item" v-if="packFee && packFee > 0"> <view class="cell-item" v-if="packFee && packFee > 0">
<view class="label">打包费</view> <view class="label">打包费</view>
@@ -285,7 +285,7 @@
this.cartLists = JSON.parse(options.cartLists); this.cartLists = JSON.parse(options.cartLists);
this.listinfo.name = this.storeInfo.shopName; this.listinfo.name = this.storeInfo.shopName;
this.listinfo.details = JSON.parse(options.cartLists).data; this.listinfo.details = JSON.parse(options.cartLists).data;
this.listinfo.payAmount = this.cartLists.memberAmount && this.cartLists.memberAmount > 0 ? this.cartLists.memberAmount : this.cartLists.amount this.listinfo.payAmount = this.amountVIP.isVip == 1 && this.cartLists.memberAmount && this.cartLists.memberAmount > 0 ? this.cartLists.memberAmount : this.cartLists.amount
if ( options.tableCode ) { this.tableCode = options.tableCode;} if ( options.tableCode ) { this.tableCode = options.tableCode;}
if ( this.storeInfo.eatModel.indexOf("dine-in") != -1 ) { if ( this.storeInfo.eatModel.indexOf("dine-in") != -1 ) {
this.eatModel = "dine-in"; this.eatModel = "dine-in";