diff --git a/api/pages/api.js b/api/pages/homepage/homepage.js similarity index 89% rename from api/pages/api.js rename to api/pages/homepage/homepage.js index 67fde05..9f1b049 100644 --- a/api/pages/api.js +++ b/api/pages/homepage/homepage.js @@ -1,4 +1,4 @@ -import request from "../request.js" +import request from "../../request.js" // 获取OpenId export function getOpenId(code) { diff --git a/api/pages/login/index.js b/api/pages/login/index.js index 7578627..436fb0c 100644 --- a/api/pages/login/index.js +++ b/api/pages/login/index.js @@ -13,3 +13,13 @@ export function createMobileToken() { method: 'GET' }) } + + + +// 获取微信手机号 +export function getwxPhoneNumber(code) { + return request({ + url: `/applet/register/getPhone/${code}`, + method: 'GET' + }) +} \ No newline at end of file diff --git a/api/pages/register/register.js b/api/pages/register/register.js new file mode 100644 index 0000000..1ffdea0 --- /dev/null +++ b/api/pages/register/register.js @@ -0,0 +1,10 @@ +import request from "../../request.js" + +// 注册 +export function register(data) { + return request({ + url: `/applet/register`, + method: 'POST', + data: data + }) +} \ No newline at end of file diff --git a/pages.json b/pages.json index 4cda6f4..ee05e79 100644 --- a/pages.json +++ b/pages.json @@ -44,18 +44,20 @@ "path": "pages/login1/login", "style": { "navigationBarTitleText": "登录", - "navigationBarBackgroundColor": "#fff", - "enablePullDownRefresh": false, - "navigationBarTextStyle": "black" + "enablePullDownRefresh": false } }, { "path": "pages/register/register", "style": { "navigationBarTitleText": "注册", - "navigationBarBackgroundColor": "#fff", - "enablePullDownRefresh": false, - "navigationBarTextStyle": "black" + "enablePullDownRefresh": false + } + }, { + "path": "pages/facecollection/facecollection", + "style": { + "navigationBarTitleText": "人脸采集", + "enablePullDownRefresh": false } } ], @@ -170,14 +172,12 @@ }, { "path": "paysuccess/paysuccess", "style": { - "navigationBarTitleText": "", "enablePullDownRefresh": false, "navigationStyle": "custom" } }, { "path": "ratesuccess/ratesuccess", "style": { - "navigationBarTitleText": "", "enablePullDownRefresh": false, "navigationStyle": "custom" } @@ -340,14 +340,21 @@ ] }, { "root": "pagesC", - "pages": [ - { + "pages": [{ "path": "appointmenttime/appointmenttime", "style": { "navigationBarTitleText": "服务预约", "enablePullDownRefresh": false } }, + + { + "path": "Filinginformation/Filinginformation", + "style": { + "navigationBarTitleText": "查看建档信息", + "enablePullDownRefresh": false + } + }, { "path": "Screeningdetails/Screeningdetails", "style": { @@ -387,12 +394,12 @@ } ,{ "path" : "Myappointment/Myappointment", - "style" : + "style" : { "navigationBarTitleText": "我的预约", "enablePullDownRefresh": false } - + } ] }], diff --git a/pages/facecollection/facecollection.vue b/pages/facecollection/facecollection.vue new file mode 100644 index 0000000..6f515a6 --- /dev/null +++ b/pages/facecollection/facecollection.vue @@ -0,0 +1,393 @@ + + + + + \ No newline at end of file diff --git a/pages/homepage/homepage.scss b/pages/homepage/homepage.scss index 7b8485d..ce29eef 100644 --- a/pages/homepage/homepage.scss +++ b/pages/homepage/homepage.scss @@ -45,7 +45,6 @@ .health { padding: 30rpx 30rpx 0 30rpx; font-size: 28rpx; - font-family: Source Han Sans CN; font-weight: 400; color: #333333; line-height: 38rpx; @@ -90,14 +89,18 @@ top: 12%; left: 7%; font-size: 28rpx; - font-family: Source Han Sans CN; font-weight: 400; color: #717070; image { + vertical-align: middle; width: 22rpx; height: 12rpx; } + text{ + margin-left: 10rpx; + display: inline-block; + } } } } \ No newline at end of file diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue index 32e5903..ca100b7 100644 --- a/pages/homepage/homepage.vue +++ b/pages/homepage/homepage.vue @@ -4,7 +4,7 @@ - 你好,请登录 + 你好,请登录 @@ -64,7 +64,10 @@ \ No newline at end of file diff --git a/pagesB/Behaviorpoints/Behaviorpoints.vue b/pagesB/Behaviorpoints/Behaviorpoints.vue index 3bcd27b..ce30816 100644 --- a/pagesB/Behaviorpoints/Behaviorpoints.vue +++ b/pagesB/Behaviorpoints/Behaviorpoints.vue @@ -27,7 +27,7 @@ 2023-03-09 13:23:12 - + 兑换商品 @@ -52,7 +52,7 @@ }; }, methods: { - goexchange(){ + goexchange() { uni.navigateTo({ url: '/pagesB/exchangerecords/exchangerecords' }) @@ -60,25 +60,24 @@ //积分页面 ...mapActions(["integralopenPopup"]), gointegral() { - const value = uni.getStorageSync('openid'); - const value2 = uni.getStorageSync('patientId'); - if (value && value2) { - this.integralopenPopup(); - setTimeout(e => { - uni.navigateTo({ - url: `/pagesB/healthybeans/healthybeans?integral=${this.appPersonallist.integral}` - }) - }, 0) - } else { - uni.navigateTo({ - url: '/pagesB/PointsMall/PointsMall' - }) - // this.gologin(); - } + // const value = uni.getStorageSync('openid'); + // const value2 = uni.getStorageSync('patientId'); + // if (value && value2) { + // setTimeout(e => { + // uni.navigateTo({ + // url: `/pagesB/healthybeans/healthybeans?integral=${this.appPersonallist.integral}` + // }) + // }, 0) + // } else { + uni.navigateTo({ + url: '/pagesB/PointsMall/PointsMall' + }) + // this.gologin(); + // } }, }, } + \ No newline at end of file diff --git a/pagesC/Filinginformation/Filinginformation.vue b/pagesC/Filinginformation/Filinginformation.vue new file mode 100644 index 0000000..e8c3a9b --- /dev/null +++ b/pagesC/Filinginformation/Filinginformation.vue @@ -0,0 +1,176 @@ + + + + + \ No newline at end of file diff --git a/pagesC/Healthrecords/Healthrecords.vue b/pagesC/Healthrecords/Healthrecords.vue index 0dc6126..1a53f05 100644 --- a/pagesC/Healthrecords/Healthrecords.vue +++ b/pagesC/Healthrecords/Healthrecords.vue @@ -1,7 +1,10 @@