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

src/assets/global/foot.css

 .foot-box{
     background: #333;
-    padding: 10px 0;
+    padding: 15px 0;
     color: #D0D0D0;
     font-size: 12px;
+    padding-top:25px;
 }
 .foot-box p{
     margin: 0;
     text-align: center;
-    line-height: 30px;
+    /* line-height: 30px; */
 }
\ No newline at end of file

src/components/DependentTravel/CustomizedTourism.vue

@@ -423,7 +423,6 @@ export default {
                             }
                         })
                     });
-                    console.log("this.datades",this.datades)
                     }else{}
                 },err=>{})
     },
@@ -448,8 +447,6 @@ export default {
       this.loading=true;
       this.apiJavaPost('/api/b2b/free/getTravelCustomOrderInfo',{customId: this.customId},res=>{
         this.loading=false;
-        // console.log("GetStatus父组件");
-        console.log(res);
           if(res.data.resultCode==1){
               this.dataInfo=res.data.data;
               this.tcid=this.dataInfo.tcid;

src/components/DependentTravel/DesignScheme.vue

@@ -329,7 +329,6 @@ export default {
                             }
                         })
                     });
-                    console.log("this.datades",this.datades);
                     }else{}
                 },err=>{})
       },

src/components/DependentTravel/IndependentList.vue

@@ -230,7 +230,6 @@ export default {
   created(){
      if(this.$route.query.lineteamId){
          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){
@@ -343,7 +342,6 @@ export default {
                 this.MonthDateList.push(obj)
            })
         
-    //   console.log("MonthDateList",this.MonthDateList)
       },
     //   选择天数
     SelectDay(id){
@@ -360,7 +358,6 @@ export default {
             if(this.companyId!=-1){
                 this.apipost('b2b_get_GetFreeSearchItem',{'companyId':this.companyId},r=>{
                     this.linesList=r.data.data.lineTeam;
-                    console.log("this.linesList",this.linesList)
                     this.startCityList=r.data.data.startCity;
                     this.tripDayList=r.data.data.tripDay;
                 },null)
@@ -385,7 +382,6 @@ export default {
             }
           this.loading=true;
            this.apipost('b2b_get_GetB2BFreePageList',this.listmsg,res=>{
-            //    console.log("res",res);
             this.loading=false;
                 if(res.data.resultCode==1){
                     this.datalist=res.data.data.pageData;

src/components/DependentTravel/IndependentTravel.vue

@@ -398,7 +398,6 @@ export default {
       this.apipost('b2b_get_GetB2BFreeRecommendPageList',
           this.commonmsg2,
           res => {
-            console.log("HotCrash",res);
             if (res.data.resultCode == 1) {
               this.HotCrashList=res.data.data.pageData;
               this.HotCrashList.forEach(item=>{

src/components/Home.vue

@@ -173,7 +173,7 @@
                                             <span @click="SearchTicket" class="form_btn">立即搜索</span>
                                         </div>
                                 </el-tab-pane>
-                                <el-tab-pane label="国内机票" name="second">国内机票</el-tab-pane>
+                                <!-- <el-tab-pane label="国内机票" name="second">国内机票</el-tab-pane> -->
                             </el-tabs>
                         </div>
                         <!-- 酒店 -->
@@ -686,7 +686,7 @@
             </div> 
               
           </div>
-            <el-row class="home_footer">
+        <!-- <el-row class="home_footer">
             <el-col :span="6">
                 <div class="float"><i class="iconfont icon-icon-test6"></i></div>
                 <div class="float" style="width:198px">
@@ -723,7 +723,6 @@
                 <div class="float">
                     <p class="color_33">定制旅游</p>
                     <div>
-                        <!-- <p @click="FootgoUrl('PersonalTailor')">选择定制师</p> -->
                         <p @click="FootgoUrl('PersonalTailor')">定制我的行程</p>
 
                     </div>
@@ -747,7 +746,7 @@
                 <p style="color:#666666;font-size:14px;">微信扫描小程序</p>
                 <div style="width:118px;height:118px;border:1px dashed #eeeeee;display: inline-block;margin-top:5px"><img src="../assets/img/xiaocx.png" alt=""></div>
             </el-col>
-        </el-row>
+        </el-row> -->
           
       </div>
          <!-- <div class="phone">
@@ -885,9 +884,6 @@ export default {
   },
   methods: {
       goLocalDes(idDes,obj){
-        //   console.log(idDes);
-        //   console.log(obj);
-        //   return;
         let path = 'detailTwo'
         path=`${path}/${encodeURIComponent(idDes)}/${obj.tcid}`;
         this.$router.push({ path })

src/components/IntegralMall/IntegralMall.vue

@@ -37,7 +37,7 @@
         </el-row>
         <commodity v-bind:message="item.list"/>
       </div>
-      <div class="_block">
+      <!-- <div class="_block">
         <el-row class="tit">
           <div>
             <img src="../../assets/img/ps/jifenhot.png" alt="">
@@ -45,7 +45,7 @@
           </div>
         </el-row>
         <recommend/>
-      </div>
+      </div> -->
       <div class="_block" v-for="item in ClassifyGoodsList">
         <el-row class="tit">
           <div>

src/components/IntegralMall/OrderdetailsCompleted.vue

@@ -98,6 +98,9 @@
         border:1px solid #ECECEC;
         display: inline-block;
    }
+  .OrderdetailCompleted .po_left img{
+      width:100%;
+  }
    .OrderdetailCompleted .po_right{
        color: #666666;
        font-size: 14px;
@@ -137,6 +140,10 @@
     text-decoration: underline;
     cursor: pointer;
   }
+  .OrderDetails_Status{
+    text-align: center;
+    font-size:18px;
+  }
  </style>
 
 <template>
@@ -154,7 +161,7 @@
             <div class="Order_Top_left">
                 <div class="Order_Complate">
                     <img src="../../assets/img/ticket/icons8-tick-box-96.png" alt=""/>
-                    <span>完成</span>
+                    <span>支付成功</span>
                 </div>
                 <div class="Order_jifen">
                   支付积分：￥{{dataList.goodsPrice*dataList.buyNum}}
@@ -162,30 +169,33 @@
             </div>
             <div class="Order_Top_right">
                 <div class="Submit_Orders">
-                    <i class="iconfont icon-order_icon"/>
-                      提交订单
+                    <i class="iconfont icon-order_icon" v-if="dataList.orderStatus==1"/>
+                    <i class="iconfont icon-order_icon" v-else style="color:gray"/>
+                      待处理
                 </div>
                 <div class="SubmitComLine">
                   <img src="../../assets/img/orderLins.png" alt=""/>
                 </div>
                 <div class="Submit_Orders">
-                    <i class="iconfont icon-xunhuan"/>
-                      确认兑换
+                    <i class="iconfont icon-xunhuan" v-if="dataList.orderStatus==2"/>
+                    <i class="iconfont icon-xunhuan" v-else style="color:gray"/>
+                      待配送
                 </div>
                 <div class="SubmitComLine">
                   <img src="../../assets/img/orderLins.png" alt=""/>
                 </div>
                 <div class="Submit_Orders">
-                    <i class="iconfont icon-gerenzhongxindingdandaishouhuo"></i>
-                      等待收货
+                    <i class="iconfont icon-gerenzhongxindingdandaishouhuo" v-if="dataList.orderStatus==3"></i>
+                    <i class="iconfont icon-gerenzhongxindingdandaishouhuo" v-else style="color:gray"></i>
+                      配送中
                 </div>
                 <div class="SubmitComLine">
                   <img src="../../assets/img/orderLins.png" alt=""/>
                 </div>
                 <div class="Submit_Orders">
-                    <div v-if="dataList.orderStatus==3"><img src="../../assets/img/ticket/icons8-tick-box-96.png" alt=""/></div>
+                    <div v-if="dataList.orderStatus==4"><img src="../../assets/img/ticket/icons8-tick-box-96.png" alt=""/></div>
                     <div v-else><img src="../../assets/img/ticket/huigou.png" alt=""/></div>
-                      订单完成
+                      交易成功
                 </div>
             </div>
         </div>
@@ -220,10 +230,11 @@
                           </div>
                       </div>
                   </div> -->
-                  <div>
-                      <span v-if="dataList.orderStatus==1">待发货</span>
-                      <span v-if="dataList.orderStatus==2">待收货</span>
-                      <span v-if="dataList.orderStatus==3">交易成功</span>
+                  <div class="OrderDetails_Status">
+                      <span v-if="dataList.orderStatus==1">待处理</span>
+                      <span v-if="dataList.orderStatus==2">待配送</span>
+                      <span v-if="dataList.orderStatus==3">配送中</span>
+                      <span v-if="dataList.orderStatus==4">交易成功</span>
                   </div>
                 </td>
                 <td width="132px" style="text-align:center;">
@@ -281,6 +292,7 @@ export default {
        this.apiJavaPost('/api/orderForm/getOrderDetail',msg,res=>{
           if(res.data.resultCode==1){
               this.dataList = res.data.data;
+              console.log(this.dataList,'dataListsssss');
           }else{
               this.Error(res.data.message);
           }

src/components/IntegralMall/block/detailsLeftHot.vue

@@ -36,11 +36,14 @@
 .list_item p._num{
   color: #999999;
 }
+.detailsLeftHot li{
+  cursor: pointer;
+}
 </style>
 <template>
   <div class="detailsLeftHot">
     <el-row>
-      <el-col :span="12" class="d_tit">
+      <!-- <el-col :span="12" class="d_tit">
         <div :class="{'_ative': tabActive === 1}" @click="tabActive = 1">
           同类热卖
         </div>
@@ -49,15 +52,30 @@
         <div :class="{'_ative': tabActive === 2}" @click="tabActive = 2">
           商城热卖
         </div>
+      </el-col> -->
+      <el-col :span="24" class="d_tit">
+        <div class="_ative">
+            <span v-if="showList==1">同类热卖</span>
+            <span v-else>商城热卖</span>
+        </div>
       </el-col>
     </el-row>
-    <ul>
-      <li class="list_item">
+    <ul v-if="showList==1">
+      <li class="list_item" v-for="item in dataList"  @click="goDetail(item.id)">
         <div>
-          <img src="../../../assets/img/img-01.png" alt="">
+          <img :src="getImgUrl(item.images)" alt="">
         </div>
-        <p class="_name">夏日必备神器</p>
-        <p class="_num">1900分兑换</p>
+        <p class="_name">{{item.name}}</p>
+        <p class="_num">{{item.price}}分兑换</p>
+      </li>
+    </ul>
+    <ul v-else>
+      <li class="list_item" v-for="item in dataList" @click="goDetail2(item.Id)">
+        <div>
+          <img :src="getImgUrl(item.Images)" alt="">
+        </div>
+        <p class="_name">{{item.name}}</p>
+        <p class="_num">{{item.Price}}分兑换</p>
       </li>
     </ul>
   </div>
@@ -65,15 +83,63 @@
 
 <script>
 export default {
+  props:['Type','showList'],
   data(){
     return{
       tabActive: 1,
+      dataList:[]
     }
   },methods:{
-    
+      getList(){
+        var msg = {
+          ranks: '',
+          type: this.Type,
+          pageSize: 15,
+          pageIndex: 1,
+        }
+        this.apiJavaPost(
+          "/api/goodsMarket/getGoodsList",msg,res => {
+            if (res.data.resultCode === 1) {
+              this.dataList = res.data.data.pageData;
+            } else {
+              this.Error(res.data.message);
+            }
+          },
+          null
+        );
+      },
+      getImgUrl(imgUrl){
+        var url= imgUrl.split(",")[0];
+        return url;
+      },
+      //获取活动分类展示
+      getActivesList(){
+        this.apiJavaPost('/api/goodsMarket/getActivityClassifyGoods',{},res=>{
+            if(res.data.resultCode==1){
+                var DataList = res.data.data;
+                DataList.forEach(x => {
+                  if(x.activityId==1){
+                    this.dataList = x.list;
+                  }
+                });
+            }else{
+                this.Error(res.data.message);
+            }
+        },null)
+      },
+      //跳转详情页面
+      goDetail: function (id) {
+        this.$emit('getChildInfo',id)
+      },
+      goDetail2(id){
+          this.$router.push({ path: 'productDetail', query: {id: id}})
+      }
   },mounted(){
-
+    if(this.showList==1){
+       this.getList();
+    }else{
+      this.getActivesList();
+    }
   }
-
 }
 </script>

src/components/IntegralMall/confirOrder.vue

@@ -210,19 +210,17 @@
             <el-row :gutter="20">
               <el-col
                 :span="6"
-                v-for="(item, index) in OrderAddList"
-                :key="index"
-                :class="{'_active': addListActive === index}"
+                :class="{'_active': addListActive === 1}"
               >
-                <div class="address_info_item" @click="addListActive = index">
-                  <p class="item_name">{{item.city}}（{{item.uname}}）</p>
-                  <p class="item_add">{{item.district}} {{item.address}}</p>
-                  <p class="item_tel">{{item.uphone}}</p>
+                <div class="address_info_item" @click="addListActive = 1">
+                  <p class="item_name">{{OrderAddList.city}}（{{OrderAddList.uname}}）</p>
+                  <p class="item_add">{{OrderAddList.district}} {{OrderAddList.address}}</p>
+                  <p class="item_tel">{{OrderAddList.uphone}}</p>
                 </div>
               </el-col>
             </el-row>
             <div class="edit_addr">
-              <span class="edit_addr_btn" v-if="OrderAddList.length>0" @click="addressShow = false,getUpAddress()">修改地址</span>
+              <span class="edit_addr_btn" v-if="OrderAddList" @click="getUpAddress()">修改地址</span>
             </div>
           </div>
           <div v-else class="form_box">
@@ -297,6 +295,7 @@
           <p>应付 <span class="_pay">¥ <span>{{tableData[0].score*tableData[0].num}}</span> 积分</span></p>
         </div>
         <div class="details_box_btn">
+          <span class="edit_addr_btn" @click="goDetail(id)" style="margin-right:20px;">取消</span>
           <span class="edit_addr_btn" @click="exchangeGood()">确认并兑换</span>
         </div>
       </el-row>
@@ -371,7 +370,12 @@ export default {
     },
     //获取当前收货地址详情
     getUpAddress(){
-      this.addressObj = this.OrderAddList[this.addListActive];
+      if(this.addListActive==0){
+        this.Error('请选择收货地址');
+        return;
+      }
+      this.addressShow = false,
+      this.addressObj = this.OrderAddList;
       this.form.addr = this.addressObj.province+" "+ this.addressObj.city+" "+ this.addressObj.district;
       this.form.desc = this.addressObj.address;
       this.form.name = this.addressObj.uname;
@@ -445,7 +449,7 @@ export default {
         goodsName:this.tableData[0].date,
         goodsPrice:this.tableData[0].score,
         goodsImg:this.tableData[0].imgUrl,
-        shippingAdd:this.OrderAddList[this.addListActive].id,
+        shippingAdd:this.OrderAddList.id,
         goodsInfoId:this.id,
         buyNum:this.tableData[0].num,
         orderTotalPrice:this.tableData[0].num*this.tableData[0].score,
@@ -468,8 +472,10 @@ export default {
               this.Error(res.data.message);
           }
       });
-
-    }
+    },
+    goDetail: function (id) {
+      this.$router.push({ path: 'productDetail', query: {id: id}})
+    },
   },
   mounted() {
     this.getOrderAdd();

src/components/IntegralMall/myPointOrder.vue

@@ -220,13 +220,13 @@
                     <div class="myPo_left">
                         <el-row>
                             <el-col :span="8" class="d_tit">
-                                <div :class="{'pActive':tabActive==1}" @click="tabActive = 1,msg.queType='',getList()">
+                                <div :class="{'pActive':tabActive==1}" @click="tabActive = 1,msg.queName='',msg.queType='',getList()">
                                     全部订单
                                     <i class="myPoint_line"></i>
                                 </div>
                             </el-col>
                             <el-col :span="8" class="d_tit">
-                                <div :class="{'pActive':tabActive==2}" @click="tabActive = 2,msg.queType=3,getList()">
+                                <div :class="{'pActive':tabActive==2}" @click="tabActive = 2,msg.queType=4,msg.queName='',getList()">
                                     交易成功
                                     <i class="myPoint_line"></i>
                                 </div>
@@ -291,9 +291,10 @@
                             <span style="color:#FF0101">￥{{item.goodsPrice}}</span>
                         </td>
                         <td width="150px">
-                            <span v-if="item.orderStatus==1">待发货</span>
-                            <span v-if="item.orderStatus==2">待收货</span>
-                            <span v-if="item.orderStatus==3">交易成功</span>
+                            <span v-if="item.orderStatus==1">待处理</span>
+                            <span v-if="item.orderStatus==2">待配送</span>
+                            <span v-if="item.orderStatus==3">配送中</span>
+                            <span v-if="item.orderStatus==4">交易成功</span>
                         </td>
                         <td width="150px">
                            <input type="button" class="pointDetailBtn"  @click="goUrl('OrderdetailsCompleted',item.id)" value="查看详情">
@@ -330,7 +331,7 @@ export default {
   },
   data(){
     return {
-        tabActive:2,
+        tabActive:1,
         currentPage: 1,
         totalCount: 0,
         orderTime:'近三个月订单',
@@ -339,7 +340,7 @@ export default {
             pageIndex: 1,
             pageSize: 5,
             queName:'',
-            queType:3
+            queType:''
         },
         OrderTimeList: [
             {
@@ -360,7 +361,7 @@ export default {
   },methods:{
     //获取数据
     getList(){
-        this.apiJavaPost('/api/orderForm/orderDetailList',this.msg,res=>{
+        this.apiJavaPost('/api/orderForm/orderDetailListByUid',this.msg,res=>{
           if(res.data.resultCode==1){
               this.dataList = res.data.data.pageData;
               this.totalCount = res.data.data.pageCount;

src/components/IntegralMall/productDetail.vue

@@ -165,6 +165,11 @@
   .pd_bottom_detail_right img{
     max-width: 100%;
   }
+  .pd_quota{
+    font-size:12px;
+    color:#666666;
+    margin:10px 0 0 53px;
+  }
 </style>
 
 <template>
@@ -197,7 +202,10 @@
           <p class="_price">售价<span class="jifen">¥ <span>{{detail.price}}</span> {{detail.priceUnit === 1 ? '现金' : '积分'}}</span></p>
           <div class="_numbers">
             <span class="_numbers_name">数量</span>
-            <el-input-number v-model="numbers" :min="1" :max="detail.quota === 0 ? '' : detail.quota" size="mini"></el-input-number>
+            <el-input-number v-model="numbers" :min="1" :max="detail.quota === 0 ? 0 : detail.quota" size="mini"></el-input-number>
+          </div>
+          <div class="pd_quota">
+              限购数量：{{detail.quota}}
           </div>
           <div class="_yunfei">
             <span class="_yunfei_name">运费</span>
@@ -216,7 +224,7 @@
       </el-row>
       <el-row class="pd_bottom_detail" :gutter="20">
         <el-col :span="5">
-          <detailsLeftHot/>
+          <detailsLeftHot v-if="detail.type" :Type="detail.type" :showList="1" v-on:getChildInfo='getChildInfo'/>
         </el-col>
         <el-col :span="19" class="pd_bottom_detail_right">
           <el-row>
@@ -260,11 +268,7 @@ export default {
         imgArr: [],
         deImgArr: [],
       },
-      colors: [
-        '黑色',
-        '红色',
-        '白色'
-      ],
+      isActivityType:1,
       configs: {
         width:650,
         height:350,
@@ -289,7 +293,8 @@ export default {
             let deImgArr = detail.descripImg.split(',')
             detail.imgArr = imgArr
             detail.deImgArr = deImgArr
-            this.detail = detail
+            this.detail = detail;
+            this.isActivityType = detail.isActivityType;
           } else {
             this.Error(res.data.message);
           }
@@ -298,7 +303,15 @@ export default {
       );
     },
     PlacingOrder: function () {
-      this.$router.push({name: 'confirOrder', query: { id: this.id, num: this.numbers}})
+      if(this.isActivityType!=0){
+        this.Error('该商品为活动商品，不能兑换');
+      }else{
+        this.$router.push({name: 'confirOrder', query: { id: this.id, num: this.numbers}})
+      }
+    },
+    getChildInfo(val){
+      this.id = val;
+      this.getDetail();
     }
   },mounted(){
     this.getDetail()

src/components/IntegralMall/productList.vue

@@ -231,84 +231,6 @@ export default {
         pageSize: 15,
         pageIndex: 1,
       },
-      typeList: [
-        {
-          id: 0,
-          name: '全部',
-        },{
-          id: 1,
-          name: '出行用品',
-        },{
-          id: 2,
-          name: '居家用品',
-        },{
-          id: 3,
-          name: '母婴用品',
-        },{
-          id: 4,
-          name: '健康保证',
-        },{
-          id: 5,
-          name: '家居日用',
-        }
-      ],
-      brandList: [
-        {
-          id: 0,
-          name: '全部',
-        },{
-          id: 1,
-          name: '迪士尼',
-        },{
-          id: 2,
-          name: '卡西欧',
-        },{
-          id: 3,
-          name: '哈撒给',
-        },{
-          id: 4,
-          name: '撸啊撸',
-        },{
-          id: 5,
-          name: '红烧肉',
-        },{
-          id: 6,
-          name: '卡西欧',
-        },{
-          id: 7,
-          name: '哈撒给',
-        },{
-          id: 8,
-          name: '撸啊撸',
-        },{
-          id: 9,
-          name: '红烧肉',
-        },{
-          id: 10,
-          name: '卡西欧',
-        },{
-          id: 11,
-          name: '哈撒给',
-        },{
-          id: 12,
-          name: '撸啊撸',
-        },{
-          id: 13,
-          name: '红烧肉',
-        },{
-          id: 14,
-          name: '撸啊撸',
-        },{
-          id: 15,
-          name: '红烧肉',
-        },{
-          id: 16,
-          name: '撸啊撸',
-        },{
-          id: 17,
-          name: '红烧肉',
-        }
-      ],
       dataList: [],
       goodsTypeManagerList: [],
       loading: false,
@@ -373,6 +295,8 @@ export default {
     },
     handleCurrentChange(val) {
       // 翻页
+      this.msg.pageIndex = parseInt(val);
+      this.getList();
     }
   },mounted(){
     this.getGoodsTypeManager();

src/components/LocalTour/LocalCuisineDetails.vue

@@ -299,7 +299,6 @@ export default {
           this.currentMonthDays = moment(this.tomonth).daysInMonth();
           this.dateMsg.startDate=`${this.tomonth}-01`;
           this.dateMsg.endDate=`${this.tomonth}-${this.currentMonthDays}`;
-          console.log("this.dateMsg",this.dateMsg)
           this.dateMsg.idDes=this.tcidDes;
             this.apiJavaPost('/api/b2b/food/getFoodMealPriceList',this.dateMsg,res=>{ 
                 

src/components/LocalTour/Localtourhome.vue

@@ -394,7 +394,6 @@ export default {
       },
       getFoodCountryItem(){
           this.apiJavaPost('/api/b2b/food/getFoodCountryItem',{},res=>{
-            //   console.log(res);
             if(res.data.resultCode==1){
                 this.foodcountryList=res.data.data;
                 if(this.foodcountryList.length>0){
@@ -487,7 +486,6 @@ export default {
             this.dayLoad=false;            
               if(res.data.resultCode==1){
                   this.abroadList=res.data.data.pageData;
-                //   console.log("this.abroadList",this.abroadList);
                   
               }else{
                   this.Error(res.data.message);
@@ -499,7 +497,6 @@ export default {
         this.apiJavaPost('/api/b2b/dayTrip/getLineItem',{},res=>{
               if(res.data.resultCode==1){
                   this.lineTeamList=res.data.data;
-                //   console.log("this.lineTeamList",this.lineTeamList);
               }else{
                   this.Error(res.data.message);
               }

src/components/Ticket/ChooseCity.vue

@@ -61,7 +61,6 @@ export default {
     getCountryList() { //获取国家
         let msg = {};
         this.apipost('dict_post_Destination_GetCountry', msg, res => {
-            // console.log(res);
           this.countryList = res.data.data;
         }, err => {})
       },
@@ -69,9 +68,7 @@ export default {
           this.msg = {
             Id: country.ID
             };
-            // this.cityInfo=country;
         this.apipost('dict_post_Destination_GetChildList', this.msg, res => {
-            // console.log(res);
             if(res.data.data.length==0){
                 this.$emit("CityInfo",country);
                 this.$emit("CityCompClose",'close');

src/components/Ticket/ChooseCity1.vue

@@ -61,7 +61,6 @@ export default {
     getCountryList() { //获取国家
         let msg = {};
         this.apipost('dict_post_Destination_GetCountry', msg, res => {
-            // console.log(res);
           this.countryList = res.data.data;
         }, err => {})
       },
@@ -69,9 +68,7 @@ export default {
           this.msg = {
             Id: country.ID
             };
-            // this.cityInfo=country;
         this.apipost('dict_post_Destination_GetChildList', this.msg, res => {
-            // console.log(res);
             if(res.data.data.length==0){
                 this.$emit("CityInfo1",country);
                 this.$emit("CityCompClose1",'close');

src/components/Ticket/EditTicketOrder.vue

@@ -227,7 +227,6 @@ export default {
             this.apipost(
             "b2b_get_GetCountryForSMAirTick", {},
             res => {
-                // console.log(res)
                 if (res.data.resultCode == 1) {
                 this.countroylist = res.data.data;
                 }
@@ -239,7 +238,6 @@ export default {
         //获取订单详情
         GetDes(){
             this.apiJavaPost('/api/dmc/airticket/getB2BAirticketInfo',{AirOrderId:this.AirOrderId},res=>{
-                // console.log("机票详情",res)
                 this.getlistSigel=res.data.data;
                 this.getlistSigel.synum=this.getlistSigel.airTicketScatterNum-this.getlistSigel.useScatterNum;
              
@@ -249,7 +247,6 @@ export default {
         //获取机票订单详情
         GetTicketDes(){
             this.apiJavaPost('/api/dmc/airticket/GetB2BAirtickOrderInfo',{AirOrderId:this.AirOrderId},res=>{
-                // console.log("获取机票订单详情",res)
                 this.personNum=res.data.data;
                 
                 

src/components/Ticket/FillItinerary.vue

@@ -264,7 +264,6 @@ export default {
             this.apipost(
             "b2b_get_GetCountryForSMAirTick", {},
             res => {
-                // console.log(res)
                 if (res.data.resultCode == 1) {
                     this.countroylist = res.data.data;
                 }
@@ -276,7 +275,6 @@ export default {
         //获取订单详情
         GetDes(){
             this.apiJavaPost('/api/dmc/airticket/getB2BAirticketInfo',{AirTicketId:this.AirTicketId},res=>{
-                // console.log("订单",res)
                 this.getlistSigel=res.data.data;
                 this.getlistSigel.synum=this.getlistSigel.airTicketScatterNum-this.getlistSigel.useScatterNum;
                 
@@ -397,7 +395,6 @@ export default {
                         }else{
                             this.$message.error(res.data.message)
                         }
-                    // console.log("下单",res);
                 
                 
                 },null)
@@ -413,7 +410,6 @@ export default {
             this.apipost(
             "sell_get_GetCustomerToSellInfo", {},
             res => {
-                // console.log(res)
                 if (res.data.resultCode == 1) {
                     this.SellInfoList = res.data.data;
                     this.personNum.enterID=this.SellInfoList[0].EmployeeId;

src/components/Ticket/Pay.vue

@@ -215,7 +215,6 @@ export default {
     },
     Code(str) {
         this.payway=str?this.payway=str:this.payway;
-        console.log("this.payway",this.payway)
         this.codeLoading=true;
         this.code_ts="";
          this.zfbpay_imgcode = false; 
@@ -225,7 +224,6 @@ export default {
         "OnlinePay_post_GetCodeUrlForAirB2B",
         this.code,
         res => {
-          // console.log(res)
           this.codeLoading=false;
           if (res.data.resultCode == 1) {
               this.codeInfo=res.data.data;

src/components/Ticket/TicketList.vue

@@ -511,7 +511,6 @@ export default {
         "airline_get_GetB2BAirLineList",
         {},
         res => {
-          // console.log(res)
           if (res.data.resultCode == 1) {
             this.airlineList = res.data.data;
           }
@@ -525,7 +524,6 @@ export default {
       let num = moment(val, "YYYY-MM-DD").format("E");
       this.choose_info.qFlightDateEnd = moment(val).format("YYYY-MM-DD");
     },
-    // moment("2018-10-29",'YYYY-MM-DD').format('E')
     handleChange() {},
     Search() {
       this.choose_info.departure_city =this.choose_info.departure_cityname == ""? 0: this.choose_info.departure_city;
@@ -655,7 +653,6 @@ export default {
         "/api/dmc/airticket/getB2BAirticketList",
         this.choose_info,
         res => {
-          // console.log(res);
           this.loading = false;
           if (res.data.resultCode == 1) {
             this.datalist = res.data.data.pageData;
@@ -700,7 +697,6 @@ export default {
         };
         monthArray.push(dateDict);
       }
-      // console.log("monthArray",monthArray)
       //数组去重,获取有几个月
       var hash = {};
       monthArray = monthArray.reduce(function(item, next) {

src/components/global/foot.vue

 <style>
 @import "../../assets/global/foot.css";
+.foot-box .home_footer{
+  margin:30px 0 15px 0;
+  cursor: pointer;
+}
+.foot-box .home_footer .float{
+  float: left;
+  font-size: 12px;
+  color: #D0D0D0;
+}
+.foot-box .home_footer .float .iconfont{
+  font-size: 32px;
+  margin: 15px 10px;
+}
+.foot-box .home_footer .float ul li{
+  display: inline-block;
+  font-size: 12px;
+  color:#D0D0D0;
+  width: 50%;
+  padding:5px 0;
+}
+.foot-box .home_footer .float p{
+  padding:5px 0;
+  text-align: left;
+}
+.foot-box .home_footer .el-col-6{
+  padding-left: 40px;
+  box-sizing: border-box;
+}
+
 </style>
 
 <template>
     <div class="foot-box">
+         <el-row style="width:1200px;margin:0 auto" class="home_footer">
+            <el-col :span="6">
+                <div class="float"><i class="iconfont icon-icon-test6"></i></div>
+                <div class="float" style="width:198px">
+                    <p class="color_33">印象之旅</p>
+                    <ul>
+                        <li @click="FootgoUrl('heel')">跟团游</li>
+                        <li>酒店</li>
+                        <li @click="FootgoUrl('IndependentTravel')">自由行</li>
+                        <li @click="FootgoUrl('Localtourhome')">门票</li>
+                        <li @click="FootgoUrl('Localtourhome')">当地游</li>
+                        <li @click="FootgoUrl('VisaHomePage')">签证</li>
+                        <li>定制机票</li>
+                        <li @click="FootgoUrl('TicketHome')">机票</li>
+
+                    </ul>
+                </div>
+                
+            </el-col>
+            <el-col :span="5">
+                <div class="float"><i class="iconfont icon-icon-test7"></i></div>
+                <div class="float">
+                    <p class="color_33">优惠渠道</p>
+                    <div>
+                        <p>特卖</p>
+                        <p>积分商城</p>
+                        <p>活动中心</p>
+
+                    </div>
+                </div>
+                
+            </el-col>
+            <el-col :span="5">
+                <div class="float"><i class="iconfont icon-cailiao"></i></div>
+                <div class="float">
+                    <p class="color_33">定制旅游</p>
+                    <div>
+                        <!-- <p @click="FootgoUrl('PersonalTailor')">选择定制师</p> -->
+                        <p @click="FootgoUrl('PersonalTailor')">定制我的行程</p>
+
+                    </div>
+                </div>
+                
+            </el-col>
+            <el-col :span="5">
+                <div class="float"><i class="iconfont icon-putonghuiyuan"></i></div>
+                <div class="float">
+                    <p class="color_33">个人中心</p>
+                    <div>
+                        <p @click="FootgoUrl('newPersonalCenter?key=1')">我的优惠券</p>
+                        <p @click="FootgoUrl('integral')">我的积分</p>
+                        <p @click="FootgoUrl('newPersonalCenter?key=8-1')">订单中心</p>
+
+                    </div>
+                </div>
+                
+            </el-col>
+            <el-col :span="3" style="text-align:center">
+                <p style="color:#D0D0D0;font-size:14px;">微信扫描小程序</p>
+                <div style="width:118px;height:118px;border:1px dashed #eeeeee;display: inline-block;margin-top:5px"><img src="../../assets/img/xiaocx.png" alt=""></div>
+            </el-col>
+        </el-row>
         <p>旅行社业务经营许可证编号：L-SC-CJ00015    蜀ICP备13000760号</p>
-        <p>©2012-2018 微途科技 版权所有    </p>
+        <p style="padding:10px 0">©2012-2018 微途科技 版权所有    </p>
     </div> 
 </template>
 <script>
 export default {
+    methods:{
+        //   底部跳转
+       FootgoUrl(path){
+        this.$router.push({ path })
+      },
+    },
   
 }
 </script>
\ No newline at end of file

src/components/mall/LocalTourCalendar.vue

@@ -135,8 +135,7 @@ export default {
 			this.priceData=list[0];
 			let day=this.day;
 			let currentYear = day.substring(0,4); //当前年份
-            let currentMonth =day.substring(5,7); //当前月份	
-            // console.log("currentMonth",currentMonth)
+            let currentMonth =day.substring(5,7); //当前月份
 			let date = new Date();
 			let strDate = date.getDate();
 			let strMonth = (date.getMonth()+1).toString();

src/components/mall/newcalendar.vue

@@ -107,7 +107,6 @@ export default {
 		// this.getYearMonthDay();		
 	},methods:{
 		selectDate(item){
-			// console.log(item);
 			if(item.price=="0.00"){
 				return;
 			}else{
@@ -119,7 +118,6 @@ export default {
 			let day=this.day;
 			let currentYear = day.substring(0,4); //当前年份
             let currentMonth =day.substring(5,7); //当前月份	
-            // console.log("currentMonth",currentMonth)
 			let date = new Date();
 			let strDate = date.getDate();
 			let strMonth = (date.getMonth()+1).toString();

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

@@ -123,7 +123,6 @@ export default {
         res => {
           if (res.data.resultCode == 1) { 
             this.tableData = res.data.data.pageData;
-            console.log("美食订单",this.tableData)
             this.totalCount = res.data.data.pageCount;
             this.Count = res.data.data.count;
             this.orderLoading = false;

src/components/newPersonalCenter/block/model/OrderInfoModel/FoodTable.vue

@@ -276,7 +276,6 @@ export default {
     };
   },
   mounted() {
-    // console.log("tableData",this.tableData)
   },
   methods: {
       Exit(item){

src/components/newPersonalCenter/block/model/OrderInfoModel/NewTKtable.vue

@@ -554,7 +554,6 @@ export default {
     };
   },
   mounted() {
-    console.log("机票122",this.tableData)
   },
   methods: {
       ShowDes(index){

src/components/newPersonalCenter/block/model/OrderInfoModel/ScenTable.vue

@@ -294,7 +294,6 @@ export default {
     };
   },
   mounted() {
-    // console.log("tableData",this.tableData)
   },
   methods: {
     Pay(item){

src/components/newPersonalCenter/block/model/OrderInfoModel/TCTable.vue

@@ -328,7 +328,6 @@ export default {
     };
   },
   mounted() {
-    // console.log("tableData",this.tableData)
   },
   methods: {
     enter: function (t) {

src/components/newPersonalCenter/block/model/OrderInfoModel/VisaTable.vue

@@ -328,11 +328,9 @@ export default {
     };
   },
   mounted() {
-    // console.log("tableData",this.tableData)
   },
   methods: {
     Exit(item){
-      console.log(item)
         this.$confirm("确认取消订单?", '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',

src/components/newPersonalCenter/block/model/ScenOrder(废).vue

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

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

@@ -129,7 +129,6 @@ export default {
         res => {
           if (res.data.resultCode == 1) { 
             this.tableData = res.data.data.pageData;
-            console.log("当地游订单",this.tableData)
             this.totalCount = res.data.data.pageCount;
             this.Count = res.data.data.count;
             this.orderLoading = false;

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

@@ -150,7 +150,6 @@ export default {
         res => {
           if (res.data.resultCode == 1) { 
             this.tableData = res.data.data.pageData;
-            console.log("签证订单",this.tableData)
             this.totalCount = res.data.data.pageCount;
             this.Count = res.data.data.count;
             this.orderLoading = false;

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

@@ -129,7 +129,6 @@ export default {
         res => {
           if (res.data.resultCode == 1) { 
             this.tableData = res.data.data.pageData;
-            console.log("定制游订单",this.tableData)
             this.totalCount = res.data.data.pageCount;
             this.Count = res.data.data.count;
             this.orderLoading = false;

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

@@ -176,7 +176,6 @@ export default {
                     // 推送接口
                     this.apipost("airline_get_GetB2BAirLineList",msg,
                         res => {
-                        // console.log(res)
                     },
                     err => {
                     }
@@ -210,7 +209,6 @@ export default {
           this.List();
       },
       handlePay(index,row){
-        //   console.log("row",row)
         this.$router.push({
               name: "Pay",
               query: {
@@ -223,14 +221,12 @@ export default {
           this.List();
       },
       handleEdit(index,row){
-        //   console.log("row",row)
           this.$router.push({
                 path: `/EditTicketOrder/${row.id}`
             })
       },
     List(){
         this.loading=true;
-        // console.log(this.form)
         if(this.form.time){
             this.form.startTime=this.form.time[0];
             this.form.endTime=this.form.time[1];
@@ -240,7 +236,6 @@ export default {
           this.form.endTime="";
         }
         this.apiJavaPost('/api/dmc/airticket/GetB2BAirtickOrderPageList',this.form,res=>{
-                // console.log(res);
                 this.loading=false;
                 if(res.data.resultCode==1){
                     this.tableData=res.data.data.pageData;

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

@@ -119,7 +119,6 @@ export default {
         res => {
           if (res.data.resultCode == 1) { 
             this.tableData = res.data.data.pageData;
-            console.log("门票订单",this.tableData)
             this.totalCount = res.data.data.pageCount;
             this.Count = res.data.data.count;
             this.orderLoading = false;

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

@@ -142,7 +142,6 @@ export default {
         res => {
           if (res.data.resultCode == 1) { 
             this.tableData = res.data.data.pageData;
-            console.log("自由行订单",this.tableData);
             
             this.totalCount = res.data.data.pageCount;
             this.Count = res.data.data.count;

src/components/newPersonalCenter/integral/model/commodity.vue

@@ -24,7 +24,6 @@
   color: #333333;
   width:229px;
   height:241px;
-  cursor: pointer;
 }
 .commodity .small:last-child{
   width:230px;
@@ -38,9 +37,6 @@
 }
 .commodity .small ._detais{
   color: #999999;
-}
-.commodity .medium{
-  
 }
 .commodity .medium{
   padding: 29px ;
@@ -62,7 +58,6 @@
 .medium{
   width:344px;
   height:240px;
-  cursor: pointer;
 }
 .com_BigDiv{
   min-height:480px;border-right:1px solid #ECECEC;
@@ -73,11 +68,14 @@
 .r_item_btmBox{
   min-height: 135px;
 }
+.comCanClick{
+  cursor: pointer;
+}
 </style>
 <template>
   <el-row class="commodity">
     <el-col :span="10" class="com_BigDiv">
-      <div @click="goDetail(item.Id)" class="info" v-if="index==0" v-for="(item,index) in message" :key="index">
+      <div @click="goDetail(item.Id)" class="info" :class="{'comCanClick':item.Id}" v-if="index==0" v-for="(item,index) in message" :key="index">
         <div>
           <img class="com_bigImg" :src="getImgUrl(message[0].Images)" alt>
         </div>
@@ -88,7 +86,7 @@
     <el-col :span="14">
       <el-row>
         <el-col :span="8"  class="small" v-if="index>0&&index<4" v-for="(item,index) in message"  :key="index">
-          <div @click="goDetail(item.Id)">
+          <div @click="goDetail(item.Id)" :class="{'comCanClick':item.Id}">
             <div class="r_item_img_box">
               <img :src="getImgUrl(item.Images)" alt>
             </div>
@@ -99,7 +97,7 @@
       </el-row>
       <el-row>
         <el-col :span="12" class="medium f" v-if="index>3" v-for="(item,index) in message"  :key="index">
-          <div @click="goDetail(item.Id)">
+          <div @click="goDetail(item.Id)" :class="{'comCanClick':item.Id}">
             <div class="r_item_btmBox">
               <img :src="getImgUrl(item.Images)" alt>
             </div>
@@ -126,11 +124,14 @@ export default {
     },
     //跳转详情页面
     goDetail: function (id) {
-      this.$router.push({ path: 'productDetail', query: {id: id}})
+      console.log(id);
+      if(id){
+        this.$router.push({ path: 'productDetail', query: {id: id}})
+      }
     },
 
   },mounted(){
-      console.log(this.message,'messagess');
+      
   }
 };
 </script>

src/components/newPersonalCenter/integral/model/integralHomeV2.vue

@@ -91,12 +91,14 @@
     border: 1px solid rgba(236, 236, 236, 1);
     border-left: none;
     border-top: none;
+    cursor: pointer;
   }
   .integralHomeV2 .class .item:nth-child(1),.integralHomeV2 .class .item:nth-child(6){
     border-left: 1px solid rgba(236, 236, 236, 1);
   }
   .integralHomeV2 .class .item img{
     max-height: 150px;
+    max-width:100%;
   }
   .integralHomeV2 .class .item ._name{
     font-size:12px;
@@ -211,12 +213,12 @@
         </el-row>
         <el-row>
           <div class="clearfix">
-            <div class="info item" v-for="item in list">
+            <div class="info item" v-for="item in list" @click="goDetail(item.id)">
               <div>
-                <img src="../../../../assets/img/img-01.png" alt>
+                <img :src="item.images.split(',')[0]" alt>
               </div>
-              <p class="_name">出行必备物品</p>
-              <p class="_detais">699积分抢兑</p>
+              <p class="_name">{{item.name}}</p>
+              <p class="_detais">{{item.price}}</p>
             </div>
           </div>
         </el-row>
@@ -234,7 +236,7 @@ export default {
   data(){
     return{
       StorageInfo: {},
-      list: [1,2,3,4,5,6,7,8,9,10],
+      list: [],
       dataList:[],
       score:0,
     }
@@ -254,11 +256,12 @@ export default {
       this.apiJavaPost('/api/goodsMarket/getActivityClassifyGoods',{},res=>{
           if(res.data.resultCode==1){
               this.dataList = res.data.data;
-              console.log(this.dataList,'sssssss');
               var num=0;
               this.dataList.forEach(x=>{
                 if(x.list.length<6){
                   num=6-x.list.length;
+                }else{
+                  num=0;
                 }
                 var obj = {
                   Description:'',
@@ -288,10 +291,36 @@ export default {
               this.Error(res.data.message);
           }
       });
-    }
+    },
+    // 获取列表
+    getScoreList: function () {
+      var msg = {
+        ranks: '',
+        type: '',
+        pageSize: 10,
+        pageIndex: 1,
+      }
+      this.apiJavaPost(
+        "/api/goodsMarket/getGoodsList",msg,
+        res => {
+          if (res.data.resultCode === 1) {
+              this.list = res.data.data.pageData;
+              console.log(this.list,'list');
+          } else {
+              this.Error(res.data.message);
+          }
+        },
+        null
+      );
+    },
+    //跳转详情页面
+    goDetail: function (id) {
+      this.$router.push({ path: 'productDetail', query: {id: id}})
+    },
   },mounted(){
     this.getScore();
     this.getActivesList();
+    this.getScoreList();
   }
 }
 </script>