skyline 1 日 前
コミット
27036487d9

+ 11 - 3
admin-web/vite.config.ts

@@ -46,9 +46,17 @@ const viteConfig = defineConfig((mode: ConfigEnv) => {
                     chunkFileNames: `assets/[name].[hash].js`,
                     assetFileNames: `assets/[name].[hash].[ext]`,
                     compact: true,
-                    manualChunks: {
-                        vue: ['vue', 'vue-router', 'pinia'],
-                        echarts: ['echarts'],
+                    manualChunks(id) {
+                        if (!id.includes('node_modules')) return;
+                        if (id.includes('echarts-gl')) return 'echarts-gl';
+                        if (id.includes('echarts')) return 'echarts';
+                        if (id.includes('element-plus')) return 'element-plus';
+                        if (id.includes('vxe-table') || id.includes('xe-utils')) return 'vxe-table';
+                        if (id.includes('xlsx')) return 'xlsx';
+                        if (id.includes('@wangeditor')) return 'wangeditor';
+                        if (id.includes('jspdf') || id.includes('html2canvas')) return 'pdf-utils';
+                        if (id.includes('lodash')) return 'lodash';
+                        if (id.includes('vue') || id.includes('pinia') || id.includes('vue-router')) return 'vue';
                     },
                 },
             },

+ 1 - 1
car-wash-mp/src/pages/user/index.vue

@@ -167,7 +167,7 @@ const toPage = (item: any) => {
 };
 
 const handleUserClick = () => {
-  if (!isLogin.value) {
+  if (!isLogin.value || !user.value.mobilePhone) {
     uni.navigateTo({
       url: '/pages-user/login/index'
     })

+ 1 - 1
car-wash-service/src/main/java/com/kym/service/impl/WashOrderServiceImpl.java

@@ -139,7 +139,7 @@ public class WashOrderServiceImpl extends MyBaseServiceImpl<WashOrderMapper, Was
                 .setOrderId(orderId)
                 .setOrderIdLocal(createOrder.getOrder_id_local())
                 .setMemberDiscount(Account.NO_DISCOUNT)
-                .setPrepayMoney(account.getBalance() - 50)
+                .setPrepayMoney(account.getBalance())
                 .setStartTime(LocalDateTime.now())
                 .setOrderStatus(WashOrder.ORDER_STATUS_开机)
                 .setPayStatus(WashOrder.PAY_STATUS_未支付)