123

api/hall.js

@@ -89,3 +89,12 @@ export function hanging_sale(data) {
 		data
 	});
 }
+
+//购买倒计时
+export function count_down(data) {
+	return request({
+		url: '/api/auction/count_down',
+		method: 'get',
+		data
+	});
+}

api/order.js

@@ -197,3 +197,21 @@ export function untreated(data) {
 		data
 	});
 }
+
+//申诉
+export function plead(data) {
+	return request({
+		url: '/api/auction/plead',
+		method: 'post',
+		data
+	});
+}
+
+//撤销申诉
+export function revoke(data) {
+	return request({
+		url: '/api/auction/revoke',
+		method: 'post',
+		data
+	});
+}

components/ss-calendar/ss-calendar.vue

@@ -14,7 +14,22 @@
 						<image v-else :src="checksIcon" mode="aspectFit"></image>
 						<view class="check_text" v-if="checkTextShow">{{ dayLoad(index) }}</view>
 					</view>
-					<text class="current-box"  v-else>{{ item }}</text>
+					<text class="current-box" v-else>{{ item }}</text>
+				</view>
+			</view>
+		</view>
+		<view class="header" v-if="nextMounth">
+			<view class="current-date">{{ currentDate1 }}</view>
+		</view>
+		<view class="body" v-if="nextMounth">
+			<view class="day__list">
+				<view class="day__item" v-for="(item, index) in dateData1" :key="index">
+					<view class="checked-box" :class="[checksClass]" v-if="item === 'checked'">
+						<text class="checked iconfavor" v-if="!checksIcon"></text>
+						<image v-else :src="checksIcon" mode="aspectFit"></image>
+						<view class="check_text" v-if="checkTextShow">{{ dayLoad(index) }}</view>
+					</view>
+					<text class="current-box" v-else>{{ item }}</text>
 				</view>
 			</view>
 		</view>
@@ -32,6 +47,10 @@ export default {
 				return [];
 			}
 		},
+		nextMounth: {
+			type: Boolean,
+			default: false
+		},
 		// 选中物品的样式类
 		checksClass: {
 			type: String,
@@ -43,7 +62,7 @@ export default {
 		},
 		// 选中时是否显示文字
 		checkTextShow: {
-			type: Boolean, 
+			type: Boolean,
 			default: false
 		},
 		// 表示当前日期的样式
@@ -55,13 +74,17 @@ export default {
 	data() {
 		const { year, month, day } = this.getDate();
 		const dateData = this.getDateData(year, month);
-		const noDay = ( new Date(year,month-1,1)).getDay();
+		const dateData1 = this.getDateData(year, month + 1);
+		const noDay = new Date(year, month - 1, 1).getDay();
+		const noDay1 = new Date(year, month, 1).getDay();
 		return {
 			year,
 			month,
 			day,
 			dateData,
-			noDay,//本月1号是星期几
+			dateData1,
+			noDay, //本月1号是星期几
+			noDay1, //下个月1号是星期几
 			weeks: ['日', '一', '二', '三', '四', '五', '六'],
 		};
 	},
@@ -69,24 +92,34 @@ export default {
 		// 获取当前日期
 		currentDate() {
 			return `${this.year}-${this.format(this.month)}`;
+		},
+		// 获取下个月日期
+		currentDate1() {
+			return `${this.year}-${this.format(this.month + 1)}`;
 		}
 	},
 	watch: {
 		checks(val) {
+			console.log(val,"123456");
 			const { year, month } = this.getDate();
 			const dateData = this.getDateData(year, month);
+			const dateData1 = this.getDateData1(year, month + 1);
 			// 保存当前月份信息
 			this.dateData = dateData;
-		},
+			this.dateData1 = dateData1;
+		}
 	},
 	methods: {
 		// 重新计算时间
 		dayLoad: function(value) {
-			return value + 1 - this.noDay;
+			if(this.nextMounth) {
+				return value + 1 - this.noDay1;
+			}else {
+				return value + 1 - this.noDay;
+			}
 		},
 		// 获取当前日期
 		getDate(current) {
-			console.log(current);
 			const date = current ? new Date(current) : new Date();
 			const year = date.getFullYear();
 			// 月份值默认从0开始
@@ -101,9 +134,38 @@ export default {
 		// 日期处理
 		getDateData(year, month) {
 			// 新增月份时需要减少1个月
-			const date = new Date(year,month-1,1);
+			const date = new Date(year, month - 1, 1);
+			const firstDayWeek = date.getDay();
+			let data
+			if(this.nextMounth) {
+				data = [...this.getEmptys(firstDayWeek), ...this.getDays1(firstDayWeek)];
+			}else {
+				data = [...this.getEmptys(firstDayWeek), ...this.getDays(firstDayWeek)];
+			}
+			const day = new Date().getDate();
+			if(this.nextMounth) {
+				const cd = data.indexOf(day);
+				let del = (cd - cd%7);
+				for(let i=0;i<del;i++) {
+					data.shift()
+				}
+			} 
+			console.log(data);
+			return data;
+		},
+		// 下个月日期处理
+		getDateData1(year, month) {
+			// 新增月份时需要减少1个月
+			const date = new Date(year, month - 1, 1);
 			const firstDayWeek = date.getDay();
-			const data = [...this.getEmptys(firstDayWeek), ...this.getDays(firstDayWeek)];
+			let data
+			if(this.nextMounth) {
+				data = [...this.getEmptys(firstDayWeek), ...this.getDays(firstDayWeek)];
+			}else {
+				data = [...this.getEmptys(firstDayWeek), ...this.getDays1(firstDayWeek)];
+			}
+			
+			data.length = 14
 			return data;
 		},
 		// 查询日期列表有几个空格
@@ -136,6 +198,14 @@ export default {
 			}
 			return days;
 		},
+		getDays1() {
+			const lastDay = this.getLastDay();
+			const days = [];
+			for (let i = 1; i <= lastDay; i++) {
+				days.push(this.checks.includes(i) ? 'checked' : i);
+			}
+			return days;
+		},
 		format(num) {
 			return num < 10 ? `0${num}` : num;
 		}
@@ -206,12 +276,12 @@ export default {
 					height: 56rpx;
 					border-radius: 6rpx;
 					font-size: 40rpx;
-					background-color: #FBED66;
+					background-color: #fbed66;
 					color: #fff;
 				}
 				.current {
 					padding: 18rpx;
-					background-color: #FBED66;
+					background-color: #fbed66;
 					color: #fff;
 					font-size: 28rpx;
 				}

pages.json

@@ -341,12 +341,6 @@
 				}
 			}
 		},
-		{
-			"path": "pages/user/withdrawal",
-			"style": {
-				"navigationBarTitleText": "奖励提现"
-			}
-		},
 		{
 			"path": "pages/user/notice",
 			"style": {
@@ -395,16 +389,6 @@
 				}
 			}
 		},
-		{
-			"path": "pages/order/order1",
-			"style": {
-			"navigationStyle":"custom",
-				"navigationBarTitleText": "",
-				"app-plus": {
-					"bounce": "none"
-				}
-			}
-		},
 		{
 			"path": "pages/order/order1",
 			"style": {
@@ -428,6 +412,15 @@
 					"bounce": "none"
 				}
 			}
+		},
+		{
+			"path": "pages/order/hallorderDetail",
+			"style": {
+				"navigationBarTitleText": "订单详情",
+				"app-plus": {
+					"bounce": "none"
+				}
+			}
 		},
 		{
 			"path": "pages/hall/hallpay",

pages/hall/gsell.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="center">
-		<view class="center"><calendar class="sign-date-box" :checks="signList" checksClass="" :checkTextShow="true"></calendar></view>
+		<view class="center"><calendar class="sign-date-box" :checks="signList" checksClass="" :checkTextShow="true" :nextMounth="next"></calendar></view>
 		<view class="title">今日最高限价{{ price }}</view>
 		<view class="main">
 			<view class="main-font">挂售日期</view>
@@ -33,6 +33,7 @@ export default {
 			price:'',//挂售价格
 			deta:'',//挂售日期
 			fwprice:'',//服务费
+			next: false,
 		};
 	},
 	onLoad(option) {
@@ -47,7 +48,15 @@ export default {
 				this.fwprice = e.data.anticipate;
 				let arr = e.data.gs_time.split(" ")
 				let brr = arr[0].split('-')
-				this.signList.push(brr[2]*1)
+				// this.signList.push(brr[2] * 1)
+				this.signList.push(brr[2] * 1)
+				let month = new Date().getMonth() + 1;
+				console.log(month,"1234568797321896");
+				if(brr[1]*1 == month) {
+					this.next = false
+				}else {
+					this.next = true
+				}
 				console.log(this.signList);
 				this.deta = brr[1] + '月' + brr[2] + '日'
 				console.log(brr);

pages/hall/hallinfo.vue

@@ -19,7 +19,12 @@
 				</view>
 			</view>
 		</view>
-		<view class="hotgoods" v-if="firstList.length != 0">
+		<view class="djs" v-if="!isbuy">
+			<view class="djs-bg"><image src="../../static/img/djs.png" mode=""></image></view>
+			<view class="djs-font">客官请稍后，请{{ time }}入场</view>
+			<view class="djs-main">入场倒计时：{{ countdown_time }}</view>
+		</view>
+		<view class="hotgoods" v-if="firstList.length != 0 && isbuy">
 			<view class="hotgoods-item" v-for="item in firstList" :key="item.id" @click="navToDetailPage(item)">
 				<view class="image-wrapper"><image :src="item.image" mode="scaleToFill"></image></view>
 				<view class="title clamp margin-c-20">{{ item.name }}</view>
@@ -28,9 +33,7 @@
 						<text class="font-size-sm">￥</text>
 						{{ item.hanging_price }}
 					</view>
-					<view class="over" v-if="item.status == 2">
-						已售罄
-					</view>
+					<view class="over" v-if="item.status == 2">已售罄</view>
 				</view>
 			</view>
 		</view>
@@ -38,38 +41,92 @@
 </template>
 
 <script>
-import { auction_product } from '@/api/hall.js'
+import { auction_product, count_down } from '@/api/hall.js';
+import { getTime } from '@/utils/rocessor.js';
 export default {
 	data() {
 		return {
-			productname:'',//商品名称
-			name:'',//馆名字
-			peoplename:'',//馆长名字
+			productname: '', //商品名称
+			name: '', //馆名字
+			peoplename: '', //馆长名字
 			firstList: [],
-			id:'',//场次id
+			id: '', //场次id
 			page: 1,
 			limit: 10,
 			loadingType: 'more',
+			countdown_time: '',
+			canbuy: 0, //结束时间
+			isbuy: false,
+			time: '' //进场时间
 		};
 	},
 	onLoad(option) {
-		this.name = option.name
-		this.peoplename = option.peoplename
-		this.id = option.id
+		this.name = option.name;
+		this.peoplename = option.peoplename;
+		this.id = option.id;
+		this.isDjs();
 		this.loadData();
 	},
 	onShow() {
+		this.isDjs();
 		this.loadData();
 	},
 	methods: {
+		isDjs() {
+			count_down({ id: this.id }).then(({ data }) => {
+				this.canbuy = data.time;
+				let day = getTime(this.canbuy * 1000).split(' ');
+				this.time = day[1];
+				this.counTime();
+			});
+		},
+		counTime() {
+			//获取当前时间
+			let data = new Date();
+			let newTime = data.getTime();
+			//结束时间
+			let end = this.canbuy;
+			//时间差
+			let leftTime = end * 1000 - newTime;
+			console.log(leftTime);
+			console.log(this.la, '2222222');
+			if (leftTime <= 0) {
+				console.log('已结束');
+				this.isbuy = true;
+				return;
+			}
+			//定义保存倒计时时间
+			let m, s;
+			if (leftTime >= 0) {
+				m = Math.floor((leftTime / 1000 / 60) % 60);
+				s = Math.floor((leftTime / 1000) % 60);
+				this.second = s;
+				this.la = m + s;
+				console.log(this.la, '计算');
+				console.log(this.second);
+				console.log(m, s);
+				//倒计时赋值view
+				this.countdown_time = `${m}:${s}`;
+				let timers = setTimeout(this.counTime, 1000);
+				//显示动态时间效果
+				if (s < 10) {
+					return (this.countdown_time = `${m}:0${s}`);
+					let timers = setTimeout(this.counTime, 1000);
+				}
+				if (m < 10) {
+					return (this.countdown_time = `0${m}:${s}`);
+					let timers = setTimeout(this.counTime, 1000);
+				}
+			}
+		},
 		search() {
 			this.firstList = [];
 			this.page = 1;
 			this.limit = 10;
 			this.loadingType = 'more';
-			this.loadData()
+			this.loadData();
 		},
-		loadData(){
+		loadData() {
 			const obj = this;
 			if (obj.loadingType == 'nomore' || obj.loadingType == 'loading') {
 				return;
@@ -79,18 +136,20 @@ export default {
 				page: obj.page,
 				limit: obj.limit,
 				id: obj.id,
-				name: obj.productname,
-			}).then(({data}) => {
-				obj.firstList = obj.firstList.concat(data);
-				if (data.length != obj.limit) {
-					obj.loadingType = 'more';
-					obj.page++;
-				} else {
-					obj.loadingType = 'nomore';
-				}
-			}).catch(e =>{
-				console.log(e);
+				name: obj.productname
 			})
+				.then(({ data }) => {
+					obj.firstList = obj.firstList.concat(data);
+					if (data.length != obj.limit) {
+						obj.loadingType = 'more';
+						obj.page++;
+					} else {
+						obj.loadingType = 'nomore';
+					}
+				})
+				.catch(e => {
+					console.log(e);
+				});
 		},
 		toBack() {
 			uni.navigateBack({});
@@ -101,12 +160,12 @@ export default {
 			});
 		},
 		navToDetailPage(item) {
-			if(item.status == '2'){
-				return this.$api.msg('已售罄')
+			if (item.status == '2') {
+				return this.$api.msg('已售罄');
 			}
 			uni.navigateTo({
-				url:'/pages/hall/porducthall?id=' + item.id + '&uid=' + this.id + '&name='+ this.name + '&peoplename=' + this.peoplename
-			})
+				url: '/pages/hall/porducthall?id=' + item.id + '&uid=' + this.id + '&name=' + this.name + '&peoplename=' + this.peoplename
+			});
 		}
 	}
 };
@@ -249,8 +308,31 @@ page {
 				color: #a199a1;
 				font-weight: 500;
 			}
-			
 		}
 	}
 }
+.djs {
+	margin: 90rpx auto 0;
+	width: 700rpx;
+	.djs-bg {
+		margin: auto;
+		width: 400rpx;
+		height: 400rpx;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.djs-font {
+		margin-top: 20rpx;
+		font-size: 32rpx;
+		text-align: center;
+	}
+	.djs-main {
+		margin-top: 20rpx;
+		font-size: 40rpx;
+		text-align: center;
+		color: #fd3b39;
+	}
+}
 </style>

pages/hall/halllist.vue

@@ -57,7 +57,7 @@
 						<view class="mmaint-time">{{ item.radd_time }}开售</view>
 					</view>
 					<view class="mmain-time" style="margin-top: 28rpx;">预约时间:{{ item.add_time }}-{{ item.end_time }}</view>
-					<view class="mmain-time">入场时间:{{ item.radd_time }}-{{ 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>
 
@@ -125,22 +125,36 @@ export default {
 			wx: {}
 		};
 	},
+	filters: {
+		ahead(provider) {
+			let time = provider.split(":")
+			console.log(time);
+			if(time[1]*1 - 5 < 0){
+				time[1] = time[1]*1 + 55
+				if(time[0]*1 == 0) {
+					time[0] = '23'
+				}else {
+					time[0] = time[0]*1 - 1
+				}
+			}else {
+				time[1] = time[1] *1 - 5
+ 			}
+			return time[0] + ':' + time[1] + ':' +time[2]
+		}
+	},
 	onLoad(option) {
 		this.oid = option.id;
 		this.name = option.name;
 		this.peoplename = option.peoplename;
 		this.loadData();
-		article({}, 1).then(({ data }) => {
-			data.forEach(e => {
-				this.text.push(e.synopsis);
-			});
-			this.article = data;
-			pay_list({}).then(({ data }) => {
-				this.wx = data.wx;
-				this.aliData = data.zfb;
-				this.bankData = data.bank;
-			});
+	},
+	onShow() {
+		pay_list({}).then(({ data }) => {
+			this.wx = data.wx;
+			this.aliData = data.zfb;
+			this.bankData = data.bank;
 		});
+		this.loadData();
 	},
 	computed: {
 		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])

pages/hall/hallpay.vue

@@ -112,7 +112,7 @@
 					</view>
 					<view class="tc-item">
 						<view class="upload-title" style="color: #9d9d9d;">微信二维码</view>
-						<view class="upload-main"><image class="upload-image" :src="wx.image" mode=""></image></view>
+						<view class="upload-main" @click="lookimg(wx.image)"><image class="upload-image" :src="wx.image" mode="aspectFit"></image></view>
 					</view>
 				</swiper-item>
 				<swiper-item class="tab-content" v-else></swiper-item>
@@ -247,6 +247,15 @@ export default {
 				phoneNumber: num //仅为示例
 			});
 		},
+		// 查看大图
+		lookimg(src) {
+			console.log(src);
+			let arr = [src];
+			uni.previewImage({
+				current: src,
+				urls: arr
+			});
+		},
 		//swiper 切换
 		changeTab(e) {
 			this.tabCurrentIndex = e.target.current;

pages/money/qudou.vue

@@ -8,14 +8,14 @@
 			</view>
 			<view class="content-bg"><image src="../../static/img/yongjin-bg.png" mode=""></image></view>
 			<view class="money-box">
-				<view class="money">{{ userInfo.brokerage_price }}</view>
+				<view class="money">{{ userInfo.integral }}</view>
 				<view>余额</view>
 			</view>
 			<!-- <view class="money-btn" @click="navto('/pages/money/withdrawal')">
 				转账
 			</view> -->
 		</view>
-		<view class="info-box flex">
+		<!-- <view class="info-box flex">
 			<view class="info-item">
 				<view class="info-font">累计收入</view>
 				<view class="info-num">{{ recharge }}</view>
@@ -25,7 +25,7 @@
 				<view class="info-font">累计支出</view>
 				<view class="info-num">{{ orderStatusSum }}</view>
 			</view>
-		</view>
+		</view> -->
 		<view class="navbar">
 			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
 		</view>
@@ -104,7 +104,7 @@ export default {
 					loadingType: 'more',
 					orderList: [],
 					page: 1, //当前页数
-					limit: 10, //每次信息条数
+					limit: 1000, //每次信息条数
 					loaded: false
 				},
 				{
@@ -113,7 +113,7 @@ export default {
 					loadingType: 'more',
 					orderList: [],
 					page: 1, //当前页数
-					limit: 10, //每次信息条数
+					limit: 1000, //每次信息条数
 					loaded: false
 				}
 			],

pages/order/hallorderDetail.vue

@@ -0,0 +1,505 @@
+<template>
+	<view class="content">
+		<view class="order-item">
+			<view class="goods-box-single">
+				<image class="goods-img" :src="item.image" mode="aspectFill"></image>
+				<view class="right position-relative">
+					<view class="flex">
+						<text class="title">{{ item.name }}</text>
+						<view class="title-right">
+							<view class="price">{{ item.price }}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="row b-b flex">
+			<text class="tit">订单总价</text>
+			<view class="input">￥{{ item.price }}</view>
+		</view>
+	
+		<view class="orderDetialBox">
+			<view class="f-header m-t">
+				<view class="f-left-icon"></view>
+				<view class="tit-box"><text class="tit">订单信息</text></view>
+			</view>
+			<view class="item flex">
+				<view class="title-left flex">
+					<text class="title">订单编号:</text>
+					<view class="text">{{ item.order_id }}</view>
+				</view>
+				<view class="buttom-right" @click="copyOrderId(item.order_id)">复制单号</view>
+			</view>
+			<view class="item flex">
+				<view class="title-left flex">
+					<text class="title">下单时间:</text>
+					<view class="text">{{ item.create_time }}</view>
+				</view>
+			</view>
+			<view class="item flex">
+				<view class="title-left flex">
+					<text class="title">完成时间:</text>
+					<view class="text">{{ item.update_time }}</view>
+				</view>
+			</view>
+			<view class="item flex">
+				<view class="title-left flex">
+					<text class="title">卖家昵称:</text>
+					<view class="text">{{ item.c_nickname }}</view>
+				</view>
+			</view>
+			<view class="item flex">
+				<view class="title-left flex">
+					<text class="title">卖家电话:</text>
+					<view class="text">{{ item.phone }}</view>
+				</view>
+			</view>
+			<view class="main">
+				<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>
+							<view class="mt-font" :class="{ current: tabCurrentIndex === 0 }">支付宝</view>
+						</view>
+					</view>
+					<view class="main-item">
+						<view class="mt-item" @click="change('1')" :class="{ current: tabCurrentIndex === 1 }" v-if="bank != ''">
+							<image class="mt-image1" :src="tabCurrentIndex == 1 ? '../../static/img/bankD.png' : '../../static/img/bank.png'" mode=""></image>
+							<view class="mt-font" :class="{ current: tabCurrentIndex === 1 }">银行卡</view>
+						</view>
+					</view>
+					<view class="main-item">
+						<view class="mt-item" @click="change('2')" :class="{ current: tabCurrentIndex === 2 }" v-if="wx != ''">
+							<image class="mt-image2" :src="tabCurrentIndex == 2 ? '../../static/img/yueD.png' : '../../static/img/yue.png'" mode=""></image>
+							<view class="mt-font" :class="{ current: tabCurrentIndex === 2 }">微信</view>
+						</view>
+					</view>
+				</view>
+				<swiper class="swiper-box" :duration="500" @change="changeTab" :style="{ height: tabCurrentIndex == 2 ? '450rpx' : '280rpx' }" :current="tabCurrentIndex" disable-touch>
+					<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="" @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="" @click="copy(zfb.name)"></image>
+						</view>
+					</swiper-item>
+					<swiper-item class="tab-content" v-else></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="" @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="" @click="copy(bank.bank)"></image>
+						</view>
+						<!-- <view class="tc-item flex">
+							<view class="tcitem-name">开户行</view>
+							<view class="ali-name">椒江支行</view>
+							<image class="tcitem-image" src="../../static/img/copy.png" mode=""></image>
+						</view> -->
+						<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="" @click="copy(bank.payment)"></image>
+						</view>
+					</swiper-item>
+					<swiper-item class="tab-content" v-else></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="" @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="" @click="copy(wx.name)"></image>
+						</view>
+						<view class="tc-item">
+							<view class="upload-title" style="color: #9d9d9d;">微信二维码</view>
+							<view class="upload-main" @click="lookimg(wx.image)"><image class="upload-image" :src="wx.image" mode="aspectFit"></image></view>
+						</view>
+					</swiper-item>
+					<swiper-item class="tab-content" v-else></swiper-item>
+				</swiper>
+			</view>
+			<view class="zf flex">
+				<view class="title-left">
+					<text class="title">支付凭证(点击右边图片查看大图):</text>
+				</view>
+				<image class="zfpz" @click="lookimg(item.upload_image)" :src="item.upload_image" mode=""></image>
+			</view>
+		</view>
+	
+		<view class="btHeight">
+			
+		</view>
+	</view>
+</template>
+
+<script>
+import { user_auction_order } from '@/api/order.js';
+export default {
+	data() {
+		return {
+			id:'',
+			item: '',
+			tabCurrentIndex: 0,
+			info: '',
+			bank: '',
+			wx: '',
+			zfb: '',
+		}
+	},
+	onLoad(opt) {
+		this.id = opt.id
+		this.loadData()
+	},
+	methods: {
+		loadData() {
+			user_auction_order({order_id: this.id}).then(({data}) =>{
+				console.log(data);
+				this.item = data;
+				this.bank = data.bank;
+				this.wx = data.wx;
+				this.zfb = data.zfb;
+			})
+		},
+		// 查看大图
+		lookimg(src) {
+			console.log(src);
+			let arr = [src];
+			uni.previewImage({
+				current: src,
+				urls: arr
+			});
+		},
+		//swiper 切换
+		changeTab(e) {
+			this.tabCurrentIndex = e.target.current;
+		},
+		change(num) {
+			this.tabCurrentIndex = num * 1;
+		},
+		// 复制订单编号
+		copyOrderId(text) {
+			// #ifndef H5
+			uni.setClipboardData({
+				data: text,
+				success: e => {
+					uni.showToast({
+						title: '复制成功',
+						duration: 1500
+					});
+				}
+			});
+			// #endif
+			// #ifdef H5
+			// 获取需要复制的文字
+			const copyStr = text;
+			// 创建input标签存放需要复制的文字
+			const oInput = document.createElement('input');
+			// 把文字放进input中，供复制
+			oInput.value = copyStr;
+			// 添加文
+			document.body.appendChild(oInput);
+			// 选中创建的input
+			oInput.select();
+			// 执行复制方法， 该方法返回bool类型的结果，告诉我们是否复制成功
+			const copyResult = document.execCommand('copy');
+			// 操作中完成后 从Dom中删除创建的input
+			document.body.removeChild(oInput);
+			// 根据返回的复制结果 给用户不同的提示
+			if (copyResult) {
+				uni.showToast({
+					title: '已复制到粘贴板',
+					duration: 2000
+				});
+			} else {
+				this.$api.msg('复制失败');
+			}
+			// #endif
+		}
+	}
+}
+</script>
+
+<style lang="scss">
+page {
+	background: $page-color-base;
+}
+
+// 订单详细
+.orderDetialBox {
+	margin-top: 20rpx;
+	padding: 0 30rpx;
+	background-color: #ffffff;
+	font-size: $font-base;
+	color: $font-color-base;
+	.item {
+		height: 80rpx;
+		.text {
+			padding-left: 10rpx;
+		}
+		.buttom-right {
+			width: 180rpx;
+			border-radius: 99rpx;
+			padding: 10rpx;
+			text-align: center;
+			border: 1px solid $border-color-light;
+		}
+	}
+	.zf {
+		.zfpz {
+			width: 160rpx;
+			height: 160rpx;
+		}
+	}
+}
+.row {
+	display: flex;
+	align-items: center;
+	position: relative;
+	padding: 0 30rpx;
+	height: 80rpx;
+	background: #fff;
+	.order-status {
+		font-size: $font-lg;
+		color: $color-red;
+		font-weight: 500;
+	}
+	.refund {
+		font-size: 30rpx;
+		color: $font-color-dark;
+	}
+	.noRefund {
+		font-size: 30rpx;
+		color: $font-color-light;
+	}
+	.tit {
+		flex-shrink: 0;
+		width: 120rpx;
+		font-size: 30rpx;
+		color: $font-color-dark;
+	}
+	.input {
+		text-align: right;
+		flex: 1;
+		font-size: 30rpx;
+		color: $font-color-dark;
+		&.payColor {
+			color: $color-red;
+		}
+	}
+	.iconlocation {
+		font-size: 36rpx;
+		color: $font-color-light;
+	}
+}
+.add-btn {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 690rpx;
+	height: 80rpx;
+	margin: 60rpx auto;
+	font-size: $font-lg;
+	color: #fff;
+	background-color: $base-color;
+	border-radius: 10rpx;
+	// box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
+}
+
+/* 多条商品 */
+.order-item {
+	display: flex;
+	flex-direction: column;
+	padding-left: 30rpx;
+	background: #fff;
+	margin-top: 20rpx;
+	/* 单条商品 */
+	.goods-box-single {
+		display: flex;
+		padding: 20rpx 0;
+		.goods-img {
+			display: block;
+			width: 120rpx;
+			height: 120rpx;
+		}
+		.right {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			padding: 0 30rpx 0 24rpx;
+			overflow: hidden;
+			height: 100%;
+			.title {
+				align-self: flex-start;
+				font-size: $font-base + 2rpx;
+				color: $font-color-dark;
+			}
+			.title-right {
+				flex-shrink: 0;
+				text-align: right;
+				align-self: flex-start;
+			}
+			.attr-box {
+				font-size: $font-sm + 2rpx;
+				color: $font-color-light;
+			}
+			.evaluate{
+					color:#FFFFFF;
+					font-size: 24rpx;
+					display: inline-block;
+					text-align: right;
+					text{
+						background:#FA2740;
+						padding: 5rpx 15rpx;
+						
+					}
+			}
+			.yesevaluate{
+				color:#333333;
+				font-size: 24rpx;
+				display: inline-block;
+				text-align: right;
+				text{
+					border: 2rpx solid #333333;
+					padding: 5rpx 15rpx;
+					
+				}
+			}
+			.price {
+				font-size: $font-base + 2rpx;
+				color: $font-color-dark;
+				&:before {
+					content: '￥';
+					font-size: $font-sm;
+					margin: 0 2rpx 0 8rpx;
+				}
+			}
+		}
+	}
+}
+// 标题头
+.f-header {
+	display: flex;
+	align-items: center;
+	height: 80rpx;
+	.tit-box {
+		@extend %font-title-box;
+	}
+	.tit {
+		@extend %font-title;
+	}
+	.f-left-icon {
+		@extend %f-left-icon;
+	}
+}
+// 共有底部高度
+$btHeight:100rpx;
+.btHeight{
+	height: $btHeight;
+}
+// 拼团按钮
+.group-nav {
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	height:$btHeight;
+	width: 100%;
+	justify-content: flex-end;
+	padding-right: 30rpx;
+	.bottom {
+	}
+}
+.main {
+	margin-top: 20rpx;
+	padding: 30rpx 0 40rpx;
+	background: #ffffff;
+	.main-tip {
+		padding: 0 30rpx;
+		font-size: 30rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #999999;
+	}
+	.main-title {
+		margin-top: 34rpx;
+		justify-content: flex-start;
+		.current {
+			background: linear-gradient(143.2747deg, #ff6a00, #ee0979) !important;
+			color: #ffffff !important;
+		}
+		.main-item {
+			width: 33%;
+		}
+		.mt-item {
+			margin: 0 auto;
+			width: 160rpx;
+			height: 60rpx;
+			background: #f8f8f8;
+			border-radius: 10rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			.mt-image {
+				width: 32rpx;
+				height: 32rpx;
+			}
+			.mt-image1 {
+				width: 38rpx;
+				height: 32rpx;
+			}
+			.mt-image2 {
+				width: 36rpx;
+				height: 32rpx;
+			}
+			.mt-font {
+				margin-left: 10rpx;
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #333333;
+			}
+		}
+	}
+	.swiper-box {
+		width: 100%;
+		padding: 14rpx 30rpx 0;
+		.tc-item {
+			padding: 50rpx 2rpx 0;
+			line-height: 1;
+			.tcitem-name {
+				width: 118rpx;
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+			}
+			.ali-name {
+				width: 380rpx;
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #333333;
+			}
+			.tcitem-image {
+				width: 26rpx;
+				height: 28rpx;
+			}
+		}
+	}
+}
+
+</style>
+

pages/order/order.vue

@@ -29,7 +29,7 @@
 					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
 
 					<!-- 订单列表 -->
-					<view v-for="(item, index) in tabItem.orderList" :key="index" class="order-item">
+					<view v-for="(item, index) in tabItem.orderList" :key="index" class="order-item" @click="goToOrderDetail(item)">
 						<view class="i-top b-b">
 							<text class="time">{{ item.order_id }}</text>
 							<text class="state" :style="{ color: item.stateTipColor }">{{ item.stateTip }}</text>
@@ -53,7 +53,7 @@
 							<text class="price">{{ moneyNum(item.price) }}</text>
 						</view>
 						<view class="action-box b-t" v-if="item.stateTip == '待支付'"><button @click.stop="pay(item)" class="action-btn recom">立即支付</button></view>
-						<view class="action-box b-t" v-if="item.stateTip == '待挂售'"><button @click.stop="gsell(item)" class="action-btn recom">立即挂售</button></view>
+						<view class="action-box b-t" v-if="item.stateTip == '待挂售'"><button @click.stop="gsell(item)" class="action-btn recom">{{item.frozen == 0? "立即挂售" : "冻结中"}}</button></view>
 					</view>
 
 					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
@@ -88,7 +88,7 @@
 								<view class="buy-name">{{ item.nickname }}</view>
 								<view class="phone">{{ item.phone }}</view>
 							</view>
-							<view v-if="!item.status">
+							<view v-if="!item.status && item.status != 0">
 								<view class="buy-info">
 									<view class="font">挂售价格：{{ item.hanging_price }}</view>
 								</view>
@@ -107,10 +107,13 @@
 							<!-- <button @click.stop="orderPay(item)" class="refuse recom">拒绝</button> -->
 							<button @click.stop="orderPay(item)" class="action-btn recom">通过</button>
 						</view>
-						<view class="action-box b-t" v-if="!item.status">
+						<view class="action-box b-t" v-if="!item.status && item.status !=0">
 							<!-- <button @click.stop="orderPay(item)" class="refuse recom">拒绝</button> -->
 							<button @click.stop="cancel(item)" class="action-btn recom">取消挂售</button>
 						</view>
+						<view class="action-box b-t" v-if="item.status == 3">
+							<button @click.stop="appeal(item)" class="action-btn recom">{{ item.appeal == 0 ? '申诉' : '取消申诉'}}</button>
+						</view>
 					</view>
 
 					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
@@ -124,7 +127,7 @@
 <script>
 import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
 import empty from '@/components/empty';
-import { orderList, orderCancel, orderDel, orderTake, adopt, user_auction_order, seller, cancel, untreated } from '@/api/order.js';
+import { orderList, orderCancel, orderDel, orderTake, adopt, user_auction_order, seller, cancel, untreated, plead, revoke } from '@/api/order.js';
 import { tabbar } from '@/utils/tabbar.js';
 export default {
 	components: {
@@ -133,6 +136,7 @@ export default {
 	},
 	data() {
 		return {
+			loading: false,//判断是否在点击
 			height: '', //第一层swiper高度
 			tabbar: tabbar,
 			current: 1, //底部tabar选中的icon对象
@@ -153,7 +157,7 @@ export default {
 					text: '已过期',
 					loadingType: 'more',
 					orderList: [],
-					isnew:1,//判断是否有新的订单
+					isnew: 1, //判断是否有新的订单
 					page: 1, //当前页数
 					limit: 10 //每次信息条数
 				},
@@ -162,7 +166,7 @@ export default {
 					text: '待支付',
 					loadingType: 'more',
 					orderList: [],
-					isnew:1,//判断是否有新的订单
+					isnew: 1, //判断是否有新的订单
 					page: 1, //当前页数
 					limit: 10 //每次信息条数
 				},
@@ -171,7 +175,7 @@ export default {
 					text: '待审核',
 					loadingType: 'more',
 					orderList: [],
-					isnew:1,//判断是否有新的订单
+					isnew: 1, //判断是否有新的订单
 					page: 1, //当前页数
 					limit: 10 //每次信息条数
 				},
@@ -180,7 +184,7 @@ export default {
 					text: '待挂售',
 					loadingType: 'more',
 					orderList: [],
-					isnew:1,//判断是否有新的订单
+					isnew: 1, //判断是否有新的订单
 					page: 1, //当前页数
 					limit: 10 //每次信息条数
 				},
@@ -189,7 +193,7 @@ export default {
 					text: '已完成',
 					loadingType: 'more',
 					orderList: [],
-					isnew:1,//判断是否有新的订单
+					isnew: 1, //判断是否有新的订单
 					page: 1, //当前页数
 					limit: 10 //每次信息条数
 				}
@@ -200,7 +204,7 @@ export default {
 					text: '已过期',
 					loadingType: 'more',
 					orderList: [],
-					isnew:1,//判断是否有新的订单
+					isnew: 1, //判断是否有新的订单
 					page: 1, //当前页数
 					limit: 10 //每次信息条数
 				},
@@ -209,7 +213,7 @@ export default {
 					text: '售卖中',
 					loadingType: 'more',
 					orderList: [],
-					isnew:1,//判断是否有新的订单
+					isnew: 1, //判断是否有新的订单
 					page: 1, //当前页数
 					limit: 10 //每次信息条数
 				},
@@ -218,7 +222,7 @@ export default {
 					text: '待支付',
 					loadingType: 'more',
 					orderList: [],
-					isnew:1,//判断是否有新的订单
+					isnew: 1, //判断是否有新的订单
 					page: 1, //当前页数
 					limit: 10 //每次信息条数
 				},
@@ -227,7 +231,7 @@ export default {
 					text: '待审核',
 					loadingType: 'more',
 					orderList: [],
-					isnew:1,//判断是否有新的订单
+					isnew: 1, //判断是否有新的订单
 					page: 1, //当前页数
 					limit: 10 //每次信息条数
 				},
@@ -236,7 +240,7 @@ export default {
 					text: '已完成',
 					loadingType: 'more',
 					orderList: [],
-					isnew:1,//判断是否有新的订单
+					isnew: 1, //判断是否有新的订单
 					page: 1, //当前页数
 					limit: 10 //每次信息条数
 				}
@@ -311,33 +315,41 @@ export default {
 		navGo(index) {
 			this.currentIndex = index;
 			console.log(this.currentIndex, '点击');
-			this.loadData();
+			this.upData()
+			this.loadData('reload');
 		},
 		// 转换金额为数字
 		moneyNum(value) {
 			return +value;
 		},
+		// 订单支付
+		pay(item) {
+			uni.navigateTo({
+				url: '/pages/hall/hallpay?ordid=' + item.order_id
+			});
+		},
+		// 更新
 		upData() {
 			untreated().then(({ data }) => {
 				console.log(data);
-				if(data.user.hanging != 0){
-					this.navList[3].isnew = 2
+				if (data.user.hanging != 0) {
+					this.navList[3].isnew = 2;
+				}
+				if (data.user.hanging == 0) {
+					this.navList[3].isnew = 1;
 				}
-				if(data.user.hanging == 0){
-					this.navList[3].isnew = 1
+				if (data.user.paid != 0) {
+					this.navList[1].isnew = 2;
 				}
-				if(data.user.paid != 0){
-					this.navList[1].isnew = 2
+				if (data.user.paid == 0) {
+					this.navList[1].isnew = 1;
 				}
-				if(data.user.paid == 0){
-					this.navList[1].isnew = 1
+				if (data.seller.reviewed != 0) {
+					this.navList1[3].isnew = 2;
 				}
-				if(data.seller.reviewed != 0) {
-					this.navList1[3].isnew = 2
+				if (data.seller.reviewed == 0) {
+					this.navList1[3].isnew = 1;
 				}
-				if(data.seller.reviewed == 0) {
-					this.navList1[3].isnew = 1
-				} 
 			});
 		},
 		// 查看大图
@@ -349,60 +361,85 @@ export default {
 				urls: arr
 			});
 		},
-		// 确认收货
-		orderTake(item, index) {
-			let obj = this;
-			uni.showModal({
-				title: '是否确认收货？',
-				success: () => {
-					orderTake({
-						uni: item.order_id
-					})
-						.then(e => {
-							obj.navList[obj.tabCurrentIndex].orderList.splice(index, 1);
-							uni.showToast({
-								title: '收货成功'
-							});
-						})
-						.catch(e => {
-							console.log(e);
-						});
-				}
-			});
+		//申诉和取消申诉
+		appeal(item) {
+			if(this.loading) {
+				return
+			}
+			this.loading = true
+			if(item.appeal == 0) {
+				uni.showLoading({
+					title: '申诉中'
+				});
+				plead({order_id:item.order_id }).then(e =>{
+					uni.hideLoading()
+					this.$api.msg('申诉成功')
+					this.loadData('reload');
+					this.loading = false
+				})
+			}else {
+				uni.showLoading({
+					title: '取消申诉中'
+				});
+				revoke({order_id:item.order_id }).then(e =>{
+					uni.hideLoading()
+					this.$api.msg('取消申诉成功')
+					this.loadData('reload');
+					this.loading = false
+				})
+			}
 		},
 		//跳转到订单详情
 		goToOrderDetail(e) {
+			if (e.stateTip != '已完成') {
+				return;
+			}
+			console.log(11);
 			uni.navigateTo({
-				url: '/pages/order/orderDetail?id=' + e.order_id
-			});
-		},
-		// 申请退款
-		orderRefund(e) {
-			uni.navigateTo({
-				url: '/pages/order/orderRefund?id=' + e.order_id
-			});
-		},
-		// 订单支付
-		pay(item) {
-			uni.navigateTo({
-				url: '/pages/hall/hallpay?ordid=' + item.order_id
+				url: '/pages/order/hallorderDetail?id=' + e.order_id
 			});
 		},
 		gsell(item) {
-			uni.navigateTo({
-				url: '/pages/hall/gsell?id=' + item.product_id
-			});
+			if(item.frozen){
+				return this.$api.msg('已冻结，请联系客服或与卖家协商')
+			}else {
+				uni.navigateTo({
+					url: '/pages/hall/gsell?id=' + item.product_id
+				});
+			}
+			
 		},
+		//卖家确认订单
 		orderPay(e) {
+			if(this.loading) {
+				return
+			}
+			uni.showLoading({
+				title: '确认订单中'
+			});
+			this.loading = true
 			adopt({ order_id: e.order_id }).then(({ data }) => {
 				console.log('1111');
+				uni.hideLoading()
+				this.loading = false
 				this.loadData('reload');
+				this.upData();
 			});
 		},
+		//取消挂售
 		cancel(e) {
+			if(this.loading) {
+				return
+			}
+			this.loading = true
+			uni.showLoading({
+				title: '取消挂售中'
+			});
 			cancel({ id: e.id }).then(({ data }) => {
+				uni.hideLoading()
+				this.loading = false
 				this.loadData('reload');
-				this.upData()
+				this.upData();
 			});
 		},
 		//获取订单列表
@@ -425,10 +462,10 @@ export default {
 				navItem.limit = 10;
 				navItem.loadingType = 'more';
 			}
-			if (source === 'tabChange' && navItem.loaded === true) {
-				//tab切换只有第一次需要加载数据
-				return;
-			}
+			// if ( navItem.loaded === true) {
+			// 	//tab切换只有第一次需要加载数据
+			// 	return;
+			// }
 			if (navItem.loadingType === 'loading') {
 				//防止重复加载
 				return;

pages/user/award.vue

@@ -16,7 +16,7 @@
 				<text>></text>
 			</view>
 		</view>
-		<view class="info-box flex">
+		<!-- <view class="info-box flex">
 			<view class="info-item">
 				<view class="info-font">累计收入</view>
 				<view class="info-num">{{recharge}}</view>
@@ -26,7 +26,7 @@
 				<view class="info-font">累计支出</view>
 				<view class="info-num">{{orderStatusSum}}</view>
 			</view>
-		</view>
+		</view> -->
 		<view class="navbar">
 			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
 		</view>

pages/user/myAppointment.vue

@@ -110,7 +110,7 @@ export default {
 					loadingType: 'more',
 					orderList: [],
 					page: 1, //当前页数
-					limit: 10, //每次信息条数
+					limit: 1000, //每次信息条数
 					loaded: false
 				},
 				{
@@ -119,7 +119,7 @@ export default {
 					loadingType: 'more',
 					orderList: [],
 					page: 1, //当前页数
-					limit: 10, //每次信息条数
+					limit: 1000, //每次信息条数
 					loaded: false
 				}
 			],
@@ -165,8 +165,8 @@ export default {
 				limit: navItem.limit
 			})
 				.then(({ data }) => {
-					// obj.recharge = data.income;
-					// obj.orderStatusSum = data.expend;
+					obj.recharge = data.sr;
+					obj.orderStatusSum = data.zc;
 					if(state == 0 ){
 						navItem.orderList = data.zj
 					}

pages/user/user.vue

@@ -6,7 +6,15 @@
 			<view class="user-info" @click="navTo('/pages/set/set')">
 				<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="phone flex" v-if="userInfo.uid">
+					<view class="phone-font">
+						ID号：{{ userInfo.uid }}
+					</view>
+					<view class="green" v-if="userInfo.green != 0">
+						<image class="green-bg" src="../../static/img/vip.png" mode=""></image>
+						<view class="green-title">vip</view>
+					</view>
+				</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>
@@ -113,6 +121,7 @@
 	} from 'vuex';
 	import uniList from '@/components/uni-list/uni-list.vue';
 	import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
+	import uniCopy from '@/components/js_sdk/xb-copy/uni-copy.js';
 	import {
 		orderData,
 		getUserInfo,
@@ -236,6 +245,23 @@
 				this.month = date.getMonth() + 1;//保存当前月份
 				this.day = date.getDate();//保存当前日期
 			},
+			comfirm(text) {
+				let obj = this;
+				let content = text; //需要复制的内容
+				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'
+					});
+				}
+			},
 			// 获取签到列表
 			loadList() {
 				let obj = this;
@@ -721,11 +747,36 @@
 				color: #FFFFFF;
 			}
 			.phone {
+				justify-content: start;
 				margin-top: 13rpx;
 				font-size: 30rpx;
 				font-family: PingFang SC;
 				font-weight: 500;
 				color: #FFFFFF;
+				.green{
+					margin-left: 12rpx;
+					position: relative;
+					width: 80rpx;
+					height: 30rpx;
+					.green-bg {
+						position: absolute;
+						top: 0;
+						left: 0;
+						right: 0;
+						width: 100%;
+						height: 100%;
+					}
+					.green-title {
+						line-height: 30rpx;
+						text-align: center;
+						position: relative;
+						z-index: 10;
+						font-size: 20rpx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #93794b;
+					}
+				}
 			}
 			.vip {
 				margin-top: 20rpx;

pages/user/withdrawal.vue

@@ -1,321 +0,0 @@
-<template>
-	<view class="content">
-		<uni-notice-bar single="true" text="每月25号到月底可提现上月结算余额"></uni-notice-bar>
-		<view class="content-money">
-			<view class="flex ">
-				<view class="buttom">
-					<view class="icon">{{ money | getMoneyStyle }}</view>
-					<text class="text">可提现佣金</text>
-				</view>
-				<view class="interval"></view>
-				<view class="buttom">
-					<view class=" icon">{{ freeze | getMoneyStyle }}</view>
-					<text class="text">待审核提现佣金</text>
-				</view>
-			</view>
-		</view>
-		<view class="row-box">
-			<view class="title">提现金额</view>
-			<view class="row">
-				<text class="tit">￥</text>
-				<input class="input" type="number" v-model="withdrawal" :placeholder="'最低提现金额' + minPrice + '元'" placeholder-class="placeholder" />
-				<view class="buttom" @click="withdrawal = money">全部提现</view>
-			</view>
-		</view>
-		<!-- #ifndef MP-WEIXIN -->
-		<view class="list" v-if="!weichatBsrowser">
-			<radio-group @change="tabRadio">
-				<label>
-					<view class="box">
-						<view class="icon iconfont iconweixin1"></view>
-						<view class="title-box">
-							<view class="title"><text>提现至微信</text></view>
-						</view>
-						<view class="right"><radio value="weixin" color="#5dbc7c" :checked="type == 'weixin'" /></view>
-					</view>
-				</label>
-				<label>
-					<view class="box">
-						<view class="icon iconfont iconzhifubao"></view>
-						<view class="title-box">
-							<view class="title">
-								<text v-if="aliData.fullname">提现至支付宝</text>
-								<text v-else>请创建支付宝账号</text>
-							</view>
-							<view class="node">
-								<text v-if="aliData.fullname">真实姓名({{ aliData.fullname }})</text>
-							</view>
-						</view>
-						<view class="right"><radio value="alipay" color="#5dbc7c" :checked="type == 'alipay'" /></view>
-					</view>
-				</label>
-				<label>
-					<view class="box">
-						<view class="icon iconfont"><image class="icon-img" src="/static/icon/i8.png" mode="aspectFit"></image></view>
-						<view class="title-box">
-							<view class="title">
-								<text v-if="bankData.bankno">{{ bankData.bank + ' ' + bankData.bankno }}</text>
-								<text v-else>请创建银行账号</text>
-							</view>
-							<view class="node">
-								<text v-if="bankData.fullname">真实姓名({{ bankData.fullname }})</text>
-							</view>
-						</view>
-						<view class="right"><radio value="bank" color="#5dbc7c" :checked="type == 'bank'" /></view>
-					</view>
-				</label>
-			</radio-group>
-		</view>
-		<!-- #endif -->
-		<button class="add-btn up" @click="confirm">提交申请</button>
-		<button class="add-btn modified" v-if="!weichatBsrowser" @click="navTo('/pages/money/account')">账号管理</button>
-	</view>
-</template>
-
-<script>
-import { getMoneyStyle } from '@/utils/rocessor.js';
-import { extractCash, extractBank, aliInfo, bankInfo } from '@/api/wallet.js';
-import uniNoticeBar from '@/components/uni-notice-bar/uni-notice-bar.vue';
-export default {
-	filters: {
-		getMoneyStyle
-	},
-	components: {
-		uniNoticeBar
-	},
-	data() {
-		return {
-			type: 'weixin', //提现方式
-			money: '0.00', //可提现金额
-			freeze: '0.0', //冻结金额
-			withdrawal: '', //提现金额
-			minPrice: '', //最少提现金额
-			aliData: {},
-			bankData: {},
-			// #ifdef H5
-			weichatBsrowser: false
-			// #endif
-		};
-	},
-	onLoad(options) {
-		// #ifdef H5
-		this.weichatBsrowser = uni.getStorageSync('weichatBrowser');
-		// #endif
-		//加载提现信息
-		this.loadData();
-		// 加载提款账号信息
-		this.loadAli();
-		this.loadBank();
-	},
-	methods: {
-		// 更新数据
-		dataUp() {
-			this.loadAli();
-			this.loadBank();
-		},
-		//加载数据
-		async loadAli(source) {
-			aliInfo({}).then(e => {
-				this.aliData = e.data;
-			});
-		},
-		// 加载银行卡信息
-		async loadBank() {
-			bankInfo({}).then(e => {
-				this.bankData = e.data;
-			});
-		},
-		// 加载余额信息
-		async loadData() {
-			extractBank({}).then(({ data }) => {
-				this.money = data.commissionCount;
-				this.minPrice = data.minPrice;
-				this.freeze = data.incommissionCount;
-			});
-		},
-		// 跳转
-		navTo(url) {
-			uni.navigateTo({
-				url: url
-			});
-		},
-		// 切换选中对象
-		tabRadio(e) {
-			this.type = e.detail.value;
-		},
-		// 提交
-		confirm() {
-			let data = {
-				extract_type: this.type, //bank -银行卡 alipay-支付宝 weixin-微信
-				money: this.withdrawal, //金额
-				money_type: 0 //0佣金1余额
-			};
-
-			if (this.withdrawal < this.minPrice) {
-			uni.showToast({
-				title: '提现金额不可少于'+this.minPrice,
-				duration: 2000,
-				mask: false,
-				icon: 'none',
-			})
-				return;
-			}
-			if (this.type == 'alipay') {
-				data.name = this.aliData.fullname;
-				data.alipay_code = this.aliData.alino;
-			}
-			if (this.type == 'bank') {
-				data.name = this.bankData.fullname;
-				data.bankname = this.bankData.bank;
-				data.cardnum = this.bankData.bankno;
-			}
-
-			extractCash(data)
-				.then(e => {
-					uni.showToast({
-						title: '提交成功',
-						duration: 2000,
-						position: 'top'
-					});
-				})
-				.catch(e => {
-					console.log();
-				});
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page {
-	height: 100%;
-}
-.content-money {
-	padding: 30rpx 0;
-	background: #ffffff;
-}
-.flex {
-	background-color: #ffffff;
-	text-align: center;
-	margin: 0 30rpx;
-	border-radius: $border-radius-sm;
-	.buttom {
-		font-size: $font-lg;
-		width: 50%;
-	}
-	.interval {
-		width: 2px;
-		height: 60rpx;
-		background-color: #eeeeee;
-	}
-	.icon {
-		background-size: 100%;
-		font-size: 42rpx;
-		color: $font-color-dark;
-		font-weight: bold;
-		background-repeat: no-repeat;
-		background-position: center;
-	}
-	.text {
-		color: $font-color-light;
-	}
-}
-
-.row-box {
-	margin-top: 30rpx;
-	padding: 20rpx 30rpx;
-	background: #fff;
-	.title {
-		font-size: $font-base + 2rpx;
-		color: $font-color-dark;
-	}
-	.row {
-		display: flex;
-		align-items: center;
-		position: relative;
-		height: 80rpx;
-		.tit {
-			flex-shrink: 0;
-			width: 40rpx;
-			font-size: 30rpx;
-			color: $font-color-dark;
-		}
-		.input {
-			flex: 1;
-			font-size: 30rpx;
-			color: $font-color-dark;
-		}
-		.iconlocation {
-			font-size: 36rpx;
-			color: $font-color-light;
-		}
-
-		.buttom {
-			color: $font-color-spec;
-			font-size: $font-base;
-		}
-	}
-}
-.add-btn {
-	&.modified {
-		color: $base-color;
-	}
-	&.up {
-		background-color: $base-color;
-		color: #fff;
-	}
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	width: 690rpx;
-	height: 80rpx;
-	margin: 0 auto;
-	margin-top: 30rpx;
-	font-size: $font-lg;
-	border-radius: 10rpx;
-	// box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
-}
-
-.list {
-	padding-left: 30rpx;
-	margin-top: 30rpx;
-	background-color: #ffffff;
-	.box {
-		display: flex;
-		align-items: center;
-		width: 100%;
-		height: 120rpx;
-		border-bottom: 1px solid $border-color-light;
-		.icon {
-			font-size: 48rpx;
-			padding-right: 20rpx;
-			.icon-img {
-				height: 50rpx;
-				width: 50rpx;
-			}
-		}
-		.iconweixin1 {
-			color: #18bf16;
-		}
-		.iconzhifubao {
-			color: #08aaec;
-		}
-		.title-box {
-			flex-grow: 1;
-			text-align: left;
-			.title {
-				font-size: $font-base + 2rpx;
-				color: $font-color-base;
-			}
-			.node {
-				font-size: $font-sm;
-				color: $font-color-light;
-			}
-		}
-	}
-}
-/deep/ .uni-radio-input {
-	width: 45rpx;
-	height: 45rpx;
-}
-</style>

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.bdef51cf.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.35a02dac.js></script></body></html>

utils/rocessor.js

@@ -110,8 +110,17 @@ export function getTime(time) {
 	const year = date.getFullYear();
 	const mon = date.getMonth() + 1;
 	const day = date.getDate();
-	const hours = date.getHours();
-	const minu = date.getMinutes();
-	const sec = date.getSeconds();
+	let hours = date.getHours();
+	if(hours*1 < 10) {
+		hours = '0' + hours
+	}
+	let minu = date.getMinutes();
+	if(minu*1 < 10) {
+		minu = '0' + minu
+	}
+	let sec = date.getSeconds();
+	if(sec*1 < 10) {
+		sec = '0' + sec
+	}
 	return year + '-' + mon + '-' + day + ' ' + hours + ':' + minu + ':' + sec;
 }