diff --git a/api/loginApi.js b/api/loginApi.js index 2717c06..c2ee0c3 100644 --- a/api/loginApi.js +++ b/api/loginApi.js @@ -33,4 +33,18 @@ export function getList(){ url: `/NuBizAdvisoryInfo/nuBizAdvisoryInfo/list`, method: 'get', }) -} \ No newline at end of file +} +//微信code换openid +export function getOpenid(code){ + return request({ + url: `/weixin/wechat/callback?code=${code}`, + method: 'get', + }) +} +//微信openid换个人信息 +export function getMessage(openId){ + return request({ + url: `/h5Api/nuBizAdvisoryInfo/queryWeixinInfo?openId=${openId}`, + method: 'get', + }) +} diff --git a/api/main.js b/api/main.js index 93744a7..e12c6b0 100644 --- a/api/main.js +++ b/api/main.js @@ -45,19 +45,3 @@ export const jsonp = function (url, data) { document.body.appendChild(scriptNode) }) } -//验证码是否正确 -// export function checkPhoneCode(data){ -// return request({ -// url: `/sys/checkPhoneCode`, -// method: 'post', -// data, -// }) -// } - -// //不知道干啥的 -// export function getList(){ -// return request({ -// url: `/NuBizAdvisoryInfo/nuBizAdvisoryInfo/list`, -// method: 'get', -// }) -// } \ No newline at end of file diff --git a/compontent/public/huakuai.vue b/compontent/public/huakuai.vue index 36e68ec..1629b4c 100644 --- a/compontent/public/huakuai.vue +++ b/compontent/public/huakuai.vue @@ -1,295 +1,269 @@ - \ No newline at end of file +.font-title { + width: 100%; + display: flex; + justify-content: center; + align-items: center; + height: 100rpx; + font-size: 35rpx; + font-weight: 700; +} + diff --git a/compontent/public/photohuadong.vue b/compontent/public/photohuadong.vue index 9f45ee6..66caecc 100644 --- a/compontent/public/photohuadong.vue +++ b/compontent/public/photohuadong.vue @@ -41,9 +41,9 @@ const emit = defineEmits(['updateCenterIndex']) const images = ref([ - '/static/index/three/0.png', - '/static/index/three/1.png', - '/static/index/three/2.png', + 'https://www.focusnu.com/media/directive/index/three/0.png', + 'https://www.focusnu.com/media/directive/index/three/1.png', + 'https://www.focusnu.com/media/directive/index/three/2.png', ]) const imageName = ref([ "长者入住", diff --git a/compontent/useWeChatAuth.js b/compontent/useWeChatAuth.js deleted file mode 100644 index 1024fd3..0000000 --- a/compontent/useWeChatAuth.js +++ /dev/null @@ -1,28 +0,0 @@ -// src/composables/useWeChatAuth.js -import { ref } from 'vue'; -import request from '@/request/index.js'; - -const APPID = 'wx8fc3e4305d2fbf0b'; -const REDIRECT_URI = encodeURIComponent('https://www.focusnu.com/wechat/thd/#/pages/login/callback'); - -export function useWeChatAuth() { - const code = ref(''); - const openid = ref(''); - const userInfo = ref(null); - - function login(scope = 'snsapi_userinfo', state = '') { - const url = - `https://open.weixin.qq.com/connect/oauth2/authorize` + - `?appid=${APPID}` + - `&redirect_uri=${REDIRECT_URI}` + - `&response_type=code` + - `&scope=${scope}` + - `&state=${state}` + - `#wechat_redirect`; - - window.location.href = url; - } - - - return { login }; -} \ No newline at end of file diff --git a/index.html b/index.html index 66b953d..7cff614 100644 --- a/index.html +++ b/index.html @@ -9,10 +9,10 @@ '') - + --> diff --git a/manifest.json b/manifest.json index ea77ba8..633e1b2 100644 --- a/manifest.json +++ b/manifest.json @@ -50,9 +50,12 @@ "quickapp" : {}, /* 小程序特有相关 */ "mp-weixin" : { - "appid" : "", + "appid" : "wx53bc8a44e780d26a", "setting" : { - "urlCheck" : false + "urlCheck" : false, + "minified" : true, + "es6" : false, + "postcss" : false }, "usingComponents" : true }, diff --git a/pages.json b/pages.json index 91b31e2..a43dc31 100644 --- a/pages.json +++ b/pages.json @@ -103,9 +103,9 @@ } }, { - "path": "pages/map/index", + "path": "pages/addoldman/camera", "style": { - "navigationBarTitleText": "选择位置" + "navigationBarTitleText": "照相机" } }, { diff --git a/pages/addjigou/all.vue b/pages/addjigou/all.vue index 9a22e3a..2a7643d 100644 --- a/pages/addjigou/all.vue +++ b/pages/addjigou/all.vue @@ -3,7 +3,7 @@ - + 返回 @@ -13,7 +13,7 @@ 身份证上传 - + @@ -21,10 +21,10 @@ 请上传身份证人像面 - - + + src="https://www.focusnu.com/media/directive/index/takephoto.png" /> @@ -34,10 +34,10 @@ 请上传身份证国徽面 - - + + src="https://www.focusnu.com/media/directive/index/takephoto.png" /> @@ -61,7 +61,7 @@ 营业执照上传 - + @@ -69,10 +69,10 @@ 请上传营业执照 - - + + src="https://www.focusnu.com/media/directive/index/takephoto.png" /> diff --git a/pages/addjigou/card.vue b/pages/addjigou/card.vue index eb4b408..034c00b 100644 --- a/pages/addjigou/card.vue +++ b/pages/addjigou/card.vue @@ -5,7 +5,7 @@ 营业执照上传 - + @@ -13,10 +13,10 @@ 请上传营业执照 - - + + src="https://www.focusnu.com/media/directive/index/takephoto.png" /> diff --git a/pages/addjigou/name.vue b/pages/addjigou/name.vue index 18f8e93..60fdb63 100644 --- a/pages/addjigou/name.vue +++ b/pages/addjigou/name.vue @@ -3,7 +3,7 @@ - + 返回 - + @@ -236,7 +236,7 @@ keys.forEach((key, idx) => { // 如果 address.value[idx] 存在就取它的 id,否则用空字符串 - form[key] = address.value[idx]?.id ?? ''; + form[key] = address.value[idx]?.id ? address.value[idx]?.id : ""; }); address.value = []; list.value = []; diff --git a/pages/addoldman/IDcard.vue b/pages/addoldman/IDcard.vue index 1f70741..41afd59 100644 --- a/pages/addoldman/IDcard.vue +++ b/pages/addoldman/IDcard.vue @@ -4,7 +4,7 @@ 身份证上传 - + @@ -12,8 +12,8 @@ 请上传身份证人像面 - - + + @@ -23,8 +23,8 @@ 请上传身份证国徽面 - - + + @@ -73,20 +73,20 @@ // 拍照并上传 function getMessage() { - + uni.navigateTo({ url: '/pages/addoldman/camera' }); // 使用 UniApp 的 API 调用摄像头 - uni.chooseImage({ - count: 1, - sourceType: ['camera'], - success: chooseRes => { - tempImagePath.value = chooseRes.tempFilePaths[0] - // 拍照成功后,调用上传函数 - uploadImage(tempImagePath.value) - }, - fail: err => { - console.error('拍照失败:', err) - } - }) + // uni.chooseImage({ + // count: 1, + // sourceType: ['camera'], + // success: chooseRes => { + // tempImagePath.value = chooseRes.tempFilePaths[0] + // // 拍照成功后,调用上传函数 + // uploadImage(tempImagePath.value) + // }, + // fail: err => { + // console.error('拍照失败:', err) + // } + // }) } const headImge = ref(""); diff --git a/pages/addoldman/camera.vue b/pages/addoldman/camera.vue new file mode 100644 index 0000000..3ccefa5 --- /dev/null +++ b/pages/addoldman/camera.vue @@ -0,0 +1,195 @@ + + + + + \ No newline at end of file diff --git a/pages/addoldman/hukou.vue b/pages/addoldman/hukou.vue index fcead7d..92f7034 100644 --- a/pages/addoldman/hukou.vue +++ b/pages/addoldman/hukou.vue @@ -3,14 +3,14 @@ 上传户口本本人页 - + 户口本本人页 请上传户口本本人页 - + diff --git a/pages/addoldman/yibao.vue b/pages/addoldman/yibao.vue index cd2900f..9d7cc39 100644 --- a/pages/addoldman/yibao.vue +++ b/pages/addoldman/yibao.vue @@ -3,21 +3,21 @@ 医保卡上传 - + 医保卡正面 请上传身份证医保卡正面 - + 医保卡背面 请上传身份证医保卡背面 - + diff --git a/pages/camera/CustomCamera.vue b/pages/camera/CustomCamera.vue index dacb6fe..9a82239 100644 --- a/pages/camera/CustomCamera.vue +++ b/pages/camera/CustomCamera.vue @@ -7,16 +7,16 @@ class="video" playsinline webkit-playsinline x5-playsinline muted - v-show="started" + v-if="started" /> - + diff --git a/pages/index/index.vue b/pages/index/index.vue index 5d0b02c..e9dba1e 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,7 +1,8 @@