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

app/recover/html/personal-manage.html

@@ -92,8 +92,9 @@
			    							<span class="fr c-999">{{plan.time}}</span>
			    						</p>
			    						<div class="clearfix">
			    							<p class="fl w-100-78 bgc-c1c1c1 lh22 b-r-11 c-position-r c-t-center">{{setPercent(plan)}}
			    							<p class="fl w-100-78 bgc-c1c1c1 lh22 b-r-11 c-position-r c-t-center">
			    								<span class="c-position-a bgc-orange lh22 b-r-11 c-t-center c-fff" :style="{width: setPercent(plan), left: 0}"></span>
			    								<span class="c-position-r w-100 c-t-center">{{setPercent(plan)}}</span>
			    							</p>
			    							<span class="fr w60 c-999 lh22">{{plan.allFinishCount}}/{{plan.allCount}}</span>
			    						</div>

app/recover/html/project-detail.html

@@ -50,7 +50,7 @@
					<li class="fl set-photo c-border mr10 clearfix" v-for="(record, index) in planDetail.relationRecordImg" :key="index">
						<img class="fl" :src="handleImg(record)" alt="记录图" @click="lookPhoto(record)" />
					</li>
					<li class="c-t-center" v-if="!planDetail.relationRecordImg.length">暂无相关记录</li>
					<li class="c-t-center" v-if="planDetail.relationRecordImg && !planDetail.relationRecordImg.length">暂无相关记录</li>
				</ul>
			</div>
		</div>

app/rehabilitation/html/guide_the_message.html

@@ -79,7 +79,7 @@
	      		</div>
	      		<div class="note-info pt10">
	      			<p class="f14 c-333">服务完成笔记</p>
	      			<textarea v-if="service.status!=1" class="form-control" style="resize: none;" rows="4" placeholder="可备注您的服务记录" v-model="service.node"></textarea>
	      			<textarea v-if="service.status!=1  && service.isMyTask==1" class="form-control" style="resize: none;" rows="4" placeholder="可备注您的服务记录" v-model="service.node"></textarea>
	      			<div v-if="service.status==1">{{service.node}}</div>
	      		</div>
	      		<div class="note-info pt10" v-if="(service.type==2 || service.type==4) && service.relationRecordCode">
@@ -88,7 +88,7 @@
	      				<span class="pull-right"><i class="icon icon-arrow-right"></i></span>{{service.type==2?'健康文章':'随访记录'}} {{service.completeTimeShort}}
	      			</p>
	      		</div>
	      		<div class="note-info ptb10" v-if="service.type==0">
	      		<div class="note-info ptb10" v-if="service.type==0  && service.isMyTask==1">
	      			<p class="f14 c-333">相关记录</p>
	      			<ul class="upload-box"  v-if="service.status!=1">
	      				<li class="flex-box" v-for="(img,index) in upImgs">
@@ -118,7 +118,7 @@
				        <img id="bigimg" style="border:5px solid #fff;" src="" />
				    </div>
				</div>
	      		<div class="text-center ptb50" v-if="service.status!=1">
	      		<div class="text-center ptb50" v-if="service.status!=1 && service.isMyTask==1">
	      			<button class="btn btn-zhidao" @click="qrwc">确认完成</button>
	      		</div>
	      	</div>