From e573c5f473573378fc167b73d7ad1ff4fd39370e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?TOP=E7=B3=AF=E7=B1=B3?= <1130395124@qq.com>
Date: Sat, 11 Feb 2023 14:02:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=8D=E5=8A=A1=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E9=A1=B5=E9=9D=A2=E9=AB=98=E5=BA=A6=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/cate/cate.vue          | 30 ++++++++++++++-------------
 src/components/cate/template/list.vue | 19 +++++++++--------
 src/pages.json                        | 10 +++++++--
 src/pages/service/detail.vue          | 25 ++++++++++++++++++++++
 src/pages/service/list.vue            | 22 ++++++++++++--------
 5 files changed, 72 insertions(+), 34 deletions(-)
 create mode 100644 src/pages/service/detail.vue

diff --git a/src/components/cate/cate.vue b/src/components/cate/cate.vue
index a3a79ea..0208c38 100644
--- a/src/components/cate/cate.vue
+++ b/src/components/cate/cate.vue
@@ -59,7 +59,7 @@
 </template>
 
 <script>
-import { mapState } from 'vuex';
+import { mapState } from "vuex";
 import CateTmpl from "@/components/cate/template/cate";
 import ListTmpl from "@/components/cate/template/list";
 export default {
@@ -98,24 +98,26 @@ export default {
     },
     computed: {
         ...mapState({
-            config: state => state.system.config,
+            config: (state) => state.system.config,
             bodyPaddingTop: (state) => state.system.bodyPaddingTop,
-        })
+        }),
     },
     created() {},
     mounted() {
         this.getMenuItemTop();
-        let headerHeight = this.$utils.rpx2px(this.bodyPaddingTop);
-        let offsetHeight = this.$utils.rpx2px(this.offsetHeight);
-        const { windowHeight, statusBarHeight } = this.config;
-        // 窗口高度 - 头部高度 - 顶部内容高度 = 分类容器高度
-        this.wrapHeight = windowHeight - headerHeight - offsetHeight;
-        // #ifdef MP-WEIXIN
-        // 微信窗口高度不会计算tabbar高度，这里加回来
-        if (this.cateType == 'cate') {
-            this.wrapHeight += this.$utils.rpx2px(100);
-        }
-        // #endif
+        setTimeout(() => {
+            let headerHeight = this.$utils.rpx2px(this.bodyPaddingTop);
+            let offsetHeight = this.$utils.rpx2px(this.offsetHeight);
+            const { windowHeight, statusBarHeight } = this.config;
+            // 窗口高度 - 头部高度 - 顶部内容高度 = 分类容器高度
+            this.wrapHeight = windowHeight - headerHeight - offsetHeight;
+            // #ifdef MP-WEIXIN
+            // 微信窗口高度不会计算tabbar高度，这里加回来
+            if (this.cateType == "cate") {
+                this.wrapHeight += this.$utils.rpx2px(100);
+            }
+            // #endif
+        }, 20);
     },
     destroyed() {},
     methods: {
diff --git a/src/components/cate/template/list.vue b/src/components/cate/template/list.vue
index c191ab4..312c8ea 100644
--- a/src/components/cate/template/list.vue
+++ b/src/components/cate/template/list.vue
@@ -8,21 +8,21 @@
                 class="thumb-box"
                 v-for="(child, index1) in data.child"
                 :key="index1"
-                @click="clickItem(child.id, child.name)"
             >
                 <image
                     class="cover-image"
                     mode="aspectFill"
                     :src="child.icon"
+                    @click="clickItem(child.id, child.name)"
                 ></image>
-                <view class="item-box">
+                <view class="item-box" @click="clickItem(child.id, child.name)">
                     <view class="title">{{ child.name }}</view>
                     <view class="text-box">
                         {{ "已服务113256次" }}
                     </view>
                     <view class="price">￥158元起</view>
-                    <mini-add class="component-add" :initNumber="child.buyNumber" />
                 </view>
+                <mini-add class="component-add" :initNumber="child.buyNumber" />
             </view>
         </view>
     </view>
@@ -64,10 +64,17 @@ export default {
     flex-wrap: wrap;
 }
 .thumb-box {
+    position: relative;
     width: 100%;
     display: flex;
     justify-content: space-between;
     margin-top: 40rpx;
+    
+    .component-add {
+        position: absolute;
+        right: 0;
+        bottom: 8rpx;
+    }
 }
 .thumb-box:nth-child(3n) {
     margin-right: 0;
@@ -80,7 +87,6 @@ export default {
     border: 2rpx solid #d8d8d8;
 }
 .item-box {
-    position: relative;
     width: 300rpx;
     display: flex;
     justify-content: space-between;
@@ -99,10 +105,5 @@ export default {
         font-size: 30rpx;
         color: #ec7655;
     }
-    .component-add {
-        position: absolute;
-        right: 0;
-        bottom: 8rpx;
-    }
 }
 </style>
\ No newline at end of file
diff --git a/src/pages.json b/src/pages.json
index d613d38..b7b9ad6 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -22,7 +22,7 @@
 		{
 			"path": "pages/member/address",
 			"style": {
-				"navigationBarTitleText": "分类"
+				"navigationBarTitleText": "地址管理"
 			}
 		},
 		{
@@ -34,7 +34,13 @@
 		{
 			"path": "pages/service/list",
 			"style": {
-				"navigationBarTitleText": "分类"
+				"navigationBarTitleText": "服务列表"
+			}
+		},
+		{
+			"path": "pages/service/detail",
+			"style": {
+				"navigationBarTitleText": "服务详情"
 			}
 		}
 	],
diff --git a/src/pages/service/detail.vue b/src/pages/service/detail.vue
new file mode 100644
index 0000000..6a09ae2
--- /dev/null
+++ b/src/pages/service/detail.vue
@@ -0,0 +1,25 @@
+<template>
+    <app-layout backgroundColor="#00418c" :title="title" textColor="light">
+    </app-layout>
+</template>
+
+<script>
+import AppLayout from "@/components/layout/layout";
+export default {
+    name: "service-detail",
+    data() {
+        return {
+            title: "服务详情",
+        };
+    },
+    components: { AppLayout },
+    onLoad() {},
+    onShow() {},
+    onReady() {},
+    onReachBottom() {},
+    onPullDownRefresh() {},
+    methods: {},
+};
+</script>
+
+<style lang="less" scoped></style>
\ No newline at end of file
diff --git a/src/pages/service/list.vue b/src/pages/service/list.vue
index d12af44..18b40a3 100644
--- a/src/pages/service/list.vue
+++ b/src/pages/service/list.vue
@@ -1,9 +1,9 @@
 <template>
     <app-layout btnType="back" title="服务列表" pageBackgroundColor="#FFFFFF">
         <view class="cate">
-            <app-cate :data="data" cateType="list" />
+            <app-cate :data="data" cateType="list" @clickItem="clickItem" />
         </view>
-        <view class="buy-components" :style="{bottom: bottom + 'rpx'}">
+        <view class="buy-components" :style="{ bottom: bottom + 'rpx' }">
             <view class="cart">
                 <view class="cart-icon">
                     <text class="iconfont icon-gouwuche"></text>
@@ -22,7 +22,7 @@
 <script>
 import AppLayout from "@/components/layout/layout";
 import AppCate from "@/components/cate/cate";
-import { mapState } from 'vuex';
+import { mapState } from "vuex";
 export default {
     name: "service-list",
     data() {
@@ -91,19 +91,23 @@ export default {
     components: { AppLayout, AppCate },
     computed: {
         ...mapState({
-            config: (state) => state.system.config
-        })
+            config: (state) => state.system.config,
+        }),
     },
     onLoad() {
         this.bottom = this.$utils.px2rpx(this.config.safeAreaInsets.bottom);
     },
     onShow() {},
-    onReady() {
-
-    },
+    onReady() {},
     onReachBottom() {},
     onPullDownRefresh() {},
-    methods: {},
+    methods: {
+        clickItem(id) {
+            uni.navigateTo({
+                url: "/pages/service/detail?id=" + id,
+            });
+        },
+    },
 };
 </script>