diff --git a/app.json b/app.json index b3882ca..7b8fdf1 100644 --- a/app.json +++ b/app.json @@ -63,7 +63,8 @@ "pages/spellGroup/paySpellGroup/index", "pages/integralmall/index", "pages/mallInfo/mallInfo", - "pages/location/location" + "pages/location/location", + "pages/tcExplain/tcExplain" ], "subpackages": [ { diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js index 6f85581..91db12a 100644 --- a/custom-tab-bar/index.js +++ b/custom-tab-bar/index.js @@ -172,9 +172,10 @@ Component({ ], }) } - console.log(this.data.list[0].selectedIconPath, '99999999999999999999999999999999999999999') + // console.log(this.data.list[0].selectedIconPath, '99999999999999999999999999999999999999999') }) }, + getTemplateId() { Http.get({ url: config.api.templateId, @@ -202,7 +203,7 @@ Component({ this.data.templateId.map(res => { tmplIds.push(res.templateId) }) - console.log(tmplIds[0], "?|?|?|", this.data.templateId) + // console.log(tmplIds[0], "?|?|?|", this.data.templateId) wx.requestSubscribeMessage({ tmplIds: tmplIds, success(res) { diff --git a/ext.json b/ext.json index 11389a9..2c3a4e6 100644 --- a/ext.json +++ b/ext.json @@ -1,6 +1,13 @@ { "ext": { "attr": { + "car": { + "etcp": { + "etcpAppId": "wx192b7d2e8dcbefd0", + "etcpVersion": "release", + "etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback" + } + }, "imgProxy": [ { "newUrl": "https://ctest.malls.iformall.com/img", @@ -16,13 +23,6 @@ } ], "configUrl": "https://ctest.malls.iformall.com/C/api", - "car": { - "etcp": { - "etcpAppId": "wx192b7d2e8dcbefd0", - "etcpVersion": "release", - "etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback" - } - }, "ifHaveWebSocket": "0", "ifHaveCarModular": "1" }, diff --git a/index/index.wxml b/index/index.wxml index 8692294..66703f7 100644 --- a/index/index.wxml +++ b/index/index.wxml @@ -5,7 +5,7 @@ - + {{squareName}} ↓ diff --git a/index/index.wxss b/index/index.wxss index 71bb0f3..260fd6c 100644 --- a/index/index.wxss +++ b/index/index.wxss @@ -368,7 +368,7 @@ page { top: 0; left: 0; right: 0; - z-index: 100; + z-index: 10000000; margin: auto; } .signin open-data { diff --git a/index/passCar.js b/index/passCar.js index ecac93c..4d638e7 100644 --- a/index/passCar.js +++ b/index/passCar.js @@ -20,6 +20,7 @@ Page({ cheUrl: imgurl.che.url, jiaofei: imgurl.jiaofei.url, wentiHr: imgurl.wentiHr.url, + stopThat: imgurl.stopThat.url, park: null, carList: [], payList: [], @@ -442,6 +443,11 @@ Page({ url: '/pages/ques/ques', }) }, + goExplain: function () { + wx.navigateTo({ + url: '/pages/tcExplain/tcExplain', + }) + }, /** @@ -478,6 +484,15 @@ Page({ couponOrderId: quanid } } + if (app.globalData.parkVendor>=6){ + console.log(123456789) + postCouponData = { + carNumber: that.data.listCardNum, + // orderId: that.data.bolinkOrderId, + couponOrderId: quanid, + parkOrderId: that.data.stopFees.orderId + } + } Http.post({ url: config.api.getCarCoupon, data: postCouponData @@ -491,7 +506,7 @@ Page({ wx.showToast({ title: err.message, icon: 'none', - duration: 2000, + duration: 3000, mask: false }); } diff --git a/index/passCar.wxml b/index/passCar.wxml index aeb4cfb..b733854 100644 --- a/index/passCar.wxml +++ b/index/passCar.wxml @@ -25,7 +25,7 @@ - + 优惠券: {{quantitle}} @@ -129,6 +129,14 @@ + + + 使用说明 + + + + + diff --git a/pages/index/index.js b/pages/index/index.js index 1350bb3..e828822 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -325,6 +325,12 @@ Page({ url: '/pages/discountCardList/discountCardList' }) } + //直播 + else if (app.globalData.type == 'zb') { + wx.redirectTo({ + url: `/pages2/live/livelist/index` + }); + } // 门店 else if (app.globalData.type == 'ml') { wx.switchTab({ diff --git a/pages/tcExplain/tcExplain.js b/pages/tcExplain/tcExplain.js new file mode 100644 index 0000000..f943e7d --- /dev/null +++ b/pages/tcExplain/tcExplain.js @@ -0,0 +1,67 @@ +// pages/tcExplain/tcExplain.js +const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' +Page({ + + /** + * 页面的初始数据 + */ + data: { + navigationBarHeight + }, + + /** + * 生命周期函数--监听页面加载 + */ + 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/tcExplain/tcExplain.json b/pages/tcExplain/tcExplain.json new file mode 100644 index 0000000..68ea354 --- /dev/null +++ b/pages/tcExplain/tcExplain.json @@ -0,0 +1,6 @@ +{ + "navigationBarTitleText": "停车说明", + "usingComponents": { + "navbar": "../../components/navbar/navbar" + } +} \ No newline at end of file diff --git a/pages/tcExplain/tcExplain.wxml b/pages/tcExplain/tcExplain.wxml new file mode 100644 index 0000000..e6fdd2b --- /dev/null +++ b/pages/tcExplain/tcExplain.wxml @@ -0,0 +1,56 @@ + + + + 停车支付只有在车辆入场之后才能使用哦! + + + + + 绑定车牌,绑定之后,会显示当前车辆的停车费信息。 + + + 绑定车牌: + + 绑定成功后,显示停车费信息: + + + + + + + + + 使用停车券,如果有停车券,选择一张停车券使用,一次入场只能使用一张停车券哦。 + + + 当前个人停车券列表: + + 使用停车券: + + + + + + + + + 支付。点击支付按钮,支付成功后就可以出停车场啦! + + + + + + + + + + + 解绑车牌:进行车牌解绑操作。 + + + + + + + + \ No newline at end of file diff --git a/pages/tcExplain/tcExplain.wxss b/pages/tcExplain/tcExplain.wxss new file mode 100644 index 0000000..1ebe28e --- /dev/null +++ b/pages/tcExplain/tcExplain.wxss @@ -0,0 +1,57 @@ +.Box { + padding: 0 30rpx 20rpx 30rpx; + margin: 20rpx auto; +} +.textBox_1_top{ + overflow: hidden; + margin-top:20rpx; +} +.t1_logo{ +width: 68rpx; +height: 68rpx; +border-radius: 50%; +border: 2rpx solid #FD832D; +text-align: center; +line-height: 68rpx; +color: #FD832D; +float: left; +} +.t1_text_1{ + float: left; + width: 85%; + margin-left: 15rpx; + color: #FD832D; + font-size: 28rpx; +} +.t1_text_j{ + float: left; + width: 85%; + margin-left: 15rpx; + color: #FD832D; + font-size: 28rpx; + line-height: 55rpx; +} +.t1_text_2{ + float: left; + width: 85%; + margin-left: 85rpx; + color: #FD832D; + font-size: 28rpx; +} +.textBox_1_img{ + width: 85%; + margin-left: 83rpx; + margin-top: 10rpx; +} +.payText{ + font-size: 33rpx; + margin-left: 83rpx; + /* padding: 20rpx 0; */ +} +.style_hui{ + color: rgba(0, 0, 0, 0.3); + font-size: 28rpx; + margin-left: 85rpx; + padding: 20rpx 0; + height: 30rpx; +} \ No newline at end of file diff --git a/pages/topicDetail/index.wxml b/pages/topicDetail/index.wxml index 3f42a0f..a305c8b 100644 --- a/pages/topicDetail/index.wxml +++ b/pages/topicDetail/index.wxml @@ -1,6 +1,6 @@ - + diff --git a/project.config.json b/project.config.json index bf0e270..c598dda 100644 --- a/project.config.json +++ b/project.config.json @@ -62,9 +62,9 @@ "current": -1, "list": [ { - "id": -1, - "name": "pages/bargain/bargainDatail/bargainDatail", - "pathName": "pages/bargain/bargainDatail/bargainDatail", + "id": 0, + "name": "pages/tcExplain/tcExplain", + "pathName": "pages/tcExplain/tcExplain", "query": "", "scene": null }, @@ -83,10 +83,10 @@ "scene": null }, { - "id": -1, - "name": "pages2/live/livelist/index", + "id": 3, + "name": "pages/index/index", "pathName": "pages/index/index", - "query": "type=cd&couponChannelId=426712984674504704", + "query": "type=zb", "scene": null }, { diff --git a/utils/creditType.js b/utils/creditType.js index 4a9d531..3ec9fc7 100644 --- a/utils/creditType.js +++ b/utils/creditType.js @@ -11,7 +11,8 @@ let creditType=[ { name: "新增积分", value: "10" }, { name: "积分兑换", value: "11" }, { name: "消费积分", value: "12" }, - { name: "活动报名", value: "13" } + { name: "活动报名", value: "13" }, + { name: "积分清零计划", value: "14" } ] module.exports = { creditType diff --git a/utils/imgurl.js b/utils/imgurl.js index 441e249..12d5aab 100644 --- a/utils/imgurl.js +++ b/utils/imgurl.js @@ -709,6 +709,10 @@ module.exports = { 'url': baseUrl + "wentiHr.png", 'name': '' }, + 'stopThat':{ + 'url': baseUrl +"tingcheshiyong.png", + 'name': '' + }, 'jiaofei': { 'url': baseUrl + "jiaofei.png", 'name': ''