diff --git a/api/home/index.js b/api/home/index.js new file mode 100644 index 0000000..b619bf4 --- /dev/null +++ b/api/home/index.js @@ -0,0 +1,12 @@ +import request from '@/utils/request' + +// api地址 +const api = { + list: 'goods/list', +} + +// 商品列表 +export const list = (param, option) => { + return request.get(api.list, param, option) +} + diff --git a/pages.json b/pages.json index 39a97ce..030a214 100644 --- a/pages.json +++ b/pages.json @@ -70,6 +70,20 @@ } } }, + { + "path": "pages/member/index", + "style": { + "navigationBarTitleText": "会员中心", + "navigationStyle": "custom" + } + }, + { + "path": "pages/invite/index", + "style": { + "navigationBarTitleText": "邀请记录", + "navigationStyle": "custom" + } + }, { "path": "pages/custom/index", "style": { @@ -234,9 +248,10 @@ { "path": "pages/order/detail", "style": { - "navigationBarTitleText": "订单详情", - "navigationBarTextStyle": "white", - "navigationBarBackgroundColor": "#e8c269" + "navigationStyle": "custom" + // "navigationBarTitleText": "订单详情", + // "navigationBarTextStyle": "black", + // "navigationBarBackgroundColor": "#ffaaff" } }, { diff --git a/pages/index/index.vue b/pages/index/index.vue index cc38aa8..fa4054e 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -27,16 +27,28 @@ - 手机 + + {{item.name}} + + + + + + + + + + HuaWei - + @@ -169,6 +181,7 @@ goodsList: [ ], + goodsType: [], } } } @@ -178,7 +191,6 @@ background-color: rgba(255, 255, 255, 1.000000); position: relative; width: 750rpx; - height: 100%; overflow: hidden; overflow-y: auto; display: flex; @@ -190,7 +202,6 @@ .box_1 { position: relative; width: 750rpx; - height: 100%; flex-direction: row; display: flex; justify-content: flex-end; @@ -376,7 +387,6 @@ .box_3 { position: relative; width: 750rpx; - height: 2034rpx; margin-left: -744rpx; display: flex; flex-direction: column; @@ -1079,4 +1089,27 @@ line-height: 20rpx; margin: -2rpx 0 20rpx 36rpx; } + + .suggest { + width: 694rpx; + height: 196rpx; + margin: 8rpx 0 0 20rpx; + + .swiper { + width: 694rpx; + height: 196rpx; + + .swiper-item { + width: 100%; + display: block; + height: 196rpx; + line-height: 196rpx; + text-align: center; + .supImg{ + width: 694rpx; + height: 196rpx; + } + } + } + } \ No newline at end of file diff --git a/pages/invite/index.vue b/pages/invite/index.vue new file mode 100644 index 0000000..be09bc3 --- /dev/null +++ b/pages/invite/index.vue @@ -0,0 +1,99 @@ + + + + + \ No newline at end of file diff --git a/pages/member/index.vue b/pages/member/index.vue new file mode 100644 index 0000000..e09522e --- /dev/null +++ b/pages/member/index.vue @@ -0,0 +1,559 @@ + + + + + \ No newline at end of file diff --git a/pages/order/detail - 副本.vue b/pages/order/detail - 副本.vue new file mode 100644 index 0000000..f8c2dc5 --- /dev/null +++ b/pages/order/detail - 副本.vue @@ -0,0 +1,915 @@ + + + + + + \ No newline at end of file diff --git a/pages/order/detail.vue b/pages/order/detail.vue index f8c2dc5..e093316 100644 --- a/pages/order/detail.vue +++ b/pages/order/detail.vue @@ -1,915 +1,900 @@ - \ No newline at end of file diff --git a/static/home/suprise.png b/static/home/suprise.png new file mode 100644 index 0000000..3c7bc59 Binary files /dev/null and b/static/home/suprise.png differ diff --git a/static/member/bg.png b/static/member/bg.png new file mode 100644 index 0000000..93b62b4 Binary files /dev/null and b/static/member/bg.png differ diff --git a/static/member/merBack.png b/static/member/merBack.png new file mode 100644 index 0000000..1992b0b Binary files /dev/null and b/static/member/merBack.png differ diff --git a/static/member/my.png b/static/member/my.png new file mode 100644 index 0000000..6a0b28e Binary files /dev/null and b/static/member/my.png differ diff --git a/static/member/tip.png b/static/member/tip.png new file mode 100644 index 0000000..16c696c Binary files /dev/null and b/static/member/tip.png differ diff --git a/static/member/user.png b/static/member/user.png new file mode 100644 index 0000000..9f9f7a0 Binary files /dev/null and b/static/member/user.png differ diff --git a/static/order/am.png b/static/order/am.png new file mode 100644 index 0000000..b7f5f77 Binary files /dev/null and b/static/order/am.png differ diff --git a/static/order/call.png b/static/order/call.png new file mode 100644 index 0000000..5da917a Binary files /dev/null and b/static/order/call.png differ diff --git a/static/order/car.png b/static/order/car.png new file mode 100644 index 0000000..7fdd9cb Binary files /dev/null and b/static/order/car.png differ diff --git a/static/order/cd.png b/static/order/cd.png new file mode 100644 index 0000000..6d8ebe6 Binary files /dev/null and b/static/order/cd.png differ diff --git a/static/order/ld.png b/static/order/ld.png new file mode 100644 index 0000000..659d1ff Binary files /dev/null and b/static/order/ld.png differ diff --git a/static/order/share.png b/static/order/share.png new file mode 100644 index 0000000..4788624 Binary files /dev/null and b/static/order/share.png differ