Skip to content

dev / lilejia-f2mb-pro

Go to a project
Toggle navigation
Toggle navigation pinning
2fd73dd4 by joe
Options

第一版修改意见（内部）

1 parent 222cda25
Inline Side-by-side
Showing 10 changed files with 118 additions and 27 deletions

31.2 KB | W: | H:

30.3 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
......@@ -26,7 +26,10 @@
<div class="model-title">微信提示</div>
<div class="successModel">
<div class="model-data">扫码关注<br>及时了解最新赛况及结果哦！</div>
<div class="model-data">
扫码关注
<br />及时了解最新赛况及结果哦！
</div>
<div class="qrcode">
<img src="../../assets/imgs/walfare-qrcode.png" />
</div>
......@@ -36,9 +39,10 @@
</div>
</div>
<!-- 规则-->
<div class="model rule-model" v-if="data.index == 'rule'">
<div class="model-close" @click="modelCloseHandler"></div>
<!-- 规则-->
<div class="model-content">
<div class="model-head-line"></div>
<div class="model-title">{{data.title}}</div>
......@@ -46,23 +50,23 @@
<div class="rule-container">
<div class="rule-line">
<div>1.</div>
<div>每位微信用户每天可投一票；</div>
<div>每位微信用户每天可投一票</div>
</div>
<div class="rule-line">
<div>2.</div>
<div>投票后可以获得一次抽奖机会；</div>
<div>投票后可以获得一次抽奖机会</div>
</div>
<div class="rule-line">
<div>3.</div>
<div>严禁恶意刷人气，一经发现将立即取消选手人气评选资格；</div>
<div>严禁恶意刷人气，一经发现将立即取消选手人气评选资格</div>
</div>
<div class="rule-line">
<div>4.</div>
<div>本组委会保留最终解释权；</div>
<div>本组委会保留最终解释权</div>
</div>
<div class="rule-line">
<div>5.</div>
<div>报名截止时间9月19日23：59，投票截止时间9月20日23：59，最终入围名单将在9月21在嘉佳卡通卫视官方微信号公布</div>
<div>报名截止时间9月19日23:59，投票截止时间9月20日23:59，最终入围名单将在9月21日在立乐家微信公众号公布</div>
</div>
<div class="rule-line">
<div>6.</div>
......@@ -76,6 +80,38 @@
</div>
</div>
</div>
<!-- 奖品-->
<div class="model rule-model" v-if="data.index == 'prize'">
<div class="model-close" @click="modelCloseHandler"></div>
<div class="model-content">
<div class="model-head-line"></div>
<div class="model-title">{{data.title}}</div>
<div class="rule-container">
<div class="rule-line sm-width">
<div>超级大奖:珠海长隆海洋王国2天1夜亲自游</div>
</div>
<div class="rule-line sm-width">
<div>幸运大奖:立白集团立乐家商城1000元现金券</div>
</div>
<div class="rule-line sm-width">
<div>超洁净奖:立白集团礼包</div>
</div>
<div class="rule-line sm-width">
<div>好运来奖:立白集团立乐家商城无门槛现金券</div>
</div>
<div class="rule-line sm-width">
<div>幸福满满奖:立白集团立乐家商城会员积分</div>
</div>
</div>
<div class="successModel">
<div v-if="data.btnShow" class="sys-btn-02" @click="modelBtnClickHandler">{{data.btnText}}</div>
<div class="model-bottom-line"></div>
</div>
</div>
</div>
</van-popup>
</template>
......@@ -234,5 +270,14 @@ export default {
min-width: 40px;
}
}
.sm-width {
width: 480px !important;
margin-bottom: 30px;
div {
font-weight: 600;
}
}
}
</style>
......
......@@ -43,6 +43,7 @@ export default {
props: ["value"],
data() {
return {
init: false,
activityIndex: this.value,
model: {
show: false,
......@@ -72,11 +73,22 @@ export default {
this.$router.push("/");
break;
case 2:
if (this.init) {
if (this.indexData.isSubcribe == 1) {
this.$router.push("/sign");
} else {
this.model.show = true;
}
} else {
httpGet({ url: urls.index }).then(res => {
this.indexData = res;
if (this.indexData.isSubcribe == 1) {
this.$router.push("/sign");
} else {
this.model.show = true;
}
});
}
break;
case 3:
this.$router.push("/list");
......@@ -89,12 +101,9 @@ export default {
}
},
created() {
if (!this.activityIndex) {
this.activityIndex = 1;
}
httpGet({ url: urls.index }).then(res => {
this.indexData = res;
this.init = true;
});
},
components: {
......
......@@ -36,13 +36,15 @@
<div class="draw-tip">请选择任意一张翻牌开启奖品</div>
<div class="btn-view-prize" @click="model.show =true"></div>
<div class="btn-view-prize" @click="bizModel.show=true"></div>
</div>
<div class="bottom-line"></div>
<bottom-tool v-model="activityIndex"></bottom-tool>
<draw-model v-model="model"></draw-model>
<biz-model v-model="bizModel"></biz-model>
</div>
</template>
......@@ -57,6 +59,7 @@ let urls = {
import { httpGet } from "@/api/fetch-api";
import BottomTool from "@/components/bottom-tools/bottom-tools";
import DrawModel from "@/components/biz-model/draw-model";
import BizModel from "@/components/biz-model/biz-model";
import HeadView from "@/components/plugins/head";
......@@ -91,6 +94,18 @@ export default {
show: false,
drawResult: {}
},
bizModel: {
show: false,
title: "活动奖品",
content: "",
index: "prize",
btnShow: true,
btnText: "我知道了",
confirmHandler: null,
labelBtnShow: false,
labelBtnText: "",
labelBtnHandler: null
},
rotate: {
target: "",
isRotate: false
......@@ -148,7 +163,8 @@ export default {
components: {
BottomTool,
DrawModel,
HeadView
HeadView,
BizModel
},
mounted() {
this.initActivity();
......
......@@ -25,7 +25,7 @@
</van-col>
</van-cell>
<van-col span="24" v-if="worksList.length == 0 ">
<van-col span="24" v-if="worksList.length == 0 && !isLoading">
<div class="empty">
<div class="empty-icon">
<van-icon name="warn-o" />
......
......@@ -42,6 +42,12 @@
<div class="label">竞赛宣言：</div>
<div class="msg">{{formData.slogan}}</div>
</div>
<div class="text-container space top">
<div class="label">个人简介：</div>
<div class="msg">{{formData.profile}}</div>
</div>
</div>
<div class="view-btn-group">
......
<template>
<div class="viewClass" v-if="init">
<div class="viewClass">
<div class="btn-show-rule" @click="showRuleHandler"></div>
<div v-if="indexForm.worksCode">
<div v-if="formData.worksCode">
<div class="sys-container-panel content top-marin">
<div class="container-title">人气评选</div>
<div class="head-line"></div>
......@@ -45,10 +45,10 @@
</div>
<div
class="sys-container-panel content list-panel"
v-bind:class="{'top-marin' : indexForm.worksCode == ''}"
v-bind:class="{'top-marin' : !formData.worksCode}"
>
<div class="container-title" v-if="!indexForm.worksCode">人气评选</div>
<div class="head-line" v-if="!indexForm.worksCode"></div>
<div class="container-title" v-if="!formData.worksCode">人气评选</div>
<div class="head-line" v-if="!formData.worksCode"></div>
<list-view v-on:worksDetail="showWorksDetail"></list-view>
<div class="bottom-line"></div>
......@@ -89,7 +89,6 @@ export default {
methods: {
initActvity() {
httpGet({ url: urls.index, data: {} }).then(res => {
this.init = true;
this.indexForm = res;
// this.indexForm.worksCode = "";
});
......
......@@ -98,13 +98,13 @@ export default {
httpGet({ url: urls.myWork }).then(res => {
this.init = true;
Toast.clear();
this.formData = res.data || {};
if (!res.data) {
this.formEdit = true;
} else {
this.formEdit = false;
}
Toast.clear();
});
},
showRuleHandler() {
......
......@@ -62,7 +62,11 @@
</div>
<div class="sys-btn-02" :class="{disabled : !autoRegister}" @click="submitFormHandler">确认提交</div>
<div class="center base-margin auto-register-tips" @click="acceptRegisterHandler">
<div
class="center base-margin auto-register-tips"
@click="acceptRegisterHandler"
v-if="formData.worksCode == '' || formData.worksCode == null "
>
<div class="icon-register" :class="{activity : autoRegister}"></div>
<div class="tips">自动注册为立白集团会员，立享会员权益，详见“更多福利”</div>
</div>
......
......@@ -4,7 +4,9 @@
<div class="container-title">我要报名</div>
<div class="head-line"></div>
<div class="edit">
<u @click="formEditHandler">信息编辑</u>
<u @click="formEditHandler">
<van-icon name="edit" />信息编辑
</u>
</div>
<div class="swipe">
<van-swipe :autoplay="5000">
......@@ -32,13 +34,13 @@
</div>
<div class="text-container space top">
<div class="label">我的简介：</div>
<div class="msg">{{formData.profile}}</div>
<div class="label">竞赛宣言：</div>
<div class="msg">{{formData.slogan}}</div>
</div>
<div class="text-container space top">
<div class="label">竞赛宣言：</div>
<div class="msg">{{formData.slogan}}</div>
<div class="label">我的简介：</div>
<div class="msg">{{formData.profile}}</div>
</div>
<div class="privacy">
......@@ -67,7 +69,9 @@ import { request } from "@/api/fetch-api";
import Vue from "vue";
import { Toast } from "vant";
import { Swipe, SwipeItem } from "vant";
import { Icon } from "vant";
Vue.use(Icon);
Vue.use(Swipe).use(SwipeItem);
Vue.use(Toast);
......@@ -131,6 +135,9 @@ export default {
color: #5db288;
position: relative;
z-index: 1000;
display: flex;
align-items: center;
justify-content: flex-end;
}
}
......@@ -138,6 +145,7 @@ export default {
width: 630px;
height: 451px;
margin: auto;
margin-top: 15px;
border: 2px solid #82acae;
border-radius: 30px;
overflow: hidden;
......@@ -198,6 +206,7 @@ export default {
color: #303531;
font-size: 24px;
text-align: left;
min-width: 120px;
}
.primay {
font-size: 32px !important;
......@@ -240,4 +249,7 @@ export default {
background: url(../../../assets/imgs/draw-down.png) no-repeat;
background-size: 100%;
}
.van-icon-edit {
font-size: 32px;
}
</style>
......