Skip to content

C
chinafrica
提交 4fa67205 authored 作者: zhengfg's avatar zhengfg
浏览文件
操作

修改图片上传样式

上级 30d206bb
隐藏空白字符变更
内嵌 并排
正在显示 包含 157 行增加 和 26 行删除
platform-admin/src/main/java/com/platform/entity/TbCfCouponUseEntity.java
浏览文件 @ 4fa67205
...@@ -30,6 +30,27 @@ public class TbCfCouponUseEntity implements Serializable { ...@@ -30,6 +30,27 @@ public class TbCfCouponUseEntity implements Serializable {
*/ */
private Date useTime; private Date useTime;
private String name;
private String title;
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
/** /**
* 设置：使用id * 设置：使用id
*/ */
......
platform-admin/src/main/resources/com/platform/dao/TbCfCouponUseDao.xml
浏览文件 @ 4fa67205
...@@ -21,12 +21,17 @@ ...@@ -21,12 +21,17 @@
</select> </select>
<select id="queryList" resultType="com.platform.entity.TbCfCouponUseEntity"> <select id="queryList" resultType="com.platform.entity.TbCfCouponUseEntity">
select SELECT
`use_id`, t1.use_id,
`user_id`, t1.user_id,
`coupon_id`, t1.coupon_id,
`use_time` t1.use_time,
from tb_cf_coupon_use t2.nick name,
t3.coupon_title title
FROM
tb_cf_coupon_use t1
LEFT JOIN tb_cf_user_info t2 ON t1.user_id = t2.user_id
LEFT JOIN tb_cf_coupon t3 ON t1.coupon_id = t3.coupon_id
WHERE 1=1 WHERE 1=1
<if test="name != null and name.trim() != ''"> <if test="name != null and name.trim() != ''">
AND name LIKE concat('%',#{name},'%') AND name LIKE concat('%',#{name},'%')
......
platform-admin/src/main/webapp/WEB-INF/page/sys/tbcfcoupon.html
浏览文件 @ 4fa67205
...@@ -223,7 +223,7 @@ ...@@ -223,7 +223,7 @@
<el-table-column property="nick" label="用户昵称"></el-table-column> <el-table-column property="nick" label="用户昵称"></el-table-column>
<el-table-column property="account" label="用户账号"></el-table-column> <el-table-column property="account" label="用户账号"></el-table-column>
<el-table-column property="createTime" label="领取时间"></el-table-column> <el-table-column property="createTime" label="领取时间"></el-table-column>
<el-table-column property="enableFlag" label="是否已经使用，0已使用，1未使用"></el-table-column> <el-table-column property="enableFlag" label="是否已经使用"></el-table-column>
</el-table> </el-table>
</el-dialog> </el-dialog>
<!-- 发放详情 --> <!-- 发放详情 -->
...@@ -233,7 +233,7 @@ ...@@ -233,7 +233,7 @@
<el-table-column property="nick" label="用户昵称"></el-table-column> <el-table-column property="nick" label="用户昵称"></el-table-column>
<el-table-column property="account" label="用户账号"></el-table-column> <el-table-column property="account" label="用户账号"></el-table-column>
<el-table-column property="createTime" label="领取时间"></el-table-column> <el-table-column property="createTime" label="领取时间"></el-table-column>
<el-table-column property="enableFlag" label="是否已经使用，0已使用，1未使用"></el-table-column> <el-table-column property="enableFlag" label="是否已经使用"></el-table-column>
</el-table> </el-table>
</el-dialog> </el-dialog>
......
platform-admin/src/main/webapp/WEB-INF/page/sys/tbcfplatform.html
浏览文件 @ 4fa67205
<!DOCTYPE html> <!DOCTYPE html>
<html> <html xmlns:v-bind="http://www.w3.org/1999/xhtml">
<head> <head>
<title>平台管理</title> <title>平台管理</title>
#parse("sys/header.html") #parse("sys/header.html")
...@@ -50,8 +50,12 @@ ...@@ -50,8 +50,12 @@
<Form-item label="平台链接" prop="platformUrl"> <Form-item label="平台链接" prop="platformUrl">
<i-input v-model="tbCfPlatform.platformUrl" placeholder="平台链接"/> <i-input v-model="tbCfPlatform.platformUrl" placeholder="平台链接"/>
</Form-item> </Form-item>
<Form-item label="平台图片" prop="platformImg"> <!--<Form-item label="平台图片" prop="platformImg">
<i-input v-model="tbCfPlatform.platformImg" placeholder="平台图片"/> <i-input v-model="tbCfPlatform.platformImg" placeholder="平台图片"/>
</Form-item>-->
<Form-item label="主营商品图片" prop="platformImg">
<img v-bind:src="tbCfPlatform.platformImg" style="width:200px;height:200px;" v-show="!!tbCfPlatform.platformImg"/>
<input type="file" placeholder="主营商品图片" @change="tirggerFile($event)"/>
</Form-item> </Form-item>
<Form-item label="启用状态" prop="enableFlag"> <Form-item label="启用状态" prop="enableFlag">
<i-input v-model="tbCfPlatform.enableFlag" placeholder="启用状态"/> <i-input v-model="tbCfPlatform.enableFlag" placeholder="启用状态"/>
......
platform-admin/src/main/webapp/WEB-INF/page/sys/tbcfstore.html
浏览文件 @ 4fa67205
<!DOCTYPE html> <!DOCTYPE html>
<html> <html xmlns:v-bind="http://www.w3.org/1999/xhtml">
<head> <head>
<title>店铺管理</title> <title>店铺管理</title>
#parse("sys/header.html") #parse("sys/header.html")
...@@ -50,15 +50,25 @@ ...@@ -50,15 +50,25 @@
<Form-item label="店铺链接" prop="storeUrl"> <Form-item label="店铺链接" prop="storeUrl">
<i-input v-model="tbCfStore.storeUrl" placeholder="店铺链接"/> <i-input v-model="tbCfStore.storeUrl" placeholder="店铺链接"/>
</Form-item> </Form-item>
<Form-item label="主营商品图片" prop="itemImg2"> <!-- <Form-item label="主营商品图片" prop="itemImg2">
<i-input v-model="tbCfStore.itemImg2" placeholder="主营商品图片"/> <i-input v-model="tbCfStore.itemImg2" placeholder="主营商品图片"/>
</Form-item>-->
<Form-item label="主营商品图片" prop="itemImg2">
<img v-bind:src="tbCfStore.itemImg2" style="width:200px;height:200px;" v-show="!!tbCfStore.itemImg2"/>
<input type="file" placeholder="主营商品图片" @change="tirggerFile($event)"/>
</Form-item> </Form-item>
<Form-item label="主营商品图片" prop="itemImg1"> <Form-item label="主营商品图片" prop="itemImg1">
<i-input v-model="tbCfStore.itemImg1" placeholder="主营商品图片"/> <img v-bind:src="tbCfStore.itemImg1" style="width:200px;height:200px;" v-show="!!tbCfStore.itemImg1"/>
<input type="file" placeholder="主营商品图片" @change="tirggerFile1($event)"/>
</Form-item> </Form-item>
<Form-item label="店铺图片" prop="storeImg"> <!-- <Form-item label="店铺图片" prop="storeImg">
<i-input v-model="tbCfStore.storeImg" placeholder="店铺图片"/> <i-input v-model="tbCfStore.storeImg" placeholder="店铺图片"/>
</Form-item> </Form-item>-->
<Form-item label="主营商品图片" prop="storeImg">
<img v-bind:src="tbCfStore.storeImg" style="width:200px;height:200px;" v-show="!!tbCfStore.storeImg"/>
<input type="file" placeholder="店铺图片" @change="tirggerStore($event)"/>
</Form-item>
<Form-item label="所属平台" prop="platformCode"> <Form-item label="所属平台" prop="platformCode">
<i-input v-model="tbCfStore.platformCode" placeholder="所属平台"/> <i-input v-model="tbCfStore.platformCode" placeholder="所属平台"/>
</Form-item> </Form-item>
......
platform-admin/src/main/webapp/WEB-INF/page/sys/tbcfuserinfo.html
浏览文件 @ 4fa67205
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<i-input v-model="tbCfUserInfo.userNo" placeholder="用户编号"/> <i-input v-model="tbCfUserInfo.userNo" placeholder="用户编号"/>
</Form-item> </Form-item>
<Form-item label="用户类型" prop="userType"> <Form-item label="用户类型" prop="userType">
<i-input v-model="tbCfUserInfo.userType" placeholder="用户类型（1邮箱、2facebook、3twitter）"/> <i-input v-model="tbCfUserInfo.userType" placeholder="用户类型"/>
</Form-item> </Form-item>
<Form-item label="账号" prop="account"> <Form-item label="账号" prop="account">
<i-input v-model="tbCfUserInfo.account" placeholder="账号"/> <i-input v-model="tbCfUserInfo.account" placeholder="账号"/>
......
platform-admin/src/main/webapp/js/sys/tbcfcountryconfig.js
浏览文件 @ 4fa67205
...@@ -10,7 +10,7 @@ $(function () { ...@@ -10,7 +10,7 @@ $(function () {
{label: '英文名', name: 'englishName', index: 'english_name', width: 80}, {label: '英文名', name: 'englishName', index: 'english_name', width: 80},
{label: '缩写名', name: 'shortName', index: 'short_name', width: 80}, {label: '缩写名', name: 'shortName', index: 'short_name', width: 80},
{label: '是否有下一级', name: 'endFlag', index: 'end_flag', width: 80}, {label: '是否有下一级', name: 'endFlag', index: 'end_flag', width: 80},
{label: '是否启用', name: 'enableFlag', index: 'enable_flag', width: 80}] {label: '是否启用', name: 'enableFlag', index: 'enable_flag', width: 80,formatter:yesOrNoFormat}]
}); });
}); });
......
platform-admin/src/main/webapp/js/sys/tbcfcouponuse.js
浏览文件 @ 4fa67205
...@@ -3,8 +3,8 @@ $(function () { ...@@ -3,8 +3,8 @@ $(function () {
url: '../tbcfcouponuse/list', url: '../tbcfcouponuse/list',
colModel: [ colModel: [
{label: 'useId', name: 'useId', index: 'use_id', key: true, hidden: true}, {label: 'useId', name: 'useId', index: 'use_id', key: true, hidden: true},
{label: '用户id', name: 'userId', index: 'user_id', width: 80}, {label: '用户名称', name: 'name', index: 'name', width: 80},
{label: '优惠券id', name: 'couponId', index: 'coupon_id', width: 80}, {label: '优惠券名称', name: 'title', index: 'title', width: 80},
{label: '使用时间', name: 'useTime', index: 'use_time', width: 80}] {label: '使用时间', name: 'useTime', index: 'use_time', width: 80}]
}); });
}); });
......
platform-admin/src/main/webapp/js/sys/tbcfplatform.js
浏览文件 @ 4fa67205
...@@ -113,6 +113,28 @@ let vm = new Vue({ ...@@ -113,6 +113,28 @@ let vm = new Vue({
}, },
handleReset: function (name) { handleReset: function (name) {
handleResetForm(this, name); handleResetForm(this, name);
} },tirggerFile : function (event) {
var file = event.target.files[0]; // (利用console.log输出看file文件对象)
var formData = new FormData();
formData.append("file",file);
$.ajax({
url: "../api/upload/image/",
type: "POST",
data:formData,
cache:false, //不设置缓存
processData: false, // 不处理数据
contentType: false,// 不设置内容类型
success: function (result) {
result=JSON.parse(result);
//console.log(result)
if (result.errno == 0) {//成功
vm.tbCfPlatform.platformImg=result.data;
vm.$forceUpdate();
} else {
iview.Message.error(result.errmsg);
}
}
});
}
} }
}); });
\ No newline at end of file
platform-admin/src/main/webapp/js/sys/tbcfstore.js
浏览文件 @ 4fa67205
...@@ -116,6 +116,75 @@ let vm = new Vue({ ...@@ -116,6 +116,75 @@ let vm = new Vue({
}, },
handleReset: function (name) { handleReset: function (name) {
handleResetForm(this, name); handleResetForm(this, name);
} },
tirggerFile : function (event) {
var file = event.target.files[0]; // (利用console.log输出看file文件对象)
var formData = new FormData();
formData.append("file",file);
$.ajax({
url: "../api/upload/image/",
type: "POST",
data:formData,
cache:false, //不设置缓存
processData: false, // 不处理数据
contentType: false,// 不设置内容类型
success: function (result) {
result=JSON.parse(result);
//console.log(result)
if (result.errno == 0) {//成功
vm.tbCfStore.itemImg2=result.data;
vm.$forceUpdate();
} else {
iview.Message.error(result.errmsg);
}
}
});
},
tirggerFile1 : function (event) {
var file = event.target.files[0]; // (利用console.log输出看file文件对象)
var formData = new FormData();
formData.append("file",file);
$.ajax({
url: "../api/upload/image/",
type: "POST",
data:formData,
cache:false, //不设置缓存
processData: false, // 不处理数据
contentType: false,// 不设置内容类型
success: function (result) {
result=JSON.parse(result);
//console.log(result)
if (result.errno == 0) {//成功
vm.tbCfStore.itemImg1=result.data;
vm.$forceUpdate();
} else {
iview.Message.error(result.errmsg);
}
}
});
},
tirggerStore : function (event) {
var file = event.target.files[0]; // (利用console.log输出看file文件对象)
var formData = new FormData();
formData.append("file",file);
$.ajax({
url: "../api/upload/image/",
type: "POST",
data:formData,
cache:false, //不设置缓存
processData: false, // 不处理数据
contentType: false,// 不设置内容类型
success: function (result) {
result=JSON.parse(result);
//console.log(result)
if (result.errno == 0) {//成功
vm.tbCfStore.storeImg=result.data;
vm.$forceUpdate();
} else {
iview.Message.error(result.errmsg);
}
}
});
}
} }
}); });
\ No newline at end of file
platform-admin/src/main/webapp/js/sys/tbcftakecoupon.js
浏览文件 @ 4fa67205
...@@ -9,7 +9,7 @@ $(function () { ...@@ -9,7 +9,7 @@ $(function () {
{label: '优惠券名称', name: 'couponTitle', index: 'couponTitle', width: 80}, {label: '优惠券名称', name: 'couponTitle', index: 'couponTitle', width: 80},
{label: '用户昵称', name: 'nick', index: 'nick', width: 80}, {label: '用户昵称', name: 'nick', index: 'nick', width: 80},
{label: '领取时间', name: 'createTime', index: 'create_time', width: 80}, {label: '领取时间', name: 'createTime', index: 'create_time', width: 80},
{label: '是否已经使用，0已使用，1未使用', name: 'enableFlag', index: 'enable_flag', width: 80}] {label: '是否已经使用', name: 'enableFlag', index: 'enable_flag', width: 80,formatter:yesOrNoFormat}]
}); });
}); });
......
platform-common/pom.xml
浏览文件 @ 4fa67205
...@@ -177,7 +177,7 @@ ...@@ -177,7 +177,7 @@
</dependency> </dependency>
<!--QRCode --> <!--QRCode -->
<dependency> <!-- <dependency>
<groupId>QRCode</groupId> <groupId>QRCode</groupId>
<artifactId>QRCode</artifactId> <artifactId>QRCode</artifactId>
<version>1.0</version> <version>1.0</version>
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
<groupId>sun.misc</groupId> <groupId>sun.misc</groupId>
<artifactId>sun.misc</artifactId> <artifactId>sun.misc</artifactId>
<version>1.0</version> <version>1.0</version>
</dependency> </dependency>-->
<!-- 二维码生成工具 --> <!-- 二维码生成工具 -->
<dependency> <dependency>
...@@ -216,7 +216,7 @@ ...@@ -216,7 +216,7 @@
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<version>2.4</version> <version>2.4</version>
</dependency> </dependency>
<dependency> <!--<dependency>
<groupId>json</groupId> <groupId>json</groupId>
<artifactId>json</artifactId> <artifactId>json</artifactId>
<version>0.1</version> <version>0.1</version>
...@@ -225,7 +225,7 @@ ...@@ -225,7 +225,7 @@
<groupId>ueditor</groupId> <groupId>ueditor</groupId>
<artifactId>ueditor</artifactId> <artifactId>ueditor</artifactId>
<version>1.1.2</version> <version>1.1.2</version>
</dependency> </dependency>-->
</dependencies> </dependencies>
</project> </project>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论