|
|
@@ -1,4 +1,5 @@
|
|
|
<template>
|
|
|
+<<<<<<< HEAD
|
|
|
<<<<<<< HEAD
|
|
|
<view class="mine-container">
|
|
|
|
|
|
@@ -41,6 +42,16 @@
|
|
|
</up-grid>
|
|
|
</view>
|
|
|
>>>>>>> 3e2be9f (fetch:详情tabs/用户新增地址)
|
|
|
+=======
|
|
|
+ <view class="mine-container">
|
|
|
+
|
|
|
+ <view class="mine-header">
|
|
|
+ <img :src="userInfo.avatar" alt="" style="width: 136rpx;height: 136rpx;">
|
|
|
+ <view class="header-info">
|
|
|
+ <text class="info-name">{{ userInfo.nickName }}</text>
|
|
|
+ <text class="info-id">ID: 88888888</text>
|
|
|
+ <text class="info-edit" @click="handLsetTing">设置> </text>
|
|
|
+>>>>>>> 8343935 (fix: 代码合并)
|
|
|
</view>
|
|
|
</view>
|
|
|
|
|
|
@@ -107,6 +118,9 @@
|
|
|
|
|
|
<script setup>
|
|
|
<<<<<<< HEAD
|
|
|
+<<<<<<< HEAD
|
|
|
+=======
|
|
|
+>>>>>>> 8343935 (fix: 代码合并)
|
|
|
import { onMounted, ref } from 'vue';
|
|
|
import {
|
|
|
onLoad,
|
|
|
@@ -116,6 +130,7 @@ import store from "@/store"
|
|
|
const userInfo = ref({
|
|
|
avatar: '/static/serverImg/mine/user.png'
|
|
|
})
|
|
|
+<<<<<<< HEAD
|
|
|
|
|
|
const rateValue = ref(3)
|
|
|
const priceList = [{
|
|
|
@@ -287,180 +302,165 @@ const handLsetTing = () => {
|
|
|
} from '@dcloudio/uni-app';
|
|
|
import store from "@/store"
|
|
|
const userType = uni.getStorageSync('userType') //读取本地存储
|
|
|
+=======
|
|
|
+>>>>>>> 8343935 (fix: 代码合并)
|
|
|
|
|
|
- // 用户/志愿者 识别标识
|
|
|
- const userOrWorker = uni.getStorageSync('storage_data').vuex_userOrWorker //读取本地存储
|
|
|
-
|
|
|
- const userInfo = ref({});
|
|
|
-
|
|
|
- const setTing = ref(
|
|
|
- [{
|
|
|
- iconName: 'setting-fill',
|
|
|
- value: 1,
|
|
|
- }, ]);
|
|
|
-
|
|
|
- const serviceList = ref(
|
|
|
- [{
|
|
|
- name: '待服务',
|
|
|
- iconName: 'clock',
|
|
|
- page: '/pages/classify',
|
|
|
- value: 1
|
|
|
- },
|
|
|
- {
|
|
|
- name: '进行中',
|
|
|
- iconName: 'car',
|
|
|
- page: '/pages/classify',
|
|
|
- value: 2
|
|
|
- },
|
|
|
- {
|
|
|
- name: '已完成',
|
|
|
- iconName: 'car-fill',
|
|
|
- page: '/pages/classify',
|
|
|
- value: 3
|
|
|
- },
|
|
|
- {
|
|
|
- name: '差评申述',
|
|
|
- iconName: 'edit-pen',
|
|
|
- page: '/pages_mine/pages/bad/index'
|
|
|
- },
|
|
|
- {
|
|
|
- name: '钱包',
|
|
|
- iconName: 'rmb-circle',
|
|
|
- page: '/pages_mine/pages/wallet/index'
|
|
|
- },
|
|
|
- {
|
|
|
- name: '帮助与客服',
|
|
|
- iconName: 'kefu-ermai',
|
|
|
- },
|
|
|
- {
|
|
|
- name: '服务地址',
|
|
|
- iconName: 'map',
|
|
|
- page: '/pages_mine/pages/serviceInforMation/index'
|
|
|
- },
|
|
|
- ]);
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- const serviceList2 = ref([{
|
|
|
- name: '待服务',
|
|
|
- iconName: 'clock',
|
|
|
- page: '/pages/classify',
|
|
|
- value: 1
|
|
|
- },
|
|
|
-
|
|
|
- {
|
|
|
- name: '进行中',
|
|
|
- iconName: 'car',
|
|
|
- page: '/pages/classify',
|
|
|
- value: 2
|
|
|
- },
|
|
|
- {
|
|
|
- name: '已完成',
|
|
|
- iconName: 'car-fill',
|
|
|
- page: '/pages/classify',
|
|
|
- value: 3
|
|
|
- },
|
|
|
- {
|
|
|
- name: '评论',
|
|
|
- iconName: 'edit-pen',
|
|
|
- // page: '/pages/myCenter/bad'
|
|
|
- },
|
|
|
- {
|
|
|
- name: '钱包',
|
|
|
- iconName: 'rmb-circle',
|
|
|
- page: '/pages_mine/pages/wallet/index'
|
|
|
- },
|
|
|
- {
|
|
|
- name: '帮助与客服',
|
|
|
- iconName: 'kefu-ermai',
|
|
|
- },
|
|
|
- {
|
|
|
- name: '浏览记录',
|
|
|
- iconName: 'eye',
|
|
|
- page: '/pages_mine/pages/wallet/index'
|
|
|
- },
|
|
|
- {
|
|
|
- name: '收藏',
|
|
|
- iconName: 'star',
|
|
|
- },
|
|
|
- ]);
|
|
|
-
|
|
|
- const priceList = [{
|
|
|
- name: '余额',
|
|
|
- key: 'balance',
|
|
|
- decimals: 2
|
|
|
- },
|
|
|
- {
|
|
|
- name: '订单总数',
|
|
|
- key: 'orderCount',
|
|
|
- decimals: 0
|
|
|
- }
|
|
|
- ]
|
|
|
-
|
|
|
+const rateValue = ref(3)
|
|
|
+const priceList = [{
|
|
|
+ name: '账户余额',
|
|
|
+ key: 'balance',
|
|
|
+ decimals: 2
|
|
|
+},
|
|
|
+{
|
|
|
+ name: '订单总数',
|
|
|
+ key: 'orderCount',
|
|
|
+ decimals: 0
|
|
|
+}
|
|
|
+]
|
|
|
+const orderList = ref([{
|
|
|
+ name: '预约单',
|
|
|
+ key: 'orderCount'
|
|
|
+},
|
|
|
|
|
|
+{
|
|
|
+ name: '进行单',
|
|
|
+ key: 'orderCount'
|
|
|
|
|
|
- const orderList = ref([{
|
|
|
- name: '预约单',
|
|
|
- key: 'orderCount'
|
|
|
- },
|
|
|
+},
|
|
|
+{
|
|
|
+ name: '完成单',
|
|
|
+ key: 'orderCount'
|
|
|
|
|
|
- {
|
|
|
- name: '进行单',
|
|
|
- key: 'orderCount'
|
|
|
+},
|
|
|
+{
|
|
|
+ name: '取消单',
|
|
|
+ key: 'orderCount'
|
|
|
|
|
|
- },
|
|
|
- {
|
|
|
- name: '完成单',
|
|
|
- key: 'orderCount'
|
|
|
+}
|
|
|
+]);
|
|
|
+const data = ref({
|
|
|
+ balance: 0.0,
|
|
|
+ orderCount: 0,
|
|
|
+});
|
|
|
|
|
|
- },
|
|
|
- {
|
|
|
- name: '取消单',
|
|
|
- key: 'orderCount'
|
|
|
+const userType = uni.getStorageSync('userType') //读取本地存储
|
|
|
|
|
|
- }
|
|
|
+const adminList = ref(
|
|
|
+ [{
|
|
|
+ name: '待服务',
|
|
|
+ iconName: '/static/serverImg/mine/icon1.png',
|
|
|
+ page: '/pages/classify',
|
|
|
+ value: 1
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: '进行中',
|
|
|
+ iconName: '/static/serverImg/mine/icon2.png',
|
|
|
+ page: '/pages/classify',
|
|
|
+ value: 2
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: '已完成',
|
|
|
+ iconName: '/static/serverImg/mine/icon3.png',
|
|
|
+ page: '/pages/classify',
|
|
|
+ value: 3
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: '差评申述',
|
|
|
+ iconName: '/static/serverImg/mine/icon4.png',
|
|
|
+ page: '/pages_mine/pages/bad/index'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: '钱包',
|
|
|
+ iconName: '/static/serverImg/mine/icon5.png',
|
|
|
+ page: '/pages_mine/pages/wallet/index'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: '帮助与客服',
|
|
|
+ iconName: '/static/serverImg/mine/icon6.png',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: '用户端',
|
|
|
+ iconName: '/static/serverImg/mine/icon6.png',
|
|
|
+ },
|
|
|
+ ]);
|
|
|
+const userList = ref(
|
|
|
+ [{
|
|
|
+ name: '待服务',
|
|
|
+ iconName: 'clock',
|
|
|
+ page: '/pages/classify',
|
|
|
+ value: 1
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: '进行中',
|
|
|
+ iconName: 'car',
|
|
|
+ page: '/pages/classify',
|
|
|
+ value: 2
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: '已完成',
|
|
|
+ iconName: 'car-fill',
|
|
|
+ page: '/pages/classify',
|
|
|
+ value: 3
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: '评论',
|
|
|
+ iconName: 'edit-pen',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: '钱包',
|
|
|
+ iconName: 'rmb-circle',
|
|
|
+ page: '/pages_mine/pages/wallet/index'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: '浏览记录',
|
|
|
+ iconName: 'eye',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: '收藏',
|
|
|
+ iconName: 'star',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: '帮助与客服',
|
|
|
+ iconName: 'kefu-ermai',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: '地址',
|
|
|
+ iconName: 'kefu-ermai',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: '志愿者',
|
|
|
+ iconName: 'kefu-ermai',
|
|
|
+ },
|
|
|
]);
|
|
|
|
|
|
- const avatarSrc = ref('/static/my/客服.png');
|
|
|
- const data = ref({
|
|
|
- balance: 0.0,
|
|
|
- orderCount: 0,
|
|
|
- });
|
|
|
- const rateValue = ref(3);
|
|
|
- const onClick = (record) => {
|
|
|
- console.log('record', record, record.page);
|
|
|
- if (record.page && record.value) {
|
|
|
- const app = getApp();
|
|
|
- app.globalData.switchTabParams = {
|
|
|
- tabKey: record.value
|
|
|
- };
|
|
|
- // JS跳转
|
|
|
- uni.switchTab({
|
|
|
- url: record.page
|
|
|
- });
|
|
|
- return;
|
|
|
- }
|
|
|
- if (record.page) {
|
|
|
- uni.navigateTo({
|
|
|
- url: record.page
|
|
|
- });
|
|
|
- }
|
|
|
|
|
|
- onMounted(getDetails)
|
|
|
+const onClick = (record) => {
|
|
|
+ console.log('record', record, record.page);
|
|
|
+ if (record.page && record.value) {
|
|
|
+ const app = getApp();
|
|
|
+ app.globalData.switchTabParams = {
|
|
|
+ tabKey: record.value
|
|
|
+ };
|
|
|
+ // JS跳转
|
|
|
+ uni.switchTab({
|
|
|
+ url: record.page
|
|
|
+ });
|
|
|
+ return;
|
|
|
}
|
|
|
+}
|
|
|
|
|
|
- const getDetails = async () => {
|
|
|
- try {
|
|
|
- // const res = await getVolunteerAccount();
|
|
|
- // console.log('res',res);
|
|
|
+const getDetails = async () => {
|
|
|
+ try {
|
|
|
+ // const res = await getVolunteerAccount();
|
|
|
+ // console.log('res',res);
|
|
|
|
|
|
- } catch (error) {
|
|
|
- console.log('error', error);
|
|
|
+ } catch (error) {
|
|
|
+ console.log('error', error);
|
|
|
|
|
|
- }
|
|
|
}
|
|
|
+}
|
|
|
|
|
|
+<<<<<<< HEAD
|
|
|
|
|
|
|
|
|
const geUserInfo = () => {
|
|
|
@@ -471,12 +471,16 @@ const handLsetTing = () => {
|
|
|
// 设置
|
|
|
const handLsetTing = () => {
|
|
|
>>>>>>> 3e2be9f (fetch:详情tabs/用户新增地址)
|
|
|
+=======
|
|
|
+const handLsetTing = () => {
|
|
|
+>>>>>>> 8343935 (fix: 代码合并)
|
|
|
console.log('123')
|
|
|
uni.navigateTo({
|
|
|
url: '/pages_mine/pages/setupUser/index'
|
|
|
})
|
|
|
}
|
|
|
<<<<<<< HEAD
|
|
|
+<<<<<<< HEAD
|
|
|
|
|
|
|
|
|
|
|
|
@@ -573,30 +577,44 @@ onShow(() => {
|
|
|
=======
|
|
|
onShow(() => {
|
|
|
geUserInfo();
|
|
|
+=======
|
|
|
+>>>>>>> 8343935 (fix: 代码合并)
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+const geUserInfo = () => {
|
|
|
+ console.log(store.state, '>>>>99');
|
|
|
+ userInfo.value = store.state.user
|
|
|
+}
|
|
|
+
|
|
|
+onShow(() => {
|
|
|
+ geUserInfo();
|
|
|
+
|
|
|
+})
|
|
|
|
|
|
- })
|
|
|
</script>
|
|
|
|
|
|
<style lang="scss" scoped>
|
|
|
- .mine-card {
|
|
|
- border-radius: 8px;
|
|
|
- background: rgba(255, 255, 255, 1);
|
|
|
- padding: 12px;
|
|
|
- margin-bottom: 12px;
|
|
|
- }
|
|
|
+.mine-container {
|
|
|
+ position: fixed;
|
|
|
+ left: 0;
|
|
|
+ top: 0;
|
|
|
+ right: 0;
|
|
|
+ bottom: 0;
|
|
|
+ background: rgba(245, 245, 245, 1);
|
|
|
+ overflow-y: auto;
|
|
|
|
|
|
- .mine-container {
|
|
|
- position: fixed;
|
|
|
- top: 0px;
|
|
|
- left: 0px;
|
|
|
- right: 0px;
|
|
|
- bottom: 0px;
|
|
|
- background: rgba(245, 245, 245, 1);
|
|
|
+ .mine-header {
|
|
|
+ padding: 42rpx 44rpx;
|
|
|
+ background: #fff;
|
|
|
+ display: flex;
|
|
|
|
|
|
- .mine-top-bgc {
|
|
|
- height: 120px;
|
|
|
- background: linear-gradient(180deg, rgba(255, 219, 171, 1) 0%, rgba(242, 151, 99, 1) 100%);
|
|
|
+ .header-info {
|
|
|
+ display: flex;
|
|
|
+ flex-direction: column;
|
|
|
+ margin-left: 36rpx;
|
|
|
|
|
|
+<<<<<<< HEAD
|
|
|
}
|
|
|
|
|
|
.mine-box {
|
|
|
@@ -629,73 +647,66 @@ onShow(() => {
|
|
|
margin-left: 12px;
|
|
|
}
|
|
|
>>>>>>> 3e2be9f (fetch:详情tabs/用户新增地址)
|
|
|
- }
|
|
|
+=======
|
|
|
+ .info-name {
|
|
|
+ font-size: 36rpx;
|
|
|
+ font-weight: 400;
|
|
|
+ line-height: 54rpx;
|
|
|
+ color: rgba(51, 51, 51, 1);
|
|
|
}
|
|
|
- }
|
|
|
|
|
|
- .service-img {
|
|
|
- width: 60rpx;
|
|
|
- height: 60rpx;
|
|
|
- margin-bottom: 10rpx;
|
|
|
- }
|
|
|
+ .info-id {
|
|
|
+ font-size: 28rpx;
|
|
|
+ font-weight: 400;
|
|
|
+ letter-spacing: 0rpx;
|
|
|
+ line-height: 42rpx;
|
|
|
+ color: rgba(153, 153, 153, 1);
|
|
|
+ }
|
|
|
|
|
|
- .service-list {
|
|
|
- padding-bottom: 12px;
|
|
|
+ .info-edit {
|
|
|
+ font-size: 24rpx;
|
|
|
+ font-weight: 400;
|
|
|
+ letter-spacing: 0rpx;
|
|
|
+ line-height: 36rpx;
|
|
|
+ color: rgba(102, 102, 102, 1);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
- .grid-text {
|
|
|
- font-size: 14px;
|
|
|
- color: #909399;
|
|
|
- padding: 10rpx 0 20rpx 0rpx;
|
|
|
- /* #ifndef APP-PLUS */
|
|
|
- box-sizing: border-box;
|
|
|
- /* #endif */
|
|
|
- }
|
|
|
+ }
|
|
|
|
|
|
+ .list-box {
|
|
|
+ padding: 16rpx 40rpx;
|
|
|
|
|
|
- .grid-box {
|
|
|
+ .price-card {
|
|
|
display: flex;
|
|
|
align-items: center;
|
|
|
- justify-content: center;
|
|
|
- flex-direction: column;
|
|
|
- position: relative;
|
|
|
-
|
|
|
- .item-badge {
|
|
|
- position: absolute;
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- .price-box {
|
|
|
- display: flex;
|
|
|
- align-content: center;
|
|
|
justify-content: space-between;
|
|
|
- // padding: 12px;
|
|
|
|
|
|
.price-item {
|
|
|
- width: 50%;
|
|
|
- padding: 12px;
|
|
|
display: flex;
|
|
|
- flex-direction: column;
|
|
|
align-items: center;
|
|
|
- justify-content: center;
|
|
|
-
|
|
|
- .user-name-box {
|
|
|
- display: flex;
|
|
|
- flex-direction: column;
|
|
|
- align-items: center;
|
|
|
- justify-content: center;
|
|
|
+ flex-direction: column;
|
|
|
|
|
|
- padding: 12px 12px 0;
|
|
|
+ .price-name {
|
|
|
+ font-size: 28rpx;
|
|
|
+ font-weight: 400;
|
|
|
+ line-height: 42rpx;
|
|
|
+ color: rgba(102, 102, 102, 1);
|
|
|
+>>>>>>> 8343935 (fix: 代码合并)
|
|
|
+ }
|
|
|
|
|
|
- .user-avatar {}
|
|
|
+ .price-data {
|
|
|
+ font-size: 48rpx;
|
|
|
+ font-weight: 400;
|
|
|
+ line-height: 72rpx;
|
|
|
+ color: rgba(51, 51, 51, 1);
|
|
|
+ }
|
|
|
|
|
|
- .user-name {
|
|
|
- font-size: 18px;
|
|
|
- font-weight: 700;
|
|
|
- line-height: 21.09px;
|
|
|
- color: rgba(51, 51, 51, 1);
|
|
|
- margin-left: 12px;
|
|
|
- }
|
|
|
+ .grid-min-price {
|
|
|
+ font-size: 24rpx;
|
|
|
+ font-weight: 400;
|
|
|
+ line-height: 36rpx;
|
|
|
+ color: rgba(153, 153, 153, 1);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -770,6 +781,7 @@ onShow(() => {
|
|
|
|
|
|
}
|
|
|
}
|
|
|
+<<<<<<< HEAD
|
|
|
|
|
|
.status-card {
|
|
|
display: grid;
|
|
|
@@ -829,30 +841,31 @@ onShow(() => {
|
|
|
color: rgba(102, 102, 102, 1);
|
|
|
}
|
|
|
=======
|
|
|
+=======
|
|
|
+>>>>>>> 8343935 (fix: 代码合并)
|
|
|
|
|
|
- .service-list {
|
|
|
- padding-bottom: 12px;
|
|
|
- }
|
|
|
-
|
|
|
- .grid-text {
|
|
|
- font-size: 14px;
|
|
|
- color: #909399;
|
|
|
- padding: 10rpx 0 20rpx 0rpx;
|
|
|
- /* #ifndef APP-PLUS */
|
|
|
- box-sizing: border-box;
|
|
|
- /* #endif */
|
|
|
- }
|
|
|
+ .status-card {
|
|
|
+ display: grid;
|
|
|
+ grid-template-columns: repeat(3, 1fr);
|
|
|
+ gap: 48rpx;
|
|
|
|
|
|
- .grid-box {
|
|
|
+ /* 网格项之间的间距 */
|
|
|
+ .status-card-item {
|
|
|
display: flex;
|
|
|
align-items: center;
|
|
|
justify-content: center;
|
|
|
flex-direction: column;
|
|
|
- position: relative;
|
|
|
|
|
|
- .item-badge {
|
|
|
- position: absolute;
|
|
|
+ .grid-img-box {
|
|
|
+ padding: 35rpx;
|
|
|
+ border-radius: 50%;
|
|
|
+ background: rgba(249, 250, 251, 1);
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ justify-content: center;
|
|
|
+ margin-bottom: 18rpx;
|
|
|
}
|
|
|
+<<<<<<< HEAD
|
|
|
}
|
|
|
|
|
|
.price-box {
|
|
|
@@ -927,6 +940,41 @@ onShow(() => {
|
|
|
.rate-count {
|
|
|
color: rgba(237, 123, 47, 1);
|
|
|
>>>>>>> 3e2be9f (fetch:详情tabs/用户新增地址)
|
|
|
+=======
|
|
|
+
|
|
|
+ .grid-text {
|
|
|
+ font-size: 28rpx;
|
|
|
+ font-weight: 400;
|
|
|
+ line-height: 42rpx;
|
|
|
+ color: rgba(51, 51, 51, 1);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ .count-card {
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ .count-list {
|
|
|
+ display: grid;
|
|
|
+ grid-template-columns: repeat(4, 1fr);
|
|
|
+ /* 3 列，每列等宽 */
|
|
|
+ gap: 32rpx;
|
|
|
+
|
|
|
+ /* 网格项之间的间距 */
|
|
|
+ .count-item {
|
|
|
+ display: flex;
|
|
|
+ flex-direction: column;
|
|
|
+ align-items: center;
|
|
|
+ justify-content: center;
|
|
|
+
|
|
|
+ .count-item-text {
|
|
|
+ font-size: 28rpx;
|
|
|
+ font-weight: 400;
|
|
|
+ line-height: 42rpx;
|
|
|
+ color: rgba(102, 102, 102, 1);
|
|
|
+ }
|
|
|
+>>>>>>> 8343935 (fix: 代码合并)
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -960,6 +1008,9 @@ onShow(() => {
|
|
|
|
|
|
}
|
|
|
<<<<<<< HEAD
|
|
|
+<<<<<<< HEAD
|
|
|
+=======
|
|
|
+>>>>>>> 8343935 (fix: 代码合并)
|
|
|
}
|
|
|
|
|
|
.mine-card {
|
|
|
@@ -977,6 +1028,9 @@ onShow(() => {
|
|
|
color: rgba(51, 51, 51, 1);
|
|
|
margin-bottom: 32rpx;
|
|
|
}
|
|
|
+<<<<<<< HEAD
|
|
|
=======
|
|
|
>>>>>>> 3e2be9f (fetch:详情tabs/用户新增地址)
|
|
|
+=======
|
|
|
+>>>>>>> 8343935 (fix: 代码合并)
|
|
|
</style>
|
chenjj