Merge remote-tracking branch 'origin/master'

light-application-wx/app.json

@@ -1,18 +1,15 @@
 {
     "pages": [
         "pages/login/login",
-        "pages/index-work/index-work",
         "pages/index/index",
         "pages/logs/logs",
         "pages/visit-agenda/visit-agenda",
         "pages/meeting-inspection/meeting-inspection",
-        "pages/index-guest/index-guest",
         "pages/meeting-list/meeting-list",
         "pages/file-browse/file-browse",
         "pages/file-detail/file-detail",
         "pages/chat-room/chat-room",
         "pages/chat-detail/chat-detail",
-        "pages/index-admin/index-admin",
         "pages/information-release/information-release",
         "pages/light-map/light-map",
         "pages/meeting-cover/meeting-cover",
@@ -22,7 +19,8 @@
         "pages/daily-inspection/daily-inspection",
         "pages/chat-group/chat-group",
         "pages/chat-group-detail/chat-group-detail",
-        "pages/personal/personal"
+        "pages/personal/personal",
+        "pages/fault-list/fault-list"
     ],
     "window": {
         "backgroundTextStyle": "light",

light-application-wx/comps/chat/msglist/msglist.js

@@ -68,7 +68,7 @@ Component({
 
         getHistoryMsg() {
             let me = this
-            let username = this.data.username;
+            let username = me.data.username;
             let myUsername = wx.getStorageSync("myUsername");
             let sessionKey = username.groupId ? username.groupId + myUsername : username.your + myUsername;
             let historyChatMsgs = wx.getStorageSync("rendered_" + sessionKey) || [];

light-application-wx/comps/chat/msglist/msglist.wxss

@@ -229,4 +229,18 @@
     font-size: 22rpx;
     color: #dcdcdc;
     padding: 10rpx;
+}
+
+.msgbox {
+    width: 90%;
+}
+
+.clickMsg {
+    width: 100%;
+}
+
+.msg-text {
+    width: 100%;
+    overflow-wrap: normal;
+    word-break: break-all;
 }

light-application-wx/pages/chat-group-detail/chat-group-detail.js

@@ -1,5 +1,6 @@
 // pages/chat-group-detail/chat-group-detail.js
 let disp = require("../../utils/broadcast");
+
 Page({
 
     /**

light-application-wx/pages/chat-room/chat-room.js

@@ -3,6 +3,7 @@ const app = getApp();
 const disp = require("../../utils/broadcast.js");
 const WebIM = require("../../utils/WebIM.js")["default"];
 const util = require('../../utils/util.js');
+
 Page({
 
     /**
@@ -454,5 +455,40 @@ Page({
         } else {
             return `${dateArr[0]}/${dateArr[1]}/${dateArr[2]}`;
         }
+    },
+
+    /**
+     * 扫一扫加入群聊
+     */
+    scanJoinGroup: function () {
+        wx.scanCode({
+            onlyFromCamera: true,
+            success: (res) => {
+                console.info('scanCode', res);
+                if (res.result) {
+                    util.post({
+                        url: '/api/easemob/addGroupUser',
+                        data: {
+                            chatgroupid: res.result,
+                            usernames: [wx.getStorageSync('myUsername')]
+                        },
+                        success: (res) => {
+                            wx.hideLoading();
+                            console.info('addGroupUser', res);
+                            if (res.data.code != 200) {
+                                util.toast(res.data.msg);
+                            } else {
+                                util.toast(res.data.msg);
+                            }
+                        }
+                    });
+                }
+
+            },
+            fail: (err) => {
+                console.info('scanCode', err);
+            }
+        });
     }
+
 })

light-application-wx/pages/chat-room/chat-room.wxml

@@ -64,4 +64,9 @@
 <!-- bug: margin-bottom 不生效 需要加一个空标签-->
 <view style="height: 1px;"></view>
 
-<view class="mask" bindtap="close_mask" wx:if="{{show_mask}}"></view>
+<view class="mask" bindtap="close_mask" wx:if="{{show_mask}}"></view>
+
+<view class="scan-jion-group" bindtap="scanJoinGroup">
+    <text>扫一扫</text>
+    <text>加入群聊</text>
+</view>

light-application-wx/pages/chat-room/chat-room.wxss

@@ -256,4 +256,20 @@
 .goback {
     top: 128rpx;
     transition: top 0.5s;
+}
+
+.scan-jion-group {
+    background-color: #516C9C;
+    width: 130rpx;
+    height: 130rpx;
+    border-radius: 65rpx;
+    position: absolute;
+    right: 19rpx;
+    bottom: 92rpx;
+    color: #FEFEFE;
+    font-size: 22rpx;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
 }

light-application-wx/pages/fault-list/fault-list.js

@@ -0,0 +1,142 @@
+// pages/fault-list/fault-list.js
+const util = require('../../utils/util.js');
+
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        current: 1,
+        size: 10,
+        total: 0,
+        list: [],
+        type: ''
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        let that = this;
+        util.get({
+            url: '/api/fault/handling/record/list',
+            data: {
+                current: that.data.current,
+                size: that.data.size
+            },
+            success: function (res) {
+                wx.hideLoading();
+                if (res.data.code != 200) {
+                    util.toast(res.data.msg);
+                } else {
+                    that.setData({
+                        total: res.data.data.total,
+                        list: res.data.data.records
+                    });
+                }
+            }
+        });
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+        let that = this;
+        that.setData({
+            current: 1,
+            list: []
+        });
+        util.get({
+            url: '/api/fault/handling/record/list',
+            data: {
+                current: that.data.current,
+                size: that.data.size
+            },
+            success: (res) => {
+                wx.hideLoading();
+                wx.stopPullDownRefresh();
+                if (res.data.code != 200) {
+                    util.toast(res.data.msg);
+                } else {
+                    that.setData({
+                        total: res.data.data.total,
+                        list: res.data.data.records
+                    });
+                }
+            }
+        });
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+        let that = this;
+        let arr = that.data.list;
+        let page = that.data.current;
+        if (arr.length >= that.data.total) {
+            util.toast('没有更多数据了');
+            return;
+        }
+        that.setData({
+            current: ++page
+        });
+        util.get({
+            url: '/api/fault/handling/record/list',
+            data: {
+                current: that.data.current,
+                size: that.data.size
+            },
+            success: (res) => {
+                wx.hideLoading();
+                wx.stopPullDownRefresh();
+                console.info(res);
+                if (res.data.code != 200) {
+                    util.toast(res.data.msg);
+                } else {
+                    let list = res.data.data.records;
+                    that.setData({
+                        list: arr.concat(list)
+                    });
+                }
+            }
+        });
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})

light-application-wx/pages/fault-list/fault-list.json

@@ -0,0 +1,7 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "故障处理",
+    "navigationBarBackgroundColor": "#2867B6",
+    "navigationBarTextStyle": "white",
+    "enablePullDownRefresh": true
+}

light-application-wx/pages/fault-list/fault-list.wxml

@@ -0,0 +1,18 @@
+<!--pages/fault-list/fault-list.wxml-->
+<scroll-view class="list" scroll-y="true">
+    <view class="item" wx:for="{{list}}" wx:key="i" data-item="{{item}}">
+        <view class="item-title">{{item.title}}</view>
+        <view class="item-row">
+            <label>内容：</label>
+            <text>{{item.content}}</text>
+        </view>
+        <view class="item-row">
+            <label>提出人员：</label>
+            <text>{{item.proposePersonnel}}</text>
+        </view>
+        <view class="item-row">
+            <label>提出时间：</label>
+            <text>{{item.createTime}}</text>
+        </view>
+    </view>
+</scroll-view>

light-application-wx/pages/fault-list/fault-list.wxss

@@ -0,0 +1,42 @@
+/* pages/fault-list/fault-list.wxss */
+
+page {
+    background-color: #F0F4F7;
+}
+
+.item {
+    box-sizing: border-box;
+    background-color: #FFFFFF;
+    border-radius: 20rpx;
+    margin-bottom: 18rpx;
+    padding: 30rpx;
+    margin: 15rpx 30rpx;
+}
+
+.item-title {
+    line-height: 60rpx;
+    border-bottom: solid 1rpx #EBE8E3;
+    padding-bottom: 15rpx;
+}
+
+.item-row {
+    margin-top: 12rpx;
+    margin-bottom: 12rpx;
+    font-size: 30rpx;
+    display: flex;
+    align-items: center;
+}
+
+.item-row label {
+    color: #999999;
+}
+
+.item-row text {
+    word-break: break-all;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 1;
+    -webkit-box-orient: vertical;
+    max-width: 75%;
+}

light-application-wx/pages/index-admin/index-admin.js

@@ -1,326 +0,0 @@
-// pages/index-admin/index-admin.js
-const app = getApp();
-const util = require('../../utils/util.js');
-
-Page({
-
-    /**
-     * 页面的初始数据
-     */
-    data: {
-        imgPath: app.globalData.imgPath,
-        path: app.globalData.path,
-        username: app.globalData.userInfo.usernameShow,
-        role_name: app.globalData.roleInfo.name,
-        app_bottom: '大城细管·大城众管·大城智管',
-        nextMeeting: null
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad: function (options) {
-        let that = this;
-        if (!app.globalData.userInfo.usernameShow || !app.globalData.userInfo.nickName || !app.globalData.userInfo.headImgUrl) {
-            wx.showModal({
-                title: '提示',
-                content: '轻应用需要取您的用户信息',
-                showCancel: false,
-                confirmText: '确定',
-                success: (res) => {
-                    if (res.confirm) {
-                        wx.getUserProfile({
-                            desc: '提升用户体验感',
-                            success: (res) => {
-                                app.globalData.userInfo.usernameShow = res.userInfo.nickName;
-                                app.globalData.userInfo.nickName = res.userInfo.nickName;
-                                app.globalData.userInfo.headImgUrl = res.userInfo.avatarUrl;
-                                that.setData({
-                                    username: app.globalData.userInfo.usernameShow,
-                                    role_name: app.globalData.roleInfo.name
-                                });
-                                util.post({
-                                    url: '/sys/user/updateNoAuth',
-                                    data: {
-                                        id: app.globalData.userInfo.id,
-                                        nickName: res.userInfo.nickName,
-                                        usernameShow: res.userInfo.nickName,
-                                        headImgUrl: res.userInfo.avatarUrl
-                                    }
-                                });
-                            },
-                            fail: (res) => {
-                                util.toast('拒绝授权将影响您的体验感');
-                                that.setData({
-                                    username: '未知用户',
-                                    role_name: app.globalData.roleInfo.name
-                                });
-                            }
-                        });
-                    }
-                },
-            });
-        } else {
-            that.setData({
-                username: app.globalData.userInfo.usernameShow,
-                role_name: app.globalData.roleInfo.name
-            });
-        }
-        // 下一场会议
-        util.get({
-            url: '/api/meeting/info/getNextMeeting',
-            success: (res) => {
-                wx.hideLoading();
-                if (res.data.code != 200) {
-                    util.toast(res.data.msg);
-                } else {
-                    let datas = res.data.data;
-                    if (datas) {
-                        that.setData({
-                            nextMeeting: datas,
-                            nextTitle: datas.title,
-                            nextTime: util.formatDate(datas.receptionTime),
-                            nextUnit: datas.receptionObject
-                        });
-                    } else {
-                        util.toast('暂无下一场会议');
-                    }
-                }
-            }
-        });
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload: function () {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh: function () {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom: function () {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage: function () {
-
-    },
-
-    /**
-     * 调试使用：切换角色菜单
-     */
-    changeRole: function () {
-        wx.redirectTo({
-            url: '../index-guest/index-guest',
-        })
-    },
-
-    /**
-     * 点击查看下一场会议详情
-     */
-    meetingInfo: function () {
-        let nextMeeting = this.data.nextMeeting;
-        if (nextMeeting) {
-            wx.navigateTo({
-                url: '../meeting-cover/meeting-cover?item=' + JSON.stringify(nextMeeting),
-            });
-        } else {
-            util.toast('暂无下一场会议');
-        }
-    },
-
-    /**
-     * 日常巡检
-     */
-    dailyInspection: function () {
-        wx.navigateTo({
-            url: '../daily-inspection/daily-inspection',
-        });
-    },
-
-    /**
-     * 发布会议信息
-     */
-    informationRelease: function () {
-        wx.navigateTo({
-            url: '../information-release/information-release',
-        });
-    },
-
-    /**
-     * 分享海报
-     */
-    meetingCover: function () {
-        wx.navigateTo({
-            url: '../meeting-cover/meeting-cover',
-        });
-    },
-
-    /**
-     * 图片回传
-     */
-    uploadImage: function () {
-        let that = this;
-        wx.chooseImage({
-            count: 1,
-            success: function (res) {
-                console.info(res.tempFilePaths);
-                wx.uploadFile({
-                    filePath: res.tempFilePaths[0],
-                    name: 'file',
-                    url: that.data.path + '/api/upload/record/upload',
-                    header: {
-                        "Content-Type": "multipart/form-data",
-                        "Authorization": app.globalData.Authorization
-                    },
-                    formData: {
-                        fileType: 10
-                    },
-                    success(res) {
-                        console.info(res)
-                    }
-                });
-            }
-        });
-    },
-
-    /**
-     * 内容投屏
-     */
-    contentScreen: function () {
-        let wifi, pass;
-        // 打开微信扫一扫
-        wx.scanCode({
-            onlyFromCamera: true,
-            scanType: 'qrCode',
-            success: (res) => {
-                console.info(res);
-                if (res.result.indexOf('WIFI') < 0) {
-                    util.toast('请扫描WIFI二维码');
-                    return;
-                }
-                wx.showLoading({
-                    title: '加载中...',
-                    mask: true
-                });
-                try {
-                    let a = res.result.split(',');
-                    wifi = a[0].split(':')[1];
-                    pass = a[1].split(':')[1];
-                } catch (error) {
-                    util.toast('请扫描WIFI二维码');
-                    return;
-                }
-                // 获取设备系统类型
-                wx.getSystemInfo({
-                    success: (res) => {
-                        console.info(res);
-                        if (!res.wifiEnabled) {
-                            wx.hideLoading();
-                            util.toast('请打开WIFI功能');
-                            return;
-                        }
-                        // 1、初始化Wi-Fi模块
-                        wx.startWifi({
-                            success: (res) => {
-                                console.info(res)
-                                if (res.errMsg == 'startWifi:ok') {
-                                    // 4、连接Wi-Fi
-                                    wx.connectWifi({
-                                        SSID: wifi,
-                                        password: pass,
-                                        success: (res) => {
-                                            wx.hideLoading();
-                                            console.info('connectWifi', res);
-                                            if (res.errMsg == 'connectWifi:ok') {
-                                                util.toast('WIFI连接成功', 'success');
-                                            } else {
-                                                util.toast(res.errMsg);
-                                            }
-                                        },
-                                        fail: (e) => {
-                                            console.info(e);
-                                            util.toast('WIFI连接失败');
-                                        }
-                                    });
-                                } else {
-                                    util.toast(res.errMsg);
-                                }
-                            },
-                            fail: (e) => {
-                                console.info(e);
-                                util.toast('初始化WiFi模块失败');
-                            }
-                        });
-                    },
-                    fail: (e) => {
-                        util.toast('获取设备系统类型失败');
-                        return;
-                    }
-                });
-            },
-            fail: (e) => {
-                util.toast('扫码失败，请重试');
-                return;
-            }
-        });
-    },
-
-    /**
-     * 地图
-     */
-    lightMap: function () {
-        wx.navigateTo({
-            url: '../light-map/light-map',
-        });
-    },
-
-    /**
-     * 聊天室
-     */
-    chatRoom: function () {
-        wx.navigateTo({
-            url: '../chat-room/chat-room',
-        });
-    },
-
-    /**
-     * 故障处理
-     */
-    faultHandle: function () {
-        util.toast('功能暂未开放');
-    }
-})

light-application-wx/pages/index-admin/index-admin.json

@@ -1,5 +0,0 @@
-{
-    "usingComponents": {},
-    "navigationBarTitleText": "",
-    "navigationStyle": "custom"
-}

light-application-wx/pages/index-admin/index-admin.wxml

@@ -1,63 +0,0 @@
-<!--pages/index-admin/index-admin.wxml-->
-<view class="container" style="height: 50%;background-image: url({{imgPath}}/index-bg.png);">
-    <view class="login-info">
-        <text>你好，{{username}}</text><text class="role-name" bindtap="changeRole">{{role_name}}</text>
-        <view class="app-bottom">{{app_bottom}}</view>
-    </view>
-
-    <view class="next" style="background-image: url({{imgPath}}/index-next.png);" bindtap="meetingInfo">
-        <view class="line-row">
-            <view class="line"></view>
-            <span>下一场</span>
-            <view class="line"></view>
-        </view>
-        <view class="next-row">
-            <text class="next-title">参观主题：</text>
-            <text class="next-content">{{nextTitle}}</text>
-        </view>
-        <view class="next-row">
-            <text class="next-title">参观时间：</text>
-            <text class="next-content">{{nextTime}}</text>
-        </view>
-        <view class="next-row">
-            <text class="next-title">参观单位：</text>
-            <text class="next-content">{{nextUnit}}</text>
-        </view>
-    </view>
-</view>
-<view class="second-part">
-    <view class="inspection">
-        <view class="inspection-left" style="background-image: url({{imgPath}}/index-inspection.png);" bindtap="dailyInspection">
-            <image mode="scaleToFill" src="{{imgPath}}/index-inspection-in1.png"></image>
-            <text>日常巡检</text>
-        </view>
-        <view class="inspection-right" style="background-image: url({{imgPath}}/index-inspection-right2.png);" bindtap="informationRelease">
-            <image mode="scaleToFill" src="{{imgPath}}/index-inspection-in3.png"></image>
-            <text>发布消息</text>
-        </view>
-    </view>
-    <view class="bottmo-module">
-        <view class="light" bindtap="meetingCover">
-            <image mode="scaleToFill" src="{{imgPath}}/index-light7.png"></image>
-            <text>分享海报</text>
-        </view>
-        <view class="light" bindtap="uploadImage">
-            <image mode="scaleToFill" src="{{imgPath}}/index-light2.png"></image>
-            <text>图片回传</text>
-        </view>
-        <view class="big" bindtap="contentScreen">
-            <image mode="scaleToFill" src="{{imgPath}}/index-light5.png"></image>
-            <text>内容投屏</text>
-        </view>
-    </view>
-    <view class="bottmo-module bottom">
-        <view class="light" bindtap="chatRoom">
-            <image mode="scaleToFill" src="{{imgPath}}/index-light3.png"></image>
-            <text>聊天室</text>
-        </view>
-        <view class="light" bindtap="faultHandle">
-            <image mode="scaleToFill" src="{{imgPath}}/index-light8.png"></image>
-            <text>故障处理</text>
-        </view>
-    </view>
-</view>

light-application-wx/pages/index-admin/index-admin.wxss

@@ -1,200 +0,0 @@
-/* pages/index-admin/index-admin.wxss */
-.container {
-    padding: 20rpx;
-    align-items: flex-start;
-    background-size: 100% 100%;
-    z-index: -99;
-    width: 100%;
-}
-
-.login-info {
-    margin: 10rpx;
-    margin-top: 80rpx;
-    font-size: 1.2em;
-    color: #ffffff;
-}
-
-.role-name {
-    font-size: .6em;
-    background-color: #86b9ff;
-    border-radius: 20rpx;
-    padding: 8rpx 14rpx;
-    margin: 0 20rpx;
-    color: #ffffff;
-}
-
-.app-bottom {
-    color: #eee;
-    font-size: .8em;
-    position: relative;
-    top: 20rpx;
-}
-
-.next {
-    width: 90%;
-    margin-left: 5%;
-    background-size: 100% 100%;
-    position: relative;
-    bottom: -30rpx;
-}
-
-.next-title {
-    width: 80%;
-    margin-left: 10%;
-    display: inline-flex;
-    align-items: center;
-    text-align: center;
-    justify-content: center;
-}
-
-.line {
-    width: 30%;
-    height: 1rpx;
-    text-align: center;
-    background-color: #dad8da;
-}
-
-.line-row text {
-    width: 33%;
-}
-
-.next-row {
-    margin-left: 5%;
-    margin-top: 10rpx;
-    margin-bottom: 10rpx;
-    font-size: .9em;
-}
-
-.next-title {
-    color: #cbcdce;
-}
-
-.second-part {
-    width: 94%;
-    height: 50%;
-    padding: 30rpx 3%;
-    background-color: #F0F4F7;
-    display: inline-flex;
-    flex-direction: column;
-    align-items: center;
-}
-
-.inspection {
-    width: 98%;
-    height: 146rpx;
-    margin-top: 20rpx;
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    border-radius: 20rpx;
-    background-color: #ffffff;
-    padding: 15rpx;
-}
-
-.inspection-left {
-    width: 48%;
-    height: 146rpx;
-    line-height: 146rpx;
-    color: #fff;
-    background-size: 100% 100%;
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    text-align: center;
-}
-
-.inspection-left image {
-    height: 80rpx;
-    width: 80rpx;
-}
-
-.inspection-left text {
-    margin-left: 15rpx;
-}
-
-.inspection-right {
-    width: 48%;
-    height: 146rpx;
-    line-height: 146rpx;
-    color: #fff;
-    margin-left: 20rpx;
-    background-size: 100% 100%;
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    text-align: center;
-}
-
-.inspection-right image {
-    height: 80rpx;
-    width: 80rpx;
-}
-
-.inspection-right text {
-    margin-left: 15rpx;
-}
-
-.bottmo-module {
-    width: 100%;
-    margin-top: 20rpx;
-    display: inline-flex;
-    flex-direction: row;
-    align-items: flex-start;
-    justify-content: space-between;
-}
-
-.bottmo-module.bottom {
-    width: 100%;
-    margin-top: -145rpx;
-    display: inline-flex;
-    flex-direction: row;
-    font-size: .8em;
-    justify-content: flex-start;
-}
-
-.light {
-    height: 130rpx;
-    width: 32%;
-    margin-right: 15rpx;
-    margin-top: 15rpx;
-    background: #fff;
-    line-height: 130rpx;
-    border-radius: 10rpx;
-    display: inline-flex;
-    align-items: center;
-    text-align: center;
-}
-
-.light image {
-    width: 72rpx;
-    height: 72rpx;
-    margin-left: 15rpx;
-}
-
-.light text {
-    font-size: .8em;
-    margin-left: 10rpx;
-}
-
-.big {
-    height: 275rpx;
-    width: 32%;
-    background: #fff;
-    text-align: center;
-    border-radius: 10rpx;
-    display: inline-flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    margin-top: 15rpx;
-}
-
-.big image {
-    width: 70rpx;
-    height: 70rpx;
-}
-
-.big text {
-    font-size: .8em;
-    margin-top: 10rpx;
-}

light-application-wx/pages/index-guest/index-guest.js

@@ -1,340 +0,0 @@
-// pages/index-guest/index-guest.js
-const app = getApp();
-const util = require('../../utils/util.js');
-Page({
-
-    /**
-     * 页面的初始数据
-     */
-    data: {
-        imgPath: app.globalData.imgPath,
-        path: app.globalData.path,
-        username: app.globalData.userInfo.usernameShow,
-        role_name: app.globalData.roleInfo.name,
-        app_bottom: '大城细管·大城众管·大城智管',
-        nowTime: util.formatDate(null, 'yyyy.MM.dd'),
-        nextMeeting: null,
-        hasNext: false
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad: function (options) {
-        let that = this;
-        if (!app.globalData.userInfo.usernameShow || !app.globalData.userInfo.nickName || !app.globalData.userInfo.headImgUrl) {
-            wx.showModal({
-                title: '提示',
-                content: '轻应用需要取您的用户信息',
-                showCancel: false,
-                confirmText: '确定',
-                success: (res) => {
-                    if (res.confirm) {
-                        wx.getUserProfile({
-                            desc: '提升用户体验感',
-                            success: (res) => {
-                                app.globalData.userInfo.usernameShow = res.userInfo.nickName;
-                                app.globalData.userInfo.nickName = res.userInfo.nickName;
-                                app.globalData.userInfo.headImgUrl = res.userInfo.avatarUrl;
-                                that.setData({
-                                    username: app.globalData.userInfo.usernameShow,
-                                    role_name: app.globalData.roleInfo.name
-                                });
-                                util.post({
-                                    url: '/sys/user/updateNoAuth',
-                                    data: {
-                                        id: app.globalData.userInfo.id,
-                                        nickName: res.userInfo.nickName,
-                                        usernameShow: res.userInfo.nickName,
-                                        headImgUrl: res.userInfo.avatarUrl
-                                    }
-                                });
-                            },
-                            fail: (res) => {
-                                util.toast('拒绝授权将影响您的体验感');
-                                that.setData({
-                                    username: '未知用户',
-                                    role_name: app.globalData.roleInfo.name
-                                });
-                            }
-                        });
-                    }
-                },
-            });
-        } else {
-            that.setData({
-                username: app.globalData.userInfo.usernameShow,
-                role_name: app.globalData.roleInfo.name
-            });
-        }
-        // 下一场会议
-        util.get({
-            url: '/api/meeting/info/getNextMeeting',
-            success: (res) => {
-                wx.hideLoading();
-                if (res.data.code != 200) {
-                    util.toast(res.data.msg);
-                } else {
-                    let datas = res.data.data;
-                    if (datas) {
-                        that.setData({
-                            hasNext: true,
-                            nextMeeting: datas,
-                            nextTitle: datas.title,
-                            nextTime: util.formatDate(datas.receptionTime),
-                            nextUnit: datas.receptionObject
-                        });
-                    } else {
-                        util.toast('暂无下一场会议');
-                    }
-                }
-            }
-        });
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload: function () {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh: function () {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom: function () {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage: function () {
-
-    },
-
-    /**
-     * 调试使用：切换角色菜单
-     */
-    changeRole: function () {
-        wx.redirectTo({
-            url: '../index/index',
-        });
-    },
-
-    /**
-     * 点击查看下一场会议详情
-     */
-    meetingInfo: function () {
-        let nextMeeting = this.data.nextMeeting;
-        if (nextMeeting) {
-            wx.navigateTo({
-                url: '../meeting-cover/meeting-cover?item=' + JSON.stringify(nextMeeting),
-            });
-        } else {
-            util.toast('暂无下一场会议');
-        }
-    },
-
-    /**
-     * 点击参观议程跳转至会议列表
-     */
-    visitAgenda: function () {
-        wx.navigateTo({
-            url: '../meeting-list/meeting-list',
-        });
-    },
-
-    /**
-     * 图片回传
-     */
-    uploadImage: function () {
-        let that = this;
-        wx.chooseImage({
-            count: 1,
-            success: function (res) {
-                console.info(res.tempFilePaths);
-                wx.uploadFile({
-                    filePath: res.tempFilePaths[0],
-                    name: 'file',
-                    url: that.data.path + '/api/upload/record/upload',
-                    header: {
-                        "Content-Type": "multipart/form-data",
-                        "Authorization": app.globalData.Authorization
-                    },
-                    formData: {
-                        fileType: 10
-                    },
-                    success(res) {
-                        console.info(res)
-                    }
-                });
-            }
-        });
-    },
-
-    /**
-     * 内容投屏
-     */
-    contentScreen: function () {
-        let wifi, pass;
-        // 打开微信扫一扫
-        wx.scanCode({
-            onlyFromCamera: true,
-            scanType: 'qrCode',
-            success: (res) => {
-                console.info(res);
-                if (res.result.indexOf('WIFI') < 0) {
-                    util.toast('请扫描WIFI二维码');
-                    return;
-                }
-                wx.showLoading({
-                    title: '加载中...',
-                    mask: true
-                });
-                try {
-                    let a = res.result.split(',');
-                    wifi = a[0].split(':')[1];
-                    pass = a[1].split(':')[1];
-                } catch (error) {
-                    util.toast('请扫描WIFI二维码');
-                    return;
-                }
-                // 获取设备系统类型
-                wx.getSystemInfo({
-                    success: (res) => {
-                        console.info(res);
-                        if (!res.wifiEnabled) {
-                            wx.hideLoading();
-                            util.toast('请打开WIFI功能');
-                            return;
-                        }
-                        // 1、初始化Wi-Fi模块
-                        wx.startWifi({
-                            success: (res) => {
-                                console.info('startWifi', res)
-                                if (res.errMsg == 'startWifi:ok') {
-                                    // 4、连接Wi-Fi
-                                    wx.connectWifi({
-                                        SSID: wifi,
-                                        password: pass,
-                                        success: (res) => {
-                                            wx.hideLoading();
-                                            console.info('connectWifi', res);
-                                            if (res.errMsg == 'connectWifi:ok') {
-                                                util.toast('WIFI连接成功', 'success');
-                                            } else {
-                                                util.toast(res.errMsg);
-                                            }
-                                        },
-                                        fail: (e) => {
-                                            console.info(e);
-                                            util.toast('WIFI连接失败');
-                                        }
-                                    });
-                                } else {
-                                    util.toast(res.errMsg);
-                                }
-                            },
-                            fail: (e) => {
-                                console.info(e);
-                                util.toast('初始化WiFi模块失败');
-                            }
-                        });
-                    },
-                    fail: (e) => {
-                        util.toast('获取设备系统类型失败');
-                        return;
-                    }
-                });
-            },
-            fail: (e) => {
-                util.toast('扫码失败，请重试');
-                return;
-            }
-        });
-    },
-
-    /**
-     * 聊天室
-     * @param {*} e 
-     */
-    chatRoom: function (e) {
-        wx.navigateTo({
-            url: '../chat-room/chat-room',
-        });
-    },
-
-    /**
-     * 地图
-     */
-    lightMap: function () {
-        wx.getSetting({
-            withSubscriptions: true,
-            success: function (res) {
-                console.info(res);
-                if (!res.authSetting['scope.userLocation']) {
-                    wx.authorize({
-                        scope: 'scope.userLocation',
-                        success: function (res) {
-                            console.info(res);
-                            wx.navigateTo({
-                                url: '../light-map/light-map',
-                            });
-                        },
-                        fail: function (e) {
-                            console.info(e);
-                            wx.showToast({
-                                title: '用户拒绝授权',
-                                icon: 'error'
-                            });
-                        }
-                    });
-                } else {
-                    wx.navigateTo({
-                        url: '../light-map/light-map',
-                    });
-                }
-            }
-        });
-    },
-
-    /**
-     * 文件浏览
-     */
-    fileBrowse: function () {
-        wx.navigateTo({
-            url: '../file-browse/file-browse',
-        })
-    },
-
-
-})

light-application-wx/pages/index-guest/index-guest.json

@@ -1,5 +0,0 @@
-{
-    "usingComponents": {},
-    "navigationBarTitleText": "",
-    "navigationStyle": "custom"
-}

light-application-wx/pages/index-guest/index-guest.wxml

@@ -1,55 +0,0 @@
-<!--pages/index-guest/index-guest.wxml-->
-<view class="container" style="height: 50%;background-image: url({{imgPath}}/index-bg.png);">
-    <view class="login-info">
-        <text>你好，{{username}}</text><text class="role-name" bindtap="changeRole">{{role_name}}</text>
-        <view class="app-bottom">{{app_bottom}}</view>
-    </view>
-
-    <view class="next" style="background-image: url({{imgPath}}/index-next2.png);">
-        <view class="line-row">热烈欢迎领导莅临指导</view>
-        <image class="next-line" mode="scaleToFill" src="{{imgPath}}/index-next-line.png"></image>
-        <view class="next-row-org">重庆市城市管理局</view>
-        <view class="next-row-time">{{nowTime}}</view>
-    </view>
-</view>
-<view class="second-part">
-    <view class="curr-meeting" wx:if="{{hasNext}}" bindtap="meetingInfo">
-        <view class="curr-time">{{nextTime}}</view>
-        <view class="curr-row">
-            <text class="row-title">单位：</text>
-            <text class="row-value">{{nextUnit}}</text>
-        </view>
-        <view class="curr-row">
-            <text class="row-title">主题：</text>
-            <text class="row-value">{{nextTitle}}</text>
-        </view>
-    </view>
-    <view class="bottmo-module">
-        <view class="light" bindtap="visitAgenda">
-            <image mode="scaleToFill" src="{{imgPath}}/index-light1.png"></image>
-            <text>参观议程</text>
-        </view>
-        <view class="light" bindtap="uploadImage">
-            <image mode="scaleToFill" src="{{imgPath}}/index-light2.png"></image>
-            <text>图片回传</text>
-        </view>
-        <view class="light" bindtap="contentScreen">
-            <image mode="scaleToFill" src="{{imgPath}}/index-light5.png"></image>
-            <text>内容投屏</text>
-        </view>
-    </view>
-    <view class="bottmo-module">
-        <view class="light" bindtap="chatRoom">
-            <image mode="scaleToFill" src="{{imgPath}}/index-light3.png"></image>
-            <text>聊天室</text>
-        </view>
-        <view class="light" bindtap="lightMap">
-            <image mode="scaleToFill" src="{{imgPath}}/index-light4.png"></image>
-            <text>地图</text>
-        </view>
-        <view class="light" bindtap="fileBrowse">
-            <image mode="scaleToFill" src="{{imgPath}}/index-light6.png"></image>
-            <text>文件浏览</text>
-        </view>
-    </view>
-</view>

light-application-wx/pages/index-guest/index-guest.wxss

@@ -1,164 +0,0 @@
-/* pages/index-guest/index-guest.wxss */
-.container {
-    padding: 20rpx;
-    align-items: flex-start;
-    background-size: 100% 100%;
-    z-index: -99;
-    width: 100%;
-}
-
-.login-info {
-    margin: 10rpx;
-    margin-top: 80rpx;
-    font-size: 1.2em;
-    color: #ffffff;
-}
-
-.role-name {
-    font-size: .6em;
-    background-color: #86b9ff;
-    border-radius: 20rpx;
-    padding: 8rpx 14rpx;
-    margin: 0 20rpx;
-    color: #ffffff;
-}
-
-.app-bottom {
-    color: #eee;
-    font-size: .8em;
-    position: relative;
-    top: 20rpx;
-}
-
-.next {
-    width: 90%;
-    margin-left: 5%;
-    background-size: 100% 100%;
-    position: relative;
-    bottom: -30rpx;
-}
-
-.line-row {
-    text-align: center;
-    color: #EC6D27;
-    font-size: 1.5em;
-    margin-top: 20rpx;
-}
-
-.next-line {
-    height: 9rpx;
-    width: 60%;
-    text-align: center;
-    margin-left: 20%;
-    /* margin-top: -10rpx; */
-}
-
-.next-row-org {
-    margin-top: 20rpx;
-    margin-bottom: 10rpx;
-    color: #8C441C;
-    text-align: center;
-}
-
-.next-row-time {
-    margin-top: 10rpx;
-    margin-bottom: 20rpx;
-    font-size: .8em;
-    color: #8C441C60;
-    text-align: center;
-}
-
-.second-part {
-    width: 94%;
-    height: 50%;
-    padding: 30rpx 3%;
-    background-color: #F0F4F7;
-    display: inline-flex;
-    flex-direction: column;
-    align-items: center;
-}
-
-.curr-meeting {
-    width: 90%;
-    height: 180rpx;
-    margin-top: 20rpx;
-    border-radius: 20rpx;
-    background-color: #ffffff;
-    padding: 30rpx;
-}
-
-.curr-time {
-    font-size: 32rpx;
-    border-bottom: solid 1rpx #EBE8E3;
-    padding-bottom: 20rpx;
-}
-
-.curr-row {
-    margin-top: 20rpx;
-}
-
-.row-title {
-    color: #999999;
-    font-size: 28rpx;
-}
-
-.row-value {
-    margin-left: 13rpx;
-    font-size: 28rpx;
-}
-
-.bottmo-module {
-    width: 100%;
-    margin-top: 10rpx;
-    display: inline-flex;
-    flex-direction: row;
-    align-items: flex-start;
-    justify-content: space-between;
-}
-
-.light {
-    height: 130rpx;
-    width: 32%;
-    margin-right: 15rpx;
-    margin-top: 15rpx;
-    background: #fff;
-    line-height: 130rpx;
-    border-radius: 10rpx;
-    display: inline-flex;
-    align-items: center;
-    text-align: center;
-}
-
-.light image {
-    width: 72rpx;
-    height: 72rpx;
-    margin-left: 15rpx;
-}
-
-.light text {
-    font-size: .8em;
-    margin-left: 10rpx;
-}
-
-.big {
-    height: 275rpx;
-    width: 32%;
-    background: #fff;
-    text-align: center;
-    border-radius: 10rpx;
-    display: inline-flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    margin-top: 15rpx;
-}
-
-.big image {
-    width: 70rpx;
-    height: 70rpx;
-}
-
-.big text {
-    font-size: .8em;
-    margin-top: 10rpx;
-}

light-application-wx/pages/index-work/index-work.js

@@ -1,347 +0,0 @@
-// pages/index/index.js
-const app = getApp();
-const util = require('../../utils/util.js');
-
-Page({
-
-    /**
-     * 页面的初始数据
-     */
-    data: {
-        imgPath: app.globalData.imgPath,
-        path: app.globalData.path,
-        username: app.globalData.userInfo.usernameShow,
-        role_name: app.globalData.roleInfo.name,
-        app_bottom: '大城细管·大城众管·大城智管',
-        nextMeeting: null
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad: function (options) {
-        let that = this;
-        if (!app.globalData.userInfo.usernameShow || !app.globalData.userInfo.nickName || !app.globalData.userInfo.headImgUrl) {
-            wx.showModal({
-                title: '提示',
-                content: '轻应用需要取您的用户信息',
-                showCancel: false,
-                confirmText: '确定',
-                success: (res) => {
-                    if (res.confirm) {
-                        wx.getUserProfile({
-                            desc: '提升用户体验感',
-                            success: (res) => {
-                                app.globalData.userInfo.usernameShow = res.userInfo.nickName;
-                                app.globalData.userInfo.nickName = res.userInfo.nickName;
-                                app.globalData.userInfo.headImgUrl = res.userInfo.avatarUrl;
-                                that.setData({
-                                    username: app.globalData.userInfo.usernameShow,
-                                    role_name: app.globalData.roleInfo.name
-                                });
-                                util.post({
-                                    url: '/sys/user/updateNoAuth',
-                                    data: {
-                                        id: app.globalData.userInfo.id,
-                                        nickName: res.userInfo.nickName,
-                                        usernameShow: res.userInfo.nickName,
-                                        headImgUrl: res.userInfo.avatarUrl
-                                    }
-                                });
-                            },
-                            fail: (res) => {
-                                util.toast('拒绝授权将影响您的体验感');
-                                that.setData({
-                                    username: '未知用户',
-                                    role_name: app.globalData.roleInfo.name
-                                });
-                            }
-                        });
-                    }
-                },
-            });
-        } else {
-            that.setData({
-                username: app.globalData.userInfo.usernameShow,
-                role_name: app.globalData.roleInfo.name
-            });
-        }
-        // 下一场会议
-        util.get({
-            url: '/api/meeting/info/getNextMeeting',
-            success: (res) => {
-                wx.hideLoading();
-                console.info(res)
-                if (res.data.code != 200) {
-                    util.toast(res.data.msg);
-                } else {
-                    let datas = res.data.data;
-                    if (datas) {
-                        that.setData({
-                            nextMeeting: datas,
-                            nextTitle: datas.title,
-                            nextTime: util.formatDate(datas.receptionTime),
-                            nextUnit: datas.receptionObject
-                        });
-                    } else {
-                        util.toast('暂无下一场会议');
-                    }
-                }
-            }
-        });
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload: function () {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh: function () {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom: function () {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage: function () {
-
-    },
-
-    /**
-     * 调试使用：切换角色菜单
-     */
-    changeRole: function () {
-        wx.redirectTo({
-            url: '../index-admin/index-admin',
-        });
-    },
-
-    /**
-     * 点击查看下一场会议详情
-     */
-    meetingInfo: function () {
-        let nextMeeting = this.data.nextMeeting;
-        if (nextMeeting) {
-            wx.navigateTo({
-                url: '../meeting-cover/meeting-cover?item=' + JSON.stringify(nextMeeting),
-            });
-        } else {
-            util.toast('暂无下一场会议');
-        }
-    },
-
-    /**
-     * 日常巡检
-     */
-    dailyInspection: function () {
-        wx.navigateTo({
-            url: '../daily-inspection/daily-inspection',
-        });
-    },
-
-    /**
-     * 会议巡检
-     */
-    meetingInspection: function () {
-        wx.navigateTo({
-            url: '../meeting-list/meeting-list?type=INSPECTION',
-        });
-    },
-
-    /**
-     * 点击参观议程跳转至会议列表
-     */
-    visitAgenda: function () {
-        wx.navigateTo({
-            url: '../meeting-list/meeting-list',
-        });
-    },
-
-    /**
-     * 图片回传
-     */
-    uploadImage: function () {
-        let that = this;
-        wx.chooseImage({
-            count: 1,
-            success: function (res) {
-                console.info(res.tempFilePaths);
-                wx.uploadFile({
-                    filePath: res.tempFilePaths[0],
-                    name: 'file',
-                    url: that.data.path + '/api/upload/record/upload',
-                    header: {
-                        "Content-Type": "multipart/form-data",
-                        "Authorization": app.globalData.Authorization
-                    },
-                    formData: {
-                        fileType: 10
-                    },
-                    success(res) {
-                        console.info(res)
-                    }
-                });
-            }
-        });
-    },
-
-    /**
-     * 内容投屏
-     */
-    contentScreen: function () {
-        let wifi, pass;
-        // 打开微信扫一扫
-        wx.scanCode({
-            onlyFromCamera: true,
-            scanType: 'qrCode',
-            success: (res) => {
-                console.info(res);
-                if (res.result.indexOf('WIFI') < 0) {
-                    util.toast('请扫描WIFI二维码');
-                    return;
-                }
-                wx.showLoading({
-                    title: '加载中...',
-                    mask: true
-                });
-                try {
-                    let a = res.result.split(',');
-                    wifi = a[0].split(':')[1];
-                    pass = a[1].split(':')[1];
-                } catch (error) {
-                    util.toast('请扫描WIFI二维码');
-                    return;
-                }
-                // 获取设备系统类型
-                wx.getSystemInfo({
-                    success: (res) => {
-                        console.info(res);
-                        if (!res.wifiEnabled) {
-                            wx.hideLoading();
-                            util.toast('请打开WIFI功能');
-                            return;
-                        }
-                        // 1、初始化Wi-Fi模块
-                        wx.startWifi({
-                            success: (res) => {
-                                console.info(res)
-                                if (res.errMsg == 'startWifi:ok') {
-                                    // 4、连接Wi-Fi
-                                    wx.connectWifi({
-                                        SSID: wifi,
-                                        password: pass,
-                                        success: (res) => {
-                                            wx.hideLoading();
-                                            console.info('connectWifi', res);
-                                            if (res.errMsg == 'connectWifi:ok') {
-                                                util.toast('WIFI连接成功', 'success');
-                                            } else {
-                                                util.toast(res.errMsg);
-                                            }
-                                        },
-                                        fail: (e) => {
-                                            console.info(e);
-                                            util.toast('WIFI连接失败');
-                                        }
-                                    });
-                                } else {
-                                    util.toast(res.errMsg);
-                                }
-                            },
-                            fail: (e) => {
-                                console.info(e);
-                                util.toast('初始化WiFi模块失败');
-                            }
-                        });
-                    },
-                    fail: (e) => {
-                        util.toast('获取设备系统类型失败');
-                        return;
-                    }
-                });
-            },
-            fail: (e) => {
-                util.toast('扫码失败，请重试');
-                return;
-            }
-        });
-    },
-
-    /**
-     * 聊天室
-     * @param {*} e 
-     */
-    chatRoom: function (e) {
-        wx.navigateTo({
-            url: '../chat-room/chat-room',
-        });
-    },
-
-    /**
-     * 地图
-     */
-    lightMap: function () {
-        wx.getSetting({
-            withSubscriptions: true,
-            success: function (res) {
-                console.info(res);
-                if (!res.authSetting['scope.userLocation']) {
-                    wx.authorize({
-                        scope: 'scope.userLocation',
-                        success: function (res) {
-                            console.info(res);
-                            wx.navigateTo({
-                                url: '../light-map/light-map',
-                            });
-                        },
-                        fail: function (e) {
-                            console.info(e);
-                            wx.showToast({
-                                title: '用户拒绝授权',
-                                icon: 'error'
-                            });
-                        }
-                    });
-                } else {
-                    wx.navigateTo({
-                        url: '../light-map/light-map',
-                    });
-                }
-            }
-        });
-    }
-
-})

light-application-wx/pages/index-work/index-work.json

@@ -1,5 +0,0 @@
-{
-    "usingComponents": {},
-    "navigationBarTitleText": "",
-    "navigationStyle": "custom"
-}

light-application-wx/pages/index-work/index-work.wxml

@@ -1,64 +0,0 @@
-<!--pages/index/index.wxml-->
-<view class="container" style="height: 50%;background-image: url({{imgPath}}/index-bg.png);">
-    <view class="login-info">
-        <text>你好，{{username}}</text><text class="role-name" bindtap="changeRole">{{role_name}}</text>
-        <view class="app-bottom">{{app_bottom}}</view>
-    </view>
-
-    <view class="next" style="background-image: url({{imgPath}}/index-next.png);" bindtap="meetingInfo">
-        <view class="line-row">
-            <view class="line"></view>
-            <span>下一场</span>
-            <view class="line"></view>
-        </view>
-        <view class="next-row">
-            <text class="next-title">参观主题：</text>
-            <text class="next-content">{{nextTitle}}</text>
-        </view>
-        <view class="next-row">
-            <text class="next-title">参观时间：</text>
-            <text class="next-content">{{nextTime}}</text>
-        </view>
-        <view class="next-row">
-            <text class="next-title">参观单位：</text>
-            <text class="next-content">{{nextUnit}}</text>
-        </view>
-    </view>
-</view>
-
-<view class="second-part">
-    <view class="inspection">
-        <view class="inspection-left" style="background-image: url({{imgPath}}/index-inspection.png);" bindtap="dailyInspection">
-            <image mode="scaleToFill" src="{{imgPath}}/index-inspection-in1.png"></image>
-            <text>日常巡检</text>
-        </view>
-        <view class="inspection-right" style="background-image: url({{imgPath}}/index-inspection-right.png);" bindtap="meetingInspection">
-            <image mode="scaleToFill" src="{{imgPath}}/index-inspection-in2.png"></image>
-            <text>参观巡检</text>
-        </view>
-    </view>
-    <view class="bottmo-module">
-        <view class="light" bindtap="visitAgenda">
-            <image mode="scaleToFill" src="{{imgPath}}/index-light1.png"></image>
-            <text>参观议程</text>
-        </view>
-        <view class="light" bindtap="uploadImage">
-            <image mode="scaleToFill" src="{{imgPath}}/index-light2.png"></image>
-            <text>图片回传</text>
-        </view>
-        <view class="big" bindtap="contentScreen">
-            <image mode="scaleToFill" src="{{imgPath}}/index-light5.png"></image>
-            <text>内容投屏</text>
-        </view>
-    </view>
-    <view class="bottmo-module bottom">
-        <view class="light" bindtap="chatRoom">
-            <image mode="scaleToFill" src="{{imgPath}}/index-light3.png"></image>
-            <text>聊天室</text>
-        </view>
-        <view class="light" bindtap="lightMap">
-            <image mode="scaleToFill" src="{{imgPath}}/index-light4.png"></image>
-            <text>地图</text>
-        </view>
-    </view>
-</view>

light-application-wx/pages/index-work/index-work.wxss

@@ -1,198 +0,0 @@
-/**index.wxss**/
-.container {
-    padding: 20rpx;
-    align-items: flex-start;
-    background-size: 100% 100%;
-    z-index: -99;
-    width: 100%;
-}
-
-.login-info {
-    margin: 10rpx;
-    margin-top: 80rpx;
-    font-size: 1.2em;
-    color: #ffffff;
-}
-
-.role-name {
-    font-size: .6em;
-    background-color: #86b9ff;
-    border-radius: 20rpx;
-    padding: 8rpx 14rpx;
-    margin: 0 20rpx;
-    color: #ffffff;
-}
-
-.app-bottom {
-    color: #eee;
-    font-size: .8em;
-    position: relative;
-    top: 20rpx;
-}
-
-.next {
-    width: 90%;
-    margin-left: 5%;
-    background-size: 100% 100%;
-    position: relative;
-    bottom: -30rpx;
-}
-
-.line-row {
-    width: 80%;
-    margin-left: 10%;
-    display: inline-flex;
-    align-items: center;
-    text-align: center;
-    justify-content: center;
-}
-
-.line {
-    width: 30%;
-    height: 1rpx;
-    text-align: center;
-    background-color: #dad8da;
-}
-
-.line-row span {
-    width: 33%;
-}
-
-.next-row {
-    margin-left: 5%;
-    margin-top: 10rpx;
-    margin-bottom: 10rpx;
-    font-size: .9em;
-}
-
-.next-title {
-    color: #cbcdce;
-}
-
-.second-part {
-    width: 94%;
-    height: 50%;
-    padding: 30rpx 3%;
-    background-color: #F0F4F7;
-    display: inline-flex;
-    flex-direction: column;
-    align-items: center;
-}
-
-.inspection {
-    width: 100%;
-    height: 146rpx;
-    margin-top: 20rpx;
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    border-radius: 20rpx;
-}
-
-.inspection-left {
-    width: 50%;
-    height: 146rpx;
-    line-height: 146rpx;
-    color: #fff;
-    background-size: 100% 100%;
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    text-align: center;
-}
-
-.inspection-left image {
-    height: 80rpx;
-    width: 80rpx;
-}
-
-.inspection-left text {
-    margin-left: 15rpx;
-}
-
-.inspection-right {
-    width: 50%;
-    height: 146rpx;
-    line-height: 146rpx;
-    color: #fff;
-    margin-left: 20rpx;
-    background-size: 100% 100%;
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    text-align: center;
-}
-
-.inspection-right image {
-    height: 80rpx;
-    width: 80rpx;
-}
-
-.inspection-right text {
-    margin-left: 15rpx;
-}
-
-.bottmo-module {
-    width: 100%;
-    margin-top: 20rpx;
-    display: inline-flex;
-    flex-direction: row;
-    align-items: flex-start;
-    justify-content: space-between;
-}
-
-.bottmo-module.bottom {
-    width: 100%;
-    margin-top: -145rpx;
-    display: inline-flex;
-    flex-direction: row;
-    font-size: .8em;
-    justify-content: flex-start;
-}
-
-.light {
-    height: 130rpx;
-    width: 32%;
-    margin-right: 15rpx;
-    margin-top: 15rpx;
-    background: #fff;
-    line-height: 130rpx;
-    border-radius: 10rpx;
-    display: inline-flex;
-    align-items: center;
-    text-align: center;
-}
-
-.light image {
-    width: 72rpx;
-    height: 72rpx;
-    margin-left: 15rpx;
-}
-
-.light text {
-    font-size: .8em;
-    margin-left: 10rpx;
-}
-
-.big {
-    height: 275rpx;
-    width: 32%;
-    background: #fff;
-    text-align: center;
-    border-radius: 10rpx;
-    display: inline-flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    margin-top: 15rpx;
-}
-
-.big image {
-    width: 70rpx;
-    height: 70rpx;
-}
-
-.big text {
-    font-size: .8em;
-    margin-top: 10rpx;
-}

light-application-wx/pages/index/index.js

@@ -74,6 +74,20 @@ Page({
                 role_name: app.globalData.roleInfo.name
             });
         }
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+        let that = this;
         // 下一场会议
         util.get({
             url: '/api/meeting/info/getNextMeeting',
@@ -100,20 +114,6 @@ Page({
     },
 
     /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow: function () {
-        this.onLoad();
-    },
-
-    /**
      * 生命周期函数--监听页面隐藏
      */
     onHide: function () {
@@ -218,6 +218,10 @@ Page({
      */
     meetingCover: function () {
         util.toast('功能暂未开放');
+
+        wx.navigateTo({
+            url: '../meeting-list/meeting-list',
+        });
     },
 
     /**
@@ -414,14 +418,16 @@ Page({
     fileBrowse: function () {
         wx.navigateTo({
             url: '../file-browse/file-browse',
-        })
+        });
     },
 
     /**
      * 故障处理
      */
     faultHandle: function () {
-        util.toast('功能暂未开放');
+        wx.navigateTo({
+            url: '../fault-list/fault-list',
+        })
     }
 
 })

light-application-wx/pages/light-map/light-map.js

@@ -1,5 +1,9 @@
 // pages/light-map/light-map.js
 const app = getApp();
+const util = require('../../utils/util');
+const WebIM = require("../../utils/WebIM.js")["default"];
+const disp = require("../../utils/broadcast");
+
 Page({
 
     /**
@@ -7,18 +11,10 @@ Page({
      */
     data: {
         imgPath: app.globalData.imgPath,
-        path: app.globalData.path,
         longitude: 106.51778136583812,
         latitude: 29.617295391392194,
         scale: 16,
-        markers: [{
-            id: 1,
-            latitude: 29.616108853713463,
-            longitude: 106.4994235457998,
-            iconPath: app.globalData.imgPath + '/map-user.png',
-            width: 34,
-            height: 40
-        }],
+        markers: [],
         show: false,
         username: '刘元云',
         roleName: '工作人员'
@@ -30,7 +26,6 @@ Page({
     onLoad: function (options) {
         let that = this;
         wx.getSetting({
-            withSubscriptions: true,
             success: function (res) {
                 console.info(res);
                 if (!res.authSetting['scope.userLocation']) {
@@ -38,8 +33,9 @@ Page({
                         scope: 'scope.userLocation',
                         success: function (res) {
                             wx.getLocation({
+                                type: 'gcj02',
                                 success: function (res) {
-                                    console.info(res)
+                                    console.info('getLocation', res);
                                     that.setData({
                                         latitude: res.latitude,
                                         longitude: res.longitude
@@ -50,15 +46,16 @@ Page({
                         fail: function (e) {
                             console.info(e);
                             wx.showToast({
-                                title: '用户拒绝授权',
+                                title: '用户未授权',
                                 icon: 'error'
                             });
                         }
                     });
                 } else {
                     wx.getLocation({
+                        type: 'gcj02',
                         success: function (res) {
-                            console.info(res)
+                            console.info('getLocation', res);
                             that.setData({
                                 latitude: res.latitude,
                                 longitude: res.longitude
@@ -68,34 +65,87 @@ Page({
                 }
             }
         });
+        that.getGroupList();
+
+        // for (let i in that.data.groupIdList) {
+        // let obj = {
+        //     latitude: result.latitude,
+        //     longitude: result.longitude
+        // }
+        // 发送当前用户的实时定位信息
+        // that.sendGroupText(that.data.groupIdList[i], obj);
+        // 显示其他用户的实时定位信息
+        // that.showMapMarker(that.data.groupIdList[i]);
+        // }
     },
 
     /**
      * 生命周期函数--监听页面初次渲染完成
      */
     onReady: function () {
-        this.mapCtx = wx.createMapContext('map', this)
+        this.mapCtx = wx.createMapContext('map', this);
     },
 
     /**
      * 生命周期函数--监听页面显示
      */
     onShow: function () {
-
+        let that = this;
+        //需要基础库： 2.8.0
+        wx.startLocationUpdate({
+            type: 'gcj02',
+            success: (res) => {
+                console.info('startLocationUpdate', res);
+                if (res.errMsg == 'startLocationUpdate:ok') {
+                    //需要基础库： 2.8.1
+                    wx.onLocationChange((result) => {
+                        console.info('onLocationChange', result);
+                        that.setData({
+                            latitude: result.latitude,
+                            longitude: result.longitude
+                        });
+                        for (let i in that.data.groupIdList) {
+                            let obj = {
+                                latitude: result.latitude,
+                                longitude: result.longitude
+                            }
+                            // 显示其他用户的实时定位信息
+                            that.showMapMarker(that.data.groupIdList[i]);
+                            // 发送当前用户的实时定位信息
+                            that.sendGroupText(that.data.groupIdList[i], obj);
+                        }
+                    });
+                }
+            },
+        });
     },
 
     /**
      * 生命周期函数--监听页面隐藏
      */
     onHide: function () {
-
+        wx.offLocationChange((result) => {
+            console.info('offLocationChange', result);
+        });
+        wx.stopLocationUpdate({
+            success: (res) => {
+                console.info('stopLocationUpdate', res);
+            },
+        });
     },
 
     /**
      * 生命周期函数--监听页面卸载
      */
     onUnload: function () {
-
+        wx.offLocationChange((result) => {
+            console.info('offLocationChange', result);
+        });
+        wx.stopLocationUpdate({
+            success: (res) => {
+                console.info('stopLocationUpdate', res);
+            },
+        });
     },
 
     /**
@@ -119,7 +169,108 @@ Page({
 
     },
 
-    mapTap: function (e) {
-        console.info(e)
+    markerTap: function (e) {
+        console.info(e);
+        let id = e.markerId;
+
+        util.post({
+            url: '/api/easemob/getUpUserAttribute/' + id,
+            success: (res) => {
+                wx.hideLoading();
+                console.info(res);
+            }
+        });
+    },
+
+    /**
+     * 群组列表
+     */
+    getGroupList: function () {
+        var that = this;
+        WebIM.conn.getGroup({
+            limit: 50,
+            success: function (res) {
+                console.info('groupList', res);
+                let arr = [];
+                if (res.data && res.data.length > 0) {
+                    for (let i in res.data) {
+                        arr.push(res.data[i].groupid);
+                    }
+                }
+                that.setData({
+                    groupIdList: arr
+                });
+            },
+            error: function (e) {
+                console.info(e)
+            }
+        });
+    },
+
+    /**
+     * 发送群组文本消息
+     */
+    sendGroupText: function (groupId, message) {
+        // 生成本地消息id
+        let id = WebIM.conn.getUniqueId();
+        // 创建文本消息
+        let msg = new WebIM.message('txt', id);
+        let option = {
+            // 消息内容
+            msg: 'location',
+            // 接收消息对象(群组id)
+            to: groupId,
+            // 群聊类型设置为群聊
+            chatType: 'groupChat',
+            // 扩展消息
+            ext: message,
+            // 对成功的相关定义，sdk会将消息id登记到日志进行备份处理
+            success: function () {
+                console.log('send room text success');
+                // disp.fire('em.chat.sendSuccess', id, 'location');
+            },
+            // 对失败的相关定义，sdk会将消息id登记到日志进行备份处理
+            fail: function () {
+                console.log('failed');
+            }
+        };
+        msg.set(option);
+        WebIM.conn.send(msg.body);
+    },
+
+    /**
+     * 显示其他群组成员定位
+     */
+    showMapMarker: function (groupId) {
+        let that = this;
+        let myName = wx.getStorageSync("myUsername");
+        console.info(groupId, myName);
+        let historyChatMsgs = wx.getStorageSync("rendered_" + groupId + myName) || [];
+        let chatMsg = wx.getStorageSync(groupId + myName) || [];
+        chatMsg = historyChatMsgs.concat(chatMsg);
+        if (!chatMsg.length) return;
+        chatMsg = chatMsg.slice(-20);
+        console.info('chatMsg:', chatMsg);
+        let psersonList = [];
+        let markerList = [];
+        for (let i in chatMsg) {
+            if (chatMsg[i].info.from == myName) continue;
+            if (chatMsg[i].msg.data[0].data != 'location') continue;
+            if (psersonList.indexOf(chatMsg[i].info.from) >= 0) continue;
+            psersonList.push(chatMsg[i].info.from);
+            markerList.push({
+                id: Number(chatMsg[i].info.from),
+                latitude: chatMsg[i].msg.ext.latitude,
+                longitude: chatMsg[i].msg.ext.longitude,
+                iconPath: app.globalData.imgPath + '/map-user.png',
+                width: 34,
+                height: 40
+            });
+            that.setData({
+                psersonList: psersonList,
+                markers: markerList,
+            });
+        }
     }
+
 })

light-application-wx/pages/light-map/light-map.wxml

@@ -1,5 +1,5 @@
 <!--pages/light-map/light-map.wxml-->
-<map id="map" longitude="{{longitude}}" latitude="{{latitude}}" scale="{{scale}}" show-location="true" bindtap="mapTap" markers="{{markers}}"></map>
+<map id="map" longitude="{{longitude}}" latitude="{{latitude}}" scale="{{scale}}" show-location="true" markers="{{markers}}" bindmarkertap="markerTap"></map>
 
 <view class="bottom-card" wx:if="{{show}}">
     <view class="left">

light-application-wx/pages/meeting-cover/meeting-cover.js

@@ -1,6 +1,7 @@
 // pages/meeting-cover/meeting-cover.js
 const app = getApp();
 const util = require('../../utils/util.js');
+
 Page({
 
     /**
@@ -11,18 +12,36 @@ Page({
         location: '重庆市城市管理局会议厅1楼105会议室',
         title: '',
         receptionTime: '',
-        item: {}
+        item: {},
+        showBack: true,
+        showPart1: true,
+        showPart2: false,
     },
 
     /**
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
-        let item = JSON.parse(options.item);
-        this.setData({
-            item: item,
-            title: item.title,
-            receptionTime: util.formatDate(item.receptionTime, 'yyyy年MM月dd日 HH:mm'),
+        let that = this;
+        console.info(options)
+        if (options) {
+            that.setData({
+                id: options.id
+            });
+        }
+        util.get({
+            url: '/api/meeting/info/getByIdNotAuth?id=' + options.id,
+            success: (res) => {
+                wx.hideLoading();
+                console.info('res', res);
+                // util.toast(JSON.stringify(res))
+                let datas = res.data.data;
+                that.setData({
+                    title: datas.title,
+                    receptionTime: util.formatDate(datas.receptionTime, 'yyyy年MM月dd日 HH:mm'),
+                    receptionContent: datas.receptionContent
+                });
+            }
         });
     },
 
@@ -72,25 +91,96 @@ Page({
      * 用户点击右上角分享
      */
     onShareAppMessage: function () {
+        // util.toast('点击分享');
+        let that = this;
+        that.setData({
+            showBack: false
+        });
+        setTimeout(() => {
+            that.setData({
+                showBack: true
+            });
+        }, 10000);
+        return {
+            title: '会议分享',
+            path: '/pages/meeting-cover/meeting-cover?id=' + that.data.id,
+            // imageUrl: '/images/call2x.png'
+        }
+    },
 
+    /**
+     * 触摸开始事件
+     */
+    touchStart: function (e) {
+        this.setData({
+            moveFlag: true,
+            startY: e.touches[0].pageY,
+        });
     },
 
     /**
-     * 点击跳转至会议议程页面
+     * 触摸移动事件
      */
-    meetingAgenda: function () {
-        wx.navigateTo({
-            url: '../visit-agenda/visit-agenda?item=' + JSON.stringify(this.data.item),
-        })
+    touchMove: function (e) {
+        let that = this;
+        let endY = e.touches[0].pageY;
+        let startY = that.data.startY;
+        if (that.data.moveFlag) {
+            // 下滑
+            if (endY - startY > 50) {
+                console.log("pullDown")
+                that.setData({
+                    moveFlag: false,
+                });
+                if (!that.data.showPart1 && that.data.showPart2) {
+                    let ani = wx.createAnimation({
+                        delay: 0,
+                        duration: 1000,
+                    });
+                    ani.opacity(0.5).step();
+                    that.setData({
+                        showPart1: true,
+                        showPart2: false,
+                        ani: ani.export()
+                    });
+                    ani.opacity(1).step();
+                    that.setData({
+                        ani: ani.export()
+                    });
+                }
+            }
+            // 上滑
+            if (startY - endY > 50) {
+                console.log("pullup")
+                that.setData({
+                    moveFlag: false,
+                });
+                if (that.data.showPart1 && !that.data.showPart2) {
+                    let ani = wx.createAnimation({
+                        delay: 0,
+                        duration: 1000,
+                    });
+                    ani.opacity(0.5).step();
+                    that.setData({
+                        showPart1: false,
+                        showPart2: true,
+                        ani: ani.export()
+                    });
+                    ani.opacity(1).step();
+                    that.setData({
+                        ani: ani.export()
+                    });
+                }
+            }
+        }
     },
 
     /**
-     * 点击返回
+     * 触摸结束事件
      */
-    backTap: function () {
-        wx.navigateBack({
-            delta: -1,
+    touchEnd: function (e) {
+        this.setData({
+            moveFlag: true,
         });
-    }
-
+    },
 })

light-application-wx/pages/meeting-cover/meeting-cover.json

@@ -1,5 +1,6 @@
 {
     "usingComponents": {},
     "navigationBarTitleText": "",
+    "navigationBarTextStyle": "white",
     "navigationStyle": "custom"
 }

light-application-wx/pages/meeting-cover/meeting-cover.wxml

@@ -1,10 +1,9 @@
 <!--pages/meeting-cover/meeting-cover.wxml-->
-<view class="body" style="background-image: url({{imgPath}}/meeting-cover-bg.png);">
-    <image class="backBtn" src="{{imgPath}}/icon-back-white.png" bindtap="backTap"></image>
+<view class="body" style="background-image: url({{imgPath}}/meeting-cover-bg.png);" wx:if="{{showPart1}}" bindtouchstart="touchStart" bindtouchmove="touchMove" bindtouchend="touchEnd" animation="{{ani}}">
     <view class="welcome">诚挚邀您参加</view>
-    <view class="topic" bindtap="meetingAgenda">{{title}}</view>
+    <view class="topic">{{title}}</view>
     <view class="line"></view>
-    <view class="block" style="background-image: url({{imgPath}}/meeting-cover-block.png);" bindtap="meetingAgenda">
+    <view class="block" style="background-image: url({{imgPath}}/meeting-cover-block.png);">
         <view class="block-row">
             <image class="block-img" mode="scaleToFill" src="{{imgPath}}/meeting-cover-time.png"></image>
             <text>时间：</text>
@@ -21,4 +20,16 @@
         <text>期·待·您·的·参·与</text>
         <view class="bottom-line"></view>
     </view>
+</view>
+
+<view class="container" style="background-image: url({{imgPath}}/meeting-arrangement-bg.png);" wx:if="{{showPart2}}" bindtouchstart="touchStart" bindtouchmove="touchMove" bindtouchend="touchEnd" animation="{{ani}}">
+    <view class="agenda-title">{{title}}</view>
+    <view class="english-name">Agenda arrangement</view>
+    <view class="agenda-name">议程安排</view>
+    <view class="now-time">{{receptionTime}}</view>
+
+    <scroll-view class="arrangement-list" scroll-y="true" style="height: 70%;">
+        <!-- <textarea name="receptionContent" value="{{receptionContent}}" maxlength="5000" disabled="true"></textarea> -->
+        <text>{{receptionContent}}{{receptionContent}}{{receptionContent}}</text>
+    </scroll-view>
 </view>

light-application-wx/pages/meeting-cover/meeting-cover.wxss

@@ -78,12 +78,128 @@
 .bottom-line {
     background-color: #5467A550;
     height: 1rpx;
-    width: 30%;
+    width: 25%;
 }
 
 .bottom text {
     color: #5467A5;
-    font-size: 28rpx;
-    /* width: 38%; */
+    font-size: 26rpx;
     margin: 0 28rpx;
+}
+
+/* pages/visit-agenda/visit-agenda.wxss */
+.container {
+    color: #ffffff;
+    padding: 30rpx;
+    display: block;
+    width: 100%;
+    height: 100%;
+    background-size: 100% 100%;
+}
+
+.backBtn {
+    width: 60rpx;
+    height: 60rpx;
+    margin-top: 40rpx;
+}
+
+.agenda-title {
+    font-size: 40rpx;
+    width: 95%;
+    margin-top: 90rpx;
+    margin-left: 10rpx;
+    border-bottom: solid 1rpx #ffffff50;
+    padding-bottom: 10rpx;
+}
+
+.english-name {
+    font-size: 22rpx;
+    color: #ffffff50;
+    text-align: left;
+    margin-top: 10rpx;
+}
+
+.agenda-name {
+    margin-top: 10rpx;
+    line-height: 60rpx;
+    font-size: 50rpx;
+    color: #2BFFE9;
+    border-bottom: solid 1rpx #ffffff50;
+    padding-bottom: 10rpx;
+    display: inline-flex;
+    letter-spacing: 8rpx;
+}
+
+.now-time {
+    margin-top: 30rpx;
+    font-size: 22rpx;
+}
+
+.arrangement-list {
+    /* height: 300rpx; */
+    margin-top: 60rpx;
+}
+
+.arrangement-list textarea {
+    width: 100%;
+    height: 800rpx;
+    word-break: break-all;
+}
+
+.item:nth-child(odd) {
+    background-image: var(--bg--);
+    color: white;
+    height: 120rpx;
+    line-height: 120rpx;
+    font-size: 28rpx;
+    width: 100%;
+    margin-top: 20rpx;
+    display: inline-flex;
+    background-size: 100% 100%;
+}
+
+.item:nth-child(even) {
+    background-color: #07309C;
+    color: white;
+    height: 120rpx;
+    line-height: 120rpx;
+    font-size: 28rpx;
+    width: 100%;
+    margin-top: 20rpx;
+    border-radius: 10rpx;
+    display: inline-flex;
+    background-image: none;
+    background-size: 100% 100%;
+}
+
+.item .time {
+    margin-left: 10rpx;
+    width: 25%;
+}
+
+.item .name {
+    width: 25%;
+}
+
+.item .vertical {
+    border-left: solid 1rpx #ffffff;
+    margin-right: 20rpx;
+    height: 80rpx;
+    margin-top: 20rpx;
+}
+
+.item .desc {
+    width: 40%;
+    line-height: 35rpx;
+    height: 70rpx;
+    font-size: 22rpx;
+    word-wrap: break-all;
+    margin-top: 30rpx;
+    color: #ffffff60;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    align-items: center;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
 }

light-application-wx/pages/meeting-list/meeting-list.js

@@ -159,7 +159,7 @@ Page({
             }
         } else {
             wx.navigateTo({
-                url: '../meeting-cover/meeting-cover?item=' + JSON.stringify(item),
+                url: '../meeting-cover/meeting-cover?id=' + item.id,
             });
         }
     },

light-application-wx/pages/visit-agenda/visit-agenda.json

@@ -1,5 +1,6 @@
 {
     "usingComponents": {},
     "navigationBarTitleText": "",
+    "navigationBarTextStyle": "white",
     "navigationStyle": "custom"
 }