Commit 1ead78d5 by 高淑倩

baseUserInfo存在 调 体验者接口

parent 719d416b
......@@ -22,13 +22,13 @@ import * as watch from "./watch.js";
*/
const manageDate = new ManageDate()
class WXService extends Http {
constructor () {
constructor() {
super()
this.Promise = Promise
this.currentPage = null
}
getToken () {
getToken() {
return super.getToken()
}
......@@ -36,7 +36,7 @@ class WXService extends Http {
* 所有接口中
* 返回401 重试 (getUserInfoLimitCount:重试次数),超过重试次数提示会员系统异常,请联系管理员
*/
request ({
request({
url,
data,
header,
......@@ -99,7 +99,7 @@ class WXService extends Http {
} else {
this.reLogin()
}
} else if(res.msg && res.msg.indexOf('请重新授权') > -1) {
} else if (res.msg && res.msg.indexOf('请重新授权') > -1) {
wx.setStorageSync('reLoginErr', true)
this.replace('/pages/userCenter/userCenter')
}
......@@ -107,7 +107,7 @@ class WXService extends Http {
}
// 所有页面都有接口load状态
setPageLoadStatus () {
setPageLoadStatus() {
if (this.currentPage) {
this.nextTick(() => {
this.currentPage.setData({
......@@ -122,19 +122,19 @@ class WXService extends Http {
* @param url
* @param switchTab 是否是switchTab导航
*/
router (url, switchTab) {
router(url, switchTab) {
return new Router(url, switchTab)
}
back (dintance) {
back(dintance) {
this.router().back(dintance)
}
replace (url) {
replace(url) {
this.router(url).replace()
}
all () {
all() {
return Promise.all.apply(Promise, arguments)
}
/**
......@@ -146,38 +146,38 @@ class WXService extends Http {
wx.setStorageSync('reLoginErr', false)
const app = getApp()
var _this = this
return _this.login().then(result=>{
if(result.code){
return _this.login().then(result => {
if (result.code) {
_this.post(`/member/minaLogin`, {
code: result.code,
wechatInfo: null,
brandId: app.globalData.brandId,
}).then(response=>{
if(response){
}).then(response => {
if (response) {
let dataResp = response.data.data
wx.setStorageSync('token', dataResp.token)
wx.setStorageSync('_baseUserInfo', dataResp)
wx.setStorageSync('reLoginErr', false)
// 刷新页面
setTimeout(()=>{
setTimeout(() => {
const pages = getCurrentPages()
const perpage = pages[pages.length - 1]
perpage.onShow()
},2000)
}, 2000)
return Promise.resolve({ response })
}
}).catch(err=>{
}).catch(err => {
return Promise.reject(err)
})
} else {
return Promise.reject({ state: 2, info: res.data.data })
}
}).catch(err=>{
}).catch(err => {
console.log(err)
})
}
}
login () {
login() {
return new Promise((resolve, reject) => {
wx.login({
success: (res) => {
......@@ -191,7 +191,7 @@ class WXService extends Http {
})
}
getBaseUserInfo () {
getBaseUserInfo() {
if (!this.baseUserInfo) {
let baseUserInfo = wx.getStorageSync('_baseUserInfo')
this.baseUserInfo = baseUserInfo
......@@ -200,7 +200,7 @@ class WXService extends Http {
}
// 通过unionId获取用户信息并更新token(防止token信息过期)
getUserInfo () {
getUserInfo() {
const baseUserInfo = this.getBaseUserInfo()
wx.showLoading({
title: '正在加载...',
......@@ -234,11 +234,11 @@ class WXService extends Http {
})
}
getManageDate () {
getManageDate() {
return manageDate
}
selectAll (selector, options) {
selectAll(selector, options) {
return new Promise((resolve, reject) => {
wx.createSelectorQuery().selectAll('.page-body').fields(options, (res) => {
resolve(res)
......@@ -246,7 +246,7 @@ class WXService extends Http {
})
}
scrollOffset () {
scrollOffset() {
return new Promise((resolve, reject) => {
wx.createSelectorQuery().selectViewport().scrollOffset(function (res) {
resolve(res)
......@@ -254,7 +254,7 @@ class WXService extends Http {
})
}
showModal (config = {}) {
showModal(config = {}) {
return new Promise((resolve, reject) => {
wx.showModal({
...config,
......@@ -272,7 +272,7 @@ class WXService extends Http {
})
}
getSystemInfo () {
getSystemInfo() {
return new Promise((resolve, reject) => {
wx.getSystemInfo({
success: (res) => {
......@@ -287,10 +287,10 @@ class WXService extends Http {
})
})
}
getAssPath () {
getAssPath() {
const paths = pathData
let pathArr = []
for(const key in paths){
for (const key in paths) {
if (paths.hasOwnProperty(key)) {
let pathObj = {}
pathObj[key] = paths[key]
......@@ -312,7 +312,7 @@ class WXService extends Http {
wx.hideLoading()
// 对应的path
let currentPaths = [];
localPath.forEach(item=>{
localPath.forEach(item => {
if (item.hasOwnProperty(data)) {
currentPaths = item[data]
} else {
......@@ -392,7 +392,7 @@ class WXService extends Http {
// }
// 设置异步的全局变量值
initAppGlobalDataSync () {
initAppGlobalDataSync() {
const app = this.getApp()
if (!app.globalData.userInfo) {
const userInfo = wx.getStorageSync('_userInfo')
......@@ -408,7 +408,7 @@ class WXService extends Http {
}
}
page (config) {
page(config) {
const _self = this
const { sr } = this.getApp()
config.data.experAccessible;
......@@ -427,20 +427,23 @@ class WXService extends Http {
config.onShow && config.onShow.apply(page, args)
// 获取当前页
let router = getCurrentRouter()
_self.trialList().then(res=>{
if(!res) return false
const { currentPaths } = res
if (currentPaths.indexOf( router.route) > -1 && isExperiencer) {
this.setData({
experAccessible: true
})
} else {
this.setData({
experAccessible: false
})
}
})
const baseUserInfo = _self.getBaseUserInfo()
if (baseUserInfo) {
_self.trialList().then(res => {
if (!res) return false
const { currentPaths } = res
if (currentPaths.indexOf(router.route) > -1 && isExperiencer) {
this.setData({
experAccessible: true
})
} else {
this.setData({
experAccessible: false
})
}
})
}
},
onReady: function (...args) {
config.onReady && config.onReady.apply(this, args)
......@@ -448,7 +451,7 @@ class WXService extends Http {
onHide: function (...args) {
const page = this
config.onHide && config.onHide.apply(this, args)
},
onUnload: function (...args) {
config.onUnload && config.onUnload.apply(this, args)
......@@ -468,7 +471,7 @@ class WXService extends Http {
try {
let shareConfig = config.onShareAppMessage.apply(this, args)
if (!shareConfig) {
} else {
}
......@@ -482,7 +485,7 @@ class WXService extends Http {
Page(Object.assign({}, config, CONFIG_PAPGE))
}
checkSession () {
checkSession() {
return new Promise((resolve, reject) => {
wx.checkSession({
success: (data) => {
......@@ -495,7 +498,7 @@ class WXService extends Http {
})
}
nextTick (fn) {
nextTick(fn) {
if (wx.nextTick) {
wx.nextTick(() => {
fn()
......@@ -507,14 +510,14 @@ class WXService extends Http {
}
}
showToast ({ title, icon = 'none' }) {
showToast({ title, icon = 'none' }) {
wx.showToast({
title,
icon
})
}
getConnectedWifi () {
getConnectedWifi() {
return new Promise((resolve, reject) => {
wx.getConnectedWifi({
success: (res) => {
......@@ -523,12 +526,12 @@ class WXService extends Http {
fail: (res) => {
reject(res)
},
complete: () => {}
complete: () => { }
})
})
}
navigateToMiniProgram (options) {
navigateToMiniProgram(options) {
const _self = this
const promise = new Promise((resolve, reject) => {
if (!openCardLister) {
......@@ -641,22 +644,22 @@ class WXService extends Http {
*/
openCardList() {
// wechatCardId wechatCode
const {wechatCardId,wechatCode} = wx.getStorageSync('_baseUserInfo')
const { wechatCardId, wechatCode } = wx.getStorageSync('_baseUserInfo')
wx.openCard({
cardList: [{
cardId: wechatCardId,
code: wechatCode
}],
success (res) {
success(res) {
console.log('openCardList success', res)
},
fail(err){
fail(err) {
console.log('openCardList fail data is %o', err)
}
})
}
getRandom (num = 1) {
getRandom(num = 1) {
let random = Math.random()
if (random < 0.1) {
random += 0.1
......@@ -669,8 +672,8 @@ class WXService extends Http {
}
// 打开登录弹框
openAuthModal(){
return new Promise((resolve,reject)=>{
openAuthModal() {
return new Promise((resolve, reject) => {
resolve({
isAuthorization: true
})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment