| @@ -22,7 +22,6 @@ | |||||
| "pages/cardorder/index/index", | "pages/cardorder/index/index", | ||||
| "pages/scanPay/scanPay", | "pages/scanPay/scanPay", | ||||
| "pages/edit/edit", | "pages/edit/edit", | ||||
| "pages/actdetail/actdetail", | |||||
| "pages/radetail/index", | "pages/radetail/index", | ||||
| "pages/radetail/joinActivity/edit", | "pages/radetail/joinActivity/edit", | ||||
| "pages/bannerdetail/index", | "pages/bannerdetail/index", | ||||
| @@ -1,64 +0,0 @@ | |||||
| // pages/actdetail/actdetail.js | |||||
| Page({ | |||||
| /** | |||||
| * 页面的初始数据 | |||||
| */ | |||||
| data: { | |||||
| detail:'' | |||||
| }, | |||||
| /** | |||||
| * 生命周期函数--监听页面加载 | |||||
| */ | |||||
| onLoad: function (options) { | |||||
| let that = this; | |||||
| console.log(options); | |||||
| that.setData({ | |||||
| detail:options.detail | |||||
| }) | |||||
| }, | |||||
| /** | |||||
| * 生命周期函数--监听页面初次渲染完成 | |||||
| */ | |||||
| onReady: function () { | |||||
| }, | |||||
| /** | |||||
| * 生命周期函数--监听页面显示 | |||||
| */ | |||||
| onShow: function () { | |||||
| }, | |||||
| /** | |||||
| * 生命周期函数--监听页面隐藏 | |||||
| */ | |||||
| onHide: function () { | |||||
| }, | |||||
| /** | |||||
| * 生命周期函数--监听页面卸载 | |||||
| */ | |||||
| onUnload: function () { | |||||
| }, | |||||
| /** | |||||
| * 页面相关事件处理函数--监听用户下拉动作 | |||||
| */ | |||||
| onPullDownRefresh: function () { | |||||
| }, | |||||
| /** | |||||
| * 页面上拉触底事件的处理函数 | |||||
| */ | |||||
| onReachBottom: function () { | |||||
| }, | |||||
| }) | |||||
| @@ -1,3 +0,0 @@ | |||||
| { | |||||
| "navigationBarTitleText": "活动详情" | |||||
| } | |||||
| @@ -1,3 +0,0 @@ | |||||
| <view> | |||||
| <text>{{detail}}</text> | |||||
| </view> | |||||
| @@ -1,12 +0,0 @@ | |||||
| view text { | |||||
| display: block; | |||||
| } | |||||
| view text:nth-of-type(1) { | |||||
| padding: 20rpx 30rpx; | |||||
| font-size: 26rpx; | |||||
| color: #191919; | |||||
| letter-spacing: 0; | |||||
| text-align: justify; | |||||
| line-height: 46rpx; | |||||
| } | |||||
| @@ -48,12 +48,5 @@ Page({ | |||||
| url: '/pages/main/index', | url: '/pages/main/index', | ||||
| }) | }) | ||||
| }, | }, | ||||
| gotoactdetail:function(){ | |||||
| let that = this; | |||||
| console.log(that.data.data.detail) | |||||
| wx.navigateTo({ | |||||
| url: `/pages/actdetail/actdetail?detail=${that.data.data.detail}`, | |||||
| }) | |||||
| } | |||||
| }); | }); | ||||
| @@ -1,6 +1,6 @@ | |||||
| <!-- <button class='goback' bindtap='goback'><image src='{{wmhome}}' mode="widthFix"></image></button> --> | <!-- <button class='goback' bindtap='goback'><image src='{{wmhome}}' mode="widthFix"></image></button> --> | ||||
| <navbar back home text="砍价专场"></navbar> | |||||
| <view class="bargainDetail" hover-class="none" hover-stop-propagation="false" wx:if="{{showPage}}" style="padding-top:{{navigationBarHeight}};"> | |||||
| <navbar back home text="砍价详情" background="#fff"></navbar> | |||||
| <view class="bargainDetail" hover-class="none" hover-stop-propagation="false" wx:if="{{showPage}}" style="padding-top:{{navigationBarHeight}}"> | |||||
| <view class="listitem clearfix" hover-class="none" hover-stop-propagation="false"> | <view class="listitem clearfix" hover-class="none" hover-stop-propagation="false"> | ||||
| <image class="fl" src="{{data.coverImg}}" lazy-load="true" binderror="" bindload="" mode='aspectFill'></image> | <image class="fl" src="{{data.coverImg}}" lazy-load="true" binderror="" bindload="" mode='aspectFill'></image> | ||||
| <view class="fl ri" hover-class="none" hover-stop-propagation="false"> | <view class="fl ri" hover-class="none" hover-stop-propagation="false"> | ||||
| @@ -1,3 +1,4 @@ | |||||
| const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' | |||||
| var config = require("../../config/config.js"); | var config = require("../../config/config.js"); | ||||
| var app = getApp(); | var app = getApp(); | ||||
| const Http = require("../../utils/HttpBasics"); | const Http = require("../../utils/HttpBasics"); | ||||
| @@ -8,6 +9,7 @@ Page({ | |||||
| * 页面的初始数据 | * 页面的初始数据 | ||||
| */ | */ | ||||
| data: { | data: { | ||||
| navigationBarHeight, | |||||
| poterbg: imgurl.poterbg.url, | poterbg: imgurl.poterbg.url, | ||||
| windowWidth: wx.getSystemInfoSync().windowWidth, | windowWidth: wx.getSystemInfoSync().windowWidth, | ||||
| windowHeight: wx.getSystemInfoSync().screenHeight, | windowHeight: wx.getSystemInfoSync().screenHeight, | ||||
| @@ -1,4 +1,6 @@ | |||||
| { | { | ||||
| "navigationBarTitleText": "分享", | "navigationBarTitleText": "分享", | ||||
| "usingComponents": {} | |||||
| "usingComponents": { | |||||
| "navbar": "../../components/navbar/navbar" | |||||
| } | |||||
| } | } | ||||
| @@ -1,4 +1,5 @@ | |||||
| <view class='content'> | |||||
| <navbar back home text="分享" background="#fff"></navbar> | |||||
| <view class='content' style="padding-top:{{navigationBarHeight}}"> | |||||
| <view class='poster'> | <view class='poster'> | ||||
| <canvas canvas-id='myCanvas' class='canvas-content' style="width:{{windowWidth-20}}px;height:{{windowHeight}}px;box-shadow: 1px 1px 5px 5px rgba(0, 0, 0, 0.05); position:absolute;z-index:1;"> | <canvas canvas-id='myCanvas' class='canvas-content' style="width:{{windowWidth-20}}px;height:{{windowHeight}}px;box-shadow: 1px 1px 5px 5px rgba(0, 0, 0, 0.05); position:absolute;z-index:1;"> | ||||
| </canvas> | </canvas> | ||||
| @@ -1,3 +1,4 @@ | |||||
| const navigationBarHeight = (getApp().statusBarHeight + 60) + 'px' | |||||
| const util = require("../../../utils/util"); | const util = require("../../../utils/util"); | ||||
| const config = require("../../../config/config.js"); | const config = require("../../../config/config.js"); | ||||
| const Http = require("../../../utils/HttpBasics"); | const Http = require("../../../utils/HttpBasics"); | ||||
| @@ -6,6 +7,7 @@ let app = getApp(); | |||||
| //券详情页面 | //券详情页面 | ||||
| Page({ | Page({ | ||||
| data: { | data: { | ||||
| navigationBarHeight, | |||||
| code: "", | code: "", | ||||
| lineUrl: imgurl.line.url, | lineUrl: imgurl.line.url, | ||||
| wm01Url: imgurl.wm01.url, | wm01Url: imgurl.wm01.url, | ||||
| @@ -1,3 +1,6 @@ | |||||
| { | { | ||||
| "navigationBarTitleText": "使用优惠券" | |||||
| "navigationBarTitleText": "使用优惠券", | |||||
| "usingComponents": { | |||||
| "navbar": "../../../components/navbar/navbar" | |||||
| } | |||||
| } | } | ||||
| @@ -1,4 +1,5 @@ | |||||
| <view class="container page"> | |||||
| <navbar back home text="使用优惠券" background="#fff"></navbar> | |||||
| <view class="container page" style="margin-top:{{navigationBarHeight}}"> | |||||
| <view class="coupon_detail clearfix"> | <view class="coupon_detail clearfix"> | ||||
| <view class="fl wmfl"> | <view class="fl wmfl"> | ||||
| <image src="{{data.coverImg}}" mode='aspectFill' /> | <image src="{{data.coverImg}}" mode='aspectFill' /> | ||||
| @@ -1,11 +1,12 @@ | |||||
| // pages/cardorder/userule/userule.js | // pages/cardorder/userule/userule.js | ||||
| const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' | |||||
| Page({ | Page({ | ||||
| /** | /** | ||||
| * 页面的初始数据 | * 页面的初始数据 | ||||
| */ | */ | ||||
| data: { | data: { | ||||
| navigationBarHeight, | |||||
| }, | }, | ||||
| /** | /** | ||||
| @@ -1,3 +1,6 @@ | |||||
| { | { | ||||
| "navigationBarTitleText": "使用规则" | |||||
| "navigationBarTitleText": "使用规则", | |||||
| "usingComponents": { | |||||
| "navbar": "../../../components/navbar/navbar" | |||||
| } | |||||
| } | } | ||||
| @@ -1,4 +1,5 @@ | |||||
| <view class="lists"> | |||||
| <navbar back home text="使用规则" background="#fff"></navbar> | |||||
| <view class="lists" style="padding-top:{{navigationBarHeight}}"> | |||||
| <view class="list"> | <view class="list"> | ||||
| <view class="title"> | <view class="title"> | ||||
| 1、如何使用消费卡? | 1、如何使用消费卡? | ||||
| @@ -1,11 +1,13 @@ | |||||
| // pages/complete/index.js | // pages/complete/index.js | ||||
| const imgurl = require("../../utils/imgurl"); | const imgurl = require("../../utils/imgurl"); | ||||
| const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' | |||||
| Page({ | Page({ | ||||
| /** | /** | ||||
| * 页面的初始数据 | * 页面的初始数据 | ||||
| */ | */ | ||||
| data: { | data: { | ||||
| navigationBarHeight, | |||||
| success01: imgurl.success01.url, | success01: imgurl.success01.url, | ||||
| couponOrderId:'' | couponOrderId:'' | ||||
| }, | }, | ||||
| @@ -1,4 +1,6 @@ | |||||
| { | { | ||||
| "usingComponents": {}, | |||||
| "usingComponents": { | |||||
| "navbar": "../../components/navbar/navbar" | |||||
| }, | |||||
| "navigationBarTitleText": "领取成功" | "navigationBarTitleText": "领取成功" | ||||
| } | } | ||||
| @@ -1,4 +1,5 @@ | |||||
| <view class="container"> | |||||
| <navbar back home text="领取成功" background="#fff"></navbar> | |||||
| <view class="container" style="padding-top:{{navigationBarHeight}}"> | |||||
| <view class='c-top'> | <view class='c-top'> | ||||
| <view class='c-top-top'></view> | <view class='c-top-top'></view> | ||||
| <view class='c-top-center'> | <view class='c-top-center'> | ||||
| @@ -1,4 +1,5 @@ | |||||
| let app = getApp(); | let app = getApp(); | ||||
| const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' | |||||
| var WxParse = require('../../wxParse/wxParse.js'); | var WxParse = require('../../wxParse/wxParse.js'); | ||||
| const config = require("../../config/config"); | const config = require("../../config/config"); | ||||
| const Http = require("../../utils/HttpBasics"); | const Http = require("../../utils/HttpBasics"); | ||||
| @@ -12,6 +13,7 @@ Page({ | |||||
| * 页面的初始数据 | * 页面的初始数据 | ||||
| */ | */ | ||||
| data: { | data: { | ||||
| navigationBarHeight, | |||||
| url: config.url, | url: config.url, | ||||
| token: app.globalData.token, | token: app.globalData.token, | ||||
| id:'', | id:'', | ||||
| @@ -1,3 +1,6 @@ | |||||
| { | { | ||||
| "navigationBarTitleText": "活动详情" | |||||
| "navigationBarTitleText": "活动详情", | |||||
| "usingComponents": { | |||||
| "navbar": "../../components/navbar/navbar" | |||||
| } | |||||
| } | } | ||||
| @@ -1,5 +1,6 @@ | |||||
| <!-- <web-view src="{{url+'/wxCampaign/printHtmlById?token='+token+'&id='+id+'&date='+date}}" bindmessage="bindGetMsg"></web-view> --> | <!-- <web-view src="{{url+'/wxCampaign/printHtmlById?token='+token+'&id='+id+'&date='+date}}" bindmessage="bindGetMsg"></web-view> --> | ||||
| <navbar back home text="活动详情" background="#fff"></navbar> | |||||
| <view style="margin-top:{{navigationBarHeight}}"></view> | |||||
| <import src="../../wxParse/wxParse.wxml" /> | <import src="../../wxParse/wxParse.wxml" /> | ||||
| <view class="content"> | <view class="content"> | ||||
| <template is="wxParse" data="{{wxParseData:article.nodes}}" /> | <template is="wxParse" data="{{wxParseData:article.nodes}}" /> | ||||
| @@ -100,13 +100,5 @@ Page({ | |||||
| url: '/pages/main/index', | url: '/pages/main/index', | ||||
| }) | }) | ||||
| }, | }, | ||||
| gotoactdetail: function() { | |||||
| let that = this; | |||||
| console.log(that.data.data.detail) | |||||
| wx.navigateTo({ | |||||
| url: `/pages/actdetail/actdetail?detail=${that.data.data.detail}`, | |||||
| }) | |||||
| }, | |||||
| }); | }); | ||||
| @@ -82,11 +82,5 @@ Page({ | |||||
| }) | }) | ||||
| } | } | ||||
| }, | }, | ||||
| gotoactdetail:function(){ | |||||
| let that = this; | |||||
| console.log(that.data.data.detail) | |||||
| wx.navigateTo({ | |||||
| url: `/pages/actdetail/actdetail?detail=${that.data.data.detail}`, | |||||
| }) | |||||
| } | |||||
| }); | }); | ||||