Merge branch '通用-签到'

pages/index/index.vue

@@ -14,9 +14,9 @@
 			<view @click="changePage('Map')" :class="PageCur == 'Map' ? 'action pitch-on-color' : 'action text-gray'">
 				<view class="iconfont" :class="PageCur == 'Map' ? 'icon-ditu-xuanzhong' : 'icon-ditu-weixuanzhong'" /> 地图
 			</view>
-	<!-- 		<view class="text-gray" @click.stop="opentabControl(true)">
+			<view class="text-gray" @click.stop="opentabControl(true)">
 				<button class="cu-btn cuIcon-add shadow more" style="background-color:#0B3F7E;color: #fff;"></button>
-			</view> -->
+			</view>
 			<view @click="changePage('Message')"
 				:class="PageCur == 'Message' ? 'action pitch-on-color' : 'action text-gray'">
 				<view class="iconfont" :class="PageCur == 'Message' ? 'icon-xiaoxi-xuanzhong' : 'icon-xiaoxi-weixuanzhong'">
@@ -35,7 +35,7 @@ import home from "./modules/home.vue";
 import facility from "../facility/index.vue";
 import message from "./modules/message.vue";
 import mine from "./modules/mine.vue";
-import tabControl from "../../components/bottomTabControl.vue";
+import tabControl from "./modules/bottomTabControl.vue";
 export default {
 	components: { home, facility, message, mine, tabControl },
 	data() {

components/bottomTabControl.vue → pages/index/modules/bottomTabControl.vue

@@ -2,21 +2,17 @@
     <u-overlay :show="active" @click="active = false">
         <view class="tabbar-box-wrap">
             <view class="tabbar-box">
-                <view class="tabbar-box-item" @click="goToPage('/pages/tabbar-3-detial/tabbar-3-release/tabbar-3-release')">
-                    <image class="box-image" src="../static/img/logo.png" mode="aspectFit"></image>
-                    <text class="explain">发图文</text>
+                <view class="item">
+                    <navigator url="#" class="nav">
+                        <view class="icon">
+                            <text class="iconfont icon-a-wodemendianxinxidizhi" />
+                        </view>
+                        签到
+                    </navigator>
                 </view>
-                <view class="tabbar-box-item" @click="goToPage('/pages/tabbar-3-detial/tabbar-3-video/tabbar-3-video')">
-                    <image class="box-image" src="../static/img/logo.png" mode="aspectFit"></image>
-                    <text class="explain">发视频</text>
-                </view>
-                <view class="tabbar-box-item" @click="goToPage('/pages/tabbar-3-detial/tabbar-3-qa/tabbar-3-qa')">
-                    <image class="box-image" src="../static/img/logo.png" mode="aspectFit"></image>
-                    <text class="explain">提问</text>
-                </view>
-
             </view>
         </view>
+
     </u-overlay>
 </template>
 
@@ -43,11 +39,12 @@ export default {
 
     .tabbar-box {
         position: relative;
+        padding: 2.000vw 2.667vw;
         display: flex;
+        flex-wrap: wrap;
         width: 100%;
         background: #fff;
         border-radius: 2.667vw;
-        padding: 2.000vw 2.667vw;
         box-sizing: border-box;
         z-index: 2;
         box-shadow: 0.000vw 0.533vw 1.333vw 0.533vw rgba(0, 0, 0, 0.1);
@@ -80,19 +77,36 @@ export default {
             z-index: 2;
         }
 
-        .tabbar-box-item {
-            // position: relative;
-            width: 100%;
-            z-index: 3;
-            margin: 1.333vw;
-            color: $uni-color-subtitle;
-            text-align: center;
-            font-size: $uni-font-size-base;
+        .item {
+            width: 33.33%;
+
+            .nav {
+                position: relative;
+                z-index: 3;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+                flex-direction: column;
+                padding: 6px;
+                border-radius: 4px;
+
+                .icon {
+                    width: 44px;
+                    height: 44px;
+                    text-align: center;
+                    line-height: 44px;
+                    background: #3874F6;
+                    border-radius: 4px;
+                    margin-bottom: 6px;
 
-            .box-image {
-                width: 100%;
-                height: $uni-img-size-lg;
+                    .iconfont {
+                        color: #fff;
+                        font-size: 24px;
+                    }
+                }
             }
+
+
         }
     }
 }