Merge branch 'jyb_20250506_dev' into test

pages/login.vue

@@ -18,7 +18,7 @@
     <image src="/static/13779@1x.png" mode="widthFix" class="house-illustration"></image>
 
     <view class="actions-container">
-      <up-button @click="onLogin" :customStyle="WeChat">微信授权登录{{ sceneIfon }}</up-button>
+      <up-button @click="onLogin" :customStyle="WeChat">微信授权登录</up-button>
       <view class="xieyi text-center">
         <up-checkbox-group v-model="checkboxValue">
           <up-checkbox label="我已认真阅读、理解并同意" name="agree" usedAlone @change="onCheckboxChange" class="text-grey1">
@@ -61,16 +61,13 @@ const globalData = ref({
   navBarHeight: 91,
 })
 
-// const codeUrl = ref(""); // Not used in the new design
-// const captchaEnabled = ref(true); // Not used in the new design
 
 const router = useRouter()
-const sceneIfon = ref('')
+
 // 获取小程序码参数
 onLoad((options) => {
   // 处理从二维码扫描进入的场景
   // debugger
-  sceneIfon.value = options.scene
   // if (options.scene) {
     console.log('options.scene:>>>>>>>123123s', options.scene)
     const scene = decodeURIComponent(options.scene)
@@ -259,11 +256,8 @@ const backClick =() =>{
   z-index: 99;
 }
 .normal-login-container {
-  // border: 2px solid red;
   width: 100vw;
   height: 100vh;
-  // width: 100vw;
-  // height: 100vh;
   border-radius: 48rpx;
   background: linear-gradient(156deg, #f5c954 -4%, #f66c44 110%);
   position: relative;

pages_mine/pages/integral/index.vue

@@ -13,7 +13,7 @@
         </view>
       </view>
       <view class="integral-rate-row">
-        <view class="integral-rate">1积分=1人民币</view>
+        <view class="integral-rate">1积分可兑换1人民币的商品</view>
         <view class="integral-desc" @click="open" style="cursor: pointer;">收益说明
           <up-icon name="question-circle"></up-icon>
         </view>