Skip to content

E
ElectricitySheep
Commit 1afacd0f authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 19c63f2a
Show whitespace changes
Inline Side-by-side
Showing with 117 additions and 106 deletions
src/components/Share/shareFriend.vue
View file @ 1afacd0f
...@@ -364,8 +364,7 @@ ...@@ -364,8 +364,7 @@
submitForm(formName) { submitForm(formName) {
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
//let content = this.$refs.UeEditor1.getUEContent();
//this.addMsg.MaterialInfo = content;
this.apipost("/api/Share/SetShareFriend", this.addMsg, this.apipost("/api/Share/SetShareFriend", this.addMsg,
res => { res => {
this.loading = false; this.loading = false;
......
src/components/UserMan/setMember.vue
View file @ 1afacd0f
...@@ -219,7 +219,6 @@ ...@@ -219,7 +219,6 @@
this.getData() this.getData()
} }
this.getgradeList(); this.getgradeList();
}, },
methods: { methods: {
input(){}, input(){},
......
src/components/education/educationIndex.vue
View file @ 1afacd0f
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
<li class="menu_item" :class="{'Fchecked':isChecked=='/educationOrder'}" @click="isChecked='/educationOrder',CommonJump('educationOrder')"> <li class="menu_item" :class="{'Fchecked':isChecked=='/educationOrder'}" @click="isChecked='/educationOrder',CommonJump('educationOrder')">
<i class="el-icon-menu"></i><span>课程订单</span> <i class="el-icon-menu"></i><span>课程订单</span>
</li> </li>
<li class="menu_item" :class="{'Fchecked':isChecked=='/uploadKCSet'}" @click="isChecked='/uploadKCSet',CommonJump('uploadKCSet')"> <!-- <li class="menu_item" :class="{'Fchecked':isChecked=='/uploadKCSet'}" @click="isChecked='/uploadKCSet',CommonJump('uploadKCSet')">
<i class="el-icon-menu"></i><span>上传配置</span> <i class="el-icon-menu"></i><span>上传配置</span>
</li> </li>
<li class="menu_item" :class="{'Fchecked':isChecked=='/activityList'}" @click="isChecked='/activityList',CommonJump('activityList')"> <li class="menu_item" :class="{'Fchecked':isChecked=='/activityList'}" @click="isChecked='/activityList',CommonJump('activityList')">
...@@ -195,7 +195,7 @@ ...@@ -195,7 +195,7 @@
</li> </li>
<li class="menu_item" :class="{'Fchecked':isChecked=='/resultPageList'}" @click="isChecked='/resultPageList',CommonJump('resultPageList')"> <li class="menu_item" :class="{'Fchecked':isChecked=='/resultPageList'}" @click="isChecked='/resultPageList',CommonJump('resultPageList')">
<i class="el-icon-menu"></i><span>调查列表</span> <i class="el-icon-menu"></i><span>调查列表</span>
</li> </li> -->
</ul> </ul>
</div> </div>
</div> </div>
......
src/components/global/UE.vue
View file @ 1afacd0f
...@@ -75,7 +75,10 @@ ...@@ -75,7 +75,10 @@
this.changeState = false; this.changeState = false;
}, },
getUEContent() { // 获取内容方法 getUEContent() { // 获取内容方法
return this.editor.getContent() if (this.editor) {
return this.editor.getContent();
}
return "";
}, },
loadUe() { loadUe() {
const _this = this; const _this = this;
...@@ -102,11 +105,11 @@ ...@@ -102,11 +105,11 @@
} }
}); });
this.editor.addListener('keyup', editor => { this.editor.addListener('keyup', editor => {
this.isInputChange = false; this.isInputChange = true;
_this.$emit('input', _this.editor.getContent()); _this.$emit('input', _this.editor.getContent());
}); });
this.editor.addListener('contentChange', editor => { this.editor.addListener('contentChange', editor => {
this.isInputChange = false; this.isInputChange = true;
_this.$emit('input', _this.editor.getContent()); _this.$emit('input', _this.editor.getContent());
}); });
} }
......
src/components/sallCenter/plugin/image-text.vue
View file @ 1afacd0f
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
</div> </div>
</div> </div>
<div class="diy-component-edit imgVisible" :class="{'visibleA':imageData.isCked}"> <div class="diy-component-edit imgVisible" :class="{'visibleA':imageData.isCked}">
<UE :defaultMsg="data.content" :config="config" ref="ue" @input="input"></UE> <UE v-model="data.content" :defaultMsg="data.content" :config="config" ref="ue" :IsMultiple="true"></UE>
</div> </div>
</div> </div>
</div> </div>
...@@ -47,15 +47,19 @@ ...@@ -47,15 +47,19 @@
}, },
data() { data() {
return { return {
data: this.imageData.data, data: {
content: ''
},
config: { config: {
initialFrameWidth: null, initialFrameWidth: null,
initialFrameHeight: 350, initialFrameHeight: 350,
}, },
content: ''
}; };
}, },
created() {}, created() {
var content = this.imageData.data.content;
this.data.content = content;
},
methods: { methods: {
//向父组件传值 并调用排序 //向父组件传值 并调用排序
resetSord(IsUp) { resetSord(IsUp) {
...@@ -65,16 +69,23 @@ ...@@ -65,16 +69,23 @@
delPlugin() { delPlugin() {
this.$emit('comDelPlugin', this.index); this.$emit('comDelPlugin', this.index);
}, },
input(obj) { getContent() {
this.data.content = obj return this.$refs.ue.getUEContent();
}, },
}, },
computed: {}, computed: {},
mounted() { mounted() {
this.$refs.ue.InitData(); this.$refs.ue.loadUe();
}, },
watch: { watch: {
data: {
deep: true,
handler(newVal, oldVal) {
let newContent = newVal.content;
this.data.content = newContent;
this.imageData.data.content = newContent;
},
}
} }
}; };
......
src/components/sallCenter/templateEdit.vue
View file @ 1afacd0f
...@@ -280,22 +280,22 @@ ...@@ -280,22 +280,22 @@
@comDelPlugin="comDelPlugin" :index="index" :dataLeng="dataList.length"></imageText> @comDelPlugin="comDelPlugin" :index="index" :dataLeng="dataList.length"></imageText>
<topic v-if="item.Id=='topic'" :topicData="item" @getSord="getSord" @comDelPlugin="comDelPlugin" <topic v-if="item.Id=='topic'" :topicData="item" @getSord="getSord" @comDelPlugin="comDelPlugin"
:index="index" :dataLeng="dataList.length"></topic> :index="index" :dataLeng="dataList.length"></topic>
<shopinfo v-if="item.Id=='shop-info'" :shopinfoData="item" @getSord="getSord" @comDelPlugin="comDelPlugin" <shopinfo v-if="item.Id=='shop-info'" :shopinfoData="item" @getSord="getSord"
:index="index" :dataLeng="dataList.length"></shopinfo> @comDelPlugin="comDelPlugin" :index="index" :dataLeng="dataList.length"></shopinfo>
<sidao v-if="item.Id=='drive-guide'" :sidaoData="item" @getSord="getSord" @comDelPlugin="comDelPlugin" <sidao v-if="item.Id=='drive-guide'" :sidaoData="item" @getSord="getSord" @comDelPlugin="comDelPlugin"
:index="index" :dataLeng="dataList.length"></sidao> :index="index" :dataLeng="dataList.length"></sidao>
<education v-if="item.Id=='education'" :eduData="item" @getSord="getSord" @comDelPlugin="comDelPlugin" <education v-if="item.Id=='education'" :eduData="item" @getSord="getSord" @comDelPlugin="comDelPlugin"
:index="index" :dataLeng="dataList.length"></education> :index="index" :dataLeng="dataList.length"></education>
<educationArticle v-if="item.Id=='educationArticle'" :zxData="item" @getSord="getSord" @comDelPlugin="comDelPlugin" <educationArticle v-if="item.Id=='educationArticle'" :zxData="item" @getSord="getSord"
:index="index" :dataLeng="dataList.length"></educationArticle> @comDelPlugin="comDelPlugin" :index="index" :dataLeng="dataList.length"></educationArticle>
<educationCustom v-if="item.Id=='educationCustom'" :cusData="item" @getSord="getSord" @comDelPlugin="comDelPlugin" <educationCustom v-if="item.Id=='educationCustom'" :cusData="item" @getSord="getSord"
:index="index" :dataLeng="dataList.length"></educationCustom> @comDelPlugin="comDelPlugin" :index="index" :dataLeng="dataList.length"></educationCustom>
<reservestore v-if="item.Id=='reservestore'" :reserData="item" @getSord="getSord" @comDelPlugin="comDelPlugin" <reservestore v-if="item.Id=='reservestore'" :reserData="item" @getSord="getSord"
:index="index" :dataLeng="dataList.length"></reservestore> @comDelPlugin="comDelPlugin" :index="index" :dataLeng="dataList.length"></reservestore>
<storeGoods v-if="item.Id=='storeGoods'" :storeData="item" @getSord="getSord" @comDelPlugin="comDelPlugin" <storeGoods v-if="item.Id=='storeGoods'" :storeData="item" @getSord="getSord"
:index="index" :dataLeng="dataList.length"></storeGoods> @comDelPlugin="comDelPlugin" :index="index" :dataLeng="dataList.length"></storeGoods>
<educationteacher v-if="item.Id=='educationteacher'" :lsData="item" @getSord="getSord" @comDelPlugin="comDelPlugin" <educationteacher v-if="item.Id=='educationteacher'" :lsData="item" @getSord="getSord"
:index="index" :dataLeng="dataList.length"></educationteacher> @comDelPlugin="comDelPlugin" :index="index" :dataLeng="dataList.length"></educationteacher>
</div> </div>
</div> </div>
</div> </div>
...@@ -575,7 +575,7 @@ ...@@ -575,7 +575,7 @@
right: 0, //右边距 right: 0, //右边距
bottom: 0, //下边距 bottom: 0, //下边距
left: 0, //左边距 left: 0, //左边距
searchPosition:0,//搜索框位置(0-默认，1-顶部) searchPosition: 0, //搜索框位置(0-默认，1-顶部)
} }
} }
this.dataList.push(searchObj); this.dataList.push(searchObj);
...@@ -1281,11 +1281,11 @@ ...@@ -1281,11 +1281,11 @@
headInfo: "赞美生活,样样满意", //用户介绍 headInfo: "赞美生活,样样满意", //用户介绍
backgroundPicUrl: '', //背景图片 backgroundPicUrl: '', //背景图片
backgroundColor: '#ffffff', //背景颜色 backgroundColor: '#ffffff', //背景颜色
bottonImg:"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/1598255454000_522.png",//按钮图片 bottonImg: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/1598255454000_522.png", //按钮图片
fontColor:"",//字体颜色 fontColor: "", //字体颜色
fontName:"",//字体 fontName: "", //字体
fontSize:12,//字体大小 fontSize: 12, //字体大小
isBold:"true",//是否加粗 isBold: "true", //是否加粗
} }
}; };
this.dataList.push(shopInfoObj); this.dataList.push(shopInfoObj);
...@@ -1295,7 +1295,7 @@ ...@@ -1295,7 +1295,7 @@
let driveObj = { let driveObj = {
Id: 'drive-guide', Id: 'drive-guide',
isCked: false, isCked: false,
data:{ data: {
SearchBackground: '', //搜索背景 SearchBackground: '', //搜索背景
SearchTips: '', //搜索框文字 SearchTips: '', //搜索框文字
Tips: '每辆车都会配备一名专业导游，方便游客出行', // 按钮上面的文字提示 Tips: '每辆车都会配备一名专业导游，方便游客出行', // 按钮上面的文字提示
...@@ -1311,10 +1311,10 @@ ...@@ -1311,10 +1311,10 @@
IsShowCarClass: 1, //是否显示车辆类型筛选0-否，1-是 IsShowCarClass: 1, //是否显示车辆类型筛选0-否，1-是
IsShowTravelGuestNum: 1, //是否显示出行人数筛选0-否，1-是 IsShowTravelGuestNum: 1, //是否显示出行人数筛选0-否，1-是
ButtonFilletPX: 0, // 按钮圆角像素 ButtonFilletPX: 0, // 按钮圆角像素
PaddingTop:0, //上边距 PaddingTop: 0, //上边距
PaddingBottom:0, //下边距 PaddingBottom: 0, //下边距
PaddingLeft:0, //左边距 PaddingLeft: 0, //左边距
PaddingRight:0 //右边距 PaddingRight: 0 //右边距
} }
} }
this.dataList.push(driveObj); this.dataList.push(driveObj);
...@@ -1324,15 +1324,15 @@ ...@@ -1324,15 +1324,15 @@
let eduObj = { let eduObj = {
Id: 'education', Id: 'education',
isCked: false, isCked: false,
data:{ data: {
Cover:'', //封面图 Cover: '', //封面图
Name:'', //课程名称 Name: '', //课程名称
showProgress:0, //显示进度 showProgress: 0, //显示进度
PaddingTop:0, //上边距 PaddingTop: 0, //上边距
PaddingBottom:0, //下边距 PaddingBottom: 0, //下边距
PaddingLeft:0, //左边距 PaddingLeft: 0, //左边距
PaddingRight:0, //右边距 PaddingRight: 0, //右边距
BtnPosition:0 //按钮位置 BtnPosition: 0 //按钮位置
} }
} }
this.dataList.push(eduObj); this.dataList.push(eduObj);
...@@ -1341,17 +1341,17 @@ ...@@ -1341,17 +1341,17 @@
case 'educationArticle': case 'educationArticle':
let zxObj = { let zxObj = {
Id: 'educationArticle', Id: 'educationArticle',
isCked:false, isCked: false,
data:{ data: {
goodsLength:10, //商品数量 goodsLength: 10, //商品数量
addGoodsType:0, //商品添加方式【0-自定义,1-最新】 addGoodsType: 0, //商品添加方式【0-自定义,1-最新】
listStyle:-1, //列表样式[-1-列表模式,0-左右滑动,1-一行一个] listStyle: -1, //列表样式[-1-列表模式,0-左右滑动,1-一行一个]
backgroundColor: '#fff', //背景颜色 backgroundColor: '#fff', //背景颜色
SearchFilletPX:0,//圆角 SearchFilletPX: 0, //圆角
PaddingTop:0, //上边距 PaddingTop: 0, //上边距
PaddingBottom:0, //下边距 PaddingBottom: 0, //下边距
PaddingLeft:0, //左边距 PaddingLeft: 0, //左边距
PaddingRight:0, //右边距 PaddingRight: 0, //右边距
list: [], //商品列表 list: [], //商品列表
} }
} }
...@@ -1360,42 +1360,42 @@ ...@@ -1360,42 +1360,42 @@
//自定义列表 //自定义列表
case 'educationCustom': case 'educationCustom':
let customObj = { let customObj = {
Id:'educationCustom', Id: 'educationCustom',
isCked:false, isCked: false,
data:{ data: {
goodsLength:10, //商品数量 goodsLength: 10, //商品数量
listStyle:-1, //列表样式[-1-列表模式,0-左右滑动,1-一行一个,2-一行两个3-一行三个] listStyle: -1, //列表样式[-1-列表模式,0-左右滑动,1-一行一个,2-一行两个3-一行三个]
backgroundColor:'#fff',//背景颜色 backgroundColor: '#fff', //背景颜色
PaddingTop:0, //上边距 PaddingTop: 0, //上边距
PaddingBottom:0, //下边距 PaddingBottom: 0, //下边距
PaddingLeft:0, //左边距 PaddingLeft: 0, //左边距
PaddingRight:0, //右边距 PaddingRight: 0, //右边距
SearchFilletPX:0, //组件圆角 SearchFilletPX: 0, //组件圆角
list:[] //自定义列表 list: [] //自定义列表
} }
} }
this.dataList.push(customObj); this.dataList.push(customObj);
break; break;
case 'reservestore': case 'reservestore':
let reserObj = { let reserObj = {
Id:'reservestore', Id: 'reservestore',
isCked:false, isCked: false,
data:{ data: {
PaddingTop:0, //上边距 PaddingTop: 0, //上边距
PaddingBottom:0, //下边距 PaddingBottom: 0, //下边距
PaddingLeft:0, //左边距 PaddingLeft: 0, //左边距
PaddingRight:0, //右边距 PaddingRight: 0, //右边距
IsShowStoreImg:true, //是否显示商店图片 IsShowStoreImg: true, //是否显示商店图片
SearchFilletPX:0 //圆角像素 SearchFilletPX: 0 //圆角像素
} }
} }
this.dataList.push(reserObj); this.dataList.push(reserObj);
break; break;
case 'storeGoods': case 'storeGoods':
let storeGoodObj = { let storeGoodObj = {
Id:'storeGoods', Id: 'storeGoods',
isCked:false, isCked: false,
data:{ data: {
showCat: false, //显示分类 showCat: false, //显示分类
catPosition: 'top', //分类栏位置 catPosition: 'top', //分类栏位置
catStyle: 1, //分类样式 catStyle: 1, //分类样式
...@@ -1435,16 +1435,16 @@ ...@@ -1435,16 +1435,16 @@
case 'educationteacher': case 'educationteacher':
let lsObj = { let lsObj = {
Id: 'educationteacher', Id: 'educationteacher',
isCked:false, isCked: false,
data:{ data: {
addGoodsType:0, //商品添加方式【0-自定义,1-最新】 addGoodsType: 0, //商品添加方式【0-自定义,1-最新】
listStyle:0, //列表样式[-1-列表模式,0-左右滑动,1-一行一个] listStyle: 0, //列表样式[-1-列表模式,0-左右滑动,1-一行一个]
backgroundColor: '#fff', //背景颜色 backgroundColor: '#fff', //背景颜色
SearchFilletPX:0,//圆角 SearchFilletPX: 0, //圆角
PaddingTop:0, //上边距 PaddingTop: 0, //上边距
PaddingBottom:0, //下边距 PaddingBottom: 0, //下边距
PaddingLeft:0, //左边距 PaddingLeft: 0, //左边距
PaddingRight:0, //右边距 PaddingRight: 0, //右边距
TeacherList: [], //商品列表 TeacherList: [], //商品列表
} }
} }
...@@ -1477,7 +1477,6 @@ ...@@ -1477,7 +1477,6 @@
getItem(item) { getItem(item) {
this.dataList.forEach(x => { this.dataList.forEach(x => {
x.isCked = false; x.isCked = false;
}) })
if (item.Id == "rubik") { if (item.Id == "rubik") {
if (item.data.list && item.data.list.length > 0) { if (item.data.list && item.data.list.length > 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment