diff --git a/.env.development b/.env.development index 7d3b726..c1a0512 100644 --- a/.env.development +++ b/.env.development @@ -8,8 +8,8 @@ TARO_APP_KEY='1234567890' TARO_APP_API='https://test.wanzhuanyongcheng.cn/app' # 骰子游戏链接 -# TARO_APP_GAME='https://jdt-test-tz.wanzhuanyongcheng.cn/pages/index/index?uid=' -TARO_APP_GAME='http://192.168.31.225:10086?uid=' +TARO_APP_GAME='https://jdt-test-tz.wanzhuanyongcheng.cn/pages/index/index?uid=' +# TARO_APP_GAME='http://192.168.31.225:10086?uid=' # 捕鱼游戏链接 TARO_APP_FISH_GAME='https://jdt-test-fish.wanzhuanyongcheng.cn/?uid=' \ No newline at end of file diff --git a/config/index.ts b/config/index.ts index d1a5dd9..dfec81a 100644 --- a/config/index.ts +++ b/config/index.ts @@ -9,7 +9,7 @@ const {robot = 1, desc} = argv; const CIPluginOptFn = async () => { /** - * @typedef { import("@tarojs/plugin-mini-ci").CIOptions } CIOptions + * @typedef { import('@tarojs/plugin-mini-ci').CIOptions } CIOptions * @type {CIOptions} */ return { @@ -133,7 +133,7 @@ const config = { }, }; -module.exports = function (merge) { +module.exports = function(merge) { if (process.env.NODE_ENV === 'development') { return merge({}, config, require('./dev')); } diff --git a/package.json b/package.json index 2ae4f43..eaf46fc 100644 --- a/package.json +++ b/package.json @@ -1,123 +1,123 @@ { - "name": "jdt-user", - "version": "4.0.2", - "private": true, - "description": "", - "templateInfo": { - "name": "jdt-user", - "typescript": true, - "css": "sass" - }, - "taroConfig": { - "version": "4.0.2" - }, - "scripts": { - "build:weapp": "taro build --type weapp", - "build:test": "taro build --type weapp --mode test", - "build:swan": "taro build --type swan", - "build:alipay": "taro build --type alipay", - "build:tt": "taro build --type tt", - "build:h5": "taro build --type h5", - "build:rn": "taro build --type rn", - "build:qq": "taro build --type qq", - "build:jd": "taro build --type jd", - "build:quickapp": "taro build --type quickapp", - "dev:weapp": "taro build --type weapp --watch", - "dev:swan": "npm run build:swan -- --watch", - "dev:alipay": "npm run build:alipay -- --watch", - "dev:tt": "npm run build:tt -- --watch", - "dev:h5": "npm run build:h5 -- --watch", - "dev:rn": "npm run build:rn -- --watch", - "dev:qq": "npm run build:qq -- --watch", - "dev:jd": "npm run build:jd -- --watch", - "dev:quickapp": "npm run build:quickapp -- --watch", - "lint": "eslint --ext .ts,.vue .", - "lint:fix": "eslint --fix --ext .ts,.vue .", - "lint:staged": "lint-staged", - "prepare": "husky install", - "preview": "vite preview", - "cz": "cz", - "lf": "npx prettier --write --end-of-line lf .", - "postinstall": "weapp-tw patch", - "build:weapp:prod:upload": "taro build --type weapp --upload --robot=1 --desc='正式环境'", - "build:weapp:test:upload": "taro build --type weapp --upload --robot=2 --desc='测试环境' --mode test" - }, - "browserslist": [ - "last 3 versions", - "Android >= 4.1", - "ios >= 8" - ], - "author": "", - "lint-staged": { - "*.{ts,vue}": [ - "eslint --ext .ts,.vue .", - "npx prettier --write --end-of-line lf ." - ] - }, - "config": { - "commitizen": { - "path": "node_modules/cz-customizable" - } - }, - "dependencies": { - "@babel/runtime": "^7.23.5", - "@nutui/icons-vue-taro": "^0.0.9", - "@nutui/nutui-taro": "^4.3.9", - "@qiun/vue-ucharts": "2.5.0-20230101", - "@tarojs/components": "3.6.32", - "@tarojs/helper": "3.6.32", - "@tarojs/plugin-framework-vue3": "3.6.32", - "@tarojs/plugin-html": "3.6.32", - "@tarojs/plugin-platform-alipay": "3.6.32", - "@tarojs/plugin-platform-h5": "3.6.32", - "@tarojs/plugin-platform-jd": "3.6.32", - "@tarojs/plugin-platform-qq": "3.6.32", - "@tarojs/plugin-platform-swan": "3.6.32", - "@tarojs/plugin-platform-tt": "3.6.32", - "@tarojs/plugin-platform-weapp": "3.6.32", - "@tarojs/runtime": "3.6.32", - "@tarojs/shared": "3.6.32", - "@tarojs/taro": "3.6.32", - "dayjs": "^1.11.10", - "pinia": "^2.1.7", - "vue": "^3.3.9" - }, - "devDependencies": { - "@babel/core": "^7.23.5", - "@commitlint/cli": "^18.4.3", - "@commitlint/config-conventional": "^18.4.3", - "@tarojs/cli": "3.6.32", - "@tarojs/plugin-mini-ci": "3.6.31", - "@tarojs/taro-loader": "3.6.32", - "@tarojs/webpack5-runner": "3.6.32", - "@types/node": "^18.19.1", - "@types/webpack-env": "^1.18.4", - "@typescript-eslint/eslint-plugin": "^6.13.1", - "@typescript-eslint/parser": "^6.13.1", - "@unocss/webpack": "^0.60.0", - "@vue/babel-plugin-jsx": "^1.1.5", - "@vue/compiler-sfc": "^3.3.9", - "autoprefixer": "^10.4.19", - "babel-preset-taro": "3.6.32", - "commitizen": "^4.3.0", - "css-loader": "3.4.2", - "cz-customizable": "^7.0.0", - "eslint": "^8.55.0", - "eslint-config-taro": "3.6.32", - "eslint-plugin-vue": "^9.19.2", - "husky": "^8.0.3", - "lint-staged": "^15.1.0", - "postcss": "8.4.29", - "postcss-rem-to-responsive-pixel": "^6.0.1", - "style-loader": "1.3.0", - "stylelint": "9.3.0", - "tailwindcss": "^3.4.3", - "ts-node": "^10.9.1", - "typescript": "^4.9.5", - "unplugin-vue-components": "^0.23.0", - "vue-loader": "^17.3.1", - "weapp-tailwindcss": "^3.2.0", - "webpack": "^5.89.0" - }, - "packageManager": "pnpm@9.1.4+sha512.9df9cf27c91715646c7d675d1c9c8e41f6fce88246f1318c1aa6a1ed1aeb3c4f032fcdf4ba63cc69c4fe6d634279176b5358727d8f2cc1e65b65f43ce2f8bfb0" + "name": "jdt-user", + "version": "4.0.3", + "private": true, + "description": "", + "templateInfo": { + "name": "jdt-user", + "typescript": true, + "css": "sass" + }, + "taroConfig": { + "version": "4.0.3" + }, + "scripts": { + "build:weapp": "taro build --type weapp", + "build:test": "taro build --type weapp --mode test", + "build:swan": "taro build --type swan", + "build:alipay": "taro build --type alipay", + "build:tt": "taro build --type tt", + "build:h5": "taro build --type h5", + "build:rn": "taro build --type rn", + "build:qq": "taro build --type qq", + "build:jd": "taro build --type jd", + "build:quickapp": "taro build --type quickapp", + "dev:weapp": "taro build --type weapp --watch", + "dev:swan": "npm run build:swan -- --watch", + "dev:alipay": "npm run build:alipay -- --watch", + "dev:tt": "npm run build:tt -- --watch", + "dev:h5": "npm run build:h5 -- --watch", + "dev:rn": "npm run build:rn -- --watch", + "dev:qq": "npm run build:qq -- --watch", + "dev:jd": "npm run build:jd -- --watch", + "dev:quickapp": "npm run build:quickapp -- --watch", + "lint": "eslint --ext .ts,.vue .", + "lint:fix": "eslint --fix --ext .ts,.vue .", + "lint:staged": "lint-staged", + "prepare": "husky install", + "preview": "vite preview", + "cz": "cz", + "lf": "npx prettier --write --end-of-line lf .", + "postinstall": "weapp-tw patch", + "build:weapp:prod:upload": "taro build --type weapp --upload --robot=1 --desc='正式环境'", + "build:weapp:test:upload": "taro build --type weapp --upload --robot=2 --desc='测试环境' --mode test" + }, + "browserslist": [ + "last 3 versions", + "Android >= 4.1", + "ios >= 8" + ], + "author": "", + "lint-staged": { + "*.{ts,vue}": [ + "eslint --ext .ts,.vue .", + "npx prettier --write --end-of-line lf ." + ] + }, + "config": { + "commitizen": { + "path": "node_modules/cz-customizable" + } + }, + "dependencies": { + "@babel/runtime": "^7.23.5", + "@nutui/icons-vue-taro": "^0.0.9", + "@nutui/nutui-taro": "^4.3.9", + "@qiun/vue-ucharts": "2.5.0-20230101", + "@tarojs/components": "3.6.34", + "@tarojs/helper": "3.6.34", + "@tarojs/plugin-framework-vue3": "3.6.34", + "@tarojs/plugin-html": "3.6.34", + "@tarojs/plugin-platform-alipay": "3.6.34", + "@tarojs/plugin-platform-h5": "3.6.34", + "@tarojs/plugin-platform-jd": "3.6.34", + "@tarojs/plugin-platform-qq": "3.6.34", + "@tarojs/plugin-platform-swan": "3.6.34", + "@tarojs/plugin-platform-tt": "3.6.34", + "@tarojs/plugin-platform-weapp": "3.6.34", + "@tarojs/runtime": "3.6.34", + "@tarojs/shared": "3.6.34", + "@tarojs/taro": "3.6.34", + "dayjs": "^1.11.10", + "pinia": "^2.1.7", + "vue": "^3.3.9" + }, + "devDependencies": { + "@babel/core": "^7.23.5", + "@commitlint/cli": "^18.4.3", + "@commitlint/config-conventional": "^18.4.3", + "@tarojs/cli": "3.6.34", + "@tarojs/plugin-mini-ci": "3.6.34", + "@tarojs/taro-loader": "3.6.34", + "@tarojs/webpack5-runner": "3.6.34", + "@types/node": "^18.19.1", + "@types/webpack-env": "^1.18.4", + "@typescript-eslint/eslint-plugin": "^6.13.1", + "@typescript-eslint/parser": "^6.13.1", + "@unocss/webpack": "^0.60.0", + "@vue/babel-plugin-jsx": "^1.1.5", + "@vue/compiler-sfc": "^3.3.9", + "autoprefixer": "^10.4.19", + "babel-preset-taro": "3.6.34", + "commitizen": "^4.3.0", + "css-loader": "3.4.2", + "cz-customizable": "^7.0.0", + "eslint": "^8.55.0", + "eslint-config-taro": "3.6.34", + "eslint-plugin-vue": "^9.19.2", + "husky": "^8.0.3", + "lint-staged": "^15.1.0", + "postcss": "8.4.29", + "postcss-rem-to-responsive-pixel": "^6.0.1", + "style-loader": "1.3.0", + "stylelint": "9.3.0", + "tailwindcss": "^3.4.3", + "ts-node": "^10.9.1", + "typescript": "^4.9.5", + "unplugin-vue-components": "^0.23.0", + "vue-loader": "^17.3.1", + "weapp-tailwindcss": "^3.2.0", + "webpack": "^5.89.0" + }, + "packageManager": "pnpm@9.1.4+sha512.9df9cf27c91715646c7d675d1c9c8e41f6fce88246f1318c1aa6a1ed1aeb3c4f032fcdf4ba63cc69c4fe6d634279176b5358727d8f2cc1e65b65f43ce2f8bfb0" } diff --git a/src/api/code.ts b/src/api/code.ts new file mode 100644 index 0000000..bfc9b2a --- /dev/null +++ b/src/api/code.ts @@ -0,0 +1,9 @@ +import request from "../utils/request"; + +// 获取二维码信息 +export const getQrCode = (data: object) => + request("/qrcode/get", data, "POST"); + +// 绑定二维码 +export const bindQrCode = (data: object) => + request("/qrcode/bind", data, "POST"); \ No newline at end of file diff --git a/src/api/goods.ts b/src/api/goods.ts index 8d1d37b..9d5c5ad 100644 --- a/src/api/goods.ts +++ b/src/api/goods.ts @@ -86,3 +86,10 @@ export const getActiveOrderDetail = (data: object) => // 校验交易密码 export const checkTradePwd = (data: object) => request('/user/check/payPassword', data, 'POST'); + +// 获取活动商品或者活动积分商品 +export const getHdOrJfGoods = (data: object) => + request('/activity/goods', data, 'POST'); + +// 获取支付列表 +export const getPayList = (data: object) => request('/payType', data, 'POST'); diff --git a/src/app.config.ts b/src/app.config.ts index 1610233..67a7e87 100644 --- a/src/app.config.ts +++ b/src/app.config.ts @@ -73,7 +73,7 @@ export default defineAppConfig({ }, { root: 'pages/marketing', - pages: ['sign/index'], + pages: ['sign/index', 'yq/index', 'scratch/index'], }, { root: 'pages/search', diff --git a/src/pages/admin/order_manage/detail/index.vue b/src/pages/admin/order_manage/detail/index.vue index 4a5c05d..fe0fc45 100644 --- a/src/pages/admin/order_manage/detail/index.vue +++ b/src/pages/admin/order_manage/detail/index.vue @@ -51,7 +51,10 @@ - + { const tabChange = (e: number) => { tabVal.value = e; + dataList.value = []; getData(); }; @@ -160,7 +161,7 @@ const toDetailPage = (item: any) => { }; Taro.useReachBottom(() => { - if (pageOpt.value.total === dataList.value.length) + if (pageOpt.value.total >= dataList.value.length) return Taro.showToast({ title: '没有更多数据了', icon: 'none', diff --git a/src/pages/fastBuy/index.vue b/src/pages/fastBuy/index.vue index 0b7b5af..4c5a33d 100644 --- a/src/pages/fastBuy/index.vue +++ b/src/pages/fastBuy/index.vue @@ -1,15 +1,57 @@ diff --git a/src/pages/marketing/yq/index.config.ts b/src/pages/marketing/yq/index.config.ts new file mode 100644 index 0000000..b52af90 --- /dev/null +++ b/src/pages/marketing/yq/index.config.ts @@ -0,0 +1,4 @@ +export default definePageConfig({ + navigationBarTitleText: '', + navigationStyle: 'custom', +}); diff --git a/src/pages/marketing/yq/index.scss b/src/pages/marketing/yq/index.scss new file mode 100644 index 0000000..67b1d4e --- /dev/null +++ b/src/pages/marketing/yq/index.scss @@ -0,0 +1,32 @@ +page { + background-image: url('https://pic.imgdb.cn/item/6697ab53d9c307b7e95e032c.png'); + background-size: 100% 100%; + background-repeat: no-repeat; +} + +.tag { + width: 140px; + height: 40px; + border-radius: 8px; + background-image: linear-gradient( + 90deg, + rgb(254, 43, 34) 0%, + rgb(255, 193, 0) 100% + ); + color: #fff; + font-size: 24px; + text-align: center; + line-height: 40px; +} + +.stock { + width: 140px; + height: 40px; + border-radius: 8px; + border: 0.5px solid rgba(254, 46, 33, 1); + color: rgba(254, 46, 33, 1); + font-size: 24px; + text-align: center; + line-height: 40px; + margin-left: 30px; +} diff --git a/src/pages/marketing/yq/index.vue b/src/pages/marketing/yq/index.vue new file mode 100644 index 0000000..472f74f --- /dev/null +++ b/src/pages/marketing/yq/index.vue @@ -0,0 +1,127 @@ + + + + + diff --git a/src/pages/users/account/index.vue b/src/pages/users/account/index.vue index f15488e..8fcc061 100644 --- a/src/pages/users/account/index.vue +++ b/src/pages/users/account/index.vue @@ -173,7 +173,7 @@ const closePicker = () => { 订单号: {{ item.oid }} {{ - dayjs(item.add_time).format('YYYY/MM/DD mm:ss') + dayjs(item.add_time).format('YYYY/MM/DD HH:mm:ss') }} @@ -192,7 +192,9 @@ const closePicker = () => { 订单：{{ item.oid }} 时间：{{ item.add_time.slice(0, 10) }}时间：{{ + dayjs(item.add_time).format('YYYY/MM/DD HH:mm:ss') + }} @@ -213,7 +215,9 @@ const closePicker = () => { 订单：{{ item.oid }} 时间：{{ item.add_time.slice(0, 10) }}时间：{{ + dayjs(item.add_time).format('YYYY/MM/DD HH:mm:ss') + }} @@ -230,7 +234,9 @@ const closePicker = () => { 类型：{{ computerType(item.type) }} 时间：{{ item.add_time.slice(0, 10) }}时间：{{ + dayjs(item.add_time).format('YYYY/MM/DD HH:mm:ss') + }} @@ -291,7 +297,5 @@ const closePicker = () => { align-items: center; font-size: 25px; margin-bottom: 25px; - - } diff --git a/src/pages/users/login/index.vue b/src/pages/users/login/index.vue index 50e90f8..6341336 100644 --- a/src/pages/users/login/index.vue +++ b/src/pages/users/login/index.vue @@ -1,9 +1,9 @@