分包调整

miniprogram/app.js

@@ -23,6 +23,7 @@ App({
 
     },
     globalData: {
+        selected: 0,
         flag: false,
         exitApp: false,
         userInfo: null,

miniprogram/app.json

@@ -1,12 +1,7 @@
 {
     "pages": [
         "pages/home/home",
-        "pages/redSail/redSail",
+   
-        "pages/knight/knight",
-        "pages/redGrider/redGrider",
-        "pages/pioneer/pioneer",
-        "pages/checkIn/checkIn",
-        "pages/volunteer/volunteer",
         "pages/message/message",
         "pages/my/my",
         "pages/index/index",
@@ -27,6 +22,52 @@
         "pages/navigatetoApp/navigatetoApp"
     ],
     "subPackages": [
+        {
+            "root": "subpages/redSail",
+            "name": "redSail",
+            "pages": [
+                "pages/redSail/redSail"
+            ]
+        },
+        {
+            "root": "subpages/knight",
+            "name": "knight",
+            "pages": [
+                "pages/knight/knight"
+            ]
+        },
+        {
+            "root": "subpages/redGrider",
+            "name": "redGrider",
+            "pages": [
+                "pages/redGrider/redGrider"
+            ]
+        },
+        {
+            "root": "subpages/pioneer",
+            "name": "pioneer",
+            "pages": [
+                "pages/pioneer/pioneer"
+            ]
+        },
+        {
+            "root": "subpages/checkIn",
+            "name": "checkIn",
+            "pages": [
+                "pages/checkIn/checkIn"
+            ]
+        },
+        {
+            "root": "subpages/volunteer",
+            "name": "volunteer",
+            "pages": [
+                "pages/volunteer/volunteer"
+            ]
+        },
+
+
+
+
         {
             "root": "subpages/home",
             "name": "home",
@@ -214,10 +255,11 @@
         "selectedColor": "#FF0000",
         "backgroundColor": "#FFFFFF",
         "borderStyle": "white",
+        "custom": true,
         "list": [
             {
                 "pagePath": "pages/home/home",
-                "text": "",
+                "text": "首页",
                 "iconPath": "images/main/icon01.png",
                 "selectedIconPath": "images/main/icon01-a.png"
             },

miniprogram/custom-tab-bar/index.js

@@ -0,0 +1,45 @@
+const app = getApp()
+Component({
+  data: {
+    selected: 0,
+    color: "#7A7E83",
+    selectedColor: "#3cc51f",
+    "list": [
+        {
+            "pagePath": "/pages/home/home",
+            "text": "",
+            "iconPath": "/images/main/icon01.png",
+            "selectedIconPath": "/images/main/icon01-a.png"
+        },
+        {
+            "pagePath": "/pages/message/message",
+            "text": "消息",
+            "iconPath": "/images/main/icon02.png",
+            "selectedIconPath": "/images/main/icon02-a.png"
+        },
+       
+        {
+            "pagePath": "/pages/my/my",
+            "text": "我的",
+            "iconPath": "/images/main/icon03.png",
+            "selectedIconPath": "/images/main/icon03-a.png"
+        }
+    ]
+  },
+  attached() {
+  },
+  ready: function() {
+    this.setData({
+      selected: app.globalData.selected
+    })
+  },
+  methods: {
+    switchTab(e) {
+        // console.log(e);
+        const data = e.currentTarget.dataset;
+        const url = data.path;
+        app.globalData.selected = data.index;
+        wx.switchTab({url})
+      }
+  }
+})

miniprogram/custom-tab-bar/index.json

@@ -0,0 +1,3 @@
+{
+  "component": true
+}

miniprogram/custom-tab-bar/index.wxml

@@ -0,0 +1,8 @@
+<!--miniprogram/custom-tab-bar/index.wxml-->
+<view class="tab-bar">
+  <view class="tab-bar-border"></view>
+  <view wx:for="{{list}}" wx:key="index" class="tab-bar-item" data-path="{{item.pagePath}}" data-index="{{index}}" bindtap="switchTab">
+    <image src="{{selected === index ? item.selectedIconPath : item.iconPath}}"></image>
+    <view style="color: {{selected === index ? selectedColor : color}}">{{item.text}}</view>
+  </view>
+</view>

miniprogram/custom-tab-bar/index.wxss

@@ -0,0 +1,38 @@
+.tab-bar {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  height: 48px;
+  background: white;
+  display: flex;
+  padding-bottom: env(safe-area-inset-bottom);
+}
+
+.tab-bar-border {
+  background-color: rgba(0, 0, 0, 0.33);
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 1px;
+  transform: scaleY(0.5);
+}
+
+.tab-bar-item {
+  flex: 1;
+  text-align: center;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+}
+
+.tab-bar-item image {
+  width: 27px;
+  height: 27px;
+}
+
+.tab-bar-item view {
+  font-size: 10px;
+}

miniprogram/pages/home/home.js

@@ -1,3 +1,4 @@
+
 const app = getApp()
 const api = require("../../utils/api")
 const homeApi = require("../../utils/home")
@@ -42,6 +43,7 @@ Page({
     isSignUp: 0,
     communityId: "" // 社区id
   },
+ 
   async onLoad(options) {
     wx.showLoading({
       title: "加载中,请稍后",

miniprogram/pages/home/home.wxml

@@ -6,26 +6,26 @@
 </view>
 <view class="bgw topf50">
     <view class="gridouter">
-        <navigator url="/pages/redSail/redSail" class="grid">
+        <navigator url="/subpages/redSail/pages/redSail/redSail" class="grid">
             <image src="../../images/main/home01.png" />
             <view>红帆支队</view>
         </navigator>
-        <navigator url="/pages/knight/knight" class="grid">
+        <navigator url="/subpages/knight/pages/knight/knight" class="grid">
             <image src=" ../../images/main/home02.png" />
             <view>骑士驿站</view>
         </navigator>
-        <navigator url="/pages/redGrider/redGrider" class="grid">
+        <navigator url="/subpages/redGrider/pages/redGrider/redGrider" class="grid">
             <image src="../../images/main/home03.png" />
             <view>红色网格员</view>
         </navigator>
-        <navigator url="/pages/pioneer/pioneer" class="grid">
+        <navigator url="/subpages/pioneer/pages/pioneer/pioneer" class="grid">
             <image src="../../images/main/home04.png" />
             <view>西海岸先锋</view>
         </navigator>
     </view>
     <view class="grid2outer">
 
-        <navigator url="/pages/checkIn/checkIn" class="grid2 blue">
+        <navigator url="/subpages/checkIn/pages/checkIn/checkIn" class="grid2 blue">
             <image src="../../images/main/home05.png" />
             <view>
                 <view class="h1">在职党员</view>
@@ -35,7 +35,7 @@
 
         <view class="w40"></view>
 
-        <navigator url="/pages/volunteer/volunteer" class="grid2 red">
+        <navigator url="/subpages/volunteer/pages/volunteer/volunteer" class="grid2 red">
             <image src="../../images/main/home06.png" />
             <view>
                 <view class="h1">红色尖兵</view>

miniprogram/pages/message/message.js

@@ -7,7 +7,15 @@ Page({
     data: {
 
     },
-
+    getInstance() {
+        if (typeof this.getTabBar === 'function' ) {
+          this.getTabBar((tabBar) => {
+            tabBar.setData({
+              selected: 1
+            })
+          })
+        }
+      },
     /**
      * 生命周期函数--监听页面加载
      */

miniprogram/pages/CheckIn/CheckIn.wxml → miniprogram/subpages/checkIn/pages/checkIn/checkIn.wxml

@@ -1,5 +1,5 @@
 <view class="header">
-     <image src="../../images/main/back.png" class="back" style=" top: {{statusHeight}}px;"  bindtap="back"></image>
+     <image src="../../images/back.png" class="back" style=" top: {{statusHeight}}px;"  bindtap="back"></image>
     <!-- <image class="header-bg" src="../../images/checkin/redSail_bg.png" mode="widthFix" /> -->
     <view class="navigation" style="height: {{navigationHeight}}px; top: {{statusHeight}}px;">
         在职党员到居住社区报到
@@ -8,7 +8,7 @@
 <view class="mtf80">
     <view class="list">
         <view class="item ">
-            <image src="../../images/checkin/01.png" class="icon"></image>
+            <image src="../../images/01.png" class="icon"></image>
             <view class="vcenter flex1">
                 <view class="h1">我来报道</view>
                 <view class="h2">
@@ -16,11 +16,11 @@
                 </view>
             </view>
             <view class="vcenter w20">
-                <image src="../../images/checkin/right.png"  class="go"></image>
+                <image src="../../images/right.png"  class="go"></image>
             </view>
         </view>
         <view class="item ">
-            <image src="../../images/checkin/02.png" class="icon"></image>
+            <image src="../../images/02.png" class="icon"></image>
             <view class="vcenter flex1">
                 <view class="h1">社区活动</view>
                 <view class="h2">
@@ -28,11 +28,11 @@
                 </view>
             </view>
             <view class="vcenter w20">
-                <image src="../../images/checkin/right.png"  class="go"></image>
+                <image src="../../images/right.png"  class="go"></image>
             </view>
         </view>
         <view class="item ">
-            <image src="../../images/checkin/03.png" class="icon"></image>
+            <image src="../../images/03.png" class="icon"></image>
             <view class="vcenter flex1">
                 <view class="h1">志愿服务</view>
                 <view class="h2">
@@ -40,7 +40,7 @@
                 </view>
             </view>
             <view class="vcenter w20">
-                <image src="../../images/checkin/right.png"  class="go"></image>
+                <image src="../../images/right.png"  class="go"></image>
             </view>
         </view>
         

miniprogram/pages/knight/knight.wxml → miniprogram/subpages/knight/pages/knight/knight.wxml

@@ -1,6 +1,6 @@
 <view class="header">
-     <image src="../../images/main/back2.png" class="back" style=" top: {{statusHeight}}px;"  bindtap="back"></image>
+     <image src="../../images/back2.png" class="back" style=" top: {{statusHeight}}px;"  bindtap="back"></image>
-    <image class="header-bg" src="../../images/knight/bg.png" mode="widthFix" />
+    <image class="header-bg" src="../../images/bg.png" mode="widthFix" />
     <view class="navigation" style="height: {{navigationHeight}}px; top: {{statusHeight}}px;">
         骑士驿站
     </view>
@@ -8,7 +8,7 @@
 <view class="mtf80">
     <view class="list">
         <view class="item color01">
-            <image src="../../images/knight/01.png" class="icon"></image>
+            <image src="../../images/01.png" class="icon"></image>
             <view class="vcenter flex1">
                 <view class="h1">驿站简介</view>
                 <view class="h2">
@@ -16,11 +16,11 @@
                 </view>
             </view>
             <view class="vcenter w20">
-                <image src="../../images/knight/01r.png"  class="go"></image>
+                <image src="../../images/01r.png"  class="go"></image>
             </view>
         </view>
         <view class="item color02">
-            <image src="../../images/knight/02.png" class="icon"></image>
+            <image src="../../images/02.png" class="icon"></image>
             <view class="vcenter flex1">
                 <view class="h1">驿站地图</view>
                 <view class="h2">
@@ -28,11 +28,11 @@
                 </view>
             </view>
             <view class="vcenter w20">
-                <image src="../../images/knight/02r.png"  class="go"></image>
+                <image src="../../images/02r.png"  class="go"></image>
             </view>
         </view>
         <view class="item color03">
-            <image src="../../images/knight/03.png" class="icon"></image>
+            <image src="../../images/03.png" class="icon"></image>
             <view class="vcenter flex1">
                 <view class="h1">骑士注册</view>
                 <view class="h2">
@@ -40,11 +40,11 @@
                 </view>
             </view>
             <view class="vcenter w20">
-                <image src="../../images/knight/03r.png"  class="go"></image>
+                <image src="../../images/03r.png"  class="go"></image>
             </view>
         </view>
         <view class="item color04">
-            <image src="../../images/knight/04.png" class="icon"></image>
+            <image src="../../images/04.png" class="icon"></image>
             <view class="vcenter flex1">
                 <view class="h1">骑先锋</view>
                 <view class="h2">
@@ -52,11 +52,11 @@
                 </view>
             </view>
             <view class="vcenter w20">
-                <image src="../../images/knight/04r.png"  class="go"></image>
+                <image src="../../images/04r.png"  class="go"></image>
             </view>
         </view>
         <view class="item color05">
-            <image src="../../images/knight/05.png" class="icon"></image>
+            <image src="../../images/05.png" class="icon"></image>
             <view class="vcenter flex1">
                 <view class="h1">骑士上报</view>
                 <view class="h2">
@@ -64,11 +64,11 @@
                 </view>
             </view>
             <view class="vcenter w20">
-                <image src="../../images/knight/05r.png"  class="go"></image>
+                <image src="../../images/05r.png"  class="go"></image>
             </view>
         </view>
         <view class="item color06">
-            <image src="../../images/knight/06.png" class="icon"></image>
+            <image src="../../images/06.png" class="icon"></image>
             <view class="vcenter flex1">
                 <view class="h1">关爱行动</view>
                 <view class="h2">
@@ -76,7 +76,7 @@
                 </view>
             </view>
             <view class="vcenter w20">
-                <image src="../../images/knight/06r.png"  class="go"></image>
+                <image src="../../images/06r.png"  class="go"></image>
             </view>
         </view>
     </view>

miniprogram/pages/Pioneer/Pioneer.wxml → miniprogram/subpages/pioneer/pages/pioneer/pioneer.wxml

@@ -1,5 +1,5 @@
 <view class="header">
-    <image src="../../images/main/back2.png" class="back" style=" top: {{statusHeight}}px;" bindtap="back"></image>
+    <image src="../../images/back2.png" class="back" style=" top: {{statusHeight}}px;" bindtap="back"></image>
     <!-- <image class="header-bg" src="../../images/main/redSail_bg.png" mode="widthFix" /> -->
     <view class="navigation" style="height: {{navigationHeight}}px; top: {{statusHeight}}px;">
         西海岸先锋
@@ -7,9 +7,9 @@
 </view>
 <view class="box">
     
-    <image src="../../images/poineer/by.png" class="by" />
+    <image src="../../images/by.png" class="by" />
     <view class="saosao">扫一扫</view>
-    <image src="../../images/poineer/erweima.png" class="erweima" />
+    <image src="../../images/erweima.png" class="erweima" />
 </view>
 <view class="textcenter">
     <view class="h1">扫码关注“西海岸先锋”</view>

miniprogram/pages/redGrider/redGrider.wxml → miniprogram/subpages/redGrider/pages/redGrider/redGrider.wxml

@@ -1,6 +1,6 @@
 <view class="header">
-     <image src="../../images/main/back.png" class="back" style=" top: {{statusHeight}}px;"  bindtap="back"></image>
+     <image src="../../images/back.png" class="back" style=" top: {{statusHeight}}px;"  bindtap="back"></image>
-    <image class="header-bg" src="../../images/redGrider/bg.png" mode="widthFix" />
+    <image class="header-bg" src="../../images/bg.png" mode="widthFix" />
     <view class="navigation" style="height: {{navigationHeight}}px; top: {{statusHeight}}px;">
         红色网格员
     </view>
@@ -8,7 +8,7 @@
 <view class="mtf80">
     <view class="list">
         <view class="item color01">
-            <image src="../../images/redGrider/01.png" class="icon"></image>
+            <image src="../../images/01.png" class="icon"></image>
             <view class="vcenter flex1">
                 <view class="h1">招募令</view>
                 <view class="h2">
@@ -16,11 +16,11 @@
                 </view>
             </view>
             <view class="vcenter w20">
-                <image src="../../images/redGrider/01r.png"  class="go"></image>
+                <image src="../../images/01r.png"  class="go"></image>
             </view>
         </view>
         <view class="item color02">
-            <image src="../../images/redGrider/02.png" class="icon"></image>
+            <image src="../../images/02.png" class="icon"></image>
             <view class="vcenter flex1">
                 <view class="h1">网格工作</view>
                 <view class="h2">
@@ -28,11 +28,11 @@
                 </view>
             </view>
             <view class="vcenter w20">
-                <image src="../../images/redGrider/02r.png"  class="go"></image>
+                <image src="../../images/02r.png"  class="go"></image>
             </view>
         </view>
         <view class="item color03">
-            <image src="../../images/redGrider/03.png" class="icon"></image>
+            <image src="../../images/03.png" class="icon"></image>
             <view class="vcenter flex1">
                 <view class="h1">网格上报</view>
                 <view class="h2">
@@ -40,11 +40,11 @@
                 </view>
             </view>
             <view class="vcenter w20">
-                <image src="../../images/redGrider/03r.png"  class="go"></image>
+                <image src="../../images/03r.png"  class="go"></image>
             </view>
         </view>
         <view class="item color04">
-            <image src="../../images/redGrider/04.png" class="icon"></image>
+            <image src="../../images/04.png" class="icon"></image>
             <view class="vcenter flex1">
                 <view class="h1">网格风采</view>
                 <view class="h2">
@@ -52,7 +52,7 @@
                 </view>
             </view>
             <view class="vcenter w20">
-                <image src="../../images/redGrider/04r.png"  class="go"></image>
+                <image src="../../images/04r.png"  class="go"></image>
             </view>
         </view>
        

miniprogram/pages/redSail/redSail.wxml → miniprogram/subpages/redSail/pages/redSail/redSail.wxml

@@ -1,6 +1,6 @@
 <view class="header">
-     <image src="../../images/main/back.png" class="back" style=" top: {{statusHeight}}px;"  bindtap="back"></image>
+     <image src="../../images/back.png" class="back" style=" top: {{statusHeight}}px;"  bindtap="back"></image>
-    <image class="header-bg" src="../../images/redSail/bg.png" mode="widthFix" />
+    <image class="header-bg" src="../../images/bg.png" mode="widthFix" />
     <view class="navigation" style="height: {{navigationHeight}}px; top: {{statusHeight}}px;">
         红帆支部
     </view>
@@ -8,7 +8,7 @@
 <view class="mtf80">
     <view class="list">
         <view class="item ">
-            <image src="../../images/redSail/01.png" class="icon"></image>
+            <image src="../../images/01.png" class="icon"></image>
             <view class="vcenter flex1">
                 <view class="h1">红帆领航</view>
                 <view class="h2">
@@ -16,11 +16,11 @@
                 </view>
             </view>
             <view class="vcenter w20">
-                <image src="../../images/redSail/right.png"  class="go"></image>
+                <image src="../../images/right.png"  class="go"></image>
             </view>
         </view>
         <view class="item ">
-            <image src="../../images/redSail/02.png" class="icon"></image>
+            <image src="../../images/02.png" class="icon"></image>
             <view class="vcenter flex1">
                 <view class="h1">我要入党</view>
                 <view class="h2">
@@ -28,11 +28,11 @@
                 </view>
             </view>
             <view class="vcenter w20">
-                <image src="../../images/redSail/right.png"  class="go"></image>
+                <image src="../../images/right.png"  class="go"></image>
             </view>
         </view>
         <view class="item ">
-            <image src="../../images/redSail/03.png" class="icon"></image>
+            <image src="../../images/03.png" class="icon"></image>
             <view class="vcenter flex1">
                 <view class="h1">流动党员报到</view>
                 <view class="h2">
@@ -40,11 +40,11 @@
                 </view>
             </view>
             <view class="vcenter w20">
-                <image src="../../images/redSail/right.png"  class="go"></image>
+                <image src="../../images/right.png"  class="go"></image>
             </view>
         </view>
         <view class="item ">
-            <image src="../../images/redSail/04.png" class="icon"></image>
+            <image src="../../images/04.png" class="icon"></image>
             <view class="vcenter flex1">
                 <view class="h1">我要转出</view>
                 <view class="h2">
@@ -52,11 +52,11 @@
                 </view>
             </view>
             <view class="vcenter w20">
-                <image src="../../images/redSail/right.png"  class="go"></image>
+                <image src="../../images/right.png"  class="go"></image>
             </view>
         </view>
         <view class="item ">
-            <image src="../../images/redSail/05.png" class="icon"></image>
+            <image src="../../images/05.png" class="icon"></image>
             <view class="vcenter flex1">
                 <view class="h1">我的支部</view>
                 <view class="h2">
@@ -64,7 +64,7 @@
                 </view>
             </view>
             <view class="vcenter w20">
-                <image src="../../images/redSail/right.png"  class="go"></image>
+                <image src="../../images/right.png"  class="go"></image>
             </view>
         </view>
 

miniprogram/pages/volunteer/volunteer.wxml → miniprogram/subpages/volunteer/pages/volunteer/volunteer.wxml

@@ -1,5 +1,5 @@
 <view class="header">
-     <image src="../../images/main/back.png" class="back" style=" top: {{statusHeight}}px;"  bindtap="back"></image>
+     <image src="../../images/back.png" class="back" style=" top: {{statusHeight}}px;"  bindtap="back"></image>
     <!-- <image class="header-bg" src="../../images/volunteer/redSail_bg.png" mode="widthFix" /> -->
     <view class="navigation" style="height: {{navigationHeight}}px; top: {{statusHeight}}px;">
         红色尖兵志愿服务队
@@ -8,7 +8,7 @@
 <view class="mtf80">
     <view class="list">
         <view class="item ">
-            <image src="../../images/volunteer/01.png" class="icon"></image>
+            <image src="../../images/01.png" class="icon"></image>
             <view class="vcenter flex1">
                 <view class="h1">招募令</view>
                 <view class="h2">
@@ -16,11 +16,11 @@
                 </view>
             </view>
             <view class="vcenter w20">
-                <image src="../../images/volunteer/right.png"  class="go"></image>
+                <image src="../../images/right.png"  class="go"></image>
             </view>
         </view>
         <view class="item ">
-            <image src="../../images/volunteer/02.png" class="icon"></image>
+            <image src="../../images/02.png" class="icon"></image>
             <view class="vcenter flex1">
                 <view class="h1">尖兵行动</view>
                 <view class="h2">
@@ -28,11 +28,11 @@
                 </view>
             </view>
             <view class="vcenter w20">
-                <image src="../../images/volunteer/right.png"  class="go"></image>
+                <image src="../../images/right.png"  class="go"></image>
             </view>
         </view>
         <view class="item ">
-            <image src="../../images/volunteer/03.png" class="icon"></image>
+            <image src="../../images/03.png" class="icon"></image>
             <view class="vcenter flex1">
                 <view class="h1">尖兵风采</view>
                 <view class="h2">
@@ -40,7 +40,7 @@
                 </view>
             </view>
             <view class="vcenter w20">
-                <image src="../../images/volunteer/right.png"  class="go"></image>
+                <image src="../../images/right.png"  class="go"></image>
             </view>
         </view>