接口跨域

liuqimichale
1 parent 7ddbff4d
Showing 9 changed files with 36 additions and 26 deletions
build/utils.js
build/webpack.prod.conf.js
config/index.js
src/api/orderPay/orderPay.js
src/api/parkRecord/parkRecord.js
src/components/orderPay.vue
src/components/parkRecord.vue
src/utils/request.js
src/utils/utils.js
@@ -47,6 +47,7 @@ exports.cssLoaders = function (options) {
     if (options.extract) {
       return ExtractTextPlugin.extract({
         use: loaders,
+        publicPath: '../../',
         fallback: 'vue-style-loader'
       })
     } else {
@@ -23,6 +23,7 @@ const webpackConfig = merge(baseWebpackConfig, {
   },
   devtool: config.build.productionSourceMap ? config.build.devtool : false,
   output: {
+    publicPath: './',
     path: config.build.assetsRoot,
     filename: utils.assetsPath('js/[name].[chunkhash].js'),
     chunkFilename: utils.assetsPath('js/[id].[chunkhash].js')
@@ -46,7 +47,7 @@ const webpackConfig = merge(baseWebpackConfig, {
       filename: utils.assetsPath('css/[name].[contenthash].css'),
       // Setting the following option to `false` will not extract CSS from codesplit chunks.
       // Their CSS will instead be inserted dynamically with style-loader when the codesplit chunk has been loaded by webpack.
-      // It's currently set to `true` because we are seeing that sourcemaps are included in the codesplit bundle as well when it's `false`, 
+      // It's currently set to `true` because we are seeing that sourcemaps are included in the codesplit bundle as well when it's `false`,
       // increasing file size: https://github.com/vuejs-templates/webpack/issues/1110
       allChunks: true,
     }),
@@ -10,15 +10,15 @@ module.exports = {
     // Paths
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
-    proxyTable: {
-      '/api':{
-        target:"http://39.98.58.92:8090/",//这里设置你要访问的域名（或IP+端口）
-        changeOrigin:true,
-        pathRewrite:{
-          '^/api':''//base_api是自定义用来代替http://www.baidu.com/的
-        }
-      }
-    },
+    // proxyTable: {
+    //   '/api':{
+    //     target:"http://39.98.58.92:8090/",//这里设置你要访问的域名（或IP+端口）
+    //     changeOrigin:true,
+    //     pathRewrite:{
+    //       '^/api':''//base_api是自定义用来代替http://pay.service.huangshiparking.com/的
+    //     }
+    //   }
+    // },
     // Various Dev Server settings
@@ -52,7 +52,7 @@ module.exports = {
     // Paths
     assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
-    assetsPublicPath: '/',
+    assetsPublicPath: './',
     /**
      * Source Maps
@@ -2,7 +2,7 @@ import request from &#39;@/utils/request&#39;
 export function aliPay(params) {  // 支付宝
   return request({
-    url: '/api/alipay/aliH5Pay',
+    url: 'alipay/aliH5Pay',
     method: 'post',
     data: params
   })
@@ -11,7 +11,7 @@ export function aliPay(params) {  // 支付宝
 export function getOpenId(params) {  // 获取OpenId
   return request({
-    url: '/api//weixinPublicPay/getOpenIdByCode',
+    url: 'weixinPublicPay/getOpenIdByCode',
     method: 'post',
     data: params
   })
@@ -19,7 +19,7 @@ export function getOpenId(params) {  // 获取OpenId
 export function vxPayQuery(params) {  // 微信
   return request({
-    url: '/api//weixinpay/publicUnifiedOrder',
+    url: 'weixinpay/publicUnifiedOrder',
     method: 'post',
     data: params
   })
@@ -2,7 +2,7 @@ import request from &#39;@/utils/request&#39;
 export function parkRecordList(params) {
   return request({
-    url: '/api/queryParkOrder/queryParkingRecordPageByCarNumbers',
+    url: 'queryParkOrder/queryParkingRecordPageByCarNumbers',
     method: 'post',
     data: params
   })
@@ -10,7 +10,7 @@ export function parkRecordList(params) {
 export function historyQuery(params) {
   return request({
-    url: '/api/queryParkOrder/queryArrearageStaForWXPublc',
+    url: 'queryParkOrder/queryArrearageStaForWXPublc',
     method: 'post',
     data: params
   })
@@ -18,7 +18,7 @@ export function historyQuery(params) {
 export function parkingQuery(params) {
   return request({
-    url: '/api/queryParkOrder/billQuery',
+    url: 'queryParkOrder/billQuery',
     method: 'post',
     data: params
   })
@@ -100,14 +100,16 @@ export default {
       if (this.clientBrowser == '支付宝') { // 支付宝支付
         var aliParams = {};
+        console.log(this.orderId)
+        console.log(typeof this.orderId)
         aliParams.orderId = this.orderId;
         aliParams.carNumber = this.carNumber;
         aliParams.payType = 1;// 1:支付宝 2：微信 3：银联 10:H5   4微信公众号
         aliParams.terminalSource = 7;//请求端来源 1： 任你停 2：pda 3：微信公共号 7:H5扫码 10页面支付
         aliParams.paySrcType = this.paySrcType;//101停车支付
         aliParams.orgId = this.$utils.myOrgId,
-          aliParams.backType = 2,
-          aliParams.recordArreaInfos = JSON.stringify(this.orderId);
+        aliParams.backType = 2,
+        aliParams.recordArreaInfos = JSON.stringify(this.orderId);
         aliPay(aliParams).then(response => {
           console.log(response)
@@ -48,7 +48,7 @@
       <!--历史缴费-->
       <div v-show="currentTabActive==1" class="history-con" >
-        <div v-if="historyList.length>0">
+        <div v-if="historyList.length>0" style="height: 100%;">
           <div class="history-body" >
             <p class="money-all">总欠费金额：
               <span>¥{{(allMoney/100).toFixed(2)}}</span>
@@ -7,8 +7,8 @@ const service = axios.create({
   // baseURL: 'http://39.98.54.240:8090', // url = base url + request url
   //baseURL: _url, // url = base url + request url
-  // baseURL: 'http://39.98.54.240:8090', // url = base url + request url
-  withCredentials: true, // send cookies when cross-domain requests
+  baseURL: 'http://pay.service.huangshiparking.com/', // url = base url + request url
+  // withCredentials: true, // send cookies when cross-domain requests
   timeout: 6000 // request timeout
 })
@@ -25,13 +25,13 @@ export default {
       }
     }
     objb.sort(compare);
-    var strmd5 = 'ny1u72b6k374sg379z0kqjgfxe2ycnpw';
+    var strmd5 = '14318527b13840c2a4af63fef52c2d6e';
     for(var i=0;i<objb.length;i++){
       if(objb[i].value != null&&objb[i].value != ''){
         strmd5 += objb[i].keyname+objb[i].value;
       }
     }
-    strmd5 += 'ny1u72b6k374sg379z0kqjgfxe2ycnpw';
+    strmd5 += '14318527b13840c2a4af63fef52c2d6e';
     // console.log('strmd5-------->'+strmd5);
     strmd5 = md5(strmd5);
     strmd5=strmd5.toUpperCase();
@@ -111,11 +111,17 @@ export default {
   },
   // 0eca8f5373ca4866aec2f8e9d9367104  老的id
   // 14318527b13840c2a4af63fef52c2d6e 老的签名
-  myVarAppid:'ud8yq5tv0inxupc05xfeau39jywlqoj2',// 公共请求Appid
+
+
+  // ud8yq5tv0inxupc05xfeau39jywlqoj2  新的id
+  // ny1u72b6k374sg379z0kqjgfxe2ycnpw 新的签名
+
+
+  myVarAppid:'0eca8f5373ca4866aec2f8e9d9367104',// 公共请求Appid
   myDeviceInfo: 'BC0703A4-AFB0-4B51-9089-9B7487C0CC6E', // 公共请求设备信息
-  myVxAppId: 'wx2af2bab90d433c86' , // 微信赤峰 appid
+  myVxAppId: 'wxa1a66cc7d263afe6' , // 微信赤峰 appid    //黄石 appid    wxa1a66cc7d263afe6
   myOrgId: '10003' // 归属地 赤峰id