Browse Source

修复bug
1、录入信息某一项有问题,点击保存后,其他项信息也被清空了。
2、点击【用户头像】很长时间没有反应,目测不能用。
3、一些学校的邮箱会无法识别,报错。

XMTT 6 years ago
parent
commit
32c91545bc

+ 0 - 1
js/model/sys/org/details.js

@ -25,7 +25,6 @@ spa_define(function () {
25 25
                var saveBtn = root.find(".opt-save"),
26 26
                    headArea = root.find(".head-ctn"),
27 27
                    save = function () {
28
                        console.log(form.val().fn);
29 28
                        form.val({inviterId: id});
30 29
                        form.val({
31 30
                            industry: oString(form.val().industryList),

+ 1 - 2
js/model/sys/org/new.js

@ -15,8 +15,7 @@ spa_define(function () {
15 15
                    save = function () {
16 16
                        if (form.val().email) {
17 17
                            var email = trim(form.val().email);
18
                            var gunf = /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/;
19
                            if (!gunf.test(email)) {
18
                            if (email.trim().indexOf("@") === -1) {
20 19
                                util.alert("注册邮箱格式有误,请检查后重新填写");
21 20
                                return;
22 21
                            }

+ 1 - 2
js/model/sys/platform/edit.js

@ -16,8 +16,7 @@ spa_define(function () {
16 16
                    save = function () {
17 17
                        if (form.val().email) {
18 18
                            var email = trim(form.val().email);
19
                            var gunf = /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/;
20
                            if (!gunf.test(email)) {
19
                            if (email.trim().indexOf("@") === -1) {
21 20
                                util.alert("注册邮箱格式有误,请检查后重新填写");
22 21
                                return;
23 22
                            }

+ 1 - 2
js/model/sys/platform/new.js

@ -15,8 +15,7 @@ spa_define(function () {
15 15
                    save = function () {
16 16
                        if (form.val().email) {
17 17
                            var email = trim(form.val().email);
18
                            var gunf = /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/;
19
                            if (!gunf.test(email)) {
18
                            if (email.trim().indexOf("@") === -1) {
20 19
                                util.alert("注册邮箱格式有误,请检查后重新填写");
21 20
                                return;
22 21
                            }

+ 4 - 5
js/model/sys/professornew/details.js

@ -45,9 +45,6 @@ spa_define(function () {
45 45
                        }else {
46 46
                            form.val({subject: null});
47 47
                        }
48
                        form.val({
49
                            subjectList: "", industryList: "", researchAreaList: ""
50
                        });
51 48
                        if (form.val().title) {
52 49
                            var title = trim(form.val().title);
53 50
                            if (title.length > 20) {
@ -93,8 +90,7 @@ spa_define(function () {
93 90
                        }
94 91
                        if (form.val().email) {
95 92
                            var email = trim(form.val().email);
96
                            var gunf = /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/;
97
                            if (!gunf.test(email)) {
93
                            if (email.trim().indexOf("@") === -1) {
98 94
                                util.alert("联系邮箱格式有误,请检查后重新填写");
99 95
                                return;
100 96
                            }
@ -109,6 +105,9 @@ spa_define(function () {
109 105
                        if (form.val().name == null) {
110 106
                            util.alert("请输入专家姓名");
111 107
                        } else if (form.val().loginPhone || form.val().loginEmail) {
108
                            form.val({
109
                                subjectList: "", industryList: "", researchAreaList: ""
110
                            });
112 111
                            form.doPut("../ajax/sys/professor", function () {
113 112
                                spa.closeModal();
114 113
                                if (data.hand) {

+ 1 - 2
js/model/sys/professornew/edit.js

@ -29,8 +29,7 @@ spa_define(function () {
29 29
                        }
30 30
                        if (form.val().email) {
31 31
                            var email = trim(form.val().email);
32
                            var gunf = /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/;
33
                            if (!gunf.test(email)) {
32
                            if (email.trim().indexOf("@") === -1) {
34 33
                                util.alert("注册邮箱格式有误,请检查后重新填写");
35 34
                                return;
36 35
                            }

+ 4 - 4
js/model/sys/professornew/index.js

@ -3,7 +3,7 @@
3 3
 */
4 4
;
5 5
spa_define(function () {
6
    return $.use(["spa", "pagedatagrid", "util"], function (spa, pdgf, util) {
6
    return $.use(["spa", "pagedatagrid", "util","win"], function (spa, pdgf, util,win) {
7 7
        return {
8 8
            main: function () {
9 9
                var root = spa.findInMain(".sys_professornew_index");
@ -31,7 +31,7 @@ spa_define(function () {
31 31
                    });
32 32
                    root.find(".table-opt a.name").on("click", function () {
33 33
                        var professorId = $(this).parent().attr("professorId");
34
                        window.open('http://www.ekexiu.com/userInforShow.html?professorId=' + professorId);
34
                        win.open('http://www.ekexiu.com/userInforShow.html?professorId=' + professorId);
35 35
                    })
36 36
                });
37 37
                root.find(".opt-query").on("click", function () {
@ -138,7 +138,7 @@ spa_define(function () {
138 138
                        if ($professor.length > 1) {
139 139
                            util.alert("只能选择一个用户");
140 140
                        } else {
141
                            window.open('http://www.ekexiu.com/userInforShow.html?professorId=' + $professor.attr("professorid"));
141
                            win.open('http://www.ekexiu.com/userInforShow.html?professorId=' + $professor.attr("professorid"));
142 142
                        }
143 143
                    } else {
144 144
                        util.alert("请选择一个用户");
@ -151,7 +151,7 @@ spa_define(function () {
151 151
                        if ($professor.length > 1) {
152 152
                            util.alert("只能选择一个用户");
153 153
                        } else {
154
                            window.open('http://'+window.location.host+'/html/model/sys/professornew/photo/photo-set.html?id=' + $professor.attr("professorid"));
154
                            win.open('/html/model/sys/professornew/photo/photo-set.html?id=' + $professor.attr("professorid"));
155 155
                        }
156 156
                    } else {
157 157
                        util.alert("请选择一个用户");

+ 1 - 2
js/model/sys/professornew/new.js

@ -23,8 +23,7 @@ spa_define(function () {
23 23
                        }
24 24
                        if (form.val().email) {
25 25
                            var email = trim(form.val().email);
26
                            var gunf = /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/;
27
                            if (!gunf.test(email)) {
26
                            if (email.trim().indexOf("@") === -1) {
28 27
                                util.alert("注册邮箱格式有误,请检查后重新填写");
29 28
                                return;
30 29
                            }

+ 7 - 6
js/model/sys/userInfo/details.js

@ -27,8 +27,7 @@ spa_define(function () {
27 27
                        form.val({
28 28
                            industry: oString(form.val().industryList),
29 29
                            subject: oString(form.val().subjectList),
30
                            researchArea: form.val().researchAreaList,
31
                            subjectList: "", industryList: "", researchAreaList: ""
30
                            researchArea: form.val().researchAreaList
32 31
                        });
33 32
                        if (form.val().title) {
34 33
                            var title = form.val().title;
@ -73,10 +72,9 @@ spa_define(function () {
73 72
                                }
74 73
                            }
75 74
                        }
76
                        if (form.val().email) {
77
                            var email = form.val().email;
78
                            var gunf = /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/;
79
                            if (!gunf.test(email)) {
75
                        if (form.val().pEmail) {
76
                            var email = form.val().pEmail;
77
                            if (email.trim().indexOf("@") === -1) {
80 78
                                util.alert("联系邮箱格式有误,请检查后重新填写");
81 79
                                return;
82 80
                            }
@ -91,6 +89,9 @@ spa_define(function () {
91 89
                        if (form.val().name == null) {
92 90
                            util.alert("请输入专家姓名");
93 91
                        } else if (form.val().mobile || form.val().email) {
92
                            form.val({
93
                                subjectList: "", industryList: "", researchAreaList: ""
94
                            });
94 95
                            form.doPut("../ajax/userinfo/update", function () {
95 96
                                spa.closeModal();
96 97
                                if (data.hand) {

+ 1 - 2
js/model/sys/userInfo/edit.js

@ -23,8 +23,7 @@ spa_define(function () {
23 23
                        }
24 24
                        if (form.val().email) {
25 25
                            var email = trim(form.val().email);
26
                            var gunf = /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/;
27
                            if (!gunf.test(email)) {
26
                            if (email.trim().indexOf("@") === -1) {
28 27
                                util.alert("联系邮箱格式有误,请检查后重新填写");
29 28
                                return;
30 29
                            }

+ 5 - 4
js/model/sys/userInfo/examine.js

@ -44,8 +44,7 @@ spa_define(function () {
44 44
                        form.val({
45 45
                            industry: oString(form.val().industryList),
46 46
                            subject: oString(form.val().subjectList),
47
                            researchArea: form.val().researchAreaList,
48
                            subjectList: "", industryList: "", researchAreaList: ""
47
                            researchArea: form.val().researchAreaList
49 48
                        });
50 49
                        if (form.val().orgType == null) {
51 50
                            form.val({orgType: 1});
@ -94,8 +93,7 @@ spa_define(function () {
94 93
                        }
95 94
                        if (form.val().email) {
96 95
                            var email = trim(form.val().email);
97
                            var gunf = /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/;
98
                            if (!gunf.test(email)) {
96
                            if (email.trim().indexOf("@") === -1) {
99 97
                                util.alert("联系邮箱格式有误,请检查后重新填写");
100 98
                                return;
101 99
                            }
@ -110,6 +108,9 @@ spa_define(function () {
110 108
                        if (form.val().name == null) {
111 109
                            util.alert("请输入专家姓名");
112 110
                        } else if (form.val().mobile || form.val().email) {
111
                            form.val({
112
                                subjectList: "", industryList: "", researchAreaList: ""
113
                            });
113 114
                            form.doPut("../ajax/userinfo/update", function () {
114 115
                                spa.closeModal();
115 116
                                if (data.hand) {

+ 3 - 3
js/model/sys/userInfo/index.js

@ -3,7 +3,7 @@
3 3
 */
4 4
;
5 5
spa_define(function () {
6
    return $.use(["spa", "pagedatagrid", "util"], function (spa, pdgf, util) {
6
    return $.use(["spa", "pagedatagrid", "util","win"], function (spa, pdgf, util,win) {
7 7
        return {
8 8
            main: function () {
9 9
                var root = spa.findInMain(".sys_userinfo_index");
@ -175,8 +175,8 @@ spa_define(function () {
175 175
                        } else {
176 176
                            util.get("../ajax/userinfo/id/" + $org.attr("userId"), null, function (data) {
177 177
                                if (data) {
178
                                    if (data.state == "1" || data.state == "4") {
179
                                        window.open('http://'+window.location.host+'/html/model/sys/professornew/photo/photo-set.html?id=' + $professor.attr("professorid"));
178
                                    if (data.state === "1" || data.state === "4") {
179
                                        win.open('/html/model/sys/professornew/photo/photo-set.html?id=' + $org.attr("userId"));
180 180
                                    } else {
181 181
                                        util.alert("待审核和审核通过的不可修改。");
182 182
                                    }

+ 1 - 2
js/model/sys/userInfo/new.js

@ -20,8 +20,7 @@ spa_define(function () {
20 20
                        }
21 21
                        if (form.val().email) {
22 22
                            var email = form.val().email;
23
                            var gunf = /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/;
24
                            if (!gunf.test(email)) {
23
                            if (email.trim().indexOf("@") === -1) {
25 24
                                util.alert("注册邮箱格式有误,请检查后重新填写");
26 25
                                return;
27 26
                            }