From aea82fc6285fd37a33e0efd6cd0e5089dfa32faf Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 01 九月 2025 22:05:58 +0800
Subject: [PATCH] Merge branch 'dev_fix_sub' of http://42.193.1.25:9521/r/lmk-shop-wx into dev_fix_sub

---
 pages/tabbar/user/my.vue |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/pages/tabbar/user/my.vue b/pages/tabbar/user/my.vue
index dc9f101..6552fd3 100644
--- a/pages/tabbar/user/my.vue
+++ b/pages/tabbar/user/my.vue
@@ -17,7 +17,7 @@
       </view>
       <u-icon style="display: flex;align-items: flex-start;" name="arrow-right"></u-icon>
     </view>
-	
+	<!-- <button  type="default" @click="goTOSuccess">绔嬪嵆鏌ョ湅</button> -->
 	<view class="member-gradient-bg">	
 	 <view class="member-content">
 	      <view class="vip-icon">
@@ -130,8 +130,10 @@
 	</view>
     <!-- 鎾戣捣涓嬫柟 -->
 	<view style="height:64px;">
+		
 	</view>
   <custom-tabbar bgColor="#ffffff" selected="my"></custom-tabbar>
+  
   </view>
 </template>
 <script>
@@ -188,6 +190,13 @@
 
   mounted() { },
   methods: {
+	  // goTOSuccess(){
+	  // 		 uni.redirectTo({
+	  // 		    url:"/pages/cart/payment/success?paymentMethod=WECHAT" +
+	  // 		             "&payPrice=" +
+	  // 		             10,
+	  // 		         });
+	  // },
 	  // 鍒濆鍖栬吘璁簯cos瀹㈡埛绔�
 	  initCOS() {
 		  // 璋冪敤鍚庣鑾峰彇sts涓存椂璁块棶鍑瘉
@@ -233,6 +242,7 @@
 </script>
 
 <style lang="scss" scoped>
+	@import url("/pages/subComponents/static/bgStyle.css");
 html,
 body {
   overflow: auto;
@@ -324,7 +334,7 @@
     background-size: cover;
     border-bottom-left-radius: 30rpx;
     border-bottom-right-radius: 30rpx;
-    background-image: url("/pages/subComponents/static/img/main-bg.png");
+    background-image: var(--main-bg);
     background-position: bottom;
     background-repeat: no-repeat;
     color: #ffffff;
@@ -433,7 +443,6 @@
 	background: #fff;
 	border-radius: 20rpx;
 	box-shadow: 0 4rpx 24rpx 0 #f6f6f6;
-    transform: translateY(-30rpx);
 }
 
 .user-name {

--
Gitblit v1.8.0