Skip to content

E
ElectricitySheep
Commit 47cf0b0f authored by zhengke's avatar zhengke
Browse files
Options

增加页面

parent 0415d039
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4817 additions and 237 deletions
src/components/CommodityMan/materialMan.vue
View file @ 47cf0b0f
......@@ -274,6 +274,7 @@
Image: '',
VideoTime: 0,
WithHeight: 0,
PathType:0
},
pageMsgDig: false,
checkList: [],
......@@ -533,6 +534,8 @@
},
// 新增素材信息
addPageList() {
var upInfo = JSON.parse(localStorage.uploadInfo);
this.addpageMsg.PathType=upInfo.StoreType;
this.apipost("/api/product/SetMaterialInfo", this.addpageMsg, res => {
if (res.data.resultCode == 1) {
this.GetPageList();
......@@ -633,7 +636,6 @@
}
},
GroupsubmitForm(formName) {
console.log(this.addGroupMsg, 'this.addGroupMsg');
this.$refs[formName].validate((valid) => {
if (valid) {
this.apipost('/api/product/SetMaterialGroupInfo', this.addGroupMsg,
......
src/components/StoreDesign/userCenter.vue
View file @ 47cf0b0f
This diff is collapsed.
src/components/education/educationEdit.vue
View file @ 47cf0b0f
......@@ -651,7 +651,7 @@
<el-input v-model="courseMsg.Name" size="small"></el-input>
</el-form-item>
<el-form-item label="类型">
<el-select style="margin-right: 10px;" v-model="courseMsg.Type" size="small" placeholder="请选择">
<el-select style="margin-right: 10px;" v-model="courseMsg.Type" @change="resetPath" size="small" placeholder="请选择">
<el-option v-for="item in fileList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
......@@ -1206,6 +1206,7 @@
if (this.videoType == 1) {
this.addMsg.VideoAddress = val.Path;
} else {
this.courseMsg.PathType = val.PathType;
this.courseMsg.FilePath = val.Path;
this.courseMsg.VideoImage = val.Image;
this.courseMsg.VideoTime = val.VideoTime;
......@@ -1219,21 +1220,24 @@
if (type != 'doc' && type != 'docx') {
this.Error('请选择word文件');
} else {
this.courseMsg.FilePath = msg.url
this.courseMsg.FilePath = msg.url;
this.courseMsg.PathType = msg.PathType;
}
}
if (this.courseMsg.Type == 3) {
if (type != 'pdf') {
this.Error('请选择pdf文件');
} else {
this.courseMsg.FilePath = msg.url
this.courseMsg.FilePath = msg.url;
this.courseMsg.PathType = msg.PathType;
}
}
if (this.courseMsg.Type == 4) {
if (type != 'ppt' && type != 'pptx') {
this.Error('请选择ppt文件');
} else {
this.courseMsg.FilePath = msg.url
this.courseMsg.FilePath = msg.url;
this.courseMsg.PathType = msg.PathType;
}
}
this.fileDialog = false;
......@@ -1782,7 +1786,10 @@
let myVideo=this.$refs.myVideo;
myVideo.pause();
},
//重置
resetPath(){
this.courseMsg.FilePath = '';
}
}
};
......
src/components/education/educationIndex.vue
View file @ 47cf0b0f
......@@ -184,6 +184,9 @@
<li class="menu_item" :class="{'Fchecked':isChecked=='/informationEvalution'}" @click="isChecked='/informationEvalution',CommonJump('informationEvalution')">
<i class="el-icon-menu"></i><span>咨讯评价</span>
</li>
<li class="menu_item" :class="{'Fchecked':isChecked=='/educationOrder'}" @click="isChecked='/educationOrder',CommonJump('educationOrder')">
<i class="el-icon-menu"></i><span>课程订单</span>
</li>
</ul>
</div>
</div>
......
src/components/education/educationOrder.vue 0 → 100644
View file @ 47cf0b0f
This diff is collapsed.
src/components/education/educationOrderDetail.vue 0 → 100644
View file @ 47cf0b0f
This diff is collapsed.
src/components/mallIndex.vue
View file @ 47cf0b0f
......@@ -567,9 +567,23 @@
};
},
created() {
this.mall_userInfo = JSON.parse(localStorage.mall_userInfo)
localStorage.removeItem("uploadInfo");
this.mall_userInfo = JSON.parse(localStorage.mall_userInfo);
//获取上传配置
this.getUpConfig();
},
methods: {
//登录后获取上传配置
getUpConfig(){
this.apipost("/api/MallBase/GetDefaultFileStore", {}, res => {
if(res.data.resultCode == 1){
var upData = res.data.data;
localStorage.uploadInfo = JSON.stringify(upData);
}else{
this.Error(res.data.message);
}
})
},
//清空选择
ClearMsg() {
this.basicQMsg.Source = 0;
......
src/components/sallCenter/plugin/education.vue 0 → 100644
View file @ 47cf0b0f
<style>
.sidaoEdit .dirBackground {
width: 80px;
height: 80px;
}
.sidaoEdit .dirBackground img {
width: 100%;
height: 100%;
}
.sidaoEdit .img-edge-cover {
width: 100%;
position: relative;
border-top-left-radius: 20px;
border-top-right-radius: 20px;
overflow: hidden;
}
.sidaoContent .dir_EduContent {
height: 140px;
background-color: #fff;
background-color: #424146;
}
.sidaoContent .dir_EduItem {
width:100%;
display: flex;
padding:23px 100px;
font-size:14px;
color:#fff;
}
.dir_ItemImg{
width:140px;
height:93px;
border-radius: 6px;
overflow: hidden;
}
.dir_ItemImg img{
width:100%;
height:100%;
}
.edu_xuexi{
width:373px;
overflow: hidden;
color:#fff;
font-size:15px;
margin-left:15px;
}
</style>
<template>
<div :class="{'active':eduData.isCked}">
<div class="diy-component-options" v-if="eduData.isCked">
<el-button type="primary" icon="el-icon-delete" style="left: -25px; top: 0px;" @click="delPlugin()"></el-button>
<el-button type="primary" icon="el-icon-document-copy" style="left: -25px; top: 30px;"></el-button>
<el-button type="primary" icon="el-icon-arrow-up" v-if="index>0" @click="resetSord(0)"
style="right: -25px; top: 0;"></el-button>
<el-button type="primary" icon="el-icon-arrow-down" v-if="index!=dataLeng-1" @click="resetSord(1)"
style="right: -25px; top: 30px;"></el-button>
</div>
<div class="diy-component-preview sidaoContent">
<div class="dir_EduContent"
:style="{marginLeft:eduData.data.PaddingLeft+'px',
marginRight:eduData.data.PaddingRight+'px',marginTop:eduData.data.PaddingTop+'px',
marginBottom:eduData.data.PaddingBottom+'px'}">
<div class="dir_EduItem">
<div class="dir_ItemImg">
<img v-if="eduData.data.Cover" :src="eduData.data.Cover" style="width:100%;height:100%;" alt=""/>
<img v-else src="../../../assets/img/default.png" alt=""/>
</div>
<div class="edu_xuexi">
<div style="font-size:13px;margin-bottom:8px;color:#DBDADE">上次学习:</div>
<div class="vue-line-clamp" style="height:32px;margin-top:4px;">{{eduData.data.Name}}</div>
<div>
<el-progress :percentage="eduData.data.showProgress" status="success"></el-progress>
</div>
</div>
</div>
</div>
</div>
<div class="diy-component-edit sidaoEdit" v-if="eduData.isCked">
<el-form label-width="150px">
<el-row :gutter="20">
<el-col :span="20">
<el-form-item label="封面图" size="small">
<div>
<el-button size="mini" @click="choicImg=true">选择文件</el-button>
</div>
<div class="dirBackground">
<img v-if="eduData.data.Cover" :src="eduData.data.Cover" alt="" />
<img v-else src="../../../assets/img/default.png" alt="" />
</div>
</el-form-item>
<el-form-item label="课程名称" size="small">
<el-input v-model="eduData.data.Name"></el-input>
</el-form-item>
<el-form-item label="显示进度" size="small">
<el-input type="number" size="small" :min="0" v-model="eduData.data.showProgress">
</el-input>
</el-form-item>
<el-form-item label="上边距">
<el-input type="number" size="small" :min="0" v-model="eduData.data.PaddingTop">
<template slot="append">px</template>
</el-input>
</el-form-item>
<el-form-item label="下边距">
<el-input type="number" size="small" :min="0" v-model="eduData.data.PaddingBottom">
<template slot="append">px</template>
</el-input>
</el-form-item>
<el-form-item label="左边距">
<el-input type="number" size="small" :min="0" v-model="eduData.data.PaddingLeft">
<template slot="append">px</template>
</el-input>
</el-form-item>
<el-form-item label="右边距">
<el-input type="number" size="small" :min="0" v-model="eduData.data.PaddingRight">
<template slot="append">px</template>
</el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<!-- 选择图片文件 -->
<el-dialog title="选择文件" :visible.sync="choicImg" width="1240px">
<ChooseImg @SelectId="SelectId"></ChooseImg>
</el-dialog>
</div>
</template>
<script>
import ChooseImg from "@/components/global/ChooseImg.vue";
export default {
props: ["eduData", "index", "dataLeng"],
components: {
ChooseImg
},
data() {
return {
choicImg: false,
data: this.eduData.data,
};
},
created() {
},
methods: {
//向父组件传值 并调用排序
resetSord(IsUp) {
this.$emit('getSord', this.index, IsUp);
},
//点击触发父组件删除
delPlugin() {
this.$emit('comDelPlugin', this.index);
},
//选择图片
SelectId(msg) {
this.eduData.data.Cover = this.getIconLink(msg.url);
this.choicImg = false;
},
},
computed: {
},
mounted() {
}
};
</script>
src/components/sallCenter/plugin/educationArticle.vue 0 → 100644
View file @ 47cf0b0f
This diff is collapsed.
src/components/sallCenter/plugin/educationCustom.vue 0 → 100644
View file @ 47cf0b0f
This diff is collapsed.
src/components/sallCenter/plugin/goods.vue
View file @ 47cf0b0f
......@@ -164,6 +164,23 @@
height: 94px;
}
.diy-goods .diy-component-preview .goods-name-staticList {
white-space: normal !important;
text-overflow: -o-ellipsis-lastline;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
line-clamp: 2;
-webkit-box-orient: vertical;
min-height: 76px;
}
.diy-goods .diy-component-preview .goods-name-StaticName {
margin-top: 40px;
height:32px;
}
.diy-goods .diy-component-preview .goods-price {
white-space: nowrap;
overflow: hidden;
......@@ -173,7 +190,8 @@
}
.diy-goods .diy-component-preview .goods-list-style--1 .goods-item,
.diy-goods .diy-component-preview .goods-list-style-1 .goods-item {
.diy-goods .diy-component-preview .goods-list-style-1 .goods-item,
.diy-goods .diy-component-preview .goods-list-style-4 .goods-item {
width: 100%;
}
......@@ -195,6 +213,12 @@
border-radius: 10px 0 0 10px;
}
.diy-goods .diy-component-preview .goods-list-style-4 .goods-pic {
width: 250px;
height: 170px;
border-radius: 10px;
}
.diy-goods .diy-component-preview .goods-list-style-2 .goods-pic {
height: 342px;
border-radius: 10px 10px 0 0;
......@@ -291,8 +315,21 @@
background: rgba(0, 0, 0, 0.2);
letter-spacing: -1px;
}
.goodsDialog .el-dialog__body{
padding:10px 20px;
.goodsDialog .el-dialog__body {
padding: 10px 20px;
}
.goods-priceScore{
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
line-height: 48px;
}
.goods-price .el-rate__icon{
font-size:30px;
}
.diy-goods .gd_Price{
font-size:12px!important;
}
</style>
<template>
......@@ -333,14 +370,23 @@
:style="'background-image: url('+ getIconLink(data.goodsTagPicUrl)+')'"></div>
</div>
<div :style="cGoodsItemInfoStyle">
<div class="goods-name" :class="data.listStyle===-1?'goods-name-static':''">
<div class="goods-name"
:class="{'goods-name-static':data.listStyle===-1,'goods-name-staticList':data.listStyle===4}">
<template v-if="data.showGoodsName">{{goods.name}}</template>
</div>
<div flex="box:last">
<div flex="box:last" :class="{'goods-name-StaticName':data.listStyle===4}">
<div class="goods-price">
<template v-if="data.showGoodsPrice">￥{{goods.price}}</template>
<template v-if="data.showGoodsPrice&&data.listStyle!=4">￥{{goods.price}}</template>
<template v-if="data.showScore&&data.listStyle==4">
<el-rate v-model="ScoreStar" disabled show-score :colors="ScoreArr" :text-color="ScoreArr[0]"
score-template="{value}分">
</el-rate>
</template>
</div>
<div>
<div v-if="data.showGoodsPrice&&data.listStyle==4" style="color:#FF003F;">
<span class="gd_Price">￥</span>{{goods.price}}
</div>
<template v-if="cShowBuyBtn">
<template v-if="data.buyBtn==='cart'">
<i style="font-size: 48px;color: #ff4544;" class="el-icon-shopping-cart-1"></i>
......@@ -367,7 +413,8 @@
<div class="diy-component-edit" v-if="goodData.isCked">
<el-form label-width='150px' @submit.native.prevent>
<el-form-item label="显示分类">
<el-switch v-model="data.showCat" @change="showCatChange" :active-value="true" :inactive-value="false"></el-switch>
<el-switch v-model="data.showCat" @change="showCatChange" :active-value="true" :inactive-value="false">
</el-switch>
</el-form-item>
<template v-if="data.showCat">
<el-form-item label="分类栏位置">
......@@ -398,7 +445,7 @@
<div class="diy-goods-label">商品数量</div>
<div>
<el-input v-model.number="cat.goodsNum" type="number" min="1" max="30" size="small"
@change="catGoodsNumChange(catIndex)"></el-input>
@change="catGoodsNumChange(catIndex)"></el-input>
</div>
</div>
<div flex="box:first">
......@@ -420,7 +467,8 @@
</div>
</draggable>
<div class="goods-add">
<el-button @click="showGoodsDialog(catIndex),ckGoods=cat.goodsNum" icon="el-icon-plus"></el-button>
<el-button @click="showGoodsDialog(catIndex),ckGoods=cat.goodsNum" icon="el-icon-plus">
</el-button>
</div>
</div>
</div>
......@@ -458,6 +506,7 @@
<el-radio v-model="data.listStyle" :label="1">一行一个</el-radio>
<el-radio v-model="data.listStyle" :label="2">一行两个</el-radio>
<el-radio v-model="data.listStyle" :label="3">一行三个</el-radio>
<el-radio v-model="data.listStyle" :label="4">新列表模式</el-radio>
</el-form-item>
<el-form-item label="商品封面图宽高比例" v-if="data.listStyle==1">
<el-radio v-model="data.goodsCoverProportion" label="1-1">1:1</el-radio>
......@@ -478,6 +527,15 @@
<el-form-item label="显示商品价格">
<el-switch v-model="data.showGoodsPrice" :active-value="true" :inactive-value="false"></el-switch>
</el-form-item>
<el-form-item label="显示星级" v-if="data.listStyle==4">
<el-switch v-model="data.showScore" :active-value="true" :inactive-value="false"></el-switch>
</el-form-item>
<el-form-item label="星星颜色" v-if="data.listStyle==4">
<div class="input-color" flex="dir:left cross:center">
<el-color-picker size="small" v-model="data.scoreColor"></el-color-picker>
<el-input size="small" style="width: 80px;margin-right: 25px;" v-model="data.scoreColor"></el-input>
</div>
</el-form-item>
<el-form-item v-if="data.listStyle!==-1" label="文本样式">
<el-radio v-model="data.textStyle" :label="1">左对齐</el-radio>
<el-radio v-model="data.textStyle" :label="2">居中</el-radio>
......@@ -503,7 +561,7 @@
<el-input maxlength="4" size="small" v-model="data.buyBtnText"></el-input>
</el-form-item>
<el-form-item label="显示商品角标">
<el-switch v-model="data.showGoodsTag" :active-value="true" :inactive-value="false" ></el-switch>
<el-switch v-model="data.showGoodsTag" :active-value="true" :inactive-value="false"></el-switch>
</el-form-item>
<el-form-item label="商品角标" v-if="data.showGoodsTag">
<el-radio v-model="data.goodsTagPicUrl" v-for="tag in goodsTags" :label="tag.picUrl" :key="tag.name"
......@@ -542,7 +600,7 @@
</el-dialog>
<!-- 选择商品 -->
<el-dialog title="选择商品" :visible.sync="isShowGoods" custom-class="goodsDialog">
<choiceGood ref="choiceGood" ></choiceGood>
<choiceGood ref="choiceGood"></choiceGood>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="isShowGoods=false">取 消</el-button>
<el-button size="small" type="danger" @click="getGoodsChoice()">确 定</el-button>
......@@ -568,13 +626,15 @@
data() {
return {
//可以选择的商品数
ckGoods:0,
ckGoods: 0,
data: this.goodData.data,
position: 'center center',
repeat: 'no-repeat',
choicImg: false,
isFenlei: false,
isShowGoods: false,
ScoreStar:5, //分数
ScoreArr:[], //颜色数组
//添加的下标
comIndex: -1,
goodsTags: [{
......@@ -794,7 +854,7 @@
}
},
cGoodsItemFlex() {
if (this.data.listStyle === -1) {
if (this.data.listStyle === -1 || this.data.listStyle === 4) {
return 'dir:left box:first cross:center';
}
return 'dir:top';
......@@ -829,6 +889,9 @@
if (this.data.textStyle === 2 || this.data.listStyle === 0) {
return false;
}
if(this.data.listStyle==4){
return false;
}
return true;
},
cGoodsItemInfoStyle() {
......@@ -836,7 +899,7 @@
if (this.data.textStyle === 2) {
style += `text-align: center;`;
}
if (this.data.listStyle === -1) {
if (this.data.listStyle === -1 || this.data.listStyle === 4) {
style += `height: 200px;padding: 20px 24px 20px 32px;`;
} else {
style += `padding:24px 24px;`;
......@@ -862,8 +925,22 @@
},
},
mounted() {
if(this.data.scoreColor){
this.ScoreArr.push(this.data.scoreColor);
this.ScoreArr.push(this.data.scoreColor);
this.ScoreArr.push(this.data.scoreColor);
}
},
watch: {
"data.scoreColor"(val) {
this.ScoreArr=[];
this.ScoreArr.push(val);
this.ScoreArr.push(val);
this.ScoreArr.push(val);
this.$forceUpdate();
}
},
}
};
</script>
src/components/sallCenter/templateEdit.vue
View file @ 47cf0b0f
......@@ -284,7 +284,12 @@
:index="index" :dataLeng="dataList.length"></shopinfo>
<sidao v-if="item.Id=='drive-guide'" :sidaoData="item" @getSord="getSord" @comDelPlugin="comDelPlugin"
:index="index" :dataLeng="dataList.length"></sidao>
<education v-if="item.Id=='education'" :eduData="item" @getSord="getSord" @comDelPlugin="comDelPlugin"
:index="index" :dataLeng="dataList.length"></education>
<educationArticle v-if="item.Id=='educationArticle'" :zxData="item" @getSord="getSord" @comDelPlugin="comDelPlugin"
:index="index" :dataLeng="dataList.length"></educationArticle>
<educationCustom v-if="item.Id=='educationCustom'" :cusData="item" @getSord="getSord" @comDelPlugin="comDelPlugin"
:index="index" :dataLeng="dataList.length"></educationCustom>
</div>
</div>
</div>
......@@ -393,6 +398,9 @@
import topic from "../sallCenter/plugin/topic.vue"
import shopinfo from "../sallCenter/plugin/shopinfo.vue"
import sidao from "../sallCenter/plugin/sidao.vue"
import education from "../sallCenter/plugin/education"
import educationArticle from "../sallCenter/plugin/educationArticle"
import educationCustom from "../sallCenter/plugin/educationCustom"
import ChooseImg from "@/components/global/ChooseImg.vue";
export default {
......@@ -462,7 +470,10 @@
topic,
shopinfo,
ChooseImg,
sidao
sidao,
education,
educationArticle,
educationCustom
},
methods: {
//选择图片
......@@ -725,7 +736,9 @@
position: 5,
mode: 1,
backgroundHeight: 100, //背景高
backgroundWidth: 100, //背景宽
backgroundWidth: 100, //背景宽
showScore: true, //显示打星星
scoreColor: '' //星星颜色
}
}
this.dataList.push(goodsObj);
......@@ -1293,6 +1306,63 @@
}
this.dataList.push(driveObj);
break;
//最近学习组件
case 'education':
let eduObj = {
Id: 'education',
isCked: false,
data:{
Cover:'', //封面图
Name:'', //课程名称
showProgress:0, //显示进度
PaddingTop:0, //上边距
PaddingBottom:0, //下边距
PaddingLeft:0, //左边距
PaddingRight:0, //右边距
BtnPosition:0 //按钮位置
}
}
this.dataList.push(eduObj);
break;
//资讯
case 'educationArticle':
let zxObj = {
Id: 'educationArticle',
isCked:false,
data:{
goodsLength:10, //商品数量
addGoodsType:0, //商品添加方式【0-自定义,1-最新】
listStyle:-1, //列表样式[-1-列表模式,0-左右滑动,1-一行一个]
backgroundColor: '#fff', //背景颜色
SearchFilletPX:0,//圆角
PaddingTop:0, //上边距
PaddingBottom:0, //下边距
PaddingLeft:0, //左边距
PaddingRight:0, //右边距
list: [], //商品列表
}
}
this.dataList.push(zxObj);
break;
//自定义列表
case 'educationCustom':
let customObj = {
Id:'educationCustom',
isCked:false,
data:{
goodsLength:10, //商品数量
listStyle:-1, //列表样式[-1-列表模式,0-左右滑动,1-一行一个,2-一行两个3-一行三个]
backgroundColor:'#fff',//背景颜色
PaddingTop:0, //上边距
PaddingBottom:0, //下边距
PaddingLeft:0, //左边距
PaddingRight:0, //右边距
SearchFilletPX:0, //组件圆角
list:[] //自定义列表
}
}
this.dataList.push(customObj);
break;
}
},
//给子组件调用 重新排序上移下移
......
src/components/setup/uploadSettings.vue
View file @ 47cf0b0f
This diff is collapsed.
src/plug/index.js
View file @ 47cf0b0f
This diff is collapsed.
src/router/index.js
View file @ 47cf0b0f
This diff is collapsed.
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