Skip to content

杨炀 / ztx_wx_gzt

Go to a project
Toggle navigation
Toggle navigation pinning
95e867bc by lttnew
Options

个人会员订单

1 parent 8fb19fdf
Inline Side-by-side
Showing 3 changed files with 26 additions and 31 deletions
config.js
1 // dev 1 // dev
2 const baseUrl_api = 'http://192.168.1.222:8787' 2 // const baseUrl_api = 'http://192.168.1.222:8787'
3 // const baseUrl_api = 'http://47.98.186.233:8787' 3 // const baseUrl_api = 'http://47.98.186.233:8787'
4 // const baseUrl_api = 'https://tk001.wxjylt.com/stage-api/' 4 const baseUrl_api = 'https://tk001.wxjylt.com/stage-api/'
5 const loginImage_api = 'https://tk001.wxjylt.com/stage-api' 5 const loginImage_api = 'https://tk001.wxjylt.com/stage-api'
6 const payUrl = 'https://wxpay.cmbc.com.cn/mobilePlatform/appserver/lcbpPay.do' 6 const payUrl = 'https://wxpay.cmbc.com.cn/mobilePlatform/appserver/lcbpPay.do'
7 7
......
pages/index/home.vue
...@@ -438,10 +438,10 @@ ...@@ -438,10 +438,10 @@
438 <image :src="config.baseUrl_api+'/fs/static/icon/26.png'"/> 438 <image :src="config.baseUrl_api+'/fs/static/icon/26.png'"/>
439 变更审核 439 变更审核
440 </view> 440 </view>
441 <view @click="goPath('/level/settlementAudit')"> 441 <!-- <view @click="goPath('/level/settlementAudit')">
442 <image :src="config.baseUrl_api+'/fs/static/icon/10.png'"/> 442 <image :src="config.baseUrl_api+'/fs/static/icon/10.png'"/>
443 结算审核 443 结算审核
444 </view> 444 </view> -->
445 <view @click="goPath('/level/ztx/mail?type=1')"> 445 <view @click="goPath('/level/ztx/mail?type=1')">
446 <image :src="config.baseUrl_api+'/fs/static/icon/5.png'"/> 446 <image :src="config.baseUrl_api+'/fs/static/icon/5.png'"/>
447 证书邮寄 447 证书邮寄
......
personal/order.vue
...@@ -44,16 +44,16 @@ ...@@ -44,16 +44,16 @@
44 <text class="value">{{ item.orderName || '——' }}</text> 44 <text class="value">{{ item.orderName || '——' }}</text>
45 </view> 45 </view>
46 <text :class="{ 46 <text :class="{
47 'status-wait': item.auditStatus == 0, 47 'status-wait': item.payStatus == 3,
48 'status-pending': item.auditStatus == 1||item.auditStatus == 9, 48 'status-pending': item.payStatus == 0,
49 'status-success': item.auditStatus == 2, 49 'status-success': item.payStatus == 1,
50 'status-danger': item.auditStatus == 3||item.auditStatus == 4 50 'status-danger': item.payStatus == 2 || item.payStatus == 4
51 }" 51 }"
52 class="status-tag ">{{ getAuditStatusText(item.auditStatus) }} 52 class="status-tag ">{{ getStatusText(item.payStatus) }}
53 </text> 53 </text>
54 </view> 54 </view>
55 </view> 55 </view>
56 <view class="card-header"> 56 <!-- <view class="card-header">
57 <view class="date"> 57 <view class="date">
58 <view class="data-header"> 58 <view class="data-header">
59 <text class="value"> 59 <text class="value">
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
63 <text> {{ item.tradeNo || '——' }}</text> 63 <text> {{ item.tradeNo || '——' }}</text>
64 </view> 64 </view>
65 </view> 65 </view>
66 </view> 66 </view> -->
67 <view class="card-header"> 67 <view class="card-header">
68 <view class="date"> 68 <view class="date">
69 <view class="data-header"> 69 <view class="data-header">
...@@ -71,7 +71,9 @@ ...@@ -71,7 +71,9 @@
71 <text class="tradeNo">缴费编号：</text> 71 <text class="tradeNo">缴费编号：</text>
72 {{ item.wfCode || '——' }} 72 {{ item.wfCode || '——' }}
73 </text> 73 </text>
74
74 </view> 75 </view>
76 <view>￥{{ item.price || '0.00' }}</view>
75 </view> 77 </view>
76 </view> 78 </view>
77 <view class="member-time"> 79 <view class="member-time">
...@@ -80,13 +82,13 @@ ...@@ -80,13 +82,13 @@
80 {{ `${filterTime(item.genTime)}个人会员缴费办理` }} 82 {{ `${filterTime(item.genTime)}个人会员缴费办理` }}
81 </view> 83 </view>
82 <view class="price"> 84 <view class="price">
83 <view>￥{{ item.price || '0.00' }}</view> 85
84 <view class="person">共{{ item.content?.yearCount || 0 }}年</view> 86 <view class="person">共{{ item.content?.yearCount || 0 }}年</view>
85 </view> 87 </view>
86 </view> 88 </view>
87 89
88 <!-- 核心：展示缴费年限 --> 90 <!-- 核心：展示缴费年限 -->
89 <view v-if="item.content" class="info-section flex f-j-s"> 91 <!-- <view v-if="item.content" class="info-section flex f-j-s">
90 <view class="single-info"> 92 <view class="single-info">
91 <view class="label">缴费年限：</view> 93 <view class="label">缴费年限：</view>
92 <view class="value">{{ item.content.yearCount || 0 }}</view> 94 <view class="value">{{ item.content.yearCount || 0 }}</view>
...@@ -112,7 +114,7 @@ ...@@ -112,7 +114,7 @@
112 {{ item.payStatus == 0 ? '待缴费' : item.payStatus == 1 ? '缴费成功' : '订单取消' }} 114 {{ item.payStatus == 0 ? '待缴费' : item.payStatus == 1 ? '缴费成功' : '订单取消' }}
113 </view> 115 </view>
114 </view> 116 </view>
115 </view> 117 </view> -->
116 118
117 <!-- 按钮组 --> 119 <!-- 按钮组 -->
118 <view class="btn-group"> 120 <view class="btn-group">
...@@ -120,20 +122,12 @@ ...@@ -120,20 +122,12 @@
120 <!-- <text class="more" @click.stop="goToDetail(item)">更多</text> --> 122 <!-- <text class="more" @click.stop="goToDetail(item)">更多</text> -->
121 </view> 123 </view>
122 <view class="btn-flex"> 124 <view class="btn-flex">
123 <!-- 待缴费：去缴费 --> 125 <!-- 去支付：只有未支付且待支付状态才显示 -->
124 <!-- <template v-if="item.payStatus == 0"> 126 <button v-if="!isPayDisabled(item)" class="btn btn-pay" @click.stop="goPay(item)">去支付</button>
125 <button class="btn btn-pay" @click.stop="goPay(item)">去缴费</button> 127 <!-- 取消订单：待支付状态才显示 -->
126 </template> --> 128 <button v-if="canShowCancel(item) && !isCancelDisabled(item)" class="btn btn-info" @click.stop="handleCancel(item)">取消订单</button>
127
128 <!-- <button class="btn btn-info" @click.stop="goToDetail(item)">查看明细</button> -->
129 <button :class="{ disabled: isPayDisabled(item) }" :disabled="isPayDisabled(item)" class="btn btn-pay" @click.stop="goPay(item)">去支付</button>
130 <button v-if="canShowCancel(item)" :class="{ disabled: isCancelDisabled(item) }" :disabled="isCancelDisabled(item)" class="btn btn-info" @click.stop="handleCancel(item)">取消订单</button>
131 <!-- 已缴费：申请开票/已开票（需要审核通过才能开票） --> 129 <!-- 已缴费：申请开票/已开票（需要审核通过才能开票） -->
132 <template v-if="canShowInvoiceApply(item)"> 130 <button v-if="canShowInvoiceApply(item) && !isInvoiceDisabled(item)" class="btn btn-view-invoice" @click.stop="makeInvoiceFN(item)">申请开票</button>
133 <button :class="{ disabled: isInvoiceDisabled(item) }" :disabled="isInvoiceDisabled(item)" class="btn btn-view-invoice" @click.stop="makeInvoiceFN(item)">
134 申请开票
135 </button>
136 </template>
137 <template v-if="hasInvoice(item)"> 131 <template v-if="hasInvoice(item)">
138 <button class="btn btn-invoice" @click.stop="viewInvoice(item)">查看发票</button> 132 <button class="btn btn-invoice" @click.stop="viewInvoice(item)">查看发票</button>
139 </template> 133 </template>
...@@ -287,7 +281,7 @@ const canShowCancel = (item) => { ...@@ -287,7 +281,7 @@ const canShowCancel = (item) => {
287 }; 281 };
288 282
289 const isCancelDisabled = (item) => { 283 const isCancelDisabled = (item) => {
290 return String(item?.auditStatus) !== '9'; 284 return String(item?.auditStatus) !== '9' || String(item?.payStatus) !== '0';
291 }; 285 };
292 286
293 const canShowInvoiceApply = (item) => !hasInvoice(item); 287 const canShowInvoiceApply = (item) => !hasInvoice(item);
...@@ -349,7 +343,8 @@ const getStatusText = (status) => { ...@@ -349,7 +343,8 @@ const getStatusText = (status) => {
349 const map = { 343 const map = {
350 0: '待缴费', 344 0: '待缴费',
351 1: '缴费成功', 345 1: '缴费成功',
352 2: '订单取消' 346 2: '已取消',
347 4: '已退款'
353 }; 348 };
354 return map[status] || ''; 349 return map[status] || '';
355 }; 350 };
...@@ -751,10 +746,10 @@ const closeCancelPopup = () => { ...@@ -751,10 +746,10 @@ const closeCancelPopup = () => {
751 .btn { 746 .btn {
752 width: 160rpx; 747 width: 160rpx;
753 height: 50rpx; 748 height: 50rpx;
754 line-height: 50rpx; 749 line-height: 48rpx;
755 padding: 0; 750 padding: 0;
756 border-radius: 20rpx; 751 border-radius: 20rpx;
757 font-size: 28rpx; 752 font-size: 24rpx;
758 white-space: nowrap; 753 white-space: nowrap;
759 font-weight: bold; 754 font-weight: bold;
760 border: none; 755 border: none;
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!