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

wx_application/src/utils/Foundation.js

 export function CoutDown(Endtime) {
 
-  let leftTime = (new Date(Endtime)) - new Date(); //计算剩余的毫秒数
+  let leftTime = (new Date(Endtime.replace(/-/g, '/'))) - new Date(); //计算剩余的毫秒数
   let days = parseInt(leftTime / 1000 / 60 / 60 / 24, 10); //计算剩余的天数
   let hours = parseInt(leftTime / 1000 / 60 / 60 % 24, 10); //计算剩余的小时
   let minutes = parseInt(leftTime / 1000 / 60 % 60, 10);//计算剩余的分钟

wx_application/src/views/active/activeDetail.vue

@@ -277,7 +277,8 @@ export default {
         }
         if (this.active_type === "wheel") {
           let cur_date = new Date();
-          let end_time = new Date(this.timeLine)|| Date.parse(this.timeLine.replace(/-/g, '/'));
+          let end_time = new Date(this.timeLine.replace(/-/g, '/'));
+          console.log('ios date', this.timeLine.replace(/-/g, '/'));
           if (end_time > cur_date) {
             this.timer = setInterval(() => {
               CoutDown(this.timeLine);