@@ -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 => {});
+ }
+ }
};
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/public/config.js b/seller/public/config.js
index 2bc9856a..043671ae 100644
--- a/seller/public/config.js
+++ b/seller/public/config.js
@@ -13,11 +13,15 @@ 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",
+<<<<<<< HEAD
seller:"http://192.168.0.113:8889"
>>>>>>> 32336decc6e9e0ae8a0e67033f8ca66a89bbd372
+=======
+ seller:"http://127.0.0.1:8889"
+>>>>>>> 4ea142ea086a3f534419a31b595de80497e16d90
},
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 32b7a8ec..f7f4f412 100644
--- a/seller/src/api/shops.js
+++ b/seller/src/api/shops.js
@@ -41,10 +41,24 @@ 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) => {
- 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)
}
// 关闭开启物流公司
@@ -117,4 +131,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/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 @@
+
+