From dd39bd70971e231a18d47dc14fa1dd09dd4f1104 Mon Sep 17 00:00:00 2001 From: buffeyu Date: Fri, 7 Jan 2022 17:23:48 +0800 Subject: [PATCH] Merge branch 'devlop' of http://git.qniao.cn/dengxiongfei/paper-shopkeeper-app into devlop --- pages.json | 10 +- pages/my-offer/index.vue | 48 +- pages/submit-quotation/index.vue | 667 ++++++++++++++++++ pages/trade/index.vue | 14 +- pages/trade/orderList.vue | 62 +- pages/trade/quotationList.vue | 50 +- static/imgs/trade/myPrice.png | Bin 0 -> 794 bytes uni_modules/uni-number-box/changelog.md | 25 + .../uni-number-box/uni-number-box.vue | 220 ++++++ uni_modules/uni-number-box/package.json | 85 +++ uni_modules/uni-number-box/readme.md | 13 + 11 files changed, 1130 insertions(+), 64 deletions(-) create mode 100644 pages/submit-quotation/index.vue create mode 100644 static/imgs/trade/myPrice.png create mode 100644 uni_modules/uni-number-box/changelog.md create mode 100644 uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue create mode 100644 uni_modules/uni-number-box/package.json create mode 100644 uni_modules/uni-number-box/readme.md diff --git a/pages.json b/pages.json index 4d1d096..7a549ec 100644 --- a/pages.json +++ b/pages.json @@ -106,7 +106,15 @@ "navigationBarTitleText": "我的报价", "enablePullDownRefresh": false } - } + }, + { + "path": "pages/submit-quotation/index", + "style": { + "navigationBarTitleText": "提交报价", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + } ], "globalStyle": { "navigationBarTextStyle": "black", diff --git a/pages/my-offer/index.vue b/pages/my-offer/index.vue index fd75c55..34ae1cb 100644 --- a/pages/my-offer/index.vue +++ b/pages/my-offer/index.vue @@ -1,6 +1,6 @@ diff --git a/pages/trade/index.vue b/pages/trade/index.vue index 293bb1e..f0288c8 100644 --- a/pages/trade/index.vue +++ b/pages/trade/index.vue @@ -36,7 +36,6 @@ export default { key: '', mainKey: '1', current: '0', - items: ['报价', '订单'], } @@ -69,11 +68,11 @@ export default { .trade-index { .top-bar { background-color: rgb(255, 255, 255); - border-bottom-width: 1px; + border-bottom-width: 2rpx; border-bottom-style: solid; border-bottom-color: #eee; z-index: 998; - height: 44px; + height: 88rpx; } .title { font-size: 40rpx; @@ -82,7 +81,7 @@ export default { font-weight: 500; } .text-view { - padding: 10px; + padding: 20rpx; } .bar-contant { display: flex; @@ -93,7 +92,7 @@ export default { color: #000000; letter-spacing: 0; font-weight: 550; - border-bottom: 2px solid #007aff; + border-bottom: 4rpx solid #007aff; } .oncheck-title { font-family: PingFangSC-Regular; @@ -102,9 +101,8 @@ export default { font-weight: 550; } .check-control { - line-height: 35px; - - width: 40px; + line-height: 70rpx; + // width: 40px; text-align: center; } .title-left { diff --git a/pages/trade/orderList.vue b/pages/trade/orderList.vue index c90f54d..4ce60ac 100644 --- a/pages/trade/orderList.vue +++ b/pages/trade/orderList.vue @@ -2,14 +2,17 @@ - + 广州民族印刷有限公司 {{ items.orderStatus }} - - + + + + + {{ item.brandName }}{{ item.categoryName }} @@ -20,8 +23,8 @@ - 交货时间： - {{ items.deliveryDay }}天 + 交货时间： + {{ items.deliveryDay }}天 ¥{{ items.totalOfferPrice }} @@ -53,8 +56,8 @@ export default { pageSize: 10 }, orderData: [], - controlCurrent: 0, - controlItems: ['全部', '待确认', '待发货', '已完成'], + controlCurrent: 0, + controlItems: ['全部', '待确认', '待发货', '已完成'], orderOption: { size: 10, auto: true, @@ -142,13 +145,16 @@ export default { diff --git a/pages/trade/quotationList.vue b/pages/trade/quotationList.vue index 2a3d3d5..7a04da6 100644 --- a/pages/trade/quotationList.vue +++ b/pages/trade/quotationList.vue @@ -46,7 +46,7 @@ - + 我的报价 @@ -155,7 +155,11 @@ export default { }) }, // 报价按钮事件 - offerClick(){}, + offerClick(){ + uni.navigateTo({ + url: '../submit-quotation/index' + }); + }, // 我的报价页面跳转事件 nativeTo(){ console.log(11) @@ -169,14 +173,15 @@ export default { diff --git a/static/imgs/trade/myPrice.png b/static/imgs/trade/myPrice.png new file mode 100644 index 0000000000000000000000000000000000000000..81004a7f1e299c12ee3845fca2a99721edb8e813 GIT binary patch literal 794 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}E~ycoX}-P; zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz07Sip>6gA}f5OZv>fz|`XD;usRa z`8M1(JH%1Mw%j~0;NX@dEoRLemp@*M)dW89v;1Ke1A#|riK)Je!lJa4nm8Wu8_Z2u zDzR~sfNO83m>8pQhlgF6P5Hg*$(8+;t7ppwy*;pJ=FakWw(0L`-oz#>_r5#lnCWLu zQ{%-KYOTB0KhU*Ne`Y5kb6PlKhU1!tTrBP@?(EG?Y6`t|%}{lHv7J$Yb3uaK?gGcJ zo-Ar-1+IOZ_L#A$Jp4-BhsOK5Os)k7HKaBzaNukdTXs`^!9#taiZf-AQ*Z06esNqm zef5LcGoDuH|E){5KJ_9a+q;a-Z`or>pVM!*+^-F0dB0t|`~g?MMvbKJuDk8uS{ysh z&Mvm&mtkA&z86-C0aMDX^_s$We3JfT`ozqxahB!dw?CEqe@95}5bE-FIM}=QdDR24 zN{O#q>Njf7HxaI>xwkOS@5jUr_XF(g`<@>Vz4+mtv`lKrx!)|Cq92@YXnXm1cfr&{ z3-=uAHIvxgo^eWBd*w{Q?M1BDZO@0j^9k4*>v=mwPHjVHaLJ83n|QxONi6%4vufv& zu*3hFL;3GKZ*UC|Q42UK!+9skR%8p48Ar+ems&eco7Z)2vVO}qXZHKjLo8C8j#=(v z{U1Kd=y+$8wcba*#N!t_9s3=A@Z2%^y|Ia%=hDGG<>+brQ!KcIfAl_{V;`7wIZoyj z`>lu;&Y0ue&rHNCdD(B@n6~oMPluapfUZ$k^m@m4{@WU_?&-d8T_E15!}R)_ALloh zozaQvo%xBY9#4HDYf#~TlkwlO__TA|&ah`3oqf6X`U8WxJrVA@-A`-OSXRwQT4(0> z(%`nbpY;CE6C*zv-_PB|>RWlzKJ)pEi+d8Url^!fE;_t?%`EMIALssOO+C2gzmcr^ QB2c>YboFyt=akR{08BwnNdN!< literal 0 HcmV?d00001 diff --git a/uni_modules/uni-number-box/changelog.md b/uni_modules/uni-number-box/changelog.md new file mode 100644 index 0000000..5925c32 --- /dev/null +++ b/uni_modules/uni-number-box/changelog.md @@ -0,0 +1,25 @@ +## 1.2.1（2021-11-22） +- 修复 vue3中某些scss变量无法找到的问题 +## 1.2.0（2021-11-19） +- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource) +- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-number-box](https://uniapp.dcloud.io/component/uniui/uni-number-box) +## 1.1.2（2021-11-09） +- 新增 提供组件设计资源，组件样式调整 +## 1.1.1（2021-07-30） +- 优化 vue3下事件警告的问题 +## 1.1.0（2021-07-13） +- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834) +## 1.0.7（2021-05-12） +- 新增 组件示例地址 +## 1.0.6（2021-04-20） +- 修复 uni-number-box 浮点数运算不精确的 bug +- 修复 uni-number-box change 事件触发不正确的 bug +- 新增 uni-number-box v-model 双向绑定 +## 1.0.5（2021-02-05） +- 调整为uni_modules目录规范 + +## 1.0.7（2021-02-05） +- 调整为uni_modules目录规范 +- 新增 支持 v-model +- 新增 支持 focus、blur 事件 +- 新增 支持 PC 端 diff --git a/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue b/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue new file mode 100644 index 0000000..8d255fb --- /dev/null +++ b/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue @@ -0,0 +1,220 @@ + + + diff --git a/uni_modules/uni-number-box/package.json b/uni_modules/uni-number-box/package.json new file mode 100644 index 0000000..ad82336 --- /dev/null +++ b/uni_modules/uni-number-box/package.json @@ -0,0 +1,85 @@ +{ + "id": "uni-number-box", + "displayName": "uni-number-box 数字输入框", + "version": "1.2.1", + "description": "NumberBox 带加减按钮的数字输入框组件，用户可以控制每次点击增加的数值，支持小数。", + "keywords": [ + "uni-ui", + "uniui", + "数字输入框" +], + "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-number-box/readme.md b/uni_modules/uni-number-box/readme.md new file mode 100644 index 0000000..affc56f --- /dev/null +++ b/uni_modules/uni-number-box/readme.md @@ -0,0 +1,13 @@ + + +## NumberBox 数字输入框 +> **组件名：uni-number-box** +> 代码块： `uNumberBox` + + +带加减按钮的数字输入框。 + +### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-number-box) +#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 + +