diff --git a/app.json b/app.json index cf0e512..62a06b7 100644 --- a/app.json +++ b/app.json @@ -6,7 +6,8 @@ "pages/integralmall/payIntegcoupondetail/index", "pages/joinFrDpell/index", "pages/spellDetail/index", - "pages/spellTimeout/index", + "pages/radetail/success/index", + "pages/spellTimeout/index", "pages/spellGroup/mySpellGroup/index", "pages/spellGroup/spellGroup", "pages/complete/index", @@ -23,12 +24,10 @@ "pages/edit/edit", "pages/actdetail/actdetail", "pages/radetail/index", - "pages/radetail/success/index", "pages/radetail/joinActivity/edit", "pages/bannerdetail/index", "pages/getuserinfo/index", "pages/phoneinput/phoneinput", - "pages/market/index", "pages/user/index", "pages/user/myactivity/index", "pages/coupon/detail/index", @@ -39,23 +38,18 @@ "pages/cardorder/userule/userule", "pages/order/detail/index", "pages/order/index/index", - "pages/success/index", - "pages/park/park", "pages/ques/ques", "pages/passCar/passCar", "pages/getphoneInfo/index", "pages/addPark/addPark", "pages/orderquanma/index", "pages/passCar/couponList/couponList", - "pages/passCar/choicecoupon/choicecoupon", "pages/passCar/couponDetail/couponDetail", "pages/managelicenseplate/managelicenseplate", "pages/payrule/payrule", "pages/grade/grade", "pages/game/index", "pages/canvas/index", - "pages/main/gameentry/gentry", - "pages/index/gameentry/gentry", "pages/specialcourtesy/specialcourtesy", "pages/discountCardList/discountCardList", "pages/cardListDetail/cardListDetail", diff --git a/pages/index/gameentry/gentry.js b/pages/index/gameentry/gentry.js deleted file mode 100644 index a3185cf..0000000 --- a/pages/index/gameentry/gentry.js +++ /dev/null @@ -1,66 +0,0 @@ -// pages/index/gameentry/gentry.js -Page({ - - /** - * 页面的初始数据 - */ - data: { - - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - - } -}) \ No newline at end of file diff --git a/pages/index/gameentry/gentry.json b/pages/index/gameentry/gentry.json deleted file mode 100644 index 8835af0..0000000 --- a/pages/index/gameentry/gentry.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "usingComponents": {} -} \ No newline at end of file diff --git a/pages/index/gameentry/gentry.wxml b/pages/index/gameentry/gentry.wxml deleted file mode 100644 index ad0a5e7..0000000 --- a/pages/index/gameentry/gentry.wxml +++ /dev/null @@ -1,2 +0,0 @@ - -pages/index/gameentry/gentry.wxml diff --git a/pages/index/gameentry/gentry.wxss b/pages/index/gameentry/gentry.wxss deleted file mode 100644 index c729821..0000000 --- a/pages/index/gameentry/gentry.wxss +++ /dev/null @@ -1 +0,0 @@ -/* pages/index/gameentry/gentry.wxss */ \ No newline at end of file diff --git a/pages/main/bargain/index.js b/pages/main/bargain/index.js deleted file mode 100644 index 38a2e2f..0000000 --- a/pages/main/bargain/index.js +++ /dev/null @@ -1,84 +0,0 @@ -// pages/index/sw/index.js -let config = require("../../../config/config.js"); -let Http = require("../../../utils/HttpBasics"); -// let Http = require("../../../utils/HttpBasics"); -const app = getApp(); -const imgurl = require("../../../utils/imgurl"); -Component({ - /** - * 组件的属性列表 - */ - properties: {}, - - /** - * 组件的初始数据 - */ - data: { - jianUrl: imgurl.jian.url, - barginicon: imgurl.barginicon.url, - wangmeimeibargin: imgurl.wangmeimeibargin.url, - list: [], - total:'' - }, - - /** - * 组件的方法列表 - */ - methods: { - gotoBargainList(){ - wx.navigateTo({ - url: "/pages/bargain/bargain" - }) - }, - getList() { - let that = this; - Http.get({ - url: config.api.couponChannelList, - data: { - pageNum: 1, - pageSize: 5, - targetAd: 6 - } - }).then(res => { - that.setData({ - list: res.data.list, - total: res.data.total - }); - }) - .catch(err => { - console.log(err) - wx.showToast({ - title: err.errMsg, - icon: 'none', - duration: 2000, - mask: false - }); - }) - }, - gotomore: function() { - wx.navigateTo({ - url: "/pages/bargain/bargain" - }); - }, - gotodetail: function(e) { - wx.navigateTo({ - url: `/pages/coupon/detail/index?couponChannelId=${ - e.currentTarget.dataset.couponchannelid - }&couponId=${ - e.currentTarget.dataset.couponid - }&targetAd=${ - e.currentTarget.dataset.targetad - }` - }); - } - }, - ready() { - app.couponChannelListCallback = token => { - Http.setToken(token); - this.getList(); - }; - if (app.globalData.token && app.globalData.token != null) { - app.couponChannelListCallback(app.globalData.token); - } - } -}); diff --git a/pages/main/bargain/index.json b/pages/main/bargain/index.json deleted file mode 100644 index 32640e0..0000000 --- a/pages/main/bargain/index.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "component": true -} \ No newline at end of file diff --git a/pages/main/bargain/index.wxml b/pages/main/bargain/index.wxml deleted file mode 100644 index 2d60874..0000000 --- a/pages/main/bargain/index.wxml +++ /dev/null @@ -1,57 +0,0 @@ - - - 砍价专场更多砍价> - - - - - - - - {{item.title}} - {{item.salePriceStr}}元{{item.priceStr}}元 - - - - - - - - - - - - - - - 砍价 - - - - - - {{list[0].title}} - {{list[0].salePriceStr}} - {{list[0].priceStr}}元 - 邀请{{list[0].pressLimitNum}}人可砍至底价 - - - - - - - - - - \ No newline at end of file diff --git a/pages/main/bargain/index.wxss b/pages/main/bargain/index.wxss deleted file mode 100644 index 74b633f..0000000 --- a/pages/main/bargain/index.wxss +++ /dev/null @@ -1,227 +0,0 @@ -@import "../../../app.wxss"; -.index-rushToBuy { - width: 688rpx; - margin: 30rpx auto 0; - padding: 20rpx 0 0; - font-family: PingFangSC-Semibold; - box-shadow:0 0 10px 0 rgba(211,211,211,0.50); - border-radius:16rpx; -} - -.index-rushToBuy-title { - position: relative; - font-size: 34rpx; - font-weight:bold; - color: #333333; - letter-spacing: 1.16rpx; - padding-left: 20rpx; - line-height: 34rpx; -} -.useprice{ - font-size: 28rpx; -} -.morebargin{ - float: right; - margin-right: 20rpx; - color: #999999; - font-size: 24rpx; - line-height: 34rpx; - font-weight: normal; -} -.listimage{ - position: absolute; - right: 18rpx; - width: 20px; - top: 28rpx; -} -.index-scroll-view { - width: 100%; - white-space: nowrap; - height: 300rpx; -} -.index-scroll-view .commodity { - display: inline-block; - width: 285rpx; - margin: 20rpx 0 0 13rpx; - position: relative; - border-radius: 10rpx; - overflow: hidden; -} -.index-scroll-view .commodity:last-child{ - margin-right: 15rpx; -} -.index-scroll-view .commodity:nth-of-type(1){ - margin-left: 14rpx; -} -.commodity-img{ - display: block; - width: 285rpx; - height: 166rpx; - background:rgba(255,255,255,1); - border-radius:16rpx; -} - -.index-scroll-view .commodity-info { - padding:10rpx 0; - overflow: hidden; -} - -.index-scroll-view .commodity-info-name { - width: 285rpx; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - font-size: 28rpx; - line-height: 30rpx; - margin-top: 16rpx; - color: #333333; -} - -.index-scroll-view .commodity-info-time { - font-size: 22rpx; - color: #B4B4B4; - letter-spacing: 0.7rpx; - line-height: 42rpx; -} - -.index-scroll-view .commodity-info-price-p { - font-size: 28rpx; - color: #f96563; - line-height: 30rpx; -} -.commodity-info-price{ - margin-top: 10rpx; - line-height: 30rpx; -} -.index-scroll-view .commodity-info-price-o { - display: inline-block; - padding-left: 20rpx; - font-size: 24rpx; - color: #B4B4B4; - letter-spacing: 0.96rpx; - text-decoration:line-through; - line-height: 36rpx; -} -.barginicon{ - width: 24rpx; - height: 22rpx; -} -.barginiconimg{ - width: 26rpx; - height: 23rpx; - margin-right: 6rpx; -} -.text-red{ - color:#F12643; -} -.commodity-info-price-p { - font-size: 28rpx; - color: #f96563; - line-height: 30rpx; -} -.price{ - font-size: 24rpx; - color: #999; - text-decoration: line-through; - margin-left: 10rpx; -} -.one-commodity{ - padding-bottom: 20rpx; -} -.one-commodity-info { - width:322rpx; - white-space:nowrap; - text-overflow:ellipsis; - overflow:hidden; -} - -.one-commodity-img{ - width: 325rpx; - height: 201rpx; - float: left; - /* border-radius:16rpx; */ - margin: 20rpx 26rpx 0 13rpx; -} -.one-commodity-info .commodity-info-name{ - font-size: 24rpx; - line-height: 32rpx; - margin-top: 14rpx; - -} -.one-commodity-info .commodity-info-subTitle{ - font-size: 28rpx; - height: 28rpx; - line-height: 28rpx; - margin-top: 12rpx; - color: #999; - width: 322rpx; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} -.one-commodity-info .commodity-info-salePriceStr{ - line-height: 30rpx; - margin-top: 6rpx; -} -.one-commodity-info .commodity-info-price{ - margin-top: 0; - font-size: 18rpx; - line-height: 26rpx; - margin-left: 0; - text-decoration: none; - color: #999; -} -.inviteNum{ - color: red; -} -.one-commodity-info .salePriceStr{ - font-weight: bold; - font-size:66rpx; - line-height: 66rpx; - color: #fc5b24; -} -.titlechannel{ - text-align: center; - width: 171rpx; - height: 201rpx; - background: #fc5b24; - border-radius:16rpx; - border-top-right-radius: 0; - border-bottom-right-radius: 0; -} -.titlechannel text{ - color:#fff; - font-size:46rpx; - margin-top:13rpx; - font-weight:bold; - display:inline-block; -} -.rightcontent{ - position: relative; - width: 463rpx; - height: 201rpx; - background: #fff; - /* border-radius: 16rpx; */ - border-bottom-right-radius: 0; - border-top-right-radius: 0; -} -.more{ - position: absolute; - right: 0; - top: 0; - bottom: 0; - z-index: 10; - background: #fc5b24; - width: 55rpx; - border-bottom-right-radius:16rpx; - border-top-right-radius:16rpx; -} -.more text{ - color:#fff; - font-size: 26rpx; - display: block; - text-align: center; -} -.more text:nth-of-type(1){ - margin-top: 68rpx; -} \ No newline at end of file diff --git a/pages/main/gameentry/gentry.js b/pages/main/gameentry/gentry.js deleted file mode 100644 index bf984d5..0000000 --- a/pages/main/gameentry/gentry.js +++ /dev/null @@ -1,59 +0,0 @@ -// pages/index/gameentry/gentry.js -Page({ - - /** - * 页面的初始数据 - */ - data: { - - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { - - }, -}) \ No newline at end of file diff --git a/pages/main/gameentry/gentry.json b/pages/main/gameentry/gentry.json deleted file mode 100644 index 9e26dfe..0000000 --- a/pages/main/gameentry/gentry.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/pages/main/gameentry/gentry.wxml b/pages/main/gameentry/gentry.wxml deleted file mode 100644 index ad0a5e7..0000000 --- a/pages/main/gameentry/gentry.wxml +++ /dev/null @@ -1,2 +0,0 @@ - -pages/index/gameentry/gentry.wxml diff --git a/pages/main/gameentry/gentry.wxss b/pages/main/gameentry/gentry.wxss deleted file mode 100644 index c729821..0000000 --- a/pages/main/gameentry/gentry.wxss +++ /dev/null @@ -1 +0,0 @@ -/* pages/index/gameentry/gentry.wxss */ \ No newline at end of file diff --git a/pages/main/index.json b/pages/main/index.json index 7f18b4b..449949c 100644 --- a/pages/main/index.json +++ b/pages/main/index.json @@ -2,15 +2,11 @@ "usingComponents": { "c-banner": "../../components/banner/index", "discount-card": "../../components/discountCard/index", - "c-bargain": "./bargain/index", - "c-spellGroup": "./spellGroup/index", "c-coupons": "./coupons/index", "g-entry": "../../components/gameentry/gentry", - "c-rushtobyCard": "./rushtobyCard/index", "c-hot": "../../components/hot/index", "navbar": "../../components/navbar/navbar" }, - "navigationBarTitleText": "首页", "enablePullDownRefresh": true, "navigationBarBackgroundColor": "#F4F5F9" } diff --git a/pages/main/index.wxml b/pages/main/index.wxml index 280db74..443def1 100644 --- a/pages/main/index.wxml +++ b/pages/main/index.wxml @@ -72,7 +72,7 @@ - - + + diff --git a/pages/main/rushtobyCard/index.js b/pages/main/rushtobyCard/index.js deleted file mode 100644 index eaf103a..0000000 --- a/pages/main/rushtobyCard/index.js +++ /dev/null @@ -1,110 +0,0 @@ - -let config = require("../../../config/config.js"); -let Http = require("../../../utils/HttpBasics"); -// let Http = require("../../../utils/HttpBasics"); -const app = getApp(); -const imgurl = require("../../../utils/imgurl"); -Component({ - /** - * 组件的属性列表 - */ - properties: {}, - - /** - * 组件的初始数据 - */ - data: { - list: [], - cardlist:[],//消费卡列表 - total:'' - }, - - /** - * 组件的方法列表 - */ - methods: { - rushtobuy: function (e) { - wx.navigateTo({ - url: `/pages/coupon/detail/index?couponChannelId=${ - e.currentTarget.dataset.couponchannelid - }&couponId=${e.currentTarget.dataset.couponid}` - }) - }, - gotoRushList:function(){ - wx.navigateTo({ - url: '/pages/rushToBuy/index', - }) - }, - gotoCardList:function(){ - wx.navigateTo({ - url: '/pages/discountCardList/discountCardList', - }) - }, - gotodiscountCardList: function (e) { - wx.navigateTo({ - url: `/pages/coupon/detail/index?couponChannelId=${e.currentTarget.dataset.quancode}&couponId=${e.currentTarget.dataset.couponid}&cardType=${e.currentTarget.dataset.type}` - }); - }, - //获取限时抢购列表 - getList(){ - Http.get({ - url: config.api.couponChannelList, - data: { - pageNum: 1, - pageSize: 3, - targetAd: 2 - } - }).then(res => { - this.setData({ - list: res.data.list, - total: res.data.total, - - }); - }) - .catch(err => { - console.log(err) - wx.showToast({ - title: err.errMsg, - icon: 'none', - duration: 2000, - mask: false - }); - }) - }, - //获取消费卡列表 - getcardList() { - Http.get({ - url: config.api.couponChannelList, - data: { - pageNum: 1, - pageSize: 3, - targetAd: 5 - } - }).then(res => { - this.setData({ - cardlist: res.data.list, - total: res.data.total - }); - }) - .catch(err => { - console.log(err) - wx.showToast({ - title: err.errMsg, - icon: 'none', - duration: 2000, - mask: false - }); - }) - } - }, - ready() { - app.couponChannelListCallback = token => { - Http.setToken(token); - this.getList(); - this.getcardList(); - }; - if (app.globalData.token && app.globalData.token != null) { - app.couponChannelListCallback(app.globalData.token); - } - } -}); diff --git a/pages/main/rushtobyCard/index.json b/pages/main/rushtobyCard/index.json deleted file mode 100644 index 32640e0..0000000 --- a/pages/main/rushtobyCard/index.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "component": true -} \ No newline at end of file diff --git a/pages/main/rushtobyCard/index.wxml b/pages/main/rushtobyCard/index.wxml deleted file mode 100644 index 436bd0f..0000000 --- a/pages/main/rushtobyCard/index.wxml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - 限时 - 秒杀 - 更多> - - - - - - - - - - {{list[0].title}} - - {{list[0].salePriceStr}}元 - {{list[0].priceStr}}元 - - - - - - - - - 消费 - - 更多> - - - - - - {{cardlist[0].title}} - - {{cardlist[0].salePriceStr}}元 - {{cardlist[0].priceStr}}元 - - - - - - - \ No newline at end of file diff --git a/pages/main/rushtobyCard/index.wxss b/pages/main/rushtobyCard/index.wxss deleted file mode 100644 index afe6e86..0000000 --- a/pages/main/rushtobyCard/index.wxss +++ /dev/null @@ -1,195 +0,0 @@ -@import "../../../app.wxss"; -.rushtobuyimgs>view{ - display: inline-block; - box-shadow:0 0 10px 0 rgba(211,211,211,0.50); - border-radius:16rpx; -} -.rushtobuyimgs{ - padding: 0 30rpx; - margin-top: 30rpx; -} -.rushtobuyimgs>view>text{ - font-weight: bold; -} -.rushtobuyimgs > view:nth-of-type(1){ - margin-right: 11rpx; -} -.xianshi{ - color: #F12643; - font-weight: bold; - font-size:34rpx; - line-height: 34rpx; -} -.qianggou{ - color: #3D3737; - font-weight: bold; - font-size: 34rpx; - line-height: 34rpx; -} -.xiaofei{ - color: #3D3737; - padding-left:30rpx; - font-size: 34rpx; -} -.subtitle{ - font-size:28rpx !important; - color: #666666; - font-weight:400 !important; - margin-left: 15rpx; -} - -.index-rushToBuy { - width: 100%; - font-family: PingFangSC-Semibold; -} - -.index-rushToBuy-title { - position: relative; - font-size: 34rpx; - color: #000000; - letter-spacing: 1.16rpx; - padding-top: 0; - padding-left: 30rpx; - font-weight: bold; -} - -.index-rushToBuy-title text{ - float: right; - margin-right: 20rpx; - color: #999999; - font-size: 24rpx; - margin-top: 8rpx; - font-weight: normal; -} -.index-rushToBuy-title image{ - position: absolute; - right: 18rpx; - width: 20px; - top: 40rpx; -} -.index-scroll-view { - width: 100%; - white-space: nowrap; -} - -.index-scroll-view .commodity { - display: inline-block; - margin: 20rpx 0 16rpx; - margin-right: 0; - position: relative; - background: #fff; - width: 334rpx; - border-radius: 10rpx; - overflow: hidden; -} -.index-scroll-view .commodity:last-child{ - margin-right: 30rpx; -} -.commodity-img{ - display: block; - width: 314rpx; - height: 174rpx; - border-radius: 16rpx; - border:1rpx solid #f5f5f5; -} - -.index-scroll-view .commodity-info { - padding:10rpx 0; - overflow: hidden; -} - -.commodity-info-name { - font-size: 28rpx; - line-height: 28rpx; - color: #333; - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; - width:318rpx; - padding:16rpx 0; -} - -.commodity-info-time { - font-size: 28rpx; - color: #B4B4B4; - letter-spacing: 0.7rpx; - line-height: 42rpx; - font-weight: 500; -} - -.commodity-info-price-p { - font-size: 28rpx; - color: #FF3232; - line-height: 36rpx; - font-weight:500; -} -.commodity-info-price-o { - display: inline-block; - padding-left: 20rpx; - font-size: 24rpx; - color: #B4B4B4; - letter-spacing: 0.96rpx; - text-decoration:line-through; - line-height: 36rpx; -} -.commodity-info-price{ - line-height: 36rpx; -} -.remainingTime { - font-size: 28rpx; - color: #b4b4b4; -} - -.realRemainingTime { - color: #ff4949; - font-size: 28rpx; -} -.more{ - float: right; - line-height: 34rpx; - color: #999999; - font-size: 24rpx; - font-weight: normal; -} -.title{ - padding: 20rpx 0; -} -.clock { - width: 116rpx !important; - vertical-align: middle; - margin-right: 10rpx; - margin-top: -4rpx; -} - -.qiang { - position: inline-block; - width: 60rpx; - height: 40rpx; - line-height: 40rpx; - color: #ff4949; - text-align: center; - font-size: 28rpx; - margin-right: 10rpx; -} - -.times { - display: inline-block; - color: #ff4949; - font-weight: bold; - font-size: 26rpx; - text-align: center; -} - -.times text { - display: inline-block; - margin: 6rpx; - height: 56rpx; - padding: 0 6rpx; - text-align: center; - font-size: 28rpx; - line-height: 60rpx; - border-radius: 12rpx; - color: #fff; - font-weight: bold; - background: #ff4949; -} \ No newline at end of file diff --git a/pages/main/spellGroup/index.js b/pages/main/spellGroup/index.js deleted file mode 100644 index a7bcdda..0000000 --- a/pages/main/spellGroup/index.js +++ /dev/null @@ -1,81 +0,0 @@ -// pages/index/sw/index.js -let config = require("../../../config/config.js"); -let Http = require("../../../utils/HttpBasics"); -const app = getApp(); -const imgurl = require("../../../utils/imgurl"); -Component({ - /** - * 组件的属性列表 - */ - properties: {}, - - /** - * 组件的初始数据 - */ - data: { - jianUrl: imgurl.jian.url, - pintuan: imgurl.pintuan.url, - wangmeimeipintuan: imgurl.wangmeimeipintuan.url, - list: [], - total:'' - }, - - /** - * 组件的方法列表 - */ - methods: { - gotomore: function() { - wx.navigateTo({ - url: "/pages/spellGroup/spellGroup" - }); - }, - gotospellGroupList(){ - wx.navigateTo({ - url: "/pages/spellGroup/spellGroup" - }) - }, - gotodetail: function(e) { - wx.navigateTo({ - url: `/pages/spellGroup/mySpellGroup/index?couponChannelId=${ - e.currentTarget.dataset.couponchannelid - }&couponId=${ - e.currentTarget.dataset.couponid - }&targetAd=${ - e.currentTarget.dataset.targetad - }` - }); - }, - getList(){ - Http.get({ - url: config.api.couponChannelList, - data: { - pageNum: 1, - pageSize: 4, - targetAd: 7 - } - }).then(res => { - this.setData({ - list: res.data.list, - total: res.data.total - }); - }) - .catch(err => { - wx.showToast({ - title: err.errMsg, - icon: 'none', - duration: 2000, - mask: false - }); - }) - } - }, - ready() { - app.couponChannelListCallback = token => { - Http.setToken(token); - this.getList(); - }; - if (app.globalData.token && app.globalData.token != null) { - app.couponChannelListCallback(app.globalData.token); - } - } -}); diff --git a/pages/main/spellGroup/index.json b/pages/main/spellGroup/index.json deleted file mode 100644 index 32640e0..0000000 --- a/pages/main/spellGroup/index.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "component": true -} \ No newline at end of file diff --git a/pages/main/spellGroup/index.wxml b/pages/main/spellGroup/index.wxml deleted file mode 100644 index 92c21d4..0000000 --- a/pages/main/spellGroup/index.wxml +++ /dev/null @@ -1,54 +0,0 @@ - - - 拼团专场更多拼团> - - - - - - - {{item.title}} - {{item.salePriceStr}}元{{item.priceStr}}元 - - - - - - - - - - - - - 拼团 - - - - - - {{list[0].title}} - {{list[0].salePriceStr}} - {{list[0].priceStr}}元 - 邀请{{list[0].pressLimitNum}}人可成团 - - - - - - - - - - \ No newline at end of file diff --git a/pages/main/spellGroup/index.wxss b/pages/main/spellGroup/index.wxss deleted file mode 100644 index 82928fa..0000000 --- a/pages/main/spellGroup/index.wxss +++ /dev/null @@ -1,226 +0,0 @@ -@import "../../../app.wxss"; -.index-rushToBuy { - width: 688rpx; - margin: 30rpx auto 0; - padding: 20rpx 0 0; - font-family: PingFangSC-Semibold; - box-shadow:0 0 10px 0 rgba(211,211,211,0.50); - border-radius:16rpx; -} - -.index-rushToBuy-title { - position: relative; - font-size: 34rpx; - font-weight:bold; - color: #333333; - letter-spacing: 1.16rpx; - padding-left: 20rpx; - line-height: 34rpx; -} -.useprice{ - font-size: 28rpx; -} -.morebargin{ - float: right; - margin-right: 20rpx; - color: #999999; - font-size: 24rpx; - line-height: 34rpx; - font-weight: normal; -} -.listimage{ - position: absolute; - right: 18rpx; - width: 20px; - top: 28rpx; -} -.index-scroll-view { - width: 100%; - white-space: nowrap; -} -.index-scroll-view .commodity { - display: inline-block; - width: 285rpx; - margin: 20rpx 0 0 13rpx; - position: relative; - border-radius: 10rpx; - overflow: hidden; -} -.index-scroll-view .commodity:last-child{ - margin-right: 15rpx; -} -.index-scroll-view .commodity:nth-of-type(1){ - margin-left: 14rpx; -} -.commodity-img{ - display: block; - width: 285rpx; - height: 166rpx; - background:rgba(255,255,255,1); - border-radius:16rpx; -} - -.index-scroll-view .commodity-info { - padding:10rpx 0; - overflow: hidden; -} - -.index-scroll-view .commodity-info-name { - width: 285rpx; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - font-size: 28rpx; - line-height: 30rpx; - margin-top: 16rpx; - color: #333333; -} - -.index-scroll-view .commodity-info-time { - font-size: 22rpx; - color: #B4B4B4; - letter-spacing: 0.7rpx; - line-height: 42rpx; -} - -.index-scroll-view .commodity-info-price-p { - font-size: 28rpx; - color: #f96563; - line-height: 30rpx; -} -.commodity-info-price{ - margin-top: 10rpx; - line-height: 30rpx; -} -.index-scroll-view .commodity-info-price-o { - display: inline-block; - padding-left: 20rpx; - font-size: 24rpx; - color: #B4B4B4; - letter-spacing: 0.96rpx; - text-decoration:line-through; - line-height: 36rpx; -} -.barginicon{ - width: 24rpx; - height: 22rpx; -} -.barginiconimg{ - width: 26rpx; - height: 23rpx; - margin-right: 6rpx; -} -.text-red{ - color:#F12643; -} -.commodity-info-price-p { - font-size: 28rpx; - color: #f96563; - line-height: 30rpx; -} -.price{ - font-size: 24rpx; - color: #999; - text-decoration: line-through; - margin-left: 10rpx; -} -.one-commodity{ - padding-bottom: 20rpx; -} -.one-commodity-info { - width:322rpx; - white-space:nowrap; - text-overflow:ellipsis; - overflow:hidden; -} - -.one-commodity-img{ - width: 325rpx; - height: 200rpx; - float: left; - /* border-radius:16rpx; */ - margin: 20rpx 26rpx 0 13rpx; -} -.one-commodity-info .commodity-info-name{ - font-size: 24rpx; - line-height: 32rpx; - margin-top: 14rpx; - -} -.one-commodity-info .commodity-info-subTitle{ - font-size: 28rpx; - height: 28rpx; - line-height: 28rpx; - margin-top: 12rpx; - color: #999; - width: 322rpx; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} -.one-commodity-info .commodity-info-salePriceStr{ - line-height: 30rpx; - margin-top: 6rpx; -} -.one-commodity-info .commodity-info-price{ - margin-top: 0; - font-size: 18rpx; - line-height: 26rpx; - margin-left: 0; - text-decoration: none; - color: #999; -} -.inviteNum{ - color: red; -} -.one-commodity-info .salePriceStr{ - font-weight: bold; - font-size:66rpx; - line-height: 66rpx; - color: #fc5b24; -} -.titlechannel{ - text-align: center; - width: 171rpx; - height: 201rpx; - background: #fc5b24; - border-radius:16rpx; - border-top-right-radius: 0; - border-bottom-right-radius: 0; -} -.titlechannel text{ - color:#fff; - font-size:46rpx; - margin-top:13rpx; - font-weight:bold; - display:inline-block; -} -.rightcontent{ - position: relative; - width: 463rpx; - height: 201rpx; - background: #fff; - /* border-radius: 16rpx; */ - border-bottom-right-radius: 0; - border-top-right-radius: 0; -} -.more{ - position: absolute; - right: 0; - top: 0; - bottom: 0; - z-index: 10; - background: #fc5b24; - width: 55rpx; - border-bottom-right-radius:16rpx; - border-top-right-radius:16rpx; -} -.more text{ - color:#fff; - font-size: 26rpx; - display: block; - text-align: center; -} -.more text:nth-of-type(1){ - margin-top: 68rpx; -} \ No newline at end of file diff --git a/pages/market/index.js b/pages/market/index.js deleted file mode 100644 index 8cead1f..0000000 --- a/pages/market/index.js +++ /dev/null @@ -1,58 +0,0 @@ -Page({ - - /** - * 页面的初始数据 - */ - data: { - - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { - - }, -}) \ No newline at end of file diff --git a/pages/market/index.json b/pages/market/index.json deleted file mode 100644 index d5d391c..0000000 --- a/pages/market/index.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "usingComponents": { - - }, - "navigationBarTitleText": "商场列表" - } \ No newline at end of file diff --git a/pages/market/index.wxml b/pages/market/index.wxml deleted file mode 100644 index de7c835..0000000 --- a/pages/market/index.wxml +++ /dev/null @@ -1,26 +0,0 @@ - - - 西单大悦城 - - - 12.5KM - 北京市西城区西单北大街131号 - - - - 西单大悦城 - - - 12.5KM - 北京市西城区西单北大街131号 - - - - 西单大悦城 - - - 12.5KM - 北京市西城区西单北大街131号 - - - \ No newline at end of file diff --git a/pages/market/index.wxss b/pages/market/index.wxss deleted file mode 100644 index d4c4837..0000000 --- a/pages/market/index.wxss +++ /dev/null @@ -1,32 +0,0 @@ -@import '../../app.wxss'; -.market { - width: 100%; - height: 100%; - background: #f6f6f6; - position: absolute; -} -.position { - width: 92%; - height: 132rpx; - padding: 0 4%; - display: flex; - flex-direction: column; - background: #fff; - margin-top: 1px; - padding-top: 20rpx; -} -.position view:nth-child(1) text { - font-size: 30rpx; - padding-left: 8rpx; -} -.position view:nth-child(2) icon{ - color: #C0C0C0; -} -.position view:nth-child(2) text{ - font-size: 22rpx; - color: #C0C0C0; - padding: 0 2.7% 0 1.3%; -} -.position view:nth-child(2) text:nth-child(3) { - color: #585858; -} \ No newline at end of file diff --git a/pages/park/park.js b/pages/park/park.js deleted file mode 100644 index 95cf889..0000000 --- a/pages/park/park.js +++ /dev/null @@ -1,136 +0,0 @@ -// pages/park/park.js -Page({ - - /** - * 页面的初始数据 - */ - data: { - item1: ["京", "沪", "浙", "苏", "粤", "鲁", "晋", "冀", - "豫", "川", "渝", "辽", "吉", "黑", "皖", "鄂", - "津", "贵", "云", "桂", "琼", "青", "新", "藏", - "蒙", "宁", "甘", "陕", "闽", "赣", "湘"], - item2: ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", - "Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", - "A", "S", "D", "F", "G", "H", "J", "K", "L", - "Z", "X", "C", "V", "B", "N", "M"], - hidden1: true, - hidden2: true, - carNo: '', - }, - //车牌输入获取焦点 - d1: function () { - var that = this; - if (that.data.carNo == '') { - that.setData({ - hidden1: false, - hidden2: true - }) - } else { - that.setData({ - hidden1: true, - hidden2: false - }) - } - - }, - //车牌输入失去焦点 - d2: function () { - var that = this; - that.setData({ - hidden1: true, - hidden2: true - }) - }, - //获取车牌省份 - sheng: function (e) { - var that = this; - that.setData({ - carNo: e.currentTarget.dataset.sh - }) - if (that.data.carNo != '') { - that.setData({ - hidden1: true, - hidden2: false - }) - } - }, - //获取车牌号码 - other: function (e) { - var that = this; - var carNo = that.data.carNo + e.currentTarget.dataset.ot; - that.setData({ - carNo: carNo - }) - }, - //回删车牌 - del: function () { - var that = this; - var ss = that.data.carNo; - var s = ss.split(''); - if (s.slice(0, -1).length == 0) { - that.setData({ - hidden1: false, - hidden2: true - }) - } - var s = s.join('').slice(0, -1); - that.setData({ - carNo: s - }) - - }, - //确认输入 - ok: function () { - wx.navigateTo({ - url: '/pages/passCar/passCar', - }) - }, - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { - - }, -}) diff --git a/pages/park/park.json b/pages/park/park.json deleted file mode 100644 index e8cfaaf..0000000 --- a/pages/park/park.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "component": true, - "usingComponents": {} -} \ No newline at end of file diff --git a/pages/park/park.wxml b/pages/park/park.wxml deleted file mode 100644 index 8745769..0000000 --- a/pages/park/park.wxml +++ /dev/null @@ -1,22 +0,0 @@ - - - - 请输入车牌号码: - - {{carNo}} - - - - - - diff --git a/pages/park/park.wxss b/pages/park/park.wxss deleted file mode 100644 index 00142d1..0000000 --- a/pages/park/park.wxss +++ /dev/null @@ -1,86 +0,0 @@ -/* pages/park/park.wxss */ -/* pages/jp_cp/jp_cp.wxss */ -.lf{ - float: left; -} -.rt{ - float: right; -} -.tel{ - border-bottom: 2rpx solid #ddd; - height: 100rpx; - line-height:100rpx; -} -.chepai{ - height: 200rpx; - line-height:200rpx; -} -.provinces{ - overflow: hidden; - background-color: #CED3D9; - padding:30rpx 0; - position: absolute; - bottom: 0; - left: 0; - z-index: 10000; -} -.pro_li{ - font-size: 36rpx; - height: 70rpx; - width: 70rpx; - line-height: 70rpx; - text-align: center; - border: 2rpx solid #ddd; - margin: 5rpx; - background-color:#fff; -} -.pro_close{ - width: 100rpx; - height: 70rpx; - line-height: 70rpx; - font-size: 32rpx; - text-align: center; - background-color: #fff; - border: 2rpx solid #ddd; - margin: 5rpx ; -} -.pro_del{ - width: 100rpx; - height: 70rpx; - line-height: 70rpx; - font-size: 32rpx; - text-align: center; - background-color: #fff; - border: 2rpx solid #ddd; - margin: 5rpx; -} -.keyNums{ - overflow: hidden; - background-color: #CED3D9; - padding:30rpx 0; - position: absolute; - bottom: 0; - left: 0; - z-index: 10000; -} -.pro_ok{ - width: 100rpx; - height: 70rpx; - line-height: 70rpx; - font-size: 32rpx; - text-align: center; - background-color: #fff; - border: 2rpx solid #ddd; - margin: 5rpx ; - /* margin-left: 35%; */ -} -.pro_d{ - width: 100rpx; - height: 70rpx; - line-height: 70rpx; - font-size: 32rpx; - text-align: center; - background-color: #fff; - border: 2rpx solid #ddd; - margin: 5rpx; -} diff --git a/pages/passCar/choicecoupon/choicecoupon.js b/pages/passCar/choicecoupon/choicecoupon.js deleted file mode 100644 index 8a1f3c7..0000000 --- a/pages/passCar/choicecoupon/choicecoupon.js +++ /dev/null @@ -1,84 +0,0 @@ -const format = require("../../../utils/util.js"); -const config = require("../../../config/config.js"); -const app = getApp(); -const Http = require("../../../utils/HttpBasics"); -const imgurl = require("../../../utils/imgurl"); -Page({ - data: { - couponUrl:imgurl.coupon.url, - gouHr: imgurl.gouHr.url, - gouUrl:imgurl.gou.url, - linessUrl:imgurl.liness.url, - loadingUrl:imgurl.loading.url, - list: [], - current: "0", - current_scroll: "0", - page: 1, - allow_load: true - }, - onLoad(options) { - this.getList(0, 0); - if (options.quanid){ - this.setData({ - quanid: options.quanid - }) - } - }, - - /** - * 选择使用的优惠券 - */ - choicecoupon: function(e) { - wx.navigateBack(); - var pages = getCurrentPages(); - var prevPage = pages[pages.length - 2] //上一个页面 - var that = this; - var quantitle = e.currentTarget.dataset.title; - var quanid = e.currentTarget.dataset.id; - prevPage.setData({ - quantitle: quantitle, - quanid: quanid, - }); - wx.setStorage({ - key: 'chosed', - data: 'chosed', - }) - }, - getList(key, pageNum) { - var that = this; - if (that.data.allow_load) { - Http.get({ - url: config.api.couponOrderCarList, - data: { - pageNum: pageNum, - pageSize: 20, - couponOrderStatus: key - } - }).then(res => { - res.data.list.map(file => { - file.expiredTime = format.formatTime( - file.expiredTime, - "yyyy-MM-dd hh:mm:ss" - ); - }); - if (pageNum >= res.data.pages) { - that.setData({ - allow_load: false - }); - } - that.data.list = that.data.list.concat(res.data.list); - that.setData({ - list: that.data.list - }); - }) - .catch(err => { - wx.showToast({ - title: err.errMsg, - icon: 'none', - duration: 2000, - mask: false - }); - }) - } - }, -}); \ No newline at end of file diff --git a/pages/passCar/choicecoupon/choicecoupon.json b/pages/passCar/choicecoupon/choicecoupon.json deleted file mode 100644 index 2d7e370..0000000 --- a/pages/passCar/choicecoupon/choicecoupon.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "navigationBarTitleText": "停车券" -} \ No newline at end of file diff --git a/pages/passCar/choicecoupon/choicecoupon.wxml b/pages/passCar/choicecoupon/choicecoupon.wxml deleted file mode 100644 index 9820f31..0000000 --- a/pages/passCar/choicecoupon/choicecoupon.wxml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - 请您敬请期待 - 我们正在筹备一大波优惠活动 - - - - - - 温馨提示:请离场前使用优惠券 - - - - - - - {{item.title}} - - - {{item.subTitle}} - - - 售价:{{item.salePrice/100}}元{{item.price/100}}元 - {{item.price/100}}小时 - - - - - - 有效期至: - {{item.expiredTime}} - - - - - - {{content}} - - - \ No newline at end of file diff --git a/pages/passCar/choicecoupon/choicecoupon.wxss b/pages/passCar/choicecoupon/choicecoupon.wxss deleted file mode 100644 index 6c5bdb5..0000000 --- a/pages/passCar/choicecoupon/choicecoupon.wxss +++ /dev/null @@ -1,219 +0,0 @@ -.market { - width: 100%; - height: 100%; - /* background: #f5f5f5; */ -} - -.tabs { - width: 100% !important; - height: 88rpx; - text-align: center; - position: fixed; - top: 0; - left: 0; - right: 0; - z-index: 100000; -} - -.i-tab { - width: 25% !important; - display: inline-block; -} - -.section { - position: relative; -} - -.mms { - position: relative; - width: 690rpx; - /* background: #fff; */ - /* padding: 20rpx 0 0; */ - margin: 0 auto 46rpx; - /* border-top: 8rpx solid #02b7ff; */ - box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10); -} - -.detail_msg { - display: flex; -} - -.expiretime { - display: block; - width: 100%; - text-align: left; - text-indent: 1em; - height: 50rpx; - line-height: 50rpx; - font-size: 22rpx; - color: #A6A6A6; - letter-spacing: 0; -} - -.liness { - display: block; - width: 100%; - margin-top: 20rpx; -} - -.logo { - width: 60rpx; - height: 60rpx; - border: 1px solid #f8f8f8; - border-radius: 50rpx; - display: block; - margin-left: 20rpx; -} - -.logo image { - width: 60rpx; - height: 60rpx; - border-radius: 50%; -} - -.info view:nth-child(1) { - display: flex; - justify-content: space-between; - padding: 2% 2%; -} - -.info { - width: 100%; - height: 126rpx; - background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); -} - -.info view:nth-child(1) text { - font-size: 32rpx; - line-height: 32rpx; - height: 32rpx; - color: #FFFFFF; - letter-spacing: 0; - width: 400rpx; - display: inline-block; - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; -} - -.info view:nth-child(2) { - padding-left: 2%; - font-size: 22rpx; - color: #FFFFFF; - letter-spacing: 0; - margin-top: 6rpx; - display: inline-block; - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; - width: 400rpx; -} - -.info view:nth-child(3) { - margin-left: 20rpx; -} - -.btns { - position: absolute; - right: 120rpx; - top: 50rpx; - height: 48rpx; - line-height: 48rpx; - text-align: right; - color: #FFF; - font-size: 40rpx; -} - -.res { - color: #f96563; - font-size:30rpx; - margin-bottom:20rpx; - text-indent:.7em; -} -.btn{ - font-size:26rpx; -} -.yuan { - color: #FFF; - font-size: 26rpx; -} - -.txt1 { - font-size: 22rpx; - color: #A6A6A6; - letter-spacing: 0; -} - -.nocoupon image { - width: 300rpx; - display: block; - margin: 3% auto 0; -} - -.txt001 { - display: block; - line-height: 48rpx; - font-size: 34rpx; - color: #333; - letter-spacing: 0; - text-align: center; -} - -.txt002 { - display: block; - margin-top: 1%; - font-size: 28rpx; - color: #999; - letter-spacing: 0; - line-height: 40rpx; - text-align: center; -} - -.nocoupon button { - background: #00c0ff; - color: #fff; - font-style: 30rpx; - width: 100%; - border-radius: 60rpx; -} - -.loading { - text-align: center; - height: 80rpx; - line-height: 80rpx; - font-size: 26rpx; - color: #999; -} - -.loading image { - width: 60rpx; - height: 60rpx; - vertical-align: middle; - margin-right: 10rpx; -} - -.active { - opacity: 0.6; -} - -.nav { - position: absolute; - bottom: 3.3%; - left: 0; - right: 0; - margin: auto; - width: 670rpx; - border-radius: 60rpx; - background: #02c0ff; - font-size: 32px; - color: #fff; - text-align: center; - line-height: 32px; -} - -.gou { - position: absolute; - top:45rpx; - right: 30rpx; - width: 60rpx; -} diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js index 250da02..e01935b 100644 --- a/pages/passCar/passCar.js +++ b/pages/passCar/passCar.js @@ -445,19 +445,19 @@ Page({ /** * 选择优惠券 */ - gotoquan: function () { - let that = this; - if (that.data.quanid) { - wx.navigateTo({ - url: `/pages/passCar/choicecoupon/choicecoupon?quanid=${that.data.quanid}`, - }) - } else { - wx.navigateTo({ - url: '/pages/passCar/choicecoupon/choicecoupon', - }) - } + // gotoquan: function () { + // let that = this; + // if (that.data.quanid) { + // wx.navigateTo({ + // url: `/pages/passCar/choicecoupon/choicecoupon?quanid=${that.data.quanid}`, + // }) + // } else { + // wx.navigateTo({ + // url: '/pages/passCar/choicecoupon/choicecoupon', + // }) + // } - }, + // }, closeTicketModal: function () { this.setData({ showTicketModal: false diff --git a/pages/payrule/payrule.js b/pages/payrule/payrule.js index 4a66e87..3fee34e 100644 --- a/pages/payrule/payrule.js +++ b/pages/payrule/payrule.js @@ -1,3 +1,4 @@ +const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' // pages/payrule/payrule.js Page({ @@ -5,6 +6,7 @@ Page({ * 页面的初始数据 */ data: { + navigationBarHeight, rule:'' }, diff --git a/pages/payrule/payrule.json b/pages/payrule/payrule.json index bda8008..9a34146 100644 --- a/pages/payrule/payrule.json +++ b/pages/payrule/payrule.json @@ -1,3 +1,6 @@ { - "navigationBarTitleText": "缴费规则" + "navigationBarTitleText": "缴费规则", + "usingComponents": { + "navbar": "../../components/navbar/navbar" + } } \ No newline at end of file diff --git a/pages/payrule/payrule.wxml b/pages/payrule/payrule.wxml index 5e5a5a9..731cedc 100644 --- a/pages/payrule/payrule.wxml +++ b/pages/payrule/payrule.wxml @@ -1,3 +1,4 @@ - + + {{rule}} \ No newline at end of file diff --git a/pages/phoneinput/phoneinput.js b/pages/phoneinput/phoneinput.js index 4876df2..d79e33f 100644 --- a/pages/phoneinput/phoneinput.js +++ b/pages/phoneinput/phoneinput.js @@ -1,3 +1,4 @@ +const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px'; // pages/forgetpwd/forgetpwd.js let config = require('../../config/config.js') let Http = require('../../utils/HttpBasics') @@ -5,6 +6,7 @@ const app = getApp() Page({ data: { + navigationBarHeight, phone: '', yzm: '', retry: false, diff --git a/pages/phoneinput/phoneinput.json b/pages/phoneinput/phoneinput.json index 2c11417..5b34066 100644 --- a/pages/phoneinput/phoneinput.json +++ b/pages/phoneinput/phoneinput.json @@ -2,5 +2,8 @@ "backgroundTextStyle": "light", "navigationBarBackgroundColor": "#fff", "navigationBarTitleText": "手机验证", - "navigationBarTextStyle": "black" + "navigationBarTextStyle": "black", + "usingComponents": { + "navbar": "../../../components/navbar/navbar" + } } \ No newline at end of file diff --git a/pages/phoneinput/phoneinput.wxml b/pages/phoneinput/phoneinput.wxml index 3832cd5..0046516 100644 --- a/pages/phoneinput/phoneinput.wxml +++ b/pages/phoneinput/phoneinput.wxml @@ -1,5 +1,6 @@ - + +
diff --git a/pages/radetail/sc/edit.js b/pages/radetail/sc/edit.js deleted file mode 100644 index 3012f17..0000000 --- a/pages/radetail/sc/edit.js +++ /dev/null @@ -1,66 +0,0 @@ -// pages/radetail/sc/edit.js -Page({ - - /** - * 页面的初始数据 - */ - data: { - - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - - } -}) \ No newline at end of file diff --git a/pages/radetail/sc/edit.json b/pages/radetail/sc/edit.json deleted file mode 100644 index 8835af0..0000000 --- a/pages/radetail/sc/edit.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "usingComponents": {} -} \ No newline at end of file diff --git a/pages/radetail/sc/edit.wxml b/pages/radetail/sc/edit.wxml deleted file mode 100644 index 1ab0eaa..0000000 --- a/pages/radetail/sc/edit.wxml +++ /dev/null @@ -1,2 +0,0 @@ - -pages/radetail/sc/edit.wxml diff --git a/pages/radetail/sc/edit.wxss b/pages/radetail/sc/edit.wxss deleted file mode 100644 index eeeb7ca..0000000 --- a/pages/radetail/sc/edit.wxss +++ /dev/null @@ -1 +0,0 @@ -/* pages/radetail/sc/edit.wxss */ \ No newline at end of file diff --git a/pages/spellTimeout/index.js b/pages/spellTimeout/index.js index 7d9a25d..3f5b359 100644 --- a/pages/spellTimeout/index.js +++ b/pages/spellTimeout/index.js @@ -1,3 +1,4 @@ +const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' // pages/spellDetail/index.js var config = require("../../config/config.js"); const Http = require("../../utils/HttpBasics"); @@ -8,6 +9,7 @@ Page({ * 页面的初始数据 */ data: { + navigationBarHeight, tuanzhang: imgurl.tuanzhang.url, spellBg: imgurl.spellBg.url, position: imgurl.position.url, diff --git a/pages/spellTimeout/index.json b/pages/spellTimeout/index.json index 3aa8b3c..9f551c5 100644 --- a/pages/spellTimeout/index.json +++ b/pages/spellTimeout/index.json @@ -1,5 +1,7 @@ { "navigationBarTitleText": "拼团详情", - "usingComponents": {}, + "usingComponents": { + "navbar": "../../components/navbar/navbar" + }, "navigationBarBackgroundColor": "#F13C42" } \ No newline at end of file diff --git a/pages/spellTimeout/index.wxml b/pages/spellTimeout/index.wxml index d2e0364..c1ce971 100644 --- a/pages/spellTimeout/index.wxml +++ b/pages/spellTimeout/index.wxml @@ -1,5 +1,6 @@ - + + diff --git a/pages/success/index.js b/pages/success/index.js deleted file mode 100644 index 3b83aad..0000000 --- a/pages/success/index.js +++ /dev/null @@ -1,58 +0,0 @@ -Page({ - - /** - * 页面的初始数据 - */ - data: { - - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { - - }, -}) \ No newline at end of file diff --git a/pages/success/index.json b/pages/success/index.json deleted file mode 100644 index 3f6f557..0000000 --- a/pages/success/index.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "usingComponents": { - - }, - "navigationBarTitleText": "购买成功" - } \ No newline at end of file diff --git a/pages/success/index.wxml b/pages/success/index.wxml deleted file mode 100644 index 5c06055..0000000 --- a/pages/success/index.wxml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/pages/success/index.wxss b/pages/success/index.wxss deleted file mode 100644 index 6001ef7..0000000 --- a/pages/success/index.wxss +++ /dev/null @@ -1,47 +0,0 @@ -.success { - width: 100%; - height: 100%; - background: #f6f6f6; - position: absolute; -} - -.success_logo { - width: 201rpx; - height: 281rpx; - margin: 10% auto; - display: flex; - flex-direction: column; - margin-bottom: 20%; -} - -.success_logo icon { - width: 201rpx; - height: 201rpx; - background: #00c0ff; - border-radius: 50%; - color: #fff; - font-size: 40px; - text-align: center; - line-height: 201rpx; -} - -.success_logo text { - font-size: 36rpx; - text-align: center; - padding-top: 3%; -} - -.success button { - width: 504rpx; - height: 88rpx; - background: #00c0ff; - color: #fff; - margin: 3% auto; - font-size: 36rpx; -} - -.check { - background: #fff!important; - color: #00c0ff!important; - border:1px solid #00c0ff; -} diff --git a/pages/user/index.wxml b/pages/user/index.wxml index b053456..a28870d 100644 --- a/pages/user/index.wxml +++ b/pages/user/index.wxml @@ -1,4 +1,3 @@ -