Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
学习很差啦
commit
d84250ab88
|
|
@ -26,11 +26,18 @@
|
|||
>选择促销活动</Button
|
||||
>
|
||||
</div>
|
||||
<Alert type="warning" v-if="res.name == '商品分类'">装修提示
|
||||
<Alert type="warning" v-if="res.name == '商品分类'"
|
||||
>装修提示
|
||||
<template slot="desc">
|
||||
<div style="color:red"> 如果当前装修模块不是最后一项模块且模块内容绑定为分类，则会默认展示绑定分类的100条商品信息。</div>
|
||||
<div style="color:red"> 如果当前装修模块是最后一项模块且模块内容绑定为分类，则会默认会根据绑定分类触底加载商品信息。</div>
|
||||
<div style="color:red"> 如果当前装修内容不为分类，则会展示当前商品的静态信息。</div>
|
||||
<div style="color: red">
|
||||
如果当前装修模块不是最后一项模块且模块内容绑定为分类，则会默认展示绑定分类的100条商品信息。
|
||||
</div>
|
||||
<div style="color: red">
|
||||
如果当前装修模块是最后一项模块且模块内容绑定为分类，则会默认会根据绑定分类触底加载商品信息。
|
||||
</div>
|
||||
<div style="color: red">
|
||||
如果当前装修内容不为分类，则会展示当前商品的静态信息。
|
||||
</div>
|
||||
</template>
|
||||
</Alert>
|
||||
|
||||
|
|
@ -120,10 +127,7 @@
|
|||
<div class="decorate-view">
|
||||
<div class="decorate-view-title">绑定</div>
|
||||
<div class="decorate-view-link">
|
||||
<div
|
||||
|
||||
v-if="res.options.list[0].listWay.length != 0"
|
||||
>
|
||||
<div v-if="res.options.list[0].listWay.length != 0">
|
||||
<!-- 绑定商品选择器回调已选择的商品 -->
|
||||
|
||||
<div
|
||||
|
|
@ -160,25 +164,23 @@
|
|||
>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<!-- 显示绑定分类 -->
|
||||
<div v-if="title_item.bindCategory" >
|
||||
<div v-if="title_item.bindCategory">
|
||||
绑定分类为：{{ title_item.bindCategory.name }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="decorate-view-btn">
|
||||
<Button
|
||||
@click="bindGoodsId(title_item,title_index)"
|
||||
@click="bindGoodsId(title_item, title_index)"
|
||||
size="small"
|
||||
>选择商品</Button
|
||||
>
|
||||
<Button
|
||||
@click="bindGoodsCategory(title_index)"
|
||||
size="small"
|
||||
|
||||
style='margin-top:20px'
|
||||
style="margin-top: 20px"
|
||||
>选择分类</Button
|
||||
>
|
||||
</div>
|
||||
|
|
@ -437,10 +439,15 @@
|
|||
{{ item.model === "hotzone" ? "绘制热区" : "选择链接" }}</Button
|
||||
>
|
||||
</div>
|
||||
</div>
|
||||
<!-- 链接地址-->
|
||||
<div
|
||||
class="decorate-view"
|
||||
v-if="item.url && item.url.url && item.url.___type == 'other'"
|
||||
v-if="
|
||||
item.url &&
|
||||
item.url.url !== undefined &&
|
||||
item.url.___type == 'other'
|
||||
"
|
||||
>
|
||||
<div class="decorate-view-title">外部链接</div>
|
||||
<div>
|
||||
|
|
@ -448,13 +455,18 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<p v-if="item.url && item.url.url && item.url.___type == 'other'">
|
||||
<p
|
||||
v-if="
|
||||
item.url &&
|
||||
item.url.url !== undefined &&
|
||||
item.url.___type == 'other'
|
||||
"
|
||||
>
|
||||
(如非同域名下，则在小程序与公众号中无效)
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<Button
|
||||
v-if="
|
||||
|
|
@ -475,8 +487,11 @@
|
|||
@selectedGoodsData="selectedGoodsData"
|
||||
></liliDialog>
|
||||
|
||||
<Modal width='800px' title="选择分类" v-model="enableSelectCategory">
|
||||
<categoryTemplate v-if="enableSelectCategory" @selected="confirmCategory" />
|
||||
<Modal width="800px" title="选择分类" v-model="enableSelectCategory">
|
||||
<categoryTemplate
|
||||
v-if="enableSelectCategory"
|
||||
@selected="confirmCategory"
|
||||
/>
|
||||
</Modal>
|
||||
|
||||
<hotzone ref="hotzone" @changeZone="changeZone"></hotzone>
|
||||
|
|
@ -496,7 +511,7 @@ export default {
|
|||
components: {
|
||||
ossManage,
|
||||
hotzone,
|
||||
categoryTemplate
|
||||
categoryTemplate,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
|
@ -513,8 +528,8 @@ export default {
|
|||
selectedGoods: "", // 已选商品
|
||||
selectedLinks: "", // 已选链接
|
||||
modelList: "", // 装修列表
|
||||
enableSelectCategory:false, //商品是否绑定分类
|
||||
goodsSelectedIndex:0, //绑定商品分类的索引
|
||||
enableSelectCategory: false, //商品是否绑定分类
|
||||
goodsSelectedIndex: 0, //绑定商品分类的索引
|
||||
};
|
||||
},
|
||||
watch: {
|
||||
|
|
@ -526,23 +541,26 @@ export default {
|
|||
props: ["res"],
|
||||
methods: {
|
||||
// 选择分类
|
||||
confirmCategory(val){
|
||||
let data = {...this.res.options.list[0].titleWay[this.goodsSelectedIndex]}
|
||||
confirmCategory(val) {
|
||||
let data = {
|
||||
...this.res.options.list[0].titleWay[this.goodsSelectedIndex],
|
||||
};
|
||||
let callback = {
|
||||
id:val[0].id,
|
||||
name:val[0].name,
|
||||
categoryIdWay:val[0].id
|
||||
id: val[0].id,
|
||||
name: val[0].name,
|
||||
categoryIdWay: val[0].id,
|
||||
};
|
||||
data = {
|
||||
...data,
|
||||
bindCategory:callback
|
||||
}
|
||||
this.res.options.list[0].listWay = this.res.options.list[0].listWay.filter(item=>{
|
||||
return item.___index != this.goodsSelectedIndex
|
||||
})
|
||||
this.res.options.list[0].titleWay[this.goodsSelectedIndex] = data
|
||||
bindCategory: callback,
|
||||
};
|
||||
this.res.options.list[0].listWay =
|
||||
this.res.options.list[0].listWay.filter((item) => {
|
||||
return item.___index != this.goodsSelectedIndex;
|
||||
});
|
||||
this.res.options.list[0].titleWay[this.goodsSelectedIndex] = data;
|
||||
|
||||
console.log( this.res.options.list[0])
|
||||
console.log(this.res.options.list[0]);
|
||||
},
|
||||
// 商品排序
|
||||
slotGoods(list, key, val) {
|
||||
|
|
@ -621,7 +639,7 @@ export default {
|
|||
},
|
||||
// 回调选择的链接
|
||||
selectedLink(val) {
|
||||
this.selectedLinks.zoneInfo = []
|
||||
this.selectedLinks.zoneInfo = [];
|
||||
delete val.selected;
|
||||
delete val.intro;
|
||||
delete val.mobileIntro;
|
||||
|
|
@ -644,20 +662,20 @@ export default {
|
|||
});
|
||||
this.res.options.list[0].listWay.push(...data);
|
||||
// 清除已经绑定的分类
|
||||
this.res.options.list[0].titleWay[this.goodsSelectedIndex].bindCategory = ""
|
||||
this.res.options.list[0].titleWay[this.goodsSelectedIndex].bindCategory =
|
||||
"";
|
||||
this.linkType = "";
|
||||
},
|
||||
// 绑定商品
|
||||
bindGoodsId(val,index) {
|
||||
bindGoodsId(val, index) {
|
||||
this.selectedGoods = val;
|
||||
this.goodsSelectedIndex = index
|
||||
this.goodsSelectedIndex = index;
|
||||
this.liliDialogFlag(true);
|
||||
},
|
||||
// 绑定分类
|
||||
bindGoodsCategory(index,key){
|
||||
this.enableSelectCategory = true
|
||||
this.goodsSelectedIndex = index
|
||||
|
||||
bindGoodsCategory(index, key) {
|
||||
this.enableSelectCategory = true;
|
||||
this.goodsSelectedIndex = index;
|
||||
},
|
||||
// 点击抽屉
|
||||
clickDrawer(item, index) {
|
||||
|
|
|
|||
|
|
@ -871,7 +871,9 @@
|
|||
this.$set(this, "storeInfo", res.result);
|
||||
//因switch开关需要用到true或者false 所以进行一次格式化
|
||||
this.storeInfo.storeDisable = this.storeInfo.storeDisable === "OPEN" ? true : false
|
||||
if(this.storeInfo.goodsManagementCategory != null){
|
||||
this.checkAllGroup = this.storeInfo.goodsManagementCategory.split(",");
|
||||
}
|
||||
this.storeInfo.legalPhoto = this.storeInfo.legalPhoto.split(",");
|
||||
});
|
||||
},
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
<Select v-model="searchForm.storeDisable" clearable style="width: 200px">
|
||||
<Option value="OPEN">开启中</Option>
|
||||
<Option value="CLOSED">已关闭</Option>
|
||||
<Option value="APPLY">申请中</Option>
|
||||
<!-- <Option value="APPLY">申请中</Option> -->
|
||||
<Option value="APPLYING">审核中</Option>
|
||||
<Option value="REFUSED">审核拒绝</Option>
|
||||
</Select>
|
||||
|
|
@ -329,6 +329,7 @@ export default {
|
|||
},
|
||||
// 获取列表数据
|
||||
getDataList() {
|
||||
console.log(this.searchForm)
|
||||
this.loading = true;
|
||||
// 带多条件搜索参数获取表单数据 请自行修改接口
|
||||
getShopListData(this.searchForm).then((res) => {
|
||||
|
|
|
|||
|
|
@ -289,6 +289,10 @@ export const editDepartment = (ids, params) => {
|
|||
export const loadDepartment = (id) => {
|
||||
return getRequest(`/department/${id}`);
|
||||
};
|
||||
// 搜索部门
|
||||
export const searchDepartment = (params) => {
|
||||
return getRequest("/department", params);
|
||||
};
|
||||
|
||||
// 通过部门获取全部角色数据
|
||||
export const getUserByDepartmentId = (id, params) => {
|
||||
|
|
|
|||
Loading…
Reference in New Issue