no message

packageA/drugOrderInfo/drugOrderInfo.js

@@ -21,10 +21,9 @@ Page({
 		items: [{
 			name: '',
 			value: '1'
-		},
-	],
-	isInvoice:0,//是否开具发票
-	isBtnAsh:true,//支付按钮置灰
+		}, ],
+		isInvoice: 0, //是否开具发票
+		isBtnAsh: true, //支付按钮置灰
 	},
 	/**
 	 * 生命周期函数--监听页面加载
@@ -88,7 +87,9 @@ Page({
 	},
 	// 处方笺
 	getPrescribe: function (id, patient_unionid) {
-		wx.showLoading({mask:true});
+		wx.showLoading({
+			mask: true
+		});
 		let that = this
 		if (that.data.paySuccess) {
 			wx.hideLoading();
@@ -133,7 +134,9 @@ Page({
 	},
 	// 快速开药
 	getQuick: function (quickid, patient_unionid) {
-		wx.showLoading({mask:true});
+		wx.showLoading({
+			mask: true
+		});
 		var that = this
 		if (that.data.paySuccess) {
 			wx.hideLoading();
@@ -223,7 +226,9 @@ Page({
 	 * @param {Object} e 事件绑定值
 	 */
 	myDetails: function (e) {
-		wx.showLoading({mask:true});
+		wx.showLoading({
+			mask: true
+		});
 		var that = this;
 		if (wx.getStorageSync('data').unionid == undefined) {
 			that.login.showLogin();
@@ -246,11 +251,11 @@ Page({
 	 * 是否需要开具纸质发票
 	 * @param {*} e 
 	 */
-  checkboxChange: function (e) {
-    this.setData({
-      isInvoice: e.detail.value[0]==1?1:0,
-    })
-  },
+	checkboxChange: function (e) {
+		this.setData({
+			isInvoice: e.detail.value[0] == 1 ? 1 : 0,
+		})
+	},
 	/**
 	 * 调起顺丰电话客服
 	 */
@@ -263,7 +268,9 @@ Page({
 	 * 知情同意书
 	 */
 	goConsent: function () {
-		wx.showLoading({mask:true})
+		wx.showLoading({
+			mask: true
+		})
 		wx.navigateTo({
 			url: '/packageA/consent/consent'
 		})
@@ -273,7 +280,9 @@ Page({
 	 * 同意知情同意书
 	 */
 	agree: function () {
-		wx.showLoading({mask:true});
+		wx.showLoading({
+			mask: true
+		});
 		var that = this;
 		var agree = that.data.agree ? false : true;
 		that.setData({
@@ -285,7 +294,9 @@ Page({
 	 *选择地址 
 	 */
 	gosite() {
-		wx.showLoading({mask:true})
+		wx.showLoading({
+			mask: true
+		})
 		wx.navigateTo({
 			url: '/packageA/site/site',
 		})
@@ -317,6 +328,16 @@ Page({
 		that.setData({
 			isBtnAsh: false
 		})
+		let {
+			unionid
+		} = wx.getStorageSync('user');
+		if (Util.isEmpty(unionid)) {
+			that.login.showLogin();
+			that.setData({
+				isBtnAsh: true
+			})
+			return
+		}
 		if (that.data.receiveAddress.id == undefined) {
 			wx.showToast({
 				title: '请填写收货地址',
@@ -383,7 +404,9 @@ Page({
 		// 		hstr.push(healthcare[i].id);
 		// 	}
 		// }
-		let {unionid}=wx.getStorageSync('data');
+		let {
+			unionid
+		} = wx.getStorageSync('user');
 		let data = {
 			payid: that.data.list.payid,
 			patient_unionid: unionid,
@@ -394,7 +417,7 @@ Page({
 			money: that.data.list.money,
 			hstr: hstr.toString(),
 			isgd: 1,
-			isInvoice:that.data.isInvoice,
+			isInvoice: that.data.isInvoice,
 			// rise_need:that.data.isInvoice
 		}
 		// let data={
@@ -422,7 +445,7 @@ Page({
 						signType: 'MD5',
 						paySign: res.data.parameter.paySign,
 						success(res) {
-							console.log("success",res);
+							console.log("success", res);
 							if (res.errMsg && res.errMsg == "requestPayment:ok") {
 								console.log("requestPayment:ok")
 								wx.reLaunch({
@@ -439,7 +462,7 @@ Page({
 							}
 						},
 						fail(res) {
-							console.log("fail",res);
+							console.log("fail", res);
 							wx.showToast({
 								title: '支付失败',
 								icon: 'none'

packageB/myReport/myReport.js

@@ -156,6 +156,7 @@ Page({
     var that = this;
     let data = {};
     data.openid = wx.getStorageSync('user').openid;
+    // data.openid = 'oYQX40NLrhSABsJpu_5GbRTELTP4'
     Service.getReportList(data).then((res) => {
       if (!res) {
         wx.showToast({
@@ -165,11 +166,7 @@ Page({
         })
         return;
       }
-      if (res[0].length == 0 && res[1].length == 0) {
-        that.setData({
-          record404: true
-        })
-      } else {
+
         that.structureDataUser(res[0]);
         var con = res[1];
         for (let i = 0; i < con.length; i++) {
@@ -180,7 +177,11 @@ Page({
           [`userReport.haveDone`]: con,
           isShow: true,
         })
-      }
+        if(con.length==0&&this.data.userReport.notDone.length==0){
+          that.setData({
+            record404: true
+          })
+        }
       wx.stopPullDownRefresh();
     })
   },
@@ -199,6 +200,8 @@ Page({
         json.push(e[j])
       } else {}
     }
+    console.log("structureDataUser",e)
+   
     that.setData({
       ['userReport.notDone']: json
     })

packageB/myReport/myReport.wxss

 @import '/common/common.wxss';
 
 page {
-  background: #f2f2f2;
+  background: #fff;
   border-top: 10rpx solid #f5f8fb;
 }
 

pages/chatNews/chatNews.js

@@ -223,7 +223,7 @@ Page({
           item.groupName = item.groupProfile.name;
           return item;
         });
-        console.log("serviceList",JSON.stringify(serviceList));
+        // console.log("serviceList",JSON.stringify(serviceList));
         that.setData({
           serviceList: serviceList,
           showview: true,

pages/prescription/order/order.js

@@ -291,6 +291,14 @@ Page({
 		that.setData({
 			isBtnAsh: false
 		})
+		let {unionid}=wx.getStorageSync('user');
+		if (Util.isEmpty(unionid)) {
+			that.login.showLogin();
+			that.setData({
+				isBtnAsh: true
+			})
+			return
+		}
 		if (that.data.receiveAddress.id == undefined) {
 			wx.showToast({
 				title: '请填写收货地址',
@@ -357,6 +365,7 @@ Page({
 		// 		hstr.push(healthcare[i].id);
 		// 	}
 		// }
+		
 		let {unionid}=wx.getStorageSync('data');
 		let data = {
 			payid: that.data.list.payid,

utils/service.js

@@ -50,7 +50,7 @@ function getUserData(openid) {
   let getUserDataUrl = config.url.getUserData;
   let data = {};
   data.openid = openid;
-  // data.openid='oYQX40AcNx-pgl2fdqGOcJFvHKns'
+  // data.openid='oYQX40NLrhSABsJpu_5GbRTELTP4'
   return wxRequest.postRequest(getUserDataUrl, data);
 };
 /**