~yefuxiong/qxgIosUniapp.git

yfx

2026-03-13 07d0d98b4e0e3a33a64252d29e86ba55500a887d

refs	dev
author	yfx <1249361928@.com>
	Friday, March 13, 2026 13:48 +0800
committer	yfx <1249361928@.com>
	Friday, March 13, 2026 13:48 +0800
commit	07d0d98b4e0e3a33a64252d29e86ba55500a887d
tree	386a8f3a6064c65fe1e7e7ecf2b2c2529d70a95c tree \| zip \| gz
parent	937c1a0bd3ae3829f59fd5c9e118c4be8029458f view \| diff f71a13b320e6323c959ae76404a4977a73abb15b view \| diff

Merge branch 'master' into dev

# Conflicts:
#	pages/agree/agree.vue

2 files modified

43 files added

	App.vue	115 ●●●●● diff \| view \| raw \| blame \| history
	androidPrivacy.json	38 ●●●●● diff \| view \| raw \| blame \| history
	index.html	20 ●●●●● diff \| view \| raw \| blame \| history
	main.js	82 ●●●●● diff \| view \| raw \| blame \| history
	manifest.json	185 ●●●●● diff \| view \| raw \| blame \| history
	package-lock.json	24 ●●●●● diff \| view \| raw \| blame \| history
	package.json	5 ●●●●● diff \| view \| raw \| blame \| history
	pages.json	281 ●●●●● diff \| view \| raw \| blame \| history
	pages/addAddr/addAddr.vue	157 ●●●●● diff \| view \| raw \| blame \| history
	pages/addBank/addBank.vue	415 ●●●●● diff \| view \| raw \| blame \| history
	pages/address/address.vue	123 ●●●●● diff \| view \| raw \| blame \| history
	pages/agree/agree.vue	15 ●●●●● diff \| view \| raw \| blame \| history
	pages/bank/bank.vue	121 ●●●●● diff \| view \| raw \| blame \| history
	pages/carts/carts.vue	249 ●●●●● diff \| view \| raw \| blame \| history
	pages/cates/cates.vue	131 ●●●●● diff \| view \| raw \| blame \| history
	pages/catesList/catesList.vue	56 ●●●●● diff \| view \| raw \| blame \| history
	pages/collect/collect.vue	121 ●●●●● diff \| view \| raw \| blame \| history
	pages/customer/customer.vue	146 ●●●●● diff \| view \| raw \| blame \| history
	pages/edu/edu.vue	94 ●●●●● diff \| view \| raw \| blame \| history
	pages/entrust/entrust.vue	367 ●●●●● diff \| view \| raw \| blame \| history
	pages/esign/esign.vue	25 ●●●●● diff \| view \| raw \| blame \| history
	pages/face/face.vue	175 ●●●●● diff \| view \| raw \| blame \| history
	pages/findpass/findpass.vue	159 ●●●●● diff \| view \| raw \| blame \| history
	pages/ginfo/ginfo.vue	203 ●●●●● diff \| view \| raw \| blame \| history
	pages/idcard/idcard.vue	331 ●●●●● diff \| view \| raw \| blame \| history
	pages/index/index.vue	304 ●●●●● diff \| view \| raw \| blame \| history
	pages/job/job.vue	259 ●●●●● diff \| view \| raw \| blame \| history
	pages/login/login.vue	218 ●●●●● diff \| view \| raw \| blame \| history
	pages/logs/logs.vue	47 ●●●●● diff \| view \| raw \| blame \| history
	pages/my/my.vue	297 ●●●●● diff \| view \| raw \| blame \| history
	pages/order/order.vue	388 ●●●●● diff \| view \| raw \| blame \| history
	pages/orderinfo/orderinfo.vue	388 ●●●●● diff \| view \| raw \| blame \| history
	pages/pays/pays.vue	410 ●●●●● diff \| view \| raw \| blame \| history
	pages/profile/profile.vue	223 ●●●●● diff \| view \| raw \| blame \| history
	pages/quanyi/components/addAddress/index.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	pages/quanyi/index.vue	8 ●●●●● diff \| view \| raw \| blame \| history
	pages/regist/regist.vue	170 ●●●●● diff \| view \| raw \| blame \| history
	pages/search/search.vue	79 ●●●●● diff \| view \| raw \| blame \| history
	pages/wallet/wallet.vue	71 ●●●●● diff \| view \| raw \| blame \| history
	pages/web/index.vue	35 ●●●●● diff \| view \| raw \| blame \| history
	static/imgs/ba.png	diff \| view \| raw \| blame \| history
	static/js/vconsole.min.js	10 ●●●●● diff \| view \| raw \| blame \| history
	uni.promisify.adaptor.js	13 ●●●●● diff \| view \| raw \| blame \| history
	uni.scss	76 ●●●●● diff \| view \| raw \| blame \| history
	util.js	356 ●●●●● diff \| view \| raw \| blame \| history