Browse Source

2023-11-23

cmy 2 years ago
parent
commit
372092974e

+ 5 - 5
pages/collection/chain.vue

@@ -6,10 +6,10 @@
 				<text>地址</text>
 				<input type="text" v-model="payment" value="" placeholder="请输入地址" />
 			</view>
-			<view class="item ">
+			<!-- <view class="item ">
 				<text>姓名</text>
 				<input type="text" v-model="name" value="" placeholder="请输入姓名" />
-			</view>
+			</view> -->
 			<view class="item top">
 				<text>链名</text>
 				<input type="text" v-model="bank" value="" placeholder="请输入链名" />
@@ -135,9 +135,9 @@
 				if (!obj.payment) {
 					return this.$api.msg('请输入地址');
 				}
-				if (!obj.name) {
-					return this.$api.msg('请输入姓名');
-				}
+				// if (!obj.name) {
+				// 	return this.$api.msg('请输入姓名');
+				// }
 				if (!obj.bank) {
 					return this.$api.msg('请输入链');
 				}

+ 6 - 6
pages/collection/collection.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<view class="collection-box">
-			<view class="collection-item" @click="nav('/pages/collection/bank')">
+			<!-- <view class="collection-item" @click="nav('/pages/collection/bank')">
 				<view class="left">
 					<view class="img"><image src="../../static/user/mybank.png" mode=""></image></view>
 					<view class="bank">银行卡</view>
@@ -11,8 +11,8 @@
 					<view class="status" v-else>未添加</view>
 					<view class="img1"><text class="iconfont iconenter"></text></view>
 				</view>
-			</view>
-			<view class="collection-item" @click="nav('/pages/collection/zfb')">
+			</view> -->
+			<!-- <view class="collection-item" @click="nav('/pages/collection/zfb')">
 				<view class="left">
 					<view class="img"><image src="../../static/user/zfb.png" mode=""></image></view>
 					<view class="bank">支付宝</view>
@@ -22,8 +22,8 @@
 					<view class="status" v-else>未添加</view>
 					<view class="img1"><text class="iconfont iconenter"></text></view>
 				</view>
-			</view>
-			<view class="collection-item" @click="nav('/pages/collection/wx')">
+			</view> -->
+			<!-- <view class="collection-item" @click="nav('/pages/collection/wx')">
 				<view class="left">
 					<view class="img">
 						<image src="../../static/user/wx.png" mode=""></image>
@@ -39,7 +39,7 @@
 						<text class="iconfont iconenter"></text>
 					</view>
 				</view>
-			</view>
+			</view> -->
 			<view class="collection-item" @click="nav('/pages/collection/chain')">
 				<view class="left">
 					<view class="img"><image src="../../static/icon/user_page.png" mode=""></image></view>

+ 3 - 2
pages/hall/halllist.vue

@@ -25,7 +25,7 @@
 					</view>
 					<view class="mmain-time" style="margin-top: 28rpx;">预约时间:{{ item.add_time }}-{{ item.end_time }}
 					</view>
-					<view class="mmain-time">入场时间:{{ item.radd_time | ahead }}-{{ item.rend_time }}</view>
+					<view class="mmain-time">付款时间:{{ item.radd_time | ahead }}-{{ item.rend_time }}</view>
 					<view class="mmain-time flex">
 						<view class="mmain-font">距预约结束:</view>
 
@@ -157,6 +157,7 @@
 				this.wx = data.wx;
 				this.aliData = data.zfb;
 				this.bankData = data.bank;
+				this.chain = data.chain;
 			});
 			this.loadData();
 		},
@@ -213,7 +214,7 @@
 				});
 			},
 			open(item) {
-				if (this.wx == '' && this.aliData == '' && this.bankData == '') {
+				if (this.wx == '' && this.aliData == '' && this.bankData == ''&&this.chain=='') {
 					uni.showModal({
 						title: '提示',
 						content: '您未填写收款信息无法参与,是否前去填写收款信息?',

+ 20 - 4
pages/order/hallorderDetail.vue

@@ -55,8 +55,8 @@
 				</view>
 			</view>
 			<view class="main">
-				<view class="main-tip">卖家收款方式</view>
-				<view class="main-title flex">
+				<!-- <view class="main-tip">卖家收款方式</view> -->
+				<!-- <view class="main-title flex">
 					<view class="main-item">
 						<view class="mt-item" @click="change('0')" :class="{ current: tabCurrentIndex === 0 }" v-if="zfb != ''">
 							<image class="mt-image" :src="tabCurrentIndex == 0 ? '../../static/img/aliD.png' : '../../static/img/ali.png'" mode=""></image>
@@ -81,8 +81,24 @@
 							<view class="mt-font" :class="{ current: tabCurrentIndex === 3 }">钱包</view>
 						</view>
 					</view>
+				</view> -->
+				<view class="swiper-box" v-if="chain != ''">
+					<view class="tc-item flex">
+						<view class="tcitem-name">地址</view>
+						<view class="ali-name">{{ chain.payment }}</view>
+						<image class="tcitem-image" src="../../static/img/copy.png" mode="" @click="copy(chain.payment)"></image>
+					</view>
+					<view class="tc-item flex">
+						<view class="tcitem-name">链名</view>
+						<view class="ali-name">{{ chain.bank }}</view>
+						<image class="tcitem-image" src="../../static/img/copy.png" mode="" @click="copy(chain.bank)"></image>
+					</view>
+					<view class="tc-item">
+						<view class="upload-title" style="color: #9d9d9d;">钱包二维码</view>
+						<view class="upload-main" @click="lookimg(chain.image)"><image class="upload-image" :src="chain.image" mode="aspectFit"></image></view>
+					</view>
 				</view>
-				<swiper
+				<!-- <swiper
 					class="swiper-box"
 					:duration="500"
 					@change="changeTab"
@@ -173,7 +189,7 @@
 						</scroll-view>
 					</swiper-item>
 					<swiper-item class="tab-content" v-else></swiper-item>
-				</swiper>
+				</swiper> -->
 			</view>
 			<view class="zf flex">
 				<view class="title-left"><text class="title">支付凭证(点击右边图片查看大图):</text></view>