更新活动时间展示

main.js

@@ -46,10 +46,11 @@ Vue.filter("globalTimeSecond", function (value) {
     // const y = time.getFullYear();
     // const m = (time.getMonth() + 1) < 10 ? '0' + (time.getMonth() + 1) : (time.getMonth() + 1);
     // const d = time.getDate() < 10 ? '0' + time.getDate(): time.getDate();
-    const h = time.getHours();
-    const mm = time.getMinutes();
-    const s = time.getSeconds();
-    return h + ":" + mm + ":" + s;
+    const h = time.getHours() < 10 ? '0' + time.getHours() : time.getHours();
+    const mm = time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes();
+    const s = time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds();
+   // return h + ":" + mm + ":" + s;
+   return h + ":" + mm;
   } else {
     return "";
   }

pages/activity/activity_deatil.vue

@@ -349,7 +349,7 @@ export default {
 			url:'/pages/auth/index'
 		})
 		}
-      if (this.model.person_count >= this.model.max_person) {
+      if (Number(this.model.person_count) >= Number(this.model.max_person)) {
         uni.showToast({
           title: "报名人数已达上限",
           icon: "error",
@@ -441,7 +441,7 @@ export default {
 			}else {
 				checkFlag = true;
 			}
-		}
+		} 
 		if(checkFlag){
 			this.activityInfoList.forEach((item)=>{
 				if(item.name === '性别'){

pages/activity/index.vue

@@ -58,7 +58,8 @@
         </div>
         <div class="readShare">
           <div v-show="active.status == '待开始'" class="active-tips-box wait-color">
-            活动待开始
+             <!-- 活动待开始 -->
+			{{timeStatus}}开始
           </div>
          <div v-show="active.status == '已开始'" class="active-tips-box ing-color">
             活动进行中
@@ -87,6 +88,7 @@ export default {
       typeActive: true,
       indexType: 0,
       indexState: 0,
+	  timeStatus:'',
       pickerTypeArray: [
         {
           label: "全部",
@@ -247,16 +249,13 @@ export default {
               ob.url = item.pic_url ? getApp().globalData.shareUrl + item.pic_url : '/static/activity/default.png';
               ob.title = item.name;
               ob.way = item.sponsor;
-              let time = this.$options.filters["globalTime"](item.start_time);
-              let timeSecond = this.$options.filters["globalTime"](
-                item.end_time
-              );
-              ob.date = time + " 至 " + timeSecond;
-              ob.read =
-                parseInt(item.base_read_count) + parseInt(item.real_read_count);
-              ob.share =
-                parseInt(item.real_repost_count) +
-                parseInt(item.base_repost_count);
+              let timeStart = this.$options.filters["globalTime"](item.start_time) + ' ' + this.$options.filters["globalTimeSecond"](item.start_time);
+            //  let timeSecond = this.$options.filters["globalTime"](item.end_time);
+			  let timeEnd = this.$options.filters["globalTime"](item.end_time) + ' ' + this.$options.filters["globalTimeSecond"](item.end_time);
+              ob.date = timeStart + " 至 " + timeEnd;
+			  this.timeStatus = timeStart.substr(5,5);
+              ob.read = parseInt(item.base_read_count) + parseInt(item.real_read_count);
+              ob.share = parseInt(item.real_repost_count) + parseInt(item.base_repost_count);
               ob.type = item.type;
               ob.status = item.status;
               ob.id = item.id;

pages/attract/attract_deatil.vue

@@ -82,9 +82,7 @@ export default {
             let data = res.data.data;
             this.model.title = data.title;
             let time = this.$options.filters["globalTime"](data.addtime);
-            let timeSecond = this.$options.filters["globalTimeSecond"](
-              data.addtime
-            );
+            let timeSecond = this.$options.filters["globalTimeSecond"](data.addtime);
             this.model.time = time + " " + timeSecond;
             this.getRich();
           }

pages/index/index.vue

@@ -696,7 +696,8 @@ export default {
       let postData = {
         page: 1,
         page_size: 2,
-		s_cancel : 0
+		s_cancel : 0,
+		order_by : "weight desc,id desc"
       };
       uni.request({
         url: url,
@@ -733,11 +734,8 @@ export default {
               ob.title = item.name;
               ob.department = item.sponsor;
               ob.time = this.$options.filters["globalTime"](item.start_time);
-              ob.browe =
-                parseInt(item.base_read_count) + parseInt(item.real_read_count);
-              ob.share =
-                parseInt(item.real_repost_count) +
-                parseInt(item.base_repost_count);
+              ob.browe = parseInt(item.base_read_count) + parseInt(item.real_read_count);
+              ob.share =  parseInt(item.real_repost_count) + parseInt(item.base_repost_count);
               ob.isOnline = item.type == 1 ? 1 : 0;
               ob.id = item.id;
               return ob;

pages/policy/index.vue

@@ -76,7 +76,7 @@ export default {
     return {
       swiperList: [],
       policyList: ["市级政策", "新区政策", "新城政策","政策解读"],
-      active: 0,
+      active: 2,
       searchVal: "",
       policyData: new Array(5).fill({
         title:
@@ -191,7 +191,7 @@ export default {
           "content-type": "application/x-www-form-urlencoded",
         },
         data: {
-          s_level: level || "2", //1.省 2.市 3.区 4.新城 5.解读
+          s_level: level || "4", //1.省 2.市 3.区 4.新城 5.解读
         },
         success: (res) => {
           console.log(res);