Browse Source

Merge branch 'master' of http://120.46.190.49:10880/joenyliang/v3studio-erp-pda

yangg 1 year ago
parent
commit
2561cdaee0
9 changed files with 1092 additions and 601 deletions
  1. 5 3
      capacitor.config.ts
  2. 651 170
      package-lock.json
  3. 4 2
      package.json
  4. 1 1
      src/i18n.ts
  5. 4 1
      src/views/apps/applist.vue
  6. 2 0
      src/views/apps/order.vue
  7. 1 1
      tsconfig.json
  8. 2 2
      vite.config.ts
  9. 422 421
      yarn.lock

+ 5 - 3
capacitor.config.ts

@@ -1,9 +1,11 @@
-import type { CapacitorConfig } from '@capacitor/cli';
+
+import { CapacitorConfig } from '@capacitor/cli';
 
 const config: CapacitorConfig = {
   appId: 'com.v3studio.app',
   appName: 'v3studioapp',
-  webDir: 'dist'
+  webDir: 'dist',
+  bundledWebRuntime: false
 };
 
-export default config;
+export default config;

File diff suppressed because it is too large
+ 651 - 170
package-lock.json


+ 4 - 2
package.json

@@ -12,12 +12,14 @@
     "@bhplugin/vue3-datatable": "^1.0.3",
     "@capacitor/android": "^6.0.0",
     "@capacitor/cli": "^6.0.0",
+    "@capacitor/core": "^6.0.0",
     "@fullcalendar/core": "^5.11.0",
     "@fullcalendar/daygrid": "^5.11.0",
     "@fullcalendar/interaction": "^5.11.0",
     "@fullcalendar/timegrid": "^5.11.0",
     "@fullcalendar/vue3": "^5.11.1",
     "@headlessui/vue": "^1.7.3",
+    "@intlify/unplugin-vue-i18n": "^4.0.0",
     "@suadelabs/vue3-multiselect": "^1.0.2",
     "@vuelidate/core": "^2.0.0",
     "@vuelidate/validators": "^2.0.0",
@@ -25,6 +27,7 @@
     "@vueuse/head": "^0.9.7",
     "apexcharts": "^3.35.5",
     "axios": "^1.6.8",
+    "capacitor-pda-scanner": "file:y",
     "dotenv": "^16.4.5",
     "easymde": "^2.18.0",
     "element-plus": "^2.7.3",
@@ -63,11 +66,10 @@
     "yup": "^1.4.0"
   },
   "devDependencies": {
-    "@intlify/vite-plugin-vue-i18n": "^6.0.3",
     "@rollup/plugin-alias": "^3.1.9",
     "@tailwindcss/forms": "^0.5.3",
     "@tailwindcss/typography": "^0.5.7",
-    "@vitejs/plugin-vue": "^3.1.0",
+    "@vitejs/plugin-vue": "^5.0.5",
     "autoprefixer": "^10.4.12",
     "postcss": "^8.4.17",
     "tailwindcss": "^3.3.2",

+ 1 - 1
src/i18n.ts

@@ -1,5 +1,5 @@
 import { createI18n } from 'vue-i18n';
-import messages from '@intlify/vite-plugin-vue-i18n/messages';
+import messages from '@intlify/unplugin-vue-i18n/messages';
 
 export default createI18n({
     legacy: false,

+ 4 - 1
src/views/apps/applist.vue

@@ -46,7 +46,7 @@
 
  <div class="relative inline-flex align-middle fixed-bottom button-group">
   <button type="button" @click="godashbord" class="btn btn-dark ltr:rounded-r-none rtl:rounded-l-none">Left</button>
-  <button type="button" class="btn btn-dark rounded-none">Middle</button>
+  <button type="button" @click="godashbord" class="btn btn-dark rounded-none">Middle</button>
   <button type="button" class="btn btn-dark ltr:rounded-l-none rtl:rounded-r-none">Right</button>
 </div>
 
@@ -65,6 +65,9 @@ import { ref, computed, onMounted, inject} from 'vue'; // Added onMounted here
     const godashbord = () => {
         router.push(({path:'/'}))
     }
+    const goorder = () => {
+        router.push(({path:'/order'}))
+    }
 
     useMeta({ title: 'Chat' });
     const store = useAppStore();

+ 2 - 0
src/views/apps/order.vue

@@ -9,6 +9,7 @@
             <li class="before:content-['/'] ltr:before:mr-2 rtl:before:ml-2">
                 <span>订单列表</span>
             </li>
+       
 
       
         </ul>
@@ -92,6 +93,7 @@
 
     import IconBell from '@/components/icon/icon-bell.vue';
     import IconCaretDown from '@/components/icon/icon-caret-down.vue';
+   
 
     useMeta({ title: 'Column Chooser Table' });
     const store = useAppStore();

+ 1 - 1
tsconfig.json

@@ -18,7 +18,7 @@
         },
         "noImplicitAny": false,
         "allowJs": true,
-        "types": ["@intlify/vite-plugin-vue-i18n/client", "vite/client"]
+        "types": ["vite/client"]
     },
     "include": ["src/**/*.js", "src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue", "vite-env.d.ts"],
     "references": [

+ 2 - 2
vite.config.ts

@@ -1,8 +1,8 @@
 import { defineConfig } from 'vite';
 import vue from '@vitejs/plugin-vue';
 import path from 'path';
-import vueI18n from '@intlify/vite-plugin-vue-i18n';
 import dotenv from 'dotenv';
+import VueI18n from '@intlify/unplugin-vue-i18n/vite';
 
 // 加载环境变量
 dotenv.config();
@@ -16,7 +16,7 @@ interface ImportMeta {
 export default defineConfig({
     plugins: [
         vue(),
-        vueI18n({
+        VueI18n({
             include: path.resolve(__dirname, './src/locales/**'),
         }),
     ],

File diff suppressed because it is too large
+ 422 - 421
yarn.lock


Some files were not shown because too many files changed in this diff