解决冲突

src/App.vue

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

src/components/IntegralMall/IntegralMall.vue

@@ -28,14 +28,14 @@
   <el-row class="IntegralMall">
     <el-row class="w1180">
       <IntegralHead/>
-      <div class="_block">
+      <div class="_block" v-for="item in dataList" v-if="item.activityId==1">
         <el-row class="tit">
           <div>
-            <img src="../../assets/img/ps/jifendui.png" alt="">
-            <p>热门精品推荐</p>
+            <img :src="item.activityImg" alt="">
+            <p>{{item.activityName}}</p>
           </div>
         </el-row>
-        <commodity v-bind:message="dataList[0].list"/>
+        <commodity v-bind:message="item.list"/>
       </div>
       <div class="_block">
         <el-row class="tit">

src/components/IntegralMall/OrderCompleted.vue

@@ -75,7 +75,7 @@
         margin-top:10px;
     }
     .OrderCompleted .OC_btmList{
-        width:320px;
+        width:380px;
         margin-top:63px;
         font-size:12px;
         color:#333333;
@@ -87,7 +87,7 @@
         border-bottom:1px solid #DDDDDD;
     }
     .OrderCompleted .OC_jishu{
-        width:58%;
+        width:50%;
     }
     .OrderCompleted .OC_jifen{
         display: inline-block;
@@ -135,28 +135,28 @@
                     <img src="../../assets/img/ticket/icons8-tick-box-96.png" alt=""/>
                     <div class="OC_riContent">
                         <div class="OC_paySuccsss">支付成功！</div>
-                        <div class="OC_dianhua">如有任何疑问可致电028-56540254，点击 <span class="Order_more" @click="goUrl('OrderdetailsCompleted')">查看订单>></span></div>
+                        <div class="OC_dianhua">如有任何疑问可致电028-56540254，点击 <span class="Order_more" @click="goUrl('myPointOrder')">查看订单>></span></div>
                     </div>
                   </div>
                   <div class="OC_btmList">
                       <div>
                           <div class="OC_jifen OC_jishu">
-                              支付积分：￥9900
+                              支付积分：￥{{pay}}
                           </div>
                           <div class="OC_jifen">
-                              剩余积分：￥190010
+                              剩余积分：￥{{residue}}
                           </div>
                       </div>
                       <div>
                           <div class="OC_jifen OC_jishu">
-                              订单编号：45612312321
+                              订单编号：{{orderNum}}
                           </div>
                           <div class="OC_jifen">
-                              下单时间：2019-02-21
+                              下单时间：{{createTime | YMDHMS}}
                           </div>
                       </div>
                   </div>
-                  <input type="button" value="返回积分商城" class="OC_backBtn"/>
+                  <input type="button" value="返回积分商城" @click="goUrl('IntegralMall')" class="OC_backBtn"/>
               </div>
               <div class="OC_rightImg">
                   <img src="../../assets/img/ticket/back.png" alt=""/>
@@ -173,12 +173,20 @@ export default {
   props:{},
   data(){
     return{
-      
+        createTime:'',
+        orderNum:'',
+        pay:'',
+        residue:''
     }
   },methods: {
     goUrl: function (path) {
-      this.$router.push({name: path,query: { id: this.$route.query.id}});
+      this.$router.push({name: path});
     }
+  },mounted() {
+    this.createTime = this.$route.query.createTime;
+    this.orderNum = this.$route.query.orderNum;
+    this.pay = this.$route.query.pay;
+    this.residue = this.$route.query.residue;
   }
 }
 </script>

src/components/IntegralMall/OrderdetailsCompleted.vue

@@ -157,10 +157,7 @@
                     <span>完成</span>
                 </div>
                 <div class="Order_jifen">
-                  支付积分：￥9900
-                </div>
-                <div>
-                  剩余积分：￥{{score}}
+                  支付积分：￥{{dataList.goodsPrice*dataList.buyNum}}
                 </div>
             </div>
             <div class="Order_Top_right">
@@ -179,15 +176,15 @@
                   <img src="../../assets/img/orderLins.png" alt=""/>
                 </div>
                 <div class="Submit_Orders">
-                    <i class="iconfont icon-gerenzhongxindingdandaishouhuo"/>
-                      确认兑换
+                    <i class="iconfont icon-gerenzhongxindingdandaishouhuo"></i>
+                      等待收货
                 </div>
                 <div class="SubmitComLine">
                   <img src="../../assets/img/orderLins.png" alt=""/>
                 </div>
                 <div class="Submit_Orders">
-                    <!-- <div><img src="../../assets/img/ticket/icons8-tick-box-96.png" alt=""/></div> -->
-                    <div><img src="../../assets/img/ticket/huigou.png" alt=""/></div>
+                    <div v-if="dataList.orderStatus==3"><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>
@@ -195,23 +192,23 @@
         <table class="myPointTable">
             <tr>
                 <td colspan="3">
-                    <span class="pointOrderTime">{{orderTime | YMDHMS}}</span>
-                    <span class="pointOrderTitle">订单号：</span><span class="pointOrderNum">451648</span>
+                    <span class="pointOrderTime">{{dataList.crateTime | YMDHMS}}</span>
+                    <span class="pointOrderTitle">订单号：</span><span class="pointOrderNum">{{dataList.orderNum}}</span>
                 </td>
             </tr>
             <tr>
                 <td width="325px">
                   <div class="po_info">
                       <div class="po_left">
-                          <img :src="imageUrl" alt=""/>
+                          <img :src="dataList.goodsImg" alt=""/>
                       </div>
                       <div class="po_right">
-                          {{orderTitle}}
+                          {{dataList.goodsName}}
                       </div>
                   </div>
                 </td>
                 <td>
-                  <div class="OrderShouContent" v-if="index<num" v-for="(item,index) in data">
+                  <!-- <div class="OrderShouContent" v-if="index<num" v-for="(item,index) in data">
                       <div class="Order_left">
                           {{item.time}}
                       </div>
@@ -222,10 +219,15 @@
                             <span @click="DataLength(2)" v-if="num>1&&index==data.length-1&&subIndex==item.list.length-1" class="Order_more">收起>></span>
                           </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>
                 </td>
                 <td width="132px" style="text-align:center;">
-                    <input type="button" class="pointCancelBtn" value="取消订单">
+                    <input type="button" class="pointCancelBtn" @click="goUrl('integral')" value="再次兑换">
                 </td>
             </tr>
         </table>
@@ -239,12 +241,7 @@ export default {
     return {
       num:1,
       id:0,
-      //时间
-      orderTime:'',
-      //订单号
-      orderNum:'',
-      //图片
-      imageUrl:'',
+      dataList:[],
       //标题
       orderTitle:'',
       score:'',
@@ -279,14 +276,11 @@ export default {
     },
     getInfo(){
       let msg = {
-        goodId:this.id
+        id:this.id
       }
-       this.apiJavaPost('/api/goodsMarket/getGoodsDetail',msg,res=>{
+       this.apiJavaPost('/api/orderForm/getOrderDetail',msg,res=>{
           if(res.data.resultCode==1){
               this.dataList = res.data.data;
-              this.orderTime = dataList.updateTime;
-              this.imageUrl = dataList.images.images.split(',')[0];
-              this.orderTitle = dataList.name;
           }else{
               this.Error(res.data.message);
           }
@@ -302,6 +296,9 @@ export default {
           }
       });
     },
+    goUrl: function (path) {
+      this.$router.push({name: path});
+    }
   },mounted(){
     this.getInfo();
     this.getScore();

src/components/IntegralMall/block/IntegralHead.vue

@@ -25,6 +25,7 @@
 }
 .IntegralHead .bottom_class ._class p{
   margin-top: 5px;
+  color:#222222;
 }
 </style>
 <template>
@@ -33,13 +34,13 @@
       <img src="../../../assets/img/ps/IntegralHead.png" alt="">
     </div>
     <el-row class="bottom_class">
-      <template v-for="item in list">
-        <router-link :to="{path: '/productDetail/1'}">
+      <template v-for="item in dataList">
           <el-col :span="3" class="_class">
-            <img src="../../../assets/img/img-01.png" alt="">
-            <p>家纺家饰</p>
+            <div @click="goList(item.id)">
+              <img :src="item.icon" alt=""/>
+              <p>{{item.name}}</p>
+            </div>
           </el-col>
-        </router-link> 
       </template>
     </el-row>
   </el-row>
@@ -52,12 +53,28 @@ export default {
   },
   data(){
     return{
-      list:[1,2,3,4,5,6,7,8]
+      dataList:[]
     }
   },methods:{
-    
+    getList(){
+      this.apiJavaPost("/api/IntegralManager/goodsTypeManager",
+        {reqType: 'find'},
+        res => {
+          if (res.data.resultCode === 1) {
+            console.log(res,'ressssssss');
+            this.dataList = res.data.data;
+          } else {
+            this.Error(res.data.message);
+          }
+        },
+        null
+      );
+    },
+    goList: function (type) {
+      this.$router.push({path: 'productList', query: {type: type}})
+    }
   },mounted(){
-    
+      this.getList();
   }
 }
 </script>

src/components/IntegralMall/confirOrder.vue

@@ -457,8 +457,10 @@ export default {
               this.$router.push({ 
                 path:'/OrderCompleted',
                 query:{
-                  // id:this.id,
-                  //payScore:dataList.
+                   createTime:dataList.createTime,
+                   orderNum:dataList.orderNum,
+                   pay:dataList.pay,
+                   residue:dataList.residue
                 } 
               })
 

src/components/IntegralMall/myPointOrder.vue

@@ -296,7 +296,7 @@
                             <span v-if="item.orderStatus==3">交易成功</span>
                         </td>
                         <td width="150px">
-                           <input type="button" class="pointDetailBtn"  @click="goUrl('OrderdetailsCompleted')" value="查看详情">
+                           <input type="button" class="pointDetailBtn"  @click="goUrl('OrderdetailsCompleted',item.id)" value="查看详情">
                             <!-- <div><input type="button" class="pointCancelBtn" value="取消订单"></div> -->
                         </td>
                     </tr>
@@ -375,8 +375,13 @@ export default {
       this.msg.pageIndex = parseInt(val);
       this.getList();
     },
-    goUrl: function (path) {
-      this.$router.push({name: path});
+    goUrl: function (path,id) {
+      this.$router.push({
+          name: path,
+          query:{
+            id:id
+          } 
+      });
     },
     handleCommandTwo(command) {
       this.orderTime = command.Day;

src/components/IntegralMall/productDetail.vue

@@ -194,14 +194,7 @@
         <el-col :span="14" class="pd_top_info_right">
           <p class="_tit">{{detail.name}}</p>
           <p class="_sub_tit">{{detail.packing}}</p>
-          <p class="_price">售价<span class="jifen">¥ <span>{{detail.price}}</span> {{detail.priceUnit === 1 ? '现金' : '积分'}}</span> <span class="yishou">已售 <span>99</span></span></p>
-          <div class="_colors">
-            <span class="_colors_name">颜色</span>
-            <!-- <template v-for="(item, index) in colors">
-              <span class="_colors_item" :class="{'_active': colorsIndex === index}" @click="colorsIndex = index">{{item}}</span>
-            </template> -->
-            <span class="">无</span>
-          </div>
+          <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>

src/components/IntegralMall/productList.vue

@@ -166,7 +166,7 @@
             </template>
           </div>
         </el-row>
-        <el-row class="tabs">
+        <!-- <el-row class="tabs">
           <span class="_name">品牌</span>
           <div class="tabs_box">
             <template v-for="(item, index) in brandList">
@@ -184,7 +184,7 @@
               </span>
             </span>
           </div>
-        </el-row>
+        </el-row> -->
       </div>
       <div class="list_item" >
         <div class="list_item_box" v-for="item in dataList" :key="item.id" @click="goDetail(item.id)">

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

@@ -180,7 +180,7 @@
         </el-col>
       </el-row>
       <!-- class -->
-      <el-row class="class" v-for="item in dataList">
+      <el-row class="class" v-for="(item, index) in dataList" :key="index">
         <el-row class="tit">
           <div>
             <!-- <img src="../../../../assets/img/ps/jifenhot.png" alt=""> -->

src/components/taskPage/IceCream/assignment.vue

+<style>
+.assignment {
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.5);
+  position: absolute;
+  left: 0;
+  top: 0;
+  z-index: 2018;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.assignment .assignment_bg {
+  height: 718px;
+  width: 872px;
+  background: url("../../../assets/img/task/renwu_bg.png");
+  background-size: 100% 100%;
+  position: relative;
+}
+.assignment .assignment_close {
+  position: absolute;
+  top: 145px;
+  right: -10px;
+  cursor: pointer;
+}
+.assignment .assignment_box {
+  margin-top: 258px;
+  height: 405px;
+  padding: 0 0 0 85px;
+  overflow: auto;
+  margin-right: 85px;
+}
+.assignment .assignment_box::-webkit-scrollbar {
+  /*滚动条整体样式*/
+  width: 14px;
+  /*高宽分别对应横竖滚动条的尺寸*/
+  height: 47px;
+}
+.assignment .assignment_box::-webkit-scrollbar-thumb {
+  /*滚动条里面小方块*/
+  border-radius: 4px;
+  background: rgba(255, 197, 21, 1);
+}
+.assignment .assignment_box::-webkit-scrollbar-track {
+  /*滚动条里面轨道*/
+  border-radius: 4px;
+  background: rgba(204, 68, 39, 1);
+}
+.assignment .assignment_box .assignment_item {
+  margin: 0 25px 5px 0;
+  padding: 7px 16px;
+  display: flex;
+  align-items: center;
+  background-color: rgba(255, 231, 85, 1);
+  background-image: -webkit-linear-gradient(#ffe34d, #ffc208);
+  background-image: linear-gradient(#ffe34d, #ffc208);
+  border-radius: 8px;
+}
+.assignment .assignment_box .assignment_item .item_img {
+  width: 83px;
+  height: 83px;
+  margin-right: 14px;
+  background: url("../../../assets/img/task/renwu_left_bg.png");
+  background-size: 100% 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.assignment .assignment_box .assignment_item .item_info {
+  margin-right: 36px;
+}
+.assignment .assignment_box .assignment_item .item_info ._name {
+  font-size: 32px;
+  font-family: "PingFangR";
+  font-weight: bold;
+  color: rgba(255, 255, 255, 1);
+  -webkit-text-stroke: 2px rgba(185, 51, 0, 1);
+  min-width: 350px;
+  max-width: 350px;
+  overflow: hidden;
+}
+.assignment .assignment_box .assignment_item .item_info ._info {
+  font-size: 16px;
+  font-family: "PingFangR";
+  font-weight: bold;
+  color: rgba(180, 64, 47, 1);
+}
+.assignment .assignment_box .assignment_item .item_btn img {
+  display: block;
+  cursor: pointer;
+}
+.assignment .assignment_box .assignment_item .item_btn ._gray {
+  background-color: #CCCCCC;
+  color: white;
+  display: inline-block;
+  width: 148px;
+  height: 58px;
+  line-height: 58px;
+  text-align: center;
+  font-size: 28px;
+  font-family: "PingFangR";
+  font-weight: bold;
+  color: rgba(255, 255, 255, 1);
+  border-radius: 17px
+}
+.assignment .assignment_box .assignment_item .item_btn ._gray._green{
+  background-color: #5FBF8D;
+}
+</style>
+<template>
+  <div class="assignment">
+    <div class="assignment_bg" :style="{zoom: zoom}">
+      <ul class="assignment_box">
+        <li class="assignment_item" v-for="(item, index) in dataList">
+          <div class="item_img">
+            <img src="../../../assets/img/task/bingqiling1.png" alt>
+          </div>
+          <div class="item_info">
+            <p class="_name">{{item.taskName}}</p>
+            <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>
+            <span class="_gray _green" v-else-if="item.taskStatus === 1">已完成</span>
+            <span class="_gray" v-else>未完成</span>
+          </div>
+        </li>
+      </ul>
+      <div
+        @mouseover="closeShow = 1"
+        @mouseout="closeShow = 2"
+        class="assignment_close"
+        @click="close"
+      >
+        <img v-if="closeShow === 2" src="../../../assets/img/task/renwu_close.png" alt>
+        <img v-else src="../../../assets/img/task/renwu_close.png" alt>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  props: ["zoom"],
+  data() {
+    return {
+      closeShow: 2,
+      dataList: [],
+    };
+  },
+  methods: {
+    getTask: function(customerId) {
+      let msg = {
+        customerId: customerId,
+        activityId: 1
+      };
+      this.apiJavaPost(
+        "/api/mactivity/getTask",
+        msg,
+        res => {
+          if (res.data.resultCode == 1) {
+            let data = res.data.data
+            this.dataList = data;
+          } else {
+            this.Error(res.data.message);
+          }
+        },
+        null
+      );
+    },
+    close: function() {
+      this.$emit("closeMyWindow", "myAssignment");
+    }
+  },
+  mounted() {
+    let userInfo = JSON.parse(localStorage.userInfo)
+    this.getTask(userInfo.customerId);
+  }
+};
+</script>

src/components/taskPage/IceCream/description.vue

@@ -12,19 +12,20 @@
   justify-content: center;
 }
 .description .description_bg{
-  height: 397px;
-  width: 337px;
+  height: 558px;
+  width: 474px;
   background: url('../../../assets/img/task/des_bg.png');
   background-size: 100% 100%;
   position: relative;
 }
 .description_info{
-  font-size: 12px;
-  color: #494949;
-  padding: 180px 60px  0 60px;
+  padding: 251px 89px 0 89px;
+  font-weight: bold;
+  font-size: 14px;
+  font-family: 'PingFangR';
 }
 .description_info p{
-  max-height: 132px;
+  max-height: 186px;
   overflow: auto;
 }
 .description_info p::-webkit-scrollbar{
@@ -45,11 +46,13 @@
 }
 .description_close{
   text-align: center;
-  padding-top: 30px;
+  position: absolute;
+  width: 100%;
+  bottom: 25px;
 }
 .description_close img{
-  width: 137px;
-  height: 35px;
+  width: 192px;
+  height: 49px;
   cursor: pointer;
 }
 .description_bg>img{
@@ -63,7 +66,7 @@
 </style>
 <template>
   <div class="description">
-    <div class="description_bg">
+    <div class="description_bg" :style="{zoom: zoom}">
       <div class="description_info">
         <p>{{data}}</p>
       </div>
@@ -79,7 +82,7 @@
 </template>
 <script>
 export default {
-  props:['data'],
+  props:['data', 'zoom'],
   data(){
     return{
       closeShow: 2

src/components/taskPage/IceCream/myExchange.vue

+<style scoped>
+.myExchange{
+  width: 100%;
+  height: 100%;
+  background:rgba(0, 0, 0, .5);
+  position: absolute;
+  left: 0;
+  top: 0;
+  z-index: 2018;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.myExchange .myExchange_bg{
+  height: 727px;
+  width: 935px;
+  background: url('../../../assets/img/task/duihuan_bg.png');
+  background-size: 100% 100%;
+  position: relative;
+}
+.myExchange .myExchange_box{
+  padding: 202px 65px 55px 65px;
+  display: flex;
+  /* justify-content: space-between; */
+  flex-wrap: wrap;
+}
+.myExchange .myExchange_box .item{
+  width: 198px;
+  height: 220px;
+  background: url('../../../assets/img/task/duihuan_small_bg.png');
+  background-size: 100% 100%;
+  margin-bottom: 30px;
+  text-align: center;
+  position: relative;
+}
+.myExchange .myExchange_box .item .item_img{
+  height: 139px;
+  max-width: 70%;
+  margin: 20px auto 0 auto;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.myExchange .myExchange_box .item .item_img img{
+  max-height: 139px;
+  max-width: 70%;
+}
+.myExchange .myExchange_box .item .item_name{
+  font-size: 16px;
+  color: rgba(72, 17, 0, 1);
+  width: 125px;
+  height: 33px;
+  background:rgba(255,204,0,1);
+  box-shadow: 0px 2px 7px 0px rgba(255,114,0,0.5);
+  border-radius: 16px;
+  display: inline-block;
+  line-height: 33px;
+  cursor: pointer;
+  transition: all linear .5s;
+}
+.myExchange .myExchange_box .item .item_name:hover{
+  background:rgb(239, 194, 18);
+}
+.myExchange .myExchange_close{
+  position: absolute;
+  right: 0;
+  top: 135px;
+  cursor: pointer;
+}
+.myExchange .myExchange_box .item .right_number{
+  display: inline-block;
+  width:39px;
+  height:39px;
+  background:rgba(255,86,86,1);
+  border-radius:50%;
+  text-align: center;
+  line-height: 39px;
+  font-weight:500;
+  color:rgba(255,255,255,1);
+  font-size: 20px;
+  font-family: 'PingFangR';
+  position: absolute;
+  right: 5px;
+}
+</style>
+<template>
+  <div class="myExchange">
+    <div class="myExchange_bg" :style="{zoom: zoom}">
+      <div class="myExchange_box">
+        <div class="item" v-for="(item, index) in list">
+          <span class="right_number">x1</span>
+          <div class="item_img">
+            <img :src="item.src" alt="">
+          </div>
+          <span class="item_name">{{item.name}}</span>
+        </div>
+      </div>
+      <div @mouseover="closeShow = 1" @mouseout="closeShow = 2" class="myExchange_close" @click="close">
+        <img v-if="closeShow === 2" src="../../../assets/img/task/close.png" alt="">
+        <img v-else src="../../../assets/img/task/close2.png" alt="">
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: ['zoom'],
+  data(){
+    return{
+      closeShow: 2,
+      list: [
+        {
+          id: 0,
+          name: '签证',
+          src: require('../../../assets/img/task/img1.png'),
+        },
+        {
+          id: 1,
+          name: '特价机票',
+          src: require('../../../assets/img/task/img2.png'),
+        },
+        {
+          id: 2,
+          name: '跟团游',
+          src: require('../../../assets/img/task/img3.png'),
+        },
+        {
+          id: 3,
+          name: '当地游',
+          src: require('../../../assets/img/task/img4.png'),
+        },
+        {
+          id: 4,
+          name: '自由行',
+          src: require('../../../assets/img/task/img5.png'),
+        },
+        {
+          id: 5,
+          name: '抽奖券',
+          src: require('../../../assets/img/task/img6.png'),
+        }
+      ]
+    }
+  },methods:{
+    close: function () {
+      this.$emit('closeMyWindow', 'Exchange')
+    },
+  },mounted(){
+
+  }
+
+}
+</script>

src/components/taskPage/IceCream/myTicket.vue

@@ -65,7 +65,7 @@
 </style>
 <template>
   <div class="myTicket">
-    <div class="myTicket_bg">
+    <div class="myTicket_bg" :style="{zoom: zoom}">
       <div class="myTicket_box">
         <div class="item" v-for="(item, index) in list">
           <div class="item_img">
@@ -84,6 +84,7 @@
 
 <script>
 export default {
+  props: ['zoom'],
   data(){
     return{
       closeShow: 2,

src/components/taskPage/IceCream/raffleTickets.vue

@@ -46,7 +46,7 @@
   font-family: 'PingFangR';
   position: absolute;
   left: 166px;
-  top: 167px;
+  top: 203px;
   text-align: center;
 }
 .raffleTickets .tips .small{
@@ -64,10 +64,6 @@
           <p>抽奖券</p>
           <p class="small">仅限于（2019年8月21日 21：）“  狂欢夜·瓜分百万现金  ”活动中使用</p>
         </div>
-        <div @mouseover="closeShow = 1" @mouseout="closeShow = 2" class="raffleTickets_close">
-          <img  @click="close" v-if="closeShow === 2" src="../../../assets/img/task/quan_lq.png" alt="">
-          <img  @click="close" v-else src="../../../assets/img/task/quan_lq1.png" alt="">
-        </div>
       </div>
       <img @click="close" src="../../../assets/img/task/des_close.png" alt="">
     </div>
@@ -78,7 +74,6 @@ export default {
   props:['data'],
   data(){
     return{
-      closeShow: 2
     }
   },methods:{
     close: function () {

src/components/taskPage/IceCream/signCalendar.vue

+<style>
+.signCalendar{
+  width: 100%;
+  height: 100%;
+  background:rgba(0, 0, 0, .5);
+  position: absolute;
+  left: 0;
+  top: 0;
+  z-index: 2018;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.signCalendar .signCalendar_bg{
+  min-height: 666px;
+  width: 498px;
+  background: url('../../../assets/img/task/qiandao_bg.png');
+  background-size: 100% 100%;
+  position: relative;
+  box-sizing: border-box;
+  padding: 156px 67px 108px 13px;
+}
+.signCalendar .signCalendar_bg>img{
+  position: absolute;
+  right: -40px;
+  top: 66px;
+  cursor: pointer;
+  width: 38px;
+  height: 38px;
+}
+.signCalendar .signCalendar_bg .signCalendar_tit{
+  text-align: center;
+  color: #FFFFFF;
+}
+.signCalendar .signCalendar_bg .signCalendar_tit .el-icon{
+  cursor: pointer;
+}
+.signCalendar .signCalendar_bg .signCalendar_tit span{
+  padding: 0 60px;
+  font-weight:800;
+  font-family: 'PingFangR'
+}
+.signCalendar .signCalendar_box{
+  padding: 26px 25px;
+}
+.signCalendar .signCalendar_box .signCalendar_box_tit{
+  padding: 0 15px;
+  font-size: 20px;
+  font-weight: 600;
+  font-family: 'PingFangR';
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  line-height: 30px;
+  background:rgba(255,167,72,1);
+  border-radius:15px;
+  color: white;
+}
+.signCalendar .monthDayList{
+  padding: 10px 0;
+}
+.signCalendar .monthDayList .dayList {
+  position: relative;
+  float: left;
+  width: 42px;
+  height: 48px;
+  border: none;
+  font-size: 12px;
+  text-align: center;
+  box-sizing: border-box;
+  margin: 5px;
+}
+.signCalendar .monthDayList .dayList.behind{
+  background-color: #FFF5B9 !important;
+}
+.signCalendar .monthDayList .dayList.behind div{
+  color: #FF8400 !important;
+  border-color: #FF8400 !important;
+}
+.signCalendar .monthDayList .dayList div{
+  height: 23px;
+  width: 23px;
+  border-radius: 50%;
+  margin: 0 auto;
+  border: 1px solid #FFFFFF;
+  color: #FFFFFF;
+  margin-top: 2px;
+  line-height: 23px;
+}
+.signCalendar .monthDayList .dayList p{
+  background:rgba(255,132,0,1);
+  font-size: 12px;
+  color: white;
+  margin: 0 auto;
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+}
+.signCalendar .monthDayList .yiqiandao{
+  display: inline-block;
+  height: 16px;
+  width: 16px;
+  border-radius: 50%;
+  background:rgba(255,76,76,1);
+  color: white;
+  line-height: 16px;
+  position: absolute;
+  right: -5px;
+  top: -5px;
+}
+</style>
+<template>
+  <div class="signCalendar">
+    <div class="signCalendar_bg" :style="{zoom: zoom}">
+      <p class="signCalendar_tit"><i class="el-icon el-icon-caret-left"></i> <span>2019年6月</span> <i class="el-icon el-icon-caret-right"></i></p>
+      <div class="signCalendar_box">
+        <div class="signCalendar_box_tit">
+          <span v-for="(item, index) in week" :key="index">{{item}}</span>
+        </div>
+        <div class="monthDayList clearfix">
+          <div v-for="(item,index) in daysData" class="dayList" :style="{backgroundColor: item.day !== ' ' ? '#CCCCCC' : '', cursor: item.cup ? 'pointer' : ''}" :class="{behind: item.day!==' ' && currentDay < item.day}" :key="index"  >
+            <span v-if="item.qian" class="yiqiandao el-icon-check"></span>
+            <div v-if="item.day">
+              <span class="iconfont icon-caidan_wujiaoxingkong" v-if="!item.today"></span>
+              <span v-else>签</span>
+            </div>
+            <p>{{item.day}}</p>
+          </div>
+        </div>
+      </div>
+      <img class="__close" @click="close" src="../../../assets/img/task/des_close.png" alt="">
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  props: ['zoom'],
+  data(){
+    return{
+      week: ['日','一','二','三','四','五','六'],
+      DaysInMonth: [],
+      daysData: [],
+      currentMonth: 0,
+      currentYear: 0,
+      currentDay: 0,
+    }
+  },methods:{
+    getYearMonthDay(){
+      let date = new Date();
+      let newDate = date.getFullYear()+"-"+((date.getMonth()+1) < 9 ? '0' + (date.getMonth()+1) : date.getMonth()+1) + "-" + (date.getDate() < 9 ? '0' + date.getDate() : date.getDate() );
+      let currentYear = newDate.substring(0,4); //当前年份
+      let currentMonth = newDate.substring(5,7); //当前月份
+      let newDay = date.getDate(); //当前天
+			let strDate = date.getDate();
+			let strMonth = (date.getMonth()+1).toString();
+			// alert(typeof strMonth)
+		//判断是否是闰年
+			if (this.isleapYears(currentYear)) { 
+				this.DaysInMonth = [31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+			}else{
+				this.DaysInMonth = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+			}
+			let monthDay = this.DaysInMonth[Number(currentMonth)-1];//当前月的天数			
+			let daysData = [];
+			//给数据源赋值
+			for (var i = 0 ;i < Number(monthDay) ;i++) {
+				var priceDict = {
+          'day': i+1,
+          'price': 0,
+          'today': i+1 === newDay ? true : false,
+          'cup': (this.currentYear === currentYear && this.currentMonth === currentMonth && this.currentDay === i+1) ? true : false,
+          'qian': i+1 < this.currentDay ? true : false
+        };
+				daysData.push(priceDict);
+			}
+			this.daysData = daysData;
+			var currentDay = `${currentYear}-${currentMonth}-01`;
+			var dateObject = new Date(currentDay);
+      var firstDay = dateObject.getDay();//得到每个月1号是周几
+			if (firstDay > 0) {
+				var firstDayData = [];
+				for (var i=0; i< firstDay;i++) {
+					var dict = {'day':' ',price:'','dis':true};
+					firstDayData.push(dict);
+				}
+				this.daysData = firstDayData.concat(daysData);
+			}else{
+				this.daysData = daysData;
+			}
+		},		
+		isleapYears(year){
+			if (((year % 4)==0) && ((year % 100)!=0) || ((year % 400)==0)) { 
+				return true;
+			} else{				
+				return false;
+			}
+		},
+    close: function () {
+      this.$emit('closeMyWindow', 'signCalendar')
+    }
+  },mounted(){
+    let date = new Date();
+    let newDate = date.getFullYear()+"-"+((date.getMonth()+1) < 9 ? '0' + (date.getMonth()+1) : date.getMonth()+1) + "-" + (date.getDate() < 9 ? '0' + date.getDate() : date.getDate() );
+    this.currentYear = newDate.substring(0,4);
+    this.currentMonth = newDate.substring(5,7);
+    this.currentDay = date.getDate(); //当前天
+    this.getYearMonthDay()
+  }
+}
+</script>

src/components/taskPage/IceCream/ticketList.vue

@@ -12,8 +12,8 @@
   justify-content: center;
 }
 .ticketList .ticketList_bg{
-  height: 538px;
-  width: 300px;
+  min-height: 756px;
+  width: 422px;
   background: url('../../../assets/img/task/quanlist.png');
   background-size: 100% 100%;
   position: relative;
@@ -29,35 +29,185 @@
   height:37px;
 }
 .ticketList .ticketList_box{
-  padding: 10px;
+  padding: 17px 15px;
 }
 .ticketList .ticketList_tit{
-  width:280px;
-  height:85px;
-  background:rgba(255,255,255,.68);
-  border-top-left-radius:21px;
-  border-top-right-radius:21px;
+  width: 392px;
+  /* height: 85px; */
+  background: rgba(255,255,255,.68);
+  border-top-left-radius: 21px;
+  border-top-right-radius: 21px;
 }
 .ticketList .ticketList_tit .top_btn{
   display: flex;
   justify-content: space-between;
   align-items: center;
   height: 52px;
-  padding: 4px 8px 0;
-  border-bottom:2px dashed rgba(255,148,21,1);
+  padding: 15px 15px 5px;
+  
 }
 .ticketList .ticketList_tit .top_btn img{
-  width:127px;
-  height:40px;
+  width: 178px;
+  height: 56px;
   cursor: pointer;
 }
+.ticketList .ticketList_tit .hebing_nav{
+  border-top:2px dashed rgba(255,148,21,1);
+}
+.ticketList .ticketList_tit .hebing_nav .hebing{
+  width:64px;
+  height:20px;
+  display: inline-block;
+  background-color: RGBA(154, 154, 154, 1);
+  text-align: center;
+  line-height: 20px;
+  color: white;
+  border-radius: 16px;
+  cursor: pointer;
+  font-size: 12px;
+}
+.ticketList .ticketList_tit .hebing_nav .hebing.hebing2{
+  background-color: #ff5656;
+}
+.ticketList .ticketList_tit .hebing_nav {
+  display: flex;
+  align-items: center;
+  padding: 4px 6px;
+  padding-right: 15px;
+  justify-content: space-between;
+}
 .ticketList .el-checkbox__inner{
   border-radius: 50%;
 }
+.ticketList .el-checkbox-group .el-checkbox{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin: 20px 10px 20px 5px;
+}
+.ticketList .el-checkbox__input.is-checked .el-checkbox__inner{
+  background-color: white;
+  border-color: rgba(255, 86, 86, 1);
+} 
+.ticketList .el-checkbox__input.is-indeterminate .el-checkbox__inner{
+  background-color: #ff5656;
+  border-color: #ff5656;
+}
+.ticketList .el-checkbox__input.is-checked+.el-checkbox__label {
+  color: #ff5656;
+}
+.ticketList .el-checkbox__inner:hover {
+  border-color: #ff5656;
+}
+.ticketList .container{
+  height: 550px;
+  overflow: auto;
+}
+.ticketList .container::-webkit-scrollbar{
+  /*滚动条整体样式*/
+  width: 13px;
+  /*高宽分别对应横竖滚动条的尺寸*/
+  height: 8px;
+}
+.ticketList .container::-webkit-scrollbar-thumb {
+  /*滚动条里面小方块*/
+  border-radius: 4px; 
+  background: rgba(255, 224, 100, 1);
+}
+.ticketList .container::-webkit-scrollbar-track {
+  /*滚动条里面轨道*/ 
+  border-radius: 4px;
+  background: rgba(31, 168, 176, 1);
+}
+.ticketList .container .item{
+  width: 316px;
+  height: 102px;
+  background:rgba(255,255,255,1);
+  border-radius:14px;
+  position: relative;
+  overflow: hidden;
+}
+.ticketList .container2 .item{
+  position: relative;
+  margin: 20px auto;
+  overflow: hidden;
+}
+.ticketList .bottom_btn{
+  text-align: center;
+  padding: 8px ;
+}
+.ticketList .bottom_btn img{
+  width: 185px;
+  height: 64px;
+  cursor: pointer;
+  margin-top: 10px;
+}
+.ticketList .item .el-row{
+  height: 100%;
+  display: flex;
+}
+.ticketList .item .el-row .left{
+  background:rgba(255,136,136,1);
+  color: white;
+  height: calc(100% - 32px);
+  display: flex;
+  align-items: flex-end;
+  padding: 16px 6px
+}
+.ticketList .item .el-row .left .num{
+  font-size: 88px;
+  font-family: 'PingFangR';
+  font-weight: bold;
+  margin-bottom: -26px;
+  position: relative;
+}
+.ticketList .item .el-row .left .num span{
+  display: inline-block;
+  width: 20px;
+  height: 20px;
+  font-size: 14px;
+  line-height: 20px;
+  text-align: center;
+  position: absolute;
+  right: 1px;
+  top: 37px;
+  background-color: #ff8888;
+  border-radius: 50%;
+}
+.ticketList .item .el-row .right {
+  padding: 11px 20px;
+  line-height: 25px;
+}
+.ticketList .item .el-row .right ._name{
+  font-size:28px;
+  font-family: 'PingFangR';
+  font-weight:bold;
+  color:rgba(63,63,63,1);
+}
+.ticketList .item .el-row .right ._type{
+  font-size: 22px;
+  color:rgba(63,63,63,1);
+  margin-top: 3px;
+}
+.ticketList .item .el-row .right ._btn{
+  display: inline-block;
+  width: 110px;
+  text-align: center;
+  font-size: 20px;
+  color: white;
+  background:rgba(255,86,86,1);
+  margin-top: 3px;
+  cursor: pointer;
+}
+.ticketList .el-checkbox__inner::after{
+  border: 1px solid #ff5656;
+  border-left: 0;
+  border-top: 0;
+}
 </style>
 <template>
   <div class="ticketList">
-    <div class="ticketList_bg">
+    <div class="ticketList_bg" :style="{zoom: zoom}">
       <div class="ticketList_box">
         <div class="ticketList_tit">
           <div class="top_btn">
@@ -70,16 +220,45 @@
               <img v-else @click="activeNav = 2" src="../../../assets/img/task/yishiyong.png" alt="">
             </div>
           </div>
-          <div>
-            <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
-            <span>合并</span>
+          <div v-if="activeNav === 1" class="hebing_nav">
+            <template>
+              <el-checkbox v-if="hebing === 2" :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
+              <span v-else>&nbsp;</span>
+            </template>
+            <span @click="hebing = hebing===1 ? 2 : 1, checkedCities=[]" :class="{'hebing2': hebing===1}" class="hebing">合并</span>
           </div>
         </div>
-        <div>
+        <div class="container" v-if="activeNav === 1 && hebing === 2">
           <el-checkbox-group v-model="checkedCities" @change="handleCheckedCitiesChange">
-            <el-checkbox v-for="city in cities" :label="city" :key="city">{{city}}</el-checkbox>
+            <el-checkbox v-for="city in cities" :label="city" :key="city">
+              <div class="item">
+                
+              </div>
+            </el-checkbox>
           </el-checkbox-group>
         </div>
+        <div class="container container2" v-else>
+          <div class="item" v-for="city in cities" :label="city" :key="city">
+            <el-row>
+              <el-col :span="10">
+                <div class="left">
+                  ￥<span class="num">20<span>元</span></span>
+                </div>
+              </el-col>
+              <el-col :span="14">
+                <div class="right">
+                  <p class="_name">签证</p>
+                  <p class="_type">现金抵用券</p>
+                  <span class="_btn">立即使用</span>
+                </div>
+              </el-col>
+            </el-row>
+          </div>
+        </div>
+        <div @mouseover="hebingBtn = 1" @mouseout="hebingBtn = 2" class="bottom_btn">
+          <img v-if="hebingBtn === 2" src="../../../assets/img/task/hebing.png" alt="">
+          <img v-else src="../../../assets/img/task/hebing1.png" alt="">
+        </div>
       </div>
       <div @mouseover="closeShow = 1" @mouseout="closeShow = 2" class="ticketList_close" @click="close">
         <img v-if="closeShow === 2" src="../../../assets/img/task/close.png" alt="">
@@ -89,17 +268,19 @@
   </div>
 </template>
 <script>
-const cityOptions = ['上海', '北京', '广州', '深圳'];
+const cityOptions = ['上海', '北京', '广州', '深圳', '成都'];
 export default {
-  props: ['id'],
+  props: ['id', 'zoom'],
   data() {
     return{
       closeShow: 1,
       activeNav: 1,
-      heckAll: false,
-      checkedCities: ['上海', '北京'],
+      checkAll: false,
+      checkedCities: [],
       cities: cityOptions,
-      isIndeterminate: true
+      isIndeterminate: true,
+      hebing: 1,
+      hebingBtn: 1,
     }
   },methods:{
     handleCheckAllChange(val) {

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",