From 27c18062923f57fcd8b1dba2a7b7d71b2d9f30e8 Mon Sep 17 00:00:00 2001 From: buffeyu Date: Sat, 15 Jan 2022 05:55:43 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=BA=B8=E5=93=81=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 2 +- .../qn-input-number/qn-input-number.vue | 73 +++ components/u-gap/u-gap.vue | 24 + pages.json | 9 +- pages/cart/index.vue | 283 ++++++++- pages/paper-details/index.vue | 550 ++++++++++++++++++ pages/store/index.vue | 63 +- .../paperDetails/add-shopping-trolley.png | Bin 0 -> 954 bytes static/imgs/paperDetails/shop-icon.png | Bin 0 -> 969 bytes static/imgs/paperDetails/shopping-trolley.png | Bin 0 -> 922 bytes static/imgs/store/special-offe.png | Bin 0 -> 3067 bytes uni_modules/uni-popup/changelog.md | 2 + .../uni-popup-dialog/uni-popup-dialog.vue | 2 +- .../uni-popup-message/uni-popup-message.vue | 2 +- .../uni-popup-share/uni-popup-share.vue | 2 +- .../components/uni-popup/uni-popup.vue | 18 +- uni_modules/uni-popup/package.json | 2 +- uni_modules/uni-swiper-dot/changelog.md | 12 + .../uni-swiper-dot/uni-swiper-dot.vue | 218 +++++++ uni_modules/uni-swiper-dot/package.json | 87 +++ uni_modules/uni-swiper-dot/readme.md | 11 + 21 files changed, 1300 insertions(+), 60 deletions(-) create mode 100644 components/qn-input-number/qn-input-number.vue create mode 100644 components/u-gap/u-gap.vue create mode 100644 pages/paper-details/index.vue create mode 100644 static/imgs/paperDetails/add-shopping-trolley.png create mode 100644 static/imgs/paperDetails/shop-icon.png create mode 100644 static/imgs/paperDetails/shopping-trolley.png create mode 100644 static/imgs/store/special-offe.png create mode 100644 uni_modules/uni-swiper-dot/changelog.md create mode 100644 uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot.vue create mode 100644 uni_modules/uni-swiper-dot/package.json create mode 100644 uni_modules/uni-swiper-dot/readme.md diff --git a/App.vue b/App.vue index c6f1183..76348d7 100644 --- a/App.vue +++ b/App.vue @@ -15,7 +15,7 @@ export default { } else { console.log('非分享进入', store.state.supplierId) if (!store.state.supplierId) { - go2('error') + // go2('error') } } }, diff --git a/components/qn-input-number/qn-input-number.vue b/components/qn-input-number/qn-input-number.vue new file mode 100644 index 0000000..ac5d749 --- /dev/null +++ b/components/qn-input-number/qn-input-number.vue @@ -0,0 +1,73 @@ + + + + + diff --git a/components/u-gap/u-gap.vue b/components/u-gap/u-gap.vue new file mode 100644 index 0000000..bd518a2 --- /dev/null +++ b/components/u-gap/u-gap.vue @@ -0,0 +1,24 @@ + + + + + diff --git a/pages.json b/pages.json index 2edb7e1..f5be82b 100644 --- a/pages.json +++ b/pages.json @@ -58,7 +58,14 @@ "enablePullDownRefresh": false, "navigationStyle": "custom" } - } + }, + { + "path": "pages/paper-details/index", + "style": { + "navigationBarTitleText": "纸品详情", + "enablePullDownRefresh": false + } + } ], "globalStyle": { "navigationBarTextStyle": "black", diff --git a/pages/cart/index.vue b/pages/cart/index.vue index 0aa3cf6..81db55d 100644 --- a/pages/cart/index.vue +++ b/pages/cart/index.vue @@ -1,40 +1,273 @@ - diff --git a/pages/paper-details/index.vue b/pages/paper-details/index.vue new file mode 100644 index 0000000..b3e8560 --- /dev/null +++ b/pages/paper-details/index.vue @@ -0,0 +1,550 @@ + + + + + diff --git a/pages/store/index.vue b/pages/store/index.vue index a6aa604..8dd40d8 100644 --- a/pages/store/index.vue +++ b/pages/store/index.vue @@ -27,9 +27,12 @@ /> - - + + + + + @@ -39,7 +42,6 @@ 广州市 - 库存:9600张 @@ -50,13 +52,16 @@ ¥2300 /吨 - + 马上抢 - + @@ -89,6 +94,7 @@ - diff --git a/uni_modules/uni-swiper-dot/package.json b/uni_modules/uni-swiper-dot/package.json new file mode 100644 index 0000000..f2dd8d2 --- /dev/null +++ b/uni_modules/uni-swiper-dot/package.json @@ -0,0 +1,87 @@ +{ + "id": "uni-swiper-dot", + "displayName": "uni-swiper-dot 轮播图指示点", + "version": "1.2.0", + "description": "自定义轮播图指示点组件", + "keywords": [ + "uni-ui", + "uniui", + "轮播图指示点", + "dot", + "swiper" +], + "repository": "https://github.com/dcloudio/uni-ui", + "engines": { + "HBuilderX": "" + }, + "directories": { + "example": "../../temps/example_temps" + }, + "dcloudext": { + "category": [ + "前端组件", + "通用组件" + ], + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "无", + "data": "无", + "permissions": "无" + }, + "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui" + }, + "uni_modules": { + "dependencies": ["uni-scss"], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y" + }, + "client": { + "App": { + "app-vue": "y", + "app-nvue": "y" + }, + "H5-mobile": { + "Safari": "y", + "Android Browser": "y", + "微信浏览器(Android)": "y", + "QQ浏览器(Android)": "y" + }, + "H5-pc": { + "Chrome": "y", + "IE": "y", + "Edge": "y", + "Firefox": "y", + "Safari": "y" + }, + "小程序": { + "微信": "y", + "阿里": "y", + "百度": "y", + "字节跳动": "y", + "QQ": "y" + }, + "快应用": { + "华为": "u", + "联盟": "u" + }, + "Vue": { + "vue2": "y", + "vue3": "y" + } + } + } + } +} \ No newline at end of file diff --git a/uni_modules/uni-swiper-dot/readme.md b/uni_modules/uni-swiper-dot/readme.md new file mode 100644 index 0000000..7d397e2 --- /dev/null +++ b/uni_modules/uni-swiper-dot/readme.md @@ -0,0 +1,11 @@ + + +## SwiperDot 轮播图指示点 +> **组件名：uni-swiper-dot** +> 代码块： `uSwiperDot` + + +自定义轮播图指示点 + +### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-swiper-dot) +#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 \ No newline at end of file From 65f4040f1050b8a2c76072c9ead28597873d40fb Mon Sep 17 00:00:00 2001 From: buffeyu Date: Sat, 15 Jan 2022 05:58:42 +0800 Subject: [PATCH 2/5] up --- pages.json | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pages.json b/pages.json index 02fea01..e518dc7 100644 --- a/pages.json +++ b/pages.json @@ -67,13 +67,6 @@ "navigationStyle": "custom" } }, - { - "path": "pages/paper-details/index", - "style": { - "navigationBarTitleText": "纸品详情", - "enablePullDownRefresh": false - } - } { "path": "pages/order-list/index", "style": { From 6184a61e939e56fa06a770dfe22819405c05fd59 Mon Sep 17 00:00:00 2001 From: buffeyu Date: Sat, 15 Jan 2022 06:00:15 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=BA=B8=E5=93=81=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pages.json b/pages.json index e518dc7..234695e 100644 --- a/pages.json +++ b/pages.json @@ -82,7 +82,14 @@ "enablePullDownRefresh": false, "navigationStyle": "custom" } - } + }, + { + "path": "pages/paper-details/index", + "style": { + "navigationBarTitleText": "纸品详情", + "enablePullDownRefresh": false + } + } ], "globalStyle": { "navigationBarTextStyle": "black", From 7fb879ee6df9a97902788c420bd0c89f4a34aed7 Mon Sep 17 00:00:00 2001 From: buffeyu Date: Sun, 16 Jan 2022 03:15:16 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 14 + pages/add-address-manage/index.vue | 208 ++++++++++ pages/address-manage/index.vue | 200 +++++++++- pages/for-comparison/index.vue | 592 +++++++++++++++++++++++++++++ pages/paper-details/index.vue | 7 +- 5 files changed, 1015 insertions(+), 6 deletions(-) create mode 100644 pages/add-address-manage/index.vue create mode 100644 pages/for-comparison/index.vue diff --git a/pages.json b/pages.json index 234695e..c75ebcf 100644 --- a/pages.json +++ b/pages.json @@ -89,6 +89,20 @@ "navigationBarTitleText": "纸品详情", "enablePullDownRefresh": false } + }, + { + "path": "pages/for-comparison/index", + "style": { + "navigationBarTitleText": "实单询比价", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/add-address-manage/index", + "style": { + "navigationBarTitleText": "新建收货地址", + "enablePullDownRefresh": false + } } ], "globalStyle": { diff --git a/pages/add-address-manage/index.vue b/pages/add-address-manage/index.vue new file mode 100644 index 0000000..bbe9611 --- /dev/null +++ b/pages/add-address-manage/index.vue @@ -0,0 +1,208 @@ + + + + + diff --git a/pages/address-manage/index.vue b/pages/address-manage/index.vue index ffece6d..3c072fa 100644 --- a/pages/address-manage/index.vue +++ b/pages/address-manage/index.vue @@ -1,12 +1,58 @@ - + diff --git a/pages/for-comparison/index.vue b/pages/for-comparison/index.vue new file mode 100644 index 0000000..921eb9d --- /dev/null +++ b/pages/for-comparison/index.vue @@ -0,0 +1,592 @@ + + + + + diff --git a/pages/paper-details/index.vue b/pages/paper-details/index.vue index b3e8560..2ec110e 100644 --- a/pages/paper-details/index.vue +++ b/pages/paper-details/index.vue @@ -98,7 +98,7 @@ - + 立即询单 @@ -192,6 +192,7 @@ import uGap from '@/components/u-gap/u-gap.vue' import qnFooter from '@/components/qn-footer/qn-footer.vue' import qnInputNumber from '@/components/qn-input-number/qn-input-number.vue' +import { go2 } from '@/utils/hook.js' export default { components: { uGap, qnFooter, qnInputNumber }, data() { @@ -220,6 +221,10 @@ export default { addShoppingTap() { this.$refs.popup.open('bottom') }, + // 路由到实单询比价 + inquiryTap() { + go2('for-comparison', {id: null}) + }, closeTap() { this.$refs.popup.close() }, From 8c5bc05a949a6c09afa3b6145d112863002e8480 Mon Sep 17 00:00:00 2001 From: buffeyu Date: Sun, 16 Jan 2022 23:07:59 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/address-manage/index.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pages/address-manage/index.vue b/pages/address-manage/index.vue index 3c072fa..c0848b2 100644 --- a/pages/address-manage/index.vue +++ b/pages/address-manage/index.vue @@ -203,6 +203,8 @@ export default { background: #FFFFFF; border-top: 2rpx solid #DDDDDD; .cancel-text { + flex-grow: 1; + flex-shrink: 1; font-size: 36rpx; color: #000000; letter-spacing: 0; @@ -210,11 +212,15 @@ export default { font-weight: 400; } .line { + flex-grow: 0; + flex-shrink: 0; width: 2rpx; height: 100rpx; border-left: 2rpx solid #DCDEE3; } .confirm-text{ + flex-grow: 1; + flex-shrink: 1; font-size: 36rpx; color: #108EE9; letter-spacing: 0;