调整situationId

pages/login/login.vue

@@ -34,7 +34,7 @@
 		data() {
 			return {
 				index:0,
-				appHospSign:'AbRZOSfygQ1xCxoZ',//app端更新hospSign
+				appHospSign:'OaOgrjpapzbLJGFU',//app端更新hospSign
 				showInputModal:false,
 				hospSign: '', // 医院标识
 				username: '', // 用户名

pages/situationDetail/situationDetail.vue

@@ -142,6 +142,7 @@
 			}
 		},
 		onLoad({ situationId,systemSituationType}){ // situationId：情景id,systemSituationType 情境类型
+		  console.log({situationId});
 		  this.situationID=situationId;
 		  this.systemSituationType = systemSituationType;
 		  this.getPlanDetailList();

pages/situationsCenter/situationsCenter.vue

@@ -10,7 +10,7 @@
 			<scroll-view class="scroll-box" scroll-y="true" @scrolltolower="toLower" lower-threshold="5">
 				<view class="content" :style="[situationList.length === 0 ?{height:'100%'}:{}]">
 					<view class="situation" v-for="(item, index) in situationList" :key="item.id"
-						@click="gotoDetail(item.situationID,item.systemSituationType,item)">
+						@click="gotoDetail(item.situationID?item.situationID:id,item.systemSituationType,item)">
 						<!-- <image v-if="item.systemSituationType != 2" class="situation-topic" :src="`/static/${
                 item.topic ? 'situation-case' : 'situation-system'
               }.png`"></image> -->
@@ -261,7 +261,7 @@
 				});
 			},
 			gotoDetail(id, systemSituationType, item) {
-
+                console.log({id, systemSituationType, item});
 				this.$store.commit({
 					type: 'situationsCenter/comChangeState',
 					key: 'currentSelectedSituation',

utils/request.js

@@ -44,7 +44,7 @@ function creatRequest(obj, data) {
 function request(url, options, additional) {
   if (additional.needLoading === undefined) additional.needLoading = true;
   // 加载中提示打开
-  // console.log({url, options, additional});
+  console.log({url, options, additional});
   openCloseLoading(additional, true);
   // 模拟token,做登录的同学将这行代码移到登录成功函数中.
 
@@ -146,9 +146,9 @@ function notifyException(resArr, additional) {
 	}
     console.error(`请求错误: ${error.errMsg}`);
     return false;
-  } else if (res.data.code !== 'SUCCESS') {
+  } else if (res.data&&res.data.code !== 'SUCCESS') {
     const { code, msg } = res.data;
-	console.log('res.data',res.data)
+	console.log('res.data',res.data,'additional',additional)
     if (code === '410' || code === '401'||code === '403') {
 		
 	  // 当页面被嵌套告诉主页面，token过期

utils/requestUrl.js

@@ -11,10 +11,11 @@
 export const networkType = 1; //网络类型：内网=0，外网=1
 
 // export const URL = '192.168.3.28:8801/imed/pfm/'; // 本地
-export const URL = '112.124.59.133:8802/imed/pfm/'; //线上测试
+// export const URL = '112.124.59.133:8802/imed/pfm/'; //线上测试
 // export const URL = '118.31.245.65:8086/imed/pfm/'; //65测试环境
 // export const URL = '118.31.245.65:8802/imed/pfm/'; //线上
 // export const URL = '112.12.21.134:8111/imed/pfm/'; //横店
+   export const URL = '118.31.245.65:8086/imed/pfm/'; // 成都新华医院
 
 // export const URL = '192.168.1.253:8111/imed/pfm/';
 // export const URL = '192.168.1.45:8088/imed/pfm/'; //内网