From 331018f3090949ea904c674b64160fb06303a028 Mon Sep 17 00:00:00 2001
From: liuqi <290219706@qq.com>
Date: Thu, 2 Jun 2022 20:42:04 +0800
Subject: [PATCH] 江阴领取优惠券调接口

---
 config/dev.env.js                 |  4 +++-
 config/prod.env.js                |  5 +++++
 src/api/couponPay/couponPay.js    | 34 ++++++++++++++++++----------------
 src/utils/request.js              | 21 ++++++++++++++++-----
 src/views/parkPay/coupon.vue      | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------
 src/views/parkPay/couponPay.vue   |  6 ++++--
 src/views/parkPay/plateNumber.vue |  8 +++++---
 7 files changed, 107 insertions(+), 69 deletions(-)

diff --git a/config/dev.env.js b/config/dev.env.js
index 1e22973..13b1f2f 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -3,5 +3,7 @@ const merge = require('webpack-merge')
 const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
-  NODE_ENV: '"development"'
+  NODE_ENV: '"development"',
+  VUE_APP_API:'"/api"',
+  VUE_APP_PAYAPI:'"/payapi"'   //本地域名
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index a6f9976..db4cb54 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,4 +1,9 @@
 'use strict'
 module.exports = {
+  APP_BASE_APP_API:'"https://bus.jycrtc.com"', //项目api地址1 注意里面的双引号
+  APP_BASE_WWW_API:'"https://pay.jycrtc.com"', //项目api地址2
+  VUE_APP_API:'"https://bus.jycrtc.com"',
+  VUE_APP_PAYAPI:'"https://pay.jycrtc.com"',
+
   NODE_ENV: '"production"'
 }
diff --git a/src/api/couponPay/couponPay.js b/src/api/couponPay/couponPay.js
index 8cd4a56..20ff010 100644
--- a/src/api/couponPay/couponPay.js
+++ b/src/api/couponPay/couponPay.js
@@ -1,62 +1,64 @@
 import request from '@/utils/request'
 
-export function scanCouponQR(params) {
+export function scanCouponQR(base,params) {
+  console.log('1111ase')
+  console.log(base)
   return request({
-    requestBase:'VUE_APP_URL',
-    url: '/api/business/h5/qr/scanCouponQR',
+    // requestBase:'VUE_APP_URL',
+    url: base+'/business/h5/qr/scanCouponQR',
     method: 'post',
     data: params
   })
 }
 
 
-export function queryParkingRecordPageByCarNumbers(params) {
+export function queryParkingRecordPageByCarNumbers(base,params) {
   return request({
-    requestBase:'VUE_APP_URL_TWO',
-    url: '/payapi/queryParkOrder/queryParkingRecordPageByCarNumbers',
+    // requestBase:'VUE_APP_URL_TWO',
+    url: base+'/queryParkOrder/queryParkingRecordPageByCarNumbers',
     method: 'post',
     data: params
   })
 }
 
 
-export function appApplyParkOut(params) {  // 0元出场
+export function appApplyParkOut(base,params) {  // 0元出场
   return request({
-    url: '/payapi/appAccountPay/appApplyParkOut',
+    url: base+'/appAccountPay/appApplyParkOut',
     method: 'post',
     data: params
   })
 }
 
 
-export function parkingQuery(params) {
+export function parkingQuery(base,params) {
   return request({
-    url: '/payapi/queryParkOrder/billQuery',
+    url: base+'/queryParkOrder/billQuery',
     method: 'post',
     data: params
   })
 }
 
-export function aliPay(params) {  // 支付宝
+export function aliPay(base,params) {  // 支付宝
   return request({
-    url: '/payapi/alipay/aliH5Pay',
+    url: base+'/alipay/aliH5Pay',
     method: 'post',
     data: params
   })
 }
 
 
-export function getOpenId(params) {  // 获取OpenId
+export function getOpenId(base,params) {  // 获取OpenId
   return request({
-    url: '/payapi/weixinPublicPay/getOpenIdByCode',
+    url: base+'/weixinPublicPay/getOpenIdByCode',
     method: 'post',
     data: params
   })
 }
 
-export function vxPayQuery(params) {  // 微信
+export function vxPayQuery(base,params) {  // 微信
   return request({
-    url: '/payapi/weixinpay/publicUnifiedOrder',
+    url: base+'/weixinpay/publicUnifiedOrder',
     method: 'post',
     data: params
   })
diff --git a/src/utils/request.js b/src/utils/request.js
index 59c3c2d..74328a1 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -6,9 +6,17 @@ import axios from 'axios'
 const service = axios.create({
  // baseURL:'https://bus.jycrtc.com/',
   // baseURL:process.env.VUE_APP_URL,
+  // baseURL:'',
   // withCredentials: true, // send cookies when cross-domain requests
   timeout: 6000, // request timeout
-  withCredentials: false,
+  // withCredentials: false,
+  // crossDomain: true,
+
+  xhrFields: {
+
+    withCredentials: false
+
+  },
   headers:{
     'Access-Control-Allow-Origin':'*'
    //'Content-Type':'application/x-www-form-urlencoded'
@@ -18,13 +26,16 @@ const service = axios.create({
 service.interceptors.request.use(
 
   config => {
-    // if(config.requestBase=='VUE_APP_URL'){
-    //   config.baseURL='https://bus.jycrtc.com/';
+    // if (process.env.NODE_ENV === 'production'){
+    //   if(config.requestBase=='VUE_APP_URL'){
+    //     config.baseURL='https://bus.jycrtc.com/';
     //
-    // }else if(config.requestBase=='VUE_APP_URL_TWO'){
-    //   config.baseURL='https://pay.jycrtc.com/';
+    //   }else if(config.requestBase=='VUE_APP_URL_TWO'){
+    //     config.baseURL='https://pay.jycrtc.com/';
+    //   }
     // }
 
+
     return config
   },
   error => {
diff --git a/src/views/parkPay/coupon.vue b/src/views/parkPay/coupon.vue
index 62db3a8..ae7738b 100644
--- a/src/views/parkPay/coupon.vue
+++ b/src/views/parkPay/coupon.vue
@@ -2,10 +2,11 @@
   <div>
     <img :src="imgurl" alt="" style="margin: 10px auto;width: 64px;height: 64px;">
     <div style="padding: 10px 30px 50px">
-      <p>尊敬的车主您好：{{tipText}}</p>
+      <p>尊敬的车主您好：{{ tipText }}</p>
     </div>
     <div style="padding: 0 20px">
-      <mt-button size="large" type="primary" @click="toPay" style="margin-bottom: 20px;" v-show="payFlag">去支付</mt-button>
+      <mt-button size="large" type="primary" @click="toPay" style="margin-bottom: 20px;" v-show="payFlag">去支付
+      </mt-button>
       <mt-button size="large" type="danger" @click="toBackPage">返回</mt-button>
     </div>
 
@@ -15,29 +16,34 @@
 <script>
 
 
-import { scanCouponQR, queryParkingRecordPageByCarNumbers, appApplyParkOut, parkingQuery } from '@/api/couponPay/couponPay.js'
+import {
+  scanCouponQR,
+  queryParkingRecordPageByCarNumbers,
+  appApplyParkOut,
+  parkingQuery
+} from '@/api/couponPay/couponPay.js'
 
 export default {
   name: "coupon",
   data() {
     return {
-      imgurl:'',
+      imgurl: '',
       successiconUrl: require('../../assets/images/successIcon.png'),
       loseiconUrl: require('../../assets/images/loseIcon.png'),
       carNum: '',
       carNumberColor: '',
-      parkingData:[],
-      carType:'',
-      codeType:'',
-      tipText:'',
-      payFlag:false,
+      parkingData: [],
+      carType: '',
+      codeType: '',
+      tipText: '',
+      payFlag: false,
     }
   },
   created() {
     this.carNum = this.$route.query.carNumber
     this.carType = this.$route.query.carType
     this.codeType = this.$route.query.codeType
-
+    this.cardRelParkNo = this.$route.query.cardRelParkNo
     // this.carNum = this.$route.query.carNumber  // 获取车牌号
     // this.carNumberColor = this.$route.query.carNumberColor  // 获取颜色   0:蓝牌;1:黄牌;2:白牌;3:黑牌;4:绿色
     // this.currentTabActive = this.$route.query.parkFlag ? this.$route.query.parkFlag : 0
@@ -46,34 +52,40 @@ export default {
     this.scanCouponQR()
   },
   methods: {
-    scanCouponQR(){
+    scanCouponQR() {
+
+      let url = process.env.VUE_APP_API;
+      console.log(url)
       var salt = this.$utils.myCommonSalt(32);
       var jsondata = {
         app_id: this.$utils.myVarAppid,
         deviceInfo: this.$utils.myDeviceInfo,
         salt: salt,
         sign_type: "md5",
-        carType:this.carType,
-        codeType:this.codeType,
-        cardRelParkNo:'123qwe',
-        key:'1',
+        carType: '2',
+        codeType: this.codeType,
+        cardRelParkNo: this.cardRelParkNo,
+        key: this.$route.query.key,
         carNum: this.carNum,
         // carNumberColor: this.carNumberColor,
         orgId: this.$utils.myOrgId,
-        terminalSource:'7',
+        terminalSource: '7',
         // token:'e2c1e43722dd43a5b7e268001b39e6f0'
       }
       jsondata.sign = this.$utils.signObject(jsondata)
-      scanCouponQR(jsondata).then(response => {
+      scanCouponQR(url,jsondata).then(response => {
         console.log(response)
-        this.tipText = response.data.message
-        if(response.data.code==0){
+
+        if (response.code == 0) {
           this.payFlag = true
           this.imgurl = this.successiconUrl
-        }else{
+          this.tipText = '领取优惠券成功'
+        } else {
           this.payFlag = false
           this.imgurl = this.loseiconUrl
+          this.tipText = response.message
         }
+        // this.tipText =
       })
     },
     toPay() {
@@ -86,6 +98,7 @@ export default {
       this.$router.back()
     },
     parkRecordList() {  // 获取停车记录数据
+      let url = process.env.VUE_APP_PAYAPI;
       var salt = this.$utils.myCommonSalt(32);
       var jsondata = {
         app_id: this.$utils.myVarAppid,
@@ -106,7 +119,7 @@ export default {
 
       // jsondata.sign = md5sign
       console.log('停车记录传参  ' + JSON.stringify(jsondata));
-      queryParkingRecordPageByCarNumbers(jsondata).then(response => {
+      queryParkingRecordPageByCarNumbers(url,jsondata).then(response => {
         console.log(response)
         // this.parkList = response.data.dataList
 
@@ -119,6 +132,7 @@ export default {
       })
     },
     toPayCurrent(i) { // 缴纳本次在停费用
+      let url = process.env.VUE_APP_PAYAPI;
       var salt = this.$utils.myCommonSalt(32);
       var params = {
         app_id: this.$utils.myVarAppid,
@@ -130,7 +144,7 @@ export default {
         terminalSource: '3',
       }
       params.sign = this.$utils.signObject(params)
-      appApplyParkOut(params).then(response => {
+      appApplyParkOut(url,params).then(response => {
         console.log(response)
 
         if (response.code == '5005') {
@@ -148,33 +162,33 @@ export default {
             carNumber: this.carNum,
           }
           jsondata.sign = this.$utils.signObject(jsondata)
-          parkingQuery(jsondata).then(result => {
+          parkingQuery(url,jsondata).then(result => {
             console.log(result)
             let res = result.data
             let _dis = res.discountFee
             let discountFee = _dis.slice(1, _dis.length - 1)
-            sessionStorage.setItem('couponPark',JSON.stringify(result.data))
-              this.$router.push(
-                {
-                  path: 'couponPay',
-                  query: {
-                    carColor: this.carColor,// 车牌颜色
-                    arrearageTotalFee: res.orderTotalFee,// 应收
-                    arrearageDiscFee: discountFee * 100,// 优惠
-                    arrearageActFee: res.orderFee,// 实收
-                    carNumber: this.carNumber, // 车牌
-                    paySrcType: 101, //支付的类型   101 是本次   103是历史欠费
-                    ordeID: i.orderId, //支付的订单号
-                    appOrderTimeout: res.appOrderTimeout, // 超时描述
-                  }
+            sessionStorage.setItem('couponPark', JSON.stringify(result.data))
+            this.$router.push(
+              {
+                path: 'couponPay',
+                query: {
+                  carColor: this.carColor,// 车牌颜色
+                  arrearageTotalFee: res.orderTotalFee,// 应收
+                  arrearageDiscFee: discountFee * 100,// 优惠
+                  arrearageActFee: res.orderFee,// 实收
+                  carNumber: this.carNumber, // 车牌
+                  paySrcType: 101, //支付的类型   101 是本次   103是历史欠费
+                  ordeID: i.orderId, //支付的订单号
+                  appOrderTimeout: res.appOrderTimeout, // 超时描述
                 }
-              )
+              }
+            )
           })
 
-          } else {
-            //$('.dialog-out').show()
-            this.$msgbox('提示', '停车15分钟内无需缴费，申请成功。')
-          }
+        } else {
+          //$('.dialog-out').show()
+          this.$msgbox('提示', '停车15分钟内无需缴费，申请成功。')
+        }
 
       })
 
diff --git a/src/views/parkPay/couponPay.vue b/src/views/parkPay/couponPay.vue
index 22506bc..873679f 100644
--- a/src/views/parkPay/couponPay.vue
+++ b/src/views/parkPay/couponPay.vue
@@ -214,7 +214,8 @@ export default {
             code: this.webAppCode,
             appId: this.$utils.myVxAppId
           };
-          getOpenId(codeParams).then(res => {
+          let url = process.env.VUE_APP_PAYAPI;
+          getOpenId(url,codeParams).then(res => {
             if (res.code == 0) {
               me.vxPay(res.data, this.orderId)
               sessionStorage.setItem('openIdData', res.data)
@@ -229,6 +230,7 @@ export default {
       }
     },
     vxPay(openIdData, orderIdData) {
+      let url = process.env.VUE_APP_PAYAPI;
       let vm = this
       var wxParams = {};
       wxParams.orderId = orderIdData;
@@ -241,7 +243,7 @@ export default {
       wxParams.recordArreaInfos = JSON.stringify(orderIdData);
       wxParams.openId = openIdData;
       wxParams.appId = this.$utils.myVxAppId;
-      vxPayQuery(wxParams).then(res => {
+      vxPayQuery(url,wxParams).then(res => {
         if (res.code == 0) { //
           if (res.data) {
             var data = res.data;
diff --git a/src/views/parkPay/plateNumber.vue b/src/views/parkPay/plateNumber.vue
index 6b3bc2a..ec468d2 100644
--- a/src/views/parkPay/plateNumber.vue
+++ b/src/views/parkPay/plateNumber.vue
@@ -334,6 +334,7 @@ export default {
   created() {
     this.carType = this.$route.query.carType
     this.codeType = this.$route.query.codeType
+    console.log(this.codeType)
   },
   mounted() {
     //
@@ -453,9 +454,10 @@ export default {
         query: {
           carNumber: plateLicense,
           carNumberColor: this.currentColor,
-          carType: this.carType,
-          codeType: this.codeType
-
+          carType: 2,
+          codeType: this.codeType,
+          cardRelParkNo: this.$route.query.cardRelParkNo,
+          key: this.$route.query.key
         }
       })
     },
--
libgit2 0.21.4