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

.hbuilderx/launch.json

@@ -1,9 +1,16 @@
+{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    "version": "0.0",
+    "configurations": [{
+     	"app-plus" : 
      	{
-    "version" : "1.0",
+     		"launchtype" : "local"
-    "configurations" : [
+     	},
+     	"default" : 
      	{
-            "playground" : "standard",
+     		"launchtype" : "local"
-            "type" : "uni-app:app-android"
+     	},
+     	"type" : "uniCloud"
      }
     ]
 }

manifest.json

@@ -41,9 +41,13 @@
                 ]
             },
             /* ios打包配置 */
-            "ios" : {},
+            "ios" : {
+                "dSYMs" : false
+            },
             /* SDK配置 */
-            "sdkConfigs" : {}
+            "sdkConfigs" : {
+                "ad" : {}
+            }
         }
     },
     /* 快应用特有相关 */

pages/index/components/businessCenter.vue

@@ -1,7 +1,7 @@
 <template>
-  <view>
+  <view style="background-color: #2c66a9; width: 100%; height: 5vh" :style="{ backgroundPositionY: -44 + safeAreaInsets.top + 'px' }">
     <!-- 自定义导航栏 -->
-    <view class="van-nav-bar">
+    <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>
@@ -46,6 +46,7 @@
 
 <script setup>
 import { ref } from 'vue';
+const { safeAreaInsets } = uni.getSystemInfoSync();
 const tags = ref([
   {
     text: '违法',

pages/index/components/drivingLicence.vue

@@ -1,6 +1,9 @@
 <template>
-  <view class="">
+  <view
-    <view class="van-nav-bar">
+    style="background-color: #2c66a9; width: 100%; height: 5vh"
+    :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>
@@ -13,6 +16,7 @@
       <view class="business">
         <view class="business-top">
           <view style="display: flex; align-items: center">
+            <image src="../../../static/renling.png" class="image"></image>
             <image src="../../../static/renling.png" class="image"></image>
             <text style="margin-left: 30rpx; font-weight: 500; font-size: 32rpx">代办驾驶证业务</text>
           </view>
@@ -88,6 +92,7 @@
 <script setup>
 import { ref, onMounted } from "vue";
 import * as echarts from "echarts";
+const { safeAreaInsets } = uni.getSystemInfoSync();
 const gotoBack = () => {
   uni.navigateBack({
     delta: 1,
@@ -146,7 +151,14 @@ const imageShow = () => {
 };
 
 // 在组件挂载后初始化ECharts实例并设置选项
-onMounted(() => {});
+onMounted(() => {
+  // const lineChartContainer = lineChartRef.value;
+  const lineChartContainer = document.getElementById("lineChartRef");
+  if (lineChartContainer) {
+    const myChart = echarts.init(lineChartContainer);
+    myChart.setOption(option);
+  }
+});
 </script>
 
 <style lang="scss">
@@ -256,7 +268,6 @@ onMounted(() => {});
 
   .drivingList {
     margin-bottom: 20rpx;
-
     .item {
       height: 120rpx;
       background-color: #fff;
@@ -272,7 +283,6 @@ onMounted(() => {});
   width: 50rpx;
   height: 50rpx;
 }
-
 .warning {
   display: inline-block;
   margin-top: 20rpx;

pages/index/index.vue

@@ -1,6 +1,6 @@
 <template>
-  <view class="content">
+  <view class="content" :style="{ backgroundPositionY: -44 + safeAreaInsets.top + 'px' }">
-    <view class="top">
+    <view class="top" :style="{ paddingTop: safeAreaInsets.top + 'px' }">
       <uni-search-bar class="search" bgColor="#EEEEEE" radius="100" placeholder="搜索" clearButton="none" cancelButton="none" @confirm="search" />
       <image src="../../static/on.png" style="width: 80rpx; height: 60rpx"></image>
     </view>
@@ -85,6 +85,7 @@
 
 <script setup>
 import { ref } from 'vue';
+const { safeAreaInsets } = uni.getSystemInfoSync();
 const businessList = ref([
   {
     img: '../../static/aw1.png',

pages/my/components/install/index.vue

@@ -1,7 +1,7 @@
 <template>
-  <view style="background-color: #f5f9fa; height: 100vh">
+  <view style="background-color: #2c66a9; height: 5vh" :style="{ backgroundPositionY: -44 + safeAreaInsets.top + 'px' }">
     <!-- 导航栏 -->
-    <view class="van-nav-bar">
+    <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>
@@ -28,6 +28,7 @@
 
 <script setup>
 import { ref } from 'vue';
+const { safeAreaInsets } = uni.getSystemInfoSync();
 const serve = ref([
   {
     text: '登录密码修改',
@@ -103,10 +104,12 @@ const gotoBack = () => {
   background-color: #fff;
   letter-spacing: 1.5px;
   font-weight: 700;
+
   .userlist-box {
     display: flex;
     align-items: center;
     justify-content: space-between;
+    background-color: #fff;
     .userlist-box-text {
       display: flex;
       align-items: center;
@@ -126,6 +129,8 @@ const gotoBack = () => {
   text-align: center;
 }
 .active {
+  padding: 0.8rem 0rem;
   margin: 0.8rem 0rem;
+  background-color: #f5f9fa;
 }
 </style>

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

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