订单

@@ -17,12 +17,12 @@
         <view class="yearRow">
         <view class="yearRow">
           <view class="label">缴费年限</view>
           <view class="label">缴费年限</view>
           <view class="control">
           <view class="control">
-            <image v-if="form.renewYear > 1" :src="config.loginImage_api + '/fs/static/dd_02.png'" class="icon"
+            <image v-if="form.renewYear > 1 && !payForm.id" :src="config.loginImage_api + '/fs/static/dd_02.png'" class="icon"
                    mode="widthFix"
                    mode="widthFix"
                    @click="minusYear"></image>
                    @click="minusYear"></image>
             <image v-else :src="config.loginImage_api + '/fs/static/dd_02_g.png'" class="icon" mode="widthFix"></image>
             <image v-else :src="config.loginImage_api + '/fs/static/dd_02_g.png'" class="icon" mode="widthFix"></image>
             <text class="num">{{ form.renewYear }}年</text>
             <text class="num">{{ form.renewYear }}年</text>
-            <image v-if="form.renewYear < 5" :src="config.loginImage_api + '/fs/static/btn_03.png'" class="icon"
+            <image v-if="form.renewYear < 5 && !payForm.id" :src="config.loginImage_api + '/fs/static/btn_03.png'" class="icon"
                    mode="widthFix"
                    mode="widthFix"
                    @click="plusYear"></image>
                    @click="plusYear"></image>
             <image v-else :src="config.loginImage_api + '/fs/static/btn_03_g.png'" class="icon" mode="widthFix"></image>
             <image v-else :src="config.loginImage_api + '/fs/static/btn_03_g.png'" class="icon" mode="widthFix"></image>

@@ -79,8 +79,16 @@
               <view class="divider"></view>
               <view class="divider"></view>
               <view class="single-info">
               <view class="single-info">
                 <view class="label">缴费方式</view>
                 <view class="label">缴费方式</view>
-                <view class="value " style="color:blue" @click="getPayWay(item)" v-if="item.ziZhangBu">对公转账</view>
-                <view class="value"  v-else>民生付</view>
+                <view class="value" :class="{ 'b2b-text-disabled': item.payType == '3' && item.payStatus == '2' }">
+                  {{ item.payType == '3' ? '对公转账' : '民生付' }}
+                </view>
+                <button
+                  v-if="item.payType == '3' && item.payStatus != '2'"
+                  class="b2b-btn"
+                  @click.stop="getPayWay(item)"
+                >
+                  查看
+                </button>
               </view>
               </view>
               <view class="divider"></view>
               <view class="divider"></view>
               <view class="single-info">
               <view class="single-info">
@@ -634,6 +642,25 @@ const goToDetail = (item) => {
   font-size: 26rpx;
   font-size: 26rpx;
 }
 }
 
 
+// 对公转账按钮禁用样式
+.b2b-btn {
+  background: transparent;
+  border: none;
+  padding: 0;
+  font-size: 24rpx;
+  color: #1890ff;
+  line-height: 1;
+  margin-left: 8rpx;
+
+  &::after {
+    border: none;
+  }
+}
+
+.b2b-text-disabled {
+  color: #bbb;
+}
+
 // 弹窗遮罩层
 // 弹窗遮罩层
 .popup-mask {
 .popup-mask {
   position: fixed;
   position: fixed;

@@ -306,17 +306,32 @@ function formatDate(value) {
   return dateText || '——'
   return dateText || '——'
 }
 }
 
 
-function commitFN(row) {
-  if (String(row.auditStatus) !== '0') {
-    openModal('是否确认去支付', () => {
+async function commitFN(row) {
+  if (String(row.auditStatus) === '0') {
+    try {
+      uni.showLoading({ title: '校验中...', mask: true })
+      const res = await api.getNewCountByRangeId(row.rangId)
+      const countData = res?.data || {}
+      if (Number(countData.all || 0) <= 0) {
+        uni.showToast({ title: '请添加缴费学员', icon: 'none' })
+        return
+      }
       uni.navigateTo({
       uni.navigateTo({
         url: buildPayOrderUrl(row)
         url: buildPayOrderUrl(row)
       })
       })
-    })
-    return
+      return
+    } catch (e) {
+      uni.showToast({ title: '校验失败，请稍后重试', icon: 'none' })
+      return
+    } finally {
+      uni.hideLoading()
+    }
   }
   }
-  uni.navigateTo({
-    url: buildPayOrderUrl(row)
+
+  openModal('是否确认去支付', () => {
+    uni.navigateTo({
+      url: buildPayOrderUrl(row)
+    })
   })
   })
 }
 }