-
-
-
订单号:{{ item.text.sn }}
+
+
![]()
{{ item.text.groupName }}
{{ item.text.paymentTime }}
+
+ 订单金额：￥{{ item.text.flowPrice }}
+
+
{{
+ item.text.orderStatus == 'CANCELLED' ? '已取消' : item.text.orderStatus == 'UNPAID' ? '未付款' :
+ item.text.orderStatus ==
+ 'PAID' ? '已付款' : item.text.orderStatus == 'UNDELIVERED' ? '待发货' : item.text.orderStatus ==
+ 'DELIVERED'
+ ? '已发货' : item.text.orderStatus == ' COMPLETED' ? '已完成' : item.text.orderStatus == ' TAKE' ?
+ '待校验' : ''
+ }}
-
-
@@ -149,10 +164,10 @@
+ talk_type: params.talk_type,
+ receiver_id: params.receiver_id,
+ title: params.nickname,
+ }" @close="findChatRecord = false" />
@@ -820,6 +835,67 @@ export default {
};
\ No newline at end of file
diff --git a/im/src/config/config.js b/im/src/config/config.js
index a5dd35ba..02f792f3 100644
--- a/im/src/config/config.js
+++ b/im/src/config/config.js
@@ -3,6 +3,9 @@ export default {
BASE_API_URL: process.env.VUE_APP_API_BASE_URL || "",
BASE_WS_URL: process.env.VUE_APP_WEB_SOCKET_URL || "",
BASE_COMMON: process.env.VUE_APP_COMMON || "",
- PC_URL: process.env.VUE_APP_PC_URL || "",
- STORE_URL:process.env.VUE_APP_PC_ORDER_URL || "http://192.168.0.139:10002",
+ PC_URL: process.env.VUE_APP_PC_URL || "https://pc-b2b2c.pickmall.cn",
+ STORE_URL: process.env.VUE_APP_PC_ORDER_URL || "http://192.168.0.139:8000/",
+ PC_STORE_GOODS: process.env.VUE_APP_PC_STORE_ORDER_URL || '',
+ PC_STORE_ORDER: process.env.VUE_APP_PC_STORE_ORDER || '',
+ PC_USER_ORDER: process.env.VUE_APP_PC_USER_ORDER || '',
};
diff --git a/im/src/main.js b/im/src/main.js
index 7ceab5ac..8fd9cef2 100644
--- a/im/src/main.js
+++ b/im/src/main.js
@@ -25,17 +25,27 @@ Vue.component('face', face)
Vue.component('face-null', faceNull)
Vue.prototype.linkToGoods = function (goodsId, skuId) { // 跳转买家端商品
- console.log(`${config.PC_URL}/goodsDetail?skuId=${skuId}&goodsId=${goodsId}`)
- window.open(`${config.PC_URL}/goodsDetail?skuId=${skuId}&goodsId=${goodsId}`, '_blank')
+ if (localStorage.getItem('storeFlag') == 'false') {
+ window.open(`${config.PC_STORE_GOODS}goods-operation-edit?id=${goodsId}`, '_blank')
+ } else {
+ window.open(`${config.PC_URL}/goodsDetail?skuId=${skuId}&goodsId=${goodsId}`, '_blank')
+ }
};
-Vue.prototype.linkToStore = function (storeId) { // 跳转买家端商品
+Vue.prototype.linkToStore = function (storeId) { // 跳转商家端商品
console.log(`${config.PC_URL}/Merchant?id=${storeId}`)
window.open(`${config.PC_URL}/Merchant?id=${storeId}`, '_blank')
};
// 订单跳转商家订单页面
-Vue.prototype.linkToOrders = function (sn) { // 跳转买家端订单
- window.open(`${config.STORE_URL}/order-detail?sn=${sn}`, '_blank')
+Vue.prototype.linkToOrders = function (sn) {
+ if (localStorage.getItem('storeFlag') == 'false') {
+ // 商家
+ window.open(`${config.PC_STORE_GOODS}order-detail?sn=${sn}`, '_blank')
+ } else {
+ // 用户
+ window.open(`${config.STORE_URL}/OrderDetail?sn=${sn}`, '_blank')
+ }
};
+
const Instance = new Vue({
router,
store,
diff --git a/manager/public/config.js b/manager/public/config.js
index 7ef1cf91..e674bf70 100644
--- a/manager/public/config.js
+++ b/manager/public/config.js
@@ -1,29 +1,29 @@
var BASE = {
- /**
- * @description api请求基础路径
- */
- API_DEV: {
- common: "http://192.168.0.113:8890",
- buyer: "http://192.168.0.113:8888",
- seller: "http://192.168.0.113:8889",
- manager: "http://192.168.0.113:8887"
- },
- API_PROD: {
- common: "https://common-api.pickmall.cn",
- buyer: "https://buyer-api.pickmall.cn",
- seller: "https://store-api.pickmall.cn",
- manager: "https://admin-api.pickmall.cn"
- },
- /**
- * @description // 跳转买家端地址 pc端
- */
- PC_URL: "https://pc-b2b2c.pickmall.cn",
- /**
- * @description // 跳转买家端地址 wap端
- */
- WAP_URL: "https://m-b2b2c.pickmall.cn",
- /**
- * @description api请求基础路径前缀
- */
- PREFIX: "/manager"
- };
+ /**
+ * @description api请求基础路径
+ */
+ API_DEV: {
+ common: "http://192.168.0.113:8890",
+ buyer: "http://192.168.0.113:8888",
+ seller: "http://192.168.0.113:8889",
+ manager: "http://192.168.0.113:8887"
+ },
+ API_PROD: {
+ common: "https://common-api.pickmall.cn",
+ buyer: "https://buyer-api.pickmall.cn",
+ seller: "https://store-api.pickmall.cn",
+ manager: "https://admin-api.pickmall.cn"
+ },
+ /**
+ * @description // 跳转买家端地址 pc端
+ */
+ PC_URL: "https://pc-b2b2c.pickmall.cn",
+ /**
+ * @description // 跳转买家端地址 wap端
+ */
+ WAP_URL: "https://m-b2b2c.pickmall.cn",
+ /**
+ * @description api请求基础路径前缀
+ */
+ PREFIX: "/manager"
+};
diff --git a/seller/public/config.js b/seller/public/config.js
index 8e0e70ba..69441029 100644
--- a/seller/public/config.js
+++ b/seller/public/config.js
@@ -3,10 +3,10 @@ var BASE = {
* @description api请求基础路径
*/
API_DEV: {
- common: "http://192.168.0.113:8890",
- buyer: "http://192.168.0.113:8888",
- seller: "http://192.168.0.113:8889",
- manager: "http://192.168.0.113:8887"
+ common: "https://common-api.pickmall.cn",
+ buyer: "https://buyer-api.pickmall.cn",
+ seller: "https://store-api.pickmall.cn",
+ manager: "https://admin-api.pickmall.cn"
},
API_PROD: {
common: "https://common-api.pickmall.cn",
diff --git a/seller/src/views/home/home.vue b/seller/src/views/home/home.vue
index 36f03b44..7d40de4b 100644
--- a/seller/src/views/home/home.vue
+++ b/seller/src/views/home/home.vue
@@ -258,7 +258,10 @@ export default {
this.$Message.error("请登录后再联系客服");
return;
}
- window.open(`${res.result}?token=` + accessToken);
+ // console.log(res.result, 'res.result');
+ // http://192.168.0.139:8000/
+ window.open(`http://192.168.0.139:8000/?token=` + accessToken);
+ // window.open(`${res.result}?token=` + accessToken);
},
// 获取im信息