diff --git a/src/main/java/com/tianpengtech/admin/fair/FairAdminServiceImpl.java b/src/main/java/com/tianpengtech/admin/fair/FairAdminServiceImpl.java index 3bf5007aac888617ab22546ccb3f0091a879cb36..2b21723b59de868ad7895c6ef38f9aff2806f215 100644 --- a/src/main/java/com/tianpengtech/admin/fair/FairAdminServiceImpl.java +++ b/src/main/java/com/tianpengtech/admin/fair/FairAdminServiceImpl.java @@ -36,7 +36,7 @@ public class FairAdminServiceImpl extends AbstractAdmin implements IAdminOpt{ Fair fair = new FairService().findByMobile(model.getStr(Fair.MOIBILE)); Validator validator = new Validator(); - validator.addRule(new StringLengthBetween(model.getStr(Fair.NICK_NAME), "昵称只能是1-50个字符", 1, 50)); + validator.addRule(new StringLengthBetween(model.getStr(Fair.NICK_NAME), "昵称只能是1-15个字符", 1, 15)); // validator.addRule(new StringLengthBetween(model.getStr(Fair.ID_CARD), "请输入正确的身份证号码", 1,18)); validator.addRule(new StringMustBeMobile(model.getStr(Fair.MOIBILE), "请输入正确的手机号码格式")); validator.addRule(new MustBeNull(fair, "当前手机号已经存在")); @@ -61,7 +61,7 @@ public class FairAdminServiceImpl extends AbstractAdmin implements IAdminOpt{ public void beforeUpdate(Model<?> model) throws ValidateException { Validator validator = new Validator(); - validator.addRule(new StringLengthBetween(model.getStr(Fair.NICK_NAME), "昵称只能是1-50个字符", 1, 50)); + validator.addRule(new StringLengthBetween(model.getStr(Fair.NICK_NAME), "昵称只能是1-15个字符", 1, 15)); validator.addRule(new StringMustBeMobile(model.getStr(Fair.MOIBILE), "请输入正确的手机号码格式")); // validator.addRule(new NumbericMustBetween(model.getInt(Fair.AGE), "请输入正确的年龄范围(1-99)", 1, 99)); // validator.addRule(new StringMustBeRequired(model.getStr(Fair.HEIGHT), "请输入身高")); diff --git a/src/main/java/com/tianpengtech/admin/task/TaskAdminServiceImpl.java b/src/main/java/com/tianpengtech/admin/task/TaskAdminServiceImpl.java index c3e61edb6dd05b761ed72ee59ecd1ffac4e93aff..b178fb925c59710114ab7396f367b3149a4a835a 100644 --- a/src/main/java/com/tianpengtech/admin/task/TaskAdminServiceImpl.java +++ b/src/main/java/com/tianpengtech/admin/task/TaskAdminServiceImpl.java @@ -23,6 +23,7 @@ import com.tianpengtech.common.model.task.Task; import com.tianpengtech.common.model.user.User; import com.tianpengtech.common.search.EqualCondition; import com.tianpengtech.common.search.LikeCondition; +import com.tianpengtech.common.search.NotEqualCondition; import com.tianpengtech.common.search.QueryConstructor; import com.tianpengtech.common.util.XxxUtil; import com.tianpengtech.common.validator.Validator; @@ -64,7 +65,8 @@ public class TaskAdminServiceImpl extends AbstractAdmin implements IAdminOpt{ public void builderSQLExpected(Model< ? > model, QueryConstructor queryConstruct, Map< String, Object > params) { queryConstruct - .and(new EqualCondition(Task.DELETETAG, Task.DELETE_STATUS_NO)); + .and(new EqualCondition(Task.DELETETAG, Task.DELETE_STATUS_NO)) + .and(new NotEqualCondition(Task.STATUS, Task.STATUS_WAIT)); String task_title = model.getStr(Task.TASK_TITLE); if(StringUtils.isNotEmpty(task_title)){ queryConstruct diff --git a/src/main/java/com/tianpengtech/common/model/fair/Fair.java b/src/main/java/com/tianpengtech/common/model/fair/Fair.java index a0fb2f48597aaabcd6ac0e790d404c7a41f17544..08c2f8df92b11830f83b0f7ff60dac2509c21cf4 100644 --- a/src/main/java/com/tianpengtech/common/model/fair/Fair.java +++ b/src/main/java/com/tianpengtech/common/model/fair/Fair.java @@ -45,6 +45,7 @@ public class Fair extends AbstractBaseModel<Fair> { public static final String MOIBILE="mobile"; //手机号码 public static final String PASS_WORD="password"; //密码 public static final String ID_CARD="id_card"; //身份证 + public static final String PERSONAL_PHOTO="personal_photo"; //个人形象照片 public static final int STATUS_APPROVING=1; diff --git a/src/main/java/com/tianpengtech/front/web/fair/FairService.java b/src/main/java/com/tianpengtech/front/web/fair/FairService.java index 74f7da0438adc2d2dab0f73ae1791d1e5667d64d..9a69b7ecd3f0e92eb2265892ec69e261e0687c61 100644 --- a/src/main/java/com/tianpengtech/front/web/fair/FairService.java +++ b/src/main/java/com/tianpengtech/front/web/fair/FairService.java @@ -99,7 +99,8 @@ public class FairService { * @return */ public Fair findById(int id){ - return fairDao.findFirstByCache(Fair.FAIR_CACHE_NAME,"fair_info_"+id,"select * from "+Fair.dao.tableName()+" where " +Fair.DELETETAG + "=? and "+Fair.ID+"=?",0,id); +// return fairDao.findFirstByCache(Fair.FAIR_CACHE_NAME,"fair_info_"+id,"select * from "+Fair.dao.tableName()+" where " +Fair.DELETETAG + "=? and "+Fair.ID+"=?",0,id); + return fairDao.findFirst("select * from "+Fair.dao.tableName()+" where " +Fair.DELETETAG + "=? and "+Fair.ID+"=?",0,id); } diff --git a/src/main/java/com/tianpengtech/front/web/task/TaskService.java b/src/main/java/com/tianpengtech/front/web/task/TaskService.java index dd83c2c6a180764583501332b71ae9473d9ffcb8..d1091a061a73c35d05b89e14f2eba598a2691dac 100644 --- a/src/main/java/com/tianpengtech/front/web/task/TaskService.java +++ b/src/main/java/com/tianpengtech/front/web/task/TaskService.java @@ -289,7 +289,7 @@ public class TaskService { List<Object> param=new ArrayList<>(); String s = "select *,task.status as status,task.id as id "; StringBuffer sql= new StringBuffer(" from " + taskDao.tableName() + " task left join " + TaskWh.dao.tableName() + " wh on task." + Task.ID + "=wh." + TaskWh.TASK_ID +" left join "+Fair.dao.tableName()+" fair on fair."+Fair.ID+"=wh."+TaskWh.WH_ID); - sql.append(" where task." + Task.DELETETAG+"=? and task."+Task.CREATE_USER+"=? " ); + sql.append(" where task." + Task.DELETETAG+"=? and task."+Task.CREATE_USER+"=? and task."+Task.STATUS+"<>"+Task.STATUS_WAIT ); param.add(Task.DELETE_STATUS_NO); param.add(params.get("user")); if (params!=null) { diff --git a/src/main/java/com/tianpengtech/front/web/task/TaskWebController.java b/src/main/java/com/tianpengtech/front/web/task/TaskWebController.java index 4b61eb45b5e72ea2b841122345e6502976717b9f..55fcf558e5c2119fac779747f2866c3297e44a31 100644 --- a/src/main/java/com/tianpengtech/front/web/task/TaskWebController.java +++ b/src/main/java/com/tianpengtech/front/web/task/TaskWebController.java @@ -118,8 +118,6 @@ public class TaskWebController extends BaseController { if (task.getInt(Task.EXTENSION_TYPE) == Task.EXT_TYPE_ZD) { // 如果是指定主播, 跳转到选择主播页面 setAttr("task", task.get(Task.ID)); - PushKit.pushSystemMessageNow( - "用户【" + user.getStr(User.MOBILE) + "】发布了任务《" + task.getStr(Task.TASK_TITLE) + "》"); forwardAction("/platform/task/choiceFairNew"); } else { // 如果是认领,跳转到创建成功页面 @@ -157,6 +155,7 @@ public class TaskWebController extends BaseController { @Before(Tx.class) public void saveTaskWait() { // String[] fairs=getParaValues("fairs"); + User user = getAttr(LoginService.loginAccountCacheName); String fairsStr = getPara("fairs"); String[] fairs = fairsStr.split(","); if (fairs == null || fairs.length == 0) { @@ -170,8 +169,11 @@ public class TaskWebController extends BaseController { } Ret ret = service.saveTaskWait(fairs, task); if (ret.isOk()) { - setAttr("task", service.findTaskById(task)); + Task temp = service.findTaskById(task); + setAttr("task",temp); setAttr("fairs", fairService.findByWhite(task)); + PushKit.pushSystemMessageNow( + "用户【" + user.getStr(User.MOBILE) + "】发布了任务《" + temp.getStr(Task.TASK_TITLE) + "》"); render("task_success.html"); } else { renderJson(ret); @@ -268,4 +270,14 @@ public class TaskWebController extends BaseController { redirect("/platform/task/taskSource?id=" + id); } + + public void viewH5(){ + + renderTemplate("h5_preview.html"); + } + + public void showH5(){ + + renderTemplate("showH5.html"); + } } diff --git a/src/main/webapp/WEB-INF/view/admin/fair/add-fair.html b/src/main/webapp/WEB-INF/view/admin/fair/add-fair.html index 121d64b7b4c7af450ffc61159c0bd99453f0a7cc..eb84b6843129ecea92e93668b29e4d55872e4d8f 100644 --- a/src/main/webapp/WEB-INF/view/admin/fair/add-fair.html +++ b/src/main/webapp/WEB-INF/view/admin/fair/add-fair.html @@ -42,7 +42,7 @@ }); - function initUploader(){ + function initUploader(id,width,height){ var srcStr; var uploader = WebUploader.create({ auto: true, @@ -50,7 +50,7 @@ swf: '#(contextPath)/assets/front/web/script/upload/Uploader.swf', server: '#(contextPath)/qiniu/upload', pick: { - id:'#fileClick' + id:id }, accept: { title: 'Images', @@ -60,7 +60,7 @@ }); // 当有文件添加进来的时候 uploader.on( 'fileQueued', function( file ) { - var up=$("#prew"); + var up=$(id+"_prew"); // 创建缩略图 // thumbnailWidth x thumbnailHeight 为 100 x 100 uploader.makeThumb( file, function( error, src ) { @@ -69,15 +69,20 @@ return; } up.html('文件正在上传中,请稍候') - }, "55", "55" ); + }, width, height); }); //文件上传成功处理 uploader.on( 'uploadSuccess', function( file,resp ) { - var up=$("#prew"); - var s='<img src="'+resp._raw+'" style="border-radius:50%;" width="55px;">'; + var up=$(id+"_prew"); + + if(id=="#fileClick"){ + var s='<img src="'+resp._raw+'" style="border-radius:50%;" width="55px;">'; + }else{ + var s='<img src="'+resp._raw+'" width="200px;">'; + } + up.html(s); - console.log(resp._raw); - $("#fairPhoto").val(resp._raw); + $(id+"_hidden").val(resp._raw); }); //文件上传失败处理 uploader.on( 'uploadError', function( file ) { @@ -90,7 +95,8 @@ $(document).ready(function(){ - initUploader(); + initUploader('#fileClick',"55","55"); + initUploader('#personal_photo',"100","100"); }); </script> #define main() diff --git a/src/main/webapp/WEB-INF/view/admin/fair/edit-fair.html b/src/main/webapp/WEB-INF/view/admin/fair/edit-fair.html index b6ce97fe2e439210744cdce9179f0ee417ff31bb..0cbe935c90f702ed0977d92bd4eb3bc9ec684a70 100644 --- a/src/main/webapp/WEB-INF/view/admin/fair/edit-fair.html +++ b/src/main/webapp/WEB-INF/view/admin/fair/edit-fair.html @@ -60,7 +60,7 @@ }); - function initUploader(){ + function initUploader(id,width,height){ var srcStr; var uploader = WebUploader.create({ auto: true, @@ -68,7 +68,7 @@ swf: '#(contextPath)/assets/front/web/script/upload/Uploader.swf', server: '#(contextPath)/qiniu/upload', pick: { - id:'#fileClick' + id:id }, accept: { title: 'Images', @@ -78,7 +78,7 @@ }); // 当有文件添加进来的时候 uploader.on( 'fileQueued', function( file ) { - var up=$("#prew"); + var up=$(id+"_prew"); // 创建缩略图 // thumbnailWidth x thumbnailHeight 为 100 x 100 uploader.makeThumb( file, function( error, src ) { @@ -87,15 +87,19 @@ return; } up.html('文件正在上传中,请稍候') - }, "55", "55" ); + }, width, height); }); //文件上传成功处理 uploader.on( 'uploadSuccess', function( file,resp ) { - var up=$("#prew"); - var s='<img src="'+resp._raw+'" style="border-radius:50%;" width="55px;">'; + var up=$(id+"_prew"); + + if(id=="#fileClick"){ + var s='<img src="'+resp._raw+'" style="border-radius:50%;" width="55px;">'; + }else{ + var s='<img src="'+resp._raw+'" width="200px;">'; + } up.html(s); - console.log(resp._raw); - $("#fairPhoto").val(resp._raw); + $(id+"_hidden").val(resp._raw); }); //文件上传失败处理 uploader.on( 'uploadError', function( file ) { @@ -108,7 +112,8 @@ $(document).ready(function(){ - initUploader(); + initUploader('#fileClick',"55","55"); + initUploader('#personal_photo',"100","100"); }); </script> #define main() diff --git a/src/main/webapp/WEB-INF/view/admin/fair/fair-form.html b/src/main/webapp/WEB-INF/view/admin/fair/fair-form.html index 70a9c35c531265cdbee8130b6f576ef284eacbcc..c60db2477336b68cb73a95dc2ba5ae757df74df2 100644 --- a/src/main/webapp/WEB-INF/view/admin/fair/fair-form.html +++ b/src/main/webapp/WEB-INF/view/admin/fair/fair-form.html @@ -2,17 +2,31 @@ <label class="form-label col-xs-4 col-sm-3"><span class="c-red">*</span>头像:</label> <div class="formControls col-xs-8 col-sm-9"> <div id="fileClick">选择头像</div> - <div id="prew"> + <div id="fileClick_prew"> #if(fair??) <img src="#(fair.photo??'')" style="border-radius:50%;" width="55px;"> #end </div> <input type="hidden" value="#(fair.photo??'')" - id="fairPhoto" name="fair.photo"> + id="fileClick_hidden" name="fair.photo"> </div> </div> + <div class="row cl"> + <label class="form-label col-xs-4 col-sm-3"><span class="c-red">*</span>个人形象照:</label> + <div class="formControls col-xs-8 col-sm-9"> + <div id="personal_photo">选择照片(360*270)</div> + <div id="personal_photo_prew"> + #if(fair??) + <img src="#(fair.personal_photo??'')" width="200px;"> + #end + </div> + + <input type="hidden" value="#(fair.personal_photo??'')" + id="personal_photo_hidden" name="fair.personal_photo"> + </div> + </div> <div class="row cl"> <label class="form-label col-xs-4 col-sm-3"><span class="c-red">*</span>昵称:</label> <div class="formControls col-xs-8 col-sm-9"> diff --git a/src/main/webapp/WEB-INF/view/admin/fair/fair-list.html b/src/main/webapp/WEB-INF/view/admin/fair/fair-list.html index e4c4acfc9150cdc3a755e47994f1acb55dfe9f28..80887ccffb4f9787a893d5497215b19abfe88449 100644 --- a/src/main/webapp/WEB-INF/view/admin/fair/fair-list.html +++ b/src/main/webapp/WEB-INF/view/admin/fair/fair-list.html @@ -26,7 +26,7 @@ { "data": "mobile" }, { "data": "age" }, { "data": "height" }, - { "data": "fans" }, + /* { "data": "fans" }, */ { "data": "status"}, { "data": "create_time" }, { "data": function(data){ @@ -136,7 +136,7 @@ <th>手机号码</th> <th>年龄</th> <th>身高</th> - <th>粉丝(人)</th> + <!-- <th>粉丝(人)</th> --> <th>审核状态</th> <th>创建时间</th> <th>操作</th> diff --git a/src/main/webapp/WEB-INF/view/web/fair/fair_detail.html b/src/main/webapp/WEB-INF/view/web/fair/fair_detail.html index 97a5f7b62b72baf46258039e99bef1e5fe05036f..5f9fa99db3668ca55bf73bcdbd4d386fa75ffb68 100644 --- a/src/main/webapp/WEB-INF/view/web/fair/fair_detail.html +++ b/src/main/webapp/WEB-INF/view/web/fair/fair_detail.html @@ -8,7 +8,11 @@ <div class="u-title">个人信息</div> <div class="m-box-row"> <div class="m-card"> - <div class="u-photo"></div> + #if(fair.personal_photo??) + <img src="#(fair.personal_photo)" width="360" height="270"> + #else + <div class="u-photo"></div> + #end <div class="u-info"> <div class="u-info-title">基本信息</div> <ul class="u-info-list"> @@ -90,7 +94,7 @@ <div class="u-content-value">转化量:xxxx</div> <div class="u-content-value">已完成</div> <div class="u-content-value "> - <div class="u-content-btn">评论(xxx)</div> + <div class="u-content-btn" style="border-radius:3px;">评论(xxx)</div> </div> </div> <ul class="m-more"> @@ -128,7 +132,7 @@ <div class="u-content-value">转化量:xxxx</div> <div class="u-content-value">已完成</div> <div class="u-content-value "> - <div class="u-content-btn">评论(xxx)</div> + <div class="u-content-btn" style="border-radius:3px;">评论(xxx)</div> </div> </div> <ul class="m-more"> @@ -166,7 +170,7 @@ <div class="u-content-value">转化量:xxxx</div> <div class="u-content-value">已完成</div> <div class="u-content-value "> - <div class="u-content-btn">评论(xxx)</div> + <div class="u-content-btn" style="border-radius:3px;">评论(xxx)</div> </div> </div> <ul class="m-more"> @@ -204,7 +208,7 @@ <div class="u-content-value">转化量:xxxx</div> <div class="u-content-value">已完成</div> <div class="u-content-value "> - <div class="u-content-btn">评论(xxx)</div> + <div class="u-content-btn" style="border-radius:3px;">评论(xxx)</div> </div> </div> <ul class="m-more"> diff --git a/src/main/webapp/WEB-INF/view/web/fair/fair_list.html b/src/main/webapp/WEB-INF/view/web/fair/fair_list.html index c289db3961cfe0d0f848d8463c153687a966a91c..5e6243e0f50a400633a1a9ed772f4fa24d7986c5 100644 --- a/src/main/webapp/WEB-INF/view/web/fair/fair_list.html +++ b/src/main/webapp/WEB-INF/view/web/fair/fair_list.html @@ -61,7 +61,7 @@ </div> </div> <div class="m-row m-select-search"> - <div class="task-next" style="margin:0 auto;">搜索</div> + <div class="task-next" style="margin:0 auto;border-radius:3px;">搜索</div> </div> </div> </div> diff --git a/src/main/webapp/WEB-INF/view/web/feedback/feedback.html b/src/main/webapp/WEB-INF/view/web/feedback/feedback.html index 209d36d5dfd90907a80375708f8ec26490507251..f3d2de9093634c1674db51228bcbb6abb4bcdafb 100644 --- a/src/main/webapp/WEB-INF/view/web/feedback/feedback.html +++ b/src/main/webapp/WEB-INF/view/web/feedback/feedback.html @@ -35,7 +35,7 @@ <textarea style="max-height:266px;" id="content" class="u-feedback" name="feedback.content" placeholder="请输入您的意见(限300字内)..." maxlength="300"></textarea> </div> <div class="m-row" style="padding:0 40px;"> - <div class="u-submit">提交</div> + <div class="u-submit" style="border-radius:3px;" >提交</div> </div> </form> </div> diff --git a/src/main/webapp/WEB-INF/view/web/main/platform.html b/src/main/webapp/WEB-INF/view/web/main/platform.html index 34434e5b5f08ec70ca116ad904936a26f8f61872..17a0fa77b7692506d4ed9d6534691b95dad10d06 100644 --- a/src/main/webapp/WEB-INF/view/web/main/platform.html +++ b/src/main/webapp/WEB-INF/view/web/main/platform.html @@ -1,6 +1,7 @@ #@web_layout?() #define css() <link rel="stylesheet" type="text/css" href="#(contextPath)/assets/front/web/css/main.css?#(getUUID())"/> +<link rel="stylesheet" type="text/css" href="#(contextPath)/assets/front/web/css/layer.css?#(getUUID())" /> #end #define content() <div class="c-main" > @@ -8,7 +9,7 @@ <div class="u-logo"></div> <div class="u-btn"> <div class="u-btn-logout" >退出账号</div> - <div class="u-btn-release" data-href="#(contextPath)/platform/task/formNew" onclick="$de.jump(this)">任务发布</div> + <div class="u-btn-release" data-href="#(contextPath)/platform/task/formNew" style="border-radius:3px;" onclick="$de.jump(this)">任务发布</div> </div> </header> <div class="g-body"> @@ -66,12 +67,6 @@ connectionConfig(); var contextPath = '#(contextPath)'; </script> - - - -<script> - -</script> <script type="application/javascript" data-main="#(contextPath)/assets/front/web/script/main" src="#(contextPath)/assets/front/web/script/require.js"></script> #end \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/view/web/main/platform_welcome.html b/src/main/webapp/WEB-INF/view/web/main/platform_welcome.html index f758ebc89474170fa94e81ae38d37e00081c37ba..a92d51505ef0b66ceecd668863f7792cd90f5f5c 100644 --- a/src/main/webapp/WEB-INF/view/web/main/platform_welcome.html +++ b/src/main/webapp/WEB-INF/view/web/main/platform_welcome.html @@ -32,7 +32,7 @@ <span class="u-text">转化率 #(fair.into??0)</span> </div> </div> - <div class="u-btn" style="background-color: #62bcc0" onclick="fairDetail('#(fair.id)')">查看详情</div> + <div class="u-btn" style="background-color: #62bcc0;border-radius:3px;" onclick="fairDetail('#(fair.id)')">查看详情</div> </div> <div class="u-bottom"> <div class="u-down-more"> @@ -72,7 +72,7 @@ #end </ul> <div class="m-btn"> - <div class="u-more" data-href="#(contextPath)/platform/fair" onclick="$de.jump(this)">查看更多</div> + <div class="u-more" style="border-radius:3px;" data-href="#(contextPath)/platform/fair" onclick="$de.jump(this)">查看更多</div> </div> </div> <div class="g-progress" > @@ -114,7 +114,7 @@ #end </ul> </div> - <div class="u-bottom" onclick="taskDetail(#(task.id))">查看全部>></div> + <div class="u-bottom" style="border-radius:3px;" onclick="taskDetail(#(task.id))">查看全部>></div> </li> #end </ul> @@ -155,13 +155,13 @@ #end </ul> </div> - <div class="u-bottom" onclick="taskDetail(#(task.id))">查看全部>></div> + <div class="u-bottom" style="border-radius:3px;" onclick="taskDetail(#(task.id))">查看全部>></div> </li> #end </ul> <div class="m-btn"> #if(tasks1.size()==0) - <div class="u-more">您当前还没有任何任务</div> + <div class="u-more" style="border-radius:3px;" >您当前还没有任何任务</div> #else <div class="u-more" data-href="#(contextPath)/platform/task" onclick="$de.jump(this)">查看任务列表</div> #end diff --git a/src/main/webapp/WEB-INF/view/web/task/h5_preview.html b/src/main/webapp/WEB-INF/view/web/task/h5_preview.html new file mode 100644 index 0000000000000000000000000000000000000000..0846443b5f98ea3a3cd2b14db5c92a02e9e0f027 --- /dev/null +++ b/src/main/webapp/WEB-INF/view/web/task/h5_preview.html @@ -0,0 +1,21 @@ +#@web_layout?() +#define css() +<link rel="stylesheet" type="text/css" href="#(contextPath)/assets/front/web/css/main.css?#(getUUID())" /> +#end +#define content() +<div class="c-article"> + <div class="g-task-success"> + <div class="g-task-success-page"> + <div class="m-page-box"> + <div class="u-page"> + ###<iframe class="g-article-iframe" src="#(contextPath)/platform/task/showH5"></iframe> + </div> + <div class="u-icon"></div> + </div> + </div> + </div> +</div> +#end +#define script() +<script type="application/javascript" data-main="#(contextPath)/assets/front/web/script/platform_feedback" src="#(contextPath)/assets/front/web/script/require.js"></script> +#end \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/view/web/task/showH5.html b/src/main/webapp/WEB-INF/view/web/task/showH5.html new file mode 100644 index 0000000000000000000000000000000000000000..dcb0b6684ddfd32033b331865282d70c35b5a344 --- /dev/null +++ b/src/main/webapp/WEB-INF/view/web/task/showH5.html @@ -0,0 +1,6 @@ +<div style="margin-top: 80px; margin-left: 23px"> + <img width="268" + src="https://ss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=1510707555,3818670286&fm=206&gp=0.jpg"> + <img width="268" + src="https://ss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=1510707555,3818670286&fm=206&gp=0.jpg"> +</div> \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/view/web/task/task_detail.html b/src/main/webapp/WEB-INF/view/web/task/task_detail.html index 7bb1a1300bbd1c5c94e4fa58e5fd5ccdfcc94453..3d50b508109206461ad89cf91a2487f1acd1a2f7 100644 --- a/src/main/webapp/WEB-INF/view/web/task/task_detail.html +++ b/src/main/webapp/WEB-INF/view/web/task/task_detail.html @@ -43,7 +43,13 @@ <div class="u-icon u-icon-link"></div> <div class="u-text"> <div class="u-text-title">任务链接</div> - <div class="u-content">#(task.task_url ?? "链接生成中")</div> + <div class="u-content"> + #if(task.h5_type==2) + <a href="#(contextPath)/platform/task/viewH5?id=#(task.id)">预览页面</a> + #else + 当前任务暂无H5预览页面 + #end + </div> </div> </div> </div> diff --git a/src/main/webapp/WEB-INF/view/web/task/task_fair_new.html b/src/main/webapp/WEB-INF/view/web/task/task_fair_new.html index 7bb3f5bdce6af3f6367f70c4f6e310af48162bb1..f253fdb8ebb2a6437785f0080b78ef3c731ac371 100644 --- a/src/main/webapp/WEB-INF/view/web/task/task_fair_new.html +++ b/src/main/webapp/WEB-INF/view/web/task/task_fair_new.html @@ -8,6 +8,13 @@ <div class="g-info" style="position: fixed;"> <div class="m-panel" style="margin-top:0;"> <div class="m-select-total" style="width:100%;"> + + <div class="m-row"> + <div class="u-row-title u-row-title-short"></div> + <div class="u-row-box"> + <div style="color:#62bcc0">温馨提示:假如您终止了当前任务流程,我们将会放弃保存你的任务数据信息</div> + </div> + </div> <div class="m-row"> <div class="u-row-title u-row-title-short">平台:</div> <div class="u-row-box"> diff --git a/src/main/webapp/WEB-INF/view/web/task/task_list.html b/src/main/webapp/WEB-INF/view/web/task/task_list.html index 5c3a2b2dc53d20afd40b3c5c78268b8a41095ad8..b664ee9b3e61234a42f74e25a57e7900cd62190c 100644 --- a/src/main/webapp/WEB-INF/view/web/task/task_list.html +++ b/src/main/webapp/WEB-INF/view/web/task/task_list.html @@ -16,7 +16,7 @@ <input id="taskName" class="u-row-cell-input" placeholder="可输入活动标题搜索" /> </div> </div> - <div class="task-search-btn">搜索</div> + <div class="task-search-btn" style="border-radius:3px;" >搜索</div> </div> </div> </div> diff --git a/src/main/webapp/assets/front/web/css/main.css b/src/main/webapp/assets/front/web/css/main.css index 944a28e0653b2e07ebd7cd012632ae4fa1fc94f0..829ecc1caafd7cbb97e24a4f5827bce5d372365b 100644 --- a/src/main/webapp/assets/front/web/css/main.css +++ b/src/main/webapp/assets/front/web/css/main.css @@ -1351,13 +1351,13 @@ ul li { width: 24px; height: 24px; } .c-article .g-passport-base-info .m-card .m-info .m-mid .m-row .u-key .u-icon-company { - background: url("../resources/icon-fair-point.png") center/contain no-repeat; } + background: url("../resources/icon-mc.png") center/contain no-repeat; } .c-article .g-passport-base-info .m-card .m-info .m-mid .m-row .u-key .u-icon-address { - background: url("../resources/icon-fair-point.png") center/contain no-repeat; } + background: url("../resources/icon-dz.jpg") center/contain no-repeat; } .c-article .g-passport-base-info .m-card .m-info .m-mid .m-row .u-key .u-icon-name { - background: url("../resources/icon-fair-point.png") center/contain no-repeat; } + background: url("../resources/icon-xm.jpg") center/contain no-repeat; } .c-article .g-passport-base-info .m-card .m-info .m-mid .m-row .u-key .u-icon-phone { - background: url("../resources/icon-fair-point.png") center/contain no-repeat; } + background: url("../resources/icon-sj.jpg") center/contain no-repeat; } .c-article .g-passport-base-info .m-card .m-info .m-mid .m-row .u-key .u-text { margin-left: 30px; width: 60px; diff --git a/src/main/webapp/assets/front/web/css/main.scss b/src/main/webapp/assets/front/web/css/main.scss index 4dcd8fb28eb2ad0dc225c3041bdb12d2893fc80e..351d2c732d3ee92ed975973d74085e9e30962fa7 100644 --- a/src/main/webapp/assets/front/web/css/main.scss +++ b/src/main/webapp/assets/front/web/css/main.scss @@ -1690,16 +1690,16 @@ ul li { height:24px; } .u-icon-company{ - background: url("../resources/icon-fair-point.png") center/contain no-repeat; + background: url("../resources/icon-mc.jpg") center/contain no-repeat; } .u-icon-address{ - background: url("../resources/icon-fair-point.png") center/contain no-repeat; + background: url("../resources/icon-dz.jpg") center/contain no-repeat; } .u-icon-name{ - background: url("../resources/icon-fair-point.png") center/contain no-repeat; + background: url("../resources/icon-xm.jpg") center/contain no-repeat; } .u-icon-phone{ - background: url("../resources/icon-fair-point.png") center/contain no-repeat; + background: url("../resources/icon-sj.jpg") center/contain no-repeat; } .u-text{ margin-left:30px; diff --git a/src/main/webapp/assets/front/web/resources/icon-dj.png b/src/main/webapp/assets/front/web/resources/icon-dj.png new file mode 100644 index 0000000000000000000000000000000000000000..4960093989a1518583717f67e9aa68f80dbfdff6 Binary files /dev/null and b/src/main/webapp/assets/front/web/resources/icon-dj.png differ diff --git a/src/main/webapp/assets/front/web/resources/icon-dz.jpg b/src/main/webapp/assets/front/web/resources/icon-dz.jpg new file mode 100644 index 0000000000000000000000000000000000000000..9bb5f12f82edbad04e1f73d549cd043cbff97b74 Binary files /dev/null and b/src/main/webapp/assets/front/web/resources/icon-dz.jpg differ diff --git a/src/main/webapp/assets/front/web/resources/icon-mc.png b/src/main/webapp/assets/front/web/resources/icon-mc.png new file mode 100644 index 0000000000000000000000000000000000000000..19ac93e2d0ae5b6f377b8b2945af204f981fccea Binary files /dev/null and b/src/main/webapp/assets/front/web/resources/icon-mc.png differ diff --git a/src/main/webapp/assets/front/web/resources/icon-sj.jpg b/src/main/webapp/assets/front/web/resources/icon-sj.jpg new file mode 100644 index 0000000000000000000000000000000000000000..7cdfd0b16360469ec55d33d26a497d3b540f76d0 Binary files /dev/null and b/src/main/webapp/assets/front/web/resources/icon-sj.jpg differ diff --git a/src/main/webapp/assets/front/web/resources/icon-xm.jpg b/src/main/webapp/assets/front/web/resources/icon-xm.jpg new file mode 100644 index 0000000000000000000000000000000000000000..200e3ec3ae2f490b899617b6418abddf912de7e9 Binary files /dev/null and b/src/main/webapp/assets/front/web/resources/icon-xm.jpg differ diff --git a/src/main/webapp/assets/front/web/resources/icon-zh.png b/src/main/webapp/assets/front/web/resources/icon-zh.png new file mode 100644 index 0000000000000000000000000000000000000000..7514617db98c85c871e1ca897ccd8b053f24d19d Binary files /dev/null and b/src/main/webapp/assets/front/web/resources/icon-zh.png differ diff --git a/src/main/webapp/assets/front/web/script/fair_list.js b/src/main/webapp/assets/front/web/script/fair_list.js index 8ccded7f0f2f346960175d12b91f73a8a8c0b170..a99520eafcbb5b2ae11d120e73a5be9dbb63c4f8 100644 --- a/src/main/webapp/assets/front/web/script/fair_list.js +++ b/src/main/webapp/assets/front/web/script/fair_list.js @@ -53,7 +53,7 @@ const load = (number)=>{ '<div class="u-item-text">点击数'+item.click+'</div> ' + '</div> ' + '<div class="u-item-rate"> ' + - '<div class="u-item-icon"></div> ' + + '<div class="u-item-icon" style="background: url(/assets/front/web/resources/icon-zh.png) center/contain no-repeat;"></div> ' + '<div class="u-item-text">转化数'+item.cvs+'</div> ' + '</div> ' + '</div> ' + @@ -61,11 +61,14 @@ const load = (number)=>{ } page(data.totalPage,data.pageNumber); $("#m_choice_page").show(); + }else { - layer.alert("没有检索到任何相关信息"); +// layer.alert("没有检索到任何相关信息"); + _html+='<div style="margin:0 auto;padding:15px;color:red">暂时没有相关数据信息</div>' $("#m_choice_page").hide(); } $(".m-choice-list").html(_html); + } }) } @@ -86,6 +89,12 @@ const page = (total,index)=>{ //选择省 生成对应市 var changeRegion = obj => { var val = $(obj).val(); + if(val==""){ + $("#city").empty(); + $("#city").append("<option value=''>请选择</option>") + return; + } + $.ajax({ type: "post", url: ctx + "/platform/fair/region", diff --git a/src/main/webapp/assets/front/web/script/main.js b/src/main/webapp/assets/front/web/script/main.js index 1e56f4f3f0927a7ed83dc6c1ba04955f89303b4a..814b2ca72d1c2271bdbb42dd03340ad9a7decab2 100644 --- a/src/main/webapp/assets/front/web/script/main.js +++ b/src/main/webapp/assets/front/web/script/main.js @@ -2,19 +2,26 @@ * Created by Delicate on 2017/5/31. */ let layer; -require(["jquery","common","layer"],(a)=>{ - layer = a; - +require(["jquery","common","layer"],(a,b,c)=>{ + layer =c; init(); monitor(); service(); }) const init = ()=>{ $(".u-btn-logout").on("click",()=>{ - var result = confirm("确定要退出当前系统吗?"); - if(result){ - location.href=contextPath+'/logout' - } + console.log(layer); + layer.confirm("确定要退出当前系统吗?", { + btn: ['确定','取消'] //按钮 + }, function(){ + location.href=contextPath+'/logout' + },function(){ + layer.close(); + }); +// var result = confirm("确定要退出当前系统吗?"); +// if(result){ +// location.href=contextPath+'/logout' +// } }); } const monitor = ()=>{ diff --git a/src/main/webapp/assets/front/web/script/task_fair.js b/src/main/webapp/assets/front/web/script/task_fair.js index 92bc362c6fba51dc5ccc1a04075e7d0feaedd7e0..2eb86a15cb1d22d15246f33a7b451b320f6f90f6 100644 --- a/src/main/webapp/assets/front/web/script/task_fair.js +++ b/src/main/webapp/assets/front/web/script/task_fair.js @@ -13,13 +13,12 @@ const init = ()=>{ fairList = []; $(".box-num-panel").text($(".u-row-cell-item").length); load(1); - - window.onbeforeunload = function(){ - return "你还有发布任务未完成,确定要放弃吗,确定后我们将不保存当前数据信息?"; - } - - +// $(window).bind('beforeunload', function(){ +// return '确认离开此页吗'; +// }); } + + const monitor = ()=>{ window.onscroll = function () { var t = document.documentElement.scrollTop || document.body.scrollTop; @@ -116,7 +115,7 @@ const load = (number)=>{ '<div class="u-item-text">点击数'+item.click+'</div> ' + '</div> ' + '<div class="u-item-rate"> ' + - '<div class="u-item-icon"></div> ' + + '<div class="u-item-icon" style="background: url(/assets/front/web/resources/icon-zh.png) center/contain no-repeat;"></div> ' + '<div class="u-item-text">转化数'+item.cvs+'</div> ' + '</div> ' + '</div> ' + @@ -124,6 +123,11 @@ const load = (number)=>{ } initFair(); page(data.totalPage,data.pageNumber); + $("#m_choice_page").show(); + + }else{ + _html+='<div style="margin:0 auto;padding:15px;color:red">暂时没有相关数据信息</div>' + $("#m_choice_page").hide(); } $(".m-choice-list").html(_html); } @@ -133,8 +137,8 @@ const load = (number)=>{ const page = (total,index)=>{ laypage({ cont: 'm_choice_page', //容器。值支持id名、原生dom对象,jquery对象。【如该容器为】:<div id="page1"></div> - pages: total||1, //通过后台拿到的总页数 - curr: index|1, //当前页 + pages: total?total:1, //通过后台拿到的总页数 + curr: index||1, //当前页 jump: function(obj, first){ //触发分页后的回调 if(!first){ //点击跳页触发函数自身,并传递当前页:obj.curr load(obj.curr); @@ -162,6 +166,11 @@ var cellClick=function(obj){ //选择省 生成对应市 var changeRegion=function(obj){ var val=$(obj).val(); + if(val==""){ + $("#city").empty(); + $("#city").append("<option value=''>请选择</option>") + return; + } $.ajax({ type:"post", url:"/platform/fair/region", @@ -191,3 +200,4 @@ var create=function(){ $("input[name='fairs']").val(fairList); $("#fairForm").submit(); } + diff --git a/src/main/webapp/assets/front/web/script/task_list.js b/src/main/webapp/assets/front/web/script/task_list.js index e3386e546b79468faf9726a4e44e7e484578bf2d..22a98bb1437392ce7569d78b34feedb6cfd6e2b8 100644 --- a/src/main/webapp/assets/front/web/script/task_list.js +++ b/src/main/webapp/assets/front/web/script/task_list.js @@ -54,9 +54,9 @@ const load = number => { '<td>'+item.status+'</td> ' + '<td> '; if (item.h5_type==2){ - _html+='<div class="table-link" onclick="openLink('+item.id+')">预览</div> '; + _html+='<div class="table-link" style="border-radius:3px;" onclick="openLink('+item.id+')">设置</div> '; } - _html+='<div class="table-detail" onclick="openDetail('+item.id+')">详情</div> ' + + _html+='<div class="table-detail" style="border-radius:3px;" onclick="openDetail('+item.id+')">详情</div> ' + '</td> ' + '</tr>'; }