beizhu

src/App.vue

@@ -37,7 +37,6 @@ export default {
   created() {
     const env = process.env.NODE_ENV || 'production'
     console.log("process.env.NODE_ENV =>", env)
-
     if (env === 'production' || env === 'test') {
       if (location.search && this.toolClass.UrlSearch(location.search).code) {
         this.code = this.toolClass.UrlSearch(location.search).code
@@ -56,7 +55,7 @@ export default {
         this.toolClass.getCode(this.appid[env])
       }
     } else {
-      this.showPage = true
+       this.showPage = true
     }
   },
   methods: {

src/util/util.js

@@ -41,7 +41,8 @@ const toolClass = {
   },
   getCode: (appid) => {
     wechatConfig.appid = appid
-    let url = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appid}&redirect_uri=${encodeURIComponent(window.location.href)}&response_type=${wechatConfig.response_type}&scope=${wechatConfig.scope}&state=${wechatConfig.state}#wechat_redirect`
+    const refer = window.encodeURIComponent(window.location.href.replace(/code=[^?&=]+/, '').replace(/state=[^?&=]+/, '').replace('?&', '?'))
+    let url = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appid}&redirect_uri=${refer}&response_type=${wechatConfig.response_type}&scope=${wechatConfig.scope}&state=${wechatConfig.state}#wechat_redirect`
     window.location.href = url
   },
   upload (item) {

src/views/vote/detail.vue

@@ -49,7 +49,7 @@ export default {
   components: {
     toast,
   },
-  mounted() {
+  created() {
     this.actid = this.$route.params.actid;
     this.memberid = this.$route.params.memberid;
     this.getActivity({

src/views/vote/list.vue

@@ -93,6 +93,7 @@ import wxsdk from "../../util/share.js";
 import toast from "../../components/toast.vue";
 // import BgImg from "../../assets/bgimg.jpg";
 // import BgImage from "../../assets/yttjbg.png";
+import { Toast } from 'vant';
 
 const {
   mapState: mapactivityState,
@@ -260,21 +261,21 @@ export default {
     },
     Vote(memberid) {
       // this.$dialog.confirm({ message: "确定投票给当前用户?" }).then(() => {
-      this.vote({
-        actid: this.actid,
-        memberid: memberid,
-        openid: this.user
-      }).then(() => {
-        if (this.activity.AfterVote) {
-          this.$dialog
-            .alert({ title: "投票成功", message: "恭喜您获得一次抽奖机会!" })
-            .then(() => {
-              window.location.href = this.activity.AfterVote;
-            });
-        } else {
-          this.$dialog.alert({ message: "投票成功" });
-        }
-      });
+        this.vote({
+          actid: this.actid,
+          memberid: memberid,
+          openid: this.user
+        }).then(() => {
+          if (this.activity.AfterVote) {
+            this.$dialog
+              .alert({ title: "投票成功！", message: "恭喜您获得一次抽奖机会!" })
+              .then(() => {
+                window.location.href = this.activity.AfterVote;
+              });
+          } else {
+            this.$dialog.alert({ message: "投票成功！" });
+          }
+        });
       // });
     },
     loadNewList(loaded) {
@@ -320,6 +321,28 @@ export default {
           path: `/detail/${this.actid}/${this.myID}`
         });
       } else {
+        var myDate = (new Date()).valueOf();
+        var begintime = (new Date(this.activity.StartTime)).valueOf()
+        var endtime = (new Date(this.activity.EndTime)).valueOf()
+        // console.log(begintime)
+        // console.log(endtime)
+        // console.log(myDate)
+        if(begintime > myDate){
+          Toast.fail({
+            duration: 2000, // 持续展示 toast
+            forbidClick: true, // 禁用背景点击
+            message: "活动未开始！"
+          })
+          return false
+        }
+        if(endtime < myDate){
+          Toast.fail({
+            duration: 2000, // 持续展示 toast
+            forbidClick: true, // 禁用背景点击
+            message: "活动已结束！"
+          })
+          return false
+        }
         this.$router.push({
           path: `/vote/signup/${this.actid}`
         });

src/views/vote/signup.vue

@@ -147,15 +147,16 @@ export default {
         });
         return false;
       }
-      if (this.postData.name == "") {
+      if(this.theme === 1 && this.postData.message == '') {
         Toast.fail({
           duration: 2000, // 持续展示 toast
           forbidClick: true, // 禁用背景点击
-          message: "请输入您的姓名！"
-        });
-        return false;
+          message: "请先输入寄语！"
+        })
+        return false
       }
-      if (this.postData.phone == "") {
+
+      if(this.postData.phone == ""){
         Toast.fail({
           duration: 2000, // 持续展示 toast
           forbidClick: true, // 禁用背景点击
@@ -172,6 +173,22 @@ export default {
         });
         return false;
       }
+      if(this.postData.name == ""){
+        Toast.fail({
+          duration: 2000, // 持续展示 toast
+          forbidClick: true, // 禁用背景点击
+          message: "请输入您的姓名！"
+        })
+        return false
+      }
+      if(this.theme === 2 && this.postData.addr == '') {
+        Toast.fail({
+          duration: 2000, // 持续展示 toast
+          forbidClick: true, // 禁用背景点击
+          message: "请输入您的所在社区！"
+        })
+        return false
+      }
 
       this.voteMember({
         actid: this.actid,

vue.config.js

@@ -7,7 +7,11 @@ module.exports = {
     proxy: {
       '/voteapi': {
         // target: 'http://wechatconfigdev.ycjcjy.com',
+<<<<<<< HEAD
         target: 'http://192.168.0.62:8080', // wf
+=======
+        target: 'http://localhost:8080', // wf
+>>>>>>> 83865c56adef1f6c6aea63317940c0a221574425
         // target: 'http://192.168.0.102:8080', // hyq
         // target: 'http://192.168.0.11:8080', // zys
         // target: 'http://dev.ycjcjy.com', // frp