合并分支 'feature.login.v3.2.3.20210605.liuquan' 到 'XDJK-master'

修改电子处方笺判断

查看合并请求 !17

packageA/chat/chat.js

@@ -877,6 +877,7 @@ Page({
    */
   moreService: Util.debouce(function () {
     var that = this;
+    console.log("getCurrentPages",getCurrentPages())
     if (!that.data.t_unionid || !that.data.doctorunitid || !that.data.t_openid) {
       return;
     }

packageA/patientList/patientList.js

@@ -24,8 +24,7 @@ Page({
 	/**
 	 * 生命周期函数--监听页面初次渲染完成
 	 */
-	onReady: function () {
-	},
+	onReady: function () {},
 
 	/**
 	 * 生命周期函数--监听页面显示
@@ -33,29 +32,29 @@ Page({
 	onShow: function () {
 		var that = this;
 		that.login = that.selectComponent("#login");
-    that.modal = that.selectComponent("#modal");
-    that.answer = that.selectComponent("#answer");
-    wx.login({
-      success: function (msg) {
-        Service.getOpenId(msg.code).then((res) => {
-          wx.setStorageSync('user', res)
-          return Service.getUserData(res.openid)
-        }).then((res) => {
-          wx.setStorageSync('data', res) 
-        })
-      }
-    })
+		that.modal = that.selectComponent("#modal");
+		that.answer = that.selectComponent("#answer");
+		wx.login({
+			success: function (msg) {
+				Service.getOpenId(msg.code).then((res) => {
+					wx.setStorageSync('user', res)
+					return Service.getUserData(res.openid)
+				}).then((res) => {
+					wx.setStorageSync('data', res)
+				})
+			}
+		})
 		this.getListUser();
 	},
 	/**
 	 * 用户点击右上角分享
 	 */
 	onShareAppMessage: function (res) {
-    return {
-      title: '请完善信息',
-      path: 'packageA/patientList/patientList',
-    }
-	},//判断是否是iPhonex
+		return {
+			title: '请完善信息',
+			path: 'packageA/patientList/patientList',
+		}
+	}, //判断是否是iPhonex
 	checkModal() {
 		let that = this;
 		wx.getSystemInfo({
@@ -89,8 +88,8 @@ Page({
 					showview: true
 				})
 			}
-		}).catch(err=>{
-			console.log("userBuyInfoList",err)
+		}).catch(err => {
+			console.log("userBuyInfoList", err)
 		})
 	},
 	///新增用户信息 add lq dateTime 2020-03-23
@@ -99,7 +98,6 @@ Page({
 			url: "/packageA/editUser/editUser?btid=''",
 		})
 	},
-	
 	//修改
 	navto: function (e) {
 		console.log(e.currentTarget.dataset.item)
@@ -107,9 +105,9 @@ Page({
 			url: "/packageA/editUser/editUser?item=" + JSON.stringify(e.currentTarget.dataset.item) + "&btid=''",
 		})
 	},
-	  //登陆后组件回调方法刷新当前页面
-		_refreshEvent() {
-			console.log("刷新");
-			this.onShow();
-		},
+	//登陆后组件回调方法刷新当前页面
+	_refreshEvent() {
+		console.log("刷新");
+		this.onShow();
+	},
 })
\ No newline at end of file

packageA/recipeDetails/recipeDetails.wxml

@@ -101,7 +101,7 @@
 	</view>
 	<view class="hd-title">
 		<view>小懂健康互联网医院</view>
-		<view>电子处方笺</view>
+		<view>{{list.prescription.length>5?'用药建议':'电子处方笺'}}</view>
 	</view>
 	<view class="line1"></view>
 	<view class="diagnose">

pages/docuterInfo/docuterInfo.js

@@ -289,7 +289,7 @@ Page({
           wx.hideLoading();
         } else {
           let t_unionid = that.data.t_userInfo.unionid;
-          wx.navigateTo({
+          wx.reLaunch({
             url: '/packageA/chat/chat?t_unionid=' + t_unionid + '&orderId=' + conductRes.data+'&groupID='+conductRes.chat_id,
           })
           wx.hideLoading();