From d5c5598e04a33848ae0cb3a9944eb11daf02605f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?TOP=E7=B3=AF=E7=B1=B3?= <1130395124@qq.com>
Date: Sun, 26 Feb 2023 22:14:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=AC=E5=85=B1=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                       | 110 +++++++++++++++++++++++++-----
 src/pages/address/address.vue     |   4 +-
 src/pages/address/edit.vue        |   4 +-
 src/pages/demand/demand.vue       |  34 ++++-----
 src/pages/index/index.vue         |  92 +++----------------------
 src/pages/member/member.vue       |   6 +-
 src/pages/order/create.vue        |   8 +--
 src/pages/order/detail.vue        |   8 +--
 src/pages/order/refund.vue        |   6 +-
 src/pages/service/detail.vue      |   4 +-
 src/pages/service/list.vue        |   4 +-
 src/pages/single/after-market.vue |   6 +-
 src/pages/single/business.vue     |   6 +-
 src/pages/single/project.vue      |   6 +-
 src/pages/worker/appraise.vue     |   6 +-
 15 files changed, 155 insertions(+), 149 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 39e2116..47c4770 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -45,7 +45,97 @@ export default {
 }
 /* #endif */
 // 通用样式
-.bottom-components {
+.placeholder-style-1 {
+    color: #bebebe;
+}
+.placeholder-style-2 {
+    color: #909090;
+}
+.placeholder-style-3 {
+    color: #c9c9c9;
+}
+.placeholder-style-4 {
+    color: #999999;
+}
+.common-service-nav-group {
+    font-size: 0;
+    width: 670rpx;
+    margin: 40rpx auto 0 auto;
+    padding-bottom: 45rpx;
+    border-bottom: 4rpx solid #f8f8f8;
+    .section-title {
+        font-size: 30rpx;
+        font-weight: bold;
+        color: #333333;
+        display: flex;
+        align-items: center;
+    }
+    .section-title::before {
+        content: "";
+        display: inline-block;
+        width: 6rpx;
+        height: 30rpx;
+        background: #f9b162;
+        margin-right: 12rpx;
+    }
+    .group {
+        width: 100%;
+        .service-item {
+            display: inline-block;
+            text-align: center;
+        }
+        .service-name {
+            font-size: 24rpx;
+            color: #333333;
+            margin-top: 15rpx;
+        }
+    }
+    .group.g1 {
+        .service-item {
+            width: 145rpx;
+            margin-top: 40rpx;
+            margin-right: 30rpx;
+        }
+        .service-icon {
+            width: 100rpx;
+            height: 100rpx;
+        }
+        .service-item:nth-child(4n) {
+            margin-right: 0;
+        }
+    }
+    .group.g2 {
+        .service-item {
+            width: 100rpx;
+            margin-top: 40rpx;
+            margin-right: 42.5rpx;
+        }
+        .service-icon {
+            width: 100rpx;
+            height: 100rpx;
+        }
+        .service-item:nth-child(5n) {
+            margin-right: 0;
+        }
+    }
+    .group.g3 {
+        .service-item {
+            width: 320rpx;
+            height: auto;
+            margin-top: 40rpx;
+            margin-right: 30rpx;
+        }
+        .service-icon {
+            width: 320rpx;
+            height: 170rpx;
+        }
+        .service-item:nth-child(2n) {
+            margin-right: 0;
+        }
+    }
+}
+// 底部固定按钮
+.common-bottom-components {
     position: fixed;
     left: 0;
     right: 0;
@@ -61,20 +151,8 @@ export default {
     justify-content: space-between;
     background-color: #ffffff;
 }
-.placeholder-style-1 {
-    color: #bebebe;
-}
-.placeholder-style-2 {
-    color: #909090;
-}
-.placeholder-style-3 {
-    color: #c9c9c9;
-}
-.placeholder-style-4 {
-    color: #999999;
-}
 // 点击表单
-.form-widget-group {
+.common-form-widget-group {
     width: 100%;
     .widget-item:first-child {
         margin-top: 0;
@@ -126,7 +204,7 @@ export default {
     }
 }
 // 输入表单
-.form-container {
+.common-form-container {
     width: 710rpx;
     background-color: #fff;
     margin: 20rpx auto 0 auto;
@@ -237,7 +315,7 @@ export default {
         }
     }
 }
-.save-form-btn {
+.common-save-form-btn {
     width: 100%;
     padding: 60rpx 0;
     .btn {
diff --git a/src/pages/address/address.vue b/src/pages/address/address.vue
index b22d086..bd62ef8 100644
--- a/src/pages/address/address.vue
+++ b/src/pages/address/address.vue
@@ -25,7 +25,7 @@
                 </view>
             </view>
         </view>
-        <view class="bottom-components" :style="{ bottom: config.safeAreaInsets.bottom + 'px' }">
+        <view class="common-bottom-components" :style="{ bottom: config.safeAreaInsets.bottom + 'px' }">
             <view class="btn get-wechat-address" @click="getWechatAddress">
                 <text class="text">获取微信收货地址</text>
             </view>
@@ -211,7 +211,7 @@ export default {
         }
     }
 }
-.bottom-components {
+.common-bottom-components {
     .btn {
         width: 310rpx;
         height: 76rpx;
diff --git a/src/pages/address/edit.vue b/src/pages/address/edit.vue
index 4d3b1b1..591753b 100644
--- a/src/pages/address/edit.vue
+++ b/src/pages/address/edit.vue
@@ -3,7 +3,7 @@
         <view class="tips-container">
             <widget-tips text="个人信息仅用于发布需求，隐私信息完全保密" textColor="#ffa800" />
         </view>
-        <view class="form-container">
+        <view class="common-form-container">
             <view class="input-item">
                 <view class="title-box">
                     <text>服务地址</text>
@@ -73,7 +73,7 @@
                 </view>
             </view>
         </view>
-        <view class="save-form-btn">
+        <view class="common-save-form-btn">
             <view class="btn" @click="save">保存</view>
         </view>
     </app-layout>
diff --git a/src/pages/demand/demand.vue b/src/pages/demand/demand.vue
index dd56be0..25706b0 100644
--- a/src/pages/demand/demand.vue
+++ b/src/pages/demand/demand.vue
@@ -12,7 +12,7 @@
                     text="如需钻孔上墙，为避免影响邻居，请提前与物业确认能否施工，再协商上门时间"
                 />
             </view>
-            <view class="form-container category">
+            <view class="common-form-container category">
                 <view class="input-item">
                     <view class="title-box">
                         <text>选择分类</text>
@@ -40,7 +40,7 @@
                     </view>
                 </view>
             </view>
-            <view class="form-container price">
+            <view class="common-form-container price">
                 <view class="input-item price-type">
                     <view class="title-box">
                         <text>选择报价方式</text>
@@ -57,7 +57,7 @@
                     </view>
                 </view>
             </view>
-            <view class="form-container explain">
+            <view class="common-form-container explain">
                 <view class="textarea-item">
                     <view class="title-box">
                         <text>需求说明</text>
@@ -84,7 +84,7 @@
                     </view>
                 </view>
             </view>
-            <view class="save-form-btn">
+            <view class="common-save-form-btn">
                 <view class="btn" @click="toStep(2)">下一步</view>
             </view>
         </view>
@@ -93,7 +93,7 @@
                 <widget-tips backgroundColor="unset" textColor="#FFA800" text="选择上门时间，请确保货物在该时间段之前到家" />
             </view>
             <view class="step-2-main">
-                <view class="form-container explain">
+                <view class="common-form-container explain">
                     <view class="textarea-item">
                         <view class="title-box">
                             <text>需求说明</text>
@@ -110,9 +110,9 @@
                         </block>
                     </view>
                 </view>
-                <view class="form-container form-widget">
+                <view class="common-form-container form-widget">
                     <view class="input-item">
-                        <view class="form-widget-group">
+                        <view class="common-form-widget-group">
                             <view class="title-box">
                                 <text>选择报价方式</text>
                                 <text class="desc">（隐私信息完全保密）</text>
@@ -138,7 +138,7 @@
                         </view>
                     </view>
                 </view>
-                <view class="form-container ext-box">
+                <view class="common-form-container ext-box">
                     <view v-if="type == 2" class="custom-price">
                         <view class="title-box">
                             <text>需求价格</text>
@@ -154,7 +154,7 @@
                         <service-insurance padding="38rpx 30rpx" :insurance="insurance" @change="changeInsuranceState" />
                     </view>
                 </view>
-                <view class="bottom-components" :style="{ bottom: config.safeAreaInsets.bottom + 'px' }">
+                <view class="common-bottom-components" :style="{ bottom: config.safeAreaInsets.bottom + 'px' }">
                     <text class="price">¥ {{ parsePrice(total) }}</text>
                     <view v-if="type == 1" class="btn" @click="submit">
                         <div class="text">立即发布</div>
@@ -342,17 +342,17 @@ export default {
     width: 710rpx;
     margin: 0 auto;
 }
-.save-form-btn {
+.common-save-form-btn {
     margin-top: 70rpx;
 }
 .demand-container {
     padding-bottom: 120rpx;
 }
-.form-container {
+.common-form-container {
     width: 100%;
     margin-top: 0;
 }
-.form-container.category {
+.common-form-container.category {
     .input-item {
         display: block;
         height: auto;
@@ -404,10 +404,10 @@ export default {
         }
     }
 }
-.form-container.price {
+.common-form-container.price {
     margin-top: 25rpx;
 }
-.form-container.explain {
+.common-form-container.explain {
     margin-top: 25rpx;
     .textarea-item {
         .title-box {
@@ -453,7 +453,7 @@ export default {
 .step-3-main {
     width: 710rpx;
     margin: 0 auto;
-    .bottom-components {
+    .common-bottom-components {
         .price {
             font-size: 40rpx;
             font-weight: bold;
@@ -473,7 +473,7 @@ export default {
         }
     }
 }
-.form-container.form-widget {
+.common-form-container.form-widget {
     margin-top: 22rpx;
     .input-item {
         height: auto;
@@ -494,7 +494,7 @@ export default {
         border-bottom: 1rpx solid #e8e7e7;
     }
 }
-.form-container.ext-box {
+.common-form-container.ext-box {
     margin-top: 22rpx;
     .custom-price {
         padding: 30rpx;
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 44ddeee..4b10da1 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -30,10 +30,15 @@
                 </swiper>
             </view>
         </view>
-        <view class="service-group">
+        <view class="common-service-nav-group">
             <text class="section-title">建材安装服务</text>
             <view class="group g1">
-                <view class="service-item" v-for="(item, index) in installServiceList" :key="index">
+                <view
+                    class="service-item"
+                    v-for="(item, index) in installServiceList"
+                    :key="index"
+                    @click="utils.toPage(item.page)"
+                >
                     <image class="service-icon" :src="item.icon" mode="scaleToFill" />
                     <text class="service-name limit-line clamp-1">
                         {{ item.title }}
@@ -41,7 +46,7 @@
                 </view>
             </view>
         </view>
-        <view class="service-group">
+        <view class="common-service-nav-group">
             <text class="section-title">维修售后服务</text>
             <view class="group g2">
                 <view
@@ -57,7 +62,7 @@
                 </view>
             </view>
         </view>
-        <view class="service-group">
+        <view class="common-service-nav-group">
             <text class="section-title">工程企业服务</text>
             <view class="group g3">
                 <view
@@ -159,7 +164,7 @@ export default {
                     id: 8,
                     icon: require("@/static/temp/index/8.png"),
                     title: "其他安装",
-                    page: "",
+                    page: "/pages/service/more",
                 },
             ],
             aftermarketServiceList: [
@@ -268,81 +273,4 @@ export default {
         }
     }
 }
-.service-group {
-    font-size: 0;
-    width: 670rpx;
-    margin: 40rpx auto 0 auto;
-    padding-bottom: 45rpx;
-    border-bottom: 4rpx solid #f8f8f8;
-    .section-title {
-        font-size: 30rpx;
-        font-weight: bold;
-        color: #333333;
-        display: flex;
-        align-items: center;
-    }
-    .section-title::before {
-        content: "";
-        display: inline-block;
-        width: 6rpx;
-        height: 30rpx;
-        background: #f9b162;
-        margin-right: 12rpx;
-    }
-}
-.group {
-    width: 100%;
-    .service-item {
-        display: inline-block;
-        text-align: center;
-        .service-name {
-            font-size: 24rpx;
-            color: #333333;
-            margin-top: 15rpx;
-        }
-    }
-}
-.group.g1 {
-    .service-item {
-        width: 145rpx;
-        margin-top: 40rpx;
-        margin-right: 30rpx;
-        .service-icon {
-            width: 100rpx;
-            height: 100rpx;
-        }
-    }
-    .service-item:nth-child(4n) {
-        margin-right: 0;
-    }
-}
-.group.g2 {
-    .service-item {
-        width: 100rpx;
-        margin-top: 40rpx;
-        margin-right: 42.5rpx;
-        .service-icon {
-            width: 100rpx;
-            height: 100rpx;
-        }
-    }
-    .service-item:nth-child(5n) {
-        margin-right: 0;
-    }
-}
-.group.g3 {
-    .service-item {
-        width: 320rpx;
-        height: auto;
-        margin-top: 40rpx;
-        margin-right: 30rpx;
-        .service-icon {
-            width: 320rpx;
-            height: 170rpx;
-        }
-    }
-    .service-item:nth-child(2n) {
-        margin-right: 0;
-    }
-}
 </style>
\ No newline at end of file
diff --git a/src/pages/member/member.vue b/src/pages/member/member.vue
index 9926273..f23b82d 100644
--- a/src/pages/member/member.vue
+++ b/src/pages/member/member.vue
@@ -12,7 +12,7 @@
             </view>
         </view>
         <view class="menu-container">
-            <view class="form-widget-group">
+            <view class="common-form-widget-group">
                 <view class="widget-item" @click="utils.toPage('/pages/address/address?openType=list')">
                     <text class="iconfont icon-dingwei icon"></text>
                     <text class="title limit-line clamp-1">我的地址</text>
@@ -34,7 +34,7 @@
                     <text class="iconfont icon-jinru more"></text>
                 </view>
             </view>
-            <view class="form-widget-group">
+            <view class="common-form-widget-group">
                 <view class="widget-item">
                     <text class="iconfont icon-gongren icon"></text>
                     <text class="title limit-line clamp-1">我是师傅</text>
@@ -136,7 +136,7 @@ export default {
     width: 670rpx;
     margin: 0 auto;
 }
-.form-widget-group {
+.common-form-widget-group {
     margin-bottom: 30rpx;
     padding: 24rpx 0;
     background-color: #ffffff;
diff --git a/src/pages/order/create.vue b/src/pages/order/create.vue
index cb74bdf..efa2d7d 100644
--- a/src/pages/order/create.vue
+++ b/src/pages/order/create.vue
@@ -4,7 +4,7 @@
             <widget-tips text="保险公司承保，人身财产，双重保障，下单无忧！" />
         </view>
         <view class="create-order-container">
-            <view class="form-widget-group">
+            <view class="common-form-widget-group">
                 <view class="widget-item" @click="selectAddress">
                     <text class="iconfont icon-dingwei icon"></text>
                     <text class="title limit-line clamp-1">
@@ -41,7 +41,7 @@
                 <agreement :agree="agree" @change="changeAgreeState" />
             </view>
         </view>
-        <view class="bottom-components" :style="{ bottom: config.safeAreaInsets.bottom + 'px' }">
+        <view class="common-bottom-components" :style="{ bottom: config.safeAreaInsets.bottom + 'px' }">
             <text class="price">¥306.00</text>
             <view class="pay" @click="pay">
                 <div class="text">去支付</div>
@@ -187,7 +187,7 @@ export default {
     box-sizing: border-box;
     padding: 0 40rpx 40rpx 40rpx;
 }
-.bottom-components {
+.common-bottom-components {
     .price {
         font-size: 42rpx;
         font-weight: bold;
@@ -207,7 +207,7 @@ export default {
         }
     }
 }
-.form-widget-group {
+.common-form-widget-group {
     .widget-item {
         background-color: #ffffff;
     }
diff --git a/src/pages/order/detail.vue b/src/pages/order/detail.vue
index 4110669..ccd3a9a 100644
--- a/src/pages/order/detail.vue
+++ b/src/pages/order/detail.vue
@@ -93,7 +93,7 @@
                                     <view class="textarea-box">
                                         <text class="textarea">{{ order.content }}</text>
                                     </view>
-                                    <view class="form-container">
+                                    <view class="common-form-container">
                                         <view class="upload-item">
                                             <view class="image-box" v-for="(item, index) in order.images" :key="index">
                                                 <image class="image" :src="item.src" mode="aspectFill" />
@@ -107,7 +107,7 @@
                 </swiper-item>
             </swiper>
         </view>
-        <view class="bottom-components" :style="{ bottom: config.safeAreaInsets.bottom + 'px' }">
+        <view class="common-bottom-components" :style="{ bottom: config.safeAreaInsets.bottom + 'px' }">
             <view class="service" @click="utils.serviceActions()">
                 <text class="iconfont icon-kefu"></text>
                 <text class="text">客服</text>
@@ -450,14 +450,14 @@ export default {
             font-size: 26rpx;
             color: #666666;
         }
-        .form-container {
+        .common-form-container {
             .upload-item {
                 padding: 0;
             }
         }
     }
 }
-.bottom-components {
+.common-bottom-components {
     .service {
         display: flex;
         align-items: center;
diff --git a/src/pages/order/refund.vue b/src/pages/order/refund.vue
index 598240a..f82401d 100644
--- a/src/pages/order/refund.vue
+++ b/src/pages/order/refund.vue
@@ -14,7 +14,7 @@
                 </view>
             </view>
         </view>
-        <view class="form-container explain">
+        <view class="common-form-container explain">
             <block v-if="type == 'apply'">
                 <view class="textarea-item">
                     <view class="title-box">
@@ -54,7 +54,7 @@
                 </view>
             </view>
         </view>
-        <view v-if="type == 'apply'" class="save-form-btn">
+        <view v-if="type == 'apply'" class="common-save-form-btn">
             <view class="btn" @click="save">提交</view>
         </view>
         <widget-modal :show="showEditModal" title="修改退款金额" @close="showEditModal = false">
@@ -189,7 +189,7 @@ export default {
         }
     }
 }
-.form-container.explain {
+.common-form-container.explain {
     width: 100%;
     margin-top: 0;
     .textarea-item {
diff --git a/src/pages/service/detail.vue b/src/pages/service/detail.vue
index a4b5b11..75aecd3 100644
--- a/src/pages/service/detail.vue
+++ b/src/pages/service/detail.vue
@@ -61,7 +61,7 @@
                     </view>
                 </swiper-item>
             </swiper>
-            <view class="bottom-components" v-if="tabIndex == 0" :style="{ bottom: config.safeAreaInsets.bottom + 'px' }">
+            <view class="common-bottom-components" v-if="tabIndex == 0" :style="{ bottom: config.safeAreaInsets.bottom + 'px' }">
                 <view class="price">
                     <text class="text">¥306.00</text>
                 </view>
@@ -263,7 +263,7 @@ export default {
         padding: 45rpx 0;
     }
 }
-.bottom-components {
+.common-bottom-components {
     .price {
         .text {
             font-size: 42rpx;
diff --git a/src/pages/service/list.vue b/src/pages/service/list.vue
index ac7f68a..146595c 100644
--- a/src/pages/service/list.vue
+++ b/src/pages/service/list.vue
@@ -3,7 +3,7 @@
         <view class="cate">
             <app-cate :offsetHeight="0" :data="data" cateType="list" @clickItem="clickItem" />
         </view>
-        <view class="bottom-components" :style="{ bottom: config.safeAreaInsets.bottom + 'px' }">
+        <view class="common-bottom-components" :style="{ bottom: config.safeAreaInsets.bottom + 'px' }">
             <view class="cart" @click="utils.toPage('/pages/service/cart')">
                 <view class="cart-icon">
                     <text class="iconfont icon-gouwuche"></text>
@@ -115,7 +115,7 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.bottom-components {
+.common-bottom-components {
     padding: 0 20rpx 0 50rpx;
     .cart {
         position: relative;
diff --git a/src/pages/single/after-market.vue b/src/pages/single/after-market.vue
index 293284a..1d721ed 100644
--- a/src/pages/single/after-market.vue
+++ b/src/pages/single/after-market.vue
@@ -3,7 +3,7 @@
         <view class="background">
             <image class="image" :src="background" mode="widthFix" />
         </view>
-        <view class="form-container">
+        <view class="common-form-container">
             <view class="input-item">
                 <view class="title-box">
                     <text>品牌</text>
@@ -65,7 +65,7 @@
                 </view>
             </view>
         </view>
-        <view class="save-form-btn">
+        <view class="common-save-form-btn">
             <view class="btn" @click="save">保存</view>
         </view>
     </app-layout>
@@ -110,7 +110,7 @@ export default {
         width: 100%;
     }
 }
-.form-container {
+.common-form-container {
     z-index: 10;
     position: relative;
     margin-top: -85rpx;
diff --git a/src/pages/single/business.vue b/src/pages/single/business.vue
index ba8d8d3..4262423 100644
--- a/src/pages/single/business.vue
+++ b/src/pages/single/business.vue
@@ -3,7 +3,7 @@
         <view class="background">
             <image class="image" :src="background" mode="widthFix" />
         </view>
-        <view class="form-container">
+        <view class="common-form-container">
             <view class="input-item">
                 <view class="title-box">
                     <text>品牌</text>
@@ -52,7 +52,7 @@
                 </view>
             </view>
         </view>
-        <view class="save-form-btn">
+        <view class="common-save-form-btn">
             <view class="btn" @click="save">保存</view>
         </view>
     </app-layout>
@@ -96,7 +96,7 @@ export default {
         width: 100%;
     }
 }
-.form-container {
+.common-form-container {
     z-index: 10;
     position: relative;
     margin-top: -85rpx;
diff --git a/src/pages/single/project.vue b/src/pages/single/project.vue
index b0e8af8..dd1a41f 100644
--- a/src/pages/single/project.vue
+++ b/src/pages/single/project.vue
@@ -3,7 +3,7 @@
         <view class="background">
             <image class="image" :src="background" mode="widthFix" />
         </view>
-        <view class="form-container">
+        <view class="common-form-container">
             <view class="input-item">
                 <view class="title-box">
                     <text>工程类型</text>
@@ -88,7 +88,7 @@
                 </view>
             </view>
         </view>
-        <view class="save-form-btn">
+        <view class="common-save-form-btn">
             <view class="btn" @click="save">保存</view>
         </view>
     </app-layout>
@@ -140,7 +140,7 @@ export default {
         width: 100%;
     }
 }
-.form-container {
+.common-form-container {
     z-index: 10;
     position: relative;
     margin-top: -130rpx;
diff --git a/src/pages/worker/appraise.vue b/src/pages/worker/appraise.vue
index 28da71f..6ce205a 100644
--- a/src/pages/worker/appraise.vue
+++ b/src/pages/worker/appraise.vue
@@ -29,7 +29,7 @@
             </view>
         </view>
         <view class="images">
-            <view class="form-container">
+            <view class="common-form-container">
                 <view class="upload-item">
                     <block v-for="(item, index) in images" :key="index">
                         <view class="image-box">
@@ -43,7 +43,7 @@
                 </view>
             </view>
         </view>
-        <view class="save-form-btn">
+        <view class="common-save-form-btn">
             <view class="btn" @click="save">提交</view>
         </view>
     </app-layout>
@@ -163,7 +163,7 @@ export default {
 }
 .images {
     padding: 35rpx 40rpx;
-    .form-container {
+    .common-form-container {
         margin-top: 0;
         .upload-item {
             padding: 0;