Merge branch 'master' of http://114.67.93.201/xulili/ybf

wx_application/src/views/active/activeDetail.vue

@@ -234,7 +234,7 @@ export default {
   methods: {
     // 领取(
     handleGet() {
-      if (this.$route.query.iswxClient === "false") {
+      if (this.$route.query.unionid === undefined) {
         this.$toast("企业微信端不能领取");
         return;
       }

wx_application/src/views/active/createActive.vue

@@ -172,8 +172,8 @@ export default {
     };
   },
   created() {
-    this.minStartDate = new Date((new Date()/1000+3600)*1000)
-    this.minEndDate = new Date((new Date()/1000+86400)*1000);
+    this.minStartDate = new Date();
+    this.minEndDate = new Date();
   },
   methods: {
     getTemplateDate(id) {

wx_application/src/views/active/createBigWheelActive.vue

@@ -351,8 +351,8 @@ export default {
     };
   },
   created() {
-    this.minStartDate = new Date((new Date()/1000+3600)*1000);
-    this.minEndDate = new Date((new Date()/1000+86400)*1000);
+    this.minStartDate = new Date();
+    this.minEndDate = new Date();
   },
   methods: {
     // 获取模板数据