diff --git a/.env.production b/.env.production index a6f9b23..e5a1553 100644 --- a/.env.production +++ b/.env.production @@ -1,3 +1,3 @@ -VITE_COMMON_API_PREFIX = /api +VITE_COMMON_API_PREFIX = /api-base VITE_COMMON_API_URL = http://store-manage.hmily.club/api \ No newline at end of file diff --git a/src/App.vue b/src/App.vue index 152b5ef..284188d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -5,11 +5,8 @@ export default { const userStore = useUserStoreWithOut() if (userStore.isLogin) { userStore.fetchUserInfo() - }else{ - // uni.reLaunch({ - // url: '/pages/login/index', - // }) } + console.log(userStore.isLogin); // #ifdef APP-PLUS if (userStore.isLogin) { plus.navigator.closeSplashscreen() diff --git a/src/manifest.json b/src/manifest.json index d8cd99e..c034a4d 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -49,7 +49,14 @@ }, /* ios打包配置 */ "ios" : { - "dSYMs" : false + "dSYMs" : false, + "privacyDescription" : { + "NSPhotoLibraryUsageDescription" : "因相关功能涉及图片的读取与写入，请在设置中开启相册权限", + "NSPhotoLibraryAddUsageDescription" : "因相关功能涉及图片的读取与写入，请在设置中开启相册权限", + "NSCameraUsageDescription" : "因相关功能涉及照相，请在设置开启相机权限", + "NSLocationWhenInUseUsageDescription" : "用户能快速知道当前位置", + "NSLocationAlwaysAndWhenInUseUsageDescription" : "用户能快速知道当前位置" + } }, /* SDK配置 */ "sdkConfigs" : { diff --git a/src/pages/data/brokerage/index.vue b/src/pages/data/brokerage/index.vue index 950f002..9d3ea98 100644 --- a/src/pages/data/brokerage/index.vue +++ b/src/pages/data/brokerage/index.vue @@ -2,11 +2,13 @@ - - - + @@ -21,6 +23,4 @@ import MescrollItem from '@/components/mescroll-api/one' import { onPageScroll, onReachBottom } from '@dcloudio/uni-app' import useMescrollComp from '@/uni_modules/mescroll-uni/hooks/useMescrollComp.js' const { mescrollItem } = useMescrollComp(onPageScroll, onReachBottom) - - diff --git a/src/pages/expense-account/detail.vue b/src/pages/expense-account/detail.vue index 5b8e47b..68c88e3 100644 --- a/src/pages/expense-account/detail.vue +++ b/src/pages/expense-account/detail.vue @@ -20,7 +20,7 @@ import CuNavbar from '@/components/cu-navbar/index.vue' import BaseData from '@/pages/audits/base-data.vue' import { ref } from 'vue' -import { onLoad } from '@dcloudio/uni-app' +import { onLoad ,onShow} from '@dcloudio/uni-app' import { http } from '@/utils/request' const modalRef = ref(null) const actions = ref([ @@ -112,6 +112,8 @@ const onDelete = () => { onLoad((option) => { id.value = option.id +}) +onShow(()=>{ getDetail() }) diff --git a/src/pages/expense-account/submit.vue b/src/pages/expense-account/submit.vue index a3eaf85..1c2079f 100644 --- a/src/pages/expense-account/submit.vue +++ b/src/pages/expense-account/submit.vue @@ -12,8 +12,14 @@ labelPosition="left" > - - {{ type.name ?? '请选择' }} + + {{ + type.name ?? '请选择' + }} @@ -44,7 +50,9 @@ - {{ form.photos.length }}/9 + {{ form.photos.length }}/9 @@ -112,7 +121,7 @@ const rules = reactive({ type: 'number', min: 0, message: '报销金额不能小于0', - } + }, ], reason: [{ required: true, message: '请输入报销原因' }], photos: { @@ -125,14 +134,14 @@ const rules = reactive({ onLoad((e) => { if (e.id) { id.value = e.id - http.get(`reimbursements/${e.id}`).then(res => { + http.get(`reimbursements/${e.id}`).then((res) => { type.value = res.type form.reimbursement_type_id = res.reimbursement_type_id form.expense = res.expense form.reason = res.reason if (res.photos && res.photos.length > 0) { - form.photos = res.photos.map(item => { - return {url: item} + form.photos = res.photos.map((item) => { + return { url: item } }) } }) @@ -145,9 +154,12 @@ const handleBlurExpense = (e) => { } const submit = () => { - formRef.value.validate().then((res) => { - modalRef.value.open() - }).catch(error => {}) + formRef.value + .validate() + .then((res) => { + modalRef.value.open() + }) + .catch((error) => {}) } const onSubmit = async () => { if (loading.value) return @@ -237,4 +249,11 @@ const typeConfirm = ({ value }) => { const openType = () => { typeRef.value.open() } + +const uploadError = (err) => { + uni.showToast({ + icon: 'none', + title: '权限未开启，请前往设置给予APP相应权限', + }) +} diff --git a/src/pages/home/index.vue b/src/pages/home/index.vue index d106104..7dbcb84 100644 --- a/src/pages/home/index.vue +++ b/src/pages/home/index.vue @@ -16,7 +16,8 @@ name="chat" > - + + 昨日累计金额 截止{{ yesday_ledger.date }} @@ -51,7 +52,7 @@ - + 近30天趋势数据 @@ -82,7 +83,6 @@ import { timeFormat } from '@climblee/uv-ui/libs/function' import StoreDown from './components/store-down.vue' import { useUserStore } from '@/store/modules/user' import checkPermission from '@/utils/permission' -import { Swiper } from '@dcloudio/uni-h5' const userStore = useUserStore() const opts = { color: ['#ee2c37'], @@ -132,9 +132,9 @@ const detail = ref({ current_month_ledger:{} }) const chartData = ref({}) -const yesday_ledger = computed(() => detail.value.yesday_ledger) -const current_month_ledger = computed(() => detail.value.current_month_ledger) -const trends_of_30days = computed(() => detail.value.trends_of_30days) +const yesday_ledger = computed(() => detail.value.yesday_ledger || {}) +const current_month_ledger = computed(() => detail.value.current_month_ledger || {}) +const trends_of_30days = computed(() => detail.value.trends_of_30days || []) const yesterday = computed(() => { return timeFormat(Number(new Date()) - 1000 * 60 * 60 * 24) @@ -179,7 +179,6 @@ const getData = (e = {}) => { if (!checkPermission(['admin'])) { e.store_id = userStore?.userInfo?.store?.id } - console.log(e.store_id) http .get('/statistics/dashboard', { params: { diff --git a/src/pages/userInfo/index.vue b/src/pages/userInfo/index.vue index e75858b..5c8582f 100644 --- a/src/pages/userInfo/index.vue +++ b/src/pages/userInfo/index.vue @@ -6,14 +6,6 @@ - - - - - - - - + + + + + + + + { uni.chooseImage({ count: 1, success: async (res) => { - const data = await uploadFilePromise(res.tempFilePaths[0]) - form.avatar = data + console.log(res) + try { + const data = await uploadFilePromise(res.tempFilePaths[0]) + form.avatar = data + } catch (error) { + console.log(error) + } }, }) }