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

pages/index/components/myCar.vue

@@ -15,8 +15,8 @@
 				<view class="car-top">
 					<image src="../../../static/R41.png" class="image"></image>
 					<view class="car-top-text">
-						<text style="font-size: 40rpx; font-weight: 600; color: ;">黑A1K5V1</text>
+						<text style="font-size: 40rpx; font-weight: 600; color: ;">黑A00000</text>
-						<text style="color: #808080;">*爽</text>
+						<text style="color: #808080;">*宇</text>
 					</view>
 				</view>
 				<view class="car-center">
@@ -42,7 +42,7 @@
 				本人车辆信息缺失或有误，请点击<a href="#" style="color: #2d65a5;">此处反馈</a>
 			</view>
 		</view>
-		<view :style="{ paddingTop: safeAreaInsets.top + 'px' }" class="van-nav-bar">
+		<view class="van-nav-bar positionBottom">
 			<view class="van-nav-bar__content" style="cursor: pointer;">
 				<view class="page-navbar">备案非本人机动车</view>
 			</view>
@@ -63,6 +63,9 @@
 			delta: 1,
 		});
 	};
+	onLoad((option)=>{
+		console.log(option)
+	})
 	const grade = ref(0);
 </script>
 
@@ -161,4 +164,10 @@
 		align-items: center;
 		justify-content: center;
 	}
+
+	.positionBottom {
+		position: fixed;
+		bottom: 0;
+		width: 100vw;
+	}
 </style>

pages/index/index.vue

@@ -8,9 +8,9 @@
       <image src="../../static/on.png" style="width: 80rpx; height: 60rpx"></image>
     </view>
     <view class="card">
-      <view class="card-content" @click="myCar">
+      <view class="card-content" @click="myCar(true)">
         <view class="card-content-top">
-          <image style="width: 50rpx; height: 40rpx" src="../../static/car.png" />
+          <image @click="myCar(false)" style="width: 50rpx; height: 40rpx" src="../../static/c5.png" />
           <text style="margin-left: 30rpx">黑A00000</text>
         </view>
         <view class="card-content-bottom">
@@ -67,7 +67,13 @@
         <uni-icons type="right" size="20" color="#acacac" style="margin-right: 20rpx"></uni-icons>
       </view>
       <view class="information-content">
-        <uni-swiper-dot :info="info" :current="current" :dots-styles="{ selectedBackgroundColor: '#2065b1', backgroundColor: '#e6e6e6' }" field="content" mode="default">
+        <uni-swiper-dot
+          :info="info"
+          :current="current"
+          :dots-styles="{ selectedBackgroundColor: '#2065b1', backgroundColor: '#e6e6e6' }"
+          field="content"
+          mode="default"
+        >
           <swiper class="swiper-box" @change="change">
             <swiper-item v-for="(item, index) in info" :key="index">
               <view class="swiper-item" style="margin-right: 20rpx">
@@ -75,7 +81,7 @@
                 <view class="swiper-text">
                   <text>{{ item.content }}</text>
                   <view style="width: 100%; display: flex; justify-content: flex-end; color: #cecdd3; font-size: 28rpx">
-                    {{ '2024-06-14' }}
+                    {{ "2024-06-14" }}
                   </view>
                 </view>
               </view>
@@ -95,7 +101,9 @@
               <image src="../../static/dl.png" style="width: 30rpx; height: 30rpx"></image>
             </view>
             <view class="text">
-              <text style="color: #8ca9cd; font-size: 24rpx; display: inline-block; text-align: center">未来会有更过服务,更好的体验现在快把我分享给帮你的好友吧</text>
+              <text style="color: #8ca9cd; font-size: 24rpx; display: inline-block; text-align: center"
+                >未来会有更过服务,更好的体验现在快把我分享给帮你的好友吧</text
+              >
             </view>
           </view>
         </view>
@@ -112,75 +120,75 @@
 </template>
 
 <script setup>
-import TabBar from '@/components/tabBar/index.vue';
+import TabBar from "@/components/tabBar/index.vue";
-import { ref } from 'vue';
+import { ref } from "vue";
 const { safeAreaInsets } = uni.getSystemInfoSync();
 const dotStyle = ref({});
 const businessList = ref([
   {
-    img: '../../static/6w1.png',
+    img: "../../static/6w1.png",
-    text: '事故视频\n快处',
+    text: "事故视频\n快处",
-    id: '1'
+    id: "1",
   },
   {
-    img: '../../static/ax3.png',
+    img: "../../static/ax3.png",
-    text: '违法处理\n\n',
+    text: "违法处理\n\n",
-    id: '2'
+    id: "2",
   },
   {
-    img: '../../static/q2.png',
+    img: "../../static/q2.png",
-    text: '罚款缴纳\n\n',
+    text: "罚款缴纳\n\n",
-    id: '3'
+    id: "3",
   },
   {
-    img: '../../static/5i.png',
+    img: "../../static/5i.png",
-    text: '驾驶证电\n子版',
+    text: "驾驶证电\n子版",
-    id: '4'
+    id: "4",
   },
   {
-    img: '../../static/az.png',
+    img: "../../static/az.png",
-    text: '学法减分\n\n',
+    text: "学法减分\n\n",
-    id: '5'
+    id: "5",
   },
   {
-    img: '../../static/ZX1.png',
+    img: "../../static/ZX1.png",
-    text: '免检车申领\n检验标志',
+    text: "免检车申领\n检验标志",
-    id: '6'
+    id: "6",
   },
   {
-    img: '../../static/621.png',
+    img: "../../static/621.png",
-    text: '驾驶证补\n领换',
+    text: "驾驶证补\n领换",
-    id: '7'
+    id: "7",
   },
   {
-    img: '../../static/JF.png',
+    img: "../../static/JF.png",
-    text: '机动车检\n验预约',
+    text: "机动车检\n验预约",
-    id: '8'
+    id: "8",
   },
   {
-    img: '../../static/pj.png',
+    img: "../../static/pj.png",
-    text: '满分学习\n考试',
+    text: "满分学习\n考试",
-    id: '9'
+    id: "9",
   },
   {
-    img: '../../static/KG.png',
+    img: "../../static/KG.png",
-    text: '更多\n\n',
+    text: "更多\n\n",
-    id: '10'
+    id: "10",
-  }
+  },
 ]);
 const info = [
   {
-    Image: '../../static/wq.png',
+    Image: "../../static/wq.png",
-    content: '公安部8项公安交管便民利企改革新措施解读'
+    content: "公安部8项公安交管便民利企改革新措施解读",
   },
   {
-    Image: '../../static/wq.png',
+    Image: "../../static/wq.png",
-    content: '公安部8项公安交管便民利企改革新措施解读'
+    content: "公安部8项公安交管便民利企改革新措施解读",
   },
   {
-    Image: '../../static/wq.png',
+    Image: "../../static/wq.png",
-    content: '公安部8项公安交管便民利企改革新措施解读'
+    content: "公安部8项公安交管便民利企改革新措施解读",
-  }
+  },
 ];
 const current = ref(0);
 const change = (e) => {
@@ -188,18 +196,18 @@ const change = (e) => {
 };
 const drivingLicence = () => {
   uni.navigateTo({
-    url: './components/drivingLicence'
+    url: "./components/drivingLicence",
+  });
+};
+const myCar = (val) => {
+  uni.navigateTo({
+    url: `./components/myCar?judge=${val}`,
   });
 };
-const myCar = ()=>{
-	uni.navigateTo({
-	  url: './components/myCar'
-	});
-}
 const closedclick = (id) => {
   if (id == 10) {
     uni.navigateTo({
-      url: './components/businessCenter'
+      url: "./components/businessCenter",
     });
   }
 };
@@ -373,6 +381,6 @@ const closedclick = (id) => {
 .kefu {
   position: absolute;
   right: 20rpx;
-  bottom: 120rpx;
+  bottom: 240rpx;
 }
 </style>