Merge remote-tracking branch 'origin/master'

app.js

@@ -13,6 +13,25 @@ const hostConfig = {
 }
 App({
   onLaunch(options) {
+    const updateManager = wx.getUpdateManager();
+    debugger;
+    updateManager.onCheckForUpdate(function(res) {
+      // 请求完新版本信息的回调
+      console.log(res.hasUpdate);
+    });
+      updateManager.onUpdateReady(function() {
+      wx.showModal({
+        title: "更新提示",
+        content: "新版本已经准备好，是否重启应用？",
+        success: function(res) {
+          if (res.confirm) {
+            // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+            updateManager.applyUpdate();
+          }
+        },
+      });
+    });
+    updateManager.onUpdateFailed(function() {});
     const ACCOUNT_INFO = wx.getAccountInfoSync();
     const ENV_VERSION = ACCOUNT_INFO.miniProgram.envVersion;
     const baseIp = ipConfig[ENV_VERSION || develop];

pages/lijijiaofei/lijijiaofei.js

@@ -203,7 +203,7 @@ Page({
       },
       data: {
         openId: app.globalData.userWxInfo.openid,
-        totalAmount: this.data.amount*100,
+        totalAmount: totalAmount*1000/10,
         dskey: app.globalData.currentAccountInfo.dsKey,
         zdId: this.data.zdId,
         userNumber: app.globalData.currentAccountInfo.usernumber