Merge remote-tracking branch 'origin/master'

pages/login/phone.js

@@ -4,8 +4,7 @@ Page({
         disabled: true, //是否禁用
         loading: false, //登陆中
         register: null,
-        showDialog: false,
-        showLogo: false
+        showDialog: false
     },
     async onLoad() {
         if (wx.getStorageSync('isAgree')) this.setData({
@@ -14,15 +13,6 @@ Page({
         this.setData({
             devCount: 0,
         })
-        const deviceInfo = wx.getDeviceInfo();
-        this.setData({
-            showLogo: !deviceInfo.system.includes("iOS 26")
-        })
-        if (this.data.showLogo) setTimeout(() => {
-            this.setData({
-                showLogo: true
-            })
-        }, 1500)
     },
     /* 修改授权 */
     isAgreeChange() {

pages/login/phone.wxml

@@ -1,5 +1,5 @@
 <view class="logo">
-	<image wx:if="{{showLogo}}" src="/static/image/logo.png" bindtap="todev" />
+	<image src="/static/image/logo.jpg" bindtap="todev" />
 </view>
 
 <!-- 手机号登录  -->