Merge branch 'master' of http://git.ycjcjy.com/support-game/wechat

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/views/vote/signup.vue

@@ -141,14 +141,15 @@ export default {
         })
         return false
       }
-      if(this.postData.name == ""){
+      if(this.theme === 1 && this.postData.message == '') {
         Toast.fail({
           duration: 2000, // 持续展示 toast
           forbidClick: true, // 禁用背景点击
-          message: "请输入您的姓名！"
+          message: "请先输入寄语！"
         })
         return false
       }
+
       if(this.postData.phone == ""){
         Toast.fail({
           duration: 2000, // 持续展示 toast
@@ -166,6 +167,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,