合并

components/entrustOrderList/entrustOrderList.vue

@@ -209,8 +209,11 @@
 			},
 		},
 		watch: {
+			deep:true,
 			symbol: {
-				handler: function() {}
+				handler: function() {
+					this.getContractOrderList()
+				}
 			},
 
 		},

pages/home/index.vue

@@ -29,7 +29,6 @@
 				 <u-swiper class="swiper" :list="swiperList" previousMargin="48rpx" nextMargin="80rpx" circular
 				 	:autoplay="true" radius="32rpx" bgColor="rgba(0,0,0,0)" height="360rpx" style="margin-top: 145rpx;">
 					<!-- #endif -->
-				
 				</u-swiper>
 			<!-- 消息 -->
 			<view class="message" @click="go('/pages/me/notification')">

pages/mine/mineDetails.vue

@@ -8,11 +8,10 @@
 		<view class="content">
 			<view class="card">
 				<view class="top">
-					<u-icon class="icon" :name="imgAddress+detail.mineDetails.imgMobile" size="80rpx" width="80rpx">
+					<u-icon :name="baseURL+'/coins/'+detail.mineDetails.baseCoin+'.png'" size="80rpx" width="80rpx">
 					</u-icon>
-					<view class="title">{{ detail.mineDetails.name }}</view>
-					<view class="coinValue">{{ detail.userCapital }} <text
-							style="font-size: 26rpx;">{{detail.mineDetails.baseCoin}}</text> </view>
+					<view class="title">{{ i18n.YourBTC }}{{" "}}{{ detail.mineDetails.baseCoin }}</view>
+					<view class="coinValue"> {{ detail.userCapital }}<text style="font-size: 26rpx;"><!-- {{detail.mineDetails.baseCoin}} --></text> </view>
 				</view>
 				<view class="bottom">
 					<view class="item">
@@ -55,6 +54,7 @@
 		name: "mineDetails",
 		data() {
 			return {
+				baseURL:'',
                  id:null,
 				info: {
 					productId: null,
@@ -87,6 +87,7 @@
 		onLoad(res) {
 			this.id=res.id
 			this.getMineDetail(this.id)
+			this.baseURL = constant.BASE_URL
 			this.imgAddress = res.imgAddress
 		},
 		onShow() {},

pages/recharge/recharge.vue

@@ -228,7 +228,7 @@
 							// this.getQr(img)
 							this.coinAddress = this.i18n.PleaseChooseCoin;
 							this.coin = this.i18n.PleaseChooseCoin
-							this.qr = this.getQr(this.i18n.PleaseChooseCoin)
+							this.qr =  QR.createQrCodeImg(this.i18n.PleaseChooseCoin)
 							this.message = this.i18n.message.replace('{rechargeMinAmount}', '').replaceAll(
 								'{enname}', '')
 						} else {
@@ -238,7 +238,6 @@
 							}
 							// 返回的币种没有充值地址就用接口传code换取虚拟币充值地址
 							api.rechargeAddress(coinInfo).then(res => {
-
 								this.coinAddress = res.address
 								this.qr = this.getQr(this.coinAddress)
 								this.rechargeMinAmount = res.rechargeMinAmount

pages/withdrawal/withdrawal.vue

@@ -46,9 +46,9 @@
 				</view>
 				<!-- 分割线 -->
 				<u-divider text="" lineColor="#B9C1D9"></u-divider>
-				<!-- 可用数量 -->
+				<!-- 可用数量 ${selectCoinInfo.enname}-->
 				<key-value-row :keyName="i18n.Quantity"
-					:value="`${i18n.Available} ${selectCoinInfo.useCapital} ${selectCoinInfo.enname}`"
+					:value="`${i18n.Available} ${selectCoinInfo.useCapital}`"
 					rightColor="#A1A0A8"></key-value-row>
 				<!-- 数量输入框 -->
 				<view class="input-item">
@@ -58,13 +58,13 @@
 					<view class="all" @click="coinInfo.tranAmt=selectCoinInfo.useCapital">{{ i18n.ALL }}
 					</view>
 				</view>
-				<!-- 最低体现金额 -->
+				<!-- 最低体现金额 +selectCoinInfo.enname-->
 				<key-value-row :keyName="i18n.MinimumWithdrawAmount" size="24rpx"
-					:value="selectCoinInfo.withdrawMinAmount+selectCoinInfo.enname" rightColor="#A1A0A8">
+					:value="selectCoinInfo.withdrawMinAmount" rightColor="#A1A0A8">
 				</key-value-row>
-				<!-- 手续费 -->
+				<!-- 手续费 +selectCoinInfo.enname-->
 				<key-value-row :keyName="i18n.HandlingFee" size="24rpx"
-					:value="withdrawFeeAmount+selectCoinInfo.enname" rightColor="#A1A0A8">
+					:value="withdrawFeeAmount" rightColor="#A1A0A8">
 				</key-value-row>
 				<view class="title">{{ i18n.PaymentPassword }}</view>
 				<view class="input-item">
@@ -538,7 +538,7 @@
 					border-radius: 16px;
 					color: #00E8A2;
 					font-size: 28rpx;
-					padding: 8rpx 20rpx 8rpx 68rpx;
+					padding: 8rpx 20rpx 5rpx 68rpx;
 					// 超出字符省略成...
 					overflow: hidden;
 					text-overflow: ellipsis;

pages/withdrawal/withdrawalRecord.vue

@@ -38,8 +38,8 @@
 					</view>
 					<view style="border-top: 2rpx solid #323045;padding:0rpx 32rpx; margin-bottom: 20rpx;">
 						<show-more class="digitalShowMore">
-							<key-value-row :keyName="i18n.Address" :value="item.toAddress" :isBr="true"></key-value-row>
-							<key-value-row :keyName="i18n.Hash" :value="item.txid" :isBr="true"></key-value-row>
+							<key-value-row :keyName="i18n.Address" :value="item.toAddress"></key-value-row>
+							<key-value-row :keyName="i18n.Hash" :value="item.txid"></key-value-row>
 							<!-- <view class="text">Postscript : ontact customer service on the top-left corner for identity
 								verific
 							</view> -->
@@ -189,6 +189,10 @@
 </script>
 
 <style lang="scss" scoped>
+	/deep/ .digitalShowMore .KeyValueRow .value{
+		position: static !important;
+		word-break: break-all !important;  
+	}
 	.main {
 
 		.head {

utils/language/en_US.js

@@ -210,7 +210,7 @@ export default {
 		MineDetails: 'Mine details',
 		Record: 'Record',
         Dataisempty:'Data is empty',
-		YourBTC: 'Your BTC',
+		YourBTC: 'Your',
 		LockBTC: 'Lock',
 		dayproduce: '1 day produce',
 		MinLockTime: 'Min lock time',

utils/language/vi_VN.js

@@ -206,7 +206,7 @@ export default {
 		MineDetails: 'Chi tiết mỏ',
 		Record: 'Ghi lại',
         Dataisempty:'Dữ liệu trống',
-		YourBTC: 'Của bạn BTC',
+		YourBTC: 'Của bạn',
 		LockBTC: 'Khóa',
 		dayproduce: '1 ngày sản xuất',
 		MinLockTime: 'Thời gian khóa tối thiểu',

utils/language/zh_TW.js

@@ -207,7 +207,7 @@ export default {
 		MineDetails: '詳細信息',
 		Record: '記錄',
         Dataisempty:'數據為空',
-		YourBTC: '您的 BTC',
+		YourBTC: '您的',
 		LockBTC: '鎖定',
 		dayproduce: '1天生產',
 		MinLockTime: '最小鎖定時間',

utils/qrCode/wxqrcode.js

@@ -1590,7 +1590,7 @@ var createImgTag = function(width, height, getPixel, alt) {
 var createQrCodeImg = function(text, options) {
 	console.log(text, options)
     options = options || {};
-    var typeNumber = options.typeNumber || 10;
+    var typeNumber = options.typeNumber || 11;
     var errorCorrectLevel = options.errorCorrectLevel || 'M';
     var size = options.size || 500;