@@ -123,7 +128,8 @@
-
@@ -138,7 +144,7 @@
base: root + '/static/core/js/base/' //静态资源所在路径
}).extend({
index: 'index' //主入口模块
- }).use(['table', 'layer', 'form','laydate'], function () {
+ }).use(['table', 'layer', 'form', 'laydate'], function () {
var form = layui.form,
laydate = layui.laydate,
table = layui.table;
@@ -146,23 +152,23 @@
//执行一个laydate实例
laydate.render({
elem: '#createTimeStart' //指定元素
- ,format: 'yyyy-MM-dd HH:mm:ss'
- ,type: 'datetime'
+ , format: 'yyyy-MM-dd HH:mm:ss'
+ , type: 'datetime'
});
laydate.render({
elem: '#createTimeEnd' //指定元素
- ,format: 'yyyy-MM-dd HH:mm:ss'
- ,type: 'datetime'
+ , format: 'yyyy-MM-dd HH:mm:ss'
+ , type: 'datetime'
});
laydate.render({
elem: '#pickTimeStart' //指定元素
- ,format: 'yyyy-MM-dd HH:mm:ss'
- ,type: 'datetime'
+ , format: 'yyyy-MM-dd HH:mm:ss'
+ , type: 'datetime'
});
laydate.render({
elem: '#pickTimeEnd' //指定元素
- ,format: 'yyyy-MM-dd HH:mm:ss'
- ,type: 'datetime'
+ , format: 'yyyy-MM-dd HH:mm:ss'
+ , type: 'datetime'
});
//方法级渲染
@@ -177,13 +183,13 @@
userPhone: $("#userPhone").val(),
status: $("#status").val(),
orderPayWay: $("#orderPayWay").val(),
- orderPick:$("#orderPick").val(),
- addressId:$("#addressId").val(),
- companyId:$("#companyId").val(),
- createTimeStart:$("#createTimeStart").val(),
- createTimeEnd:$("#createTimeEnd").val(),
- pickTimeStart:$("#pickTimeStart").val(),
- pickTimeEnd:$("#pickTimeEnd").val(),
+ orderPick: $("#orderPick").val(),
+ addressId: $("#addressId").val(),
+ companyId: $("#companyId").val(),
+ createTimeStart: $("#createTimeStart").val(),
+ createTimeEnd: $("#createTimeEnd").val(),
+ pickTimeStart: $("#pickTimeStart").val(),
+ pickTimeEnd: $("#pickTimeEnd").val(),
},
cols: [[
{checkbox: true, fixed: true},
@@ -195,22 +201,22 @@
field: 'orderPayWay',
title: '支付方式',
templet: function (item) {
- if (item.orderPayWay==1) {
+ if (item.orderPayWay == 1) {
return '
微信支付';
}
- if (item.orderPayWay==2){
+ if (item.orderPayWay == 2) {
return '
积分支付';
}
- if (item.orderPayWay==3){
+ if (item.orderPayWay == 3) {
return '
套餐券';
}
- if (item.orderPayWay==4){
+ if (item.orderPayWay == 4) {
return '
现金券';
}
- if (item.orderPayWay==5){
+ if (item.orderPayWay == 5) {
return '
现金券（折扣）';
}
- if (item.orderPayWay==6){
+ if (item.orderPayWay == 6) {
return '
促销';
}
}
@@ -233,17 +239,17 @@
},
{
field: 'orderFreight',
- width:70,
+ width: 70,
title: '运费'
},
{
field: 'orderPick',
title: '提货方式',
templet: function (item) {
- if (item.orderPick==1) {
+ if (item.orderPick == 1) {
return '
自提';
}
- if (item.orderPick==2){
+ if (item.orderPick == 2) {
return '
快递';
}
}
@@ -256,28 +262,28 @@
field: 'status',
title: '订单状态',
templet: function (item) {
- if (item.status==1) {
+ if (item.status == 1) {
return '
待支付';
}
- if (item.status==2){
+ if (item.status == 2) {
return '
待发货';
}
- if (item.status==3){
+ if (item.status == 3) {
return '
待收货';
}
- if (item.status==4){
+ if (item.status == 4) {
return '
已完成';
}
- if (item.status==5){
+ if (item.status == 5) {
return '
已取消';
}
- if (item.status==6){
+ if (item.status == 6) {
return '
退换货';
}
- if (item.status==66){
+ if (item.status == 66) {
return '
退换货完成';
}
- if (item.status==67){
+ if (item.status == 67) {
return '
退换货失败';
}
}
@@ -287,13 +293,17 @@
title: '创建时间',
sort: true
},
- {fixed: 'right', align: 'center', width:200,title: '操作',templet: function (item) {
- if (item.status==2 && item.orderPick==2) {
- return '
';
- }else {
- return '
';
+ {
+ fixed: 'right', align: 'center', width: 320, title: '操作', templet: function (item) {
+ if (item.status != 4 && item.orderPick == 2 && item.pendingApprovalAddressId) {
+ return '
';
+ } else if (item.status == 2 && item.orderPick == 2) {
+ return '
';
+ } else {
+ return '
';
}
- }}
+ }
+ }
]],
page: true,
request: {
@@ -364,7 +374,7 @@
var index = layer.load(2, {
offset: '20%',
shade: [0.5, '#000'],
- content: '正在处理, 请稍后...',success: function (layero) {
+ content: '正在处理, 请稍后...', success: function (layero) {
layero.find('.layui-layer-content').css({
'paddingTop': '40px',
'textAlign': 'center',
@@ -374,7 +384,8 @@
'fontWeight': '700',
'letterSpacing': '2px'
});
- }})
+ }
+ })
$.ajax({
url: root + "/order/exportOrder",
type: "post",
@@ -384,16 +395,16 @@
userPhone: $("#userPhone").val(),
status: $("#status").val(),
orderPayWay: $("#orderPayWay").val(),
- orderPick:$("#orderPick").val(),
- addressId:$("#addressId").val(),
- companyId:$("#companyId").val(),
- createTimeStart:$("#createTimeStart").val(),
- createTimeEnd:$("#createTimeEnd").val(),
- pickTimeStart:$("#pickTimeStart").val(),
- pickTimeEnd:$("#pickTimeEnd").val(),
- type:1
+ orderPick: $("#orderPick").val(),
+ addressId: $("#addressId").val(),
+ companyId: $("#companyId").val(),
+ createTimeStart: $("#createTimeStart").val(),
+ createTimeEnd: $("#createTimeEnd").val(),
+ pickTimeStart: $("#pickTimeStart").val(),
+ pickTimeEnd: $("#pickTimeEnd").val(),
+ type: 1
},
- success: function(res){
+ success: function (res) {
window.location.href = res.value;
layer.close(index);
$.message({
@@ -457,14 +468,14 @@
// var ids = [];
// ids.push(data.id);
// del(ids, obj, "one");
- close()
+ close()
},
cancel: function (close) {
close()
}
})
} else if (layEvent === 'edit') { //编辑
- admin.openMax(root + '/order/find?id=' + data.id,'[ 详情 ]');
+ admin.openMax(root + '/order/find?id=' + data.id, '[ 详情 ]');
} else if (layEvent === 'delivery') {
if (data.status != 2) {
$.message({
@@ -478,7 +489,7 @@
type: 2,
content: root + "/order/getAllLogistics?type=1&orderId=" + data.id,
area: ['500px', '300px']
- ,offset: '20%'
+ , offset: '20%'
});
} else if (layEvent === 'refund') {
if (data.status != 6) {
@@ -503,7 +514,7 @@
close()
}
})
- }else if (layEvent === 'refundno') {
+ } else if (layEvent === 'refundno') {
if (data.status != 6) {
$.message({
message: "该状态无法拒绝退换货",
@@ -526,6 +537,22 @@
close()
}
})
+ } else if (layEvent === "updateAddress") {
+ layer.open({
+ title: "处理发货地址修改申请",
+ content: root + "/order/getUpdateAddress?type=1&orderId=" + data.id,
+ area: ['500px', '300px'],
+ offset: '20%',
+ type: 2,
+ })
+ } else if (layEvent === 'editAddress') {
+ layer.open({
+ title: "修改地址",
+ content: root + "/order/getEditAddress?type=1&orderId=" + data.id,
+ area: ['500px', '300px'],
+ offset: '20%',
+ type: 2,
+ })
}
});
@@ -534,7 +561,7 @@
function refund(id, obj, type) {
var index = layer.load(2);
console.log($(".layui-laypage-em").next().html());
- $.post(root + "/order/refund?orderId="+id, function (e) {
+ $.post(root + "/order/refund?orderId=" + id, function (e) {
layer.close(index);
if (e.code == 1) {
$.message({
@@ -560,7 +587,7 @@
function refundno(id, obj, type) {
var index = layer.load(2);
console.log($(".layui-laypage-em").next().html());
- $.post(root + "/order/refundno?orderId="+id, function (e) {
+ $.post(root + "/order/refundno?orderId=" + id, function (e) {
layer.close(index);
if (e.code == 1) {
$.message({
@@ -585,7 +612,7 @@
//删除
function del(id, obj, type) {
var index = layer.load(2);
- $.post(root + "/order/delete",{ids: JSON.stringify(id)}, function (e) {
+ $.post(root + "/order/delete", {ids: JSON.stringify(id)}, function (e) {
layer.close(index);
if (e.code == 1) {
if (type == "one") {
@@ -621,13 +648,13 @@
userPhone: $("#userPhone").val(),
status: $("#status").val(),
orderPayWay: $("#orderPayWay").val(),
- orderPick:$("#orderPick").val(),
- addressId:$("#addressId").val(),
- companyId:$("#companyId").val(),
- createTimeStart:$("#createTimeStart").val(),
- createTimeEnd:$("#createTimeEnd").val(),
- pickTimeStart:$("#pickTimeStart").val(),
- pickTimeEnd:$("#pickTimeEnd").val(),
+ orderPick: $("#orderPick").val(),
+ addressId: $("#addressId").val(),
+ companyId: $("#companyId").val(),
+ createTimeStart: $("#createTimeStart").val(),
+ createTimeEnd: $("#createTimeEnd").val(),
+ pickTimeStart: $("#pickTimeStart").val(),
+ pickTimeEnd: $("#pickTimeEnd").val(),
},
page: {
curr: 1 //重新从第 1 页开始
diff --git a/src/main/webapp/WEB-INF/view/pages/order/order_update_address.jsp b/src/main/webapp/WEB-INF/view/pages/order/order_update_address.jsp
new file mode 100644
index 0000000..0ecc20e
--- /dev/null
+++ b/src/main/webapp/WEB-INF/view/pages/order/order_update_address.jsp
@@ -0,0 +1,97 @@
+<%--
+ Created by IntelliJ IDEA.
+ User: ayaya
+ Date: 2024/5/7
+ Time: 上午10:28
+ To change this template use File | Settings | File Templates.
+--%>
+<%@ include file="../../sys/base.jsp" %>
+<%@ page contentType="text/html;charset=utf-8" language="java" %>
+
+
+
+
56集品后台管理系统
+
+
+
+
+
+
+
+
+
+
diff --git a/wisdommining.iml b/wisdommining.iml
index 9caf1b0..1daccae 100644
--- a/wisdommining.iml
+++ b/wisdommining.iml
@@ -1,219 +1,8 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file