Merge remote-tracking branch 'origin/master' into zzx

src/subPack-film/movie/index.vue

@@ -34,7 +34,7 @@ const { data: hotList, isLastPage, page, reload, error, refresh } = usePaginatio
 })
 
 const { data: filmList, isLastPage: isLastPage1, page: page1, reload: reload1, error: error1, refresh: refresh1 } = usePagination(() =>
-  Apis.film.getFilmList({ data: { movieId: '2062', lat: Location.value.latitude, lng: Location.value.longitude } }), {
+  Apis.film.getFilmList({ data: { movieId: '', lat: Location.value.latitude, lng: Location.value.longitude } }), {
   data: resp => resp.data,
   initialData: [],
   initialPage: 1,

src/subPack-film/order-detail/index.vue

@@ -47,7 +47,7 @@ async function getData(orderNo: string) {
   }
 }
 function call() {
-  if (!orderInfo.value.phone) {
+  if (!orderInfo.value.cinemaPhone) {
     uni.showToast({
       title: '暂无联系电话',
       icon: 'none',
@@ -55,7 +55,7 @@ function call() {
     return
   }
   uni.makePhoneCall({
-    phoneNumber: orderInfo.value.phone,
+    phoneNumber: orderInfo.value.cinemaPhone,
   })
 }
 

src/subPack-film/select-time/index.vue

@@ -101,10 +101,10 @@ onLoad((options) => {
   console.log('dadas', options)
   title.value = options?.title
   uni.setNavigationBarTitle({ title: options?.title })
-  query.value.movieId = options?.movieId
   query.value.cinemaId = options?.cinemaId
   currentTime.value = options?.time || timeFormat(new Date().getTime(), 'yyyy-MM-dd')
   getData().then(() => {
+    query.value.movieId = options?.movieId || filmInfo.value.movieShows?.[0].movieId
     getDate(options?.movieId || filmInfo.value.movieShows?.[0].movieId)
   })
 })