From b1fb9afc129cd05844bbb9a55fcec01c2bcb60a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E6=89=BF=E6=B7=9E?= <644344980@qq.com> Date: Fri, 4 Aug 2017 07:01:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=95=B4=E4=B8=AA=E6=84=8F?= =?UTF-8?q?=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/fair/FairAdminServiceImpl.java | 4 +-- .../admin/task/TaskAdminServiceImpl.java | 4 ++- .../tianpengtech/common/model/fair/Fair.java | 1 + .../front/web/fair/FairService.java | 3 +- .../front/web/task/TaskService.java | 2 +- .../front/web/task/TaskWebController.java | 18 +++++++++-- .../WEB-INF/view/admin/fair/add-fair.html | 24 +++++++++------ .../WEB-INF/view/admin/fair/edit-fair.html | 23 ++++++++------ .../WEB-INF/view/admin/fair/fair-form.html | 18 +++++++++-- .../WEB-INF/view/admin/fair/fair-list.html | 4 +-- .../WEB-INF/view/web/fair/fair_detail.html | 14 +++++---- .../WEB-INF/view/web/fair/fair_list.html | 2 +- .../WEB-INF/view/web/feedback/feedback.html | 2 +- .../WEB-INF/view/web/main/platform.html | 9 ++---- .../view/web/main/platform_welcome.html | 10 +++---- .../WEB-INF/view/web/task/h5_preview.html | 21 +++++++++++++ .../webapp/WEB-INF/view/web/task/showH5.html | 6 ++++ .../WEB-INF/view/web/task/task_detail.html | 8 ++++- .../WEB-INF/view/web/task/task_fair_new.html | 7 +++++ .../WEB-INF/view/web/task/task_list.html | 2 +- src/main/webapp/assets/front/web/css/main.css | 8 ++--- .../webapp/assets/front/web/css/main.scss | 8 ++--- .../assets/front/web/resources/icon-dj.png | Bin 0 -> 1658 bytes .../assets/front/web/resources/icon-dz.jpg | Bin 0 -> 1978 bytes .../assets/front/web/resources/icon-mc.png | Bin 0 -> 1630 bytes .../assets/front/web/resources/icon-sj.jpg | Bin 0 -> 1777 bytes .../assets/front/web/resources/icon-xm.jpg | Bin 0 -> 1918 bytes .../assets/front/web/resources/icon-zh.png | Bin 0 -> 1143 bytes .../assets/front/web/script/fair_list.js | 13 ++++++-- .../webapp/assets/front/web/script/main.js | 21 ++++++++----- .../assets/front/web/script/task_fair.js | 28 ++++++++++++------ .../assets/front/web/script/task_list.js | 4 +-- 32 files changed, 185 insertions(+), 79 deletions(-) create mode 100644 src/main/webapp/WEB-INF/view/web/task/h5_preview.html create mode 100644 src/main/webapp/WEB-INF/view/web/task/showH5.html create mode 100644 src/main/webapp/assets/front/web/resources/icon-dj.png create mode 100644 src/main/webapp/assets/front/web/resources/icon-dz.jpg create mode 100644 src/main/webapp/assets/front/web/resources/icon-mc.png create mode 100644 src/main/webapp/assets/front/web/resources/icon-sj.jpg create mode 100644 src/main/webapp/assets/front/web/resources/icon-xm.jpg create mode 100644 src/main/webapp/assets/front/web/resources/icon-zh.png diff --git a/src/main/java/com/tianpengtech/admin/fair/FairAdminServiceImpl.java b/src/main/java/com/tianpengtech/admin/fair/FairAdminServiceImpl.java index 3bf5007..2b21723 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 c3e61ed..b178fb9 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 a0fb2f4..08c2f8d 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 74f7da0..9a69b7e 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 dd83c2c..d1091a0 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 4b61eb4..55fcf55 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 121d64b..eb84b68 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 b6ce97f..0cbe935 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 70a9c35..c60db24 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 e4c4acf..80887cc 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 97a5f7b..5f9fa99 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 c289db3..5e6243e 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 209d36d..f3d2de9 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 34434e5..17a0fa7 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 f758ebc..a92d515 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 0000000..0846443 --- /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 0000000..dcb0b66 --- /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 7bb1a13..3d50b50 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 7bb3f5b..f253fdb 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 5c3a2b2..b664ee9 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 944a28e..829ecc1 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 4dcd8fb..351d2c7 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 GIT binary patch literal 1658 zcmaJ?dr;GM951pd7MYujDNaWk7~(;jCTWwlqk^<lKne&5IGLC>DXq|^CSjB+57FWI zz&i#AICa8&?1qmi<2LtDHcotkjPt?NDR`%johZZMV=`F^)cJ>JF3Ior`{w)keBYN1 zNeK&lgfoQ#fxss=Mw`s90RPPPn#jM;?zFAv7k@4~gG-@JTt2~2g83wEpnzB_kxeC2 z1X-~1G!-roc&@XgW^ft$c$Ja1N(h&Z#9_7bXn`O+!eJ+jITQyNsBDW(4c`CZI0#rs zHJC2fOZ9dQWwyjP87jq@kZN@17?mU#F%JlLsCWV^#SwtRnrmZK4mCK+tK#=AF$4mm zDqM~l9CIo|p9E-Vh63agRBV*OFo0naSSH6XI1E6fFak;W8xzAal^jzcI52*Jyfub2 zsgkw2aa;UJ4VpR5u7aTa{Cr71DxsNd2v#bUE)E0{^BQ8dz{U{{v5gIMGiWK+$XM*0 zg|-1MM#4bnacYqFbSwm`U9W#mY-7h0#itB%5OxTbNFl4$71yXX%Oz9)yYW(OHnqS` zLCF+L=P^dU9;QGyn9tp-4Y?F~Z&Znlg)a(`tEG*3R?5c3YSkeBMM7Fg6@npB87arb za+nX-gvl^5fy*(m6qVs7*r3Ev9Ch=&46mE7)F|XAj-zrd3`gTpx@dW{R;N**Ivj=( zxf>g6V>!ZRq};YGyzOx;_DZZu!%zfAGpRJ4>+XUiGtJSgnYIHOjjQT1ASB&lBk6p0 zuB%LAQEMs2@-ao~7}^Sq=2>NVi4V9!DK*MWxEO;KsF<Q;q?k~mu$V+J9LEqCH6bQ& z98bQGzp*~$C43xqw>v5V!%&QbrD7S37{oA4;bH^I^D2!bh2WGFF;XxH@h(EH)_I|o z+#<d|UEAk_!5^NF7G>k-iQxywKBsf7Krmr*tag5?<I0aUS>{Ay#>wK7ZDrD<kuj3o zbyYzJzA@k4_m0op>B8m^{N3qZ(?4B_N~+?IXjgzwDw9JiyycY{n=-w6O>vLgZz$){ zg^4?^cPKjw&JSMLx9`ET!j7l&iaY*VeFF+QeS0a?zgO2ip;@}v8qg!+erX@*@h)%j zy&SM825Rgr$1<k+_I~nZY4CR*v>dD6E$<OrEAzJtZ~ttr4Qy-49MWIzE^MV*-cn5Y zDaq%9`Ut}{cBl?ctk<)?Cl(HR+&k`(x4>HxMphQ>I1@L#>*~;Jl7&#ym2X?$@Ake0 zvpIVXDL(R`v$XmW<ACx)UO+-?utHcU#S9w~J8hSi9|*4THCNlFHurZ~wpTysUq4gv zUQ?T>&nlTH3pq9^%9^wLGruCMbIYn$D5=z$9`Hx=&V^lH?0<M@a!&Z#xOC6E&qRH~ zKBQ6IG<>$?pQxfG+b%5G*_n;hW#1{UJ$&5v(r=!{+ovtk!he>QOP9Towzoa2bvPvJ z)Z)$EtJet61$GMqMQ3i-A*X7vw1|>74pgZ9(8IbX>ab(inQa(yB<&)-RrqUAZEpM3 zme|a8=Y%`EYeMdRf6Mb>;j;C!zm8kXY;3FRY)sMJWsa7f=u!`aR{4jfI7g=L>0ecE zZzo$OH@-R4*B?5qK@_*Ob=M}3*=c%dSHoat+|hz+FnE=+&9bci`qF}DL2skvu@!xD z4%Q8<KKCf{!zH4ByDye>Bw=ht!{5J$*V!Wv_bX>C2YcsSR!Yt<u=H%s^T!`mMK}kG z{3cDDb<W&!FR6j~s%%Z|=M^~{%S3x_Dq7b*ow8*(aJ&DOfXckM`1@6UlZ=mT_h!X= nWvz?8HiF+7DIF0Nzdl1yC)yv`A9nGn>u(SnouEA!wY>B{cCm0- literal 0 HcmV?d00001 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 GIT binary patch literal 1978 zcma)63s4hh5dM=OAfOmg2T`2s*@}vn+$Fh7auBHytmxnaQc>~2CAmO^<TA-20jtnf zDOHrJ1#PX4ML_|zK2gC@p{R(8mSQDJTXZ^=mr`4`)oRlV@~~6Jap!L4zuj;5+ueWn zoK4O<z(3M%Gyo74H5qt<esOjJp*mHUoDO)vjZ^CZaNZGYNMczFDHfY;B1+F_X_1aG ziS3j{jEPV&2o1AaC|xqmLRvb}XjZ{pm1kkds8_*pcr+SqiJ+5=Gcv4nY{qPjE+bi| z)Wcy@p-?+%H(5+HOF?#1irGfmRd9E3k~_Q9Vi@X%u*oWTnu`@$5Iq-)V5~HRi=>DS z#W08<M3@XG2y6-@K{1IK<sJgTWF$_I5;@c(Fvn)q8^{>-^d2tmO9l57m6nz!N|TBh zYoZuaDwVDn5(&Z~5L>#LrR<2=HoiB4nzrezMhk0X%#bT0rDalC70hM&vILVQI=V0L zfZZ~gTy=G$ZEOtPpT>Y_n<m{ti(_aTlWNt`9DIDQGuOM<6S;s~Hsl<uk-HQsMa}3^ zO|+SfQmbIjBGMc6q=b;5GCeLwaEvS0K*$J$lH&w|N@a2brd1MBxwJRVK>p$3Qan-; zDU(ZaHHJmXr-c&{5s}Jp1+G@2SY&vwZ<N`_Qf3|9%WdSidwe;D*Z7hVR+?fNtA=4x zdZ%D+62mgKB*p?oM7VBU22G4Jn)OVYZIbJnURJH9t;Q9!e!7)0LEU{OjRWMMB$P54 zj_D9uO3M%fD$^pAM1dm)EsiQsLQ2RfE!^X;f2Dsf=akcMby#}SAq_GNr4*PRkx@D& zf?>2AQBX=8(V~Q$CNNrWK$WnVOHu3^omWPwSH;bz>)5v#+(+MP(PnO+tlZ)_AAq6V z>j3oUxCP}oZ-X^}_vXUy7eSx&xbt~D&dR-ghBrMp&jFz)2mk>Bo)GYbJb{qstN|<l zd;zcj?*hPJuR-pf-n{?lT=roAxbr!%mv0YR;5NwJ!;{Acg9(LFINVP<0;lB*M!$tg zVzfG$re@?QL!uWc{9hpFE#SjZ@`VB+2m|cOi$<^5fTO`pI~=8(XLcyor@Dvce)rxb zTuCh3vJ`18AHDJ2d5tBVyZKM^m*%u(kFYMjP*N1_$t0|~9(b%)JfhKbE9=45A&xP= z^+Rhf9e+{LY+V-h^H$Bx<B7$x#ed|V*pss)Us$CNeE6{Ky8jWm1}?9N|2-XV_Oob9 zXDOQRW`COTp>0>eityO{JsHW0S*E{zeogxJuxkH)V#5$sc@DC#*l*K4I2ik_Gn{TA z(v_s#j^`F044f(Y^7Aw5TVz%EJ0G03wtN`h;t@vp8|G|pO=;NRF=6>B`GviOm&Xq! zp666&b&Z}-cKJ$(|INHwzsZo+tK{t+xtViD*4ut^r(&a@{DoiRZ4&Hl--;K!I6Ol8 z_~fpDysMKo*5~gJ9xNJ_r24UA<y3fnjkR@EmGAjP$^092`c>-tztnh4t(#Hb98^}^ z(mE)rB#WqCb6=RdVB^Mw0&{$J{GIY-dhEernG+ZN6Oi%s$E_X7XiUZF-IRCn@}lDQ z+ePX!(ey3e?rX<h%U+UlKv4d4SozbYAt%6)22;`H$^y7PuI@ac$(X-k@t#j=LXXXk zOD=2L-gvU~(!6T(QBV9(;+5$&>vpyIPD6LqEzl@B9kpvurH1k2Vignp)s>||=*;V# znN?q%X-;W)zq<Y8wThjaZ8z8wLFn<Ky)&Loc1$XETj%p2p(gwGp#;yuBR6!z34RE< zaBf}Jt@h?n_Ef^*sdv4{Tpkr9T3)t@6p#IW;tt-<j~rQI>B8CLOmf@}_|(?Z!Q~B~ zS&FCRVP|qnPc~|rQ;t9XV(~&0+IBnS-fDhFm(jy<-qF<6Wo+9vF354QFmTGFYqgIu zL2%}g6HW0iHZAcK|B!i1T3;8q=xoaBkjitDrQ-`LouDw!Z|}amSSJ{^lzBAg>a)Nu m-ih?tsim_zpR@(*$}10?-6?qN`+WVMVc$Hk1R{1{r{iB#!ln@b literal 0 HcmV?d00001 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 GIT binary patch literal 1630 zcmaJ>dr;GM94|PrL!2;m3Mz}CdU|Ktq)k#1DN@>Ec`BtUhqoJPo6=I!bZL-+Xn73g zcFy4or*krN^QH{uYq%4f8@lreDr1}I9=x1$g5cOq=Qdpm)cJ>JF3Ior`{w)keBXI< zS=y3G!4bhCk!Vt)UTYB62;U<P65jihQrd(ioY!UY8LX8rpg3Bjwy-7|NMxuS+CWp5 z!q?8xF(T2p*X_nkJ~K6iG_#D9^65xDj7va^L@|p!F3RkndB8;H*qthHu<0ZS*exn> zC6)@Ox-_)St}o)~jG{E7xyWHAEa2i;AjU%q1PsknfQQL*x=D`;9N{H}y-zFyfe{tn zp#n#p%1m7bXjqO0FsTAE!w3T4xD-J#97h%cau|`zVBy9g1SK(?lq-R;3lywz7AtAc zCXCq<PAbsG^Da^*D<~+C7AT}Fmm@<6g79(3<&dBOxeJ{<<$;{;C_jUicAGi7i?_2* zz{g0L*nD0E3Z9OJz_?OV9}_#>V~G+{Ci74(86t&c4C9MyMBB|9=>Oe#s<zu$=%Qr? z+Rf&3W}zO|C_h-p-Lnn(6a{a{rJP+T3YDj2&G`)N<P)_jQ1~LX*e#?Sm&2$9Q$iRb zglol79HNvM4#5gkX+=x~u23rcJWs>N$15<MTn8%^m=-~FN_9N0(ddZyXiQ7Mh%Vlb zO?0|>%4w$kw(WxLQLHxMnOIW8(G<^eMwZR<cfm3n%d>79>jE?yU)51y{z|*k!WOs} z_{uaIwU*}Wt7%ID$1=c3o=N*td?0WFMKQz-(Fz)ctT1YVD0wsnSxp!m4dV)2NtwVg zyyc1fjrOS^5#n(9-65?g0#nh51wtt^0U-#jgrX?|gG?~4q;Z6{SYZN`2`<Wft@A`H z`9(s1`nHb;LpVGhE!ru}6DJH#d{c`sw1KWft=j0h)?A&eU!Fd-a`5i%_Up;R0iETj z<hj=Nsm9YUhRv<wf0-ZJ5gIY??TE@Ld)4S=b-8xV`gut}H=x&tZJAor7gu5Y_;mBW zeeXY<<~?}5f1tbP+wm{Iapce5R~-Xqh>bT3OHaYy_wloChD2(B7y50jb1qki1_xG& zSBFVTvW7D5CO>HXK+>}z^aNBwTxM-eLG4g4*k;?#7>+YlK`q(grw<q3N_sS7Xm;`N zl&wPz^9L)kcRkF=4v8^eKgn$@NtXv?g$yUb3vv@aRfC_`=5PJgTf!auD5M%V5WfCQ z&Q*X9Zw}lKZVk?j+f-|=no@7;k>A=}>m8T;Z`t75kfBW-jnAi)O|C38?CH%G9ldg_ z-q<7dyl{A0?V@Y5>bn}n%S-N6e>RabHwT<LUv$9nUckn?Ya<uty8kHoMtb|IJ#4eQ zKKZwup15-j9XWej&vtL$fM=3hnDkG=j92chx}ZP5x@AfK5i!H%>_};-+1u5i)0cTB zHvBCfINqGw7q<@O#mM^N<Xe)n@`GJbyu8v;Rfk<XlsB_dePO3JiO@K*mrvi+bmc~4 zTY6*NuA#uH36buvX5TPuE8qDwQ+FqBfqiyOWck|jxss$atGecHqgB_`G4})899zcE zIAn394X?SlB5BP_#etLKls`Ypdbh0{UfQWIEh6_YKQ8R{;uC+;rT5J%ztl0ar*lXW z4DQ%<`-^%FzKFl0`EaxQ=wJCMy*U)w;w=wlxl6x?9nG3>KRBpx{3|^~2DIatcRI^- zwy$JrhEDVcdc<!P##Vb)tSgo5R&0+YemL=+x8l@;(to196s?%?4rXkPt@Hiy6Lo3Y JhWPBV{{RY?WWE3Z literal 0 HcmV?d00001 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 GIT binary patch literal 1777 zcma)64Qvy26#sYKXPH7<CakdKI3xn@+Pk)Q*PbhLYlk$tImU3~L*UxGZq0VRdcDzZ z5Woo-8DltbOw?><i3TG^WH1B*QzwiKL=Xc^P{zkXV1S4MBBNeMyJ1`iFL%lNzmMPh z_`mlLo(lGWvDpE)3jn))Du@R|6zl^^Te-8e0?0tLBxV2z_Q-2WMA1v>bRM6UW_Smy zb@H4pKzntV7S)0DjDVMRma-z`V2j-z3w&eGei(8y7Pt`4L36xTw!}T7QebCQ<`y_B zOPyv0&X@+J2dDt&<yeu10$iELM+GeK05~P_A+ZjI228|K3!E8>3Kiw#K~`R1AzW)f zoG6At1fj)@I6+`(kRHYKI#l`y1T#`NLFq{-Ot2J9U|dwbZF)GCbh5zVqWpfp)^E`A zLa`1ro6R8%y&jP)5MPByqyvb@H!*@>V|`A+?G@d;2MQt54!&Hpz*43UOW?dYIfKB% zc8lXebq!ei#C&!rjbW{Q1r=Uam(Tk6a>2<;<`W~%QtuugC}b#QL%k}vrAwj9Y`n9a zV?CnXW`QM*mT@zbp3tL41}705lgf1wMgpNpoIp^6k#u1WGhrYN5uD-tv$Bk)OwvY@ z2Hb{W*<@xGVYOzPvrM?njAGeY5nsE<C(<4#8;R|fVuyW+$NExMfu%)WDB$_B$Q0z2 z@FMRk;k}U68oG5OG`Z02VR*l9O6Zy%R&8Si_hOcrF7O;Q&}Yg$Ob%wkY&7DS6JZUk z5pkhL2SV#jIO1~Ps0k$u1W7yKus`!i{~pe%B$4XyM$(~NMhvA*7=svTry0R8mPAan z8Alu_L9ztKGA`5%>!cKQq0xC{lp-Q&K11x_Vn~O<)nYx;J_*v|1h0dq2i5^FZPJ3u zg1>;3K=$MmHAM133cE+iWRh0;2Nh4s1lxcz9%z6@E>nUirA)4r1>1ojy&`hi(CY#~ zLabs$oa{fMka`pVF>+aSO#Fzju{=5^Hcl254^%jrpj0QB6c{|4C0YY!y<^rht}(?W z6<<@z|KS9?L825eN-0-@46uB!?M962*GZZ2#Q6D1b^V7fiCboFTz}n<b#$(6_$P6@ zYDrGb*{gk%c6N0hpw7HIk~}=MJ~tmSA8)@Bw~(z`cs#ZM?`fO6>3sYrb6TOBtM-&N zkHeU`WMBLJ*4f(>wXWUsHf{U7VE^VS?#kjxw;N|#le7z(^DMhpr+7{^iHVxFZ^x>C z$W5zCDm={>CeIJtznfimK6-D>%9l6W*Q>s&)Gk<aamKN~HzlWb)@g1huj|mMQAU3t z;raTs$;PLfUhAnkdr#4Kcf$*xT_C?7{b|4Jmg-0S*o9|qs2^w+HI^UYWUdE6U^|v^ zv-{wk>JPf(s$bOH>RMZUq$c-u@B2IGQHmqu+t*lo$9xm@ofUd(%A$3Cw0$0ESgj}u zh}GkhFnU>wcHg<nDY~7lT;7Dzn<t5-)9DLki>!n*Ib~nV@9$u5eE6)jbE>_59rh-= zLa$1EkJRwR8oKB<#H+YDcWO?c1#ta@6<_R9#6H)cUL2dsT%-@DD!T4(J9POV^xGe* znM+?OZMNOL{&6kW+nl{+^rb(0;d@OZ)bl&I<GY%^4CHTY!4irRmR0Z8Zf(6LuWgD? zf2lDo?v6ioitVEwva!YQ_w{#G%75-}ZaSKx?%2_e99SY$Oluf-^~7@iubpDz$hVL7 j{<L;)`k4(UM_aa^OJCK-pQyDjd+OTO*t+hK!PEZ&O;I~y literal 0 HcmV?d00001 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 GIT binary patch literal 1918 zcma)62~ZPf6#kQdoLW~Z;8oXnBb#J5yPHEIND>t(6*)v4$FkYoz!q|tgeGVm@j&qa zZ^UC9??PLhO4W)|MX`mV#agXZup<<eu@z~nwHB@E1_?S-#_`SW%=_Pa-@E?ze)n~E z3kcV{I3oaYaS^~Dyd?L10O@k+>^vX<KD?L#z}+G$%5pfYYN^z0mr#twz)EO~N$R4k zQdA<7f~aVhm7=p*2W((7IkQIGaq5g1<`|7QjYyCsShZ{xH*JB9O<wR`3cVnkRx#q} zNpO@)?J`+Stb>AGrW~_f?b3+5oU3`>BbJKcE)z$#Mm*UQ6`q}t2x~1i7A7QegqEQw zOp+25CrA>FgfSV4NoD*;A}FpVNHwN_yGhJPvoS_>l5R?OEdHbscNgV!IwelI#A3^o zqAHcj;{(GG-U6}bnH`i1G22IaJ?L0FZR4yC&SHi=9w~z**P#*fnZ78&WKBruaolUS zOeRlVUDkF-68kcZUajpZc~(}M#M&*nHk#$lM|#10?_M9sW5{Qto?+woOQCXf7CP6& znjLXEjhNR+7>-e6BqqZdLV*w{U#^kFNrX}mBqEdJ3L|Pzk#dFH>!&w-Y%H#vtkCgR zgbqdZipjC0R;yRVDhZuRhU#Oz*f_J@L78dR8=K=}cVn^FV%1t3OF1mI6pJOtI|YeZ z7Kg>2WwF9qt>@Npcw8E1W-Lzoc+WMxs9ML`xDQ!oip^qzyZWr=ddWdWs&Je@X@r%t zIAWCH286<t1Y$H0GNp`^lM2cp?#45(^zX%-@)Eudt2Z6B5l3Z|5@isaqE!frvI;~= zsR+a%BNZ%(vW!ut5=;3MrJm7wWt6-kem*^H&tmY0p4DQ_{65+E#c@9X{kqlxFxC8m z3fxU#IS{-#315<^hq~cHfq>WYe~;o#8Fw{+{J~%_SR{ae5E6(Wf%`l#b|v=mbpgOH zz&}tRcva%z`vcHN2z*6CziySt$G4B4zd#5`g)$)IZ8kI$N*PF`&dLge{s(q9f?$z= z4=RE{G<bm3H5ARM1s7*Q_h;XGd|ox|B;$*3u3A!%+wpPIySqj;>i?d&B5gu(DmVwn z3)^?+;Y^h2_{la^bw<ge;a`NT;l?DM2s8XJ)xL0leo&@Cy)vSIK}Kmv#2iX@)OdAF z;jQ%K(temzeq`j~mDG<pCxVw%=C4{m_C!Fluqb}Z!MmGVv7{hnXF|#CX-7)xc8tht zKDB7{&gPvH_7_&Paa++b@*Qwk*6xe*@udw>g(s<@0|J7|?`}+uhs5J+m_T2s8MH^i zS1Pugwk~-;NJuvRS!L)jj#uYD{s+5sBYkKc^A7WSj^Xz4sD|X~h>Q;=J&}HXfT%uG znAbGar*K)-Z!zCS#tbT1>5RDeYhAeVkLlV^A;%Ufn>f6FLmc$|xqqWKwHo)<k9;!q z;EH_ZgybR5E3VDNF!a#c)l+GDSzB>!`NVZ-!)e{s&~zWCi%38A$)M$lH%Esa2=522 zyEa$)aP*<UTuAGRa}^aeckW{qHCpSDQ+of^m}_6ZJp~Xp@K*k&(C>n>w>ny93@_eU zmYqI3ah9ZSrKzNUOhCieTW_=B$B+Hwj9VH%s<=I*a#--nP1_o^w$`wDm&>+qjxO7k zJ53;*m-m-uF5Oh%22qh;em1SxDxMTGU=<oXqGhIFQgp`NaWzPC!u}Mp_Gm)DTWL*2 z8xOVPL4zJ`KU)$sBW7mJ^@y<>N}m+vj-l%#BUkP9`FYL-`0#bvkZqE+eRq@v1eV`1 zme!|UNshbMaKLp<75=n*dD)&N4T_!P&W1@~u6}w!k*~2?G+^P@#gC+W=KHm4E<AkJ za>)%0Zcz4-8(ggtEZW!BxaP*K`P{I}4?7|%C+gim|2+AZui8LuMkj<h79W%rH+Mo8 UR%@82^s}~aI&X^n1nwLE0VXSYd;kCd literal 0 HcmV?d00001 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 GIT binary patch literal 1143 zcmV--1c>{IP)<h;3K|Lk000e1NJLTq001HY001Hg1^@s6I!6n_00009a7bBm000XU z000XU0RWnu7ytkOAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ<{YgYYRCwC#*k7m>RTRhZ&-EHpCYfZK{r901!=TheEz1WVEV6$P5oFTCNNOgE z8N`$|rBSAsWHm-9J!ED7z@q<Xl$mK!WMNWCU}i*Si8kr=_OfmqkLR9yyxj*MS}+{W z*?ac+&f07J*4oq5+S=-9ux^eL>wYAY%RKFYF}M;VaRz$E@E&Z(daTA;{Mpf(Nmeut zQs!wdOu=pFk8kiPUc@hGMPCfWXiSdZmtqNi`_CRJ^YjWlj+5had6E@hR*cuW?L17x z?0}kvmpdIJWu9i?=JgnqWW~%%h&r|zbHYRK;U&!Llt;=uU4U7bkz~c<PR8JN+=LJD z1bSg=!ysjz&IpJ}Nmi`rf~0s7yYM`A;QkIl$~+y4MYyMnAlmGO$g%}k6JGk)nkogY z%+uz`hL$8NhIbG@qa%%bVk1`KuLgkDMuwe_{cY)69jxPVL3{gH0kIIPa4K4GJ3hvM z20*4_5U#6`hQmN+V_lLJ8|pwz#*G-0WW~gQ7>durE5~#I@)h2}^Z;LV2uPWyr-f=3 zbs)OM6U|AoVr#|FLEIW*cS!?Yc@)F&K`8Vg9vK=7zF%j7o{@qZYmEJk?{IDdAlu^e zbnLAL8G+yNQ=J9&Mok$~W2_lx<NFRE2IJL=Ej+FoWG~)MvZAF<fjWSv@L-vz{i}u_ z!5@(o?O89}71^~Zu1^k2--=l1Uh&7Z#+Tu8yn@}h6#XzE3SvDaZ$??O`j&b6CVI!% zvDk{VR@E%?bZo>ya}>870kjnRI@p#2af$hRa7X3VjKoE8^}+lkD{4VZjVk(j6v45P z%8vxxTT%AsgnCY@12rBeRZILnoDf-aZITt6YCw#`!x*1r#o8Ky`gF+lh0y{$fQLe< zH&@L+F}8ADbsNwlT-<`Q+R=~sm|Fv)?ScAYdBn-cfM|&athSMnEgw~bd=UY+CX}+; z285iqR|LyY$mO9YU*lQ)5SdYJlVi@e)gae|QZB)$GEb`uUhi=K-a31JC$`}8NXfyt zA;2o_99$Ju_~0QRNml$C-`|LZ9;>?f=ZNzC^=cumk1bq{i}7PS^1cnvwc7?nJPeBf zyF1B>yn&wfNP3bf@sQ*2Zl#WNtD&A7qdU8=%+rZo*ceR+h<R-g9X8KNRxHFqtSIwz zdKW<4jMwl?NPOd6e3BKjFc*u<JY8Al>6x7XI0efhn-<}gP8}zbthhH^Itp9LJY7)c z>5v8h1|p9vx;oT%X1yDl8aaeVJ2x#(di_EvH^d+9jA?xWV0iSSyW$A3I8J?akDN_M z@;0E%)8lbjG|eNTBkNI7CU!=~t&Rq3ccW+DrvG0{9IYV#3;=kNMdz-?az+3E002ov JPDHLkV1nbY6<7cO literal 0 HcmV?d00001 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 8ccded7..a99520e 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 1e56f4f..814b2ca 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 92bc362..2eb86a1 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 e3386e5..22a98bb 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>'; } -- Gitee