1
This commit is contained in:
lxb
parent
7245d83dcd
commit
742952453c
@ -2,7 +2,14 @@
|
|||||||
<view class="item" @click="toDetailsPage">
|
<view class="item" @click="toDetailsPage">
|
||||||
<image></image>
|
<image></image>
|
||||||
<view class="goods">
|
<view class="goods">
|
||||||
<view class="status" v-if="cur==4">待处理订单</view>
|
|
||||||
|
<view class="goods_num">
|
||||||
|
<view class="number">
|
||||||
|
编号:1234567890123456
|
||||||
|
</view>
|
||||||
|
<view class="order" v-if="cur==4">已完成订单</view>
|
||||||
|
<view class="order" v-else>待处理订单</view>
|
||||||
|
</view>
|
||||||
<view class="name u-line-1">心机小黑裙连衣裙赫本风夏季爆款...</view>
|
<view class="name u-line-1">心机小黑裙连衣裙赫本风夏季爆款...</view>
|
||||||
<view class="info">
|
<view class="info">
|
||||||
<view class="num">共一件商品</view>
|
<view class="num">共一件商品</view>
|
||||||
@ -50,6 +57,26 @@ export default {
|
|||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
align-items: flex-start;
|
align-items: flex-start;
|
||||||
justify-content: center;
|
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 {
|
.status {
|
||||||
align-self: flex-end;
|
align-self: flex-end;
|
||||||
font-size: 26rpx;
|
font-size: 26rpx;
|
||||||
|
|||||||
5
package-lock.json
generated
5
package-lock.json
generated
@ -6,13 +6,8 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"uview-ui": {
|
"uview-ui": {
|
||||||
"version": "1.5.2",
|
"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",
|
"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="
|
"integrity": "sha1-4jDud0TIBjMJe74GU+IyvJSyAwk="
|
||||||
>>>>>>> fa383397b331ec0091096becf886f978cc1277fc
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -32,12 +32,14 @@
|
|||||||
<scroll-view scroll-y style="height: 100%;width: 100%;">
|
<scroll-view scroll-y style="height: 100%;width: 100%;">
|
||||||
<view class="complaint">
|
<view class="complaint">
|
||||||
<view class="select-container">
|
<view class="select-container">
|
||||||
<view class="title">选择骑手</view>
|
<view class="title">选择订单号</view>
|
||||||
<view class="worker" v-if="JSON.stringify(worker) != '{}'">
|
<view class="select" v-if="JSON.stringify(worker) != '{}'">
|
||||||
<view>{{ worker.company + " " + worker.name }}</view>
|
<!-- <view>{{ worker.label + " " + worker.name }}</view>
|
||||||
<u-icon name="edit-pen" @click="worker={}"></u-icon>
|
<u-icon name="edit-pen"></u-icon> -->
|
||||||
|
<view class="order_num"><text>{{ worker.label}}</text><text> {{ worker.name }}</text></view>
|
||||||
|
<image src="/static/image/home/5.png" @click="open()"></image>
|
||||||
</view>
|
</view>
|
||||||
<view v-else class="select" @click="showSelect=true">
|
<view v-else class="select" @click="show = true">
|
||||||
<view>请选择</view>
|
<view>请选择</view>
|
||||||
<image src="/static/image/home/5.png"></image>
|
<image src="/static/image/home/5.png"></image>
|
||||||
</view>
|
</view>
|
||||||
@ -70,7 +72,34 @@
|
|||||||
<image src="/static/home/1.png"></image>
|
<image src="/static/home/1.png"></image>
|
||||||
<view class="text" @click="release()">发布</view>
|
<view class="text" @click="release()">发布</view>
|
||||||
</view>
|
</view>
|
||||||
<u-select v-model="showSelect" mode="mutil-column-auto" :list="workerList" @confirm="setWorker"></u-select>
|
<!-- <u-select v-model="showSelect" mode="mutil-column-auto" :list="workerList" @confirm="setWorker"></u-select> -->
|
||||||
|
<u-popup v-model="show" mode="bottom" >
|
||||||
|
<view class="popup_cont" >
|
||||||
|
<view class="rider">
|
||||||
|
<text>选择骑手</text>
|
||||||
|
<image src="../../static/image/tosign/noes.png" @click="show = false"></image>
|
||||||
|
</view>
|
||||||
|
<swiper style="height: 30vh" vertical="true">
|
||||||
|
<swiper-item class="swiper-item" >
|
||||||
|
<scroll-view scroll-y class="order-list">
|
||||||
|
<view class="checkd">
|
||||||
|
<u-radio-group v-model="value" @change="radioGroupChange" class="posi">
|
||||||
|
<label v-for="(item, index) in workerList" :key="index" class="check" @confirm="setWorker">
|
||||||
|
<view class="">{{item.name}}</view>
|
||||||
|
<view class="">{{item.label}}</view>
|
||||||
|
<view class="">{{item.company}}</view>
|
||||||
|
<u-radio @change="radioChange(item)" :name="item.id":disabled="item.disabled" shape="circle" active-color="rgba(255, 120, 15, 1)" wrap ="true"></u-radio>
|
||||||
|
</label>
|
||||||
|
</u-radio-group>
|
||||||
|
</view>
|
||||||
|
</scroll-view>
|
||||||
|
</swiper-item>
|
||||||
|
</swiper>
|
||||||
|
<view class="bottom_btn" style="width: 100%;background-color: #fff;">
|
||||||
|
<view class="wash-btn" @click="confirm()">确认</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</u-popup>
|
||||||
<u-popup v-model="showComplaint" mode="center" border-radius="10">
|
<u-popup v-model="showComplaint" mode="center" border-radius="10">
|
||||||
<view class="confirm-complaint">
|
<view class="confirm-complaint">
|
||||||
<view class="text">
|
<view class="text">
|
||||||
@ -130,34 +159,45 @@ export default {
|
|||||||
worker: {},
|
worker: {},
|
||||||
workerList: [
|
workerList: [
|
||||||
{
|
{
|
||||||
label: '百世快递公司',
|
label: '1826789742312345',
|
||||||
children: [
|
id:'1',
|
||||||
{
|
name:'芳芳',
|
||||||
label: '小米'
|
disabled: false
|
||||||
},
|
|
||||||
{
|
|
||||||
label: '小亮'
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '中通快递公司',
|
label: '1826789742312345',
|
||||||
children: [
|
id:'2',
|
||||||
{
|
name:'张三',
|
||||||
label: '小红'
|
disabled: false
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '申通快递公司',
|
label: '1826789742312345',
|
||||||
children: [
|
id:'3',
|
||||||
{
|
name:'李四',
|
||||||
label: '小蓝'
|
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: {
|
components: {
|
||||||
@ -170,18 +210,36 @@ export default {
|
|||||||
release(){
|
release(){
|
||||||
this.publishstate = true
|
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(){
|
publish(){
|
||||||
|
|
||||||
},
|
},
|
||||||
setWorker(e) {
|
setWorker(e) {
|
||||||
// console.log(e);
|
// console.log(e);
|
||||||
this.worker = {
|
|
||||||
company: e[0].label,
|
|
||||||
name: e[1].label
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
tabsChange(index) {
|
tabsChange(index) {
|
||||||
this.swiperCurrent = index;
|
this.swiperCurrent = index;
|
||||||
|
if(this.swiperCurrent == 3){
|
||||||
|
this.worker ={}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
animationfinish(e) {
|
animationfinish(e) {
|
||||||
let current = e.detail.current;
|
let current = e.detail.current;
|
||||||
@ -220,7 +278,7 @@ export default {
|
|||||||
}
|
}
|
||||||
.swiper-item {
|
.swiper-item {
|
||||||
.complaint {
|
.complaint {
|
||||||
margin: 0 30rpx;
|
margin: 0rpx 30rpx 0;
|
||||||
padding: 75rpx 30rpx;
|
padding: 75rpx 30rpx;
|
||||||
background-color: #ffffff;
|
background-color: #ffffff;
|
||||||
.select-container {
|
.select-container {
|
||||||
@ -234,7 +292,7 @@ export default {
|
|||||||
}
|
}
|
||||||
.select {
|
.select {
|
||||||
padding: 18rpx 20rpx;
|
padding: 18rpx 20rpx;
|
||||||
width: 490rpx;
|
width: 470rpx;
|
||||||
height: 60rpx;
|
height: 60rpx;
|
||||||
background: rgba(236,236,236,1);
|
background: rgba(236,236,236,1);
|
||||||
border-radius: 6rpx;
|
border-radius: 6rpx;
|
||||||
@ -249,6 +307,11 @@ export default {
|
|||||||
width: 24rpx;
|
width: 24rpx;
|
||||||
height: 13rpx;
|
height: 13rpx;
|
||||||
}
|
}
|
||||||
|
.order_num{
|
||||||
|
width: 367rpx;
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
.worker {
|
.worker {
|
||||||
display: flex;
|
display: flex;
|
||||||
@ -375,5 +438,110 @@ export default {
|
|||||||
height: 37rpx;
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
Loading…
Reference in New Issue
Block a user