github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-30 14:31:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev

Browse Source
This commit is contained in:
From-wh 2023-05-10 10:11:23 +08:00
commit 2e41d616bb
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
template/admin/src/pages/order/orderList/handle/orderDetails.vue
View File

@ -57,7 +57,7 @@
<Col span="12" class="fontColor3 mb10" v-if="parseFloat(orderDatalist.orderInfo.back_integral)"
>退回积分：{{ parseFloat(orderDatalist.orderInfo.back_integral) }}</Col
>
<Col span="12" class="fontColor3 mb10" v-if="parseFloat(orderDatalist.orderInfo.gain_integral)"
<Col span="12" class="fontColor3 mb10" v-if="parseFloat(orderDatalist.orderInfo.gain_integral) && orderDatalist.orderInfo.paid == 1"
>赠送积分：{{ parseFloat(orderDatalist.orderInfo.gain_integral) }}</Col
>
<Col span="12" class="mb10">创建时间：{{ orderDatalist.orderInfo._add_time }}</Col>

4
template/admin/vue.config.js
View File

@ -18,7 +18,7 @@ const resolve = (dir) => {
// 例如：https://www.foobar.com/my-app/
// 需要将它改为'/my-app/'
// iview-admin线上演示打包路径： https://file.iviewui.com/admin-dist/
const BASE_URL = process.env.NODE_ENV === 'production' ? '/' : '/';
// const BASE_URL = process.env.NODE_ENV === 'production' ? '/' : '/';
const env = process.env.NODE_ENV;
module.exports = {
// Project deployment base
@ -31,7 +31,7 @@ module.exports = {
outputDir: Setting.outputDir,
runtimeCompiler: true,
productionSourceMap: false, //关闭生产环境下的SourceMap映射文件
baseUrl: BASE_URL,
baseUrl: '/',
// tweak internal webpack configuration.
// see https://github.com/vuejs/vue-cli/blob/dev/docs/webpack.md
// 如果你不需要使用eslint，把lintOnSave设为false即可

2
template/uni-app/pages/points_mall/integral_order_details.vue
View File

@ -22,7 +22,7 @@
<view class='name line1'>{{cartInfo.store_name}}</view>
<view class='num'>x {{cartInfo.total_num}}</view>
</view>
<view class='attr line1' v-if="cartInfo.attrInfo">{{cartInfo.attrInfo.suk}}
<view class='attr line1'>{{cartInfo.suk}}
</view>
<view class='money font-num'>
{{cartInfo.price}}{{$t(`积分`)}}

2
template/uni-app/pages/points_mall/integral_order_status.vue
View File

@ -21,7 +21,7 @@
<view class='itemCom'>{{$t(`积分兑换`)}}</view>
</view>
<view class='item acea-row row-between-wrapper'>
<view>{{$t(`兑换积分`)}}</view>
<view>{{$t(`支付积分`)}}</view>
<view class='itemCom'>{{order_pay_info.total_price}}</view>
</view>
<!--失败时加上这个 -->