fix: 解决冲突

pages.json

@@ -72,9 +72,6 @@
 			"style": {
 				"navigationBarTitleText": "详情"
 			}
-<<<<<<< HEAD
-		}        
-=======
 		},
 		{
 			"path" : "pages/register/register",
@@ -109,7 +106,6 @@
         //     }
             
         // }
->>>>>>> e304b330bbea412ab178beebd8b9788292f4e724
     ],
 	"subPackages": [
 		{

pages/Client/new_file.vue

@@ -54,21 +54,14 @@
 	import {
 		typeOptionSelect
 	} from "@/api/volunteerDetailsApi/details.js"
-<<<<<<< HEAD
-	
-	// Toast 控制宫格
-	const uToastRef = ref(null);
-	const userType = uni.getStorageSync('userType') //读取本地存储
-	// 用户/志愿者 识别标识
-	const userOrWorker = uni.getStorageSync('storage_data').vuex_userOrWorker //读取本地存储
-=======
-	import dayjs from 'dayjs';
 	import { workDate,getDataTime } from '@/api/volunteer.js'
 	import Calendar from '../../components/uni-calendar/components/uni-calendar/uni-calendar.vue'
 
 	// Toast 控制宫格
 	const uToastRef = ref(null);
 	const userType = uni.getStorageSync('userType') //读取本地存储
+	// 用户/志愿者 识别标识
+	const userOrWorker = uni.getStorageSync('storage_data').vuex_userOrWorker //读取本地存储
 
 	const calendar = ref(null)
 	const info = ref({
@@ -80,7 +73,6 @@
 
 
 
->>>>>>> e304b330bbea412ab178beebd8b9788292f4e724
 	 // 普通用户
 	 const serviceList1 = ref([
 		 {

pages/index.vue

@@ -20,7 +20,7 @@
 			<Client></Client>
 
 			<!-- 瀑布流 -->
-			<volunteerSide></volunteerSide>
+			<volunteerSide ></volunteerSide>
 
 			<view class="font-title index-title">月度排名</view>
 			<List :data="data" @refresh="getList" v-if="data.length > 0" :type="'ranking'"/>