Просмотр исходного кода

feat(KIP-11004): Temp parking Frontend|临时停车(南昌)Rollout 联调

john 2 лет назад
Родитель
Сommit
b36f26b3b2

+ 35 - 1
src/common/js/BaseDictionary.js

@@ -104,6 +104,30 @@ const JAKC = {
   },
 }
 
+// 南昌
+const NCHC = {
+  dev: {
+    ...testAppIdInfo,
+    groupId: '8a8484b287c1b7cf01880e982460007a',
+    mallId: '8a84834088f11119018949444636000c',
+    projectId: 'NCHC',
+  },
+  qa: {
+    ...testAppIdInfo,
+    groupId: '8a8484b287c1b7cf01880e982460007a',
+    // mallId: '8a84834088f11119018949444636000c',
+    mallId: '8a8484f488af06890188be39913e000e',
+    projectId: 'NCHC',
+  },
+  prod: {
+    // TODO: 等待对应公众号上线
+    ...testAppIdInfo,
+    groupId: '8a8484b287c1b7cf01880e982460007a',
+    mallId: '8a84834088f11119018949444636000c',
+    projectId: 'NCHC',
+  },
+}
+
 export const lbsDictionary = {
   // 沈阳
   '8aaa87bc7ce98224017ce995fd8a0002': {
@@ -157,7 +181,17 @@ export const lbsDictionary = {
   },
   "8a88835c7cd96d31017cda47d11b0004":{
     ...PKC
-  }
+  },
+  // 南昌
+  "8a8484f488af06890188be39913e000e":{
+    ...NCHC
+  },
+  // "8a8484f488af06890188be39913e000e":{
+  //   ...NCHC
+  // },
+  // "8a8484f488af06890188be39913e000e":{
+  //   ...NCHC
+  // }
 };
 
 // 订单状态枚举数据

+ 1 - 1
src/pages/parkingFee/mixins/parkingFeeList.js

@@ -56,7 +56,7 @@ export default {
     pageNum = 0;
     const member = uni.getStorageSync('member');
     this.loadData();
-    if ( !uni.getStorageSync('loadData') && !member ) {
+    if ( !uni.getStorageSync('loadData') && this.$store.state.isLogin === 'notLoggedIn' ) {
       uni.setStorageSync('loadData','loadData')
       wxToLoginCallback('parkingFeeList',( options ) => {
         this.list = [];

+ 1 - 1
src/pages/parkingFee/mixins/parkingReceipt/parkingReceipt.js

@@ -119,7 +119,7 @@ export default {
     const invoiceindex = Number.parseInt(uni.getStorageSync('invoiceindex') || 1)
     this.$store.dispatch('clearUnlicensed');
     // 如果用户登录时 或者 是浦东和静安访问的话,展示开票内容
-    if (JSON.stringify(this.member) !== '{}' || ['JINGAN', 'PUDONG'].indexOf(this.source) > -1) {
+    if (JSON.stringify(this.member) !== '{}' || ['JINGAN', 'PUDONG'].indexOf(this.source) > -1 || this.$store.state.isLogin === 'haveLoggedIn') {
       this.invoice(invoiceindex);
     } else {
       wxToLoginCallback('parkingReceipt', () => {

+ 1 - 1
src/pages/parkingFee/mixins/vehicleManagement.js

@@ -73,7 +73,7 @@ export default {
     }, 500)
     this.$store.dispatch('clearUnlicensed');
     const member = uni.getStorageSync('member');
-    if (member && JSON.stringify(this.member) !== '{}') {
+    if (member && JSON.stringify(this.member) !== '{}' || this.$store.state.isLogin === 'haveLoggedIn') {
       this.getKipMemberVehicles();
     } else {
       wxToLoginCallback('vehicleManagement', (options) => {

+ 1 - 1
src/store/order/state.js

@@ -36,7 +36,7 @@ export default  {
   // 无牌车逻辑
   unlicensedCar: '',
   // 车场相关
-  parkMallCode: '', // 车场唯一编号 0静安 1浦东 2杭州 3北京 4沈阳 5深圳 6天津 7合集一期 8福州 9合集三期
+  parkMallCode: '', // 车场唯一编号 0静安 1浦东 2杭州 3北京 4沈阳 5深圳 6天津 7合集一期 8福州 9合集三期 10南昌
   /* 纸质优惠券相关 */
   paperCoupons: [], // 可选纸质优惠券数量
   paperCouponCount: 0, // 已选纸质择优惠券

+ 1 - 1
vue.config.js

@@ -124,7 +124,7 @@ module.exports = {
       '/msApi': {
         // target: 'https://dev-kip-service-internal.kerryonvip.com/temporary-parking-service', //代理地址,这里设置的地址会代替axios中设置的baseURL
         // target: 'https://qa-apim.kerryplus.com/c/api/temporary-parking-service', //代理地址,这里设置的地址会代替axios中设置的baseURL
-        target: 'http://172.21.200.122:8080', // 代理地址,这里设置的地址会代替axios中设置的baseURL
+        target: 'http://172.21.200.193:8080', // 代理地址,这里设置的地址会代替axios中设置的baseURL
         changeOrigin: true, // 如果接口跨域,需要进行这个参数配置
         //ws: true, // proxy websockets
         //pathRewrite方法重写url