旅行订单详情

杨炀
Showing 4 changed files with 27 additions and 16 deletions
src/viewsPc/booking/component/choosePerson.vue
src/viewsPc/booking/pay.vue
src/viewsPc/booking/travelOrder.vue
src/viewsPc/center/myReservation.vue
--- a/src/viewsPc/booking/component/choosePerson.vue
View file @9f337e6
+++ b/src/viewsPc/booking/component/choosePerson.vue
View file @9f337e6
 <template>
  <el-dialog v-model="show" title="出行人信息" center append-to-body>
+    <el-button type="primary" plain @click="addPeopl">{{ languageFormat(language, "新增", "Add") }}</el-button>
    <el-form>
      <el-form-item prop="message">
        <div class="p_box">
          <div class="people">
            <el-radio-group v-model="personId">
              <div
-                v-for="(it, index) in personList" :key="index" class="prople_item"
+                v-for="(it, index) in personList" :key="index" class="e_item"
              >
-                <el-radio :value="it.id" :disabled="hasPersonIds?.indexOf(it.id)!=-1">
+                <el-radio border :value="it.id" :disabled="hasPersonIds?.indexOf(it.id)!=-1">
                  <div>
                    {{ it.name }}  {{ it.idCard }}
                  </div>
@@ -16,7 +18,6 @@
              </div>
            </el-radio-group>
          </div>
-          <el-button @click="addPeopl">{{ languageFormat(language, "新增", "Add") }}</el-button>
        </div>
      </el-form-item>
    </el-form>
@@ -29,7 +30,7 @@
  </el-dialog>
-  <el-dialog v-model="showAdd" title="新增出现人" center append-to-body>
+  <el-dialog v-model="showAdd" title="新增出行人" center append-to-body>
    <el-form
      ref="formRef" :model="form" label-width="100px" size="large"
      style="margin: 80px"
@@ -154,5 +155,5 @@ defineExpose({
 </script>
 <style scoped lang="scss">
+.e_item{margin: 20px 20px 0 0;}
 </style>
--- a/src/viewsPc/booking/pay.vue
View file @9f337e6
+++ b/src/viewsPc/booking/pay.vue
View file @9f337e6
@@ -793,9 +793,15 @@ function getData() {
  if (type.value == 'ticket') {
    getTicketOrderInfoFN()
  }
+  if (type.value == 'travel') {
+    getTravelOrderInfo()
+  }
  console.log(payType.value)
 }
+//旅游订单详情
+const getTravelOrderInfo = () => {
+}
 // 票务订单详情
 async function getTicketOrderInfoFN() {
  const res = await getTicketOrderInfo({ orderId: orderId.value })
--- a/src/viewsPc/booking/travelOrder.vue
View file @9f337e6
+++ b/src/viewsPc/booking/travelOrder.vue
View file @9f337e6
@@ -16,9 +16,7 @@
                <el-col :span="language == 0?16:24">
                  <h3 class="esp flex">{{ scenicItem?.name }}
-                    <div class="starBox ml20">
+                    <el-tag effect="dark" class="ml20">{{scenicItem?.rank||0}}A</el-tag>
-                      <img v-for="i in Number(scenicItem?.rank||0)" src="@/assets/booking/star.png">
-                    </div>
                  </h3>
                  <div class="info">
                    <el-icon>
@@ -84,7 +82,7 @@
                      <el-icon @click="delPerson(n,j)"><Remove /></el-icon>
                      {{ n.name }}{{ j+1 }}
                    </label>
-                    <div class="mation">
+                    <div class="mation" v-if="p.name">
                      <div>{{ p.name }}</div>
                      身份证：{{ p.idCard }}
                    </div>
@@ -105,13 +103,14 @@
          <el-col :span="10">
            <div class="leftboderTT">{{ language == 0 ? '订单明细' : 'Order details' }}</div>
            <div class="border-rr mt20 pd20 ccitemBox">
-              <label> {{ language == 0 ? '基本费用' : 'Room fee' }}
-              </label>
              <div v-for="(c, index) in gateList" v-show="c.count>0" :key="index" class="ccitem">
+                {{c.name}}
                <span v-if="language==0">{{ c.count }}*{{ '¥' }}{{ c.price }}</span>
                <span v-else>{{ c.count }}*{{ '€' }}{{ c.priceEn }}</span>
              </div>
              <label>{{ language == 0 ? '共计' : 'Total' }}<span
                class="fr bigMoney"
              >{{ language == 0 ? '¥' : '€' }}{{ money }}</span></label>
--- a/src/viewsPc/center/myReservation.vue
View file @9f337e6
+++ b/src/viewsPc/center/myReservation.vue
View file @9f337e6
@@ -19,6 +19,7 @@
            <label v-if="b.orderType == 3" class="orangeTag"> {{ 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 == 6" class="orangeTag"> {{ language == 0 ? '旅游' : 'Travel ' }} </label>
            <span>{{ language == 0 ? '订单编号：' : 'No.' }} {{ b.id }}</span>
          </div>
@@ -54,10 +55,9 @@
              </div>
              <div v-if="b.orderType == 1">
                <h3 class="name">{{ b.name }}</h3>
-                <div v-for="(car,index) in b.messageObj.carsList" :key="index">
+                <div>
-                  <p v-if="car.num>0">{{ car.typeName }}：{{ car.name }}：{{ car.num }} {{
+                  <p>{{b.extJsonObj.pickUpBo.count}} 人</p>
-                      language == 0 ? '辆' : 'Cars'
+                  <p>{{b.extJsonObj.pickUpBo.revTime}}</p>
-                    }}</p>
                </div>
                <!--                <p>{{b.messageObj}}</p>-->
                <!--                <p>{{b.extJsonObj}}</p>-->
@@ -91,6 +91,11 @@
                  {{ b.extJsonObj.ticketDate.name }}
                </p>
              </div>
+              <div v-if="b.orderType == 6">
+                <h3 class="name">{{ b.name }}</h3>
+                <p>出行时间：{{ b.extJsonObj.dcStart }}</p>
+                <p v-for="t in b.extJsonObj.touristList">{{ t.gateName }}：{{t.name}}</p>
+              </div>
            </el-col>
            <el-col :lg="6" :md="12" :sm="12" :xs="24">
              <div v-if="b.orderType == 0">