修改

pages/menu/sendToken/addAddress/index.vue

@@ -16,9 +16,8 @@
 					</view>
 					<view class="inputcon">
 						<input type="text" value="" v-model="value"
-							placeholder-style="font-size: 30rpx; color: #D0D0D2;"
-							:placeholder="teee1" class="input1" @click="showSelect()"
-							:disabled="true" />
+							placeholder-style="font-size: 30rpx; color: #D0D0D2;" :placeholder="teee1" class="input1"
+							@click="showSelect()" :disabled="true" />
 						<image src="../../../../static/tongyonh/chevron_right_24px.png" mode="aspectFit" class="img1">
 						</image>
 					</view>
@@ -32,10 +31,10 @@
 					</view>
 					<view class="inputcon">
 						<input type="text" value="" @input="showSave()"
-							placeholder-style="font-size: 30rpx; color: #D0D0D2;"
-							:placeholder="teee2" class="input1" v-model="bigAddress" />
+							placeholder-style="font-size: 30rpx; color: #D0D0D2;" :placeholder="teee2" class="input1"
+							v-model="bigAddress" />
 						<image src="../../../../static/tongyonh/Frame330.png" mode="aspectFit" class="img2"
-							@click="chooseImage"></image>
+							@click="scanCode"></image>
 					</view>
 
 				</view>
@@ -48,8 +47,8 @@
 					</view>
 					<view class="inputcon">
 						<input type="text" @input="showSave" value=""
-							placeholder-style="font-size: 30rpx; color: #D0D0D2;" :placeholder="teee3"
-							class="input1" v-model="addressName" />
+							placeholder-style="font-size: 30rpx; color: #D0D0D2;" :placeholder="teee3" class="input1"
+							v-model="addressName" />
 					</view>
 				</view>
 
@@ -148,18 +147,17 @@
 			selectA() {
 				this.show = false
 			},
-			// 唤醒摄像头
-			chooseImage() {
+			scanCode() {
 				var _this = this
-				uni.chooseImage({
-					count: 1, //默认9
-					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
-					sourceType: ['album', 'camera'], //从相册选择、摄像头
+				uni.scanCode({
 					success: function(res) {
-						_this.imgShow = res.tempFilePaths[0]
+						console.log('扫码内容', res.result)
+
+						_this.bigAddress = res.result;
 					}
 				});
 			},
+			
 			handove2(item, index) {
 				this.value = item.name;
 				this.show = false;

pages/menu/token/btc/index.css

@@ -41,7 +41,7 @@
 
 .textcon1 .text1 {
 	color: #fff;
-	font-size: 56rpx;
+	font-size: 50rpx;
 }
 
 .textcon1 .text1 .text2 {

pages/menu/token/btc/index.vue

@@ -13,9 +13,9 @@
 				<view class="textcon1">
 					<text class="text1">
 						<view class="">
-							{{coin.balance}}
+							{{coin.balance}} {{coin.name}}
 						</view>
-						<text class="text2">≈ $ {{coin.balancePrice}}</text>
+						<text class="text2">≈ $ {{coin.balancePrice?coin.balancePrice:0}}</text>
 					</text>
 					<image src="../../../../static/tongyonh/ethereum.png" mode="aspectFit" class="img1"
 						v-if="coin.type=='ETH'&&!coin.contractAddress"></image>

pages/menu/wallet/mwallet/manage/index.vue

@@ -1,7 +1,8 @@
 <template>
 	<view class="">
 		<navigation :showBack="false" :bgnum="true">
-			<image src="../../../../../static/tongyonh/Vector.png" mode="aspectFit" class="back" @click="back()"></image>
+			<image src="../../../../../static/tongyonh/Vector.png" mode="aspectFit" class="back" @click="back()">
+			</image>
 			<text class="big_title">
 				{{i18n.Manage}}
 			</text>
@@ -22,15 +23,13 @@
 						{{i18n.Name}}
 					</view>
 					<view class="address">
-<<<<<<< HEAD
-			<text v-if="userObj.name=='BTC'">{{i18n.Setname}}</text>
+						<!-- <text v-if="userObj.name=='BTC'">{{i18n.Setname}}</text>
 			<text v-else-if="userObj.name=='ETH'">{{i18n.Setname}}</text>
-			<text v-else-if="userObj.name=='TRX'">{{i18n.Setname}}</text>
-			<text v-else>{{userObj.name}}</text>
-=======
-			{{userObj.name}}
->>>>>>> 597f46eb933c677e991915c5a7fe52f9e8d27baa
-			<image src="../../../../../static/tongyonh/chevron_right_24px.png" mode="aspectFit" class="img1"></image>
+			<text v-else-if="userObj.name=='TRX'">{{i18n.Setname}}</text> -->
+						<text>{{userObj.name}}</text>
+
+						<image src="../../../../../static/tongyonh/chevron_right_24px.png" mode="aspectFit"
+							class="img1"></image>
 					</view>
 				</view>
 				<view class="name flex" @click="goTrans()" v-if="itemMnemonic">
@@ -38,7 +37,8 @@
 						{{i18n.backupMneTit}}
 					</view>
 					<view class="address">
-			<image src="../../../../../static/tongyonh/chevron_right_24px.png" mode="aspectFit" class="img1"></image>
+						<image src="../../../../../static/tongyonh/chevron_right_24px.png" mode="aspectFit"
+							class="img1"></image>
 					</view>
 				</view>
 				<view class="name flex" @click="goKey()">
@@ -46,13 +46,15 @@
 						{{i18n.Backupprivatekey}}
 					</view>
 					<view class="address">
-			<image src="../../../../../static/tongyonh/chevron_right_24px.png" mode="aspectFit" class="img1"></image>
+						<image src="../../../../../static/tongyonh/chevron_right_24px.png" mode="aspectFit"
+							class="img1"></image>
 					</view>
 				</view>
 			</view>
 
 			<view class="showAddress" v-if="showAddress">
-		<image src="../../../../../static/tongyonh/xg.png" mode="aspectFit" class="img1" @click="showAddress=false"></image>
+				<image src="../../../../../static/tongyonh/xg.png" mode="aspectFit" class="img1"
+					@click="showAddress=false"></image>
 				<view class="title">
 					{{i18n.Newwalletname}}
 				</view>