diff --git a/packageA/pages/cardDetails/cardDetails.js b/packageA/pages/cardDetails/cardDetails.js index d779387..ca60dd5 100644 --- a/packageA/pages/cardDetails/cardDetails.js +++ b/packageA/pages/cardDetails/cardDetails.js @@ -1,18 +1,31 @@ // pages/i_service/cardDetails/cardDetails.js +const app = getApp(); +let self = null; + Page({ /** * 页面的初始数据 */ data: { - }, /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { - + self = this; + this.data.options = options; + // this.setData({ + // options, + // }); + app.isLogin().then(function(data) {//进入页面前已经授权登录成功 + self.setData({ + userInfo: data, + imghost: app.globalData.setting.imghost, + }); + }); + }, /** @@ -26,7 +39,26 @@ Page({ * 生命周期函数--监听页面显示 */ onShow: function () { - + if(app.globalData.userInfo) { + if(!this.data.isLogin) { + this.setData({ + userInfo: app.globalData.userInfo, + imghost: app.globalData.setting.imghost, + isLogin: true, + }); + + app.request.get("/api/weshop/serviceCard/get/" + app.globalData.setting.stoid + '/' + this.data.options.id, { + isShowLoading: false, + success: function(res) { + self.setData({ + details: res.data.data + }); + }, + }); + + + }; + }; }, /** diff --git a/packageA/pages/cardDetails/cardDetails.wxml b/packageA/pages/cardDetails/cardDetails.wxml index 4a2612c..bd610df 100644 --- a/packageA/pages/cardDetails/cardDetails.wxml +++ b/packageA/pages/cardDetails/cardDetails.wxml @@ -1,21 +1,19 @@ - + - 3000 - 服务卡项名称服务卡项名称服务卡项名称服务卡称服务卡项名称服务卡称服务卡项名称服务卡称服务卡项名称服务卡项名称服务卡项名称服务卡项名称服务卡项名称 + {{details.money}} + {{details.serviceName}} - 时长:30分钟 - 次数:10次 - 有效天数:365天 + + 有效天数:{{details.validDays}}天 - - 详情 - - - + + —— 详情 —— + {{details.serviceContent}} diff --git a/packageA/pages/cardDetails/cardDetails.wxss b/packageA/pages/cardDetails/cardDetails.wxss index 660ed48..bfeac5b 100644 --- a/packageA/pages/cardDetails/cardDetails.wxss +++ b/packageA/pages/cardDetails/cardDetails.wxss @@ -10,7 +10,6 @@ page { .image { width: 100%; display: block; - background-color: pink; } .price { @@ -40,6 +39,5 @@ page { } .title { - background-color: #f2f2f2; padding: 10rpx; } \ No newline at end of file diff --git a/packageA/pages/service_share/service_share.js b/packageA/pages/service_share/service_share.js index 3fb1597..ded4795 100644 --- a/packageA/pages/service_share/service_share.js +++ b/packageA/pages/service_share/service_share.js @@ -857,7 +857,13 @@ Page({ success:function(){} }) - } + }, + + + goto:function(e) { + var url = e.currentTarget.dataset.url; + app.goto(url); + }, }) \ No newline at end of file diff --git a/packageA/pages/service_share/service_share.wxml b/packageA/pages/service_share/service_share.wxml index 26b456f..1282ef9 100644 --- a/packageA/pages/service_share/service_share.wxml +++ b/packageA/pages/service_share/service_share.wxml @@ -35,8 +35,9 @@ bindscrolltolower="refresh" scroll-anchoring > - - + + +