Skip to content

C
chinafrica
提交 d08b1ac3 authored 作者: zgy's avatar zgy
浏览文件
操作

完成轮播图新旧版本区分

上级 df0f80df
显示空白字符变更
内嵌 并排
正在显示 包含 305 行增加 和 168 行删除
platform-admin/src/main/java/com/platform/entity/TbCfGoodstypeEntity.java
浏览文件 @ d08b1ac3
package com.platform.entity;
import java.io.Serializable;
import java.util.Date;
/**
* 实体
* 商品一级分类表实体
* 表名 tb_cf_goodstype
*
* @author lipengjun
* @date 2019-10-08 16:34:40
* @date 2020-03-31 17:04:36
*/
public class TbCfGoodstypeEntity implements Serializable {
private static final long serialVersionUID = 1L;
......@@ -24,8 +25,14 @@ public class TbCfGoodstypeEntity implements Serializable {
* 商品分类排序编号
*/
private Integer goodstypeSort;
/**
* 分类详情（旧版）
*/
private String goodstypeUrl;
/**
* 分类图片
*/
private String goodstypeImage;
/**
* 设置：商品分类Id
......@@ -66,12 +73,30 @@ public class TbCfGoodstypeEntity implements Serializable {
public Integer getGoodstypeSort() {
return goodstypeSort;
}
/**
* 设置：分类详情（旧版）
*/
public void setGoodstypeUrl(String goodstypeUrl) {
this.goodstypeUrl = goodstypeUrl;
}
/**
* 获取：分类详情（旧版）
*/
public String getGoodstypeUrl() {
return goodstypeUrl;
}
/**
* 设置：分类图片
*/
public void setGoodstypeImage(String goodstypeImage) {
this.goodstypeImage = goodstypeImage;
}
public void setGoodstypeUrl(String goodstypeUrl) {
this.goodstypeUrl = goodstypeUrl;
/**
* 获取：分类图片
*/
public String getGoodstypeImage() {
return goodstypeImage;
}
}
platform-admin/src/main/java/com/platform/entity/TbCfHomePageEntity.java
浏览文件 @ d08b1ac3
......@@ -8,7 +8,7 @@ import java.util.Date;
* 表名 tb_cf_home_page
*
* @author lipengjun
* @date 2019-09-20 11:03:37
* @date 2020-03-31 15:36:05
*/
public class TbCfHomePageEntity implements Serializable {
private static final long serialVersionUID = 1L;
......@@ -21,12 +21,20 @@ public class TbCfHomePageEntity implements Serializable {
* 图片名称
*/
private String imgName;
/**
* 类型 0：不跳转，1：外链，2.分类子页面，3.商品列表页，4.商品
*/
private Integer imgType;
/**
* 商品版本 0：旧版，1：新版
*/
private Integer imgVersion;
/**
* 排序
*/
private Integer sort;
/**
* 图片链接
* 跳转链接
*/
private String linkUrl;
/**
......@@ -72,6 +80,32 @@ public class TbCfHomePageEntity implements Serializable {
public String getImgName() {
return imgName;
}
/**
* 设置：类型 0：不跳转，1：外链，2.分类子页面，3.商品列表页，4.商品
*/
public void setImgType(Integer imgType) {
this.imgType = imgType;
}
/**
* 获取：类型 0：不跳转，1：外链，2.分类子页面，3.商品列表页，4.商品
*/
public Integer getImgType() {
return imgType;
}
/**
* 设置：商品版本 0：旧版，1：新版
*/
public void setImgVersion(Integer imgVersion) {
this.imgVersion = imgVersion;
}
/**
* 获取：商品版本 0：旧版，1：新版
*/
public Integer getImgVersion() {
return imgVersion;
}
/**
* 设置：排序
*/
......@@ -86,14 +120,14 @@ public class TbCfHomePageEntity implements Serializable {
return sort;
}
/**
* 设置：图片链接
* 设置：跳转链接
*/
public void setLinkUrl(String linkUrl) {
this.linkUrl = linkUrl;
}
/**
* 获取：图片链接
* 获取：跳转链接
*/
public String getLinkUrl() {
return linkUrl;
......
platform-admin/src/main/resources/com/platform/dao/TbCfHomePageDao.xml
浏览文件 @ d08b1ac3
......@@ -6,6 +6,8 @@
<resultMap type="com.platform.entity.TbCfHomePageEntity" id="tbCfHomePageMap">
<result property="pageId" column="page_id"/>
<result property="imgName" column="img_name"/>
<result property="imgType" column="img_type"/>
<result property="imgVersion" column="img_version"/>
<result property="sort" column="sort"/>
<result property="linkUrl" column="link_url"/>
<result property="imgUrl" column="img_url"/>
......@@ -18,6 +20,8 @@
select
`page_id`,
`img_name`,
`img_type`,
`img_version`,
`sort`,
`link_url`,
`img_url`,
......@@ -32,6 +36,8 @@
select
`page_id`,
`img_name`,
`img_type`,
`img_version`,
`sort`,
`link_url`,
`img_url`,
......@@ -68,6 +74,8 @@
insert into tb_cf_home_page(
`page_id`,
`img_name`,
`img_type`,
`img_version`,
`sort`,
`link_url`,
`img_url`,
......@@ -77,6 +85,8 @@
values(
#{pageId},
#{imgName},
#{imgType},
#{imgVersion},
#{sort},
#{linkUrl},
#{imgUrl},
......@@ -89,6 +99,8 @@
update tb_cf_home_page
<set>
<if test="imgName != null">`img_name` = #{imgName}, </if>
<if test="imgType != null">`img_type` = #{imgType}, </if>
<if test="imgVersion != null">`img_version` = #{imgVersion}, </if>
<if test="sort != null">`sort` = #{sort}, </if>
<if test="linkUrl != null">`link_url` = #{linkUrl}, </if>
<if test="imgUrl != null">`img_url` = #{imgUrl}, </if>
......
platform-admin/src/main/webapp/WEB-INF/page/sys/tbcfhomepage.html
浏览文件 @ d08b1ac3
......@@ -42,11 +42,33 @@
<Form-item label="图片名称" prop="imgName">
<i-input v-model="tbCfHomePage.imgName" placeholder="图片名称"/>
</Form-item>
<!-- <Form-item label="版本" prop="imgVersion">
<i-input v-model="tbCfHomePage.imgVersion" placeholder="商品版本 0：旧版，1：新版"/>
</Form-item>-->
<!--<Form-item label="版本" prop="imgVersion">
<el-select v-model="tbCfHomePage.imgVersion" placeholder="版本">
<el-option
v-for="version in versionOptions"
:key="version.value"
:label="version.label"
:value="version.value">
</el-option>
</el-select>
</Form-item>-->
<Form-item label="版本" prop="imgVersion" >
<i-select placeholder="请选择" v-model="tbCfHomePage.imgVersion">
<i-option v-for="(el,i) in versionOptions" :key='i'
:value="el.value">{{el.label}}
</i-option>
</i-select>
</Form-item>
<Form-item label="排序" prop="sort">
<i-input v-model="tbCfHomePage.sort" placeholder="排序"/>
</Form-item>
<Form-item label="跳转链接" prop="linkUrl">
<i-input v-model="tbCfHomePage.linkUrl" placeholder="Android跳转url;IOS跳转url(最多两个url,并以分号分割);如:https://www.andriod.com;https://www.apple.com"/>
<i-input v-model="tbCfHomePage.linkUrl"
placeholder="Android跳转url;IOS跳转url(最多两个url,并以分号分割);如:https://www.andriod.com;https://www.apple.com"/>
</Form-item>
<Form-item label="图片" prop="newsImg">
<img v-bind:src="tbCfHomePage.imgUrl" style="width:200px;height:200px;" v-show="!!tbCfHomePage.imgUrl"/>
......
platform-admin/src/main/webapp/WEB-INF/page/sys/tbcfstationitem.html
浏览文件 @ d08b1ac3
......@@ -149,70 +149,80 @@
}
/* commnstyle */
.pp-text-center{
.pp-text-center {
text-align: center;
margin:10px;
margin: 10px;
}
.pp-flex-sb{
.pp-flex-sb {
display: flex;
justify-content: space-between;
align-items: center;
}
.pp-flex-start{
.pp-flex-start {
display: flex;
justify-content: start;
align-items: center;
}
/* 标签弹窗*/
.pp-popup-wrapper{
width:100vw;
height:100vh;
position:fixed;
top:0;
left:0;
.pp-popup-wrapper {
width: 100vw;
height: 100vh;
position: fixed;
top: 0;
left: 0;
z-index: 100;
}
.pp-popup-mask{
width:100%;
height:100%;
.pp-popup-mask {
width: 100%;
height: 100%;
position: absolute;
left:0;
top:0;
left: 0;
top: 0;
z-index: -1;
background: #000;
opacity: 0.5;
}
.pp-popup-container{
position:absolute;
left:50%;
top:50%;
transform: translate(-50%,-50%);
.pp-popup-container {
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
height: 400px;
min-width:600px;
min-width: 600px;
background: #fff;
border-radius: 6px;
overflow-y: scroll;
padding:10px;
padding: 10px;
}
.pp-tags-section{
margin-bottom:22px;
.pp-tags-section {
margin-bottom: 22px;
}
.pp-popup-close{
.pp-popup-close {
position: absolute;
bottom: 10px;
left:50%;
left: 50%;
transform: translateY(-50%);
}
.pp-tags-subtag{
margin-left:10px;
margin-top:10px;
.pp-tags-subtag {
margin-left: 10px;
margin-top: 10px;
}
/*标签展示*/
.item-tag-container{
.item-tag-container {
margin-bottom: 24px;
}
.item-tag-container>span{
width:80px;
.item-tag-container > span {
width: 80px;
text-align: right;
vertical-align: middle;
float: left;
......@@ -224,38 +234,43 @@
font-weight: bold;
font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
}
.item-tag-container>div{
width:720px;
min-height:32px;
.item-tag-container > div {
width: 720px;
min-height: 32px;
background: white;
border-radius: 2px;
border: 1px solid #dddee1;
}
.tag-preview{
.tag-preview {
position: relative;
}
.add-tag-btn{
.add-tag-btn {
position: absolute;
right: 0;
top:50%;
top: 50%;
transform: translateY(-50%);
}
.pp-tag{
margin:5px;
.pp-tag {
margin: 5px;
display: inline-block;
min-width:50px;
height:30px;
min-width: 50px;
height: 30px;
background: #f9f9f9;
border-radius: 4px;
border:1px solid #eee;
line-height:30px;
border: 1px solid #eee;
line-height: 30px;
text-align: center;
justify-content: space-between;
padding: 0 4px;
}
.pp-tag>i{
padding:0 12px;
.pp-tag > i {
padding: 0 12px;
cursor: pointer;
color: black;
}
......@@ -393,7 +408,8 @@
size="large"
:type="element.isSelected?'success':'info'"
@click="selectTag(element,index)"
>{{element.labelName}}</i-button>
>{{element.labelName}}
</i-button>
<transition-group tag="div" name="slide">
<i-button
class="pp-tags-subtag"
......@@ -401,7 +417,8 @@
size="small"
:type="subElement.isSelected?'success':''"
@click="selectSubTag(subElement,subIndex,index)"
>{{subElement.labelName}}</i-button>
>{{subElement.labelName}}
</i-button>
</transition-group>
</div>
<div class="pp-popup-close" @click="hideTagPopup">
......@@ -409,10 +426,10 @@
</div>
</div>
</div>
<!-- <Form-item label="商品标签" prop="itemLabel" style="width: 800px">-->
<!-- <i-input v-model="tbCfStationItem.itemLabel" placeholder="商品标签"/>-->
<!-- <div>123</div>-->
<!-- </Form-item>-->
<!-- <Form-item label="商品标签" prop="itemLabel" style="width: 800px">-->
<!-- <i-input v-model="tbCfStationItem.itemLabel" placeholder="商品标签"/>-->
<!-- <div>123</div>-->
<!-- </Form-item>-->
<Form-item label="原价" prop="itemPrice" style="width: 800px">
<i-input v-model="tbCfStationItem.itemPrice" placeholder="原价（可不填）"/>
</Form-item>
......
platform-admin/src/main/webapp/js/common.js
浏览文件 @ d08b1ac3
......@@ -510,6 +510,21 @@ sexFormat = function (cellvalue) {
return cellvalue == 0 ? '男' : '女';
};
/**
* 版本
* @param cellvalue
* @returns {string}
*/
versionFormat = function (cellvalue) {
let returnStr = "未知";
if (cellvalue == '0') {
returnStr = "旧版";
} else if (cellvalue == '1') {
returnStr = "新版";
}
return returnStr;
};
moneyFormat = function (cellvalue) {
/* var returnStr = "未知";
if (!!cellvalue) {
......
platform-admin/src/main/webapp/js/sys/tbcfhomepage.js
浏览文件 @ d08b1ac3
......@@ -4,16 +4,17 @@ $(function () {
colModel: [
{label: 'pageId', name: 'pageId', index: 'page_id', key: true, hidden: true},
{label: '图片名称', name: 'imgName', index: 'img_name', width: 80},
{label: '版本', name: 'imgVersion', index: 'img_version', width: 80, formatter: versionFormat},
{label: '排序(倒序显示)', name: 'sort', index: 'sort', width: 80},
{label: '跳转链接', name: 'linkUrl', index: 'link_url', width: 100,formatter:linkFormat},
{label: '图片', name: 'imgUrl', index: 'img_url', width: 80,formatter: imageFormat},
{label: '是否支持浏览', name: 'scanFlag', index: 'scan_flag', width: 80,formatter: yesOrNoFormat},
{label: '跳转页面', name: 'redirectFlag', index: 'redirect_flag', width: 80,formatter: pageFormat},
{label: '是否可用', name: 'enableFlag', index: 'enable_flag', width: 80,formatter: yesOrNoFormat}],
{label: '跳转链接', name: 'linkUrl', index: 'link_url', width: 100, formatter: linkFormat},
{label: '图片', name: 'imgUrl', index: 'img_url', width: 80, formatter: imageFormat},
{label: '是否支持浏览', name: 'scanFlag', index: 'scan_flag', width: 80, formatter: yesOrNoFormat},
{label: '跳转页面', name: 'redirectFlag', index: 'redirect_flag', width: 80, formatter: pageFormat},
{label: '是否可用', name: 'enableFlag', index: 'enable_flag', width: 80, formatter: yesOrNoFormat}],
shrinkToFit: true,
datatype : "json",
rowNum:15,
rowList:[15,30,45],
datatype: "json",
rowNum: 15,
rowList: [15, 30, 45],
mtype: "POST",
rownumbers: true,
rownumWidth: 40,
......@@ -38,7 +39,18 @@ let vm = new Vue({
},
q: {
name: ''
},
version: '',
versionOptions: [
{
value: 0,
label: '旧版'
},
{
value: 1,
label: '新版'
}
]
},
methods: {
query: function () {
......@@ -75,7 +87,7 @@ let vm = new Vue({
},
del: function (event) {
let pageIds = getSelectedRows("#jqGrid");
if (pageIds == null){
if (pageIds == null) {
return;
}
......@@ -93,9 +105,9 @@ let vm = new Vue({
});
});
},
getInfo: function(pageId){
getInfo: function (pageId) {
Ajax.request({
url: "../tbcfhomepage/info/"+pageId,
url: "../tbcfhomepage/info/" + pageId,
async: true,
successCallback: function (r) {
vm.tbCfHomePage = r.tbCfHomePage;
......@@ -111,7 +123,7 @@ let vm = new Vue({
}).trigger("reloadGrid");
vm.handleReset('formValidate');
},
reloadSearch: function() {
reloadSearch: function () {
vm.q = {
name: ''
};
......@@ -125,22 +137,22 @@ let vm = new Vue({
handleReset: function (name) {
handleResetForm(this, name);
},
tirggerFile : function (event) {
tirggerFile: function (event) {
var file = event.target.files[0]; // (利用console.log输出看file文件对象)
var formData = new FormData();
formData.append("file",file);
formData.append("file", file);
$.ajax({
url: "../api/upload/image/",
type: "POST",
data:formData,
cache:false, //不设置缓存
data: formData,
cache: false, //不设置缓存
processData: false, // 不处理数据
contentType: false,// 不设置内容类型
success: function (result) {
result=JSON.parse(result);
result = JSON.parse(result);
//console.log(result)
if (result.errno == 0) {//成功
vm.tbCfHomePage.imgUrl=result.data;
vm.tbCfHomePage.imgUrl = result.data;
vm.$forceUpdate();
} else {
iview.Message.error(result.errmsg);
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论