Compare commits

...

23 Commits

Author SHA1 Message Date
434ce9e4b5 build(custom): 优化若干细节,升级项目依赖
All checks were successful
continuous-integration/drone/push Build is passing
2024-05-04 17:12:38 +08:00
e30a3ca698 Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
2024-04-29 16:34:00 +08:00
ab9aff44da Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
2024-04-12 17:48:25 +08:00
b85e360a17 Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
2024-04-11 16:17:37 +08:00
74ca20ca01 Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
2024-03-28 16:29:55 +08:00
d9735b60f0 Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
2024-03-15 17:12:37 +08:00
aed8e6f73f Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
2024-03-15 16:07:06 +08:00
74ca4123eb Merge branch 'test' 2024-01-30 16:11:12 +08:00
45648d78ba Merge branch 'test' 2024-01-13 16:55:20 +08:00
7e86c01913 Merge branch 'test' 2023-12-21 21:11:38 +08:00
52ad54f6a9 Merge branch 'test' 2023-12-20 23:46:46 +08:00
52c0bb70e7 Merge branch 'test' 2023-12-20 18:56:57 +08:00
eb696252f2 Merge branch 'test' 2023-12-20 00:10:25 +08:00
b8b7f1faa8 Merge branch 'test' 2023-12-19 22:58:13 +08:00
7fdad4ed26 Merge branch 'test' 2023-12-15 20:52:45 +08:00
d3caef5172 Merge branch 'test' 2023-12-13 12:58:05 +08:00
b94c4110ea Merge branch 'test' 2023-12-04 22:29:20 +08:00
659d2fd972 Merge branch 'test' 2023-12-04 21:32:03 +08:00
b8ab7699e1 Merge branch 'test' 2023-12-03 21:15:30 +08:00
62f1f3454c Merge branch 'test' 2023-12-03 21:10:48 +08:00
878cc05673 Merge branch 'test' 2023-11-29 23:08:48 +08:00
6c25beff1d Merge branch 'test' 2023-11-29 15:38:59 +08:00
b01f4ff3a9 Merge branch 'test' into 'master'
增加库存显示

See merge request xinling/jdt-user!2
2023-10-29 16:05:02 +08:00
5 changed files with 321 additions and 315 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "jdt-user",
"version": "3.0.17",
"version": "3.0.18",
"private": true,
"description": "",
"templateInfo": {
@@ -9,7 +9,7 @@
"css": "sass"
},
"taroConfig": {
"version": "3.0.17"
"version": "3.0.18"
},
"scripts": {
"build:weapp": "taro build --type weapp",
@@ -63,20 +63,20 @@
"@nutui/icons-vue-taro": "^0.0.9",
"@nutui/nutui-taro": "^4.3.6",
"@qiun/vue-ucharts": "2.5.0-20230101",
"@tarojs/components": "3.6.27",
"@tarojs/helper": "3.6.27",
"@tarojs/plugin-framework-vue3": "3.6.27",
"@tarojs/plugin-html": "3.6.27",
"@tarojs/plugin-platform-alipay": "3.6.27",
"@tarojs/plugin-platform-h5": "3.6.27",
"@tarojs/plugin-platform-jd": "3.6.27",
"@tarojs/plugin-platform-qq": "3.6.27",
"@tarojs/plugin-platform-swan": "3.6.27",
"@tarojs/plugin-platform-tt": "3.6.27",
"@tarojs/plugin-platform-weapp": "3.6.27",
"@tarojs/runtime": "3.6.27",
"@tarojs/shared": "3.6.27",
"@tarojs/taro": "3.6.27",
"@tarojs/components": "3.6.28",
"@tarojs/helper": "3.6.28",
"@tarojs/plugin-framework-vue3": "3.6.28",
"@tarojs/plugin-html": "3.6.28",
"@tarojs/plugin-platform-alipay": "3.6.28",
"@tarojs/plugin-platform-h5": "3.6.28",
"@tarojs/plugin-platform-jd": "3.6.28",
"@tarojs/plugin-platform-qq": "3.6.28",
"@tarojs/plugin-platform-swan": "3.6.28",
"@tarojs/plugin-platform-tt": "3.6.28",
"@tarojs/plugin-platform-weapp": "3.6.28",
"@tarojs/runtime": "3.6.28",
"@tarojs/shared": "3.6.28",
"@tarojs/taro": "3.6.28",
"dayjs": "^1.11.10",
"pinia": "^2.1.7",
"uqrcodejs": "^4.0.7",
@@ -86,22 +86,22 @@
"@babel/core": "^7.23.5",
"@commitlint/cli": "^18.4.3",
"@commitlint/config-conventional": "^18.4.3",
"@tarojs/cli": "3.6.27",
"@tarojs/plugin-mini-ci": "3.6.27",
"@tarojs/taro-loader": "3.6.27",
"@tarojs/webpack5-runner": "3.6.27",
"@tarojs/cli": "3.6.28",
"@tarojs/plugin-mini-ci": "3.6.28",
"@tarojs/taro-loader": "3.6.28",
"@tarojs/webpack5-runner": "3.6.28",
"@types/node": "^18.19.1",
"@types/webpack-env": "^1.18.4",
"@typescript-eslint/eslint-plugin": "^6.13.1",
"@typescript-eslint/parser": "^6.13.1",
"@vue/babel-plugin-jsx": "^1.1.5",
"@vue/compiler-sfc": "^3.3.9",
"babel-preset-taro": "3.6.27",
"babel-preset-taro": "3.6.28",
"commitizen": "^4.3.0",
"css-loader": "3.4.2",
"cz-customizable": "^7.0.0",
"eslint": "^8.55.0",
"eslint-config-taro": "3.6.27",
"eslint-config-taro": "3.6.28",
"eslint-plugin-vue": "^9.19.2",
"husky": "^8.0.3",
"lint-staged": "^15.1.0",

576
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@@ -2,7 +2,7 @@
<view class="container">
<view class="name">立即收款</view>
<view class="input">
<input v-model="val" placeholder="请输入收款金额" />
<input v-model="val" type="digit" placeholder="请输入收款金额" />
<view class="line"></view>
</view>

View File

@@ -26,13 +26,12 @@ page {
width: 608px;
height: 457px;
position: relative;
canvas {
.qrcode {
position: absolute;
width: 280px;
height: 280px;
top: 47%;
left: 69%;
transform: translate(-50%, -50%);
top: 14%;
right: 9%;
}
}
}

View File

@@ -7,7 +7,7 @@
<view class="box">
<!-- <image :src="`https://api.pwmqr.com/qrcode/create?url=${code}`"></image> -->
<!-- <view ref="qrcode" id="qrcode"></view> -->
<canvas canvas-id="qrcode" id="qrcode"></canvas>
<canvas class="qrcode" canvas-id="qrcode" id="qrcode"></canvas>
</view>
</view>
</template>
@@ -49,9 +49,10 @@ Taro.useLoad((e) => {
const getCode = () => {
var qr = new UQRCode();
qr.data = Taro.getStorageSync("pay_code");
qr.size = 150;
qr.size = 160;
qr.margin = 5;
qr.make();
var canvasContext = Taro.createCanvasContext("qrcode");
const canvasContext = Taro.createCanvasContext("qrcode");
qr.canvasContext = canvasContext;
qr.drawCanvas();
};