Merge branch 'master' of http://gitlab.oytour.com/huaguohao/athena

src/components/ActivityCenter/TurnaroundDraw.vue

-<style scoped>
+<style>
 .page_TurnaroundDraw .main_box {
   height: 766px;
   background: #d1f3f2 url(../../assets/img/active/active_bg_s.png) no-repeat 0
@@ -136,23 +136,23 @@
   font-weight: bold;
   color: #E53E48;
 }
-.info_rule{
+.page_TurnaroundDraw .info_rule{
   position: absolute;
   left: 173px;
   bottom: -110px;
 }
-.info_rule p {
+.page_TurnaroundDraw .info_rule p {
   font-size: 14px;
   color: #FFFFFF;
 }
-.info_rule div{
+.page_TurnaroundDraw .info_rule div{
   font-size: 12px;
   color: white;
 }
-.info_rule div p{
+.page_TurnaroundDraw .info_rule div p{
   margin: 3px 0;
 }
-.pointer{
+.page_TurnaroundDraw .pointer{
   cursor: pointer;
 }
 .page_TurnaroundDraw .tips{
@@ -455,6 +455,10 @@ export default {
       return random;
     },
     startmarquee(lh,speed,delay,marqueeObj) {  //lh---每行列表的高度，speed---滚动的速度，delay---间隔多久滚动一次,marqueeObj---需要实现这个效果的id
+        if(this.zhuandong){
+          return
+        }
+        this.zhuandong = true;
         var p=false;
         var t;
         var o=document.getElementById(marqueeObj);

src/components/DependentTravel/PersonalTailor.vue

@@ -28,7 +28,7 @@
   .PersonalTailor .main .info .info_.info_right{
     background-color: #333333;
   }
-  .PersonalTailor .main .info .info_.info_left .info_left_tit{
+  .PersonalTailor .main .info .info_.info_left .info_left_tit, .info_right_tit{
     font-size: 18px;
     color: #000000;
     font-weight:400;
@@ -138,7 +138,23 @@
     left: -20px;
     top: 45%;
   }
-  
+  .info_right .info_right_tit{
+    color: white;
+  }
+  .info_right .info_details{
+    padding: 20px 0;
+    line-height: 36px;
+    color: #B4B4B4;
+    font-size: 12px;
+  }
+  .info_right .info_details p label{
+    width: 100px;
+    text-align: right;
+    display: inline-block;
+  }
+  .info_right .info_details p span.d{
+    color: white;
+  }
 </style>
 <template>
   <div class="PersonalTailor">
@@ -234,7 +250,26 @@
             </el-form>
           </el-col>
           <el-col :span="10" class="info_ info_right">
-            <div class="tri-right"></div>
+            <div class="tri-right">
+              
+            </div>
+            <div>
+              <p class="info_right_tit">填写需求，快速定制行程</p>
+              <div class="info_details">
+                <p><label>出游性质：</label> <span class="d">个人定制</span></p>
+                <p><label>出发地：</label> <span class="d">个人定制</span></p>
+                <p><label>目的地：</label><span class="d">个人定制</span></p>
+                <p><label>预估出行日期：</label><span class="d">个人定制</span></p>
+                <p><label>预估出行人数：</label><span class="d">个人定制</span></p>
+                <p><label>预估人均预算：</label> <span class="d">个人定制</span></p>
+                <p><label>需要提供什么：</label><span class="d">个人定制</span></p>
+                <p><label>其他需求：</label><span class="d">个人定制</span></p>
+                <p><label>姓名：</label><span class="d">个人定制</span></p>
+                <p><label>手机：</label><span class="d">个人定制</span></p>
+                <p><label>邮箱：</label><span class="d">个人定制</span></p>
+                <p><label>微信：</label><span class="d">个人定制</span></p>
+              </div>
+            </div>
           </el-col>
         </el-row>
       </el-col>

src/components/global/head.vue

@@ -48,7 +48,7 @@ color:rgba(51,51,51,1);
             <el-row>
                 <el-col :span="20" :offset="2" v-if='!user.account'>
                     <el-menu default-active=0 class="el-menu-demo small" mode="horizontal" background-color="rgba(0,0,0,0)" >
-                        <el-menu-item index="2" @click="goLoginUrl('login',4)"><a href="javascript:void(0);">注册</a></el-menu-item>
+                        <!-- <el-menu-item index="2" @click="goLoginUrl('login',4)"><a href="javascript:void(0);">注册</a></el-menu-item> -->
                         <el-menu-item index="1" @click="goLoginUrl('login',1)"><a href="javascript:void(0);" >登录</a></el-menu-item>
                         <el-menu-item index="0" disabled>
                             <i class="iconfont icon-defaultPort2"></i>
@@ -91,7 +91,7 @@ color:rgba(51,51,51,1);
                                 <el-menu-item index="0" @click="goUrl('Home',true)"><a href="javascript:void(0);">首页</a></el-menu-item>                                
                                 <el-menu-item index="2-1" @click="handleSelect('2-1',false)"><a href="javascript:void(0);">跟团游</a></el-menu-item>
                                 <el-menu-item index="2-2" @click="handleSelect('2-2',true)"><a href="javascript:void(0);">当地游</a></el-menu-item>
-                                <!-- <el-menu-item index="3" @click="goUrl('TicketHome',true)"><a href="javascript:void(0);">机票</a></el-menu-item> -->
+                                <el-menu-item index="3" @click="goUrl('TicketHome',true)"><a href="javascript:void(0);">机票</a></el-menu-item>
                                 <el-menu-item index="4" @click="goUrl('VisaHomePage',true)"><a href="javascript:void(0);">签证</a></el-menu-item>
                                 <el-menu-item index="5" @click="goUrl('IndependentTravel',true)"><a href="javascript:void(0);">自由行</a></el-menu-item>
 

src/views/login.vue

@@ -280,7 +280,7 @@ export default {
                     };
                     this.loginF(msg);
                 }else{
-                    this.$message.error(res.data.message);
+                    this.$message.error(r.data.message);
                 }
             },err=>{})
         },