Merge pull request #21 from biaov/release/v1.2.0

v1.2.0

.gitignore

@@ -1,2 +1,3 @@
-node_modules
-dist
+node_modules
+dist
+.log

README.md

@@ -3,7 +3,7 @@
 一个简单的生态系统，包含 APP，H5，微信小程序，控制台，服务端 😄
 
 <h2 align="center">
-  <a href="https://github.com/biaov/ecosystem"><img src="https://img.shields.io/badge/version-v1.1.0-blue" /></a>
+  <a href="https://github.com/biaov/ecosystem"><img src="https://img.shields.io/badge/version-v1.2.0-blue" /></a>
   <a href="https://github.com/biaov/ecosystem/blob/main/LICENSE"><img src="https://img.shields.io/badge/license-MIT-green" /></a>
 </h2>
 

admin/README.md

@@ -2,10 +2,6 @@
 
 生态系统的控制台
 
-<h2 align="center">
-  <a href="https://github.com/biaov/ecosystem"><img src="https://img.shields.io/badge/version-v1.1.0-blue" /></a>
-</h2>
-
 ## 安装依赖
 
 ```Basic

admin/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ecosystem-admin",
   "private": false,
-  "version": "1.1.0",
+  "version": "1.2.0",
   "author": {
     "name": "biaov",
     "email": "biaov@qq.com",
@@ -44,21 +44,21 @@
     "@ant-design/icons": "^5.2.6",
     "@antv/g2": "^4.2.10",
     "@reduxjs/toolkit": "^1.9.7",
-    "antd": "^5.10.0",
+    "antd": "^5.10.1",
     "axios": "^1.5.1",
     "dayjs": "^1.11.10",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-quill": "^2.0.0",
     "react-redux": "^8.1.3",
-    "react-router-dom": "^6.16.0"
+    "react-router-dom": "^6.17.0"
   },
   "devDependencies": {
-    "@types/node": "^20.8.5",
+    "@types/node": "^20.8.6",
     "@types/react": "^18.2.28",
     "@types/react-dom": "^18.2.13",
-    "@typescript-eslint/eslint-plugin": "^6.7.5",
-    "@typescript-eslint/parser": "^6.7.5",
+    "@typescript-eslint/eslint-plugin": "^6.8.0",
+    "@typescript-eslint/parser": "^6.8.0",
     "@vitejs/plugin-react": "^4.1.0",
     "eslint": "^8.51.0",
     "eslint-config-airbnb-base": "^15.0.0",

mobile/.env.development

@@ -1,3 +1,3 @@
-VITE_BASE_URL=http://127.0.0.1:3600/api
+# VITE_BASE_URL=http://127.0.0.1:3600/api
 # VITE_BASE_URL=http://192.168.10.75:3600/api
-# VITE_BASE_URL=https://ecosystem.biaov.cn/api
+VITE_BASE_URL=https://ecosystem.biaov.cn/api

mobile/.gitignore

@@ -1,3 +1,3 @@
 /node_modules
 /dist
-/.git
+/.git

mobile/README.md

@@ -2,10 +2,6 @@
 
 生态系统的 APP，H5，微信小程序
 
-<h2 align="center">
-  <a href="https://github.com/biaov/ecosystem"><img src="https://img.shields.io/badge/version-v1.1.0-blue" /></a>
-</h2>
-
 ## 安装依赖
 
 ```Basic

mobile/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ecosystem-mobile",
   "private": false,
-  "version": "1.1.0",
+  "version": "1.2.0",
   "scripts": {
     "start": "npm run dev:h5",
     "dev:app": "uni -p app",
@@ -48,24 +48,24 @@
     }
   ],
   "dependencies": {
-    "@dcloudio/uni-app": "^3.0.0-alpha-3090120230927001",
-    "@dcloudio/uni-app-plus": "^3.0.0-alpha-3090120230927001",
-    "@dcloudio/uni-components": "^3.0.0-alpha-3090120230927001",
-    "@dcloudio/uni-h5": "^3.0.0-alpha-3090120230927001",
-    "@dcloudio/uni-mp-weixin": "^3.0.0-alpha-3090120230927001",
+    "@dcloudio/uni-app": "^3.0.0-alpha-3090320231017002",
+    "@dcloudio/uni-app-plus": "^3.0.0-alpha-3090320231017002",
+    "@dcloudio/uni-components": "^3.0.0-alpha-3090320231017002",
+    "@dcloudio/uni-h5": "^3.0.0-alpha-3090320231017002",
+    "@dcloudio/uni-mp-weixin": "^3.0.0-alpha-3090320231017002",
     "dayjs": "^1.11.10",
     "pinia": "2.0.36",
     "vue": "^3.3.4"
   },
   "devDependencies": {
     "@dcloudio/types": "^3.4.0",
-    "@dcloudio/uni-automator": "^3.0.0-alpha-3090120230927001",
-    "@dcloudio/uni-cli-shared": "^3.0.0-alpha-3090120230927001",
-    "@dcloudio/uni-stacktracey": "^3.0.0-alpha-3090120230927001",
-    "@dcloudio/vite-plugin-uni": "^3.0.0-alpha-3090120230927001",
-    "@types/node": "^20.8.5",
-    "@typescript-eslint/eslint-plugin": "^6.7.5",
-    "@typescript-eslint/parser": "^6.7.5",
+    "@dcloudio/uni-automator": "^3.0.0-alpha-3090320231017002",
+    "@dcloudio/uni-cli-shared": "^3.0.0-alpha-3090320231017002",
+    "@dcloudio/uni-stacktracey": "^3.0.0-alpha-3090320231017002",
+    "@dcloudio/vite-plugin-uni": "^3.0.0-alpha-3090320231017002",
+    "@types/node": "^20.8.6",
+    "@typescript-eslint/eslint-plugin": "^6.8.0",
+    "@typescript-eslint/parser": "^6.8.0",
     "@vitejs/plugin-vue": "^4.4.0",
     "eslint": "^8.51.0",
     "eslint-config-airbnb-base": "^15.0.0",

mobile/src/components/types.ts

@@ -1,5 +1,12 @@
 /**
- * responsive-swiper 组件类型定义
+ * 默认插槽
+ */
+export interface DefaultSlots {
+  default: (props: {}) => unknown
+}
+
+/**
+ * responsive-swiper 组件
  */
 export namespace ResponsiveSwiper {
   export interface ListItem extends Record<string, unknown> {
@@ -17,7 +24,7 @@ export namespace ResponsiveSwiper {
 }
 
 /**
- * svg-img 组件类型定义
+ * svg-img 组件
  */
 export namespace SvgImg {
   export interface Props {
@@ -30,7 +37,7 @@ export namespace SvgImg {
 }
 
 /**
- * loading-more 组件类型定义
+ * loading-more 组件
  */
 export namespace LoadingMore {
   export interface Props {
@@ -50,3 +57,29 @@ export namespace NoticeList {
     content: string
   }
 }
+
+/**
+ * view-mask 组件
+ */
+export namespace ViewMask {
+  export interface Emits {
+    (event: 'update:visible', e: boolean): void
+  }
+  export interface Props {
+    /**
+     * 显示状态
+     */
+    visible?: boolean
+
+    /**
+     * 背景颜色
+     */
+    background?: string
+
+    /**
+     * 禁止点击遮罩层关闭弹窗
+     */
+    disabled?: boolean
+  }
+}
+

mobile/src/components/view-cell.vue

@@ -9,6 +9,7 @@
 </template>
 <script lang="ts" setup>
 const emit = defineEmits(['click'])
+
 withDefaults(
   defineProps<{
     /**

mobile/src/components/view-mask.vue

@@ -0,0 +1,57 @@
+<script setup lang="ts">
+/**
+ * 响应事件
+ */
+const emit = defineEmits<{
+  (event: 'update:visible', e: boolean): void
+}>()
+
+/**
+ * 所需参数
+ */
+const props = withDefaults(
+  defineProps<{
+    /**
+     * 显示状态
+     */
+    visible?: boolean
+
+    /**
+     * 背景颜色
+     */
+    background?: string
+
+    /**
+     * 禁止点击遮罩层关闭弹窗
+     */
+    disabled?: boolean
+  }>(),
+  {
+    visible: false,
+    background: 'rgba(0,0,0,0.6)',
+    disabled: false
+  }
+)
+
+/**
+ * 关闭遮罩层
+ */
+const onClose = () => {
+  !props.disabled && emit('update:visible', false)
+}
+</script>
+
+<template>
+  <!-- 遮罩层 -->
+  <view v-if="visible" class="view-mask fixed w-fill h-fill" :style="{ background }" @click="onClose" @touchmove.stop.prevent>
+    <slot></slot>
+  </view>
+</template>
+
+<style lang="less" scoped>
+.view-mask {
+  top: 0;
+  left: 0;
+  z-index: 99;
+}
+</style>

mobile/src/composables/useVisible.ts

@@ -0,0 +1,18 @@
+/**
+ * 显示状态
+ */
+export const useVisible = (initVisible = false) => {
+  /**
+   * 是否显示
+   */
+  const visible = ref(initVisible)
+
+  /**
+   * 设置显示状态
+   */
+  const setVisible = (value: boolean) => {
+    visible.value = value
+  }
+
+  return [visible, setVisible] as const
+}

mobile/src/config/asset.ts

@@ -0,0 +1,4 @@
+/**
+ * 基础资源路径
+ */
+export const baseAssetURL = 'https://ecosystem.biaov.cn/uploads/'

mobile/src/manifest.json

@@ -2,8 +2,8 @@
   "name": "ecosystem",
   "appid": "H5B979BEE",
   "description": "这是一个生态系统的移动端",
-  "versionName": "1.1.0",
-  "versionCode": "110",
+  "versionName": "1.2.0",
+  "versionCode": "120",
   "transformPx": false,
   "app-plus": {
     "usingComponents": true,
@@ -39,13 +39,30 @@
         "targetSdkVersion": 31
       },
       "ios": {},
-      "sdkConfigs": {}
+      "sdkConfigs": {},
+      "apple": {
+        "idfa": false
+      },
+      "splashscreen": {
+        "androidStyle": "default",
+        "android": {
+          "hdpi": "static/snowflake.png",
+          "xhdpi": "static/snowflake.png",
+          "xxhdpi": "static/snowflake.png"
+        }
+      }
     }
   },
   "mp-weixin": {
     "appid": "wxedb0edf60129ec39",
     "setting": {
-      "urlCheck": false
+      "urlCheck": false,
+      "es6": true,
+      "postcss": true,
+      "minified": true,
+      "newFeature": true,
+      "bigPackageSizeSupport": true,
+      "enhance": true
     },
     "usingComponents": true
   },

mobile/src/pages.json

@@ -106,6 +106,12 @@
           "style": {
             "navigationBarTitleText": "微信授权"
           }
+        },
+        {
+          "path": "draw-poster",
+          "style": {
+            "navigationBarTitleText": "绘制海报"
+          }
         }
       ]
     },

mobile/src/pages/auth/login.vue

@@ -1,6 +1,9 @@
-<style scoped lang="less">
-@import './form.less';
-</style>
+<script setup lang="ts">
+import { useLogin } from './hooks'
+
+const { formState, handleLogin, onRegister } = useLogin()
+</script>
+
 <template>
   <view class="form">
     <image class="logo" src="/static/logo.svg" mode="widthFix" />
@@ -18,8 +21,6 @@
   </view>
 </template>
 
-<script setup lang="ts">
-import { useLogin } from './hooks'
-
-const { formState, handleLogin, onRegister } = useLogin()
-</script>
+<style scoped lang="less">
+@import './form.less';
+</style>