提交

cloudfunctions/server/controller/media/index.js

@@ -5,7 +5,7 @@ async function MediaController(data) {
   let code = 0;
   let msg = "ok";
   try{
-    article = await MediaService(data);
+    list = await MediaService(data);
   }catch{
     code = 500;
     msg = "err";
@@ -18,7 +18,7 @@ async function MediaOnceController(data) {
   let code = 0;
   let msg = "ok";
   try{
-    article = await MediaOnceService(data);
+    list = await MediaOnceService(data);
   }catch{
     code = 500;
     msg = "err";

cloudfunctions/server/controller/schedule/index.js

@@ -5,7 +5,8 @@ const { ScheduleService } = require("../../service/index");
 async function getScheduleController(data) {
   let article = {};
   let code = 0;
-  let msg = "ok";
+  const T = new Date(data.start);
+  let msg = "ok-" + T.getTime();
   try{
     article = await ScheduleService(data);
   }catch{

cloudfunctions/server/service/schedule/index.js

@@ -7,12 +7,12 @@ async function ScheduleService(data) {
     const startTime = T.getTime();
     const endTime = startTime + 86400000;
     orilist = await db.collection('schedule').where({
-      startTime: _.and(_.gte(startTime), _.lt(endTime))
+      startTime: _.and(_.gte(startTime), _.lte(endTime))
     }).get();
   } else {
     orilist = await db.collection('schedule').limit(100).get();
   }
-  return orilist.data || {}
+  return orilist.data || []
 }
 
 module.exports = {

miniprogram/components/none/index.wxml

@@ -0,0 +1,7 @@
+<template name="none">
+  <view class="page">
+    <image class="img" src="../../assets/image/None-1.png" style="width: 50vw; height: 50vw;" mode="aspectFit"/>
+    <view>
+    </view>
+  </view>
+</template>

miniprogram/components/none/index.wxss

@@ -0,0 +1,13 @@
+.page {
+  text-align: center;
+  position: absolute;
+  width: 750rpx;
+  top: 50%;
+  transform: translateY(-50%);
+  color: #666666;
+}
+
+.page .img{
+  display: block;
+  margin: 0 auto;
+}

miniprogram/pages/detail/detail.wxml

@@ -1,5 +1,7 @@
 <!--miniprogram/pages/detail/detail.wxml-->
 <import src="./template/sysDetail/index.wxml"></import>
+<import src="../../components/none/index"></import>
 <view class="detail">
+  <template wx:if="{{detail.type === undefined}}" is="none" ></template>
   <template wx:if="{{detail.type === '1'}}" is="sysDetail" data="{{...detail}}"></template>
 </view>

miniprogram/pages/detail/detail.wxss

@@ -1,6 +1,7 @@
 /* miniprogram/pages/detail/detail.wxss */
 @import "./template/sysDetail/index.wxss";
+@import "../../components/none/index.wxss";
 
-.detail{
+.detail {
   width: 750rpx;
 }

miniprogram/pages/home/index.js

@@ -21,7 +21,7 @@ Page({
         url = '/pages/mediaController/index?title=' + item.text + "&mediaType=" + item.type;
         break;
       case "schedule":
-        url = '/pages/schedule/index?title=' + item.text + "&id=" + item.id;
+        url = '/pages/schedule/index?noToday=1&title=' + item.text;
         break;
       default:
         url = '/pages/detail/detail?title=' + item.text + "&id=" + item.id;

miniprogram/pages/mediaController/index.js

@@ -1,6 +1,6 @@
 // pages/imgController/index.js
 import { httpCloud } from "../../utils/httpFunc";
-import {dateFormmat} from "../../utils/tool"
+import { dateFormmat } from "../../utils/tool"
 
 Page({
 
@@ -16,7 +16,6 @@ Page({
    */
   onLoad(options) {
     const _this = this;
-    wx.showLoading({})
     this.nameText = decodeURIComponent(options.title || "详情");
     this.mediaType = options.mediaType || 'image';
     wx.setNavigationBarTitle({
@@ -30,7 +29,7 @@ Page({
       },
       call(res) {
         _this.setData({
-          mediaList: (res || []).map(v=>{
+          mediaList: (res || []).map(v => {
             const date = dateFormmat(v.date);
             return {
               ...v,
@@ -46,49 +45,36 @@ Page({
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
-  onReady() {
-
-  },
+  onReady() { },
 
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow() {
-
-  },
-
+  onShow() { },
   /**
    * 生命周期函数--监听页面隐藏
    */
-  onHide() {
-
-  },
+  onHide() { },
 
   /**
    * 生命周期函数--监听页面卸载
    */
-  onUnload() {
-
-  },
+  onUnload() { },
 
   /**
    * 页面相关事件处理函数--监听用户下拉动作
    */
-  onPullDownRefresh() {
-
-  },
+  onPullDownRefresh() { },
 
   /**
    * 页面上拉触底事件的处理函数
    */
-  onReachBottom() {
-
-  },
+  onReachBottom() { },
 
   onShareAppMessage: function () {
     return {
       title: this.nameText,  // 分享名称
-      path: 'pages/detail/detail?title=' + this.nameText,  // 点击分享后的链接要来到的页面的路径已经对应需要的参数
+      path: 'pages/home/index',  // 点击分享后的链接要来到的页面的路径已经对应需要的参数
     }
   },
 })

miniprogram/pages/mediaController/index.wxml

@@ -1,4 +1,4 @@
 <!--pages/imgController/index.wxml-->
-<view>
-  <day-list mediaList="{{mediaList}}" ></day-list>
-</view>
+<import src="../../components/none/index"></import>
+<template is="none" wx:if="{{!mediaList || !mediaList.length}}" ></template>
+<day-list mediaList="{{mediaList}}" wx:if="{{mediaList && mediaList.length}}"></day-list>

miniprogram/pages/mediaController/index.wxss

@@ -1 +1,2 @@
-/* pages/imgController/index.wxss */
+/* pages/imgController/index.wxss */
+@import "../../components/none/index.wxss"

miniprogram/pages/schedule/index.js

@@ -21,9 +21,7 @@ Page({
     const _this = this;
     let ST = dateFormmat();
     let p = {};
-    if(options.isToday){
-      p.start = ST.year + '-' + ST.month + '-' + ST.day + ' 00:00:00'
-    }
+    if(!options.noToday) p.start = ST.year + '-' + ST.month + '-' + ST.day + ' 00:00:00'
     httpCloud({
       name: "server",
       type: "getSchedule",

miniprogram/pages/schedule/index.wxml

@@ -1,21 +1,8 @@
-<!--pages/schedule/index.wxml-->
-<!-- <swiper class="swiper">
-  <swiper-item>
-    <view class="swiperItem">
-      1
-    </view>
-  </swiper-item>
-  <swiper-item>
-    <view class="swiperItem">
-      2
-    </view>
-  </swiper-item>
-</swiper> -->
-
+<import src="../../components/none/index"></import>
+<template wx:if="{{!list || !list.length }}" is="none"></template>
 <view wx:for="{{list}}" wx:key="index">
   <mp-cell title="{{item.date}}" footer="{{item.location}}"></mp-cell>
   <view class="text" wx:for="{{item.child}}" wx:for-index="i" wx:for-item="v" wx:key="i">
-      {{v.content}}
+    {{v.content}}
   </view>
-</view>
-
+</view>

miniprogram/pages/schedule/index.wxss

@@ -1,6 +1,8 @@
 /* pages/schedule/index.wxss */
+@import "../../components/none/index.wxss";
+
 .swiperItem,
-.swiper{
+.swiper {
   width: 750rpx;
   height: 100vh;
 }

project.private.config.json

@@ -3,19 +3,7 @@
     "compileHotReLoad": false,
     "urlCheck": true
   },
-  "condition": {
-    "miniprogram": {
-      "list": [
-        {
-          "name": "",
-          "pathName": "pages/schedule/index",
-          "query": "title=%E6%97%A5%E7%A8%8B%E5%AE%89%E6%8E%92&id=c658c1c5637db5bd00e66d715693ebc3",
-          "launchMode": "default",
-          "scene": null
-        }
-      ]
-    }
-  },
+  "condition": {},
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
   "libVersion": "2.14.1"
 }