diff --git a/components/informations/notice/notice.vue b/components/informations/notice/notice.vue
new file mode 100644
index 0000000..f9c37b6
--- /dev/null
+++ b/components/informations/notice/notice.vue
@@ -0,0 +1,95 @@
+
+
+
+ 2020-05-14 20:11
+
+
+ {{item.content}}
+
+ 查看详情
+ >
+
+
+
+
+
+
+
diff --git a/components/informations/titles/titles.vue b/components/informations/titles/titles.vue
new file mode 100644
index 0000000..00b211c
--- /dev/null
+++ b/components/informations/titles/titles.vue
@@ -0,0 +1,80 @@
+
+
+
+
+
+ {{item.text}}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/logininput/logininput.vue b/components/logininput/logininput.vue
new file mode 100644
index 0000000..ac05081
--- /dev/null
+++ b/components/logininput/logininput.vue
@@ -0,0 +1,269 @@
+
+
+
+ 手机登录
+
+
+
+
+
+
+
+ 获取验证码
+
+
+
+
+ 我已详细阅读并同意
+ 《用户协议》
+ 《隐私协议》
+ 《使用协议》
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/umaskes/umaskes.vue b/components/umaskes/umaskes.vue
new file mode 100644
index 0000000..c4e18f8
--- /dev/null
+++ b/components/umaskes/umaskes.vue
@@ -0,0 +1,35 @@
+
+
+
+
+ {{type_login}}
+
+
+
+
+
+
+
+
diff --git a/pageA/bindinges/bindinges.vue b/pageA/bindinges/bindinges.vue
new file mode 100644
index 0000000..70d9d25
--- /dev/null
+++ b/pageA/bindinges/bindinges.vue
@@ -0,0 +1,286 @@
+
+
+
+
+
+ 手机登录
+
+ 手机号
+
+
+
+ 请输入验证码
+
+ 获取验证码
+
+
+
+
+ 我已详细阅读并同意
+ 《用户协议》
+ 《隐私协议》
+ 《使用协议》
+
+
+
+
+
+
+ {{login}}
+
+
+
+
+
+
+
diff --git a/pageA/login/login.vue b/pageA/login/login.vue
index 045cd52..d76c9fe 100644
--- a/pageA/login/login.vue
+++ b/pageA/login/login.vue
@@ -7,13 +7,13 @@
手机登录
- 手机号
-
+
+
- 请输入验证码
-
- 获取验证码
+
+
+ {{text}}
@@ -22,18 +22,34 @@
《用户协议》
《隐私协议》
《使用协议》
-
-
+
+
新用户点击注册
- 其他方式登录
+ 其他方式登录
-
- {{login}}
+
+ {{login}}
+
+
+
+
+
+ QQ登录
+
+
+
+ 微信登录
+
+ 取消
+
+
+
@@ -46,18 +62,31 @@
disabled: false
}],
value: '',
- login:'登录',
+ text : '获取验证码',
+ login: '登录',
+ show: false
};
},
methods: {
// 选中某个复选框时,由checkbox时触发
- checkboxChange(e) {
- //console.log(e);
- },
- // 选中任一checkbox时,由checkbox-group触发
- checkboxGroupChange(e) {
- // console.log(e);
- }
+ checkboxChange(e) {
+ //console.log(e);
+ },
+ // 选中任一checkbox时,由checkbox-group触发
+ checkboxGroupChange(e) {
+ // console.log(e);
+ },
+ mask_u(){
+ this.show = !this.show
+ },
+ // 获取验证码倒计时
+ getCode(){
+ console.log("11")
+ this.loading()
+ },
+ loading(){
+
+ }
}
};
@@ -131,10 +160,13 @@
.labales {
border-bottom: 1px #fff solid;
margin-bottom: 90rpx;
+ height: 70rpx;
+ line-height: 70rpx;
}
-
- .labales {
+
+ .labales:nth-child(3) {
position: relative;
+ margin-bottom: 10px;
}
.identifying {
@@ -146,9 +178,13 @@
font-size: 30rpx;
font-weight: 500;
color: rgba(255, 120, 15, 1);
- line-height: 36px;
+ line-height: 20px;
}
}
+ .uni-input-input, .uni-input-placeholder{
+ color:#fff!important;
+ letter-spacing: 2rpx;
+ }
.pact text {
font-size: 22rpx;
@@ -163,34 +199,122 @@
color: rgba(129, 188, 253, 1) !important;
line-height: 36px;
}
+
//单选框的样式
- .pact{
+ .pact {
position: relative;
padding-left: 40rpx;
+ overflow:hidden; //超出的文本隐藏
+ text-overflow:ellipsis; //溢出用省略号显示
+ white-space:nowrap; //溢出不换行
}
- .u-checkbox-group{
+
+ .u-checkbox-group {
position: absolute;
left: 0;
top: 0;
bottom: 0;
margin: auto;
}
- .u-checkbox__icon--square{
- border-radius: 50rpx!important;
+
+ .u-checkbox__icon--square {
+ border-radius: 50rpx !important;
width: 22rpx;
height: 22rpx;
}
- .u-btn{
- width:628rpx;
- height:98rpx;
- background:rgba(255,120,15,1)!important;
- border-radius:49rpx;
+
+ .u-btn {
+ width: 628rpx;
+ height: 98rpx;
+ background: rgba(255, 120, 15, 1) !important;
+ border-radius: 49rpx;
margin: 0 auto;
- font-size:36rpx;
- color:rgba(255,255,255,1)!important;
- line-height:36px;
+ font-size: 36rpx;
+ color: rgba(255, 255, 255, 1) !important;
+ line-height: 36px;
border: 1px #ff780f solid;
outline: none;
- border-color: rgba(255,120,15,1)!important;
+ border-color: rgba(255, 120, 15, 1) !important;
+ }
+
+ .warp {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ height: 100%;
+ }
+
+ .rect {
+ width: 558rpx;
+ height: 300rpx;
+ background-color: #fff;
+ border-radius: 20rpx;
+ overflow: hidden;
+ zoom: 1;
+ position: relative;
+ display: flex;
+ flex-wrap:wrap;
+ display: -webkit-flex; /* Safari */
+ .rect_view{
+ width: 100rpx;
+ height: 100rpx;
+ .image{
+ width: 45rpx;
+ height: 53rpx;
+ display: inline-block;
+
+ }
+ flex:1;
+ margin-top: 77rpx;
+ }
+ .rect_view:nth-child(2) image{
+ width: 57rpx;
+ height: 45rpx;
+ }
+
+ .rect_butoon{
+ width: 100%;
+ position: absolute;
+ bottom: 0;
+ height: 85rpx;
+ text-align: center;
+ line-height: 85rpx;
+ border-top: 1px #999999 solid;
+ }
+ view{
+ color: #666;
+ font-size:24rpx;
+ margin-top: 30rpx;
+
+ }
+ }
+ .rect_view:nth-child(1) image,.rect_view:nth-child(1) view{
+ float: right;
+ }
+ .rect_view:nth-child(1) image{
+ margin-right: 20rpx;
+ }
+ .rect_view:nth-child(1){
+ position: relative;
+ margin-right: 79rpx;
+ }
+ .rect_view:nth-child(1) view{
+ position: absolute;
+ bottom: 0;
+ right: 0;
+ }
+ .rect_view:nth-child(2) image,.rect_view:nth-child(2) view{
+ float: left;
+ }
+ .rect_view:nth-child(2) image{
+ margin-left: 20rpx;
+ }
+ .rect_view:nth-child(2){
+ position: relative;
+ }
+ .rect_view:nth-child(2) view{
+ position: absolute;
+ bottom: 0;
+ left: 0;
}
diff --git a/pageA/register/register.vue b/pageA/register/register.vue
new file mode 100644
index 0000000..8d15d4b
--- /dev/null
+++ b/pageA/register/register.vue
@@ -0,0 +1,310 @@
+
+
+
+
+
+
+
+ 手机登录
+
+
+
+
+
+
+
+ 获取验证码
+
+
+
+
+ 我已详细阅读并同意
+ 《用户协议》
+ 《隐私协议》
+ 《使用协议》
+
+
+
+
+
+
+
+
+ 其他方式登录
+
+
+ {{login}}
+
+
+
+
+
+ QQ登录
+
+
+
+ 微信登录
+
+ 取消
+
+
+
+
+
+
+
+
+
diff --git a/pageA/topick/topick.vue b/pageA/topick/topick.vue
new file mode 100644
index 0000000..5cdc6bb
--- /dev/null
+++ b/pageA/topick/topick.vue
@@ -0,0 +1,349 @@
+
+
+
+
+
+
+
+ 开启个性化定制
+ 你的兴趣频道
+
+
+
+ {{item}}
+
+
+ {{submites}}
+
+
+
+
+
+
diff --git a/pageD/activity/activity.vue b/pageD/activity/activity.vue
new file mode 100644
index 0000000..f5361ca
--- /dev/null
+++ b/pageD/activity/activity.vue
@@ -0,0 +1,120 @@
+
+
+
+
+ {{item.type}}
+
+ {{item.name}}
+
+
+
+ {{item.about}}
+
+
+
+
+
+
+
+
+
+
diff --git a/pageD/attention/attention.vue b/pageD/attention/attention.vue
new file mode 100644
index 0000000..fc59d0e
--- /dev/null
+++ b/pageD/attention/attention.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+ {{item.name}}
+ 状态:{{item.type}}
+ 已关注
+ 未关注
+
+
+
+
+
+
+
diff --git a/pageD/information/information.vue b/pageD/information/information.vue
new file mode 100644
index 0000000..b97c848
--- /dev/null
+++ b/pageD/information/information.vue
@@ -0,0 +1,158 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.text}}
+ {{item.contentes}}
+ {{item.title}}
+
+
+
+
+
+
+
+
+
diff --git a/pageD/logistics/logistics.vue b/pageD/logistics/logistics.vue
new file mode 100644
index 0000000..e97ecf7
--- /dev/null
+++ b/pageD/logistics/logistics.vue
@@ -0,0 +1,156 @@
+
+
+
+
+ {{item.type}}
+
+
+
+ 小时代
+
+
+ {{item.name}}
+
+
+
+ {{item.about}}
+
+
+
+
+
+
+
+
+
+
diff --git a/pageD/notice/notice.vue b/pageD/notice/notice.vue
new file mode 100644
index 0000000..66765c8
--- /dev/null
+++ b/pageD/notice/notice.vue
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/pageE/mine/MemberServe.vue b/pageE/mine/MemberServe.vue
index fe74eb6..9ab2f45 100644
--- a/pageE/mine/MemberServe.vue
+++ b/pageE/mine/MemberServe.vue
@@ -173,7 +173,7 @@ export default {
.coupon-btn {
margin-left: auto;
width: 85rpx;
- height: 42rpx;
+ // height: 42rpx;
border: 2rpx solid rgba(255,120,15,1);
border-radius: 10rpx;
font-size: 26rpx;
diff --git a/pages.json b/pages.json
index c143e1e..c68b7d9 100644
--- a/pages.json
+++ b/pages.json
@@ -6,6 +6,20 @@
{
"root": "pageA",
"pages": [
+ {
+ "path": "topick/topick"
+ },
+ {
+ "path": "bindinges/bindinges",
+ "style": {
+ "navigationBarTitleText": "",
+ "navigationStyle": "custom",
+ "app-plus": {
+ "titleNView": false,
+ "animationType": "slide-in-bottom"
+ }
+ }
+ },
{
"path": "welcome/welcome",
"style": {
@@ -28,7 +42,20 @@
"animationType": "slide-in-bottom"
}
}
+ },
+ {
+ "path": "register/register",
+ "style": {
+ "navigationBarTitleText": "",
+ "navigationStyle": "custom",
+ "app-plus": {
+ "titleNView": false,
+ "animationType": "slide-in-bottom"
+ }
+ }
}
+
+
]
},
{
@@ -216,29 +243,79 @@
]
},
{
- "root": "pageE",
- "pages":[
+ "root": "pageD",
+ "pages": [
{
- "path": "mine/MineIndex",
+ "path": "logistics/logistics",
"style": {
- "navigationBarTitleText": "我的",
+ "navigationBarTitleText": "交易物流 ",
"app-plus": {
"titleSize": "36px",
+ "titleColor": "#333333",
"titleNView": {
- "titleColor": "#333333",
- "backgroundColor": "#FFFFFF",
- "buttons": [
- {
- "type": "none",
- "text": "\ue502",
- "float": "right",
- "fontSize": "14"
- }
- ]
+ "backgroundColor": "#FFFFFF"
}
}
}
},
+ {
+ "path": "activity/activity",
+ "style": {
+ "navigationBarTitleText": "活动消息",
+ "app-plus": {
+ "titleSize": "36px",
+ "titleColor": "#333333",
+ "titleNView": {
+ "backgroundColor": "#FFFFFF"
+ }
+ }
+ }
+ },
+ {
+ "path": "attention/attention",
+ "style": {
+ "navigationBarTitleText": "关注消息",
+ "app-plus": {
+ "titleSize": "36px",
+ "titleColor": "#333333",
+ "titleNView": {
+ "backgroundColor": "#FFFFFF"
+ }
+ }
+ }
+ },
+ {
+ "path": "information/information",
+ "style": {
+ "navigationBarTitleText": "",
+ "navigationStyle": "custom",
+ "app-plus": {
+ "titleNView": false,
+ "animationType": "slide-in-bottom"
+ }
+ }
+ },
+ {
+ "path": "notice/notice",
+ "style": {
+ "navigationBarTitleText": "公告/咨询",
+ "app-plus": {
+ "titleSize": "36px",
+ "titleColor": "#333333",
+ "titleNView": {
+ "backgroundColor": "#FFFFFF"
+ }
+ }
+ }
+ }
+
+
+
+ ]
+ },
+ {
+ "root": "pageE",
+ "pages":[
{
"path": "tool/MineHistory",
"style": {
@@ -680,10 +757,24 @@
}
},
{
- "path": "pages/shop/index",
+ "path": "pages/mine/index",
"style": {
- "navigationBarTitleText": "首页",
- "navigationStyle": "custom"
+ "navigationBarTitleText": "我的",
+ "app-plus": {
+ "titleSize": "36px",
+ "titleNView": {
+ "titleColor": "#333333",
+ "backgroundColor": "#FFFFFF",
+ "buttons": [
+ {
+ "type": "none",
+ "text": "\ue502",
+ "float": "right",
+ "fontSize": "14"
+ }
+ ]
+ }
+ }
}
}
],
diff --git a/pageE/mine/MineIndex.vue b/pages/mine/index.vue
similarity index 88%
rename from pageE/mine/MineIndex.vue
rename to pages/mine/index.vue
index bd6e3d1..1b1457e 100644
--- a/pageE/mine/MineIndex.vue
+++ b/pages/mine/index.vue
@@ -2,12 +2,12 @@
-
+
小同学
-
+
勋章
@@ -47,32 +47,32 @@
我的订单
查看全部订单
-
+
-
+
待支付
-
+
已取消
-
+
待收货
-
+
试穿试送
-
+
待评价
-
+
售后
@@ -81,15 +81,15 @@
我的工具
-
+
送洗
-
+
美甲
-
+
足迹
@@ -98,19 +98,19 @@
更多工具
-
+
收货地址
-
+
售后政策
-
+
使用帮助
-
+
投诉意见
@@ -128,12 +128,12 @@ export default {
},
onLoad() {},
onNavigationBarButtonTap() {
- console.log("setting");
- this.toOtherPage("/setting/Index");
+ // console.log("setting");
+ this.toOtherPage("/pageE/setting/Index");
},
methods: {
toOtherPage(url) {
- console.log(url);
+ // console.log(url);
uni.navigateTo({
url: '/pageE' + url
});
@@ -160,6 +160,7 @@ export default {
border-radius: 50%;
border: 2rpx solid rgba(251,251,251,1);
margin-right: 30rpx;
+ flex-shrink: 0;
}
.user-info {
display: flex;
diff --git a/static/image/mine/1.png b/static/image/mine/1.png
new file mode 100644
index 0000000..e7ac03f
Binary files /dev/null and b/static/image/mine/1.png differ
diff --git a/static/image/mine/13.png b/static/image/mine/13.png
new file mode 100644
index 0000000..ee7078c
Binary files /dev/null and b/static/image/mine/13.png differ
diff --git a/static/image/mine/14.png b/static/image/mine/14.png
new file mode 100644
index 0000000..2075aff
Binary files /dev/null and b/static/image/mine/14.png differ
diff --git a/static/image/mine/15.png b/static/image/mine/15.png
new file mode 100644
index 0000000..f720a02
Binary files /dev/null and b/static/image/mine/15.png differ
diff --git a/static/image/mine/16.png b/static/image/mine/16.png
new file mode 100644
index 0000000..f3f687a
Binary files /dev/null and b/static/image/mine/16.png differ
diff --git a/static/image/mine/17.png b/static/image/mine/17.png
new file mode 100644
index 0000000..9f576ae
Binary files /dev/null and b/static/image/mine/17.png differ
diff --git a/static/image/mine/18.png b/static/image/mine/18.png
new file mode 100644
index 0000000..66a0c16
Binary files /dev/null and b/static/image/mine/18.png differ
diff --git a/static/image/mine/19.png b/static/image/mine/19.png
new file mode 100644
index 0000000..cf67c08
Binary files /dev/null and b/static/image/mine/19.png differ
diff --git a/static/image/mine/2.png b/static/image/mine/2.png
new file mode 100644
index 0000000..cb00cc7
Binary files /dev/null and b/static/image/mine/2.png differ
diff --git a/static/image/mine/20.png b/static/image/mine/20.png
new file mode 100644
index 0000000..7cd550f
Binary files /dev/null and b/static/image/mine/20.png differ
diff --git a/static/image/mine/21.png b/static/image/mine/21.png
new file mode 100644
index 0000000..8aa6d13
Binary files /dev/null and b/static/image/mine/21.png differ
diff --git a/static/image/mine/23.png b/static/image/mine/23.png
new file mode 100644
index 0000000..cae1a3d
Binary files /dev/null and b/static/image/mine/23.png differ
diff --git a/static/image/mine/3.png b/static/image/mine/3.png
new file mode 100644
index 0000000..a102b3f
Binary files /dev/null and b/static/image/mine/3.png differ
diff --git a/static/image/mine/6.png b/static/image/mine/6.png
new file mode 100644
index 0000000..ba7d225
Binary files /dev/null and b/static/image/mine/6.png differ
diff --git a/static/image/mine/9.png b/static/image/mine/9.png
new file mode 100644
index 0000000..52524b4
Binary files /dev/null and b/static/image/mine/9.png differ
diff --git a/static/image/home.png b/static/image/tabbar/home.png
similarity index 100%
rename from static/image/home.png
rename to static/image/tabbar/home.png
diff --git a/static/image/home2.png b/static/image/tabbar/home2.png
similarity index 100%
rename from static/image/home2.png
rename to static/image/tabbar/home2.png
diff --git a/static/image/mall.png b/static/image/tabbar/mall.png
similarity index 100%
rename from static/image/mall.png
rename to static/image/tabbar/mall.png
diff --git a/static/image/mall2.png b/static/image/tabbar/mall2.png
similarity index 100%
rename from static/image/mall2.png
rename to static/image/tabbar/mall2.png
diff --git a/static/image/message.png b/static/image/tabbar/message.png
similarity index 100%
rename from static/image/message.png
rename to static/image/tabbar/message.png
diff --git a/static/image/message2.png b/static/image/tabbar/message2.png
similarity index 100%
rename from static/image/message2.png
rename to static/image/tabbar/message2.png
diff --git a/static/image/mine.png b/static/image/tabbar/mine.png
similarity index 100%
rename from static/image/mine.png
rename to static/image/tabbar/mine.png
diff --git a/static/image/mine2.png b/static/image/tabbar/mine2.png
similarity index 100%
rename from static/image/mine2.png
rename to static/image/tabbar/mine2.png
diff --git a/static/pageA/.jpg b/static/pageA/topick.jpg
similarity index 100%
rename from static/pageA/.jpg
rename to static/pageA/topick.jpg
diff --git a/static/pageD/info(1).png b/static/pageD/info(1).png
new file mode 100644
index 0000000..76e5cb5
Binary files /dev/null and b/static/pageD/info(1).png differ
diff --git a/static/pageD/info(10).png b/static/pageD/info(10).png
new file mode 100644
index 0000000..73c64b4
Binary files /dev/null and b/static/pageD/info(10).png differ
diff --git a/static/pageD/info(11).png b/static/pageD/info(11).png
new file mode 100644
index 0000000..d13a7f9
Binary files /dev/null and b/static/pageD/info(11).png differ
diff --git a/static/pageD/info(12).png b/static/pageD/info(12).png
new file mode 100644
index 0000000..bf21a5c
Binary files /dev/null and b/static/pageD/info(12).png differ
diff --git a/static/pageD/info(13).png b/static/pageD/info(13).png
new file mode 100644
index 0000000..18826bc
Binary files /dev/null and b/static/pageD/info(13).png differ
diff --git a/static/pageD/info(14).png b/static/pageD/info(14).png
new file mode 100644
index 0000000..53af931
Binary files /dev/null and b/static/pageD/info(14).png differ
diff --git a/static/pageD/info(15).png b/static/pageD/info(15).png
new file mode 100644
index 0000000..73c64b4
Binary files /dev/null and b/static/pageD/info(15).png differ
diff --git a/static/pageD/info(16).png b/static/pageD/info(16).png
new file mode 100644
index 0000000..42c4c4d
Binary files /dev/null and b/static/pageD/info(16).png differ
diff --git a/static/pageD/info(2).png b/static/pageD/info(2).png
new file mode 100644
index 0000000..b7c2f72
Binary files /dev/null and b/static/pageD/info(2).png differ
diff --git a/static/pageD/info(3).png b/static/pageD/info(3).png
new file mode 100644
index 0000000..74f6b70
Binary files /dev/null and b/static/pageD/info(3).png differ
diff --git a/static/pageD/info(4).png b/static/pageD/info(4).png
new file mode 100644
index 0000000..a274bb2
Binary files /dev/null and b/static/pageD/info(4).png differ
diff --git a/static/pageD/info(5).png b/static/pageD/info(5).png
new file mode 100644
index 0000000..ae46c84
Binary files /dev/null and b/static/pageD/info(5).png differ
diff --git a/static/pageD/info(6).png b/static/pageD/info(6).png
new file mode 100644
index 0000000..9446326
Binary files /dev/null and b/static/pageD/info(6).png differ
diff --git a/static/pageD/info(7).png b/static/pageD/info(7).png
new file mode 100644
index 0000000..209093c
Binary files /dev/null and b/static/pageD/info(7).png differ
diff --git a/static/pageD/info(8).png b/static/pageD/info(8).png
new file mode 100644
index 0000000..029aa02
Binary files /dev/null and b/static/pageD/info(8).png differ
diff --git a/static/pageD/info(9).png b/static/pageD/info(9).png
new file mode 100644
index 0000000..912f65e
Binary files /dev/null and b/static/pageD/info(9).png differ