Commit 53fa7b91 by 高淑倩

watch

parent e8c704c0
...@@ -41,7 +41,7 @@ App({ ...@@ -41,7 +41,7 @@ App({
const baseUserInfo = wx.getStorageSync('_baseUserInfo') const baseUserInfo = wx.getStorageSync('_baseUserInfo')
// 获取当前会员是否是体验者 // 获取当前会员是否是体验者
const { member } = baseUserInfo const { member } = baseUserInfo
const curMemberTrial = member.trial || false const curMemberTrial = member && member.trial || false
wx.setStorageSync('isExperiencer', curMemberTrial) wx.setStorageSync('isExperiencer', curMemberTrial)
if (options.referrerInfo.extraData!=null){ if (options.referrerInfo.extraData!=null){
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
const app = getApp() const app = getApp()
const wxService = require('../../utils/wxService') const wxService = require('../../utils/wxService')
const utils = require('../../utils/util') const utils = require('../../utils/util')
// import * as watch from "../../utils/watch.js";
wxService.page({ wxService.page({
/** /**
...@@ -41,9 +42,12 @@ wxService.page({ ...@@ -41,9 +42,12 @@ wxService.page({
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad() {}, onLoad() {
// watch.setWatcher(this);
},
watch: { watch: {
experAccessible(newVal, oldVal) { experAccessible(newVal, oldVal) {
console.log('集点详情', newVal)
if(newVal) { if(newVal) {
// 登录接口返回err // 登录接口返回err
const reLoginErrFlag = wx.getStorageSync('reLoginErr') const reLoginErrFlag = wx.getStorageSync('reLoginErr')
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
const app = getApp() const app = getApp()
const wxService = require('../../utils/wxService') const wxService = require('../../utils/wxService')
const utils = require('../../utils/util') const utils = require('../../utils/util')
// import * as watch from "../../utils/watch.js";
wxService.page({ wxService.page({
/** /**
...@@ -16,9 +17,12 @@ wxService.page({ ...@@ -16,9 +17,12 @@ wxService.page({
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad() {}, onLoad() {
// watch.setWatcher(this);
},
watch: { watch: {
experAccessible(newVal, oldVal) { experAccessible(newVal, oldVal) {
console.log('集点列表', newVal)
if(newVal) { if(newVal) {
this.getPointList() this.getPointList()
} else { } else {
...@@ -36,6 +40,8 @@ wxService.page({ ...@@ -36,6 +40,8 @@ wxService.page({
* 生命周期函数--监听页面显示 * 生命周期函数--监听页面显示
*/ */
onShow() { onShow() {
const { experAccessible } = this.data
console.log('experAccessible', experAccessible)
// wxService.nextTick(() => { // wxService.nextTick(() => {
// const { experAccessible } = this.data // const { experAccessible } = this.data
// console.log('experAccessible', experAccessible) // console.log('experAccessible', experAccessible)
......
...@@ -31,15 +31,11 @@ export function setWatcher(page) { ...@@ -31,15 +31,11 @@ export function setWatcher(page) {
Object.keys(watch).forEach((item) => { Object.keys(watch).forEach((item) => {
let targetData = data; let targetData = data;
let keys = item.split("."); let keys = item.split(".");
for (let i = 0; i < keys.length - 1; i++) { for (let i = 0; i < keys.length - 1; i++) {
targetData = targetData[keys[i]]; targetData = targetData[keys[i]];
} }
let targetKey = keys[keys.length - 1]; let targetKey = keys[keys.length - 1];
let watchFun = watch[item].handler || watch[item]; let watchFun = watch[item].handler || watch[item];
let deep = watch[item].deep; let deep = watch[item].deep;
observe(targetData, targetKey, watchFun, deep, page); observe(targetData, targetKey, watchFun, deep, page);
}); });
......
...@@ -431,10 +431,12 @@ class WXService extends Http { ...@@ -431,10 +431,12 @@ class WXService extends Http {
_self.trialList().then(res=>{ _self.trialList().then(res=>{
if(!res) return false if(!res) return false
const { currentPaths } = res const { currentPaths } = res
console.log('22222', currentPaths, currentPaths.indexOf( router.route), isExperiencer)
if (currentPaths.indexOf( router.route) > -1 && isExperiencer) { if (currentPaths.indexOf( router.route) > -1 && isExperiencer) {
this.setData({ this.setData({
experAccessible: true experAccessible: true
},()=> {
console.log('experAccessible', this.data.experAccessible)
}) })
} }
}) })
......
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