no message

src/components/scenicSpot/Singleticket/OrderPreview.vue

@@ -328,6 +328,7 @@
             <div>
               <el-radio v-model="msg.MailingState" label="1" @change="changePeople">自行取票</el-radio>
               <el-radio v-model="msg.MailingState" label="2" @change="changePeople">邮寄票券</el-radio>
+              <el-radio v-model="msg.MailingState" label="4" @change="changePeople">电子券</el-radio>
             </div>
           </div>
           <div class="flexOne-description" v-if="msg.MailingState==1">
@@ -335,7 +336,7 @@
             <!-- <p>自行前往指定位置取票，當您完成付款後我們將通過郵件通知您取票的門票訊息</p> -->
             <p>自取地址：{{SelffetchAddress}}</p>
           </div>
-          <div class="flexOne-infor-box">
+          <div class="flexOne-infor-box" v-if="msg.MailingState!=4">
             <b> {{msg.MailingState==1?'客人讯息':'邮寄讯息'}}</b>
             <el-form label-width="80px" :model="msg" :rules="rules" ref="msg">
             <div class="infor-list">
@@ -519,18 +520,24 @@
       },
       methods: {
         submit(){
-          this.$refs['msg'].validate((valid) => {
+          if(this.msg.MailingState!=4){
+            this.$refs['msg'].validate((valid) => {
                 if (valid) {
                     this.setFormMsg()
                 } else {
                     return false;
                 }
             });
+          }else{
+            this.setFormMsg()
+          }
         },
         setFormMsg(){
-          if(this.msg.MailingState=='1'){
+          if(this.msg.MailingState!='2'){
             this.msg.MailingAddress = ''
             this.msg.MailingMoney = null
+          }if(this.msg.MailingState!='1'){
+            this.msg.SelffetchAddress = ''
           }
           this.msg.DetailList = []
           this.types.forEach(x=>{

src/components/scenicSpot/reservation/OrderList.vue

@@ -312,6 +312,10 @@
   background: #4dd0e1;
 }
 
+.orderType.activeNo {
+  background: #E95252;
+}
+
 .copy {
   display: inline-block;
   padding: 3px 15px;
@@ -500,9 +504,10 @@
       <div class="row-c justify-sb align-c py">
         <div class="row-c">
           <div>
-            <div class="orderType cf fz12" :class="{ active: item.MailingState == 1 }">
+            <div class="orderType cf fz12" :class="{ active: item.MailingState == 1,activeNo: item.MailingState == 4 }">
               <template v-if="item.MailingState == 1">自行取件</template>
-              <template v-if="item.MailingState > 1">邮寄票券</template>
+              <template v-if="item.MailingState > 1&&item.MailingState < 4">邮寄票券</template>
+              <template v-if="item.MailingState == 4">电子券</template>
             </div>
           </div>
           <div class="c9e fz12">
@@ -602,7 +607,7 @@
       
       <div class="row justify-sb mt mb20">
         <div class="column px15 bjFFF3E0 radius5 flex-g pa relative">
-          <div class="fz12 row justify-sb">
+          <div class="fz12 row justify-sb" v-if="item.MailingState != 4">
             <span>{{ item.MailingState > 1 ? '收货地址：' : '自取地址：' }}</span>
             <div :class="{ 'cF1416C': item.MailingState == 2, 'c02C854': item.MailingState == 3 }">
               <template v-if="item.MailingState == 2">
@@ -618,7 +623,51 @@
               {{ item.MailingAddress }}
             </template>
             <template v-else>
-              {{ item.SelffetchAddress ? item.SelffetchAddress : '等待操作确认后，才能看到自取地址' }}
+              <template v-if="item.MailingAddress==1">
+                {{ item.SelffetchAddress ? item.SelffetchAddress : '等待操作确认后，才能看到自取地址' }}
+              </template>
+              <div class="row pt20" style="margin-right: 10px;" v-if="item.MailingState==4">
+                <div class="column">
+                  <template v-if="item.TicketCodeFile">
+                  <div class="wrap fz12 c9e">
+                    电子券
+                  </div>
+                  <div class="row fz12 see-rec mt">
+                    <div class="text-accent q-mr-md c">
+                      {{ item.TicketCodeFile.split("/").at(-1) }}
+                    </div>
+                    <div class="cursor-pointer ml mr rec cf">
+                      <a
+                        class="cf"
+                        style="text-decoration:none"
+                        :href="item.TicketCodeFile"
+                        >下载</a
+                      >
+                    </div>
+                  </div>
+                  </template>
+                  <template v-if="item.MailingState==4&&pagesTitle!='销售'&&!item.TicketCodeFile">
+                      <div class="fz12 mt c9e">
+                        电子券，需要您于
+                        <span class="cff9800">{{item.UseDate}}</span> 前
+                      </div>
+                      <div class="row fz12 see-rec mt">
+                        <el-upload ref="my-upload" 
+                        :http-request="uploadFileBtn" 
+                        v-loading="loadingDZP"
+                          :multiple="true" 
+                          :show-file-list="false" action="">
+                            <div :class="{'cursor-pointer seeLK c059FF6':!loadingDZP,
+                            'cursor-pointer see c04C8C8':loadingDZP}" 
+                            @click="uploadOrderId=item.OrderId">上传电子券</div>
+                          </el-upload>
+                      </div>
+                  </template>
+                  <template v-if="item.MailingState==4&&pagesTitle=='销售'&&!item.TicketCodeFile">
+                    '等待操作确认后，才能看到电子券地址'
+                  </template>
+                </div>
+              </div>
             </template>
           </div>
         </div>
@@ -978,7 +1027,10 @@ export default {
         { Name: this.$t('OrderList.orderStatus.sun'), ID: '4' },
       ],
       items: null,
-      typeState: ''
+      typeState: '',
+      loadingDZP: false,
+      uploadOrderId: 0,
+      GuestFile: ''
     };
   },
   watch: {
@@ -1052,16 +1104,16 @@ export default {
         this.uploadHandleChange()
       }, 1);
     },
-    // 上传旅客名单
+    // 上传电子券
     uploadHandleChange() {
       if (this.loading) return
       let msg = {
         OrderId: this.uploadOrderId,
-        GuestFileList: [this.GuestFile]
+        TicketCodeFile: this.GuestFile
       }
       this.loading = true
       this.apipost(
-        "dict_post_SetSaleOrderGuestFile", msg,
+        "ticket_post_SetTicketCodeFile", msg,
         res => {
           this.loading = false;
           if (res.data.resultCode == 1) {