parent: c5c145 | patch | commitdiff
yfx
2026-03-16 4065a1ffca0287fa48bcd35916450b6859e870dc
refs
author yfx <1249361928@.com>
Monday, March 16, 2026 08:58 +0800
committer yfx <1249361928@.com>
Monday, March 16, 2026 08:58 +0800
commit4065a1ffca0287fa48bcd35916450b6859e870dc
tree 60d25dee412a593868f963b370b1afa297400936 tree | zip | gz
parent c5c1453e2dc26479c3f4d74fe17e016e85ca897b view | diff
a8131b3c002d72bfe54f5d16107d60b94ad17f5b view | diff 
Merge remote-tracking branch 'origin/master'

# Conflicts:
#	App.vue
#	androidPrivacy.json
#	main.js
#	manifest.json
#	pages/addAddr/addAddr.vue
#	pages/addBank/addBank.vue
#	pages/address/address.vue
#	pages/bank/bank.vue
#	pages/carts/carts.vue
#	pages/cates/cates.vue
#	pages/catesList/catesList.vue
#	pages/collect/collect.vue
#	pages/customer/customer.vue
#	pages/edu/edu.vue
#	pages/entrust/entrust.vue
#	pages/findpass/findpass.vue
#	pages/ginfo/ginfo.vue
#	pages/idcard/idcard.vue
#	pages/index/index.vue
#	pages/job/job.vue
#	pages/logs/logs.vue
#	pages/my/my.vue
#	pages/order/order.vue
#	pages/orderinfo/orderinfo.vue
#	pages/pays/pays.vue
#	pages/profile/profile.vue
#	pages/regist/regist.vue
#	pages/search/search.vue
#	pages/wallet/wallet.vue
32 files modified
13 files deleted
1434 ■■■■■ changed files
App.vue 20 ●●●●● diff | view | raw | blame | history
androidPrivacy.json 2 ●●●●● diff | view | raw | blame | history
components/picker/aliCredit.vue 33 ●●●●● diff | view | raw | blame | history
components/picker/areas.vue 68 ●●●●● diff | view | raw | blame | history
components/picker/companyNature.vue 40 ●●●●● diff | view | raw | blame | history
components/picker/companyTrade.vue 40 ●●●●● diff | view | raw | blame | history
components/picker/education.vue 41 ●●●●● diff | view | raw | blame | history
components/picker/index.vue 3 ●●●●● diff | view | raw | blame | history
components/picker/loanUsage.vue 33 ●●●●● diff | view | raw | blame | history
components/picker/maritalStatus.vue 36 ●●●●● diff | view | raw | blame | history
components/picker/monthlyIncome.vue 33 ●●●●● diff | view | raw | blame | history
components/picker/professionInfo.vue 33 ●●●●● diff | view | raw | blame | history
components/picker/provincesCity.vue 3 ●●●●● diff | view | raw | blame | history
components/picker/relation.vue 40 ●●●●● diff | view | raw | blame | history
components/picker/repayTerm.vue 33 ●●●●● diff | view | raw | blame | history
main.js 13 ●●●●● diff | view | raw | blame | history
manifest.json 20 ●●●●● diff | view | raw | blame | history
pages/addAddr/addAddr.vue 2 ●●●●● diff | view | raw | blame | history
pages/addBank/addBank.vue 2 ●●●●● diff | view | raw | blame | history
pages/address/address.vue 8 ●●●●● diff | view | raw | blame | history
pages/bank/bank.vue 8 ●●●●● diff | view | raw | blame | history
pages/carts/carts.vue 10 ●●●●● diff | view | raw | blame | history
pages/cates/cates.vue 10 ●●●●● diff | view | raw | blame | history
pages/catesList/catesList.vue 4 ●●●●● diff | view | raw | blame | history
pages/collect/collect.vue 6 ●●●●● diff | view | raw | blame | history
pages/customer/customer.vue 4 ●●●●● diff | view | raw | blame | history
pages/edu/edu.vue 18 ●●●●● diff | view | raw | blame | history
pages/entrust/entrust.vue 10 ●●●●● diff | view | raw | blame | history
pages/findpass/findpass.vue 2 ●●●●● diff | view | raw | blame | history
pages/ginfo/ginfo.vue 14 ●●●●● diff | view | raw | blame | history
pages/idcard/idcard.vue 16 ●●●●● diff | view | raw | blame | history
pages/index/index.vue 36 ●●●●● diff | view | raw | blame | history
pages/job/job.vue 2 ●●●●● diff | view | raw | blame | history
pages/logs/logs.vue 2 ●●●●● diff | view | raw | blame | history
pages/my/my.vue 87 ●●●●● diff | view | raw | blame | history
pages/order/order.vue 10 ●●●●● diff | view | raw | blame | history
pages/orderinfo/orderinfo.vue 8 ●●●●● diff | view | raw | blame | history
pages/pays/pays.vue 24 ●●●●● diff | view | raw | blame | history
pages/profile/profile.vue 2 ●●●●● diff | view | raw | blame | history
pages/quanyi/add.vue 4 ●●●●● diff | view | raw | blame | history
pages/quanyi/components/code/index.vue 323 ●●●●● diff | view | raw | blame | history
pages/quanyi/components/code/set.vue 323 ●●●●● diff | view | raw | blame | history
pages/regist/regist.vue 2 ●●●●● diff | view | raw | blame | history
pages/search/search.vue 4 ●●●●● diff | view | raw | blame | history
pages/wallet/wallet.vue 2 ●●●●● diff | view | raw | blame | history