Merge branch 'test'

components.d.ts

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

src/components/Popup.vue

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

src/pages/index/index.vue

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