Skip to content

L
lumastoreapp
Commit 4eeab36c authored by 魏保保's avatar 魏保保
Browse files
Options

wbb

parent 6f59df4d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1649 additions and 408 deletions
pages.json
View file @ 4eeab36c
......@@ -419,7 +419,35 @@
"enablePullDownRefresh":true
}
} ],
},{
"path" : "pages/order/shoprefundorderdetail/shoprefundorderdetail",
"style" :
{
"navigationBarTitleText": "商城售后订单详情",
"enablePullDownRefresh": false
}
}
,{
"path" : "pages/order/shopExamine/shopExamine",
"style" :
{
"navigationBarTitleText": "订单退款",
"enablePullDownRefresh": false
}
}
,{
"path" : "pages/order/ExamineDelivery/ExamineDelivery",
"style" :
{
"navigationBarTitleText": "立即发货",
"enablePullDownRefresh": false
}
}
],
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "",
......
pages/ViewLogistics/ViewLogistics.vue
View file @ 4eeab36c
<template>
<!-- yocode 物流信息 -->
<view class="content ViewLogistics yocode">
<!-- 地图呀 -->
<!-- <view class="page-body">
<view class="page-section page-section-gap">
......@@ -9,66 +8,66 @@
</map>
</view>
</view> -->
<view class="wuliuboxss flex ali-c">
<image class="imgs" :src="statictowUrl+'/static/applet5'+logisticLogo" mode=""></image>
<image class="imgs" :src="statictowUrl + '/static/applet5' + logisticLogo" mode=""></image>
<view class="rightinfos">
<view class="wuliutype">{{shipperName}}</view>
<view class="wuliucode">运单号: {{logisticCode}}</view>
<view class="wuliutel">官方电话: {{phone}}</view>
<view class="wuliutype">{{ shipperName }}</view>
<view class="wuliucode">运单号: {{ logisticCode }}</view>
<view class="wuliutel">官方电话: {{ phone }}</view>
</view>
</view>
<!-- 查看物流的组件 alidata2.state -->
<ali :state="3" :datas="list" :ways="information"></ali>
</view>
</template>
<script>
import ali from '@/components/WuLiu-step/WuLiu-step.vue';
import {checkLogistics} from "@/utils/api/api.js";
import { checkLogistics,viewLogistics} from '@/utils/api/api.js';
export default {
components: {
ali
},
computed: {
staticUrl () {//静态资源地址
staticUrl() {
//静态资源地址
return this.$store.state.staticUrl;
},
staticUrl1(){
staticUrl1() {
return this.$store.state.staticUrl1;
},
statictowUrl(){
statictowUrl() {
return this.$store.state.statictowUrl;
},
uploadurl(){
uploadurl() {
return this.$store.state.uploadurl;
}
},
data() {
return {
//地图的东西
title: 'map',
latitude: 39.909,
longitude: 116.39742,
covers: [{
latitude: 39.909,
longitude: 116.39742,
iconPath: '/static/news/address.png'
}, {
latitude: 39.90,
longitude: 116.39,
iconPath: '/static/news/address.png'
}],
covers: [
{
latitude: 39.909,
longitude: 116.39742,
iconPath: '/static/news/address.png'
},
{
latitude: 39.9,
longitude: 116.39,
iconPath: '/static/news/address.png'
}
],
alidata: {
state: 2,
uptime: '2019-05-23 17:52:06',
data: [
],
data: [],
information: {
no: '231880744913',
sName: 'SF',
......@@ -81,9 +80,7 @@ export default {
alidata2: {
state: 3,
uptime: '2019-05-24 10:58:24',
data: [
],
data: [],
information: {
no: '70939995911523',
sName: 'HTKY',
......@@ -93,12 +90,12 @@ export default {
img: 'https:oss-cn2.apistore.cnexpHTKY.png'
}
},
list: [],
logisticCode: "",
shipperName: "",
logisticLogo: "",
phone: "",
logisticCode: '',
shipperName: '',
logisticLogo: '',
phone: '',
information: {
no: '',
sName: '',
......@@ -110,71 +107,89 @@ export default {
};
},
onLoad(options) {
// console.log(options)
this.init();
var that = this;
console.log(options);
let params = {
order_id: options.order_id,
action: options.action,
vendor_id:options.vendor,
};
checkLogistics(params).then(res => {
console.log(res);
if (res.code == 0) {
let data = res.data;
let list = this.checkArray(data.Traces) ? data.Traces : [];
let logistics_info = this.getLogisticsConfig(data.ShipperCode)
this.list=list.reverse();
this.logisticCode=data.LogisticCode;
this.shipperName=logistics_info.name;
this.logisticLogo= logistics_info.img_url;
this.phone=logistics_info.phone;
}
})
// 判断为正常订单
if (options.order_id) {
let params = {
order_id: options.order_id,
action: options.action,
vendor_id: options.vendor
};
checkLogistics(params).then(res => {
console.log(res);
if (res.code == 0) {
let data = res.data;
let list = this.checkArray(data.Traces) ? data.Traces : [];
let logistics_info = this.getLogisticsConfig(data.ShipperCode);
this.list = list.reverse();
this.logisticCode = data.LogisticCode;
this.shipperName = logistics_info.name;
this.logisticLogo = logistics_info.img_url;
this.phone = logistics_info.phone;
}
});
// 如果为售后订单
} else if (options.refund_id) {
let refundParams = {
refund_id: options.refund_id,
type: 2
};
viewLogistics(refundParams).then(res => {
console.log(res)
if (res.code == 0) {
this.list = res.data.list;
let logistics_info = this.getLogisticsConfig(res.data.shipperCode);
this.list.reverse();
this.logisticCode = res.data.logisticCode;
this.shipperName = logistics_info.name;
this.logisticLogo = logistics_info.img_url;
this.phone = logistics_info.phone;
}
});
}
},
methods: {
init() {
},
init() {},
/**
* 获取快递公司信息
*/
* 获取快递公司信息
*/
getLogisticsConfig(shipperCode) {
let config = {
'YTO': { 'name': '圆通速递', 'phone': '95554', 'img_url': '/images/delivery_icon/YTO.png' },
'HTKY': { 'name': '百世快递', 'phone': '95320', 'img_url': '/images/delivery_icon/HTKY.png' },
'ZTO': { 'name': '中通快递', 'phone': '95311', 'img_url': '/images/delivery_icon/ZTO.png' },
'STO': { 'name': '申通快递', 'phone': '95543', 'img_url': '/images/delivery_icon/STO.png' },
'SF': { 'name': '顺丰速运', 'phone': '95338', 'img_url': '/images/delivery_icon/SF.png' },
'YD': { 'name': '韵达速递', 'phone': '95546', 'img_url': '/images/delivery_icon/YD.png' },
'YZPY': { 'name': '邮政快递包裹', 'phone': '11185', 'img_url': '/images/delivery_icon/EMS.png' },
'EMS': { 'name': 'EMS', 'phone': '11183', 'img_url': '/images/delivery_icon/EMS.png' },
'HHTT': { 'name': '天天快递', 'phone': '400-188-8888', 'img_url': '/images/delivery_icon/HHTT.png' },
'JD': { 'name': '京东快递', 'phone': '950616', 'img_url': '/images/delivery_icon/JD.png' },
'UC': { 'name': '优速快递', 'phone': '95349', 'img_url': '/images/qishou@2x.png' },
'DBL': { 'name': '德邦快递', 'phone': '95353', 'img_url': '/images/delivery_icon/DBL.png' },
'ZJS': { 'name': '宅急送', 'phone': '400-678-9000', 'img_url': '/images/qishou@2x.png' },
'TNT': { 'name': 'TNT快递', 'phone': '400-820-9868', 'img_url': '/images/qishou@2x.png' },
'UPS': { 'name': 'UPS', 'phone': '400-820-8388', 'img_url': '/images/qishou@2x.png' },
'DHL': { 'name': 'DHL', 'phone': '95380', 'img_url': '/images/qishou@2x.png' },
'FEDEX': { 'name': 'FEDEX联邦(国内件）', 'phone': '400-886-1888', 'img_url': '/images/qishou@2x.png' },
'FEDEX_GJ': { 'name': 'FEDEX联邦(国际件）', 'phone': '400-886-1888', 'img_url': '/images/qishou@2x.png' },
}
return config[shipperCode] || {};
let config = {
YTO: { name: '圆通速递', phone: '95554', img_url: '/images/delivery_icon/YTO.png' },
HTKY: { name: '百世快递', phone: '95320', img_url: '/images/delivery_icon/HTKY.png' },
ZTO: { name: '中通快递', phone: '95311', img_url: '/images/delivery_icon/ZTO.png' },
STO: { name: '申通快递', phone: '95543', img_url: '/images/delivery_icon/STO.png' },
SF: { name: '顺丰速运', phone: '95338', img_url: '/images/delivery_icon/SF.png' },
YD: { name: '韵达速递', phone: '95546', img_url: '/images/delivery_icon/YD.png' },
YZPY: { name: '邮政快递包裹', phone: '11185', img_url: '/images/delivery_icon/EMS.png' },
EMS: { name: 'EMS', phone: '11183', img_url: '/images/delivery_icon/EMS.png' },
HHTT: { name: '天天快递', phone: '400-188-8888', img_url: '/images/delivery_icon/HHTT.png' },
JD: { name: '京东快递', phone: '950616', img_url: '/images/delivery_icon/JD.png' },
UC: { name: '优速快递', phone: '95349', img_url: '/images/qishou@2x.png' },
DBL: { name: '德邦快递', phone: '95353', img_url: '/images/delivery_icon/DBL.png' },
ZJS: { name: '宅急送', phone: '400-678-9000', img_url: '/images/qishou@2x.png' },
TNT: { name: 'TNT快递', phone: '400-820-9868', img_url: '/images/qishou@2x.png' },
UPS: { name: 'UPS', phone: '400-820-8388', img_url: '/images/qishou@2x.png' },
DHL: { name: 'DHL', phone: '95380', img_url: '/images/qishou@2x.png' },
FEDEX: { name: 'FEDEX联邦(国内件）', phone: '400-886-1888', img_url: '/images/qishou@2x.png' },
FEDEX_GJ: { name: 'FEDEX联邦(国际件）', phone: '400-886-1888', img_url: '/images/qishou@2x.png' }
};
return config[shipperCode] || {};
},
checkArray (obj) {
if (obj != undefined && obj != null && obj[0] != undefined) {
return true;
} else {
return false;
}
checkArray(obj) {
if (obj != undefined && obj != null && obj[0] != undefined) {
return true;
} else {
return false;
}
}
}
};
</script>
<style lang="scss">
@import "./ViewLogistics.scss";
@import './ViewLogistics.scss';
</style>
pages/order/ExamineDelivery/ExamineDelivery.scss 0 → 100644
View file @ 4eeab36c
//快速发货
.delivery{
min-height: 100vh;
background: #F2F3F3;
padding: 20upx 0;
}
.fahuobox{
margin: 0 24upx;
padding: 0 20upx;
padding-bottom: 60upx;
background: #FFFFFF;
.selectcell{
height: 107upx;
line-height: 107upx;
border-bottom: 1px solid #F4F4F4;
.names{
font-size:30upx;
color:rgba(0,0,0,1);
}
.icons1{
width:48upx;
height:38upx;
margin-right: 26upx;
}
.icons2{
width:10upx;
height:18upx;
}
.icons3{
width:39upx;
height:42upx;
margin-right: 26upx;
}
.tosaomaboxs{
width: 50px;
text-align: right;
}
.icons4{
width:25upx;
height:25upx;
}
}
}
.btnsbox{
margin-top: 60upx;
.btns{
width:300upx;
height:90upx;
line-height: 90upx;
text-align: center;
border:1px solid rgba(160,160,160,1);
border-radius:6upx;
font-size:32upx;
color:rgba(0,0,0,1);
}
.btns1{
border:0;
background: #FF6600;
color:#FFFFFF;
}
}
\ No newline at end of file
pages/order/ExamineDelivery/ExamineDelivery.vue 0 → 100644
View file @ 4eeab36c
<template>
<!-- 商家发货 -->
<view class="delivery fahuo yocode">
<view class="fahuobox">
<!-- <picker @change="bindPickerChange" :value="index" :range="logsitslist"> -->
<view class="selectcell flex ali-c jus-b" @tap='pickerone'>
<view class="flex ali-c">
<image class="icons1" src="/static/news/fahuo.png" mode=""></image>
<view class="names">{{chindtext==''?'选择快递公司':chindtext}}</view>
</view>
<image class="icons2" src="/static/news/xiala.png" mode=""></image>
</view>
<lb-picker ref="picker" :list="logsitslist" :value='chindtext' range-key="label" :props="myProps" @confirm='confirm'></lb-picker>
<!-- </picker> -->
<view class="selectcell flex ali-c jus-b">
<view class="flex ali-c">
<image class="icons3" src="/static/news/dindhao.png" mode=""></image>
<input class="names" type="text" value="" v-model="logscode" placeholder="输入快递单号" />
</view>
<view @tap="tosaoyisao" class="tosaomaboxs">
<image class="icons4" src="/static/news/saoma.png" mode=""></image>
</view>
</view>
<view class="btnsbox flex ali-c jus-a">
<view class="btns">取消</view>
<view class="btns btns1" @tap="oneKeyShipmentsfun">确定发货</view>
</view>
</view>
</view>
</template>
<script>
import { logisticsList,setDeliverGoods } from '@/utils/api/api.js';
export default{
data(){
return{
myProps: {
label: 'value',
value: 'cate_id',
},
logsitslist:[
"圆通速递",
"百世快递",
"中通快递",
"申通快递",
"顺丰速运",
"韵达速递",
"邮政快递包裹",
"EMS",
"天天快递",
"京东快递",
"优速快递",
"德邦快递",
"宅急送",
"TNT快递",
"UPS",
"DHL",
"FEDEX联邦(国内件）",
"FEDEX联邦(国际件）"
],
index:0,
chindtext:"",
logscode:"",
refund_id: '',//订单id
}
},
onLoad(options) {
this.refund_id = options.refund_id;
// console.log(this.refund_id)
this.logisticsListfun();
},
methods:{
confirm(e){
console.log(e)
this.chindtext=e.value;
},
pickerone(){
this.$refs.picker.show() // 显示
},
async logisticsListfun(){
let res = await logisticsList({
});
if(res.code==0){
this.logsitslist =res.data;
}else{
this.$api.msg(res.msg);
}
},
//快速发货 确认发货
async oneKeyShipmentsfun(){
if(this.chindtext==""){
this.$api.msg("请选中快速公司");
return false;
}
if(this.logscode==""){
this.$api.msg("物流单号不能为空");
return false;
}
let res = await setDeliverGoods({
logisticCode:this.logscode,//物流号 快递单号 订单号
shipperCode:this.chindtext,//名称 快递公司编号 名称
refund_id:this.refund_id,//订单id 订单id
shop_id:'',
});
if(res.code==0){
uni.showModal({
title: '提示',
content: res.msg,
showCancel: false,
success(res) {
uni.$emit("isDelorder",{action: 'setDeliverGoods'});
uni.navigateBack({}); //返回上一页
}
})
}else{
this.$api.msg(res.msg);
}
},
//请求end
bindPickerChange(e){
console.log(e.detail.value,'哈哈哈');
this.chindtext = this.logsitslist[e.detail.value];
},
//扫码方法
tosaoyisao(){
uni.scanCode({
success: (res)=> {
console.log('条码类型：' + res.scanType);
console.log('条码内容：' + res.result);
// let qrcodecon =
this.logscode = res.result;
}
});
}
}
}
</script>
<style lang="scss">
@import "ExamineDelivery.scss"
</style>
pages/order/shopExamine/shopExamine.vue 0 → 100644
View file @ 4eeab36c
<template>
<!-- 添加收获地址 OK -->
<!-- 添加收货地址呀 -->
<view class="content addddd yicode">
<view class="row b-b">
<text class="tit">收货人</text>
<input class="input" type="text" v-model="name" placeholder="请填写收货人姓名" placeholder-class="placeholder" />
</view>
<view class="row b-b">
<text class="tit">手机号码</text>
<input class="input" type="number" v-model="mobile" placeholder="请填写手机号码" placeholder-class="placeholder" />
</view>
<view class="row b-b">
<text class="tit">收货地址</text>
<input class="input" type="text" v-model="address" placeholder="请填写详细地址" placeholder-class="placeholder s24" @input="doorplate" />
</view>
<view class="submitbtn active" @tap="refundExamine">确定</view>
</view>
</template>
<script>
import { shopExamine } from '@/utils/api/api.js';
export default {
data() {
return {
name: '',
mobile: '',
address: '',
type: '',//退款退款 退款
refund_id: ''
}
},
onShow() {
},
onHide() {
},
onUnload(){
},
onLoad(option){
// console.log(option)
this.type = option.type;
this.refund_id = option.refund_id;
// console.log(this.refund_id,this.type)
},
methods: {
refundExamine(){//提交
if(!this.name){
this.$api.msg('请填写收货人姓名');
return;
}
if(!/(^1[3|4|5|7|8|9][0-9]{9}$)/.test(this.mobile)){
this.$api.msg('请输入正确的手机号码');
return;
}
if(!this.address){
this.$api.msg('请输入详细收货地址');
return;
}
// 参数
let params = {
contacts: this.name,//收货联系人
contact_number : this.mobile,//收货联系电话
addr: this.address,//收货地址
type: this.type,
refund_id: this.refund_id,
}
shopExamine(params).then(res=>{
// console.log(res)
if(res.code == 0){
uni.$emit('isDelorder', { action: 'shopExamine' });//监听操作成功后跳回上一页自动刷新列表
uni.showToast({
title: '退款审核成功',
duration: 2000,
icon: 'none'
});
uni.navigateBack({})
}else{
this.$api.msg(res.msg);
}
})
},
}
}
</script>
<style lang="scss">
page {
background: $page-color-base;
padding-top: 16upx;
// margin-top: 20upx;
}
.row {
display: flex;
align-items: center;
position: relative;
padding: 0 30upx;
height: 88upx;
background: #fff;
.immgs {
width: 13upx;
height: 24upx;
opacity: 0.5;
}
.tit {
flex-shrink: 0;
//width: 120upx;
width: 200upx;
font-size: 30upx;
color: $font-color-dark;
}
.input {
flex: 1;
font-size: 30upx;
color: $font-color-dark;
}
.icon-shouhuodizhi {
font-size: 36upx;
color: $font-color-light;
}
}
.default-row {
margin-top: 16upx;
.tit {
flex: 1;
}
switch {
transform: translateX(16upx) scale(0.9);
}
}
.add-btn {
display: flex;
align-items: center;
justify-content: center;
width: 690upx;
height: 80upx;
margin: 60upx auto;
font-size: $font-lg;
color: #fff;
background-color: $base-color;
border-radius: 10upx;
box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
}
.addddd{
// margin-top: 40upx;
}
</style>
pages/order/shopOrder.scss
View file @ 4eeab36c
......@@ -163,4 +163,40 @@
}
.mt-20{
margin-top: 20upx;
}
.setSelect{
width:601upx;
height:660upx;
background:rgba(255,255,255,1);
border-radius:10upx;
.titelsf{
height: 88upx;
line-height: 88upx;
text-align: center;
font-size:32upx;
font-family:PingFang SC;
font-weight:bold;
color:rgba(0,0,0,1);
}
.selectbottom{
background: #FFFFFF;
padding: 0 24upx;
}
.setbtns{
margin: 0 auto;
margin-top: 90upx;
width:501upx;
height:88upx;
line-height:88upx;
text-align: center;
background:rgba(255,105,0,1);
border-radius:10upx;
font-size:32upx;
color:rgba(255,255,255,1);
}
}
.textarea{
font-size: 34upx;
padding: 30upx;
}
\ No newline at end of file
pages/order/shopOrder.vue
View file @ 4eeab36c
This diff is collapsed.
pages/order/shoprefundorderdetail/shoprefundorderdetail.vue 0 → 100644
View file @ 4eeab36c
This diff is collapsed.
utils/api/api.js
View file @ 4eeab36c
......@@ -300,12 +300,22 @@ export function orderList(data)
return request.post("order/orderList",data,{ noAuth : true});
}
// 商城退款/售后列表(新接口)
export function getRefundOrderList(data) {
return request.post("RefundOrder/getRefundOrderList",data, { noAuth: false });
}
//商城订单详情
export function orderDetails(data)
{
return request.post("order/orderDetails",data,{ noAuth : true});
}
// 商城退款/售后订单详情页面(新接口)
export function getRefundDetail(data) {
return request.post("RefundOrder/getRefundDetail",data, { noAuth: false });
}
//商城订单一键核销
export function oneKeyCancel(data)
{
......@@ -331,6 +341,26 @@ export function checkLogistics(data)
return request.post("order/checkLogistics",data,{ noAuth : true});
}
// 商城退款/售后 查看物流
export function viewLogistics(data) {
return request.post("RefundOrder/viewLogistics",data, { noAuth: false });
}
// 商城退款/售后 确认收货
export function setReceivingGoods(data) {
return request.post("RefundOrder/setReceivingGoods",data, { noAuth: false });
}
// 商城退款/售后 商家审核
export function shopExamine(data) {
return request.post("RefundOrder/shopExamine",data, { noAuth: false });
}
// 商城退款/售后 立即发货
export function setDeliverGoods(data) {
return request.post("RefundOrder/setDeliverGoods",data, { noAuth: false });
}
//商城订单同意退款
export function consentRefund(data)
{
......
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