From 8b0cc7662784327f3fa4d0c6b594f33b2d840aca Mon Sep 17 00:00:00 2001
From: sundongyu <2811054731@qq.com>
Date: Mon, 27 May 2024 10:36:02 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat:=E6=B7=BB=E5=8A=A0=E4=BA=86?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=B8=8A=E4=B8=80=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/AboutView.vue | 26 +++++++++++++++++++-------
 src/views/HomeView.vue  | 24 ++++++++++++++++++------
 2 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/src/views/AboutView.vue b/src/views/AboutView.vue
index c07f927..dab43f1 100644
--- a/src/views/AboutView.vue
+++ b/src/views/AboutView.vue
@@ -21,6 +21,7 @@
             </el-col>
           </el-row>
         </div>
+        <div class="color-nav" @click="colorNav">返回上一页</div>
       </el-header>
       <el-main>
         <div style="margin-top: 2rem; margin-bottom: 1rem">
@@ -77,13 +78,15 @@
           </el-row>
         </div>
         <div>
-          <el-row :gutter="20">
-            <el-col :span="4" :offset="2">
+          <el-row>
+            <el-col v-for="(item, index) in slot" :key="index" :span="4" :offset="2">
               <div class="cardone">
-                <div><img src="" style="width: 5rem; height: 5rem; border-radius: 0.5rem" /></div>
-                <div class="card-textone">汽车多门店预约</div>
+                <div>
+                  <img :src="item.icon" style="width: 5rem; height: 5rem; border-radius: 0.5rem" />
+                </div>
+                <div class="card-textone">{{ item.title }}</div>
                 <div class="card-texttow">免费使用7天</div>
-                <div class="card-textthree">气测行业门店预约系统，搭载最新的内部群机器人通知</div>
+                <div class="card-textthree">{{ item.desce }}</div>
                 <div class="card-textfour">免费使用</div>
               </div>
             </el-col>
@@ -97,6 +100,9 @@
 <script setup>
 import { ref, onMounted } from 'vue'
 import { posttListAPI } from '../api/index'
+import { useRouter } from 'vue-router'
+const router = useRouter()
+const slot = ref([])
 const data = ref([
   {
     text: '全部'
@@ -116,12 +122,17 @@ const data = ref([
 ])
 const posttList = async () => {
   const arr = await posttListAPI({ id: '', category: '', name: '', tags: '', status: '' })
-  console.log(arr)
+  slot.value = arr.data
+  console.log(arr.data)
 }
 const dataIndex = ref(0)
 function click (index) {
   dataIndex.value = index
 }
+function colorNav () {
+  console.log(1)
+  router.back()
+}
 onMounted(() => {
   posttList()
 })
@@ -132,7 +143,7 @@ onMounted(() => {
   padding: 0;
 }
 .color {
-  max-width: 100%;
+  max-width: 99%;
   background-color: #4772ff;
   color: #fff;
   padding-top: 1rem;
@@ -197,6 +208,7 @@ onMounted(() => {
   width: 240px;
   padding: 30px;
   background-color: #fff;
+  margin-bottom: 1.5rem;
   transition: transform 0.3s ease;
   .card-textone {
     margin-top: 1rem;
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 40f89f9..464ca7a 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -41,7 +41,8 @@
               <div>
                 <div class="block">
                   <div style="font-size: 1.2rem; font-weight: 700">
-                    我的商铺(0/10)
+                    我的商铺(<span>{{ data.length }}</span
+                    >/10)
                     <span style="font-size: 0.8rem; color: #a6aec2"
                       >每个商铺为独立运营的，会员是不通用的。每个商铺可以邀请合伙人一起管理</span
                     >
@@ -63,11 +64,17 @@
               <div @click="enterInto">
                 <div class="blockone">
                   <div class="blockone-textone">
-                    {{ item.title }}<span class="blockone-textone-one">(通用服务业)</span
-                    ><span class="blockone-textone-tow">创始人</span>
+                    <div>
+                      {{ item.title }}
+                      <span class="blockone-textone-one"
+                        >(<span>{{ item.key }}</span
+                        >)
+                      </span>
+                    </div>
+                    <span class="blockone-textone-tow">创始人</span>
                   </div>
                   <div class="blockone-texttow">
-                    开通时间: &nbsp; <span>2024-05-25 15:57:34</span>
+                    开通时间: &nbsp; <span>{{ item.createTime }}</span>
                   </div>
                 </div>
               </div>
@@ -94,7 +101,7 @@
 <script lang="ts" setup>
 import { ref, reactive, toRefs, onMounted } from 'vue'
 import { useRouter } from 'vue-router'
-import { posttListAPI, getListAPI } from '../api/index'
+import { getListAPI } from '../api/index'
 const router = useRouter()
 const tenantId = ref(1)
 const data: any = ref([])
@@ -169,11 +176,16 @@ onMounted(() => {
         margin-bottom: 1rem;
         margin-top: 1.5rem;
         margin-left: 0.8rem;
+        display: flex;
+        justify-content: space-between;
         .blockone-textone-one {
           font-size: 1rem;
           color: #91919b;
         }
         .blockone-textone-tow {
+          display: flex;
+          align-items: center;
+          text-align: center;
           font-size: 0.7rem;
           font-weight: 500;
           padding: 0rem 0.5rem;
@@ -181,7 +193,7 @@ onMounted(() => {
           color: #4772ff;
           height: 20px;
           border-radius: 10px;
-          margin-left: 8rem;
+          margin-right: 1rem;
         }
       }
       .blockone-texttow {