Merge branch 'next'

# Conflicts:
#	js/model/sys/article/index.js

css/model/sys/article.css

@@ -6,9 +6,6 @@
    width: 35px;
}
.sys_article_index .content{
    width: 50px;
}
.sys_article_index .table {
    table-layout: fixed;
}
@@ -18,5 +15,15 @@
}
.sys_article_index .number {
    width: 6%;
    width: 4%;
}
.sys_article_sort {
    width: 600px;
    height: 200px;
}
.sys_article_sort .content{
    font-size: 25px;
    font-weight: bold;
}

css/model/sys/content.css

@@ -18,5 +18,5 @@
}
.sys_content_index .number {
    width: 6%;
    width: 4%;
}

css/model/sys/professornew.css

@@ -25,3 +25,9 @@
.sys_professornew_data .icon-close {
    display: none;
}
.sys_professornew_new {
    width: 500px;
    height: 250px;
    padding: 0 20px 10px;
}

html/model/sys/article/index.html

@@ -48,6 +48,9 @@
            <div class="btn opt-view">
                查看
            </div>
            <div class="btn opt-sort-num">
                设置权重
            </div>
            <div class="btn opt-del">
                删除
            </div>

html/model/sys/article/sort.html

@@ -0,0 +1,28 @@
<div class="sys_article_sort centerModal">
    <div class="modal-ctrl">
        <i class="icon icon-times"></i>
    </div>
    <div class="container newForm">
        <div class="row">
            <div class="col-2"></div>
            <div class="col-4 item-caption content ">设置权重</div>
        </div>
        <div class="row">
            <div class="col-2 item-caption">权重值</div>
            <div class="col-6">
                <div class="form-item text" defVal="" name="sortNum"></div>
            </div>
        </div>
        <div class="row">
            <div class="col-10"></div>
            <div class="col-2">
                <div class="btn pull-right opt-save">
                    <i class="icon-check"></i> SAVE
                </div>
            </div>
        </div>
    </div>
</div>

html/model/sys/professornew/index.html

@@ -33,12 +33,12 @@
    <div class="container page-split"></div>
    <div class="container tpl-btns">
        <div class="row">
            <!--<div class="btn opt-new">-->
                <!--新增账户-->
            <!--</div>-->
            <!--<div class="btn opt-edit">-->
                <!--修改账户信息-->
            <!--</div>-->
            <div class="btn opt-new">
                新增账户
            </div>
            <div class="btn opt-edit">
                修改账户信息
            </div>
            <!--<div class="btn opt-details">-->
                <!--编辑用户资料-->
            <!--</div>-->
@@ -74,7 +74,7 @@
            </thead>
            <tbody>
            <tr ch-dir="list">
                <td class="opt-check"><i class="icon icon-st-check" professorid="{{id}}"></i></td>
                <td class="opt-check"><i class="icon icon-st-check" na="{{name}}" professorid="{{id}}"></i></td>
                <td>{{-_index}}</td>
                <td>{{name}}</td>
                <td>{{title}}</td>

html/model/sys/professornew/new.html

@@ -0,0 +1,35 @@
<div class="sys_professornew_new centerModal">
    <div class="modal-ctrl">
        <i class="icon icon-times"></i>
    </div>
    <div class="container newForm">
        <div class="row">
            <div class="col-2 item-caption">手机</div>
            <div class="col-6">
                <div class="form-item text trim" placeholder="手机或邮箱至少输入一项" name="mobile"></div>
            </div>
        </div>
        <div class="row">
            <div class="col-2 item-caption">邮箱</div>
            <div class="col-6">
                <div class="form-item text trim" placeholder="手机或邮箱至少输入一项" name="email"></div>
            </div>
        </div>
        <div class="row me">
            <div class="col-2 item-caption">用户名</div>
            <div class="col-6">
                <div class="form-item text required trim pname" placeholder="姓名最长为10个字" name="name"></div>
            </div>
        </div>
        <div class="row">
            <div class="col-10"></div>
            <div class="col-2">
                <div class="btn pull-right opt-save">
                    <i class="icon-check"></i> SAVE
                </div>
            </div>
        </div>
    </div>
</div>

js/model/sys/article/index.js

@@ -79,6 +79,24 @@ spa_define(function () {
                        util.alert("请选择一个用户");
                    }
                });
                root.find(".opt-sort-num").on("click", function() {
                    var $article = root.find("td.opt-check>i.checked");
                    if($article.length) {
                        if($article.length > 1) {
                            util.alert("只能选择一篇文章");
                        } else {
                            $.util.get("../ajax/article/id/"+$article.attr("articleId"),null,function(rd){
                                if(rd){
                                    spa.showModal("sys_article_sort", { data:rd, hand: function() { pdg.load() } })
                                }else{
                                    util.alertMsg("文章", function(){pdg.load();});
                                }
                            },{});
                        }
                    } else {
                        util.alert("请选择一篇文章");
                    }
                });
                root.find(".opt-view").on("click", function () {
                    var $org = root.find("td.opt-check>i.checked");
                    if ($org.length) {

js/model/sys/article/sort.js

@@ -0,0 +1,44 @@
/**
 * Created by TT on 2017/8/3.
 */
;
spa_define(function () {
    return $.use(["spa", "util", "form"], function (spa, util, fb) {
        return {
            modal: function (data) {
                var root = spa.findInModal(".sys_article_sort");
                var form = fb.build(root.find(".newForm"));
                form.val({sortNum: data.data.sortNum, id: data.data.id});
                var saveBtn = root.find(".opt-save"),
                    save = function () {
                        if (form.val().sortNum) {
                            var sortNum = form.val().sortNum;
                            var reg = new RegExp("^(\\d|[1-9]\\d|100)$");
                            if (!reg.test(sortNum)) {
                                util.alert("权重值必须是0-100的正整数");
                                return;
                            }
                        } else {
                            form.val({sortNum: 0});
                        }
                        util.post("../ajax/article/sortNum", {
                            articleId: data.data.articleId,
                            sortNum: form.val().sortNum
                        }, function () {
                            spa.closeModal();
                            if (data.hand) {
                                data.hand();
                            }
                        }, {});
                    };
                root.find(".modal-ctrl .icon-times").on("click", function () {
                    spa.closeModal();
                });
                saveBtn.on("click", save);
            }
        }
    });
});

js/model/sys/professornew/data.js

@@ -36,7 +36,6 @@ spa_define(function () {
                };
                saveBtn.on("click", save);
                form.val(data.data);
                form.val({authStatus: 3});
            }
        }
    });

js/model/sys/professornew/edit.js

@@ -0,0 +1,80 @@
/**
 * Created by TT on 2017/8/8.
 */
;
spa_define(function () {
    return $.use(["spa", "util", "form"], function (spa, util, fb) {
        return {
            modal: function (data) {
                var root = spa.findInModal(".sys_professornew_new");
                $(".sys_professornew_new .pname").addClass("showOnly");
                $(".sys_professornew_new .me").after('<div class="row me"> ' +
                    '<div class="col-2 item-caption">邀请码</div> ' +
                    '<div class="col-4"> ' +
                    '<div class="form-item text showOnly" name="inviteCode"></div> ' +
                    '</div> ');
                var form = fb.build(root.find(".newForm"));
                var trim = function (str) {
                    return str.replace(/(^\s*)|(\s*$)/g, "");
                };
                var saveBtn = root.find(".opt-save"),
                    save = function () {
                        if (form.val().mobile) {
                            var mobile = trim(form.val().mobile);
                            var hunPhone = /^1[3|4|5|7|8]\d{9}$/;
                            if (!hunPhone.test(mobile)) {
                                util.alert("注册电话格式有误，请检查后重新填写");
                                return;
                            }
                        }
                        if (form.val().email) {
                            var email = trim(form.val().email);
                            var gunf = /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/;
                            if (!gunf.test(email)) {
                                util.alert("注册邮箱格式有误，请检查后重新填写");
                                return;
                            }
                        }
                        if (form.val().mobile || form.val().email) {
                            if (form.val().mobile != data.data.mobile || form.val().email != data.data.email) {
                                util.get("../ajax/sys/professor/updateCheck", {
                                    mobile: form.val().mobile,
                                    email: form.val().email,
                                    id:data.data.id
                                }, function (code) {
                                    if (code == 1) {
                                        util.post("../ajax/sys/professor/updateAccount", {
                                            mobile: form.val().mobile,
                                            email: form.val().email,
                                            id:data.data.id
                                        },closeThis,{"40001":"该邮箱已被注册","40002":"该电话已被注册"});
                                    } else if (code == 2){
                                        util.alert("该邮箱已被注册");
                                    }else if (code == 3){
                                        util.alert("该手机已被注册");
                                    }
                                });
                            } else {
                                closeThis();
                            }
                        } else {
                            util.alert("手机或邮箱至少输入一项");
                        }
                    };
                root.find(".modal-ctrl .icon-times").on("click", function () {
                    spa.closeModal();
                });
                var handler = data.hand;
                var closeThis = function () {
                    spa.closeModal();
                    if (handler) {
                        handler();
                    }
                };
                form.val({mobile:data.data.mobilePhone,email:data.data.email,name:data.name,inviteCode:data.data.inviteCode});
                saveBtn.on("click", save);
            }
        };
    })
});

js/model/sys/professornew/index.js

@@ -43,36 +43,35 @@ spa_define(function () {
                    var $this = $(this);
                    $this.toggleClass("checked");
                });
                // root.find(".opt-new").on("click", function () {
                //     spa.showModal("sys_org_new", function () {
                //         pdg.load()
                //     });
                // });
                // root.find(".opt-edit").on("click", function () {
                //     var $org = root.find("td.opt-check>i.checked");
                //     if ($org.length) {
                //         if ($org.length > 1) {
                //             util.alert("只能选择一个用户");
                //         } else {
                //             util.get("../ajax/sys/org/queryAccount/" + $org.attr("orgId"), null, function (data) {
                //                 if (data) {
                //                     spa.showModal("sys_org_edit", {
                //                         data: data,
                //                         hand: function () {
                //                             pdg.load()
                //                         }
                //                     })
                //                 } else {
                //                     util.alert("用户不存在了", function () {
                //                         pdg.load();
                //                     });
                //                 }
                //             }, {});
                //         }
                //     } else {
                //         util.alert("请选择一个用户");
                //     }
                // });
                root.find(".opt-new").on("click", function () {
                    spa.showModal("sys_professornew_new", function () {
                        pdg.load()
                    });
                });
                root.find(".opt-edit").on("click", function () {
                    var $org = root.find("td.opt-check>i.checked");
                    if ($org.length) {
                        if ($org.length > 1) {
                            util.alert("只能选择一个用户");
                        } else {
                            util.get("../ajax/sys/professor/luserId/" + $org.attr("professorId"), null, function (data) {
                                if (data) {
                                        spa.showModal("sys_professornew_edit", {
                                            data: data,name:$org.attr("na"), hand: function () {
                                                pdg.load()
                                            }
                                        })
                                } else {
                                    util.alert("用户不存在了", function () {
                                        pdg.load();
                                    });
                                }
                            }, {});
                        }
                    } else {
                        util.alert("请选择一个用户");
                    }
                });
                // root.find(".opt-details").on("click", function () {
                //     var $org = root.find("td.opt-check>i.checked");
                //     if ($org.length) {

js/model/sys/professornew/new.js

@@ -0,0 +1,70 @@
/**
 * Created by TT on 2017/8/4.
 */
;
spa_define(function () {
    return $.use(["spa", "util", "form"], function (spa, util, fb) {
        return {
            modal: function (data) {
                var root = spa.findInModal(".sys_professornew_new");
                var form = fb.build(root.find(".newForm"));
                var trim = function (str) { //删除左右两端的空格			　　
                    return str.replace(/(^\s*)|(\s*$)/g, "");
                };
                var saveBtn = root.find(".opt-save"),
                    save = function () {
                        if (form.val().mobile) {
                            var mobile = trim(form.val().mobile);
                            var hunPhone = /^1[3|4|5|7|8]\d{9}$/;
                            if (!hunPhone.test(mobile)) {
                                util.alert("注册电话格式有误，请检查后重新填写");
                                return;
                            }
                        }
                        if (form.val().email) {
                            var email = trim(form.val().email);
                            var gunf = /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/;
                            if (!gunf.test(email)) {
                                util.alert("注册邮箱格式有误，请检查后重新填写");
                                return;
                            }
                        }
                        if (form.val().name) {
                            var name = trim(form.val().name);
                            if (name.length > 10) {
                                util.alert("姓名最长为10个字");
                                return;
                            }
                        }else {
                            util.alert("请填写用户名称");
                            return;
                        }
                        if (form.val().mobile || form.val().email) {
                            util.get("../ajax/sys/professor/createCheck", {
                                mobile: form.val().mobile,
                                email: form.val().email
                            },function (success) {
                                if (success){
                                    form.doPost("../ajax/sys/professor/createAccount", function () {
                                        spa.closeModal();
                                        if (data) {
                                            data();
                                        }
                                    }, {});
                                }else {
                                    util.alert("该账号已存在");
                                }
                            });
                        } else {
                            util.alert("手机或邮箱至少输入一项");
                        }
                    };
                root.find(".modal-ctrl .icon-times").on("click", function () {
                    spa.closeModal();
                });
                saveBtn.on("click", save);
            }
        }
    });
});