|
@@ -207,7 +207,7 @@
|
|
|
// import authorize from '../../components/authorize/authorize.vue';
|
|
|
import plateNumber from '../../components/plate-number/plateNumber.vue';
|
|
|
import { REG_SOURCE } from '@/constants';
|
|
|
-import { mapGetters } from 'vuex';
|
|
|
+import { mapState } from 'vuex';
|
|
|
import MemberCacheTool from '../../utils/member-cache-tool.js';
|
|
|
import { Decrypt, Encrypt } from '@/utils/crypto.js';
|
|
|
// import ws from '@/utils/websocket';
|
|
@@ -256,14 +256,14 @@ export default {
|
|
|
disabledBtn() {
|
|
|
return this.numArr.findIndex((val) => !val) !== -1;
|
|
|
},
|
|
|
- ...mapGetters([
|
|
|
- 'groupId',
|
|
|
- 'openid',
|
|
|
- 'mallId',
|
|
|
- 'kipUserId',
|
|
|
- 'userInfo',
|
|
|
- 'member',
|
|
|
- ]),
|
|
|
+ ...mapState({
|
|
|
+ groupId: (state) => state.groupId,
|
|
|
+ openid: (state) => state.openid,
|
|
|
+ mallId: (state) => state.mallId,
|
|
|
+ kipUserId: (state) => state.kipUserId,
|
|
|
+ userInfo: (state) => state.userInfo,
|
|
|
+ member: (state) => state.member,
|
|
|
+ }),
|
|
|
/* groupId: (state) => state.groupId,
|
|
|
openid: (state) => state.openid,
|
|
|
mallId: (state) => state.mallId,
|
|
@@ -283,6 +283,7 @@ export default {
|
|
|
title: '临时停车',
|
|
|
});
|
|
|
}, 300);
|
|
|
+ console.log(286, this.openid);
|
|
|
// this.getParkInfo();
|
|
|
if (this.openid) {
|
|
|
// this.openId = this.openid;
|
|
@@ -376,8 +377,10 @@ export default {
|
|
|
});
|
|
|
const openid = uni.getStorageSync('openid') || this.openId;
|
|
|
let params = {
|
|
|
- mallid: '8a84853b7c91ac5b017c961a9b2a030d',
|
|
|
- groupId: '8a84853b7c91ac5b017c962dab55030e',
|
|
|
+ // mallid: '8a84853b7c91ac5b017c961a9b2a030d',
|
|
|
+ // groupId: '8a84853b7c91ac5b017c962dab55030e',
|
|
|
+ mallid: this.mallId,
|
|
|
+ groupId: this.groupId,
|
|
|
openid: openid,
|
|
|
// vipcode: app.globalData.member.vipcode
|
|
|
};
|
|
@@ -511,6 +514,8 @@ export default {
|
|
|
uni.showLoading({
|
|
|
title: '加载中',
|
|
|
});
|
|
|
+ console.log(514, this.userInfo);
|
|
|
+ return;
|
|
|
const params = {
|
|
|
carno,
|
|
|
mallid: this.mallId,
|
|
@@ -543,7 +548,7 @@ export default {
|
|
|
// url: 'http://172.21.90.87:8083/xcrm-api/api/1.0/park/checkCarIsInParkAndCarFee',
|
|
|
data: params,
|
|
|
method: 'POST',
|
|
|
- header: JSON.parse(uni.getStorageSync('handleUser')),
|
|
|
+ header: uni.getStorageSync('handleUser'),
|
|
|
timeout: 10000,
|
|
|
})
|
|
|
.then((res) => {
|