自由行相关

b3e740ea · 华国豪 · eea49b3c · b3e740ea · b3e740ea · b3e740ea
Commit b3e740ea authored Sep 11, 2019 by 华国豪 🙄
8 changed files
--- a/src/components/FreeTravel/FreeDetail.vue
+++ b/src/components/FreeTravel/FreeDetail.vue
@@ -362,9 +362,8 @@ export default {
        },
        YdBtn(){
-            if(this.isLogin==0){
+            if(sessionStorage.getItem('OpenB2BCode')==null && !localStorage.userInfo){
-                this.Error("请先登录");
+                return this.Error('请登录！')
-                return;
            }
            let that=this;
            if(that.msgObj.s_date=="" || !that.msgObj.s_date){
@@ -411,6 +410,9 @@ export default {
                let userInfo = this.getLocalStorage();
                this.msgObj.CustomerId = userInfo.customerId;
            }
+            if (sessionStorage.getItem("OpenB2BCode")) {
+                this.msgObj.CustomerId = 0;
+            }
            sessionStorage.setItem("freeMsg",JSON.stringify(this.msgObj));
            this.$router.push({path:'OrderConfirmation',query:{id:this.id}})
        },

--- a/src/components/FreeTravel/FreeHome.vue
+++ b/src/components/FreeTravel/FreeHome.vue
@@ -949,6 +949,13 @@ export default {
    }
  },
  mounted() {
+    //获取传递参数
+    var url = window.location.href;
+    if (url.indexOf("?") != -1) {
+      let str = url.split("?")[1];
+      let uid = str.split("uid=")[1];
+      sessionStorage.setItem("OpenB2BCode", decodeURIComponent(uid));
+    }
    this.isLogin=this.$store.state.isLogin;
    this.scrollobj=document.getElementsByClassName('el-scrollbar__wrap')[0];
    this.scrollobj.addEventListener('scroll', this.handleScroll);

--- a/src/components/FreeTravel/OrderConfirmation.vue
+++ b/src/components/FreeTravel/OrderConfirmation.vue
@@ -288,7 +288,7 @@
                            </div>
                        </div>
                     </el-form> 
-                      <div class="commomStyle">
+                      <div class="commomStyle" v-if="isShowTime">
                            <div class="titleDiv">
                                <span class="redSpan"></span>
                                <span class="f18 pfR">优惠</span>
@@ -484,9 +484,14 @@ export default {
                weight_unit_s:false,
                weight_unitList:[],
            },
+            isShowTime: true,
        }
    },
    created(){
+        if (sessionStorage.getItem("OpenB2BCode")) {
+            this.isShowTime = false;
+            this.freeMsg.EmployeeIdStr= sessionStorage.getItem('OpenB2BCode');
+        }
        this.freeMsg = JSON.parse(sessionStorage.getItem("freeMsg"));
        let id = this.$route.query.id;
        this.freeMsg.buyer_country="CN";
@@ -515,15 +520,18 @@ export default {
        };
        this.getDetails(id)
        this.GetInfo();
-        let userInfo = this.getLocalStorage();
+        if (this.isShowTime) {
-        this.apipost("app_customer_GetCertificationModel", { CustomerID: userInfo.customerId }, res => {
+            let userInfo = this.getLocalStorage();
-            if (res.data.resultCode == 1) {
+            this.apipost("app_customer_GetCertificationModel", { CustomerID: userInfo.customerId }, res => {
-                this.Verification = res.data.data
+                if (res.data.resultCode == 1) {
-            } else {
+                    this.Verification = res.data.data
-                this.$message.error(res.data.message);
+                } else {
-            }
+                    this.$message.error(res.data.message);
-        },err => {});
+                }
-        this.getUserCanUseCouponList()
+            },err => {});
+            this.getUserCanUseCouponList()
+        }
    },
    mounted() {
@@ -822,6 +830,23 @@ export default {
                if(res.data.data&&res.data.data.orderId) {
                    this.Success("下单成功！")
                    let msg={};
+                    if(sessionStorage.getItem("OpenB2BCode")){
+                        this.$confirm('下单成功，请返回系统进行支付。', '提示', {
+                            confirmButtonText: '确定',
+                            cancelButtonText: '取消',
+                            type: 'warning'
+                        }).then(() => {
+                            // window.open("http://yx.oytour.com:8080/#/freeTravelOrder");
+                            window.open("http://www.test.com:8080/#/freeTravelOrder");
+                            this.$router.push({ 
+                                name: "FreeHome",
+                            });
+                        }).catch(() => {
+                            this.$router.push({ 
+                                name: "FreeHome",
+                            });
+                        });
+                    }
                    let userInfo = this.getLocalStorage();
                    let user = userInfo.customerId;
                    let data=res.data.data;

--- a/src/components/Home.vue
+++ b/src/components/Home.vue
@@ -37,7 +37,7 @@
                            <i class="iconfont icon-Shape"></i>
                            <p>酒店</p>
                        </li>
-                        <li @click="ChangeTab('admticket')" :class="tag=='admticket'?'tag_active':''">
+                        <li @click="ChangeTab('admticket')" :class="tag=='admticket'?'tag_active':''"  v-show="false">
                            <i class="iconfont icon-menpiao1"></i>
                            <p>门票</p>
                        </li>
@@ -239,8 +239,8 @@
                            </el-tabs>
                        </div>
-                        <!-- 门票 -->
+                        <!-- 门票  v-show="tag=='admticket'"--> 
-                        <div style="width:394px" v-show="tag=='admticket'" class="visa">
+                        <div style="width:394px"  class="visa"  v-show="false">
                            <el-form ref="visa_form" :model="visa_form" label-width="90px">
                                <!-- <el-form-item label="关键词搜索" style="margin-bottom:10px">
                                    <el-input size="small" v-model="visa_form.name" placeholder="输入景点名称、城市或主题"></el-input>
@@ -400,7 +400,7 @@
          </el-row>
          <!-- 自由行 -->
-          <div class="travel Grouptour">
+          <div class="travel Grouptour"  v-show="false">
              <div class="tour_left">
                  <p class="pfR">自由行</p>
                  <div class="tour_left_content travel_left" style="height:325px;">
@@ -408,7 +408,6 @@
                      <span v-if="index<7" v-for="(item,index) in freeTravel.placeNames" :key="index">
                          <router-link  :to="{ path: '/IndependentList',query:{'keywords':item} }" target='_blank' >{{item}}</router-link>                          
                      </span>
                  </div>
              </div>
              <div v-loading="freelload" class="tour_right">
@@ -463,7 +462,7 @@
          > 
          </el-row>
          <!-- 景点门票 -->
-          <div class="Ticket_spots">
+          <div class="Ticket_spots" v-show="false">
            <ul class="common_ul_tab">
                <span style="font-weight:700;margin-right:172px">景点门票</span>
                <li @click="ClickTicket(item)" v-for="(item,index) in tciketCountry" :key="index+200" :class="ticketMsg.countryId==item.countryId?'li_active':''">{{item.countryName}}</li>

--- a/src/components/Hotel/HotelSure.vue
+++ b/src/components/Hotel/HotelSure.vue
@@ -546,7 +546,7 @@
                    </div>
                </div>
            </div>
-            <div class="HS_div4">
+            <div class="HS_div4" v-if="isShowTime">
                <div class="HS_bookTitle" style="margin-bottom:20px;box-sizing: border-box;">
                    优惠信息
                </div>
@@ -841,9 +841,15 @@ export default {
        ActivateCode:'',
        price:0,
        Verification:'',
+        isShowTime: true
    };
  },
  mounted() {
+    if (sessionStorage.getItem("OpenB2BCode")) {
+      if (sessionStorage.getItem("OpenB2BCode") == "jqk4n7BSaoI=") {
+        this.isShowTime = false;
+      }
+    }
  },
  created() {
    if(sessionStorage.getItem("HotelSure")){
@@ -1122,7 +1128,9 @@ export default {
                    // childJapanCount+=ChildJapanPrice;
                    this.sureMsg.totalPriceJapanese += parseFloat(AdultJapanCount+childJapanCount);
-                    this.getUserCanUseCouponList();
+                    if (this.isShowTime) {
+                        this.getUserCanUseCouponList();
+                    }
                })
            } else {

--- a/src/components/IntegralMall/block/commodity2.vue
+++ b/src/components/IntegralMall/block/commodity2.vue
@@ -52,7 +52,7 @@
  font-size: 12px;
  display: -webkit-box;
  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 2;
+  -webkit-line-clamp: 1;
  overflow: hidden;
 }
 .commodity2 .commodity2_right .r_item p:nth-child(3){
@@ -85,7 +85,7 @@
              <div class="r_item_img_box">
                <img :src="item.Images.split(',')[0]" alt="">
              </div>
-              <p>{{item.name}}</p>
+              <p>{{item.NAME}}</p>
              <p v-if="item.Price">¥ {{item.Price}}积分</p>
            </div>
          </el-col>

--- a/src/components/global/newHead.vue
+++ b/src/components/global/newHead.vue
@@ -166,13 +166,12 @@
          <el-col :span="10" :offset="1">
            <div class="_search_box _flex_center">
              <!-- <span class="_city">成都</span> -->
              <el-select v-model="select" slot="prepend" size="mini" class="w100" placeholder="请选择">
                <el-option label="旅游" value="1"></el-option>
                <el-option label="定制游" value="4"></el-option>
-                <el-option label="一日游" value="5-1"></el-option>
+                <el-option label="一日游" value="5-1" v-show="false"></el-option>
-                <el-option label="当地门票" value="5-2"></el-option>
+                <el-option label="当地门票" value="5-2" v-show="false"></el-option>
-                <el-option label="当地美食" value="5-3"></el-option>
+                <el-option label="当地美食" value="5-3" v-show="false"></el-option>
                <el-option label="签证" value="6"></el-option>
                <el-option label="机票" value="3"></el-option>
                <el-option label="酒店" value="7"></el-option>
@@ -240,15 +239,15 @@
          </li>
          <!-- 当地游 -->
-          <li class="localLi" :class="{_active: navActive === 3}">
+          <li class="localLi" :class="{_active: navActive === 3}" v-show="false">
            <div @click="handleSelect('/Localtourhome', 3), navActive = 3">
              <span>当地游</span>
              <span class="__splice">|</span>
            </div>
            <div class="localtour">
              <span @click="GoLocalTour('outoneday')">一日游</span>
-              <span @click="GoLocalTour('PlayTicket')">游玩门票</span>
+              <span @click="GoLocalTour('PlayTicket')" >游玩门票</span>
-              <span @click="GoLocalTour('LocalFood')">当地美食</span>
+              <span @click="GoLocalTour('LocalFood')" >当地美食</span>
            </div>
          </li>
          <!-- <li :class="{_active: navActive === 3}">

--- a/src/components/newPersonalCenter/integral/model/commodity.vue
+++ b/src/components/newPersonalCenter/integral/model/commodity.vue
@@ -46,7 +46,7 @@
  padding:0 20px;
  display: -webkit-box;
  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 2;
+  -webkit-line-clamp: 1;
  overflow: hidden;
  font-size:12px;
  color:#333;
@@ -114,7 +114,8 @@
          <img class="com_bigImg" :src="getImgUrl(message[0].Images)" alt>
        </div>
        <p class="_name" :title="message[0].name">{{message[0].name}}</p>
-        <p class="_detais" v-html="message[0].Description"></p>
+        <p>积分: <span style="color: #FF0101;">{{message[0].Price}}</span></p>
+        <!-- <p class="_detais" v-html="message[0].Description"></p> -->
      </div>
    </el-col>
    <el-col :span="14">
@@ -125,7 +126,8 @@
              <img :src="getImgUrl(item.Images)" alt>
            </div>
            <p class="_name" :title="item.name">{{item.name}}</p>
-            <p class="_detais" v-html="item.Description"></p>
+            <p v-if="item.Price">积分: <span style="color: #FF0101;">{{item.Price}}</span></p>
+            <!-- <p class="_detais" v-html="item.Description"></p> -->
          </div>
        </el-col>
      </el-row>
@@ -136,7 +138,8 @@
              <img :src="getImgUrl(item.Images)" alt>
            </div>
            <p class="_name" :title="item.name">{{item.name}}</p>
-            <p class="_detais" v-html="item.Description"></p>
+            <p v-if="item.Price">积分: <span style="color: #FF0101;">{{item.Price}}</span></p>
+            <!-- <p class="_detais" v-html="item.Description"></p> -->
          </div>
        </el-col>
      </el-row>