diff --git a/App.vue b/App.vue index 03c21fb..73ac7a4 100644 --- a/App.vue +++ b/App.vue @@ -12,12 +12,14 @@ \ No newline at end of file diff --git a/components/couponPopup/couponPopup.vue b/components/couponPopup/couponPopup.vue new file mode 100644 index 0000000..24f3913 --- /dev/null +++ b/components/couponPopup/couponPopup.vue @@ -0,0 +1,133 @@ + + + + + + \ No newline at end of file diff --git a/components/product/productItem.vue b/components/product/productItem.vue index c9755db..9d0f64e 100644 --- a/components/product/productItem.vue +++ b/components/product/productItem.vue @@ -70,6 +70,7 @@ display: flex; box-sizing: border-box; border-bottom: 1rpx solid #00000012; + background: white; .item-image { width: 140rpx; diff --git a/components/user/productList.vue b/components/user/productList.vue index 1cc1ff2..eadcb93 100644 --- a/components/user/productList.vue +++ b/components/user/productList.vue @@ -1,133 +1,130 @@ \ No newline at end of file diff --git a/manifest.json b/manifest.json index 99308e9..7befa21 100644 --- a/manifest.json +++ b/manifest.json @@ -52,7 +52,7 @@ "quickapp" : {}, /* 小程序特有相关 */ "mp-weixin" : { - "appid" : "wx0839bc52e7849c13", + "appid" : "wxf7152f59d366236b", "setting" : { "urlCheck" : false }, diff --git a/package.json b/package.json index 136edbc..bbac28a 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,8 @@ "license": "ISC", "dependencies": { "ali-oss": "^6.21.0", - "dayjs": "^1.11.12" + "dayjs": "^1.11.12", + "swiper": "^5.4.5", + "vue-awesome-swiper": "^4.1.0" } } diff --git a/pages.json b/pages.json index bc8ffff..dc17df4 100644 --- a/pages.json +++ b/pages.json @@ -48,7 +48,12 @@ }, "subPackages": [{ "root": "pages_order", - "pages": [ + "pages": [{ + "path": "mine/card" + }, + { + "path": "mine/partner" + }, { "path": "order/orderDetail", "style": { @@ -82,23 +87,17 @@ { "path": "home/journalism" }, - { - "path": "mine/recommend", - "style": { - "enablePullDownRefresh": true - } - }, { "path": "home/introduce" }, { - "path" : "home/newsDetail" + "path": "home/newsDetail" }, { - "path" : "order/createOrder" + "path": "order/createOrder" }, { - "path" : "mine/balance" + "path": "mine/balance" }, { "path": "mine/commission" @@ -120,12 +119,21 @@ }, { "path": "home/addEnterprise" + }, + { + "path": "mine/memberCenter" + }, + { + "path": "mine/recruit" + }, + { + "path": "mine/moreCommodity" } ] }], "globalStyle": { "navigationBarTextStyle": "black", - "navigationBarTitleText": "酒店桌布", + "navigationBarTitleText": "珠宝商城", "navigationBarBackgroundColor": "#F8F8F8", "backgroundColor": "#F8F8F8", "navigationStyle": "custom" diff --git a/pages/index/category.vue b/pages/index/category.vue index c4677f6..34b543a 100644 --- a/pages/index/category.vue +++ b/pages/index/category.vue @@ -1,37 +1,32 @@