Ver código fonte

Merge pull request #231 from John-Hong/release-2.15.0

fix(SCRM-4406): Incident - 顾客景先生,手机号为18681629095,车牌号码为:辽AUT261近期在手机小程…
Tron 1 ano atrás
pai
commit
3bdd7a7aa5

+ 2 - 2
src/common/js/BaseDictionary.js

@@ -144,8 +144,8 @@ const HJBGL = {
   prod: {
     // TODO: 等待对应公众号上线
     ...testAppIdInfo,
-    groupId: '8a8881dc8754766f0187796cee6b0000',
-    mallId: '8a88835c7cd96d31017cda3662720001',
+    groupId: '8a88835c7cd96d31017cda3662720001',
+    mallId: '8a8881dc8754766f0187796cee6b0000',
     projectId: 'FZJLZX',
   },
 }

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

@@ -84,6 +84,7 @@ export default {
       member: (state) => state.member,
       mobile: (state) => state.mobile,
       source: (state) => state.source,
+      isLogin: (state) => state.isLogin,
     }),
   },
   created() {
@@ -119,7 +120,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 (this.isLogin === 'haveLoggedIn' || ['JINGAN', 'PUDONG'].indexOf(this.source) > -1) {
       this.invoice(invoiceindex);
     } else {
       wxToLoginCallback('parkingReceipt', () => {

+ 3 - 2
src/pages/parkingFee/mixins/vehicleManagement.js

@@ -34,6 +34,7 @@ export default {
       mallid: (state) => state.mallId,
       mobile: (state) => state.mobile,
       kipUserId: (state) => state.kipUserId,
+      isLogin: (state) => state.isLogin,
     }),
     isNoLogin() {
       return JSON.stringify(this.member) === '{}'
@@ -74,8 +75,8 @@ export default {
       });
     }, 500)
     this.$store.dispatch('clearUnlicensed');
-    const member = uni.getStorageSync('member');
-    if (member && JSON.stringify(this.member) !== '{}') {
+    // const member = uni.getStorageSync('member');
+    if (this.isLogin === 'haveLoggedIn') {
       this.getKipMemberVehicles();
     } else {
       wxToLoginCallback('vehicleManagement', (options) => {