From 64d4e3340bf62103f2eec03006b145f5469234d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Sat, 3 Feb 2024 11:23:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages.json | 24 +++++++++----------
pages/homepage/homepage.vue | 4 ++--
pages/medicalservice/medicalservice.vue | 16 ++++++-------
pages/myinformation/myinformation.vue | 8 +++----
pagesB/CommodityDetails/CommodityDetails.vue | 6 ++---
pagesB/ProjectDetails/ProjectDetails.vue | 4 ++--
pagesB/appointmenttime/appointmenttime.vue | 2 +-
.../appointmenttimetext.vue | 0
pagesB/classification/classification.vue | 2 +-
pagesB/facecollection/facecollection.vue | 2 +-
pagesB/healthybeans/healthybeans.vue | 10 ++++----
pagesB/information/information.vue | 6 ++---
{pages => pagesB}/login/login.scss | 3 ++-
{pages => pagesB}/login/login.vue | 6 ++---
pagesB/materialbenefits/materialbenefits.vue | 4 ++--
pagesB/medicine/medicine.vue | 4 ++--
pagesB/modify/modify.vue | 2 +-
pagesB/nursestation/nursestation.vue | 4 ++--
{pages => pagesB}/register/register.vue | 2 +-
{components => pagesB}/text.vue | 7 ++----
pagesC/healthtest/healthtest.vue | 2 +-
21 files changed, 58 insertions(+), 60 deletions(-)
rename {components => pagesB}/appointmenttimetext.vue (100%)
rename {pages => pagesB}/login/login.scss (98%)
rename {pages => pagesB}/login/login.vue (97%)
rename {pages => pagesB}/register/register.vue (99%)
rename {components => pagesB}/text.vue (99%)
diff --git a/pages.json b/pages.json
index ace6cff..42c7c19 100644
--- a/pages.json
+++ b/pages.json
@@ -9,12 +9,6 @@
"navigationStyle": "custom",
"enablePullDownRefresh": false
}
- }, {
- "path": "pages/register/register",
- "style": {
- "navigationBarTitleText": "注册",
- "enablePullDownRefresh": false
- }
}, {
"path": "pages/message/message",
"style": {
@@ -40,17 +34,23 @@
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
- }, {
- "path": "pages/login/login",
- "style": {
- "navigationBarTitleText": "登录",
- "enablePullDownRefresh": false
- }
}
],
"subPackages": [{
"root": "pagesB",
"pages": [{
+ "path": "register/register",
+ "style": {
+ "navigationBarTitleText": "注册",
+ "enablePullDownRefresh": false
+ }
+ },{
+ "path": "login/login",
+ "style": {
+ "navigationBarTitleText": "登录",
+ "enablePullDownRefresh": false
+ }
+ }, {
"path": "Behaviorpoints/Behaviorpoints",
"style": {
"navigationBarTitleText": "积分兑换",
diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue
index c0e39ca..8a429d2 100644
--- a/pages/homepage/homepage.vue
+++ b/pages/homepage/homepage.vue
@@ -204,7 +204,7 @@
// 登录
login() {
uni.navigateTo({
- url: "/pages/login/login"
+ url: "/pagesB/login/login"
})
},
//照护方案
@@ -232,7 +232,7 @@
title: '您未登录,请先登录',
type: 'error',
duration: '1000',
- url: '/pages/login/login'
+ url: '/pagesB/login/login'
})
},
// 家医功能提示
diff --git a/pages/medicalservice/medicalservice.vue b/pages/medicalservice/medicalservice.vue
index b66a664..57516eb 100644
--- a/pages/medicalservice/medicalservice.vue
+++ b/pages/medicalservice/medicalservice.vue
@@ -87,7 +87,7 @@
success(res) {
if (res.confirm) {
uni.redirectTo({
- url: "/pages/register/register"
+ url: "/pagesB/register/register"
})
} else {
wx.exitMiniProgram()
@@ -125,7 +125,7 @@
title: '您未登录,请先登录',
type: 'error',
duration: '1000',
- url: '/pages/login/login'
+ url: '/pagesB/login/login'
})
}
},
@@ -157,7 +157,7 @@
title: '您未登录,请先登录',
type: 'error',
duration: '1000',
- url: '/pages/login/login'
+ url: '/pagesB/login/login'
})
}
@@ -178,7 +178,7 @@
title: '您未登录,请先登录',
type: 'error',
duration: '1000',
- url: '/pages/login/login'
+ url: '/pagesB/login/login'
})
}
}, 0)
@@ -196,7 +196,7 @@
title: '您未登录,请先登录',
type: 'error',
duration: '1000',
- url: '/pages/login/login'
+ url: '/pagesB/login/login'
})
}
},
@@ -215,7 +215,7 @@
title: '您未登录,请先登录',
type: 'error',
duration: '1000',
- url: '/pages/login/login'
+ url: '/pagesB/login/login'
})
}
}, 50)
@@ -234,7 +234,7 @@
title: '您未登录,请先登录',
type: 'error',
duration: '1000',
- url: '/pages/login/login'
+ url: '/pagesB/login/login'
})
}
}, 0)
@@ -254,7 +254,7 @@
title: '您未登录,请先登录',
type: 'error',
duration: '1000',
- url: '/pages/login/login'
+ url: '/pagesB/login/login'
})
}
}, 0)
diff --git a/pages/myinformation/myinformation.vue b/pages/myinformation/myinformation.vue
index 9398f50..ba6ab78 100644
--- a/pages/myinformation/myinformation.vue
+++ b/pages/myinformation/myinformation.vue
@@ -448,7 +448,7 @@
title: '您未登录,请先登录',
type: 'error',
duration: '1000',
- url: '/pages/login/login'
+ url: '/pagesB/login/login'
})
},
//优惠券
@@ -486,7 +486,7 @@
this.$refs.uToast.show({
title: '您未登录,请先登录',
type: 'error',
- url: '/pages/login/login'
+ url: '/pagesB/login/login'
})
},
//护理站服务订单
@@ -558,7 +558,7 @@
// success(res) {
// if (res.confirm) {
// uni.redirectTo({
- // url: "/pages/login/login?mode=注册"
+ // url: "/pagesB/login/login?mode=注册"
// })
// } else {
// wx.exitMiniProgram()
@@ -568,7 +568,7 @@
// } else {
// this.getSetting()
// uni.navigateTo({
- // url: '/pages/login/login'
+ // url: '/pagesB/login/login'
// });
// }
},
diff --git a/pagesB/CommodityDetails/CommodityDetails.vue b/pagesB/CommodityDetails/CommodityDetails.vue
index 770bd27..db6e379 100644
--- a/pagesB/CommodityDetails/CommodityDetails.vue
+++ b/pagesB/CommodityDetails/CommodityDetails.vue
@@ -530,7 +530,7 @@
that.$refs.uToast.show({
title: res.msg,
type: 'error',
- url: '/pages/login/login'
+ url: '/pagesB/login/login'
})
}
})
@@ -538,7 +538,7 @@
that.$refs.uToast.show({
title: '未登录,请先登录',
type: 'error',
- url: '/pages/login/login'
+ url: '/pagesB/login/login'
})
}
},
@@ -712,7 +712,7 @@
this.$refs.uToast.show({
title: '未登录,请先登录',
type: 'error',
- url: '/pages/login/login'
+ url: '/pagesB/login/login'
})
}
}
diff --git a/pagesB/ProjectDetails/ProjectDetails.vue b/pagesB/ProjectDetails/ProjectDetails.vue
index 6eed3d1..e9fb178 100644
--- a/pagesB/ProjectDetails/ProjectDetails.vue
+++ b/pagesB/ProjectDetails/ProjectDetails.vue
@@ -180,7 +180,7 @@
that.$refs.uToast.show({
title: res.msg,
type: 'error',
- url: '/pages/login/login'
+ url: '/pagesB/login/login'
})
}
})
@@ -188,7 +188,7 @@
that.$refs.uToast.show({
title: '未登录,请先登录',
type: 'error',
- url: '/pages/login/login'
+ url: '/pagesB/login/login'
})
}
},
diff --git a/pagesB/appointmenttime/appointmenttime.vue b/pagesB/appointmenttime/appointmenttime.vue
index 10e87cf..1d523d0 100644
--- a/pagesB/appointmenttime/appointmenttime.vue
+++ b/pagesB/appointmenttime/appointmenttime.vue
@@ -136,7 +136,7 @@
appletAppointmentOrderPay
} from '@/api/pagesB/appointmenttime/appointmenttime.js'
import baseurl from '@/api/baseurl.js'
- import appointmenttext from '../../components/appointmenttimetext.vue'
+ import appointmenttext from '../appointmenttimetext.vue'
import tabs from '../utabs/u-tabs.vue'
export default {
components: {
diff --git a/components/appointmenttimetext.vue b/pagesB/appointmenttimetext.vue
similarity index 100%
rename from components/appointmenttimetext.vue
rename to pagesB/appointmenttimetext.vue
diff --git a/pagesB/classification/classification.vue b/pagesB/classification/classification.vue
index 868d664..d584867 100644
--- a/pagesB/classification/classification.vue
+++ b/pagesB/classification/classification.vue
@@ -104,7 +104,7 @@
const value3 = uni.getStorageSync('Refresh');
if (value) {} else {
uni.navigateTo({
- url: '/pages/login/login'
+ url: '/pagesB/login/login'
})
}
if (value3) {
diff --git a/pagesB/facecollection/facecollection.vue b/pagesB/facecollection/facecollection.vue
index f0e327b..a3b05c4 100644
--- a/pagesB/facecollection/facecollection.vue
+++ b/pagesB/facecollection/facecollection.vue
@@ -212,7 +212,7 @@
})
// uni.navigateTo({
- // url:`/pages/register/register?headPictureUrl=${this.tempImg}`
+ // url:`/pagesB/register/register?headPictureUrl=${this.tempImg}`
// })
},
diff --git a/pagesB/healthybeans/healthybeans.vue b/pagesB/healthybeans/healthybeans.vue
index 90b0dab..3c74f9c 100644
--- a/pagesB/healthybeans/healthybeans.vue
+++ b/pagesB/healthybeans/healthybeans.vue
@@ -481,7 +481,7 @@
title: '请先登录',
type: 'error',
duration: '2000',
- url: '/pages/login/login'
+ url: '/pagesB/login/login'
})
}
})
@@ -490,7 +490,7 @@
title: '请先登录',
type: 'error',
duration: '2000',
- url: '/pages/login/login'
+ url: '/pagesB/login/login'
})
}
},
@@ -511,7 +511,7 @@
this.$refs.uToast.show({
title: '未登录,请先登录',
type: 'error',
- url: '/pages/login/login'
+ url: '/pagesB/login/login'
})
}
}
@@ -592,7 +592,7 @@
title: '请先登录',
type: 'error',
duration: '2000',
- url: '/pages/login/login'
+ url: '/pagesB/login/login'
})
}
})
@@ -601,7 +601,7 @@
title: '请先登录',
type: 'error',
duration: '2000',
- url: '/pages/login/login'
+ url: '/pagesB/login/login'
})
}
},
diff --git a/pagesB/information/information.vue b/pagesB/information/information.vue
index 929533d..0c90c88 100644
--- a/pagesB/information/information.vue
+++ b/pagesB/information/information.vue
@@ -105,7 +105,7 @@
getNurseType,
information
} from '@/api/pagesB/information/index.js'
- import contenttext from '../../components/text.vue';
+ import contenttext from '../text.vue';
import {
appPersonal,
} from '@/api/pages/myinformation/myinformation.js';
@@ -356,7 +356,7 @@
if (value) {
that.query.patientId = value.id
}
-
+
if(options.updata){
// this.baseurl = baseurl
// var that = this
@@ -436,4 +436,4 @@
\ No newline at end of file
+
diff --git a/pages/login/login.scss b/pagesB/login/login.scss
similarity index 98%
rename from pages/login/login.scss
rename to pagesB/login/login.scss
index d6dfa41..d8916f7 100644
--- a/pages/login/login.scss
+++ b/pagesB/login/login.scss
@@ -24,7 +24,8 @@
}
.scroll-Y{
padding-top: 20rpx;
- height:800rpx ;
+ height:800rpx;
+ width: 100%;
overflow-y:scroll;
text-align: left;
text-indent: 2em;
diff --git a/pages/login/login.vue b/pagesB/login/login.vue
similarity index 97%
rename from pages/login/login.vue
rename to pagesB/login/login.vue
index a08b1a0..c199450 100644
--- a/pages/login/login.vue
+++ b/pagesB/login/login.vue
@@ -24,7 +24,7 @@
用户协议与隐私政策
-
+
取消
@@ -53,7 +53,7 @@
import {
mapMutations
} from "vuex";
- import contenttext from '../../components/text.vue';
+ import contenttext from '../text.vue';
export default {
components: {
contenttext,
@@ -176,7 +176,7 @@
}
that.timer = setTimeout(() => {
uni.redirectTo({
- url: '/pages/register/register',
+ url: '/pagesB/register/register',
})
}, 1500)
} else if (resp.data.code == '2') {
diff --git a/pagesB/materialbenefits/materialbenefits.vue b/pagesB/materialbenefits/materialbenefits.vue
index 3af25ff..435b32f 100644
--- a/pagesB/materialbenefits/materialbenefits.vue
+++ b/pagesB/materialbenefits/materialbenefits.vue
@@ -148,7 +148,7 @@
title: '请先登录',
type: 'error',
duration: '2000',
- url: '/pages/login/login'
+ url: '/pagesB/login/login'
})
}
})
@@ -157,7 +157,7 @@
title: '请先登录',
type: 'error',
duration: '2000',
- url: '/pages/login/login'
+ url: '/pagesB/login/login'
})
}
},
diff --git a/pagesB/medicine/medicine.vue b/pagesB/medicine/medicine.vue
index a1edadf..26b9be9 100644
--- a/pagesB/medicine/medicine.vue
+++ b/pagesB/medicine/medicine.vue
@@ -242,7 +242,7 @@
// that.$refs.uToast.show({
// title: res.msg,
// type: 'error',
- // url: '/pages/login/login'
+ // url: '/pagesB/login/login'
// })
// }
// })
@@ -250,7 +250,7 @@
// that.$refs.uToast.show({
// title: '未登录,请先登录',
// type: 'error',
- // url: '/pages/login/login'
+ // url: '/pagesB/login/login'
// })
// }
},
diff --git a/pagesB/modify/modify.vue b/pagesB/modify/modify.vue
index 77f2fd3..dcdc065 100644
--- a/pagesB/modify/modify.vue
+++ b/pagesB/modify/modify.vue
@@ -107,7 +107,7 @@
import {
getRegionAndStreetInfo
} from '@/api/pagesB/information/index.js'
- import contenttext from '../../components/text.vue';
+ import contenttext from '../text.vue';
import baseurl from '@/api/baseurl.js'
import {
appPersonal,
diff --git a/pagesB/nursestation/nursestation.vue b/pagesB/nursestation/nursestation.vue
index b892e3a..722d13e 100644
--- a/pagesB/nursestation/nursestation.vue
+++ b/pagesB/nursestation/nursestation.vue
@@ -355,7 +355,7 @@
that.$refs.uToast.show({
title: res.msg,
type: 'error',
- url: '/pages/login/login'
+ url: '/pagesB/login/login'
})
}
})
@@ -364,7 +364,7 @@
that.$refs.uToast.show({
title: '未登录,请先登录',
type: 'error',
- url: '/pages/login/login'
+ url: '/pagesB/login/login'
})
}
},
diff --git a/pages/register/register.vue b/pagesB/register/register.vue
similarity index 99%
rename from pages/register/register.vue
rename to pagesB/register/register.vue
index 634d0d0..0caa344 100644
--- a/pages/register/register.vue
+++ b/pagesB/register/register.vue
@@ -142,7 +142,7 @@
getNurseType,
information
} from '@/api/pagesB/information/index.js'
- import contenttext from '../../components/text.vue';
+ import contenttext from '../text.vue';
import {
getSubordinateRegions,
} from '@/api/pagesB/modifyAddress/modifyAddress.js';
diff --git a/components/text.vue b/pagesB/text.vue
similarity index 99%
rename from components/text.vue
rename to pagesB/text.vue
index 5c23358..3dcf5ac 100644
--- a/components/text.vue
+++ b/pagesB/text.vue
@@ -209,7 +209,8 @@
（四）访问隐私政策
您可以在“我的”—“设置”中查看本隐私政策的全部内容。
七、未成年人使用条款
- （一）若您是未满18周岁的未成年人且无完全民事行为能力，在使用“智慧家庭医生服务平台”及相关服务前，应在您的父母或其他监护人监护、指导下共同阅读并在征得您父母或者监护人同意的前提下使用我们的服务或向我们提供信息。
+
+ （一）若您是未满18周岁的未成年人且无完全民事行为能力，在使用“智慧家庭医生服务平台”及相关服务前，应在您的父母或其他监护人监护、指导下共同阅读并在征得您父母或者监护人同意的前提下使用我们的服务或向我们提供信息。
（二）我们根据国家相关法律法规的规定保护未成年人的个人信息，只会在法律允许、父母或其他监护人明确同意或保护未成年人所必要的情况下收集、使用、储存、共享、转让或披露未成年人的个人信息；如果我们发现在违背了法律有关规定或未事先获得可证实的父母同意的情况下收集了未成年人的个人信息，则会设法尽快删除相关信息。
@@ -361,8 +362,6 @@
-
-
友盟 SDK 安全能力通过：
公安部三级等保认证（非银机构最高安全等级）；
ISO27001 信息安全管理体系认证；
@@ -380,9 +379,7 @@
-
-
\ No newline at end of file
diff --git a/pagesC/healthtest/healthtest.vue b/pagesC/healthtest/healthtest.vue
index d2688ad..bf8ae51 100644
--- a/pagesC/healthtest/healthtest.vue
+++ b/pagesC/healthtest/healthtest.vue
@@ -47,7 +47,7 @@
this.$refs.uToast.show({
title: '您未登录,请先登录',
type: 'error',
- url: '/pages/login/login'
+ url: '/pagesB/login/login'
})
} else {
if (item.surveySubject == 1001) {