[发布商品认证及商品认证展示，详情页面水晶展示位置]

pages/goods/tracedTo.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="GoodsAuthentication">
-		<view class="authenticationTop" v-if='list.length>0'>区块链溯源码：{{info.token}}</view>
+		<view class="authenticationTop" v-if='list.length>0'>权证溯源码：{{info.token}}</view>
 		<!-- 进度条 -->
 		<view v-if='list.length>0' class='timeAxis'>
 			<view class="box-top" v-for="(item,index) in list" :key="index">
-				<view class="left-box-top"><span>{{index === list.length - 1?item.note:'权证交易'}}</span>{{item.blockTime}}</view>
+				<view class="left-box-top"><span>{{item.title}}</span>{{item.blocked_at}}</view>
 				<!-- 左边 -->
 				<view class="line" :class="{active:true,none:index==(list.length-1)}">
 					<!-- 中线 -->
@@ -24,18 +24,26 @@
 								<view class="content">{{item.goods.skus.unit}}</view>
 							</view>
 							<view class="authenticationItemcontentItem">
-								<view class="title">{{index === list.length - 1?'初始发行量':'交易数量'}}：</view>
+								<view class="title">{{item.type}}数量：</view>
 								<view class="content">{{item.amount}}</view>
 							</view>
 							<view class="authenticationItemcontentItem">
 								<view class="title">区块链高度：</view>
 								<view class="content">{{item.height}}</view>
 							</view>
-							<view class="authenticationItemcontentItem">
-								<view class="title">交易哈希：</view>
-								<view class="content">{{item.hash}}</view>
+							<view class="authenticationItemcontentItem" v-if="item.from_user.nickname">
+								<view class="title">HashFrom：</view>
+								<view class="content"><image :src="item.from_user.avatar" mode="widthFix"/> {{item.from_user.nickname}}</view>
 							</view>
-							<view class="zhushi">注释：{{item.note}}</view>
+							<view class="authenticationItemcontentItem">
+								<view class="title">Hash：</view>
+								<view class="content hash">{{item.hash}}</view>
+							</view>
+							<view class="authenticationItemcontentItem" v-if="item.to_user.nickname">
+								<view class="title">HashTo：</view>
+								<view class="content"><image :src="item.to_user.avatar" mode="widthFix"/>{{item.to_user.nickname}}</view>
+							</view>
+							<view class="zhushi">注释：{{item.remark}}</view>
 						</view>
 					</view>
 				</view>
@@ -50,29 +58,39 @@
 
 <script>
 	import {
-		managesTracedTo,
-		checkmessage
+		managesTracedTo
 	} from '@/apis/interfaces/goods'
 	export default {
 		data() {
 			return {
-				list: '',
-				info: ''
+				list: [],
+				info: {},
+				has_more:true,
+				page:1
 			}
 		},
 		created() {
-			managesTracedTo(this.$Route.query.id).then(res1 => {
-				console.log(res1)
-				this.list= res1.list
-				this.info = res1
-				checkmessage(this.$Route.query.id).then(res => {
-					this.list.push(res)
+			this.getList()
+		},
+		onReachBottom(){
+			if(this.has_more){
+				this.getList()
+			}else{
+				uni.showToast({
+					title:'没有更多',
+					icon:'none',
+					mask:true
 				})
-				
-			})
-
+			}
 		},
 		methods: {
+			getList(){
+				managesTracedTo(this.$Route.query.id,this.page).then(res1 => {
+					this.list= this.list.concat(res1.logs.data)
+					this.info = res1
+					this.has_more = res1.logs.page.has_more
+				})
+			},
 			priveImg(img) {
 				uni.previewImage({
 					current: img, // 当前显示图片的http链接
@@ -207,11 +225,26 @@
 						.title {
 							width: 160rpx;
 						}
-
-						.content {
-							text-overflow: ellipsis;
+						.hash{
 							width: calc(100% - 180rpx);
-							word-wrap: break-word;
+							word-wrap: break-word !important;
+						}
+						.content {
+							display: flex;
+							flex-direction: row;
+							align-items: center;
+							justify-content: flex-start;
+							box-sizing: border-box;
+							color: #999;
+							overflow: hidden;
+							text-overflow: ellipsis;
+							white-space: nowrap;
+							image{
+								width: 40rpx;
+								height: 40rpx;
+								border-radius: 50%;
+								margin-right: $padding * .3;
+							}
 						}
 
 						.img {