no message

src/components/scenicSpot/Singleticket/OrderPreview.vue

@@ -331,7 +331,8 @@
           </div>
           <div class="flexOne-description">
             <b>自行取票说明</b>
-            <p>自行前往指定位置取票，當您完成付款後我們將通過郵件通知您取票的門票訊息</p>
+            <!-- <p>自行前往指定位置取票，當您完成付款後我們將通過郵件通知您取票的門票訊息</p> -->
+            <p>自取地址：{{SelffetchAddress}}</p>
           </div>
           <div class="flexOne-infor-box">
             <b> {{msg.MailingState==1?'客人讯息':'邮寄讯息'}}</b>
@@ -425,14 +426,6 @@
                 {{msg.MailingMoney}}
               </div>
             </div>
-            <div class="right-list" v-if="msg.SelffetchAddress&&msg.MailingMoney==0&&msg.Money>msg.MailingMoney">
-              <div>
-                <el-tag size="mini" type="warning">自取地址</el-tag>
-              </div>
-              <div class="right-list-right">
-                {{msg.SelffetchAddress}}
-              </div>
-            </div>
           </div>
         </div>
         <div class="right-Money">
@@ -442,12 +435,12 @@
           </div>
         </div>
         <div class="right-Submit">
-          <button v-if="!isCheck" class="hollowFixedBtn" type="primary">
+          <button class="hollowFixedBtn" type="primary" :disabled="!isCheck&&!loading">
             提交订单
           </button>
-          <button v-else class="normalBtn"  type="primary" @click="submit">
+          <!-- <button v-else class="normalBtn"  type="primary" @click="submit">
             提交订单
-          </button>
+          </button> -->
         </div>
       </div>
    <!-- 门票详情信息 -->
@@ -465,6 +458,7 @@
           isCheck:true,
           showDetails: false,
           loading: false,
+          SelffetchAddress: '',
           msg: {
             OrderId: 0,
             Money: 0.0,
@@ -548,6 +542,7 @@
               this.msg.DetailList.push(y)
             }
           })
+            this.loading = true
             this.apipost("ticket_post_SetSaleTicketOrder", this.msg,
                 res => {
                     this.loading = false;
@@ -622,6 +617,7 @@
               if (res.data.resultCode == 1) {
                 this.detailsObj = res.data.data;
                 this.msg.SelffetchAddress = this.detailsObj.SelffetchAddress
+                this.SelffetchAddress = this.detailsObj.SelffetchAddress
                 let addList = function (arr) {
                     arr.forEach(item => {
                       item.checked = false

src/components/scenicSpot/reservation/OrderList.vue

@@ -564,11 +564,6 @@
               {{ scope.row.Num }}
             </template>
           </el-table-column>
-          <el-table-column label="邮寄费" style="background:#EAEAEA" v-if="item.MailingMoney>0">
-            <template slot-scope="scope">
-              {{ item.MailingMoney>0?item.MailingMoney:'' }}
-            </template>
-          </el-table-column>
           <el-table-column label="小计" min-width="70" style="background:#EAEAEA">
             <template slot-scope="scope">
               {{ scope.row.Money.toFixed(2) }}
@@ -677,13 +672,23 @@
           </el-tooltip>
         </div>
         <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20">
-          <div class="row-c justify-sb pb5">
+          <div class="row-c justify-sb pb5" :class="{'borderD':item.MailingMoney>0}">
             <span class="fz12 c9e">订单总金额</span>
             <div class="ml">
               <span class="fz15 fbold">{{ item.Money.toFixed(2) }}</span>
               <span class="fz12 ml">{{ item.CurrencyName }}</span>
             </div>
           </div>
+          <div
+            class="row-c justify-sb py5"
+            v-if="item.MailingMoney>0"
+          >
+            <span class="fz12 c9e">邮寄费</span>
+            <div class="ml">
+              <span class="fz14">{{ item.MailingMoney.toFixed(2) }}</span>
+              <span class="fz12 ml">{{ item.CurrencyName }}</span>
+            </div>
+          </div>
         </div>
         <div v-if="item.OrderStatus > 0 && item.OrderStatus < 4 && item.OrderStatus != 3"
           class="column justify-c px15 bgE8F5E9 radius5 ml fz12 orderop pa20 flex-s">

src/components/scenicSpot/reservation/ReservationOrder.vue

@@ -287,7 +287,6 @@ export default {
               let Money = 0
               x.DetailList.forEach((y) => {
                 Money+=y.Money
-                y.Money=Number(y.Money+x.MailingMoney)
               })
               x.Money= Number(Money+x.MailingMoney)
             })