From d89b984344ed468f02c7496b66a4d02ad4e27d05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Mon, 21 Jun 2021 18:11:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=B4=E6=92=AD=E9=97=B4?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=B2=A1=E6=9C=89=E5=88=A4=E6=96=ADbug,?= =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=90=8E=E5=8F=B0=EF=BC=8C=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E6=B2=A1=E6=9C=89=E8=B7=B3=E8=BD=ACbug,?= =?UTF-8?q?=E7=9B=B4=E6=92=AD=E5=90=8E=E5=8F=B0=E6=B7=BB=E5=8A=A0=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E7=9B=B4=E6=92=AD=EF=BC=8C=E5=89=8D=E5=8F=B0?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=9B=B4=E6=92=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/config/index.js | 8 ++--- .../src/views/lili-dialog/template/other.vue | 9 ++++-- manager/src/views/order/order/orderList.vue | 2 +- seller/src/config/index.js | 8 ++--- seller/src/views/promotion/live/addLive.vue | 32 +++++++++++++------ 5 files changed, 39 insertions(+), 20 deletions(-) diff --git a/manager/src/config/index.js b/manager/src/config/index.js index 8b6b162f..1a28698c 100644 --- a/manager/src/config/index.js +++ b/manager/src/config/index.js @@ -21,10 +21,10 @@ export default { // buyer: "https://buyer-api.pickmall.cn", // seller: "https://store-api.pickmall.cn", // manager: "https://admin-api.pickmall.cn" - common: 'http://192.168.0.109:8890', - buyer: 'http://192.168.0.109:8888', - seller: 'http://192.168.0.109:8889', - manager: 'http://192.168.0.109:8887' + common: 'http://192.168.0.100:8890', + buyer: 'http://192.168.0.100:8888', + seller: 'http://192.168.0.100:8889', + manager: 'http://192.168.0.100:8887' }, api_prod: { common: "https://common-api.pickmall.cn", diff --git a/manager/src/views/lili-dialog/template/other.vue b/manager/src/views/lili-dialog/template/other.vue index 2e44016b..709e28d6 100644 --- a/manager/src/views/lili-dialog/template/other.vue +++ b/manager/src/views/lili-dialog/template/other.vue @@ -18,7 +18,7 @@ - + @@ -74,7 +74,12 @@ export default { icon: "md-happy", ___type: "sign", }, - + { + title: "小程序直播", + icon: "ios-videocam", + ___type: "live", + }, + ], linkItem: { title: "外部链接", diff --git a/manager/src/views/order/order/orderList.vue b/manager/src/views/order/order/orderList.vue index 19bb9905..03b982b8 100644 --- a/manager/src/views/order/order/orderList.vue +++ b/manager/src/views/order/order/orderList.vue @@ -230,7 +230,7 @@ export default { title: "操作", key: "action", align: "center", - width: 100, + width: 150, render: (h, params) => { return h("div", [ h( diff --git a/seller/src/config/index.js b/seller/src/config/index.js index 27da5927..17f824e8 100644 --- a/seller/src/config/index.js +++ b/seller/src/config/index.js @@ -22,10 +22,10 @@ export default { // buyer: 'https://buyer-api.pickmall.cn', // seller: 'https://store-api.pickmall.cn', // manager: 'https://admin-api.pickmall.cn', - common: 'http://192.168.0.109:8890', - buyer: 'http://192.168.0.109:8888', - seller: 'http://192.168.0.109:8889', - manager: 'http://192.168.0.109:8887' + common: 'http://192.168.0.100:8890', + buyer: 'http://192.168.0.100:8888', + seller: 'http://192.168.0.100:8889', + manager: 'http://192.168.0.100:8887' }, api_prod: { common: 'https://common-api.pickmall.cn', diff --git a/seller/src/views/promotion/live/addLive.vue b/seller/src/views/promotion/live/addLive.vue index 5b5d0090..8f1ee673 100644 --- a/seller/src/views/promotion/live/addLive.vue +++ b/seller/src/views/promotion/live/addLive.vue @@ -328,20 +328,34 @@ export default { this.$set(this, "liveData", way); }, + /** + * 提交直播间商品 + */ + addGoods() { + addLiveGoods({ + roomId: this.$route.query.roomId, + liveGoodsId: item.liveGoodsId, + }); + }, + /** * dialog点击确定时判断 */ addGoods() { + console.log(this.commodityList); this.liveData.forEach((item, index) => { - this.commodityList.forEach((oldVal, i) => { - // 如果商品里面没有商品，以及添加商品为第一次的话 - if (oldVal.liveGoodsId != item.liveGoodsId) { - addLiveGoods({ - roomId: this.$route.query.roomId, - liveGoodsId: item.liveGoodsId, - }); - } - }); + if (this.commodityList.length == 1 && this.liveData.length == 1) { + addLiveGoods({ + roomId: this.$route.query.roomId, + liveGoodsId: item.liveGoodsId, + }); + } else { + this.commodityList.forEach((oldVal, i) => { + // 如果商品里面没有商品，以及添加商品为第一次的话 + if (oldVal.liveGoodsId != item.liveGoodsId) { + } + }); + } }); },