From 2b3697474effa26581377f9946dfe38efb238ac9 Mon Sep 17 00:00:00 2001 From: longjieli <11918793+longjieli@user.noreply.gitee.com> Date: Mon, 30 Dec 2024 13:09:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 4 +- api/api.js | 6 +- api/http.js | 33 +- components/base/tabbar.vue | 164 +++-- components/couponPopup/couponPopup.vue | 133 ++++ components/product/productItem.vue | 1 + components/user/productList.vue | 197 +++--- manifest.json | 2 +- package.json | 4 +- pages.json | 30 +- pages/index/category.vue | 73 ++- pages/index/center.vue | 666 +++++++++++---------- pages/index/index.vue | 534 +++++++---------- pages_order/auth/wxLogin.vue | 16 - pages_order/components/product/submit.vue | 153 +++-- pages_order/mine/card.vue | 141 +++++ pages_order/mine/memberCenter.vue | 406 +++++++++++++ pages_order/mine/moreCommodity.vue | 119 ++++ pages_order/mine/partner.vue | 270 +++++++++ pages_order/mine/recommend - 副本.vue | 89 --- pages_order/mine/recommend.vue | 162 ----- pages_order/mine/recruit.vue | 177 ++++++ pages_order/order/createOrder.vue | 517 +++++++++------- pages_order/product/productDetail.vue | 250 ++++---- pages_order/static/card/diamond-min.png | Bin 0 -> 12602 bytes pages_order/static/card/diamond.png | Bin 0 -> 94329 bytes pages_order/static/card/gold-min.png | Bin 0 -> 11579 bytes pages_order/static/card/gold.png | Bin 0 -> 106507 bytes pages_order/static/card/profilePhoto.png | Bin 0 -> 12224 bytes pages_order/static/card/silver.png | Bin 0 -> 94648 bytes pages_order/static/card/sliver-min.png | Bin 0 -> 9141 bytes pages_order/static/coupon/bg.png | Bin 0 -> 411231 bytes pages_order/static/coupon/close-btn.png | Bin 0 -> 2617 bytes pages_order/static/coupon/examine.png | Bin 0 -> 63250 bytes pages_order/static/coupon/register-success.png | Bin 0 -> 104588 bytes pages_order/static/createOrder/account.png | Bin 0 -> 839 bytes pages_order/static/createOrder/address.png | Bin 0 -> 1666 bytes pages_order/static/createOrder/coupon.png | Bin 0 -> 1485 bytes pages_order/static/createOrder/wx.png | Bin 0 -> 2302 bytes pages_order/static/memberCenter/descript1.png | Bin 0 -> 31675 bytes pages_order/static/memberCenter/descript2.png | Bin 0 -> 20175 bytes pages_order/static/memberCenter/equity.png | Bin 0 -> 6686 bytes pages_order/static/productDetail/service.png | Bin 0 -> 2841 bytes pages_order/static/recruit/bg.png | Bin 0 -> 254238 bytes static/image/center/1.png | Bin 0 -> 1032 bytes static/image/center/11.svg | 1 - static/image/center/13.png | Bin 8825 -> 0 bytes static/image/center/14.png | Bin 6849 -> 0 bytes static/image/center/15.png | Bin 5419 -> 0 bytes static/image/center/16.png | Bin 5530 -> 0 bytes static/image/center/17.png | Bin 6154 -> 0 bytes static/image/center/2.png | Bin 0 -> 1742 bytes static/image/center/3.png | Bin 6082 -> 1520 bytes static/image/center/4.png | Bin 0 -> 2147 bytes static/image/center/5.png | Bin 0 -> 840 bytes static/image/center/6.png | Bin 0 -> 1603 bytes static/image/center/7.png | Bin 0 -> 912 bytes static/image/center/8.png | Bin 0 -> 2236 bytes static/image/center/ad-tag.png | Bin 0 -> 2290 bytes static/image/center/ad.png | Bin 0 -> 255413 bytes static/image/center/balance.png | Bin 0 -> 27018 bytes static/image/center/brokerage.png | Bin 0 -> 38144 bytes static/image/center/c1.png | Bin 1508 -> 0 bytes static/image/center/c2.png | Bin 1358 -> 0 bytes static/image/center/c3.png | Bin 1687 -> 0 bytes static/image/center/close.png | Bin 0 -> 2037 bytes static/image/center/diamond-min.png | Bin 0 -> 12602 bytes static/image/center/edit-icon.png | Bin 0 -> 771 bytes static/image/center/gold-min.png | Bin 0 -> 11579 bytes static/image/center/head-img.png | Bin 0 -> 2994 bytes static/image/center/icon1.png | Bin 7285 -> 0 bytes static/image/center/sliver-min.png | Bin 0 -> 9141 bytes static/image/home/exclusive.png | Bin 0 -> 3683 bytes static/image/home/necklace.png | Bin 0 -> 6487 bytes static/image/home/red-packet.png | Bin 0 -> 27664 bytes static/image/home/view-more.png | Bin 0 -> 4560 bytes static/image/tabbar/cart-a.png | Bin 3396 -> 0 bytes static/image/tabbar/cart.png | Bin 3941 -> 0 bytes static/image/tabbar/center-a.png | Bin 3479 -> 0 bytes static/image/tabbar/center.png | Bin 3962 -> 0 bytes static/image/tabbar/home-a.png | Bin 1997 -> 0 bytes static/image/tabbar/home-active.png | Bin 0 -> 2603 bytes static/image/tabbar/home.png | Bin 1754 -> 2482 bytes static/image/tabbar/member-a.png | Bin 3750 -> 0 bytes static/image/tabbar/member.png | Bin 3454 -> 0 bytes static/image/tabbar/order-active.png | Bin 0 -> 2339 bytes static/image/tabbar/order.png | Bin 0 -> 2249 bytes static/image/tabbar/product-list-active.png | Bin 0 -> 2413 bytes static/image/tabbar/product-list.png | Bin 0 -> 2308 bytes static/image/tabbar/user-center-active.png | Bin 0 -> 1883 bytes static/image/tabbar/user-center.png | Bin 0 -> 1842 bytes uni_modules/uni-scss/changelog.md | 8 + uni_modules/uni-scss/index.scss | 1 + uni_modules/uni-scss/package.json | 82 +++ uni_modules/uni-scss/readme.md | 4 + uni_modules/uni-scss/styles/index.scss | 7 + uni_modules/uni-scss/styles/setting/_border.scss | 3 + uni_modules/uni-scss/styles/setting/_color.scss | 66 ++ uni_modules/uni-scss/styles/setting/_radius.scss | 55 ++ uni_modules/uni-scss/styles/setting/_space.scss | 56 ++ uni_modules/uni-scss/styles/setting/_styles.scss | 167 ++++++ uni_modules/uni-scss/styles/setting/_text.scss | 24 + .../uni-scss/styles/setting/_variables.scss | 146 +++++ uni_modules/uni-scss/styles/tools/functions.scss | 19 + uni_modules/uni-scss/theme.scss | 31 + uni_modules/uni-scss/variables.scss | 62 ++ uni_modules/uni-section/changelog.md | 2 + .../components/uni-section/uni-section.vue | 167 ++++++ uni_modules/uni-section/package.json | 87 +++ uni_modules/uni-section/readme.md | 8 + uni_modules/uv-icon/components/uv-icon/props.js | 2 +- .../components/uv-number-box/props.js | 4 +- .../components/uv-number-box/uv-number-box.vue | 6 +- uni_modules/uv-ui-tools/libs/css/color.scss | 3 +- 114 files changed, 3581 insertions(+), 1577 deletions(-) create mode 100644 components/couponPopup/couponPopup.vue create mode 100644 pages_order/mine/card.vue create mode 100644 pages_order/mine/memberCenter.vue create mode 100644 pages_order/mine/moreCommodity.vue create mode 100644 pages_order/mine/partner.vue delete mode 100644 pages_order/mine/recommend - 副本.vue delete mode 100644 pages_order/mine/recommend.vue create mode 100644 pages_order/mine/recruit.vue create mode 100644 pages_order/static/card/diamond-min.png create mode 100644 pages_order/static/card/diamond.png create mode 100644 pages_order/static/card/gold-min.png create mode 100644 pages_order/static/card/gold.png create mode 100644 pages_order/static/card/profilePhoto.png create mode 100644 pages_order/static/card/silver.png create mode 100644 pages_order/static/card/sliver-min.png create mode 100644 pages_order/static/coupon/bg.png create mode 100644 pages_order/static/coupon/close-btn.png create mode 100644 pages_order/static/coupon/examine.png create mode 100644 pages_order/static/coupon/register-success.png create mode 100644 pages_order/static/createOrder/account.png create mode 100644 pages_order/static/createOrder/address.png create mode 100644 pages_order/static/createOrder/coupon.png create mode 100644 pages_order/static/createOrder/wx.png create mode 100644 pages_order/static/memberCenter/descript1.png create mode 100644 pages_order/static/memberCenter/descript2.png create mode 100644 pages_order/static/memberCenter/equity.png create mode 100644 pages_order/static/productDetail/service.png create mode 100644 pages_order/static/recruit/bg.png create mode 100644 static/image/center/1.png delete mode 100644 static/image/center/11.svg delete mode 100644 static/image/center/13.png delete mode 100644 static/image/center/14.png delete mode 100644 static/image/center/15.png delete mode 100644 static/image/center/16.png delete mode 100644 static/image/center/17.png create mode 100644 static/image/center/2.png create mode 100644 static/image/center/4.png create mode 100644 static/image/center/5.png create mode 100644 static/image/center/6.png create mode 100644 static/image/center/7.png create mode 100644 static/image/center/8.png create mode 100644 static/image/center/ad-tag.png create mode 100644 static/image/center/ad.png create mode 100644 static/image/center/balance.png create mode 100644 static/image/center/brokerage.png delete mode 100644 static/image/center/c1.png delete mode 100644 static/image/center/c2.png delete mode 100644 static/image/center/c3.png create mode 100644 static/image/center/close.png create mode 100644 static/image/center/diamond-min.png create mode 100644 static/image/center/edit-icon.png create mode 100644 static/image/center/gold-min.png create mode 100644 static/image/center/head-img.png delete mode 100644 static/image/center/icon1.png create mode 100644 static/image/center/sliver-min.png create mode 100644 static/image/home/exclusive.png create mode 100644 static/image/home/necklace.png create mode 100644 static/image/home/red-packet.png create mode 100644 static/image/home/view-more.png delete mode 100644 static/image/tabbar/cart-a.png delete mode 100644 static/image/tabbar/cart.png delete mode 100644 static/image/tabbar/center-a.png delete mode 100644 static/image/tabbar/center.png delete mode 100644 static/image/tabbar/home-a.png create mode 100644 static/image/tabbar/home-active.png delete mode 100644 static/image/tabbar/member-a.png delete mode 100644 static/image/tabbar/member.png create mode 100644 static/image/tabbar/order-active.png create mode 100644 static/image/tabbar/order.png create mode 100644 static/image/tabbar/product-list-active.png create mode 100644 static/image/tabbar/product-list.png create mode 100644 static/image/tabbar/user-center-active.png create mode 100644 static/image/tabbar/user-center.png create mode 100644 uni_modules/uni-scss/changelog.md create mode 100644 uni_modules/uni-scss/index.scss create mode 100644 uni_modules/uni-scss/package.json create mode 100644 uni_modules/uni-scss/readme.md create mode 100644 uni_modules/uni-scss/styles/index.scss create mode 100644 uni_modules/uni-scss/styles/setting/_border.scss create mode 100644 uni_modules/uni-scss/styles/setting/_color.scss create mode 100644 uni_modules/uni-scss/styles/setting/_radius.scss create mode 100644 uni_modules/uni-scss/styles/setting/_space.scss create mode 100644 uni_modules/uni-scss/styles/setting/_styles.scss create mode 100644 uni_modules/uni-scss/styles/setting/_text.scss create mode 100644 uni_modules/uni-scss/styles/setting/_variables.scss create mode 100644 uni_modules/uni-scss/styles/tools/functions.scss create mode 100644 uni_modules/uni-scss/theme.scss create mode 100644 uni_modules/uni-scss/variables.scss create mode 100644 uni_modules/uni-section/changelog.md create mode 100644 uni_modules/uni-section/components/uni-section/uni-section.vue create mode 100644 uni_modules/uni-section/package.json create mode 100644 uni_modules/uni-section/readme.md 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 @@