readme

miniprogram/pages/home/index.js

@@ -15,14 +15,17 @@ Page({
     const db = wx.cloud.database();
     const _ = db.command;
     let list = await db.collection('data_news').where({
-      hot: 1,
+      hot: true,
       type: 1
     }).get();
     let video = await db.collection("data_asset").where({
       type: "video"
     }).get();
+    console.log(list)
     list.data = list.data.concat(video.data);
     list.data = list.data.sort((a,b)=>{
+      if(a._createTime) a.create_time = a._createTime;
+      if(b._createTime) b.create_time = b._createTime;
       return b.create_time - a.create_time
     })
     console.log(list)

miniprogram/pages/interList/interList.js

@@ -12,7 +12,6 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: async function (options) {
-    console.log(options.type)
     if (options.type == "news") {
       wx.setNavigationBarTitle({
         title: '新闻列表'
@@ -26,9 +25,18 @@ Page({
     let list = await db.collection('data_news').where({
       type: 1
     }).get();
+    let video = await db.collection("data_asset").where({
+      type: "video"
+    }).get();
+    list.data = list.data.concat(video.data);
+    list.data = list.data.sort((a,b)=>{
+      if(a._createTime) a.create_time = a._createTime;
+      if(b._createTime) b.create_time = b._createTime;
+      return b.create_time - a.create_time
+    })
     for (let i = 0; i < list.data.length; i++) {
       const v = list.data[i];
-      if (v.creat_time) v.creat_time = this.format(v.creat_time || 0)
+      if (v.create_time) v.create_time = this.format(v.create_time || 0)
     }
     console.log(list.data)
     this.setData({

miniprogram/pages/interList/interList.wxml

@@ -1,18 +1,17 @@
 <!--miniprogram/pages/interList/interList.wxml-->
 <view class="interList">
   <view wx:for="{{newsList}}" style="margin-bottom: 20rpx" wx:key="_id" >
-
-    <view class="videoEle" wx:if="{{item.headUrl}}">
+    <view class="videoEle" wx:if="{{item.type == 'video'}}">
       <text wx:if="{{item.title}}" class="top">{{item.title}}</text>
-      <video custom-cache="{{false}}" class="video" wx:if="{{item && item.headUrl}}" src="{{item.headUrl}}"></video>
-      <text wx:if="{{item.creat_time}}" class="subTitle">发布日期 {{item.creat_time}}</text>
+      <video custom-cache="{{false}}" class="video" wx:if="{{item.headUrl || item.url}}" src="{{item.headUrl || item.url}}"></video>
+      <text wx:if="{{item.create_time}}" class="subTitle">发布日期 {{item.create_time}}</text>
     </view>
-    <view wx:if="{{!item.headUrl}}" bindtap="toDetail"  data-id="{{item._id}}" data-title="{{item.title}}">
+    <view wx:if="{{item.type == 1}}" bindtap="toDetail"  data-id="{{item._id}}" data-title="{{item.title}}">
       <view class="newList">
         <image mode="aspectFit" class="newsImg" src="{{item.cover}}" wx:if="{{item.cover}}"></image>
         <view class="newsTitle">
           <text wx:if="{{item.title}}" class="top">{{item.title}}</text>
-          <text wx:if="{{item.creat_time}}" class="subTitle">发布日期 {{item.creat_time}}</text>
+          <text wx:if="{{item.create_time}}" class="subTitle">发布日期 {{item.create_time}}</text>
         </view>
       </view>
     </view>