diff --git a/packageA/pages/hongBao/hongBao.js b/packageA/pages/hongBao/hongBao.js index e69b09f..b02e4b0 100644 --- a/packageA/pages/hongBao/hongBao.js +++ b/packageA/pages/hongBao/hongBao.js @@ -322,6 +322,10 @@ Page({ gotoDetails() { + // this.data.qiangHongBao = false; + this.setData({ + qiangHongBao: false + }); app.goto('/packageA/pages/hongBaoDetails/hongBaoDetails?redid=' + this.data.hongBaoData.id); }, diff --git a/packageA/pages/hongBaoDetails/hongBaoDetails.js b/packageA/pages/hongBaoDetails/hongBaoDetails.js index a074d79..87de214 100644 --- a/packageA/pages/hongBaoDetails/hongBaoDetails.js +++ b/packageA/pages/hongBaoDetails/hongBaoDetails.js @@ -22,27 +22,35 @@ Page({ onLoad: function (options) { _this = this; console.log('options', options); - this.data.options = options; - reqData.url = '/api/weshop/redmoney/redRecord/page', - reqData.data = { - store_id: app.globalData.setting.stoid, - redid: this.data.options.redid, - }; - reqData.data2 = { - store_id: app.globalData.setting.stoid, - user_id: app.globalData.user_id, - redid: this.data.options.redid, - pageSize: 1, - page: 1, - }; - this.getData(true, reqData.url, reqData.data); - this.requestData(reqData.url, reqData.data2) + + this.isLogin() .then(function(data) { - _this.setData({ - myRed: data.data.data.pageData[0] + + _this.data.options = options; + reqData.url = '/api/weshop/redmoney/redRecord/page', + reqData.data = { + store_id: app.globalData.setting.stoid, + redid: _this.data.options.redid, + }; + reqData.data2 = { + store_id: app.globalData.setting.stoid, + user_id: app.globalData.user_id, + redid: _this.data.options.redid, + pageSize: 1, + page: 1, + }; + _this.getData(true, reqData.url, reqData.data); + _this.requestData(reqData.url, reqData.data2) + .then(function(data) { + _this.setData({ + myRed: data.data.data.pageData[0] + }); + // console.log('123', data.data.data.pageData[0]); }); - // console.log('123', data.data.data.pageData[0]); + }); + + }, /** @@ -94,6 +102,20 @@ Page({ }, + // 判断是否授权登录 + isLogin() { + return new Promise((resolve, reject) => { + let user_info = app.globalData.userInfo; + if(user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { + wx.navigateTo({ + url: '/pages/togoin/togoin', + }) + } else { + resolve(); + }; + }); + }, + // 请求数据 requestData(url, data) { return new Promise((resolve, reject) => { diff --git a/packageA/pages/hongBaoDetails/hongBaoDetails.json b/packageA/pages/hongBaoDetails/hongBaoDetails.json index f460f69..98fd0b2 100644 --- a/packageA/pages/hongBaoDetails/hongBaoDetails.json +++ b/packageA/pages/hongBaoDetails/hongBaoDetails.json @@ -1,6 +1,7 @@ { "usingComponents": { - "nodata": "/components/nodata/nodata" + "nodata": "/components/nodata/nodata", + "nav_box": "/components/nav_box/nav_box" }, "enablePullDownRefresh": false, "navigationBarTitleText": "抢红包" diff --git a/packageA/pages/hongBaoDetails/hongBaoDetails.wxml b/packageA/pages/hongBaoDetails/hongBaoDetails.wxml index 5ad9b77..7d81b03 100644 --- a/packageA/pages/hongBaoDetails/hongBaoDetails.wxml +++ b/packageA/pages/hongBaoDetails/hongBaoDetails.wxml @@ -45,6 +45,8 @@ + +