From 37266a4e977b1ecc5c28bc97efb7d2a4288fd3af Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Thu, 23 Jan 2025 01:35:40 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A3144=20=E3=80=90=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E4=BF=AE=E6=94=B9=E5=BA=97?=
 =?UTF-8?q?=E9=93=BA=E8=B5=84=E6=96=99=E9=A1=B5=E9=9D=A2=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E8=90=A5=E4=B8=9A=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesInn/inn/innProfileEdit.vue | 39 ++++++++++++++++++++++++++++++---
 pkg_join/views/supplier.vue     |  4 ++--
 2 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/pagesInn/inn/innProfileEdit.vue b/pagesInn/inn/innProfileEdit.vue
index 76cdb46..b33539d 100644
--- a/pagesInn/inn/innProfileEdit.vue
+++ b/pagesInn/inn/innProfileEdit.vue
@@ -97,6 +97,24 @@
         </view>
         <text class="iconfont icon-jiantou"></text>
       </view>
+      <view class="item" @click="showTimePicker">
+        <view class="cell acea-row row-between row-middle">
+          <view class="cell-title">营业时间</view>
+          <view class="cell-value">
+            <u--text :text="innApplyInfo.serviceTime + ' - ' + innApplyInfo.serviceEndTime"></u--text>
+            <tpf-time-range
+              startTime="00:00"
+              endTime="23:59"
+              :startDefaultTime="innApplyInfo.serviceTime"
+              :endDefaultTime="innApplyInfo.serviceEndTime"
+              ref="TimePickerPopupRef" 
+              @timeRange="timeRange"
+              >
+            </tpf-time-range>
+          </view>
+        </view>
+        <text class="iconfont icon-jiantou"></text>
+      </view>
       <view class="item is_required">
         <view class="cell acea-row row-between row-middle">
           <view class="cell-title">店主名字</view>
@@ -184,6 +202,7 @@
 </template>
 
 <script>
+import TimePickerPopup from '@/components/timePickerPopup/time-picker-popup.vue';
 import CitySelect from '@/components/CitySelect'
 import tmUpload from '@/components/tm-upload/tm-upload.vue'
 import {
@@ -195,6 +214,7 @@ import {getHotelTypeList, postHotelInfoEdit} from '@/api/inn.js'
 export default {
   components: {
     CitySelect,
+    TimePickerPopup,
     tmUpload
   },
   data() {
@@ -230,7 +250,9 @@ export default {
         'tel': '',
         'qrcode': '',
         'tips': '',
-        'type': ''
+        'type': '',
+        serviceTime: '00:00',
+        serviceEndTime: '23:59'
       },
       loading: false
     }
@@ -243,8 +265,11 @@ export default {
     if (id) {
       // 赋值
       const hotel = JSON.parse(uni.getStorageSync('MY_HOTEL_INFO'))
-      console.log(hotel)
-      this.innHistory = hotel
+      this.innHistory = {
+        ...hotel,
+        serviceTime: '00:00',
+        serviceEndTime: '23:59'
+      }
       this.fillData(this.innApplyInfo, this.innHistory)
       if (hotel.coverType === 2) {
         this.innApplyInfo.coverVideo = hotel.cover
@@ -273,6 +298,14 @@ export default {
     }
   },
   methods: {
+    showTimePicker() {
+      this.$refs.TimePickerPopupRef.open()
+    },
+    timeRange(e) {
+      this.innApplyInfo.serviceTime = e[0]
+      this.innApplyInfo.serviceEndTime = e[1]
+      this.$forceUpdate()
+    },
     typePickerChange: function (e) {
       this.typeIndex = e.target.value
       // 修改type
diff --git a/pkg_join/views/supplier.vue b/pkg_join/views/supplier.vue
index 8f60264..1030908 100644
--- a/pkg_join/views/supplier.vue
+++ b/pkg_join/views/supplier.vue
@@ -434,8 +434,8 @@
             <template #value>
               <u--text :text="form.serviceTime + ' - ' + form.serviceEndTime"></u--text>
               <tpf-time-range
-                :startTime="form.serviceTime"
-                :endTime="form.serviceEndTime"
+                startTime="00:00"
+                endTime="23:59"
                 :startDefaultTime="form.serviceTime"
                 :endDefaultTime="form.serviceEndTime"
                 ref="TimePickerPopupRef"