XinLingKeJi/jdt-user
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
YuanHuakk
2024-08-30 18:35:05 +08:00
parent 1e7f5c3d71 d57f9cc53e
commit 20d112246e
4 changed files with 74 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
components.d.ts vendored
View File

@@ -1,59 +1,59 @@
// generated by unplugin-vue-components // generated by unplugin-vue-components
// We suggest you to commit this file into source control // We suggest you to commit this file into source control
// Read more: https://github.com/vuejs/core/pull/3399 // Read more: https://github.com/vuejs/core/pull/3399
import '@vue/runtime-core' import '@vue/runtime-core';
export {} export {};
declare module '@vue/runtime-core' { declare module '@vue/runtime-core' {
export interface GlobalComponents { export interface GlobalComponents {
Auth: typeof import('./src/components/Auth.vue')['default'] Auth: typeof import('./src/components/Auth.vue')['default'];
Back: typeof import('./src/components/Back.vue')['default'] Back: typeof import('./src/components/Back.vue')['default'];
Cart: typeof import('./src/components/Cart.vue')['default'] Cart: typeof import('./src/components/Cart.vue')['default'];
MerList: typeof import('./src/components/MerList.vue')['default'] MerList: typeof import('./src/components/MerList.vue')['default'];
NutAvatar: typeof import('@nutui/nutui-taro')['Avatar'] NutAvatar: typeof import('@nutui/nutui-taro')['Avatar'];
NutBacktop: typeof import('@nutui/nutui-taro')['Backtop'] NutBacktop: typeof import('@nutui/nutui-taro')['Backtop'];
NutButton: typeof import('@nutui/nutui-taro')['Button'] NutButton: typeof import('@nutui/nutui-taro')['Button'];
NutCalendar: typeof import('@nutui/nutui-taro')['Calendar'] NutCalendar: typeof import('@nutui/nutui-taro')['Calendar'];
NutCell: typeof import('@nutui/nutui-taro')['Cell'] NutCell: typeof import('@nutui/nutui-taro')['Cell'];
NutCellGroup: typeof import('@nutui/nutui-taro')['CellGroup'] NutCellGroup: typeof import('@nutui/nutui-taro')['CellGroup'];
NutCheckbox: typeof import('@nutui/nutui-taro')['Checkbox'] NutCheckbox: typeof import('@nutui/nutui-taro')['Checkbox'];
NutCheckboxGroup: typeof import('@nutui/nutui-taro')['CheckboxGroup'] NutCheckboxGroup: typeof import('@nutui/nutui-taro')['CheckboxGroup'];
NutDialog: typeof import('@nutui/nutui-taro')['Dialog'] NutDialog: typeof import('@nutui/nutui-taro')['Dialog'];
NutEllipsis: typeof import('@nutui/nutui-taro')['Ellipsis'] NutEllipsis: typeof import('@nutui/nutui-taro')['Ellipsis'];
NutEmpty: typeof import('@nutui/nutui-taro')['Empty'] NutEmpty: typeof import('@nutui/nutui-taro')['Empty'];
NutForm: typeof import('@nutui/nutui-taro')['Form'] NutForm: typeof import('@nutui/nutui-taro')['Form'];
NutFormItem: typeof import('@nutui/nutui-taro')['FormItem'] NutFormItem: typeof import('@nutui/nutui-taro')['FormItem'];
NutGrid: typeof import('@nutui/nutui-taro')['Grid'] NutGrid: typeof import('@nutui/nutui-taro')['Grid'];
NutGridItem: typeof import('@nutui/nutui-taro')['GridItem'] NutGridItem: typeof import('@nutui/nutui-taro')['GridItem'];
NutImagePreview: typeof import('@nutui/nutui-taro')['ImagePreview'] NutImagePreview: typeof import('@nutui/nutui-taro')['ImagePreview'];
NutInput: typeof import('@nutui/nutui-taro')['Input'] NutInput: typeof import('@nutui/nutui-taro')['Input'];
NutInputNumber: typeof import('@nutui/nutui-taro')['InputNumber'] NutInputNumber: typeof import('@nutui/nutui-taro')['InputNumber'];
NutNumberKeyboard: typeof import('@nutui/nutui-taro')['NumberKeyboard'] NutNumberKeyboard: typeof import('@nutui/nutui-taro')['NumberKeyboard'];
NutOverlay: typeof import('@nutui/nutui-taro')['Overlay'] NutOverlay: typeof import('@nutui/nutui-taro')['Overlay'];
NutPagination: typeof import('@nutui/nutui-taro')['Pagination'] NutPagination: typeof import('@nutui/nutui-taro')['Pagination'];
NutPicker: typeof import('@nutui/nutui-taro')['Picker'] NutPicker: typeof import('@nutui/nutui-taro')['Picker'];
NutPopover: typeof import('@nutui/nutui-taro')['Popover'] NutPopover: typeof import('@nutui/nutui-taro')['Popover'];
NutPopup: typeof import('@nutui/nutui-taro')['Popup'] NutPopup: typeof import('@nutui/nutui-taro')['Popup'];
NutPrice: typeof import('@nutui/nutui-taro')['Price'] NutPrice: typeof import('@nutui/nutui-taro')['Price'];
NutRadio: typeof import('@nutui/nutui-taro')['Radio'] NutRadio: typeof import('@nutui/nutui-taro')['Radio'];
NutRadioGroup: typeof import('@nutui/nutui-taro')['RadioGroup'] NutRadioGroup: typeof import('@nutui/nutui-taro')['RadioGroup'];
NutRate: typeof import('@nutui/nutui-taro')['Rate'] NutRate: typeof import('@nutui/nutui-taro')['Rate'];
NutShortPassword: typeof import('@nutui/nutui-taro')['ShortPassword'] NutShortPassword: typeof import('@nutui/nutui-taro')['ShortPassword'];
NutSwiper: typeof import('@nutui/nutui-taro')['Swiper'] NutSwiper: typeof import('@nutui/nutui-taro')['Swiper'];
NutSwiperItem: typeof import('@nutui/nutui-taro')['SwiperItem'] NutSwiperItem: typeof import('@nutui/nutui-taro')['SwiperItem'];
NutSwitch: typeof import('@nutui/nutui-taro')['Switch'] NutSwitch: typeof import('@nutui/nutui-taro')['Switch'];
NutTable: typeof import('@nutui/nutui-taro')['Table'] NutTable: typeof import('@nutui/nutui-taro')['Table'];
NutTabPane: typeof import('@nutui/nutui-taro')['TabPane'] NutTabPane: typeof import('@nutui/nutui-taro')['TabPane'];
NutTabs: typeof import('@nutui/nutui-taro')['Tabs'] NutTabs: typeof import('@nutui/nutui-taro')['Tabs'];
NutTextarea: typeof import('@nutui/nutui-taro')['Textarea'] NutTextarea: typeof import('@nutui/nutui-taro')['Textarea'];
NutUploader: typeof import('@nutui/nutui-taro')['Uploader'] NutUploader: typeof import('@nutui/nutui-taro')['Uploader'];
Pay: typeof import('./src/components/Pay.vue')['default'] Pay: typeof import('./src/components/Pay.vue')['default'];
Popup: typeof import('./src/components/Popup.vue')['default'] Popup: typeof import('./src/components/Popup.vue')['default'];
RichEditor: typeof import('./src/components/RichEditor.vue')['default'] RichEditor: typeof import('./src/components/RichEditor.vue')['default'];
StoreList: typeof import('./src/components/StoreList.vue')['default'] StoreList: typeof import('./src/components/StoreList.vue')['default'];
Ucharts: typeof import('./src/components/Ucharts.vue')['default'] Ucharts: typeof import('./src/components/Ucharts.vue')['default'];
Upload: typeof import('./src/components/Upload.vue')['default'] Upload: typeof import('./src/components/Upload.vue')['default'];
UserModal: typeof import('./src/components/UserModal.vue')['default'] UserModal: typeof import('./src/components/UserModal.vue')['default'];
} }
} }

37
src/components/Popup.vue
View File

@@ -2,15 +2,13 @@
import {ref} from 'vue'; import {ref} from 'vue';
import Taro from '@tarojs/taro'; import Taro from '@tarojs/taro';
const show = ref(false); const isShow = ref(false);
const overlay = ref();
defineExpose({ defineExpose({
show, isShow,
}); });
defineProps({ const props = defineProps({
src: { src: {
required: true, required: true,
type: String, type: String,
@@ -18,29 +16,36 @@ defineProps({
}, },
type: Number, type: Number,
cb: { cb: {
required: true, type: Function || null,
type: Function, default: null,
default: () => {},
}, },
}); });
Taro.useLoad(async () => { const clickFn = type => {
if (Taro.getStorageSync('token')) show.value = true; if (props.cb) props.cb(type);
// const res = await getSignRecord() else isShow.value = false;
// console.log(res) };
Taro.useLoad(() => {
if (Taro.getStorageSync('token')) isShow.value = true;
}); });
</script> </script>
<template> <template>
<nut-overlay <nut-overlay
v-model:visible="show" v-model:visible="isShow"
:lock-scroll="true" :lock-scroll="true"
:close-on-click-overlay="false"> :close-on-click-overlay="false">
<view class="wrapper"> <view class="wrapper">
<view @click.stop="cb(type)"> <view @click.stop="clickFn(type)">
<image class="image" :src="src" /> <image
:style="{
width: src.naturalWidth,
height: src.naturalHeight < 600 ? src.naturalHeight : '480px',
}"
:src="src" />
</view> </view>
<view @click.stop="show = false"> <view @click.stop="isShow = false">
<image class="icon" src="../static/index/close.png" /> <image class="icon" src="../static/index/close.png" />
</view> </view>
</view> </view>

5
src/pages/index/index.vue
View File

@@ -48,15 +48,16 @@
hover-class="none"> hover-class="none">
</navigator> </navigator>
<MerList :get-user-location="getUserLocal" /> <MerList :get-user-location="getUserLocal" />
<Popup :src="require('../../static/popTip.png')" />
</view> </view>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import Taro from '@tarojs/taro'; import Taro from '@tarojs/taro';
import {ref} from 'vue'; import {ref} from 'vue';
import {getHomeList, getStoreList} from '@/api/home'; import {getHomeList} from '@/api/home';
import MerList from '@/components/MerList.vue'; import MerList from '@/components/MerList.vue';
import {showTips} from '@/utils'; import Popup from '@/components/Popup.vue';
const statusBarHeight = Taro.getSystemInfoSync().statusBarHeight; const statusBarHeight = Taro.getSystemInfoSync().statusBarHeight;
const BarHeight = ref((statusBarHeight as number) + 7); const BarHeight = ref((statusBarHeight as number) + 7);

BIN
src/static/popTip.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 173 KiB