Merge branch 'main' of https://gitea.dykj.co/sundongyu/dykj-outsource-12123

components/tabBar/index.vue

@@ -1,8 +1,104 @@
 <template>
+  <up-tabbar :value="value4" @change="toRoute" :fixed="true" :placeholder="true" activeColor="#4a7bb5" :safeAreaInsetBottom="true" :border="false">
+    <up-tabbar-item style="border-top: 1rpx solid #e4e4e4" text="首页">
+      <template #active-icon>
+        <image src="../../static/tabbar/clickone.png" style="width: 1.5rem; height: 1.5rem"></image>
+      </template>
+      <template #inactive-icon>
+        <image src="../../static/tabbar/one.png" style="width: 1.5rem; height: 1.5rem"></image>
+      </template>
+    </up-tabbar-item>
+    <up-tabbar-item style="border-top: 1rpx solid #e4e4e4" text="网版进度">
+      <template #active-icon>
+        <image src="../../static/tabbar/clicktow.png" style="width: 1.5rem; height: 1.5rem"></image>
+      </template>
+      <template #inactive-icon>
+        <image src="../../static/tabbar/tow.png" style="width: 1.5rem; height: 1.5rem"></image>
+      </template>
+    </up-tabbar-item>
+    <up-tabbar-item style="margin-top: -1.2rem; border-top: 4rpx solid #e4e4e4; border-radius: 50%; padding-top: 0.7rem" text="扫一扫">
+      <template #active-icon>
+        <image src="../../static/tabbar/three.png" style="width: 2.5rem; height: 2.5rem"></image>
+      </template>
+      <template #inactive-icon>
+        <image src="../../static/tabbar/three.png" style="width: 2.5rem; height: 2.5rem"></image>
+      </template>
+    </up-tabbar-item>
+    <up-tabbar-item style="border-top: 1rpx solid #e4e4e4" text="服务网点">
+      <template #active-icon>
+        <image src="../../static/tabbar/clickforu.png" style="width: 1.5rem; height: 1.5rem"></image>
+      </template>
+      <template #inactive-icon>
+        <image src="../../static/tabbar/foru.png" style="width: 1.5rem; height: 1.5rem"></image>
+      </template>
+    </up-tabbar-item>
+    <up-tabbar-item style="border-top: 1rpx solid #e4e4e4" text="我的">
+      <template #active-icon>
+        <image src="../../static/tabbar/yonghu_1.png" style="width: 1.5rem; height: 1.5rem"></image>
+      </template>
+      <template #inactive-icon>
+        <image src="../../static/tabbar/yonghu_1.png" style="width: 1.5rem; height: 1.5rem"></image>
+      </template>
+    </up-tabbar-item>
+  </up-tabbar>
 </template>
 
-<script>
+<script setup>
+import { ref } from 'vue';
+const value4 = ref(0);
+uni.getStorage({
+  key: 'value',
+  success(data) {
+    value4.value = data.data;
+  }
+});
+const toRoute = (index) => {
+  if (index == 0) {
+    uni.navigateTo({
+      url: '/pages/index/index'
+    });
+    uni.setStorage({
+      key: 'value',
+      data: index
+    });
+  }
+  if (index == 1) {
+    uni.navigateTo({
+      url: '/pages/schedule/index'
+    });
+    uni.setStorage({
+      key: 'value',
+      data: index
+    });
+  }
+  if (index == 2) {
+    // uni.navigateTo({
+    //   url: '/pages/index/index'
+    // });
+    // uni.setStorage({
+    //   key: 'value',
+    //   data: index
+    // });
+  }
+  if (index == 3) {
+    uni.navigateTo({
+      url: '/pages/serve/index'
+    });
+    uni.setStorage({
+      key: 'value',
+      data: index
+    });
+  }
+  if (index == 4) {
+    uni.navigateTo({
+      url: '/pages/my/index'
+    });
+    uni.setStorage({
+      key: 'value',
+      data: index
+    });
+  }
+};
 </script>
 
-<style>
-</style>
+<style lang="scss"></style>

pages.json

@@ -61,24 +61,5 @@
     "navigationBarBackgroundColor": "#F8F8F8",
     "backgroundColor": "#F8F8F8"
   },
-  "uniIdRouter": {},
-  "tabBar": {
-    "list": [{
-        "pagePath": "pages/index/index",
-        "text": "首页"
-      },
-      {
-        "pagePath": "pages/schedule/index",
-        "text": "网办进度"
-      },
-      {
-        "pagePath": "pages/serve/index",
-        "text": "服务网点"
-      },
-      {
-        "pagePath": "pages/my/index",
-        "text": "我的"
-      }
-    ]
-  }
+  "uniIdRouter": {}
 }

pages/index/index.vue

@@ -112,16 +112,12 @@
 </template>
 
 <script setup>
-	import {
-		ref
-	} from 'vue';
-	const {
-		safeAreaInsets
-	} = uni.getSystemInfoSync();
-	const dotStyle = ref({
-
-	})
-	const businessList = ref([{
+import TabBar from '@/components/tabBar/index.vue';
+import { ref } from 'vue';
+const { safeAreaInsets } = uni.getSystemInfoSync();
+const dotStyle = ref({});
+const businessList = ref([
+  {
     img: '../../static/6w1.png',
     text: '事故视频\n快处',
     id: '1'
@@ -172,7 +168,8 @@
     id: '10'
   }
 ]);
-	const info = [{
+const info = [
+  {
     Image: '../../static/wq.png',
     content: '公安部8项公安交管便民利企改革新措施解读'
   },
@@ -371,6 +368,6 @@
 .kefu {
   position: absolute;
   right: 20rpx;
-		bottom: 40rpx;
+  bottom: 120rpx;
 }
 </style>

pages/my/index.vue

@@ -34,11 +34,13 @@
       </view>
       <view style="width: 92%; border-bottom: 1rpx solid #e2e2e2; margin-left: 8%"></view>
     </view>
+    <TabBar />
   </view>
 </template>
 
 <script setup>
 import { ref } from 'vue';
+import TabBar from '@/components/tabBar/index.vue';
 const serve = ref([
   {
     text: '实人认证',

pages/schedule/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <view style="background-color: #f5f9fa; height: 88vh; display: flow-root">
+  <view style="background-color: #fff; height: 88vh; display: flow-root">
     <view class="select">
       <view style="margin-left: 1rem; font-weight: 700">以下数据来自</view>
       <view class="icon">
@@ -41,11 +41,13 @@
         </view>
       </view>
     </view>
+    <TabBar />
   </view>
 </template>
 
 <script setup>
 import { onMounted, ref, getCurrentInstance, computed } from 'vue';
+import TabBar from '@/components/tabBar/index.vue';
 const feedTabs = ref([
   { label: '受理中', rendered: true },
   { label: '已办结', rendered: false },

pages/serve/index.vue

@@ -1,15 +1,11 @@
 <template>
-  <up-tabbar :value="value4" @change="(name) => (value4 = name)" :fixed="false" :placeholder="false" activeColor="#d81e06" :safeAreaInsetBottom="false">
-    <up-tabbar-item text="首页">
-      <template #active-icon></template>
-      <template #inactive-icon></template>
-    </up-tabbar-item>
-    <up-tabbar-item text="放映厅" icon="photo"></up-tabbar-item>
-    <up-tabbar-item text="直播" icon="play-right"></up-tabbar-item>
-    <up-tabbar-item text="我的" icon="account"></up-tabbar-item>
-  </up-tabbar>
+  <view class="">
+    <TabBar />
+  </view>
 </template>
 
-<script setup></script>
+<script setup>
+import TabBar from '@/components/tabBar/index.vue';
+</script>
 
-<style lang="scss"></style>
+<style></style>