diff --git a/app.js b/app.js index a170520..2cce52c 100644 --- a/app.js +++ b/app.js @@ -1,5 +1,6 @@ const Http = require("./utils/HttpBasics.js") const config = require("./config/config.js"); + App({ data: {}, globalData: { @@ -21,10 +22,10 @@ App({ nickName: "", //用户姓名 templateId: [], //订阅消息模板id ifshowtab: false, - version: "2.9.1" }, onLaunch: function () { let that = this + tt.setStorageSync('locationFlag', true); try { var res = tt.getSystemInfoSync(); diff --git a/config/config.js b/config/config.js index 5aeb8ed..8e376cf 100644 --- a/config/config.js +++ b/config/config.js @@ -1,6 +1,5 @@ const extConfig = tt.getExtConfigSync ? tt.getExtConfigSync().extConfig : {} let weappId = extConfig.weappId; -console.log(extConfig, "configUrls"); let configUrls = extConfig.attr.configUrl; var config = { diff --git a/ext.json b/ext.json index e765f19..ae04bf2 100644 --- a/ext.json +++ b/ext.json @@ -1,7 +1,8 @@ { "ext": { "attr": { - "configUrl": "https://ctest.malls.iformall.com/C/api" + "configUrl": "https://ctest.malls.iformall.com/C/api", + "version": "2.9.1" }, "name": "富茂家政", "weappId": "tt90b5e6080f896bde01" diff --git a/index/index.js b/index/index.js index fb9b5f4..9e158ef 100644 --- a/index/index.js +++ b/index/index.js @@ -11,7 +11,7 @@ const QR = require("../utils/memberqrcode.js"); const util = require("../utils/util"); const bgColor = require("../utils/bgColor.js") let app = getApp(); -const updateManager = tt.getUpdateManager(); +const updateManager = tt.getUpdateManager() Page({ data: { userAvatarUrl: '', @@ -917,7 +917,18 @@ Page({ }, 1000) setTimeout(() => { - console.log('onCheckForUpdate'); + const getEnvInfoSync = tt.getEnvInfoSync() + const envType = getEnvInfoSync.microapp.envType + console.log(envType, 'envType'); + if (envType == 'development') return + + if (envType == 'preview') { + tt.showToast({ + title: 'preview mode', + icon: "success" + }); + } + updateManager.onCheckForUpdate(res => { console.log(res, 'onCheckForUpdate'); if (res.hasUpdate) { @@ -936,7 +947,6 @@ Page({ } }); }, 2500); - }, diff --git a/index/user.js b/index/user.js index f84d40d..65f19c2 100644 --- a/index/user.js +++ b/index/user.js @@ -3,6 +3,8 @@ const navigationBarHeight = (getApp().statusBarHeight + 50) + "px"; const Http = require("../utils/HttpBasics"); const config = require("../config/config"); const imgurl = require("../utils/imgurl"); + + Page({ data: { navigationBarHeight, diff --git a/index/user.ttml b/index/user.ttml index 5cbeccf..4f0d05d 100644 --- a/index/user.ttml +++ b/index/user.ttml @@ -83,7 +83,7 @@ - Version {{ version }} + Version 2.9.1 diff --git a/pages2/appointment/appointment.js b/pages2/appointment/appointment.js index ee9d924..7467797 100644 --- a/pages2/appointment/appointment.js +++ b/pages2/appointment/appointment.js @@ -253,20 +253,20 @@ Page({ that.setData({ isDetail: true }) - tt.showToast({ - title: '请点击右上角:更多-权限设置-开启地理位置授权', - icon: 'none', - duration: 4000, - success: () => { - setTimeout(() => { - tt.showToast({ - title: '或直接填写详细地址', - icon: 'none', - duration: 3000, - }); - }, 4000); - } + + tt.showModal({ + title: '提示', + content: '请点击右上角:更多-权限设置-开启地理位置授权,或直接填写详细地址', + showCancel: false, + confirmText: "知道了", + success: (res) => { + + }, + fail: (res) => { + + }, }); + }, complete: function (data) {} }) diff --git a/pages2/shopSelect/shopSelect.js b/pages2/shopSelect/shopSelect.js index fa07fb2..9ae4bec 100644 --- a/pages2/shopSelect/shopSelect.js +++ b/pages2/shopSelect/shopSelect.js @@ -330,6 +330,7 @@ Page({ currentTag: id, toView: id }) + tt.vibrateShort() }, goSetShop(e) {