Skip to content

L
lumastoreapp
Commit d8b71ed3 authored by 石家欣's avatar 石家欣
Browse files
Options

sjx

parent ab02de01
Hide whitespace changes
Inline Side-by-side
Showing with 117 additions and 26 deletions
components/orderItemss/orderItemss.vue
View file @ d8b71ed3
......@@ -16,8 +16,8 @@
<view class="mingxi oneline" v-for="(item,index) in dataorder.products" :key="index">{{item.productname}} x {{item.num}}</view>
<view class="beizhu flex jus-b ali-c">
<text class="beizhutext oneline flex1" v-if="dataorder.remark">备注：{{dataorder.remark}}</text>
<text class="beizhutext oneline flex1" v-else></text>
<text class="beizhutext oneline flex1" v-if="dataorder.remark">备注：{{dataorder.remark||''}}</text>
<text class="beizhutext oneline flex1" v-if="dataorder.message">退款原因：{{dataorder.message||''}}</text>
<text class="price">合计：¥{{dataorder.total}}</text>
</view>
<view class="orderItemss_foot jus-b">
......@@ -26,16 +26,19 @@
</view>
<view class="btnbox flex flex1 jus-e">
<view class="btns" @tap.stop="toxq" >查看详情</view>
<!-- <view class="btns" @tap.stop="toxq" >查看详情</view>
<view class="btns" v-if="dataorder.status==1" @tap.stop="immediatelyOrderfun" >立即接单</view>
<view class="btns" v-if="dataorder.status==1" @tap.stop="refuseOrderfun" >拒绝接单</view>
<view class="btns" v-if="dataorder.status==1" @tap.stop="refuseOrderfun" >拒绝接单</view> -->
<block v-for="(action,index) in dataorder.order_operation" :key="index">
<view :class="action.class_name" :data-orderid='dataorder.order_id' @tap.stop="operation" :data-action='action.way' :data-is_ld='dataorder.buytype'>{{action.name}}</view>
</block>
</view>
</view>
</view>
</template>
<script>
import {immediatelyOrder,refuseOrder} from "@/utils/api/api.js";
import {immediatelyOrder,refuseOrder,consentEleRefund,refuseEleRefund} from "@/utils/api/api.js";
export default {
name:"orderItemss",
props:["dataorder","tabindex","index"],
......@@ -50,6 +53,70 @@
}
},
methods:{
/**
* 订单操作
*/
operation (event) {
let that = this;
let action = event.currentTarget.dataset.action;
let order_id = event.currentTarget.dataset.orderid;
switch (action) {
case 'immediatelyOrder': //立即接单 OK
that.immediatelyOrderfun(order_id, action);
// oneKeyCancel
console.info("立即接单");
break;
case 'refuseOrder': //拒接此单 OK
console.info("拒接此单");
that.refuseOrderfun(order_id, action);
break;
case 'checkLogistics': //查看物流
that.logistics(order_id, action);
// this.$api.msg("开发中,敬请期待~");
console.info("查看物流");
break;
case 'orderDetails': //订单详情
console.info("订单详情");
that.toxq(order_id,order_id);
break;
case 'consentEleRefund'://同意退款
this.consentEleRefund(order_id);
break;
case 'refuseEleRefund'://拒绝退款
this.refuseEleRefund(order_id);
break;
default:
//其他的 退款啥的 处理ok了
console.info("1111",action);
break;
}
},
// 同意退款
async consentEleRefund(order_id){
let res = await consentEleRefund({
order_id:this.dataorder.order_id,
});
if(res.code==0){
this.$api.msg(res.msg);
this.$emit("reload",{});//重新加载
}else{
this.$api.msg(res.msg);
}
},
// 拒绝退款
async refuseEleRefund(order_id){
let res = await refuseEleRefund({
order_id:this.dataorder.order_id,
});
if(res.code==0){
this.$api.msg(res.msg);
this.$emit("reload",{});//重新加载
}else{
this.$api.msg(res.msg);
}
},
// 详情
toxq(){
uni.navigateTo({
url: '/pages/order/detail/detail?id='+ this.dataorder.order_id
......@@ -182,6 +249,12 @@
margin-left: 20upx;
}
.btns1{
border-radius:4upx;
margin-left: 20upx;
width:152upx;
height:62upx;
line-height: 62upx;
text-align: center;
background:rgba(255,102,0,1);
color:#FFFFFF;
border:0;
......
manifest.json
View file @ d8b71ed3
......@@ -3,8 +3,8 @@
//"appid" : "__UNI__FC9419E",
"appid" : "__UNI__1EA80F1", //这个是 web 的
"description" : "",
"versionName" : "1.0.66",
"versionCode" : 166,
"versionName" : "1.0.67",
"versionCode" : 167,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
......
pages/order/detail/detail.vue
View file @ d8b71ed3
......@@ -3,16 +3,8 @@
<view class="r_detail">
<view class="head">
<view class="head_l">
<!-- <view class="head_l_01">配送中...</view>
<view class="head_l_02">服务专员正在为您配送中</view> -->
<view class="head_l_01" v-if="detail.status==0 && detail.pay_way==0">等待付款</view>
<view class="head_l_01" v-if="detail.status==1">等待商家接单</view>
<view class="head_l_01" v-if="detail.status==2">商家已接单</view>
<view class="head_l_01" v-if="detail.status==3 ">骑手已接单</view>
<view class="head_l_01" v-if="detail.status==4">骑手正在送餐中</view>
<view class="head_l_01" v-if="detail.status==8 && detail.is_dianping==0">待评价</view>
<view class="head_l_01" v-if="detail.status==8 && detail.is_dianping==1">订单完成</view>
<view class="head_l_01" >{{detail.orderstatus}}</view>
<view class="head_l_02" >{{detail.statusdesc}}</view>
</view>
<view class="head_r">
<image class="img" src="/static/icon/detail.jpg" mode=""></image>
......@@ -59,13 +51,26 @@
<view class="mess_02_l">订单编号:</view>
<view class="mess_02_r">{{detail.order_num}}</view>
</view> -->
<view v-if="delivery_rider">
<view class="mess_02_1">
<view class="mess_02_l">骑手姓名:</view>
<view class="mess_02_r">{{delivery_rider.rider_name}}</view>
</view>
<view class="mess_02_1">
<view class="mess_02_l">骑手电话:</view>
<view class="mess_02_r">{{delivery_rider.rider_mobile}}</view>
</view>
</view>
<view class="mess_02_1">
<view class="mess_02_l">下单时间:</view>
<view class="mess_02_r">{{detail.time}}</view>
</view>
<view class="mess_02_1">
<view class="mess_02_l">备注:</view>
<view class="mess_02_1" >
<view class="mess_02_l" v-if="detail.remark">备注:</view>
<view class="mess_02_l" v-if="detail.message">退款原因:</view>
<view class="mess_02_r">{{detail.remark}}</view>
<view class="mess_02_r">{{detail.message}}</view>
</view>
</view>
......@@ -89,9 +94,9 @@
},
order_pro:[],
order_id:"",
message:"",
delivery_info:{},//？
delivery_rider:{},//？
delivery_rider:{},//骑手信息
addr:{},//收获地址
detail:{},//订单详情信息
shop:{},//商家信息
......@@ -100,6 +105,7 @@
},
onLoad(opdata) {
this.order_id = opdata.id;
this.message = opdata.mess;
this.eleOrderDetails()
},
computed: {
......@@ -116,11 +122,11 @@
});
if(res.code==0){
this.delivery_info=res.data.delivery_info;//？
this.delivery_rider=res.data.delivery_rider;//？
this.delivery_rider=res.data.delivery_rider;//骑手信息
this.addr=res.data.addr;//收获地址
this.detail=res.data.detail;//订单详情信息
this.shop=res.data.shop;//商家信息
this.products=res.data.products;//购买的商品列表
this.products=res.data.detail.products;//购买的商品列表
}else{
this.$api.msg(res.msg);
......
pages/order/shopOrder.vue
View file @ d8b71ed3
......@@ -61,7 +61,7 @@
<view class="btnitem bg">查看物流</view> -->
<block v-for="(action,index) in item.order_operation" :key="index">
<view class='btnitem ' :data-orderid='item.order_id' @tap.stop="operation" :data-action='action.way' :data-is_ld='item.buytype'>{{action.name}}</view>
<view class='btnitem ' :class="item.class_name" :data-orderid='item.order_id' @tap.stop="operation" :data-action='action.way' :data-is_ld='item.buytype'>{{action.name}}</view>
</block>
</view>
......
utils/api/api.js
View file @ d8b71ed3
......@@ -455,4 +455,16 @@ export function getPrinterList(data)
export function closePrinter(data)
{
return request.post("user/shopDelPrint",data,{ noAuth : true});
}
//同意退款(外卖)
export function consentEleRefund(data)
{
return request.post("order/consentEleRefund",data,{ noAuth : true});
}
//拒绝退款(外卖)
export function refuseEleRefund(data)
{
return request.post("order/refuseEleRefund",data,{ noAuth : true});
}
\ No newline at end of file
utils/debug.js
View file @ d8b71ed3
......@@ -2,8 +2,8 @@
//环境变量 这个是 鹿马商家助手的 商家助手的~~~~
module.exports = {
//是否为开发调试环境 true为本地环境 false 为正式环境
// isdebug:true,//测试
isdebug:false,//正式
isdebug:true,//测试
// isdebug:false,//正式
xqdebug:false,//正式权限
// xqdebug:true,//发布审核权限 也是测试环境的 主要用于ios
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment