diff --git a/.env.development b/.env.development
index 00ae071..de7243a 100644
--- a/.env.development
+++ b/.env.development
@@ -6,7 +6,7 @@ ENV = 'development'
# 全医通护理站管理平台/开发环境
# VUE_APP_BASE_API = '/dev-api'
-VUE_APP_BASE_API = 'http://192.168.16.85:8081'
+VUE_APP_BASE_API = 'http://192.168.16.64:8080'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/src/api/system/goodsOrder.js b/src/api/system/goodsOrder.js
new file mode 100644
index 0000000..825c18e
--- /dev/null
+++ b/src/api/system/goodsOrder.js
@@ -0,0 +1,50 @@
+import request from '@/utils/request'
+
+// 查询商品订单列表
+export function listGoodsOrder(query) {
+ return request({
+ url: '/system/goodsOrder/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询商品订单详细
+export function getGoodsOrder(id) {
+ return request({
+ url: '/system/goodsOrder/' + id,
+ method: 'get'
+ })
+}
+
+export function getGoodsOrderlist(id) {
+ return request({
+ url: `/system/goodsOrder/goodsOrderByOrder`+`?orderNo=${id}`,
+ method: 'get'
+ })
+}
+// 新增商品订单
+export function addGoodsOrder(data) {
+ return request({
+ url: '/system/goodsOrder',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改商品订单
+export function updateGoodsOrder(data) {
+ return request({
+ url: '/system/goodsOrder',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除商品订单
+export function delGoodsOrder(id) {
+ return request({
+ url: '/system/goodsOrder/' + id,
+ method: 'delete'
+ })
+}
diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue
new file mode 100644
index 0000000..54dbe00
--- /dev/null
+++ b/src/views/system/goodsOrder/index.vue
@@ -0,0 +1,482 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+ {{ scope.row.orderStatus == "WAIT_PAY" ? "待付款" : "" }}
+ {{ scope.row.orderStatus == "PAY" ? "已付款" : "" }}
+ {{ scope.row.orderStatus == "CANCEL" ? "已取消" : "" }}
+ {{ scope.row.orderStatus == "WAIT_RECEIVED" ? "待收货" : "" }}
+ {{ scope.row.orderStatus == "RECEIVED" ? "已收货" : "" }}
+ {{ scope.row.orderStatus == "WAIT_REFUND" ? "待退款" : "" }}
+
+ {{ scope.row.orderStatus == "REFUNDED" ? "已退款" : "" }}
+ {{ scope.row.orderStatus == "WAIT_RETURNED" ? "待退货" : "" }}
+ {{ scope.row.orderStatus == "RETURNED" ? "已退货" : "" }}
+
+
+
+
+
+
+
+
+ {{ scope.row.orderChannel == "MOBILE_APP" ? "手机APP" : "" }}
+ {{ scope.row.orderChannel == "WECHAT_APPLET" ? "微信小程序" : "" }}
+ {{ scope.row.orderChannel == "ALI_PAY_APPLET" ? "支付宝" : "" }}
+
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+