2024-4-24

pages/index/index.vue

@@ -47,14 +47,14 @@
 				<image src="/static/image/img12.png" style="width: 75rpx;" mode="widthFix"></image>
 				<view class="starText">
 					<view class="name">okx(欧易)</view>
-					<view class="num">7.21</view>
+					<view class="num">{{baseData.ok_price}}</view>
 				</view>
 			</view>
 			<view class="starTpl flex_item">
 				<image src="/static/image/img13.png" style="width: 75rpx;" mode="widthFix"></image>
 				<view class="starText">
 					<view class="name">STAR(星空）</view>
-					<view class="num">7.21</view>
+					<view class="num">{{baseData.us_price}}</view>
 				</view>
 			</view>
 		</view>
@@ -147,6 +147,10 @@
 				active_user: '0',
 				swiperList:['/static/image/img05.png'],
 				kefu:'ch125221',
+				baseData:{
+					ok_price:0,
+					us_price:0
+				}
 			}
 		},
 		computed: {
@@ -219,6 +223,7 @@
 						data
 					}) => {
 						this.active_user = data.active_user
+						this.baseData = data;
 						console.log(data);
 					})
 					.catch(e => {});

pages/index/order.vue

@@ -13,7 +13,7 @@
 			</view>
 		</view>
 		<view class="listItemBox">
-			<view class="listItem" v-for="item,index in list" :key="index" @click="navItem(item)">
+			<view class="listItem" v-for="item,index in list" :key="index" @click="navItemTo(item)">
 				<view class="itemInfo flex">
 					<view class="flex_item">
 						<image src="/static/image/img20.png" style="width: 55rpx;" mode="widthFix"></image>
@@ -30,15 +30,15 @@
 				</view>
 				<view class="itemTip flex">
 					<view class="tipBox">
-						<view class="tipText">数量：{{re.num}}{{re.money_type}}</view>
-						<view class="tipText">总价：￥{{re.money}}</view>
-						<view class="tipText">2023-04-25 14:20:30</view>
+						<view class="tipText">数量：{{item.num}}{{item.money_type}}</view>
+						<view class="tipText">总价：￥{{item.money}}</view>
+						<view class="tipText">{{item.add_time|dateFormat}}</view>
 					</view>
 					<view class="" style="text-align: right;">
 						<image src="/static/image/img21.png" style="width: 40rpx;margin-bottom: 25rpx;" mode="widthFix">
 						</image>
 						<view class="tipBtn" v-if="item.voucher">查看凭证</view>
-						<view class="tipBtn" @click.stop="navItem(item)" v-if="status==3">上传凭证</view>
+						<view class="tipBtn" v-if="status==3">上传凭证</view>
 					</view>
 				</view>
 			</view>
@@ -54,10 +54,16 @@
 	import {
 		mapState
 	} from 'vuex';
+	import dayjs from '@/libs/dayjs/dayjs.min.js';
 	export default {
 		computed: {
 			...mapState('user', ['hasLogin'])
 		},
+		filters: {
+			dateFormat: function(value) {
+				return dayjs(value * 1000).format('YYYY/MM/DD HH:mm');
+			}
+		},
 		data() {
 			return {
 				tabIndex: 0, //当前选中的一级分类
@@ -102,6 +108,11 @@
 			this.loadData()
 		},
 		methods: {
+			navItemTo(item){
+				uni.navigateTo({
+					url:`/pages/index/orderDetail?id=${item.id}`
+				})
+			},
 			loadData() {
 				let obj = this;
 				if (obj.loadingType == "nomore" ||
@@ -125,9 +136,10 @@
 						status:obj.status
 					}, obj.status).then(res => {
 						let ar = res.data.list.map((re)=>{
-							re.num = +re.mum;
+							console.log(re,'re');
+							re.num = +re.num;
 							re.price = +re.price;
-							re.money = +(re.mum*re.price).toFixed(8);
+							re.money = +(re.num*re.price).toFixed(8);
 							
 							return re
 						})

pages/index/orderDetail.vue

@@ -3,21 +3,11 @@
 		<view class="recharge">
 			<view class="example-title flex_item">
 				<view class="titleTip"></view>
-				<view class="">充值地址</view>
+				<view class="">充值信息</view>
 			</view>
 			<view class="infoBox">
-				<view class="tplName">链名称</view>
-				<view class="tplNum">USDT-TRC20</view>
 				<view class="tplAddr">收款地址<text>{{dataMoney.address}}</text></view>
 			</view>
-			<view class="code">
-				<image :src="er_code" mode=""></image>
-				<!-- #ifdef H5 || APP-PLUS -->
-				<zb-code ref="qrcode" :show="codeShow" :cid="cid" :val="val" :size="size" :unit="unit"
-					:background="background" :foreground="foreground" :pdground="pdground" :icon="codeIcon"
-					:iconSize="iconsize" :onval="onval" :loadMake="loadMake" @result="qrR" />
-				<!-- #endif -->
-			</view>
 			<view class="flex btnBox">
 				<!-- #ifdef APP -->
 				<view class="btn margin-r-30" @click="domImage">保存相册</view>
@@ -26,11 +16,6 @@
 			</view>
 		</view>
 		<view class="login_text">
-			<view class="login_input flex" style="padding-top: 45rpx;">
-				<view class="login_img">金额</view>
-				<view class="login_name"><input class="uni-input" type="text" v-model="money" placeholder="请输入充值金额" />
-				</view>
-			</view>
 			<view class="login_input flex">
 				<view class="login_img"><text>打款凭证</text></view>
 				<view class="login_name" @click="scImg">
@@ -45,17 +30,6 @@
 			<view class="submission"><button class="golden" type="golden" hover-class="none"
 					@click="submission">确认提交</button></view>
 		</view>
-		<view class="login_text">
-			<view class="tip">
-				<view>
-					<text>
-						该地址仅支持 USDT-TRC20 收款请勿用于其他币种，否则资产将不可找回</br>
-						从易趣付之外地址转入的资金，需要在完成交易的120分钟后，才能将资产转账给易币付其他用户或提到钱包以外的地址 最小收款金额:
-						0.0001USDT小于最小金额的收款将不会上账且无法退回1次网络确认后可到账，1次网络确认后可转账。您的充值地址不会经常改变，可截图保存并重复充值。
-					</text>
-				</view>
-			</view>
-		</view>
 	</view>
 </template>
 <script type="text/javascript">