From 994cbce56bb39511f454db36e24ea5b27b1fb630 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Tue, 22 Nov 2022 16:25:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=A0=81=E3=80=81=E4=BB=98?=
 =?UTF-8?q?=E6=AC=BE=E7=A0=81=E5=B1=8F=E5=B9=95=E8=B0=83=E4=BA=AE=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/login/login.vue                         |  1 -
 .../member-code/member-code.vue               | 25 ++++++++++++-------
 .../wallet/payment-code/payment-code.vue      | 25 ++++++++++++-------
 3 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/pages/login/login.vue b/pages/login/login.vue
index defb4747..af287bf8 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -380,7 +380,6 @@
         components: {
             componentPopup
         },
-        props: {},
 
         // 页面加载初始化
         onLoad(params) {
diff --git a/pages/plugins/membershiplevelvip/member-code/member-code.vue b/pages/plugins/membershiplevelvip/member-code/member-code.vue
index 553b1207..5a62a42e 100644
--- a/pages/plugins/membershiplevelvip/member-code/member-code.vue
+++ b/pages/plugins/membershiplevelvip/member-code/member-code.vue
@@ -20,7 +20,7 @@
             <view class="bottom-fixed padding-main">
                 <view class="bg-gray round oh">
                     <button type="default" class="bg-main br-main cr-white round text-size fl" size="mini">会员码</button>
-                    <button type="default" class="bg-gray br-gray cr-base round text-size fr" size="mini" data-value="/pages/plugins/wallet/payment-code/payment-code" data-redirect="1" @tap="url_event">钱包付款码</button>
+                    <button type="default" class="bg-gray br-gray cr-base round text-size fr" size="mini" :data-value="'/pages/plugins/wallet/payment-code/payment-code?screen_brightness_value='+screen_brightness_value" data-redirect="1" @tap="url_event">钱包付款码</button>
                 </view>
             </view>
         </block>
@@ -61,17 +61,24 @@
             componentNoData
         },
 
-        onShow() {
+        // 页面加载初始化
+        onLoad(params) {
             // 获取屏幕亮度
             // #ifndef H5
             var self = this;
-            uni.getScreenBrightness({
-            	success: function (res) {
-                    self.setData({
-                        screen_brightness_value: res.value
-                    });
-            	}
-            });
+            if((params || null) != null && (params.screen_brightness_value || null) == null) {
+                uni.getScreenBrightness({
+                    success: function (res) {
+                        self.setData({
+                            screen_brightness_value: res.value
+                        });
+                    }
+                });
+            } else {
+                self.setData({
+                    screen_brightness_value: params.screen_brightness_value
+                });
+            }
             // #endif
 
             // 数据加载
diff --git a/pages/plugins/wallet/payment-code/payment-code.vue b/pages/plugins/wallet/payment-code/payment-code.vue
index aa67d78e..b588acec 100644
--- a/pages/plugins/wallet/payment-code/payment-code.vue
+++ b/pages/plugins/wallet/payment-code/payment-code.vue
@@ -22,7 +22,7 @@
             <!-- 导航 -->
             <view class="bottom-fixed padding-main oh">
                 <view class="bg-gray round oh">
-                    <button type="default" class="bg-gray br-gray cr-base round text-size fl" size="mini" data-value="/pages/plugins/membershiplevelvip/member-code/member-code" data-redirect="1" @tap="url_event">会员码</button>
+                    <button type="default" class="bg-gray br-gray cr-base round text-size fl" size="mini" :data-value="'/pages/plugins/membershiplevelvip/member-code/member-code?screen_brightness_value='+screen_brightness_value" data-redirect="1" @tap="url_event">会员码</button>
                     <button type="default" class="bg-main br-main cr-white round text-size fr" size="mini">钱包付款码</button>
                 </view>
             </view>
@@ -65,17 +65,24 @@
             componentNoData
         },
 
-        onShow() {
+        // 页面加载初始化
+        onLoad(params) {
             // 获取屏幕亮度
             // #ifndef H5
             var self = this;
-            uni.getScreenBrightness({
-            	success: function (res) {
-                    self.setData({
-                        screen_brightness_value: res.value
-                    });
-            	}
-            });
+            if((params || null) != null && (params.screen_brightness_value || null) == null) {
+                uni.getScreenBrightness({
+                    success: function (res) {
+                        self.setData({
+                            screen_brightness_value: res.value
+                        });
+                    }
+                });
+            } else {
+                self.setData({
+                    screen_brightness_value: params.screen_brightness_value
+                });
+            }
             // #endif
 
             // 数据加载