no message

src/components/ticket/order/TicketOrderList.vue

@@ -61,11 +61,11 @@
               <q-tooltip>{{ props.value }}</q-tooltip>
             </q-td>
           </template>
-          <template v-slot:body-cell-MailingMoney="props">
+          <!-- <template v-slot:body-cell-MailingMoney="props">
             <q-td :props="props">
               <span>{{moneyFormat(x.MailingMoney)}}</span>
             </q-td>
-          </template>
+          </template> -->
           <template v-slot:body-cell-Money="props">
             <q-td :props="props" >
               {{props.row.Money}}
@@ -100,9 +100,16 @@
           <div class="row items-center justify-between q-mb-sm q-pb-sm" style="border-bottom: 1px dashed #ddd">
             <div class="f12 text-grey">{{ $t('hotelorder.orderMoney') }}</div>
             <div class="dark q-ml-xl">
-              <!-- <span class="f12">{{ $t('unit.jpc') }}</span> -->
               <span class="din text-subtitle1">{{ moneyFormat(x.Money) }}</span>
-              <span class="f12">{{ $t('unit.jp') }}</span>
+              <span class="f12">{{ x.CurrencyCode }}</span>
+            </div>
+          </div>
+          <div class="row items-center justify-between q-mb-sm q-pb-sm" style="border-bottom: 1px dashed #ddd"
+            v-if="x.MailingMoney>0">
+            <div class="f12 text-grey">{{ $t('v102.ticket.sjc.c6') }}</div>
+            <div class="dark">
+              <span class="f12">{{ moneyFormat(x.MailingMoney) }}</span>
+              <span class="f12">{{ x.CurrencyCode }}</span>
             </div>
           </div>
           <div class="text-right">
@@ -212,7 +219,6 @@ export default defineComponent({
         { name: 'Date', label: t('v102.ticket.jq')+'('+t('v102.ticket.d')+')', field: (row: any) => row.Date, align: 'left' },
         { name: 'TicketName', label: t('v102.ticket.hn'), field: (row: any) => row.TicketName, align: 'left' },
         { name: 'Num', label: t('v102.ticket.sl'), field: (row: any) => row.Num, align: 'left' },
-        { name: 'MailingMoney', label: t('v102.ticket.sjc.c6'), field: (row: any) => row, align: 'left' },
         { name: 'Money', label: t('hotelorder.col.m'), field: (row: any) => row.Money, align: 'left' }
       ] as any[],
       modifyOrder:{} as any,
@@ -237,7 +243,6 @@ export default defineComponent({
               let Money = 0
               x.DetailList.forEach((y:any)=>{
                 Money+=y.Money
-                y.Money=Number(y.Money+x.MailingMoney)
               })
               x.Money= Number(Money+x.MailingMoney)
             })

src/i18n/ja-RB/index.ts

@@ -846,6 +846,7 @@ export default {
       yj: 'チケットを送ります',
       zqs: '自己取票説明します',
       zqd: '自分で指定の位置に行ってチケットを取ります、あなたが支払いを完了した後に私達はメールを通じてチケットの情報を取ることをお知らせします',
+      zqd1: '住所を持参します',
       sj: 'ゲストメッセージです',
       youji: 'メッセージを送ります',
       unit: '枚',

src/i18n/ko-HG/index.ts

@@ -846,6 +846,7 @@ export default {
       yj: "우편 티켓",
       zqs: "주문서",
       zqd: "직접 지정된 장소로 가서 표를 받으시면 돈을 지불하신 후에 우편으로 표를 받으라는 정보를 알려 드리겠습니다",
+      zqd1: '사용자 주소',
       sj: '고객 메시지',
       youji: '메시지 보내기',
       unit: '장',

src/i18n/zh-TW/index.ts

@@ -846,6 +846,7 @@ export default {
       yj: '郵寄票券',
       zqs: '自行取票說明',
       zqd: '自行前往指定位置取票，當您完成付款後我們將通過郵件通知您取票的門票訊息',
+      zqd1: '自取地址',
       sj: '客人訊息',
       youji: '郵寄訊息',
       unit: '張',

src/pages/ticket/TicketOrderPreview.vue

@@ -83,7 +83,8 @@
             </div>
             <div v-if="msg.MailingState == '1'" class="bg-light-blue-1 q-pa-md fz14 rounded-borders q-mt-md">
               <div class="text-weight-bold">{{ $t('v102.ticket.zqs') }}</div>
-              <div class="text-grey-900 q-mt-sm f12">{{ $t('v102.ticket.zqd') }}</div>
+              <!-- <div class="text-grey-900 q-mt-sm f12">{{ $t('v102.ticket.zqd') }}</div> -->
+              <div class="text-grey-900 q-mt-sm f12">{{ $t('v102.ticket.zqd1') }}：{{SelffetchAddress}}</div>
             </div>
             <div>
               <div class="q-mt-md">
@@ -158,6 +159,10 @@
               <q-badge color="grey-3" style="padding: 5px 8px" text-color="negative" :label="$t('v102.ticket.sjc.c6')" />
               <div class="col f12 text-right">{{msg.MailingMoney}}</div>
             </div>
+            <div class="row items-center q-mt-md" v-if="msg.SelffetchAddress&&msg.MailingMoney==0&&msg.Money>msg.MailingMoney">
+              <q-badge color="grey-3" style="padding: 5px 8px" text-color="negative" label="自取地址" />
+              <div class="col f12 text-right">{{msg.SelffetchAddress}}</div>
+            </div>
           </div>
           <div class="q-pt-md q-mb-lg text-right" style="border-top: 1px dashed #eee">
             <span class="f12 text-dark q-mr-md">
@@ -215,6 +220,7 @@ export default defineComponent({
     const data = reactive({
       showDetails: false,
       loading: false,
+      SelffetchAddress: '',
       msg: {
         OrderId: 0,
         Money: 0.0,
@@ -222,6 +228,7 @@ export default defineComponent({
         MailingState: '1',//邮寄状态 1自取 2邮寄
         MailingAddress: '',//MailingState =2 填写邮寄
         MailingMoney: null as Number,
+        SelffetchAddress: '',//自取地址
         UseDate:'',//门票日期
         Name:'',
         EName:'',
@@ -260,6 +267,8 @@ export default defineComponent({
             .then(r => {
               if (r.data.resultCode == ApiResult.SUCCESS) {
                 data.detailsObj = r.data.data
+                data.msg.SelffetchAddress = data.detailsObj.SelffetchAddress
+                data.SelffetchAddress = data.detailsObj.SelffetchAddress
                 let addList = function (arr) {
                     arr.forEach(item => {
                       item.checked = false
@@ -289,6 +298,7 @@ export default defineComponent({
         guestEName.value.validate()
         guestMobile.value.validate()
           if(data.msg.MailingState=='2'){
+            data.msg.SelffetchAddress = ''
             guestAddress.value.validate()
             flag = !guestName.value.hasError && !guestEName.value.hasError && !guestMobile.value.hasError && !guestAddress.value.hasError
           }else{