github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-29 22:10:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve: 保底值

Browse Source
This commit is contained in:
From-wh 2023-03-31 15:20:42 +08:00
parent 9231a23935
commit 5aa8fcdf8c
8 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
template/uni-app/pages/annex/applicationRecord/index.vue
View File

@ -3,9 +3,9 @@
<view class="application-record" v-if="listData.length">
<view class="card-list" v-for="item in listData" :key="item.mer_intention_id">
<view class="card-top">
<view class="title">{{item.mer_name}}</view>
<view class="time">{{$t(`提交时间`)}}：{{item.create_time}}</view>
<view v-if="item.fail_msg" class="reason">{{$t(`原因`)}}：{{item.fail_msg}}</view>
<view class="title">{{item.mer_name || ''}}</view>
<view class="time">{{$t(`提交时间`)}}：{{item.create_time || ''}}</view>
<view v-if="item.fail_msg" class="reason">{{$t(`原因`)}}：{{item.fail_msg || ''}}</view>
</view>
<view class="line"></view>
<view class="card-bottom">

2
template/uni-app/pages/annex/offline_pay/index.vue
View File

@ -7,7 +7,7 @@
{{$t(`￥`)}}
<input v-model.number="money" class="input" name="money" type="digit" @input="inputChange" placeholder="0.00" />
</view>
<view v-if="payPrice && show" class="discount">{{$t(`会员优惠价`)}}：{{$t(`￥`)}}{{ payPrice }}</view>
<view v-if="payPrice && show" class="discount">{{$t(`会员优惠价`)}}：{{$t(`￥`)}}{{ payPrice || 0 }}</view>
</view>
</view>
<view class="radio-section">

4
template/uni-app/pages/annex/vip_active/index.vue
View File

@ -22,8 +22,8 @@
<view v-for="item in memberRights" :key="item.id" class="acea-row row-middle item">
<image class="image" :src="item.pic"></image>
<view class="text">
<view class="name">{{item.title}}</view>
<view>{{item.explain}}</view>
<view class="name">{{item.title || ''}}</view>
<view>{{item.explain || ''}}</view>
</view>
</view>
</view>

2
template/uni-app/pages/annex/vip_clause/index.vue
View File

@ -1,6 +1,6 @@
<template>
<view>
<view class="title">{{agreement.title}}</view>
<view class="title">{{agreement.title || ''}}</view>
<view class="cont" v-html="agreement.content"></view>
</view>
</template>

6
template/uni-app/pages/annex/vip_paid/index.vue
View File

@ -4,19 +4,19 @@
<view class="acea-row row-middle">
<image class="image" :src="userInfo.avatar"></image>
<view class="text">
<view class="name line1">{{userInfo.nickname}}</view>
<view class="name line1">{{userInfo.nickname || ''}}</view>
<view v-if="userInfo.is_ever_level">{{$t(`永久SVIP会员`)}}</view>
<view v-else-if="userInfo.is_money_level">{{$t(`SVIP会员`)}} {{userInfo.overdue_time | dateFormat}}
{{$t(`到期`)}}
</view>
<view v-else>{{$t(`您与`)}} {{userInfo.shop_name}} {{$t(`商城的第`)}} {{userInfo.register_days}}
<view v-else>{{$t(`您与`)}} {{userInfo.shop_name || ''}} {{$t(`商城的第`)}} {{userInfo.register_days || ''}}
{{$t(`天.`)}}
</view>
</view>
</view>
<view class="acea-row row-between-wrapper info">
<view v-if="userInfo.is_money_level">{{$t(`已累积为您节省`)}} {{$t(`￥`)}}<text
class="num">{{userInfo.economize_money}}</text>
class="num">{{userInfo.economize_money || ''}}</text>
</view>
<view v-else>{{$t(`开通即享会员权益`)}}</view>
<view class="btn" @click="scrollToCard" v-if="!userInfo.is_ever_level">

1
template/uni-app/pages/goods/admin_order_detail/index.vue
View File

@ -469,7 +469,6 @@
.order-details .wrapper .item .conter {
color: #868686;
width: 500upx;
text-align: right;
}

20
template/uni-app/pages/goods/cashier/index.vue
View File

@ -256,6 +256,7 @@
title: that.$t(`支付中`)
});
if (paytype == 'friend' && that.orderId) {
uni.hideLoading();
return uni.navigateTo({
url: '/pages/users/payment_on_behalf/index?order_id=' + that.orderId + '&spread=' +
this.$store.state.app.uid,
@ -290,7 +291,6 @@
'&spread=' +
this
.$store.state.app.uid
switch (status) {
case 'ORDER_EXIST':
case 'EXTEND_ORDER':
@ -518,16 +518,16 @@
case 'ALIPAY_PAY':
//#ifdef H5
uni.hideLoading();
that.$util.Tips({
title: that.$t(`等待支付中`)
}, {
tab: 4,
url: goPages + '&status=0'
uni.hideLoading();
that.$util.Tips({
title: that.$t(`等待支付中`)
}, {
tab: 4,
url: goPages + '&status=0'
});
that.formContent = res.data.result.jsConfig;
setTimeout(() => {
document.getElementById('alipaysubmit').submit();
that.formContent = res.data.result.jsConfig;
setTimeout(() => {
document.getElementById('alipaysubmit').submit();
}, 1500);
//#endif
// #ifdef MP

6
template/uni-app/pages/users/promoter-list/index.vue
View File

@ -227,7 +227,9 @@
}
},
onReachBottom: function() {
this.userSpreadNewList();
if (this.teamCount > this.recordList.length) {
this.userSpreadNewList();
}
}
}
</script>
@ -370,7 +372,7 @@
.no-data {
background-color: #fff;
padding-bottom: 30rpx;
padding: 180rpx 0 300rpx;
padding: 180rpx 0 calc(100vh - 1030rpx);
.emptyBox {
text-align: center;