Merge commit 'ee471d6c' into dev

@@ -62,7 +62,8 @@
             <div class="border-rr mt20 pd20">
             <div class="border-rr mt20 pd20">
               <el-form class="mw500" :model="form" :label-width="language == 0 ?'100':'150'" :rules="rules" ref="formRef">
               <el-form class="mw500" :model="form" :label-width="language == 0 ?'100':'150'" :rules="rules" ref="formRef">
                 <el-form-item :label="language == 0 ?'开票金额':'Amount'">
                 <el-form-item :label="language == 0 ?'开票金额':'Amount'">
-                  <span class="bigprice">{{paymentType==1?'¥':'€'}}{{totalMoney}}</span>
+                  <span  v-if="orderType==5||orderType==6" class="bigprice">{{paymentType!=2?'¥':'€'}}{{totalMoney}}</span>
+                  <span v-else class="bigprice">{{paymentType!=3?'¥':'€'}}{{totalMoney}}</span>
                 </el-form-item>
                 </el-form-item>
 
 
                 <el-form-item :label="language == 0 ?`发票形式`:'Invoice Form'" required prop="invoiceForm">
                 <el-form-item :label="language == 0 ?`发票形式`:'Invoice Form'" required prop="invoiceForm">

@@ -20,7 +20,7 @@
               <div v-if="b.orderType == 0">
               <div v-if="b.orderType == 0">
                 <p>{{b.messageObj.roomInfo}}</p>
                 <p>{{b.messageObj.roomInfo}}</p>
                 <p>{{b.messageObj.roomStayDate}}</p>
                 <p>{{b.messageObj.roomStayDate}}</p>
-                <p class="poPrice">¥{{b.totalStr}}</p>
+                <p class="poPrice">{{ b.paymentType==3?'€' :'¥' }}{{b.totalStr}}</p>
               </div>
               </div>
               <!--              接送订单-->
               <!--              接送订单-->
               <div v-if="b.orderType == 1">
               <div v-if="b.orderType == 1">
@@ -53,7 +53,8 @@
             <div class="border-rr mt20 pd20">
             <div class="border-rr mt20 pd20">
               <el-form class="mw500" :model="form" :label-width="language == 0 ?'100':'150'" :rules="rules" ref="formRef">
               <el-form class="mw500" :model="form" :label-width="language == 0 ?'100':'150'" :rules="rules" ref="formRef">
                 <el-form-item :label="'开票金额'">
                 <el-form-item :label="'开票金额'">
-                  <span class="bigprice">{{paymentType==1?'¥':'€'}}{{totalMoney}}</span>
+                  <span v-if="orderType==5||orderType==6" class="bigprice">{{paymentType!=2?'¥':'€'}}{{totalMoney}}</span>
+                  <span v-else class="bigprice">{{paymentType!=3?'¥':'€'}}{{totalMoney}}</span>
                 </el-form-item>
                 </el-form-item>
 
 
                 <el-form-item :label="`发票形式`" required prop="invoiceForm">
                 <el-form-item :label="`发票形式`" required prop="invoiceForm">
@@ -127,6 +128,7 @@ const {proxy} = getCurrentInstance()
 
 
 const user = useUserStore().user
 const user = useUserStore().user
 const language = useStorage('language', 0)
 const language = useStorage('language', 0)
+const paymentType=ref(1)
 const router = useRouter()
 const router = useRouter()
 const route = useRoute()
 const route = useRoute()
 const list = ref([])
 const list = ref([])
@@ -171,6 +173,7 @@ onMounted(() => {
     form.value.activeId = route.query.activeId
     form.value.activeId = route.query.activeId
   }
   }
   orderType.value=route.query.orderType
   orderType.value=route.query.orderType
+  paymentType.value=route.query.paymentType
   invoiceId = route.query.invoiceId
   invoiceId = route.query.invoiceId
   getList()
   getList()
 
 

@@ -319,7 +319,7 @@ const showDetail = (item) => {
       invoiceId:query.value.orderType==6?item.invoiceIdStr :item.invoiceId,
       invoiceId:query.value.orderType==6?item.invoiceIdStr :item.invoiceId,
       type:activeName.value,
       type:activeName.value,
       orderType:query.value.orderType,
       orderType:query.value.orderType,
-      paymentType:query.value.orderType==6?item.payType:item.paymentType,
+      paymentType:query.value.orderType==6||query.value.orderType==5?item.payType:item.paymentType,
     }
     }
   })
   })
 }
 }