diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 5f1194273..aeb9e645a 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -550,8 +550,8 @@ function observeSearchfield(fieldId, targetId, url) {
dataType: 'jsonp',
data: {q: $this.val()},
success: function(data){ if(targetId) $('#'+targetId).html(data); },
- beforeSend: function(){ $this.addClass('ajax-loading'); },
- complete: function(){ $this.removeClass('ajax-loading'); }
+ beforeSend: function(){ $this.addClass('ajax-loading'); }, // 添加成员加载完成前，显示载入中
+ complete: function(){ $this.removeClass('ajax-loading'); } // 完成后，移除
});
}
};
diff --git a/public/javascripts/org.js b/public/javascripts/org.js
index a2b2bd361..f1520a0ec 100644
--- a/public/javascripts/org.js
+++ b/public/javascripts/org.js
@@ -1,4 +1,5 @@
//�����֯��Ա���ύ����
+// 组织：新增成员
function submit_add_org_members(){
$("#org_member_add_form").submit();
}
diff --git a/public/javascripts/wechat/controllers/edit_userinfo.js b/public/javascripts/wechat/controllers/edit_userinfo.js
new file mode 100644
index 000000000..94722398d
--- /dev/null
+++ b/public/javascripts/wechat/controllers/edit_userinfo.js
@@ -0,0 +1,92 @@
+app.controller('EditUserInfoController', ['$scope', 'config','$http', 'auth','$location','$routeParams','alertService','rms','common','$timeout','wx', function($scope, config, $http, auth, $location, $routeParams,alertService,rms,common,$timeout,wx){
+// common.checkLogin();
+
+ $scope.replaceUrl = function(url){
+ return url;
+ };
+
+ var vm = $scope;
+
+ //单弹框
+ vm.alertService_1 = alertService.create();
+
+ //双弹框
+ vm.alertService_2 = alertService.create();
+
+ vm.getuserinfo = function(){
+ $http.get(config.apiUrl + 'users/get_userinfo?token='+auth.token()).then(
+ function(response) {
+ console.log(response.data);
+ vm.user = response.data.data;
+ vm.lastname = vm.user.lastname;
+ vm.mail = vm.user.mail;
+ vm.sex = vm.user.gender;
+ }
+ );
+ };
+
+ vm.getuserinfo();
+
+ vm.unbind = function(){
+ vm.alertService_2.showMessage('提示', '是否确认解除绑定', function() {
+ $http.post(config.apiUrl + "users/user_unbind",
+ {token: auth.token()}
+ ).then(function (response) {
+ if (response.data.status == 0) {
+ vm.alertService_1.showMessage('提示', '解除绑定成功', function () {
+ wx.closeWindow();
+ });
+ }
+ else {
+ vm.alertService_1.showMessage('提示', response.data.message);
+ }
+ });
+ });
+ };
+
+ vm.cancel = function(){
+ vm.alertService_2.showMessage('提示', '是否确认取消', function() {
+ wx.closeWindow();
+ });
+ };
+
+ vm.confirm = function(frm){
+ frm.$setSubmitted();
+
+ console.log(frm);
+ if (!frm.$valid) {
+ console.log(frm.$error);
+ return;
+ }
+
+ if(vm.lastname == ""){
+ vm.alertService_1.showMessage('提示', '姓名不能为空');
+ return;
+ }
+
+ if(vm.mail == ""){
+ vm.alertService_1.showMessage('提示', '邮箱不能为空');
+ return;
+ }
+
+// if(!(/\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i.test(vm.mail))){
+// vm.alertService_1.showMessage('提示', '邮箱不合法');
+// return;
+// }
+
+ $http.post(config.apiUrl + "users/edit_userinfo",
+ {token: auth.token(),lastname: vm.lastname, sex: vm.sex, mail: vm.mail}
+ ).then(function(response){
+ if(response.data.status == 0)
+ {
+ vm.alertService_1.showMessage('提示', '修改成功',function(){
+ wx.closeWindow();
+ });
+ }
+ else{
+ vm.alertService_1.showMessage('提示', response.data.message);
+ }
+ });
+ };
+
+}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/directives/input_auto.js b/public/javascripts/wechat/directives/input_auto.js
index 9cd77188b..ea0a6bf1a 100644
--- a/public/javascripts/wechat/directives/input_auto.js
+++ b/public/javascripts/wechat/directives/input_auto.js
@@ -1,19 +1,40 @@
-app.directive('inputAuto',function(){
- return{
- restrict: 'A',
- scope: {},
- link: function(scope, element){
- var copyContainer = element.parent().children().children().eq(0);
- var sendButton = element.next();
- element.on('input',function(){
- //console.log(sendButton);
- copyContainer.html(element[0].value);
- var textHeight = copyContainer[0].scrollHeight-10;
- element.css('height', textHeight + 'px');
- });
- sendButton.on('click',function(){
- element.css('height','18px');
- });
- }
- }
-});
\ No newline at end of file
+//app.directive('inputAuto',function(){
+// return{
+// restrict: 'A',
+// scope: {},
+// link: function(scope, element){
+// var copyContainer = element.parent().children().children().eq(0);
+// var sendButton = element.next();
+// element.on('input',function(){
+// //console.log(sendButton);
+// copyContainer.html(element[0].value);
+// var textHeight = copyContainer[0].scrollHeight-10;
+// element.css('height', textHeight + 'px');
+// });
+// sendButton.on('click',function(){
+// element.css('height','18px');
+// });
+// }
+// }
+//});
+
+app.directive('inputAuto',["$timeout",function(timer){
+ return{
+ restrict: 'A',
+ scope: {},
+ link: function(scope, element){
+ timer(function(){
+ $(".post-reply-input").bind("input",function(){
+ var copyInput = $(this).prev().children();
+ var sendButton = $(this).next();
+ copyInput.html($(this).val());
+ var textHeight = copyInput[0].scrollHeight-10;
+ $(this).css("height",textHeight + "px");
+ sendButton.click(function(){
+ $(this).prev().css("height","18px");
+ })
+ });
+ });
+ }
+ }
+}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/directives/load_head.js b/public/javascripts/wechat/directives/load_head.js
new file mode 100644
index 000000000..47862f0b7
--- /dev/null
+++ b/public/javascripts/wechat/directives/load_head.js
@@ -0,0 +1,35 @@
+app.directive('loadHead',['$http','config','auth','$location','alertService',function($http,config,auth,$location,alertService){
+ return{
+ restrict: 'A',
+ scope: {},
+ link: function (scope, element, attrs) {
+ element.bind('change', function(){
+ var file = event.target.files[0];
+ //判断类型是不是图片
+ if (!/image\/\w+/.test(file.type)) {
+ alert("非图片");
+ return;
+ }
+
+ var reader = new FileReader();
+ reader.readAsDataURL(file);
+ reader.onload = function (e) {
+// alert(this.result);//base64
+
+ $http.post(config.apiUrl + "users/upload_head",
+ {token: auth.token(),imgdata:this.result}
+ ).then(function (response) {
+ if(response.data.status == 0){
+ scope.$parent.alertService_1.showMessage('提示',"上传成功",function(){
+ scope.$parent.getuserinfo();
+ });
+ }
+ else{
+ scope.$parent.alertService_1.showMessage('提示',response.data.message);
+ }
+ });
+ }
+ });
+ }
+ }
+}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/directives/multi_reply.js b/public/javascripts/wechat/directives/multi_reply.js
new file mode 100644
index 000000000..5b1e2b483
--- /dev/null
+++ b/public/javascripts/wechat/directives/multi_reply.js
@@ -0,0 +1,42 @@
+/**
+ * Created by ttang on 2016/9/5.
+ */
+app.directive('multiReply',["$timeout",function(timer){
+ return{
+ restrict: 'A',
+ scope: {},
+ link: function(scope, element){
+ timer(function(){
+ $(".reply-icons").each(function(){
+ $(this).toggle(function(){
+ $(this).next().next().removeClass("undis");
+ $(this).next().next().focus();
+ },function(){
+ $(this).next().next().addClass("undis");
+ });
+ });
+// $(".reply-icons").live("click",function(){
+// if($(this).hasClass("multi-hide")){
+// $(".multi-input-container").addClass("undis");
+// $(".reply-icons").addClass("multi-hide");
+// $(this).next().next().removeClass("undis");
+// $(this).next().next().focus();
+// $(this).removeClass("multi-hide");
+// $(".post-reply-input").val("");
+// }
+// else{
+// $(this).addClass("multi-hide");
+// $(".post-input-container").addClass("undis");
+// $(".post-reply-input").val("");
+// $("#post_input_1, #post_input_1 .post-input-container").show();
+// }
+// });
+// $(".post-reply-submit,#more_reply").click(function(){
+// $(".reply-icons").addClass("multi-hide");
+// $(".post-input-container").addClass("undis");
+// $("#post_input_1, #post_input_1 .post-input-container").show();
+// });
+ })
+ }
+ }
+}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/directives/submit_start.js b/public/javascripts/wechat/directives/submit_start.js
deleted file mode 100644
index cbdc469ab..000000000
--- a/public/javascripts/wechat/directives/submit_start.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Created by ttang on 2016/8/31.
- */
-app.directive('submitStart',["$timeout",function(timer){
- return{
- restrict: 'A',
- scope: {},
- link: function(scope, element){
- timer(function(){
- $("#manageDelete,.login-box").click(function(){
- element.removeClass("bg-grey c-white");
- element.addClass("link-blue2");
- });
- })
- }
- }
-}]);
diff --git a/public/javascripts/wechat/others/factory.js b/public/javascripts/wechat/others/factory.js
index d4e365321..190dd36b4 100644
--- a/public/javascripts/wechat/others/factory.js
+++ b/public/javascripts/wechat/others/factory.js
@@ -94,7 +94,7 @@ app.factory('rms', function(){
});
app.factory('common', ['$http', 'auth', '$routeParams','rms','config','wx','$location', function($http, auth, $routeParams,rms,config,wx,$location){
- var addCommonReply = function(id, type, data,args, cb){
+ var addCommonReply = function(id, type, data,args,reply_type, cb){
//先判断有没有绑定
// $http.post(
// '/wechat/is_bind',
@@ -111,12 +111,12 @@ app.factory('common', ['$http', 'auth', '$routeParams','rms','config','wx','$loc
}
var temp = data.comment.replace(/\n/g,'
');
- temp = temp.replace(/^\:[a-z0-9_]+\:$/g, "[表情]");
var userInfo = {
type: type,
content: temp,
- token: auth.token()
+ token: auth.token(),
+ reply_type:reply_type
};
//回复按钮禁用
data.disabled = true;
@@ -146,24 +146,26 @@ app.factory('common', ['$http', 'auth', '$routeParams','rms','config','wx','$loc
cb(response.data.subscribe);
}
+ var act_id = response.data.act_id;
+
//保证内外回复数一致
activities = rms.get("activities") || [];
course_activities = rms.get("course_activities") || [];
project_activities = rms.get("project_activities") || [];
for(var i in activities){
- if(activities[i].act_id == id){
+ if(activities[i].act_id == act_id){
activities[i].reply_count += 1;
break;
}
}
for(var i in course_activities){
- if(course_activities[i].act_id == id){
+ if(course_activities[i].act_id == act_id){
course_activities[i].reply_count += 1;
break;
}
}
for(var i in project_activities){
- if(project_activities[i].act_id == id){
+ if(project_activities[i].act_id == act_id){
project_activities[i].reply_count += 1;
break;
}
@@ -222,7 +224,7 @@ app.factory('common', ['$http', 'auth', '$routeParams','rms','config','wx','$loc
var init = function(args){
args.scope.replytip = "输入回复内容~";
- args.scope.formData = {comment: ''};
+// args.scope.formData = {comment: ''};
var loadData = function(id,replytype,page){
loadCommonData(id, args.type,replytype,page).then(function successCallback(response) {
console.log(response.data);
@@ -304,10 +306,10 @@ app.factory('common', ['$http', 'auth', '$routeParams','rms','config','wx','$loc
};
loadData(args.id,0,0);
- args.scope.addReply = function(data){
+ args.scope.addReply = function(data,reply_type){
console.log(data.comment);
- addCommonReply(args.id, args.replyType, data,args, function(subscribe){
- args.scope.formData = {comment: ''};
+ addCommonReply(data.act_id, args.replyType, data,args,reply_type, function(subscribe){
+// args.scope.formData = {comment: ''};
if(subscribe == 0){
$location.path("/login_tip");
return;
@@ -322,6 +324,27 @@ app.factory('common', ['$http', 'auth', '$routeParams','rms','config','wx','$loc
});
};
+ args.scope.inputfocus = function(data){
+ data.notshow = true;
+ };
+
+ args.scope.inputblur = function(data){
+ data.notshow = false;
+ };
+
+ args.scope.clickReply = function(act_id,data) {
+ allchidren = data.all_children;
+ for(var i in allchidren){
+ if(allchidren[i].act_id != act_id ){
+ allchidren[i].showinput = false;
+ }
+ else{
+ allchidren[i].showinput = !allchidren[i].showinput;
+ data.notshow = allchidren[i].showinput;
+ }
+ }
+ };
+
// 动态详情界面点赞与动态界面的数据要同步 保证进入详情点赞后出来显示一致
args.scope.addPraise = function(act){
activities = rms.get("activities") || [];
diff --git a/public/javascripts/wechat/others/routes.js b/public/javascripts/wechat/others/routes.js
index 2182e16ee..e5c87d1ab 100644
--- a/public/javascripts/wechat/others/routes.js
+++ b/public/javascripts/wechat/others/routes.js
@@ -51,6 +51,7 @@ app.config(['$routeProvider',"$httpProvider", "$locationProvider",'config', func
.when('/review_project_member', makeRoute('review_project_member.html', 'ReviewProjectMemberController'))
.when('/project_publishnote', makeRoute('project_publishnote.html', 'ProjectPublishNoteController'))
.when('/login_tip', makeRoute('login_tip.html', 'LoginTipController'))
+ .when('/edit_userinfo', makeRoute('edit_userinfo.html', 'EditUserInfoController'))
.otherwise({
redirectTo: '/activites'
});
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index 3d960b4ad..cf44a3814 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -257,4 +257,9 @@ a.underline {text-decoration:underline;}
/*发布帖子，通知*/
.full-width-wrap {padding:5px 15px; background-color:#fff; border-top:1px solid #ddd; border-bottom:1px solid #ddd;}
-.full-width-textarea {width:100%; height:180px; line-height:18px; max-height:180px; border:none; resize:none; font-size:13px; color:#555; overflow-y:auto;}
\ No newline at end of file
+.full-width-textarea {width:100%; height:180px; line-height:18px; max-height:180px; border:none; resize:none; font-size:13px; color:#555; overflow-y:auto;}
+
+/*资料修改*/
+.blank-row {width:100%; height:38px; line-height:38px; vertical-align:middle;}
+.upload-input-container {width:30px; height:30px; border:1px solid #ddd; position:relative;}
+.upload-input {width:30px; height:30px; position:absolute; z-index:1; opacity:0;}
\ No newline at end of file
<% end %>
@@ -112,7 +112,7 @@
<% end %>
-
+
