build(deps): taro升级至4.0.9
Some checks reported errors
continuous-integration/drone/push Build was killed

This commit is contained in:
2025-02-12 11:15:51 +08:00
parent 7096e38967
commit 05caf08c47
21 changed files with 148 additions and 145 deletions

92
components.d.ts vendored
View File

@@ -7,51 +7,51 @@ export {};
declare module '@vue/runtime-core' { declare module '@vue/runtime-core' {
export interface GlobalComponents { export interface GlobalComponents {
Auth: typeof import('./src/components/Auth.vue')['default']; Auth: (typeof import('./src/components/Auth.vue'))['default'];
Back: typeof import('./src/components/Back.vue')['default']; Back: (typeof import('./src/components/Back.vue'))['default'];
Cart: typeof import('./src/components/Cart.vue')['default']; Cart: (typeof import('./src/components/Cart.vue'))['default'];
MerList: typeof import('./src/components/MerList.vue')['default']; MerList: (typeof import('./src/components/MerList.vue'))['default'];
NutAvatar: typeof import('@nutui/nutui-taro')['Avatar']; NutAvatar: (typeof import('@nutui/nutui-taro'))['Avatar'];
NutBacktop: typeof import('@nutui/nutui-taro')['Backtop']; NutBacktop: (typeof import('@nutui/nutui-taro'))['Backtop'];
NutButton: typeof import('@nutui/nutui-taro')['Button']; NutButton: (typeof import('@nutui/nutui-taro'))['Button'];
NutCalendar: typeof import('@nutui/nutui-taro')['Calendar']; NutCalendar: (typeof import('@nutui/nutui-taro'))['Calendar'];
NutCell: typeof import('@nutui/nutui-taro')['Cell']; NutCell: (typeof import('@nutui/nutui-taro'))['Cell'];
NutCellGroup: typeof import('@nutui/nutui-taro')['CellGroup']; NutCellGroup: (typeof import('@nutui/nutui-taro'))['CellGroup'];
NutCheckbox: typeof import('@nutui/nutui-taro')['Checkbox']; NutCheckbox: (typeof import('@nutui/nutui-taro'))['Checkbox'];
NutCheckboxGroup: typeof import('@nutui/nutui-taro')['CheckboxGroup']; NutCheckboxGroup: (typeof import('@nutui/nutui-taro'))['CheckboxGroup'];
NutDialog: typeof import('@nutui/nutui-taro')['Dialog']; NutDialog: (typeof import('@nutui/nutui-taro'))['Dialog'];
NutEllipsis: typeof import('@nutui/nutui-taro')['Ellipsis']; NutEllipsis: (typeof import('@nutui/nutui-taro'))['Ellipsis'];
NutEmpty: typeof import('@nutui/nutui-taro')['Empty']; NutEmpty: (typeof import('@nutui/nutui-taro'))['Empty'];
NutForm: typeof import('@nutui/nutui-taro')['Form']; NutForm: (typeof import('@nutui/nutui-taro'))['Form'];
NutFormItem: typeof import('@nutui/nutui-taro')['FormItem']; NutFormItem: (typeof import('@nutui/nutui-taro'))['FormItem'];
NutGrid: typeof import('@nutui/nutui-taro')['Grid']; NutGrid: (typeof import('@nutui/nutui-taro'))['Grid'];
NutGridItem: typeof import('@nutui/nutui-taro')['GridItem']; NutGridItem: (typeof import('@nutui/nutui-taro'))['GridItem'];
NutImagePreview: typeof import('@nutui/nutui-taro')['ImagePreview']; NutImagePreview: (typeof import('@nutui/nutui-taro'))['ImagePreview'];
NutInput: typeof import('@nutui/nutui-taro')['Input']; NutInput: (typeof import('@nutui/nutui-taro'))['Input'];
NutInputNumber: typeof import('@nutui/nutui-taro')['InputNumber']; NutInputNumber: (typeof import('@nutui/nutui-taro'))['InputNumber'];
NutOverlay: typeof import('@nutui/nutui-taro')['Overlay']; NutOverlay: (typeof import('@nutui/nutui-taro'))['Overlay'];
NutPagination: typeof import('@nutui/nutui-taro')['Pagination']; NutPagination: (typeof import('@nutui/nutui-taro'))['Pagination'];
NutPicker: typeof import('@nutui/nutui-taro')['Picker']; NutPicker: (typeof import('@nutui/nutui-taro'))['Picker'];
NutPopover: typeof import('@nutui/nutui-taro')['Popover']; NutPopover: (typeof import('@nutui/nutui-taro'))['Popover'];
NutPopup: typeof import('@nutui/nutui-taro')['Popup']; NutPopup: (typeof import('@nutui/nutui-taro'))['Popup'];
NutPrice: typeof import('@nutui/nutui-taro')['Price']; NutPrice: (typeof import('@nutui/nutui-taro'))['Price'];
NutRadio: typeof import('@nutui/nutui-taro')['Radio']; NutRadio: (typeof import('@nutui/nutui-taro'))['Radio'];
NutRadioGroup: typeof import('@nutui/nutui-taro')['RadioGroup']; NutRadioGroup: (typeof import('@nutui/nutui-taro'))['RadioGroup'];
NutRate: typeof import('@nutui/nutui-taro')['Rate']; NutRate: (typeof import('@nutui/nutui-taro'))['Rate'];
NutSwiper: typeof import('@nutui/nutui-taro')['Swiper']; NutSwiper: (typeof import('@nutui/nutui-taro'))['Swiper'];
NutSwiperItem: typeof import('@nutui/nutui-taro')['SwiperItem']; NutSwiperItem: (typeof import('@nutui/nutui-taro'))['SwiperItem'];
NutSwitch: typeof import('@nutui/nutui-taro')['Switch']; NutSwitch: (typeof import('@nutui/nutui-taro'))['Switch'];
NutTable: typeof import('@nutui/nutui-taro')['Table']; NutTable: (typeof import('@nutui/nutui-taro'))['Table'];
NutTabPane: typeof import('@nutui/nutui-taro')['TabPane']; NutTabPane: (typeof import('@nutui/nutui-taro'))['TabPane'];
NutTabs: typeof import('@nutui/nutui-taro')['Tabs']; NutTabs: (typeof import('@nutui/nutui-taro'))['Tabs'];
NutTextarea: typeof import('@nutui/nutui-taro')['Textarea']; NutTextarea: (typeof import('@nutui/nutui-taro'))['Textarea'];
NutUploader: typeof import('@nutui/nutui-taro')['Uploader']; NutUploader: (typeof import('@nutui/nutui-taro'))['Uploader'];
Pay: typeof import('./src/components/Pay.vue')['default']; Pay: (typeof import('./src/components/Pay.vue'))['default'];
Popup: typeof import('./src/components/Popup.vue')['default']; Popup: (typeof import('./src/components/Popup.vue'))['default'];
RichEditor: typeof import('./src/components/RichEditor.vue')['default']; RichEditor: (typeof import('./src/components/RichEditor.vue'))['default'];
StoreList: typeof import('./src/components/StoreList.vue')['default']; StoreList: (typeof import('./src/components/StoreList.vue'))['default'];
Ucharts: typeof import('./src/components/Ucharts.vue')['default']; Ucharts: (typeof import('./src/components/Ucharts.vue'))['default'];
Upload: typeof import('./src/components/Upload.vue')['default']; Upload: (typeof import('./src/components/Upload.vue'))['default'];
UserModal: typeof import('./src/components/UserModal.vue')['default']; UserModal: (typeof import('./src/components/UserModal.vue'))['default'];
} }
} }

View File

@@ -1,6 +1,6 @@
{ {
"name": "jdt-user", "name": "jdt-user",
"version": "4.0.7", "version": "4.0.8",
"private": true, "private": true,
"description": "", "description": "",
"templateInfo": { "templateInfo": {
@@ -9,7 +9,7 @@
"css": "sass" "css": "sass"
}, },
"taroConfig": { "taroConfig": {
"version": "4.0.7" "version": "4.0.8"
}, },
"scripts": { "scripts": {
"build:weapp": "taro build --type weapp", "build:weapp": "taro build --type weapp",
@@ -23,6 +23,7 @@
"build:jd": "taro build --type jd", "build:jd": "taro build --type jd",
"build:quickapp": "taro build --type quickapp", "build:quickapp": "taro build --type quickapp",
"dev:weapp": "taro build --type weapp --watch", "dev:weapp": "taro build --type weapp --watch",
"dev:weapp:prview": "taro build --type weapp --watch --mode production",
"dev:swan": "npm run build:swan -- --watch", "dev:swan": "npm run build:swan -- --watch",
"dev:alipay": "npm run build:alipay -- --watch", "dev:alipay": "npm run build:alipay -- --watch",
"dev:tt": "npm run build:tt -- --watch", "dev:tt": "npm run build:tt -- --watch",
@@ -60,66 +61,66 @@
} }
}, },
"dependencies": { "dependencies": {
"@babel/runtime": "^7.23.5", "@babel/runtime": "^7.26.7",
"@nutui/icons-vue-taro": "^0.0.9", "@nutui/icons-vue-taro": "^0.0.9",
"@nutui/nutui-taro": "^4.3.13", "@nutui/nutui-taro": "^4.3.13",
"@qiun/vue-ucharts": "2.5.0-20230101", "@qiun/vue-ucharts": "2.5.0-20230101",
"@tarojs/components": "3.6.34", "@tarojs/components": "4.0.9",
"@tarojs/helper": "3.6.34", "@tarojs/helper": "4.0.9",
"@tarojs/plugin-framework-vue3": "3.6.34", "@tarojs/plugin-framework-vue3": "4.0.9",
"@tarojs/plugin-html": "3.6.34", "@tarojs/plugin-html": "4.0.9",
"@tarojs/plugin-platform-alipay": "3.6.34", "@tarojs/plugin-platform-alipay": "4.0.9",
"@tarojs/plugin-platform-h5": "3.6.34", "@tarojs/plugin-platform-h5": "4.0.9",
"@tarojs/plugin-platform-jd": "3.6.34", "@tarojs/plugin-platform-jd": "4.0.9",
"@tarojs/plugin-platform-qq": "3.6.34", "@tarojs/plugin-platform-qq": "4.0.9",
"@tarojs/plugin-platform-swan": "3.6.34", "@tarojs/plugin-platform-swan": "4.0.9",
"@tarojs/plugin-platform-tt": "3.6.34", "@tarojs/plugin-platform-tt": "4.0.9",
"@tarojs/plugin-platform-weapp": "3.6.34", "@tarojs/plugin-platform-weapp": "4.0.9",
"@tarojs/runtime": "3.6.34", "@tarojs/runtime": "4.0.9",
"@tarojs/shared": "3.6.34", "@tarojs/shared": "4.0.9",
"@tarojs/taro": "3.6.34", "@tarojs/taro": "4.0.9",
"dayjs": "^1.11.10", "dayjs": "^1.11.13",
"pinia": "^2.1.7", "pinia": "^2.3.1",
"uqrcodejs": "^4.0.7", "uqrcodejs": "^4.0.7",
"vue": "^3.3.9" "vue": "^3.5.13"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.23.5", "@babel/core": "^7.26.8",
"@commitlint/cli": "^18.4.3", "@commitlint/cli": "^18.6.1",
"@commitlint/config-conventional": "^18.4.3", "@commitlint/config-conventional": "^18.6.3",
"@tarojs/cli": "3.6.34", "@tarojs/cli": "4.0.9",
"@tarojs/plugin-mini-ci": "3.6.34", "@tarojs/plugin-mini-ci": "4.0.9",
"@tarojs/taro-loader": "3.6.34", "@tarojs/taro-loader": "4.0.9",
"@tarojs/webpack5-runner": "3.6.34", "@tarojs/webpack5-runner": "4.0.9",
"@types/node": "^18.19.1", "@types/node": "^18.19.75",
"@types/webpack-env": "^1.18.4", "@types/webpack-env": "^1.18.8",
"@typescript-eslint/eslint-plugin": "^6.13.1", "@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.13.1", "@typescript-eslint/parser": "^6.21.0",
"@unocss/webpack": "^0.60.0", "@unocss/webpack": "^0.60.4",
"@vue/babel-plugin-jsx": "^1.1.5", "@vue/babel-plugin-jsx": "^1.2.5",
"@vue/compiler-sfc": "^3.3.9", "@vue/compiler-sfc": "^3.5.13",
"autoprefixer": "^10.4.19", "autoprefixer": "^10.4.20",
"babel-preset-taro": "3.6.34", "babel-preset-taro": "4.0.9",
"commitizen": "^4.3.0", "commitizen": "^4.3.1",
"css-loader": "3.4.2", "css-loader": "3.4.2",
"cz-customizable": "^7.0.0", "cz-customizable": "^7.4.0",
"eslint": "^8.55.0", "eslint": "^8.57.1",
"eslint-config-taro": "3.6.34", "eslint-config-taro": "4.0.9",
"eslint-plugin-vue": "^9.19.2", "eslint-plugin-vue": "^9.32.0",
"husky": "^8.0.3", "husky": "^8.0.3",
"lint-staged": "^15.1.0", "lint-staged": "^15.4.3",
"miniprogram-ci": "^2.0.8", "miniprogram-ci": "^2.0.10",
"postcss": "8.4.29", "postcss": "8.4.29",
"postcss-rem-to-responsive-pixel": "^6.0.1", "postcss-rem-to-responsive-pixel": "^6.0.2",
"style-loader": "1.3.0", "style-loader": "1.3.0",
"stylelint": "9.3.0", "stylelint": "9.3.0",
"tailwindcss": "^3.4.3", "tailwindcss": "^3.4.17",
"ts-node": "^10.9.1", "ts-node": "^10.9.2",
"typescript": "^4.9.5", "typescript": "^4.9.5",
"unplugin-vue-components": "^0.23.0", "unplugin-vue-components": "^0.23.0",
"vue-loader": "^17.3.1", "vue-loader": "^17.4.2",
"weapp-tailwindcss": "^3.2.0", "weapp-tailwindcss": "^3.7.0",
"webpack": "^5.89.0" "webpack": "^5.97.1"
}, },
"packageManager": "pnpm@9.1.4+sha512.9df9cf27c91715646c7d675d1c9c8e41f6fce88246f1318c1aa6a1ed1aeb3c4f032fcdf4ba63cc69c4fe6d634279176b5358727d8f2cc1e65b65f43ce2f8bfb0" "packageManager": "pnpm@9.1.4+sha512.9df9cf27c91715646c7d675d1c9c8e41f6fce88246f1318c1aa6a1ed1aeb3c4f032fcdf4ba63cc69c4fe6d634279176b5358727d8f2cc1e65b65f43ce2f8bfb0"
} }

View File

@@ -1,4 +1,4 @@
<!DOCTYPE html> <!doctype html>
<html> <html>
<head> <head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" /> <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />

View File

@@ -15,7 +15,7 @@
<view v-if="listData.length > 0"> <view v-if="listData.length > 0">
<view <view
class="card" class="card"
v-for="(item, index) in (listData as any[])" v-for="(item, index) in listData as any[]"
:key="index"> :key="index">
<view class="header"> <view class="header">
<view> <view>

View File

@@ -48,10 +48,10 @@
info.status === 0 info.status === 0
? '待付款' ? '待付款'
: info.status === 1 : info.status === 1
? '待使用' ? '待使用'
: info.status === 2 : info.status === 2
? '已使用' ? '已使用'
: '已失效' : '已失效'
"> ">
</nut-cell> </nut-cell>
<nut-cell title="下单用户:" :desc="info.User?.nickName"></nut-cell> <nut-cell title="下单用户:" :desc="info.User?.nickName"></nut-cell>

View File

@@ -33,19 +33,19 @@
item.status === 0 item.status === 0
? '#FF850A' ? '#FF850A'
: item.status === 1 : item.status === 1
? '#F83D3D' ? '#F83D3D'
: item.status === 2 : item.status === 2
? '#333333' ? '#333333'
: '#9C9C9C', : '#9C9C9C',
}" }"
>{{ >{{
item.status === 0 item.status === 0
? '待付款' ? '待付款'
: item.status === 1 : item.status === 1
? '待使用' ? '待使用'
: item.status === 2 : item.status === 2
? '已使用' ? '已使用'
: '已失效' : '已失效'
}} }}
</view> </view>
</view> </view>

View File

@@ -195,15 +195,15 @@ Taro.useReachBottom(() => {
item.status === 1 item.status === 1
? 'success' ? 'success'
: item.status === 1 : item.status === 1
? 'danger' ? 'danger'
: 'warning' : 'warning'
" "
>{{ >{{
item.status === 1 item.status === 1
? '已打款' ? '已打款'
: item.status === 2 : item.status === 2
? '已拒绝' ? '已拒绝'
: '待审核' : '待审核'
}}</view }}</view
> >
</view> </view>

View File

@@ -10,12 +10,12 @@
@change="tabChange"> @change="tabChange">
<nut-tab-pane <nut-tab-pane
v-for="item in list" v-for="item in list"
:title="(item.name as string)" :title="item.name as string"
:key="item.ID"> :key="item.ID">
<view v-if="goodList.length > 0"> <view v-if="goodList.length > 0">
<view <view
class="list" class="list"
v-for="(item, index) in (goodList as any)" v-for="(item, index) in goodList as any"
:key="index"> :key="index">
<view class="item"> <view class="item">
<img :src="item.cover" /> <img :src="item.cover" />

View File

@@ -66,8 +66,8 @@
item.number > 0 item.number > 0
? `可用积分:${item.number}` ? `可用积分:${item.number}`
: item.name.includes('微信') : item.name.includes('微信')
? '微信全额支付' ? '微信全额支付'
: '' : ''
" "
@click="cellClick(item.ID)"> @click="cellClick(item.ID)">
<template #icon> <template #icon>

View File

@@ -201,10 +201,10 @@ const delOrder = async (oid: string) => {
item.status === 0 item.status === 0
? '待付款' ? '待付款'
: item.status === 1 : item.status === 1
? '待使用' ? '待使用'
: item.status === 2 : item.status === 2
? '已使用' ? '已使用'
: '已失效' : '已失效'
}} }}
</view> </view>
</view> </view>

View File

@@ -44,10 +44,10 @@
<view class="goodBox"> <view class="goodBox">
<view <view
class="good" class="good"
v-for="item in (merdata as any)" v-for="item in merdata as any"
:key="item.ID" :key="item.ID"
@click.stop="toMerDetails(item)"> @click.stop="toMerDetails(item)">
<image :src="(item.head_photo as string)" /> <image :src="item.head_photo as string" />
<view class="good-text-box"> <view class="good-text-box">
<text class="good-text">{{ item.name }}</text> <text class="good-text">{{ item.name }}</text>
<text style="color: #999" <text style="color: #999"

View File

@@ -73,7 +73,7 @@ interface navigationType {
const navigationList = ref<Array<navigationType>>([]); const navigationList = ref<Array<navigationType>>([]);
const imgList = ref([ const imgList = ref([
require('../../static/popTip-1.png'), // require('../../static/popTip-1.png'),
require('../../static/popTip.png'), require('../../static/popTip.png'),
]); ]);

View File

@@ -1,6 +1,6 @@
.appUser { .appUser {
box-sizing: border-box; box-sizing: border-box;
background-color: #f8f8f8; // background-color: #f8f8f8;
height: 100%; height: 100%;
background-image: url('http://p0.meituan.net/csc/f44bb11463e3c538c307d7ce4b303bec33520.png'); background-image: url('http://p0.meituan.net/csc/f44bb11463e3c538c307d7ce4b303bec33520.png');
background-size: 100% 500px; background-size: 100% 500px;

View File

@@ -169,9 +169,9 @@
</view> </view>
<!-- 版权 --> <!-- 版权 -->
<view class="text-[#999999] mt-5 text-[20px] text-center"> <view class="mt-5 text-[20px] text-center">
<view>鑫瓴科技版权所有</view> <view class="text-[#999999]">鑫瓴科技版权所有</view>
<view>v4.0.0</view> <!-- <view>v4.0.0</view> -->
</view> </view>
<!-- 登录 --> <!-- 登录 -->
<Auth <Auth

View File

@@ -3,7 +3,7 @@
<view v-if="data.length > 0"> <view v-if="data.length > 0">
<view <view
class="card-list" class="card-list"
v-for="(item, index) in (data as any[])" v-for="(item, index) in data as any[]"
:key="index"> :key="index">
<view class="left"> <view class="left">
<view>昵称{{ item.nick_name }}</view> <view>昵称{{ item.nick_name }}</view>

View File

@@ -3,7 +3,7 @@
<view v-if="data.length > 0"> <view v-if="data.length > 0">
<view <view
class="card-list" class="card-list"
v-for="(item, index) in (data as any[])" v-for="(item, index) in data as any[]"
:key="index"> :key="index">
<view class="left"> <view class="left">
<image :src="item.avatarUrl" /> <image :src="item.avatarUrl" />

View File

@@ -266,19 +266,19 @@ const closed = () => {
item.status === 0 item.status === 0
? '#FF850A' ? '#FF850A'
: item.status === 1 : item.status === 1
? '#F83D3D' ? '#F83D3D'
: item.status === 2 : item.status === 2
? '#333333' ? '#333333'
: '#9C9C9C', : '#9C9C9C',
}" }"
>{{ >{{
item.status === 0 item.status === 0
? '待付款' ? '待付款'
: item.status === 1 : item.status === 1
? '待使用' ? '待使用'
: item.status === 2 : item.status === 2
? '已使用' ? '已使用'
: '已失效' : '已失效'
}} }}
</view> </view>
</view> </view>

View File

@@ -146,10 +146,10 @@
goodInfo.status === 0 goodInfo.status === 0
? '待付款' ? '待付款'
: goodInfo.status === 1 : goodInfo.status === 1
? '待使用' ? '待使用'
: goodInfo.status === 2 : goodInfo.status === 2
? '已使用' ? '已使用'
: '已失效' : '已失效'
"></nut-cell> "></nut-cell>
</nut-cell-group> </nut-cell-group>

View File

@@ -27,7 +27,7 @@
<view v-if="listData.length > 0"> <view v-if="listData.length > 0">
<view <view
class="card" class="card"
v-for="(item, index) in (listData as any[])" v-for="(item, index) in listData as any[]"
:key="index"> :key="index">
<view class="header"> <view class="header">
<view> <view>

View File

@@ -1,6 +1,7 @@
@font-face { @font-face {
font-family: 'iconfont'; /* Project id 4211210 */ font-family: 'iconfont'; /* Project id 4211210 */
src: url('https://at.alicdn.com/t/c/font_4211210_2x20brbrv94.woff2?t=1692081500100') src:
url('https://at.alicdn.com/t/c/font_4211210_2x20brbrv94.woff2?t=1692081500100')
format('woff2'), format('woff2'),
url('https://at.alicdn.com/t/c/font_4211210_2x20brbrv94.woff?t=1692081500100') url('https://at.alicdn.com/t/c/font_4211210_2x20brbrv94.woff?t=1692081500100')
format('woff'), format('woff'),

View File

@@ -1,6 +1,7 @@
@font-face { @font-face {
font-family: 'iconfont'; /* Project id 993865 */ font-family: 'iconfont'; /* Project id 993865 */
src: url('https://at.alicdn.com/t/c/font_993865_zmqjk4lvax.woff2?t=1681715156711') src:
url('https://at.alicdn.com/t/c/font_993865_zmqjk4lvax.woff2?t=1681715156711')
format('woff2'), format('woff2'),
url('https://at.alicdn.com/t/c/font_993865_zmqjk4lvax.woff?t=1681715156711') url('https://at.alicdn.com/t/c/font_993865_zmqjk4lvax.woff?t=1681715156711')
format('woff'), format('woff'),