浏览代码

会议议程详情

xyg 3 年之前
父节点
当前提交
05230f8ea2

+ 4 - 3
light-application-wx/app.js

@@ -14,9 +14,10 @@ App({
     })
   },
   globalData: {
-    imgPath: 'http://192.168.0.46/image',
-    // path: 'https://192.168.1.218',
-    path: 'http://192.168.0.46:8081',
+    // imgPath: 'http://192.168.0.46/image',
+    imgPath: 'https://miniapp.cqjudong.com/image',
+    path: 'https://miniapp.cqjudong.com/base',
+    // path: 'http://192.168.0.46:8081',
     Authorization: '',
     userInfo: {},
     roleInfo: {}

+ 21 - 10
light-application-wx/pages/index-guest/index-guest.js

@@ -13,7 +13,8 @@ Page({
         role_name: app.globalData.roleInfo.name,
         app_bottom: '大城细管·大城众管·大城智管',
         nowTime: util.formatDate('', 'yyyy.MM.dd'),
-        nextMeeting: {}
+        nextMeeting: null,
+        hasNext: false
     },
 
     /**
@@ -75,12 +76,17 @@ Page({
                     util.toast(res.data.msg);
                 } else {
                     let datas = res.data.data;
-                    that.setData({
-                        nextMeeting: datas,
-                        nextTitle: datas.title,
-                        nextTime: util.formatDate(datas.receptionTime),
-                        nextUnit: datas.receptionObject
-                    });
+                    if (datas) {
+                        that.setData({
+                            hasNext: true,
+                            nextMeeting: datas,
+                            nextTitle: datas.title,
+                            nextTime: util.formatDate(datas.receptionTime),
+                            nextUnit: datas.receptionObject
+                        });
+                    } else {
+                        util.toast('暂无下一场会议');
+                    }
                 }
             }
         });
@@ -148,9 +154,14 @@ Page({
      * 点击查看下一场会议详情
      */
     meetingInfo: function () {
-        wx.navigateTo({
-            url: '../meeting-cover/meeting-cover?item=' + JSON.stringify(this.data.nextMeeting),
-        });
+        let nextMeeting = this.data.nextMeeting;
+        if (nextMeeting) {
+            wx.navigateTo({
+                url: '../meeting-cover/meeting-cover?item=' + JSON.stringify(nextMeeting),
+            });
+        } else {
+            util.toast('暂无下一场会议');
+        }
     },
 
     /**

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

@@ -1,55 +1,55 @@
 <!--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="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 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" 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="heightFix" src="{{imgPath}}/index-light1.png"></image>
-      <text>参观议程</text>
-    </view>
-    <view class="light" bindtap="uploadImage">
-      <image mode="heightFix" src="{{imgPath}}/index-light2.png"></image>
-      <text>图片回传</text>
-    </view>
-    <view class="light" bindtap="contentScreen">
-      <image mode="heightFix" src="{{imgPath}}/index-light5.png"></image>
-      <text>内容投屏</text>
-    </view>
-  </view>
-  <view class="bottmo-module">
-    <view class="light" bindtap="chatRoom">
-      <image mode="heightFix" src="{{imgPath}}/index-light3.png"></image>
-      <text>聊天室</text>
-    </view>
-    <view class="light" bindtap="lightMap">
-      <image mode="heightFix" src="{{imgPath}}/index-light4.png"></image>
-      <text>地图</text>
-    </view>
-    <view class="light" bindtap="fileBrowse">
-      <image mode="heightFix" src="{{imgPath}}/index-light6.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="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="heightFix" src="{{imgPath}}/index-light1.png"></image>
+            <text>参观议程</text>
+        </view>
+        <view class="light" bindtap="uploadImage">
+            <image mode="heightFix" src="{{imgPath}}/index-light2.png"></image>
+            <text>图片回传</text>
+        </view>
+        <view class="light" bindtap="contentScreen">
+            <image mode="heightFix" src="{{imgPath}}/index-light5.png"></image>
+            <text>内容投屏</text>
+        </view>
+    </view>
+    <view class="bottmo-module">
+        <view class="light" bindtap="chatRoom">
+            <image mode="heightFix" src="{{imgPath}}/index-light3.png"></image>
+            <text>聊天室</text>
+        </view>
+        <view class="light" bindtap="lightMap">
+            <image mode="heightFix" src="{{imgPath}}/index-light4.png"></image>
+            <text>地图</text>
+        </view>
+        <view class="light" bindtap="fileBrowse">
+            <image mode="heightFix" src="{{imgPath}}/index-light6.png"></image>
+            <text>文件浏览</text>
+        </view>
     </view>
-  </view>
 </view>

+ 1 - 7
light-application-wx/pages/visit-agenda/visit-agenda.wxml

@@ -6,12 +6,6 @@
     <view class="now-time">{{receptionTime}}</view>
 
     <view class="arrangement-list">
-        <!-- <view class="item" wx:for="{{list}}" wx:for-item="item" wx:key="i" style="--bg--: url({{imgPath}}/meeting-arrangement1.png);">
-            <view class="time">{{item.time}}</view>
-            <view class="name">{{item.name}}</view>
-            <view class="vertical" wx:if="{{item.desc != null && item.desc != ''}}"></view>
-            <view class="desc" wx:if="{{item.desc != null && item.desc != ''}}">{{item.desc}}</view>
-        </view> -->
-        <view>{{receptionContent}}</view>
+        <textarea name="receptionContent" id="" cols="30" rows="10" value="{{receptionContent}}"></textarea>
     </view>
 </view>

+ 11 - 33
light-application-wx/project.config.json

@@ -1,12 +1,13 @@
 {
-    "description": "项目配置文件",
+    "description": "项目配置文件,详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
     "packOptions": {
         "ignore": [
             {
-                "type": "file",
-                "value": ".eslintrc.js"
+                "value": ".eslintrc.js",
+                "type": "file"
             }
-        ]
+        ],
+        "include": []
     },
     "setting": {
         "urlCheck": false,
@@ -44,39 +45,16 @@
         "minifyWXML": true,
         "showES6CompileOption": false,
         "useCompilerPlugins": false,
-        "ignoreUploadUnusedFiles": true
+        "ignoreUploadUnusedFiles": true,
+        "useStaticServer": true
     },
     "compileType": "miniprogram",
     "libVersion": "2.23.4",
     "appid": "wxc4466f468dcf82a5",
     "projectname": "light-application-wx",
-    "debugOptions": {
-        "hidedInDevtools": []
-    },
-    "scripts": {},
-    "staticServerOptions": {
-        "baseURL": "",
-        "servePath": ""
-    },
-    "isGameTourist": false,
-    "condition": {
-        "search": {
-            "list": []
-        },
-        "conversation": {
-            "list": []
-        },
-        "game": {
-            "list": []
-        },
-        "plugin": {
-            "list": []
-        },
-        "gamePlugin": {
-            "list": []
-        },
-        "miniprogram": {
-            "list": []
-        }
+    "condition": {},
+    "editorSetting": {
+        "tabIndent": "insertSpaces",
+        "tabSize": 4
     }
 }

+ 6 - 5
light-application-wx/project.private.config.json

@@ -1,7 +1,8 @@
 {
-  "projectname": "light-application-wx",
-  "setting": {
-    "compileHotReLoad": true
-  },
-  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html"
+    "projectname": "light-application-wx",
+    "setting": {
+        "compileHotReLoad": true,
+        "urlCheck": true
+    },
+    "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html"
 }