فهرست منبع

修改登录页样式,修改页面顶部栏样式

xyg 3 سال پیش
والد
کامیت
d6fdbe9c9d
24فایلهای تغییر یافته به همراه168 افزوده شده و 85 حذف شده
  1. 2 2
      light-application-wx/app.js
  2. 2 0
      light-application-wx/pages/chat-detail/chat-detail.json
  3. 2 0
      light-application-wx/pages/chat-group-detail/chat-group-detail.json
  4. 3 1
      light-application-wx/pages/chat-group/chat-group.json
  5. 4 2
      light-application-wx/pages/chat-room/chat-room.json
  6. 4 2
      light-application-wx/pages/daily-inspection/daily-inspection.json
  7. 6 4
      light-application-wx/pages/file-browse/file-browse.json
  8. 4 2
      light-application-wx/pages/file-detail/file-detail.json
  9. 4 2
      light-application-wx/pages/information-release/information-release.json
  10. 4 2
      light-application-wx/pages/light-map/light-map.json
  11. 2 2
      light-application-wx/pages/login/login.wxml
  12. 49 35
      light-application-wx/pages/login/login.wxss
  13. 10 0
      light-application-wx/pages/meeting-cover/meeting-cover.js
  14. 1 0
      light-application-wx/pages/meeting-cover/meeting-cover.wxml
  15. 26 14
      light-application-wx/pages/meeting-cover/meeting-cover.wxss
  16. 4 2
      light-application-wx/pages/meeting-inspection-abnormal/meeting-inspection-abnormal.json
  17. 4 2
      light-application-wx/pages/meeting-inspection-history-detail/meeting-inspection-history-detail.json
  18. 6 4
      light-application-wx/pages/meeting-inspection-history/meeting-inspection-history.json
  19. 4 2
      light-application-wx/pages/meeting-inspection/meeting-inspection.json
  20. 6 4
      light-application-wx/pages/meeting-list/meeting-list.json
  21. 3 1
      light-application-wx/pages/personal/personal.json
  22. 10 0
      light-application-wx/pages/visit-agenda/visit-agenda.js
  23. 1 1
      light-application-wx/pages/visit-agenda/visit-agenda.wxml
  24. 7 1
      light-application-wx/pages/visit-agenda/visit-agenda.wxss

+ 2 - 2
light-application-wx/app.js

@@ -496,8 +496,8 @@ App({
     ToastPannel,
 
     globalData: {
-        // imgPath: 'http://192.168.0.46/image',
-        imgPath: 'https://miniapp.cqjudong.com/image',
+        imgPath: 'http://192.168.0.46/image',
+        // imgPath: 'https://miniapp.cqjudong.com/image',
         path: 'https://miniapp.cqjudong.com/base',
         // path: 'http://192.168.1.218:8081',
         Authorization: '',

+ 2 - 0
light-application-wx/pages/chat-detail/chat-detail.json

@@ -3,5 +3,7 @@
         "chat": "../../comps/chat/chat"
     },
     "navigationBarTitleText": "chatting",
+    "navigationBarBackgroundColor": "#2867B6",
+    "navigationBarTextStyle": "white",
     "enablePullDownRefresh": true
 }

+ 2 - 0
light-application-wx/pages/chat-group-detail/chat-group-detail.json

@@ -1,5 +1,7 @@
 {
     "navigationBarTitleText": "chatting",
+    "navigationBarBackgroundColor": "#2867B6",
+    "navigationBarTextStyle": "white",
     "enablePullDownRefresh": true,
     "usingComponents": {
         "chat": "../../comps/chat/chat"

+ 3 - 1
light-application-wx/pages/chat-group/chat-group.json

@@ -1,4 +1,6 @@
 {
     "usingComponents": {},
-    "navigationBarTitleText": "群聊"
+    "navigationBarTitleText": "群聊",
+    "navigationBarBackgroundColor": "#2867B6",
+    "navigationBarTextStyle": "white"
 }

+ 4 - 2
light-application-wx/pages/chat-room/chat-room.json

@@ -1,4 +1,6 @@
 {
-  "usingComponents": {},
-  "navigationBarTitleText": "聊天室"
+    "usingComponents": {},
+    "navigationBarTitleText": "聊天室",
+    "navigationBarBackgroundColor": "#2867B6",
+    "navigationBarTextStyle": "white"
 }

+ 4 - 2
light-application-wx/pages/daily-inspection/daily-inspection.json

@@ -1,4 +1,6 @@
 {
-  "usingComponents": {},
-  "navigationBarTitleText": "日常巡检"
+    "usingComponents": {},
+    "navigationBarTitleText": "日常巡检",
+    "navigationBarBackgroundColor": "#2867B6",
+    "navigationBarTextStyle": "white"
 }

+ 6 - 4
light-application-wx/pages/file-browse/file-browse.json

@@ -1,6 +1,8 @@
 {
-  "usingComponents": {},
-  "navigationBarTitleText": "文件浏览",
-  "enablePullDownRefresh": true,
-  "onReachBottomDistance": 50
+    "usingComponents": {},
+    "navigationBarTitleText": "文件浏览",
+    "navigationBarBackgroundColor": "#2867B6",
+    "navigationBarTextStyle": "white",
+    "enablePullDownRefresh": true,
+    "onReachBottomDistance": 50
 }

+ 4 - 2
light-application-wx/pages/file-detail/file-detail.json

@@ -1,4 +1,6 @@
 {
-  "usingComponents": {},
-  "navigationBarTitleText": "详情"
+    "usingComponents": {},
+    "navigationBarTitleText": "详情",
+    "navigationBarBackgroundColor": "#2867B6",
+    "navigationBarTextStyle": "white"
 }

+ 4 - 2
light-application-wx/pages/information-release/information-release.json

@@ -1,4 +1,6 @@
 {
-  "usingComponents": {},
-  "navigationBarTitleText": "发布信息"
+    "usingComponents": {},
+    "navigationBarTitleText": "发布信息",
+    "navigationBarBackgroundColor": "#2867B6",
+    "navigationBarTextStyle": "white"
 }

+ 4 - 2
light-application-wx/pages/light-map/light-map.json

@@ -1,4 +1,6 @@
 {
-  "usingComponents": {},
-  "navigationBarTitleText": "地图"
+    "usingComponents": {},
+    "navigationBarTitleText": "地图",
+    "navigationBarBackgroundColor": "#2867B6",
+    "navigationBarTextStyle": "white"
 }

+ 2 - 2
light-application-wx/pages/login/login.wxml

@@ -1,5 +1,5 @@
 <!--pages/login/login.wxml-->
-<view class="container" style="background-image: url({{imgPath}}/login-bg.png);">
+<view class="body" style="background-image: url({{imgPath}}/login-bg.png);">
     <view class="app-title">
         <image mode="aspectFit" src="{{imgPath}}/login-app-name.png" style="height: 63rpx;"></image>
     </view>
@@ -19,7 +19,7 @@
     </view>
     <view class="line-row">
         <view class="line"></view>
-        <span>快捷登录</span>
+        <text>快捷登录</text>
         <view class="line"></view>
     </view>
     <view class="fast-login">

+ 49 - 35
light-application-wx/pages/login/login.wxss

@@ -1,57 +1,69 @@
 /* pages/login/login.wxss */
-.container {
-    padding: 100rpx 0 80rpx 0;
+.body {
+    width: 100%;
+    height: 100%;
     background-size: 100% 100%;
     z-index: -99;
+    padding-top: 228rpx;
+    box-sizing: border-box;
 }
 
 .app-title {
-    margin-top: 130rpx;
-    font-size: 1.4em;
-    text-align: center;
-    font-weight: 700;
-    color: #fff;
-    display: inline-flex;
-    flex-direction: column;
-    align-items: center;
     width: 100%;
+    text-align: center;
 }
 
 .login {
-    padding: 0 6%;
+    padding: 0 80rpx;
     width: 100%;
     box-sizing: border-box;
+    margin-top: 100rpx;
 }
 
-.login-row {
+form {
+    padding: 0;
+    margin: 0;
     width: 100%;
+    height: 100%;
+}
+
+.login-row {
+    width: 99%;
     display: inline-flex;
     align-items: center;
-    border-bottom: solid 1rpx #ffffff;
-    padding-bottom: 20rpx;
-    margin-bottom: 40rpx;
+    border-bottom: solid 1rpx #FFFFFF30;
+    padding-bottom: 16rpx;
+    padding-left: 24rpx;
+    box-sizing: border-box;
+}
+
+.login-row:nth-child(2) {
+    margin-top: 70rpx;
 }
 
 .login-phone {
-    height: 60rpx;
+    width: 35rpx;
+    height: 48rpx;
 }
 
 .login-input {
     width: 90%;
     height: 60rpx;
-    margin-left: 30rpx;
+    margin-left: 24rpx;
+    color: #FFFFFF;
 }
 
 .send_btn {
-    color: #ffffff;
+    color: #FFFFFF;
     line-height: 60rpx;
     position: absolute;
-    right: 60rpx;
+    margin-left: 30rpx;
+    right: 90rpx;
 }
 
 .login-btn {
-    color: #ffffff;
-    margin-top: 80rpx;
+    color: #FFFFFF;
+    margin-top: 90rpx;
     margin-left: 0 !important;
     width: 100% !important;
     height: 80rpx !important;
@@ -64,31 +76,32 @@
 
 .line-row {
     display: inline-flex;
-    width: 90%;
-    margin-left: 5%;
+    box-sizing: border-box;
+    width: 100%;
     align-items: center;
     text-align: center;
-}
-
-input {
-    color: #ffffff;
+    justify-content: center;
+    margin-top: 250rpx;
+    padding: 0 100rpx;
 }
 
 .line {
-    width: 30%;
+    width: 33%;
     height: 2rpx;
     text-align: center;
     background-color: #fff;
 }
 
-.line-row span {
+.line-row text {
     color: #ffffff;
-    width: 30%;
+    margin: 0 15rpx;
+    font-size: 34rpx;
 }
 
 .fast-login {
     height: 100rpx;
-    width: 100rpx;
+    width: 100%;
+    margin-top: 46rpx;
     text-align: center;
 }
 
@@ -101,9 +114,10 @@ input {
 }
 
 .app-bottom {
-    color: #ffffff;
+    color: #FFFFFF72;
+    bottom: 40rpx;
+    font-size: 28rpx;
+    width: 100%;
+    position: absolute;
     text-align: center;
-    position: relative;
-    bottom: 0;
-    font-size: .9em;
 }

+ 10 - 0
light-application-wx/pages/meeting-cover/meeting-cover.js

@@ -82,5 +82,15 @@ Page({
         wx.navigateTo({
             url: '../visit-agenda/visit-agenda?item=' + JSON.stringify(this.data.item),
         })
+    },
+
+    /**
+     * 点击返回
+     */
+    backTap: function () {
+        wx.navigateBack({
+            delta: -1,
+        });
     }
+
 })

+ 1 - 0
light-application-wx/pages/meeting-cover/meeting-cover.wxml

@@ -1,5 +1,6 @@
 <!--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="welcome">诚挚邀您参加</view>
     <view class="topic" bindtap="meetingAgenda">{{title}}</view>
     <view class="line"></view>

+ 26 - 14
light-application-wx/pages/meeting-cover/meeting-cover.wxss

@@ -6,17 +6,24 @@
     z-index: -99;
 }
 
+.backBtn {
+    width: 60rpx;
+    height: 60rpx;
+    margin-left: 40rpx;
+    margin-top: 70rpx;
+}
+
 .welcome {
     color: #A8B8E7;
-    padding-top: 300rpx;
+    padding-top: 180rpx;
     padding-left: 40rpx;
-    font-size: 40rpx;
+    font-size: 42rpx;
 }
 
 .topic {
     color: #F6E3C3;
-    font-size: 80rpx;
-    margin-top: 30rpx;
+    font-size: 82rpx;
+    margin-top: 40rpx;
     padding-left: 40rpx;
 }
 
@@ -29,24 +36,26 @@
 }
 
 .block {
-    width: 88%;
-    height: 254rpx;
+    box-sizing: border-box;
+    width: 94%;
+    min-height: 253rpx;
     margin-left: 3%;
     background-size: 100% 100%;
     margin-top: 140rpx;
-    font-size: 26rpx;
+    font-size: 28rpx;
     color: #ADBCEB;
     padding-left: 40rpx;
-    padding-top: 34rpx;
+    padding-top: 33rpx;
+    padding-bottom: 37rpx;
 }
 
 .block-row:nth-last-child(2) {
-    margin-top: 50rpx;
+    margin-top: 46rpx;
 }
 
 .block-img {
     width: 32rpx;
-    height: 28rpx;
+    height: 32rpx;
     margin-right: 8rpx;
 }
 
@@ -61,17 +70,20 @@
     text-align: center;
     justify-content: center;
     position: absolute;
-    bottom: 50rpx;
+    bottom: 53rpx;
+    padding: 0 30rpx;
+    box-sizing: border-box;
 }
 
 .bottom-line {
     background-color: #5467A550;
     height: 1rpx;
-    width: 25%;
+    width: 30%;
 }
 
 .bottom text {
     color: #5467A5;
-    font-size: 26rpx;
-    width: 38%;
+    font-size: 28rpx;
+    /* width: 38%; */
+    margin: 0 28rpx;
 }

+ 4 - 2
light-application-wx/pages/meeting-inspection-abnormal/meeting-inspection-abnormal.json

@@ -1,4 +1,6 @@
 {
-  "usingComponents": {},
-  "navigationBarTitleText": ""
+    "usingComponents": {},
+    "navigationBarTitleText": "",
+    "navigationBarBackgroundColor": "#2867B6",
+    "navigationBarTextStyle": "white"
 }

+ 4 - 2
light-application-wx/pages/meeting-inspection-history-detail/meeting-inspection-history-detail.json

@@ -1,4 +1,6 @@
 {
-  "usingComponents": {},
-  "navigationBarTitleText": "详情"
+    "usingComponents": {},
+    "navigationBarTitleText": "详情",
+    "navigationBarBackgroundColor": "#2867B6",
+    "navigationBarTextStyle": "white"
 }

+ 6 - 4
light-application-wx/pages/meeting-inspection-history/meeting-inspection-history.json

@@ -1,6 +1,8 @@
 {
-  "usingComponents": {},
-  "navigationBarTitleText": "历史记录",
-  "enablePullDownRefresh": true,
-  "onReachBottomDistance": 50
+    "usingComponents": {},
+    "navigationBarTitleText": "历史记录",
+    "navigationBarBackgroundColor": "#2867B6",
+    "navigationBarTextStyle": "white",
+    "enablePullDownRefresh": true,
+    "onReachBottomDistance": 50
 }

+ 4 - 2
light-application-wx/pages/meeting-inspection/meeting-inspection.json

@@ -1,4 +1,6 @@
 {
-  "usingComponents": {},
-  "navigationBarTitleText": "会务巡检"
+    "usingComponents": {},
+    "navigationBarTitleText": "会务巡检",
+    "navigationBarBackgroundColor": "#2867B6",
+    "navigationBarTextStyle": "white"
 }

+ 6 - 4
light-application-wx/pages/meeting-list/meeting-list.json

@@ -1,6 +1,8 @@
 {
-  "usingComponents": {},
-  "navigationBarTitleText": "会议列表",
-  "enablePullDownRefresh": true,
-  "onReachBottomDistance": 50
+    "usingComponents": {},
+    "navigationBarTitleText": "会议列表",
+    "navigationBarBackgroundColor": "#2867B6",
+    "navigationBarTextStyle": "white",
+    "enablePullDownRefresh": true,
+    "onReachBottomDistance": 50
 }

+ 3 - 1
light-application-wx/pages/personal/personal.json

@@ -1,3 +1,5 @@
 {
-    "usingComponents": {}
+    "usingComponents": {},
+    "navigationBarTitleText": "个人中心",
+    "navigationStyle": "custom"
 }

+ 10 - 0
light-application-wx/pages/visit-agenda/visit-agenda.js

@@ -71,5 +71,15 @@ Page({
      */
     onShareAppMessage: function () {
 
+    },
+
+    /**
+     * 点击返回
+     */
+    backTap: function () {
+        wx.navigateBack({
+            delta: -1,
+        });
     }
+
 })

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

@@ -1,6 +1,6 @@
 <!--pages/visit-agenda/visit-agenda.wxml-->
 <view class="container" style="background-image: url({{imgPath}}/meeting-arrangement-bg.png);">
-    <!-- <image class="backBtn" src="{{imgPath}}/icon-back.png"></image> -->
+    <image class="backBtn" src="{{imgPath}}/icon-back-white.png" bindtap="backTap"></image>
     <view class="agenda-title">{{title}}</view>
     <view class="english-name">Agenda arrangement</view>
     <view class="agenda-name">议程安排</view>

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

@@ -8,10 +8,16 @@
     background-size: 100% 100%;
 }
 
+.backBtn {
+    width: 60rpx;
+    height: 60rpx;
+    margin-top: 40rpx;
+}
+
 .agenda-title {
     font-size: 40rpx;
     width: 95%;
-    margin-top: 190rpx;
+    margin-top: 90rpx;
     margin-left: 10rpx;
     border-bottom: solid 1rpx #ffffff50;
     padding-bottom: 10rpx;