From 7c172b534a158d68dbc3d80d05d8dae5b1b42ff2 Mon Sep 17 00:00:00 2001
From: liuqimichale <123456lq>
Date: Wed, 20 Jan 2021 16:25:58 +0800
Subject: [PATCH] 黄石分支

---
 src/components/orderPay.vue   |  2 +-
 src/components/parkRecord.vue |  2 +-
 src/router/index.js           | 16 +++++++++-------
 src/utils/request.js          |  9 +++------
 src/utils/utils.js            | 60 ++++++++++++++++++++++++++++++------------------------------
 5 files changed, 44 insertions(+), 45 deletions(-)

diff --git a/src/components/orderPay.vue b/src/components/orderPay.vue
index 8ba6a80..0a79582 100644
--- a/src/components/orderPay.vue
+++ b/src/components/orderPay.vue
@@ -25,7 +25,7 @@
       <div class="toPay" @click="toPay">{{clientBrowser}}支付</div>
     </div>
 
-    <div v-if="appOrderTimeout.length>0">
+    <div v-if="appOrderTimeout">
       <p class="tip">
         温馨提示：
       </p>
diff --git a/src/components/parkRecord.vue b/src/components/parkRecord.vue
index fcbf122..b42ba05 100644
--- a/src/components/parkRecord.vue
+++ b/src/components/parkRecord.vue
@@ -125,7 +125,7 @@
 
 <script>
 import { parkRecordList, historyQuery, parkingQuery } from '@/api/parkRecord/parkRecord.js'
-import axios from 'axios'
+
 
 export default {
   name: 'parkRecord',
diff --git a/src/router/index.js b/src/router/index.js
index 1474bf5..2b86f01 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import Router from 'vue-router'
-import plateNumber from '@/components/plateNumber'
+// import plateNumber from '@/components/plateNumber'
 import parkRecord from '@/components/parkRecord'
 import navigation from '@/components/navigation'
 
@@ -11,7 +11,7 @@ export default new Router({
     {
       path: '/',
       redirect: {
-        name: 'navigation'
+        name: 'parkRecord'
       }
     },
     {
@@ -19,17 +19,19 @@ export default new Router({
       name: 'navigation',
       component: navigation
     },
-    {
-      path: '/plateNumber',
-      name: 'plateNumber',
-      component: plateNumber
-    },
+
     {
       path: '/parkRecord',
       name: 'parkRecord',
       component: parkRecord
     },
     {
+      path: '/plateNumber',
+      name: 'plateNumber',
+      component: () => import("@/components/plateNumber.vue")
+    },
+
+    {
       path: '/orderPay',
       name: 'orderPay',
       component: () => import("@/components/orderPay.vue")
diff --git a/src/utils/request.js b/src/utils/request.js
index ec511a0..37edac3 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -1,22 +1,19 @@
 import axios from 'axios'
 
-// let _userToken = sessionStorage.getItem('userToken')
 // let _url = process.env.API_ROOT
 // axios.defaults.baseURL = process.env.API_ROOT
 const service = axios.create({
 
   // http://pay.service.renniting.cn/  赤峰
-  // http://pay.service.huangshiparking.com/  黄石
-  baseURL: 'http://pay.service.renniting.cn/', // url = base url + request url
+  // http://pay.service.huangshiparking.com/  黄石正式环境
+  //  http://39.98.54.240:8090/   黄石测试环境
+  baseURL: 'http://39.98.54.240:8090/', // url = base url + request url
   // withCredentials: true, // send cookies when cross-domain requests
   timeout: 6000 // request timeout
 })
 
 service.interceptors.request.use(
   config => {
-    // let token = _userToken
-    // //let  token='298bd7ff-a025-4145-a4a3-554769375b48';
-    // config.headers['X-Auth-Token'] = token
     return config
   },
   error => {
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 4410ded..c75f17a 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -12,31 +12,7 @@ export default {
     return pwd;
   },
 
-  myGetSign: function (objb) { // 获取签名
-    var compare = function (obj1, obj2) {
-      var val1 = obj1.keyname;
-      var val2 = obj2.keyname;
-      if (val1 < val2) {
-        return -1;
-      } else if (val1 > val2) {
-        return 1;
-      } else {
-        return 0;
-      }
-    }
-    objb.sort(compare);
-    var strmd5 = 'ny1u72b6k374sg379z0kqjgfxe2ycnpw';
-    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';
-    // console.log('strmd5-------->'+strmd5);
-    strmd5 = md5(strmd5);
-    strmd5=strmd5.toUpperCase();
-    return strmd5;
-  },
+
 
   dateFormat: function (msd) {  // 时间转换
     var time = msd
@@ -112,17 +88,41 @@ export default {
   // 0eca8f5373ca4866aec2f8e9d9367104  老的id
   // 14318527b13840c2a4af63fef52c2d6e 老的签名
 
-
   // ud8yq5tv0inxupc05xfeau39jywlqoj2  新的id
   // ny1u72b6k374sg379z0kqjgfxe2ycnpw 新的签名
 
-
-  myVarAppid:'ud8yq5tv0inxupc05xfeau39jywlqoj2',// 公共请求Appid
+  myVarAppid:'0eca8f5373ca4866aec2f8e9d9367104',// 公共请求Appid
 
   myDeviceInfo: 'BC0703A4-AFB0-4B51-9089-9B7487C0CC6E', // 公共请求设备信息
 
-  myVxAppId: 'wx2af2bab90d433c86' , // 微信赤峰 appid   wx2af2bab90d433c86      //黄石 appid    wxa1a66cc7d263afe6
+  myVxAppId: 'wxa1a66cc7d263afe6' , // 微信赤峰 appid   wx2af2bab90d433c86      //黄石 appid    wxa1a66cc7d263afe6
+
+  myOrgId: '10079', // 归属地 赤峰id  10003    黄石 10079
 
-  myOrgId: '10003' // 归属地 赤峰id
+  myGetSign: function (objb) { // 获取签名
+    var compare = function (obj1, obj2) {
+      var val1 = obj1.keyname;
+      var val2 = obj2.keyname;
+      if (val1 < val2) {
+        return -1;
+      } else if (val1 > val2) {
+        return 1;
+      } else {
+        return 0;
+      }
+    }
+    objb.sort(compare);
+    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 += '14318527b13840c2a4af63fef52c2d6e';
+    // console.log('strmd5-------->'+strmd5);
+    strmd5 = md5(strmd5);
+    strmd5=strmd5.toUpperCase();
+    return strmd5;
+  },
 
 }
--
libgit2 0.21.4