diff --git a/.env.development b/.env.development index 3754cdd..2ae4acf 100644 --- a/.env.development +++ b/.env.development @@ -1,2 +1,2 @@ -VUE_APP_API_BASE_URL=http://market.dev.liche.cn/api +VUE_APP_API_BASE_URL=http://market.lc.haodian.cn/api #npm run serve 加载环境 diff --git a/src/views/sylive/activity/components/activity-edit.vue b/src/views/sylive/activity/components/activity-edit.vue index aa163ef..6ea6942 100644 --- a/src/views/sylive/activity/components/activity-edit.vue +++ b/src/views/sylive/activity/components/activity-edit.vue @@ -150,13 +150,6 @@ - - - @@ -168,13 +161,36 @@ placeholder="请输入弹幕文案" /> - + + + + - - + 商品 + 报名 + + + + + + + -
+
+ @@ -362,11 +375,18 @@ bottoms: [], blacklist: 0, button: { title: '' }, - signBespeak: { status: 0, title: '', content: '', itemId: 0 }, + signBespeak: { + status: 0, + title: '', + content: '', + itemId: 0, + payItemId: '' + }, barrage: { color: 0, title: '' } }; return { goodsList: [], + payGoodsLists: [], editVersion: false, editoption: { height: 300, @@ -448,6 +468,17 @@ .catch((e) => { this.$message.error(e.message); }); + listGoods({ + activityId: this.form.activityId, + price: 0, + price_type: 'gt' + }) + .then((list) => { + this.payGoodsLists = list; + }) + .catch((e) => { + this.$message.error(e.message); + }); }, /* 添加海报描述 */ addShareTitle() {