修改加密的secretKey

src/App.vue

@@ -59,7 +59,7 @@ export default {
 
 <style>
 @import './assets/global/font.css';
-@import '//at.alicdn.com/t/font_863923_mmwwh61s03g.css';
+@import '//at.alicdn.com/t/font_863923_naoz0fqofi.css';
 @import './assets/global/global.css';
 body,html{
   padding: 0px;

src/assets/css/localtourhome.css

@@ -266,26 +266,29 @@
 
 .AdmissionTicket .hottour_ul li{
     position: relative;
-    height: 76px;
-    margin-top:10px;
+    width:212px;
+    height:159px;
+    margin-top:20px;
 }
 .AdmissionTicket .hottour_ul li img{
-    position: absolute;
-    width: 60px;
-    height: 60px;
-    top: 8px;
-    left: 10px;
+    width: 100%;
+    height: 100%;
 }
 .AdmissionTicket .hottour_ul li .hotcontent{
-    padding-left: 79px;
+    position: absolute;
+    bottom: 0;
     box-sizing: border-box;
-    padding-top:12px;
+    padding:6px;
+    box-sizing: border-box;
+    background:linear-gradient(0deg,rgba(0,0,0,1),rgba(0,0,0,-0.01));    
 }
 .AdmissionTicket .hottour_ul li:hover{
     cursor: pointer;
     box-shadow:0px 1px 4px 0px rgba(94,94,94,0.61);
 }
-
+.AdmissionTicket .hottour_ul li .hotcontent>span{
+    display: inline-block;
+}
 
 .Localtourhome .ticketContent>div{
     float: left;
@@ -647,7 +650,7 @@
 }
 .LocalTourList .sortDiv>div i{
     color:#8F9199;
-    margin-right: -5px;
+    font-size: 14px;
     cursor: pointer;
 }
 .LocalTourList .sortDiv>div .iconfontActive{
@@ -936,6 +939,12 @@
     top: 0;
     margin-top: -20px;
     z-index: 100;
+    width: 1200px;
+    background: #fff;
+}
+.TicketDetails .searchFixed .TicketTab{
+    /* border: none; */
+    border-right: 1px solid rgba(220,220,220,1);
 }
 .TicketDetails .green{
     background: #ddd!important;
@@ -1095,6 +1104,13 @@
     border: 1px solid #dcdfe6;
     display: inline-block;
     padding-left:10px;
+    position: relative;
+}
+.Appointment .formline .calendarSpan .icon-img-rili{
+    position: absolute;
+    right: 13px;
+    color: #4CB960;
+    font-size: 14px;
 }
 .calendarPopover{
     padding:0;

src/components/LocalTour/AdmissionTicket.vue

@@ -51,8 +51,10 @@
             <li @click="GoUrl(item)" v-for="(item,index) in hotList" :key="index+2000">
                 <img :src="item.coverImgs[0]" alt="">
                 <div class="hotcontent">
-                    <span class="textHidden font12">{{item.name}}</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>
+                    <span style="color:#fff;width:125px;" class="textHidden font12">{{item.name}}</span>
+                    <span style="width:75px;color:#FDAC11;text-align:right">
+                        ￥<span class="pfR font18">{{item.b2bPrice | NoDesnum}}</span>起
+                    </span>
                 </div>
             </li>
         </ul>
@@ -157,7 +159,7 @@ export default {
     top: -15px;
 }
 .AdmissionTicket .ticketDiv li .firsrSpan{
-    width:660px;
+    width:680px;
     padding-left:20px;
     color:#2A5532;
 }

src/components/LocalTour/Appointment.vue

@@ -41,7 +41,10 @@
                                 </v-calendar> 
                                 </div>
                                 
-                            <span class="calendarSpan" slot="reference">{{form.useDate}}</span>
+                            <span class="calendarSpan" slot="reference">{{form.useDate}}
+                                <span class="iconfont icon-img-rili"></span>
+                            </span>
+
                             </el-popover>
                         
                     </el-form-item>
@@ -52,16 +55,16 @@
                     <div style="padding:0 20px">
                         <p class="pfR" style="color:#000000;margin:30px 0">取票人/出行人信息</p>
                             <el-form-item class="formline" label="中文姓名" prop="contactCNName">
-                                <el-input size="small" v-model="form.contactCNName"></el-input>
+                                <el-input size="small" v-model="form.contactCNName" placeholder="请输入中文姓名"></el-input>
                             </el-form-item>
                             <el-form-item class="formline" label="英文姓名">
-                                <el-input size="small" v-model="form.contactENName"></el-input>
+                                <el-input size="small" v-model="form.contactENName" placeholder="请输入英文姓名"></el-input>
                             </el-form-item>
                             <el-form-item class="formline" label="手机号" prop="contactMobile">
-                                <el-input size="small" v-model="form.contactMobile"></el-input>
+                                <el-input size="small" v-model="form.contactMobile" placeholder="请输入手机号"></el-input>
                             </el-form-item>
                             <el-form-item class="formline" label="E-mail" prop="contactEmail">
-                                <el-input size="small" v-model="form.contactEmail"></el-input>
+                                <el-input size="small" v-model="form.contactEmail" placeholder="请输入E-mail"></el-input>
                             </el-form-item>
                     </div>
 
@@ -78,7 +81,10 @@
                             <span v-else>不可叠加</span>
 
                         </span>
-                        <p style="margin-top:10px">￥<span>{{item.denomination}}</span></p>
+                        <p style="margin-top:10px">
+                            <span v-if="item.couponsType==1">￥<span>{{item.denomination}}</span></span>
+                            <span v-else>{{item.denomination}}折</span>
+                        </p>
                         <p style="font-size:14px">满{{item.useCondition}}使用</p>
                         <p  style="font-size:12px;color:#4C58A4;margin-top:6px">
                             有效期：{{item.effectDate | YMD}}-{{item.expirationDate | YMD}}

src/components/LocalTour/LocalTourList.vue

@@ -168,17 +168,18 @@
            </li> -->
           </ul>
         </div>
+        
         <!-- 排序条件 -->
         <div class="sortDiv basefix">
             <div>
               销量
-              <i :class="msg.orderBySales==1?'iconfontActive':''" @click="ChangeOrderBySales(1)" class="iconfont icon-jiang1"></i>
-              <i :class="msg.orderBySales==2?'iconfontActive':''" @click="ChangeOrderBySales(2)" class="iconfont icon-jiang"></i>
+              <i :class="msg.orderBySales==1?'iconfontActive':''" @click="ChangeOrderBySales(1)" class="iconfont icon-jiantou"></i>
+              <i :class="msg.orderBySales==2?'iconfontActive':''" @click="ChangeOrderBySales(2)" class="iconfont icon-jiantou-copy"></i>
             </div>
             <div>
               价格
-              <i :class="msg.orderByPrice==1?'iconfontActive':''" @click="ChangeOrderByPrice(1)" class="iconfont icon-jiang1"></i>
-              <i :class="msg.orderByPrice==2?'iconfontActive':''" @click="ChangeOrderByPrice(2)" class="iconfont icon-jiang"></i>
+              <i :class="msg.orderByPrice==1?'iconfontActive':''" @click="ChangeOrderByPrice(1)" class="iconfont icon-jiantou"></i>
+              <i :class="msg.orderByPrice==2?'iconfontActive':''" @click="ChangeOrderByPrice(2)" class="iconfont icon-jiantou-copy"></i>
             </div>
         </div>
 

src/components/LocalTour/TicketDetails.vue

@@ -74,7 +74,7 @@
                           <el-row>
                               <el-col :span="19">   
                                 {{item.ticketName}}
-                                <span class="pfR">({{item.ticketDesc}})</span>
+                                <span v-if="item.ticketDesc" class="pfR">({{item.ticketDesc}})</span>
                                 <!-- <span>(18-64周岁)</span> -->
                                 <!-- <span class="colorG">可订今日</span>
                                 <span class="colorG">可订今日</span> -->
@@ -211,7 +211,7 @@ export default {
   mounted() {
       this.idDes=decodeURIComponent(this.$route.query.idDes);
     this.scrollobj = document.getElementsByClassName("el-scrollbar__wrap")[0];
-    // this.scrollobj.addEventListener("scroll", this.handleScroll);
+    this.scrollobj.addEventListener("scroll", this.handleScroll);
     this.GetDes();
     
   },
@@ -250,6 +250,9 @@ export default {
         this.ImgIndex=0;
       },
       ImgNext(){
+          if(this.next<2){
+              return;
+          }
         this.$refs.Changeimg.style.left="-440px";
         this.ImgIndex=1;
         

src/components/newPersonalCenter/block/model/ScenOrder.vue

@@ -118,7 +118,7 @@ export default {
       getList(){
           this.apiJavaPost('/api/b2b/scenic/getTicketCouponsOrder',this.form,res=>{
         this.loading=false;
-        // console.log("景点门票",res);
+        console.log("景点门票",res);
               this.tableData=res.data.pageData;
               this.totalCount=res.data.count;
       },null)