diff --git a/littleApp_child/app.json b/littleApp_child/app.json
index 37addc5..c387633 100644
--- a/littleApp_child/app.json
+++ b/littleApp_child/app.json
@@ -1,69 +1,72 @@
{
- "pages": [
- "pages/home/home",
- "pages/quickArchives/quickArchives",
- "pages/illnessArchives/illnessArchives",
- "pages/checkupAskInput/checkupAskInput",
- "pages/Setting/Setting",
- "pages/PersonalInfo/PersonalInfo",
- "pages/checkTabList/checkTabList",
- "pages/feedback/feedback",
- "pages/mySaved/mySaved",
- "pages/CheckReport/CheckReport",
- "pages/articleLists/articleLists",
- "pages/SearchPage/SearchPage",
- "pages/login/login",
- "pages/inspectionReport/inspectionReport",
- "pages/doctor_detail/doctor_detail",
- "pages/doctorList/doctorList",
- "pages/hospital_detail/hospital_detail",
- "pages/doctor/doctor",
- "pages/hospitalList/hospitalList",
- "pages/childcare_knowledge_detail/childcare_knowledge_detail",
- "pages/system_notifacations/system_notifacations",
- "pages/risk_guide/risk_guide",
- "pages/childcare_knowledge/childcare_knowledge",
- "pages/CompleteTouristInfo/CompleteTouristInfo",
- "pages/vipService/vipService",
- "pages/order_payment/order_payment",
- "pages/Register/Register",
- "pages/Guide/guide",
- "pages/checkupInput/checkupInput",
- "pages/inspect/inspectList",
- "pages/diet/measuret",
- "pages/inforBind/inforBind",
- "pages/QRCodePage/QRCodePage",
- "pages/DiseaseGuide/DiseaseGuide",
- "pages/quickMeasurement/quickMeasurement",
- "pages/doctorLists/doctorLists",
- "pages/payFail/payFail",
- "pages/paySuccess/paySuccess",
- "pages/consulting/consulting",
- "pages/consultationRecord/consultationRecord",
- "pages/chatHis/chatHis",
- "pages/eyeReoort/eyeReoort",
- "pages/weightReport/weightReport",
- "pages/weightReportList/weightReportList",
- "pages/chatroom/chatroom"
- ],
- "subPackages": [
- {
- "root": "packageA",
- "pages": [
- "pages/graph/graph",
- "pages/editAddress/editAddress",
- "pages/articleList/articleList",
- "pages/article/article",
- "pages/preDocumented/preDocumented"
- ]
+ "pages": [
+ "pages/home/home",
+ "pages/quickArchives/quickArchives",
+ "pages/illnessArchives/illnessArchives",
+ "pages/checkupAskInput/checkupAskInput",
+ "pages/Setting/Setting",
+ "pages/PersonalInfo/PersonalInfo",
+ "pages/checkTabList/checkTabList",
+ "pages/feedback/feedback",
+ "pages/mySaved/mySaved",
+ "pages/CheckReport/CheckReport",
+ "pages/articleLists/articleLists",
+ "pages/SearchPage/SearchPage",
+ "pages/login/login",
+ "pages/inspectionReport/inspectionReport",
+ "pages/doctor_detail/doctor_detail",
+ "pages/doctorList/doctorList",
+ "pages/hospital_detail/hospital_detail",
+ "pages/doctor/doctor",
+ "pages/hospitalList/hospitalList",
+ "pages/childcare_knowledge_detail/childcare_knowledge_detail",
+ "pages/system_notifacations/system_notifacations",
+ "pages/risk_guide/risk_guide",
+ "pages/childcare_knowledge/childcare_knowledge",
+ "pages/CompleteTouristInfo/CompleteTouristInfo",
+ "pages/vipService/vipService",
+ "pages/order_payment/order_payment",
+ "pages/Register/Register",
+ "pages/Guide/guide",
+ "pages/checkupInput/checkupInput",
+ "pages/inspect/inspectList",
+ "pages/diet/measuret",
+ "pages/inforBind/inforBind",
+ "pages/QRCodePage/QRCodePage",
+ "pages/DiseaseGuide/DiseaseGuide",
+ "pages/quickMeasurement/quickMeasurement",
+ "pages/doctorLists/doctorLists",
+ "pages/payFail/payFail",
+ "pages/paySuccess/paySuccess",
+ "pages/consulting/consulting",
+ "pages/consultationRecord/consultationRecord",
+ "pages/chatHis/chatHis",
+ "pages/eyeReoort/eyeReoort",
+ "pages/weightReport/weightReport",
+ "pages/weightReportList/weightReportList",
+ "pages/chatroom/chatroom"
+ ],
+ "subPackages": [
+ {
+ "root": "packageA",
+ "pages": [
+ "pages/graph/graph",
+ "pages/editAddress/editAddress",
+ "pages/articleList/articleList",
+ "pages/article/article",
+ "pages/preDocumented/preDocumented",
+ "pages/serviceNotice/serviceNotice"
+ ]
+ }
+ ],
+ "window": {
+ "backgroundTextStyle": "light",
+ "navigationBarBackgroundColor": "#fff",
+ "navigationBarTitleText": "孕婴助手",
+ "navigationBarTextStyle": "black"
+ },
+ "sitemapLocation": "sitemap.json",
+ "useExtendedLib": {
+ "weui": true
}
- ],
- "window": {
- "backgroundTextStyle": "light",
- "navigationBarBackgroundColor": "#fff",
- "navigationBarTitleText": "孕婴助手",
- "navigationBarTextStyle": "black"
- },
- "sitemapLocation": "sitemap.json",
- "useExtendedLib":{"weui":true}
-}
+}
\ No newline at end of file
diff --git a/littleApp_child/packageA/pages/serviceNotice/serviceNotice.js b/littleApp_child/packageA/pages/serviceNotice/serviceNotice.js
new file mode 100644
index 0000000..c9944d0
--- /dev/null
+++ b/littleApp_child/packageA/pages/serviceNotice/serviceNotice.js
@@ -0,0 +1,31 @@
+const app = getApp()
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ hospitalName: '' //当前医院名称
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+ this.getCurrentHospitalName(options)
+ },
+ /**
+ * 获取医院名称
+ */
+ getCurrentHospitalName(options) {
+ if (options && options.hospitalName) {
+ this.setData({
+ hospitalName: options.hospitalName
+ })
+ } else {
+ this.setData({
+ hospitalName: app.globalData.userInfo.checkhospital || ''
+ })
+ }
+ }
+})
\ No newline at end of file
diff --git a/littleApp_child/packageA/pages/serviceNotice/serviceNotice.json b/littleApp_child/packageA/pages/serviceNotice/serviceNotice.json
new file mode 100644
index 0000000..060e73c
--- /dev/null
+++ b/littleApp_child/packageA/pages/serviceNotice/serviceNotice.json
@@ -0,0 +1,8 @@
+{
+ "navigationBarTitleText": "服务名目通知",
+ "navigationBarBackgroundColor": "#48C17B",
+ "navigationBarTextStyle": "white",
+ "backgroundColor": "#d8dbd4",
+ "pageOrientation": "auto",
+ "usingComponents": {}
+ }
\ No newline at end of file
diff --git a/littleApp_child/packageA/pages/serviceNotice/serviceNotice.wxml b/littleApp_child/packageA/pages/serviceNotice/serviceNotice.wxml
new file mode 100644
index 0000000..ac11e76
--- /dev/null
+++ b/littleApp_child/packageA/pages/serviceNotice/serviceNotice.wxml
@@ -0,0 +1,8 @@
+
+ 【{{hospitalName}}】您好,在后续儿童健康管理过程中,我院为您提供专属您的精准医疗服务,包括:
+ ①每周二、周五依据婴幼儿个体数据,通过微信公众号向您提供各周/月龄的儿童健康指导;
+ ②每周二、周五微信公众号向您提供,精口确到每周及患病诊断的高风险管控指导;
+ ③依据国家免疫规划程序及二类疫苗适宜接种月龄进行疫苗接种相关知识提醒;
+ ④微信公众号和微信小程序服务的同时,我们将持续通过短信辅助进行提醒。
+ 我们依据婴幼儿个体数据,每周均会向您推送公众号消息指导,并在小程序上呈现对应的文章指导。如果您没有享受到对应的服务或对服务有任何疑问、意见与建议,您可以通过拨打客服电话:18932538893来联系我们处理。
+
\ No newline at end of file
diff --git a/littleApp_child/packageA/pages/serviceNotice/serviceNotice.wxss b/littleApp_child/packageA/pages/serviceNotice/serviceNotice.wxss
new file mode 100644
index 0000000..e69de29
diff --git a/littleApp_child/pages/home/home.js b/littleApp_child/pages/home/home.js
index c189c11..5afe43f 100644
--- a/littleApp_child/pages/home/home.js
+++ b/littleApp_child/pages/home/home.js
@@ -863,6 +863,10 @@ Page({
goArticle() {
wx.navigateTo({url: '/packageA/pages/articleList/articleList'})
},
+ //跳转服务名目通知
+ goServiceNotice(){
+ wx.navigateTo({url: '/packageA/pages/serviceNotice/serviceNotice'})
+ },
//专家咨询
consultation(){
if(this.data.riskGuide){
diff --git a/littleApp_child/pages/home/home.wxml b/littleApp_child/pages/home/home.wxml
index f12f8c4..ee56fb3 100644
--- a/littleApp_child/pages/home/home.wxml
+++ b/littleApp_child/pages/home/home.wxml
@@ -117,6 +117,10 @@
中医指导文章
+
+
+ 服务名目通知
+
diff --git a/littleApp_child/project.config.json b/littleApp_child/project.config.json
index ea42bdf..79d8132 100644
--- a/littleApp_child/project.config.json
+++ b/littleApp_child/project.config.json
@@ -1,78 +1,74 @@
{
- "description": "项目配置文件。",
- "packOptions": {
- "ignore": []
- },
- "setting": {
- "urlCheck": false,
- "es6": true,
- "enhance": true,
- "postcss": true,
- "preloadBackgroundData": false,
- "minified": true,
- "newFeature": false,
- "coverView": true,
- "nodeModules": false,
- "autoAudits": false,
- "showShadowRootInWxmlPanel": true,
- "scopeDataCheck": false,
- "uglifyFileName": false,
- "checkInvalidKey": true,
- "checkSiteMap": true,
- "uploadWithSourceMap": true,
- "compileHotReLoad": false,
- "lazyloadPlaceholderEnable": false,
- "useMultiFrameRuntime": true,
- "useApiHook": true,
- "useApiHostProcess": true,
- "babelSetting": {
- "ignore": [],
- "disablePlugins": [],
- "outputPath": ""
+ "description": "项目配置文件。",
+ "packOptions": {
+ "ignore": [],
+ "include": []
},
- "useIsolateContext": true,
- "userConfirmedBundleSwitch": false,
- "packNpmManually": false,
- "packNpmRelationList": [],
- "minifyWXSS": true,
- "disableUseStrict": false,
- "minifyWXML": true,
- "showES6CompileOption": false,
- "useCompilerPlugins": false,
- "ignoreUploadUnusedFiles": true
- },
- "compileType": "miniprogram",
- "libVersion": "2.15.0",
- "appid": "wx60e0071c56800f71",
- "projectname": "littleApp_child",
- "isGameTourist": false,
- "simulatorType": "wechat",
- "simulatorPluginLibVersion": {},
- "condition": {
- "plugin": {
- "list": []
- },
- "game": {
- "list": []
- },
- "gamePlugin": {
- "list": []
- },
- "miniprogram": {
- "list": [
- {
- "name": "ss",
- "pathName": "pages/weightReportList/weightReportList",
- "query": "recordTime=2019-07-10&weight=10",
- "scene": null
+ "setting": {
+ "urlCheck": false,
+ "es6": true,
+ "enhance": true,
+ "postcss": true,
+ "preloadBackgroundData": false,
+ "minified": true,
+ "newFeature": false,
+ "coverView": true,
+ "nodeModules": false,
+ "autoAudits": false,
+ "showShadowRootInWxmlPanel": true,
+ "scopeDataCheck": false,
+ "uglifyFileName": false,
+ "checkInvalidKey": true,
+ "checkSiteMap": true,
+ "uploadWithSourceMap": true,
+ "compileHotReLoad": false,
+ "lazyloadPlaceholderEnable": false,
+ "useMultiFrameRuntime": true,
+ "useApiHook": true,
+ "useApiHostProcess": true,
+ "babelSetting": {
+ "ignore": [],
+ "disablePlugins": [],
+ "outputPath": ""
},
- {
- "name": "咨询",
- "pathName": "pages/consulting/consulting",
- "query": "username= JSON.stringify({myName:\"qing\",your:\"qing003\",serviceId:\"21\",memberId:\"21\" })",
- "scene": null
+ "useIsolateContext": true,
+ "userConfirmedBundleSwitch": false,
+ "packNpmManually": false,
+ "packNpmRelationList": [],
+ "minifyWXSS": true,
+ "disableUseStrict": false,
+ "minifyWXML": true,
+ "showES6CompileOption": false,
+ "useCompilerPlugins": false,
+ "ignoreUploadUnusedFiles": true,
+ "condition": false
+ },
+ "compileType": "miniprogram",
+ "libVersion": "2.15.0",
+ "appid": "wx60e0071c56800f71",
+ "projectname": "littleApp_child",
+ "simulatorType": "wechat",
+ "simulatorPluginLibVersion": {},
+ "condition": {
+ "miniprogram": {
+ "list": [
+ {
+ "name": "ss",
+ "pathName": "pages/weightReportList/weightReportList",
+ "query": "recordTime=2019-07-10&weight=10",
+ "scene": null
+ },
+ {
+ "name": "咨询",
+ "pathName": "pages/consulting/consulting",
+ "query": "username= JSON.stringify({myName:\"qing\",your:\"qing003\",serviceId:\"21\",memberId:\"21\" })",
+ "scene": null
+ }
+ ]
}
- ]
+ },
+ "editorSetting": {
+ "tabIndent": "insertSpaces",
+ "tabSize": 4
}
- }
}
\ No newline at end of file
diff --git a/littleApp_child/project.private.config.json b/littleApp_child/project.private.config.json
new file mode 100644
index 0000000..0f394ce
--- /dev/null
+++ b/littleApp_child/project.private.config.json
@@ -0,0 +1,26 @@
+{
+ "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+ "projectname": "littleApp_child",
+ "setting": {
+ "compileHotReLoad": true
+ },
+ "condition": {
+ "miniprogram": {
+ "list": [
+ {
+ "name": "ss",
+ "pathName": "pages/weightReportList/weightReportList",
+ "query": "recordTime=2019-07-10&weight=10",
+ "scene": null
+ },
+ {
+ "name": "咨询",
+ "pathName": "packageA/pages/serviceNotice/serviceNotice",
+ "query": "",
+ "launchMode": "default",
+ "scene": null
+ }
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/littleApp_child/utils/network_util.js b/littleApp_child/utils/network_util.js
index 09047c9..1001b86 100644
--- a/littleApp_child/utils/network_util.js
+++ b/littleApp_child/utils/network_util.js
@@ -4,7 +4,7 @@
// 18382670036 多层次
// 18328537371 陈云 666666
// 0测试环境 1正式环境 2演示环境 3衡水
-var Builing_Release_AppStore = 0;
+var Builing_Release_AppStore = 1;
// 获取服务器地址
function kServerBaseUrl() {
switch (Builing_Release_AppStore) {
diff --git a/littleApp_child/utils/sdk/src/connection.js b/littleApp_child/utils/sdk/src/connection.js
index 7ed447c..006f374 100644
--- a/littleApp_child/utils/sdk/src/connection.js
+++ b/littleApp_child/utils/sdk/src/connection.js
@@ -798,11 +798,6 @@ connection.prototype.open = function (options) {
var error = function (res, xhr, msg) {
console.log('error', res, xhr, msg)
conn.clear();
- wx.showModal({
- title: '用户名或密码错误!',
- showCancel: false,
- confirmText: 'OK'
- });
if (res.error && res.error_description) {
conn.onError({
type: _code.WEBIM_CONNCTION_OPEN_USERGRID_ERROR,