新增 安全模块;更新样式

miniprogram/app.json

@@ -21,7 +21,8 @@
     "pages/voyages/uploadDischarge/uploadDischarge",
     "pages/index/declarePort/voyageList",
     "pages/index/weather/weatherList",
-    "pages/index/declarePort/detail"
+    "pages/index/declarePort/detail",
+    "pages/index/security/security"
   ],
   "window": {
     "backgroundColor": "#F6F6F6",
@@ -31,7 +32,8 @@
     "navigationBarTextStyle": "black"
   },
   "tabBar": {
-    "list": [{
+    "list": [
+      {
         "pagePath": "pages/index/index",
         "text": "首页",
         "iconPath": "images/tabBar/index.png",

miniprogram/app.wxss

@@ -213,16 +213,4 @@ picker {
 
 .back-red {
   background: #d90024;
-}
-
-.next {
-  text-align: center;
-  width: 300rpx;
-  height: 80rpx;
-  line-height: 80rpx;
-  color: #fff;
-  background: #0094FE;
-  border-radius: 10rpx;
-  margin: 0 auto;
-  margin-top: 5vh;
 }

miniprogram/pages/index/index.wxml

@@ -17,39 +17,49 @@
       </view>
     </view>
   </view>
-  <view class="tools">
-    <view class="df">
+  <scroll-view scroll-y="{{true}}" class="tools">
+    <view class="df jcsa tac">
       <view bindtap="goTo" data-maintab="{{2}}" class="go-to" data-url="/pages/voyageManage/voyageManage">
-        <image src="../../images/camera.png"></image>
+        <image class="index-image" src="../../images/camera.png"></image>
         <view>日 报</view>
         <view class="badge">{{indexInfo.dayReportNum||0}}</view>
       </view>
       <view bindtap="goTo" data-maintab="{{1}}" class="go-to" data-url="/pages/voyageManage/voyageManage">
-        <image src="../../images/ship.png"></image>
+        <image class="index-image" src="../../images/ship.png"></image>
         <view>卸 货</view>
         <view class="badge">{{indexInfo.discVoyageNum||0}}</view>
       </view>
     </view>
-    <view class="df">
+    <view class="df jcsa tac">
       <view bindtap="goTo" data-maintab="{{3}}" class="go-to" data-url="/pages/voyageManage/voyageManage">
-        <image src="../../images/bills.png"></image>
+        <image class="index-image" src="../../images/bills.png"></image>
         <view>单 据</view>
         <view class="badge">{{indexInfo.billNum||0}}</view>
       </view>
       <view bindtap="goTo" class="go-to" data-url="/pages/voyageManage/createVoyage/createVoyage">
-        <image src="../../images/rudder.png"></image>
+        <image class="index-image" src="../../images/rudder.png"></image>
         <view>创建航次</view>
       </view>
     </view>
-    <view class="df">
-      <view bindtap="goTo" class="go-to" data-url="/pages/index/weather/weatherList">
-        <image src="../../images/weather.png"></image>
-        <view>天气查询</view>
+    <view class="df jcsa tac">
+      <view bindtap="goTo" class="go-to" data-url="/pages/index/security/security">
+        <image class="index-image" src="../../images/security.png"></image>
+        <view>安全</view>
       </view>
       <view bindtap="goTo" class="go-to" data-url="/pages/index/declarePort/voyageList">
-        <image src="../../images/port.png"></image>
+        <image class="index-image" src="../../images/port.png"></image>
         <view>报 港</view>
       </view>
     </view>
-  </view>
+    <view class="df jcsa tac">
+      <view bindtap="goTo" class="go-to" data-url="/pages/index/weather/weatherList">
+        <image class="index-image" src="../../images/weather.png"></image>
+        <view>天气查询</view>
+      </view>
+      <view class="go-to">
+        <view class="index-image"></view>
+        <view></view>
+      </view>
+    </view>
+  </scroll-view>
 </view>

miniprogram/pages/index/index.wxss

@@ -45,7 +45,7 @@
 }
 
 .tools {
-  height: calc(100vh - 480rpx);
+  height: calc(100vh - 36vh);
 }
 
 .tools>view {
@@ -58,8 +58,8 @@
 }
 
 .tools>view>view>image {
-  width: 20vw;
-  height: 20vw;
+  width: 50vw;
+  height: 50vw;
   margin-top: 10%;
 }
 
@@ -77,6 +77,12 @@
   border-radius: 25rpx;
   color: #fff;
   font-size: 30rpx;
-  top: 12vw;
-  right: 12vw;
+  top: 10vw;
+  right: 0vw;
+}
+
+.index-image {
+  width: 25vw;
+  height: 25vw;
+  margin-top: 10%;
 }

miniprogram/pages/index/security/security.js

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

miniprogram/pages/index/security/security.json

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

miniprogram/pages/index/security/security.wxml

@@ -0,0 +1,2 @@
+<!--pages/index/security/security.wxml-->
+<text>pages/index/security/security.wxml</text>

miniprogram/pages/index/security/security.wxss

@@ -0,0 +1 @@
+/* pages/index/security/security.wxss */

miniprogram/pages/voyages/detail/detail.wxss

@@ -136,12 +136,13 @@ page {
 }
 
 .voyage-btn {
-  height: 50rpx;
-  line-height: 50rpx;
+  height: 70rpx;
+  line-height: 70rpx;
   border-radius: 10rpx;
-  padding: 0 20rpx;
+  padding: 0 30rpx;
   margin-right: 20rpx;
   color: #fff;
+  font-size: 30rpx;
 }
 
 .line {
@@ -156,11 +157,12 @@ page {
   color: #fff;
   background: #0094FE;
   border-radius: 10rpx;
-  width: 200rpx;
-  height: 50rpx;
-  line-height: 50rpx;
-  font-size: 26rpx;
-  margin: 0 auto;
+  margin: 20rpx auto;
+  height: 70rpx;
+  line-height: 70rpx;
+  border-radius: 10rpx;
+  padding: 0 30rpx;
+  font-size: 30rpx;
 }
 
 .delete {