Commit 4e8550c8 authored by 华国豪's avatar 华国豪 🙄

完成任务

parent d75bb90c
...@@ -247,11 +247,11 @@ ...@@ -247,11 +247,11 @@
<!-- 全家桶 --> <!-- 全家桶 -->
<allHome v-show="allHomeShow" @closeMyWindow="closeMyWindow" name='allHome'/> <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'/> <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'/> <signCalendar v-if="signCalendarShow" @closeMyWindow="closeMyWindow" :ActivityID='ActivityInfo.id' :zoom="zoom" name='signCalendar'/>
<!-- 我的冰淇淋 --> <!-- 我的冰淇淋 -->
......
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
<p class="_info">{{item.awardMaterials}}</p> <p class="_info">{{item.awardMaterials}}</p>
</div> </div>
<div class="item_btn"> <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 _green" v-else-if="item.taskStatus === 1">已完成</span>
<span class="_gray" v-else>未完成</span> <span class="_gray" v-else>未完成</span>
</div> </div>
...@@ -170,6 +170,9 @@ export default { ...@@ -170,6 +170,9 @@ export default {
}, },
close: function() { close: function() {
this.$emit("closeMyWindow", "myAssignment"); this.$emit("closeMyWindow", "myAssignment");
},
goUrl: function (path) {
this.$router.push({path: path});
} }
}, },
mounted() { mounted() {
......
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
<div class="item_img"> <div class="item_img">
<img :src="item.imgs" alt=""> <img :src="item.imgs" alt="">
</div> </div>
<span class="item_name">{{item.name}}</span> <span class="item_name" @click="goUrl('myPointOrder')">{{item.name}}</span>
</div> </div>
</div> </div>
<div @mouseover="closeShow = 1" @mouseout="closeShow = 2" class="myExchange_close" @click="close"> <div @mouseover="closeShow = 1" @mouseout="closeShow = 2" class="myExchange_close" @click="close">
...@@ -133,6 +133,9 @@ export default { ...@@ -133,6 +133,9 @@ export default {
close: function () { close: function () {
this.$emit('closeMyWindow', 'Exchange') this.$emit('closeMyWindow', 'Exchange')
}, },
goUrl: function (path) {
this.$router.push({path: path});
}
},mounted(){ },mounted(){
this.getActivityGoods() this.getActivityGoods()
} }
......
...@@ -61,8 +61,8 @@ ...@@ -61,8 +61,8 @@
<div class="raffleTickets_bg"> <div class="raffleTickets_bg">
<div> <div>
<div class="tips"> <div class="tips">
<p>抽奖券</p> <p>{{raffleTicketsData.mName}}</p>
<p class="small">仅限于(2019年8月21日 21:)“ 狂欢夜·瓜分百万现金 ”活动中使用</p> <!-- <p class="small">仅限于(2019年8月21日 21:)“ 狂欢夜·瓜分百万现金 ”活动中使用</p> -->
</div> </div>
</div> </div>
<img @click="close" src="../../../assets/img/task/des_close.png" alt=""> <img @click="close" src="../../../assets/img/task/des_close.png" alt="">
......
...@@ -31,7 +31,7 @@ export default { ...@@ -31,7 +31,7 @@ export default {
DomainUrl: domainUrl, DomainUrl: domainUrl,
//常用提交数据URL //常用提交数据URL
PostUrl: domainUrl + "/api/common/post", 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', 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", UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://upload.oytour.com" : "http://192.168.2.214:8120",
LocalFileStreamDownLoadUrl: domainUrl + "/api/file/GetFileFromWebApi", LocalFileStreamDownLoadUrl: domainUrl + "/api/file/GetFileFromWebApi",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment