wangmingchuan
/
yanzong_qianduan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

服务订单

Browse Source
version/0412
shuxiaoquan 11 months ago
parent f905d9e2b8
commit e2671484c2
4 changed files with 588 additions and 450 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 12
      pages/login/index.vue
  2. 6
      pages/news/recycling/orderDetail.vue
  3. 346
      pages/news/recycling/orderList.vue
  4. 20
      pages/user/index.vue

12
pages/login/index.vue
Unescape View File

@ -14,16 +14,16 @@
<text @click="getCode" v-if="!showCountDown">获取验证码</text>
<text v-if="showCountDown">{{countdown}}</text>
</view>
<view class="c">
查看并同意<text @click="toTextPage(1)">《用户服务协议》</text>和<text @click="toTextPage(2)">《隐私政策》</text>
<view class="c" style="display: flex;align-items: center;">
<u-checkbox active-color="#FF343C" v-model="isCheckout" style="margin-right: -20rpx;"></u-checkbox>同意<text @click="toTextPage(1)">《用户服务协议》</text>和<text @click="toTextPage(2)">《隐私政策》</text>
</view>
</view>
<view class="login-fd login-fd-on" @click="login">登录</view>
<view class="" v-if="isCheckout">
<mpWeiXinMobile :refereeId="refereeId"></mpWeiXinMobile>
</view>
<view class="" v-else>
<mpWeiXinMobile :refereeId="refereeId"></mpWeiXinMobile>
<view class="" v-else style="font-size: 28rpx;color: #666;text-align: center;margin-top: 50rpx;" @click="login">
手机号快捷登录
</view>
</view>
</template>
@ -114,6 +114,10 @@
})
},
login() {
if(this.isCheckout == false){
this.$toast('请勾选用户协议')
return ;
}
// 登录
if (!this.validatePhoneNumber(this.phoneNum)) {
this.$toast('请输入正确的手机号')

6
pages/news/recycling/orderDetail.vue
Unescape View File

@ -123,13 +123,11 @@
isShow: false,
currentIndex: 0,
background: {
background: `url(${this.$picUrl}/static/news/refund-bg.png) center -10px no-repeat`,
// background: 'url('+ img+') center -10px no-repeat',
background: `url(${this.$picUrl}/static/news/refund-bg.png) center top no-repeat`,
backgroundSize: '100%',
},
background1: {
background: `url(${this.$picUrl}/static/news/login-bg.png) center -10px no-repeat`,
// background: 'url('+ img1+') center -10px no-repeat',
background: `url(${this.$picUrl}/static/news/login-bg.png) center top no-repeat`,
backgroundSize: '100%',
},
info: {},

346
pages/news/recycling/orderList.vue
Unescape View File

@ -14,54 +14,107 @@
<text>全部</text>
<text class="line" v-show="classifyShow == -1"></text>
</view>
<view class="list" v-for="(item,index) in classList" :class="{'action':classifyShow==index}"
@click="onClassify(index)" :key="index">
<view class="list" v-for="(item,index) in classList" :class="{'action':classifyShow==index}" @click="onClassify(index)" :key="index">
<text>{{item.name}}</text>
<text class="line" v-show="classifyShow==index"></text>
</view>
</view>
</view>
<view class="shopContent">
<view class="shopItem" v-for="(item,index) in goodsList" :key="index" @click="openPage(2,index,item)">
<view class="shopItem" v-for="(item,index) in goodsList" :key="index" @click="openPage(6,item.order_id)">
<view class="orderInfo">
<text>订单号：{{item.order_no}}</text>
<text class="statusText" style="color: #FF6813;">{{item.order_status_text}}</text>
</view>
<view class="shopItemInfo">
<image :src="item.recovery_image"></image>
<image :src="item.server_image"></image>
<view class="priceCon">
<view class="a">名称：{{item.recovery_name}}</view>
<view class="a" v-if="item.brand">品牌：{{item.brand}}</view>
<view class="a">{{item.server_name}}</view>
<view class="b">
<text class="num"></text>
<text class="num">x1</text>
<view class="priceText">
<text style="font-size: 26upx;">¥</text>
<text>{{item.expect_price}}</text>
<text>{{item.pay_price}}</text>
</view>
</view>
</view>
</view>
<view class="totalNum">
<!-- <text>含运费¥{{item.yunfei}}</text> -->
<text>共计：</text>
<text>¥{{item.pay_price}}</text>
</view>
<view class="remark">
<view class="remarkTitle">
联系电话:{{item.mobile}}
收件人姓名 {{item.username}}
</view>
<view class="remarkContent" v-if="item.buyer_remark">
{{item.buyer_remark}}
</view>
</view>
<view class="btnGroup">
<view class="btn info" v-if="item.is_cancel && (item.order_status == 10 || item.order_status == 20)" @click.stop="openPage(1,index,item)" >取消订单</view>
<view class="btn primary" v-if="item.is_pay && item.order_status == 10" @click.stop="openPage(2,index,item)">去支付</view>
<view class="btn primary" v-if="item.is_dispatch && item.order_status == 20" @click.stop="openPage(3,index,item)">去派单</view>
<view class="btn primary" v-if="item.is_success && item.order_status == 30" @click.stop="openPage(4,index,item)">立即完成</view>
<view class="btn info" v-if="item.order_status==40">已完成</view>
<view class="btn info" v-if="item.order_status==50">已取消</view>
</view>
</view>
</view>
<view style="margin-top: 220rpx;">
<u-empty text="暂无信息" v-if="total == 0" mode="list" style="margin-top: 160rpx;"></u-empty>
</view>
<u-popup v-model="show" mode="bottom" border-radius="10" :closeable="true">
<view class="filterContent">
<view class="filterTitle">
订单筛选
</view>
<view class="filterItem">
<view class="filterItemContent">
<view class="itemTitle">
下单时间
</view>
<view class="timeContainer">
<u-input v-model="startTime" type="select" @click="getTime('start')" disabled placeholder="起始时间"/>
<text>-</text>
<u-input v-model="endTime" type="select" @click="getTime('end')" disabled placeholder="终止时间"/>
</view>
</view>
<view class="filterItemContent">
<view class="itemTitle">
来源
</view>
<view class="selectContainer">
<view @click="setResourceIndex(index)" :class="sourceIndex==index?'selectItem active':'selectItem'" v-for="(item,index) in selectList" :key="item.id">
{{item.name}}
</view>
</view>
</view>
<view class="filterItemContent">
<view class="itemTitle">
支付方式
</view>
<view class="selectContainer">
<view @click="setpayIndex(index)" :class="payIndex==index?'selectItem active':'selectItem'" v-for="(item,index) in payList" :key="item.id">
{{item.name}}
</view>
</view>
<view class="remarkContent" v-if="item.remake">
{{item.remake}}
</view>
</view>
<view class="btnGroup">
<view class="btn info" v-if="item.is_cancel==1 && (item.order_status == 10)"
@click.stop="openPage(3,index,item)">修改订单</view>
<view class="btn info" v-if="item.is_cancel==1 && (item.order_status == 10)"
@click.stop="openPage(1,index,item)">取消订单</view>
<view class="btn info" v-if="item.is_success==1 && (item.order_status == 20)"
@click.stop="openPage(4,index,item)">完成</view>
<view class="resetBtn">
重置
</view>
<view class="confrim">
确定
</view>
</view>
<view style="margin-top: 260rpx;">
<u-empty text="暂无信息" v-if="total == 0" mode="list"></u-empty>
</view>
<u-picker mode="time" z-index="99999" v-model="timeShow"></u-picker>
</u-popup>
</view>
</template>
@ -74,6 +127,19 @@
classifyShow: -1,
classList: [],
goodsList:[],
show:false,
timeShow:false,
selectList:[
{id:1,name:'预售'},
{id:2,name:'秒杀'},
{id:3,name:'拼团'},
{id:4,name:'砍价'},
],
payList:[
{id:1,name:'微信支付'},
{id:2,name:'好友代付'},
{id:3,name:'线下支付'},
],
sourceIndex:0,
payIndex:0,
startTime:null,
@ -85,7 +151,6 @@
},
onLoad(o) {
if(o.type){
console.log(o.type)
this.classifyShow = o.type-1
}
},
@ -120,73 +185,60 @@
}
}
})
}
if (i == 2) {
}else if(i == 2){
uni.navigateTo({
url: '/pages/news/recycling/order?recovery_id=' + a.recovery_id + '&order_id=' + a.order_id
url: "/pages/news/recycling/pay?type=fuwuorder&order_id="+a.order_id
})
}
if (i == 3) {
}else if(i == 3){
uni.navigateTo({
url: '/pages/news/recycling/confirm1?order_id=' + a.order_id + '&tabIndex=' + (a
.recovery_type == 10 ? 1 : a.recovery_type == 20 ? 0 : 2) + '&source=2'
url: "/pages/news3/dispatch?type=fuwuorder&order_id="+a.order_id
})
}
if (i == 4) {
}else if(i == 6){
uni.navigateTo({
url: "/pages/news/recycling/orderDetail?type=fuwuorder&order_id="+index
})
}else if(i == 4){
uni.showModal({
title: "温馨提示",
content: "是否完成该订单？",
content: "是否提交该订单？",
confirmColor: "#F21A1C" ,
complete(res) {
if(res.confirm){
that.toComplete(index, a.order_id);
that.toConfirmSuccess(a.order_id);
}
}
})
}
},
//完成订单
async toComplete(index, order_id) {
const {
status,
message,
data
} = await newFunApi.completeOrder({
async toConfirmSuccess(order_id) {
const {status, message, data} = await serverConfirmSuccess({
order_id
});
})
if(status == 200){
uni.showToast({
title: "完成成功"
title: "提交成功"
})
this.getList(1)
this.getInfo();
}
},
//取消订单
//删除订单
async toDel(index,order_id) {
const {
status,
message,
data
} = await newFunApi.cancelOrder({
const {status, message, data} = await newFunApi.serverCancelOrder({
order_id
});
if(status == 200){
uni.showToast({
title: "取消成功"
})
this.classifyShow = 2
this.getOrderList(1)
this.goodsList.splice(index,1);
}
},
/**
* 获取列表
*/
async getList() {
let {
status,
message,
data
} = await newFunApi.orderStatus({});
let {status, message, data} = await newFunApi.serverOrderInfoStatus({});
if(status == 200){
this.classList = data.list
this.getOrderList();
@ -203,21 +255,35 @@
this.pageNum = 1;
this.goodsList = []
}
let {
status,
message,
data
} = await newFunApi.orderList({
let {status, message, data} = await newFunApi.serverOrderList({
order_no: this.order_no,
page: this.pageNum,
order_status: (this.classList.length > 0) ? (this.classifyShow >= 0 ? this.classList[this
.classifyShow].value : '') : ""
order_status: this.classList.length > 0?(this.classifyShow>=0?this.classList[this.classifyShow].value:''):""
});
if(status == 200){
uni.hideLoading();
this.goodsList = this.goodsList.concat(data.list)
this.goodsList = this.arrayUnique(this.goodsList.concat(data.list),'order_id')
this.total = data.total
}
},
//数组对象去重
arrayUnique(arr, name) {
    var hash = {};
    return arr.reduce(function (item, next) {
        hash[next[name]]
            ? ""
            : (hash[next[name]] = true && item.push(next));
        return item;
    }, []);
},
getLable(val){
let arr = this.classList.filter(item=>{
return val==item.id
})
return arr[0].name
},
onSearch(){
},
onClassify(index){
this.classifyShow = index;
@ -225,6 +291,16 @@
this.goodsList = []
this.getOrderList();
},
setResourceIndex(index){
this.sourceIndex = index;
},
setpayIndex(index){
this.payIndex = index;
},
getTime(val){
console.log("ooo")
this.timeShow = true;
}
}
};
</script>
@ -234,7 +310,6 @@
background-color: #F7F8FA;
min-height:100%;
}
.nolist {
width: 100%;
display: block;
@ -254,11 +329,9 @@
color: #fff;
}
}
.head-info{
padding:22upx 20upx;
.searchContent{
display: flex;
align-items: center;
@ -269,52 +342,44 @@
width: 100%;
background-color: #fff;
border-radius: 80rpx;
::v-deep .uni-input-placeholder{
margin-left: 20upx;
margin-left:90upx;
z-index:10;
}
input{
margin-left: 60rpx;
flex: 1;
}
.search{
position: absolute;
top:20upx;
left:26upx;
z-index:9;
}
::v-deep .u-input{
flex:1;
width: 500rpx;
margin-left: 40upx;
}
::v-deep .uni-input-input{
background: #FFFFFF;
border-radius: 30px 30px 30px 30px;
opacity: 1;
padding-left: 20upx;
padding-left:80upx;
width:calc(100% - 80upx);
}
.filter{
display: flex;
width: 100upx;
flex-direction: column;
align-items: center;
justify-content: center;
image{
width:34upx;
height:auto;
}
text{
font-size: 24upx;
font-family: PingFang SC, PingFang SC;
@ -325,32 +390,27 @@
}
}
}
.container{
background-color: #fff;
}
.classify-list{
white-space:nowrap;
width: 100%;
height: 100rpx;
overflow-x: auto;
overflow-y: hidden;
.list{
position: relative;
display:inline-block;
width: 25%;
width: 18%;
height: 100%;
line-height: 100rpx;
text-align: center;
text{
font-size: 28rpx;
color: #3B3B3B;
}
.line{
position: absolute;
left: 50%;
@ -368,7 +428,6 @@
opacity: 1;
}
}
.action{
text{
font-size: 32rpx;
@ -376,42 +435,34 @@
}
}
}
.shopContent{
overflow: hidden;
.shopItem{
margin-bottom:14upx;
padding:36upx;
background-color: #fff;
.orderInfo{
display: flex;
align-items: center;
justify-content:space-between;
text{
font-size: 28upx;
color: #707070;
}
}
.shopItemInfo{
display: flex;
margin-top:40upx;
image{
width:180upx;
height:180upx;
flex-shrink: 0;
}
.priceCon{
flex:1;
overflow: hidden;
.a{
font-size: 28rpx;
font-weight: 500;
@ -420,15 +471,13 @@
overflow: hidden;
margin-left:40upx;
}
.b{
display: flex;
align-items: flex-end;
justify-content: space-between;
margin-left:40upx;
margin-top: 40rpx;
margin-top: 80rpx;
}
.num{
font-size: 28upx;
font-family: PingFang SC, PingFang SC;
@ -436,11 +485,9 @@
color: #1E1E1E;
}
.priceText{
display: flex;
align-items: center;
text{
font-size: 32upx;
font-family: PingFang SC, PingFang SC;
@ -452,11 +499,9 @@
}
}
}
.totalNum{
text-align: right;
margin-top:70upx;
text:first-child{
font-size: 24upx;
font-family: PingFang SC, PingFang SC;
@ -464,7 +509,6 @@
color: #B7B7B7;
}
text:nth-child(2){
font-size: 32upx;
font-family: PingFang SC, PingFang SC;
@ -473,7 +517,6 @@
margin:0 10upx;
}
text:nth-child(3){
font-size: 32upx;
font-family: PingFang SC, PingFang SC;
@ -482,14 +525,12 @@
}
}
.remark{
background: #F8F8F8;
border-radius: 0px 0px 0px 0px;
opacity: 1;
padding:20upx;
margin-top:20upx;
.remarkTitle{
font-size: 28upx;
font-family: PingFang SC, PingFang SC;
@ -497,7 +538,6 @@
color: #3B3B3B;
}
.remarkContent{
font-size: 28upx;
font-family: PingFang SC, PingFang SC;
@ -506,13 +546,11 @@
margin-top:8upx;
}
}
.btnGroup{
display: flex;
margin-top:28upx;
flex-wrap: wrap;
justify-content: flex-end;
.btn{
width: 180upx;
height: 56upx;
@ -524,13 +562,11 @@
text-align: center;
margin-left:12upx;
}
.info{
border: 1px solid #9F9F9F;
color: #8B8B8B;
}
.primary{
border: 1px solid #F63116;
color: #F83F11;
@ -539,4 +575,104 @@
}
}
}
.filterContent{
padding:32upx;
.filterTitle{
font-size: 32upx;
font-family: PingFang SC, PingFang SC;
font-weight: 500;
color: #303030;
text-align: center;
}
.filterItem{
.filterItemContent{
margin-top:40upx;
.itemTitle{
font-size: 28upx;
font-family: PingFang SC, PingFang SC;
font-weight: 500;
color: #303030;
margin-bottom:20upx;
}
.timeContainer{
display: flex;
align-items: center;
::v-deep .uni-input-wrapper{
background: #F3F3F3;
border-radius: 22px 22px 22px 22px;
opacity: 1;
text-align: center;
}
::v-deep .u-input__right-icon{
display: none;
}
text{
margin:16upx;
}
}
.selectContainer{
display: flex;
.selectItem{
flex:1;
margin:0 10upx;
height: 70upx;
line-height: 66upx;
text-align: center;
background: #F3F3F3;
border-radius: 22px 22px 22px 22px;
opacity: 1;
font-size: 28upx;
font-family: PingFang SC, PingFang SC;
font-weight: 500;
color: #A1A1A1;
}
.active{
border: 1px solid #F83F11;
color:#F21A1C;
background-color: #fff;
}
}
}
}
.btnGroup{
display: flex;
justify-content: center;
margin-top:100upx;
padding-bottom:60upx;
.resetBtn{
width: 216upx;
height: 70upx;
line-height: 66upx;
background: #DBDBDB;
border-radius: 22px 22px 22px 22px;
opacity: 1;
font-size: 28upx;
font-family: PingFang SC, PingFang SC;
font-weight: 500;
color: #585858;
text-align: center;
}
.confrim{
width: 216upx;
height: 70upx;
text-align: center;
background: linear-gradient(180deg, #FD5D06 0%, #F3211A 100%);
border-radius: 50px 50px 50px 50px;
opacity: 1;
line-height: 66upx;
font-size: 28upx;
font-family: PingFang SC, PingFang SC;
font-weight: 500;
color: #FFFFFF;
margin-left:24upx;
}
}
}
</style>

20
pages/user/index.vue
Unescape View File

@ -213,12 +213,20 @@
<u-icon style="margin-left: 5rpx; color: #909090; margin-top: -5rpx;" name="arrow-right"></u-icon>
</view>
<view class="grounding goodsOrder">
<view class="image-text_21" @click="toFuwu(1)">
<image :src="$picUrl+'/static/user/untake.png'" class="label_11"></image>
<view class="text-group_21">
<text class="text_71"
v-if="orderTodoInfo.service_order.payment_number">{{orderTodoInfo.service_order.payment_number}}</text>
<text class="text_81">待支付</text>
</view>
</view>
<view class="image-text_21" @click="toFuwu(3)">
<image :src="$picUrl+'/static/user/unpay.png'" class="label_11"></image>
<view class="text-group_21">
<text class="text_71"
v-if="orderTodoInfo.service_order.confirm_number">{{orderTodoInfo.service_order.confirm_number}}</text>
<text class="text_81">待确认</text>
<text class="text_81">待服务</text>
</view>
</view>
<view class="image-text_21" @click="toFuwu(2)">
@ -226,15 +234,7 @@
<view class="text-group_21">
<text class="text_71"
v-if="orderTodoInfo.service_order.service_number">{{orderTodoInfo.service_order.service_number}}</text>
<text class="text_81">待服务</text>
</view>
</view>
<view class="image-text_21" @click="toFuwu(1)">
<image :src="$picUrl+'/static/user/untake.png'" class="label_11"></image>
<view class="text-group_21">
<text class="text_71"
v-if="orderTodoInfo.service_order.payment_number">{{orderTodoInfo.service_order.payment_number}}</text>
<text class="text_81">待支付</text>
<text class="text_81">待派单</text>
</view>
</view>
<view class="image-text_21" @click="toFuwu(4)">

Write Preview
Loading…
Cancel
Save