lex-xin 3 months ago
parent
commit
19aedf0f03

+ 3 - 3
miniprogram/components/navigation-bar/navigation-bar.ts

@@ -67,9 +67,9 @@ Component({
       // console.log(wxWindowInfo, wxDeviceInfo, 'wxDeviceInfo----')
       this.setData({
         ios: !isAndroid,
-        innerPaddingRight: `padding-right: ${wxWindowInfo.windowWidth - rect.left}px`,
-        leftWidth: `width: ${wxWindowInfo.windowWidth - rect.left }px`,
-        safeAreaTop: isDevtools || isAndroid ? `height: calc(var(--height) + ${wxWindowInfo.safeArea.top}px); padding-top: ${wxWindowInfo.safeArea.top}px` : ``
+        innerPaddingRight: `padding-right: ${wxWindowInfo.windowWidth - rect.left}px;`,
+        leftWidth: `width: ${wxWindowInfo.windowWidth - rect.left }px;`,
+        safeAreaTop: isDevtools || isAndroid ? `height: calc(var(--height) + ${wxWindowInfo.safeArea.top}px); padding-top: ${wxWindowInfo.safeArea.top}px;` : ``
       })
     },
   },

+ 2 - 2
miniprogram/pages/download/download.ts

@@ -13,7 +13,7 @@ Page({
    */
   onLoad() {
     const wxDeviceInfo = wx.getDeviceInfo()
-    const isAndroid = wxDeviceInfo.platform === 'android'
+    const isAndroid = wxDeviceInfo.platform === 'android' || wxDeviceInfo.platform === 'devtools'
     this.setData({
       isIOS: !isAndroid
     })
@@ -27,7 +27,7 @@ Page({
   },
   onDownload() {
     wx.downloadFile({
-      url: 'https://oss.dayaedu.com/ktyq/1733277847031.png',
+      url: 'https://oss.dayaedu.com/ktyq/1733293069841.png',
       success: (res) => {
         wx.saveImageToPhotosAlbum({
           filePath: res.tempFilePath,

+ 1 - 1
miniprogram/pages/download/download.wxml

@@ -6,7 +6,7 @@
       <view class="container">
         <view class="section">
           <image src="https://oss.dayaedu.com/ktyq/1733226456374.png" class="qrCodeImg"></image>
-          <image wx:if="isIOS" mode="widthFix" src="https://oss.dayaedu.com/ktyq/1733230943390.png" class="func"></image>
+          <image wx:if="{{isIOS}}" mode="widthFix" src="https://oss.dayaedu.com/ktyq/1733230943390.png" class="func"></image>
           <image wx:else mode="widthFix" src="https://oss.dayaedu.com/ktyq/1733233798354.png" class="func"></image>
         </view>