Merge branch 'master' of http://121.40.40.223:3000/zizhong.wang/konggang-city-miniprogram

pages/policy/index.vue

@@ -46,7 +46,15 @@
             <view class="policy-content-item-left-time">
               <p class="moment">{{ item.publish_time | globalTime }}</p>
               <p class="maxMony">{{ item.project_money }}</p>
-              <p class="leftDay">{{ item.project_end_date || '长期可申报' }}</p>
+              <p class="leftDay" v-if="item.project_end_date && Math.floor(new Date(new Date(item.project_end_date).getTime() -new Date().getTime()).getTime() / (1 * 24 * 60 * 60 * 1000)) + 1 >= 1">
+			  剩{{Math.floor(new Date(new Date(item.project_end_date).getTime() -new Date().getTime()).getTime() / (1 * 24 * 60 * 60 * 1000)) + 1}}天
+			  </p>
+			  <p class="leftDay" v-if="item.project_end_date && Math.floor(new Date(new Date(item.project_end_date).getTime() -new Date().getTime()).getTime() / (1 * 24 * 60 * 60 * 1000)) + 1 < 1">
+			  申报结束
+			  </p>
+			 <p class="leftDay" v-if="!item.project_end_date">
+			  长期可申报
+			  </p>
             </view>
           </view>
           <view class="policy-content-item-img">

pages/selfCenter/collection.vue

@@ -13,56 +13,28 @@
         </view>
       </view>
       <view class="policy-content" v-if="active == 0">
-        <view
-          class="policy-content-item"
-          v-for="(item, idx) in policyData"
-          :key="idx"
-          @click="enterPolicyDeatil(item.id)"
-        >
+        <view class="policy-content-item" v-for="(item, idx) in policyData" :key="idx" @click="enterPolicyDeatil(item.source_id)" >
           <view class="policy-content-item-left">
             <p class="policy-content-item-left-title">
-              {{ item.title }}
+              {{ item.source_title }}
             </p>
             <view class="policy-content-item-left-time">
-              <p class="moment">收藏时间： {{ item.time | globalTime }}</p>
+              <p class="moment">收藏时间： {{ item.addtime | globalTime }}</p>
             </view>
           </view>
         </view>
       </view>
-      <view class="companys" v-if="active == 1">
-        <view
-          class="company"
-          v-for="(company, index) in companyList"
-          :key="index"
-          @tap="toDetail(index)"
-        >
-          <view class="title">
-            <view class="logo">
-              <img :src="company.logo" alt="" />
-            </view>
-            <view class="name">
-              {{ company.name }}
-            </view>
-          </view>
-          <view class="info">
-            <view class="view">
-              <view class="info_t">法定代表人</view>
-              <view class="name">
-                {{ company.info.person }}
-              </view>
-            </view>
-            <view class="line"></view>
-            <view class="view">
-              <view class="info_t">注册资本</view>
-              {{ company.info.money }}
-            </view>
-            <view class="line"></view>
-            <view class="view">
-              <view class="info_t">成立日期</view>
-              {{ company.info.time }}
-            </view>
-          </view>
-        </view>
+      <view class="policy-content" v-if="active == 1">
+        <view class="policy-content-item" v-for="(company, index) in companyList" :key="index" @click="toDetail(company.source_id)">
+		   <view class="policy-content-item-left">
+			 <p class="policy-content-item-left-title">
+			   {{ company.source_title }}
+			 </p>
+			 <view class="policy-content-item-left-time">
+			   <p class="moment">收藏时间： {{ company.addtime | globalTime }}</p>
+			 </view>
+       </view>
+		</view>
       </view>
     </view>
   </view>
@@ -138,17 +110,12 @@ export default {
           console.log(res);
           if (res.data.code === 200) {
             let list = res.data.data.list;
-            this.policyData = list.map((item) => {
-              let ob = {
-                title: "",
-                time: "",
-                id: "",
-              };
-              ob.title = item.source_title;
-              ob.time = item.addtime;
-              ob.id = item.source_id;
-              return ob;
+            this.policyData = list.filter((item) => {
+              return item.source === 'policy'
             });
+			this.companyList = list.filter((item) => {
+			  return item.source === 'company'
+			});
           }
         },
         fail: () => {

pages/selfCenter/my_activity.vue

@@ -1,42 +1,48 @@
 <template>
   <view class="content">
-    <div class="actives">
-      <div
-        v-for="(active, idx) in activeListCopy"
-        :key="idx"
-        class="actives-item"
-        @click="goDeatil(active.id)"
-      >
-        <div class="active-content">
-          <div class="img-box"><img :src="active.url" alt="" /></div>
-          <div class="right">
-            <div class="right-title">{{ active.title }}</div>
-            <div class="right-inf">
-              <div class="inf-type" style="width: 17%;">
-                <div
-                  :class="{ color: active.type == 1 }"
-                  class="originColor"
-                ></div>
-                <div>{{ active.type == 1 ? "线上" : "线下" }}</div>
-              </div>
-              <div class="inf-way" style="width: 24%;">
-                {{ active.way }}
-              </div>
-              <div class="inf-date">
-                {{ active.date }}
-              </div>
+  <div class="actives">
+    <div
+      v-for="(active, idx) in activeListCopy"
+      :key="idx"
+      class="actives-item"
+      @click="goDeatil(active.id)"
+    >
+      <div class="active-content">
+        <div class="img-box"><img :src="active.url" alt="" /></div>
+        <div class="right">
+          <div class="right-title">{{ active.title }}</div>
+          <div class="right-inf">
+            <div class="inf-type right-item" style="width: 17%">
+              <div
+                :class="{ color: active.type == 1 }"
+                class="originColor"
+              ></div>
+              <div>{{ active.type == 1 ? "线上" : "线下" }}</div>
+            </div>
+            <div class="inf-way right-item">
+              {{ active.way }}
+            </div>
+            <div class="inf-date right-item">
+              {{ active.date }}
             </div>
           </div>
         </div>
-        <div class="readShare">
-		  <div v-show="active.status == '0'" class="active-tips-box wait-color">活动待开始</div>
-		  <div v-show="active.status == '1'" class="active-tips-box ing-color">活动进行中</div>
-		  <div v-show="active.status == '2'" class="active-tips-box end-color">活动已结束</div>
-          <div class="read">浏览 {{ active.read }}</div>
-          <div class="share">分享 {{ active.share }}</div>
+      </div>
+      <div class="readShare">
+        <div v-show="active.status == '0'" class="active-tips-box wait-color">
+          活动待开始
+        </div>
+        <div v-show="active.status == '1'" class="active-tips-box ing-color">
+          活动进行中
+        </div>
+        <div v-show="active.status == '2'" class="active-tips-box end-color">
+          活动已结束
         </div>
+        <div class="read">浏览 {{ active.read }}</div>
+        <div class="share">分享 {{ active.share }}</div>
       </div>
     </div>
+  </div>
   </view>
 </template>
 
@@ -210,11 +216,13 @@ export default {
     }
   }
   .actives {
-    padding: 0 40rpx;
-    display: flex;
-    flex-direction: column;
+	 width: 90%;
+     display: flex;
+     flex-direction: column;
+	 align-items: center;
     .actives-item {
       // height: 150rpx;
+	  width: 100%;
       box-shadow: 0px 4rpx 32rpx rgba(0, 0, 0, 0.1);
       border-radius: 32rpx;
       margin-top: 20px;
@@ -247,10 +255,10 @@ export default {
             letter-spacing: 3rpx;
           }
           .right-inf {
-            display: flex;
-            font-size: 21rpx;
-			align-items: center;
-            color: $uni-text-color-grey;
+           font-size: 21rpx;
+           flex-wrap: wrap;
+           display: flex;
+           color: $uni-text-color-grey;
             .inf-type {
               margin-right: 10rpx;
               display: flex;