From 4cf088ce2cfee92b26d7816f555fdcfe22f2a7bf Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Wed, 1 Nov 2023 18:34:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/plugins/scanpay/index/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/plugins/scanpay/index/index.vue b/pages/plugins/scanpay/index/index.vue
index 78259aee..259b5c3b 100644
--- a/pages/plugins/scanpay/index/index.vue
+++ b/pages/plugins/scanpay/index/index.vue
@@ -72,7 +72,7 @@
                         <text class="flex-1 key-1 br-r-f5 br-b-f5" @tap="key_up_event('2')">2</text>
                         <text class="flex-1 key-1 br-r-f5 br-b-f5" @tap="key_up_event('3')">3</text>
                         <text class="flex-1 key-1 br-b-f5" @tap="key_up_event('del')">
-                            <iconfont name="icon-jianpan-guanbi" size="68rpx" class="fw-n"></iconfont>
+                            <iconfont name="icon-keyboard-backspace" size="68rpx" class="fw-n"></iconfont>
                         </text>
                     </view>
                     <view class="flex-row">

From c05fbf0f05420b0cd60376b2671ab505be1cb0b0 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Wed, 1 Nov 2023 18:46:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/plugins/scanpay/index/index.vue | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pages/plugins/scanpay/index/index.vue b/pages/plugins/scanpay/index/index.vue
index 259b5c3b..c6c7a97e 100644
--- a/pages/plugins/scanpay/index/index.vue
+++ b/pages/plugins/scanpay/index/index.vue
@@ -4,7 +4,7 @@
             <view class="padding-main">
                 <block v-if="(data.scanpay_info || null) !== null">
                     <view class="flex-row align-c margin-top-main margin-bottom-xl">
-                        <image v-if="data.scanpay_info.logo" :src="data.scanpay_info.logo" mode="widthFix" class="circle img-user margin-right-main" />
+                        <image v-if="data.scanpay_info.logo" :src="data.scanpay_info.logo" mode="widthFix" class="circle img-user br margin-right-main" />
                         <div class="flex-1 flex-width flex-row align-c">
                             <text class="text-size fw-b single-text">{{ data.scanpay_info.name }}</text>
                             <text v-if="(data.scanpay_info.alias || null) !== null" class="cr-white badge tc margin-left-sm">{{ data.scanpay_info.alias }}</text>
@@ -218,13 +218,23 @@
                         uni.stopPullDownRefresh();
                         if (res.data.code == 0) {
                             var new_form = this.form;
-                            new_form.payment_id = res.data.data.payment_list[0].id;
+                            var data = res.data.data || null;
+                            if(data != null) {
+                                new_form.payment_id = data.payment_list[0].id;
+                            }
                             this.setData({
-                                data: res.data.data || null,
+                                data: res.data.data,
                                 form: new_form,
                                 data_list_loding_msg: '',
                                 data_list_loding_status: 0,
                             });
+
+                            // 标题
+                            if(data != null && (data.scanpay_info || null) != null) {
+                                uni.setNavigationBarTitle({
+                                	title: data.scanpay_info.name+'收款'
+                                });
+                            }
                         } else {
                             this.setData({
                                 data_list_loding_status: 2,