提交 9c6a7fd8 authored 作者: huaxinzhu's avatar huaxinzhu

云仓优化版本项目

上级 51f51ca2
...@@ -229,7 +229,8 @@ ...@@ -229,7 +229,8 @@
} }
}; };
//xhttp.open("GET", '//sysapi.jxhh.com/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 直接上正式,以防上线忘改 //xhttp.open("GET", '//sysapi.jxhh.com/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 直接上正式,以防上线忘改
xhttp.open("GET", 'http://192.168.26.179:6601/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 直接上正式,以防上线忘改 // xhttp.open("GET", '//newsys.jxhh.com/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 内网开发
xhttp.open("GET", 'http://192.168.26.179:6601/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 测试
xhttp.send(); xhttp.send();
} }
</script> </script>
......
import request from '@/utils/request'
// 结算列表
export function listVerifyrecord(data) {
return request({
url: '/local/asset/getSellerBalanceLogList',
method: 'post',
data: data
})
}
// 结算详情
// export function getVerifyrecord (id) {
// return request({
// url: '/system/order/getOrderSellerListInfo?id='+id,
// method: 'get'
// })
// }
export function getVerifyrecord(query) {
return request({
url: '/system/order/getOrderSellerListInfo',
method: 'get',
params: query
})
}
import request from '@/utils/request' import request from '@/utils/request'
// 查询verifyrecord列表 // 结算列表
export function listVerifyrecord(query) { export function listVerifyrecord(data) {
return request({ return request({
url: '/system/verifyrecord/list', url: '/local/asset/getSellerBalanceLogList',
method: 'get', method: 'post',
params: query data: data
}) })
} }
// 查询verifyrecord详细 // 详情
export function getVerifyrecord (id) { export function getVerifyrecord (id) {
return request({ return request({
url: '/system/verifyrecord/getDetail?id='+id, url: '/system/order/getOrderSellerListInfo?id='+id,
method: 'get' method: 'get'
}) })
} }
......
...@@ -5,6 +5,7 @@ export function indexInfo(params) { ...@@ -5,6 +5,7 @@ export function indexInfo(params) {
return request({ return request({
// url: 'http://sysapi.jxhh.com/api/v1/oem/webSite/domainChannel', // url: 'http://sysapi.jxhh.com/api/v1/oem/webSite/domainChannel',
url: 'http://192.168.26.179:6601/api/v1/oem/webSite/domainChannel', url: 'http://192.168.26.179:6601/api/v1/oem/webSite/domainChannel',
// url: 'http://newsys.jxhh.com/api/v1/oem/webSite/domainChannel',
method: 'get', method: 'get',
params params
...@@ -15,6 +16,7 @@ export function getdomain(params) { ...@@ -15,6 +16,7 @@ export function getdomain(params) {
return request({ return request({
// url: 'http://sysapi.jxhh.com/api/v1/oem/channel/domainFront', // url: 'http://sysapi.jxhh.com/api/v1/oem/channel/domainFront',
url: 'http://192.168.26.179:6601/api/v1/oem/channel/domainFront', url: 'http://192.168.26.179:6601/api/v1/oem/channel/domainFront',
// url: 'http://newsys.jxhh.com/api/v1/oem/channel/domainFront',
method: 'get', method: 'get',
params params
...@@ -25,6 +27,7 @@ export function webSite(params) { ...@@ -25,6 +27,7 @@ export function webSite(params) {
return request({ return request({
// url: 'http://sysapi.jxhh.com/api/v1/oem/common/counsel', // url: 'http://sysapi.jxhh.com/api/v1/oem/common/counsel',
url: 'http://192.168.26.179:6601/api/v1/oem/common/counsel', url: 'http://192.168.26.179:6601/api/v1/oem/common/counsel',
// url: 'http://newsys.jxhh.com/api/v1/oem/common/counsel',
method: 'get', method: 'get',
params params
}) })
...@@ -35,6 +38,7 @@ export function getallCloudList(params) { ...@@ -35,6 +38,7 @@ export function getallCloudList(params) {
return request({ return request({
// url: 'http://sysapi.jxhh.com/api/v1/oem/front/CloudList', // url: 'http://sysapi.jxhh.com/api/v1/oem/front/CloudList',
url: 'http://192.168.26.179:6601/api/v1/oem/front/CloudList', url: 'http://192.168.26.179:6601/api/v1/oem/front/CloudList',
// url: 'http://newsys.jxhh.com/api/v1/oem/front/CloudList',
method: 'get', method: 'get',
params params
}) })
...@@ -44,6 +48,7 @@ export function getssoUrl(data) { ...@@ -44,6 +48,7 @@ export function getssoUrl(data) {
return request({ return request({
// url: '//sysapi.jxhh.com/api/v1/oem/webSite/ssoChannel', // url: '//sysapi.jxhh.com/api/v1/oem/webSite/ssoChannel',
url: '//192.168.26.179:6601/api/v1/oem/webSite/ssoChannel', url: '//192.168.26.179:6601/api/v1/oem/webSite/ssoChannel',
// url: 'http://newsys.jxhh.com/api/v1/oem/webSite/ssoChannel',
method: 'get', method: 'get',
params: data params: data
}) })
......
...@@ -716,14 +716,16 @@ export default { ...@@ -716,14 +716,16 @@ export default {
return return
} }
this.dialogCheck = true
let params = { let params = {
goods_order_sn: row.goods_order_sn, goods_order_sn: row.goods_order_sn,
sku_id: row.goods_option_id sku_id: row.goods_option_id
} }
expressInfoNew(params).then(res => { expressInfoNew(params).then(res => {
if (res.code == 1 && res.data) { if (res.code == 1 && res.data) {
this.dialogCheck = true
this.activities = res.data.order_track ? res.data.order_track : []; this.activities = res.data.order_track ? res.data.order_track : [];
}else {
this.$message({type:'error',message: res.message ? res.message : '获取数据失败' });
} }
}) })
}, },
......
...@@ -88,6 +88,24 @@ ...@@ -88,6 +88,24 @@
</el-row> </el-row>
</div> </div>
</div> </div>
<!-- 买家信息 -->
<div>
<div class="card-header-title">
<span class="blue-block blue-block-goods-title"></span>买家信息
</div>
<div>
<el-row class="row-title">
<el-col :span="4" class="text-r text-c">收货人姓名</el-col>
<el-col :span="4" class="text-r text-c">联系电话</el-col>
<el-col :span="10" class="text-r text-c">收货地址</el-col>
</el-row>
<el-row class="row-title">
<el-col :span="4" class="text-l text-c">{{ orderConsignee.real_name }}</el-col>
<el-col :span="4" class="text-l text-c">{{ orderConsignee.mobile }}</el-col>
<el-col :span="10" class="text-l text-c">{{ orderConsignee.provice + orderConsignee.city + orderConsignee.district + orderConsignee.street + orderConsignee.address }}</el-col>
</el-row>
</div>
</div>
<!-- 买家退货凭证 --> <!-- 买家退货凭证 -->
<div v-if="asOrderType == 2"> <div v-if="asOrderType == 2">
<div class="card-header-title"> <div class="card-header-title">
...@@ -280,6 +298,16 @@ ...@@ -280,6 +298,16 @@
goods_option_title: '', // 商品规格 goods_option_title: '', // 商品规格
total: '', // 商品数量 total: '', // 商品数量
}, },
// 买家信息
orderConsignee: {
real_name: '',
mobile: '',
provice: '',
city: '',
district: '',
street: '',
address: '',
},
// 售后申请 图片 list // 售后申请 图片 list
asSrcList: [], asSrcList: [],
asApplyList: [], asApplyList: [],
...@@ -498,6 +526,11 @@ ...@@ -498,6 +526,11 @@
this.goodsOrderDetail.goods_price = res.data.order_goods.goods_price / 100 this.goodsOrderDetail.goods_price = res.data.order_goods.goods_price / 100
} }
// 买家 信息
if (res.data.order_consignee) {
this.orderConsignee = res.data.order_consignee;
}
// 退款凭证 list 数据 // 退款凭证 list 数据
this.returnInfoTableData = []; this.returnInfoTableData = [];
if(res.data.order_refund.return_info && res.data.order_refund.return_info.express_code) { if(res.data.order_refund.return_info && res.data.order_refund.return_info.express_code) {
...@@ -843,6 +876,10 @@ ...@@ -843,6 +876,10 @@
text-align: left; text-align: left;
} }
.text-c {
justify-content: center!important;
}
.count-down-con { .count-down-con {
padding: 10px 20px; padding: 10px 20px;
margin: 0; margin: 0;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论