修改直播间时间没有判断bug,店铺后台，批量发货没有跳转bug,直播后台添加小程序直播，前台显示小程序直播

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",

manager/src/views/lili-dialog/template/other.vue

@@ -74,6 +74,11 @@ export default {
           icon: "md-happy",
           ___type: "sign",
         },
+        {
+          title: "小程序直播",
+          icon: "ios-videocam",
+          ___type: "live",
+        },
 
       ],
       linkItem: {

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(

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',

seller/src/views/promotion/live/addLive.vue

@@ -329,19 +329,33 @@ export default {
     },
 
     /**
-     * dialog点击确定时判断
+     * 提交直播间商品
      */
     addGoods() {
-      this.liveData.forEach((item, index) => {
-        this.commodityList.forEach((oldVal, i) => {
-          // 如果商品里面没有商品，以及添加商品为第一次的话
-          if (oldVal.liveGoodsId != item.liveGoodsId) {
       addLiveGoods({
         roomId: this.$route.query.roomId,
         liveGoodsId: item.liveGoodsId,
       });
+    },
+
+    /**
+     * dialog点击确定时判断
+     */
+    addGoods() {
+      console.log(this.commodityList);
+      this.liveData.forEach((item, index) => {
+        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) {
             }
           });
+        }
       });
     },