From 4133badc465ddb4a1503827e3f61de1563939a58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Thu, 24 Jun 2021 10:32:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E5=8F=B0=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E7=9B=B4=E6=92=AD=E6=9F=A5=E7=9C=8B=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=8F=AA=E6=9C=89=E8=87=AA?=
 =?UTF-8?q?=E8=90=A5=E5=BA=97=E5=8F=AF=E4=BB=A5=E8=B5=A0=E9=80=81=E7=A7=AF?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/api/promotion.js                     |  2 +-
 seller/src/config/index.js                       | 16 ++++++++--------
 .../src/views/promotion/fullCut/newFullCut.vue   |  2 ++
 seller/src/views/promotion/live/addLive.vue      |  5 ++---
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/manager/src/api/promotion.js b/manager/src/api/promotion.js
index 42173562..0c7c6113 100644
--- a/manager/src/api/promotion.js
+++ b/manager/src/api/promotion.js
@@ -30,7 +30,7 @@ export const getLiveList = params => {
 
 // 获取直播间详情
 export const getLiveInfo = studioId => {
-  return getRequest(`/broadcast/studio/studioInfo/${studioId}`);
+  return getRequest(`/broadcast/studio/${studioId}`);
 };
 
 // 获取当前进行中的促销活动商品
diff --git a/seller/src/config/index.js b/seller/src/config/index.js
index 27da5927..a7163666 100644
--- a/seller/src/config/index.js
+++ b/seller/src/config/index.js
@@ -18,14 +18,14 @@ export default {
    * @description api请求基础路径
    */
   api_dev: {
-    // common: 'https://common-api.pickmall.cn',
-    // 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: 'https://common-api.pickmall.cn',
+    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'
   },
   api_prod: {
     common: 'https://common-api.pickmall.cn',
diff --git a/seller/src/views/promotion/fullCut/newFullCut.vue b/seller/src/views/promotion/fullCut/newFullCut.vue
index 9f44bb6d..3f4c4d9f 100644
--- a/seller/src/views/promotion/fullCut/newFullCut.vue
+++ b/seller/src/views/promotion/fullCut/newFullCut.vue
@@ -113,9 +113,11 @@
               >&nbsp;
               <Checkbox
                 :disabled="form.promotionStatus != 'NEW'"
+                v-if="JSON.parse(getStore('userInfo')).selfOperated"
                 v-model="form.isPoint"
                 >送积分</Checkbox
               >
+
             </FormItem>
             <FormItem v-if="form.isCoupon" label="赠送优惠券" prop="couponId">
               <Select
diff --git a/seller/src/views/promotion/live/addLive.vue b/seller/src/views/promotion/live/addLive.vue
index 5dcd9529..5f4b3295 100644
--- a/seller/src/views/promotion/live/addLive.vue
+++ b/seller/src/views/promotion/live/addLive.vue
@@ -130,7 +130,7 @@
         </FormItem>
 
         <FormItem>
-          <Button type="primary" @click="createLives()">保存</Button>
+          <Button type="primary" v-if="liveStatus=='NEW'" @click="createLives()">保存</Button>
 
         </FormItem>
       </Form>
@@ -342,8 +342,7 @@ export default {
      * dialog点击确定时判断
      */
     addGoods() {
-      console.log(this.commodityList);
-      this.liveData.forEach((item, index) => {
+      this.liveData.forEach((item) => {
         if (this.commodityList.length == 1 && this.liveData.length == 1) {
           addLiveGoods({
             roomId: this.$route.query.roomId,