2 Commits 6e0b786a98 ... 3d53ea30d7

Author SHA1 Message Date
  Jing-Jiu 3d53ea30d7 update 4 years ago
  Jing-Jiu 60e74a19b5 update 4 years ago
2 changed files with 33 additions and 21 deletions
  1. 2 2
      components/foot-tabs/footTabs.vue
  2. 31 19
      pages/selfCenter/collection.vue

+ 2 - 2
components/foot-tabs/footTabs.vue

@@ -57,13 +57,13 @@ export default {
           pagePath: "/pages/index/index",
           iconPath: "/static/tabbar/home-select.png",
           selectedIconPath: "/static/tabbar/home-selected.png",
-          text: "页",
+          text: "锟斤拷页",
         },
         {
           pagePath: "/pages/selfCenter/index",
           iconPath: "/static/tabbar/user-select.png",
           selectedIconPath: "/static/tabbar/user-selected.png",
-          text: "我的",
+          text: "锟揭碉拷",
         },
       ],
     };

+ 31 - 19
pages/selfCenter/collection.vue

@@ -24,17 +24,9 @@
               {{ item.title }}
             </p>
             <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 | globalTime || "长期可申报" }} -->
-                {{ "长期可申报" }}
-              </p>
+              <p class="moment">收藏时间: {{ item.time | globalTime }}</p>
             </view>
           </view>
-          <view class="policy-content-item-img">
-            <image :src="item.pic_url" alt="" />
-          </view>
         </view>
       </view>
       <view class="companys" v-if="active == 1">
@@ -84,14 +76,7 @@ export default {
       titleList: ["政策", "企业"],
       active: 0,
       searchVal: "",
-      policyData: new Array(5).fill({
-        title:
-          "工业金额信息化部办公厅 组织开2021念工业互联网平台创新互联网工业文化产业项目征集工作。",
-        moment: "2021-07-12",
-        maxMony: "最高500.00万",
-        leftDay: "剩5天",
-        img: "/static/policy/u388.jpg",
-      }),
+      policyData: [],
       companyList: new Array(5).fill({
         logo: "/static/enterprise/logo.png",
         name: "康拓科技有限责任公司",
@@ -104,7 +89,11 @@ export default {
     };
   },
   onLoad() {
+<<<<<<< HEAD
+    this.getCollection();
+=======
     // this.getCollection();
+>>>>>>> 6e0b786a98bea8e321f5aa2e2b0df0209b180b83
   },
   methods: {
     toDetail(index) {
@@ -117,7 +106,11 @@ export default {
         url: "/pages/policy/policy_deatil?id=" + id,
       });
     },
+<<<<<<< HEAD
+    getCollection() {
+=======
   /*   getCollection() {
+>>>>>>> 6e0b786a98bea8e321f5aa2e2b0df0209b180b83
       let md5Sign = md5(
         "method=" +
           "user" +
@@ -148,13 +141,32 @@ export default {
         success: (res) => {
           console.log(res);
           if (res.data.code === 200) {
+<<<<<<< HEAD
+            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.id;
+              return ob;
+            });
+=======
+>>>>>>> 6e0b786a98bea8e321f5aa2e2b0df0209b180b83
           }
         },
         fail: () => {
           console.log("连接失败");
         },
       });
+<<<<<<< HEAD
+    },
+=======
     }, */
+>>>>>>> 6e0b786a98bea8e321f5aa2e2b0df0209b180b83
   },
 };
 </script>
@@ -266,7 +278,7 @@ export default {
           line-clamp: 2;
           -webkit-box-orient: vertical;
           font-size: 25rpx;
-          margin-bottom: 10rpx;
+          margin-bottom: 2rpx;
         }
         .policy-content-item-left-time {
           width: 100%;
@@ -352,4 +364,4 @@ export default {
     }
   }
 }
-</style>
+</style>