From 59b12821de2f11650c1f93014aaf7cc3b034b625 Mon Sep 17 00:00:00 2001
From: shaoshuai <975432984@qq.com>
Date: Mon, 22 May 2023 15:48:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 woman/app.json               |  5 ++---
 woman/pages/doctor/doctor.js | 15 ++++++++++-----
 woman/pages/home/home.js     | 13 ++++++++++---
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/woman/app.json b/woman/app.json
index d53f9cb..de92787 100644
--- a/woman/app.json
+++ b/woman/app.json
@@ -8,13 +8,12 @@
     "pages/articleDetail/articleDetail",
     "pages/hospitalDetail/hospitalDetail",
     "pages/login/login",
-    "pages/logs/logs",
     "pages/folicAcid/folicAcid",
     "pages/cancerCheck/cancerCheck",
     "pages/report_first/report_first",
     "pages/premaritalCheckup/premaritalCheckup",
-  "pages/premaritalReport/premaritalReport",
-  "pages/eugenics/eugenics"
+	"pages/premaritalReport/premaritalReport",
+	"pages/eugenics/eugenics"
   
   
 	
diff --git a/woman/pages/doctor/doctor.js b/woman/pages/doctor/doctor.js
index 5550378..23e3ac1 100644
--- a/woman/pages/doctor/doctor.js
+++ b/woman/pages/doctor/doctor.js
@@ -32,22 +32,27 @@ Page({
 			"provinceId": "1",
 			"pwd": "E10ADC3949BA59ABBE56E057F20F883E",
 			"status": 0,
-			"type": 1
+			"type": 1,
+			"username": "张春芳",
+			"goodAt": "医生技能医生技能医生技能医生技能医生技能医生技能医生技能医生技能医生技能医生技能",
+			"expertCase":"医生技能医生技能医生技能医生技能医生技能医生技能医生技能医生技能医生技能医生技能医生技能医生技能医生技能医生技能医生技能医生技能医生技能"
 		},
     hospitalName: '',
     doctorLevel: '',
     deptName: '',
     hxName: '',
-    member: []
+    member: [],
+	hospitalLevel:"三甲医院"
   },
   /*---------生命周期--------*/
   onLoad: function (options) {
     console.log(options)
+	console.log("医生详情")
    // networkUtil.showLoading()
    // 测试数据
-    options.hospitalId = 177
-    options.doctorId = 473
-    this.requestData(options.hospitalId, options.doctorId)
+    //options.hospitalId = 177
+    //options.doctorId = 473
+   // this.requestData(options.hospitalId, options.doctorId)
   },
   chatWithDoctor() {
     var self = this
diff --git a/woman/pages/home/home.js b/woman/pages/home/home.js
index f21a490..b49727f 100644
--- a/woman/pages/home/home.js
+++ b/woman/pages/home/home.js
@@ -61,7 +61,14 @@ Page({
     smallH: wx.getSystemInfoSync().windowWidth / 4 - 2,
     yyHospitalId: '',
     Babyimg:[],
-	userInfo: ""
+	week:"已分娩",
+	leftCheckDay: "已分娩",
+	intervalDays: "已分娩",
+	userInfo: {
+		username: '李芳芳',
+		newPatientId: "12312341234",
+		
+	}
   },
 
 
@@ -129,7 +136,7 @@ Page({
     }
   },
   onShow: function(option) {
-    console.log('首页的op__', option)
+  /*  console.log('首页的op__', option)
     wx.setStorageSync('isSocketConnnected', false)
     // 生命周期函数--监听页面显示
     if (app.globalData.token.length > 0 && this.data.isDocument == 1) {
@@ -146,7 +153,7 @@ Page({
     
     this.setData({
       yyHospitalId: wx.getStorageSync('yyHospitalId')
-    })
+    }) */
   },
   onUnload: function() {
     // 移除监听
-- 
1.8.3.1