Skip to content

C
chinafrica
提交 aa3b964b authored 作者: 潘鹏's avatar 潘鹏
浏览文件
操作

微调样式

上级 00ec3d66
显示空白字符变更
内嵌 并排
正在显示 包含 117 行增加 和 48 行删除
platform-admin/src/main/resources/dev/platform.properties
浏览文件 @ aa3b964b
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
#jdbc.username=root #jdbc.username=root
#jdbc.password=root #jdbc.password=root
#jdbc.url=jdbc:mysql://47.106.242.175:3306/chinafrica?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8 jdbc.url=jdbc:mysql://47.106.242.175:3306/afrishop_test?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8
#jdbc.username=root jdbc.username=root
#jdbc.password=diaoyun666 jdbc.password=diaoyun666
jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false #jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
jdbc.username: root #jdbc.username: root
jdbc.password: Diaoyunnuli.8 #jdbc.password: Diaoyunnuli.8
jdbc.initialSize=5 jdbc.initialSize=5
jdbc.maxActive=30 jdbc.maxActive=30
......
platform-admin/src/main/resources/prod/platform.properties
浏览文件 @ aa3b964b
#jdbc.url=jdbc:mysql://localhost:3306/platform?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8 #jdbc.url=jdbc:mysql://localhost:3306/chinafrica?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8
#jdbc.username=root #jdbc.username=root
#jdbc.password=root #jdbc.password=root
#jdbc.url=jdbc:mysql://47.106.242.175:3306/chinafrica?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8 jdbc.url=jdbc:mysql://47.106.242.175:3306/afrishop_test?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8
#jdbc.username=root jdbc.username=root
#jdbc.password=diaoyun666 jdbc.password=diaoyun666
jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false #jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
jdbc.username: root #jdbc.username: root
jdbc.password: Diaoyunnuli.8 #jdbc.password: Diaoyunnuli.8
jdbc.initialSize=5 jdbc.initialSize=5
jdbc.maxActive=30 jdbc.maxActive=30
......
platform-admin/src/main/webapp/WEB-INF/page/sys/advertisement.html
浏览文件 @ aa3b964b
...@@ -19,7 +19,12 @@ ...@@ -19,7 +19,12 @@
min-width: 1200px; min-width: 1200px;
margin: 0 auto; margin: 0 auto;
} }
.ui-jqgrid-bdiv{
height: 500px !important;
}
.edit-container{
height: 600px !important;
}
.category-container { .category-container {
min-height: 600px; min-height: 600px;
padding-bottom: 80px; padding-bottom: 80px;
......
platform-admin/src/main/webapp/WEB-INF/page/sys/menu.html
浏览文件 @ aa3b964b
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
</div> </div>
<div class="buttons-group"> <div class="buttons-group">
#if($shiro.hasPermission("sys:menu:save")) #if($shiro.hasPermission("sys:menu:save"))
<i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button> <i-button type="info" @click="add"><i class="fa fa-plus"></i>新增</i-button>
#end #end
#if($shiro.hasPermission("sys:menu:update")) #if($shiro.hasPermission("sys:menu:update"))
<i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button> <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
......
platform-admin/src/main/webapp/WEB-INF/page/sys/tbcfstationitem.html
浏览文件 @ aa3b964b
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
padding-right: 2px; padding-right: 2px;
height: 100px; height: 100px;
} }
#itemImg:hover { .bigImg:hover{
transform: scale(3); transform: scale(3);
} }
...@@ -596,13 +596,14 @@ ...@@ -596,13 +596,14 @@
<i-button type="info" @click="exportExcel"><i class="fa fa-chevron-down"></i>&nbsp;导出 <i-button type="info" @click="exportExcel"><i class="fa fa-chevron-down"></i>&nbsp;导出
</i-button> </i-button>
#end #end
#if($shiro.hasPermission("tbcfstationitem:delete"))
<i-button type="error" @click="changeItemStatus(0)"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
#end
<i-button type="warning" @click="changeItemsTop"><i class="fa fa-arrow-down"></i>&nbsp;取消置顶 <i-button type="warning" @click="changeItemsTop"><i class="fa fa-arrow-down"></i>&nbsp;取消置顶
</i-button> </i-button>
<i-button type="success" @click="changeItemsunTop"><i class="fa fa-arrow-up"></i>置顶</i-button> <i-button type="success" @click="changeItemsunTop"><i class="fa fa-arrow-up"></i>置顶</i-button>
#if($shiro.hasPermission("tbcfstationitem:delete"))
<i-button type="error" @click="changeItemStatus(0)" :style="`margin-left:100px`"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
#end
</div> </div>
</div> </div>
...@@ -703,7 +704,7 @@ ...@@ -703,7 +704,7 @@
<Form-item label="成本价" prop="costPrice" style="width: 800px"> <Form-item label="成本价" prop="costPrice" style="width: 800px">
<i-input v-model="tbCfStationItem.costPrice" placeholder="成本价"/> <i-input v-model="tbCfStationItem.costPrice" placeholder="成本价"/>
</Form-item> </Form-item>
<Form-item label="商品图片" prop="itemImg"> <Form-item label="商品图片" prop="itemImg" >
<!-- <i-input v-model="xPicture.pictureUrl" placeholder="图片地址"/> --> <!-- <i-input v-model="xPicture.pictureUrl" placeholder="图片地址"/> -->
<upload <upload
multiple multiple
......
platform-admin/src/main/webapp/WEB-INF/page/sys/term.html
浏览文件 @ aa3b964b
...@@ -33,27 +33,57 @@ ...@@ -33,27 +33,57 @@
<Card v-show="!showList"> <Card v-show="!showList">
<p slot="title">{{title}}</p> <p slot="title">{{title}}</p>
<i-form ref="formValidate" :model="term" :rules="ruleValidate" :label-width="80"> <i-form ref="formValidate" :model="term" :rules="ruleValidate" :label-width="80">
<Form-item label="父条款ID，一级条款为0" prop="parentId"> <!-- <Form-item label="父条款ID，一级条款为0" prop="parentId">-->
<i-input v-model="term.parentId" placeholder="父条款ID，一级条款为0"/> <!-- <i-input v-model="term.parentId" placeholder="父条款ID，一级条款为0"/>-->
</Form-item> <!-- </Form-item>-->
<Form-item label="条款名称" prop="termName"> <Form-item label="条款名称" prop="termName">
<i-input v-model="term.termName" placeholder="条款名称"/> <i-input v-model="term.termName" placeholder="条款名称"/>
</Form-item> </Form-item>
<Form-item label="条款内容" prop="termContent">
<span>条款目录</span>
<select @change="changeProduct($event)">
<!-- <option v-model="term.termName">Volvo</option>-->
<option value="0">上级目录</option>
<option v-for="(el,index) in Allfa.list" :key="index" :value="el.id">{{el.termName}}</option>
<!-- <option :value="audi">Audi</option>-->
</select>
<!-- <Form-item label="上级菜单" v-if="term.type == 2" prop="parentName">-->
<!-- <i-input v-model="menu.parentName" @on-click="termTree" icon="eye" readonly="readonly"-->
<!-- placeholder="一级菜单"/>-->
<!-- </Form-item>-->
<!-- <Form-item label="上级菜单" v-if="term.type != 2">-->
<!-- <i-input v-model="menu.parentName" @on-click="termTree" icon="eye" readonly="readonly"-->
<!-- placeholder="一级菜单"/>-->
<!-- </Form-item>-->
<Form-item label="条款内容" prop="termContent" v-if="flag">
<i-input v-model="term.termContent" placeholder="条款内容"/> <i-input v-model="term.termContent" placeholder="条款内容"/>
</Form-item> </Form-item>
<Form-item label="创建时间" prop="createTime"> <Form-item label="条款内容" prop="termContent" v-if="!flag">
<i-input v-model="term.createTime" placeholder="创建时间"/> <i-input v-model="term.termContent" placeholder="父级不可用" readonly="readonly"/>
</Form-item>
<Form-item label="更新时间" prop="updateTime">
<i-input v-model="term.updateTime" placeholder="更新时间"/>
</Form-item>
<Form-item label="状态 0：无效 1：有效" prop="status">
<i-input v-model="term.status" placeholder="状态 0：无效 1：有效"/>
</Form-item> </Form-item>
<Form-item label="排序" prop="sort"> <!-- <Form-item label="创建时间" prop="createTime">-->
<i-input v-model="term.sort" placeholder="排序"/> <!-- <i-input v-model="term.createTime" placeholder="创建时间"/>-->
<!-- </Form-item>-->
<!-- <Form-item label="更新时间" prop="updateTime">-->
<!-- <i-input v-model="term.updateTime" placeholder="更新时间"/>-->
<!-- </Form-item>-->
<!-- <Form-item label="状态 0：无效 1：有效" prop="status">-->
<!-- <i-input v-model="term.status" placeholder="状态 0：无效 1：有效"/>-->
<!-- </Form-item>-->
<Form-item label="状态" prop="status">
<Radio-group v-model="term.status">
<Radio label="1">
<span>有效</span>
</Radio>
<Radio label="0">
<span>无效</span>
</Radio>
</Radio-group>
</Form-item> </Form-item>
<!-- <Form-item label="排序" prop="sort">-->
<!-- <i-input v-model="term.sort" placeholder="排序"/>-->
<!-- </Form-item>-->
<Form-item> <Form-item>
<i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button> <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
<i-button type="warning" @click="reload" style="margin-left: 8px"/>返回</i-button> <i-button type="warning" @click="reload" style="margin-left: 8px"/>返回</i-button>
......
platform-admin/src/main/webapp/js/sys/tbcfstationitem.js
浏览文件 @ aa3b964b
...@@ -8,9 +8,9 @@ $(function () { ...@@ -8,9 +8,9 @@ $(function () {
label: '商品图片', name: 'itemImg', index: 'item_img', width: 80, formatter: function (value, grid, rows) { label: '商品图片', name: 'itemImg', index: 'item_img', width: 80, formatter: function (value, grid, rows) {
if (value.indexOf(';')) { if (value.indexOf(';')) {
let firstImg = value.split(';')[0]; let firstImg = value.split(';')[0];
return '<img src="' + firstImg + '" style="width:50px;height:50px;" id="itemImg" />' return '<img src="' + firstImg + '" style="width:50px;height:50px;" id="itemImg" class="bigImg"/>'
} }
return '<img src="' + value + '" style="width:50px;height:50px;" id="itemImg" //>' return '<img src="' + value + '" style="width:50px;height:50px;" id="itemImg" class="bigImg" //>'
} }
}, },
{label: '商品编号', name: 'itemCode', index: 'item_code', width: 60}, {label: '商品编号', name: 'itemCode', index: 'item_code', width: 60},
......
platform-admin/src/main/webapp/js/sys/term.js
浏览文件 @ aa3b964b
...@@ -2,14 +2,15 @@ $(function () { ...@@ -2,14 +2,15 @@ $(function () {
$("#jqGrid").Grid({ $("#jqGrid").Grid({
url: '../term/list', url: '../term/list',
colModel: [ colModel: [
{label: 'id', name: 'id', index: 'id', key: true, hidden: true}, // {label: 'id', name: 'id', index: 'id', key: true, hidden: true},
{label: '父条款ID，一级条款为0', name: 'parentId', index: 'parent_id', width: 80}, // {label: '父条款ID，一级条款为0', name: 'parentId', index: 'parent_id', width: 80},
{label: '条款名称', name: 'termName', index: 'term_name', width: 80}, {label: '条款名称', name: 'termName', index: 'term_name', width: 80},
{label: '条款内容', name: 'termContent', index: 'term_content', width: 80}, {label: '条款内容', name: 'termContent', index: 'term_content', width: 80},
{label: '创建时间', name: 'createTime', index: 'create_time', width: 80}, {label: '创建时间', name: 'createTime', index: 'create_time', width: 80},
{label: '更新时间', name: 'updateTime', index: 'update_time', width: 80}, // {label: '更新时间', name: 'updateTime', index: 'update_time', width: 80},
{label: '状态 0：无效 1：有效', name: 'status', index: 'status', width: 80}, {label: '状态 0：无效 1：有效', name: 'status', index: 'status', width: 80},
{label: '排序', name: 'sort', index: 'sort', width: 80}] // {label: '排序', name: 'sort', index: 'sort', width: 80}
]
}); });
}); });
...@@ -18,7 +19,7 @@ let vm = new Vue({ ...@@ -18,7 +19,7 @@ let vm = new Vue({
data: { data: {
showList: true, showList: true,
title: null, title: null,
term: {}, term: {parentId:'0'},
ruleValidate: { ruleValidate: {
name: [ name: [
{required: true, message: '名称不能为空', trigger: 'blur'} {required: true, message: '名称不能为空', trigger: 'blur'}
...@@ -26,7 +27,9 @@ let vm = new Vue({ ...@@ -26,7 +27,9 @@ let vm = new Vue({
}, },
q: { q: {
name: '' name: ''
} },
Allfa:{},
flag:false
}, },
methods: { methods: {
query: function () { query: function () {
...@@ -36,6 +39,7 @@ let vm = new Vue({ ...@@ -36,6 +39,7 @@ let vm = new Vue({
vm.showList = false; vm.showList = false;
vm.title = "新增"; vm.title = "新增";
vm.term = {}; vm.term = {};
vm.getFainfo();
}, },
update: function (event) { update: function (event) {
let id = getSelectedRow("#jqGrid"); let id = getSelectedRow("#jqGrid");
...@@ -66,7 +70,6 @@ let vm = new Vue({ ...@@ -66,7 +70,6 @@ let vm = new Vue({
if (ids == null){ if (ids == null){
return; return;
} }
confirm('确定要删除选中的记录？', function () { confirm('确定要删除选中的记录？', function () {
Ajax.request({ Ajax.request({
url: "../term/delete", url: "../term/delete",
...@@ -112,6 +115,36 @@ let vm = new Vue({ ...@@ -112,6 +115,36 @@ let vm = new Vue({
}, },
handleReset: function (name) { handleReset: function (name) {
handleResetForm(this, name); handleResetForm(this, name);
},
changeProduct(e) {
vm.term.parentId = e.target.value
console.log(vm.term.parentId)
if(vm.term.parentId == 0){
vm.flag = false;
}else {
vm.flag = true;
}
},
getFainfo(){
Ajax.request({
url: "../term/queryAll",
async: true,
successCallback: function (r) {
console.log(r)
vm.Allfa = r
}
});
} }
},
created(){
Ajax.request({
url: "../term/queryAll",
async: true,
successCallback: function (r) {
// console.log(r)
vm.Allfa = r
}
});
// console.log(this.term.parentId)
} }
}); });
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论