黄媛媛的

1879717d · qiaoyajun · 8648a440 · 1879717d · 8648a440 · 1879717d
Commit 1879717d authored Jun 06, 2019 by qiaoyajun
12 changed files
--- a/package-lock.json
+++ b/package-lock.json
@@ -5398,8 +5398,7 @@
        "ansi-regex": {
          "version": "2.1.1",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "aproba": {
          "version": "1.2.0",
@@ -5420,14 +5419,12 @@
        "balanced-match": {
          "version": "1.0.0",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "brace-expansion": {
          "version": "1.1.11",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "balanced-match": "^1.0.0",
            "concat-map": "0.0.1"
@@ -5442,20 +5439,17 @@
        "code-point-at": {
          "version": "1.1.0",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "concat-map": {
          "version": "0.0.1",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "console-control-strings": {
          "version": "1.1.0",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "core-util-is": {
          "version": "1.0.2",
@@ -5572,8 +5566,7 @@
        "inherits": {
          "version": "2.0.3",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "ini": {
          "version": "1.3.5",
@@ -5585,7 +5578,6 @@
          "version": "1.0.0",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "number-is-nan": "^1.0.0"
          }
@@ -5600,7 +5592,6 @@
          "version": "3.0.4",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "brace-expansion": "^1.1.7"
          }
@@ -5608,14 +5599,12 @@
        "minimist": {
          "version": "0.0.8",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "minipass": {
          "version": "2.2.4",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "safe-buffer": "^5.1.1",
            "yallist": "^3.0.0"
@@ -5634,7 +5623,6 @@
          "version": "0.5.1",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "minimist": "0.0.8"
          }
@@ -5715,8 +5703,7 @@
        "number-is-nan": {
          "version": "1.0.1",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "object-assign": {
          "version": "4.1.1",
@@ -5728,7 +5715,6 @@
          "version": "1.4.0",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "wrappy": "1"
          }
@@ -5814,8 +5800,7 @@
        "safe-buffer": {
          "version": "5.1.1",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "safer-buffer": {
          "version": "2.1.2",
@@ -5851,7 +5836,6 @@
          "version": "1.0.2",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "code-point-at": "^1.0.0",
            "is-fullwidth-code-point": "^1.0.0",
@@ -5871,7 +5855,6 @@
          "version": "3.0.1",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "ansi-regex": "^2.0.0"
          }
@@ -5915,14 +5898,12 @@
        "wrappy": {
          "version": "1.0.2",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "yallist": {
          "version": "3.0.2",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        }
      }
    },
@@ -11308,6 +11289,14 @@
      "integrity": "sha1-3EJpcTMwLOMBdSQ1amxht7abShg=",
      "dev": true
    },
+    "vue2.0-zoom": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npm.taobao.org/vue2.0-zoom/download/vue2.0-zoom-2.1.1.tgz",
+      "integrity": "sha1-HcA2ljVcb4jZ/nGsgFunXxpnlDY=",
+      "requires": {
+        "vue": "^2.0"
+      }
+    },
    "vuex": {
      "version": "3.0.1",
      "resolved": "http://registry.npm.taobao.org/vuex/download/vuex-3.0.1.tgz",

--- a/package.json
+++ b/package.json
-{
-  "name": "athena",
-  "version": "0.1.0",
-  "private": true,
-  "scripts": {
-    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build"
-  },
-  "dependencies": {
-    "axios": "^0.18.0",
-    "echarts": "^4.2.0-rc.1",
-    "element-ui": "^2.4.5",
-    "html2canvas": "^1.0.0-alpha.12",
-    "js-md5": "^0.7.3",
-    "jspdf": "^1.4.1",
-    "moment": "^2.22.2",
-    "register-service-worker": "^1.0.0",
-    "vue": "^2.5.17",
-    "vue-echarts-v3": "^1.0.19",
-    "vue-lazyload": "^1.2.6",
-    "vue-router": "^3.0.1",
-    "vuex": "^3.0.1"
-  },
-  "devDependencies": {
-    "@vue/cli-plugin-babel": "^3.4.1",
-    "@vue/cli-plugin-pwa": "^3.0.4",
-    "@vue/cli-service": "^3.0.4",
-    "stylus": "^0.54.5",
-    "stylus-loader": "^3.0.2",
-    "vue-cli-plugin-element": "^1.0.0",
-    "vue-template-compiler": "^2.5.17"
-  },
-  "postcss": {
-    "plugins": {
-      "autoprefixer": {}
-    }
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not ie <= 8"
-  ]
-}
--- a/src/components/DependentTravel/CustomizedTourism.vue
+++ b/src/components/DependentTravel/CustomizedTourism.vue
@@ -365,6 +365,7 @@ export default {
      tcid:0,
      configId:0,
      datades:{},
+      isLogin:0,
    }
  },
  components:{
@@ -372,6 +373,7 @@ export default {
  },
  created(){
    this.customId=this.$route.query.customId ? Number(this.$route.query.customId):this.customId;
+    this.isLogin=this.$store.state.isLogin;
  },
  mounted() {
   this.GetStatus();

--- a/src/components/DependentTravel/IndependentList.vue
+++ b/src/components/DependentTravel/IndependentList.vue
@@ -137,7 +137,7 @@
                                <p>出发日期：最早{{item.startDate}}出发</p>
                            </el-col>
                            <el-col :span="4" style="color:#FF680B;font-size:16px;">
-                                ￥<span style="font-weight:700">{{item.b2BPrice | priceFormat}}</span><span style="font-size:12px">起</span>       
+                                ￥<span style="font-weight:700">{{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}</span><span style="font-size:12px">起</span>       
                            </el-col>
                            <el-col :span="3" style="text-align:right">
                                <el-button @click="goUrl('detail',item.id,item.tcid)" size="small" style="border:1px solid #FF6633;color:#FF6633;">立即预定</el-button>
@@ -196,7 +196,7 @@ export default {
            minPrice:'',
            maxPrice:'',
            companyId:parseInt(localStorage.site),
-            priceOrderByField:4,
+            priceOrderByField:0,
        },
        minPrice:'',
        maxPrice:'',
@@ -222,7 +222,8 @@ export default {
            disabledDate(time) {
            return time.getTime() < Date.now() - 8.64e7;
            }
-        }
+        },
+        isLogin:0,
    
    }
  },
@@ -231,6 +232,12 @@ export default {
         this.listmsg.lineId=this.$route.query.lineteamId;
         console.log("this.listmsg.lineId",this.listmsg.lineId)
     }
+     this.isLogin=this.$store.state.isLogin;
+    if(this.isLogin==1){
+      this.listmsg.priceOrderByField=2;
+    }else{
+      this.listmsg.priceOrderByField=4;      
+    }
  },
  mounted() {
    // this.GetVisaCountry();
@@ -390,7 +397,6 @@ export default {
                            item.priceTags=item.priceTags.split(",");
                        }
                    })
-                    console.log(this.datalist)
                    
                }else{
                    this.Error(res.data.message);

--- a/src/components/DependentTravel/IndependentTravel.vue
+++ b/src/components/DependentTravel/IndependentTravel.vue
@@ -110,7 +110,7 @@
                    <div :class="SeasonBtn==0 ? 'Season_moneyActive' :''" class="Season_money">
                      <p style="font-size:12px;padding-top:10px">RMB</p>
                      <p style="font-size:14px;font-weight:600">
-                        {{item.b2BPrice}}
+                        {{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}
                        <span style="font-size:12px;font-weight:10">起</span>
                      </p>
                    </div>
@@ -170,7 +170,7 @@
                <div class="zyx_pay">
                  <span style="color:#FF6633;font-size:12px">
                    <span>￥</span>
-                    <span style="font-size:20px;font-weight:700">{{item.b2BPrice}}</span>
+                    <span style="font-size:20px;font-weight:700">{{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}</span>
                    <span>起</span>
                  </span>
                  <span style="color:#EE4454;margin-left:20px">
@@ -202,7 +202,7 @@
                <div class="zyx_pay">
                  <span style="color:#FF6633;font-size:12px">
                    <span>￥</span>
-                    <span style="font-size:20px;font-weight:700">{{item.b2BPrice}}</span>
+                    <span style="font-size:20px;font-weight:700">{{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}</span>
                    <span>起</span>
                  </span>
                  <span style="color:#EE4454;margin-left:20px">
@@ -246,7 +246,7 @@
                <div class="zyx_pay">
                  <span style="color:#FF6633;font-size:12px">
                    <span>￥</span>
-                    <span style="font-size:20px;font-weight:700">{{item.b2BPrice}}</span>
+                    <span style="font-size:20px;font-weight:700">{{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}</span>
                    <span>起</span>
                  </span>
                  <span style="color:#EE4454;margin-left:20px">
@@ -365,9 +365,11 @@ export default {
       },
       TreatmentList:[],
       HotCrashList:[],
+       isLogin:0,
    };
  },
  created(){
+    this.isLogin=this.$store.state.isLogin;
  },
  mounted() {
    this.getSlideList();

--- a/src/components/Home.vue
+++ b/src/components/Home.vue
@@ -308,7 +308,7 @@
                                    <p style="margin-top:35px" class="cztm_title">{{item.dayNum}}日{{item.nightNum}}晚</p>
                                    <!-- <p><span class="discount">7.2折</span></p> -->
                                    <p style="color:#FF6600">￥<span style="font-size:18px;font-weight:bold">
-                                        {{isLogin!=1 ? (item.b2CPrice | NoDesnum) : item.b2BPrice | NoDesnum}}
+                                        {{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}
                                        </span>起
                                    </p>
                                    <!-- <p><span class="bg">5</span>天<span class="bg">14</span>时<span class="bg">18</span>分</p> -->
@@ -338,7 +338,7 @@
                                    <p style="font-size:12px;padding:6px 0 2px 10px">日期：{{item.flightDate}}</p>
                                    <p style="font-size:12px;padding:2px 0 2px 10px">￥
                                        <span style="color:#FF6600;font-size:16px;font-weight:700">
-                                            {{isLogin!=1 ? (item.b2CPrice | NoDesnum) : item.b2BPrice | NoDesnum}}
+                                            {{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}
                                        </span>起</p>
                                </div>
                            </div>    
@@ -371,7 +371,7 @@
                           </div>
                           <div>
                               <span style="color:#FF6600">￥<span style="font-size:18px;font-weight:bold">
-                                    {{isLogin!=1 ? (item.b2CPrice | NoDesnum) : item.b2BPrice | NoDesnum}}   
+                                    {{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}   
                                </span>起</span>
                               <span style="color:#666666;float:right;margin-top:6px">席位充足</span>
                           </div>
@@ -402,7 +402,7 @@
                               <div class="Remarks">
                                   <p class="text2">{{item.title}}</p>
                                   <p style="text-align:right"><span style="color:#FF6600">￥<span style="font-size:18px;font-weight:bold">
-                                       {{isLogin!=1 ? (item.b2CPrice | NoDesnum) : item.b2BPrice | NoDesnum}}
+                                       {{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}
                                       </span>起</span></p>
                               </div> 
                       </div>
@@ -413,7 +413,7 @@
                               <div class="Remarks">
                                   <p class="text2">{{item.title}}</p>
                                   <p style="text-align:right"><span style="color:#FF6600">￥<span style="font-size:18px;font-weight:bold">
-                                       {{isLogin!=1 ? (item.b2CPrice | NoDesnum) : item.b2BPrice | NoDesnum}}
+                                       {{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}
                                       </span>起</span></p>
                               </div> 
                            </div>
@@ -424,7 +424,7 @@
                               <div class="Remarks">
                                   <p class="text2">{{item.title}}</p>
                                   <p style="text-align:right"><span style="color:#FF6600">￥<span style="font-size:18px;font-weight:bold">
-                                       {{isLogin!=1 ? (item.b2CPrice | NoDesnum) : item.b2BPrice | NoDesnum}}
+                                       {{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}
                                       </span>起</span></p>
                               </div> 
                       </div>
@@ -634,7 +634,7 @@
                           </p>
                           <p>{{item.flightDate}}</p>
                           <p style="color:#FF6600">￥<span style="font-size:18px;font-weight:bold">
-                                {{isLogin!=1 ? (item.b2CPrice | NoDesnum) : item.b2BPrice | NoDesnum}}
+                                {{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}
                               </span>起
                           <span @click="Purchase(item)" class="qg">抢购</span>
                           </p>
@@ -678,7 +678,7 @@
                    </div>
                    <div class="price">
                        <p class="f12" style="color:#fff;">￥<span style="font-size:18px;font-weight:bold;color:#FF6600">
-                             {{isLogin!=1 ? (item.b2CPrice | NoDesnum) : item.b2BPrice | NoDesnum}}
+                             {{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}
                            </span>起</p>
                    </div>
                </div>

--- a/src/components/LocalTour/LocalTourList.vue
+++ b/src/components/LocalTour/LocalTourList.vue
@@ -185,7 +185,7 @@

        <!-- 数据 -->
        <div style="margin-top:14px" v-loading="Loading">
-            <OnedayList :onelist="onelist" v-show="tab==1"></OnedayList>
+            <OnedayList :isLogin="isLogin" :onelist="onelist" v-show="tab==1"></OnedayList>
            <AdmissionTicket :ticketList="ticketList" :hotList="hotList" v-show="tab==2"></AdmissionTicket>
        </div>
        <div style="text-align:right;width:950px;margin-top:15px">
@@ -227,7 +227,7 @@ export default {
        maxPrice:-1,
        companyId:localStorage.site,
        cityId:localStorage.site,
-        priceOrderByField:1,
+        priceOrderByField:0,
        orderByPrice:0,
        orderBySales:0,
        searchKey:"",
@@ -268,6 +268,7 @@ export default {
      ticketList:[],
      hotList:[],
      tempsearchKey:'',
+      isLogin: 0,
    }
  },
  components:{
@@ -275,6 +276,12 @@ export default {
    AdmissionTicket:AdmissionTicket,
  },
  created(){
+    this.isLogin=this.$store.state.isLogin;
+    if(this.isLogin==1){
+      this.msg.priceOrderByField=2;
+    }else{
+      this.msg.priceOrderByField=4;      
+    }
    this.GetLine();  
    if(this.$route.query.tab){
      this.tab= this.$route.query.tab;
@@ -398,6 +405,11 @@ export default {
      }
    },
    GetList(){
+      if(this.isLogin==1){
+      this.msg.priceOrderByField=2;
+      }else{
+        this.msg.priceOrderByField=4;      
+      }
      if(this.minPrice==""){
        this.msg.minPrice=-1;
      }else{
@@ -495,6 +507,7 @@ export default {
          this.GetList();        
      }
      if(this.tab==2){
+        this.msg.priceOrderByField=0;
        this.msg.searchKey=this.tempsearchKey;
        this.GetTicketList();        
      }

--- a/src/components/LocalTour/Localtourhome.vue
+++ b/src/components/LocalTour/Localtourhome.vue
@@ -78,7 +78,7 @@
                      <div @click="goOneDayDetail(item)" v-if="index<2" v-for="(item,index) in abroadList" :key="index+300">
                          <img v-if="index==0" :key="img.url" v-for="(img,index) in item.imgCover" :src='compressImg(img.url, "filt", 245, "")' alt="">
                          <span class="daydes">{{item.title}}</span>
-                          <span class="price">￥<span class="pfR font18">{{item.b2BPrice}}</span>起</span>
+                          <span class="price">￥<span class="pfR font18">{{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}</span>起</span>
                      </div>
                  </div>
                  <div class="dayConDiv2">
@@ -88,7 +88,7 @@
                                   <img v-if="index==0" :key="img.url" v-for="(img,index) in item.imgCover" :src='compressImg(img.url, "filt", 245, "")' alt="">
                                    <span class="country">{{item.lineShortName}}</span>
                                    <p class="price">
-                                        <span>￥<span class="font18 pfR">{{item.b2BPrice}}</span>起</span>
+                                        <span>￥<span class="font18 pfR">{{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}</span>起</span>
                                    </p>
                                    
                              </div>
@@ -109,7 +109,8 @@
                              <img v-if="index==0" :key="img.url" v-for="(img,index) in item.imgCover" :src='compressImg(img.url, "filt", 245, "")' alt="">
                              <div class="hotcontent">
                                  <span class="textHidden font12">{{item.title}}</span>
-                                  <p class="font12" style="color:#FDAC11;text-align:right;padding-top:4px;padding-right:6px">￥<span class="pfR font14">{{item.b2BPrice}}</span>起</p>
+                                  <p class="font12" style="color:#FDAC11;text-align:right;padding-top:4px;padding-right:6px">￥<span class="pfR font14">
+                                      {{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}</span>起</p>
                              </div>
                          </li>
                      </ul>
@@ -360,8 +361,12 @@ export default {
        foodLoad:false,
        dayLoad:false,
        ticketLoad:false,
+        isLogin:0,
    }
  },
+  created(){
+      this.isLogin=this.$store.state.isLogin;
+  },
  mounted() {
    this.getSlideList();
    this.GetLine();

--- a/src/components/LocalTour/OnedayList.vue
+++ b/src/components/LocalTour/OnedayList.vue
@@ -23,7 +23,7 @@
                   </p>
              </div>
              <div class="threeDiv">
-                  <p><span style="color:#FDAC11;font-size:22px">￥{{item.b2BPrice | NoDesnum}}</span>起</p>
+                  <p><span style="color:#FDAC11;font-size:22px">￥{{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}</span>起</p>
                  <p style="margin-top:80px"><span class="ckxq">查看详情</span></p>
              </div>
          </li>
@@ -39,7 +39,9 @@
                <img :src='compressImg(item.imgCover[0].url, "filt", 245, "")' alt="">
                <div class="hotcontent">
                    <span class="textHidden font12">{{item.title}}</span>
-                    <p class="font12" style="color:#FDAC11;text-align:right;padding-top:4px;padding-right:6px">￥<span class="pfR font14">{{item.b2BPrice | NoDesnum}}</span>起</p>
+                    <p class="font12" style="color:#FDAC11;text-align:right;padding-top:4px;padding-right:6px">￥<span class="pfR font14">
+                        {{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}</span>
+                    起</p>
                </div>
            </li>
            <img style="width:228px;height:100px;margin-top:25px" src="../../assets/img/localtour/guangg1.png" alt="">
@@ -48,7 +50,7 @@
 </template>
 <script>
 export default {
-   props:["onelist"],
+   props:["onelist","isLogin"],
  data () {
    return {
      dataList:[],

--- a/src/components/mall/OneDayDetailTwo.vue
+++ b/src/components/mall/OneDayDetailTwo.vue
@@ -868,13 +868,14 @@ export default {
        },
        creatCalendar(list){  // 创建日历 
            let dateList = [];
+            // isLogin!=1 ? (item.b2CPrice | NoDesnum) : item.b2BPrice | NoDesnum
            if(list && list.length>0){
                list.forEach((x,index)=>{
                    if(x.tcState==3){
                        let msg = {
                            dateStr:x.startDate,
                            cDate:x.startDate.replace('-','年').replace('-','月'),
-                            price:x.b2CPrice,
+                            price:this.isLogin!=1 ? x.b2CPrice : x.b2BPrice,
                            b2BMemberPrice:x.b2BMemberPrice,
                            b2BPrice:x.b2BPrice,
                            b2CMemberPrice:x.b2CMemberPrice,

--- a/src/components/mall/search.vue
+++ b/src/components/mall/search.vue
@@ -338,6 +338,12 @@ export default {
                orderBySales:this.orderindex==3?(this.ordertype==0?2:1):0,
                startCityId
            }
+            this.isLogin=this.$store.state.isLogin;
+            if(this.isLogin==1){
+                msg.priceOrderByField=2;
+            }else{
+                msg.priceOrderByField=4;      
+            }
            let cmd='b2b_get_GetB2BTravelPageList'
            this.apipost(cmd,msg,r=>{
                this.teamDatas=r.data.data.pageData

--- a/src/plugins/index.js
+++ b/src/plugins/index.js
@@ -31,7 +31,7 @@ export default {
                    DomainUrl: domainUrl,
                    //常用提交数据URL 
                    PostUrl: domainUrl + "/api/common/post",
-                    javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.106:9000",
+                    javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.215:9000",
                    ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://imgfile.oytour.com" : 'http://192.168.2.214:8130',
                    UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://upload.oytour.com" : "http://192.168.2.214:8120",
                    LocalFileStreamDownLoadUrl: domainUrl + "/api/file/GetFileFromWebApi",