物流增加貨到付款設定

3 years ago · 9542a26dde
parent 1beb30a123
commit 9542a26dde
7 changed files with 52 additions and 4857 deletions
--- a/.env.development
+++ b/.env.development
@ -1,3 +1,5 @@
+VITE_APP_ENV = development
+
 VITE_APP_IMG_URL = 'https://shop.h888.fun/'

 VITE_APP_API_URL = 'https://shop.h888.fun/appapi/v1'
--- a/package-lock.json
+++ b/package-lock.json
--- a/src/pages/Cart/Checkout.vue
+++ b/src/pages/Cart/Checkout.vue
@ -26,7 +26,7 @@
            <div class="swipe-to-show" v-for="item in items" :key="item.rec_id">
                <div class="product-list media">
                    <a href="javascript:void(0);">
-                        <img :src="`https://shop.h888.fun/${item.goods_thumb}`" alt="offer" />
+                        <img :src="img_url + item.goods_thumb" alt="offer" />
                    </a>
                    <div class="media-body">
                        <a href="product.html" class="font-sm"> {{ item.goods_name }} </a>
@ -147,7 +147,7 @@
                                <li
                                    class="filter-col"
                                    :class="{ active: orderStore.payment.pay_code === 'cod' }"
-                                    v-if="orderStore.shipping.shipping_code === 'ecpay'"
+                                    v-if="showCod"
                                    @click="selectPayment({ pay_id: 0, pay_code: 'cod', pay_name: '貨到付款' })"
                                >
                                    貨到付款
@ -279,9 +279,12 @@ import { checkBonusSn } from "@/services/bonus";

 import router from "@/router";

+
 import linepayicon from "/src/assets/icons/png/linepay.png";
 import mastericon from "/src/assets/icons/png/mastercard1.png";

+const img_url = import.meta.env.VITE_APP_IMG_URL
+
 const cartStore = useCartStore();
 const orderStore = useOrderStore();

@ -374,10 +377,16 @@ const cartToOrder = () => {
    }
 };

+const showCod = ref(false)
 // 物流
 const selectShipping = async (value) => {
    if (shippingData.value.shipping_code === value.shipping_code) return;

+    if(value.support_cod === 1){
+        showCod.value = true
+    }else{
+        showCod.value = false    
+    }
    switch (value.shipping_code) {
        case "shipping":
            let resAddr = await getUserDefaultAddress();
--- a/src/pages/Cart/Index.vue
+++ b/src/pages/Cart/Index.vue
@ -30,7 +30,7 @@
                >
                    <div class="product-list media">
                        <a href="javascript:void(0);">
-                            <img :src="`https://shop.h888.fun/${item.goods_thumb}`" alt="offer" />
+                            <img :src="img_url + item.goods_thumb" alt="offer" />
                        </a>
                        <div class="media-body">
                            <a href="javascript:void(0)" class="font-md"> {{ item.goods_name }} </a>
@ -101,6 +101,8 @@ import { checkLogin } from "@/services/auth";
 import router from "@/router";
 import Cookies from "js-cookie";

+const img_url = import.meta.env.VITE_APP_IMG_URL
+
 const cartStore = useCartStore();

 const { cartItems: items } = storeToRefs(cartStore);
--- a/vite.config.js
+++ b/vite.config.js
@ -1,13 +1,20 @@
-import { defineConfig } from 'vite'
-import vue from '@vitejs/plugin-vue'
+import { defineConfig } from 'vite';
+import vue from '@vitejs/plugin-vue';
 import Components from 'unplugin-vue-components/vite';
 import { VantResolver } from 'unplugin-vue-components/resolvers';
-import {resolve} from 'path'
-import alias from '@rollup/plugin-alias'
+import { resolve } from 'path';
+import alias from '@rollup/plugin-alias';
 import topLevelAwait from "vite-plugin-top-level-await";

 // https://vitejs.dev/config/
-export default defineConfig({
+export default defineConfig(({ mode }) => {
+  const isProduction = mode === 'production';
+
+  const isSlashEnv = mode === 'slash';
+
+  const outDir = isSlashEnv ? '../build/m' : './dist';
+
+  return {
    base: '/m/',
    plugins: [
      alias(),
@ -16,9 +23,7 @@ export default defineConfig({
        resolvers: [VantResolver()],
      }),
      topLevelAwait({
-      // The export name of top-level await promise for each chunk module
        promiseExportName: "__tla",
-      // The function to generate import names of top-level await promise in each chunk module
        promiseImportName: i => `__tla_${i}`
      })
    ],
@ -27,10 +32,10 @@ export default defineConfig({
        '@': resolve(__dirname, 'src')
      }
    },
-  css: {
-
-  },
+    css: {},
    build: {
-    outDir: ['slash'].includes(vite.meta.env.VITE_APP_ENV)?'../build/m':'./dist'  
+      emptyOutDir: true,
+      outDir
    }
-})
+  };
+});
--- a/vite.config.js.timestamp-1672304645439.mjs
+++ b/vite.config.js.timestamp-1672304645439.mjs
@ -1,26 +0,0 @@
-// vite.config.js
-import { defineConfig } from "file:///home/wayne/SynologyDrive/project/stage/evshop/h5src/node_modules/vite/dist/node/index.js";
-import vue from "file:///home/wayne/SynologyDrive/project/stage/evshop/h5src/node_modules/@vitejs/plugin-vue/dist/index.mjs";
-import Components from "file:///home/wayne/SynologyDrive/project/stage/evshop/h5src/node_modules/unplugin-vue-components/dist/vite.mjs";
-import { VantResolver } from "file:///home/wayne/SynologyDrive/project/stage/evshop/h5src/node_modules/unplugin-vue-components/dist/resolvers.mjs";
-import { resolve } from "path";
-var __vite_injected_original_dirname = "/home/wayne/SynologyDrive/project/stage/evshop/h5src";
-var vite_config_default = defineConfig({
-  base: "/m",
-  plugins: [
-    vue(),
-    Components({
-      resolvers: [VantResolver()]
-    })
-  ],
-  resolve: {
-    alias: {
-      "@": resolve(__vite_injected_original_dirname, "src")
-    }
-  },
-  css: {}
-});
-export {
-  vite_config_default as default
-};
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsidml0ZS5jb25maWcuanMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbImNvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lID0gXCIvaG9tZS93YXluZS9TeW5vbG9neURyaXZlL3Byb2plY3Qvc3RhZ2UvZXZzaG9wL2g1c3JjXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ZpbGVuYW1lID0gXCIvaG9tZS93YXluZS9TeW5vbG9neURyaXZlL3Byb2plY3Qvc3RhZ2UvZXZzaG9wL2g1c3JjL3ZpdGUuY29uZmlnLmpzXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ltcG9ydF9tZXRhX3VybCA9IFwiZmlsZTovLy9ob21lL3dheW5lL1N5bm9sb2d5RHJpdmUvcHJvamVjdC9zdGFnZS9ldnNob3AvaDVzcmMvdml0ZS5jb25maWcuanNcIjtpbXBvcnQgeyBkZWZpbmVDb25maWcgfSBmcm9tICd2aXRlJ1xuaW1wb3J0IHZ1ZSBmcm9tICdAdml0ZWpzL3BsdWdpbi12dWUnXG5pbXBvcnQgQ29tcG9uZW50cyBmcm9tICd1bnBsdWdpbi12dWUtY29tcG9uZW50cy92aXRlJztcbmltcG9ydCB7IFZhbnRSZXNvbHZlciB9IGZyb20gJ3VucGx1Z2luLXZ1ZS1jb21wb25lbnRzL3Jlc29sdmVycyc7XG5pbXBvcnQge3Jlc29sdmV9IGZyb20gJ3BhdGgnXG5cbi8vIGh0dHBzOi8vdml0ZWpzLmRldi9jb25maWcvXG5leHBvcnQgZGVmYXVsdCBkZWZpbmVDb25maWcoe1xuICBiYXNlOiAnL20nLFxuICBwbHVnaW5zOiBbdnVlKCksXG4gICAgQ29tcG9uZW50cyh7XG4gICAgICByZXNvbHZlcnM6IFtWYW50UmVzb2x2ZXIoKV0sXG4gICAgfSlcbiAgXSxcbiAgcmVzb2x2ZToge1xuICAgIGFsaWFzOiB7XG4gICAgICAnQCcgOiByZXNvbHZlKF9fZGlybmFtZSwnc3JjJylcbiAgICB9XG4gIH0sXG4gIGNzczoge1xuXG4gIH1cbn0pXG4iXSwKICAibWFwcGluZ3MiOiAiO0FBQThVLFNBQVMsb0JBQW9CO0FBQzNXLE9BQU8sU0FBUztBQUNoQixPQUFPLGdCQUFnQjtBQUN2QixTQUFTLG9CQUFvQjtBQUM3QixTQUFRLGVBQWM7QUFKdEIsSUFBTSxtQ0FBbUM7QUFPekMsSUFBTyxzQkFBUSxhQUFhO0FBQUEsRUFDMUIsTUFBTTtBQUFBLEVBQ04sU0FBUztBQUFBLElBQUMsSUFBSTtBQUFBLElBQ1osV0FBVztBQUFBLE1BQ1QsV0FBVyxDQUFDLGFBQWEsQ0FBQztBQUFBLElBQzVCLENBQUM7QUFBQSxFQUNIO0FBQUEsRUFDQSxTQUFTO0FBQUEsSUFDUCxPQUFPO0FBQUEsTUFDTCxLQUFNLFFBQVEsa0NBQVUsS0FBSztBQUFBLElBQy9CO0FBQUEsRUFDRjtBQUFBLEVBQ0EsS0FBSyxDQUVMO0FBQ0YsQ0FBQzsiLAogICJuYW1lcyI6IFtdCn0K
--- a/yarn.lock
+++ b/yarn.lock
@ -1045,7 +1045,7 @@ destroy@1.2.0:

 dotenv@^16.0.3:
  version "16.0.3"
-  resolved "https://registry.npmjs.org/dotenv/-/dotenv-16.0.3.tgz"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.3.tgz#115aec42bac5053db3c456db30cc243a5a836a07"
  integrity sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==

 easy-bem@^1.0.2: