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

components/tabBar/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <up-tabbar :value="value4" @change="toRoute" :fixed="true" :placeholder="true" activeColor="#4a7bb5" :safeAreaInsetBottom="true" :border="false">
+  <up-tabbar :value="props.val" @change="toRoute" zIndex="99" :fixed="true" :placeholder="false" activeColor="#4a7bb5" :safeAreaInsetBottom="false" :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>
@@ -45,31 +45,23 @@
 
 <script setup>
 import { ref } from 'vue';
-const value4 = ref(0);
+uni.hideTabBar();
-uni.getStorage({
+const props = defineProps({
-  key: 'value',
+  val: {
-  success(data) {
+    type: Number,
-    value4.value = data.data;
+    default: 0
   }
 });
 const toRoute = (index) => {
   if (index == 0) {
-    uni.navigateTo({
+    uni.switchTab({
       url: '/pages/index/index'
     });
-    uni.setStorage({
-      key: 'value',
-      data: index
-    });
   }
   if (index == 1) {
-    uni.navigateTo({
+    uni.switchTab({
       url: '/pages/schedule/index'
     });
-    uni.setStorage({
-      key: 'value',
-      data: index
-    });
   }
   if (index == 2) {
     // uni.navigateTo({
@@ -81,22 +73,14 @@ const toRoute = (index) => {
     // });
   }
   if (index == 3) {
-    uni.navigateTo({
+    uni.switchTab({
       url: '/pages/serve/index'
     });
-    uni.setStorage({
-      key: 'value',
-      data: index
-    });
   }
   if (index == 4) {
-    uni.navigateTo({
+    uni.switchTab({
       url: '/pages/my/index'
     });
-    uni.setStorage({
-      key: 'value',
-      data: index
-    });
   }
 };
 </script>

manifest.json

@@ -12,7 +12,7 @@
     "compilerVersion": 3,
     "splashscreen": {
       "alwaysShowBeforeRender": true,
-            "waiting" : true,
+      "waiting": false,
       "autoclose": true,
       "delay": 0
     },
@@ -47,6 +47,22 @@
       /* SDK配置 */
       "sdkConfigs": {
         "ad": {}
+      },
+      "splashscreen": {
+        "androidStyle": "default",
+        "android": {
+          "xxhdpi": "static/qideng/pingbaoL.png",
+          "xhdpi": "static/qideng/pingbaoM.png",
+          "hdpi": "static/qideng/pingbaoS.png"
+        }
+      },
+      "icons": {
+        "android": {
+          "xxxhdpi": "static/qideng/Ll.png",
+          "xxhdpi": "static/qideng/Ll.png",
+          "xhdpi": "static/qideng/Mm.png",
+          "hdpi": "static/qideng/Ss.png"
+        }
       }
     }
   },

pages.json

@@ -59,6 +59,12 @@
       "style": {
         "navigationStyle": "custom"
       }
+    },
+    {
+      "path": "pages/my/components/effectiveDate/index",
+      "style": {
+        "navigationStyle": "custom"
+      }
     }
   ],
   "globalStyle": {
@@ -67,5 +73,21 @@
     "navigationBarBackgroundColor": "#F8F8F8",
     "backgroundColor": "#F8F8F8"
   },
-  "uniIdRouter": {}
+  "uniIdRouter": {},
+  "tabBar": {
+    "custom": true,
+    "list": [{
+        "pagePath": "pages/index/index"
+      },
+      {
+        "pagePath": "pages/schedule/index"
+      },
+      {
+        "pagePath": "pages/serve/index"
+      },
+      {
+        "pagePath": "pages/my/index"
+      }
+    ]
+  }
 }

pages/index/components/businessCenter.vue

@@ -97,47 +97,47 @@ const functionList = ref([
     content: [
       {
         txt: '新车注册登记',
-        icon: '../../../static/业务中心/1/1.png',
+        icon: '../../../static/yewuzhongxin/1/1.png',
         id: 0
       },
       {
         txt: '新车选号',
-        icon: '@/static/业务中心/1/2.png',
+        icon: '../../../static/yewuzhongxin/1/2.png',
         id: 1
       },
       {
         txt: '在用车选号',
-        icon: '@/static/业务中心/1/3.png',
+        icon: '../../../static/yewuzhongxin/1/3.png',
         id: 2
       },
       {
         txt: '号牌号段公布',
-        icon: '@/static/业务中心/1/4.png',
+        icon: '../../../static/yewuzhongxin/1/4.png',
         id: 3
       },
       {
         txt: '备案非本人机动车',
-        icon: '@/static/业务中心/1/5.png',
+        icon: '../../../static/yewuzhongxin/1/5.png',
         id: 4
       },
       {
         txt: '机动车转籍申请',
-        icon: '@/static/业务中心/1/6.png',
+        icon: '../../../static/yewuzhongxin/1/5.png',
         id: 5
       },
       {
         txt: '异常选号资料修改',
-        icon: '@/static/业务中心/1/7.png',
+        icon: '../../../static/yewuzhongxin/1/7.png',
         id: 6
       },
       {
         txt: '申请新车临时号牌',
-        icon: '@/static/业务中心/1/8.png',
+        icon: '../../../static/yewuzhongxin/1/8.png',
         id: 7
       },
       {
         txt: '城市货车通行码申领',
-        icon: '@/static/业务中心/1/9.png',
+        icon: '../../../static/yewuzhongxin/1/9.png',
         id: 8
       }
     ]
@@ -148,32 +148,32 @@ const functionList = ref([
     content: [
       {
         txt: '考试预约',
-        icon: '',
+        icon: '../../../static/yewuzhongxin/2/1.png',
         id: 0
       },
       {
         txt: '取消考试预约',
-        icon: '',
+        icon: '../../../static/yewuzhongxin/2/2.png',
         id: 1
       },
       {
         txt: '考试信息公布',
-        icon: '',
+        icon: '../../../static/yewuzhongxin/2/3.png',
         id: 2
       },
       {
         txt: '考试费缴纳',
-        icon: '',
+        icon: '../../../static/yewuzhongxin/2/4.png',
         id: 3
       },
       {
         txt: '初学增驾工考试费缴纳',
-        icon: '',
+        icon: '../../../static/yewuzhongxin/2/5.png',
         id: 4
       },
       {
         txt: '电子学习驾驶证明',
-        icon: '',
+        icon: '../../../static/yewuzhongxin/2/6.png',
         id: 5
       }
     ]
@@ -184,15 +184,83 @@ const functionList = ref([
     content: [
       {
         txt: '违法处理',
-        icon: '',
+        icon: '../../../static/yewuzhongxin/3/1.png',
         id: 0
       },
       {
         txt: '罚款缴纳',
-        icon: '',
+        icon: '../../../static/yewuzhongxin/3/2.png',
         id: 1
       }
     ]
+  },
+  {
+    texe: '事故处理业务',
+    uid: 3,
+    content: [
+      {
+        txt: '事故快处',
+        icon: '../../../static/yewuzhongxin/4/1.png',
+        id: 0
+      },
+      {
+        txt: '事故处理进度和结果',
+        icon: '../../../static/yewuzhongxin/4/2.png',
+        id: 1
+      },
+      {
+        txt: '事故证据材料查询',
+        icon: '../../../static/yewuzhongxin/4/3.png',
+        id: 2
+      },
+      {
+        txt: '事故快处模拟',
+        icon: '../../../static/yewuzhongxin/4/4.png',
+        id: 3
+      },
+      {
+        txt: '事故视频快处',
+        icon: '../../../static/yewuzhongxin/4/5.png',
+        id: 4
+      }
+    ]
+  },
+  {
+    texe: '学习教育业务',
+    uid: 4,
+    content: [
+      {
+        txt: '满分学习考试',
+        icon: '../../../static/yewuzhongxin/5/4.png',
+        id: 0
+      }
+    ]
+  },
+  {
+    texe: '便民服务',
+    uid: 5,
+    content: [
+      {
+        txt: '一键挪车',
+        icon: '../../../static/yewuzhongxin/6/1.png',
+        id: 0
+      },
+      {
+        txt: '业务委托申请',
+        icon: '../../../static/yewuzhongxin/6/2.png',
+        id: 1
+      },
+      {
+        txt: '老年人业务代办',
+        icon: '../../../static/yewuzhongxin/6/3.png',
+        id: 2
+      },
+      {
+        txt: '电子文书',
+        icon: '../../../static/yewuzhongxin/6/4.png',
+        id: 3
+      }
+    ]
   }
 ]);
 // 返回上一级
@@ -240,7 +308,7 @@ const gotoBack = () => {
   .tag-box {
     display: inline;
     width: 3.2rem;
-    border: 1rpx solid #2c66a8;
+    border: 1rpx solid #6095d0;
     border-radius: 0.2rem;
     padding: 0.2rem 0rem;
     text-align: center;

pages/index/index.vue

@@ -10,7 +10,7 @@
     <view class="card">
       <view class="card-content" @click="myCar">
         <view class="card-content-top">
-          <image style="width: 50rpx; height: 40rpx" src="../../static/c5.png" />
+          <image style="width: 50rpx; height: 40rpx" src="../../static/car.png" />
           <text style="margin-left: 30rpx">黑A00000</text>
         </view>
         <view class="card-content-bottom">
@@ -107,7 +107,7 @@
       </view>
     </view>
     <image src="../../static/hp1.png" style="width: 100rpx; height: 100rpx" class="kefu"></image>
-    <TabBar />
+    <TabBar :val="0" />
   </view>
 </template>
 
@@ -143,7 +143,7 @@ const businessList = ref([
     id: '5'
   },
   {
-    img: '../../static/zx1.png',
+    img: '../../static/ZX1.png',
     text: '免检车申领\n检验标志',
     id: '6'
   },
@@ -153,7 +153,7 @@ const businessList = ref([
     id: '7'
   },
   {
-    img: '../../static/jf.png',
+    img: '../../static/JF.png',
     text: '机动车检\n验预约',
     id: '8'
   },

pages/my/components/effectiveDate/index.vue

@@ -0,0 +1,152 @@
+<template>
+  <view style="background-color: #2c66a9; height: 3rem" :style="{ backgroundPositionY: -44 + safeAreaInsets.top + 'px' }">
+    <!-- 导航栏 -->
+    <view :style="{ paddingTop: safeAreaInsets.top + 'px' }" class="van-nav-bar">
+      <view class="van-nav-bar__content">
+        <view class="page-icon" @click="gotoBack">
+          <uni-icons color="#fff" type="back" size="26"></uni-icons>
+          <view>返回</view>
+        </view>
+        <view class="page-navbar">有效期限</view>
+      </view>
+    </view>
+    <!-- 用户详情 -->
+    <view class="boxone">
+      <view class="user">
+        <view class="userbox">
+          <view style="font-weight: 700">姓名</view>
+          <view style="margin-left: 6rem; color: #6a7372">xx</view>
+        </view>
+        <view class="userbox">
+          <view style="font-weight: 700">证件类型</view>
+          <view style="margin-left: 4rem; color: #6a7372">A居民身份证</view>
+        </view>
+        <view class="userbox">
+          <view style="font-weight: 700">证件号码</view>
+          <view style="margin-left: 4rem; color: #6a7372">2323***********229</view>
+        </view>
+        <view class="userboxdata">
+          <view style="display: flex">
+            <view style="font-weight: 700">证件有效期限</view>
+            <view style="margin-left: 2rem; color: #6a7372">请选择日期</view>
+          </view>
+          <view>
+            <uni-icons style="margin-right: 0.5rem" type="right" size="20" color="#b3b3b3"></uni-icons>
+          </view>
+        </view>
+      </view>
+      <!-- 案例 -->
+      <view class="example">样例</view>
+      <!-- 图片 -->
+      <view style="background-color: #fff">
+        <image style="width: 90%; height: 12rem; margin: 0.8rem 5%" src="../../../../static/shenfen.png"></image>
+      </view>
+      <!-- 按钮 -->
+      <view class="buttom">
+        <view class="buttombox">下一步</view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { ref } from 'vue';
+const { safeAreaInsets } = uni.getSystemInfoSync();
+const user = ref([
+  {
+    text: '',
+    content: '',
+    id: 1
+  },
+  {
+    text: '',
+    content: '',
+    id: 2
+  },
+  {
+    text: '',
+    content: '',
+    id: 3
+  },
+  {
+    text: '',
+    content: '',
+    id: 4
+  }
+]);
+const gotoBack = () => {
+  uni.navigateBack({
+    delta: 1
+  });
+};
+</script>
+
+<style lang="scss">
+.van-nav-bar__content {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 3rem;
+  background-color: #2c66a9;
+  color: #fff;
+  letter-spacing: 1.5px;
+  position: relative;
+
+  .page-icon {
+    display: flex;
+    align-items: center;
+    position: absolute;
+    left: 0;
+  }
+  .page-navbar {
+    font-size: 1.1rem;
+  }
+}
+.boxone {
+  background-color: #f2fbfa;
+  display: flex;
+  flex-direction: column;
+  min-height: calc(100vh - 3rem);
+}
+.user {
+  width: 100%;
+  background-color: #fff;
+  margin-top: 0.8rem;
+  .userbox {
+    display: flex;
+    align-items: center;
+    padding: 1rem 0;
+    width: 95%;
+    border-bottom: 1rpx solid #ececec;
+    margin-left: 5%;
+  }
+  .userboxdata {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    width: 95%;
+    margin-left: 5%;
+    padding: 1rem 0;
+  }
+}
+.example {
+  padding: 0.8rem 0;
+  width: 95%;
+  margin-left: 5%;
+  color: #6a7372;
+  font-size: 1rem;
+}
+.buttom {
+  flex-grow: 1;
+  .buttombox {
+    background-color: #d5d5d5;
+    width: 90%;
+    height: 3.2rem;
+    border-radius: 0.2rem;
+    text-align: center;
+    line-height: 3.2rem;
+    color: #a1a1a1;
+    margin: 2rem 5%;
+  }
+}
+</style>

pages/my/components/install/index.vue

@@ -11,18 +11,15 @@
       </view>
     </view>
     <!-- 功能页 -->
-		<view style="background-color: #f5f9fa; height: 94vh;">
+    <view style="background-color: #f5f9fa; height: 94vh">
-			<view style="height: 20rpx;" />
+      <view style="height: 20rpx" />
       <view v-for="item in serve" :key="item.id" class="userlist">
         <view :class="{ active: item.id === 5 }">
           <view class="userlist-box">
             <view style="margin: 0 0.8rem">
-							<image :src="item.icon"
+              <image :src="item.icon" :style="{ width: item.id == 0 ? '1.25rem' : '1.45rem', height: '1.45rem', transform: 'translateY(0.2rem)' }"></image>
-								:style="{ width: item.id == 0 ? '1.25rem' : '1.45rem', height: '1.45rem', transform: 'translateY(0.2rem)' }">
-							</image>
             </view>
-						<view class="userlist-box-text"
+            <view class="userlist-box-text" :style="{ 'border-bottom': item.id == 5 || item.id == 4 ? 'node' : '1rpx solid #eee' }">
-							:style="{ 'border-bottom': item.id == 5 || item.id == 4 ? 'node' : '1rpx solid #eee' }">
               <view :style="{ transform: item.id == 0 ? 'translateX(0.2rem)' : '' }">{{ item.text }}</view>
               <view style="margin-right: 0.7rem"><uni-icons color="#c1c1c3" type="forward" size="18"></uni-icons></view>
             </view>
@@ -35,13 +32,10 @@
 </template>
 
 <script setup>
-	import {
+import { ref } from 'vue';
-		ref
+const { safeAreaInsets } = uni.getSystemInfoSync();
-	} from 'vue';
+const serve = ref([
-	const {
+  {
-		safeAreaInsets
-	} = uni.getSystemInfoSync();
-	const serve = ref([{
     text: '登录密码修改',
     icon: '../../../../static/wodeshezhi/1.png',
     id: 0
@@ -116,8 +110,6 @@
 
 .userlist {
   letter-spacing: 1.5px;
-		font-weight: 600;
-
   .userlist-box {
     display: flex;
     align-items: center;

pages/my/index.vue

@@ -12,7 +12,7 @@
         <view style="margin-top: 0.2rem; font-size: 0.9rem">设置</view>
       </view>
     </view>
-    <view v-for="item in serve" :key="item.id" class="userlist">
+    <view v-for="item in serve" :key="item.id" class="userlist" @click="date(item.id)">
       <view class="userlist-box">
         <view class="userlist-box-text">
           <view>
@@ -34,7 +34,7 @@
       </view>
       <view style="width: 92%; border-bottom: 1rpx solid #e2e2e2; margin-left: 8%"></view>
     </view>
-    <TabBar />
+    <TabBar :val="4" />
   </view>
 </template>
 
@@ -97,7 +97,7 @@ const serve = ref([
   },
   {
     text: '交管小安',
-    icon: '',
+    icon: '../../static/wode/9.png',
     queenicon: '\ue612',
     id: 8
   },
@@ -114,6 +114,14 @@ const set = () => {
     url: '/pages/my/components/install/index'
   });
 };
+// 跳转有效日期
+const date = (id) => {
+  if (id == 3) {
+    uni.navigateTo({
+      url: '/pages/my/components/effectiveDate/index'
+    });
+  }
+};
 </script>
 
 <style lang="scss">
@@ -138,7 +146,6 @@ const set = () => {
 .userlist {
   background-color: #fff;
   letter-spacing: 1.5px;
-  font-weight: 700;
   .userlist-box {
     width: 96%;
     margin-left: 4%;

pages/schedule/index.vue

@@ -75,7 +75,7 @@
         </view>
       </view>
     </view>
-		<TabBar />
+    <TabBar :val="1" />
   </view>
 </template>
 

pages/serve/index.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="">
-    <TabBar />
+    <TabBar :val="3" />
   </view>
 </template>
 

unpackage/dist/cache/.vite/deps/_metadata.json

@@ -1,13 +1,13 @@
 {
-  "hash": "4a204181",
+  "hash": "f0e888ba",
-  "configHash": "eb966fb1",
+  "configHash": "046e9b57",
   "lockfileHash": "fa978dd2",
-  "browserHash": "65cd6fd1",
+  "browserHash": "f56c9596",
   "optimized": {
     "echarts": {
       "src": "../../../../../node_modules/echarts/index.js",
       "file": "echarts.js",
-      "fileHash": "47eb0dc6",
+      "fileHash": "3a5ca97e",
       "needsInterop": false
     }
   },