merge limo to daylight
This commit is contained in:
@@ -18,19 +18,19 @@
|
||||
<!-- <view class="player-summary"> -->
|
||||
<view class="hz-card-profile mb-[40]" style="margin:9px 9px 6px;">
|
||||
<view class="hz-flex-row">
|
||||
<view style="width:60%">
|
||||
<view class="hz-w-60">
|
||||
<view class="hz-font-color-light hz-font-sm">{{$t("common.playerId")}}</view>
|
||||
<view class="hz-font-bolder hz-font-lg" >{{ safePlayerData.playerId }}</view>
|
||||
<view class="hz-font-bolder hz-font-lg" >{{ playerData.playerId }}</view>
|
||||
</view>
|
||||
<view style="width:40%">
|
||||
<view class="hz-w-40">
|
||||
<view class="hz-font-color-light hz-font-sm">{{$t("common.tier")}}</view>
|
||||
<view class="hz-font-bolder hz-font-lg" >{{ safePlayerData.tierName }}</view>
|
||||
<view class="hz-font-bolder hz-font-lg" >{{ playerData.tierName }}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="hz-flex-row hz-mr-t-30">
|
||||
<view style="width:100%">
|
||||
<view class="hz-w-100">
|
||||
<view class="hz-font-color-light hz-font-sm">{{$t("common.name")}}</view>
|
||||
<view class="hz-font-bolder hz-font-lg" >{{ playerName }}</view>
|
||||
<view class="hz-font-bolder hz-font-lg" >{{playerData.salutation + " " + playerData.name }}</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@@ -197,13 +197,11 @@
|
||||
propertyTabItemStyle() {
|
||||
return {
|
||||
height: '70rpx',
|
||||
padding: '0 24rpx',
|
||||
flexShrink: 0,
|
||||
padding: '0',
|
||||
};
|
||||
},
|
||||
propertyTabActiveStyle() {
|
||||
return {
|
||||
whiteSpace: 'nowrap',
|
||||
color: '#C39A4B',
|
||||
fontFamily: 'Inter-Bold',
|
||||
fontSize: '30rpx',
|
||||
@@ -212,7 +210,6 @@
|
||||
},
|
||||
propertyTabInactiveStyle() {
|
||||
return {
|
||||
whiteSpace: 'nowrap',
|
||||
color: '#111111',
|
||||
fontFamily: 'Inter-Bold',
|
||||
fontSize: '30rpx',
|
||||
@@ -241,7 +238,6 @@
|
||||
this.navBack();
|
||||
},
|
||||
async loadPropertiesRoomTypes() {
|
||||
if (!this.canLoadPlayerCalendar()) return;
|
||||
try {
|
||||
this.calendarReady = false;
|
||||
uni.showLoading({
|
||||
@@ -249,19 +245,14 @@
|
||||
});
|
||||
await this.loadCalendarSetting();
|
||||
const res = await getPropertiesRoomTypes({});
|
||||
if (this.isNoPermissionResponse(res)) {
|
||||
this.showCalendarNoPermission();
|
||||
return;
|
||||
}
|
||||
this.propertyList = Array.isArray(res && res.propertyList) ? res.propertyList : [];
|
||||
if (!this.propertyList.length) throw new Error('No calendar properties configured');
|
||||
this.propertyList = res.propertyList;
|
||||
this.selectedPropertyCode = this.getDefaultPropertyCode();
|
||||
this.selectDefaultOptions();
|
||||
this.buildCalendar();
|
||||
await this.loadQualificationData();
|
||||
this.calendarRenderKey += 1;
|
||||
this.$nextTick(() => {
|
||||
this.calendarReady = !this.calendarNoPermission;
|
||||
this.calendarReady = true;
|
||||
});
|
||||
} catch (e) {
|
||||
uni.$u.toast(e.message || e.errMsg || 'Load property room types failed');
|
||||
@@ -464,12 +455,10 @@
|
||||
}));
|
||||
},
|
||||
refreshCalendar() {
|
||||
if (!this.canLoadPlayerCalendar()) return;
|
||||
this.ensureSelectedOptionsForRefresh(true);
|
||||
this.loadQualificationData();
|
||||
},
|
||||
async loadQualificationData() {
|
||||
if (!this.canLoadPlayerCalendar()) return;
|
||||
const records = [];
|
||||
const dateRange = this.getCalendarDateRange();
|
||||
const requestId = this.startCalendarRequest();
|
||||
@@ -523,20 +512,7 @@
|
||||
});
|
||||
},
|
||||
isNoPermissionResponse(res) {
|
||||
return res && res.success === false && (res.errorCode || res.code) === 'NO_PERMISSION';
|
||||
},
|
||||
canLoadPlayerCalendar() {
|
||||
this.userData = uni.getStorageSync("userData");
|
||||
if (!this.userData || this.userData.canViewCalendar !== true) {
|
||||
this.showCalendarNoPermission();
|
||||
return false;
|
||||
}
|
||||
if (!this.safePlayerData.playerId) {
|
||||
this.calendarReady = false;
|
||||
uni.$u.toast(this.$t("common.dataNotFound"));
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
return res && res.success === false && res.errorCode === 'NO_PERMISSION';
|
||||
},
|
||||
showCalendarNoPermission() {
|
||||
this.qualificationMap = {};
|
||||
|
||||
Reference in New Issue
Block a user