diff --git a/components/myAvatar/myAvatar.vue b/components/myAvatar/myAvatar.vue
new file mode 100644
index 0000000..49bc3ef
--- /dev/null
+++ b/components/myAvatar/myAvatar.vue
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 顾发航
+
+
+
+
+
+
diff --git a/pages/bindCompony/bindCompony.vue b/components/myForm/myForm.vue
similarity index 53%
rename from pages/bindCompony/bindCompony.vue
rename to components/myForm/myForm.vue
index 09060bd..e1cee44 100644
--- a/pages/bindCompony/bindCompony.vue
+++ b/components/myForm/myForm.vue
@@ -11,52 +11,20 @@
-
-
diff --git a/pages.json b/pages.json
index 47542bd..75b3285 100644
--- a/pages.json
+++ b/pages.json
@@ -44,7 +44,7 @@
}
},
{
- "path": "pages/news/news",
+ "path": "pages/report/news/news",
"style": {
"navigationBarTitleText": "行内新闻",
"navigationBarTextStyle": "white",
@@ -53,7 +53,7 @@
}
}, {
- "path": "pages/certifiedCj/certifiedCj",
+ "path": "pages/report/certifiedCj/certifiedCj",
"style": {
"navigationBarTitleText": "认证厂家",
"navigationBarTextStyle": "white",
@@ -88,7 +88,7 @@
}
}, {
- "path": "pages/bindCompony/bindCompony",
+ "path": "pages/my/bindCompony/bindCompony",
"style": {
"navigationBarTitleText": "绑定公司",
"navigationBarTextStyle": "white",
@@ -97,13 +97,21 @@
}
}, {
- "path": "pages/browseHistory/browseHistory",
+ "path": "pages/my/browseHistory/browseHistory",
"style": {
"navigationBarTitleText": "浏览记录",
"navigationBarTextStyle": "white",
"navigationBarBackgroundColor": "#12CA64",
"enablePullDownRefresh": false
}
+ }, {
+ "path": "pages/my/memberCenter/memberCenter",
+ "style": {
+ "navigationBarTitleText": "会员中心",
+ "navigationBarTextStyle": "white",
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": false
+ }
}
],
"tabBar": {
diff --git a/pages/my/bindCompony/bindCompony.vue b/pages/my/bindCompony/bindCompony.vue
new file mode 100644
index 0000000..a8b567a
--- /dev/null
+++ b/pages/my/bindCompony/bindCompony.vue
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/browseHistory/browseHistory.vue b/pages/my/browseHistory/browseHistory.vue
similarity index 100%
rename from pages/browseHistory/browseHistory.vue
rename to pages/my/browseHistory/browseHistory.vue
diff --git a/pages/my/memberCenter/memberCenter.vue b/pages/my/memberCenter/memberCenter.vue
new file mode 100644
index 0000000..ddf81c7
--- /dev/null
+++ b/pages/my/memberCenter/memberCenter.vue
@@ -0,0 +1,91 @@
+
+
+
+
+
+
+
+
+ {{commitment}}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 6641a6f..92af0cf 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -4,31 +4,28 @@
-
-
-
-
-
-
-
-
-
-
-
- 顾发航
-
+
-
+
-
+
+
+
+
+
+
+
@@ -38,70 +35,65 @@
data() {
return {
show: false,
- avatar: '/static/my/avatar.png',
- normal: '/static/my/wo_icon_pthy.png',
- VIP: '/static/my/wo_icon_vip.png',
+ showM: false,
+ content: `138 1222 222
+ 是否拨打客服电话`,
+
}
},
methods: {
//跳转到绑定公司页面
bindCompany() {
uni.navigateTo({
- url: '/pages/bindCompony/bindCompony'
+ url: '/pages/my/bindCompony/bindCompony'
+ })
+ },
+ //跳转到会员中心页面
+ toMemberCenter() {
+ uni.navigateTo({
+ url: '/pages/my/memberCenter/memberCenter'
})
},
//跳转到浏览记录页面
toBrowseHistory() {
uni.navigateTo({
- url: '/pages/browseHistory/browseHistory?id=' + 1
+ url: '/pages/my/browseHistory/browseHistory?id=' + 1
})
},
//跳转到我的收藏页面
toMyCollect() {
uni.navigateTo({
- url: '/pages/browseHistory/browseHistory?id=' + 2
+ url: '/pages/my/browseHistory/browseHistory?id=' + 2
})
- }
+ },
+ // 联系客服模态框
+ showModal() {
+ this.showM = true
+ },
+ confirm() {
+ this.showM = false
+ let phone = '1381222222'
+ uni.makePhoneCall({
+ phoneNumber: phone,
+ success: function() {
+ console.log('拨打电话成功');
+ },
+ fail() {
+ console.log('打电话失败了');
+ }
+ })
+ },
+ cancel() {
+ this.showM = false
+ },
+ close() {
+ this.showM = false
+ },
}
}
diff --git a/pages/certifiedCj/certifiedCj.vue b/pages/report/certifiedCj/certifiedCj.vue
similarity index 100%
rename from pages/certifiedCj/certifiedCj.vue
rename to pages/report/certifiedCj/certifiedCj.vue
diff --git a/pages/news/news.vue b/pages/report/news/news.vue
similarity index 100%
rename from pages/news/news.vue
rename to pages/report/news/news.vue
diff --git a/pages/report/report.vue b/pages/report/report.vue
index 4c4efa8..56139b0 100644
--- a/pages/report/report.vue
+++ b/pages/report/report.vue
@@ -70,11 +70,11 @@
//点击行内新闻时
if (listIndex == 0) {
uni.navigateTo({
- url: '/pages/news/news'
+ url: '/pages/report/news/news'
})
} else if (listIndex == 2) {
uni.navigateTo({
- url: '/pages/certifiedCj/certifiedCj'
+ url: '/pages/report/certifiedCj/certifiedCj'
})
}
},
diff --git a/static/my/wo_icon_hyzxbj.png b/static/my/wo_icon_hyzxbj.png
new file mode 100644
index 0000000..17825ec
Binary files /dev/null and b/static/my/wo_icon_hyzxbj.png differ
diff --git a/static/styles/form.scss b/static/styles/form.scss
new file mode 100644
index 0000000..04de5ce
--- /dev/null
+++ b/static/styles/form.scss
@@ -0,0 +1,22 @@
+.u-form {
+ margin-top: 20rpx;
+ }
+
+ .u-form-item__body__left {
+ width: auto !important;
+ color: #3E3E3E;
+ margin-left: 20rpx;
+ margin-right: 50rpx;
+ }
+
+ .u-form-item__body {
+ padding: 24rpx 0 !important;
+ }
+
+ .u-form-item__body__left__content__label {
+ font-size: 24rpx !important;
+ }
+
+ .u-form-item {
+ background-color: #fff;
+ }
diff --git a/static/styles/myAvatar.scss b/static/styles/myAvatar.scss
new file mode 100644
index 0000000..a5fd1c0
--- /dev/null
+++ b/static/styles/myAvatar.scss
@@ -0,0 +1,35 @@
+.u-status-bar {
+ background-color: transparent !important;
+ }
+
+ .u-navbar__content {
+ background-color: transparent !important;
+ }
+
+ .u-navbar__content__title {
+ color: #fff !important;
+ }
+
+ .uicon-arrow-left {
+ // display: none !important;
+ color: #fff !important;
+ }
+
+ .my_avatar {
+ position: absolute;
+ right: 325rpx;
+ top: 148rpx;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+
+
+ text {
+ font-size: 26rpx;
+ font-family: PingFangSC-Medium, PingFang SC;
+ font-weight: 500;
+ color: #FFFFFF;
+ line-height: 37rpx;
+
+ }
+ }
\ No newline at end of file
diff --git a/uni.scss b/uni.scss
index a9f4a55..273cdc3 100644
--- a/uni.scss
+++ b/uni.scss
@@ -14,6 +14,8 @@
@import 'uview-ui/theme.scss';
@import 'static/styles/products.scss';
@import 'static/styles/news.scss';
+@import 'static/styles/myAvatar.scss';
+@import 'static/styles/form.scss';
/* 颜色变量 */