From 0d3aa3effb405d9ab1d6c80e545839710e8ecd54 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 31 May 2023 09:04:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E6=98=8C=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/project/szpc/AppCircle/AppCircle.vue      | 60 +++++++++++--------
 .../AppConvenientService.vue                  |  4 +-
 2 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/src/project/szpc/AppCircle/AppCircle.vue b/src/project/szpc/AppCircle/AppCircle.vue
index a07781b..6e0c213 100644
--- a/src/project/szpc/AppCircle/AppCircle.vue
+++ b/src/project/szpc/AppCircle/AppCircle.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="AppCircle" :style="{paddingTop: (statusBarHeight + 110) + 'px'}">
+  <div class="AppCircle" :style="{paddingTop: (statusBarHeight + 102) + 'px'}" :background="background">
     <div class="header">
       <div class="status-bar" :style="{height: statusBarHeight + 'px'}"></div>
       <div class="nav-bar" :style="{
@@ -19,17 +19,19 @@
         </div>
       </div>
     </div>
-    <div class="nav" v-if="topic.length">
-      <div
-        class="nav-item"
-        hover-class="text-hover"
-        v-for="(item, index) in topic" :key="index" @click="$linkTo('./TopicDetail?themeId=' + item.id + '&name=' + item.title)">
-        <image :src="item.picUrl" mode="aspectFill"/>
-        <h2>{{ item.title }}</h2>
-      </div>
-      <div class="nav-item" hover-class="text-hover" @click="$linkTo('./Topic')" v-if="topicList.length > 6">
-        <image src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-more.png"/>
-        <h2>更多</h2>
+    <div class="nav-content" v-if="topic.length">
+      <div class="nav">
+        <div
+          class="nav-item"
+          hover-class="text-hover"
+          v-for="(item, index) in topic" :key="index" @click="$linkTo('./TopicDetail?themeId=' + item.id + '&name=' + item.title)">
+          <image :src="item.picUrl" mode="aspectFill"/>
+          <h2>{{ item.title }}</h2>
+        </div>
+        <div class="nav-item" hover-class="text-hover" @click="$linkTo('./Topic')" v-if="topicList.length > 6">
+          <image src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-more.png"/>
+          <h2>更多</h2>
+        </div>
       </div>
     </div>
     <div class="AppCircle-list">
@@ -96,7 +98,8 @@
         current: 1,
         isFixed: false,
         statusBarHeight: uni.getSystemInfoSync().statusBarHeight,
-        total: 0
+        total: 0,
+        background: {backgroundColor: '#4181FF'}
       }
     },
 
@@ -291,15 +294,15 @@
       opacity: 1;
       transition: all 0.2s ease;
       .status-bar {
-        background: #fff;
+        background: #4181FF;
       }
 
       .nav-bar {
         position: relative;
-        color: #000;
+        color: #fff;
         font-size: 32px;
         font-weight: 600;
-        background: #fff;
+        background: #4181FF;
         text-align: center;
       }
     }
@@ -320,6 +323,13 @@
       }
     }
 
+    .nav-content {
+      padding-top: 16px;
+      width: 100%;
+      height: 192px;
+      background-image: linear-gradient(0deg, #F3F6F9 0%, #4181FF 100%);
+      margin-bottom: 230px;
+    }
     .nav {
       display: flex;
       align-items: center;
@@ -328,7 +338,7 @@
       padding-top: 30px;
       background: #ffffff;
       border-radius: 16px;
-      box-shadow: inset 0 -1px 0 0 #eeeeee;
+      // box-shadow: inset 0 -1px 0 0 #eeeeee;
 
       .nav-item {
         display: flex;
@@ -469,7 +479,7 @@
       width: 100%;
       height: 100px;
       padding: 0 32px;
-      background: #ffffff;
+      background: #4181FF;
 
       .left {
         display: flex;
@@ -480,7 +490,7 @@
           position: relative;
           height: 100px;
           line-height: 100px;
-          color: #222;
+          color: #fff;
           font-size: 30px;
 
           &:first-child {
@@ -498,7 +508,7 @@
               width: 40px;
               height: 6px;
               border-radius: 3px;
-              background: #2d7dffff;
+              background: #fff;
               transform: translateX(-50%);
               content: ' ';
             }
@@ -518,10 +528,10 @@
           line-height: 24px;
           padding: 0 10px;
           font-size: 16px;
-          color: #fff;
+          color: #4181FF;
           border-radius: 50%;
-          border: 2px solid #ffffff;
-          background: #ff5e5e;
+          border: 2px solid #4181FF;
+          background: #fff;
           box-sizing: border-box;
           transform: translateX(50%);
         }
@@ -532,10 +542,10 @@
           height: 60px;
           line-height: 60px;
           text-align: center;
-          color: #df6b6c;
+          color: #fff;
           font-size: 24px;
           border-radius: 10px;
-          border: 1px solid #df6b6c;
+          border: 1px solid #fff;
         }
       }
     }
diff --git a/src/project/szpc/AppConvenientService/AppConvenientService.vue b/src/project/szpc/AppConvenientService/AppConvenientService.vue
index 9ffffca..cef0fe2 100644
--- a/src/project/szpc/AppConvenientService/AppConvenientService.vue
+++ b/src/project/szpc/AppConvenientService/AppConvenientService.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="AppConvenientService">
-    <u-navbar :is-back="false" title="便民服务" title-color="#000" title-width="300" title-size="32" :background="backgroundNavbar" :title-bold="true"></u-navbar>
+    <u-navbar :is-back="false" title="便民服务" title-color="#fff" title-width="300" title-size="32" :background="backgroundNavbar" :title-bold="true"></u-navbar>
     <div class="card-list">
       <div class="card" v-for="(item,index) in list" :key="index">
         <h2>{{ $dict.getLabel('homeConfigMenuType', index) }}</h2>
@@ -29,7 +29,7 @@ export default {
     return {
       list: [],
       backgroundNavbar: {
-        background: '#FFF'
+        background: '#4181FF'
       }
     }
   },