Commit 1ead78d5 by 高淑倩

baseUserInfo存在 调 体验者接口

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