From 74dba2ef29be6a1266eb56910c6041043056d0d0 Mon Sep 17 00:00:00 2001
From: Waiting <waitinghc@foxmail.com>
Date: Fri, 10 May 2024 17:51:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=85=E5=80=BC=E9=A1=B5=E9=9D=A2=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=20=E5=95=86=E5=93=81=E6=8A=98=E6=89=A3=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=85=AC=E4=BC=97=E5=8F=B7=E8=B7=B3=E8=BD=AC=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E8=B5=84=E6=96=99=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                |   8 +
 src/pages/mall/index.vue                   |   2 +-
 src/pages/mall/subs/goods/detail.vue       |   4 +-
 src/pages/mall/subs/search/index.vue       |   2 +-
 src/pages/mall/subs/shoppingcart/index.vue |   2 +-
 src/pages/mine/subs/recharge/index.vue     | 161 +++++++++++++++------
 src/static/images/ic_recharge_checked.png  | Bin 0 -> 2382 bytes
 7 files changed, 133 insertions(+), 46 deletions(-)
 create mode 100644 src/static/images/ic_recharge_checked.png

diff --git a/src/App.vue b/src/App.vue
index 1851c8b..12c95e1 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -27,6 +27,14 @@ onLaunch((options) => {
       if(params.split('=')[0] === 'storeId') {
         setRegisterStoreId(params.split('=')[1]);
       }
+
+      if(options?.query.scene === 'edit_avatar_nickname') {
+        setTimeout(()=>{
+          uni.reLaunch({
+            url: '/pages/mine/subs/profile/index'
+          });
+        },500)
+      }
     }
   }
 
diff --git a/src/pages/mall/index.vue b/src/pages/mall/index.vue
index 1fea4c4..18c4d67 100644
--- a/src/pages/mall/index.vue
+++ b/src/pages/mall/index.vue
@@ -23,7 +23,7 @@
             <image class='goods-image' :src='item.images||defaultImage' />
             <text class='goods-name'>{{ item.goodsName || '未知' }}</text>
             <text class='goods-price'>¥{{ (item.price * ((userInfo.levelEntity?.discount || 100) / 100)).toFixed(2) }}
-              <text v-if='userInfo.levelEntity?.discount>0'
+              <text v-if='userInfo.levelEntity?.discount>0&&userInfo.levelEntity?.discount<100'
                     style='text-decoration: line-through;color: #999999;font-size: 25rpx'>¥{{ item.price }}
               </text>
             </text>
diff --git a/src/pages/mall/subs/goods/detail.vue b/src/pages/mall/subs/goods/detail.vue
index 70a90ba..65f1ec1 100644
--- a/src/pages/mall/subs/goods/detail.vue
+++ b/src/pages/mall/subs/goods/detail.vue
@@ -16,7 +16,7 @@
       <view class='c-flex-row'>
         <text class='goods-price accent-text-color'>
           ¥{{ ((goodsBean?.price || 0) * ((userInfo.levelEntity?.discount || 100) / 100)).toFixed(2) }}
-          <text v-if='userInfo.levelEntity?.discount>0'
+          <text v-if='userInfo.levelEntity?.discount>0&&userInfo.levelEntity?.discount<100'
                 style='display:unset;text-decoration: line-through;font-size: 30rpx;color: #999999'>
             ¥{{ goodsBean?.price || 0 }}
           </text>
@@ -57,7 +57,7 @@
             <image :src='item.images||defaultImage' />
             <text>{{ item.goodsName || '未知' }}</text>
             <text class='goods-price'>{{ (item.price * ((userInfo.levelEntity?.discount || 100) / 100)).toFixed(2) }}
-              <text v-if='userInfo.levelEntity?.discount>0'
+              <text v-if='userInfo.levelEntity?.discount>0&&userInfo.levelEntity?.discount<100'
                     style='text-decoration: line-through;font-size: 25rpx;color: #999999'>{{ item.price }}
               </text>
             </text>
diff --git a/src/pages/mall/subs/search/index.vue b/src/pages/mall/subs/search/index.vue
index aa9549a..fa4a1b0 100644
--- a/src/pages/mall/subs/search/index.vue
+++ b/src/pages/mall/subs/search/index.vue
@@ -14,7 +14,7 @@
           <image class='goods-image' :src='item.images||defaultImage' />
           <text class='goods-name'>{{ item.goodsName || '未知' }}</text>
           <text class='goods-price'>¥{{ (item.price * ((userInfo.levelEntity?.discount || 100)/100)).toFixed(2) }}
-            <text v-if='userInfo.levelEntity?.discount>0'
+            <text v-if='userInfo.levelEntity?.discount>0&&userInfo.levelEntity?.discount<100'
                   style='text-decoration: line-through;color: #999999;font-size: 25rpx'>¥{{ item.price }}
             </text>
           </text>
diff --git a/src/pages/mall/subs/shoppingcart/index.vue b/src/pages/mall/subs/shoppingcart/index.vue
index b0ee6ca..d837c49 100644
--- a/src/pages/mall/subs/shoppingcart/index.vue
+++ b/src/pages/mall/subs/shoppingcart/index.vue
@@ -26,7 +26,7 @@
               </view>
               <text style='margin-top: 50rpx'>
                 ￥{{ (item?.price * ((userInfo.levelEntity?.discount || 100) / 100)).toFixed(2) }}
-                <text v-if='userInfo.levelEntity?.discount>0'
+                <text v-if='userInfo.levelEntity?.discount>0&&userInfo.levelEntity?.discount<100'
                       style='text-decoration: line-through;color: #999999;font-size: 25rpx'>¥{{ item?.price }}
                 </text>
               </text>
diff --git a/src/pages/mine/subs/recharge/index.vue b/src/pages/mine/subs/recharge/index.vue
index c42decc..174c899 100644
--- a/src/pages/mine/subs/recharge/index.vue
+++ b/src/pages/mine/subs/recharge/index.vue
@@ -13,17 +13,30 @@
     </view>
 
     <view class='recharge-option-card'>
-      <text>充值金额</text>
-      <tabbar :titles='rechargeItems?.map(res=>res.rechargeamount)' @change='change' />
-      <view class='divider' />
-      <view class='option-item'>
-        <image :src='assetsUrl("bg_member_recharge_item.png")' />
-        <text>充值{{ rechargeItems[currentIndex]?.rechargeamount }}送{{ rechargeItems[currentIndex]?.rewardamount }}元
-        </text>
-        <text class='accent-text-color'>
-          实得{{ rechargeItems[currentIndex]?.rechargeamount + (rechargeItems[currentIndex]?.rewardamount) }}元
-        </text>
-      </view>
+      <view class='top-border'></view>
+      <text class='title'>充值金额</text>
+      <scroll-view scroll-y style='flex: 1;padding-bottom: 180rpx'>
+        <view class='option-item' :class="{'option-item-active': currentIndex==index}"
+              v-for='(item,index) in rechargeItems' :key='index' @click.stop='change(index)'>
+          <image v-if='currentIndex==index' class='checked-image' src='/static/images/ic_recharge_checked.png' />
+          <label class='amount-title'>{{ item.rechargeamount }}元</label>
+          <view class='divider' style='margin-bottom: 36rpx' />
+          <view class='card-view'>
+            <view class='title-container'>
+              <text>充值{{ item?.rechargeamount || 0 }}送{{ item?.rewardamount || 0
+                }}元
+              </text>
+              <text class='accent-text-color'>
+                实得{{ item?.rechargeamount + (item?.rewardamount) }}元
+              </text>
+            </view>
+            <text class='description'>送{{ item.rewardamount || 0 }}元、送{{ item.rewardcouponamount || 0
+              }}元优惠券共{{ item.rewardcouponnum || 0 }}张、
+              返利{{ item.rewardrefundamount || 0 }}元
+            </text>
+          </view>
+        </view>
+      </scroll-view>
     </view>
 
     <view class='bottom-button-view'>
@@ -47,7 +60,7 @@
 <script lang='ts' setup>
 import { assetsUrl } from '@/utils/assets';
 import { useUserStore } from '@/store';
-import { getRechargeList, preRecharge, recharge, rechargeVerify } from '@/api/user';
+import { getRechargeList, preRecharge, rechargeVerify } from '@/api/user';
 import { parseParameter, sortASCII } from '@/utils';
 import { hexMD5 } from '@/utils/common/md5';
 import { handlePayResult } from '@/utils/order';
@@ -55,12 +68,16 @@ import { handlePayResult } from '@/utils/order';
 const userState = useUserStore();
 const { userInfo, terminalInfo } = storeToRefs(userState);
 
+const rechargeOptionBackgroundUrl = assetsUrl('bg_member_recharge_item.png');
+
 const rechargeItems = ref<{
   itemid: string
   rechargeamount: number
   rewardamount: number
   rewardcouponamount: number,
-  rechargetype: number
+  rewardcouponnum: number
+  rechargetype: number,
+  rewardrefundamount: number
 }[]>([]);
 const currentIndex = ref<number>(0);
 const preRechargeOrderId = ref();
@@ -68,6 +85,12 @@ const preRechargeOrderId = ref();
 onLoad(async () => {
   const { ruleitems } = await getRechargeList();
   rechargeItems.value = ruleitems;
+  // rechargeItems.value.push(rechargeItems.value[0]);
+  // rechargeItems.value.push(rechargeItems.value[0]);
+  // rechargeItems.value.push(rechargeItems.value[0]);
+  // rechargeItems.value.push(rechargeItems.value[0]);
+
+  console.log(rechargeItems.value);
   await change(0);
 });
 
@@ -158,53 +181,109 @@ const goRecharge = async () => {
 .recharge-option-card {
   display: flex;
   flex-direction: column;
-  background: #FFFFFF;
-  border-radius: 30rpx 30rpx 0 0;
+  background: #F5F5F5;
   position: relative;
-  margin-top: -25rpx;
+  //margin-top: -25rpx;
 
-  text:nth-of-type(1) {
+  .top-border {
+    background: #FFFFFF;
+    height: 30rpx;
+    margin-top: -35rpx;
+    border-radius: 30rpx 30rpx 0 0;
+  }
+
+  .title {
     font-size: 30rpx;
     font-weight: bold;
     color: #333333;
-    margin-top: 20rpx;
-    margin-left: 30rpx;
+    background: #FFFFFF;
+    border-radius: 10rpx 10rpx 0 0;
+    padding: 10rpx 20rpx 20rpx 20rpx;
     margin-bottom: 20rpx;
+    margin-top: -15rpx;
   }
 
   .option-item {
     display: flex;
     flex-direction: column;
+    margin: 10rpx 20rpx 20rpx 20rpx;
+    background: #FFFFFF;
+    border-radius: 20rpx;
+    padding-top: 20rpx;
+    box-sizing: border-box;
+    border: solid #00000000 2rpx;
     position: relative;
-    margin: 36rpx 20rpx;
 
-    image {
+    .amount-title {
+      font-weight: bold;
+      font-size: 40rpx;
+      width: fit-content;
+      color: #333333;
+      margin-left: 30rpx;
+    }
+
+    .amount-title:after {
+      content: "";
+      display: block;
+      border: 2rpx solid black;
+    }
+
+    .checked-image {
+      width: 70rpx;
+      height: 70rpx;
+      position: absolute;
+      right: 0;
+      top: 0;
+      border-radius: 0 18rpx 0 0
+    }
+
+    .card-view {
+      display: flex;
+      flex-direction: column;
       width: 100%;
       height: 167rpx;
       border-radius: 20rpx;
-    }
-
-    text:nth-of-type(1) {
-      font-size: 36rpx;
+      //background-image: url(v-bind(rechargeOptionBackgroundUrl));
+      background-image: url('https://img.lakeapp.cn/wx/images/bg_member_recharge_item.png');
+      background-size: 100% 100%;
+      justify-content: flex-start;
       color: #FFFFFF;
-      margin-top: 27rpx;
-      margin-left: 30rpx;
-      position: absolute;
-    }
 
-    text:nth-of-type(2) {
-      display: flex;
-      font-size: 30rpx;
-      margin-top: 85rpx;
-      margin-left: 30rpx;
-      align-items: center;
-      justify-content: center;
-      width: 185rpx;
-      height: 50rpx;
-      background: #FFFFFF;
-      border-radius: 25rpx;
-      position: absolute;
+      .title-container {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: space-between;
+        margin-top: 27rpx;
+        padding: 0 30rpx;
+
+        text:nth-of-type(1) {
+          display: flex;
+          font-size: 36rpx;
+        }
+
+        text:nth-of-type(2) {
+          display: flex;
+          font-size: 30rpx;
+          align-items: center;
+          justify-content: center;
+          width: 185rpx;
+          height: 50rpx;
+          background: #FFFFFF;
+          border-radius: 25rpx;
+        }
+      }
+
+      .description {
+        margin-top: 30rpx;
+        margin-left: 30rpx;
+      }
     }
   }
+
+  .option-item-active {
+    @extend .option-item;
+    border: 2rpx solid #f95e5d;
+  }
 }
 </style>
diff --git a/src/static/images/ic_recharge_checked.png b/src/static/images/ic_recharge_checked.png
new file mode 100644
index 0000000000000000000000000000000000000000..e6e5ad32bb90f9e6666c3db47acebcf1803023c6
GIT binary patch
literal 2382
zcmW+&dpuO>AAZl7VTMLcV|JT~)}S;MH5$pxpiva+6H4qZ*~ul>sW9a_<Cw@KwXz#Y
zG=;W{rZ%@s2wBM`mlZLwD=L!E$Qak(+20@M{eGVFJn#EF-}gPA_jAs>9^9v+y;d6l
zpyT9de+aF}e-B<09iQ7CYeowcd1&8mAbX`h3V;^g$==RA+GqT&Fl_y4DsFOusp#*m
z`^)%~!P<NhDgS)xIokP!o1_S$j#<?yof$b(F*HopHUEQdxUY^{tCDuuHzsqQGQ9?3
zxl>Zg9;2o3K{L{K?iMC_hO@iVYK;S<%Eqk+EG;s9qEy*gxw%<^%l#7*svKdSOF}V+
z<Ms7(pBY$}WSi=d_>cPE{H~bSsnVdTgvD>9MZOMVM5lx61M@qp1^rs7xIrBt*ysvk
z+4QT4%rijf;%W*Vg+@lD6k;swidFAxUxOGm?u1tZhxA{tz95x$0}n$ev4==Oi8W$Z
zK(-SRlQgCHuZc7gsuE%^Lv(SNu|xwga?}v(+Ap*^=f^Y_k1K_fzeAsKycxFq4WNq$
z4S5Y1@6G)THYd(^$nE;Q*IOy(BW~d2*cri}sP#)@9&al7(@1@C%1X17rSd=p2NE&N
z(F80kVc}iZy<Jn86&1hrdmO!%&FY!-T+X1Q?pQcBBqk=tS7D=CDDDY)c;Mg(h3(Hm
zvv82glj21~dWGj(KQ27*@Rq&aI-|q3C8O_Y_$6#Z(x^Nkz2(d62PtgzO|-!bODE<u
z>B_?SCYNh%PJ5#>PlF^c-FeEJP{XSC-kp!XP~jy9{{z44U6d)*4ISgL<Lu*e;m?lv
zEmQ8`=dM_HDVKL}Ju}yR41XEaR`yVH*2l@x4c+JTlHoK0bIQK7W8tp9;J&Sp`sbg3
z=bquBj~Jzw1o)k^<+EQ2Gu-&i^7f6U#L1OT)xS}-fdegcmHCXjca%qlPhau8wO?Tg
zsKaege`{$+_i})5^sdcwZ7XMe>#%UXY+HHe54OU9$)St|y_qa2=H08YKh83@G)cF4
zuKRc<_<>8pyoy%CDO9^d?YX?e3d+tLSzJy@_PG4?8s?0%GADA6jYgO?rC+Oi;Bx<Q
z%eOg&tzo@0QCjh5EuJ0Ox&x$E>oSJskMt~Nlw|w#%eB%@Ix71k?!xH|@%M->b|EEE
z1)?Lne9x_GOXA$uQL#s7%lHYIwNcK>s))OobfVbv<&RYb+v8LZdoB$1b}s^xA$rIo
z){|rGR_Z9F?Xij7h<>Q)ukJ9#0{%O^Jib3KK)4P&#j=XUjfnmZmu0>xcE3?wQr`e$
z6a{{B?+>lux#FGuy;+?>f~umvvT*~(?1e?`HR_l;^Wwov`#%P^eO_YB7p6d!``LRl
z_U}L-npH6S%Zw;FSkZk<Q#P8lV%{41HS1z0rS;XBfs|?CWS-4L*h85<X7XnBAd=XH
zk?2Cuvj<kPJCeMkIk+Itn%J3(x+AlPVuIu62h|BG9n5S>K(27*AO*^D{A$O{2E;A!
z^JjOqb5unIu6g`LLe2Y(qV;={K6+ejXp6X>wLx9l!~bcY-4o|)tFAQ@kT*o)_bunP
zREPDIJs2W*>z6$88ve!q#*2HcA8r&zmh#7lm>y^4v50J#s0U9%e+Q>-yA@sb%^F#i
zwCPkJfw|<oA))1Z?pTX)Y;@V88FG@GY@D<mN85_E4Vt(!q<^{Vl4_iDzyIes8zgG~
zS3M@7(idsid`X!mDDo_?)@~>-RMRUCz!I(6&CG`TvZwS-|K9z1d_3TJbYiWYj8c7^
z(a<ED-~V!L?t!N##seCTcE)#kABXCb{tfsVQ`t!#2;eZk*%oEy;W{MJ$t{G0%1<pe
zCXF%&>$upBJi#J0OOQvaIDnDhpyiOiUcBjT{qWC*<WR+o13@G|nHhd%RQ~Sx)}Ao~
zW$#3Mcf#R+D*OokKX9$_BW~!Kr+1egxj#-jD;n70;?2}+WsS!BR4s`fE#r~MLce!S
z?_sV!UUKS5=c!%BW<`N66L6ZkH3t60EBxBK$l1QQ3nZJmv=s%RFS46;5Gx|K$}pd=
z=wZxG#_qujgnxyL*7J!j2R$m?A}@2ZoL|)EHh+i87$b8bh)LO}ZjtZX6T}myJKs)V
zgWD&o#Y@X>A6BA{+{)%K3xjma;z&-;sKqmr)~JXF^3ynT+co|zw8s@#B1Y_~)BZ=(
zCFL+J6}?})YONTOinFh>y?{9_x?`vFjo%kEcR6+_PKWMd)|bcQvN;DVd%!ItUW4xO
z`=?p0ZRO9&QOc`j{2r?5T%n8pnA3+w8{`h2`=lrA$>9v&nWmDkd2Kjq>vX{<H#~4#
zjjalZi%iMl&*$4dQRY5p-Tk!0NYH1e?Y37>Y3U{u_63Qyjf9tnl&VM_M);2!>vHU?
z8JwC}^L!cz>JwalT6mGg+VQPBB*6bN)!_0aC$^^*SnYyqK3AJ{B{0WjI+TnV?(Oy?
z519olb`zBGhLF8oP0jwvn0=+a3w{s9ab>U7+k>L6-d@kT{Rprfd>)75blS}fwU-0|
z1(jzn>Gys$V3hI4QV8*e^_AyWZL&au@FRvZi#e7P*u0}0$*DV}lcK=dI*ddtRX$X3
zt>p41)fH!fZTx5dx{c>LU#4H!jP$HnGbkWFo*t##2A0z|C3tep?OpY^3|)cO=X!_T
zQXs#cdO^&ErlYrcV6ocLww$R-V^<({@r&6j1z2#)+mv*0SIJcv?>cAw1*=U1$o~rs
zsYKT>1jAa1FkXwc4NvA`K@3+4jNnE#tU<&ersy)}P~&D47$c@eD8MwXg*6xe{Dj(S
zVrg5@ECBL{5@8AhDM8g*z>x`Sq!W=6RILR&8lwPZP@g>@-2|)6a|E4eRKjZRS|S}W
z#850z0SunoOTi(S_aho16%a6qup<>ISWQRBup<ctn~(xjO~yFFC}1IWs1X$~9MM*c
zfo3un^2gWEP(d0b(MyCIX^0g%H4T=mKmh~&v{8VOq;jEQz$K$|Hi9}d91A9DqC6Fm
zqNXb$teq4@XmkHlQ4lOjun-YSKwui}R2!D+!5XeK;Dt7#fq6ttgy}ToBFfuAMaHuR
Zfm=LC$2R@gi~b-1Cx?UfvfVuK{{X5Y8uI`E

literal 0
HcmV?d00001