|
|
@@ -1,6 +1,4 @@
|
|
|
<template>
|
|
|
-<<<<<<< HEAD
|
|
|
-<<<<<<< HEAD
|
|
|
<view class="mine-container">
|
|
|
|
|
|
<view class="mine-header">
|
|
|
@@ -9,49 +7,6 @@
|
|
|
<text class="info-name">{{ userInfo.nickName }}</text>
|
|
|
<text class="info-id">ID: 88888888</text>
|
|
|
<text class="info-edit" @click="handLsetTing">设置> </text>
|
|
|
-=======
|
|
|
- <view class="mine-container" :style="{ height: `${windowHeight}px` }">
|
|
|
- <view class="mine-top-bgc"></view>
|
|
|
- <view class="mine-box">
|
|
|
- <view class="mine-user">
|
|
|
- <view class="user-name-box">
|
|
|
- <view class="user-avatar">
|
|
|
- <up-avatar :src="userInfo.avatar" shape="square"></up-avatar>
|
|
|
- </view>
|
|
|
- <view class="user-name">{{ userInfo.nickName }}</view>
|
|
|
- <view class="grid-box" v-for="(listItem, listIndex) in setTing" :key="listIndex">
|
|
|
- <!-- <up-badge :isDot="true" type="success" class="item-badge"></up-badge> -->
|
|
|
- <up-icon :customStyle="{ paddingTop: 20 + 'rpx' }" :name="listItem.iconName" :size="22"
|
|
|
- @click="handLsetTing"></up-icon>
|
|
|
- <text class="grid-text">{{ listItem.name }}</text>
|
|
|
-
|
|
|
- </view>
|
|
|
- </view>
|
|
|
- <up-divider></up-divider>
|
|
|
- <view class="service-list">
|
|
|
- <up-grid :border="false" col="4">
|
|
|
- <up-grid-item v-for="(listItem, listIndex) in serviceList" :key="listIndex"
|
|
|
- @click="onClick(listItem)">
|
|
|
- <view class="grid-box">
|
|
|
- <!-- <up-badge :isDot="true" type="success" class="item-badge"></up-badge> -->
|
|
|
- <up-icon :customStyle="{ paddingTop: 20 + 'rpx' }" :name="listItem.iconName"
|
|
|
- :size="22"></up-icon>
|
|
|
- <text class="grid-text">{{ listItem.name }}</text>
|
|
|
- </view>
|
|
|
- </up-grid-item>
|
|
|
- </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>
|
|
|
|
|
|
@@ -117,10 +72,6 @@
|
|
|
</template>
|
|
|
|
|
|
<script setup>
|
|
|
-<<<<<<< HEAD
|
|
|
-<<<<<<< HEAD
|
|
|
-=======
|
|
|
->>>>>>> 8343935 (fix: 代码合并)
|
|
|
import { onMounted, ref } from 'vue';
|
|
|
import {
|
|
|
onLoad,
|
|
|
@@ -130,7 +81,6 @@ import store from "@/store"
|
|
|
const userInfo = ref({
|
|
|
avatar: '/static/serverImg/mine/user.png'
|
|
|
})
|
|
|
-<<<<<<< HEAD
|
|
|
|
|
|
const rateValue = ref(3)
|
|
|
const priceList = [{
|
|
|
@@ -288,199 +238,11 @@ const getDetails = async () => {
|
|
|
}
|
|
|
|
|
|
const handLsetTing = () => {
|
|
|
-=======
|
|
|
- import {
|
|
|
- onMounted,
|
|
|
- ref
|
|
|
- } from 'vue';
|
|
|
- import {
|
|
|
- getVolunteerAccount
|
|
|
- } from '@/api/volunteer.js'
|
|
|
- import {
|
|
|
- onLoad,
|
|
|
- onShow
|
|
|
- } from '@dcloudio/uni-app';
|
|
|
- import store from "@/store"
|
|
|
- const userType = uni.getStorageSync('userType') //读取本地存储
|
|
|
-=======
|
|
|
->>>>>>> 8343935 (fix: 代码合并)
|
|
|
-
|
|
|
-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'
|
|
|
-
|
|
|
-},
|
|
|
-{
|
|
|
- name: '完成单',
|
|
|
- key: 'orderCount'
|
|
|
-
|
|
|
-},
|
|
|
-{
|
|
|
- name: '取消单',
|
|
|
- key: 'orderCount'
|
|
|
-
|
|
|
-}
|
|
|
-]);
|
|
|
-const data = ref({
|
|
|
- balance: 0.0,
|
|
|
- orderCount: 0,
|
|
|
-});
|
|
|
-
|
|
|
-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 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);
|
|
|
-
|
|
|
- } catch (error) {
|
|
|
- console.log('error', error);
|
|
|
-
|
|
|
- }
|
|
|
-}
|
|
|
-
|
|
|
-<<<<<<< HEAD
|
|
|
-
|
|
|
-
|
|
|
- const geUserInfo = () => {
|
|
|
- console.log(store.state, '>>>>99');
|
|
|
- userInfo.value = store.state.user
|
|
|
- }
|
|
|
-
|
|
|
- // 设置
|
|
|
- const handLsetTing = () => {
|
|
|
->>>>>>> 3e2be9f (fetch:详情tabs/用户新增地址)
|
|
|
-=======
|
|
|
-const handLsetTing = () => {
|
|
|
->>>>>>> 8343935 (fix: 代码合并)
|
|
|
console.log('123')
|
|
|
uni.navigateTo({
|
|
|
url: '/pages_mine/pages/setupUser/index'
|
|
|
})
|
|
|
}
|
|
|
-<<<<<<< HEAD
|
|
|
-<<<<<<< HEAD
|
|
|
|
|
|
|
|
|
|
|
|
@@ -569,139 +331,6 @@ onShow(() => {
|
|
|
color: rgba(51, 51, 51, 1);
|
|
|
}
|
|
|
|
|
|
- .grid-min-price {
|
|
|
- font-size: 24rpx;
|
|
|
- font-weight: 400;
|
|
|
- line-height: 36rpx;
|
|
|
- color: rgba(153, 153, 153, 1);
|
|
|
-=======
|
|
|
- onShow(() => {
|
|
|
- geUserInfo();
|
|
|
-=======
|
|
|
->>>>>>> 8343935 (fix: 代码合并)
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-const geUserInfo = () => {
|
|
|
- console.log(store.state, '>>>>99');
|
|
|
- userInfo.value = store.state.user
|
|
|
-}
|
|
|
-
|
|
|
-onShow(() => {
|
|
|
- geUserInfo();
|
|
|
-
|
|
|
-})
|
|
|
-
|
|
|
-</script>
|
|
|
-
|
|
|
-<style lang="scss" scoped>
|
|
|
-.mine-container {
|
|
|
- position: fixed;
|
|
|
- left: 0;
|
|
|
- top: 0;
|
|
|
- right: 0;
|
|
|
- bottom: 0;
|
|
|
- background: rgba(245, 245, 245, 1);
|
|
|
- overflow-y: auto;
|
|
|
-
|
|
|
- .mine-header {
|
|
|
- padding: 42rpx 44rpx;
|
|
|
- background: #fff;
|
|
|
- display: flex;
|
|
|
-
|
|
|
- .header-info {
|
|
|
- display: flex;
|
|
|
- flex-direction: column;
|
|
|
- margin-left: 36rpx;
|
|
|
-
|
|
|
-<<<<<<< HEAD
|
|
|
- }
|
|
|
-
|
|
|
- .mine-box {
|
|
|
- position: absolute;
|
|
|
- top: 40px;
|
|
|
- left: 12px;
|
|
|
- right: 12px;
|
|
|
- bottom: 0px;
|
|
|
- overflow-y: auto;
|
|
|
-
|
|
|
-
|
|
|
- .mine-user {
|
|
|
- border-radius: 8px;
|
|
|
- background: rgba(255, 255, 255, 1);
|
|
|
- margin-bottom: 12px;
|
|
|
-
|
|
|
- .user-name-box {
|
|
|
- display: flex;
|
|
|
- justify-content: space-between;
|
|
|
- align-items: center;
|
|
|
- padding: 12px 12px 0;
|
|
|
-
|
|
|
- .user-avatar {}
|
|
|
-
|
|
|
- .user-name {
|
|
|
- font-size: 18px;
|
|
|
- font-weight: 700;
|
|
|
- line-height: 21.09px;
|
|
|
- color: rgba(51, 51, 51, 1);
|
|
|
- margin-left: 12px;
|
|
|
- }
|
|
|
->>>>>>> 3e2be9f (fetch:详情tabs/用户新增地址)
|
|
|
-=======
|
|
|
- .info-name {
|
|
|
- font-size: 36rpx;
|
|
|
- font-weight: 400;
|
|
|
- line-height: 54rpx;
|
|
|
- color: rgba(51, 51, 51, 1);
|
|
|
- }
|
|
|
-
|
|
|
- .info-id {
|
|
|
- font-size: 28rpx;
|
|
|
- font-weight: 400;
|
|
|
- letter-spacing: 0rpx;
|
|
|
- line-height: 42rpx;
|
|
|
- color: rgba(153, 153, 153, 1);
|
|
|
- }
|
|
|
-
|
|
|
- .info-edit {
|
|
|
- font-size: 24rpx;
|
|
|
- font-weight: 400;
|
|
|
- letter-spacing: 0rpx;
|
|
|
- line-height: 36rpx;
|
|
|
- color: rgba(102, 102, 102, 1);
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- .list-box {
|
|
|
- padding: 16rpx 40rpx;
|
|
|
-
|
|
|
- .price-card {
|
|
|
- display: flex;
|
|
|
- align-items: center;
|
|
|
- justify-content: space-between;
|
|
|
-
|
|
|
- .price-item {
|
|
|
- display: flex;
|
|
|
- align-items: center;
|
|
|
- flex-direction: column;
|
|
|
-
|
|
|
- .price-name {
|
|
|
- font-size: 28rpx;
|
|
|
- font-weight: 400;
|
|
|
- line-height: 42rpx;
|
|
|
- color: rgba(102, 102, 102, 1);
|
|
|
->>>>>>> 8343935 (fix: 代码合并)
|
|
|
- }
|
|
|
-
|
|
|
- .price-data {
|
|
|
- font-size: 48rpx;
|
|
|
- font-weight: 400;
|
|
|
- line-height: 72rpx;
|
|
|
- color: rgba(51, 51, 51, 1);
|
|
|
- }
|
|
|
-
|
|
|
.grid-min-price {
|
|
|
font-size: 24rpx;
|
|
|
font-weight: 400;
|
|
|
@@ -781,7 +410,6 @@ onShow(() => {
|
|
|
|
|
|
}
|
|
|
}
|
|
|
-<<<<<<< HEAD
|
|
|
|
|
|
.status-card {
|
|
|
display: grid;
|
|
|
@@ -811,143 +439,6 @@ onShow(() => {
|
|
|
line-height: 42rpx;
|
|
|
color: rgba(51, 51, 51, 1);
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
- }
|
|
|
-<<<<<<< HEAD
|
|
|
- }
|
|
|
-
|
|
|
- .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: 代码合并)
|
|
|
-
|
|
|
- .status-card {
|
|
|
- display: grid;
|
|
|
- grid-template-columns: repeat(3, 1fr);
|
|
|
- gap: 48rpx;
|
|
|
-
|
|
|
- /* 网格项之间的间距 */
|
|
|
- .status-card-item {
|
|
|
- display: flex;
|
|
|
- align-items: center;
|
|
|
- justify-content: center;
|
|
|
- flex-direction: column;
|
|
|
-
|
|
|
- .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 {
|
|
|
- display: flex;
|
|
|
- align-content: center;
|
|
|
- justify-content: space-between;
|
|
|
- // padding: 12px;
|
|
|
-
|
|
|
- .price-item {
|
|
|
- width: 50%;
|
|
|
- padding: 12px;
|
|
|
-
|
|
|
- .price-name {
|
|
|
- font-size: 16px;
|
|
|
- font-weight: 700;
|
|
|
- line-height: 23.17px;
|
|
|
- color: rgba(51, 51, 51, 1);
|
|
|
- margin-bottom: 12px;
|
|
|
- }
|
|
|
-
|
|
|
- .price-data {
|
|
|
- font-size: 20px;
|
|
|
- font-weight: 700;
|
|
|
- line-height: 23.44px;
|
|
|
- color: rgba(51, 51, 51, 1);
|
|
|
- }
|
|
|
-
|
|
|
- .grid-min-price {
|
|
|
- font-size: 12px;
|
|
|
- font-weight: 500;
|
|
|
- line-height: 17.38px;
|
|
|
- color: rgba(153, 153, 153, 1);
|
|
|
- margin-top: 4px;
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- .price-item:first-child {
|
|
|
- border-right: 1px solid #dcdfe6;
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- .rate-box {
|
|
|
- display: flex;
|
|
|
- align-items: center;
|
|
|
- justify-content: space-between;
|
|
|
-
|
|
|
- .rate-left {
|
|
|
- font-size: 14px;
|
|
|
- font-weight: 500;
|
|
|
- letter-spacing: 0px;
|
|
|
- line-height: 20.27px;
|
|
|
- color: rgba(0, 0, 0, 1);
|
|
|
-
|
|
|
- display: flex;
|
|
|
- align-items: center;
|
|
|
- justify-content: left;
|
|
|
-
|
|
|
- flex: 1;
|
|
|
- }
|
|
|
-
|
|
|
- .rate-rigth {
|
|
|
- font-size: 14px;
|
|
|
- font-weight: 500;
|
|
|
- letter-spacing: 0px;
|
|
|
- line-height: 20.27px;
|
|
|
- color: rgba(0, 0, 0, 1);
|
|
|
-
|
|
|
- .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);
|
|
|
- }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -974,7 +465,6 @@ onShow(() => {
|
|
|
line-height: 42rpx;
|
|
|
color: rgba(102, 102, 102, 1);
|
|
|
}
|
|
|
->>>>>>> 8343935 (fix: 代码合并)
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -1007,10 +497,6 @@ onShow(() => {
|
|
|
}
|
|
|
|
|
|
}
|
|
|
-<<<<<<< HEAD
|
|
|
-<<<<<<< HEAD
|
|
|
-=======
|
|
|
->>>>>>> 8343935 (fix: 代码合并)
|
|
|
}
|
|
|
|
|
|
.mine-card {
|
|
|
@@ -1028,9 +514,4 @@ onShow(() => {
|
|
|
color: rgba(51, 51, 51, 1);
|
|
|
margin-bottom: 32rpx;
|
|
|
}
|
|
|
-<<<<<<< HEAD
|
|
|
-=======
|
|
|
->>>>>>> 3e2be9f (fetch:详情tabs/用户新增地址)
|
|
|
-=======
|
|
|
->>>>>>> 8343935 (fix: 代码合并)
|
|
|
</style>
|
chenjj