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

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

Browse Source
This commit is contained in:
Huakk
2024-05-04 17:13:29 +08:00
parent 4ed38eeca7 434ce9e4b5
commit cee33dddd1
5 changed files with 321 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
package.json
View File

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

576
pnpm-lock.yaml generated
View File

File diff suppressed because it is too large Load Diff

2
src/pages/admin/add_order/pending_order/pay/index.vue
View File

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

7
src/pages/admin/add_order/pending_order/wx_pay_code/index.scss
View File

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

7
src/pages/admin/add_order/pending_order/wx_pay_code/index.vue
View File

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