diff --git a/app.js b/app.js index a7b0239..699f959 100644 --- a/app.js +++ b/app.js @@ -63,7 +63,10 @@ App({ } else { this.globalData.origion = 0; }; - this.imLogin(options); + if(this.isHasToken()){ + this.imLogin(options); + } + }, method: router, @@ -160,6 +163,20 @@ App({ onKickOut(event) { this.handleLogout(); }, + isHasToken(){ + let token=''; + const { envVersion } = wx.getAccountInfoSync().miniProgram; + if(envVersion=='release'){ + token = wx.getStorageSync('AUTH_TOKEN'); + }else{ + token = wx.getStorageSync('DEV_AUTH_TOKEN'); + } + if(token){ + return true + }else { + return false; + } + }, async handleLogout() { if (wx.$TUIKit) { wx.$TUIKit.destroy(); diff --git a/assets/images/cert.png b/assets/images/cert.png new file mode 100644 index 0000000..adf2ed4 Binary files /dev/null and b/assets/images/cert.png differ diff --git a/pages/index/index.js b/pages/index/index.js index 5581de8..074f3aa 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -48,6 +48,12 @@ Page({ } }), goH5:throttle(function(event){ + if(!this.isHasToken()){ + wx.reLaunch({ + url: '/patient/pages/login/login', + }) + return + } let {url,name,type,title}=event.currentTarget.dataset; if(url.indexOf("http")!=-1){ let urlName=(decodeURIComponent(url)) @@ -150,9 +156,18 @@ Page({ }) }, goMydoctor:throttle(function(){ - app.method.navigateTo({ - url: '/patient/pages/myDoctor/myDoctor', - }) + if(!this.isHasToken()){ + wx.reLaunch({ + url: '/patient/pages/login/login', + }) + + } + + app.method.navigateTo({ + url: '/patient/pages/myDoctor/myDoctor', + }) + + }), onConfirmEntry(){ @@ -192,12 +207,24 @@ Page({ wx.exitMiniProgram({success: (res) => {}}) }, goAgreement:throttle(function(event){ + if(!this.isHasToken()){ + wx.reLaunch({ + url: '/patient/pages/login/login', + }) + + } let id=event.currentTarget.dataset.id; app.method.navigateTo({ url:"/patient/pages/linkPage/linkPage?url="+encodeURIComponent(urlHost+'/basic/file/agreement.htm?id='+id) }) }), goCheck:throttle(function(){ + if(!this.isHasToken()){ + wx.reLaunch({ + url: '/patient/pages/login/login', + }) + + } // let that=this; // wx.scanCode({ // onlyFromCamera: true, @@ -218,6 +245,12 @@ Page({ }) }), goMall:throttle(function(){ + if(!this.isHasToken()){ + wx.reLaunch({ + url: '/patient/pages/login/login', + }) + + } wx.navigateToMiniProgram({ appId: 'wxdee7006582529713', path:"/pages/home/dashboard/index", @@ -228,12 +261,24 @@ Page({ }) }), freeConsult:throttle(function(){ + if(!this.isHasToken()){ + wx.reLaunch({ + url: '/patient/pages/login/login', + }) + + } app.method.navigateTo({ url: '/patient/pages/expertConsult/expertConsult?type=free' }) }), handleFocus:throttle(function(event){ wx.hideKeyboard(); + if(!this.isHasToken()){ + wx.reLaunch({ + url: '/patient/pages/login/login', + }) + + } if(event.detail){ app.method.navigateTo({ url: '/patient/pages/search/search', @@ -242,23 +287,47 @@ Page({ }), goExpertDetail:throttle(function(event){ + if(!this.isHasToken()){ + wx.reLaunch({ + url: '/patient/pages/login/login', + }) + + } let id=event.currentTarget.dataset.id; app.method.navigateTo({ url: '/patient/pages/expertDetail/expertDetail?doctor_id='+id }) }), goquickExpert:throttle(function(){ + if(!this.isHasToken()){ + wx.reLaunch({ + url: '/patient/pages/login/login', + }) + + } app.method.navigateTo({ url:'/patient/pages/expertConsult/expertConsult' //'/patient/pages/quickConsult/quickConsult' }) }), goExpertAndCloseOld:throttle(function(){ + if(!this.isHasToken()){ + wx.reLaunch({ + url: '/patient/pages/login/login', + }) + + } app.method.navigateTo({ url:'/patient/pages/expertConsult/expertConsult' }) this.onClickHide(); }), goExpertAndClose:throttle(function(event){ + if(!this.isHasToken()){ + wx.reLaunch({ + url: '/patient/pages/login/login', + }) + + } let id=event.currentTarget.dataset.id; let url=''; if(id==1){ @@ -284,11 +353,23 @@ Page({ // title: '敬请期待', // icon:'none' // }) + if(!this.isHasToken()){ + wx.reLaunch({ + url: '/patient/pages/login/login', + }) + + } app.method.navigateTo({ url: '/patient/pages/hivConsult/hivConsult' }) }), goconsultandbuy:throttle(function(){ + if(!this.isHasToken()){ + wx.reLaunch({ + url: '/patient/pages/login/login', + }) + + } app.method.navigateTo({ url: '/patient/pages/expertConsult/expertConsult?type=buyYao' }) @@ -298,11 +379,23 @@ Page({ }), goHealth:throttle(function(){ + if(!this.isHasToken()){ + wx.reLaunch({ + url: '/patient/pages/login/login', + }) + + } app.method.navigateTo({ url: '/healthyService/pages/healthyIntro/healthyIntro' }) }), goVisit:throttle(function(){ + if(!this.isHasToken()){ + wx.reLaunch({ + url: '/patient/pages/login/login', + }) + + } app.method.navigateTo({ url: '/healthyService/pages/visitList/visitList' }) @@ -339,6 +432,12 @@ goVisit:throttle(function(){ onLoad(options) { console.log("index onload"); if(options.doctor_id){ + if(!this.isHasToken()){ + wx.reLaunch({ + url: '/patient/pages/login/login', + }) + + } wx.redirectTo({ url: '/patient/pages/expertDetail/expertDetail?doctor_id='+options.query.doctor_id, }) @@ -352,6 +451,20 @@ goVisit:throttle(function(){ }); //this.handleMyDoctor(); }, + isHasToken(){ + let token=''; + const { envVersion } = wx.getAccountInfoSync().miniProgram; + if(envVersion=='release'){ + token = wx.getStorageSync('AUTH_TOKEN'); + }else{ + token = wx.getStorageSync('DEV_AUTH_TOKEN'); + } + if(token){ + return true + }else { + return false; + } + }, onShow(){ let isIntro=wx.getStorageSync('hasIntro'); //let isEntry=wx.getStorageSync('hasEntry'); @@ -388,7 +501,10 @@ goVisit:throttle(function(){ app.globalData.origion=0; if(!app.globalData.totalUnread && app.globalData.totalUnread!=0){ - app.imLogin(); + if(this.isHasToken()){ + app.imLogin(); + } + }else{ let total=app.globalData.totalUnread; setBarData(total) diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 7902615..06d43ba 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -56,33 +56,31 @@ - + 找专家 - - 30多位主任医师 + 200多位主任医师 专业医生，服务保障 - + - + 问诊购药 - - + - 30多种常用处方药品 + 50多种常用处方药品 正品无忧，品质护航 - + - + {{item.article_title}} diff --git a/patient/pages/personCenter/personCenter.js b/patient/pages/personCenter/personCenter.js index ff1b7ab..63d7ffe 100644 --- a/patient/pages/personCenter/personCenter.js +++ b/patient/pages/personCenter/personCenter.js @@ -99,6 +99,7 @@ Page({ const { file } = event.detail; + console.log(file) this.setData({ showCrop:true, src:file.url @@ -204,6 +205,7 @@ Page({ showCrop:false }) this.cropper.getImg((obj) => { + console.log(obj) this.upload(obj) }); }, diff --git a/project.config.json b/project.config.json index 888d007..58da7b1 100644 --- a/project.config.json +++ b/project.config.json @@ -51,7 +51,6 @@ "tabIndent": "insertSpaces", "tabSize": 2 }, - "libVersion": "2.30.2", "packOptions": { "ignore": [], "include": [] diff --git a/project.private.config.json b/project.private.config.json index adb12bb..f284afa 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -6,5 +6,5 @@ "bigPackageSizeSupport": false }, "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html", - "libVersion": "3.3.0" + "libVersion": "3.9.3" } \ No newline at end of file diff --git a/utils/config.js b/utils/config.js index ef3ffe7..03110b6 100644 --- a/utils/config.js +++ b/utils/config.js @@ -26,9 +26,6 @@ SDKAPPID='1600027911'; break; case 'trial': //体验版环境 - // host =`${Hosts.host_prod}`; - // imghost=`${Hosts.img_prod}`; - // agreehost=`${Hosts.agree_prod}` host = `${Hosts.host_dev}`; imghost=`${Hosts.img_dev}`; agreehost=`${Hosts.agree_dev}`; diff --git a/utils/request.js b/utils/request.js index a8e971d..b4f7b48 100644 --- a/utils/request.js +++ b/utils/request.js @@ -133,6 +133,10 @@ function request(url, method, data, loding = false) { reject(res.data); }, fail: function (res) { + if (loding) { + wx.hideLoading() + wx.stopPullDownRefresh(); + } console.log(res) console.log(2222222222222222); // wx.showToast({ diff --git a/utils/router.js b/utils/router.js index 168d355..d0cc15e 100644 --- a/utils/router.js +++ b/utils/router.js @@ -1,11 +1,33 @@ // router.js + + + //import {getCurrentPageUrl} from "./getUrl" module.exports = { navigateTo(object) { - let pages = getCurrentPages(); - let len = pages.length; - let dlt = 0; - let cur_url=object.url; + let pages = getCurrentPages(); + let len = pages.length; + let dlt = 0; + let cur_url=object.url; + // let token=''; + // const { envVersion } = wx.getAccountInfoSync().miniProgram; + // if(envVersion=='release'){ + // token = wx.getStorageSync('AUTH_TOKEN'); + // }else{ + // token = wx.getStorageSync('DEV_AUTH_TOKEN'); + + // }; + // if(!token){ + // if(cur_url.indexOf('/mobileLogin/mobileLogin')!=-1 || cur_url.indexOf('/linkPage/linkPage')!=-1 || cur_url.indexOf('patient/pages/login/login')!=-1 || cur_url.indexOf('index/index') !=-1){ + // AnimatorControllerStateModel.log(111) + // wx.reLaunch({ + // url: '/patient/pages/login/login' + // }); + // } + + // }; + + object.fail=function(error){ console.log(error)