XinLingKeJi/jdt-user
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Huakk
2024-06-29 11:25:13 +08:00
parent 45ad285ae9 1566eae251
commit 8bc22dcc97
10 changed files with 94 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
package.json
View File

@@ -1,6 +1,6 @@
{
"name": "jdt-user",
"version": "4.0.1",
"version": "4.0.2",
"private": true,
"description": "",
"templateInfo": {
@@ -9,7 +9,7 @@
"css": "sass"
},
"taroConfig": {
"version": "4.0.1"
"version": "4.0.2"
},
"scripts": {
"build:weapp": "taro build --type weapp",
@@ -62,22 +62,22 @@
"dependencies": {
"@babel/runtime": "^7.23.5",
"@nutui/icons-vue-taro": "^0.0.9",
"@nutui/nutui-taro": "^4.3.6",
"@nutui/nutui-taro": "^4.3.9",
"@qiun/vue-ucharts": "2.5.0-20230101",
"@tarojs/components": "3.6.29",
"@tarojs/helper": "3.6.29",
"@tarojs/plugin-framework-vue3": "3.6.29",
"@tarojs/plugin-html": "3.6.29",
"@tarojs/plugin-platform-alipay": "3.6.29",
"@tarojs/plugin-platform-h5": "3.6.29",
"@tarojs/plugin-platform-jd": "3.6.29",
"@tarojs/plugin-platform-qq": "3.6.29",
"@tarojs/plugin-platform-swan": "3.6.29",
"@tarojs/plugin-platform-tt": "3.6.29",
"@tarojs/plugin-platform-weapp": "3.6.29",
"@tarojs/runtime": "3.6.29",
"@tarojs/shared": "3.6.29",
"@tarojs/taro": "3.6.29",
"@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"
@@ -86,10 +86,10 @@
"@babel/core": "^7.23.5",
"@commitlint/cli": "^18.4.3",
"@commitlint/config-conventional": "^18.4.3",
"@tarojs/cli": "3.6.29",
"@tarojs/plugin-mini-ci": "3.6.29",
"@tarojs/taro-loader": "3.6.29",
"@tarojs/webpack5-runner": "3.6.29",
"@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",
@@ -98,12 +98,12 @@
"@vue/babel-plugin-jsx": "^1.1.5",
"@vue/compiler-sfc": "^3.3.9",
"autoprefixer": "^10.4.19",
"babel-preset-taro": "3.6.29",
"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.29",
"eslint-config-taro": "3.6.32",
"eslint-plugin-vue": "^9.19.2",
"husky": "^8.0.3",
"lint-staged": "^15.1.0",

1
src/app.config.ts
View File

@@ -8,6 +8,7 @@ export default defineAppConfig({
'pages/game/gamedetail/index',
'pages/game/gameview/index',
'pages/game/view/index',
'pages/fastBuy/index',
],
subPackages: [
{

5
src/components/Cart.vue
View File

@@ -168,6 +168,11 @@ const create_order = async () => {
icon: 'none',
});
} catch (e) {
if (e.msg === '请先设置交易密码') {
Taro.navigateTo({
url: '/pages/users/pwd/index',
});
}
Taro.showToast({
title: e.msg,
icon: 'none',

4
src/pages/fastBuy/index.config.ts Normal file
View File

@@ -0,0 +1,4 @@
export default definePageConfig({
navigationBarTitleText: '',
navigationStyle: 'custom',
});

6
src/pages/fastBuy/index.scss Normal file
View File

@@ -0,0 +1,6 @@
page {
background-image: url('https://p1.meituan.net/csc/75a139bcec06745d385ec211aa313a98196174.png');
background-size: 100% 40%;
background-repeat: no-repeat;
background-color: #F9F8F6;
}

40
src/pages/fastBuy/index.vue Normal file
View File

@@ -0,0 +1,40 @@
<template>
<view class="flex flex-col items-center pt-[208px]">
<image class="h-[152px]" :src="par.header" />
<view class="list mt-[30px]">
<view class="bg-white w-[700px] h-[300px] rounded-[20px]"></view>
</view>
</view>
</template>
<script setup lang="ts">
import {ref} from 'vue';
import Taro from '@tarojs/taro';
const par = ref<any>({});
Taro.useLoad(e => {
switch (e.type) {
case '1':
par.value = {
header:
'https://p0.meituan.net/csc/6229068017d3b199aafd9eed47bfd50513859.png',
};
break;
case '2':
par.value = {
header:
'https://p0.meituan.net/csc/ccfb8d3119200f81e2d6a5241081eb4b13797.png',
};
break;
}
par.value = {
...par.value,
type: e.type,
};
});
</script>
<style lang="scss">
@import './index.scss';
</style>

10
src/pages/index/index.vue
View File

@@ -16,13 +16,19 @@
<view class="title"></view>
<navigator class="jf-btn" hover-class="none"></navigator>
<view class="footer">
<navigator hover-class="none" class="btn-1"></navigator>
<navigator
hover-class="none"
class="btn-1"
url="/pages/fastBuy/index?type=1"></navigator>
<navigator
hover-class="none"
openType="switchTab"
url="/pages/game/gamehome/index"
class="btn-2"></navigator>
<navigator hover-class="none" class="btn-3"></navigator>
<navigator
hover-class="none"
class="btn-3"
url="/pages/fastBuy/index?type=2"></navigator>
</view>
</view>
<view class="navigation">

5
src/pages/user/index.vue
View File

@@ -307,6 +307,11 @@ const userMenuList = ref([
url: '/pages/users/setting/index',
icon: 'http://p0.meituan.net/csc/1d8e6b328d384ff042c282976b82feec6005.png',
},
{
label: '关于我们',
url: '',
icon: 'http://p0.meituan.net/csc/3e772eca05bd56104e8a0a5c6cffe56c7447.png',
},
]);
const clickLogin = () => {

2
src/pages/users/order_list/index.vue
View File

@@ -121,7 +121,7 @@ const openPay = async (item: OrderList) => {
// oid: item.oid,
// };
Taro.navigateTo({
url: `/pages/goods/pay/index?oid=${item.joint_oid}&bid=${item.bid}`,
url: `/pages/goods/pay/index?oid=${item.joint_oid}&bid=${item.bid}&OrderType=1`,
});
};

2
src/utils/request.ts
View File

@@ -47,4 +47,4 @@ const request = (
});
};
export default request;
export default request;