Commit f36d25ac22a8c273e0ed9a1c8e8d2606f8d02752
1 parent
34c54a40
西城家园
Showing
5 changed files
with
34 additions
and
35 deletions
src/utils/request.js
@@ -5,7 +5,7 @@ import axios from 'axios' | @@ -5,7 +5,7 @@ import axios from 'axios' | ||
5 | const service = axios.create({ | 5 | const service = axios.create({ |
6 | // https://dev.renniting.cn/pay/ 赤峰测试 | 6 | // https://dev.renniting.cn/pay/ 赤峰测试 |
7 | // http://pay.service.renniting.cn/ 赤峰 | 7 | // http://pay.service.renniting.cn/ 赤峰 |
8 | - baseURL: 'http://pay.service.renniting.cn/', // url = base url + request url | 8 | + baseURL: 'http://pay.service.renniting.cn/v1', // url = base url + request url |
9 | // withCredentials: true, // send cookies when cross-domain requests | 9 | // withCredentials: true, // send cookies when cross-domain requests |
10 | timeout: 6000 // request timeout | 10 | timeout: 6000 // request timeout |
11 | }) | 11 | }) |
src/utils/utils.js
@@ -145,14 +145,12 @@ export default { | @@ -145,14 +145,12 @@ export default { | ||
145 | // ud8yq5tv0inxupc05xfeau39jywlqoj2 新的id | 145 | // ud8yq5tv0inxupc05xfeau39jywlqoj2 新的id |
146 | // ny1u72b6k374sg379z0kqjgfxe2ycnpw 新的签名 | 146 | // ny1u72b6k374sg379z0kqjgfxe2ycnpw 新的签名 |
147 | 147 | ||
148 | - myVarAppid:'65grtq5tv0wewec05xfeau39jyghhjm',// 公共请求Appid | 148 | + myVarAppid:'ud8yq5tv0inxupc05xfeau39jywlqoj2',// 公共请求Appid |
149 | 149 | ||
150 | myDeviceInfo: 'BC0703A4-AFB0-4B51-9089-9B7487C0CC6E', // 公共请求设备信息 | 150 | myDeviceInfo: 'BC0703A4-AFB0-4B51-9089-9B7487C0CC6E', // 公共请求设备信息 |
151 | 151 | ||
152 | - myVxAppId: 'wx2af2bab90d433c86', | ||
153 | - // 测试环境 微信赤峰 appid wxff4cebaedbf4f886 | ||
154 | - // 微信赤峰 appid wx2af2bab90d433c86 | ||
155 | - // 黄石 appid wxa1a66cc7d263afe6 | 152 | + myVxAppId: 'wx78702b90dadb9586', |
153 | + | ||
156 | 154 | ||
157 | myOrgId: '10003', // 归属地 赤峰id 10003 黄石 10079 | 155 | myOrgId: '10003', // 归属地 赤峰id 10003 黄石 10079 |
158 | 156 | ||
@@ -169,13 +167,13 @@ export default { | @@ -169,13 +167,13 @@ export default { | ||
169 | } | 167 | } |
170 | } | 168 | } |
171 | objb.sort(compare); | 169 | objb.sort(compare); |
172 | - var strmd5 = 'dfdf2b6k37r5y79z0kqjgfxe2wet3434'; | 170 | + var strmd5 = 'ny1u72b6k374sg379z0kqjgfxe2ycnpw'; |
173 | for(var i=0;i<objb.length;i++){ | 171 | for(var i=0;i<objb.length;i++){ |
174 | if(objb[i].value != null&&objb[i].value != ''){ | 172 | if(objb[i].value != null&&objb[i].value != ''){ |
175 | strmd5 += objb[i].keyname+objb[i].value; | 173 | strmd5 += objb[i].keyname+objb[i].value; |
176 | } | 174 | } |
177 | } | 175 | } |
178 | - strmd5 += 'dfdf2b6k37r5y79z0kqjgfxe2wet3434'; | 176 | + strmd5 += 'ny1u72b6k374sg379z0kqjgfxe2ycnpw'; |
179 | // console.log('strmd5-------->'+strmd5); | 177 | // console.log('strmd5-------->'+strmd5); |
180 | strmd5 = md5(strmd5); | 178 | strmd5 = md5(strmd5); |
181 | strmd5=strmd5.toUpperCase(); | 179 | strmd5=strmd5.toUpperCase(); |
src/views/parkPay/orderPay.vue
@@ -22,8 +22,8 @@ | @@ -22,8 +22,8 @@ | ||
22 | </li> | 22 | </li> |
23 | </ul> | 23 | </ul> |
24 | 24 | ||
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="tollNumber" :attr="{ oninput: 'if(value.length>7)value=value.slice(0,7)' }" ></mt-field> | 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="tollNumber" :attr="{ oninput: 'if(value.length>7)value=value.slice(0,7)' }" ></mt-field>--> | ||
27 | 27 | ||
28 | 28 | ||
29 | <div style="padding: 20px 18px"> | 29 | <div style="padding: 20px 18px"> |
@@ -125,15 +125,16 @@ export default { | @@ -125,15 +125,16 @@ export default { | ||
125 | 125 | ||
126 | 126 | ||
127 | if (this.clientBrowser == '支付宝') { // 支付宝支付 | 127 | if (this.clientBrowser == '支付宝') { // 支付宝支付 |
128 | + console.log('1') | ||
128 | let me = this | 129 | let me = this |
129 | var aliParams = {}; | 130 | var aliParams = {}; |
130 | aliParams.orderId = this.orderId; | 131 | aliParams.orderId = this.orderId; |
131 | aliParams.carNumber = this.carNumber; | 132 | aliParams.carNumber = this.carNumber; |
132 | - aliParams.payType = 1;// 1:支付宝 2:微信 3:银联 10:H5 4微信公众号 | ||
133 | - aliParams.terminalSource = 7;//请求端来源 1: 任你停 2:pda 3:微信公共号 7:H5扫码 10页面支付 | 133 | + aliParams.payType = '1';// 1:支付宝 2:微信 3:银联 10:H5 4微信公众号 |
134 | + aliParams.terminalSource = '3';//请求端来源 1: 任你停 2:pda 3:微信公共号 7:H5扫码 10页面支付 | ||
134 | aliParams.paySrcType = this.paySrcType;//101停车支付 | 135 | aliParams.paySrcType = this.paySrcType;//101停车支付 |
135 | aliParams.orgId = this.$utils.myOrgId | 136 | aliParams.orgId = this.$utils.myOrgId |
136 | - aliParams.backType = 2 | 137 | + aliParams.backType = '2' |
137 | aliParams.backDeveloperCode = this.tollNumber | 138 | aliParams.backDeveloperCode = this.tollNumber |
138 | aliParams.recordArreaInfos = JSON.stringify(this.orderId); | 139 | aliParams.recordArreaInfos = JSON.stringify(this.orderId); |
139 | console.log(aliParams) | 140 | console.log(aliParams) |
@@ -197,7 +198,7 @@ export default { | @@ -197,7 +198,7 @@ export default { | ||
197 | wxParams.backType = 2, | 198 | wxParams.backType = 2, |
198 | wxParams.orgId = this.$utils.myOrgId, | 199 | wxParams.orgId = this.$utils.myOrgId, |
199 | wxParams.payType = 4;// 1:支付宝 2:微信 3:银联 10:H5 4微信公众号 | 200 | wxParams.payType = 4;// 1:支付宝 2:微信 3:银联 10:H5 4微信公众号 |
200 | - wxParams.terminalSource = 7;//请求端来源 1: 任你停 2:pda 3:微信公共号 7:H5扫码 10页面支付 | 201 | + wxParams.terminalSource = 3;//请求端来源 1: 任你停 2:pda 3:微信公共号 7:H5扫码 10页面支付 |
201 | wxParams.carNumber = this.carNumber; | 202 | wxParams.carNumber = this.carNumber; |
202 | wxParams.paySrcType = this.paySrcType;//101停车支付 | 203 | wxParams.paySrcType = this.paySrcType;//101停车支付 |
203 | wxParams.recordArreaInfos = JSON.stringify(orderIdData); | 204 | wxParams.recordArreaInfos = JSON.stringify(orderIdData); |
@@ -268,7 +269,7 @@ export default { | @@ -268,7 +269,7 @@ export default { | ||
268 | pageNum: 1, | 269 | pageNum: 1, |
269 | pageSize: 10000, | 270 | pageSize: 10000, |
270 | parkState: 10, | 271 | parkState: 10, |
271 | - terminalSource: 7, | 272 | + terminalSource: 3, |
272 | carNumber: me.carNumber, | 273 | carNumber: me.carNumber, |
273 | app_id: me.$utils.myVarAppid, | 274 | app_id: me.$utils.myVarAppid, |
274 | deviceInfo: me.$utils.myDeviceInfo, | 275 | deviceInfo: me.$utils.myDeviceInfo, |
src/views/parkPay/parkRecord.vue
@@ -188,13 +188,13 @@ export default { | @@ -188,13 +188,13 @@ export default { | ||
188 | deviceInfo: this.$utils.myDeviceInfo, | 188 | deviceInfo: this.$utils.myDeviceInfo, |
189 | salt: salt, | 189 | salt: salt, |
190 | sign_type: "md5", | 190 | sign_type: "md5", |
191 | - pageNum: 1, | ||
192 | - pageSize: 1000, | ||
193 | - parkState: 10, | ||
194 | - terminalSource: 7, | 191 | + pageNum: "1", |
192 | + pageSize: "1000", | ||
193 | + parkState: "10", | ||
194 | + terminalSource:"3", | ||
195 | carNumber: this.carNumber, | 195 | carNumber: this.carNumber, |
196 | - carNumberColor: this.carColor, | ||
197 | - orgId: this.$utils.myOrgId, | 196 | + // carNumberColor: this.carColor, |
197 | + // orgId: this.$utils.myOrgId, | ||
198 | 198 | ||
199 | } | 199 | } |
200 | jsondata.sign = this.$utils.signObject(jsondata) | 200 | jsondata.sign = this.$utils.signObject(jsondata) |
@@ -303,7 +303,7 @@ export default { | @@ -303,7 +303,7 @@ export default { | ||
303 | payType: this.$utils.clientBrowsePayType(), | 303 | payType: this.$utils.clientBrowsePayType(), |
304 | appId: this.$utils.myVxAppId, | 304 | appId: this.$utils.myVxAppId, |
305 | orderId: i.orderId, | 305 | orderId: i.orderId, |
306 | - terminalSource: '7', | 306 | + terminalSource: '3', |
307 | parkCode: i.parkCode, | 307 | parkCode: i.parkCode, |
308 | carNumber: this.carNumber, | 308 | carNumber: this.carNumber, |
309 | } | 309 | } |
@@ -357,7 +357,7 @@ export default { | @@ -357,7 +357,7 @@ export default { | ||
357 | sign_type: "md5", | 357 | sign_type: "md5", |
358 | appId: this.$utils.myVxAppId, | 358 | appId: this.$utils.myVxAppId, |
359 | orderIds: list, | 359 | orderIds: list, |
360 | - terminalSource: '7', | 360 | + terminalSource: '3', |
361 | payType: this.$utils.clientBrowsePayType(), | 361 | payType: this.$utils.clientBrowsePayType(), |
362 | orgId: this.$utils.myOrgId, | 362 | orgId: this.$utils.myOrgId, |
363 | backDeveloperCode: this.$route.query.backDeveloperCode | 363 | backDeveloperCode: this.$route.query.backDeveloperCode |
src/views/parkPay/plateNumber.vue
1 | <template> | 1 | <template> |
2 | <div id="page"> | 2 | <div id="page"> |
3 | 3 | ||
4 | - <div class="swiper-container" style="height: 260px"> | ||
5 | - <div class="swiper-wrapper"> | ||
6 | - <div class="swiper-slide" v-for="item in swiperData" :key="item.id" | ||
7 | - :style="{backgroundImage:'url(' + item.url + ')'}" | ||
8 | - @click="openImgUrl(item)" | ||
9 | - ></div> | ||
10 | - </div> | ||
11 | - <!-- 如果需要分页器 --> | ||
12 | - <div class="swiper-pagination"></div> | 4 | + <!--<div class="swiper-container" style="height: 260px">--> |
5 | + <!--<div class="swiper-wrapper">--> | ||
6 | + <!--<div class="swiper-slide" v-for="item in swiperData" :key="item.id"--> | ||
7 | + <!--:style="{backgroundImage:'url(' + item.url + ')'}"--> | ||
8 | + <!--@click="openImgUrl(item)"--> | ||
9 | + <!--></div>--> | ||
10 | + <!--</div>--> | ||
11 | + <!--<!– 如果需要分页器 –>--> | ||
12 | + <!--<div class="swiper-pagination"></div>--> | ||
13 | 13 | ||
14 | - <!-- 如果需要滚动条 --> | ||
15 | - <!-- <div class="swiper-scrollbar"></div>--> | ||
16 | - </div> | 14 | + <!--<!– 如果需要滚动条 –>--> |
15 | + <!--<!– <div class="swiper-scrollbar"></div>–>--> | ||
16 | + <!--</div>--> | ||
17 | 17 | ||
18 | <div class="wrap"> | 18 | <div class="wrap"> |
19 | <!--<p style="margin-bottom: 18px;margin-top: 18px;">请选择车牌颜色</p>--> | 19 | <!--<p style="margin-bottom: 18px;margin-top: 18px;">请选择车牌颜色</p>--> |