Skip to content

E
ElectricitySheep
Commit 23586f4e authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

parents 261031da e52f1f64
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 29 deletions
src/components/Login.vue
View file @ 23586f4e
......@@ -169,7 +169,7 @@
<el-input v-model="msg.Account" placeholder="请输入用户名" maxlength="25" />
</el-form-item>
<el-form-item label="" prop="Password">
<el-input type="password" v-model="msg.Password" placeholder="请输入密码" maxlength="25" />
<el-input type="password" v-model="msg.Password" @keyup.enter.native="submitForm('msg')" placeholder="请输入密码" maxlength="25" />
</el-form-item>
<el-form-item label="" style="display:none;">
<el-input v-model="msg.ValidataCode" style="width:140px;" placeholder="验证码" maxlength="25" />
......
src/components/StoreDesign/labelBar.vue
View file @ 23586f4e
......@@ -114,6 +114,7 @@
position: relative;
display: flex;
flex-direction: column;
float:left;
}
.labelBar .btm_icon {
......@@ -216,18 +217,21 @@
<el-form-item label="底部导航图标" size="small">
<div class="nav_Main">
<div class="nav_IconContent">
<div class="bottom-icon" v-for="(item,index) in mallMsg.BottomTagList" :key="index">
<div class="Btm_ImgIcon">
<img class="btm_icon" :src="item.DefaultIcon" alt="">
<draggable v-model="mallMsg.BottomTagList">
<div class="bottom-icon" v-for="(item,index) in mallMsg.BottomTagList" :key="index">
<div class="Btm_ImgIcon">
<img class="btm_icon" :src="item.DefaultIcon" alt="">
</div>
<div class="btnCenter">{{item.TagName}}</div>
<div class="nav_Action">
<span style="background: rgba(64, 158, 255, 0.9);" @click="EditInfo(item,index)">编辑</span>
<span style="background: rgba(245, 108, 108, 0.9);" @click="delItem(index,item)">删除</span>
</div>
</div>
<div class="btnCenter">{{item.TagName}}</div>
<div class="nav_Action">
<span style="background: rgba(64, 158, 255, 0.9);" @click="EditInfo(item,index)">编辑</span>
<span style="background: rgba(245, 108, 108, 0.9);" @click="delItem(index,item)">删除</span>
</div>
</div>
</draggable>
</div>
<div class="nav_Add" @click="addIconList">
<div class="nav_Add" v-if="mallMsg.BottomTagList.length<5" @click="addIconList">
<i class="el-icon-plus nav-add-icon"></i>
</div>
</div>
......@@ -302,6 +306,7 @@
<script>
import chooseMenu from "../common/chooseMenu.vue";
import ChooseImg from "@/components/global/ChooseImg.vue";
import draggable from "vuedraggable"
export default {
data() {
let validataIcon = (rule, value, callback) => {
......@@ -404,7 +409,7 @@
TagSort: 1, //排序
IsActive: false
},
EditIndex:-1,//编辑的行
EditIndex: -1, //编辑的行
rules: {
icon: [{
required: true,
......@@ -431,7 +436,8 @@
},
components: {
chooseMenu,
ChooseImg
ChooseImg,
draggable,
},
created() {
......@@ -508,9 +514,9 @@
this.addMsg.IsActive = false;
},
//点击编辑
EditInfo(item,index) {
EditInfo(item, index) {
this.isAdd = false;
this.EditIndex=index;
this.EditIndex = index;
this.addMsg = JSON.parse(JSON.stringify(item));
this.isShowDialog = true;
},
......@@ -522,10 +528,8 @@
if (this.isAdd) {
this.mallMsg.BottomTagList.push(JSON.parse(JSON.stringify(this.addMsg)));
this.clearAddmsg();
}
else
{
this.mallMsg.BottomTagList[this.EditIndex]=JSON.parse(JSON.stringify(this.addMsg));
} else {
this.mallMsg.BottomTagList[this.EditIndex] = JSON.parse(JSON.stringify(this.addMsg));
}
this.isShowDialog = false;
} else {
......
src/components/sallCenter/plugin/quick-nav.vue
View file @ 23586f4e
......@@ -50,9 +50,9 @@
<el-switch v-model="data.navSwitch" :inactive-value="0" :active-value="1"></el-switch>
</el-form-item>
<el-form-item v-if="data.navSwitch == 1" label="使用商城配置">
<el-switch v-model="data.useMallConfig"></el-switch>
<el-switch v-model="data.useMallConfig" :active-value="true" :inactive-value="false"></el-switch>
</el-form-item>
<template v-if="!data.useMallConfig && data.navSwitch == 1">
<template v-if="data.useMallConfig && data.navSwitch == 1">
<el-form-item label="导航样式">
<el-radio v-model="data.navStyle" :label="1">样式1(点击收起)</el-radio>
<el-radio v-model="data.navStyle" :label="2">样式2(全部展示)</el-radio>
......@@ -78,7 +78,7 @@
<div class="edit-item">
<div style="margin-bottom: 10px;">返回首页</div>
<el-form-item label="是否开启">
<el-switch v-model="data.home.opened"></el-switch>
<el-switch v-model="data.home.opened" :active-value="true" :inactive-value="false"></el-switch>
</el-form-item>
<el-form-item v-if="data.home.opened" label="图标">
<div class="zk_pic_box" @click="choicImg=true,getImgUtl(3)"
......@@ -93,7 +93,7 @@
<div class="edit-item">
<div style="margin-bottom: 10px;">小程序客服</div>
<el-form-item label="是否开启">
<el-switch v-model="data.customerService.opened"></el-switch>
<el-switch v-model="data.customerService.opened" :active-value="true" :inactive-value="false"></el-switch>
</el-form-item>
<el-form-item v-if="data.customerService.opened" label="图标">
<div class="zk_pic_box" @click="choicImg=true,getImgUtl(4)"
......@@ -108,7 +108,7 @@
<div class="edit-item">
<div style="margin-bottom: 10px;">一键拨号</div>
<el-form-item label="是否开启">
<el-switch v-model="data.tel.opened"></el-switch>
<el-switch v-model="data.tel.opened" :active-value="true" :inactive-value="false"></el-switch>
</el-form-item>
<el-form-item v-if="data.tel.opened" label="图标">
<div class="zk_pic_box" @click="choicImg=true,getImgUtl(5)"
......@@ -126,7 +126,7 @@
<div class="edit-item">
<div style="margin-bottom: 10px;">网页链接</div>
<el-form-item label="是否开启">
<el-switch v-model="data.web.opened"></el-switch>
<el-switch v-model="data.web.opened" :active-value="true" :inactive-value="false"></el-switch>
</el-form-item>
<el-form-item v-if="data.web.opened" label="图标">
<div class="zk_pic_box" @click="choicImg=true,getImgUtl(6)"
......@@ -144,7 +144,7 @@
<div class="edit-item">
<div style="margin-bottom: 10px;">跳转小程序</div>
<el-form-item label="是否开启">
<el-switch v-model="data.mApp.opened"></el-switch>
<el-switch v-model="data.mApp.opened" :active-value="true" :inactive-value="false"></el-switch>
</el-form-item>
<el-form-item v-if="data.mApp.opened" label="图标">
<div class="zk_pic_box" @click="choicImg=true,getImgUtl(7)"
......@@ -165,7 +165,7 @@
<div class="edit-item">
<div style="margin-bottom: 10px;">地图导航</div>
<el-form-item label="是否开启">
<el-switch v-model="data.mapNav.opened"></el-switch>
<el-switch v-model="data.mapNav.opened" :active-value="true" :inactive-value="false"></el-switch>
</el-form-item>
<el-form-item v-if="data.mapNav.opened" label="图标">
<div class="zk_pic_box" @click="choicImg=true,getImgUtl(8)"
......@@ -186,7 +186,7 @@
<div class="edit-item">
<div style="margin-bottom: 10px;">自定义按钮</div>
<el-form-item label="是否开启">
<el-switch v-model="data.customize.opened"></el-switch>
<el-switch v-model="data.customize.opened" :active-value="true" :inactive-value="false"></el-switch>
</el-form-item>
<el-form-item v-if="data.customize.opened" label="图标">
<div class="zk_pic_box" @click="choicImg=true,getImgUtl(9)"
......@@ -304,6 +304,7 @@
},
mapEvent(e) {
this.data.mapNav.location = e.lat + ',' + e.long;
this.data.mapNav.address =e.address;
this.isShowMap=false;
},
......
src/components/sallCenter/templateEdit.vue
View file @ 23586f4e
......@@ -1158,7 +1158,7 @@
isCked: false,
data: {
navSwitch: 0, //快捷导航开关
useMallConfig: true, //使用商城配置
useMallConfig: false, //使用商城配置
navStyle: 1, //导航样式
closedPicUrl: '', //收起图标
openedPicUrl: '', //展开图标
......@@ -1237,6 +1237,7 @@
//点击保存
SaveData() {
this.addMsg.ComponentDataList = this.dataList;
console.log("this.addMsg",this.addMsg);
this.apipost("/api/Template/SetMiniTemplate", this.addMsg, res => {
if (res.data.resultCode == 1) {
this.addMsg.Id = res.data.data;
......
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