优化加桌提醒弹窗

app.js

@@ -14,10 +14,7 @@ App({
   onLaunch() {
     this.checkIsIos()
     this.getNavbarInfo()
-    let {
-      scene
-    } = wx.getLaunchOptionsSync()
-    this.globalData.scene = scene
+
   },
   async onShow(options) {
     this.storeBindings = createStoreBindings(this, {
@@ -63,6 +60,11 @@ App({
         if (res.system.search('iOS') != -1) {
           this.globalData.isIOS = true
         }
+        let {
+          scene
+        } = wx.getLaunchOptionsSync()
+        // 1023	安卓系统桌面图标,1104微信聊天主界面下拉，「我的小程序」栏（基础库2.2.4-2.29.0版本废弃，2.29.1版本起生效） 
+        this.globalData.desktopTips = this.globalData.isIOS ? scene != 1104 : scene != 1023
       }
     })
   },
@@ -80,7 +82,7 @@ App({
   globalData: {
     userInfo: null,
     isIOS: false, // 判断设备是否为苹果
-    scene: '', // 1023	安卓系统桌面图标,1104微信聊天主界面下拉，「我的小程序」栏（基础库2.2.4-2.29.0版本废弃，2.29.1版本起生效）
+    desktopTips: false,
     navBarHeight: 0, // 导航栏高度
     menuRight: 0, // 胶囊距右方间距（方保持左、右间距一致）
     menuTop: 0, // 胶囊距底部间距（保持底部间距一致）

components/uploadFile/index.wxml

@@ -7,8 +7,7 @@
   </view>
 </view>
 <!-- 上传成功 -->
-<!-- <view class="uploadBox successBox" wx:if="{{uploadSuccess}}" catchtap="cancelMask"> -->
-<view class="uploadBox successBox" catchtap="cancelMask">
+<view class="uploadBox successBox" wx:if="{{uploadSuccess}}" catchtap="cancelMask">
   <view class="success" catchtap="true">
     <image src="/static/lan.png" class="icon" mode="" />
     <view class="tips1">作品上传成功</view>

pages/index/index.js

@@ -23,8 +23,8 @@ Page({
     currentType: '1',
     // 控制一级分类是否固定
     isFixed: false,
-    desktopTips: false,
-    isIOS: false,
+    desktopTips: app.globalData.desktopTips,
+    isIOS: app.globalData.isIOS,
     categoryList: []
   },
   /**
@@ -52,17 +52,10 @@ Page({
          this.getLocUserInfo()
          this.resetData()
        } */
-    // 1023	安卓系统桌面图标,1104微信聊天主界面下拉，「我的小程序」栏（基础库2.2.4-2.29.0版本废弃，2.29.1版本起生效）
     let {
-      isIOS,
-      scene
+      desktopTips
     } = app.globalData
-    let desktopTips = isIOS ? scene != 1104 : scene != 1023
     if (desktopTips) {
-      this.setData({
-        isIOS,
-        desktopTips
-      })
       setTimeout(() => {
         this.setData({
           desktopTips: false

pages/score/index.js

@@ -63,50 +63,50 @@ Page({
           pic.src = video.coverImg; //可以是本地，也可以是网络图片
           pic.onload = () => {
             ctx.drawImage(pic, 0, 0, 375, 211);
-          }
-          let peiyin = canvas.createImage();
-          peiyin.src = '/static/peiyin.jpg';
-          peiyin.onload = () => {
-            ctx.drawImage(peiyin, 0, 211, 375, 89);
-            //分享
-            let fx = canvas.createImage();
-            fx.src = '/static/share.png'
-            fx.onload = () => {
-              ctx.drawImage(fx, 12, 220, 20, 20)
-              ctx.fillText('分享', 36, 238)
-              // 收藏，一个一个渲染
-              let sc = canvas.createImage();
-              sc.src = '/static/no_collect.png'
-              sc.onload = () => {
-                ctx.drawImage(sc, 110, 220, 19, 19)
-                ctx.fillText('收藏', 134, 238)
-                //点赞
-                let dz = canvas.createImage();
-                dz.src = '/static/heart.png'
-                dz.onload = () => {
-                  ctx.drawImage(dz, 228, 222, 22, 22)
-                  ctx.fillText(0, 254, 238)
-                  // 评论
-                  let pl = canvas.createImage();
-                  pl.src = '/static/comment.png'
-                  pl.onload = () => {
-                    ctx.drawImage(pl, 318, 222, 22, 22)
-                    ctx.fillText( 0, 340, 238)
-                    setTimeout(() => {
-                      wx.canvasToTempFilePath({
-                        canvas: canvas,
-                        success(res) {
-                          resolve({
-                            title: '请欣赏我的课文朗读作品，点赞+评论。',
-                            path: `/pages/index?readId=${video.id}&uid=${wx.getStorageSync('uid')}`,
-                            imageUrl: res.tempFilePath
-                          })
-                        },
-                        fail(res) {
-                          reject()
-                        }
-                      }, this)
-                    }, 500)
+            let peiyin = canvas.createImage();
+            peiyin.src = '/static/peiyin.jpg';
+            peiyin.onload = () => {
+              ctx.drawImage(peiyin, 0, 211, 375, 89);
+              //分享
+              let fx = canvas.createImage();
+              fx.src = '/static/share.png'
+              fx.onload = () => {
+                ctx.drawImage(fx, 12, 220, 20, 20)
+                ctx.fillText('分享', 36, 238)
+                // 收藏，一个一个渲染
+                let sc = canvas.createImage();
+                sc.src = '/static/no_collect.png'
+                sc.onload = () => {
+                  ctx.drawImage(sc, 110, 220, 19, 19)
+                  ctx.fillText('收藏', 134, 238)
+                  //点赞
+                  let dz = canvas.createImage();
+                  dz.src = '/static/heart.png'
+                  dz.onload = () => {
+                    ctx.drawImage(dz, 228, 222, 22, 22)
+                    ctx.fillText(0, 254, 238)
+                    // 评论
+                    let pl = canvas.createImage();
+                    pl.src = '/static/comment.png'
+                    pl.onload = () => {
+                      ctx.drawImage(pl, 318, 222, 22, 22)
+                      ctx.fillText(0, 340, 238)
+                      setTimeout(() => {
+                        wx.canvasToTempFilePath({
+                          canvas: canvas,
+                          success(res) {
+                            resolve({
+                              title: '请欣赏我的课文朗读作品，点赞+评论。',
+                              path: `/pages/index?readId=${video.id}&uid=${wx.getStorageSync('uid')}`,
+                              imageUrl: res.tempFilePath
+                            })
+                          },
+                          fail(res) {
+                            reject()
+                          }
+                        }, this)
+                      }, 500)
+                    }
                   }
                 }
               }