diff --git a/src/manifest.json b/src/manifest.json index 3572b42..f399b91 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -20,7 +20,10 @@ "delay" : 0 }, /* 模块配置 */ - "modules" : {}, + "modules" : { + "Barcode" : {}, + "Camera" : {} + }, /* 应用发布信息 */ "distribute" : { /* android打包配置 */ diff --git a/src/pages/coordinatePhotos/upload-record/index.vue b/src/pages/coordinatePhotos/upload-record/index.vue index ecd0aab..d29100a 100644 --- a/src/pages/coordinatePhotos/upload-record/index.vue +++ b/src/pages/coordinatePhotos/upload-record/index.vue @@ -44,7 +44,7 @@ - + - + - + { .swiper-container { position: relative; + margin-bottom: 14rpx; .swiper-count { position: absolute; diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index 9fab019..6a23f7b 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -117,39 +117,34 @@ const onSubmitLogin = debounce(() => { .validate() .then(async (valid) => { if (valid) { - uni.$u.toast('登录成功') - sendLoading.value = false - setTimeout(() => { - uni.switchTab({ url: '/pages/workbenches/index' }) - }, 500) - // try { - // console.log( - // '%c🔍 登录请求入参 %c', - // 'background: linear-gradient(90deg, #FF6B6B, #4ECDC4); color: white; padding: 5px 10px; border-radius: 5px; font-weight: bold;', - // '', - // opinionModel.value, - // ) - // const res = await loginApi(opinionModel.value) - // console.log( - // '%c🔍 登录请求出参 %c', - // 'background: linear-gradient(90deg, #FF6B6B, #4ECDC4); color: white; padding: 5px 10px; border-radius: 5px; font-weight: bold;', - // '', - // res, - // ) - // sendLoading.value = false - // if (res.code === 200) { - // memberStore.setToken(res.token) - // uni.$u.toast('登录成功') - // getUserInfo() - // setTimeout(() => { - // uni.switchTab({ url: '/pages/workbenches/index' }) - // }, 500) - // } else { - // uni.$u.toast('登录失败' + res.message) - // } - // } catch (error) { - // sendLoading.value = false - // } + try { + console.log( + '%c🔍 登录请求入参 %c', + 'background: linear-gradient(90deg, #FF6B6B, #4ECDC4); color: white; padding: 5px 10px; border-radius: 5px; font-weight: bold;', + '', + opinionModel.value, + ) + const res = await loginApi(opinionModel.value) + console.log( + '%c🔍 登录请求出参 %c', + 'background: linear-gradient(90deg, #FF6B6B, #4ECDC4); color: white; padding: 5px 10px; border-radius: 5px; font-weight: bold;', + '', + res, + ) + sendLoading.value = false + if (res.code === 200) { + memberStore.setToken(res.token) + uni.$u.toast('登录成功') + getUserInfo() + setTimeout(() => { + uni.switchTab({ url: '/pages/workbenches/index' }) + }, 500) + } else { + uni.$u.toast('登录失败' + res.message) + } + } catch (error) { + sendLoading.value = false + } } }) .catch(() => { diff --git a/src/pages/safetyViolations/components/addAndEditForm.vue b/src/pages/safetyViolations/components/addAndEditForm.vue index 0518260..2590a3c 100644 --- a/src/pages/safetyViolations/components/addAndEditForm.vue +++ b/src/pages/safetyViolations/components/addAndEditForm.vue @@ -10,23 +10,23 @@ style="background-color: #fff; padding: 0 30rpx 20rpx" > - + - + - +