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 @@ ...@@ -26,7 +26,10 @@
26 <div class="model-title">微信提示</div> 26 <div class="model-title">微信提示</div>
27 27
28 <div class="successModel"> 28 <div class="successModel">
29 <div class="model-data">扫码关注<br>及时了解最新赛况及结果哦！</div> 29 <div class="model-data">
30 扫码关注
31 <br />及时了解最新赛况及结果哦！
32 </div>
30 <div class="qrcode"> 33 <div class="qrcode">
31 <img src="../../assets/imgs/walfare-qrcode.png" /> 34 <img src="../../assets/imgs/walfare-qrcode.png" />
32 </div> 35 </div>
...@@ -36,9 +39,10 @@ ...@@ -36,9 +39,10 @@
36 </div> 39 </div>
37 </div> 40 </div>
38 41
42 <!-- 规则-->
39 <div class="model rule-model" v-if="data.index == 'rule'"> 43 <div class="model rule-model" v-if="data.index == 'rule'">
40 <div class="model-close" @click="modelCloseHandler"></div> 44 <div class="model-close" @click="modelCloseHandler"></div>
41 <!-- 规则--> 45
42 <div class="model-content"> 46 <div class="model-content">
43 <div class="model-head-line"></div> 47 <div class="model-head-line"></div>
44 <div class="model-title">{{data.title}}</div> 48 <div class="model-title">{{data.title}}</div>
...@@ -46,23 +50,23 @@ ...@@ -46,23 +50,23 @@
46 <div class="rule-container"> 50 <div class="rule-container">
47 <div class="rule-line"> 51 <div class="rule-line">
48 <div>1.</div> 52 <div>1.</div>
49 <div>每位微信用户每天可投一票；</div> 53 <div>每位微信用户每天可投一票</div>
50 </div> 54 </div>
51 <div class="rule-line"> 55 <div class="rule-line">
52 <div>2.</div> 56 <div>2.</div>
53 <div>投票后可以获得一次抽奖机会；</div> 57 <div>投票后可以获得一次抽奖机会</div>
54 </div> 58 </div>
55 <div class="rule-line"> 59 <div class="rule-line">
56 <div>3.</div> 60 <div>3.</div>
57 <div>严禁恶意刷人气，一经发现将立即取消选手人气评选资格；</div> 61 <div>严禁恶意刷人气，一经发现将立即取消选手人气评选资格</div>
58 </div> 62 </div>
59 <div class="rule-line"> 63 <div class="rule-line">
60 <div>4.</div> 64 <div>4.</div>
61 <div>本组委会保留最终解释权；</div> 65 <div>本组委会保留最终解释权</div>
62 </div> 66 </div>
63 <div class="rule-line"> 67 <div class="rule-line">
64 <div>5.</div> 68 <div>5.</div>
65 <div>报名截止时间9月19日23：59，投票截止时间9月20日23：59，最终入围名单将在9月21在嘉佳卡通卫视官方微信号公布</div> 69 <div>报名截止时间9月19日23:59，投票截止时间9月20日23:59，最终入围名单将在9月21日在立乐家微信公众号公布</div>
66 </div> 70 </div>
67 <div class="rule-line"> 71 <div class="rule-line">
68 <div>6.</div> 72 <div>6.</div>
...@@ -76,6 +80,38 @@ ...@@ -76,6 +80,38 @@
76 </div> 80 </div>
77 </div> 81 </div>
78 </div> 82 </div>
83
84 <!-- 奖品-->
85 <div class="model rule-model" v-if="data.index == 'prize'">
86 <div class="model-close" @click="modelCloseHandler"></div>
87
88 <div class="model-content">
89 <div class="model-head-line"></div>
90 <div class="model-title">{{data.title}}</div>
91 <div class="rule-container">
92 <div class="rule-line sm-width">
93 <div>超级大奖:珠海长隆海洋王国2天1夜亲自游</div>
94 </div>
95 <div class="rule-line sm-width">
96 <div>幸运大奖:立白集团立乐家商城1000元现金券</div>
97 </div>
98 <div class="rule-line sm-width">
99 <div>超洁净奖:立白集团礼包</div>
100 </div>
101 <div class="rule-line sm-width">
102 <div>好运来奖:立白集团立乐家商城无门槛现金券</div>
103 </div>
104 <div class="rule-line sm-width">
105 <div>幸福满满奖:立白集团立乐家商城会员积分</div>
106 </div>
107 </div>
108
109 <div class="successModel">
110 <div v-if="data.btnShow" class="sys-btn-02" @click="modelBtnClickHandler">{{data.btnText}}</div>
111 <div class="model-bottom-line"></div>
112 </div>
113 </div>
114 </div>
79 </van-popup> 115 </van-popup>
80 </template> 116 </template>
81 117
...@@ -234,5 +270,14 @@ export default { ...@@ -234,5 +270,14 @@ export default {
234 min-width: 40px; 270 min-width: 40px;
235 } 271 }
236 } 272 }
273
274 .sm-width {
275 width: 480px !important;
276 margin-bottom: 30px;
277
278 div {
279 font-weight: 600;
280 }
281 }
237 } 282 }
238 </style> 283 </style>
......
...@@ -43,6 +43,7 @@ export default { ...@@ -43,6 +43,7 @@ export default {
43 props: ["value"], 43 props: ["value"],
44 data() { 44 data() {
45 return { 45 return {
46 init: false,
46 activityIndex: this.value, 47 activityIndex: this.value,
47 model: { 48 model: {
48 show: false, 49 show: false,
...@@ -72,11 +73,22 @@ export default { ...@@ -72,11 +73,22 @@ export default {
72 this.$router.push("/"); 73 this.$router.push("/");
73 break; 74 break;
74 case 2: 75 case 2:
76 if (this.init) {
75 if (this.indexData.isSubcribe == 1) { 77 if (this.indexData.isSubcribe == 1) {
76 this.$router.push("/sign"); 78 this.$router.push("/sign");
77 } else { 79 } else {
78 this.model.show = true; 80 this.model.show = true;
79 } 81 }
82 } else {
83 httpGet({ url: urls.index }).then(res => {
84 this.indexData = res;
85 if (this.indexData.isSubcribe == 1) {
86 this.$router.push("/sign");
87 } else {
88 this.model.show = true;
89 }
90 });
91 }
80 break; 92 break;
81 case 3: 93 case 3:
82 this.$router.push("/list"); 94 this.$router.push("/list");
...@@ -89,12 +101,9 @@ export default { ...@@ -89,12 +101,9 @@ export default {
89 } 101 }
90 }, 102 },
91 created() { 103 created() {
92 if (!this.activityIndex) {
93 this.activityIndex = 1;
94 }
95
96 httpGet({ url: urls.index }).then(res => { 104 httpGet({ url: urls.index }).then(res => {
97 this.indexData = res; 105 this.indexData = res;
106 this.init = true;
98 }); 107 });
99 }, 108 },
100 components: { 109 components: {
......
...@@ -36,13 +36,15 @@ ...@@ -36,13 +36,15 @@
36 36
37 <div class="draw-tip">请选择任意一张翻牌开启奖品</div> 37 <div class="draw-tip">请选择任意一张翻牌开启奖品</div>
38 38
39 <div class="btn-view-prize" @click="model.show =true"></div> 39 <div class="btn-view-prize" @click="bizModel.show=true"></div>
40 </div> 40 </div>
41 41
42 <div class="bottom-line"></div> 42 <div class="bottom-line"></div>
43 43
44 <bottom-tool v-model="activityIndex"></bottom-tool> 44 <bottom-tool v-model="activityIndex"></bottom-tool>
45 <draw-model v-model="model"></draw-model> 45 <draw-model v-model="model"></draw-model>
46
47 <biz-model v-model="bizModel"></biz-model>
46 </div> 48 </div>
47 </template> 49 </template>
48 50
...@@ -57,6 +59,7 @@ let urls = { ...@@ -57,6 +59,7 @@ let urls = {
57 import { httpGet } from "@/api/fetch-api"; 59 import { httpGet } from "@/api/fetch-api";
58 import BottomTool from "@/components/bottom-tools/bottom-tools"; 60 import BottomTool from "@/components/bottom-tools/bottom-tools";
59 import DrawModel from "@/components/biz-model/draw-model"; 61 import DrawModel from "@/components/biz-model/draw-model";
62 import BizModel from "@/components/biz-model/biz-model";
60 63
61 import HeadView from "@/components/plugins/head"; 64 import HeadView from "@/components/plugins/head";
62 65
...@@ -91,6 +94,18 @@ export default { ...@@ -91,6 +94,18 @@ export default {
91 show: false, 94 show: false,
92 drawResult: {} 95 drawResult: {}
93 }, 96 },
97 bizModel: {
98 show: false,
99 title: "活动奖品",
100 content: "",
101 index: "prize",
102 btnShow: true,
103 btnText: "我知道了",
104 confirmHandler: null,
105 labelBtnShow: false,
106 labelBtnText: "",
107 labelBtnHandler: null
108 },
94 rotate: { 109 rotate: {
95 target: "", 110 target: "",
96 isRotate: false 111 isRotate: false
...@@ -148,7 +163,8 @@ export default { ...@@ -148,7 +163,8 @@ export default {
148 components: { 163 components: {
149 BottomTool, 164 BottomTool,
150 DrawModel, 165 DrawModel,
151 HeadView 166 HeadView,
167 BizModel
152 }, 168 },
153 mounted() { 169 mounted() {
154 this.initActivity(); 170 this.initActivity();
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
25 </van-col> 25 </van-col>
26 </van-cell> 26 </van-cell>
27 27
28 <van-col span="24" v-if="worksList.length == 0 "> 28 <van-col span="24" v-if="worksList.length == 0 && !isLoading">
29 <div class="empty"> 29 <div class="empty">
30 <div class="empty-icon"> 30 <div class="empty-icon">
31 <van-icon name="warn-o" /> 31 <van-icon name="warn-o" />
......
...@@ -42,6 +42,12 @@ ...@@ -42,6 +42,12 @@
42 <div class="label">竞赛宣言：</div> 42 <div class="label">竞赛宣言：</div>
43 <div class="msg">{{formData.slogan}}</div> 43 <div class="msg">{{formData.slogan}}</div>
44 </div> 44 </div>
45
46
47 <div class="text-container space top">
48 <div class="label">个人简介：</div>
49 <div class="msg">{{formData.profile}}</div>
50 </div>
45 </div> 51 </div>
46 52
47 <div class="view-btn-group"> 53 <div class="view-btn-group">
......
1 <template> 1 <template>
2 <div class="viewClass" v-if="init"> 2 <div class="viewClass">
3 <div class="btn-show-rule" @click="showRuleHandler"></div> 3 <div class="btn-show-rule" @click="showRuleHandler"></div>
4 <div v-if="indexForm.worksCode"> 4 <div v-if="formData.worksCode">
5 <div class="sys-container-panel content top-marin"> 5 <div class="sys-container-panel content top-marin">
6 <div class="container-title">人气评选</div> 6 <div class="container-title">人气评选</div>
7 <div class="head-line"></div> 7 <div class="head-line"></div>
...@@ -45,10 +45,10 @@ ...@@ -45,10 +45,10 @@
45 </div> 45 </div>
46 <div 46 <div
47 class="sys-container-panel content list-panel" 47 class="sys-container-panel content list-panel"
48 v-bind:class="{'top-marin' : indexForm.worksCode == ''}" 48 v-bind:class="{'top-marin' : !formData.worksCode}"
49 > 49 >
50 <div class="container-title" v-if="!indexForm.worksCode">人气评选</div> 50 <div class="container-title" v-if="!formData.worksCode">人气评选</div>
51 <div class="head-line" v-if="!indexForm.worksCode"></div> 51 <div class="head-line" v-if="!formData.worksCode"></div>
52 <list-view v-on:worksDetail="showWorksDetail"></list-view> 52 <list-view v-on:worksDetail="showWorksDetail"></list-view>
53 53
54 <div class="bottom-line"></div> 54 <div class="bottom-line"></div>
...@@ -89,7 +89,6 @@ export default { ...@@ -89,7 +89,6 @@ export default {
89 methods: { 89 methods: {
90 initActvity() { 90 initActvity() {
91 httpGet({ url: urls.index, data: {} }).then(res => { 91 httpGet({ url: urls.index, data: {} }).then(res => {
92 this.init = true;
93 this.indexForm = res; 92 this.indexForm = res;
94 // this.indexForm.worksCode = ""; 93 // this.indexForm.worksCode = "";
95 }); 94 });
......
...@@ -98,13 +98,13 @@ export default { ...@@ -98,13 +98,13 @@ export default {
98 98
99 httpGet({ url: urls.myWork }).then(res => { 99 httpGet({ url: urls.myWork }).then(res => {
100 this.init = true; 100 this.init = true;
101 Toast.clear();
102 this.formData = res.data || {}; 101 this.formData = res.data || {};
103 if (!res.data) { 102 if (!res.data) {
104 this.formEdit = true; 103 this.formEdit = true;
105 } else { 104 } else {
106 this.formEdit = false; 105 this.formEdit = false;
107 } 106 }
107 Toast.clear();
108 }); 108 });
109 }, 109 },
110 showRuleHandler() { 110 showRuleHandler() {
......
...@@ -62,7 +62,11 @@ ...@@ -62,7 +62,11 @@
62 </div> 62 </div>
63 <div class="sys-btn-02" :class="{disabled : !autoRegister}" @click="submitFormHandler">确认提交</div> 63 <div class="sys-btn-02" :class="{disabled : !autoRegister}" @click="submitFormHandler">确认提交</div>
64 64
65 <div class="center base-margin auto-register-tips" @click="acceptRegisterHandler"> 65 <div
66 class="center base-margin auto-register-tips"
67 @click="acceptRegisterHandler"
68 v-if="formData.worksCode == '' || formData.worksCode == null "
69 >
66 <div class="icon-register" :class="{activity : autoRegister}"></div> 70 <div class="icon-register" :class="{activity : autoRegister}"></div>
67 <div class="tips">自动注册为立白集团会员，立享会员权益，详见“更多福利”</div> 71 <div class="tips">自动注册为立白集团会员，立享会员权益，详见“更多福利”</div>
68 </div> 72 </div>
......
...@@ -4,7 +4,9 @@ ...@@ -4,7 +4,9 @@
4 <div class="container-title">我要报名</div> 4 <div class="container-title">我要报名</div>
5 <div class="head-line"></div> 5 <div class="head-line"></div>
6 <div class="edit"> 6 <div class="edit">
7 <u @click="formEditHandler">信息编辑</u> 7 <u @click="formEditHandler">
8 <van-icon name="edit" />信息编辑
9 </u>
8 </div> 10 </div>
9 <div class="swipe"> 11 <div class="swipe">
10 <van-swipe :autoplay="5000"> 12 <van-swipe :autoplay="5000">
...@@ -32,13 +34,13 @@ ...@@ -32,13 +34,13 @@
32 </div> 34 </div>
33 35
34 <div class="text-container space top"> 36 <div class="text-container space top">
35 <div class="label">我的简介：</div> 37 <div class="label">竞赛宣言：</div>
36 <div class="msg">{{formData.profile}}</div> 38 <div class="msg">{{formData.slogan}}</div>
37 </div> 39 </div>
38 40
39 <div class="text-container space top"> 41 <div class="text-container space top">
40 <div class="label">竞赛宣言：</div> 42 <div class="label">我的简介：</div>
41 <div class="msg">{{formData.slogan}}</div> 43 <div class="msg">{{formData.profile}}</div>
42 </div> 44 </div>
43 45
44 <div class="privacy"> 46 <div class="privacy">
...@@ -67,7 +69,9 @@ import { request } from "@/api/fetch-api"; ...@@ -67,7 +69,9 @@ import { request } from "@/api/fetch-api";
67 import Vue from "vue"; 69 import Vue from "vue";
68 import { Toast } from "vant"; 70 import { Toast } from "vant";
69 import { Swipe, SwipeItem } from "vant"; 71 import { Swipe, SwipeItem } from "vant";
72 import { Icon } from "vant";
70 73
74 Vue.use(Icon);
71 Vue.use(Swipe).use(SwipeItem); 75 Vue.use(Swipe).use(SwipeItem);
72 Vue.use(Toast); 76 Vue.use(Toast);
73 77
...@@ -131,6 +135,9 @@ export default { ...@@ -131,6 +135,9 @@ export default {
131 color: #5db288; 135 color: #5db288;
132 position: relative; 136 position: relative;
133 z-index: 1000; 137 z-index: 1000;
138 display: flex;
139 align-items: center;
140 justify-content: flex-end;
134 } 141 }
135 } 142 }
136 143
...@@ -138,6 +145,7 @@ export default { ...@@ -138,6 +145,7 @@ export default {
138 width: 630px; 145 width: 630px;
139 height: 451px; 146 height: 451px;
140 margin: auto; 147 margin: auto;
148 margin-top: 15px;
141 border: 2px solid #82acae; 149 border: 2px solid #82acae;
142 border-radius: 30px; 150 border-radius: 30px;
143 overflow: hidden; 151 overflow: hidden;
...@@ -198,6 +206,7 @@ export default { ...@@ -198,6 +206,7 @@ export default {
198 color: #303531; 206 color: #303531;
199 font-size: 24px; 207 font-size: 24px;
200 text-align: left; 208 text-align: left;
209 min-width: 120px;
201 } 210 }
202 .primay { 211 .primay {
203 font-size: 32px !important; 212 font-size: 32px !important;
...@@ -240,4 +249,7 @@ export default { ...@@ -240,4 +249,7 @@ export default {
240 background: url(../../../assets/imgs/draw-down.png) no-repeat; 249 background: url(../../../assets/imgs/draw-down.png) no-repeat;
241 background-size: 100%; 250 background-size: 100%;
242 } 251 }
252 .van-icon-edit {
253 font-size: 32px;
254 }
243 </style> 255 </style>
......