Commit 57753dccf49e5690ebcd3e55ee423a631f140a2a
1 parent
f1a5e97b
货车30分钟内免费
Showing
2 changed files
with
7 additions
and
5 deletions
src/components/orderPay.vue
| @@ -23,7 +23,7 @@ | @@ -23,7 +23,7 @@ | ||
| 23 | </ul> | 23 | </ul> |
| 24 | 24 | ||
| 25 | <p style="margin-top: 20px;padding-left: 15px;">停车引导员工号（非必填）</p> | 25 | <p style="margin-top: 20px;padding-left: 15px;">停车引导员工号（非必填）</p> |
| 26 | - <mt-field style="font-size: 14px;color: #333;" label="" placeholder="请输入员工号" type="number" v-model="tollNxumber" :attr="{ oninput: 'if(value.length>7)value=value.slice(0,7)' }" ></mt-field> | 26 | + <mt-field style="font-size: 14px;color: #333;" label="" placeholder="请输入员工号" type="number" v-model="tollNumber" :attr="{ oninput: 'if(value.length>7)value=value.slice(0,7)' }" ></mt-field> |
| 27 | 27 | ||
| 28 | <div style="padding: 20px 18px"> | 28 | <div style="padding: 20px 18px"> |
| 29 | <div class="toPay" @click="toPay">{{clientBrowser}}支付</div> | 29 | <div class="toPay" @click="toPay">{{clientBrowser}}支付</div> |
| @@ -130,7 +130,7 @@ export default { | @@ -130,7 +130,7 @@ export default { | ||
| 130 | 130 | ||
| 131 | // tollNumber | 131 | // tollNumber |
| 132 | // this.backDeveloperCode = this.tollNumber // 输入字段 | 132 | // this.backDeveloperCode = this.tollNumber // 输入字段 |
| 133 | - let ticketChargeCode = this.$route.query.ticketChargeCode // 二维码里面的收费员编号 | 133 | + let ticketChargeCode = this.$route.query.backDeveloperCode // 二维码里面的收费员编号 |
| 134 | if (this.clientBrowser == '支付宝') { // 支付宝支付 | 134 | if (this.clientBrowser == '支付宝') { // 支付宝支付 |
| 135 | let me = this | 135 | let me = this |
| 136 | var aliParams = {}; | 136 | var aliParams = {}; |
| @@ -298,7 +298,7 @@ export default { | @@ -298,7 +298,7 @@ export default { | ||
| 298 | wxParams.recordArreaInfos = JSON.stringify(orderIdData); | 298 | wxParams.recordArreaInfos = JSON.stringify(orderIdData); |
| 299 | wxParams.openId = openIdData; | 299 | wxParams.openId = openIdData; |
| 300 | wxParams.backDeveloperCode = this.tollNumber | 300 | wxParams.backDeveloperCode = this.tollNumber |
| 301 | - wxParams.ticketChargeCode = ticketChargeCode | 301 | + wxParams.ticketChargeCode = this.$route.query.backDeveloperCode |
| 302 | wxParams.appId = this.$utils.myVxAppId; | 302 | wxParams.appId = this.$utils.myVxAppId; |
| 303 | vxPayQuery(wxParams).then(res => { | 303 | vxPayQuery(wxParams).then(res => { |
| 304 | if (res.code == 0) { // | 304 | if (res.code == 0) { // |
src/components/parkRecord.vue
| @@ -15,7 +15,7 @@ | @@ -15,7 +15,7 @@ | ||
| 15 | <div v-show="currentTabActive==0"> | 15 | <div v-show="currentTabActive==0"> |
| 16 | 16 | ||
| 17 | <div v-if="parkingData.length>0"> | 17 | <div v-if="parkingData.length>0"> |
| 18 | - <p class="free-tip" v-if="parkingData[0].parkDuration<=900">停车15分钟内无需缴费，请申请离场。</p> | 18 | + <p class="free-tip" v-if="parkingData[0].parkDuration<=900">停车15分钟内(货车30分钟内)无需缴费！</p> |
| 19 | 19 | ||
| 20 | <div class="cost-main" v-for="i in parkingData"> | 20 | <div class="cost-main" v-for="i in parkingData"> |
| 21 | <ul class="cost-header"> | 21 | <ul class="cost-header"> |
| @@ -35,6 +35,8 @@ | @@ -35,6 +35,8 @@ | ||
| 35 | <div class="out-wrap"> | 35 | <div class="out-wrap"> |
| 36 | <p class="mon-wrap">￥{{(i.unPayFee/100).toFixed(2)}}</p> | 36 | <p class="mon-wrap">￥{{(i.unPayFee/100).toFixed(2)}}</p> |
| 37 | <p class="out-btn" @click="toPayCurrent(i,parkingData[0].parkDuration)" v-if="parkingData[0].parkDuration<=900">申请离场</p> | 37 | <p class="out-btn" @click="toPayCurrent(i,parkingData[0].parkDuration)" v-if="parkingData[0].parkDuration<=900">申请离场</p> |
| 38 | + <p class="out-btn" @click="toPayCurrent(i,parkingData[0].parkDuration)" v-else-if="parkingData[0].parkDuration<=1800&parkingData[0].carType==7">申请离场</p> | ||
| 39 | + <p class="out-btn" @click="toPayCurrent(i,parkingData[0].parkDuration)" v-else-if="parkingData[0].parkDuration<=1800&parkingData[0].carType==8">申请离场</p> | ||
| 38 | <p class="out-btn" @click="toPayCurrent(i,parkingData[0].parkDuration)" v-else>出场缴费</p> | 40 | <p class="out-btn" @click="toPayCurrent(i,parkingData[0].parkDuration)" v-else>出场缴费</p> |
| 39 | </div> | 41 | </div> |
| 40 | </div> | 42 | </div> |
| @@ -331,7 +333,7 @@ export default { | @@ -331,7 +333,7 @@ export default { | ||
| 331 | 333 | ||
| 332 | } else { | 334 | } else { |
| 333 | //$('.dialog-out').show() | 335 | //$('.dialog-out').show() |
| 334 | - this.$msgbox('提示', '停车15分钟内无需缴费，申请成功。') | 336 | + this.$msgbox('提示', '您已成功申请离场！') |
| 335 | } | 337 | } |
| 336 | 338 | ||
| 337 | }) | 339 | }) |