diff --git a/src/api/cards/cards.js b/src/api/cards/cards.js index 6d70dc2..c6f4e70 100644 --- a/src/api/cards/cards.js +++ b/src/api/cards/cards.js @@ -20,6 +20,66 @@ export function queryVipAreaCardByOrgId(params) { }) } +// +// // 搜索有会员卡的停车场 +// export function queryParkListForVipCard(params) { +// return request({ +// url: 'applyVipCard/queryParkListForVipCard', +// method: 'post', +// data: params +// }) +// } + + +// 搜索停车场 +export function queryParkListForVipCard(params) { + return request({ + url: 'applyVipCard/queryParkListForVipCard', + method: 'post', + data: params + }) +} + +// 搜索卡类型 +export function queryVipCardInfoByPlNo(params) { + return request({ + url: 'applyVipCard/queryVipCardInfoByPlNo', + method: 'post', + data: params + }) +} + +// 获取用户车牌 +export function queryUserCars(params) { + return request({ + url: 'user/queryUserCars', + method: 'post', + data: params + }) +} + +// 创建订单 +export function createVipCardOrder(params) { + return request({ + url: 'vip/createVipCardOrder', + method: 'post', + data: params + }) +} + + +// 会员卡-微信支付 +export function weixinpay(params) { + return request({ + url: 'weixinpay/publicUnifiedOrder', + method: 'post', + data: params + }) +} + + + + diff --git a/src/main.js b/src/main.js index d58a22f..e2aa3c9 100644 --- a/src/main.js +++ b/src/main.js @@ -69,9 +69,10 @@ import { Toast, dateFormat, Loading, + XDialog }from 'vux' - +Vue.component('x-dialog', XDialog) Vue.component('loading', Loading) Vue.component('Toast', Toast) Vue.component('Confirm', Confirm) diff --git a/src/utils/request.js b/src/utils/request.js index 027b13f..a858551 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -5,7 +5,7 @@ import axios from 'axios' const service = axios.create({ // http://dev.renniting.cn/pay/ 赤峰测试 // http://pay.service.renniting.cn/ 赤峰 - baseURL: 'http://dev.renniting.cn/pay/', // url = base url + request url + baseURL: 'http://pay.service.renniting.cn/', // url = base url + request url // withCredentials: true, // send cookies when cross-domain requests timeout: 6000 // request timeout }) @@ -25,6 +25,7 @@ service.interceptors.request.use( service.interceptors.response.use( response => { const res = response.data + // console.log(res) // if the custom code is not 20000, it is judged as an error. if (res.code != '8888') { return res diff --git a/src/utils/utils.js b/src/utils/utils.js index 0bcb0a6..d5c2299 100644 --- a/src/utils/utils.js +++ b/src/utils/utils.js @@ -41,9 +41,14 @@ export default { } }, timestampToTime: function(timestamp) { - var d = new Date(timestamp);//时间戳为10位需*1000，时间戳为13位的话不需乘1000 - var youWant = d.getFullYear() + "-" + this.completedString(d.getMonth() + 1) + "-" + this.completedString(d.getDate()); - return youWant; + if(timestamp){ + var d = new Date(timestamp);//时间戳为10位需*1000，时间戳为13位的话不需乘1000 + var youWant = d.getFullYear() + "-" + this.completedString(d.getMonth() + 1) + "-" + this.completedString(d.getDate()); + return youWant; + }else{ + return '' + } + }, timestampTransformTime: function(timestamp) { var d = new Date(timestamp);//时间戳为10位需*1000，时间戳为13位的话不需乘1000 @@ -150,13 +155,14 @@ export default { // ud8yq5tv0inxupc05xfeau39jywlqoj2 新的id // ny1u72b6k374sg379z0kqjgfxe2ycnpw 新的签名 myVarAppid: "65grtq5tv0wewec05xfeau39jyghhjm",// 公共请求Appid - myDeviceInfo: "BC0703A4-AFB0-4B51-9089-9B7487C0CC6E", // 公共请求设备信息 + myDeviceInfo: "BC0703A4-AFB0-4B51-9089-9B7487C0CC6E", // 公共请求设备信息 80ac1a4218beb19a BC0703A4-AFB0-4B51-9089-9B7487C0CC6E myVxAppId: "wxdfb0276f85514ea3", // 测试环境 微信赤峰 appid wxff4cebaedbf4f886 // 微信赤峰 appid wx2af2bab90d433c86 // 黄石 appid wxa1a66cc7d263afe6 // 阳明 wxdfb0276f85514ea3 - myOrgId: "10193", // 归属地 赤峰id 10003 黄石 10079 无锡10005 + // 无锡 wx1e9001e5940605b1 + myOrgId: "10193", // 归属地 赤峰id 10003 黄石 10079 无锡10005 扬明10193 myGetSign: function(objb) { // 获取签名 var compare = function(obj1, obj2) { var val1 = obj1.keyname; @@ -203,7 +209,7 @@ export default { deviceInfo: this.myDeviceInfo, salt: salt, sign_type: "md5", - token: '7f61e743f9e24f86b1673e32c16e181e', //7f61e743f9e24f86b1673e32c16e181e sessionStorage.getItem("wx_Token") + token: sessionStorage.getItem("wx_Token"), //de8eb9cce14b4c8f81d027fcda0b78f8 sessionStorage.getItem("wx_Token") orgId: this.myOrgId }; return reqData; diff --git a/src/views/carManage/addCar.vue b/src/views/carManage/addCar.vue index e181678..b4372ac 100644 --- a/src/views/carManage/addCar.vue +++ b/src/views/carManage/addCar.vue @@ -457,13 +457,23 @@ export default { userCarsInfoEdit(jsondata).then(data => { console.log(data) if (data.code == 0) { - this.$router.push({ - path: "myCars", - // query: { - // carNumber: plateLicense, - // carNumberColor: this.currentColor - // } - }); + + // source:1 // 1表示来源是购买车牌页面 + + if(this.$route.query.source){ + this.$router.push({ + path: "buyCard", + }); + }else{ + this.$router.push({ + path: "myCars", + // query: { + // carNumber: plateLicense, + // carNumberColor: this.currentColor + // } + }); + } + }else{ this.$vux.toast.text(data.message, 'top') } diff --git a/src/views/carManage/certification.vue b/src/views/carManage/certification.vue index fe79d69..7264105 100644 --- a/src/views/carManage/certification.vue +++ b/src/views/carManage/certification.vue @@ -66,7 +66,7 @@ export default { let params = new FormData(); params.append("picFile", this.fil); params.append("fileType", 7); - params.append("token", "7f61e743f9e24f86b1673e32c16e181e"); + params.append("token", sessionStorage.getItem("wx_Token")); // sessionStorage.getItem("wx_Token") uploadPic(params).then(data => { console.log(data); if (data.code == 0) { diff --git a/src/views/cards/CardList.vue b/src/views/cards/CardList.vue index 25f798d..7921f08 100644 --- a/src/views/cards/CardList.vue +++ b/src/views/cards/CardList.vue @@ -46,12 +46,12 @@ export default { } }, mounted(){ - this.queryVipAreaCardByOrgId() + this.queryParkListForVipCard() }, methods:{ - queryVipAreaCardByOrgId: function() { + queryParkListForVipCard: function() { let jsondata = this.$utils.commonParams(); - jsondata.saleChannel = '3' // 售卖渠道:1-APP、2-公众号、3-平台 + jsondata.saleChannel = '2' // 售卖渠道:1-APP、2-公众号、3-平台 jsondata.sign = this.$utils.signObject(jsondata); queryVipAreaCardByOrgId(jsondata).then(data => { console.log(data); diff --git a/src/views/cards/Cards.vue b/src/views/cards/Cards.vue index 6ad7c73..c75a75f 100644 --- a/src/views/cards/Cards.vue +++ b/src/views/cards/Cards.vue @@ -1,44 +1,37 @@ @@ -62,6 +55,7 @@ export default { console.log(data); if (data.code == 0) { let res = data.data; + this.cardList = res } else { this.$vux.toast.text(data.message, "top"); } diff --git a/src/views/cards/buyCard.vue b/src/views/cards/buyCard.vue index 3c7138c..1f24aad 100644 --- a/src/views/cards/buyCard.vue +++ b/src/views/cards/buyCard.vue @@ -1,14 +1,25 @@