diff --git a/.env.development b/.env.development index ebfcf54..adcb5a0 100644 --- a/.env.development +++ b/.env.development @@ -12,5 +12,7 @@ TARO_APP_API='https://test.wanzhuanyongcheng.cn/app' TARO_APP_NAME='捷兑通' TARO_APP_COP='玩赚商城版权所有' -TARO_APP_TITLE_IMG='../../static/index/1.png' -TARO_APP_LOGO_IMG='../../../static/logo.jpg' \ No newline at end of file +TARO_APP_TITLE_IMG='../../../static/index/1.png' +TARO_APP_LOGO_IMG='../../../static/logo.jpg' + +TARO_APP_SHOW_NEW_HOME='no' \ No newline at end of file diff --git a/.env.production b/.env.production index 2029f40..6750128 100644 --- a/.env.production +++ b/.env.production @@ -12,5 +12,8 @@ TARO_APP_API='https://www.wanzhuanyongcheng.cn/app' TARO_APP_NAME='捷兑通' TARO_APP_COP='鑫瓴科技版权所有' -TARO_APP_TITLE_IMG='../../static/index/1.png' -TARO_APP_LOGO_IMG='../../../static/logo.jpg' \ No newline at end of file +TARO_APP_TITLE_IMG='../../../static/index/1.png' +TARO_APP_LOGO_IMG='../../../static/logo.jpg' + + +TARO_APP_SHOW_NEW_HOME='no' \ No newline at end of file diff --git a/.env.reserve b/.env.reserve index 05b5563..b77dec6 100644 --- a/.env.reserve +++ b/.env.reserve @@ -12,5 +12,7 @@ TARO_APP_NAME='玩赚商城' TARO_APP_COP='玩赚商城版权所有' -TARO_APP_TITLE_IMG='../../static/index/title.png' -TARO_APP_LOGO_IMG='../../../static/logo-1.jpg' \ No newline at end of file +TARO_APP_TITLE_IMG='../../../static/index/title.png' +TARO_APP_LOGO_IMG='../../../static/logo-1.jpg' + +TARO_APP_SHOW_NEW_HOME='yes' \ No newline at end of file diff --git a/.env.test b/.env.test index cf98689..1df25ca 100644 --- a/.env.test +++ b/.env.test @@ -13,4 +13,6 @@ TARO_APP_NAME='捷兑通' TARO_APP_COP='鑫瓴科技版权所有' TARO_APP_TITLE_IMG='../../static/index/1.png' -TARO_APP_LOGO_IMG='../../../static/logo.jpg' \ No newline at end of file +TARO_APP_LOGO_IMG='../../../static/logo.jpg' + +TARO_APP_SHOW_NEW_HOME='no' \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 35410ca..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# 默认忽略的文件 -/shelf/ -/workspace.xml -# 基于编辑器的 HTTP 客户端请求 -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 2e77a2e..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index 79ee123..0000000 --- a/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 7c4836f..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/jdt-user.iml b/.idea/jdt-user.iml deleted file mode 100644 index 24643cc..0000000 --- a/.idea/jdt-user.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index df5e3fa..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/prettier.xml b/.idea/prettier.xml deleted file mode 100644 index b0c1c68..0000000 --- a/.idea/prettier.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/config/dev.ts b/config/dev.ts index c33defd..c12fe80 100644 --- a/config/dev.ts +++ b/config/dev.ts @@ -4,7 +4,6 @@ module.exports = { env: { NODE_ENV: '"development"', }, - defineConstants: {}, mini: {}, h5: {}, }; diff --git a/config/prod.ts b/config/prod.ts index 101565b..dd4a6d6 100644 --- a/config/prod.ts +++ b/config/prod.ts @@ -4,7 +4,6 @@ module.exports = { env: { NODE_ENV: '"production"', }, - defineConstants: {}, mini: {}, h5: { /** diff --git a/config/reserve.ts b/config/reserve.ts new file mode 100644 index 0000000..84fb70e --- /dev/null +++ b/config/reserve.ts @@ -0,0 +1,37 @@ +// @ts-nocheck + +module.exports = { + env: { + NODE_ENV: '"production"', + }, + mini: {}, + h5: { + /** + * WebpackChain 插件配置 + * @docs https://github.com/neutrinojs/webpack-chain + */ + // webpackChain (chain) { + // /** + // * 如果 h5 端编译后体积过大,可以使用 webpack-bundle-analyzer 插件对打包体积进行分析。 + // * @docs https://github.com/webpack-contrib/webpack-bundle-analyzer + // */ + // chain.plugin('analyzer') + // .use(require('webpack-bundle-analyzer').BundleAnalyzerPlugin, []) + // /** + // * 如果 h5 端首屏加载时间过长,可以使用 prerender-spa-plugin 插件预加载首页。 + // * @docs https://github.com/chrisvfritz/prerender-spa-plugin + // */ + // const path = require('path') + // const Prerender = require('prerender-spa-plugin') + // const staticDir = path.join(__dirname, '..', 'dist') + // chain + // .plugin('prerender') + // .use(new Prerender({ + // staticDir, + // routes: [ '/pages/index/index' ], + // postProcess: (context) => ({ ...context, outputPath: path.join(staticDir, 'index.html') }) + // })) + // } + }, +}; + diff --git a/package.json b/package.json index 3f52682..f473bfb 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "jdt-user", - "version": "4.0.15", + "version": "4.0.16", "taroConfig": { - "version": "4.0.15" + "version": "4.0.16" }, "scripts": { "build:weapp": "taro build --type weapp", diff --git a/src/pages/index/components/HomeNew.vue b/src/pages/index/components/HomeNew.vue new file mode 100644 index 0000000..34f0713 --- /dev/null +++ b/src/pages/index/components/HomeNew.vue @@ -0,0 +1,874 @@ + + + + + diff --git a/src/pages/index/components/HomeOld.vue b/src/pages/index/components/HomeOld.vue new file mode 100644 index 0000000..68533f9 --- /dev/null +++ b/src/pages/index/components/HomeOld.vue @@ -0,0 +1,245 @@ + + + + + + diff --git a/src/pages/index/components/home-new.scss b/src/pages/index/components/home-new.scss new file mode 100644 index 0000000..4b6b12f --- /dev/null +++ b/src/pages/index/components/home-new.scss @@ -0,0 +1,10 @@ +/* HomeNew 页面样式 */ +page { + background-color: #f5f6f7; +} + +.home-new { + background-color: #f5f6f7; + min-height: 100vh; +} + diff --git a/src/pages/index/index.scss b/src/pages/index/components/home-old.scss similarity index 97% rename from src/pages/index/index.scss rename to src/pages/index/components/home-old.scss index c514cda..5d618fc 100644 --- a/src/pages/index/index.scss +++ b/src/pages/index/components/home-old.scss @@ -70,7 +70,7 @@ page { .btn-2 { // background-image: url('//p1.meituan.net/csc/8cc2b518031eb7424b184d90a583d805146287.png'); - background-image: url('../../static/game_banner.png'); + background-image: url('../../../static/game_banner.png'); background-size: 100% 100%; width: 300px; height: 220px; @@ -121,3 +121,4 @@ page { height: 180px; margin: 20px; } + diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index fdf0ab7..42cd613 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -1,223 +1,19 @@ - + diff --git a/tailwind.config.js b/tailwind.config.js index 1e07cf3..b763c44 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -2,7 +2,16 @@ module.exports = { content: ['./src/pages/index.html', './src/**/*.{html,js,ts,jsx,tsx,vue}'], theme: { - extend: {}, + extend: { + colors: { + primary: '#fa2c19', // Theme Red + secondary: '#ff5d45', // Lighter Red + surface: '#ffffff', + }, + boxShadow: { + 'card': '0 2px 8px rgba(0, 0, 0, 0.04)', + }, + }, }, plugins: [], corePlugins: {