From 742952453c426eea704f681df9348d46ab47d5a2 Mon Sep 17 00:00:00 2001 From: lxb <275353933@qq.com> Date: Mon, 27 Jul 2020 08:58:46 +0800 Subject: [PATCH] 1 --- components/order-item/index.vue | 29 +++- package-lock.json | 5 - pages/index/index.vue | 236 +++++++++++++++++++++++++++----- 3 files changed, 230 insertions(+), 40 deletions(-) diff --git a/components/order-item/index.vue b/components/order-item/index.vue index 7923ee0..667d0ca 100644 --- a/components/order-item/index.vue +++ b/components/order-item/index.vue @@ -2,7 +2,14 @@ - 待处理订单 + + + + 编号:1234567890123456 + + 已完成订单 + 待处理订单 + 心机小黑裙连衣裙赫本风夏季爆款... 共一件商品 @@ -50,6 +57,26 @@ export default { flex-direction: column; align-items: flex-start; justify-content: center; + .goods_num{ + display: flex; + justify-content: space-between; + width: 100%; + margin-bottom: 18rpx; + .number{ + font-size:22rpx; + font-family:PingFang SC; + font-weight:400; + color:rgba(153,153,153,1); + line-height:36rpx; + } + .order{ + font-size:26rpx; + font-family:PingFang SC; + font-weight:400; + color:rgba(255,49,49,1); + line-height:36rpx; + } + } .status { align-self: flex-end; font-size: 26rpx; diff --git a/package-lock.json b/package-lock.json index 5f7bbf4..ec1bd6b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,13 +6,8 @@ "dependencies": { "uview-ui": { "version": "1.5.2", -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.5.2.tgz", - "integrity": "sha512-FV9G+gZTAZKEE2m85ahIbIRiC/fdzTl+eNXDIMBoyc9b+fQWQhEtmAfu6huu7AtKuTI6gfqaYn6WGcmqYvr76w==" -======= "resolved": "https://registry.npm.taobao.org/uview-ui/download/uview-ui-1.5.2.tgz?cache=0&sync_timestamp=1594781920423&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fuview-ui%2Fdownload%2Fuview-ui-1.5.2.tgz", "integrity": "sha1-4jDud0TIBjMJe74GU+IyvJSyAwk=" ->>>>>>> fa383397b331ec0091096becf886f978cc1277fc } } } diff --git a/pages/index/index.vue b/pages/index/index.vue index 08b2f6d..00f3b1b 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -32,12 +32,14 @@ - 选择骑手 - - {{ worker.company + " " + worker.name }} - + 选择订单号 + + + {{ worker.label}} {{ worker.name }} + - + 请选择 @@ -70,7 +72,34 @@ 发布 - + + + + + 选择骑手 + + + + + + + + + + + + + + + 确认 + + + @@ -130,34 +159,45 @@ export default { worker: {}, workerList: [ { - label: '百世快递公司', - children: [ - { - label: '小米' - }, - { - label: '小亮' - } - ] + label: '1826789742312345', + id:'1', + name:'芳芳', + disabled: false }, { - label: '中通快递公司', - children: [ - { - label: '小红' - } - ] + label: '1826789742312345', + id:'2', + name:'张三', + disabled: false }, { - label: '申通快递公司', - children: [ - { - label: '小蓝' - } - ] + label: '1826789742312345', + id:'3', + name:'李四', + disabled: false + }, + { + label: '1826789742312345', + id:'4', + name:'王五', + disabled: false + }, + { + label: '1826789742312345', + id:'5', + name:'阿郎', + disabled: false + }, + { + label: '1826789742312345', + id:'6', + name:'阿娘', + disabled: false } ], - publishstate:true + publishstate:true, + value: 'orange', + show: false } }, components: { @@ -170,18 +210,36 @@ export default { release(){ this.publishstate = true }, + confirm(){ + this.show=false + }, + open(){ + this.show = true + }, + // 选中某个单选框时，由radio时触发 + radioChange(e) { + this.worker = { + label: e.label, + name: e.name, + company:e.company + } + }, + // 选中任一radio时，由radio-group触发 + radioGroupChange(e) { + // console.log(e); + }, publish(){ }, setWorker(e) { // console.log(e); - this.worker = { - company: e[0].label, - name: e[1].label - } + }, tabsChange(index) { this.swiperCurrent = index; + if(this.swiperCurrent == 3){ + this.worker ={} + } }, animationfinish(e) { let current = e.detail.current; @@ -220,7 +278,7 @@ export default { } .swiper-item { .complaint { - margin: 0 30rpx; + margin: 0rpx 30rpx 0; padding: 75rpx 30rpx; background-color: #ffffff; .select-container { @@ -234,7 +292,7 @@ export default { } .select { padding: 18rpx 20rpx; - width: 490rpx; + width: 470rpx; height: 60rpx; background: rgba(236,236,236,1); border-radius: 6rpx; @@ -249,6 +307,11 @@ export default { width: 24rpx; height: 13rpx; } + .order_num{ + width: 367rpx; + display: flex; + justify-content: space-between; + } } .worker { display: flex; @@ -375,5 +438,110 @@ export default { height: 37rpx; } } + .popup_cont{ + border-top: 1px solid RGBA(239, 236, 240, 1); + background-color: #fff; + width: 100%; + height: 562rpx; + line-height: 80rpx; + font-size:28rpx; + font-family:PingFang SC; + font-weight:400; + color:rgba(102,102,102,1); + transform: scale(1); + /* top: 0px; */ + transition-duration: 0.3s; + + > uni-swiper { + flex: 1; + height: 100vh; + + .order-list{ + height: 30vh; + padding-bottom: 140rpx; + } + } + .rider{ + border-radius:20px 20px 0px 0px; + font-size:30rpx; + font-family:PingFang SC; + font-weight:500; + color:rgba(51,51,51,1); + height:88rpx; + width: 100%; + padding-left: 30rpx; + border-bottom: 1px solid rgba(236, 236, 236, 1); + + >image{ + width: 32rpx; + height: 32rpx; + vertical-align: middle; + float: right; + padding-top: 30rpx; + padding-right:30rpx + + } + } + + .store{ + >view{ + padding-left: 30rpx; + padding-top: 30rpx; + >image{ + width:60rpx; + height:60rpx; + border-radius:50%; + vertical-align: middle; + padding-right:13rpx + } + } + + font-size:28rpx; + font-family:PingFang SC; + font-weight:400; + color:rgba(51,51,51,1); + line-height: 60rpx; + + } + .checkd{ + >radio-group .uni-list-cell{ + display: flex; + flex-wrap: nowrap; + width: 100%; + padding-bottom: 140rpx; + } + .posi{ + margin-bottom: 80rpx; + + .check{ + display: flex; + width: 100%; + justify-content: space-around; + } + } + + } + .bottom_btn{ + position: fixed; + width: 100%; + height: 140rpx; + bottom: 0; + + } + .wash-btn { + width: 690rpx; + height: 98rpx; + background: rgba(255,120,15,1); + border-radius: 49rpx; + position: absolute; + bottom: 40rpx; + left: 50%; + transform: translate(-50%, 0); + font-size: 36rpx; + color:rgba(255,255,255,1); + text-align: center; + line-height: 98rpx; + } + } } \ No newline at end of file