zhuce
/
lilishop-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改后台小程序直播查看问题，新增只有自营店可以赠送积分

master
lemon橪 2021-06-24 10:32:51 +08:00
parent b7dd7f1c3b
commit 4133badc46
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manager/src/api/promotion.js
View File

@ -30,7 +30,7 @@ export const getLiveList = params => {
// 获取直播间详情
export const getLiveInfo = studioId => {
return getRequest(`/broadcast/studio/studioInfo/${studioId}`);
return getRequest(`/broadcast/studio/${studioId}`);
};
// 获取当前进行中的促销活动商品

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

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

2
seller/src/views/promotion/fullCut/newFullCut.vue
View File

@ -113,9 +113,11 @@
> 
<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

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

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