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

src/components/IntegralMall/IntegralMall.vue

@@ -49,7 +49,7 @@
       <div class="_block" v-for="item in ClassifyGoodsList">
         <el-row class="tit">
           <div>
-            <img src="../../assets/img/ps/shafa.png" alt="">
+            <img :src="item.typeIcon" alt="">
             <p>{{item.typeName}}</p>
           </div>
         </el-row>
@@ -86,6 +86,26 @@ export default {
         res => {
           if (res.data.resultCode === 1) {
             this.ClassifyGoodsList = res.data.data;
+            var num = 0;
+            this.ClassifyGoodsList.forEach(x=>{
+               if(x.list.length<8){
+                  num=8-x.list.length;
+                }else{
+                  num=0;
+                }
+                var obj = {
+                  Id:'',
+                  Images:'',
+                  Price:'',
+                  name:'',
+                  typeIcon:'',
+                  typeId:'',
+                  typeName:''
+                } 
+                for(var i=0;i<num;i++){
+                  x.list.push(obj);
+                }
+            })
           } else {
             this.Error(res.data.message);
           }
@@ -98,6 +118,27 @@ export default {
       this.apiJavaPost('/api/goodsMarket/getActivityClassifyGoods',{},res=>{
           if(res.data.resultCode==1){
               this.dataList = res.data.data;
+              var num=0;
+              this.dataList.forEach(x=>{
+                if(x.list.length<6){
+                  num=6-x.list.length;
+                }else{
+                  num=0;
+                }
+                var obj = {
+                  Description:'',
+                  Id:'',
+                  Images:'',
+                  Price:'',
+                  activityId:'',
+                  activityImg:'',
+                  activityName:'',
+                  name:''
+                } 
+                for(var i=0;i<num;i++){
+                  x.list.push(obj);
+                }
+              })
           }else{
               this.Error(res.data.message);
           }

src/components/IntegralMall/block/commodity2.vue

@@ -41,7 +41,6 @@
   border: 1px solid rgba(236, 236, 236, 1);
   border-right: none;
   border-top: none;
-  cursor: pointer;
 }
 .commodity2 .commodity2_right .r_item>div img{
   max-height: 150px;
@@ -58,6 +57,9 @@
 .commodity2 .r_item_img_box{
   height: 175px;
 }
+.comCanClick{
+  cursor: pointer;
+}
 </style>
 <template>
   <el-row class="commodity2">
@@ -71,12 +73,12 @@
       <el-row>
         <template v-for="item in data.list">
           <el-col :span="6" class="r_item">
-            <div @click="goDetail(item.Id)">
+            <div @click="goDetail(item.Id)" :class="{'comCanClick':item.Id}">
               <div class="r_item_img_box">
                 <img :src="item.Images.split(',')[0]" alt="">
               </div>
               <p>{{item.name}}</p>
-              <p>¥ {{item.Price}}积分</p>
+              <p v-if="item.Price">¥ {{item.Price}}积分</p>
             </div>
           </el-col>
         </template>
@@ -97,7 +99,9 @@ export default {
   methods:{
     //跳转详情页面
     goDetail: function (id) {
-      this.$router.push({ path: 'productDetail', query: {id: id}})
+      if(id){
+        this.$router.push({ path: 'productDetail', query: {id: id}})
+      }
     },
     goList: function (type) {
       this.$router.push({path: 'productList', query: {type: type}})

src/components/IntegralMall/block/detailsLeftHot.vue

@@ -36,6 +36,9 @@
 .list_item p._num{
   color: #999999;
 }
+.detailsLeftHot li{
+  cursor: pointer;
+}
 </style>
 <template>
   <div class="detailsLeftHot">
@@ -58,7 +61,7 @@
       </el-col>
     </el-row>
     <ul v-if="showList==1">
-      <li class="list_item" v-for="item in dataList">
+      <li class="list_item" v-for="item in dataList"  @click="goDetail(item.id)">
         <div>
           <img :src="getImgUrl(item.images)" alt="">
         </div>
@@ -67,7 +70,7 @@
       </li>
     </ul>
     <ul v-else>
-      <li class="list_item" v-for="item in dataList">
+      <li class="list_item" v-for="item in dataList" @click="goDetail2(item.Id)">
         <div>
           <img :src="getImgUrl(item.Images)" alt="">
         </div>
@@ -96,7 +99,6 @@ export default {
         }
         this.apiJavaPost(
           "/api/goodsMarket/getGoodsList",msg,res => {
-            console.log(res,'resssss');
             if (res.data.resultCode === 1) {
               this.dataList = res.data.data.pageData;
             } else {
@@ -125,6 +127,13 @@ export default {
             }
         },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();

src/components/IntegralMall/productDetail.vue

@@ -202,7 +202,7 @@
           <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}}
@@ -224,7 +224,7 @@
       </el-row>
       <el-row class="pd_bottom_detail" :gutter="20">
         <el-col :span="5">
-          <detailsLeftHot v-if="detail.type" :Type="detail.type" :showList="1" />
+          <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>
@@ -295,7 +295,6 @@ export default {
             detail.deImgArr = deImgArr
             this.detail = detail;
             this.isActivityType = detail.isActivityType;
-            console.log(detail,'detailsss');
           } else {
             this.Error(res.data.message);
           }
@@ -309,6 +308,10 @@ export default {
       }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/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,13 @@ export default {
     },
     //跳转详情页面
     goDetail: function (id) {
-      this.$router.push({ path: 'productDetail', query: {id: 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>

src/components/taskPage/IceCream/IceCreamTask.vue

@@ -247,11 +247,11 @@
     <!-- 全家桶 -->
     <allHome v-show="allHomeShow" @closeMyWindow="closeMyWindow" name='allHome'/>
     <!-- 抽奖券 -->
-    <raffleTickets v-show="raffleTicketsShow" @closeMyWindow="closeMyWindow" name='raffleTickets'/>
+    <!-- <raffleTickets v-if="raffleTicketsShow" @closeMyWindow="closeMyWindow" name='raffleTickets'/> -->
     <!-- 我的兑换 -->
     <myExchange v-if="myExchangeShow" @closeMyWindow="closeMyWindow" :ActivityID='ActivityInfo.id' :zoom="zoom" name='myExchange'/>
     <!-- 我的任务 -->
-    <myAssignment v-show="myAssignmentShow" @closeMyWindow="closeMyWindow" :zoom="zoom" name='myAssignment'/>
+    <myAssignment v-if="myAssignmentShow" @closeMyWindow="closeMyWindow" :zoom="zoom" name='myAssignment'/>
     <!-- 签到 -->
     <signCalendar v-if="signCalendarShow" @closeMyWindow="closeMyWindow" :ActivityID='ActivityInfo.id' :zoom="zoom" name='signCalendar'/>
     <!-- 我的冰淇淋 -->

src/components/taskPage/IceCream/assignment.vue

@@ -121,7 +121,7 @@
             <p class="_info">{{item.awardMaterials}}</p>
           </div>
           <div class="item_btn">
-            <img v-if="item.taskStatus === 0" src="../../../assets/img/task/renwu_qu.png" alt>
+            <img v-if="item.taskStatus === 0" src="../../../assets/img/task/renwu_qu.png" @click="goUrl(item.taskLink)">
             <span class="_gray _green" v-else-if="item.taskStatus === 1">已完成</span>
             <span class="_gray" v-else>未完成</span>
           </div>
@@ -170,6 +170,9 @@ export default {
     },
     close: function() {
       this.$emit("closeMyWindow", "myAssignment");
+    },
+    goUrl: function (path) {
+      this.$router.push({path: path});
     }
   },
   mounted() {

src/components/taskPage/IceCream/myExchange.vue

@@ -92,7 +92,7 @@
           <div class="item_img">
             <img :src="item.imgs" alt="">
           </div>
-          <span class="item_name">{{item.name}}</span>
+          <span class="item_name" @click="goUrl('myPointOrder')">{{item.name}}</span>
         </div>
       </div>
       <div @mouseover="closeShow = 1" @mouseout="closeShow = 2" class="myExchange_close" @click="close">
@@ -133,6 +133,9 @@ export default {
     close: function () {
       this.$emit('closeMyWindow', 'Exchange')
     },
+    goUrl: function (path) {
+      this.$router.push({path: path});
+    }
   },mounted(){
     this.getActivityGoods()
   }

src/components/taskPage/IceCream/raffleTickets.vue

@@ -61,8 +61,8 @@
     <div class="raffleTickets_bg">
       <div>
         <div class="tips">
-          <p>抽奖券</p>
-          <p class="small">仅限于（2019年8月21日 21：）“  狂欢夜·瓜分百万现金  ”活动中使用</p>
+          <p>{{raffleTicketsData.mName}}</p>
+          <!-- <p class="small">仅限于（2019年8月21日 21：）“  狂欢夜·瓜分百万现金  ”活动中使用</p> -->
         </div>
       </div>
       <img @click="close" src="../../../assets/img/task/des_close.png" alt="">

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.215: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.106: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",