@@ -63,7 +63,8 @@ | |||
"pages/spellGroup/paySpellGroup/index", | |||
"pages/integralmall/index", | |||
"pages/mallInfo/mallInfo", | |||
"pages/location/location" | |||
"pages/location/location", | |||
"pages/tcExplain/tcExplain" | |||
], | |||
"subpackages": [ | |||
{ | |||
@@ -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) { | |||
@@ -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" | |||
}, | |||
@@ -5,7 +5,7 @@ | |||
<!-- 会员信息 --> | |||
<view class="color_box" style="{{typeLsit.sy_bbg.styleClass}}"> | |||
<!-- 所属集团 --> | |||
<view class="underling" bindtap="goSquareList" wx:if="{{isShowSqare}}"> | |||
<view class="underling" bindtap="goSquareList" wx:if="{{squareName}}"> | |||
<image class="underlingImg" mode="widthFix" src="https://formall.oss-accelerate.aliyuncs.com/cimg/dingwei.png"></image> | |||
<view class="underlingName">{{squareName}} ↓</view> | |||
</view> | |||
@@ -368,7 +368,7 @@ page { | |||
top: 0; | |||
left: 0; | |||
right: 0; | |||
z-index: 100; | |||
z-index: 10000000; | |||
margin: auto; | |||
} | |||
.signin open-data { | |||
@@ -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 | |||
}); | |||
} | |||
@@ -25,7 +25,7 @@ | |||
</view> | |||
</view> | |||
<!-- <view class='coupon clearfix' bindtap='gotoquan' wx:if="{{couponList.length>0}}"> --> | |||
<view style="padding:0 25rpx;" class='coupon clearfix' bindtap='openTicketModal' wx:if="{{couponList.length>0}}"> | |||
<view style="padding:0 25rpx;" class='coupon clearfix' bindtap='openTicketModal' wx:if="{{couponList.length>0&&stopFees.orderId}}"> | |||
<text class='fl'><text class='jians'>券</text>优惠券:</text> | |||
<view class="fr"> | |||
<text wx:if="{{quantitle}}">{{quantitle}}</text> | |||
@@ -129,6 +129,14 @@ | |||
<image src='{{jianUrl}}'></image> | |||
</view> | |||
</view> | |||
<view class='textStyle' bindtap='goExplain'> | |||
<image src='{{stopThat}}'></image> | |||
使用说明 | |||
<view class='detail'> | |||
<image src='{{jianUrl}}'></image> | |||
</view> | |||
</view> | |||
</view> | |||
</view> | |||
<view class="con" wx:if="{{ifHaveCarModular == 0}}" > | |||
@@ -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({ | |||
@@ -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 () { | |||
} | |||
}) |
@@ -0,0 +1,6 @@ | |||
{ | |||
"navigationBarTitleText": "停车说明", | |||
"usingComponents": { | |||
"navbar": "../../components/navbar/navbar" | |||
} | |||
} |
@@ -0,0 +1,56 @@ | |||
<navbar back home text="停车说明"></navbar> | |||
<view style="height:{{navigationBarHeight}} "></view> | |||
<view class="Box"> | |||
<view class="payText">停车支付只有在车辆入场之后才能使用哦!</view> | |||
<!-- 第一步 --> | |||
<view class="textBox_1"> | |||
<view class="textBox_1_top"> | |||
<view class="t1_logo">1</view> | |||
<view class="t1_text_1">绑定车牌,绑定之后,会显示当前车辆的停车费信息。 </view> | |||
</view> | |||
<view class="textBox_1_bady"> | |||
<view class="style_hui">绑定车牌:</view> | |||
<image src="https://formall.oss-accelerate.aliyuncs.com/cimg/car/tianjiachepai.jpg" mode="widthFix" class="textBox_1_img"> </image> | |||
<view class="style_hui">绑定成功后,显示停车费信息: | |||
</view> | |||
<image src="https://formall.oss-accelerate.aliyuncs.com/cimg/car/tingchefei.jpg" mode="widthFix" class="textBox_1_img"> </image> | |||
</view> | |||
</view> | |||
<!-- 第二步 --> | |||
<view class="textBox_1"> | |||
<view class="textBox_1_top"> | |||
<view class="t1_logo">2</view> | |||
<view class="t1_text_1">使用停车券,如果有停车券,选择一张停车券使用,一次入场只能使用一张停车券哦。 </view> | |||
</view> | |||
<view class="textBox_1_bady"> | |||
<view class="style_hui">当前个人停车券列表:</view> | |||
<image src="https://formall.oss-accelerate.aliyuncs.com/cimg/car/tingchequanliebiao.jpg" mode="widthFix" class="textBox_1_img"> </image> | |||
<view class="style_hui">使用停车券: | |||
</view> | |||
<image src="https://formall.oss-accelerate.aliyuncs.com/cimg/car/shiyongtingchequan.jpg" mode="widthFix" class="textBox_1_img"> </image> | |||
</view> | |||
</view> | |||
<!-- 第三步 --> | |||
<view class="textBox_1"> | |||
<view class="textBox_1_top"> | |||
<view class="t1_logo">3</view> | |||
<view class="t1_text_1">支付。点击支付按钮,支付成功后就可以出停车场啦! </view> | |||
</view> | |||
<view class="textBox_1_bady"> | |||
<!-- <view class="style_hui">当前个人停车券列表:</view> --> | |||
<image src="https://formall.oss-accelerate.aliyuncs.com/cimg/car/tingchezhifu.jpg" mode="widthFix" class="textBox_1_img"> </image> | |||
</view> | |||
</view> | |||
<!-- 第四步 --> | |||
<view class="textBox_1"> | |||
<view class="textBox_1_top"> | |||
<view class="t1_logo">4</view> | |||
<view class="t1_text_j">解绑车牌:进行车牌解绑操作。</view> | |||
</view> | |||
<view class="textBox_1_bady"> | |||
<!-- <view class="style_hui">当前个人停车券列表:</view> --> | |||
<image src="https://formall.oss-accelerate.aliyuncs.com/cimg/car/cheliangliebiao.jpg" mode="widthFix" class="textBox_1_img"> </image> | |||
<image src="https://formall.oss-accelerate.aliyuncs.com/cimg/car/jiebangchepai.jpg" mode="widthFix" class="textBox_1_img"> </image> | |||
</view> | |||
</view> | |||
</view> |
@@ -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; | |||
} |
@@ -1,6 +1,6 @@ | |||
<!-- <button class='goback' bindtap='goback'><image src='{{wmhome}}' mode="widthFix"></image></button> --> | |||
<navbar back home text="专题活动"></navbar> | |||
<view style="height:{{navigationBarHeight}} "></view> | |||
<!-- <view style="height:{{navigationBarHeight}} "></view> --> | |||
<!-- banner活动详情页面 --> | |||
<view class='coupons' style='background:{{data.bgColor}};height:{{winHeight}};padding-top:{{navigationBarHeight}}'> | |||
<view class="coupons-body"> | |||
@@ -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 | |||
}, | |||
{ | |||
@@ -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 |
@@ -709,6 +709,10 @@ module.exports = { | |||
'url': baseUrl + "wentiHr.png", | |||
'name': '' | |||
}, | |||
'stopThat':{ | |||
'url': baseUrl +"tingcheshiyong.png", | |||
'name': '' | |||
}, | |||
'jiaofei': { | |||
'url': baseUrl + "jiaofei.png", | |||
'name': '' | |||