fix: 代码合并

components/Client/new_file.vue

@@ -5,9 +5,9 @@
 				<view class="serve-title client-title" v-if="userType == 2">注册专区</view>
 				<swiper :indicator-dots="true" class="swiper" v-if="serveiceList && serveiceList.length > 0">
 					<swiper-item>
-						<up-grid :border="false" col="5" @click="handleGridClick">
+						<up-grid :border="false" col="5" >
 							<up-grid-item v-for="(item, index) in serveiceList.slice(0,10)" :key="index"
-								:custom-style="custmoStyle">
+								:custom-style="custmoStyle" @click="handleGridClick(item)">
 								<view class="grid-box">
 									<view class="grid-icon">
 										<image :src="item.icon" class="service-img" mode="aspectFit" />
@@ -19,9 +19,9 @@
 						</up-grid>
 					</swiper-item>
 					<swiper-item>
-						<up-grid :border="false" col="5" @click="handleGridClick">
+						<up-grid :border="false" col="5" >
 							<up-grid-item v-for="(item, index) in serveiceList.slice(10,serveiceList.length)" :key="index"
-								:custom-style="custmoStyle">
+								:custom-style="custmoStyle" @click="handleGridClick(item)">
 								<view class="grid-box">
 									<view class="grid-icon">
 										<image :src="item.icon" class="service-img" mode="aspectFit" />
@@ -228,8 +228,11 @@
 
 
 	// 宫格点击事件
-	const handleGridClick = async (index) => {
-		const service = serveiceList.value[index]; // 获取点击的服务条目
+	const handleGridClick = async (service) => {
+		
+		// const service = serveiceList.value[index]; // 获取点击的服务条目
+		console.log('index',service);
+		
 		// 用户
 		if (userType == 1) {
 

config.js

@@ -4,6 +4,7 @@ const config = {
 	//cloud后台网关地址
 	baseUrl: 'http://192.168.100.94:9527',
 	// baseUrl: 'https://zybooks.tech/prod-api',
+	mapKey:'KFEBZ-P2GKZ-A5PX4-7Q6Y7-KXOBF-XCB4C',
 	// 应用信息
 	appInfo: {
 		// 应用名称

pages_classify/components/PositioningMap/index.vue

@@ -7,6 +7,8 @@
 
 <script setup>
 import { ref, onMounted, watch } from 'vue';
+import config from '@/config'
+const mapKey = config.mapKey;
 const QQMapWX = require('./sdk/qqmap-wx-jssdk.min.js')
 // 接收外部传入的地址
 const props = defineProps({
@@ -30,10 +32,12 @@ const mapData = ref({
 let qqmapsdk = null;
 
 onMounted(() => {
+    console.log('mapKey',mapKey);
+    
     mapCtx.value = wx.createMapContext('wxMapId');
 
     qqmapsdk = new QQMapWX({
-        key: 'KFEBZ-P2GKZ-A5PX4-7Q6Y7-KXOBF-XCB4C'
+        key: mapKey
     });
 
     console.log('props',props.address);

pages_home/pages/details/index.vue

@@ -118,7 +118,7 @@ const list = [
 const serveslist =[
 {
         label: "服务项目",
-        key: "businessManagementId",
+        key: "businessTierName",
     },
     {
         label: "服务时长",
@@ -329,6 +329,8 @@ onLoad((options) => {
             letter-spacing: 0rpx;
             line-height: 40rpx;
             color: rgba(17, 24, 39, 1);
+
+
         }