预订 bug 修复

@@ -47,8 +47,8 @@
                   <h3 class="name flex">{{ r.carType }}
                     <div class="tagbox">
                       <span class="tag">{{r.carColor}}</span>
-                      <span class="tag" v-show="r.checkOut==1">可送车</span>
-                      <span class="tag" v-show="r.checkIn==1">可接车</span>
+                      <span class="tag" v-show="r.checkOut==1">{{ language==0?'可送车':'drop-off' }}</span>
+                      <span class="tag" v-show="r.checkIn==1">{{ language==0?'可接车':'pick-up' }}</span>
                     </div>
                   </h3>
                   <div class="text-gray mt20">

@@ -3,10 +3,8 @@
     <div class="box">
       <el-card class="mt30" v-loading="loading">
         <el-row v-if="form" class="hotel" align="middle" :gutter="20">
-          <!--          <el-col :span="6">-->
-          <!--            <img class="w100" :src="fillImgUrl(form.photos?.split(',')[0])"/>-->
-          <!--          </el-col>-->
-          <el-col :span="16">
+
+          <el-col :lg="16" :sm="24">
             <h3 class="esp flex">{{ form?.name }}
             </h3>
 
@@ -18,25 +16,18 @@
               {{ form?.addName }}
             </p>
           </el-col>
+          <el-col :lg="8" :sm="24">
+            <el-carousel height="120px">
+              <el-carousel-item v-for="item in form.photos?.split(',')" :key="item">
+                <el-image class="w100 h100" fit="contain" :src="fillImgUrl(item)"/>
+              </el-carousel-item>
+            </el-carousel>
+          </el-col>
         </el-row>
         <el-empty v-else :image="`/img/order_no.png`" :image-size="228" description=""/>
       </el-card>
 
       <div class="mt30">
-        <el-row :gutter="20">
-          <el-col :span="10">
-            <div class="imgbox hotelImg">
-              <el-image :src="fillImgUrl(form?.photos?.split(',')[0])" fit="cover" :preview-src-list="form?.photos?.split(',')"/>
-            </div>
-          </el-col>
-          <el-col :span="14">
-            <el-row class="h100" :gutter="20">
-              <el-col :span="8" v-for="(p,index) in form?.photos?.split(',').slice(1,7)" style="height: calc(50% - 10px)">
-                <div class="imgbox hotelImg"><el-image :src="fillImgUrl(p)" fit="cover" :preview-src-list="form?.photos?.split(',')"/></div>
-              </el-col>
-            </el-row>
-          </el-col>
-        </el-row>
       </div>
 
       <el-card class="mt30 mb60">
@@ -57,8 +48,8 @@
                 <h3 class="name">{{ r.name }}<span class="text-primary">({{ r.categoryName }})</span></h3>
                 <el-row :gutter="10">
                   <el-col :span="24">
-                    <p>{{ language==0?'配送时间':'Delivery time' }}：{{ r.psStart }}~{{ r.psEnd }}</p>
-                    <p>{{ language==0?'配送地址':'Delivery address' }}：{{ r.address }}</p>
+                    <p>{{ language == 0 ? '配送时间' : 'Delivery time' }}：{{ r.psStart }}~{{ r.psEnd }}</p>
+                    <p>{{ language == 0 ? '配送地址' : 'Delivery address' }}：{{ r.address }}</p>
                   </el-col>
                 </el-row>
               </el-col>
@@ -83,9 +74,9 @@
 </template>
 
 <script setup>
-import {useRouter,useRoute} from "vue-router";
+import {useRouter, useRoute} from "vue-router";
 import {ref, onMounted} from "vue";
-import { getMenuById} from "@/apiPc/booking"
+import {getMenuById} from "@/apiPc/booking"
 import {useStorage} from "@vueuse/core/index";
 import useUserStore from "@/store/modules/user";
 import {fillImgUrl} from "@/utils/ruoyi";
@@ -118,7 +109,7 @@ function getData() {
       var arr = []
       m.photosList = []
       arr = m.photos?.split(',')
-      for (var a of arr){
+      for (var a of arr) {
         m.photosList.push(fillImgUrl(a))
       }
       m.num = 0
@@ -135,7 +126,7 @@ function getData() {
 
 function goOrder(n) {
   if (!user) {
-    useUserStore().setReLogin()
+    useUserStore().setVisitor()
     return
   }
   router.push({

@@ -113,6 +113,7 @@ const canOrderNum = ref(0)
 const form = ref({
   num: 1,
   phone: user.phonenumber||'',
+  total:0
 })
 const rzRange = ref([])
 const rzUserArr = ref([])
@@ -126,11 +127,7 @@ onMounted(() => {
   food.value = JSON.parse(decodeURIComponent(route.query.food))
   form.value = food.value
   restaurant.value = JSON.parse(decodeURIComponent(route.query.restaurant))
-  if(language.value == 0){
-    form.value.total = food.value.foodPrice
-  } else {
-    form.value.total = food.value.foodPriceEn
-  }
+  form.value.total = 0
   console.log(food.value,restaurant.value)
   initDays()
   const today = dayjs()

@@ -82,9 +82,8 @@ export default defineConfig(({ mode, command }) => {
           rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
         },
         '/dev-api': {
-          target: 'http://192.168.1.118:8081/',
-          // target: 'https://jijin.wtwuxicenter.com/stage-api',
-          // target: 'https://jijin.wtwuxicenter.com/stage-api',
+          // target: 'http://192.168.1.118:8081/',
+          target: 'https://jijin.wtwuxicenter.com/stage-api',
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, '')
         }