diff --git a/src/pages.json b/src/pages.json index 0b9af70..ab4820d 100644 --- a/src/pages.json +++ b/src/pages.json @@ -79,6 +79,12 @@ "style": { "navigationBarTitleText": "确认订单" } + }, + { + "path": "shoppingcart/index", + "style": { + "navigationBarTitleText": "购物车" + } } ] }, @@ -91,6 +97,12 @@ "navigationBarTitleText": "会员信息" } }, + { + "path": "integral/index", + "style": { + "navigationBarTitleText": "我的积分" + } + }, { "path": "recharge/index", "style": { diff --git a/src/pages/common/groupbuy/index.vue b/src/pages/common/groupbuy/index.vue new file mode 100644 index 0000000..f45039f --- /dev/null +++ b/src/pages/common/groupbuy/index.vue @@ -0,0 +1,11 @@ + + + + + diff --git a/src/pages/home/index.vue b/src/pages/home/index.vue index bb90f83..b2731b6 100644 --- a/src/pages/home/index.vue +++ b/src/pages/home/index.vue @@ -17,12 +17,12 @@ {{ userInfo?.nickName }} - + {{ userInfo?.integration }} 积分 - + {{ userInfo?.balance }} 余额(元) diff --git a/src/pages/mall/index.vue b/src/pages/mall/index.vue index 3af04dd..901ebda 100644 --- a/src/pages/mall/index.vue +++ b/src/pages/mall/index.vue @@ -29,7 +29,7 @@ - + 10 diff --git a/src/pages/mall/subs/components/coupon-dialog.vue b/src/pages/mall/subs/components/coupon-dialog.vue new file mode 100644 index 0000000..09fbecd --- /dev/null +++ b/src/pages/mall/subs/components/coupon-dialog.vue @@ -0,0 +1,120 @@ + + + + + diff --git a/src/pages/mall/subs/components/coupon-item.vue b/src/pages/mall/subs/components/coupon-item.vue new file mode 100644 index 0000000..7b13d98 --- /dev/null +++ b/src/pages/mall/subs/components/coupon-item.vue @@ -0,0 +1,111 @@ + + + + + diff --git a/src/pages/mall/subs/goods/goods-detail.vue b/src/pages/mall/subs/goods/goods-detail.vue index 7c22bcd..c5ed4e0 100644 --- a/src/pages/mall/subs/goods/goods-detail.vue +++ b/src/pages/mall/subs/goods/goods-detail.vue @@ -63,7 +63,7 @@ - + 12 @@ -78,7 +78,6 @@ - + + diff --git a/src/pages/mine/index.vue b/src/pages/mine/index.vue index 062aa7a..6ebfe47 100644 --- a/src/pages/mine/index.vue +++ b/src/pages/mine/index.vue @@ -18,7 +18,7 @@ - + {{ userInfo.integration }} 积分 diff --git a/src/pages/mine/subs/integral/components/integral-item.vue b/src/pages/mine/subs/integral/components/integral-item.vue new file mode 100644 index 0000000..9e71565 --- /dev/null +++ b/src/pages/mine/subs/integral/components/integral-item.vue @@ -0,0 +1,45 @@ + + + + + diff --git a/src/pages/mine/subs/integral/index.vue b/src/pages/mine/subs/integral/index.vue new file mode 100644 index 0000000..15ceaa1 --- /dev/null +++ b/src/pages/mine/subs/integral/index.vue @@ -0,0 +1,53 @@ + + + + + diff --git a/src/static/images/ic_arrow_down_gray.png b/src/static/images/ic_arrow_down_gray.png new file mode 100644 index 0000000..ad104e5 Binary files /dev/null and b/src/static/images/ic_arrow_down_gray.png differ diff --git a/src/static/images/ic_checkbox_active_red.png b/src/static/images/ic_checkbox_active_red.png new file mode 100644 index 0000000..317aee6 Binary files /dev/null and b/src/static/images/ic_checkbox_active_red.png differ