|
|
@@ -128,7 +128,6 @@
|
|
|
export default {
|
|
|
data() {
|
|
|
return {
|
|
|
- homestayId: this.$store.state.moduleHouse.homestayId,
|
|
|
name: '',
|
|
|
shList: [],
|
|
|
nameList: [],
|
|
|
@@ -179,7 +178,9 @@
|
|
|
let shs = [];
|
|
|
this.shList.forEach(d => shs.push(d.merchantName));
|
|
|
this.nameList = [shs];
|
|
|
- let t = this.shList.find(d => d.merchantId == uni.getStorageSync('homestayId'));
|
|
|
+ let id = uni.getStorageSync('homestayId');
|
|
|
+ if(!uni.getStorageSync('homestayId')) id = uni.getStorageSync('merchantId');
|
|
|
+ let t = this.shList.find(d => d.merchantId == id);
|
|
|
this.name = t ? t.merchantName : ''
|
|
|
} else this.$showToast(res.data.msg);
|
|
|
})
|
|
|
@@ -207,7 +208,7 @@
|
|
|
}
|
|
|
},
|
|
|
getDetails() {
|
|
|
- this.$api.get('/merchant/hotel/home/getHotelHomeInfo/' + this.homestayId).then(res => {
|
|
|
+ this.$api.get('/merchant/hotel/home/getHotelHomeInfo/' + (uni.getStorageSync('homestayId')||0)).then(res => {
|
|
|
if (res.data.code === 0) {
|
|
|
this.item = res.data.data;
|
|
|
} else this.$showToast(res.data.msg);
|
|
|
@@ -215,11 +216,11 @@
|
|
|
},
|
|
|
getList() {
|
|
|
this.$api.get('/merchant/hotel/order/getMerchantOrderPageList', {
|
|
|
- homestayId: uni.getStorageSync('homestayId'),
|
|
|
+ homestayId: (uni.getStorageSync('homestayId')||0),
|
|
|
limit: this.limit,
|
|
|
page: this.page,
|
|
|
orderStatus: '',
|
|
|
- // orderTime:new Date().Format('yyyy-MM-dd')
|
|
|
+ orderTime:new Date().Format('yyyy-MM-dd')
|
|
|
}).then(res => {
|
|
|
if (res.data.code === 0) {
|
|
|
this.list = [...this.list, ...res.data.data.list];
|
