提交

api/meet.js

@@ -92,9 +92,33 @@ function getPhone({success, code}) {
     });
   })
 }
+
+// 获取会议信息
+function getMeetBaseInfo() {
+  return new Promise((resolve, reject) => {
+    req({
+      url: `/conference/conf/info/${config.meetID}/SHOW_CTRL`,
+      method: "GET",
+      data:{},
+      success(res) {
+        if (res.code !== 0) {
+          wx.showToast({
+            title: res.message || "请稍后再试",
+            icon: "none"
+          })
+          reject(res)
+          return
+        }
+        resolve(res.data);
+      }
+    });
+  })
+}
+
 export default {
   getMeetDetail,
   getMeetInfo,
+  getMeetBaseInfo,
   postSignUp,
   getPhone
 }

pages/home/home.js

@@ -4,6 +4,13 @@ import {
   toNavigatePage
 } from "../../utils/util"
 import api from "../../api/index"
+const {
+  globalData: {
+    systemInfo: {
+      windowWidth
+    }
+  }
+} = getApp();
 Page({
 
   /**
@@ -11,7 +18,9 @@ Page({
    */
   data: {
     news: [],
-    meet: {}
+    meet: {},
+    themeHeight: 0,
+    showMD: true
   },
 
   openFile(e) {
@@ -21,6 +30,19 @@ Page({
     openFileFunc(url, fileName);
   },
 
+  loadimg(e) {
+    const {
+      detail: {
+        width,
+        height
+      }
+    } = e;
+    this.setData({
+      themeHeight: windowWidth / width * height
+    })
+
+  },
+
   changeTab(e) {
     wx.reLaunch({
       url: e.currentTarget.dataset.url
@@ -35,12 +57,14 @@ Page({
    */
   onLoad(options) {
     // console.log(__wxConfig)
-    Promise.all([api.getNewList({}), api.getMeetDetail({})]).then(list=>{
-      const meet  = list[1] || {};
+    Promise.all([api.getNewList({}), api.getMeetDetail({}), api.getMeetBaseInfo()]).then(list => {
+      const meet = list[1] || {};
       meet.time = meet.startTime.split(" ")[0];
       meet.sponsor = meet.sponsor.split(",");
       meet.organizer = meet.organizer.split(",");
+
       this.setData({
+        showMD: (list[2] || {confContent: 'show'}).confContent === 'show',
         news: list[0].records || [],
         meet: list[1] || {}
       })

pages/home/home.wxml

@@ -1,20 +1,21 @@
 <!--pages/home/home.wxml-->
-<view class="home">
-  <view class="title">{{meet.conferenceName}}</view>
-  <view class="subtitle" style="margin-bottom: 38rpx;" wx:if="{{meet.subtitle}}">{{meet.subtitle}}</view>
-  <view class="subtitle" wx:if="{{meet.time}}">{{meet.time}}</view>
-  <view class="subtitle" style="margin-bottom: 156rpx;" wx:if="{{meet.addr}}">{{meet.addr}}</view>
+<view class="home" style="{{ meet.theme? 'padding-top: 0;': '' }}">
+  <image style="{{'margin-bottom: 30rpx;width: 750rpx;height: ' + themeHeight + 'px'}}" wx:if="{{meet.theme}}" bindload="loadimg" src="{{meet.theme}}" mode="aspectFit"/>
+  <view wx:if="{{!meet.theme}}" class="title">{{meet.conferenceName}}</view>
+  <view wx:if="{{!meet.theme && meet.subtitle}}" class="subtitle" style="margin-bottom: 38rpx;" >{{meet.subtitle}}</view>
+  <view wx:if="{{!meet.theme && meet.time}}" class="subtitle">{{meet.time}}</view>
+  <view wx:if="{{!meet.theme && meet.addr}}" class="subtitle" style="margin-bottom: 156rpx;" >{{meet.addr}}</view>
   <image bindtap="openFile" data-url="{{meet.manual}}" mode="scaleToFill" style="width: 710rpx;height: 220rpx;" class="card" src="../../assets/btn1.png" />
 
 
   <view style="width: 710rpx;margin: 30rpx 0;padding: 0 20rpx">
     <van-row gutter="5">
       <van-col span="12">
-        <image bindtap="toPage" data-url="/pages/livePhone/index" data-cover="{{meet.cover}}" mode="scaleToFill" style="width: 342rpx;height: 363rpx;" src="../../assets/btn2.png" />
+        <image wx:if="{{showMD}}" bindtap="toPage" data-url="/pages/livePhone/index" data-cover="{{meet.cover}}" mode="scaleToFill" style="width: 342rpx;height: 363rpx;" src="../../assets/btn2.png" />
       </van-col>
       <van-col span="12">
         <image bindtap="toPage" data-url="/pages/stroke/index" mode="scaleToFill" style="width: 342rpx;height: 174rpx;" src="../../assets/btn3.png" />
-        <image bindtap="toPage" data-url="/pages/liveVideo/index" mode="scaleToFill" style="width: 342rpx;height: 174rpx;" src="../../assets/btn4.png" />
+        <image wx:if="{{showMD}}" bindtap="toPage" data-url="/pages/liveVideo/index" mode="scaleToFill" style="width: 342rpx;height: 174rpx;" src="../../assets/btn4.png" />
       </van-col>
     </van-row>
   </view>

pages/seatNumber/index.js

@@ -34,8 +34,10 @@ Page({
         const v = strokeList[i];
         const time = (v.agendaTime || "").split(" ");
         if (!time.length) continue
-        if (!sl[time[0]]) sl[time[0]] = [];
-        sl[time[0]].push(v);
+        let t0 = time[0].split('-');
+        let key = [t0[1] , t0[2]].join("-");
+        if (!sl[key]) sl[key] = [];
+        sl[key].push(v);
       }
       this.setData({
         meetingList: sl