Merge branch 'master' of http://192.168.1.220:10080/raolu/PC-application

app/article/html/article.html

@@ -324,6 +324,8 @@
			        		var icon=5;
			        		if(res.status==200){//更新父窗体的状态
			        			icon=1;
		        				var index = parent.layer && parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
								parent.layer && parent.layer.close(index)
			        		}
			        		top.layer.msg(res.msg, {icon: icon});
			        	})

app/rehabilitation/html/guide_the_message.html

@@ -57,7 +57,7 @@
		      						{{item.createTime}}
		      					</div>
		      				</div>
		      				<div class="f14 c-333">{{item.content}}</div>
			      			<div class="f14 c-333" v-html="item.content | getContent(item.contentType)"></div>
	      				</div>
	      			</div>
	      			<div class="flex-box btns-group" v-if="(service.isMyTask==1 || service.isCreate || service.isCK) && service.planStatus!=0 && service.status!=1">

app/rehabilitation/html/service_item_content.html

@@ -53,7 +53,7 @@
			      						{{item.createTime}}
			      					</div>
			      				</div>
			      				<div class="f14 c-333">{{item.content}}</div>
			      				<div class="f14 c-333" v-html="item.content | getContent(item.contentType)"></div>
		      				</div>
	      				</div>
		      			<div class="flex-box btns-group" v-if="(service.isMyTask==1 || service.isCreate || service.isCK) && service.planStatus!=0 && service.status!=1">

app/rehabilitation/js/guide_the_message.js

@@ -287,6 +287,17 @@
			getImgUrl: function(value) {
				var url = httpRequest.getImgUrl(value);
				return url;
			},
			getContent: function(value,type) {
				var res=value;
				if(type==2 || type==9){
					res = "<img src='"+httpRequest.getImgUrl(res)+"'>";
				}else if(type==3){
					res = '[语音](只能在聊天窗口里查看)';
				}else if(type==19){
					res = '[聊天记录](只能在聊天窗口里查看)';
				}
				return res;
			}
		}
	})

app/rehabilitation/js/moreplan.js

@@ -248,7 +248,7 @@ layui.use('element', function () {
                    type: 2,
                    area: ['750px', '650px'],
                    shade: 0.5,
                    title: '服务项目内容',
                    title: '居民信息',
                    fixed: true, //不固定
                    maxmin: true,
                    closeBtn: 1,

app/rehabilitation/js/service_item_content.js

@@ -45,7 +45,7 @@
						shadeClose: false, //点击遮罩关闭层
						content: '../../article/html/article-info.html?articleId=' + code,
						end: function() { // 未点击确定按钮，点击关闭按钮  
							vm.getServiceItem();　　　　
							vm.getServiceItemList();　　　　
						}
					});
					
@@ -270,6 +270,17 @@
			getImgUrl: function(value) {
				var url = httpRequest.getImgUrl(value);
				return url;
			},
			getContent: function(value,type) {
				var res=value;
				if(type==2 || type==9){
					res = "<img src='"+httpRequest.getImgUrl(res)+"'>";
				}else if(type==3){
					res = '[语音](只能在聊天窗口里查看)';
				}else if(type==19){
					res = '[聊天记录](只能在聊天窗口里查看)';
				}
				return res;
			}
		}
	})

component/guidance/person-edit-panel.js

@@ -192,8 +192,8 @@ var PersonEditPanel = {
        					dataJson: JSON.stringify(obj)
        				}).then(function(res) {
        					if(res.status == 200) {
        						var index = top.layer && top.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
								top.layer && top.layer.close(index)
        						var index = parent.layer && parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
								parent.layer && parent.layer.close(index)
        					} else {
        						toastr && toastr.success(res.msg)
        					}

component/guidance/system-send-panel.js

@@ -188,9 +188,11 @@ var SystemSendPanel = {
        				guidanceAPI.saveRehabilitationOperateRecord({
        					dataJson: JSON.stringify(obj)
        				}).then(function(res) {
        					console.log(res)
        					console.log(res.status)
        					if(res.status == 200) {
        						var index = top.layer && top.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
								top.layer && top.layer.close(index)
        						var index = parent.layer && parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
								parent.layer && parent.layer.close(index)
        					} else {
        						toastr && toastr.success(res.msg)
        					}