Sfoglia il codice sorgente

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

yingzhou 6 anni fa
parent
commit
4c4e1beef6

+ 1 - 1
app/consulting/js/consulting.js

@ -196,7 +196,7 @@ new Vue({
		    consultingAPI.sendMessage(vm.sessionId, {data: params}).then(function(res){
		        console.log(res);
		        vm.count++;
		        if(vm.count==1){//level:1 专科医生 (只记录第一条数据)
		        if(vm.count==1 && JSON.parse(window.localStorage.getItem('wlyyAgent')).doctorType==1 && vm.planDetailId && vm.planDetailId!="undefined"){//level:1 专科医生 (只记录第一条数据)
			        var messages = res.messages[0];
			        var guidanceParams = {
			        	messageId:messages.id,//消息id

+ 6 - 3
app/guidance/html/index.html

@ -16,9 +16,7 @@
        <link rel="stylesheet" type="text/css" href="../css/index.css"/>
        <script src="../../../js/vue.js" type="text/javascript" charset="utf-8"></script>
        <script src="../../../js/jquery-2.2.4.js" type="text/javascript" charset="utf-8"></script>
		<script>
			var EventBus = new Vue();
		</script>
		
	</head>
	<body>
		<div id="app" >
@ -26,8 +24,13 @@
		</div>
		<script src="../../../plugins/toastr/toastr.min.js"></script>
		<script src="../../../plugins/artDialog/6.0.5/js/dialog-plus.min.js" type="text/javascript" charset="utf-8"></script>
		<script>
			var EventBus = new Vue();
			Vue.prototype.loading = dialog({contentType:'load', skin:'bk-popup'})
		</script>
		<script src="../../../api/http-request.js"></script>
		<script src="../../../js/underscore.js"></script>
		<script src="../../../api/home-api.js"></script>
		<script src="../../../api/guidance-api.js"></script>
		<script src="../../../js/vue-router.js"></script>
		<script src="../../../component/guidance/index-page.js"></script>

+ 18 - 2
app/guidance/js/index.js

@ -41,7 +41,7 @@ router = new VueRouter({
  routes: routes
}),
storage = {
	docInfo: localStorage.getItem('docInfo')?JSON.parse(localStorage.getItem('docInfo')):null,
	docInfo: null,
	patient: null, // url中patient,用来来判断是否是"发送"模式
	planId: null
}
@ -50,9 +50,25 @@ new Vue({
    data: {
    },
    router: router,
    created: function() {
    	var vm = this
    	vm.loading.show()
    	homeAPI.baseinfo().then(function(res) {
	  		if(res.status == 200) {
	  			vm.loading.close()
	  			var infoStr = JSON.stringify(res.data);
	  			localStorage.setItem("docInfo", infoStr);
	  			storage.docInfo = res.data
	  			vm.$mount('#app')
	  		} else {
	  			vm.loading.close()
	  			toastr && toastr.error(res.msg)
	  		}
	  	})
    },
    methods: {
        chooseTab: function(val){
            this.selectedTab = val;
        }
    }
}).$mount('#app')
})

+ 3 - 1
app/recover/html/personal-manage.html

@ -28,7 +28,9 @@
		    					</p>
		    					<p class="m0 p0 mb10">
		    						<span class="c-999">健康情况:</span>{{recoverPatInfo.patientInfo.healthyCondition}}
		    						<span class="c-999 ml10">联系电话:</span><span class="c-12b7f5 cur-pit" v-if="isMobile" @click="changeStatu()">点击查看</span><span v-else>{{recoverPatInfo.patientInfo.mobile}}</span>
		    					</p>
		    					<p class="m0 p0 mb10">
		    						<span class="c-999">联系电话:</span><span class="c-12b7f5 cur-pit" v-if="isMobile" @click="changeStatu()">点击查看</span><span v-else>{{recoverPatInfo.patientInfo.mobile}}</span>
		    					</p>
		    				</div>
		    				<div class="fr set-photo">

+ 1 - 0
app/rehabilitation/html/management.html

@ -29,6 +29,7 @@
			Vue.prototype.loading = dialog({contentType:'load', skin:'bk-popup'})
		</script>
		<script src="../../../api/http-request.js"></script>
		<script src="../../../api/home-api.js"></script>
		<script src="../../../js/underscore.js"></script>
		<script type="text/javascript" src="../../../api/rehabilitation-api.js"></script>
		<script src="../../../js/vue-router.js"></script>

+ 18 - 2
app/rehabilitation/js/management.js

@ -43,7 +43,7 @@ router = new VueRouter({
  routes: routes
}),
storage = {
	docInfo: localStorage.getItem('docInfo')?JSON.parse(localStorage.getItem('docInfo')):null,
	docInfo: null,
	patient: null, // url中patient,用来来判断是否是"发送"模式
	planId: null
}
@ -52,8 +52,24 @@ new Vue({
    data: {
    },
    router: router,
    created: function() {
    	var vm = this
    	vm.loading.show()
    	homeAPI.baseinfo().then(function(res) {
	  		if(res.status == 200) {
	  			vm.loading.close()
	  			var infoStr = JSON.stringify(res.data);
	  			localStorage.setItem("docInfo", infoStr);
	  			storage.docInfo = res.data
	  			vm.$mount('#app')
	  		} else {
	  			vm.loading.close()
	  			toastr && toastr.error(res.msg)
	  		}
	  	})
    },
    methods: {
    },
    components: {
    }
}).$mount('#app')
})