Merge branch 'master' of http://116.63.33.55/git/light-application

light-application-wx/app.js

@@ -12,7 +12,7 @@ wx.AgoraMiniappSDK = AgoraMiniappSDK
 console.log('WebIM', WebIM)
 console.log('wx.AgoraMiniappSDK', wx.AgoraMiniappSDK)
 
-let emediaState = require('./utils/emediaState')
+let emediaState = require('./utils/emediaState');
 
 function ack(receiveMsg) {
     // 处理未读消息回执
@@ -133,6 +133,7 @@ App({
          * 环信监听事件
          */
         WebIM.conn.listen({
+            //连接成功回调 
             onOpened(message) {
                 console.log('im登录成功');
                 // WebIM.conn.setPresence();
@@ -436,7 +437,7 @@ App({
                         });
                         WebIM.conn.close();
                         wx.redirectTo({
-                            url: "../login/login"
+                            url: "./pages/login/login"
                         });
                         logout = true
                     }
@@ -449,7 +450,7 @@ App({
                         duration: 1000
                     });
                     wx.redirectTo({
-                        url: "../login/login"
+                        url: "./pages/login/login"
                     });
                 }
                 if (error.type == WebIM.statusCode.WEBIM_CONNCTION_OPEN_ERROR) {
@@ -478,13 +479,13 @@ App({
                     // https://developers.weixin.qq.com/community/develop/doc/00084a400202787b54f8c9e6357800
                     // 因为上面的原因 这里不要一直提示了
                     return
-                    console.log('socket_errorsocket_error', error)
-                    wx.showToast({
-                        title: "网络已断开",
-                        icon: 'none',
-                        duration: 2000
-                    });
-                    disp.fire("em.xmpp.error.sendMsgErr", error);
+                    // console.log('socket_errorsocket_error', error)
+                    // wx.showToast({
+                    //     title: "网络已断开",
+                    //     icon: 'none',
+                    //     duration: 2000
+                    // });
+                    // disp.fire("em.xmpp.error.sendMsgErr", error);
                 }
             },
         });
@@ -513,7 +514,7 @@ App({
             page: '../index-admin/index-admin'
         }, {
             code: 'OPERATION',
-            page: '../index/index'
+            page: '../index-work/index-work'
         }, {
             code: 'GUEST',
             page: '../index-guest/index-guest'

light-application-wx/app.json

@@ -1,8 +1,8 @@
 {
     "pages": [
         "pages/login/login",
+        "pages/index-work/index-work",
         "pages/index/index",
-        "pages/index_copy/index",
         "pages/logs/logs",
         "pages/visit-agenda/visit-agenda",
         "pages/meeting-inspection/meeting-inspection",
@@ -21,7 +21,8 @@
         "pages/meeting-inspection-history-detail/meeting-inspection-history-detail",
         "pages/daily-inspection/daily-inspection",
         "pages/chat-group/chat-group",
-        "pages/chat-group-detail/chat-group-detail"
+        "pages/chat-group-detail/chat-group-detail",
+        "pages/personal/personal"
     ],
     "window": {
         "backgroundTextStyle": "light",
@@ -35,5 +36,22 @@
         "scope.userLocation": {
             "desc": "仅用于定位"
         }
+    },
+    "tabBar": {
+        "selectedColor": "#1296db",
+        "list": [
+            {
+                "pagePath": "pages/index/index",
+                "text": "首页",
+                "iconPath": "images/nav-index.png",
+                "selectedIconPath": "images/nav-index2.png"
+            },
+            {
+                "pagePath": "pages/index-work/index-work",
+                "text": "我的",
+                "iconPath": "images/nav-my.png",
+                "selectedIconPath": "images/nav-my2.png"
+            }
+        ]
     }
 }

light-application-wx/comps/chat/inputbar/inputbar.wxml

@@ -1,7 +1,7 @@
 <!--comps/inputbar/inputbar.wxml-->
 <view class="room_bar">
     <!-- <chat-suit-emoji id="chat-suit-emoji" bind:newEmojiStr="emojiAction"></chat-suit-emoji> -->
-    <chat-suit-main id="chat-suit-main" username="{{ username }}" chatType="{{ chatType }}" bind:inputFocused="cancelEmoji"></chat-suit-main>
+    <chat-suit-main id="chat-suit-main" username="{{ username }}" chatType="{{ chatType }}"></chat-suit-main>
     <chat-suit-image id="chat-suit-image" username="{{ username }}" chatType="{{ chatType }}"></chat-suit-image>
     <!-- <chat-suit-location id="chat-suit-location" username="{{ username }}"></chat-suit-location> -->
     <!-- <chat-suit-video id="chat-suit-video" username="{{ username }}" chatType="{{ chatType }}"></chat-suit-video> -->

light-application-wx/comps/chat/inputbar/suit/main/main.js

@@ -87,19 +87,21 @@ Component({
             if (!this.data.userMessage.trim()) {
                 util.toast('发送内容不能为空');
                 that.setData({
-                    inputMessage: null
+                    inputMessage: null,
+                    userMessage: null
                 });
                 return;
             }
             console.info('data ', that.data);
+
             let id = WebIM.conn.getUniqueId();
             let msg = new WebIM.message(msgType.TEXT, id);
             msg.set({
-                msg: this.data.userMessage,
-                from: this.data.username.myName,
-                to: this.getSendToParam(),
+                msg: that.data.userMessage,
+                from: wx.getStorageSync('myUsername'),
+                to: that.getSendToParam(),//groupId
                 roomType: false,
-                chatType: this.data.chatType,
+                chatType: that.data.chatType,
                 success(id, serverMsgId) {
                     console.log('成功了')
                     disp.fire('em.chat.sendSuccess', id, that.data.userMessage);
@@ -121,7 +123,7 @@ Component({
                     console.log('serverMsgId', serverMsgId)
                 }
             });
-
+            // 群组
             if (this.data.chatType == msgType.chatType.CHAT_ROOM) {
                 msg.setGroup("groupchat");
             }

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

@@ -0,0 +1,347 @@
+// 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

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

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

@@ -0,0 +1,63 @@
+<!--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

@@ -0,0 +1,198 @@
+/**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

@@ -1,4 +1,4 @@
-// pages/index/index.js
+// pages/index-guest/index-guest.js
 const app = getApp();
 const util = require('../../utils/util.js');
 
@@ -13,7 +13,9 @@ Page({
         username: app.globalData.userInfo.usernameShow,
         role_name: app.globalData.roleInfo.name,
         app_bottom: '大城细管·大城众管·大城智管',
-        nextMeeting: null
+        nowTime: util.formatDate(null, 'yyyy.MM.dd'),
+        nextMeeting: null,
+        hasNext: false
     },
 
     /**
@@ -71,13 +73,13 @@ Page({
             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({
+                            hasNext: true,
                             nextMeeting: datas,
                             nextTitle: datas.title,
                             nextTime: util.formatDate(datas.receptionTime),
@@ -145,7 +147,7 @@ Page({
      */
     changeRole: function () {
         wx.redirectTo({
-            url: '../index-admin/index-admin',
+            url: '../index/index',
         });
     },
 
@@ -164,24 +166,6 @@ Page({
     },
 
     /**
-     * 日常巡检
-     */
-    dailyInspection: function () {
-        wx.navigateTo({
-            url: '../daily-inspection/daily-inspection',
-        });
-    },
-
-    /**
-     * 会议巡检
-     */
-    meetingInspection: function () {
-        wx.navigateTo({
-            url: '../meeting-list/meeting-list?type=INSPECTION',
-        });
-    },
-
-    /**
      * 点击参观议程跳转至会议列表
      */
     visitAgenda: function () {
@@ -257,7 +241,7 @@ Page({
                         // 1、初始化Wi-Fi模块
                         wx.startWifi({
                             success: (res) => {
-                                console.info(res)
+                                console.info('startWifi', res)
                                 if (res.errMsg == 'startWifi:ok') {
                                     // 4、连接Wi-Fi
                                     wx.connectWifi({
@@ -342,6 +326,16 @@ Page({
                 }
             }
         });
-    }
+    },
+
+    /**
+     * 文件浏览
+     */
+    fileBrowse: function () {
+        wx.navigateTo({
+            url: '../file-browse/file-browse',
+        })
+    },
+
 
 })

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

@@ -4,36 +4,23 @@
         <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 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="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 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="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 class="curr-row">
+            <text class="row-title">主题：</text>
+            <text class="row-value">{{nextTitle}}</text>
         </view>
     </view>
     <view class="bottmo-module">
@@ -45,12 +32,12 @@
             <image mode="scaleToFill" src="{{imgPath}}/index-light2.png"></image>
             <text>图片回传</text>
         </view>
-        <view class="big" bindtap="contentScreen">
+        <view class="light" bindtap="contentScreen">
             <image mode="scaleToFill" src="{{imgPath}}/index-light5.png"></image>
             <text>内容投屏</text>
         </view>
     </view>
-    <view class="bottmo-module bottom">
+    <view class="bottmo-module">
         <view class="light" bindtap="chatRoom">
             <image mode="scaleToFill" src="{{imgPath}}/index-light3.png"></image>
             <text>聊天室</text>
@@ -59,5 +46,9 @@
             <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/index.wxss

@@ -1,4 +1,4 @@
-/**index.wxss**/
+/* pages/index-guest/index-guest.wxss */
 .container {
     padding: 20rpx;
     align-items: flex-start;
@@ -39,34 +39,33 @@
 }
 
 .line-row {
-    width: 80%;
-    margin-left: 10%;
-    display: inline-flex;
-    align-items: center;
     text-align: center;
-    justify-content: center;
+    color: #EC6D27;
+    font-size: 1.5em;
+    margin-top: 20rpx;
 }
 
-.line {
-    width: 30%;
-    height: 1rpx;
+.next-line {
+    height: 9rpx;
+    width: 60%;
     text-align: center;
-    background-color: #dad8da;
-}
-
-.line-row span {
-    width: 33%;
+    margin-left: 20%;
+    /* margin-top: -10rpx; */
 }
 
-.next-row {
-    margin-left: 5%;
-    margin-top: 10rpx;
+.next-row-org {
+    margin-top: 20rpx;
     margin-bottom: 10rpx;
-    font-size: .9em;
+    color: #8C441C;
+    text-align: center;
 }
 
-.next-title {
-    color: #cbcdce;
+.next-row-time {
+    margin-top: 10rpx;
+    margin-bottom: 20rpx;
+    font-size: .8em;
+    color: #8C441C60;
+    text-align: center;
 }
 
 .second-part {
@@ -79,77 +78,44 @@
     align-items: center;
 }
 
-.inspection {
-    width: 100%;
-    height: 146rpx;
+.curr-meeting {
+    width: 90%;
+    height: 180rpx;
     margin-top: 20rpx;
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
     border-radius: 20rpx;
+    background-color: #ffffff;
+    padding: 30rpx;
 }
 
-.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;
+.curr-time {
+    font-size: 32rpx;
+    border-bottom: solid 1rpx #EBE8E3;
+    padding-bottom: 20rpx;
 }
 
-.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;
+.curr-row {
+    margin-top: 20rpx;
 }
 
-.inspection-right image {
-    height: 80rpx;
-    width: 80rpx;
+.row-title {
+    color: #999999;
+    font-size: 28rpx;
 }
 
-.inspection-right text {
-    margin-left: 15rpx;
+.row-value {
+    margin-left: 13rpx;
+    font-size: 28rpx;
 }
 
 .bottmo-module {
     width: 100%;
-    margin-top: 20rpx;
+    margin-top: 10rpx;
     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%;

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

@@ -1,51 +0,0 @@
-// index.js
-// 获取应用实例
-const app = getApp()
-
-Page({
-  data: {
-    motto: 'Hello World',
-    userInfo: {},
-    hasUserInfo: false,
-    canIUse: wx.canIUse('button.open-type.getUserInfo'),
-    canIUseGetUserProfile: false,
-    canIUseOpenData: wx.canIUse('open-data.type.userAvatarUrl') && wx.canIUse('open-data.type.userNickName') // 如需尝试获取用户信息可改为false
-  },
-  // 事件处理函数
-  bindViewTap() {
-    wx.navigateTo({
-      url: '../logs/logs'
-    })
-  },
-  onLoad() {
-    if (wx.getUserProfile) {
-      this.setData({
-        canIUseGetUserProfile: true
-      })
-    }
-  },
-  getUserProfile(e) {
-    // 推荐使用wx.getUserProfile获取用户信息，开发者每次通过该接口获取用户个人信息均需用户确认，开发者妥善保管用户快速填写的头像昵称，避免重复弹窗
-    wx.getUserProfile({
-      desc: '展示用户信息', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
-      success: (res) => {
-        console.log(res)
-        this.setData({
-          userInfo: res.userInfo,
-          hasUserInfo: true
-        })
-      }
-    })
-  },
-  getUserInfo(e) {
-    // 不推荐使用getUserInfo获取用户信息，预计自2021年4月13日起，getUserInfo将不再弹出弹窗，并直接返回匿名的用户个人信息
-    console.log(e)
-    this.setData({
-      userInfo: e.detail.userInfo,
-      hasUserInfo: true
-    })
-  },
-  goLoginPage(e) {
-
-  }
-})

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

@@ -1,3 +0,0 @@
-{
-  "usingComponents": {}
-}

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

@@ -1,23 +0,0 @@
-<!--index.wxml-->
-<view class="container">
-  <view class="userinfo">
-    <block wx:if="{{canIUseOpenData}}">
-      <view class="userinfo-avatar" bindtap="bindViewTap">
-        <open-data type="userAvatarUrl"></open-data>
-      </view>
-      <open-data type="userNickName"></open-data>
-    </block>
-    <block wx:elif="{{!hasUserInfo}}">
-      <button wx:if="{{canIUseGetUserProfile}}" bindtap="getUserProfile"> 获取头像昵称 </button>
-      <button wx:elif="{{canIUse}}" open-type="getUserInfo" bindgetuserinfo="getUserInfo"> 获取头像昵称 </button>
-      <view wx:else> 请使用1.4.4及以上版本基础库 </view>
-    </block>
-    <block wx:else>
-      <image bindtap="bindViewTap" class="userinfo-avatar" src="{{userInfo.avatarUrl}}" mode="cover"></image>
-      <text class="userinfo-nickname">{{userInfo.nickName}}</text>
-    </block>
-  </view>
-  <view class="usermotto">
-    <text class="user-motto" bindtap="goLoginPage">{{motto}}</text>
-  </view>
-</view>

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

@@ -1,19 +0,0 @@
-/**index.wxss**/
-.userinfo {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  color: #aaa;
-}
-
-.userinfo-avatar {
-  overflow: hidden;
-  width: 128rpx;
-  height: 128rpx;
-  margin: 20rpx;
-  border-radius: 50%;
-}
-
-.usermotto {
-  margin-top: 200px;
-}

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

@@ -19,7 +19,7 @@ Page({
             width: 34,
             height: 40
         }],
-        show: true,
+        show: false,
         username: '刘元云',
         roleName: '工作人员'
     },

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

@@ -0,0 +1,68 @@
+// pages/personal/personal.js
+const util = require('../../utils/util');
+
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})

light-application-wx/pages/personal/personal.json

@@ -0,0 +1,3 @@
+{
+    "usingComponents": {}
+}

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

@@ -0,0 +1,3 @@
+<!--pages/personal/personal.wxml-->
+<text>pages/personal/personal.wxml</text>
+<view></view>

light-application-wx/pages/personal/personal.wxss

@@ -0,0 +1 @@
+/* pages/personal/personal.wxss */