diff --git a/src/api/shop/goods/index.js b/src/api/shop/goods/index.js new file mode 100644 index 0000000..5c0f88e --- /dev/null +++ b/src/api/shop/goods/index.js @@ -0,0 +1,11 @@ +import httpService from "@/request" + +// 商品 +// list +export function goodsList(params) { + return httpService({ + url: `/user/shop/jcookGoodsList`, + method: 'get', + params: params, + }) +} diff --git a/src/api/shop/order/index.js b/src/api/shop/order/index.js index 385aeba..9755551 100644 --- a/src/api/shop/order/index.js +++ b/src/api/shop/order/index.js @@ -9,3 +9,19 @@ export function orderList(params) { params: params, }) } +// 订单详情 +export function orderInfo(params) { + return httpService({ + url: `/user/shopOrder/findDetail`, + method: 'get', + params: params, + }) +} +// 取消订单 +export function shopOrderCancel(params) { + return httpService({ + url: `/user/shopOrder/cancel`, + method: 'get', + params: params, + }) +} diff --git a/src/router/basic.js b/src/router/basic.js index 9cb94ed..d7148ce 100644 --- a/src/router/basic.js +++ b/src/router/basic.js @@ -45,6 +45,7 @@ export default [ icon: 'home', hide: false, component: resolve => require(['@/views/Basic/EstateInfo'], resolve), + redirect: '/EstateInfo/BuildingManage', meta: {title: '小区信息'}, children: [ { diff --git a/src/router/shop.js b/src/router/shop.js index 5aac4d8..0833b76 100644 --- a/src/router/shop.js +++ b/src/router/shop.js @@ -7,6 +7,50 @@ * @FilePath: /LittleBeeSaas/src/router/smartMall.js */ export default [ + { + path: '/GoodsManage', + name: "GoodsManage", + title: "商品管理", + icon: 'home', + hide: false, + component: resolve => require(['@/views/Shop/GoodsManage'], resolve), + redirect: '/GoodsManage/GoodsList', + meta: {title: '商品管理'}, + children: [ + { + path: '/GoodsManage/GoodsList', + name: "GoodsList", + title: "商品列表", + hide: false, + component: resolve => require(['@/views/Shop/GoodsManage/_goodsList'], resolve), + meta: {title: '商品列表'}, + }, + { + path: '/GoodsManage/GoodsCate', + name: "GoodsCate", + title: "商品分类", + hide: false, + component: resolve => require(['@/views/Shop/GoodsManage/_goodsCate'], resolve), + meta: {title: '商品分类'}, + }, + // { + // path: '/GoodsManage/GoodsCate', + // name: "GoodsCate", + // title: "商品审核", + // hide: false, + // component: resolve => require(['@/views/Shop/GoodsManage/_goodsCate'], resolve), + // meta: {title: '商品分类'}, + // }, + { + path: '/GoodsManage/Brand', + name: "Brand", + title: "品牌资质", + hide: false, + component: resolve => require(['@/views/Shop/GoodsManage/_brand'], resolve), + meta: {title: '品牌资质'}, + }, + ] + }, { path: '/OrderManage', name: "OrderManage", @@ -16,4 +60,13 @@ export default [ component: resolve => require(['@/views/Shop/OrderManage'], resolve), meta: {title: '订单列表'} }, + { + path: '/OrderDetail', + name: "OrderDetail", + title: "订单详情", + hide: true, + icon: 'container', + component: resolve => require(['@/views/Shop/OrderManage/depend/detail'], resolve), + meta: {title: '订单详情'} + }, ] \ No newline at end of file diff --git a/src/styles/index.less b/src/styles/index.less index f827b5c..89c619d 100644 --- a/src/styles/index.less +++ b/src/styles/index.less @@ -20,7 +20,13 @@ margin-left : 10px; margin-bottom: 10px; } - +.back-btn{ + font-size: 16px; + line-height: 22px; + color: #000000D9; + font-weight: 500; + cursor: pointer; +} // 表格 #commonTable { margin: 24px; diff --git a/src/views/Basic/Authority/index.vue b/src/views/Basic/Authority/index.vue index 90ef62b..b7eb179 100644 --- a/src/views/Basic/Authority/index.vue +++ b/src/views/Basic/Authority/index.vue @@ -219,6 +219,7 @@ export default { keyword: this.searchForm.keyword, }).then((res) => { this.tableData = res.data.rows; + this.pagination.total = res.data.total }); }, success() { diff --git a/src/views/Basic/Employee/index.vue b/src/views/Basic/Employee/index.vue index 9096a0e..27e4fa8 100644 --- a/src/views/Basic/Employee/index.vue +++ b/src/views/Basic/Employee/index.vue @@ -291,6 +291,7 @@ export default { positionId:this.searchForm.positionId, }).then((res) => { this.tableData = res.data.rows; + this.pagination.total = res.data.total }); }, openDepartment(type) { diff --git a/src/views/Basic/EstateInfo/_buildingManage/index.vue b/src/views/Basic/EstateInfo/_buildingManage/index.vue index 2f6e9fb..bb94944 100644 --- a/src/views/Basic/EstateInfo/_buildingManage/index.vue +++ b/src/views/Basic/EstateInfo/_buildingManage/index.vue @@ -71,6 +71,7 @@ export default { } ) this.tableData = res.data.rows + this.pagination.total = res.data.total }, addBuilding(){ this.drawerConfig.show = true diff --git a/src/views/Basic/EstateInfo/_houseHoldAudit/index.vue b/src/views/Basic/EstateInfo/_houseHoldAudit/index.vue index 256b8c0..3d453be 100644 --- a/src/views/Basic/EstateInfo/_houseHoldAudit/index.vue +++ b/src/views/Basic/EstateInfo/_houseHoldAudit/index.vue @@ -175,6 +175,7 @@ export default { identity: this.searchForm.identity, }); this.tableData = res.data.rows; + this.pagination.total = res.data.total }, tabsChange() { this.getData(); diff --git a/src/views/Basic/EstateInfo/_houseManage/index.vue b/src/views/Basic/EstateInfo/_houseManage/index.vue index b540d72..9b7e97c 100644 --- a/src/views/Basic/EstateInfo/_houseManage/index.vue +++ b/src/views/Basic/EstateInfo/_houseManage/index.vue @@ -233,6 +233,7 @@ export default { manageEstateTypeId: this.searchForm.manageEstateTypeId, }); this.tableData = res.data.rows; + this.pagination.total = res.data.total }, // 获取类型 async getType() { diff --git a/src/views/Shop/GoodsManage/_brand/index.vue b/src/views/Shop/GoodsManage/_brand/index.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/views/Shop/GoodsManage/_goodsCate/index.vue b/src/views/Shop/GoodsManage/_goodsCate/index.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/views/Shop/GoodsManage/_goodsList/index.vue b/src/views/Shop/GoodsManage/_goodsList/index.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/views/Shop/GoodsManage/index.vue b/src/views/Shop/GoodsManage/index.vue index e69de29..b0561c2 100644 --- a/src/views/Shop/GoodsManage/index.vue +++ b/src/views/Shop/GoodsManage/index.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/src/views/Shop/OrderManage/depend/config.js b/src/views/Shop/OrderManage/depend/config.js index 424ae53..465baba 100644 --- a/src/views/Shop/OrderManage/depend/config.js +++ b/src/views/Shop/OrderManage/depend/config.js @@ -6,7 +6,12 @@ export const columns = [ { title: "订单号", dataIndex: "code", - width: "15%", + width: "25%", + }, + { + title: "jcook订单号", + dataIndex: "jcookCode", + width: "25%", }, { title: "创建时间", @@ -42,95 +47,78 @@ export const columns = [ } } }, - // { - // title: "jcook订单号", - // dataIndex: "jcookCode", - // width: "15%", - // }, - // { - // title: "支付宝交易号", - // dataIndex: "tradeNo", - // width: "15%", - // }, - // { - // title: "交易状态", - // dataIndex: "tradeStatus", - // width: "15%", - // }, - // { - // title: "支付人名称", - // dataIndex: "payName", - // width: "15%", - // }, - // { - // title: "支付人联系方式", - // dataIndex: "payTel", - // width: "15%", - // }, - // { - // title: "付款方式", - // dataIndex: "payType", - // width: "15%", - // }, - // { - // title: "付款金额", - // dataIndex: "payPrice", - // width: "15%", - // }, - // { - // title: "运费", - // dataIndex: "freightFee", - // width: "15%", - // }, - // { - // title: "收货人", - // dataIndex: "receiverName", - // width: "15%", - // }, - // { - // title: "收货人联系方式", - // dataIndex: "receiverTel", - // width: "15%", - // }, - // { - // title: "所在地区名称", - // dataIndex: "locationName", - // width: "15%", - // }, - // { - // title: "详细地址", - // dataIndex: "addressDetail", - // width: "15%", - // }, - // { - // title: "运费", - // dataIndex: "freightFee", - // width: "15%", - // }, - // { - // title: "运费", - // dataIndex: "freightFee", - // width: "15%", - // }, - // { - // title: "房屋类型", - // dataIndex: "manageEstateTypeName", - // width: "15%", - // }, { title: "操作", dataIndex: "action", key: "action", width: "180", - fixed: "right", scopedSlots: { customRender: "action" }, }, ] +export const detailColumns = [ + { + title: "商品", + dataIndex: "skuName", + width: "16%", + scopedSlots: { customRender: "skuName"} + }, + { + title: "商品类别", + dataIndex: "kind", + width: "15%", + customRender:function(kind){ + switch (kind) { + case 0: + return '未知' + case 1: + return '自营' + case 2: + return '其他' + default: + break; + } + } + }, + { + title: "商品单价", + dataIndex: "sellPrice", + width: "10%", + customRender:function(sellPrice){ + return '￥'+sellPrice + } + }, + { + title: "数量", + dataIndex: "num", + width: "8%", + }, + { + title: "单位", + dataIndex: "unit", + width: "12%", + }, + { + title: "总金额", + width: "12%", + customRender:function(data){ + return '￥'+data.sellPrice*data.num + } + + }, + { + title: "实收款", + dataIndex: "payPrice", + width: "15%", + customRender:function(payPrice){ + return '￥'+payPrice + } + }, +] // 搜索项 export const searchForm = { code: "", jcookCode: '', - tradeStatus:null + tradeStatus:undefined } // 分页 export const pagination = { @@ -140,15 +128,4 @@ export const pagination = { showTotal: (total) => `共 ${total} 条`, showSizeChanger: true, showQuickJumper: true, -} -export function del(data) { - this.$confirm({ - title: "是否删除", - // okText:'删除', - // cancelText:'取消', - icon: "delete", - onOk: function () { - console.log(data); - }, - }); } \ No newline at end of file diff --git a/src/views/Shop/OrderManage/depend/detail.vue b/src/views/Shop/OrderManage/depend/detail.vue new file mode 100644 index 0000000..c2bcbf1 --- /dev/null +++ b/src/views/Shop/OrderManage/depend/detail.vue @@ -0,0 +1,303 @@ + + + + + \ No newline at end of file diff --git a/src/views/Shop/OrderManage/index.vue b/src/views/Shop/OrderManage/index.vue index 2cd4db7..151cf8b 100644 --- a/src/views/Shop/OrderManage/index.vue +++ b/src/views/Shop/OrderManage/index.vue @@ -5,8 +5,8 @@ - - + + 查 询 重 置 @@ -17,37 +17,53 @@ - > -
- - - {{record.freightFee}} + +
+ + + + + {{record.tradeStatus | tradeStatus}} - - 1810000000 + + {{record.payName + record.payTel}} - - Hangzhou, Zhejiang + + {{record.payPrice}} - - empty + + {{record.freightFee}} - - No. 18, Wantang Road, Xihu District, Hangzhou, Zhejiang, China + + {{record.receiverName + record.receiverTel}} + + + {{record.locationName + record.addressDetail}} + + + {{record.remake||'无'}} + + + {{record.createName}} + + + {{record.createDate}}
- + 查看详情 - 备注 + 取消订单
\ No newline at end of file