Merge remote-tracking branch 'origin/master'

@@ -110,7 +110,7 @@ page {
 	box-shadow: 0px -2rpx 10rpx 0px #e8e8e8;	box-sizing: border-box;	padding: 30rpx 0 0;
 	position: fixed;    display: flex;justify-content: center;
 	width: 100%;	bottom: 0;left: 0;z-index: 3;
-	.btn-red{line-height: 70rpx;height: 70rpx;border-radius: 35rpx;width: 500rpx;font-size: 32rpx;}
+	.btn-red{line-height: 70rpx;height: 70rpx;border-radius: 35rpx;width: 90%;font-size: 32rpx;}
 	.btn-red-kx{line-height: 70rpx;height: 70rpx;border-radius: 35rpx;font-size: 32rpx;}
 }
 .nolineform{margin: 24rpx;background-color: #fff;padding: 30rpx;border-radius: 15rpx;box-sizing: border-box;

@@ -84,19 +84,32 @@
                 <view class="label">缴费年限：</view>
                 <view class="value">{{ item.content.yearCount || 0 }}</view>
               </view>
-              <view v-if="currentTab === '0' || currentTab === '1'" class="line"></view>
               <!-- 级位/段位考试（仅人数合计） -->
               <view v-if="currentTab === '2' || currentTab === '3' || currentTab === '4'" class="single-info">
                 <view class="label">人数合计</view>
                 <view class="value">{{ item.content.personCount || 0 }}</view>
               </view>
-              <view v-if="currentTab === '2' || currentTab === '3' || currentTab === '4'" class="line"></view>
+              <view class="line"></view>
               <view class="single-info">
                 <view class="label">订单状态</view>
                 <view :class="item.effect == 1 ? 'text-success' : 'text-warning'" class="value">
                   {{ item.effect == 1 ? '已生效' : '未生效' }}
                 </view>
               </view>
+              <view class="line"></view>
+              <view class="single-info">
+                <view class="label">缴费状态</view>
+                <view
+                  :class="{
+                    'text-primary': item.payStatus == 0,
+                    'text-success': item.payStatus == 1,
+                    'text-danger': item.payStatus == 2
+                  }"
+                  class="value"
+                >
+                  {{ item.payStatus == 0 ? '待缴费' : item.payStatus == 1 ? '缴费成功' : '订单取消' }}
+                </view>
+              </view>
             </view>
             
             <!-- 费用合计 + 缴费方式 -->
@@ -114,7 +127,7 @@
             <!-- 按钮组：靠右紧凑展示 -->
             <view class="btn-group">
               <!-- 已缴费：申请开票/已开票（需要审核通过才能开票） -->
-              <template v-if="item.payStatus == 1 && item.invoiceStatus != 1&& item.auditStatus == 2">
+              <template v-if="item.payStatus == 1 && item.invoiceStatus != 1&& item.auditStatus == 2 &&item.price>0">
                 <button :disabled="item.invoiceStatus === 1" class="btn btn-view-invoice" @click="makeInvoiceFN(item)">
                   开票
                 </button>
@@ -239,7 +252,7 @@ const tabs = computed(() => {
   } else if (dt === 2) {
     console.log('返回3个tab: 单位会员、段位考试、越段考试');
     return [
-      {name: '单位会员', type: '1'},
+      // {name: '单位会员', type: '1'},
       {name: '段位考试', type: '3'},
       {name: '越段考试', type: '4'}
     ];
@@ -694,22 +707,25 @@ const closeCancelPopup = () => {
   background: #f3f6fc;
   display: flex;
   align-items: center;
-  padding: 0 40rpx;
-  justify-content: space-around;
+  justify-content: space-between;
   margin: 20rpx 0;
+  padding: 0 20rpx;
+  min-height: 100rpx;
 }
 
 .line {
   width: 1rpx;
-  height: 90%;
-  background: #eee;
+  height: 60rpx;
+  background: #e5e5e5;
+  flex-shrink: 0;
 }
 
 .single-info {
+  flex: 1;
   padding: 16rpx 20rpx;
   border-radius: 8rpx;
   font-size: 26rpx;
-  // border-right: 1rpx solid #eee;
+  text-align: center;
   .label {
     color: #999;
     text-align: center;
@@ -720,11 +736,19 @@ const closeCancelPopup = () => {
     font-weight: 500;
     text-align: center;
     margin-top: 10rpx;
-    
+
+    &.text-primary {
+      color: #597ef7;
+    }
+
     &.text-success {
       color: #52c41a;
     }
-    
+
+    &.text-danger {
+      color: #ff4d4f;
+    }
+
     &.text-warning {
       color: #faad14;
     }

@@ -77,6 +77,20 @@
                 <view class="label">缴费方式</view>
                 <view class="value">{{ item.ziZhangBu ? '对公转账' : (item.payWay || '民生付') }}</view>
               </view>
+              <view class="divider"></view>
+              <view class="single-info">
+                <view class="label">缴费状态</view>
+                <view
+                  :class="{
+                    'text-primary': item.payStatus == 0,
+                    'text-success': item.payStatus == 1,
+                    'text-danger': item.payStatus == 2
+                  }"
+                  class="value"
+                >
+                  {{ item.payStatus == 0 ? '待缴费' : item.payStatus == 1 ? '缴费成功' : '订单取消' }}
+                </view>
+              </view>
             </view>
 
             <!-- 费用合计 -->
@@ -542,15 +556,27 @@ const goToDetail = (item) => {
   flex: 1;
   text-align: center;
   font-size: 28rpx;
-  
+
   .label {
     color: #666;
     margin-bottom: 8rpx;
   }
-  
+
   .value {
     color: #333;
     font-weight: 500;
+
+    &.text-primary {
+      color: #597ef7;
+    }
+
+    &.text-success {
+      color: #52c41a;
+    }
+
+    &.text-danger {
+      color: #ff4d4f;
+    }
   }
 }