no message

src/components/WebSet/WebSiteConfig.vue

@@ -127,6 +127,16 @@
 
 </style>
 <template>
+  <div class="dianshangannualRatio" ref="barparent">
+    <div class="query-box" style="border: 0;padding: 0;">
+      <ul class="clearfix">
+        <li class="hight_query">
+            <span style="text-align: right;color: red;">导入Jalan 酒店基础数据，定时器会更新酒店的报价数据</span>
+            <button class="normalBtn" @click="outerVisible=true">导入</button>
+            
+        </li>
+    </ul>
+    </div>
   <!--网站设定(网站设置)-->
   <div class="WebSiteConfig">
     <el-form label-width="130px">
@@ -578,11 +588,25 @@
       </span>
     </el-dialog>
   </div>
+  <el-dialog custom-class='w700' title="导入" :visible.sync="outerVisible" center>
+    <el-upload style="text-align: center;" drag class="upload-demo"
+              :action="importFileUrl2"
+              :on-success="handleAvatarSuccess"
+              :before-upload="beforeAvatarUpload">
+          <i class="el-icon-upload"></i>
+          <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+          <!-- <div slot="tip" class="el-upload__tip">只能上传Excel文件</div> -->
+        </el-upload>
+    
+  </el-dialog>
+  </div>
 </template>
 <script>
   export default {
     data() {
       return {
+        importFileUrl2: "",
+        outerVisible: false,
         editTitle: "選單",
         //弹窗
         isShowDialog: false,
@@ -700,10 +724,39 @@
       };
     },
     mounted() {
+      let userInfo = this.getLocalStorage();
+      console.log(userInfo,'=====')
+      this.importFileUrl2=this.domainManager().UploadFileUrl +
+          "?cmd=dmc_post_LocalFileUpload&Type=16&fileType=1&fileLimit=10&EmployeeId="+userInfo.EmployeeId
+          +'&RB_Group_id='+userInfo.RB_Group_id +'&KingdeeBId=0'
+        ;
       this.getPageTypeList();
       this.getData();
     },
     methods: {
+      //上传
+      handleAvatarSuccess(res, file) {
+            let that = this
+          if (res.resultCode == 1) {
+            this.Success(res.message);
+            this.outerVisible = false;
+            this.getData();
+          }else{
+            that.$confirm(res.message, '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+            }).then(() => {
+                
+            }).catch(() => {
+
+            });
+  
+          }
+        },
+        beforeAvatarUpload(file) {
+          return
+        },
       //下拉选择
       changeMenu(type) {
         if (type == 1) {

src/components/scenicSpot/Singleticket/OrderPreview.vue

@@ -78,6 +78,7 @@
       display: flex;
       flex-direction: row;
       margin-bottom: 15px;
+      border:  0 !important;
     }
     .time-box.center{
       align-items: center;
@@ -429,6 +430,7 @@
           </div>
         </div>
         <div class="right-Money">
+          
           <div>
             <span>订单总金额：</span>
             <b>{{ msg.Money>msg.MailingMoney?msg.Money.toFixed(2):0.0 }} <span class="fz12" v-if="types&&types.length>0">{{types[0].CurrencyName}}</span></b>
@@ -625,7 +627,7 @@
                     });
                 };
                 addList(res.data.data.TicketPriceList);
-                this.types = res.data.data.TicketPriceList
+                this.types = res.data.data.TicketPriceList.filter(x=>{ return x.B2BPrice>0})
                 this.msg.Money = 0.00
                 if(this.types&&this.types.length==0){
                   this.Error('暂无报价，无法下单')