diff --git a/packages/user/index/index.css b/packages/user/index/index.css
index e049f4ee..d042f5c7 100644
--- a/packages/user/index/index.css
+++ b/packages/user/index/index.css
@@ -1,8 +1,13 @@
.header {
- margin-left: 20rpx;
- color: #222222;
- font-size: 28rpx;
- font-weight: bold;
+margin: 40rpx 0 45rpx;
+display: flex;
+flex-direction: column;
+align-items: center;
+}
+.avatar_pic {
+ width: 130rpx;
+ height: 130rpx;
+ border-radius: 50%;
}
.item{
display:flex;
@@ -70,4 +75,15 @@
font-size: 36rpx;
font-weight: 400;
line-height: 80rpx;
+}
+.u-upload__wrap__preview {
+ width: 130rpx;
+ height: 130rpx;
+ border-radius: 50% !important;
+}
+
+.u-upload__wrap__preview__image {
+ width: 100% !important;
+ height: 100% !important;
+ object-fit: cover;
}
\ No newline at end of file
diff --git a/packages/user/index/index.vue b/packages/user/index/index.vue
index bbfecfaf..355ec308 100644
--- a/packages/user/index/index.vue
+++ b/packages/user/index/index.vue
@@ -1,5 +1,16 @@
+
+
@@ -51,11 +62,12 @@
+
+
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 120cf399..6eec1e3e 100644
--- a/pages.json
+++ b/pages.json
@@ -247,6 +247,13 @@
"nav-footer": "/components/nav/nav"
}
}
+ },
+ {
+ "path": "replenishInfo/index",
+ "style": {
+ "navigationBarTitleText": "",
+ "navigationBarBackgroundColor": "#F9F9F9"
+ }
},
{
"path": "uploadAvatar/index",
diff --git a/pages/user/index.css b/pages/user/index.css
index 7e5e0a1b..5fd07ece 100644
--- a/pages/user/index.css
+++ b/pages/user/index.css
@@ -1,10 +1,15 @@
+page {
+ background: #F6F7FB;
+}
.conatiner {
- height: 100%;
- background: linear-gradient(to bottom, #FFE7E1, #FFFFFF);
+ /* height: 100%; */
+ /* height: 578rpx; */
+ /* background: linear-gradient(to bottom, #FFE7E1, #FFFFFF); */
+ /* background: linear-gradient( 359deg, rgba(255,255,255,0) 0%, #FDD9CA 100%); */
+ background: url('http://127.0.0.1:5500/assets/page_user_Group_1584.png');
+ background-size: contain;
+ background-repeat: no-repeat;
background-attachment: fixed;
- background-size: cover;
- padding-top: 20rpx;
- padding-bottom: 20%;
}
/* 头部 */
@@ -12,15 +17,16 @@
display: flex;
align-items: center;
margin-left: 25rpx;
- /* margin-top: 83rpx; */
- margin-bottom: 30rpx;
- pointer-events: none;
+ margin-right: 20rpx;
+ margin-top: 37rpx;
+ margin-bottom: 35rpx;
+ /* pointer-events: none; */
}
/* 头像 */
.avatar-container {
display: flex;
- width: 120rpx;
- height: 120rpx;
+ width: 130rpx;
+ height: 130rpx;
border-radius: 50%;
overflow: hidden;
background-color: #FF7354;
@@ -31,20 +37,109 @@
}
/* 头像图片 */
.avatar {
- /* width: 100%;
- height: 100%; */
- width: 73rpx;
- height: 69rpx;
- /* margin-bottom: 20rpx; */
+ width: 130rpx;
+ height: 130rpx;
pointer-events: auto;
border-radius: 50%;
overflow: hidden;
}
+.avatar_right {
+ flex: 1;
+}
+.avatar_title {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
+.avatar_setting {
+ display: flex;
+ pointer-events: auto;
+}
+.avatar_setting > image {
+ width: 34rpx;
+ height: 34rpx;
+}
+.avatar_setting > image:first-child {
+ margin-right: 40rpx;
+}
+
/* 登录/注册 */
.login-btn {
font-size: 36rpx;
pointer-events: auto;
}
+.avater_mobile {
+ margin-top: 10rpx;
+}
+.center {
+ position: relative;
+ margin: 0 20rpx;
+ height: 350rpx;
+}
+
+.gold_container {
+ /* width: 710rpx; */
+ height: 127rpx;
+ background: linear-gradient( 90deg, #FFE9A3 0%, rgba(232,127,0,0.8) 100%);
+ box-shadow: inset 0rpx 1rpx 2rpx 0rpx #E2C47C;
+ border-radius: 30rpx 30rpx 30rpx 30rpx;
+ margin: 37rpx 0 0;
+ position: relative;
+}
+.gold_title {
+ display: flex;
+ align-items: center;
+ padding-top: 16rpx;
+}
+.gold {
+ margin-left: 37rpx;
+ font-weight: normal;
+font-size: 34rpx;
+color: #7F3907;
+}
+.monenyt {
+ /* display: inline-block; */
+ margin-left: 17rpx;
+ margin-right: 37rpx;
+ font-weight: 400;
+ font-size: 40rpx;
+ color: #7F3907;
+}
+.price {
+ margin-left: 37rpx;
+ font-weight: normal;
+font-size: 26rpx;
+color: #7F3907;
+margin-right: 20rpx;
+}
+.gold_pic {
+ width: 140rpx;
+ height: 113rpx;
+ position: absolute;
+ top: 0;
+ right: 39rpx;
+}
+.main {
+ margin: 0 20rpx;
+ border-radius: 20rpx 20rpx 20rpx 20rpx;
+ background: #FFFFFF;
+}
+.main1 {
+ width: 100%;
+ margin: 0;
+ position: absolute;
+ top: 80rpx;
+}
+.main_title {
+ padding-top: 25rpx;
+ margin: 0 0 40rpx 30rpx;
+ font-weight: 600;
+ font-size: 36rpx;
+ color: #222222;
+}
+.margin20 {
+ margin-top: 20rpx;
+}
.section {
display: flex;
@@ -54,6 +149,14 @@
margin-right: 20rpx;
margin-bottom: 21rpx;
}
+.section1 {
+ justify-content: space-around;
+}
+.section_label {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+}
.order {
margin-top: 24rpx;
}
@@ -80,11 +183,12 @@
.item1 {
display: flex;
justify-content: space-around;
- width: 100%;
- height: 220rpx;
- background-color: #FFFFFF;
align-items: center;
- border-radius: 30rpx;
+ border-radius: 20rpx;
+ padding-bottom: 25rpx;
+}
+.padding_bottom0 {
+ padding-bottom: 0;
}
.item-owner {
@@ -140,11 +244,30 @@
font-size: 32rpx;
font-weight: bold;
}
-
+.customer {
+ width: 130rpx;
+ height: 130rpx;
+ position: fixed;
+ right: 0;
+ bottom: 212rpx;
+ background: rgba(255,55,11,0.6);
+ border-radius: 50%;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ font-weight: normal;
+font-size: 28rpx;
+color: #FFFFFF;
+}
+.customer > image {
+ width: 50rpx;
+ height: 55rpx;
+}
.uicon-volume {
font-size: 28rpx !important;
}
.u-grid-item {
- margin-bottom: 43rpx;
-}
\ No newline at end of file
+ margin-bottom: 36rpx;
+}
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 4d49d2a7..b9e5afd7 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -6,10 +6,37 @@
:src="userInfo.userPic || 'https://wechat-img-file.oss-cn-beijing.aliyuncs.com/person/Group_309.png'"
mode="" />
- {{userInfo.user_name ? userInfo.user_name : '登录/注册'}}
+
+
+ {{userInfo.user_name ? userInfo.user_name : '登录/注册'}}
+
+
+
+
+
+ {{ phoneNum }}
+
+
+
+
+ 10010
+ 积分
+
+
+ 0.00
+ 繁华币
+
+
+ 0.00元
+ 物业费公积金
+
+
+ 0元
+ 红包卡券
+
-
+
-
-
-
-
-
+ -->
+
+
+
+ 金币 0 | 价值0.00元
-
-
- 申请业主
-
-
-
- 我的设备
-
-
-
- 我的申请
+
+
+
+ 物业服务
+
+
+
+
+
+
+
+ 申请业主
+
+
+
+ 我的设备
+
+
+
+ 我的申请
+
-
-
- 我的订单
-
-
-
-
- {{item.name}}
-
-
-
-
-
- 功能服务
-
-
-
-
- {{item.name}}
-
-
-
-
-
-
- 商家服务
-
+
+ 电商服务
+
-
-
- {{item.name}}
-
-
+
+
+ {{item.name}}
+
+
+
+ 到家服务
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+ 门店服务
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+
+ 客服
+
+
@@ -97,124 +134,98 @@
data() {
return {
top: 0,
- order_List: [{
- image: "https://zhsq.hshuishang.com/Public/img/common/order12.png",
- name: "物业账单",
- type: "h5",
+ networkList: [{
+ image: "http://127.0.0.1:5500/assets/page_user_Group_1568.png",
+ name: "我的订单",
url: "",
},
{
- image: "https://zhsq.hshuishang.com/Public/img/common/order04.png",
- name: "社区服务",
- type: "h5",
- url: "/packages/communityService/index/index",
- },
- {
- image: "https://zhsq.hshuishang.com/Public/img/common/order11.png",
- name: "商家优惠",
- type: "h5",
+ image: "http://127.0.0.1:5500/assets/page_user_Group_1567.png",
+ name: "我的拼团",
url: "",
},
{
- image: "https://zhsq.hshuishang.com/Public/img/common/order08.png",
- name: "积分商城",
- type: "h5",
+ image: "http://127.0.0.1:5500/assets/page_user_Group_1565.png",
+ name: "我的收藏",
url: "",
},
{
- image: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/User/_assets/orderIcon_1.png",
- name: "社区健康",
- type: "h5",
+ image: "http://127.0.0.1:5500/assets/page_user_Group_1566.png",
+ name: "售后服务",
url: "",
},
{
- image: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/User/_assets/orderIcon_2.png",
- name: "生活缴费",
- type: "h5",
+ image: "http://127.0.0.1:5500/assets/page_user_Group_1563.png",
+ name: "收货地址",
url: "",
},
{
- image: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/User/_assets/orderIcon_3.png",
- name: "社区商城",
- type: "h5",
+ image: "http://127.0.0.1:5500/assets/page_user_Group_1564.png",
+ name: "购物车",
url: "",
},
- {
- image: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/User/_assets/orderIcon_4.png",
- name: "周边商超",
- type: "h5",
- url: "",
- },
-
- ],
- functional_List: [{
- "image": "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/person/Group_25.png",
- "name": "生活缴费",
- "url": "",
- "type": "h5"
- },
- {
- "image": "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/person/Group_26.png",
- "name": "优惠卡券",
- // "url": "/packages/user/coupon/index",
- "type": "h5"
- },
- {
- "image": "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/person/Group_35.png",
- "name": "我的卡券",
- "url": "",
- "type": "h5"
- },
- {
- "image": "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/person/Group_30.png",
- "name": "营销推广",
- "url": "/packages/user/marketing/index",
- "type": "h5"
- },
- {
- "image": "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/person/Group_27.png",
- "name": "个人设置",
- "url": "/packages/user/index/index",
- "type": "h5"
- },
- {
- "image": "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/person/Group_29.png",
- "name": "平台客服",
- "url": "/packages/user/customerService/index",
- "type": "h5"
- },
-
- // {
- // "image": "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/repairList.png",
- // "name": "报修列表",
- // "url": "/packages/OneRepair/pages/OwnerRepairList/OwnerRepairList",
- // "type": "h5"
- // },
-
- ],
- shopServer: [{
- image: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/Group_774.png",
- name: "订单核销",
- type: "",
- url: "/shopWrite/index/index",
- },
- {
- image: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/Group_774.png",
- name: "核销列表",
- type: "",
- url: "/shopWrite/list/index",
- },
],
+ visitList: [{
+ image: "http://127.0.0.1:5500/assets/page_user_Group_1572.png",
+ name: "服务工单",
+ url: "",
+ },
+ {
+ image: "http://127.0.0.1:5500/assets/page_user_Group_1573.png",
+ name: "服务地址",
+ url: "",
+ },
+ {
+ image: "http://127.0.0.1:5500/assets/page_user_Group_1574.png",
+ name: "服务卡",
+ url: "",
+ }
+ ],
+ shopList: [{
+ image: "http://127.0.0.1:5500/assets/page_user_Group_1580.png",
+ name: "附近门店",
+ url: "",
+ },
+ {
+ image: "http://127.0.0.1:5500/assets/page_user_Group_1581.png",
+ name: "服务券",
+ url: "",
+ },
+ {
+ image: "http://127.0.0.1:5500/assets/page_user_Group_1582.png",
+ name: "支付记录",
+ url: "",
+ }
+ ],
+
+
userInfo: {},
isShop: false,
+ phoneNum: uni.getStorageSync('phone'),
}
},
methods: {
// 头像点击
toLogin() {
+ NavgateTo('/packages/user/replenishInfo/index');
+ },
+
+ // 刷新
+ headerRefreshClick() {
+ console.log('刷新')
+ },
+
+ // 设置
+ headerSettingsClick() {
+ console.log('设置')
NavgateTo('/packages/user/index/index');
},
+
+ // 客服
+ headerCustomerClick() {
+ console.log('客服')
+ },
// 积分跳转
handlePointsClick() {
diff --git a/unpackage/dist/dev/mp-weixin/app.json b/unpackage/dist/dev/mp-weixin/app.json
index bb91ff41..82e3fcd4 100644
--- a/unpackage/dist/dev/mp-weixin/app.json
+++ b/unpackage/dist/dev/mp-weixin/app.json
@@ -66,6 +66,7 @@
"root": "packages/user",
"pages": [
"index/index",
+ "replenishInfo/index",
"uploadAvatar/index",
"resetPwd/index",
"points/index",
diff --git a/unpackage/dist/dev/mp-weixin/project.private.config.json b/unpackage/dist/dev/mp-weixin/project.private.config.json
index 7c90ee6e..af0555cc 100644
--- a/unpackage/dist/dev/mp-weixin/project.private.config.json
+++ b/unpackage/dist/dev/mp-weixin/project.private.config.json
@@ -1,70 +1,38 @@
{
- "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
- "projectname": "uniapp-ZHSQ",
- "setting": {
- "compileHotReLoad": true
- },
"condition": {
"miniprogram": {
"list": [
{
-<<<<<<< HEAD
- "name": "师傅端详情页",
- "pathName": "packages/workOrderDashboard/detail/index",
- "query": "id=12",
+ "name": "packages/user/replenishInfo/index",
+ "pathName": "packages/user/replenishInfo/index",
+ "query": "",
"scene": null,
"launchMode": "default"
},
{
- "name": "详情页",
- "pathName": "packages/community/repairDetail/index",
- "query": "id=12",
- "launchMode": "default",
- "scene": null
- },
- {
-=======
->>>>>>> e4912a82a85c39559af5bbf9f538f54bfe7ecde7
- "name": "packages/localLife/comment/index",
- "pathName": "packages/localLife/comment/index",
- "query": "",
- "launchMode": "default",
- "scene": null
- },
- {
-<<<<<<< HEAD
- "name": "师傅端列表",
- "pathName": "packages/workOrderDashboard/index/index",
-=======
- "name": "packages/localLife/detail/index",
- "pathName": "packages/localLife/detail/index",
->>>>>>> e4912a82a85c39559af5bbf9f538f54bfe7ecde7
- "query": "",
- "launchMode": "default",
- "scene": null
- },
- {
-<<<<<<< HEAD
- "name": "商家入驻",
- "pathName": "packages/shopEnter/apply/index",
-=======
- "name": "packages/localLife/index/index",
- "pathName": "packages/localLife/index/index",
->>>>>>> e4912a82a85c39559af5bbf9f538f54bfe7ecde7
- "query": "",
- "launchMode": "default",
- "scene": null
- },
- {
- "name": "保修填写",
+ "name": "packages/user/",
"pathName": "packages/community/oneRepair/index",
"query": "",
"launchMode": "default",
"scene": null
},
{
- "name": "packages/community/repairList/index",
- "pathName": "packages/community/repairList/index",
+ "name": "packages/user/index/index",
+ "pathName": "packages/user/index/index",
+ "query": "",
+ "launchMode": "default",
+ "scene": null
+ },
+ {
+ "name": "pages/user/index",
+ "pathName": "pages/user/index",
+ "query": "",
+ "launchMode": "default",
+ "scene": null
+ },
+ {
+ "name": "packages/localLife/index/index",
+ "pathName": "packages/localLife/shopList/index",
"query": "",
"launchMode": "default",
"scene": null