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

src/components/Home.vue

@@ -451,15 +451,14 @@
               </div>
           </div>
 
-        <!-- 冰糕活动跳转 -->
-        <!-- <el-row style="margin: 20px 0;cursor: pointer;">
+        <!-- 冰糕活动跳转 --><el-row style="margin: 20px 0;cursor: pointer;">
           <img
             @click="FootgoUrl('IceCreamTask')"
             class="huodong_img"
             src="../assets/img/active/huodong_img1.png"
             alt
-          >
-        </!-->
+          > 
+          </el-row>
           <!-- 景点门票 -->
           <div class="Ticket_spots">
             <ul class="common_ul_tab">

src/components/global/newHead.vue

@@ -321,12 +321,12 @@
             </div>
           </li>-->
           <!-- 活动中心 -->
-          <!-- <li :class="{_active: navActive === 9}" style="width: auto;">
+          <li :class="{_active: navActive === 9}" style="width: auto;">
             <div @click="handleSelect('/IceCreamTask', 9), navActive = 9">
               <img style="z-index: -1;position: absolute;top: -27px;" src="../../assets/img/task/nav_bg.png" alt="">
-              <li src="../../assets/img/task/nav_text.png" alt="">
+              <img src="../../assets/img/task/nav_text.png" alt="">
             </div>
-          </li>-->
+          </li>
         </ul>
       </div>
       <!-- <div  id="map-container" class="map-container">

src/components/taskPage/IceCream/shoppingMall.vue

@@ -183,7 +183,7 @@
                 <img :src="item.imgs[0]" alt="">
               </div>
               <span class="info" @click="goDetails(item.id)" :title="item.name">{{item.name}}</span>
-              <span class="_d">可兑换：<span>{{item.residue}}次</span></span>
+              <span class="_d" v-if="item.residue !== 0">可兑换：<span>{{item.limited}}次</span></span>
             </div>
             <div class="bottom">
               <p class="price"><span class="_s">市场价：￥{{item.marketPrice}}</span></p>
@@ -198,7 +198,7 @@
                   </template>
                 </div>
                 <template>
-                  <span v-if="item.residue < 1" class="no_dui">兑换</span>
+                  <span v-if="item.residue !== 0 && item.limited < 1" class="no_dui">兑换</span>
                   <span v-else @click="setExchangeGoods(item.id)">兑换</span>
                 </template>
               </div>

src/plugins/index.js

@@ -261,7 +261,7 @@ export default {
                         } else if (res.data.resultCode == 10005) {
                             this.$router.go(-1)
                         } else {
-                            if (res.data.award) {
+                            if (res.data.award && res.data.award.mName!==null) {
                                 this.MsgBus.$emit('openRaffleTickets', res.data.award)
                             }
                             successCall(res)