123456

components/js_sdk/xb-copy/uni-copy.js

@@ -0,0 +1,33 @@
+export default function uniCopy(content) {
+	/**
+	 * 小程序端 和 app端的复制逻辑
+	 */
+	//#ifndef H5
+	uni.setClipboardData({
+		data: content,
+		success: function() {
+			console.log('success');
+			return true
+		}
+	});
+	//#endif
+	
+	/**
+	 * H5端的复制逻辑
+	 */
+	// #ifdef H5
+	if (!document.queryCommandSupported('copy')) { //为了兼容有些浏览器 queryCommandSupported 的判断
+		// 不支持
+		return false
+	}
+	let textarea = document.createElement("textarea")
+	textarea.value = content
+	textarea.readOnly = "readOnly"
+	document.body.appendChild(textarea)
+	textarea.select() // 选择对象
+	textarea.setSelectionRange(0, content.length) //核心
+	let result = document.execCommand("copy") // 执行浏览器复制命令
+	textarea.remove()
+	return result
+	// #endif
+}

pages/hall/hallinfo.vue

@@ -26,7 +26,7 @@
 				<view class="hot-price">
 					<view class="price">
 						<text class="font-size-sm">￥</text>
-						{{ item.price }}
+						{{ item.hanging_price }}
 					</view>
 				</view>
 			</view>

pages/hall/halllist.vue

@@ -202,6 +202,7 @@ export default {
 							}
 						}
 				})
+				return
 			}
 			if(item.sta != 1) {
 				this.id = item.id

pages/hall/hallpay.vue

@@ -8,7 +8,10 @@
 				</view>
 				<!-- <image class="top-image" src="../../static/img/copy.png" mode=""></image> -->
 			</view>
-			<view class="downtime">
+			<view class="downtime" v-if="stopTime.stopTimeH < 0 || stopTime.stopTimeM < 0 || stopTime.stopTimeS < 0">
+				订单已过期
+			</view>
+			<view class="downtime" v-else>
 				<uni-countdowns
 					color="#FFFFFF"
 					splitor-color="#FD3B39"
@@ -61,29 +64,29 @@
 					</view>
 				</view>
 			</view>
-			<swiper class="swiper-box" :current="tabCurrentIndex" :duration="500" @change="changeTab" :style="{ height: tabCurrentIndex == 2 ? '450rpx' : '280rpx' }">
+			<swiper class="swiper-box"  :duration="500" @change="changeTab" :style="{ height: tabCurrentIndex == 2 ? '450rpx' : '280rpx' }">
 				<swiper-item class="tab-content" v-if="zfb != ''">
 					<view class="tc-item flex">
 						<view class="tcitem-name">账号</view>
 						<view class="ali-name">{{ zfb.payment }}</view>
-						<image class="tcitem-image" src="../../static/img/copy.png" mode=""></image>
+						<image class="tcitem-image" src="../../static/img/copy.png" mode="" @click="copy(zfb.payment)"></image>
 					</view>
 					<view class="tc-item flex">
 						<view class="tcitem-name">姓名</view>
 						<view class="ali-name">{{ zfb.name }}</view>
-						<image class="tcitem-image" src="../../static/img/copy.png" mode=""></image>
+						<image class="tcitem-image" src="../../static/img/copy.png" mode="" @click="copy(zfb.name)"></image>
 					</view>
 				</swiper-item>
 				<swiper-item class="tab-content" v-if="bank != ''">
 					<view class="tc-item flex">
 						<view class="tcitem-name">姓名</view>
 						<view class="ali-name">{{ bank.name }}</view>
-						<image class="tcitem-image" src="../../static/img/copy.png" mode=""></image>
+						<image class="tcitem-image" src="../../static/img/copy.png" mode="" @click="copy(bank.name)"></image>
 					</view>
 					<view class="tc-item flex">
 						<view class="tcitem-name">银行</view>
 						<view class="ali-name">{{ bank.bank }}</view>
-						<image class="tcitem-image" src="../../static/img/copy.png" mode=""></image>
+						<image class="tcitem-image" src="../../static/img/copy.png" mode="" @click="copy(bank.bank)"></image>
 					</view>
 					<!-- <view class="tc-item flex">
 						<view class="tcitem-name">开户行</view>
@@ -93,19 +96,19 @@
 					<view class="tc-item flex">
 						<view class="tcitem-name">账号</view>
 						<view class="ali-name">{{ bank.payment }}</view>
-						<image class="tcitem-image" src="../../static/img/copy.png" mode=""></image>
+						<image class="tcitem-image" src="../../static/img/copy.png" mode="" @click="copy(bank.payment)"></image>
 					</view>
 				</swiper-item>
 				<swiper-item class="tab-content" v-if="wx != ''">
 					<view class="tc-item flex">
 						<view class="tcitem-name">账号</view>
 						<view class="ali-name">{{ wx.payment }}</view>
-						<image class="tcitem-image" src="../../static/img/copy.png" mode=""></image>
+						<image class="tcitem-image" src="../../static/img/copy.png" mode="" @click="copy(wx.payment)"></image>
 					</view>
 					<view class="tc-item flex">
 						<view class="tcitem-name">姓名</view>
 						<view class="ali-name">{{ wx.name }}</view>
-						<image class="tcitem-image" src="../../static/img/copy.png" mode=""></image>
+						<image class="tcitem-image" src="../../static/img/copy.png" mode="" @click="copy(wx.name)"></image>
 					</view>
 					<view class="tc-item">
 						<view class="upload-title" style="color: #9d9d9d;">微信二维码</view>
@@ -140,6 +143,7 @@
 
 <script>
 import uniCountdowns from '@/components/uni-countdown/uni-countdowns.vue';
+import uniCopy from '@/components/js_sdk/xb-copy/uni-copy.js';
 import { user_auction_order,upload,up_image } from '@/api/order.js';
 import { timeComputed } from '@/utils/rocessor.js';
 export default {
@@ -177,7 +181,8 @@ export default {
 		},
 		loadData() {
 			user_auction_order({ type: 1, order_id: this.id }).then(({ data }) => {
-				let now_time = timeComputed(data.time);
+				let now_time = timeComputed(data.time+3600);
+				console.log(now_time);
 				this.stopTime.stopTimeH = now_time.hours;
 				this.stopTime.stopTimeM = now_time.minutes;
 				this.stopTime.stopTimeS = now_time.seconds;
@@ -185,6 +190,14 @@ export default {
 				this.zfb = data.zfb;
 				this.wx = data.wx;
 				this.bank = data.bank;
+				console.log(data.zfb.length,"123456");
+				if(data.zfb.length == []){
+					this.tabCurrentIndex = 1
+					if(data.bank .length == []) {
+						this.tabCurrentIndex = 2
+					}
+				}
+				console.log(this.tabCurrentIndex);
 			});
 		},
 		open() {
@@ -198,8 +211,26 @@ export default {
 				url
 			});
 		},
+		copy(value) {
+			let obj = this;
+			let content = value; //需要复制的内容
+			console.log('复制的内容:', content);
+			// content = typeof content === 'string' ? content : content.toString(); // 复制内容，必须字符串，数字需要转换为字符串
+			const result = uniCopy(content);
+			if (result === false) {
+				uni.showToast({
+					title: '不支持'
+				});
+			} else {
+				uni.showToast({
+					title: '复制成功',
+					icon: 'none'
+				});
+			}
+		},
 		tocall() {
 			let num = this.zfb != ''? this.zfb.phone : this.wx != '' ? this.wx.phone : this.bank.phone
+			console.log(num);
 			uni.makePhoneCall({
 				phoneNumber: num //仅为示例
 			});
@@ -215,6 +246,9 @@ export default {
 			this.tabCurrentIndex = num * 1;
 		},
 		buy() {
+			if (this.image == ''){
+				return this.$api.msg('请上传支付凭证')
+			}
 			up_image({id:this.info.id,image: this.image}).then(({data}) => {
 				uni.navigateTo({
 					url:'/pages/money/success'

pages/hall/history.vue

@@ -3,29 +3,17 @@
 		<view class="product">
 			<image class="product-image" :src="info.image" mode=""></image>
 			<view class="product-font font1">{{info.name}}</view>
-			<view class="product-font font2">艺术家：{{info.user_nickname}}</view>
+			<view class="product-font font2" v-if="info.user_nickname">艺术家：{{info.user_nickname}}</view>
 			<view class="product-font font2">{{info.create_time | time}}</view>
 		</view>
-		<view class="main">
+		<view class="main" v-if="list.length != 0">
 			<view class="main-item">
 				<view class="main-left">日期</view>
 				<view class="main-right">归属人</view>
 			</view>
-			<view class="main-item">
-				<view class="main-left">2022年01月20日</view>
-				<view class="main-right">林兰</view>
-			</view>
-			<view class="main-item">
-				<view class="main-left">2022年01月20日</view>
-				<view class="main-right">林兰</view>
-			</view>
-			<view class="main-item">
-				<view class="main-left">2022年01月20日</view>
-				<view class="main-right">林兰</view>
-			</view>
-			<view class="main-item">
-				<view class="main-left">2022年01月20日</view>
-				<view class="main-right">林兰</view>
+			<view class="main-item" v-for="(item,index) in list" :key="index">
+				<view class="main-left">{{item.create_time | time}}</view>
+				<view class="main-right">{{item.nickname}}</view>
 			</view>
 		</view>
 		<!-- <view class="ma">
@@ -46,11 +34,12 @@ export default {
 		return {
 			id:'',
 			info:'',
+			list:[],
 		}
 	},
 	filters:{
 		time(e){
-			if(e != ''){
+			if(e){
 				let times = e.split(" ")
 				let years = times[0].split("-")
 				return years[0]+'年'+years[1]+'月'+years[2]+'日'
@@ -65,9 +54,11 @@ export default {
 	methods: {
 		loadData() {
 			belong({product_id: this.id}).then(({data}) =>{
+				this.list = data
 				console.log(data);
 				details({product_id: this.id}).then(({data}) =>{
 					this.info = data
+					console.log(info);
 				}).catch(e =>{
 					
 				})

pages/hall/porducthall.vue

@@ -133,9 +133,9 @@ export default {
 			details({product_id: this.id}).then(({data}) =>{
 				console.log(data);
 				this.imageList = data.slider_image
-				if (data.description != null) {
+				if (data.description != '') {
 					data.description = data.description.replace(/\<img/gi, '<img class="rich-img"');
-				} //小程序商品详情图超出屏幕问题
+				} 
 				this.info = data
 			}).catch(e =>{
 				

pages/index/index.vue

@@ -65,11 +65,11 @@
 			</view>
 		</view>
 		<!-- <view class="product"><image class="product-image" src="../../static/img/index-product.png" mode=""></image></view> -->
-		<view class="shingle">
+		<view class="shingle" v-if="list">
 			<view class="shingle-top flex">
-				<view class="shingle-title">艺术品挂牌交易区</view>
+				<view class="shingle-title">易趣竞拍游戏区</view>
 				<view class="shingle-btn" @click="nav('/pages/hall/hall')">
-					查看更多趣豆会馆
+					查看更多易趣会馆
 					<text>></text>
 				</view>
 			</view>
@@ -164,7 +164,7 @@ export default {
 			stop:[],
 		};
 	},
-	onLoad() {
+	onShow() {
 		this.loadData();
 		this.getaddress();
 	},

pages/money/money.vue

@@ -103,6 +103,9 @@ export default {
 	onLoad() {
 		this.loadData();
 	},
+	onReachBottom() {
+		this.loadData();
+	},
 	methods: {
 		loadData() {
 			const obj = this;

pages/public/register.vue

@@ -17,7 +17,7 @@
 				<view class="login_img"><image src="/static/icon/img04.png"></image></view>
 				<view class="login_name"><input class="uni-input" type="password" v-model="repassword" focus placeholder="请重复输入密码" /></view>
 			</view>
-			<view class="login_input flex" style="display: none;">
+			<view class="login_input flex" >
 				<view class="login_img"><image src="/static/icon/img07.png"></image></view>
 				<view class="login_name"><input class="uni-input" type="text" v-model="invitation" focus placeholder="请输入邀请码" /></view>
 			</view>

pages/user/user.vue

@@ -4,10 +4,10 @@
 		<view class="user-top">
 			<image src="../../static/img/user-bg.png" mode="" class="user-top-bg"></image>
 			<view class="user-info" @click="navTo('/pages/set/set')">
-				<image class="avtar" :src="userInfo.avatar" mode=""></image>
-				<view class="name">{{ userInfo.nickname }}</view>
-				<view class="phone">{{ userInfo.phone }}</view>
-				<view class="vip">
+				<image class="avtar" :src="userInfo.avatar || '/static/error/missing-face.png'" mode=""></image>
+				<view class="name">{{ userInfo.nickname || '游客' }}</view>
+				<view class="phone" v-if="userInfo.uid">ID号：{{ userInfo.uid }}</view>
+				<view class="vip" v-if="userInfo.level_name">
 					<image class="vip-bg" src="../../static/img/vip.png" mode=""></image>
 					<view class="vip-title">{{userInfo.level_name}}</view>
 				</view>
@@ -311,6 +311,11 @@
 					if(url == '/pages/user/approve'){
 						rate({}).then(e =>{
 							console.log(e);
+							if(e.data.is_auth == null){
+								uni.navigateTo({
+									url
+								});
+							}
 							if(e.data.is_auth == 0){
 								uni.navigateTo({
 									url

store/index.js

@@ -7,7 +7,7 @@ const store = new Vuex.Store({
 	namespaced: true,
 	state: {
 		// baseURL:"http://yrh.liuniu946.com",//'http://eb.shuibo.net',//请求地址配置 
-		baseURL:'http://base.liuniu946.com',//请求地址配置 
+		baseURL:'http://qudou.frp.liuniu946.com',//请求地址配置 
 		urlFile:'/index',//项目部署所在文件夹
 		userInfo: {}, //登录信息
 		loginInterceptor:false,//是否打开强制登录

unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>商城</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.d618d095.js></script><script src=/index/static/js/index.06262a99.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.d618d095.js></script><script src=/index/static/js/index.e2186282.js></script></body></html>