~admin/aerospace-pc.git

Merge branch 'master' of http://124.156.157.155:8060/r/~admin/aerospace-pc

lxf

2025-06-13 066ec67b7080f07a0e47dda9864ee6be2e4b9053

refs
author	lxf <1371462558@qq.com>
	Friday, June 13, 2025 14:03 +0800
committer	lxf <1371462558@qq.com>
	Friday, June 13, 2025 14:03 +0800
commit	066ec67b7080f07a0e47dda9864ee6be2e4b9053
tree	dfcde9f81889e9de9c2d89d39d0ec52ab5c257ea tree \| zip \| gz
parent	fbbab29b06bb2acb066c1b90d3342fd478d63233 view \| diff b13d4a4289ca95318f10db5eba75310cae0db3d6 view \| diff

Merge branch 'master' of http://124.156.157.155:8060/r/~admin/aerospace-pc

88 files modified

41 files added

1 files deleted

	.env	2 ●●●●● diff \| view \| raw \| blame \| history
	index.html	4 ●●●●● diff \| view \| raw \| blame \| history
	package-lock.json	26 ●●●●● diff \| view \| raw \| blame \| history
	src/App.vue	5 ●●●●● diff \| view \| raw \| blame \| history
	src/api/currency.js	6 ●●●●● diff \| view \| raw \| blame \| history
	src/assets/1-e8dc2a35.jpg	diff \| view \| raw \| blame \| history
	src/assets/2-99bf9001.jpg	diff \| view \| raw \| blame \| history
	src/assets/3-1cadf24f.jpg	diff \| view \| raw \| blame \| history
	src/assets/css/common.css	12 ●●●●● diff \| view \| raw \| blame \| history
	src/assets/css/login/langMoney.css	2 ●●●●● diff \| view \| raw \| blame \| history
	src/assets/css/login/login.css	14 ●●●●● diff \| view \| raw \| blame \| history
	src/assets/css/login/register.css	20 ●●●●● diff \| view \| raw \| blame \| history
	src/assets/css/my/index-0c4c93e2.css	1 ●●●●● diff \| view \| raw \| blame \| history
	src/assets/css/my/index-554eeb30.css	1 ●●●●● diff \| view \| raw \| blame \| history
	src/assets/css/my/index-a4ccec66.css	1 ●●●●● diff \| view \| raw \| blame \| history
	src/assets/css/my/security.css	2 ●●●●● diff \| view \| raw \| blame \| history
	src/assets/css/order/index.scss	12 ●●●●● diff \| view \| raw \| blame \| history
	src/assets/forexImages/1.png	diff \| view \| raw \| blame \| history
	src/assets/forexImages/2.jpg	diff \| view \| raw \| blame \| history
	src/assets/forexImages/3.png	diff \| view \| raw \| blame \| history
	src/assets/forexImages/avatar-e57e8e09.png	diff \| view \| raw \| blame \| history
	src/assets/forexImages/banner2.png	diff \| view \| raw \| blame \| history
	src/assets/forexImages/bg-ebcf394f.png	diff \| view \| raw \| blame \| history
	src/assets/forexImages/bg.png	diff \| view \| raw \| blame \| history
	src/assets/forexImages/center-000cd06e.png	diff \| view \| raw \| blame \| history
	src/assets/forexImages/df-1da51671.png	diff \| view \| raw \| blame \| history
	src/assets/forexImages/logo-66dce226.png	diff \| view \| raw \| blame \| history
	src/assets/forexImages/newlogo.png	diff \| view \| raw \| blame \| history
	src/assets/forexImages/online-1-d61bee88.png	diff \| view \| raw \| blame \| history
	src/assets/forexImages/online-banner-c5baa5d5.png	diff \| view \| raw \| blame \| history
	src/assets/forexImages/prodec-b42f3823.svg	9 ●●●●● diff \| view \| raw \| blame \| history
	src/assets/forexImages/prodect2-55f0ac99.svg	9 ●●●●● diff \| view \| raw \| blame \| history
	src/assets/forexImages/prodect3-0fe127b8.svg	9 ●●●●● diff \| view \| raw \| blame \| history
	src/assets/forexImages/youshi1-999dca68.png	diff \| view \| raw \| blame \| history
	src/assets/forexImages/youshi2-7264896b.png	diff \| view \| raw \| blame \| history
	src/assets/forexImages/youshi3-d83183ea.png	diff \| view \| raw \| blame \| history
	src/assets/forexImages/youshi4-2f4f49a8.png	diff \| view \| raw \| blame \| history
	src/assets/images/logos-new.0789f28f.svg	12 ●●●●● diff \| view \| raw \| blame \| history
	src/assets/logo.jpeg	diff \| view \| raw \| blame \| history
	src/assets/logo.png	diff \| view \| raw \| blame \| history
	src/assets/market/bamarket.css	22 ●●●●● diff \| view \| raw \| blame \| history
	src/assets/market/coinDetail.css	2 ●●●●● diff \| view \| raw \| blame \| history
	src/assets/wallet/asset-4aac2d85.css	1 ●●●●● diff \| view \| raw \| blame \| history
	src/assets/wallet/exchange.css	6 ●●●●● diff \| view \| raw \| blame \| history
	src/assets/wallet/withdraw.css	2 ●●●●● diff \| view \| raw \| blame \| history
	src/assets/wealth/fundBuy.css	34 ●●●●● diff \| view \| raw \| blame \| history
	src/assets/wealth/fundManage.css	8 ●●●●● diff \| view \| raw \| blame \| history
	src/components/commonTrade/kline.vue	23 ●●●●● diff \| view \| raw \| blame \| history
	src/components/commonTrade/secondaryLine.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/components/constract/DeliveryContract/DetailDialog.vue	4 ●●●●● diff \| view \| raw \| blame \| history
	src/components/constract/DeliveryContract/DialogConfirm.vue	4 ●●●●● diff \| view \| raw \| blame \| history
	src/components/constract/DeliveryContract/createOrder.vue	16 ●●●●● diff \| view \| raw \| blame \| history
	src/components/constract/DeliveryContract/position.vue	8 ●●●●● diff \| view \| raw \| blame \| history
	src/components/constract/PerpetualContract/createOrder.vue	138 ●●●●● diff \| view \| raw \| blame \| history
	src/components/constract/PerpetualContract/orderCom/amountSlider.vue	45 ●●●●● diff \| view \| raw \| blame \| history
	src/components/constract/PerpetualContract/position.vue	8 ●●●●● diff \| view \| raw \| blame \| history
	src/components/constract/PerpetualContract/positionCom/currentPosition.vue	71 ●●●●● diff \| view \| raw \| blame \| history
	src/components/constract/components/coinSearchCollect.vue	4 ●●●●● diff \| view \| raw \| blame \| history
	src/components/constract/components/orderBookNew.vue	10 ●●●●● diff \| view \| raw \| blame \| history
	src/components/constract/index.vue	3090 ●●●●● diff \| view \| raw \| blame \| history
	src/components/layout/commonHeader.vue	500 ●●●●● diff \| view \| raw \| blame \| history
	src/components/layout/footerView.vue	438 ●●●●● diff \| view \| raw \| blame \| history
	src/components/layout/headerMenuItem.vue	86 ●●●●● diff \| view \| raw \| blame \| history
	src/components/layout/langSelect.vue	17 ●●●●● diff \| view \| raw \| blame \| history
	src/components/spot/MakeADeal/index.vue	10 ●●●●● diff \| view \| raw \| blame \| history
	src/components/spot/SpotPosition/ItemDropdown.vue	18 ●●●●● diff \| view \| raw \| blame \| history
	src/components/spot/SpotPosition/SelectTime.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/components/spot/SpotPosition/index.vue	6 ●●●●● diff \| view \| raw \| blame \| history
	src/components/spot/SpotPosition/positionTable.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/components/spot/createOrder.vue	10 ●●●●● diff \| view \| raw \| blame \| history
	src/components/spot/index.vue	6 ●●●●● diff \| view \| raw \| blame \| history
	src/config/index.js	2 ●●●●● diff \| view \| raw \| blame \| history
	src/i18n/cht/home.js	26 ●●●●● diff \| view \| raw \| blame \| history
	src/i18n/cht/user.js	1359 ●●●●● diff \| view \| raw \| blame \| history
	src/i18n/de/home.js	18 ●●●●● diff \| view \| raw \| blame \| history
	src/i18n/de/user.js	85 ●●●●● diff \| view \| raw \| blame \| history
	src/i18n/en/forex.js	2 ●●●●● diff \| view \| raw \| blame \| history
	src/i18n/en/home.js	45 ●●●●● diff \| view \| raw \| blame \| history
	src/i18n/en/jiaoyi.js	10 ●●●●● diff \| view \| raw \| blame \| history
	src/i18n/en/user.js	293 ●●●●● diff \| view \| raw \| blame \| history
	src/i18n/fra/home.js	18 ●●●●● diff \| view \| raw \| blame \| history
	src/i18n/fra/user.js	85 ●●●●● diff \| view \| raw \| blame \| history
	src/i18n/it/home.js	2 ●●●●● diff \| view \| raw \| blame \| history
	src/i18n/kor/home.js	18 ●●●●● diff \| view \| raw \| blame \| history
	src/i18n/kor/user.js	84 ●●●●● diff \| view \| raw \| blame \| history
	src/i18n/th/home.js	2 ●●●●● diff \| view \| raw \| blame \| history
	src/i18n/vie/home.js	2 ●●●●● diff \| view \| raw \| blame \| history
	src/i18n/zh/home.js	23 ●●●●● diff \| view \| raw \| blame \| history
	src/i18n/zh/jiaoyi.js	3 ●●●●● diff \| view \| raw \| blame \| history
	src/i18n/zh/user.js	14 ●●●●● diff \| view \| raw \| blame \| history
	src/router/forex.js	42 ●●●●● diff \| view \| raw \| blame \| history
	src/router/my.js	21 ●●●●● diff \| view \| raw \| blame \| history
	src/router/usStocks.js	1 ●●●●● diff \| view \| raw \| blame \| history
	src/router/wealth.js	44 ●●●●● diff \| view \| raw \| blame \| history
	src/utils/http.js	4 ●●●●● diff \| view \| raw \| blame \| history
	src/views/forex/about.vue	75 ●●●●● diff \| view \| raw \| blame \| history
	src/views/forex/agreement.vue	373 ●●●●● diff \| view \| raw \| blame \| history
	src/views/forex/customerService.vue	75 ●●●●● diff \| view \| raw \| blame \| history
	src/views/forex/helpCenter.vue	589 ●●●●● diff \| view \| raw \| blame \| history
	src/views/forex/termsOfService.vue	240 ●●●●● diff \| view \| raw \| blame \| history
	src/views/login/index.vue	23 ●●●●● diff \| view \| raw \| blame \| history
	src/views/login/register.vue	20 ●●●●● diff \| view \| raw \| blame \| history
	src/views/login/resetPwd.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/views/market/components/hangqing.vue	9861 ●●●●● diff \| view \| raw \| blame \| history
	src/views/market/components/pageDetail.vue	127 ●●●●● diff \| view \| raw \| blame \| history
	src/views/market/components/pagePromote.vue	554 ●●●●● diff \| view \| raw \| blame \| history
	src/views/market/market.vue	728 ●●●●● diff \| view \| raw \| blame \| history
	src/views/market/page.vue	107 ●●●●● diff \| view \| raw \| blame \| history
	src/views/my/advance-auth.vue	274 ●●●●● diff \| view \| raw \| blame \| history
	src/views/my/center.vue	463 ●●●●● diff \| view \| raw \| blame \| history
	src/views/my/change-password.vue	204 ●●●●● diff \| view \| raw \| blame \| history
	src/views/my/components/emailBind.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/views/my/components/fundsPassword.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/views/my/components/loginPassword.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/views/my/components/phoneBind.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/views/my/index.vue	26 ●●●●● diff \| view \| raw \| blame \| history
	src/views/my/mysecurity.vue	155 ●●●●● diff \| view \| raw \| blame \| history
	src/views/order/orderLayout.vue	6 ●●●●● diff \| view \| raw \| blame \| history
	src/views/wallet/addressAdd.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/views/wallet/components/account.vue	18 ●●●●● diff \| view \| raw \| blame \| history
	src/views/wallet/components/optionRecord.vue	296 ●●●●● diff \| view \| raw \| blame \| history
	src/views/wallet/recharge.vue	46 ●●●●● diff \| view \| raw \| blame \| history
	src/views/wallet/walletIndex.vue	6 ●●●●● diff \| view \| raw \| blame \| history
	src/views/wallet/withdraw.vue	41 ●●●●● diff \| view \| raw \| blame \| history
	src/views/wealth/asset.vue	265 ●●●●● diff \| view \| raw \| blame \| history
	src/views/wealth/newLockMiner.vue	232 ●●●●● diff \| view \| raw \| blame \| history
	src/views/wealth/pledgeRecord.vue	238 ●●●●● diff \| view \| raw \| blame \| history
	src/views/wealth/transactionRecord.vue	304 ●●●●● diff \| view \| raw \| blame \| history
	src/views/wealth/wealth.css	12 ●●●●● diff \| view \| raw \| blame \| history
	yarn.lock	6 ●●●●● diff \| view \| raw \| blame \| history