diff --git a/src/components/filter/header.vue b/src/components/filter/header.vue index 36577ba..ccca424 100644 --- a/src/components/filter/header.vue +++ b/src/components/filter/header.vue @@ -52,9 +52,10 @@ export default { } }, methods: { - initStadiumSelect(brand_id){ + initStadiumSelect({ brand_id, stadium_id }){ this.isStadium = !!brand_id; - return this.$refs.stadiumSelect.getStadiumList(brand_id); + if(!brand_id) return; + return this.$refs.stadiumSelect.initStadiums({ brand_id, stadium_id }); }, showPeriodModal(e){ this.$refs.periodModal.show(e); diff --git a/src/components/filter/stadium_select.vue b/src/components/filter/stadium_select.vue index 3683099..8bd3de2 100644 --- a/src/components/filter/stadium_select.vue +++ b/src/components/filter/stadium_select.vue @@ -35,6 +35,13 @@ export default { this.curStadium = stadiumList[value]; this.$emit('change:stadium', this.curStadium); }, + async initStadiums({ brand_id, stadium_id }){ + if(!brand_id) return; + let _ls = await this.getStadiumList(brand_id); + console.log('initStadiums:', _ls); + let _curStadium = _ls.find(e=>e.id === stadium_id); + if(_curStadium)this.curStadium = _curStadium; + }, // 获取品牌店铺列表 getStadiumList(brand_id){ return servers.get({ diff --git a/src/subpackage/device/pages/switch_manage/switch_manage.vue b/src/subpackage/device/pages/switch_manage/switch_manage.vue index 40b734c..a6a116e 100644 --- a/src/subpackage/device/pages/switch_manage/switch_manage.vue +++ b/src/subpackage/device/pages/switch_manage/switch_manage.vue @@ -147,8 +147,10 @@ export default { methods: { // 水阀使用记录 toWaterRecord(){ - let { curStoreInfo } = this; - routeTo(`/subpackage/shower/pages/device/use_record?brand_id=${curStoreInfo?.brand_id || ''}`, 'nT') + let { curStoreInfo, pageInfo } = this; + console.log(curStoreInfo) + let _qryStr = `brand_id=${curStoreInfo?.brand_id || ''}&stadium_id=${curStoreInfo?.id || ''}`; + routeTo(`/subpackage/shower/pages/device/use_record?${_qryStr}`, 'nT') }, isDetailBtn(e){ if(e&&e.toString() === "[object Object]"){ diff --git a/src/subpackage/order/pages/order_manage/order_manage.vue b/src/subpackage/order/pages/order_manage/order_manage.vue index ce9449b..2e83782 100644 --- a/src/subpackage/order/pages/order_manage/order_manage.vue +++ b/src/subpackage/order/pages/order_manage/order_manage.vue @@ -33,6 +33,11 @@ export default { tabClick(ele){ let { brandInfo } = this; if(!this.isFinish(ele.key))return util.showNone('待开放中!'); + // 20240910 浴室订单独立 md0726 + if([16].includes(ele.key)){ + let _qryStr = `brand_id=${brandInfo?.brand?.id || ''}`; + return util.routeTo(`/subpackage/shower/pages/device/use_record?${_qryStr}`, 'nT'); + } // 20240813 计时订单入口拆分 tid1553 if([22, 23].includes(ele.key)){ let _qryStr = `order_type=${ele.orderType}&brand_id=${brandInfo?.brand?.id || ''}`; diff --git a/src/subpackage/shower/pages/card/detail.vue b/src/subpackage/shower/pages/card/detail.vue index cdebb55..1548a21 100644 --- a/src/subpackage/shower/pages/card/detail.vue +++ b/src/subpackage/shower/pages/card/detail.vue @@ -223,7 +223,7 @@ export default { &::after{ content: ''; display: block; - padding-top: 26upx; + margin-top: 26upx; height: 1px; background: #D8D8D8; } diff --git a/src/subpackage/shower/pages/device/use_record.vue b/src/subpackage/shower/pages/device/use_record.vue index 23c9d83..ab190e1 100644 --- a/src/subpackage/shower/pages/device/use_record.vue +++ b/src/subpackage/shower/pages/device/use_record.vue @@ -95,11 +95,14 @@ export default { }) }, async onLoad(options){ - this.$refs.orderFilter.initStadiumSelect(options?.brand_id); + this.$refs.orderFilter.initStadiumSelect({ + brand_id: options?.brand_id || '', + stadium_id: options?.stadium_id || '' + }); this.brand_id = options?.brand_id || ''; + this.condition.stadium_id = options?.stadium_id || ''; // this.getOrderList({ brand_id: options?.brand_id }); this.initDate(); - console.log(this.condition) }, methods: { endTimekeeping(e){