From ed99aa435030acb1c4b1f36faf685c0ffd572da3 Mon Sep 17 00:00:00 2001
From: lidongtony <lidongtony@gmail.com>
Date: Mon, 13 Mar 2023 18:56:17 +0800
Subject: [PATCH 1/2] =?UTF-8?q?remove:=20=E7=A7=BB=E9=99=A4=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/address/list.vue | 8 +-------
 sheep/router/index.js       | 7 -------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/pages/user/address/list.vue b/pages/user/address/list.vue
index 7f8a5754..9d824329 100644
--- a/pages/user/address/list.vue
+++ b/pages/user/address/list.vue
@@ -49,18 +49,12 @@
     loading: true,
   });
 
-  // 选择收货地址， 有h5端需返回两次的bug
+  // 选择收货地址
   const onSelect = (addressInfo) => {
-    // const pages = sheep.$router.getCur();
-    // const lastPage = pages[pages.length - 2];
-    // if (!_.isEmpty(lastPage) && lastPage.route === "pages/order/confirm") {
-    // sheep.$router.back();
-    // uni.navigateBack();
     uni.$emit('SELECT_ADDRESS', {
       addressInfo,
     });
     sheep.$router.back();
-    // }
   };
 
   // 导入微信地址
diff --git a/sheep/router/index.js b/sheep/router/index.js
index 22a43d99..86796e5a 100644
--- a/sheep/router/index.js
+++ b/sheep/router/index.js
@@ -158,12 +158,6 @@ function getCurrentPage() {
   return pages[pages.length - 1];
 }
 
-function getCur() {
-  let a = getCurrentPages();
-  let pages = clone(a);
-  return pages;
-}
-
 function handleAction(path) {
   const action = path.split(':');
   switch (action[1]) {
@@ -187,6 +181,5 @@ export default {
   redirect,
   getCurrentPage,
   getCurrentRoute,
-  getCur,
   error,
 };

From 908094e43c0411b5d5c7fd26a225b212245e5490 Mon Sep 17 00:00:00 2001
From: lidongtony <lidongtony@gmail.com>
Date: Tue, 14 Mar 2023 11:28:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E7=BB=9F=E4=B8=80=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=9B=B8=E5=85=B3=E9=9D=99=E6=80=81=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/pay/components/account-type-select.vue | 6 +++---
 pages/pay/index.vue                          | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pages/pay/components/account-type-select.vue b/pages/pay/components/account-type-select.vue
index 50cccc7c..8ff4f5be 100644
--- a/pages/pay/components/account-type-select.vue
+++ b/pages/pay/components/account-type-select.vue
@@ -59,17 +59,17 @@
   });
   const typeList = [
     {
-      icon: '/static/img/shop/pay/wx_type.png',
+      icon: '/static/img/shop/pay/wechat.png',
       title: '微信零钱',
       value: 'wechat',
     },
     {
-      icon: '/static/img/shop/pay/ali_type.png',
+      icon: '/static/img/shop/pay/alipay.png',
       title: '支付宝账户',
       value: 'alipay',
     },
     {
-      icon: '/static/img/shop/pay/bank_type.png',
+      icon: '/static/img/shop/pay/bank.png',
       title: '银行卡转账',
       value: 'bank',
     },
diff --git a/pages/pay/index.vue b/pages/pay/index.vue
index c981ed7a..fbe45995 100644
--- a/pages/pay/index.vue
+++ b/pages/pay/index.vue
@@ -100,25 +100,25 @@
   const allowedPayment = computed(() => sheep.$store('app').platform.payment);
   const payMethods = [
     {
-      icon: '/static/img/shop/wechat_pay.png',
+      icon: '/static/img/shop/pay/wechat.png',
       title: '微信支付',
       value: 'wechat',
       disabled: false,
     },
     {
-      icon: '/static/img/shop/ali_pay.png',
+      icon: '/static/img/shop/pay/alipay.png',
       title: '支付宝支付',
       value: 'alipay',
       disabled: false,
     },
     {
-      icon: '/static/img/shop/wallet_pay.png',
+      icon: '/static/img/shop/pay/wallet.png',
       title: '余额支付',
       value: 'money',
       disabled: false,
     },
     {
-      icon: '/static/img/shop/apple_pay.png',
+      icon: '/static/img/shop/pay/apple.png',
       title: 'Apple Pay',
       value: 'apple',
       disabled: false,