子页面

.tea/editorTabs.json

-{"tabs":["file:///f%3A/code/7_Eleven_Alipay/component/picNav/picNav.axml","file:///f%3A/code/7_Eleven_Alipay/utils/currentLinkRouter.js","file:///f%3A/code/7_Eleven_Alipay/utils/wxService.js","file:///f%3A/code/7_Eleven_Alipay/component/bottom/bottom.js","file:///f%3A/code/7_Eleven_Alipay/component/imageSwiper/imageSwiper.js","file:///f%3A/code/7_Eleven_Alipay/utils/util.js","file:///f%3A/code/7_Eleven_Alipay/app.js","file:///f%3A/code/7_Eleven_Alipay/utils/common.js"],"current":"file:///f%3A/code/7_Eleven_Alipay/utils/common.js"}
+{"tabs":["file:///f%3A/code/7_Eleven_Alipay/subPackage/page/pages/subPage/subPage.js","file:///f%3A/code/7_Eleven_Alipay/utils/renderPage.js"],"current":"file:///f%3A/code/7_Eleven_Alipay/subPackage/page/pages/subPage/subPage.js"}
\ No newline at end of file

.tea/recentlyTouched.json

-{"files":["f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\h5\\h5page.js","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\h5\\h5page.acss","f:\\code\\7_Eleven_Alipay\\utils\\common.js","f:\\code\\7_Eleven_Alipay\\app.js","f:\\code\\7_Eleven_Alipay\\utils\\util.js","f:\\code\\7_Eleven_Alipay\\component\\picNav\\picNav.js","f:\\code\\7_Eleven_Alipay\\component\\imageSwiper\\imageSwiper.js","f:\\code\\7_Eleven_Alipay\\component\\bottom\\bottom.js","f:\\code\\7_Eleven_Alipay\\utils\\currentLinkRouter.js","f:\\code\\7_Eleven_Alipay\\utils\\wxService.js","f:\\code\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.js","f:\\code\\7_Eleven_Alipay\\component\\picNav\\picNav.axml","f:\\code\\7_Eleven_Alipay\\component\\personCenter\\personCenter.js","f:\\code\\7_Eleven_Alipay\\component\\personCenter\\personCenter.axml","f:\\code\\7_Eleven_Alipay\\pages\\userCenter\\userCenter.json","f:\\code\\7_Eleven_Alipay\\pages\\userCenter\\userCenter.js","f:\\code\\7_Eleven_Alipay\\pages\\userCenter\\userCenter.axml","f:\\code\\7_Eleven_Alipay\\pages\\userCenter\\userCenter.acss","f:\\code\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.acss","f:\\code\\7_Eleven_Alipay\\pages\\activateCard\\activateCardCallback.js","f:\\code\\7_Eleven_Alipay\\utils\\Http.js","f:\\code\\7_Eleven_Alipay\\project.config.json","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\goToHome\\goToHome.acss","f:\\code\\7_Eleven_Alipay\\package-lock.json","f:\\code\\7_Eleven_Alipay\\config\\index.js","f:\\code\\7_Eleven_Alipay\\pages\\pointDetail\\pointDetail.js","f:\\code\\7_Eleven_Alipay\\pages\\pointList\\pointList.acss","f:\\code\\7_Eleven_Alipay\\pages\\pointList\\pointList.axml","f:\\code\\7_Eleven_Alipay\\pages\\pointList\\pointList.js","f:\\code\\7_Eleven_Alipay\\pages\\pointList\\pointList.json","f:\\code\\7_Eleven_Alipay\\utils\\currentAccessiblePath.js","f:\\code\\7_Eleven_Alipay\\utils\\integerDigitalConvertion.js","f:\\code\\7_Eleven_Alipay\\utils\\helper.js","f:\\code\\7_Eleven_Alipay\\app.json","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\subPage\\subPage.js","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\subPage\\subPage.json","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\subPage\\subPage.acss","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\subPage\\subPage.axml","f:\\code\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.axml","f:\\code\\7_Eleven_Alipay\\component\\picNav\\picNav.json","f:\\code\\7_Eleven_Alipay\\images\\3x-29.png","f:\\code\\7_Eleven_Alipay\\images\\3x-28.png","f:\\code\\7_Eleven_Alipay\\wxs\\utils.sjs","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\pointGoodsList\\pointGoodsList.json","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\pointGoodsList\\pointGoodsList.axml","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\pointGoodsList\\pointGoodsList.js","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\pointGoodsList\\pointGoodsList.acss","f:\\code\\7_Eleven_Alipay\\pages\\mySpend\\mySpend.json","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\goToHome\\goToHome.axml","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\goToHome\\goToHome.js"]}
+{"files":["f:\\code\\7_Eleven_Alipay\\utils\\renderPage.js","f:\\code\\7_Eleven_Alipay\\utils\\router.js","f:\\code\\7_Eleven_Alipay\\utils\\currentLinkRouter.js","f:\\code\\7_Eleven_Alipay\\utils\\common.js","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\subPage\\subPage.js","f:\\code\\7_Eleven_Alipay\\pages\\userCenter\\userCenter.js","f:\\code\\7_Eleven_Alipay\\component\\bottom\\bottom.js","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\h5\\h5page.js","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\h5\\h5page.acss","f:\\code\\7_Eleven_Alipay\\app.js","f:\\code\\7_Eleven_Alipay\\utils\\util.js","f:\\code\\7_Eleven_Alipay\\component\\picNav\\picNav.js","f:\\code\\7_Eleven_Alipay\\component\\imageSwiper\\imageSwiper.js","f:\\code\\7_Eleven_Alipay\\utils\\wxService.js","f:\\code\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.js","f:\\code\\7_Eleven_Alipay\\component\\picNav\\picNav.axml","f:\\code\\7_Eleven_Alipay\\component\\personCenter\\personCenter.js","f:\\code\\7_Eleven_Alipay\\component\\personCenter\\personCenter.axml","f:\\code\\7_Eleven_Alipay\\pages\\userCenter\\userCenter.json","f:\\code\\7_Eleven_Alipay\\pages\\userCenter\\userCenter.axml","f:\\code\\7_Eleven_Alipay\\pages\\userCenter\\userCenter.acss","f:\\code\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.acss","f:\\code\\7_Eleven_Alipay\\pages\\activateCard\\activateCardCallback.js","f:\\code\\7_Eleven_Alipay\\utils\\Http.js","f:\\code\\7_Eleven_Alipay\\project.config.json","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\goToHome\\goToHome.acss","f:\\code\\7_Eleven_Alipay\\package-lock.json","f:\\code\\7_Eleven_Alipay\\config\\index.js","f:\\code\\7_Eleven_Alipay\\pages\\pointDetail\\pointDetail.js","f:\\code\\7_Eleven_Alipay\\pages\\pointList\\pointList.acss","f:\\code\\7_Eleven_Alipay\\pages\\pointList\\pointList.axml","f:\\code\\7_Eleven_Alipay\\pages\\pointList\\pointList.js","f:\\code\\7_Eleven_Alipay\\pages\\pointList\\pointList.json","f:\\code\\7_Eleven_Alipay\\utils\\currentAccessiblePath.js","f:\\code\\7_Eleven_Alipay\\utils\\integerDigitalConvertion.js","f:\\code\\7_Eleven_Alipay\\utils\\helper.js","f:\\code\\7_Eleven_Alipay\\app.json","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\subPage\\subPage.json","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\subPage\\subPage.acss","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\subPage\\subPage.axml","f:\\code\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.axml","f:\\code\\7_Eleven_Alipay\\component\\picNav\\picNav.json","f:\\code\\7_Eleven_Alipay\\images\\3x-29.png","f:\\code\\7_Eleven_Alipay\\images\\3x-28.png","f:\\code\\7_Eleven_Alipay\\wxs\\utils.sjs","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\pointGoodsList\\pointGoodsList.json","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\pointGoodsList\\pointGoodsList.axml","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\pointGoodsList\\pointGoodsList.js","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\pointGoodsList\\pointGoodsList.acss","f:\\code\\7_Eleven_Alipay\\pages\\mySpend\\mySpend.json"]}
\ No newline at end of file

.tea/tmp-saving/48d36db54916fbcef24a2a8e93b4e0b0156931339816640f

+const wxService = require('./wxService')
+const app = getApp()
+const wx2my = require('../wx2my');
+const Behavior = require('../Behavior');
+
+function currentLinkRouter(event, _this) {
+  const ev = event.currentTarget.dataset;
+  let curItemType = ev.item
+  const userInfo = wx2my.getStorageSync('_baseUserInfo') && wx2my.getStorageSync('_baseUserInfo').data || null
+ 
+  // link row
+  if (curItemType.link) {
+    let currentClickType = app.globalData.commonFunc.getLink(curItemType.link.type, curItemType)
+    console.log('wwwwwwww', curItemType.link.type)
+    console.log('wwwwwwuserInfoww',wx2my.getStorageSync('_baseUserInfo'),userInfo)
+    console.log('currentClickType', currentClickType)
+
+    // 触发父组件更新页面 外部小程序
+    if (curItemType.link.type == 1) {
+      // 触发父组件更新页面 外部小程序
+      _this.setData({
+        isAuthorization: false
+      })
+      return false
+    } else if (!userInfo) {
+      // userInfo 不存在 授权弹框
+      _this.setData({
+        isAuthorization: true
+      })
+      return false
+    }
+
+    if (curItemType.link.type == 2) {
+      // 触发父组件更新页面
+       console.log('2', currentClickType.url)
+      wxService.nextTick(() => {
+        console.log('2', currentClickType.url)
+        wxService.router(`/subPackage/page/pages/subPage/subPage`).search({pageId: currentClickType.url})
+        // _this.triggerEvent('updatePage', { pageId: currentClickType.url })
+      })
+    } else if (curItemType.link.type == 3) {
+      // 预览
+      wx.previewImage({
+        current: `${app.globalData.imageUrl}/${currentClickType.imageUrl}`, // 当前显示图片的http链接
+        urls: [`${app.globalData.imageUrl}/${currentClickType.link.url}`]  // 需要预览的图片http链接列表
+      })
+    } else if (curItemType.link.type == 4) {
+      wxService.router(`${currentClickType}`)
+    } else if (curItemType.link.type == 5) {
+      if (currentClickType == 1) {
+        wxService.openCard()
+      } else if (currentClickType == 2) {
+        wxService.openCard()
+      }
+    } else if (curItemType.link.type == 6) {
+      wxService.router(`${currentClickType}`)
+    } else if (curItemType.link.type == 7) {
+      // 集点详情
+      wxService.router(`${currentClickType}`)
+    }
+  } else if (curItemType.row) {
+    let rowObj = typeof (curItemType.row) == "string" ? JSON.parse(curItemType.row) : curItemType.row
+    let currentClickRow = app.globalData.commonFunc.getLinkRow(rowObj.type, rowObj)
+
+    if (rowObj.type == 1) { }
+    else if (rowObj.type == 2) { }
+    else if (rowObj.type == 3) { }
+    else if (rowObj.type == 4) { }
+    else if (rowObj.type == 5) { }
+    else if (rowObj.type == 6) { }
+    else if (rowObj.type == 7) { }
+    else if (rowObj.type == 8) {
+      // 商品
+      wxService.router(`/pages/productDetail/productDetail?id=${currentClickRow}`)
+    }
+    else if (rowObj.type == 9) {
+      // 分类
+      wxService.router(`/subPackage/page/pages/categoryPro/categoryPro?${currentClickRow}`)
+    }
+  }
+}
+
+module.exports = {
+  currentLinkRouter: currentLinkRouter
+}
\ No newline at end of file

.tea/tmp-saving/7367aa0f4573a20e6610f625b1031e7715693153972850fa

+const wx2my = require('../../../../wx2my');
+const Behavior = require('../../../../Behavior');
+// subPackage/page/pages/subPage/subPage.js
+const app = getApp();
+const wxService = require('../../../../utils/wxService');
+const utils = require('../../../../utils/util');
+const envInfo = require('../../../../config/index').envInfo;
+let renderPage = null; // 渲染页面数据对象(安全渲染)
+let handlerDataOnPage = null;
+let config = require('../../../../configScreen/configScreen');
+const logger = utils.logger;
+
+wxService.page({
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    pages: [],
+    render: null,
+    // 渲染页面数据对象(安全渲染)
+    renderPageOver: false,
+    // 渲染页面结束
+    integralNum: 0,
+    couponNum: 0,
+    // isAllScreen: fullSucreen.isAllScreen
+    isAllScreen: config.isAllScreen,
+    token: '',
+    isAuthorization: false,
+    pageId: 3,
+    baseUserInfo: null,
+    cardMember: null,
+    curMemberTrial: false, // 当前会员是不是体验者
+    curAccessiblePathArr: [] // 当前体验版本对应的路径
+  },
+
+  /**
+    * 生命周期函数--监听页面加载
+    */
+  onLoad(options) {
+    console.log('load', options)
+    const {
+      pageId
+    } = options || this.data;
+    this.setData({
+      token: wx2my.getStorageSync('token'),
+      pages: [],
+      // 清空当前页
+      pageId
+    }, () => {
+      let currentPageId = pageId ? pageId : this.data.pageId;
+      this.initPage(currentPageId);
+    });
+  },
+
+  /** 
+   * 监听子组件事件
+   * */
+  updatePage(ev) {// const {pageId} = ev.detail
+    // this.setData({
+    //   pages: [],
+    //   pageId
+    // },()=>{
+    //   this.initPage(pageId)
+    // })
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow(options) {
+    const baseUserInfo = wx2my.getStorageSync('_baseUserInfo') && wx2my.getStorageSync('_baseUserInfo').data
+    const reLoginErrFlag = wx2my.getStorageSync('reLoginErr') && wx2my.getStorageSync('reLoginErr').data
+    if (baseUserInfo && !reLoginErrFlag) {
+      this.setData({
+        token: wx.getStorageSync('token'),
+        baseUserInfo,
+        cardMember,
+        isAuthorization: false
+      }, () => {
+        // 积分数量
+        this.getMemberPointInfo()
+        // 优惠券数量
+        this.getMemberCouponInfo()
+      })
+    } else if (!baseUserInfo && reLoginErrFlag) {
+      this.setData({
+        isAuthorization: true
+      })
+    } else {
+      this.setData({
+        isAuthorization: true
+      })
+    }
+  },
+
+  // 查询积分信息
+  getMemberPointInfo() {
+    wx2my.showLoading({
+      title: '加载中'
+    });
+    wxService.get(`/member/memberPoint/getMyPointInfo`).then(res => {
+      if (res) {
+        const {
+          result,
+          data
+        } = res.data;
+
+        if (result == 0) {
+          wx2my.hideLoading();
+          this.setData({
+            integralNum: data && data.point || 0
+          });
+        }
+      }
+    });
+  },
+
+  // 查询优惠券数量
+  getMemberCouponInfo() {
+    wx2my.showLoading({
+      title: '加载中'
+    });
+    wxService.post(`/coupon/coupon/memberCouponCount`).then(res => {
+      if (res) {
+        const {
+          result,
+          data
+        } = res && res.data;
+
+        if (result == 0) {
+          wx2my.hideLoading();
+          this.setData({
+            couponNum: data && data[1] || 0
+          });
+        }
+      } else {
+        wx2my.showToast({
+          title: '请求失败',
+          icon: 'none'
+        });
+      }
+    });
+  },
+
+  // page 信息
+  initPage(pageId) {
+    this.setData({
+      pages: [],
+      products: [],
+      groupLoadState: 'complete', // 活动分组加载标志
+      homeApiLoading: true,
+      render: null, // 渲染页面数据对象(安全渲染)
+      isLastPage: false, // 页面段落加载完成
+      renderPageOver: false, // 渲染页面结束
+    }, () => {
+      this.initHomePage()
+    })
+    handlerDataOnPage = new utils.HandlerDataOnPage()
+    renderPage = require('../../../../utils/renderPage').getRenderPage()
+    handlerDataOnPage.init(this, 'pages')
+  },
+  initHomePage() {
+    wx2my.showLoading({
+      title: '加载中'
+    });
+    wxService.post(`/merchant/modelPage/getDetailById?pageId=${pageId}&brandId=${app.globalData.brandId}`).then(res => {
+      if (!res) return false;
+      const {
+        result,
+        data
+      } = res.data;
+
+      if (result == 0) {
+        // 动态设置title
+        wx2my.setNavigationBarTitle({
+          title: data.page.title
+        }); // 段落
+
+        const products = data.paragraphs;
+        const filterResult = products.map((res, index) => {
+          return {
+            ...res,
+            index
+          };
+        }).filter(item => {// wx.hideLoading()
+        });
+        const render = renderPage.initPaging(filterResult).initRenderData(products);
+        this.data.render = render;
+        const renderData = render.next();
+        this.data.renderPageOver = renderData.done;
+        this.renderPageFunc({
+          products: renderData.value
+        });
+      }
+    }).finally(() => {
+      wx2my.hideLoading();
+    });
+  },
+
+  /**
+  * 渲染数据(合并之前的数据)
+  * @param products 数组数据
+  * @param isLastPage
+  * @param now
+  */
+  renderPageFunc({
+    products
+  }) {
+    let productData = handlerDataOnPage.handlerArray(products);
+    logger.log('productData.keysNum', productData.keysNum(), productData);
+    this.setData({
+      ...productData
+    }, () => {
+      wx2my.hideLoading();
+    });
+  }
+
+});
\ No newline at end of file

.tea/tmp-saving/7367aa0f4573a20e6610f625b1031e771569315397503cf1

+const wx2my = require('../../../../wx2my');
+const Behavior = require('../../../../Behavior');
+// subPackage/page/pages/subPage/subPage.js
+const app = getApp();
+const wxService = require('../../../../utils/wxService');
+const utils = require('../../../../utils/util');
+const envInfo = require('../../../../config/index').envInfo;
+let renderPage = null; // 渲染页面数据对象(安全渲染)
+let handlerDataOnPage = null;
+let config = require('../../../../configScreen/configScreen');
+const logger = utils.logger;
+
+wxService.page({
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    pages: [],
+    render: null,
+    // 渲染页面数据对象(安全渲染)
+    renderPageOver: false,
+    // 渲染页面结束
+    integralNum: 0,
+    couponNum: 0,
+    // isAllScreen: fullSucreen.isAllScreen
+    isAllScreen: config.isAllScreen,
+    token: '',
+    isAuthorization: false,
+    pageId: 3,
+    baseUserInfo: null,
+    cardMember: null,
+    curMemberTrial: false, // 当前会员是不是体验者
+    curAccessiblePathArr: [] // 当前体验版本对应的路径
+  },
+
+  /**
+    * 生命周期函数--监听页面加载
+    */
+  onLoad(options) {
+    console.log('load', options)
+    const {
+      pageId
+    } = options || this.data;
+    this.setData({
+      token: wx2my.getStorageSync('token'),
+      pages: [],
+      // 清空当前页
+      pageId
+    }, () => {
+      let currentPageId = pageId ? pageId : this.data.pageId;
+      this.initPage(currentPageId);
+    });
+  },
+
+  /** 
+   * 监听子组件事件
+   * */
+  updatePage(ev) {// const {pageId} = ev.detail
+    // this.setData({
+    //   pages: [],
+    //   pageId
+    // },()=>{
+    //   this.initPage(pageId)
+    // })
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow(options) {
+    const baseUserInfo = wx2my.getStorageSync('_baseUserInfo') && wx2my.getStorageSync('_baseUserInfo').data
+    const reLoginErrFlag = wx2my.getStorageSync('reLoginErr') && wx2my.getStorageSync('reLoginErr').data
+    if (baseUserInfo && !reLoginErrFlag) {
+      this.setData({
+        token: wx.getStorageSync('token'),
+        baseUserInfo,
+        cardMember,
+        isAuthorization: false
+      }, () => {
+        // 积分数量
+        this.getMemberPointInfo()
+        // 优惠券数量
+        this.getMemberCouponInfo()
+      })
+    } else if (!baseUserInfo && reLoginErrFlag) {
+      this.setData({
+        isAuthorization: true
+      })
+    } else {
+      this.setData({
+        isAuthorization: true
+      })
+    }
+  },
+
+  // 查询积分信息
+  getMemberPointInfo() {
+    wx2my.showLoading({
+      title: '加载中'
+    });
+    wxService.get(`/member/memberPoint/getMyPointInfo`).then(res => {
+      if (res) {
+        const {
+          result,
+          data
+        } = res.data;
+
+        if (result == 0) {
+          wx2my.hideLoading();
+          this.setData({
+            integralNum: data && data.point || 0
+          });
+        }
+      }
+    });
+  },
+
+  // 查询优惠券数量
+  getMemberCouponInfo() {
+    wx2my.showLoading({
+      title: '加载中'
+    });
+    wxService.post(`/coupon/coupon/memberCouponCount`).then(res => {
+      if (res) {
+        const {
+          result,
+          data
+        } = res && res.data;
+
+        if (result == 0) {
+          wx2my.hideLoading();
+          this.setData({
+            couponNum: data && data[1] || 0
+          });
+        }
+      } else {
+        wx2my.showToast({
+          title: '请求失败',
+          icon: 'none'
+        });
+      }
+    });
+  },
+
+  // page 信息
+  initPage(pageId) {
+    this.setData({
+      pages: [],
+      products: [],
+      groupLoadState: 'complete', // 活动分组加载标志
+      homeApiLoading: true,
+      render: null, // 渲染页面数据对象(安全渲染)
+      isLastPage: false, // 页面段落加载完成
+      renderPageOver: false, // 渲染页面结束
+    }, () => {
+      this.initHomePage()
+    })
+    handlerDataOnPage = new utils.HandlerDataOnPage()
+    renderPage = require('../../../../utils/renderPage').getRenderPage()
+    handlerDataOnPage.init(this, 'pages')
+  },
+  initHomePage() {
+    wx2my.showLoading({
+      title: '加载中'
+    });
+    wxService.post(`/merchant/modelPage/getDetailById?pageId=${pageId}&brandId=${app.globalData.brandId}`).then(res => {
+      if (!res) return false;
+      const {
+        result,
+        data
+      } = res.data;
+
+      if (result == 0) {
+        // 动态设置title
+        wx2my.setNavigationBarTitle({
+          title: data.page.title
+        }); // 段落
+
+        const products = data.paragraphs;
+        const filterResult = products.map((res, index) => {
+          return {
+            ...res,
+            index
+          };
+        }).filter(item => {// wx.hideLoading()
+        });
+        const render = renderPage.initPaging(filterResult).initRenderData(products);
+        this.data.render = render;
+        const renderData = render.next();
+        this.data.renderPageOver = renderData.done;
+        this.renderPageFunc({
+          products: renderData.value
+        });
+      }
+    }).finally(() => {
+      wx2my.hideLoading();
+    });
+  },
+
+  /**
+  * 渲染数据(合并之前的数据)
+  * @param products 数组数据
+  * @param isLastPage
+  * @param now
+  */
+  renderPageFunc({
+    products
+  }) {
+    let productData = handlerDataOnPage.handlerArray(products);
+    logger.log('productData.keysNum', productData.keysNum(), productData);
+    this.setData({
+      ...productData
+    }, () => {
+      wx2my.hideLoading();
+    });
+  }
+
+});
\ No newline at end of file

subPackage/page/pages/subPage/subPage.js

@@ -2,20 +2,14 @@ const wx2my = require('../../../../wx2my');
 const Behavior = require('../../../../Behavior');
 // subPackage/page/pages/subPage/subPage.js
 const app = getApp();
-
 const wxService = require('../../../../utils/wxService');
-
 const utils = require('../../../../utils/util');
-
 const envInfo = require('../../../../config/index').envInfo;
-
 let renderPage = null; // 渲染页面数据对象(安全渲染)
-
 let handlerDataOnPage = null;
-
 let config = require('../../../../configScreen/configScreen');
-
 const logger = utils.logger;
+
 wxService.page({
   /**
    * 页面的初始数据
@@ -32,30 +26,30 @@ wxService.page({
     isAllScreen: config.isAllScreen,
     token: '',
     isAuthorization: false,
-    pageId: 3
+    pageId: 3,
+    baseUserInfo: null,
+    cardMember: null,
+    curMemberTrial: false, // 当前会员是不是体验者
+    curAccessiblePathArr: [] // 当前体验版本对应的路径
   },
 
   /**
     * 生命周期函数--监听页面加载
     */
-  onLoad() {
+  onLoad(options) {
+    console.log('load', options)
+    const {
+      pageId
+    } = options || this.data;
     this.setData({
+      token: wx2my.getStorageSync('token'),
       pages: [],
-      groupLoadState: 'complete',
-      // 活动分组加载标志
-      homeApiLoading: true,
-      render: null,
-      // 渲染页面数据对象(安全渲染)
-      isLastPage: false,
-      // 页面段落加载完成
-      renderPageOver: false // 渲染页面结束
-      // isAuthorization: true
-
-    }, () => {// this.loadMore()
+      // 清空当前页
+      pageId
+    }, () => {
+      let currentPageId = pageId ? pageId : this.data.pageId;
+      this.initPage(currentPageId);
     });
-    handlerDataOnPage = new utils.HandlerDataOnPage();
-    renderPage = require('../../../../utils/renderPage').getRenderPage();
-    handlerDataOnPage.init(this, 'pages');
   },
 
   /** 
@@ -73,25 +67,29 @@ wxService.page({
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow() {
-    const {
-      pageId
-    } = this.options || this.data;
+  onShow(options) {
+    const baseUserInfo = wx2my.getStorageSync('_baseUserInfo') && wx2my.getStorageSync('_baseUserInfo').data
+    const reLoginErrFlag = wx2my.getStorageSync('reLoginErr') && wx2my.getStorageSync('reLoginErr').data
+    if (baseUserInfo && !reLoginErrFlag) {
       this.setData({
-      token: wx2my.getStorageSync('token'),
-      pages: [],
-      // 清空当前页
-      pageId
+        token: wx.getStorageSync('token'),
+        baseUserInfo,
+        cardMember,
+        isAuthorization: false
       }, () => {
-      let currentPageId = pageId ? pageId : this.data.pageId;
-      this.initPage(currentPageId);
-    });
-
-    if (wx2my.getStorageSync('_baseUserInfo')) {
         // 积分数量
-      this.getMemberPointInfo(); // 优惠券数量
-
-      this.getMemberCouponInfo();
+        this.getMemberPointInfo()
+        // 优惠券数量
+        this.getMemberCouponInfo()
+      })
+    } else if (!baseUserInfo && reLoginErrFlag) {
+      this.setData({
+        isAuthorization: true
+      })
+    } else {
+      this.setData({
+        isAuthorization: true
+      })
     }
   },
 
@@ -147,11 +145,25 @@ wxService.page({
   // page 信息
   initPage(pageId) {
     this.setData({
-      products: []
-    });
+      pages: [],
+      products: [],
+      groupLoadState: 'complete', // 活动分组加载标志
+      homeApiLoading: true,
+      render: null, // 渲染页面数据对象(安全渲染)
+      isLastPage: false, // 页面段落加载完成
+      renderPageOver: false, // 渲染页面结束
+    }, () => {
+      this.initHomePage()
+    })
+    handlerDataOnPage = new utils.HandlerDataOnPage()
+    renderPage = require('../../../../utils/renderPage').getRenderPage()
+    handlerDataOnPage.init(this, 'pages')
+  },
+  initHomePage() {
     wx2my.showLoading({
       title: '加载中'
     });
+    const {pageId} = this.data
     wxService.post(`/merchant/modelPage/getDetailById?pageId=${pageId}&brandId=${app.globalData.brandId}`).then(res => {
       if (!res) return false;
       const {
@@ -167,7 +179,8 @@ wxService.page({
 
         const products = data.paragraphs;
         const filterResult = products.map((res, index) => {
-          return { ...res,
+          return {
+            ...res,
             index
           };
         }).filter(item => {// wx.hideLoading()
@@ -196,7 +209,8 @@ wxService.page({
   }) {
     let productData = handlerDataOnPage.handlerArray(products);
     logger.log('productData.keysNum', productData.keysNum(), productData);
-    this.setData({ ...productData
+    this.setData({
+      ...productData
     }, () => {
       wx2my.hideLoading();
     });

utils/currentLinkRouter.js

@@ -32,11 +32,12 @@ function currentLinkRouter(event, _this) {
 
     if (curItemType.link.type == 2) {
       // 触发父组件更新页面
-      console.log('0_this', _this)
-      _this.props.onCounterPlusOne(1);
-
-      wxService.nextTick((_this) => {
-        _this.triggerEvent('updatePage', { pageId: currentClickType.url })
+      wxService.nextTick(() => {
+        let pageId =  currentClickType.url
+        console.log('pageId', pageId)
+        // wxService.router(`/subPackage/page/pages/subPage/subPage`).search({pageId})
+        my.navigateTo({ url: `/subPackage/page/pages/subPage/subPage?pageId=${pageId}` })
+        // _this.triggerEvent('updatePage', { pageId: currentClickType.url })
       })
     } else if (curItemType.link.type == 3) {
       // 预览

utils/router.js

@@ -62,6 +62,7 @@ class Router {
     }
 
     this.router += `?${temp.join('&')}`;
+    console.log('this.router', this.router)
     return this;
   }