diff --git a/pages.json b/pages.json index c37dd0a..6535019 100644 --- a/pages.json +++ b/pages.json @@ -1434,9 +1434,14 @@ "backgroundColor": "#FFFFFF", "borderStyle": "black", "list": [{ + //"pagePath": "pages/index/index", + //"iconPath": "static/tabbar/tabrNav.png", + //"selectedIconPath": "static/tabbar/tabrNav.png", + "pagePath": "pages/index/index", - "iconPath": "static/tabbar/tabrNav.png", - "selectedIconPath": "static/tabbar/tabrNav.png" + "iconPath": "static/tabbar/bottom5_1.png", + "selectedIconPath": "static/tabbar/bottom5_2.png", + "text": "盛安到家" }, { "pagePath": "pages/videoCircle/index", diff --git a/pages/index/index.vue b/pages/index/index.vue index 6fc77bf..1bf3e78 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -3,8 +3,14 @@ 盛安到家 + + {{ city }} + + + + - 实名认证 @@ -18,25 +24,56 @@ 平台担保 - - + + +<<<<<<< .mine {{ city }} +======= + + + + + + +>>>>>>> .theirs +<<<<<<< .mine 搜索 +======= + + + + + +>>>>>>> .theirs +<<<<<<< .mine + + + + + + +======= + + + + 搜索 + +>>>>>>> .theirs - @@ -1137,11 +1174,19 @@ height: 32px !important; } + .index-line{ + width: 100%; + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + margin-top: 12rpx; + } /deep/.uni-searchbar__box-icon-search,.search-btn{ - width: 150rpx; height: 60rpx; background: #18A689; border-radius: 31rpx; + padding: 2rpx 5%; } /deep/.uni-searchbar__box{ @@ -1160,7 +1205,14 @@ width:200px; border-radius: 31rpx; } - + .index-headset{ + margin-right: 30rpx; + + } + .locate-line{ + padding-left: 25rpx; + margin-top: 3rpx; + } .popup-mian-view{ width: 100%; display: flex; @@ -1297,7 +1349,8 @@ margin-left: 4rpx; font-weight: bold; color: #333333; - font-size: 30rpx; + font-size: 26rpx; + margin-top: 3rpx; } .menu-topic-act .menu-topic-bottom-color { background: linear-gradient(90deg,rgba(234, 248, 245,0.7),rgba(132, 211, 196,0.7)); @@ -1893,14 +1946,11 @@ flex-direction: row; justify-content: space-between; align-items: center; - margin: 10px 0px; padding: 0px 10px; } - - .index-top-mian{ display: flex; - flex-direction: row; + margin-left: 15rpx; } .index-top-left{ color: #019C88; diff --git a/pages/my/newcika.vue b/pages/my/newcika.vue new file mode 100644 index 0000000..5d8984c --- /dev/null +++ b/pages/my/newcika.vue @@ -0,0 +1,447 @@ + + + + + + diff --git a/pages/my/newseckill.vue b/pages/my/newseckill.vue new file mode 100644 index 0000000..fdfb536 --- /dev/null +++ b/pages/my/newseckill.vue @@ -0,0 +1,502 @@ + + + + + + diff --git a/pages/my/newseckilldetails.vue b/pages/my/newseckilldetails.vue new file mode 100644 index 0000000..971cffa --- /dev/null +++ b/pages/my/newseckilldetails.vue @@ -0,0 +1,1477 @@ + + + \ No newline at end of file diff --git a/static/seckill.png b/static/seckill.png index c3ca74c..fca7241 100644 Binary files a/static/seckill.png and b/static/seckill.png differ diff --git a/static/seckill3.png b/static/seckill3.png new file mode 100644 index 0000000..d096fbf Binary files /dev/null and b/static/seckill3.png differ diff --git a/static/tabbar/bottom5_1.png b/static/tabbar/bottom5_1.png new file mode 100644 index 0000000..fcde943 Binary files /dev/null and b/static/tabbar/bottom5_1.png differ diff --git a/static/tabbar/bottom5_2.png b/static/tabbar/bottom5_2.png new file mode 100644 index 0000000..e2af91f Binary files /dev/null and b/static/tabbar/bottom5_2.png differ