Skip to content

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

修改海报只针对m端

上级 73b49f78
显示空白字符变更
内嵌 并排
正在显示 包含 150 行增加 和 15 行删除
platform-admin/src/main/resources/com/platform/dao/TbCfPostersDao.xml
浏览文件 @ cae24e80
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
`sort`, `sort`,
`is_show`, `is_show`,
`redirect_url`, `redirect_url`,
link link,
`remark`, `remark`,
`create_time`, `create_time`,
`update_time`) `update_time`)
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
<if test="sort != null">`sort` = #{sort},</if> <if test="sort != null">`sort` = #{sort},</if>
<if test="isShow != null">`is_show` = #{isShow},</if> <if test="isShow != null">`is_show` = #{isShow},</if>
<if test="redirectUrl != null">`redirect_url` = #{redirectUrl},</if> <if test="redirectUrl != null">`redirect_url` = #{redirectUrl},</if>
<if test="link != null">`link` = #{link}</if> <if test="link != null">`link` = #{link},</if>
<if test="remark != null">`remark` = #{remark},</if> <if test="remark != null">`remark` = #{remark},</if>
<if test="createTime != null">`create_time` = #{createTime},</if> <if test="createTime != null">`create_time` = #{createTime},</if>
<if test="updateTime != null">`update_time` = #{updateTime}</if> <if test="updateTime != null">`update_time` = #{updateTime}</if>
......
platform-admin/src/main/webapp/WEB-INF/page/sys/tbcfitemcomment.html
浏览文件 @ cae24e80
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
z-index: 99; z-index: 99;
top: 0; top: 0;
} }
.ui-jqgrid-bdiv{ .ui-jqgrid-bdiv{
height: 500px !important; height: 500px !important;
} }
...@@ -99,6 +100,26 @@ ...@@ -99,6 +100,26 @@
#showItems { #showItems {
margin-top: 20px; margin-top: 20px;
} }
#newapp {
box-sizing: border-box;
/*min-width: 1000px;*/
/*width: 100%;*/
height: 600px;
margin: 0 auto;
position: fixed;
z-index: 99;
background: #fff;
top: 0;
}
#newapp .ui-jqgrid .ui-jqgrid-bdiv{
height:auto!important;
}
#newapp .table > thead > tr > th, .table > tbody > tr > th, .table > tfoot > tr > th, .table > thead > tr > td, .table > tbody > tr > td, .table > tfoot > tr > td {
border-top: 2px solid #e7eaec;
line-height: 1.38857;
padding: 13px;
vertical-align: middle;
}
</style> </style>
</head> </head>
<body> <body>
...@@ -132,7 +153,10 @@ ...@@ -132,7 +153,10 @@
<p slot="title">{{title}}</p> <p slot="title">{{title}}</p>
<i-form ref="formValidate" :model="tbCfItemComment" :rules="ruleValidate" :label-width="80"> <i-form ref="formValidate" :model="tbCfItemComment" :rules="ruleValidate" :label-width="80">
<Form-item label="选择用户" prop="userId" style="width: 500px"> <Form-item label="选择用户" prop="userId" style="width: 500px">
<div v-model="tbCfItemComment.userId" @click="openidbtn">
<i-input v-model="tbCfItemComment.userId" placeholder="选择用户"/> <i-input v-model="tbCfItemComment.userId" placeholder="选择用户"/>
</div>
</Form-item> </Form-item>
<!-- <Form-item label="订单ID" prop="orderId">--> <!-- <Form-item label="订单ID" prop="orderId">-->
<!-- <i-input v-model="tbCfItemComment.orderId" placeholder="订单ID"/>--> <!-- <i-input v-model="tbCfItemComment.orderId" placeholder="订单ID"/>-->
...@@ -166,7 +190,7 @@ ...@@ -166,7 +190,7 @@
</Form-item> </Form-item>
<Form-item label="选择商品" prop="itemId" style="width: 500px"> <Form-item label="选择商品" prop="itemId" style="width: 500px">
<div v-model="tbCfItemComment.itemId" @click="openbtn"> <div v-model="tbCfItemComment.itemId" @click="openbtn">
<i-input v-model="tbCfItemComment.itemId" placeholder="选择商品" @click="openbtn"/> <i-input v-model="tbCfItemComment.itemId" placeholder="选择商品"/>
</div> </div>
</Form-item> </Form-item>
<Form-item label="商品评分" prop="itemScore" style="width: 500px"> <Form-item label="商品评分" prop="itemScore" style="width: 500px">
...@@ -224,6 +248,27 @@ ...@@ -224,6 +248,27 @@
</Card> </Card>
</div>
<!-- 选择马甲号-->
<!-- <div id="newapp" v-show="isnewapp" style="width: 3050px;height: calc(100% - 15px);">-->
<div id="newapp" v-show="isnewapp">
<div style="height: 100%;">
<Row :gutter="16">
<div class="search-group">
<i-col span="4">
<i-input v-model="q2.name" @on-enter="query" placeholder="名称"/>
</i-col>
<i-button @click="query2">查询</i-button>
<i-button @click="reloadSearch2">重置</i-button>
<i-button type="info" @click="getmjid">选择用户</i-button>
<i-button type="warning" @click="closeidbtn" style="margin-left: 8px"/>
关闭</i-button>
</div>
</Row>
<div id="newspeedp"></div>
<table id="newjqGrid"></table>
</div>
</div> </div>
</div> </div>
......
platform-admin/src/main/webapp/WEB-INF/page/sys/tbcfposters.html
浏览文件 @ cae24e80
...@@ -167,6 +167,8 @@ ...@@ -167,6 +167,8 @@
</div> </div>
<i-Button type="warning" style="float: right;margin-top:30px;width:100px;" @click='resetSelectedCategory'>重置</i-Button> <i-Button type="warning" style="float: right;margin-top:30px;width:100px;" @click='resetSelectedCategory'>重置</i-Button>
<!--让m端去落地页-->
<i-Input v-model="mlink" placeholder="m端落地页" />
</div> </div>
<!-- 商品 --> <!-- 商品 -->
<div v-else-if="typeActive==2"> <div v-else-if="typeActive==2">
......
platform-admin/src/main/webapp/js/sys/tbcfhomepage.js
浏览文件 @ cae24e80
...@@ -286,13 +286,15 @@ let vm = new Vue({ ...@@ -286,13 +286,15 @@ let vm = new Vue({
vm.tbCfHomePage.type = ['2']; vm.tbCfHomePage.type = ['2'];
} else if (version === 3) { } else if (version === 3) {
vm.tbCfHomePage.type = ['3']; vm.tbCfHomePage.type = ['3'];
}else if (version === 5) {
vm.tbCfHomePage.type = ['5'];
} }
vm.typeActive = vm.tbCfHomePage.imgType; vm.typeActive = vm.tbCfHomePage.imgType;
vm.vHandleChange(null, vm.typeActive) vm.vHandleChange(null, vm.typeActive)
if (vm.typeActive === 0) { if (vm.typeActive === 0) {
vm.link = vm.tbCfHomePage.linkUrl; vm.link = vm.tbCfHomePage.linkUrl;
} else if(vm.typeActive===5){ } else if(vm.typeActive===5){
vm.appLink=vm.tbCfPosters.linkUrl; vm.appLink=vm.tbCfHomePage.linkUrl;
} }
else if (vm.typeActive === 1) { else if (vm.typeActive === 1) {
let ARR_ids = vm.tbCfHomePage.linkUrl.split(','); let ARR_ids = vm.tbCfHomePage.linkUrl.split(',');
......
platform-admin/src/main/webapp/js/sys/tbcfitemcomment.js
浏览文件 @ cae24e80
...@@ -38,6 +38,35 @@ $(function () { ...@@ -38,6 +38,35 @@ $(function () {
sortorder: "desc" sortorder: "desc"
}); });
}); });
$(function () {
$("#newjqGrid").Grid({
url: '../tbcfuserinfo/queryVirtualUser',
colModel: [
{label: 'userId', name: 'userId', index: 'user_id', key: true, hidden: true, width: 100},
// {label: '用户编号', name: 'userNo', index: 'user_no', width: 160},
{label: '用户类型', name: 'userType', index: 'user_type', width: 80, formatter: userTypeFormat},
{label: '账号', name: 'account', index: 'account', width: 160},
{label: '国家', name: 'country', index: 'country', width: 100},
{label: '注册来源', name: 'source', index: 'source', width: 60, formatter: signTypeFormat},
{label: '用户头像地址', name: 'avatar', index: 'avatar', width: 100, formatter: imageFormat},
{label: '用户名', name: 'nick', index: 'nick', width: 160},],
shrinkToFit: true,
datatype: "json",
rowNum: 15,
rowList: [15, 30, 45],
mtype: "POST",
rownumbers: true,
rownumWidth: 40,
gridview: true,
pager: '#newspeedp',
sortname: 'create_time',
viewrecords: true,
sortorder: "desc",
multiselect: true,
multiboxonly:true,
beforeSelectRow: true,
});
});
let vm = new Vue({ let vm = new Vue({
el: '#rrapp', el: '#rrapp',
...@@ -72,8 +101,12 @@ let vm = new Vue({ ...@@ -72,8 +101,12 @@ let vm = new Vue({
orderNo: '', orderNo: '',
itemName: '' itemName: ''
}, },
q2: {
name: ''
},
search: null,// 搜索 search: null,// 搜索
isapp: false,//是否显示商品选择 isapp: false,//是否显示商品选择
isnewapp:false,//是否显示马甲号
tempId: '', tempId: '',
advertisement: {}, advertisement: {},
}, },
...@@ -337,16 +370,55 @@ let vm = new Vue({ ...@@ -337,16 +370,55 @@ let vm = new Vue({
vm.closebtn() vm.closebtn()
}); });
console.log(ids) console.log(ids)
// Ajax.request({ },
// url: "../advertisementitem/saveBatch?aId=" + id + '&itemIds=' + ids, // 打开马甲号
// type: "POST", openidbtn(){
// contentType: "application/json", vm.isnewapp = true
// successCallback: function () { },
// alert('操作成功', function (index) { // 关闭马甲号
// console.log(index) closeidbtn(){
// }); vm.isnewapp = false
// } },
// }); // 马甲号相关
reload2: function (event) {
let page = $("#newjqGrid").jqGrid('getGridParam', 'page');
$("#newjqGrid").jqGrid('setGridParam', {
postData: {'name': vm.q2.name},
page: page
}).trigger("reloadGrid");
// vm.handleReset2('formValidate');
},
handleReset2: function (name) {
handleResetForm(this, name);
},
// 搜索马甲号
query2: function () {
vm.reload2();
},
// 重置马甲号
reloadSearch2: function () {
vm.q2 = {
name: ''
};
vm.reload2();
},
// 确定马甲号
getmjid:function (){
let ids = getSelectedRow("#newjqGrid");
if (ids == null) {
return;
}
let id = vm.advertisement.id;
if (id == null || id == '' || id == 'undefined') {
id = vm.tempId;
}
vm.tbCfItemComment.userId = ids
alert('操作成功', function (index) {
console.log(index)
vm.closeidbtn()
});
console.log(ids)
}, },
guid() { guid() {
return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) { return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
......
platform-admin/src/main/webapp/js/sys/tbcfposters.js
浏览文件 @ cae24e80
...@@ -55,6 +55,7 @@ let vm = new Vue({ ...@@ -55,6 +55,7 @@ let vm = new Vue({
*/ */
link: null,//链接 link: null,//链接
appLink:'',//app落地页 appLink:'',//app落地页
mlink:'',//m端落地页
/* /*
--分类子页面 --分类子页面
*/ */
...@@ -196,6 +197,8 @@ let vm = new Vue({ ...@@ -196,6 +197,8 @@ let vm = new Vue({
vm.tbCfPosters = {}; vm.tbCfPosters = {};
this.link = null; this.link = null;
this.appLink = null;
this.mlink = null;
this.typeActive = 0; this.typeActive = 0;
}, },
update: function (event) { update: function (event) {
...@@ -213,6 +216,9 @@ let vm = new Vue({ ...@@ -213,6 +216,9 @@ let vm = new Vue({
let url = vm.tbCfPosters.id == null ? "../tbcfposters/save": "../tbcfposters/update"; let url = vm.tbCfPosters.id == null ? "../tbcfposters/save": "../tbcfposters/update";
vm.tbCfPosters.redirectUrl=event; vm.tbCfPosters.redirectUrl=event;
vm.tbCfPosters.postersType=this.typeActive; vm.tbCfPosters.postersType=this.typeActive;
if (vm.mlink != ''){
vm.tbCfPosters.link= vm.mlink
}
Ajax.request({ Ajax.request({
url: url, url: url,
params: JSON.stringify(vm.tbCfPosters), params: JSON.stringify(vm.tbCfPosters),
...@@ -270,6 +276,9 @@ let vm = new Vue({ ...@@ -270,6 +276,9 @@ let vm = new Vue({
vm.appLink=vm.tbCfPosters.redirectUrl; vm.appLink=vm.tbCfPosters.redirectUrl;
} }
else if(vm.typeActive===1){ else if(vm.typeActive===1){
if (vm.tbCfPosters.link){
vm.mlink=vm.tbCfPosters.link;
}
let ARR_ids = vm.tbCfPosters.redirectUrl.split(','); let ARR_ids = vm.tbCfPosters.redirectUrl.split(',');
vm.CategoryLists1.forEach(item=>{ vm.CategoryLists1.forEach(item=>{
if(item.value===ARR_ids[0]) { if(item.value===ARR_ids[0]) {
...@@ -325,6 +334,7 @@ let vm = new Vue({ ...@@ -325,6 +334,7 @@ let vm = new Vue({
let postersType = this.typeActive; //海报类型 let postersType = this.typeActive; //海报类型
switch (this.typeActive) { switch (this.typeActive) {
case 0: case 0:
vm.mlink = null
redirectUrl = this.link; redirectUrl = this.link;
redirectUrl?vm.saveOrUpdate(redirectUrl):this.$Message.info('请输入链接') redirectUrl?vm.saveOrUpdate(redirectUrl):this.$Message.info('请输入链接')
break; break;
...@@ -335,22 +345,26 @@ let vm = new Vue({ ...@@ -335,22 +345,26 @@ let vm = new Vue({
})():this.$Message.info('至少选择一种分类') })():this.$Message.info('至少选择一种分类')
break; break;
case 2: case 2:
vm.mlink = null
redirectUrl = getSelectedRows("#searchjqGrid")[0]; redirectUrl = getSelectedRows("#searchjqGrid")[0];
if(redirectUrl){ if(redirectUrl){
vm.saveOrUpdate(redirectUrl) vm.saveOrUpdate(redirectUrl)
} }
break; break;
case 3: case 3:
vm.mlink = null
redirectUrl = this.tagListsActive; redirectUrl = this.tagListsActive;
if(redirectUrl){ if(redirectUrl){
vm.saveOrUpdate(redirectUrl) vm.saveOrUpdate(redirectUrl)
} }
break; break;
case 5: case 5:
vm.mlink = null
redirectUrl = this.appLink; redirectUrl = this.appLink;
redirectUrl?vm.saveOrUpdate(redirectUrl):this.$Message.info('请输入app落地页地址') redirectUrl?vm.saveOrUpdate(redirectUrl):this.$Message.info('请输入app落地页地址')
break; break;
default : default :
vm.mlink = null
vm.saveOrUpdate('') vm.saveOrUpdate('')
break; break;
} }
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论