abu/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
lemon橪 2021-06-21 18:11:46 +08:00
parent 2b85a5aba1
commit d89b984344
5 changed files with 39 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manager/src/config/index.js
View File

@ -21,10 +21,10 @@ export default {
// buyer: "https://buyer-api.pickmall.cn", // buyer: "https://buyer-api.pickmall.cn",
// seller: "https://store-api.pickmall.cn", // seller: "https://store-api.pickmall.cn",
// manager: "https://admin-api.pickmall.cn" // manager: "https://admin-api.pickmall.cn"
common: 'http://192.168.0.109:8890', common: 'http://192.168.0.100:8890',
buyer: 'http://192.168.0.109:8888', buyer: 'http://192.168.0.100:8888',
seller: 'http://192.168.0.109:8889', seller: 'http://192.168.0.100:8889',
manager: 'http://192.168.0.109:8887' manager: 'http://192.168.0.100:8887'
}, },
api_prod: { api_prod: {
common: "https://common-api.pickmall.cn", common: "https://common-api.pickmall.cn",

9
manager/src/views/lili-dialog/template/other.vue
View File

@ -18,7 +18,7 @@
<Input type="text" @keyup="handleLink(linkItem,linkList.length)" v-model="linkItem.url" placeholder="https://"></Input> <Input type="text" @keyup="handleLink(linkItem,linkList.length)" v-model="linkItem.url" placeholder="https://"></Input>
</div> </div>
</Poptip> </Poptip>
</div> </div>
</Col> </Col>
</Row> </Row>
@ -74,7 +74,12 @@ export default {
icon: "md-happy", icon: "md-happy",
___type: "sign", ___type: "sign",
}, },
{
title: "小程序直播",
icon: "ios-videocam",
___type: "live",
},
], ],
linkItem: { linkItem: {
title: "外部链接", title: "外部链接",

2
manager/src/views/order/order/orderList.vue
View File

@ -230,7 +230,7 @@ export default {
title: "操作", title: "操作",
key: "action", key: "action",
align: "center", align: "center",
width: 100, width: 150,
render: (h, params) => { render: (h, params) => {
return h("div", [ return h("div", [
h( h(

8
seller/src/config/index.js
View File

@ -22,10 +22,10 @@ export default {
// buyer: 'https://buyer-api.pickmall.cn', // buyer: 'https://buyer-api.pickmall.cn',
// seller: 'https://store-api.pickmall.cn', // seller: 'https://store-api.pickmall.cn',
// manager: 'https://admin-api.pickmall.cn', // manager: 'https://admin-api.pickmall.cn',
common: 'http://192.168.0.109:8890', common: 'http://192.168.0.100:8890',
buyer: 'http://192.168.0.109:8888', buyer: 'http://192.168.0.100:8888',
seller: 'http://192.168.0.109:8889', seller: 'http://192.168.0.100:8889',
manager: 'http://192.168.0.109:8887' manager: 'http://192.168.0.100:8887'
}, },
api_prod: { api_prod: {
common: 'https://common-api.pickmall.cn', common: 'https://common-api.pickmall.cn',

32
seller/src/views/promotion/live/addLive.vue
View File

@ -328,20 +328,34 @@ export default {
this.$set(this, "liveData", way); this.$set(this, "liveData", way);
}, },
/**
* 提交直播间商品
*/
addGoods() {
addLiveGoods({
roomId: this.$route.query.roomId,
liveGoodsId: item.liveGoodsId,
});
},
/** /**
* dialog点击确定时判断 * dialog点击确定时判断
*/ */
addGoods() { addGoods() {
console.log(this.commodityList);
this.liveData.forEach((item, index) => { this.liveData.forEach((item, index) => {
this.commodityList.forEach((oldVal, i) => { if (this.commodityList.length == 1 && this.liveData.length == 1) {
// 如果商品里面没有商品，以及添加商品为第一次的话 addLiveGoods({
if (oldVal.liveGoodsId != item.liveGoodsId) { roomId: this.$route.query.roomId,
addLiveGoods({ liveGoodsId: item.liveGoodsId,
roomId: this.$route.query.roomId, });
liveGoodsId: item.liveGoodsId, } else {
}); this.commodityList.forEach((oldVal, i) => {
} // 如果商品里面没有商品，以及添加商品为第一次的话
}); if (oldVal.liveGoodsId != item.liveGoodsId) {
}
});
}
}); });
}, },