Commit 2a4c08ca9d2a37dbd770a4ea280715a43ddc4eea
1 parent
6e7e8785
确定按钮在等待
Showing
4 changed files
with
366 additions
and
343 deletions
config/index.js
@@ -13,14 +13,14 @@ module.exports = { | @@ -13,14 +13,14 @@ module.exports = { | ||
13 | open: true,//vue项目启动时自动打开浏览器 | 13 | open: true,//vue项目启动时自动打开浏览器 |
14 | proxyTable: { | 14 | proxyTable: { |
15 | '/api':{ | 15 | '/api':{ |
16 | - target:"https://bus.jycrtc.com",//这里设置你要访问的域名(或IP+端口) | 16 | + target:"http://221.228.70.87:8096",//这里设置你要访问的域名(或IP+端口) |
17 | changeOrigin:true, | 17 | changeOrigin:true, |
18 | pathRewrite:{ | 18 | pathRewrite:{ |
19 | '^/api':''//base_api是自定义用来代替 | 19 | '^/api':''//base_api是自定义用来代替 |
20 | } | 20 | } |
21 | }, | 21 | }, |
22 | '/payapi':{ | 22 | '/payapi':{ |
23 | - target:"https://pay.jycrtc.com",//这里设置你要访问的域名(或IP+端口) | 23 | + target:"http://221.228.70.87:8096",//这里设置你要访问的域名(或IP+端口) |
24 | changeOrigin:true, | 24 | changeOrigin:true, |
25 | pathRewrite:{ | 25 | pathRewrite:{ |
26 | '^/payapi':''//base_api是自定义用来代替 | 26 | '^/payapi':''//base_api是自定义用来代替 |
config/prod.env.js
1 | 'use strict' | 1 | 'use strict' |
2 | module.exports = { | 2 | module.exports = { |
3 | - APP_BASE_APP_API:'"https://bus.jycrtc.com"', //项目api地址1 注意里面的双引号 | ||
4 | - APP_BASE_WWW_API:'"https://pay.jycrtc.com"', //项目api地址2 | ||
5 | - VUE_APP_API:'"https://bus.jycrtc.com"', | ||
6 | - VUE_APP_PAYAPI:'"https://pay.jycrtc.com"', | 3 | + APP_BASE_APP_API:'"http://221.228.70.87:8096"', //项目api地址1 注意里面的双引号 |
4 | + APP_BASE_WWW_API:'"http://221.228.70.87:8096"', //项目api地址2 | ||
5 | + VUE_APP_API:'"http://221.228.70.87:8096"', | ||
6 | + VUE_APP_PAYAPI:'"http://221.228.70.87:8096"', | ||
7 | 7 | ||
8 | NODE_ENV: '"production"' | 8 | NODE_ENV: '"production"' |
9 | } | 9 | } |
src/views/parkPay/coupon.vue
@@ -5,9 +5,12 @@ | @@ -5,9 +5,12 @@ | ||
5 | <p>尊敬的车主您好:{{ tipText }}</p> | 5 | <p>尊敬的车主您好:{{ tipText }}</p> |
6 | </div> | 6 | </div> |
7 | <div style="padding: 0 20px"> | 7 | <div style="padding: 0 20px"> |
8 | - <mt-button size="large" type="primary" @click="toPay" style="margin-bottom: 20px;" v-show="payFlag">去查询停车费用 | 8 | + <mt-button size="large" type="primary" @click="toPay" style="margin-bottom: 20px;" v-show="payFlag" |
9 | + :disabled="disabledFlag"> | ||
10 | + {{btnText}} | ||
9 | </mt-button> | 11 | </mt-button> |
10 | <mt-button size="large" type="danger" @click="toBackPage">返回</mt-button> | 12 | <mt-button size="large" type="danger" @click="toBackPage">返回</mt-button> |
13 | + | ||
11 | </div> | 14 | </div> |
12 | 15 | ||
13 | </div> | 16 | </div> |
@@ -21,32 +24,33 @@ import { | @@ -21,32 +24,33 @@ import { | ||
21 | queryParkingRecordPageByCarNumbers, | 24 | queryParkingRecordPageByCarNumbers, |
22 | appApplyParkOut, | 25 | appApplyParkOut, |
23 | parkingQuery | 26 | parkingQuery |
24 | -} from '@/api/couponPay/couponPay.js' | ||
25 | - | 27 | +} from "@/api/couponPay/couponPay.js"; |
26 | export default { | 28 | export default { |
27 | name: "coupon", | 29 | name: "coupon", |
28 | data() { | 30 | data() { |
29 | return { | 31 | return { |
30 | - imgurl: require('../../assets/images/successIcon.png'), | ||
31 | - successiconUrl: require('../../assets/images/successIcon.png'), | ||
32 | - loseiconUrl: require('../../assets/images/loseIcon.png'), | ||
33 | - carNum: '', | ||
34 | - carNumberColor: '', | 32 | + imgurl: require("../../assets/images/successIcon.png"), |
33 | + successiconUrl: require("../../assets/images/successIcon.png"), | ||
34 | + loseiconUrl: require("../../assets/images/loseIcon.png"), | ||
35 | + carNum: "", | ||
36 | + carNumberColor: "", | ||
35 | parkingData: [], | 37 | parkingData: [], |
36 | - carType: '', | ||
37 | - codeType: '', | ||
38 | - tipText: '', | 38 | + carType: "", |
39 | + codeType: "", | ||
40 | + tipText: "", | ||
39 | payFlag: true, | 41 | payFlag: true, |
40 | - couponsType:1,// 1:按次优惠,2:按时优惠,3:折扣优惠(打折),4:满减优惠' | ||
41 | - cardRuleName:'', | ||
42 | - loadFlag:false, | ||
43 | - } | 42 | + couponsType: 1,// 1:按次优惠,2:按时优惠,3:折扣优惠(打折),4:满减优惠' |
43 | + cardRuleName: "", | ||
44 | + loadFlag: false, // | ||
45 | + disabledFlag: false, | ||
46 | + btnText: "去查询停车费用" | ||
47 | + }; | ||
44 | }, | 48 | }, |
45 | created() { | 49 | created() { |
46 | - this.carNum = this.$route.query.carNumber | ||
47 | - this.carType = this.$route.query.carType | ||
48 | - this.codeType = this.$route.query.codeType | ||
49 | - this.cardRelParkNo = this.$route.query.cardRelParkNo | 50 | + this.carNum = this.$route.query.carNumber; |
51 | + this.carType = this.$route.query.carType; | ||
52 | + this.codeType = this.$route.query.codeType; | ||
53 | + this.cardRelParkNo = this.$route.query.cardRelParkNo; | ||
50 | // this.carNum = this.$route.query.carNumber // 获取车牌号 | 54 | // this.carNum = this.$route.query.carNumber // 获取车牌号 |
51 | // this.carNumberColor = this.$route.query.carNumberColor // 获取颜色 0:蓝牌;1:黄牌;2:白牌;3:黑牌;4:绿色 | 55 | // this.carNumberColor = this.$route.query.carNumberColor // 获取颜色 0:蓝牌;1:黄牌;2:白牌;3:黑牌;4:绿色 |
52 | // this.currentTabActive = this.$route.query.parkFlag ? this.$route.query.parkFlag : 0 | 56 | // this.currentTabActive = this.$route.query.parkFlag ? this.$route.query.parkFlag : 0 |
@@ -56,16 +60,15 @@ export default { | @@ -56,16 +60,15 @@ export default { | ||
56 | }, | 60 | }, |
57 | methods: { | 61 | methods: { |
58 | scanCouponQR() { | 62 | scanCouponQR() { |
59 | - | ||
60 | let url = process.env.VUE_APP_API; | 63 | let url = process.env.VUE_APP_API; |
61 | - console.log(url) | 64 | + console.log(url); |
62 | var salt = this.$utils.myCommonSalt(32); | 65 | var salt = this.$utils.myCommonSalt(32); |
63 | var jsondata = { | 66 | var jsondata = { |
64 | app_id: this.$utils.myVarAppid, | 67 | app_id: this.$utils.myVarAppid, |
65 | deviceInfo: this.$utils.myDeviceInfo, | 68 | deviceInfo: this.$utils.myDeviceInfo, |
66 | salt: salt, | 69 | salt: salt, |
67 | sign_type: "md5", | 70 | sign_type: "md5", |
68 | - carType: '2', | 71 | + carType: "2", |
69 | codeType: this.codeType, | 72 | codeType: this.codeType, |
70 | cardRelParkNo: this.cardRelParkNo, | 73 | cardRelParkNo: this.cardRelParkNo, |
71 | key: this.$route.query.key, | 74 | key: this.$route.query.key, |
@@ -73,43 +76,43 @@ export default { | @@ -73,43 +76,43 @@ export default { | ||
73 | carNum: this.carNum, | 76 | carNum: this.carNum, |
74 | // carNumberColor: this.carNumberColor, | 77 | // carNumberColor: this.carNumberColor, |
75 | orgId: this.$utils.myOrgId, | 78 | orgId: this.$utils.myOrgId, |
76 | - terminalSource: '7', | 79 | + terminalSource: "7" |
77 | // token:'e2c1e43722dd43a5b7e268001b39e6f0' | 80 | // token:'e2c1e43722dd43a5b7e268001b39e6f0' |
78 | - } | ||
79 | - jsondata.sign = this.$utils.signObject(jsondata) | ||
80 | - console.log(jsondata) | ||
81 | - scanCouponQR(url,jsondata).then(response => { | ||
82 | - console.log(response) | ||
83 | - | 81 | + }; |
82 | + jsondata.sign = this.$utils.signObject(jsondata); | ||
83 | + console.log(jsondata); | ||
84 | + scanCouponQR(url, jsondata).then(response => { | ||
85 | + console.log(response); | ||
84 | if (response.code == 0) { | 86 | if (response.code == 0) { |
85 | - this.payFlag = true | ||
86 | - this.imgurl = this.successiconUrl | ||
87 | - this.tipText = '领取优惠券成功' | ||
88 | - this.cardRuleName = response.data.cardRuleName | ||
89 | - this.couponsType = response.data.cardType | ||
90 | - console.log(this.couponsType) | 87 | + this.payFlag = true; |
88 | + this.imgurl = this.successiconUrl; | ||
89 | + this.tipText = "领取优惠券成功"; | ||
90 | + this.cardRuleName = response.data.cardRuleName; | ||
91 | + this.couponsType = response.data.cardType; | ||
92 | + console.log(this.couponsType); | ||
91 | } else { | 93 | } else { |
92 | - this.payFlag = false | ||
93 | - this.imgurl = this.loseiconUrl | ||
94 | - this.tipText = response.message | 94 | + this.payFlag = false; |
95 | + this.imgurl = this.loseiconUrl; | ||
96 | + this.tipText = response.message; | ||
95 | } | 97 | } |
96 | setTimeout(() => { | 98 | setTimeout(() => { |
97 | - this.loadFlag = true | 99 | + this.loadFlag = true; |
98 | }, 300); | 100 | }, 300); |
99 | - | ||
100 | // this.tipText = | 101 | // this.tipText = |
101 | - }) | 102 | + }); |
102 | }, | 103 | }, |
103 | toPay() { | 104 | toPay() { |
104 | - this.parkRecordList() | 105 | + this.parkRecordList(); |
105 | // this.$router.push({ | 106 | // this.$router.push({ |
106 | // path: 'couponPay' | 107 | // path: 'couponPay' |
107 | // }) | 108 | // }) |
108 | }, | 109 | }, |
109 | toBackPage() { | 110 | toBackPage() { |
110 | - this.$router.back() | 111 | + this.$router.back(); |
111 | }, | 112 | }, |
112 | parkRecordList() { // 获取停车记录数据 | 113 | parkRecordList() { // 获取停车记录数据 |
114 | + this.disabledFlag = true | ||
115 | + this.btnText = "查询中,请等待" | ||
113 | let url = process.env.VUE_APP_PAYAPI; | 116 | let url = process.env.VUE_APP_PAYAPI; |
114 | var salt = this.$utils.myCommonSalt(32); | 117 | var salt = this.$utils.myCommonSalt(32); |
115 | var jsondata = { | 118 | var jsondata = { |
@@ -117,32 +120,29 @@ export default { | @@ -117,32 +120,29 @@ export default { | ||
117 | deviceInfo: this.$utils.myDeviceInfo, | 120 | deviceInfo: this.$utils.myDeviceInfo, |
118 | salt: salt, | 121 | salt: salt, |
119 | sign_type: "md5", | 122 | sign_type: "md5", |
120 | - pageNum: '1', | ||
121 | - pageSize: '1000', | ||
122 | - parkState: '10', | ||
123 | - terminalSource: '7', | 123 | + pageNum: "1", |
124 | + pageSize: "1000", | ||
125 | + parkState: "10", | ||
126 | + terminalSource: "7", | ||
124 | // parkState:'10', | 127 | // parkState:'10', |
125 | carNumber: this.carNum, | 128 | carNumber: this.carNum, |
126 | // carNumberColor: '1', | 129 | // carNumberColor: '1', |
127 | - orgId: this.$utils.myOrgId, | ||
128 | - | ||
129 | - } | ||
130 | - jsondata.sign = this.$utils.signObject(jsondata) | ||
131 | - | ||
132 | - | 130 | + orgId: this.$utils.myOrgId |
131 | + }; | ||
132 | + jsondata.sign = this.$utils.signObject(jsondata); | ||
133 | // jsondata.sign = md5sign | 133 | // jsondata.sign = md5sign |
134 | - console.log('停车记录传参 ' + JSON.stringify(jsondata)); | ||
135 | - queryParkingRecordPageByCarNumbers(url,jsondata).then(response => { | ||
136 | - console.log(response) | 134 | + console.log("停车记录传参 " + JSON.stringify(jsondata)); |
135 | + queryParkingRecordPageByCarNumbers(url, jsondata).then(response => { | ||
136 | + console.log(response); | ||
137 | + this.disabledFlag = false | ||
138 | + this.btnText = "去查询停车费用" | ||
137 | // this.parkList = response.data.dataList | 139 | // this.parkList = response.data.dataList |
138 | - | ||
139 | this.parkingData = response.data.dataList.filter(item => { | 140 | this.parkingData = response.data.dataList.filter(item => { |
140 | - return item.parkState == '10' | ||
141 | - }) | ||
142 | - console.log(this.parkingData) | ||
143 | - this.toPayCurrent(this.parkingData) | ||
144 | - | ||
145 | - }) | 141 | + return item.parkState == "10"; |
142 | + }); | ||
143 | + console.log(this.parkingData); | ||
144 | + this.toPayCurrent(this.parkingData); | ||
145 | + }); | ||
146 | }, | 146 | }, |
147 | toPayCurrent(i) { // 缴纳本次在停费用 | 147 | toPayCurrent(i) { // 缴纳本次在停费用 |
148 | let url = process.env.VUE_APP_PAYAPI; | 148 | let url = process.env.VUE_APP_PAYAPI; |
@@ -153,14 +153,13 @@ export default { | @@ -153,14 +153,13 @@ export default { | ||
153 | salt: salt, | 153 | salt: salt, |
154 | sign_type: "md5", | 154 | sign_type: "md5", |
155 | orderId: i[0].orderId, | 155 | orderId: i[0].orderId, |
156 | - payOrderType: '101', | ||
157 | - terminalSource: '7', | ||
158 | - } | ||
159 | - params.sign = this.$utils.signObject(params) | ||
160 | - appApplyParkOut(url,params).then(response => { | ||
161 | - console.log(response) | ||
162 | - | ||
163 | - if (response.code == '5005') { | 156 | + payOrderType: "101", |
157 | + terminalSource: "7" | ||
158 | + }; | ||
159 | + params.sign = this.$utils.signObject(params); | ||
160 | + appApplyParkOut(url, params).then(response => { | ||
161 | + console.log(response); | ||
162 | + if (response.code == "5005") { | ||
164 | var salt = this.$utils.myCommonSalt(32); | 163 | var salt = this.$utils.myCommonSalt(32); |
165 | var jsondata = { | 164 | var jsondata = { |
166 | app_id: this.$utils.myVarAppid, | 165 | app_id: this.$utils.myVarAppid, |
@@ -170,20 +169,20 @@ export default { | @@ -170,20 +169,20 @@ export default { | ||
170 | payType: this.$utils.clientBrowsePayType(), | 169 | payType: this.$utils.clientBrowsePayType(), |
171 | appId: this.$utils.myVxAppId, | 170 | appId: this.$utils.myVxAppId, |
172 | orderId: i[0].orderId, | 171 | orderId: i[0].orderId, |
173 | - terminalSource: '7', | 172 | + terminalSource: "7", |
174 | parkCode: i[0].parkCode, | 173 | parkCode: i[0].parkCode, |
175 | - carNumber: this.carNum, | ||
176 | - } | ||
177 | - jsondata.sign = this.$utils.signObject(jsondata) | ||
178 | - parkingQuery(url,jsondata).then(result => { | ||
179 | - console.log(result) | ||
180 | - let res = result.data | ||
181 | - let _dis = res.discountFee | ||
182 | - let discountFee = _dis.slice(1, _dis.length - 1) | ||
183 | - sessionStorage.setItem('couponPark', JSON.stringify(result.data)) | 174 | + carNumber: this.carNum |
175 | + }; | ||
176 | + jsondata.sign = this.$utils.signObject(jsondata); | ||
177 | + parkingQuery(url, jsondata).then(result => { | ||
178 | + console.log(result); | ||
179 | + let res = result.data; | ||
180 | + let _dis = res.discountFee; | ||
181 | + let discountFee = _dis.slice(1, _dis.length - 1); | ||
182 | + sessionStorage.setItem("couponPark", JSON.stringify(result.data)); | ||
184 | this.$router.push( | 183 | this.$router.push( |
185 | { | 184 | { |
186 | - path: 'couponPay', | 185 | + path: "couponPay", |
187 | query: { | 186 | query: { |
188 | carColor: this.carColor,// 车牌颜色 | 187 | carColor: this.carColor,// 车牌颜色 |
189 | arrearageTotalFee: res.orderTotalFee,// 应收 | 188 | arrearageTotalFee: res.orderTotalFee,// 应收 |
@@ -193,20 +192,17 @@ export default { | @@ -193,20 +192,17 @@ export default { | ||
193 | paySrcType: 101, //支付的类型 101 是本次 103是历史欠费 | 192 | paySrcType: 101, //支付的类型 101 是本次 103是历史欠费 |
194 | ordeID: i.orderId, //支付的订单号 | 193 | ordeID: i.orderId, //支付的订单号 |
195 | appOrderTimeout: res.appOrderTimeout, // 超时描述 | 194 | appOrderTimeout: res.appOrderTimeout, // 超时描述 |
196 | - couponsType:this.couponsType | 195 | + couponsType: this.couponsType |
197 | } | 196 | } |
198 | } | 197 | } |
199 | - ) | ||
200 | - }) | ||
201 | - | 198 | + ); |
199 | + }); | ||
202 | } else { | 200 | } else { |
203 | //$('.dialog-out').show() | 201 | //$('.dialog-out').show() |
204 | - this.$msgbox('提示', '成功领取'+this.cardRuleName+',离场时自动抵扣') | 202 | + this.$msgbox("提示", "成功领取" + this.cardRuleName + ",离场时自动抵扣"); |
205 | } | 203 | } |
206 | - | ||
207 | - }) | ||
208 | - | ||
209 | - }, | 204 | + }); |
205 | + } | ||
210 | } | 206 | } |
211 | }; | 207 | }; |
212 | </script> | 208 | </script> |
src/views/parkPay/plateNumber.vue
1 | <template> | 1 | <template> |
2 | <div id="page"> | 2 | <div id="page"> |
3 | 3 | ||
4 | + <div v-if="alertFlag"> | ||
5 | + <div class="wrap"> | ||
6 | + <p style="margin-bottom: 18px;margin-top: 18px;">请选择车牌颜色</p> | ||
4 | 7 | ||
5 | - <div class="wrap"> | ||
6 | - <p style="margin-bottom: 18px;margin-top: 18px;">请选择车牌颜色</p> | 8 | + <ul class="color-choose"> |
9 | + <li v-for="(i,index) in colorList" :key="i.name" @click="chooseColor(index)" | ||
10 | + :style="{color:currentColor==index?'#FFF':'',background: currentColor==index?activeBG:'' }" | ||
11 | + > | ||
12 | + {{ i.name }} | ||
13 | + </li> | ||
7 | 14 | ||
8 | - <ul class="color-choose"> | ||
9 | - <li v-for="(i,index) in colorList" :key="i.name" @click="chooseColor(index)" | ||
10 | - :style="{color:currentColor==index?'#FFF':'',background: currentColor==index?activeBG:'' }" | ||
11 | - > | ||
12 | - {{ i.name }} | ||
13 | - </li> | 15 | + </ul> |
14 | 16 | ||
15 | - </ul> | ||
16 | 17 | ||
18 | + <p style="margin-bottom: 18px;margin-top: 18px;"></p> | ||
19 | + <p style="margin-bottom: 18px;margin-top: 18px;">请输入车牌号码</p> | ||
20 | + <div class="num-box"> | ||
21 | + <div class="num0" @click="clickFirstWrap()"> | ||
22 | + <span>{{ formData.num0 }}</span> | ||
23 | + </div> | ||
24 | + <div class="num1" @click="clickKeyWordWrap(1)"><span>{{ formData.num1 }}</span></div> | ||
25 | + <!--<em class="spot"></em>--> | ||
26 | + <div class="num1" @click="clickKeyWordWrap(2)"><span>{{ formData.num2 }}</span></div> | ||
27 | + <div class="num1" @click="clickKeyWordWrap(3)"><span>{{ formData.num3 }}</span></div> | ||
28 | + <div class="num1" @click="clickKeyWordWrap(4)"><span>{{ formData.num4 }}</span></div> | ||
29 | + <div class="num1" @click="clickKeyWordWrap(5)"><span>{{ formData.num5 }}</span></div> | ||
30 | + <div class="num1" @click="clickKeyWordWrap(6)"><span>{{ formData.num6 }}</span></div> | ||
31 | + <div v-if="formData.commonCard == '2'" class="num1" @click="clickKeyWordWrap(7)"> | ||
32 | + <span>{{ formData.num7 }}</span></div> | ||
33 | + </div> | ||
34 | + | ||
35 | + | ||
36 | + <!--<div class="radio-box">--> | ||
37 | + <!--<label class="flex-items-center">--> | ||
38 | + <!--<img v-if="formData.commonCard == 1"--> | ||
39 | + <!--src="../../assets/images/parkPay/icon_chose_s@2x.png"--> | ||
40 | + <!--alt="">--> | ||
41 | + <!--<img v-else--> | ||
42 | + <!--src="../../assets/images/parkPay/icon_chose_n@2x.png"--> | ||
43 | + <!--alt="">--> | ||
44 | + <!--<input type="radio"--> | ||
45 | + <!--v-model="formData.commonCard"--> | ||
46 | + <!--value="1" />普通车牌--> | ||
47 | + <!--</label>--> | ||
48 | + <!--<label class="flex-items-center">--> | ||
49 | + <!--<img v-if="formData.commonCard == 2"--> | ||
50 | + <!--src="../../assets/images/parkPay/icon_chose_s@2x.png"--> | ||
51 | + <!--alt="">--> | ||
52 | + <!--<img v-else--> | ||
53 | + <!--src="../../assets/images/parkPay/icon_chose_n@2x.png"--> | ||
54 | + <!--alt="">--> | ||
55 | + <!--<input type="radio"--> | ||
56 | + <!--v-model="formData.commonCard"--> | ||
57 | + <!--value="2" />新能源车牌--> | ||
58 | + <!--</label>--> | ||
59 | + <!--</div>--> | ||
17 | 60 | ||
18 | - <p style="margin-bottom: 18px;margin-top: 18px;"></p> | ||
19 | - <p style="margin-bottom: 18px;margin-top: 18px;">请输入车牌号码</p> | ||
20 | - <div class="num-box"> | ||
21 | - <div class="num0" @click="clickFirstWrap()"> | ||
22 | - <span>{{ formData.num0 }}</span> | ||
23 | - </div> | ||
24 | - <div class="num1" @click="clickKeyWordWrap(1)"><span>{{ formData.num1 }}</span></div> | ||
25 | - <!--<em class="spot"></em>--> | ||
26 | - <div class="num1" @click="clickKeyWordWrap(2)"><span>{{ formData.num2 }}</span></div> | ||
27 | - <div class="num1" @click="clickKeyWordWrap(3)"><span>{{ formData.num3 }}</span></div> | ||
28 | - <div class="num1" @click="clickKeyWordWrap(4)"><span>{{ formData.num4 }}</span></div> | ||
29 | - <div class="num1" @click="clickKeyWordWrap(5)"><span>{{ formData.num5 }}</span></div> | ||
30 | - <div class="num1" @click="clickKeyWordWrap(6)"><span>{{ formData.num6 }}</span></div> | ||
31 | - <div v-if="formData.commonCard == '2'" class="num1" @click="clickKeyWordWrap(7)"> | ||
32 | - <span>{{ formData.num7 }}</span></div> | ||
33 | - </div> | 61 | + <div v-if="historyList.length>0"> |
62 | + <p style="margin-bottom: 18px;margin-top: 18px;"></p> | ||
63 | + <p style="margin-bottom: 18px;margin-top: 18px;">历史输入车牌号码</p> | ||
34 | 64 | ||
65 | + <mt-cell :title="i.carNumberColor | filterCarNumberColor" is-link v-for="(i, index) in historyList" :key="index" @click.native="toNext(i)"> | ||
66 | + <span style="color: green">{{i.carNumber}}</span> | ||
67 | + </mt-cell> | ||
35 | 68 | ||
36 | - <!--<div class="radio-box">--> | ||
37 | - <!--<label class="flex-items-center">--> | ||
38 | - <!--<img v-if="formData.commonCard == 1"--> | ||
39 | - <!--src="../../assets/images/parkPay/icon_chose_s@2x.png"--> | ||
40 | - <!--alt="">--> | ||
41 | - <!--<img v-else--> | ||
42 | - <!--src="../../assets/images/parkPay/icon_chose_n@2x.png"--> | ||
43 | - <!--alt="">--> | ||
44 | - <!--<input type="radio"--> | ||
45 | - <!--v-model="formData.commonCard"--> | ||
46 | - <!--value="1" />普通车牌--> | ||
47 | - <!--</label>--> | ||
48 | - <!--<label class="flex-items-center">--> | ||
49 | - <!--<img v-if="formData.commonCard == 2"--> | ||
50 | - <!--src="../../assets/images/parkPay/icon_chose_s@2x.png"--> | ||
51 | - <!--alt="">--> | ||
52 | - <!--<img v-else--> | ||
53 | - <!--src="../../assets/images/parkPay/icon_chose_n@2x.png"--> | ||
54 | - <!--alt="">--> | ||
55 | - <!--<input type="radio"--> | ||
56 | - <!--v-model="formData.commonCard"--> | ||
57 | - <!--value="2" />新能源车牌--> | ||
58 | - <!--</label>--> | ||
59 | - <!--</div>--> | ||
60 | - | ||
61 | - <div v-if="historyList.length>0"> | ||
62 | - <p style="margin-bottom: 18px;margin-top: 18px;"></p> | ||
63 | - <p style="margin-bottom: 18px;margin-top: 18px;">历史输入车牌号码</p> | 69 | + </div> |
64 | 70 | ||
65 | - <mt-cell :title="i.carNumberColor | filterCarNumberColor" is-link v-for="(i, index) in historyList" :key="index" @click.native="toNext(i)"> | ||
66 | - <span style="color: green">{{i.carNumber}}</span> | ||
67 | - </mt-cell> | 71 | + <div class="submit-box" @click="submitFn()"> |
72 | + 领取 | ||
73 | + </div> | ||
68 | 74 | ||
69 | - </div> | ||
70 | 75 | ||
71 | - <div class="submit-box" @click="submitFn()"> | ||
72 | - 领取 | ||
73 | </div> | 76 | </div> |
77 | + <div class="first-word-wrap" | ||
78 | + v-if="firstWrapStatus"> | ||
79 | + <div class="first-word" | ||
80 | + @click="selectFirstWord($event)"> | ||
81 | + <div class="word"> | ||
82 | + <span>蒙</span> | ||
83 | + </div> | ||
84 | + <div class="word"> | ||
85 | + <span>湘</span> | ||
86 | + </div> | ||
87 | + <div class="word"> | ||
88 | + <span>津</span> | ||
89 | + </div> | ||
90 | + <div class="word"> | ||
91 | + <span>鄂</span> | ||
92 | + </div> | ||
93 | + <div class="word"> | ||
94 | + <span>沪</span> | ||
95 | + </div> | ||
96 | + <div class="word"> | ||
97 | + <span>粤</span> | ||
98 | + </div> | ||
99 | + <div class="word"> | ||
100 | + <span>渝</span> | ||
101 | + </div> | ||
102 | + <div class="word"> | ||
103 | + <span>琼</span> | ||
104 | + </div> | ||
105 | + </div> | ||
106 | + <div class="first-word" | ||
107 | + @click="selectFirstWord($event)"> | ||
108 | + <div class="word"> | ||
109 | + <span>冀</span> | ||
110 | + </div> | ||
111 | + <div class="word"> | ||
112 | + <span>川</span> | ||
113 | + </div> | ||
114 | + <div class="word"> | ||
115 | + <span>晋</span> | ||
116 | + </div> | ||
117 | + <div class="word"> | ||
118 | + <span>贵</span> | ||
119 | + </div> | ||
120 | + <div class="word"> | ||
121 | + <span>辽</span> | ||
122 | + </div> | ||
123 | + <div class="word"> | ||
124 | + <span>云</span> | ||
125 | + </div> | ||
126 | + <div class="word"> | ||
127 | + <span>吉</span> | ||
128 | + </div> | ||
129 | + <div class="word"> | ||
130 | + <span>陕</span> | ||
131 | + </div> | ||
132 | + </div> | ||
133 | + <div class="first-word" | ||
134 | + @click="selectFirstWord($event)"> | ||
135 | + <div class="word"> | ||
136 | + <span>黑</span> | ||
137 | + </div> | ||
138 | + <div class="word"> | ||
139 | + <span>甘</span> | ||
140 | + </div> | ||
141 | + <div class="word"> | ||
142 | + <span>苏</span> | ||
143 | + </div> | ||
144 | + <div class="word"> | ||
145 | + <span>青</span> | ||
146 | + </div> | ||
147 | + <div class="word"> | ||
148 | + <span>浙</span> | ||
149 | + </div> | ||
150 | + <div class="word"> | ||
151 | + <span>皖</span> | ||
152 | + </div> | ||
153 | + <div class="word"> | ||
154 | + <span>藏</span> | ||
155 | + </div> | ||
156 | + <div class="word"> | ||
157 | + <span>闽</span> | ||
158 | + </div> | ||
159 | + </div> | ||
160 | + <div class="first-word" | ||
161 | + @click="selectFirstWord($event)"> | ||
162 | + <div class="word"> | ||
163 | + <span>京</span> | ||
164 | + </div> | ||
165 | + <div class="word"> | ||
166 | + <span>赣</span> | ||
167 | + </div> | ||
168 | + <div class="word"> | ||
169 | + <span>桂</span> | ||
170 | + </div> | ||
171 | + <div class="word"> | ||
172 | + <span>鲁</span> | ||
173 | + </div> | ||
174 | + <div class="word"> | ||
175 | + <span>宁</span> | ||
176 | + </div> | ||
177 | + <div class="word"> | ||
178 | + <span>豫</span> | ||
179 | + </div> | ||
180 | + <div class="word"> | ||
181 | + <span>新</span> | ||
182 | + </div> | ||
183 | + <!--<div class="word">--> | ||
184 | + <!--<span>学</span>--> | ||
185 | + <!--</div>--> | ||
186 | + <div class="word bordernone"> | ||
187 | + <!-- <img src="../assets/images/icon-switch.png" alt=""> --> | ||
188 | + </div> | ||
189 | + </div> | ||
190 | + | ||
191 | + <!--<div class="first-word"--> | ||
192 | + <!--@click="selectFirstWord($event)">--> | ||
193 | + <!--<div class="word">--> | ||
194 | + <!--<span>港</span>--> | ||
195 | + <!--</div>--> | ||
196 | + <!--<div class="word">--> | ||
197 | + <!--<span>澳</span>--> | ||
198 | + <!--</div>--> | ||
199 | + <!--<div class="word">--> | ||
200 | + <!--<span>领</span>--> | ||
201 | + <!--</div>--> | ||
74 | 202 | ||
75 | - | ||
76 | - </div> | ||
77 | - <div class="first-word-wrap" | ||
78 | - v-if="firstWrapStatus"> | ||
79 | - <div class="first-word" | ||
80 | - @click="selectFirstWord($event)"> | ||
81 | - <div class="word"> | ||
82 | - <span>蒙</span> | ||
83 | - </div> | ||
84 | - <div class="word"> | ||
85 | - <span>湘</span> | ||
86 | - </div> | ||
87 | - <div class="word"> | ||
88 | - <span>津</span> | ||
89 | - </div> | ||
90 | - <div class="word"> | ||
91 | - <span>鄂</span> | ||
92 | - </div> | ||
93 | - <div class="word"> | ||
94 | - <span>沪</span> | ||
95 | - </div> | ||
96 | - <div class="word"> | ||
97 | - <span>粤</span> | ||
98 | - </div> | ||
99 | - <div class="word"> | ||
100 | - <span>渝</span> | ||
101 | - </div> | ||
102 | - <div class="word"> | ||
103 | - <span>琼</span> | ||
104 | - </div> | ||
105 | - </div> | ||
106 | - <div class="first-word" | ||
107 | - @click="selectFirstWord($event)"> | ||
108 | - <div class="word"> | ||
109 | - <span>冀</span> | ||
110 | - </div> | ||
111 | - <div class="word"> | ||
112 | - <span>川</span> | ||
113 | - </div> | ||
114 | - <div class="word"> | ||
115 | - <span>晋</span> | ||
116 | - </div> | ||
117 | - <div class="word"> | ||
118 | - <span>贵</span> | ||
119 | - </div> | ||
120 | - <div class="word"> | ||
121 | - <span>辽</span> | ||
122 | - </div> | ||
123 | - <div class="word"> | ||
124 | - <span>云</span> | ||
125 | - </div> | ||
126 | - <div class="word"> | ||
127 | - <span>吉</span> | ||
128 | - </div> | ||
129 | - <div class="word"> | ||
130 | - <span>陕</span> | ||
131 | - </div> | ||
132 | - </div> | ||
133 | - <div class="first-word" | ||
134 | - @click="selectFirstWord($event)"> | ||
135 | - <div class="word"> | ||
136 | - <span>黑</span> | ||
137 | - </div> | ||
138 | - <div class="word"> | ||
139 | - <span>甘</span> | ||
140 | - </div> | ||
141 | - <div class="word"> | ||
142 | - <span>苏</span> | ||
143 | - </div> | ||
144 | - <div class="word"> | ||
145 | - <span>青</span> | ||
146 | - </div> | ||
147 | - <div class="word"> | ||
148 | - <span>浙</span> | ||
149 | - </div> | ||
150 | - <div class="word"> | ||
151 | - <span>皖</span> | ||
152 | - </div> | ||
153 | - <div class="word"> | ||
154 | - <span>藏</span> | ||
155 | - </div> | ||
156 | - <div class="word"> | ||
157 | - <span>闽</span> | ||
158 | - </div> | ||
159 | - </div> | ||
160 | - <div class="first-word" | ||
161 | - @click="selectFirstWord($event)"> | ||
162 | - <div class="word"> | ||
163 | - <span>京</span> | ||
164 | - </div> | ||
165 | - <div class="word"> | ||
166 | - <span>赣</span> | ||
167 | - </div> | ||
168 | - <div class="word"> | ||
169 | - <span>桂</span> | ||
170 | - </div> | ||
171 | - <div class="word"> | ||
172 | - <span>鲁</span> | ||
173 | - </div> | ||
174 | - <div class="word"> | ||
175 | - <span>宁</span> | ||
176 | - </div> | ||
177 | - <div class="word"> | ||
178 | - <span>豫</span> | ||
179 | - </div> | ||
180 | - <div class="word"> | ||
181 | - <span>新</span> | ||
182 | - </div> | ||
183 | <!--<div class="word">--> | 203 | <!--<div class="word">--> |
184 | - <!--<span>学</span>--> | 204 | + <!--<span>警</span>--> |
185 | <!--</div>--> | 205 | <!--</div>--> |
186 | - <div class="word bordernone"> | ||
187 | - <!-- <img src="../assets/images/icon-switch.png" alt=""> --> | ||
188 | - </div> | ||
189 | - </div> | ||
190 | 206 | ||
191 | - <!--<div class="first-word"--> | ||
192 | - <!--@click="selectFirstWord($event)">--> | ||
193 | - <!--<div class="word">--> | ||
194 | - <!--<span>港</span>--> | ||
195 | - <!--</div>--> | ||
196 | - <!--<div class="word">--> | ||
197 | - <!--<span>澳</span>--> | ||
198 | - <!--</div>--> | ||
199 | - <!--<div class="word">--> | ||
200 | - <!--<span>领</span>--> | ||
201 | - <!--</div>--> | ||
202 | - | ||
203 | - <!--<div class="word">--> | ||
204 | - <!--<span>警</span>--> | ||
205 | - <!--</div>--> | ||
206 | - | ||
207 | - | ||
208 | - <!--<div class="word bordernone">--> | ||
209 | - <!--</div>--> | ||
210 | - <!--<div class="word bordernone">--> | ||
211 | - <!--</div>--> | ||
212 | - <!--<div class="word bordernone">--> | ||
213 | - <!--</div>--> | ||
214 | - <!--<div class="word bordernone">--> | ||
215 | - <!--</div>--> | ||
216 | - <!--</div>--> | ||
217 | - </div> | ||
218 | - <div class="keyboard-wrap" v-if="keyBoardStatus === true"> | ||
219 | - <!-- <div class="number-wrap"></div> | ||
220 | - <div class="letter-wrap"></div> | ||
221 | - <div class="cn-wrap"></div> --> | ||
222 | - <div class="keyboard" v-if="activeKeyWordIndex !== 1"> | 207 | + |
208 | + <!--<div class="word bordernone">--> | ||
209 | + <!--</div>--> | ||
210 | + <!--<div class="word bordernone">--> | ||
211 | + <!--</div>--> | ||
212 | + <!--<div class="word bordernone">--> | ||
213 | + <!--</div>--> | ||
214 | + <!--<div class="word bordernone">--> | ||
215 | + <!--</div>--> | ||
216 | + <!--</div>--> | ||
217 | + </div> | ||
218 | + <div class="keyboard-wrap" v-if="keyBoardStatus === true"> | ||
219 | + <!-- <div class="number-wrap"></div> | ||
220 | + <div class="letter-wrap"></div> | ||
221 | + <div class="cn-wrap"></div> --> | ||
222 | + <div class="keyboard" v-if="activeKeyWordIndex !== 1"> | ||
223 | <span v-for="(item,index) in allKeyWord._1" | 223 | <span v-for="(item,index) in allKeyWord._1" |
224 | :key="index" | 224 | :key="index" |
225 | @click="clickKeyBoard(item)">{{ item }}</span> | 225 | @click="clickKeyBoard(item)">{{ item }}</span> |
226 | - </div> | ||
227 | - <div class="keyboard" v-if="activeKeyWordIndex !== 1"> | 226 | + </div> |
227 | + <div class="keyboard" v-if="activeKeyWordIndex !== 1"> | ||
228 | <span v-for="(item,index) in allKeyWord._2" | 228 | <span v-for="(item,index) in allKeyWord._2" |
229 | :key="index" | 229 | :key="index" |
230 | @click="clickKeyBoard(item)">{{ item }}</span> | 230 | @click="clickKeyBoard(item)">{{ item }}</span> |
231 | - <span class="bordernone"></span> | ||
232 | - <span class="bordernone"></span> | ||
233 | - <span class="bordernone"></span> | ||
234 | - <span class="bordernone"></span> | ||
235 | - </div> | ||
236 | - <div class="keyboard"> | 231 | + <span class="bordernone"></span> |
232 | + <span class="bordernone"></span> | ||
233 | + <span class="bordernone"></span> | ||
234 | + <span class="bordernone"></span> | ||
235 | + </div> | ||
236 | + <div class="keyboard"> | ||
237 | <span v-for="(item,index) in allKeyWord._3" | 237 | <span v-for="(item,index) in allKeyWord._3" |
238 | :key="index" | 238 | :key="index" |
239 | @click="clickKeyBoard(item)">{{ item }}</span> | 239 | @click="clickKeyBoard(item)">{{ item }}</span> |
240 | - </div> | ||
241 | - <div class="keyboard"> | 240 | + </div> |
241 | + <div class="keyboard"> | ||
242 | <span v-for="(item,index) in allKeyWord._4" | 242 | <span v-for="(item,index) in allKeyWord._4" |
243 | :key="index" | 243 | :key="index" |
244 | @click="clickKeyBoard(item)">{{ item }}</span> | 244 | @click="clickKeyBoard(item)">{{ item }}</span> |
245 | - </div> | ||
246 | - <div class="keyboard"> | 245 | + </div> |
246 | + <div class="keyboard"> | ||
247 | <span v-for="(item,index) in allKeyWord._5" | 247 | <span v-for="(item,index) in allKeyWord._5" |
248 | :key="index" | 248 | :key="index" |
249 | @click="clickKeyBoard(item)">{{ item }}</span> | 249 | @click="clickKeyBoard(item)">{{ item }}</span> |
250 | - </div> | ||
251 | - <div class="keyboard"> | 250 | + </div> |
251 | + <div class="keyboard"> | ||
252 | <span v-for="(item,index) in allKeyWord._6" | 252 | <span v-for="(item,index) in allKeyWord._6" |
253 | :key="index" | 253 | :key="index" |
254 | @click="clickKeyBoard(item)">{{ item }}</span> | 254 | @click="clickKeyBoard(item)">{{ item }}</span> |
255 | - <span class="bordernone"></span> | ||
256 | - <span class="bordernone"></span> | ||
257 | - <span class="bordernone"></span> | ||
258 | - <!-- <span class="bordernone" v-if="activeKeyWordIndex === 1"></span> | ||
259 | - <span class="bordernone" v-if="activeKeyWordIndex === 1"></span> --> | ||
260 | - <!-- <span @click="deleteWord" v-if="activeKeyWordIndex === 1">x</span> --> | ||
261 | - </div> | ||
262 | - <div class="keyboard" v-if="activeKeyWordIndex !== 1"> | 255 | + <span class="bordernone"></span> |
256 | + <span class="bordernone"></span> | ||
257 | + <span class="bordernone"></span> | ||
258 | + <!-- <span class="bordernone" v-if="activeKeyWordIndex === 1"></span> | ||
259 | + <span class="bordernone" v-if="activeKeyWordIndex === 1"></span> --> | ||
260 | + <!-- <span @click="deleteWord" v-if="activeKeyWordIndex === 1">x</span> --> | ||
261 | + </div> | ||
262 | + <div class="keyboard" v-if="activeKeyWordIndex !== 1"> | ||
263 | <span v-for="(item,index) in allKeyWord._7" | 263 | <span v-for="(item,index) in allKeyWord._7" |
264 | :key="index" | 264 | :key="index" |
265 | @click="clickKeyBoard(item)">{{ item }}</span> | 265 | @click="clickKeyBoard(item)">{{ item }}</span> |
266 | - <span class="bordernone"></span> | ||
267 | - <span class="delete" @click="deleteWord"><img src="../../assets/images/parkPay/icon-delete.png" alt=""></span> | ||
268 | - </div> | ||
269 | - <div class="cancel"> | ||
270 | - <span @click="keyBoardStatus = false">完成</span> | 266 | + <span class="bordernone"></span> |
267 | + <span class="delete" @click="deleteWord"><img src="../../assets/images/parkPay/icon-delete.png" alt=""></span> | ||
268 | + </div> | ||
269 | + <div class="cancel"> | ||
270 | + <span @click="keyBoardStatus = false">完成</span> | ||
271 | + </div> | ||
271 | </div> | 272 | </div> |
272 | </div> | 273 | </div> |
273 | 274 | ||
275 | + <div v-else style="font-size: 16px;padding: 20px;text-align: center"> | ||
276 | + <img :src="imgurl" alt="" style="margin: 10px auto;width: 64px;height: 64px;"> | ||
277 | + {{alertmsg}} | ||
278 | + </div> | ||
279 | + | ||
274 | 280 | ||
275 | </div> | 281 | </div> |
276 | </template> | 282 | </template> |
@@ -283,6 +289,7 @@ import { | @@ -283,6 +289,7 @@ import { | ||
283 | export default { | 289 | export default { |
284 | data() { | 290 | data() { |
285 | return { | 291 | return { |
292 | + imgurl: require('../../assets/images/loseIcon.png'), | ||
286 | 293 | ||
287 | // 0:蓝牌;1:黄牌;2:白牌;3:黑牌;4:绿色 | 294 | // 0:蓝牌;1:黄牌;2:白牌;3:黑牌;4:绿色 |
288 | colorList: [ | 295 | colorList: [ |
@@ -341,6 +348,8 @@ export default { | @@ -341,6 +348,8 @@ export default { | ||
341 | codeType: '', | 348 | codeType: '', |
342 | historyList:[], | 349 | historyList:[], |
343 | encryptTime:'', // 加密后的时间 | 350 | encryptTime:'', // 加密后的时间 |
351 | + alertmsg:'', | ||
352 | + alertFlag:false | ||
344 | } | 353 | } |
345 | }, | 354 | }, |
346 | created() { | 355 | created() { |
@@ -362,6 +371,7 @@ export default { | @@ -362,6 +371,7 @@ export default { | ||
362 | // return code; | 371 | // return code; |
363 | // } | 372 | // } |
364 | // } | 373 | // } |
374 | + this.getEncryptTime() | ||
365 | 375 | ||
366 | }, | 376 | }, |
367 | methods: { | 377 | methods: { |
@@ -482,7 +492,19 @@ export default { | @@ -482,7 +492,19 @@ export default { | ||
482 | localStorage.setItem('historyArr',JSON.stringify(this.historyList)) | 492 | localStorage.setItem('historyArr',JSON.stringify(this.historyList)) |
483 | } | 493 | } |
484 | 494 | ||
485 | - this.getEncryptTime() | 495 | + |
496 | + this.$router.push({ | ||
497 | + path: 'coupon', | ||
498 | + query: { | ||
499 | + carNumber: plateLicense, | ||
500 | + carNumberColor: this.currentColor, | ||
501 | + carType: 2, | ||
502 | + codeType: this.codeType, | ||
503 | + cardRelParkNo: this.$route.query.cardRelParkNo, | ||
504 | + key: this.$route.query.key, | ||
505 | + encryptTime: this.encryptTime | ||
506 | + } | ||
507 | + }) | ||
486 | }, | 508 | }, |
487 | getEncryptTime() { | 509 | getEncryptTime() { |
488 | let url = process.env.VUE_APP_API; | 510 | let url = process.env.VUE_APP_API; |
@@ -510,20 +532,21 @@ export default { | @@ -510,20 +532,21 @@ export default { | ||
510 | 532 | ||
511 | if (response.code == 0) { | 533 | if (response.code == 0) { |
512 | this.encryptTime = response.data.encryptTime | 534 | this.encryptTime = response.data.encryptTime |
513 | - this.$router.push({ | ||
514 | - path: 'coupon', | ||
515 | - query: { | ||
516 | - carNumber: plateLicense, | ||
517 | - carNumberColor: this.currentColor, | ||
518 | - carType: 2, | ||
519 | - codeType: this.codeType, | ||
520 | - cardRelParkNo: this.$route.query.cardRelParkNo, | ||
521 | - key: this.$route.query.key, | ||
522 | - encryptTime: this.encryptTime | ||
523 | - } | ||
524 | - }) | 535 | + this.alertFlag = true |
536 | + | ||
537 | + | ||
538 | + | ||
525 | } else { | 539 | } else { |
526 | - alert(response.message) | 540 | + // this.$msgbox({ |
541 | + // title: '提示', | ||
542 | + // message: response.message, | ||
543 | + // // showCancelButton: false, | ||
544 | + // closeOnClickModal:false, | ||
545 | + // showConfirmButton:false | ||
546 | + // }); | ||
547 | + // this.alertFlag = true | ||
548 | + this.alertmsg = response.message | ||
549 | + // this.$refs.alert.open() | ||
527 | } | 550 | } |
528 | 551 | ||
529 | }) | 552 | }) |
@@ -539,7 +562,8 @@ export default { | @@ -539,7 +562,8 @@ export default { | ||
539 | carType: 2, | 562 | carType: 2, |
540 | codeType: this.codeType, | 563 | codeType: this.codeType, |
541 | cardRelParkNo: this.$route.query.cardRelParkNo, | 564 | cardRelParkNo: this.$route.query.cardRelParkNo, |
542 | - key: this.$route.query.key | 565 | + key: this.$route.query.key, |
566 | + encryptTime : this.encryptTime | ||
543 | } | 567 | } |
544 | }) | 568 | }) |
545 | }, | 569 | }, |
@@ -974,4 +998,7 @@ export default { | @@ -974,4 +998,7 @@ export default { | ||
974 | >>> .mint-cell:last-child{ | 998 | >>> .mint-cell:last-child{ |
975 | background-image:none; | 999 | background-image:none; |
976 | } | 1000 | } |
1001 | +/*>>> .mint-msgbox{*/ | ||
1002 | + /*display: none;*/ | ||
1003 | +/*}*/ | ||
977 | </style> | 1004 | </style> |