no message

src/components/scenicSpot/Singleticket/OrderPreview.vue

@@ -361,9 +361,16 @@
                   </el-form-item>
                 </li>
                 <li v-if="msg.MailingState==2">
-                  <el-form-item label="地址" prop="MailingAddress">
-                    <el-input style="border-radius: 3px;" v-model="msg.MailingAddress" placeholder="请输入邮寄地址"/>
-                  </el-form-item>
+                  <el-popover trigger="click" placement="MailingAddress">
+                    <el-input type="textarea" v-model="msg.MailingAddress"
+                          :autosize="{ minRows: 3, maxRows: 100}"
+                          placeholder="输入邮寄地址"/>
+                    <div slot="reference" class="name-wrapper">
+                    <el-form-item label="邮寄地址" prop="MailingAddress">
+                        <el-input v-model="msg.MailingAddress" placeholder="输入邮寄地址" readonly/>
+                    </el-form-item>
+                    </div>
+                  </el-popover>
                 </li>
                 <li class="bottom">
                   <el-form-item label="性别" prop="Sex">

src/components/scenicSpot/reservation/OrderList.vue

@@ -564,6 +564,11 @@
               {{ 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) }}

src/components/scenicSpot/reservation/ReservationOrder.vue

@@ -284,9 +284,12 @@ export default {
             addList(data)
             data.forEach((x) => {
               x.Money = 0
+              let Money = 0
               x.DetailList.forEach((y) => {
-                x.Money += y.Money
+                Money+=y.Money
+                y.Money=Number(y.Money+x.MailingMoney)
               })
+              x.Money= Number(Money+x.MailingMoney)
             })
 
             this.OrderList = data;