1

.hbuilderx/launch.json

@@ -13,7 +13,7 @@
             "type" : "uniCloud"
         },
         {
-            "playground" : "custom",
+            "playground" : "standard",
             "type" : "uni-app:app-android"
         }
     ]

components/market-depth/market-depth.vue

@@ -3,7 +3,7 @@
 		<text :class="['nums-item-bg', leftbg ? 'left' : 'right']" :style="{'width': val[2] + '%' }"></text>
 		<view class="item-num">
 			<text class="color">{{ val[0] }}</text>
-			<text>{{ val[1] }}</text>
+			<text>{{ val[1] * 1000000 }}</text>
 		</view>
 	</view>
 </template>

pages/content/Google.vue

@@ -17,7 +17,7 @@
 			<text class="lable-hint">(GoogleAuthenticator)</text>
 			<view class="app-box">
 				<image class="app-icon" src="@/static/images/google.png" mode="aspectFit"></image>
-				<text class="app-btn">立即安装</text>
+				<text class="app-btn" @click.stop="openUrl">立即安装</text>
 			</view>
 			<text class="lable-text">2. 绑定谷歌验证器</text>
 			<text class="lable-hint">使用谷歌验证器App扫描该二维码或输入密钥</text>
@@ -49,8 +49,8 @@
 			return {
 				val: '',
 				account:'',
-				secret: "G64DR7OMCFV3KQIM", // 密钥
-				codeurl: "otpauth://totp/Biking?secret=G64DR7OMCFV3KQIM"
+				secret: "", // 密钥
+				codeurl: ""
 			};
 		},
 		onLoad(opt) {
@@ -65,14 +65,16 @@
 				Api_getGoogle().then(res => {
 					this.secret = res.secret
 					this.codeurl = res.codeurl
+					
 					this.$nextTick(() => {
+						if(this.codeurl){
 						this.$refs.qrcode._makeCode()
-
+						}
 					})
 				})
 			},
 			openUrl(){
-				const url = 'https://www.baidu.com/'
+				const url = 'https://m.torrent.org.cn/soft/2703.html'
 				plus.runtime.openWeb(url);
 			},
 			copySecret(secret) {

pages/content/identification/select-type.vue

@@ -17,13 +17,26 @@
 			</view>
 			<text class="content-lable lable-type">选择ID类型</text>
 			<view class="item-box">
-				<!-- getIdentity -->
-				<!-- <view class="item" @click.stop=" "> -->
+				<view class="item">
+					<text class="type-icon iconfont">&#xe619;</text>
+					<text class="text-name">护照</text>
+					<text class="item-icon iconfont">&#xe8b5;</text>
+				</view>
+				<view class="item">
+					<text class="type-icon iconfont">&#xe626;</text>
+					<text class="text-name">驾驶证</text>
+					<text class="item-icon iconfont">&#xe8b5;</text>
+				</view>
 				<view class="item" @click.stop=" getIdentity">
 					<text class="type-icon iconfont">&#xe616;</text>
 					<text class="text-name">身份证</text>
 					<text class="item-icon iconfont">&#xe8b5;</text>
 				</view>
+				<view class="item">
+					<text class="type-icon iconfont">&#xe62a;</text>
+					<text class="text-name">签证</text>
+					<text class="item-icon iconfont">&#xe8b5;</text>
+				</view>
 			</view>
 		</view>
 
@@ -146,7 +159,6 @@
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
-				border-radius: 10rpx;
 
 				text {
 					flex-shrink: 0;
@@ -167,6 +179,18 @@
 					font-size: 50rpx;
 					color: #000;
 				}
+
+				&:nth-child(n + 2) {
+					margin-top: 2px;
+				}
+
+				&:first-child {
+					border-radius: 10rpx 10rpx 0 0;
+				}
+
+				&:last-child {
+					border-radius: 0 0 10rpx 10rpx;
+				}
 			}
 		}
 	}

pages/content/safety-set.vue

@@ -15,14 +15,14 @@
 				<text class="safety-set-lable">登录密码</text>
 				<view class="safety-set-more">
 					<text class="more-lable">修改</text>
-					<text class="more-icon iconfont">&#xe88e;</text>
+					<text class="more-icon iconfont">&#xe8b5;</text>
 				</view>
 			</view>
 			<view class="safety-set-item" @click.stop="setGoogle()">
 				<text class="safety-set-lable">谷歌验证</text>
 				<view class="safety-set-more">
 					<text class="more-lable">绑定</text>
-					<text class="more-icon iconfont">&#xe88e;</text>
+					<text class="more-icon iconfont">&#xe8b5;</text>
 				</view>
 			</view>
 			<view class="safety-set-item" @click.stop="bindContactAccount(2)">
@@ -33,7 +33,7 @@
 					</template>
 					<template v-else>
 						<text class="more-lable">绑定</text>
-						<text  class="more-icon iconfont">&#xe88e;</text>
+						<text  class="more-icon iconfont">&#xe8b5;</text>
 					</template>
 				</view>
 			</view>
@@ -45,7 +45,7 @@
 					</template>
 					<template v-else>
 						<text class="more-lable">绑定</text>
-						<text  class="more-icon iconfont">&#xe88e;</text>
+						<text  class="more-icon iconfont">&#xe8b5;</text>
 					</template>
 				</view>
 			</view>
@@ -57,14 +57,14 @@
 			<view class="safety-set-item">
 				<text class="safety-set-lable">法币收款设置</text>
 				<view class="safety-set-more">
-					<text class="more-icon iconfont">&#xe88e;</text>
+					<text class="more-icon iconfont">&#xe8b5;</text>
 				</view>
 			</view>
 			<view class="safety-set-item " @click.stop="setMoneyPassword()">
 				<text class="safety-set-lable">资金密码{法币、转账}</text>
 				<view class="safety-set-more">
 					<text class="more-lable">去设置</text>
-					<text class="more-icon iconfont">&#xe88e;</text>
+					<text class="more-icon iconfont">&#xe8b5;</text>
 				</view>
 			</view>
 		</view>
@@ -156,6 +156,7 @@
 					height: 32rpx;
 					color: #ccc;
 					font-size: 32rpx;
+				transform: rotate(-180deg);
 				}
 			}
 
@@ -163,7 +164,7 @@
 			// 	<text class="safety-set-lable">邮箱</text>
 			// 	<view class="safety-set-more">
 			// 		<text class="more-lable active-more-lable">已绑定</text>
-			// 		<text class="more-icon iconfont">&#xe88e;</text>
+			// 		<text class="more-icon iconfont">&#xe8b5;</text>
 			// 	</view>
 			// </view>
 		}

pages/contract/index.vue

@@ -16,12 +16,13 @@
 		<template v-if="contractIndex === 0">
 			<sustainability ref="sustainabilityRef" :currency-info="currencyVal" :myTransaction="my_transaction"
 				:pagesInfo="pagesInfo" :my-peding-transaction="my_peding_transaction" @refreshData="init"
-				@setContract="setContract" @setProfitLoss="setProfitLoss" @setHighInfo="setHighInfo" @shareContent="val => $refs.shareRef.openShare(val)"/>
+				@setContract="setContract" @setProfitLoss="setProfitLoss" @setHighInfo="setHighInfo"
+				@shareContent="val => $refs.shareRef.openShare(val)" @setCloseLever="e => $refs.closeoutRef.open(e)" />
 		</template>
 		<!-- 永续合约 -->
 		<template v-if="contractIndex === 1">
-			<shortcut :myFast="my_fast" :rate-profits-total="rate_profits_total"
-				:pagesInfo="pagesInfo" @refreshData="init" @shareContent="val => $refs.shareRef.openShare(val)"/>
+			<shortcut :myFast="my_fast" :rate-profits-total="rate_profits_total" :pagesInfo="pagesInfo"
+				@refreshData="init" @shareContent="val => $refs.shareRef.openShare(val)"  @setCloseLever="e => $refs.closeoutRef.open(e)" />
 		</template>
 		<!-- 赠金交易 -->
 		<template v-if="contractIndex === 2">
@@ -38,7 +39,10 @@
 		<!-- 分享 -->
 		<sharePage ref="shareRef" :shareType="2"></sharePage>
 		<!-- 平仓 -->
-		<close-out ref="closeoutRef"></close-out>
+		<close-out ref="closeoutRef" @setCloseLeverAll="setCloseLeverAll" @refreshData="init"></close-out>
+		<!-- 平仓提示 -->
+		<unopen ref="unopenRef" @confirm="$refs.closeoutRef.confirm()" textAlign="left" :title="unopenInfo.title"
+			cancelBtn :content="unopenInfo.content" />
 	</view>
 </template>
 
@@ -89,15 +93,19 @@
 				currency: {},
 				UserInfo: {},
 				pagesInfo: {},
-				my_transaction: [],			// 永续 当前持仓
-				my_peding_transaction:[],	// 永续 限价持仓
-				my_fast:[],// 快捷合约 持仓
-				
-				rate_profits_total: {}
+				my_transaction: [], // 永续 当前持仓
+				my_peding_transaction: [], // 永续 限价持仓
+				my_fast: [], // 快捷合约 持仓
+
+				rate_profits_total: {},
+				unopenInfo: {
+					title: '平仓',
+					content: '如果存在平仓挂单(限价止盈止损)，将会在全平前被撤单,确定平仓吗？'
+				}
 			};
 		},
 		onLoad() {
-			
+
 		},
 
 		computed: {
@@ -128,6 +136,8 @@
 			this.close()
 		},
 		mounted() {
+
+
 			// 设置盈亏
 			// setProfitLoss(item) {
 			// 	console.log('setProfitLoss')
@@ -140,17 +150,28 @@
 			// });
 		},
 		methods: {
-			close(){
+			// 平仓 - 单个订单的平仓（全平）
+			setCloseLeverAll(obj) {
+				this.unopenInfo = obj;
+				this.$nextTick(() => {
+					this.$refs.unopenRef.open();
+				})
+
+			},
+			close() {
 				closeSocket() // 停止 Socket
 				this.$store.commit('websocket/set_currencySuspend', false) // 停止币种刷新
 			},
 			init() {
+				console.log('99')
 				// if ([0, 1].includes(this.contractIndex)) {
 				// 	// 永续 / 快捷 需要获取持仓信息
 				// 	this.getRegister()
 				// }
 				this.getAccountInfo();
-				getCurrencyMarket('contract', {onceRefresh:true})
+				getCurrencyMarket('contract', {
+					onceRefresh: true
+				})
 				// this.$store.dispatch('websocket/getQuotationNew', {
 				// 	noRefresh: true
 				// })
@@ -162,7 +183,7 @@
 				}
 
 			},
-	
+
 			setSocket() {
 				startSocket();
 			},
@@ -172,10 +193,10 @@
 					currency_id: this.currencyVal.currency_id
 				}).then(res => {
 					this.pagesInfo = res
-					this.my_transaction = res.my_transaction || [];   // 永续合约 - 持仓信息
+					this.my_transaction = res.my_transaction || []; // 永续合约 - 持仓信息
 					this.my_peding_transaction = res.my_peding_transaction || []; // 永续合约 - 限价委托
-					this.my_fast = res.my_fast || [];				  // 快捷合约 - 持仓信息
-					console.log('my_transaction' , this.my_transaction)
+					this.my_fast = res.my_fast || []; // 快捷合约 - 持仓信息
+					console.log('my_transaction', this.my_transaction)
 				}).catch(err => {
 					// this.getLeverDeal()
 				})
@@ -225,10 +246,10 @@
 						// 
 				}
 			},
-			setHighInfo(){
+			setHighInfo() {
 				this.$refs.restrictPopupRef.open()
-				
-				
+
+
 			}
 
 		}

pages/contract/modules/close-out.vue

@@ -18,13 +18,13 @@
 				<view class="content-item">
 					<text class="content-lable">开仓价格(USDT)</text>
 					<view class="content-val">
-						{{ content.price }}
+						{{ content.origin_price }}
 					</view>
 				</view>
 				<view class="content-item">
 					<text class="content-lable">标记价格(USDT)</text>
 					<view class="content-val">
-						{{ content.origin_price }}
+						{{ content.update_price }}
 					</view>
 				</view>
 
@@ -41,7 +41,8 @@
 					</view>
 					<view class="restrict-input-box input-type">
 						<text class="restrict-input" v-show="priceType === 1">市价</text>
-						<input class="restrict-input" type="number" v-show="priceType === 2" placeholder-class="placeholder-class" placeholder="请输入委托价">
+						<input class="restrict-input" type="number" v-show="priceType === 2"
+							placeholder-class="placeholder-class" placeholder="请输入委托价">
 						<text class="restrict-tag">USDT</text>
 						<view class="restrict-switch" @click.stop="priceType === 1 ? priceType = 2 : priceType = 1">
 							<text class="restrict-btn">{{ priceType === 1 ? '市价' : '限价' }}</text>
@@ -52,7 +53,7 @@
 						<text class="restrict-lable">平仓数量(USDT)</text>
 						<view class="restrict-btn">
 							<text class="restrict-nums-text">可平仓位数量(张):</text>
-							<text class="restrict-nums">{{ numss }}</text>
+							<text class="restrict-nums">{{ content.number }}</text>
 						</view>
 					</view>
 					<view class="restrict-input-box">
@@ -63,22 +64,26 @@
 						<step :percent.sync="percent" />
 					</view>
 					<view class="content-btns">
-						<view class="content-btn cancel-btn" @click.stop="close()">
+						<view class="content-btn cancel-btn" @click.stop="setCloseLeverAll()">
 							市价全平
 						</view>
-						<view class="content-btn" @click.stop="setLeverStop()">
+						<view class="content-btn" @click.stop="setCloseLever()">
 							确定
 						</view>
 					</view>
 				</view>
 			</view>
 		</view>
+
+
 	</uni-popup>
 </template>
 
 <script>
 	import {
-		Api_setLeverStop
+		Api_setCloseLever,
+
+		Api_setBatchClose
 	} from "@/api/index.js"
 	export default {
 
@@ -88,21 +93,23 @@
 			return {
 				content: {},
 				percent: 0,
-				numss: 196,
 				numsk: '',
 				priceType: 1, // 1 : 市价  2: 限价 
 				// target_profit_price: '',
 				// stop_loss_price: '',
-
+				unopenInfo: {
+					title: '平仓',
+					content: '如果存在平仓挂单(限价止盈止损)，将会在全平前被撤单,确定平仓吗？'
+				}
 
 			};
 		},
 		watch: {
 			percent: {
 				handler(newNum) {
-					if (newNum) {
-						let num = Math.ceil(this.numss * newNum / 100)
-						this.numsk = num > this.numss ? this.numss : num
+					if (newNum && this.content.number) {
+						let num = Math.ceil(this.content.number * newNum / 100)
+						this.numsk = num > this.content.number ? this.content.number : num
 					} else {
 						this.numsk = ''
 					}
@@ -115,6 +122,9 @@
 		methods: {
 			open(item = {}) {
 				this.content = item;
+				this.percent = 0;
+				this.numsk ='';
+				
 				this.$nextTick(() => {
 					this.$refs.popupRef.open();
 				})
@@ -131,43 +141,78 @@
 				}
 
 			},
+			// const obj = {
+			// 				title: '市价全平',
+			// 				closeLeverContent: '如果存在平仓挂单(限价止盈止损)，将会在全平前被撤单,确定平仓吗？'
+			// 			}
 
 
+			// <view class="content-btn cancel-btn" @click.stop="setCloseLeverAll()">
+			// 	市价全平
+			// </view>
+			// <view class="content-btn" @click.stop="setCloseLever()">
+			// 	确定
+			// </view>
+			// 市价全平
+			setCloseLeverAll() {
+				this.unopenInfo = {
+					title: '平仓',
+					content: '如果存在平仓挂单(限价止盈止损)，将会在全平前被撤单,确定平仓吗？'
+				};
+				this.$emit('setCloseLeverAll' , this.unopenInfo)
+				// this.$nextTick(() => {
+				// 	this.$refs.unopenRef.open();
+				// })
 
+			},
 
+			setCloseLever() {
+				// id	是	number	订单id
+				// share	否	number	【5-25】张数
+				if (this.numsk && this.numsk <= this.content.number) {
+					this.closeLever({
+						id: this.content.id,
+						share: this.numsk
+					})
 
+				}
 
+			},
 
 
+			confirm() {
 
-			// confirm() {
-			// 	this.close();
-			// 	this.$emit('confirm')
-			// },
-			// 
-			setLeverStop() {
-				if (this.content) {
-					// 单个持仓修改
-					Api_setLeverStop({
-						id: this.content.id,
-						target_profit_price: this.target_profit_price,
-						stop_loss_price: this.stop_loss_price
-					}).then(res => {
-						this.close();
-						this.$emit('setSuccess')
-					})
-				} else {
-					// 全局下单设置
-					this.close();
-					this.$eventBus.$emit('placeOrder', {
-						target_profit_price: this.target_profit_price,
-						stop_loss_price: this.stop_loss_price
-					});
+				// id	是	number	订单id
+				// share	否	number	【5-25】张数
+				this.closeLever({
+					id: this.content.id,
+					share: this.content.number
+				})
 
-				}
+			},
+
+			closeLever(obj) {
+				uni.showLoading({
+					title: '',
+					mask: true
+				});
+				Api_setCloseLever(obj).then(res => {
+					setTimeout(() => {
+						uni.showToast({
+							icon: 'none',
+							title: '平仓成功'
+						})
+						this.$emit('refreshData')
+					}, 201)
+				}).catch(err => {}).finally(() => {
+					setTimeout(() => {
+						this.close()
+					}, 200)
+				})
 
-			}
 
+
+			}
 		}
 	}
 </script>
@@ -320,6 +365,7 @@
 
 				.restrict-switch {
 					flex-shrink: 0;
+
 					.iconfont {
 						font-size: 22rpx;
 						color: #c29032;

pages/contract/shortcut/index.vue

@@ -521,12 +521,13 @@
 				this.$emit('refreshData')
 			},
 			setCloseLever(item) {
-				this.closeLeverItem = item;
-				this.unopenSolt = {
-					title: '平仓',
-					closeLeverContent: '如果存在平仓挂单(限价止盈止损)，将会在全平前被撤单,确定平仓吗？'
-				}
-				this.setDepot();
+				// this.closeLeverItem = item;
+				// this.unopenSolt = {
+				// 	title: '平仓',
+				// 	closeLeverContent: '如果存在平仓挂单(限价止盈止损)，将会在全平前被撤单,确定平仓吗？'
+				// }
+				// this.setDepot();
+				this.$emit('setCloseLever', item)
 			},
 			setInversion() {
 

pages/contract/sustainability/freight-space.vue

@@ -39,7 +39,7 @@
 						</view>
 						<view class="info-item">
 							<text class="info-item-lable">标记价格(USDT)</text>
-							<text class="info-item-val">{{ item.origin_price }}</text>
+							<text class="info-item-val">{{ item.update_price }}</text>
 						</view>
 						<view class="info-item">
 							<text class="info-item-lable">持仓数量(张)</text>
@@ -144,7 +144,7 @@
 					title: '平仓',
 					closeLeverContent: '如果存在平仓挂单(限价止盈止损)，将会在全平前被撤单,确定平仓吗？'
 				}
-				this.$emit('setDepot', obj)
+				this.$emit('setCloseLever', item)
 			},
 			setInversion() {
 
@@ -199,6 +199,7 @@
 
 					} else {
 						// 全部平仓
+						
 						Api_setBatchClose({
 							type: 0,
 							currency_id: this.currency.currency_id

pages/contract/sustainability/index.vue

@@ -209,7 +209,7 @@
 
 				<view class="info-item">
 					<text class="info-item-lable">成本</text>
-					<view class="info-item-val">0.00 USDT</view>
+					<view class="info-item-val">{{ cost || '--'}}USDT</view>
 				</view>
 
 				<view class="info-item">
@@ -246,7 +246,7 @@
 		<view class="lable-title">
 			<view class="lable-text">
 				<text @click.stop="freightSpaceIndex = 1"
-					:class="['lable-text-item' , freightSpaceIndex == 1 ? 'active-text-item' : '' ]">持仓({{ myTransaction.length }})</text>
+					:class="['lable-text-item' , freightSpaceIndex == 1 ? 'active-text-item' : '' ]">持仓({{ leverTrade && leverTrade.trades_cur ? leverTrade.trades_cur.length : 0 }})</text>
 				<text @click.stop="freightSpaceIndex = 2"
 					:class="['lable-text-item' , freightSpaceIndex == 2 ? 'active-text-item' : '' ]">当前委托({{ myPedingTransaction.length }})</text>
 			</view>
@@ -372,6 +372,7 @@
 				restrictLossVal: '',
 				restrictLossStatus: 1, // 按价格止损 ， 2 ： 比例止损
 
+				cost: '', // 成本
 			};
 		},
 		watch: {
@@ -392,14 +393,25 @@
 				immediate: true
 			},
 			percent(newNums) {
-				// const maxNums = this.pagesInfo?.lever_share_limit?.max
-				// if (newNums >= 0 && maxNums) {
-				// 	this.share = this.$decimalNum.mul(maxNums, newNums / 100);
-				// 	console.log('this.share = ', this.share)
-				// }
-				// 
+				const maxNums = this.pagesInfo?.lever_share_limit?.max
+				if (newNums >= 0 && maxNums) {
+					const nums = maxNums * newNums / 100;
+					console.log('nums = ' , nums)
+					this.calculateCost(nums)
+				}
+				
 			},
 
+			share(nums) {
+				this.calculateCost(nums)
+			},
+			// percent(num){
+			// 	if(num){
+			// 		const nums = pagesInfo.lever_share_limit.max
+					
+			// 	}
+			// }
+
 		},
 		computed: {
 			...mapGetters([
@@ -411,7 +423,7 @@
 				'PageContentHeight',
 				'currencyVal',
 				'contractAccount',
-				
+
 				'leverTrade'
 			])
 		},
@@ -434,9 +446,45 @@
 			});
 		},
 		methods: {
+			// 成本计算
+			calculateCost(nus) {
+				// $decimalNum
+				// // 加法
+				// add: (a, b) => {
+				// 	return new Decimal(a).add(new Decimal(b))
+				// },
+				// // 减法
+				// sub: (a, b) => {
+				// 	return new Decimal(a).sub(new Decimal(b))
+				// },
+				// // 乘法
+				// mul: (a, b) => {
+				// 	return new Decimal(a).mul(new Decimal(b))
+				// },
+				// // 除法
+				// div: (a, b) => {
+				// 	return new Decimal(a).div(new Decimal(b))
+				// },
+
+				try {
+					// 成本 = 价格*张数*每张折合数量*（1+保证金百分比）/逐仓倍数
+					const t1 = this.$decimalNum.mul(this.daymarket.now_price, nus); // 价格*张数
+					const t2 = this.$decimalNum.mul(t1, this.pagesInfo.lever_share_num) // 价格*张数*每张折合数量
+					const t3 = this.$decimalNum.add(1, this.pagesInfo.lever_trade_fee) // 1+保证金百分比
+					const t4 = this.$decimalNum.mul(t2, t3) // 价格*张数*每张折合数量*（1+保证金百分比）
+					const t5 = this.$decimalNum.div(t4, this.multiple) // 价格*张数*每张折合数量*（1+保证金百分比）/逐仓倍数
+					// * this.pagesInfo.lever_share_num *（1+ this.pagesInfo.lever_trade_fee）/ this.multiple
+					this.cost = t5 ? t5.toFixed(2) : '--'
+				} catch(err) {
+					console.log('计算错误' , err)
+					this.cost = '--'
+				}
 
 
 
+
+			},
+
 			getData() {
 				this.closeLeverSuccess();
 
@@ -510,8 +558,10 @@
 					// // 止损
 					// restrictLossVal: '',
 					// restrictLossStatus: 1, // 按价格止损 ， 2 ： 比例止损
-					setData.target_profit_price = this.restrictProfitStatus === 1 ? this.restrictProfitVal : `${this.restrictProfitVal}%` // 【5-18】止盈,选填
-					setData.stop_loss_price =  this.restrictLossStatus === 1 ? this.restrictLossVal : `${this.restrictLossVal}%` //  5-18】止损,选填
+					setData.target_profit_price = this.restrictProfitStatus === 1 ? this.restrictProfitVal :
+						`${this.restrictProfitVal}%` // 【5-18】止盈,选填
+					setData.stop_loss_price = this.restrictLossStatus === 1 ? this.restrictLossVal :
+						`${this.restrictLossVal}%` //  5-18】止损,选填
 				};
 				if (this.status === 0) {
 					setData.target_price = this.target_price

static/fontsize/fontsize1/demo_index.html

@@ -54,6 +54,24 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe626;</span>
+                <div class="name">汽车</div>
+                <div class="code-name">&amp;#xe626;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe619;</span>
+                <div class="name">签证</div>
+                <div class="code-name">&amp;#xe619;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe62a;</span>
+                <div class="name">更新身份证信息</div>
+                <div class="code-name">&amp;#xe62a;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe632;</span>
                 <div class="name">验证</div>
@@ -570,9 +588,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1684753573110') format('woff2'),
-       url('iconfont.woff?t=1684753573110') format('woff'),
-       url('iconfont.ttf?t=1684753573110') format('truetype');
+  src: url('iconfont.woff2?t=1685069697729') format('woff2'),
+       url('iconfont.woff?t=1685069697729') format('woff'),
+       url('iconfont.ttf?t=1685069697729') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -598,6 +616,33 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont icon-qiche"></span>
+            <div class="name">
+              汽车
+            </div>
+            <div class="code-name">.icon-qiche
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-qianzheng"></span>
+            <div class="name">
+              签证
+            </div>
+            <div class="code-name">.icon-qianzheng
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-gengxinshenfenzhengxinxi"></span>
+            <div class="name">
+              更新身份证信息
+            </div>
+            <div class="code-name">.icon-gengxinshenfenzhengxinxi
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-yanzheng"></span>
             <div class="name">
@@ -1372,6 +1417,30 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-qiche"></use>
+                </svg>
+                <div class="name">汽车</div>
+                <div class="code-name">#icon-qiche</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-qianzheng"></use>
+                </svg>
+                <div class="name">签证</div>
+                <div class="code-name">#icon-qianzheng</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-gengxinshenfenzhengxinxi"></use>
+                </svg>
+                <div class="name">更新身份证信息</div>
+                <div class="code-name">#icon-gengxinshenfenzhengxinxi</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-yanzheng"></use>

static/fontsize/fontsize1/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3999574 */
-  src: url('iconfont.woff2?t=1684753573110') format('woff2'),
-       url('iconfont.woff?t=1684753573110') format('woff'),
-       url('iconfont.ttf?t=1684753573110') format('truetype');
+  src: url('iconfont.woff2?t=1685069697729') format('woff2'),
+       url('iconfont.woff?t=1685069697729') format('woff'),
+       url('iconfont.ttf?t=1685069697729') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,18 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-qiche:before {
+  content: "\e626";
+}
+
+.icon-qianzheng:before {
+  content: "\e619";
+}
+
+.icon-gengxinshenfenzhengxinxi:before {
+  content: "\e62a";
+}
+
 .icon-yanzheng:before {
   content: "\e632";
 }

static/fontsize/fontsize1/iconfont.json

@@ -5,6 +5,27 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "883992",
+      "name": "汽车",
+      "font_class": "qiche",
+      "unicode": "e626",
+      "unicode_decimal": 58918
+    },
+    {
+      "icon_id": "1133609",
+      "name": "签证",
+      "font_class": "qianzheng",
+      "unicode": "e619",
+      "unicode_decimal": 58905
+    },
+    {
+      "icon_id": "4512607",
+      "name": "更新身份证信息",
+      "font_class": "gengxinshenfenzhengxinxi",
+      "unicode": "e62a",
+      "unicode_decimal": 58922
+    },
     {
       "icon_id": "7964512",
       "name": "验证",

utils/websocket.js

@@ -69,14 +69,15 @@ export const startSocket = (data) => {
 		// })
 		socket.emit('login', getStorageSync('shareCode'));
 		socket.on('lever_trade', (msg) => {
-				const trades_cur = JSON.parse(msg.trades_cur)
-				console.log('lever_trade 1 = ' , msg)
-				// const orderList 
-				const obj = Object.assign({} , msg , {trades_cur:trades_cur})
-				store.commit('websocket/set_lever_trade', obj)
 			// if (filtration(msg)) {
-			// 	console.log('lever_trade 2= ' , msg)
+			// 	console.log('lever_trade 133 = ' , JSON.parse(msg.trades_cur))
+			// 	const trades_cur = JSON.parse(msg.trades_cur)
+			// 	const obj = Object.assign({} , msg , {trades_cur:trades_cur})
+			// 	store.commit('websocket/set_lever_trade', obj)
 			// }
+			const trades_cur = JSON.parse(msg.trades_cur)
+			const obj = Object.assign({} , msg , {trades_cur:trades_cur})
+			store.commit('websocket/set_lever_trade', obj)
 		})
 
 	})