From 9ce3a5e916ccdaf985b660d97db733eb3bc3010d Mon Sep 17 00:00:00 2001 From: chc <1501738723@qq.com> Date: Wed, 31 Aug 2022 17:27:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=94=B5=E5=AD=90=E9=9D=A2=E5=8D=95?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../setting-manage/setting/KUAIDI_SETTING.vue | 5 +- seller/src/api/shops.js | 9 + seller/src/views/shop/ship/logistics.vue | 442 +++++++++++++----- 3 files changed, 326 insertions(+), 130 deletions(-) diff --git a/manager/src/views/sys/setting-manage/setting/KUAIDI_SETTING.vue b/manager/src/views/sys/setting-manage/setting/KUAIDI_SETTING.vue index 0855cf25..97da693d 100644 --- a/manager/src/views/sys/setting-manage/setting/KUAIDI_SETTING.vue +++ b/manager/src/views/sys/setting-manage/setting/KUAIDI_SETTING.vue @@ -10,6 +10,9 @@ + + +
@@ -24,7 +27,7 @@ export default { data() { return { ruleValidate: {}, // 验证规则 - formValidate: { ebusinessID: "", reqURL: "", appKey: "" }, // 表单数据 + formValidate: { ebusinessID: "", reqURL: "", appKey: "" ,sheetReqURL: "" ,}, // 表单数据 }; }, props: ["res",'type'], diff --git a/seller/src/api/shops.js b/seller/src/api/shops.js index 32b7a8ec..e23c75e3 100644 --- a/seller/src/api/shops.js +++ b/seller/src/api/shops.js @@ -41,6 +41,10 @@ export const getBillDetail = (id, params) => { export const getLogistics = (id, params) => { return getRequest(`/other/logistics`, params) } +//返回信息 +export const getIsCheck =(logisticsId) =>{ + return getRequest(`other/logistics/${logisticsId}/getStoreLogistics`) +} // 开启物流公司 export const logisticsChecked = (id, params) => { @@ -117,4 +121,9 @@ export const editShipTemplate = (id, params, headers) => { return putRequest(`/setting/freightTemplate/${id}`, params, headers) } +//修改电子面单等信息 +export const editChecked = (logisticsId,params) => { + return putRequest(`/other/logistics/${logisticsId}/updateStoreLogistics`,params) +} + diff --git a/seller/src/views/shop/ship/logistics.vue b/seller/src/views/shop/ship/logistics.vue index 8d80103d..682381bb 100644 --- a/seller/src/views/shop/ship/logistics.vue +++ b/seller/src/views/shop/ship/logistics.vue @@ -9,154 +9,338 @@ ref="table" > + +

是否需要电子面单

+ + + 需要 + + + 不需要 + + + +

请输入详细信息

+
+ + + + + + + + + + + + + + + + +
+ 使用说明 + 快递类型 +
+
+ +
+
+ + From 2aceffc1124f841d4ec41afa42edae7816de2129 Mon Sep 17 00:00:00 2001 From: chc <1501738723@qq.com> Date: Thu, 1 Sep 2022 18:52:11 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=94=B5=E5=AD=90=E9=9D=A2=E5=8D=95?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2,=E5=AF=BC=E5=85=A5=E5=95=86=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seller/public/config.js | 4 +- seller/src/api/logistics.js | 4 + seller/src/api/order.js | 4 + seller/src/api/shops.js | 12 +- seller/src/views/goods/goods-seller/goods.vue | 32 ++++- seller/src/views/order/order/orderDetail.vue | 90 ++++++++++-- seller/src/views/shop/ship/logistics.vue | 17 ++- seller/src/views/shop/shopSetting.vue | 136 ++++++++++++++++++ 8 files changed, 271 insertions(+), 28 deletions(-) diff --git a/seller/public/config.js b/seller/public/config.js index 77fabef0..4c4bde61 100644 --- a/seller/public/config.js +++ b/seller/public/config.js @@ -7,10 +7,10 @@ var BASE = { // buyer: "http://localhost:8888", // seller: "http://localhost:8889", // manager: "http://localhost:8887" - common:"http://192.168.0.113:8890", + common:"http://127.0.0.1:8890", buyer:"http://192.168.0.113:8888", manager:"http://192.168.0.113:8887", - seller:"http://192.168.0.113:8889" + seller:"http://127.0.0.1:8889" }, API_PROD: { common: "https://common-api.pickmall.cn", diff --git a/seller/src/api/logistics.js b/seller/src/api/logistics.js index 1d4d7ebf..a74a861a 100644 --- a/seller/src/api/logistics.js +++ b/seller/src/api/logistics.js @@ -31,4 +31,8 @@ export const updateLogistics = (id,params) => { return putRequest(`/other/logistics/${id}`,params); }; +export const getCheckedOn = params =>{ + return getRequest(`/other/logistics/getCheckedFaceSheet`,params); +} + diff --git a/seller/src/api/order.js b/seller/src/api/order.js index 9c22489e..ff709b67 100644 --- a/seller/src/api/order.js +++ b/seller/src/api/order.js @@ -17,6 +17,10 @@ export const queryExportOrder = params => { return getRequest(`/order/order/queryExportOrder`, params); }; +//获取电子面单 +export const getOrderFaceSheet= (orderSn,params) =>{ + return postRequest(`/order/order/${orderSn}/createElectronicsFaceSheet`,params) +} // 上传待发货的订单列表 export const uploadDeliverExcel = params => { diff --git a/seller/src/api/shops.js b/seller/src/api/shops.js index e23c75e3..f7f4f412 100644 --- a/seller/src/api/shops.js +++ b/seller/src/api/shops.js @@ -48,7 +48,17 @@ export const getIsCheck =(logisticsId) =>{ // 开启物流公司 export const logisticsChecked = (id, params) => { - return postRequest(`/other/logistics/${id}`, params) + return postRequest(`/other/logistics/${id}`, params, { + "Content-type": "application/json" + }) +} +//获取发货地址 +export const getDeliverAddress = () =>{ + return getRequest(`/settings/storeSettings/storeDeliverGoodsAddress`) +} +//修改发货地址 +export const editDeliverAddress = (params) =>{ + return putRequest(`/settings/storeSettings/storeDeliverGoodsAddress`,params) } // 关闭开启物流公司 diff --git a/seller/src/views/goods/goods-seller/goods.vue b/seller/src/views/goods/goods-seller/goods.vue index d9227f3a..f9d819d2 100644 --- a/seller/src/views/goods/goods-seller/goods.vue +++ b/seller/src/views/goods/goods-seller/goods.vue @@ -56,6 +56,7 @@ + + +
+ +
+ +

选择或拖拽文件上传

+
+ +
+
+ +
+ @@ -192,12 +207,16 @@ import { deleteGoods, batchShipTemplate, } from "@/api/goods"; +import { baseUrl } from "@/libs/axios.js"; import * as API_Shop from "@/api/shops"; export default { name: "goods", data() { return { + accessToken: {}, // 验证token + importModal: false, + action: baseUrl + "/goods/import/import", // 上传接口 id: "", //要操作的id loading: true, // 表单加载状态 shipTemplateForm: {}, // 物流模板 @@ -486,6 +505,15 @@ export default { } }); }, + // 上传数据 + handleUpload(file) { + this.file = file; + this.upload(); + return false; + }, + openImportGoods(){ + this.importModal = true + }, // 更新库存 updateStock() { let updateStockList = this.stockList.map((i) => { @@ -727,9 +755,7 @@ export default { }, mounted() { this.init(); - }, - mounted() { - this.init(); + this.accessToken.accessToken = this.getStore("accessToken"); }, }; diff --git a/seller/src/views/order/order/orderDetail.vue b/seller/src/views/order/order/orderDetail.vue index cf7a037c..513c6983 100644 --- a/seller/src/views/order/order/orderDetail.vue +++ b/seller/src/views/order/order/orderDetail.vue @@ -27,6 +27,7 @@ + @@ -439,13 +440,31 @@ 订单发货

+
+ + + +
+ - + + import * as API_Order from "@/api/order"; +import * as API_Logistics from "@/api/logistics"; import liliMap from "@/views/my-components/map/index"; import * as RegExp from "@/libs/RegExp.js"; import region from "@/views/lili-components/region"; @@ -495,6 +516,16 @@ export default { region: [], //地区 regionId: [], //地区id showRegion: false, + someJSONdata: '', + faceSheetForm: { + logisticsId: '', + }, + faceSheetFormValidate: { + logisticsId: [ + { required: true, message: "请选择物流公司"}, + ], + }, + facesheetFlag: false, //电子面单标识 orderLogModal: false, //弹出调整价格框 logisticsModal: false, //弹出查询物流框 orderDeliverModal: false, //订单发货弹出框 @@ -716,6 +747,15 @@ export default { } }); }, + Toprint(){ + this.facesheetFlag = true; + API_Logistics.getCheckedOn().then(res => { + if (res.success) { + this.checkedLogistics = res.result; + this.orderDeliverModal = true; + } + }); + }, // 修改订单金额 modifyPrice() { //默认要修改的金额为订单总金额 @@ -754,6 +794,7 @@ export default { }, //订单发货 orderDeliver() { + this.facesheetFlag = false API_Order.getLogisticsChecked().then((res) => { if (res.success) { this.checkedLogistics = res.result; @@ -761,21 +802,40 @@ export default { } }); }, + Toprints(){ + if(this.form.logisticsId != null && this.form.logisticsId != ''){ + this.orderDeliverModal = false; + this.modalPrint = true; + } + }, //订单发货提交 orderDeliverySubmit() { - this.$refs.orderDeliveryForm.validate((valid) => { - if (valid) { - API_Order.orderDelivery(this.sn, this.orderDeliveryForm).then( - (res) => { + if(this.facesheetFlag){ + this.$refs['faceSheetForm'].validate((valid) => { + if (valid) { + API_Order.getOrderFaceSheet(this.sn, this.faceSheetForm).then(res => { if (res.success) { - this.$Message.success("订单发货成功"); - this.orderDeliverModal = false; - this.getDataDetail(); + this.someJSONdata = res.result; + this.Toprints(); } - } - ); - } - }); + }) + } + }) + }else{ + this.$refs['orderDeliveryForm'].validate((valid) => { + if (valid) { + API_Order.orderDelivery(this.sn,this.orderDeliveryForm).then( + (res) => { + if (res.success) { + this.$Message.success("订单发货成功"); + this.orderDeliverModal = false; + this.getDataDetail(); + } + } + ); + } + }); + } }, //弹出修改收货地址框 editAddress() { @@ -900,7 +960,7 @@ dl dt { .search { - + .div-item { line-height: 35px; diff --git a/seller/src/views/shop/ship/logistics.vue b/seller/src/views/shop/ship/logistics.vue index 682381bb..2807e417 100644 --- a/seller/src/views/shop/ship/logistics.vue +++ b/seller/src/views/shop/ship/logistics.vue @@ -95,7 +95,8 @@ export default { name: "logistics", data() { return { - openModal: true, + row: {}, + openModal: false, loading: true, // 表单加载状态 searchForm: { // 搜索框初始化对象 @@ -246,7 +247,7 @@ export default { }, // 开启 open(v) { - this.modalTitle = v; + this.row = v; this.openModal = true; this.searchForm.faceSheetFlag = "false"; //开弹框 等于v if (this.searchForm.faceSheetFlag == "true") { @@ -257,15 +258,17 @@ export default { }, //修改 getFaceSheetInfo(v) { + this.row = v; this.logisticsId = v.logisticsId; this.openModalTitle = '修改信息'; API_Shop.getIsCheck(this.logisticsId).then((res) => { if (res.success) { // this.searchForm = res.result.recordes; - this.faceSheetForm.faceSheetFlag = String(res.result.faceSheetFlag); //开弹框 等于v - if (this.faceSheetForm.faceSheetFlag == "true") { + this.faceSheetForm.faceSheetFlag = res.result.faceSheetFlag; //开弹框 等于v + if (this.faceSheetForm.faceSheetFlag === true) { this.onpenText = true; } else { + this.faceSheetForm.faceSheetFlag = false this.onpenText = false; } this.faceSheetForm.customerName = res.result.customerName; @@ -275,6 +278,7 @@ export default { this.faceSheetForm.sendStaff = res.result.sendStaff; } }); + this.openModal = true; }, frontDownload(val) { var a = document.createElement("a"); //创建一个标签 @@ -293,10 +297,9 @@ export default { }, submit() { - if (v.selected === null || v.selected === "") { - + if ( this.row.selected === null || this.row.selected === "") { API_Shop.logisticsChecked( - this.modalTitle.logisticsId, + this.row.logisticsId, this.faceSheetForm ).then((res) => { this.openModal = false; diff --git a/seller/src/views/shop/shopSetting.vue b/seller/src/views/shop/shopSetting.vue index 2243601d..7b6db03f 100644 --- a/seller/src/views/shop/shopSetting.vue +++ b/seller/src/views/shop/shopSetting.vue @@ -58,6 +58,77 @@ + +
+ + + + + + + + + + + + + + + + + + + + +
+
{ + if (valid) { + this.addressGoods.salesConsignorAddressPath = this.regionGoods; + this.addressGoods.salesConsignorAddressId = this.regionIdS; + API_Shop.editDeliverAddress(this.addressGoods).then(res=>{ + if(res.success){ + this.$Message.success("修改成功") + } + }) + } + }); }, //获取店铺信息 getShopInfo() { @@ -331,6 +455,18 @@ export default { } }); }, + getDeliverAddress(){ + API_Shop.getDeliverAddress().then(res=>{ + if(res.success){ + if(res.result!= '' && res.result != null){ + console.log(89898999998) + this.addressGoods = res.result; + this.regionGoods = res.result.salesConsignorAddressPath; + this.regionIdS = res.result.salesConsignorAddressId; + } + } + }) + }, //修改售后地址 regionClick() { this.showRegion = true; From 4ea142ea086a3f534419a31b595de80497e16d90 Mon Sep 17 00:00:00 2001 From: mahe Date: Fri, 2 Sep 2022 09:30:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A5=BC=E5=B1=82?= =?UTF-8?q?=E4=B8=93=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/views/lili-dialog/link-dialog.vue | 53 ++++-- .../src/views/lili-dialog/template/index.js | 2 + .../views/lili-dialog/template/special.vue | 169 ++++++++++++++++++ manager/src/views/lili-dialog/wap.js | 7 +- .../views/lili-floor-renovation/floorList.vue | 22 ++- .../views/lili-floor-renovation/wap/main.vue | 13 +- .../lili-floor-renovation/wap/navbar.vue | 62 ++++--- .../lili-floor-renovation/wap/wapList.vue | 102 ++++++----- 8 files changed, 340 insertions(+), 90 deletions(-) create mode 100644 manager/src/views/lili-dialog/template/special.vue diff --git a/manager/src/views/lili-dialog/link-dialog.vue b/manager/src/views/lili-dialog/link-dialog.vue index 0c68f0e3..e3dadf82 100644 --- a/manager/src/views/lili-dialog/link-dialog.vue +++ b/manager/src/views/lili-dialog/link-dialog.vue @@ -1,16 +1,26 @@ \ No newline at end of file diff --git a/manager/src/views/lili-dialog/wap.js b/manager/src/views/lili-dialog/wap.js index 2d2d675c..a9ee6add 100644 --- a/manager/src/views/lili-dialog/wap.js +++ b/manager/src/views/lili-dialog/wap.js @@ -29,5 +29,10 @@ export default [ title: "其他", url: "3", name: "other" - } + }, + { + title: "专题", + url: "4", + name: "special" + }, ]; diff --git a/manager/src/views/lili-floor-renovation/floorList.vue b/manager/src/views/lili-floor-renovation/floorList.vue index c65b84cd..a0473207 100644 --- a/manager/src/views/lili-floor-renovation/floorList.vue +++ b/manager/src/views/lili-floor-renovation/floorList.vue @@ -82,7 +82,9 @@ export default { pageNumber:1, pageSize:10, sort: 'createTime', - order: 'desc' + order: 'desc', + pageType:"INDEX", + pageClientType:"PC", }, columns: [ // 列表展示的column @@ -106,10 +108,10 @@ export default { type: "INDEX", title: "首页", }, - // { - // type: "SPECIAL", - // title: "专题", - // }, + { + type: "SPECIAL", + title: "专题", + } ], list: [], // 模板列表 }; @@ -125,7 +127,8 @@ export default { const data = this.formData; data.status ? (data.pageShow = "OPEN") : (data.pageShow = "CLOSE"); delete data.status; - (data.pageType = "INDEX"), (data.pageClientType = "PC"); + // (data.pageType = "INDEX"), (data.pageClientType = "PC"); + (data.pageType = this.searchForm.pageType), (data.pageClientType = "PC"); if (data.id) { API_floor.updateHome(data.id, data).then((res) => { this.$Message.success("编辑模板成功"); @@ -144,6 +147,13 @@ export default { } }); }, + + clickType(type,index){ + this.searchForm.pageNumber = 1 + this.searchForm.pageType = type; + this.selectedIndex = index; + this.getTemplateList(); + }, createTemp() { // 新建表单 diff --git a/manager/src/views/lili-floor-renovation/wap/main.vue b/manager/src/views/lili-floor-renovation/wap/main.vue index 62bd675e..423c1afa 100644 --- a/manager/src/views/lili-floor-renovation/wap/main.vue +++ b/manager/src/views/lili-floor-renovation/wap/main.vue @@ -1,8 +1,8 @@ @@ -11,16 +11,21 @@ import layout from "./index"; import navbar from "./navbar"; export default { components: { - navbar, + navbar + }, + mounted() { + this.pagetype = this.$route.query.pagetype; }, data() { return { layout, // 装修模块 name: "index", // 装修的页面 + pagetype: "INDEX" }; }, methods: { - selected(val) { // 顶部栏点击切换 + selected(val) { + // 顶部栏点击切换 this.name = val; } } diff --git a/manager/src/views/lili-floor-renovation/wap/navbar.vue b/manager/src/views/lili-floor-renovation/wap/navbar.vue index 21aa9c28..bcafad62 100644 --- a/manager/src/views/lili-floor-renovation/wap/navbar.vue +++ b/manager/src/views/lili-floor-renovation/wap/navbar.vue @@ -9,9 +9,7 @@ v-for="(item, index) in way" :key="index" :type="item.selected ? 'primary' : ''" - > - {{ item.title }} - + >{{ item.title }}
@@ -21,7 +19,7 @@
临时预览
- --> + -->
- 模板名称 + 模板名称 +
是否立即发布 @@ -45,7 +44,7 @@
- +
@@ -54,6 +53,7 @@ import * as API_Other from "@/api/other.js"; export default { + props: ["pagetype"], data() { return { progress: true, // 展示进度 @@ -61,11 +61,11 @@ export default { saveDialog: false, // 加载状态 way: [ // 装修tab栏切换 - { - title: "首页", - name: "index", - selected: true, - }, + // { + // title: "首页", + // name: "index", + // selected: true, + // }, // { // title: "全屏广告", // name: "advertising", @@ -82,11 +82,23 @@ export default { // 表单信息 pageShow: this.$route.query.type || false, name: this.$route.query.name || "模板名称", - pageClientType: "H5", - }, + pageClientType: "H5" + } }; }, - watch: {}, + watch: { + pagetype: { + handler(val) { + this.way.length = 0; + if (val == "INDEX") { + this.way.push({ title: "首页", name: "index", selected: true }); + } else if (val == "SPECIAL") { + this.way.push({ title: "专题", name: "special", selected: true }); + } + }, + immediate: true + } + }, mounted() {}, methods: { clickBtn(val) { @@ -116,7 +128,8 @@ export default { : (this.submitWay.pageShow = "CLOSE"); this.submitWay.pageData = JSON.stringify(this.$store.state.styleStore); - this.submitWay.pageType = "INDEX"; + // this.submitWay.pageType = "INDEX"; + this.submitWay.pageType = this.pagetype; this.$route.query.id ? this.update() : this.submit(this.submitWay); }, @@ -128,10 +141,11 @@ export default { pageData: JSON.stringify(this.$store.state.styleStore), name: this.submitWay.name, pageShow: this.submitWay.pageShow, - pageType: "INDEX", - pageClientType: "H5", + // pageType: "INDEX", + pageType: this.pagetype, + pageClientType: "H5" }) - .then((res) => { + .then(res => { this.num = 50; if (res.success) { this.num = 80; @@ -147,13 +161,13 @@ export default { } console.log(res); }) - .catch((error) => {}); + .catch(error => {}); }, // 返回查询数据页面 goback() { this.$router.push({ - path: "/wapList", + path: "/wapList" }); }, @@ -161,7 +175,7 @@ export default { submit(submitWay) { this.progress = false; API_Other.setHomeSetup(submitWay) - .then((res) => { + .then(res => { this.num = 50; if (res.success) { this.num = 80; @@ -178,9 +192,9 @@ export default { } console.log(res); }) - .catch((error) => {}); - }, - }, + .catch(error => {}); + } + } };