2021-5-25 修改tag样式

manifest.json

@@ -4,8 +4,8 @@
     // __UNI__6FC8B70
     // "appid" : "__UNI__6FC8B70",
     "description" : "",
-    "versionName" : "1.1.1",
-    "versionCode" : 111,
+    "versionName" : "1.1.2",
+    "versionCode" : 112,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */

pages/calculation/buyCalculation.vue

@@ -30,7 +30,7 @@
 						<view class="tags">
 							<view class="cell-tip">{{ ls.first_step_time + ls.second_step_time + ls.third_step_time }}天矿机</view>
 							<template v-if="ls.tags[0] !== '0'">
-								<view class="cell-tag" v-for="item  in ls.tags" :key="item">{{item}}</view>
+								<view class="cell-tip" v-for="item  in ls.tags" :key="item">{{item}}</view>
 								<!-- <view class="cell-tag">特价</view> -->
 							</template>
 						</view>
@@ -50,10 +50,10 @@
 						<view class="">合约周期</view>
 						<view class="">{{ ls.first_step_time + ls.second_step_time + ls.third_step_time }}天</view>
 					</view>
-					<view class="tpl">
+					<!-- <view class="tpl">
 						<view class="">上架期</view>
 						<view class="">{{ ls.stand_time }}天</view>
-					</view>
+					</view> -->
 				</view>
 				<view class="cell-info flex">
 					<!-- <view class="tip">剩余数量：{{ls.stock}}/{{ls.all_stock}}T</view> -->
@@ -337,6 +337,7 @@ page {
 			color: #0ec1a1;
 			background-color: #e3f6fa;
 			border-radius: 24rpx 24rpx;
+			margin-right: 20rpx;
 		}
 		.cell-tag {
 			display: inline-block;

pages/calculation/details.vue

@@ -45,6 +45,10 @@
 						<view class="item-title">管理费</view>
 						<view class="item-val">{{ list.service_ratio }}%</view>
 					</view>
+					<view class="list-item">
+						<view class="item-title">上架期</view>
+						<view class="item-val">{{ list.stand_time }}天</view>
+					</view>
 			</view>
 		</view>
 		<view class="list">

pages/finance/details.vue

@@ -16,7 +16,7 @@
 			<image src="../../static/img/img37.png"></image>
 		</view>
 		<view class="list" v-show="list.length > 0">
-			<view class="list-box" v-for="(ls, index) in list" :key="index">
+			<view class="list-box" v-for="(ls, index) in list" :key="index" @click="nav(index)">
 				<view class="flex">
 					<view class="list-tpl flex_item">
 						<image src="../../static/img/img36.png"></image>
@@ -49,6 +49,32 @@
 				</view>
 			</view>
 		</uni-popup>
+		<uni-popup ref="mation" type="center">
+			<view class="popup">
+				<view class="cancel flex" @click="close2"><view class="tip">x</view></view>
+				<view class="list-boxs">
+					<view class="textBox flex">
+						<view class="font">交易前:</view>
+						<view class="number">{{ before * 1 }} {{ code }}</view>
+					</view>
+					<view class="xian"></view>
+					<view class="textBox flex">
+						<view class="font">交易额:</view>
+						<view class="number">{{ pm }}{{ number * 1 }} {{ code }}</view>
+					</view>
+					<view class="xian"></view>
+					<view class="textBox flex">
+						<view class="font">交易后:</view>
+						<view class="number">{{ balance * 1 }} {{ code }}</view>
+					</view>
+					<view class="xian"></view>
+					<scroll-view scroll-y="true" class="textBox">
+						<view class="font">流水详情：</view>
+						<view class="text">{{ text }}</view>
+					</scroll-view>
+				</view>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 <script>
@@ -77,30 +103,39 @@ export default {
 			logo: '',
 			price: '',
 			mark: '',
+			charge: 0,
 
 			_address_qr: '',
 			__money_address: '',
 			ids: '',
 			keysAddr: '',
-			charge: 0,
-			address: '',
+			text: '',
+			balance: '',
+			before: '',
+			number: '',
+			pm: '',
 			way: [],
-			waypath: ''
+			address: '',
+			waypath: '',
+			less: '',
+			page: 1,
+			limit: 5,
+			isLast: true
 		};
 	},
 	onLoad(option) {
-		console.log(option,"detail-option")
-		this.waypath = option.waypath
-		console.log(this.waypath,'+++++++++++++++++++++')
-		this.way = option.way
-		console.log("detail",this.way)
+		console.log(option, 'detail-option');
+		this.waypath = option.waypath;
+		console.log(this.waypath, '+++++++++++++++++++++');
+		this.way = option.way;
+		console.log('detail', this.way);
 		this.code = option.code;
 		this.logo = option.logo;
 		this.name = option.name;
 		this.price = option.price;
 		this.charge = option.charge;
-		this.address = option.address
-		console.log(this.address,"detail")
+		this.address = option.address;
+		console.log(this.address, 'detail');
 		this._address_qr = option._address_qr;
 		this.__money_address = option.__money_address;
 		this.mark = option.mark;
@@ -123,7 +158,7 @@ export default {
 			).then(({ data }) => {
 				obj.typeList = data.type_list;
 				obj.list = data.list;
-				console.log(obj.list)
+				console.log(obj.list);
 			});
 		},
 		// 所有币种
@@ -148,7 +183,7 @@ export default {
 					obj.num = '';
 					obj.code = '';
 					uni.navigateTo({
-						url: '/pages/finance/recharge?LOGO=' + data._address_qr + '&order_id=' + data.order_id + '&ddress=' + data.__money_address + '&id=' + data.id 
+						url: '/pages/finance/recharge?LOGO=' + data._address_qr + '&order_id=' + data.order_id + '&ddress=' + data.__money_address + '&id=' + data.id
 					});
 				})
 				.catch(e => {
@@ -193,11 +228,15 @@ export default {
 					'&ids=' +
 					this.ids +
 					'&keysAddr=' +
-					this.keysAddr + 
-					'&charge=' + this.charge + 
-					'&address=' + this.address + 
-					'&way=' + this.way + 
-					'&waypath=' + this.waypath
+					this.keysAddr +
+					'&charge=' +
+					this.charge +
+					'&address=' +
+					this.address +
+					'&way=' +
+					this.way +
+					'&waypath=' +
+					this.waypath
 			});
 			// this.$refs.popup.open();
 		},
@@ -213,6 +252,54 @@ export default {
 			uni.navigateTo({
 				url
 			});
+		},
+		nav(index) {
+			const obj = this;
+			obj.text = obj.list[index].mark;
+			obj.balance = obj.list[index].balance;
+			obj.number = obj.list[index].number;
+			if (obj.list[index].pm == 1) {
+				obj.pm = '+';
+
+				obj.before = obj.subNum(obj.balance, obj.number);
+			} else {
+				obj.pm = '-';
+				obj.before = this.addNum(obj.balance, obj.number);
+			}
+			this.$refs.mation.open();
+		},
+		addNum(num1, num2) {
+			let sq1, sq2, multiple;
+			try {
+				sq1 = num1.toString().split('.')[1].length;
+			} catch (e) {
+				sq1 = 0;
+			}
+			try {
+				sq2 = num2.toString().split('.')[1].length;
+			} catch (e) {
+				sq2 = 0;
+			}
+			multiple = Math.pow(10, Math.max(sq1, sq2) + 1);
+			return (num1 * multiple + num2 * multiple) / multiple;
+		},
+		close2() {
+			this.$refs.mation.close();
+		},
+		subNum(num1, num2) {
+			let sq1, sq2, multiple;
+			try {
+				sq1 = num1.toString().split('.')[1].length;
+			} catch (e) {
+				sq1 = 0;
+			}
+			try {
+				sq2 = num2.toString().split('.')[1].length;
+			} catch (e) {
+				sq2 = 0;
+			}
+			multiple = Math.pow(10, Math.max(sq1, sq2) + 1);
+			return (num1 * multiple - num2 * multiple) / multiple;
 		}
 	}
 };
@@ -359,4 +446,59 @@ page {
 		}
 	}
 }
+.popup {
+	height: 618rpx;
+	background: #ffffff;
+	box-shadow: 3rpx 3rpx 6rpx 0rpx rgba(31, 31, 31, 0.17);
+	border-radius: 40rpx;
+	width: 700rpx;
+	.cancel {
+		text-align: center;
+		width: 100%;
+		line-height: 60rpx;
+		position: relative;
+		.tip {
+			color: #000000;
+			width: 70rpx;
+			height: 70rpx;
+			position: absolute;
+			top: 0;
+			right: 0;
+			background-color: #fff;
+		}
+	}
+	.list-boxs {
+		width: 90%;
+		margin: 0 auto;
+		margin-top: 100rpx;
+
+		.textBox {
+			padding: 24rpx 18rpx;
+			.font {
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #4f4f4f;
+			}
+			.number {
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #fb3a2f;
+			}
+			.text {
+				text-indent: 2em;
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #4f4f4f;
+			}
+		}
+		.xian {
+			width: 100%;
+			height: 1px;
+			background: #e7dfe8;
+		}
+	}
+}
 </style>

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://service.dcloud.net.cn/build/download/ecce3af0-bc46-11eb-a090-b920f1e58f65
+https://service.dcloud.net.cn/build/download/93bfe4d0-bd35-11eb-97fa-398221cd7c02