frontend / freight-ma

Download as
Browse Code »

Commit c0c1d6cf27d6642f96b0cfee985f9ce6bb7ad3dc

Authored by lxf
1 parent 96060125
Exists in master and in 1 other branch 宁夏邮政-定制

fix: 支付运费

Showing 7 changed files with 47 additions and 25 deletions   Show diff stats
iconfont/iconfont.css
  Diff comments   View file @c0c1d6c
... ... @@ -370,3 +370,9 @@
370 370 content: "\e722";
371 371 }
372 372  
  373 +.icon-radio-no:before {
  374 + content: "\e723";
  375 +}
  376 +.icon-radio-chose:before {
  377 + content: "\e724";
  378 +}
... ...
iconfont/iconfont.ttf
View file @c0c1d6c
No preview for this file type
main.js
  Diff comments   View file @c0c1d6c
1 1 import Vue from 'vue';
2 2 import App from './App';
3   -import '@/config/umtrack.js';
  3 +// import '@/config/umtrack.js';
4 4 import cache from '@/utils/cache';
5 5 import { formatImagePath } from '@/utils/imagePath';
6 6  
... ...
pages/me/index.vue
  Diff comments   View file @c0c1d6c
... ... @@ -45,7 +45,8 @@
45 45 </view>
46 46 <view class="page-my__list">
47 47 <u-cell-group>
48   - <u-cell v-if="$permission('/settlement/paymentPlan')" label="支付计划" is-link url="/pages/payPlan/list"> </u-cell>
  48 + <!-- <u-cell v-if="$permission('/settlement/paymentPlan')" icon="file-text" title="支付申请" is-link url="/pages/payPlan/list"> </u-cell>-->
  49 + <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>
49 50 </u-cell-group>
50 51 </view>
51 52 <view class="page-my__login">
... ...
pages/payPlan/card.vue
  Diff comments   View file @c0c1d6c
... ... @@ -7,9 +7,8 @@
7 7 <view style="display: flex">
8 8 <render-dict v-if="item.payStatus" class="status" :style="{ color: colorMap[item.payStatus] }" dict="ONLINE_FREIGHT_ORDER_PAY_STATUS" :value="item.payStatus"></render-dict>
9 9 <template v-if="choseMore">
10   - <u-radio-group :value="choseIds.includes(item.id) ? item.id : ''">
11   - <u-radio :name="item.id"></u-radio>
12   - </u-radio-group>
  10 + <zui-icon v-if="choseIds.includes(item.id)" name="radio-chose" size="18px" color="#1E7B6B"></zui-icon>
  11 + <zui-icon v-else name="radio-no" size="18px"></zui-icon>
13 12 <!-- <u-icon v-if="choseIds.includes(item.id)" name="checkmark-circle-fill" size="20" color="#1E7B6B"></u-icon>-->
14 13 </template>
15 14 </view>
... ...
pages/payPlan/list.vue
  Diff comments   View file @c0c1d6c
... ... @@ -60,13 +60,14 @@
60 60 笔款项
61 61 </view>
62 62 <view class="but-view">
  63 + <u-button type="info" size="small" @click="toCancelChose">取消</u-button>
63 64 <u-button type="primary" size="small" @click="toPayUrl">去支付</u-button>
64 65 </view>
65 66 </view>
66 67 <u-safe-bottom></u-safe-bottom>
67 68 </view>
68 69 </template>
69   - <u-popup :show="popShow" @close="popShow = false" closeable mode="center" :round="10">
  70 + <u-popup :show="popShow" @close="closePopShow" @click="closePopShow" mode="center" :round="10" :safeAreaInsetBottom="false">
70 71 <view class="popup">
71 72 <view class="title">支付信息确认</view>
72 73 <view class="alert"><u-icon name="error-circle" size="12"> </u-icon>列表长按可以批量选择支付哦~ </view>
... ... @@ -80,15 +81,15 @@
80 81 </view>
81 82 <view class="but">
82 83 <u-button @tap="popShow = false">取消</u-button>
83   - <u-button type="primary" @tap="(popShow = false), (pwdShow = true)">继续支付</u-button>
  84 + <u-button type="primary" @tap="(pwdStr = ''), (popShow = false), (pwdShow = true)">继续支付</u-button>
84 85 </view>
85 86 </view>
86 87 </u-popup>
87   - <u-popup :show="pwdShow" :closeable="false" mode="center" :round="10">
  88 + <u-popup :show="pwdShow" mode="center" :round="10" :safeAreaInsetBottom="false">
88 89 <view class="popup">
89 90 <view class="title">输入密码</view>
90 91 <view class="row">
91   - <u-input v-model="pwdStr" type="password" input-align="center" placeholder="请输入支付密码"></u-input>
  92 + <u-input v-model="pwdStr" type="password" input-align="center" border="bottom" placeholder="请输入支付密码"></u-input>
92 93 </view>
93 94 <view class="but">
94 95 <u-button @tap="(pwdShow = false), (popShow = true)">取消</u-button>
... ... @@ -271,6 +272,10 @@ export default {
271 272 },
272 273 });
273 274 },
  275 + toCancelChose() {
  276 + this.selection = [];
  277 + this.longClickFlag = false;
  278 + },
274 279 choseItemFun(id) {
275 280 if (this.longClickFlag) {
276 281 if (this.selection.includes(id)) {
... ... @@ -278,9 +283,6 @@ export default {
278 283 } else {
279 284 this.selection.push(id);
280 285 }
281   - if (this.selection.length === 0) {
282   - this.longClickFlag = false;
283   - }
284 286 }
285 287 },
286 288 longClick(item) {
... ... @@ -316,19 +318,28 @@ export default {
316 318 uni.$u.api.paymentPlan
317 319 .checkPayPassword({ payPassword: this.pwdStr })
318 320 .then(res => {
319   - uni.$u.api.paymentPlan.pay(this.selection).then(res => {
320   - this.loading = false;
321   - this.pwdStr = '';
322   - uni.showToast({ title: '提交成功' });
323   - this.search();
324   - this.pwdShow = false;
325   - this.popShow = false;
326   - });
  321 + uni.$u.api.paymentPlan
  322 + .pay(this.selection)
  323 + .then(res => {
  324 + this.loading = false;
  325 + this.pwdStr = '';
  326 + uni.showToast({ title: '提交成功' });
  327 + this.onSearch();
  328 + this.pwdShow = false;
  329 + this.popShow = false;
  330 + })
  331 + .catch(() => {
  332 + this.loading = false;
  333 + });
327 334 })
328 335 .catch(() => {
329 336 this.loading = false;
330 337 });
331 338 },
  339 + closePopShow() {
  340 + console.info('close');
  341 + this.popShow = false;
  342 + },
332 343 toPayUrl() {
333 344 uni.showLoading({ title: '加载中' });
334 345 let selection = this.selection;
... ... @@ -481,7 +492,9 @@ export default {
481 492 .popup {
482 493 padding-left: $padding-md;
483 494 padding-right: $padding-md;
  495 + padding-bottom: $padding-lg;
484 496 width: 70vw;
  497 + z-index: 100;
485 498 .title {
486 499 padding-top: $padding-xs;
487 500 padding-bottom: $padding-xs;
... ... @@ -528,7 +541,9 @@ export default {
528 541 justify-content: space-between;
529 542 padding: 10px;
530 543 .but-view {
531   - max-width: 100px;
  544 + display: flex;
  545 + gap: 10px;
  546 + max-width: 210px;
532 547 }
533 548 }
534 549 }
... ...
pages/payPlan/paySubmit.vue
  Diff comments   View file @c0c1d6c
... ... @@ -49,13 +49,13 @@
49 49 </view>
50 50 </template>
51 51 <template #footer>
52   - <u-button :loading="loading" type="primary" @tap="pwdShow = true">继续支付</u-button>
  52 + <u-button :loading="loading" type="primary" @tap="(pwdStr = ''), (pwdShow = true)">继续支付</u-button>
53 53 </template>
54   - <u-popup :show="pwdShow" :closeable="false" mode="center" :round="10">
  54 + <u-popup :show="pwdShow" :closeable="false" mode="center" :round="10" :safeAreaInsetBottom="false">
55 55 <view class="popup">
56 56 <view class="title">输入密码</view>
57 57 <view class="row">
58   - <u-input v-model="pwdStr" type="password" input-align="center" placeholder="请输入支付密码"></u-input>
  58 + <u-input v-model="pwdStr" type="password" input-align="center" border="bottom" placeholder="请输入支付密码"></u-input>
59 59 </view>
60 60 <view class="but">
61 61 <u-button @tap="pwdShow = false">取消</u-button>
... ... @@ -147,7 +147,7 @@ export default {
147 147 margin: 10px;
148 148 display: flex;
149 149 .label {
150   - width: 140rpx;
  150 + width: 180rpx;
151 151 }
152 152 }
153 153 }
... ... @@ -202,6 +202,7 @@ export default {
202 202 .popup {
203 203 padding-left: $padding-md;
204 204 padding-right: $padding-md;
  205 + padding-bottom: $padding-lg;
205 206 width: 70vw;
206 207 .title {
207 208 padding-top: $padding-xs;
... ...