From bc782b62279f64b4322920d45ce1a44c10145460 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AF=85?= <1335909236@qq.com>
Date: Tue, 12 Aug 2025 15:16:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8D=95=20?=
 =?UTF-8?q?=E6=B4=BE=E5=8D=95=E7=9A=84=E6=98=BE=E7=A4=BA=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2=E5=B9=BF=E5=91=8A?=
 =?UTF-8?q?=E7=9A=84=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E9=A1=B5=E9=9D=A2=E5=90=84=E9=83=A8=E5=88=86=E7=9A=84?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E9=80=BB=E8=BE=91=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=AD=E9=83=A8=E5=B9=BF=E5=91=8A=E5=92=8C=E5=BA=95=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E7=B1=BBtab=E7=9A=84=E8=81=94=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/localLife/index/index.css           |  2 +-
 packages/workOrderDashboard/detail/index.css | 10 ++-
 packages/workOrderDashboard/detail/index.vue | 15 +++--
 pages.json                                   |  7 +-
 pages/index/index.css                        |  1 +
 pages/index/index.vue                        | 67 ++++++--------------
 6 files changed, 40 insertions(+), 62 deletions(-)

diff --git a/packages/localLife/index/index.css b/packages/localLife/index/index.css
index c5fd18af..bf37a75e 100644
--- a/packages/localLife/index/index.css
+++ b/packages/localLife/index/index.css
@@ -3,7 +3,7 @@ page {
 }
 
 .container{
-    padding-top: 100rpx;
+    /* padding-top: 100rpx; */
 }
 
 .local {
diff --git a/packages/workOrderDashboard/detail/index.css b/packages/workOrderDashboard/detail/index.css
index 41b50639..32a46d7e 100644
--- a/packages/workOrderDashboard/detail/index.css
+++ b/packages/workOrderDashboard/detail/index.css
@@ -141,9 +141,17 @@ page {
 	display: flex;
 	justify-content: center;
 }
-.btn_view > .btn {
+.btn_view_btn {
+	margin: 40rpx 20rpx;
 	width: 300rpx;
 	height: 90rpx;
+	line-height: 90rpx;
+	text-align: center;
+	background: linear-gradient( 91deg, #FF7658 0%, #FF370B 100%);
+	border-radius: 100rpx 100rpx 100rpx 100rpx;
+	font-size: 36rpx;
+	color: #FFFFFF;
+	font-weight: 600;
 }
 .btn {
 	margin: 40rpx auto 60rpx;
diff --git a/packages/workOrderDashboard/detail/index.vue b/packages/workOrderDashboard/detail/index.vue
index 8f00b0ee..59f18cf1 100644
--- a/packages/workOrderDashboard/detail/index.vue
+++ b/packages/workOrderDashboard/detail/index.vue
@@ -183,15 +183,16 @@
       </view>
     </view>
 
-    <view class="btn_view" v-if="info.status == 1 && order_dispatch_permission">
-      <view class="btn" @click="headerSelectMasterClick">派单</view>
-    </view>
-
-    <view class="btn_view" v-if="info.status == 1 && work_order_permission && allow_grab_order">
-      <view class="btn" @click="headerTakeClick">接单</view>
+    <view class="btn_view">
+      <view v-if="info.status == 1 && order_dispatch_permission">
+        <view class="btn_view_btn" @click="headerSelectMasterClick">派单</view>
+      </view>
+      <view v-if="info.status == 1 && work_order_permission && allow_grab_order">
+        <view class="btn_view_btn" @click="headerTakeClick">接单</view>
+      </view>
     </view>
     <!-- 待派单状态 无派单权限按钮 -->
-    <view class="btn" v-else-if="info.status == 1" @click="headerTakeClick">接单</view>
+    <!-- <view class="btn" v-else-if="info.status == 1" @click="headerTakeClick">接单</view> -->
     <!-- 进行中状态编辑维修信息 -->
     <view class="btn" v-if="info.status == 2" @click="headerEditClick">
       {{ type === "edit" ? "确定" : "编辑" }}
diff --git a/pages.json b/pages.json
index 975ffe49..ff065b93 100644
--- a/pages.json
+++ b/pages.json
@@ -484,11 +484,8 @@
 				{
 					"path": "index/index",
 					"style": {
-						"navigationBarBackgroundColor": "#fff",
-						"navigationStyle": "custom",
-						"usingComponents": {
-							"nav-footer": "/components/nav/nav"
-						}
+						"navigationBarTitleText": "",
+						"navigationBarBackgroundColor": "#fff"
 					}
 				},
 				{
diff --git a/pages/index/index.css b/pages/index/index.css
index 68f49eee..2addac54 100644
--- a/pages/index/index.css
+++ b/pages/index/index.css
@@ -280,6 +280,7 @@ page {
 	font-weight: normal;
 	font-size: 26rpx;
 	color: #FFFFFF;
+	margin-left: 15rpx;
 }
 
 .serverList {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7a385417..6bfa1c60 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -98,7 +98,7 @@
       <view class="serverList">
         <view class="serverList_left">
           <swiper>
-            <swiper-item v-for="(item, index) in homeLeftList" :key="index">
+            <swiper-item v-for="(item, index) in homeLeftList" :key="index" @click="headerServerClick(item)">
               <image :src="item.pic_src" alt="" mode="aspectFit" />
               <!-- <view>{{ item.ad_position }}</view> -->
             </swiper-item>
@@ -107,7 +107,7 @@
 
         <view class="serverList_right">
           <view class="serverList_right1">
-            <view :class="['serverItem', `serverItem${index + 1}`]" @tap="headerServerClick(item)"
+            <view :class="['serverItem', `serverItem${index + 1}`]" @click="headerServerClick2(item)"
               v-for="(item, index) in homeRightList1" :key="index">
               <view class="serverTit">{{ item.title }}</view>
               <image v-if="item.pic_src" :src="item.pic_src" mode="" />
@@ -115,8 +115,8 @@
             </view>
           </view>
           <view class="serverList_right2">
-            <view :class="['serverItem', `serverItem${index + 4}`]" @tap="headerServerClick(item)" 
-               v-for="(item, index) in homeRightList2" :key="index">
+            <view :class="['serverItem', `serverItem${index + 4}`]" @click="headerServerClick2(item)"
+              v-for="(item, index) in homeRightList2" :key="index">
               <view class="serverTit">{{ item.title }}</view>
               <image :src="item.pic_src" mode="" />
               <!-- <view>{{ item.ad_position }}</view> -->
@@ -158,47 +158,6 @@
       </view>
 
       <!-- 商家列表展示 -->
-      <!-- <view class="store-list-container">
-        <view class="overlay" v-if="showDropdown"></view>
-        <view class="store-item" v-for="(store, index) in merchantList" :key="index">
-          <view class="store-image">
-            <image :src="store.cate_image" mode="aspectFill"></image>
-          </view>
-          <view class="store-info">
-            <view class="store-name">{{ store.merchant_name }}</view>
-            <view class="startList">
-                <image
-                  v-for="index in 5"
-                  :key="index"
-                  :src="
-                    index < item.rating
-                      ? 'https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/local_start1.png'
-                      : 'https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/local_start2.png'
-                  "
-                  mode="aspectFill"
-                ></image>
-            </view>
-            <view class="store-tags">
-              <text class="tag" v-for="(tag, idx) in store.tags" :key="idx">{{ tag }}</text>
-            </view>
-            <view class="store-address">
-              <image class="address-icon"
-                src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/address.png"
-                mode="aspectFit">
-              </image>
-              <text>{{ store.address }}</text>
-            </view>
-            <view class="store-distance">
-              <image class="distance-icon"
-                src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/distance.png"
-                mode="aspectFit">
-              </image>
-              <text>{{ store.distance }}km</text>
-            </view>
-          </view>
-          <view class="review-btn" @click="gotoReview(store.id)">点评</view>
-        </view>
-      </view> -->
       <div class="merchantList">
         <view class="overlay" v-if="showDropdown"></view>
         <div class="merchantItem" v-for="item in merchatList" :key="item.id" @click="Info(item)">
@@ -520,8 +479,17 @@ export default {
       });
     },
 
+    headerServerClick2(e) {
+      const cate_id = this.categoryList.find(item => item.cate_name == e.title)?.id;
+      if (cate_id) { this.switchCategory(cate_id) }
+      return
+    },
+
     headerServerClick(e) {
-      console.log('当前点击内容', e);
+      // const cate_id = this.categoryList.find(item => item.cate_name == e.title).id;
+      // this.switchCategory(cate_id)
+      // return
+
       if (!e.link_url) {
         this.NotOpen();
         return
@@ -700,17 +668,20 @@ export default {
           page_size: 10
         }, { silent: false });
         if (res.rows.length) {
+          // let firstItem = res.rows[0];
+          // firstItem.pic_src = picUrl + firstItem.pic_src;
+          // rightList.push(firstItem);
           let filterRes = this.filterShowList(res?.rows, 1);
           filterRes.forEach(item => {
             item.pic_src = picUrl + item.pic_src
           })
           rightList.push(...filterRes)
-        }else{
+        } else {
           rightList.push({
             ad_position: i,
             pic_src: ''
           })
-        } 
+        }
       }
       return rightList
     },