no message

杨炀
Showing 3 changed files with 56 additions and 53 deletions
src/viewsPc/center/myReservation.vue
src/viewsPc/saiC/index.vue
vite.config.js
--- a/src/viewsPc/center/myReservation.vue
View file @2727c57
+++ b/src/viewsPc/center/myReservation.vue
View file @2727c57
@@ -8,17 +8,17 @@
        <!--        <el-button class="fr" type="primary" plain @click="toInvoice">{{ language==0?'发票开具':'Invoice' }}</el-button>-->
        <!--        <el-button class="fr" type="primary" plain @click="toInvoice">{{ language==0?'我的发票':'My Invoice' }}</el-button>-->
      </div>
-      <el-empty v-if="list?.length == 0" :image="`/img/order_no.png`" :image-size="228" />
+      <el-empty v-if="list?.length == 0" :image="`/img/order_no.png`" :image-size="228"/>
      <div class="pd20">
        <div v-for="b in list" class="item">
          <div class="title">
            <label v-if="b.orderType == 0" class="blueTag"> {{ language == 0 ? '酒店' : 'HOTEL' }} </label>
            <label v-if="b.orderType == 1" class="purpleTag"> {{ language == 0 ? '车辆' : 'TRANSPORTATION' }} </label>
-            <label v-if="b.orderType == 2" class="orangeTag"> {{ language == 0 ? '餐饮' : 'DINING' }} </label>
+            <label v-if="b.orderType == 2" class="blueTag"> {{ language == 0 ? '餐饮' : 'DINING' }} </label>
-            <label v-if="b.orderType == 3" class="orangeTag"> {{ language == 0 ? '化妆' : 'MakeUp' }} </label>
+            <label v-if="b.orderType == 3" class="purpleTag"> {{ language == 0 ? '化妆' : 'MakeUp' }} </label>
            <label v-if="b.orderType == 4" class="orangeTag"> {{ language == 0 ? '拍摄' : 'Shooting ' }} </label>
-            <label v-if="b.orderType == 5" class="orangeTag"> {{ language == 0 ? '票务' : 'TICKETING ' }} </label>
+            <label v-if="b.orderType == 5" class="greenTag"> {{ language == 0 ? '票务' : 'TICKETING ' }} </label>
            <label v-if="b.orderType == 6" class="orangeTag"> {{ language == 0 ? '旅游' : 'Travel ' }} </label>
            <span>{{ language == 0 ? '订单编号：' : 'No.' }} {{ b.id }}</span>
@@ -28,20 +28,17 @@
            <span v-if="b.status == '0'&&b.surplus!='0,0'&&b.surplus!='0'" class="bg-warning">
              {{ language == 0 ? '待支付' : 'Unpaid' }}
            </span>
-            <span v-if="b.status == '0'&&(b.surplus=='0,0'||b.surplus=='0')" class="bg-warning">{{
+            <span v-if="b.status == '0'&&(b.surplus=='0,0'||b.surplus=='0')"
-              language == 0 ? '已取消' : 'Canceled'
+                  class="bg-warning">{{ language == 0 ? '已取消' : 'Canceled' }}</span>
-            }}</span>
            <span v-if="b.status == '1'" class="bg-blue">{{ language == 0 ? '支付成功' : 'successful' }}</span>
            <span v-if="b.status == '2'" class="bg-warning">{{ language == 0 ? '已取消' : 'Canceled' }}</span>
            <span v-if="b.status == '3'||b.status == '4'" class="bg-danger">{{
-              language == 0 ? '已退订' : 'Refunded'
+                language == 0 ? '已退订' : 'Refunded'
-            }}</span>
+              }}</span>
            <span v-if="b.status == '7'" class="bg-danger">{{
-              language == 0 ? '退款审核中' : 'Refund in review'
+                language == 0 ? '退款审核中' : 'Refund in review'
-            }}</span>
+              }}</span>
-            <span v-if="b.status == '-1'" class="bg-blue">{{
+            <span v-if="b.status == '-1'" class="bg-blue">{{ language == 0 ? '已核销' : 'Completed' }}</span>
-              language == 0 ? '已核销' : 'Completed'
-            }}</span>
          </div>
          <el-row align="middle" class="pd20 mt10" justify="space-between">
@@ -56,7 +53,7 @@
              <div v-if="b.orderType == 1">
                <h3 class="name">{{ b.name }}</h3>
                <div>
-                  <p>{{ b.extJsonObj.pickUpBo.count }} 人</p>
+                  <p>{{ b.extJsonObj.pickUpBo.count }} {{ language == 0 ? '人' : 'people' }}</p>
                  <p>{{ b.extJsonObj.pickUpBo.revTime }}</p>
                </div>
                <!--                <p>{{b.messageObj}}</p>-->
@@ -84,16 +81,18 @@
              <div v-if="b.orderType==5">
                <h3 class="name">{{ b.name }}</h3>
-                <p>
+                <p v-if="b.extJsonObj.ticketDate.name">
-                  <!--                  {{-->
-                  <!--                    dayjs(b.deliveryTime).format('YYYY-MM-DD') + ' ' + b.extJsonObj.timePeriod?.split('-')[0] + '-' + dayjs(b.deliveryTime).format('YYYY-MM-DD') + ' ' + b.extJsonObj.timePeriod?.split('-')[1]-->
-                  <!--                  }}-->
                  {{ b.extJsonObj.ticketDate.name }}
                </p>
+                <p>{{ b.extJsonObj.atName }} ｜ {{ b.extJsonObj.atsName }} ｜ {{ b.extJsonObj.atstName }}</p>
+                <p v-for="p in b.extJsonObj?.orderCustomerList">
+                  <el-tag class="mr10" v-if="p.deskNo">{{p.deskNo}}-{{p.seatNo}}</el-tag>
+                  {{ p.name }} - {{ p.paymentType == '3' ? '€' : '￥' }}{{ b.extJsonObj.price }}
+                </p>
              </div>
              <div v-if="b.orderType == 6">
                <h3 class="name">{{ b.name }}</h3>
-                <p>{{ language==0?'出行时间':'Travel Time' }}：{{ b.extJsonObj.dcStart }}</p>
+                <p>{{ language == 0 ? '出行时间' : 'Travel Time' }}：{{ b.extJsonObj.dcStart }}</p>
                <p v-for="t in b.extJsonObj.touristList">{{ t.gateName }}：{{ t.name }}</p>
              </div>
            </el-col>
@@ -102,8 +101,8 @@
                <p>{{ b.messageObj?.roomName }}</p>
                <p>{{ b.messageObj?.roomInfo }}</p>
              </div>
-              <div v-if="b.orderType == 1" />
+              <div v-if="b.orderType == 1"/>
-              <div v-if="b.orderType == 2" />
+              <div v-if="b.orderType == 2"/>
              <div v-if="b.orderType == 3||b.orderType == 4">
                <p>{{ b.extJsonObj.packageName }}</p>
              </div>
@@ -119,44 +118,44 @@
            <el-col :lg="6" :md="16" :sm="16" :xs="16">
              <div class="text-right mb20 text-danger">
                <el-countdown
-                  v-if="b.status == '0'&&(b.surplus!='0,0'&&b.surplus!='0')"
+                    v-if="b.status == '0'&&(b.surplus!='0,0'&&b.surplus!='0')"
-                  :value="b.countdown"
+                    :value="b.countdown"
-                  format="mm:ss"
+                    format="mm:ss"
-                  value-style="color:#E60012;font-size:16px;"
+                    value-style="color:#E60012;font-size:16px;"
-                  @finish="finish(b)"
+                    @finish="finish(b)"
                />
              </div>
              <div class="text-right">
                <el-button
-                  v-if="(b.orderType == 0||b.orderType == 5)&&b.viewStatus!=0" class="mb10" plain round
+                    v-if="(b.orderType == 0||b.orderType == 5)&&b.viewStatus!=0" class="mb10" plain round
-                  size="small" type="success"
+                    size="small" type="success"
-                  @click="Rebook(b)"
+                    @click="Rebook(b)"
                >
                  {{ language == 0 ? '再次预订' : 'Rebook' }}
                </el-button>
                <el-button
-                  class="mb10" plain round size="small" type="primary"
+                    class="mb10" plain round size="small" type="primary"
-                  @click="goDetail(b)"
+                    @click="goDetail(b)"
                >
                  {{ language == 0 ? '详情' : 'Detail' }}
                </el-button>
                <el-button
-                  v-if="b.status == '0'&&(b.surplus!='0,0'&&b.surplus!='0')" class="mb10"
+                    v-if="b.status == '0'&&(b.surplus!='0,0'&&b.surplus!='0')" class="mb10"
-                  plain round size="small" type="primary" @click="goDetail(b)"
+                    plain round size="small" type="primary" @click="goDetail(b)"
                >
                  {{ language == 0 ? '支付' : 'Pay' }}
                </el-button>
                <el-button
-                  v-if="b.viewStatus==0" class="mb10" plain round size="small"
+                    v-if="b.viewStatus==0" class="mb10" plain round size="small"
-                  type="warning"
+                    type="warning"
-                  @click="cancel(b)"
+                    @click="cancel(b)"
                >
                  {{ language == 0 ? '取消订单' : 'Cancel Order' }}
                </el-button>
                <el-button
-                  v-if="b.viewStatus==5" class="mb10" plain round size="small"
+                    v-if="b.viewStatus==5" class="mb10" plain round size="small"
-                  type="" @click="unsubscribe(b)"
+                    type="" @click="unsubscribe(b)"
                >
                  {{ language == 0 ? '退订' : 'Unsubscribe' }}
                </el-button>
@@ -167,26 +166,26 @@
        </div>
      </div>
    </el-card>
-    <div class="pd20" />
+    <div class="pd20"/>
  </div>
 </template>
 <script setup>
-import { onMounted, getCurrentInstance } from '@vue/runtime-core'
+import {onMounted, getCurrentInstance} from '@vue/runtime-core'
-import { useStorage } from '@vueuse/core/index'
+import {useStorage} from '@vueuse/core/index'
-import { newbilllist } from '@/apiPc/common'
+import {newbilllist} from '@/apiPc/common'
 import useUserStore from '@/store/modules/user'
 import dayjs from 'dayjs'
-import { cancelOrder2, cancelOrder } from '/@/apiPc/booking'
+import {cancelOrder2, cancelOrder} from '/@/apiPc/booking'
-import { ElMessage } from 'element-plus'
+import {ElMessage} from 'element-plus'
 const router = useRouter()
 const language = useStorage('language', 0)
 const list = ref([])
 const user = useUserStore().user
-const { proxy } = getCurrentInstance()
+const {proxy} = getCurrentInstance()
 onMounted(() => {
  getList()
@@ -198,7 +197,7 @@ function finish(bill) {
 }
 function getList() {
-  newbilllist({ createById: user.userId }).then(res => {
+  newbilllist({createById: user.userId}).then(res => {
    list.value = res.rows || []
    for (const b of list.value) {
      b.messageObj = JSON.parse(b.message) || {}
@@ -386,6 +385,10 @@ function toInvoice() {
  }
  .blueTag {
+    background-color: #1e62c8;
+  }
+  .greenTag {
    background-color: #1EC886;
  }
--- a/src/viewsPc/saiC/index.vue
View file @2727c57
+++ b/src/viewsPc/saiC/index.vue
View file @2727c57
@@ -38,7 +38,7 @@
      </el-card>
      <el-card class="mt20 mb20">
        <el-table :data="rank" stripe>
-          <el-table-column align="center" label="名次" type="index" width="100">
+          <el-table-column align="center" :label="language==0?'名次':'Rank'" type="index" width="100">
            <template #default="scope">
              <span v-if="scope.row.mingCi == 1" style="color:#F8A617">{{ scope.row.mingCi }}</span>
              <span v-else-if="scope.row.mingCi == 2" style="color:#778B92">{{ scope.row.mingCi }}</span>
@@ -47,15 +47,15 @@
            </template>
          </el-table-column>
-          <el-table-column label="国家" prop="name">
+          <el-table-column :label="language==0?'国家':'Country'" prop="name">
            <template #default="scope">
              <div>
                <span :class="`flag-icon flag-icon-${scope.row.code}`" />
-                {{ scope.row.countryName }}
+                {{ language==0?scope.row.countryName :scope.row.countryShortName }}
              </div>
            </template>
          </el-table-column>
-          <el-table-column align="center" label="组合">
+          <el-table-column align="center" :label="language==0?'组合':'Couple'" min-width="200">
            <template #default="scope">
              <div class="text-primary esp">{{ scope.row.zuHe }}</div>
            </template>
--- a/vite.config.js
View file @2727c57
+++ b/vite.config.js
View file @2727c57
@@ -81,9 +81,9 @@ export default defineConfig(({ mode, command }) => {
          rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
        },
        '/dev-api': {
-          target: 'http://192.168.1.118:8081/',
+          // target: 'http://192.168.1.118:8081/',
          // target: 'http://192.168.1.243:8081',
-          // target: 'https://jijin.wtwuxicenter.com/stage-api',
+          target: 'https://jijin.wtwuxicenter.com/stage-api',
          // target: 'https://wdsfwuxicenter.com/stage-api/',
          changeOrigin: true,
          rewrite: (p) => p.replace(/^\/dev-api/, '')