From 724c037db52f7917e6f1555471aa4c15775861e4 Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Fri, 15 Dec 2023 15:32:22 +0800 Subject: [PATCH] fix --- apis/modules/article.js | 26 ---- apis/modules/user.js | 17 ++- config/request.js | 2 +- index.html | 2 + manifest.json | 2 +- pages.json | 8 ++ pages/index/index.vue | 35 ++++- pages/login/login.vue | 216 +++++++++++++++++++++-------- pages/person/person.vue | 161 ++++++++++++++++----- pages/supplier/supplier.vue | 6 +- static/image/person-bg.png | Bin 26636 -> 0 bytes static/image/person1.png | Bin 528 -> 0 bytes static/image/person2.png | Bin 620 -> 0 bytes static/image/person26.png | Bin 382 -> 0 bytes static/image/person27.png | Bin 537 -> 0 bytes static/image/person3.png | Bin 514 -> 0 bytes static/image/person4.png | Bin 689 -> 0 bytes static/image/person5.png | Bin 519 -> 0 bytes static/image/person6.png | Bin 457 -> 0 bytes static/image/person7.png | Bin 270 -> 0 bytes static/image/person8.png | Bin 734 -> 0 bytes static/image/person9.png | Bin 372 -> 0 bytes static/image/product.png | Bin 3585 -> 0 bytes static/image/workbench/index1.png | Bin 39359 -> 0 bytes static/image/workbench/index10.png | Bin 221 -> 0 bytes static/image/workbench/index11.png | Bin 15624 -> 0 bytes static/image/workbench/index12.png | Bin 14767 -> 0 bytes static/image/workbench/index2.png | Bin 70125 -> 0 bytes static/image/workbench/index3.png | Bin 974 -> 0 bytes static/image/workbench/index4.png | Bin 760 -> 0 bytes static/image/workbench/index5.png | Bin 310 -> 0 bytes static/image/workbench/index6.png | Bin 654 -> 0 bytes static/image/workbench/index7.png | Bin 283 -> 0 bytes static/image/workbench/index8.png | Bin 773 -> 0 bytes static/image/workbench/index9.png | Bin 624 -> 0 bytes styles/common.scss | 29 ++-- team/article/article.vue | 212 ---------------------------- team/auth/auth.vue | 25 ++-- team/certified/certified.vue | 5 + team/infoEdit/infoEdit.vue | 24 ++-- team/personAuth/personAuth.vue | 169 ++++++++++++++++++++++ team/setting/setting.vue | 2 +- 42 files changed, 559 insertions(+), 382 deletions(-) delete mode 100644 apis/modules/article.js delete mode 100644 static/image/person-bg.png delete mode 100644 static/image/person1.png delete mode 100644 static/image/person2.png delete mode 100644 static/image/person26.png delete mode 100644 static/image/person27.png delete mode 100644 static/image/person3.png delete mode 100644 static/image/person4.png delete mode 100644 static/image/person5.png delete mode 100644 static/image/person6.png delete mode 100644 static/image/person7.png delete mode 100644 static/image/person8.png delete mode 100644 static/image/person9.png delete mode 100644 static/image/product.png delete mode 100644 static/image/workbench/index1.png delete mode 100644 static/image/workbench/index10.png delete mode 100644 static/image/workbench/index11.png delete mode 100644 static/image/workbench/index12.png delete mode 100644 static/image/workbench/index2.png delete mode 100644 static/image/workbench/index3.png delete mode 100644 static/image/workbench/index4.png delete mode 100644 static/image/workbench/index5.png delete mode 100644 static/image/workbench/index6.png delete mode 100644 static/image/workbench/index7.png delete mode 100644 static/image/workbench/index8.png delete mode 100644 static/image/workbench/index9.png delete mode 100644 team/article/article.vue create mode 100644 team/personAuth/personAuth.vue diff --git a/apis/modules/article.js b/apis/modules/article.js deleted file mode 100644 index c67ac27..0000000 --- a/apis/modules/article.js +++ /dev/null @@ -1,26 +0,0 @@ -import request from '@/apis/request.js' -const { get, post } = request - -export const partnerOperatingList = (data) => { - return post('nakadai/nakadai/partner/article/management/partnerOperatingList', data) -} - -export const findById = id => { - return post('nakadai/nakadai/applets/partner/browse?contentId=' + id) -} - -export const queryClassificationByType = id => { - return post('nakadai/nakadai/partner/article/classification/queryClassificationByType?typeId=' + id) -} - -export const schemeList = data => { - return post('nakadai/nakadai/partner/schemeManagement/schemeList', data) -} - -export const schemeFindById = id => { - return post('nakadai/nakadai/partner/schemeManagement/findById?id=' + id) -} - -export const collectCourse = (id, state) => { - return post('nakadai/nakadai/partner/article/management/collectCourse?contentId=' + id + '&state=' + state) -} \ No newline at end of file diff --git a/apis/modules/user.js b/apis/modules/user.js index 27f7a1b..02adbb8 100644 --- a/apis/modules/user.js +++ b/apis/modules/user.js @@ -2,7 +2,22 @@ import request from '@/apis/request.js' const { get, post } = request export const login = (data) => { - return post('users/users/user/weChatAppletCallbackByPartner', data) + return post('nakadai/kindergarten/platformTeamAccount/weChatAppletCallbackByKindergarten', data) +} +export const kindergartenWeChatApplication = (data) => { + return post('nakadai/kindergarten/platformTeamAccount/kindergartenWeChatApplication', data) +} +export const realNameAuthentication = (data) => { + return post(`users/users/autonym/realNameAuthentication`, data) +} +export const faceAuthenticationByObject = (data) => { + return post(`users/users/autonym/faceAuthenticationByObject`, data) +} +export const faceAuthentication = (data) => { + return post(`users/users/autonym/faceAuthentication?imgFile=${data.imgFile}&side=${data.side}`) +} +export const authenticationOrNot = (data) => { + return post(`users/users/autonym/authenticationOrNot`) } export const queryProvince = () => { diff --git a/config/request.js b/config/request.js index 3c03aad..5c6a6d8 100644 --- a/config/request.js +++ b/config/request.js @@ -6,7 +6,7 @@ export default { // baseURL: 'https://huorantech.cn/', - baseURL: 'http://192.168.31.217:10010/', + baseURL: 'http://192.168.31.51:10010/', // baseURL: 'http://121.37.12.51/', headers: { 'Content-Type': 'application/json;charset=UTF-8' diff --git a/index.html b/index.html index 9efb733..34983a3 100644 --- a/index.html +++ b/index.html @@ -4,6 +4,8 @@ + diff --git a/manifest.json b/manifest.json index 4d126fb..525c715 100644 --- a/manifest.json +++ b/manifest.json @@ -49,7 +49,7 @@ "quickapp" : {}, /* 快应用特有相关 */ "mp-weixin" : { - "appid" : "wx2b506fdb0eeee65d", + "appid" : "wxd210bb4686c9c580", "setting" : { "urlCheck" : false, "es6" : true, diff --git a/pages.json b/pages.json index e4abb12..022a781 100644 --- a/pages.json +++ b/pages.json @@ -162,6 +162,14 @@ "navigationBarTitleText" : "幼儿园认证", "enablePullDownRefresh" : false } + }, + { + "path" : "personAuth/personAuth", + "style" : + { + "navigationBarTitleText" : "实名认证", + "enablePullDownRefresh" : false + } } ] } diff --git a/pages/index/index.vue b/pages/index/index.vue index ce07fee..d8bfaad 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -35,6 +35,7 @@ 主办方：{{ item.sponsor }} {{ item.applicantNum }}/{{ item.quantityLimit }}人已报名 报名 + 取消报名 @@ -49,7 +50,7 @@ @@ -225,9 +248,6 @@ width: 100%; } } -.hot { - width: 100%; -} .module { margin: 20rpx; padding: 20rpx; @@ -277,11 +297,14 @@ position: absolute; bottom: 0; right: 0; - padding: 10rpx 30rpx; + padding: 8rpx 28rpx; font-size: 28rpx; color: #fff; background-color: $uni-primary; border-radius: 4px; } + .signed { + background-color: #ff7b32; + } } diff --git a/pages/login/login.vue b/pages/login/login.vue index c8afb6f..65f6c62 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -22,11 +22,41 @@ 《用户隐私协议》 + + + + + 请选择注册类型 + + + + + + + + + 我是幼儿园 + + + + + + 我是供应商 + + + + + + 我是个人 + + + + - - diff --git a/team/auth/auth.vue b/team/auth/auth.vue index a867370..df0dc30 100644 --- a/team/auth/auth.vue +++ b/team/auth/auth.vue @@ -4,24 +4,18 @@ 幼儿园名称 - - - - + + 统一社会信用代码 - - - - + + 法人 - - - - + + @@ -53,7 +47,7 @@ } }, onShow() { - this.getInfo() + // this.getInfo() }, methods: { // 获取个人信息 @@ -106,4 +100,9 @@ .credential { width: 100%; } +.form-list { + .name { + min-width: 250rpx; + } +} diff --git a/team/certified/certified.vue b/team/certified/certified.vue index bcf6acc..971cec0 100644 --- a/team/certified/certified.vue +++ b/team/certified/certified.vue @@ -70,4 +70,9 @@ color: #333; } } +.form-list { + .name { + min-width: 250rpx; + } +} diff --git a/team/infoEdit/infoEdit.vue b/team/infoEdit/infoEdit.vue index a372299..45704c3 100644 --- a/team/infoEdit/infoEdit.vue +++ b/team/infoEdit/infoEdit.vue @@ -1,27 +1,23 @@