From c0c1d6cf27d6642f96b0cfee985f9ce6bb7ad3dc Mon Sep 17 00:00:00 2001
From: lxf <xunfeng1122@163.com>
Date: Mon, 16 Jun 2025 10:31:02 +0800
Subject: [PATCH] fix: 支付运费

---
 iconfont/iconfont.css       |  6 ++++++
 iconfont/iconfont.ttf       | Bin 20980 -> 0 bytes
 main.js                     |  2 +-
 pages/me/index.vue          |  3 ++-
 pages/payPlan/card.vue      |  5 ++---
 pages/payPlan/list.vue      | 47 +++++++++++++++++++++++++++++++----------------
 pages/payPlan/paySubmit.vue |  9 +++++----
 7 files changed, 47 insertions(+), 25 deletions(-)

diff --git a/iconfont/iconfont.css b/iconfont/iconfont.css
index 2242b45..53d5f74 100644
--- a/iconfont/iconfont.css
+++ b/iconfont/iconfont.css
@@ -370,3 +370,9 @@
   content: "\e722";
 }
 
+.icon-radio-no:before {
+  content: "\e723";
+}
+.icon-radio-chose:before {
+  content: "\e724";
+}
diff --git a/iconfont/iconfont.ttf b/iconfont/iconfont.ttf
index f0f3afa..8eae219 100644
Binary files a/iconfont/iconfont.ttf and b/iconfont/iconfont.ttf differ
diff --git a/main.js b/main.js
index 4a0d672..15eb5bc 100644
--- a/main.js
+++ b/main.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
 import App from './App';
-import '@/config/umtrack.js';
+// import '@/config/umtrack.js';
 import cache from '@/utils/cache';
 import { formatImagePath } from '@/utils/imagePath';
 
diff --git a/pages/me/index.vue b/pages/me/index.vue
index 30fd4ad..1c635ff 100644
--- a/pages/me/index.vue
+++ b/pages/me/index.vue
@@ -45,7 +45,8 @@
     </view>
     <view class="page-my__list">
       <u-cell-group>
-        <u-cell v-if="$permission('/settlement/paymentPlan')" label="支付计划" is-link url="/pages/payPlan/list"> </u-cell>
+        <!--        <u-cell v-if="$permission('/settlement/paymentPlan')" icon="file-text" title="支付申请" is-link url="/pages/payPlan/list"> </u-cell>-->
+        <u-cell v-if="$permission('/settlement/paymentPlan')" icon="rmb" icon-style="color:#333" title-style="color:#333" title="支付计划" is-link url="/pages/payPlan/list"> </u-cell>
       </u-cell-group>
     </view>
     <view class="page-my__login">
diff --git a/pages/payPlan/card.vue b/pages/payPlan/card.vue
index 549e4da..b19f44b 100644
--- a/pages/payPlan/card.vue
+++ b/pages/payPlan/card.vue
@@ -7,9 +7,8 @@
       <view style="display: flex">
         <render-dict v-if="item.payStatus" class="status" :style="{ color: colorMap[item.payStatus] }" dict="ONLINE_FREIGHT_ORDER_PAY_STATUS" :value="item.payStatus"></render-dict>
         <template v-if="choseMore">
-          <u-radio-group :value="choseIds.includes(item.id) ? item.id : ''">
-            <u-radio :name="item.id"></u-radio>
-          </u-radio-group>
+          <zui-icon v-if="choseIds.includes(item.id)" name="radio-chose" size="18px" color="#1E7B6B"></zui-icon>
+          <zui-icon v-else name="radio-no" size="18px"></zui-icon>
           <!--          <u-icon v-if="choseIds.includes(item.id)" name="checkmark-circle-fill" size="20" color="#1E7B6B"></u-icon>-->
         </template>
       </view>
diff --git a/pages/payPlan/list.vue b/pages/payPlan/list.vue
index ba5c90e..c92d08a 100644
--- a/pages/payPlan/list.vue
+++ b/pages/payPlan/list.vue
@@ -60,13 +60,14 @@
             笔款项
           </view>
           <view class="but-view">
+            <u-button type="info" size="small" @click="toCancelChose">取消</u-button>
             <u-button type="primary" size="small" @click="toPayUrl">去支付</u-button>
           </view>
         </view>
         <u-safe-bottom></u-safe-bottom>
       </view>
     </template>
-    <u-popup :show="popShow" @close="popShow = false" closeable mode="center" :round="10">
+    <u-popup :show="popShow" @close="closePopShow" @click="closePopShow" mode="center" :round="10" :safeAreaInsetBottom="false">
       <view class="popup">
         <view class="title">支付信息确认</view>
         <view class="alert"><u-icon name="error-circle" size="12"> </u-icon>列表长按可以批量选择支付哦~ </view>
@@ -80,15 +81,15 @@
         </view>
         <view class="but">
           <u-button @tap="popShow = false">取消</u-button>
-          <u-button type="primary" @tap="(popShow = false), (pwdShow = true)">继续支付</u-button>
+          <u-button type="primary" @tap="(pwdStr = ''), (popShow = false), (pwdShow = true)">继续支付</u-button>
         </view>
       </view>
     </u-popup>
-    <u-popup :show="pwdShow" :closeable="false" mode="center" :round="10">
+    <u-popup :show="pwdShow" mode="center" :round="10" :safeAreaInsetBottom="false">
       <view class="popup">
         <view class="title">输入密码</view>
         <view class="row">
-          <u-input v-model="pwdStr" type="password" input-align="center" placeholder="请输入支付密码"></u-input>
+          <u-input v-model="pwdStr" type="password" input-align="center" border="bottom" placeholder="请输入支付密码"></u-input>
         </view>
         <view class="but">
           <u-button @tap="(pwdShow = false), (popShow = true)">取消</u-button>
@@ -271,6 +272,10 @@ export default {
         },
       });
     },
+    toCancelChose() {
+      this.selection = [];
+      this.longClickFlag = false;
+    },
     choseItemFun(id) {
       if (this.longClickFlag) {
         if (this.selection.includes(id)) {
@@ -278,9 +283,6 @@ export default {
         } else {
           this.selection.push(id);
         }
-        if (this.selection.length === 0) {
-          this.longClickFlag = false;
-        }
       }
     },
     longClick(item) {
@@ -316,19 +318,28 @@ export default {
       uni.$u.api.paymentPlan
         .checkPayPassword({ payPassword: this.pwdStr })
         .then(res => {
-          uni.$u.api.paymentPlan.pay(this.selection).then(res => {
-            this.loading = false;
-            this.pwdStr = '';
-            uni.showToast({ title: '提交成功' });
-            this.search();
-            this.pwdShow = false;
-            this.popShow = false;
-          });
+          uni.$u.api.paymentPlan
+            .pay(this.selection)
+            .then(res => {
+              this.loading = false;
+              this.pwdStr = '';
+              uni.showToast({ title: '提交成功' });
+              this.onSearch();
+              this.pwdShow = false;
+              this.popShow = false;
+            })
+            .catch(() => {
+              this.loading = false;
+            });
         })
         .catch(() => {
           this.loading = false;
         });
     },
+    closePopShow() {
+      console.info('close');
+      this.popShow = false;
+    },
     toPayUrl() {
       uni.showLoading({ title: '加载中' });
       let selection = this.selection;
@@ -481,7 +492,9 @@ export default {
   .popup {
     padding-left: $padding-md;
     padding-right: $padding-md;
+    padding-bottom: $padding-lg;
     width: 70vw;
+    z-index: 100;
     .title {
       padding-top: $padding-xs;
       padding-bottom: $padding-xs;
@@ -528,7 +541,9 @@ export default {
       justify-content: space-between;
       padding: 10px;
       .but-view {
-        max-width: 100px;
+        display: flex;
+        gap: 10px;
+        max-width: 210px;
       }
     }
   }
diff --git a/pages/payPlan/paySubmit.vue b/pages/payPlan/paySubmit.vue
index 93b7424..f14b4c3 100644
--- a/pages/payPlan/paySubmit.vue
+++ b/pages/payPlan/paySubmit.vue
@@ -49,13 +49,13 @@
       </view>
     </template>
     <template #footer>
-      <u-button :loading="loading" type="primary" @tap="pwdShow = true">继续支付</u-button>
+      <u-button :loading="loading" type="primary" @tap="(pwdStr = ''), (pwdShow = true)">继续支付</u-button>
     </template>
-    <u-popup :show="pwdShow" :closeable="false" mode="center" :round="10">
+    <u-popup :show="pwdShow" :closeable="false" mode="center" :round="10" :safeAreaInsetBottom="false">
       <view class="popup">
         <view class="title">输入密码</view>
         <view class="row">
-          <u-input v-model="pwdStr" type="password" input-align="center" placeholder="请输入支付密码"></u-input>
+          <u-input v-model="pwdStr" type="password" input-align="center" border="bottom" placeholder="请输入支付密码"></u-input>
         </view>
         <view class="but">
           <u-button @tap="pwdShow = false">取消</u-button>
@@ -147,7 +147,7 @@ export default {
       margin: 10px;
       display: flex;
       .label {
-        width: 140rpx;
+        width: 180rpx;
       }
     }
   }
@@ -202,6 +202,7 @@ export default {
   .popup {
     padding-left: $padding-md;
     padding-right: $padding-md;
+    padding-bottom: $padding-lg;
     width: 70vw;
     .title {
       padding-top: $padding-xs;
--
libgit2 0.21.0