修复bug

bdb5b227 · liuquan · 48651c12 · bdb5b227 · bdb5b227 · bdb5b227
Commit bdb5b227 authored Jun 01, 2021 by liuquan
10 changed files
--- a/app.js
+++ b/app.js
@@ -56,6 +56,7 @@ App({
  },
  onShow: function () {
    console.log("onShow")
+    this.forcedUpdate();
  },
  onHide: function () {
    console.log("onHide")

--- a/app.json
+++ b/app.json
@@ -99,11 +99,5 @@
      }
    ]
  },
-  "usingComponents": {
-    "mp-toptips": "/miniprogram_npm/weui-miniprogram/toptips/toptips",
-    "answer":"/components/answer/answer",
-    "modal": "/components/modal/modal",
-    "login": "/components/login/login"
- },
  "sitemapLocation": "sitemap.json"
 }
\ No newline at end of file
--- a/packageA/chat/chat.js
+++ b/packageA/chat/chat.js
@@ -612,9 +612,10 @@ Page({
    wx.getSetting({
      withSubscriptions: true,
      success(res) {
-        var itemSettings = !Util.isEmpty(res.subscriptionsSetting) ? res.subscriptionsSetting.itemSettings : "";
+        let itemSettings = !Util.isEmpty(res.subscriptionsSetting) ? res.subscriptionsSetting.itemSettings : "";
+        console.log('itemSettings', res, itemSettings)
        if (itemSettings) {
-          if (itemSettings['d33RkZvTz6O8Zjw8b8faoKIQGXA0cJJ2G24_kIWQjtY'] == 'accept') {
+          if (itemSettings['d33RkZvTz6O8Zjw8b8faoKIQGXA0cJJ2G24_kIWQjtY'] == 'accept' && itemSettings['FfvTlT9HNBt1zHNWKYUBs5dJ5n-bG7bcVpPcVZrH8jk'] == 'accept') {
            that.setData({
              remind: false
            });
@@ -644,9 +645,12 @@ Page({
    that.setData({
      remind: false
    })
    wx.requestSubscribeMessage({
-      tmplIds: ['d33RkZvTz6O8Zjw8b8faoKIQGXA0cJJ2G24_kIWQjtY'],
+      tmplIds: ['d33RkZvTz6O8Zjw8b8faoKIQGXA0cJJ2G24_kIWQjtY', 'FfvTlT9HNBt1zHNWKYUBs5dJ5n-bG7bcVpPcVZrH8jk'],
-      success(res) {}
+      success(res) {
+        console.log('requestSubscribeMessage', res)
+      }
    })
    that.checkDeviceAuthorize().then((result) => {
      console.log('%c授权成功', 'color:#04BE02', result)
@@ -654,6 +658,24 @@ Page({
      console.log('没有授权', error)
    })
  },
+  tmplArr() {
+    let arr=[];
+    wx.getSetting({
+      withSubscriptions: true,
+      success(res) {
+        let itemSettings = !Util.isEmpty(res.subscriptionsSetting) ? res.subscriptionsSetting.itemSettings : "";
+        console.log('itemSettings', res, itemSettings)
+        if (itemSettings) {
+          arr=itemSettings.map((item)=>{
+          })
+        }else{
+          arr= ['d33RkZvTz6O8Zjw8b8faoKIQGXA0cJJ2G24_kIWQjtY', 'FfvTlT9HNBt1zHNWKYUBs5dJ5n-bG7bcVpPcVZrH8jk'];
+        }
+      }
+    })
+    return arr;
+  },
  /**
   *  服务提前结束 0同意 1拒绝
   */
@@ -719,7 +741,7 @@ Page({
              status: true,
              serviceName: res.data.name
            })
-            if( res.data.counsel=="20"){
+            if (res.data.counsel == "20") {
              that.getFreeChat(that.data.t_unionid, wx.getStorageSync('data').unionid);
            }
            return
@@ -729,7 +751,7 @@ Page({
              end_time: '',
              serviceName: '未知',
            })
-            if( res.data.counsel=="20"){
+            if (res.data.counsel == "20") {
              that.getFreeChat(that.data.t_unionid, wx.getStorageSync('data').unionid);
            }
            break;

--- a/packageA/drugOrderInfo/drugOrderInfo.js
+++ b/packageA/drugOrderInfo/drugOrderInfo.js
@@ -55,7 +55,7 @@ Page({
 		that.login = that.selectComponent("#login");
 		that.modal = that.selectComponent("#modal");
 		that.answer = that.selectComponent("#answer");
-		if (wx.getStorageSync('data').unionid == undefined || wx.getStorageSync('data').unionid == '') {
+		if (Util.isEmpty(wx.getStorageSync('data').unionid)) {
 			wx.login({
 				success: function (msg) {
 					Service.getOpenId(msg.code).then((res) => {
@@ -405,11 +405,19 @@ Page({
 		// 	}
 		// }
 		let {
-			unionid
+			unionid,openid
 		} = wx.getStorageSync('user');
+		if (unionid == undefined || unionid == ''){
+			wx.showModel({
+				title: '小懂提示:-99',
+				content: '当前小程序版本太低，请重启小程序再试!',
+			})
+			return 
+		}
 		let data = {
 			payid: that.data.list.payid,
 			patient_unionid: unionid,
+			openid:openid,
 			modular: that.data.list.modular,
 			lastid: that.data.item.id,
 			address: that.data.receiveAddress.id,

--- a/packageA/productOrderInfo/productOrderInfo.js
+++ b/packageA/productOrderInfo/productOrderInfo.js
@@ -61,7 +61,7 @@ Page({
 		that.login = that.selectComponent("#login");
 		that.modal = that.selectComponent("#modal");
 		that.answer = that.selectComponent("#answer");
-		if (wx.getStorageSync('data').unionid == undefined || wx.getStorageSync('data').unionid == '') {
+		if (Util.isEmpty(wx.getStorageSync('data').unionid)) {
 			wx.login({
 				success: function (msg) {
 					Service.getOpenId(msg.code).then((res) => {
@@ -364,9 +364,10 @@ Page({
 		// 		hstr.push(healthcare[i].id);
 		// 	}
 		// }
-		let {unionid}=wx.getStorageSync('data');
+		let {unionid,openid}=wx.getStorageSync('user');
 		let data = {
 			id: that.data.options.scene,
+			openid:openid,
 			patient_unionid:unionid,
 			modular: that.data.list.modular,
 			lastid: that.data.item.id,

--- a/pages/docuterInfo/docuterInfo.js
+++ b/pages/docuterInfo/docuterInfo.js
@@ -216,6 +216,7 @@ Page({
  },
  //支付
  applyPay: function (e) {
+    console.log('e',e)
    wx.showLoading({
      title: '正在生成',
      mask: true

--- a/pages/prescription/order/order.js
+++ b/pages/prescription/order/order.js
@@ -228,13 +228,13 @@ Page({
 			})
 		}
 	},
-/**
+	/**
 	 * 是否需要开具纸质发票
 	 * @param {*} e 
 	 */
 	checkboxChange: function (e) {
 		this.setData({
-      isInvoice: e.detail.value[0]==1?1:0,
+			isInvoice: e.detail.value[0] == 1 ? 1 : 0,
 		})
 	},
 	/**
@@ -291,7 +291,9 @@ Page({
 		that.setData({
 			isBtnAsh: false
 		})
-		let {unionid}=wx.getStorageSync('user');
+		let {
+			unionid
+		} = wx.getStorageSync('user');
 		if (Util.isEmpty(unionid)) {
 			that.login.showLogin();
 			that.setData({
@@ -365,11 +367,21 @@ Page({
 		// 		hstr.push(healthcare[i].id);
 		// 	}
 		// }
+		let {
-		let {unionid}=wx.getStorageSync('data');
+			unionid,
+			openid
+		} = wx.getStorageSync('data');
+		if (unionid == undefined || unionid == '') {
+			wx.showModel({
+				title: '小懂提示:-99',
+				content: '当前小程序版本太低，请重启小程序再试!',
+			})
+			return
+		}
 		let data = {
 			payid: that.data.list.payid,
-			patient_unionid:unionid,
+			openid: openid,
+			patient_unionid: unionid,
 			modular: that.data.list.modular,
 			lastid: that.data.item.id,
 			address: that.data.receiveAddress.id,
@@ -377,7 +389,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
 		}
 		Service.prescriptionPay(data).then((res) => {

--- a/project.private.config.json
+++ b/project.private.config.json
@@ -94,6 +94,12 @@
          "pathName": "pages/docuterInfo/docuterInfo",
          "query": "t_unitid=18870",
          "scene": 1008
+        },
+        {
+          "name": "pages/index/index",
+          "pathName": "pages/index/index",
+          "query": "",
+          "scene": null
        }
      ]
    }

--- a/utils/service.js
+++ b/utils/service.js
@@ -50,7 +50,7 @@ function getUserData(openid) {
  let getUserDataUrl = config.url.getUserData;
  let data = {};
  data.openid = openid;
-  // data.openid='oYQX40NLrhSABsJpu_5GbRTELTP4'
+  // data.openid='oYQX40IIkeCSa2Kb_5UmEKkrUcH0'
  return wxRequest.postRequest(getUserDataUrl, data);
 };
 /**

--- a/utils/util.js
+++ b/utils/util.js
@@ -188,7 +188,7 @@ function formatLocation(longitude, latitude) {
 }
 //非空判断
 function isEmpty(obj) {
-  if (!obj || obj == "undefined" || obj == null || obj == 'null' || obj == "") {
+  if (!obj || obj == "undefined" || obj == null || obj == 'null' || obj == "" || obj == undefined) {
    return true;
  } else {
    return false;