Skip to content

杨炀 / ztx_wx_gzt

Go to a project
Toggle navigation
Toggle navigation pinning
a37d3794 by 张猛
Options

Merge remote-tracking branch 'origin/master'

2 parents 32edc977 2af85581
Inline Side-by-side
Showing 3 changed files with 64 additions and 14 deletions
common/mystyle.scss
...@@ -110,7 +110,7 @@ page { ...@@ -110,7 +110,7 @@ page {
110 box-shadow: 0px -2rpx 10rpx 0px #e8e8e8; box-sizing: border-box; padding: 30rpx 0 0; 110 box-shadow: 0px -2rpx 10rpx 0px #e8e8e8; box-sizing: border-box; padding: 30rpx 0 0;
111 position: fixed; display: flex;justify-content: center; 111 position: fixed; display: flex;justify-content: center;
112 width: 100%; bottom: 0;left: 0;z-index: 3; 112 width: 100%; bottom: 0;left: 0;z-index: 3;
113 .btn-red{line-height: 70rpx;height: 70rpx;border-radius: 35rpx;width: 500rpx;font-size: 32rpx;} 113 .btn-red{line-height: 70rpx;height: 70rpx;border-radius: 35rpx;width: 90%;font-size: 32rpx;}
114 .btn-red-kx{line-height: 70rpx;height: 70rpx;border-radius: 35rpx;font-size: 32rpx;} 114 .btn-red-kx{line-height: 70rpx;height: 70rpx;border-radius: 35rpx;font-size: 32rpx;}
115 } 115 }
116 .nolineform{margin: 24rpx;background-color: #fff;padding: 30rpx;border-radius: 15rpx;box-sizing: border-box; 116 .nolineform{margin: 24rpx;background-color: #fff;padding: 30rpx;border-radius: 15rpx;box-sizing: border-box;
......
myCenter/order.vue
...@@ -84,19 +84,32 @@ ...@@ -84,19 +84,32 @@
84 <view class="label">缴费年限：</view> 84 <view class="label">缴费年限：</view>
85 <view class="value">{{ item.content.yearCount || 0 }}</view> 85 <view class="value">{{ item.content.yearCount || 0 }}</view>
86 </view> 86 </view>
87 <view v-if="currentTab === '0' || currentTab === '1'" class="line"></view>
88 <!-- 级位/段位考试（仅人数合计） --> 87 <!-- 级位/段位考试（仅人数合计） -->
89 <view v-if="currentTab === '2' || currentTab === '3' || currentTab === '4'" class="single-info"> 88 <view v-if="currentTab === '2' || currentTab === '3' || currentTab === '4'" class="single-info">
90 <view class="label">人数合计</view> 89 <view class="label">人数合计</view>
91 <view class="value">{{ item.content.personCount || 0 }}</view> 90 <view class="value">{{ item.content.personCount || 0 }}</view>
92 </view> 91 </view>
93 <view v-if="currentTab === '2' || currentTab === '3' || currentTab === '4'" class="line"></view> 92 <view class="line"></view>
94 <view class="single-info"> 93 <view class="single-info">
95 <view class="label">订单状态</view> 94 <view class="label">订单状态</view>
96 <view :class="item.effect == 1 ? 'text-success' : 'text-warning'" class="value"> 95 <view :class="item.effect == 1 ? 'text-success' : 'text-warning'" class="value">
97 {{ item.effect == 1 ? '已生效' : '未生效' }} 96 {{ item.effect == 1 ? '已生效' : '未生效' }}
98 </view> 97 </view>
99 </view> 98 </view>
99 <view class="line"></view>
100 <view class="single-info">
101 <view class="label">缴费状态</view>
102 <view
103 :class="{
104 'text-primary': item.payStatus == 0,
105 'text-success': item.payStatus == 1,
106 'text-danger': item.payStatus == 2
107 }"
108 class="value"
109 >
110 {{ item.payStatus == 0 ? '待缴费' : item.payStatus == 1 ? '缴费成功' : '订单取消' }}
111 </view>
112 </view>
100 </view> 113 </view>
101 114
102 <!-- 费用合计 + 缴费方式 --> 115 <!-- 费用合计 + 缴费方式 -->
...@@ -114,7 +127,7 @@ ...@@ -114,7 +127,7 @@
114 <!-- 按钮组：靠右紧凑展示 --> 127 <!-- 按钮组：靠右紧凑展示 -->
115 <view class="btn-group"> 128 <view class="btn-group">
116 <!-- 已缴费：申请开票/已开票（需要审核通过才能开票） --> 129 <!-- 已缴费：申请开票/已开票（需要审核通过才能开票） -->
117 <template v-if="item.payStatus == 1 && item.invoiceStatus != 1&& item.auditStatus == 2"> 130 <template v-if="item.payStatus == 1 && item.invoiceStatus != 1&& item.auditStatus == 2 &&item.price>0">
118 <button :disabled="item.invoiceStatus === 1" class="btn btn-view-invoice" @click="makeInvoiceFN(item)"> 131 <button :disabled="item.invoiceStatus === 1" class="btn btn-view-invoice" @click="makeInvoiceFN(item)">
119 开票 132 开票
120 </button> 133 </button>
...@@ -239,7 +252,7 @@ const tabs = computed(() => { ...@@ -239,7 +252,7 @@ const tabs = computed(() => {
239 } else if (dt === 2) { 252 } else if (dt === 2) {
240 console.log('返回3个tab: 单位会员、段位考试、越段考试'); 253 console.log('返回3个tab: 单位会员、段位考试、越段考试');
241 return [ 254 return [
242 {name: '单位会员', type: '1'}, 255 // {name: '单位会员', type: '1'},
243 {name: '段位考试', type: '3'}, 256 {name: '段位考试', type: '3'},
244 {name: '越段考试', type: '4'} 257 {name: '越段考试', type: '4'}
245 ]; 258 ];
...@@ -694,22 +707,25 @@ const closeCancelPopup = () => { ...@@ -694,22 +707,25 @@ const closeCancelPopup = () => {
694 background: #f3f6fc; 707 background: #f3f6fc;
695 display: flex; 708 display: flex;
696 align-items: center; 709 align-items: center;
697 padding: 0 40rpx; 710 justify-content: space-between;
698 justify-content: space-around;
699 margin: 20rpx 0; 711 margin: 20rpx 0;
712 padding: 0 20rpx;
713 min-height: 100rpx;
700 } 714 }
701 715
702 .line { 716 .line {
703 width: 1rpx; 717 width: 1rpx;
704 height: 90%; 718 height: 60rpx;
705 background: #eee; 719 background: #e5e5e5;
720 flex-shrink: 0;
706 } 721 }
707 722
708 .single-info { 723 .single-info {
724 flex: 1;
709 padding: 16rpx 20rpx; 725 padding: 16rpx 20rpx;
710 border-radius: 8rpx; 726 border-radius: 8rpx;
711 font-size: 26rpx; 727 font-size: 26rpx;
712 // border-right: 1rpx solid #eee; 728 text-align: center;
713 .label { 729 .label {
714 color: #999; 730 color: #999;
715 text-align: center; 731 text-align: center;
...@@ -720,11 +736,19 @@ const closeCancelPopup = () => { ...@@ -720,11 +736,19 @@ const closeCancelPopup = () => {
720 font-weight: 500; 736 font-weight: 500;
721 text-align: center; 737 text-align: center;
722 margin-top: 10rpx; 738 margin-top: 10rpx;
723 739
740 &.text-primary {
741 color: #597ef7;
742 }
743
724 &.text-success { 744 &.text-success {
725 color: #52c41a; 745 color: #52c41a;
726 } 746 }
727 747
748 &.text-danger {
749 color: #ff4d4f;
750 }
751
728 &.text-warning { 752 &.text-warning {
729 color: #faad14; 753 color: #faad14;
730 } 754 }
......
personalVip/order.vue
...@@ -77,6 +77,20 @@ ...@@ -77,6 +77,20 @@
77 <view class="label">缴费方式</view> 77 <view class="label">缴费方式</view>
78 <view class="value">{{ item.ziZhangBu ? '对公转账' : (item.payWay || '民生付') }}</view> 78 <view class="value">{{ item.ziZhangBu ? '对公转账' : (item.payWay || '民生付') }}</view>
79 </view> 79 </view>
80 <view class="divider"></view>
81 <view class="single-info">
82 <view class="label">缴费状态</view>
83 <view
84 :class="{
85 'text-primary': item.payStatus == 0,
86 'text-success': item.payStatus == 1,
87 'text-danger': item.payStatus == 2
88 }"
89 class="value"
90 >
91 {{ item.payStatus == 0 ? '待缴费' : item.payStatus == 1 ? '缴费成功' : '订单取消' }}
92 </view>
93 </view>
80 </view> 94 </view>
81 95
82 <!-- 费用合计 --> 96 <!-- 费用合计 -->
...@@ -542,15 +556,27 @@ const goToDetail = (item) => { ...@@ -542,15 +556,27 @@ const goToDetail = (item) => {
542 flex: 1; 556 flex: 1;
543 text-align: center; 557 text-align: center;
544 font-size: 28rpx; 558 font-size: 28rpx;
545 559
546 .label { 560 .label {
547 color: #666; 561 color: #666;
548 margin-bottom: 8rpx; 562 margin-bottom: 8rpx;
549 } 563 }
550 564
551 .value { 565 .value {
552 color: #333; 566 color: #333;
553 font-weight: 500; 567 font-weight: 500;
568
569 &.text-primary {
570 color: #597ef7;
571 }
572
573 &.text-success {
574 color: #52c41a;
575 }
576
577 &.text-danger {
578 color: #ff4d4f;
579 }
554 } 580 }
555 } 581 }
556 582
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!