wzh преди 3 години
родител
ревизия
dbc42a795d

+ 1 - 1
miniprogram/app.json

@@ -62,7 +62,7 @@
     }
   },
   "useExtendedLib": {
-    "weui": true
+
   },
   "sitemapLocation": "sitemap.json",
   "style": "v2"

+ 10 - 7
miniprogram/pages/index/index.wxml

@@ -19,21 +19,24 @@
   </view>
   <view class="tools">
     <view class="df">
-      <view bindtap="goTo" data-url="/pages/voyageManage/myDaily/myDaily">
+      <view bindtap="goTo" class="go-to" data-url="/pages/voyageManage/myDaily/myDaily">
         <image src="../../images/camera.png"></image>
-        <view>日报{{indexInfo.dayReportNum}}</view>
+        <view>日报</view>
+        <view class="badge">{{indexInfo.dayReportNum}}</view>
       </view>
-      <view bindtap="goTo" data-url="/pages/voyageManage/myVoyages/myVoyages">
+      <view bindtap="goTo" class="go-to" data-url="/pages/voyageManage/myVoyages/myVoyages">
         <image src="../../images/ship.png"></image>
-        <view>卸货{{indexInfo.discVoyageNum}}</view>
+        <view>卸货</view>
+        <view class="badge">{{indexInfo.discVoyageNum}}</view>
       </view>
     </view>
     <view class="df">
-      <view bindtap="goTo" data-url="/pages/voyageManage/myBills/myBills">
+      <view bindtap="goTo" class="go-to" data-url="/pages/voyageManage/myBills/myBills">
         <image src="../../images/bills.png"></image>
-        <view>单据{{indexInfo.billNum}}</view>
+        <view>单据</view>
+        <view class="badge">{{indexInfo.billNum}}</view>
       </view>
-      <view bindtap="goTo" data-url="/pages/voyageManage/createVoyage/createVoyage">
+      <view bindtap="goTo" class="go-to" data-url="/pages/voyageManage/createVoyage/createVoyage">
         <image src="../../images/rudder.png"></image>
         <view>创建航次</view>
       </view>

+ 22 - 4
miniprogram/pages/index/index.wxss

@@ -2,7 +2,7 @@
   width: 50%;
   text-align: center;
   color: #fff;
-  height: 240rpx;
+  height: 220rpx;
 }
 
 .block-line:first-child>view:first-child {
@@ -53,12 +53,30 @@
 }
 
 .tools>view>view {
-  width: 50%;
+  width: 50vw;
   text-align: center;
 }
 
 .tools>view>view>image {
-  width: 50%;
-  height: 50%;
+  width: 25vw;
+  height: 25vw;
   margin-top: 20%;
+}
+
+.go-to {
+  position: relative;
+}
+
+.badge {
+  position: absolute;
+  width: 50rpx;
+  height: 50rpx;
+  text-align: center;
+  line-height: 50rpx;
+  background: #f86065;
+  border-radius: 25rpx;
+  color: #fff;
+  font-size: 30rpx;
+  top: 12vw;
+  right: 12vw;
 }

+ 1 - 1
miniprogram/pages/shipOwnerManage/shipOwnerList/shipOwnerList.wxml

@@ -12,6 +12,6 @@
   </block>
 </scroll-view>
 <view bindtap="addShipOwner" class="next">新建船东</view>
-<view style="position: fixed;top: 10vh;right: 3vw;width: 50rpx;background:#fff;text-align: center;box-shadow: 0px 0px 3px grey;">
+<view class="letter-bar">
   <view style="margin-bottom: 6rpx;" bindtap="tapLetter" data-letter="{{item.letter=='?'?'index':item.letter}}" wx:for="{{shipOwnerList}}">{{item.letter}}</view>
 </view>

+ 11 - 0
miniprogram/pages/shipOwnerManage/shipOwnerList/shipOwnerList.wxss

@@ -34,4 +34,15 @@
   border-radius: 10rpx;
   margin: 0 auto;
   margin-top: 1vh;
+}
+
+.letter-bar {
+  position: fixed;
+  top: 10vh;
+  right: 3vw;
+  width: 50rpx;
+  background: #fff;
+  text-align: center;
+  box-shadow: 0px 0px 3px grey;
+  padding: 20rpx 5rpx;
 }

+ 1 - 2
miniprogram/pages/voyageManage/createVoyage/createVoyage.json

@@ -1,7 +1,6 @@
 {
   "usingComponents": {
-    "RemotePicker": "/components/remotePicker/remotePicker",
-    "mp-searchbar": "weui-miniprogram/searchbar/searchbar"
+    "RemotePicker": "/components/remotePicker/remotePicker"
   },
   "navigationBarTitleText": "创建航次"
 }

+ 7 - 0
project.private.config.json

@@ -64,6 +64,13 @@
           "query": "",
           "launchMode": "default",
           "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/voyageManage/voyageManage",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }