wangfei 6 yıl önce
ebeveyn
işleme
83865c56ad
2 değiştirilmiş dosya ile 27 ekleme ve 4 silme
  1. 25
    2
      src/views/vote/list.vue
  2. 2
    2
      vue.config.js

+ 25
- 2
src/views/vote/list.vue Dosyayı Görüntüle

@@ -83,6 +83,7 @@ import wxsdk from "../../util/share.js";
83 83
 import toast from "../../components/toast.vue";
84 84
 import BgImg from "../../assets/bgimg.jpg";
85 85
 import BgImage from "../../assets/yttjbg.png";
86
+import { Toast } from 'vant';
86 87
 
87 88
 const {
88 89
   mapState: mapactivityState,
@@ -250,12 +251,12 @@ export default {
250 251
         }).then(() => {
251 252
           if (this.activity.AfterVote) {
252 253
             this.$dialog
253
-              .alert({ title: "投票成功", message: "恭喜您获得一次抽奖机会!" })
254
+              .alert({ title: "投票成功", message: "恭喜您获得一次抽奖机会!" })
254 255
               .then(() => {
255 256
                 window.location.href = this.activity.AfterVote;
256 257
               });
257 258
           } else {
258
-            this.$dialog.alert({ message: "投票成功" });
259
+            this.$dialog.alert({ message: "投票成功" });
259 260
           }
260 261
         });
261 262
       // });
@@ -303,6 +304,28 @@ export default {
303 304
           path: `/detail/${this.actid}/${this.myID}`
304 305
         });
305 306
       } else {
307
+        var myDate = (new Date()).valueOf();
308
+        var begintime = (new Date(this.activity.StartTime)).valueOf()
309
+        var endtime = (new Date(this.activity.EndTime)).valueOf()
310
+        // console.log(begintime)
311
+        // console.log(endtime)
312
+        // console.log(myDate)
313
+        if(begintime > myDate){
314
+          Toast.fail({
315
+            duration: 2000, // 持续展示 toast
316
+            forbidClick: true, // 禁用背景点击
317
+            message: "活动未开始!"
318
+          })
319
+          return false
320
+        }
321
+        if(endtime < myDate){
322
+          Toast.fail({
323
+            duration: 2000, // 持续展示 toast
324
+            forbidClick: true, // 禁用背景点击
325
+            message: "活动已结束!"
326
+          })
327
+          return false
328
+        }
306 329
         this.$router.push({
307 330
           path: `/vote/signup/${this.actid}`
308 331
         });

+ 2
- 2
vue.config.js Dosyayı Görüntüle

@@ -7,9 +7,9 @@ module.exports = {
7 7
     proxy: {
8 8
       '/voteapi': {
9 9
         // target: 'http://wechatconfigdev.ycjcjy.com',
10
-        // target: 'http://192.168.0.62:8080', // wf
10
+        target: 'http://localhost:8080', // wf
11 11
         // target: 'http://192.168.0.102:8080', // hyq
12
-        target: 'http://192.168.0.11:8080', // zys
12
+        // target: 'http://192.168.0.11:8080', // zys
13 13
         // target: 'http://dev.ycjcjy.com', // frp
14 14
         changeOrigin: true, // 如果接口跨域,需要进行这个参数配置
15 15
         pathRewrite: {