11-16

api/wallet.js

@@ -125,4 +125,13 @@ export function integral(data) {
 	});
 }
 
+// 账户余额
+export function zhuanList(data) {
+	return request({
+		url: '/api/transfer_list',
+		method: 'post',
+		data
+	});
+}
+
 

manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "分包",
+    "name" : "千翼社区",
     "appid" : "__UNI__20ABE35",
     "description" : "",
-    "versionName" : "1.0.4",
-    "versionCode" : 104,
+    "versionName" : "1.0.2",
+    "versionCode" : 102,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */
@@ -57,9 +57,9 @@
             "splashscreen" : {
                 "androidStyle" : "default",
                 "android" : {
-                    "hdpi" : "unpackage/启动图/qd480x762.png",
-                    "xhdpi" : "unpackage/启动图/qd720x1242.png",
-                    "xxhdpi" : "unpackage/启动图/qd1080x1882.png"
+                    "hdpi" : "unpackage/启动图/480.9.png",
+                    "xhdpi" : "unpackage/启动图/720.9.png",
+                    "xxhdpi" : "unpackage/启动图/1080.9.png"
                 },
                 "iosStyle" : "common",
                 "ios" : {
@@ -131,7 +131,7 @@
     //     }
     // }
     "h5" : {
-        "title" : "正一药业",
+        "title" : "千翼社区",
         "domain" : "",
         "router" : {
             "base" : "/index/",
@@ -140,7 +140,7 @@
         "devServer" : {
             "proxy" : {
                 "/api" : {
-                    "target" : "http://fb.frp.liuniu946.com", //请求的目标域名
+                    "target" : "http://qy.mangguo1688.cn", //请求的目标域名
                     "changeOrigin" : true,
                     // "secure": false,
                     "pathRewrite" : {}

pages.json

@@ -490,6 +490,14 @@
 			    "enablePullDownRefresh": false
 			}
 		},
+		{
+			"path" : "pages/vip/zzjl",
+			"style" :                                                                                    
+			{
+			    "navigationBarTitleText": "转账记录",
+			    "enablePullDownRefresh": false
+			}
+		},
 		{
 			"path" : "pages/vip/mytz",
 			"style" :                                                                                    

pages/appointment/appointment.vue

@@ -42,6 +42,14 @@
 								<view class="info-tit">价值：</view>
 								<view class="info-val">{{item.price}}</view>
 							</view>
+							<view class="info-data" v-if="item.touser && (currentIndex == 1)">
+								<view class="info-tit">卖家：</view>
+								<view class="info-val">{{item.touser.real_name}}</view>
+							</view>
+							<view class="info-data" @click="call(item.touser.phone)" v-if="item.touser && (currentIndex == 1)">
+								<view class="info-tit">联系卖家：</view>
+								<view class="info-val">{{item.touser.phone}}</view>
+							</view>
 							<!-- <view class="upimg" v-if="item.status >= 1">
 								<view class="up-tit">
 									打款凭证：
@@ -159,6 +167,24 @@
 						loadingType: 'more',
 						loaded: false,
 					},
+					{
+						status: 3,
+						tit: '释放中',
+						list: [],
+						page: 1,
+						limit: 10,
+						loadingType: 'more',
+						loaded: false,
+					},
+					{
+						status: 4,
+						tit: '释放完成',
+						list: [],
+						page: 1,
+						limit: 10,
+						loadingType: 'more',
+						loaded: false,
+					},
 					{
 						status: '',
 						tit: '所有预约',
@@ -196,6 +222,14 @@
 			});
 		},
 		methods: {
+			call(phone) {
+				uni.makePhoneCall({
+					phoneNumber: phone,
+					fail() {
+						this.$api.msg('请稍后再试')
+					}
+				})
+			},
 			refresh() {
 				this.navList[1].list = []
 				this.navList[1].page = 1
@@ -271,11 +305,11 @@
 					return
 				}
 				navItem.loadingType = 'loading'
-				if(navItem.status == 1) {
+				if(navItem.status != '') {
 					packageMyReserveList({
 						page: navItem.page,
 						limit: navItem.limit,
-						status: 1
+						status: navItem.status
 					}).then(({
 						data
 					}) => {

pages/purchase/upload.vue

@@ -11,11 +11,11 @@
 		</view>
 		<view class="btn" @click="evaluationUpload">提交审核</view>
 		<view class=" flex btn" style="justify-content: center;">
-			<view class="zftype">
+			<!-- <view class="zftype">
 				支付方式：
-			</view>
-			<picker mode="selector" :range="chooseList" @change="bangTypeChange">
-				<view>{{type || '请选择支付方式'}}</view>
+			</view> -->
+			<picker mode="selector" :range="chooseList" @change="bangTypeChange" style="width: 100%;">
+				<view>支付方式：{{type || '请选择支付方式'}}</view>
 			</picker>
 		</view>
 		<view class="base-info" v-if="type !== ''">
@@ -32,27 +32,27 @@
 			</view>
 			<view class="base-item flex" v-if="type == '支付宝'">
 				<view class="item-name">支付宝姓名</view>
-				<input type="text" value="" class="item-val" placeholder="" v-model="toUser.alipay_name" />
+				<input type="text" value="" class="item-val" placeholder="" v-model="toUser.alipay_name" disabled/>
 			</view>
 			<view class="base-item flex" v-if="type == '支付宝'">
 				<view class="item-name">支付宝账号</view>
-				<input type="text" value="" class="item-val" placeholder="" v-model="toUser.alipay_no" />
+				<input type="text" value="" class="item-val" placeholder="" v-model="toUser.alipay_no" disabled/>
 			</view>
 			<view class="base-item flex" v-if="type=='银行卡'">
 				<view class="item-name">开户行</view>
-				<input type="text" value="" class="item-val" placeholder="" v-model="toUser.account_Bank" />
+				<input type="text" value="" class="item-val" placeholder="" v-model="toUser.account_Bank" disabled/>
 			</view>
 			<view class="base-item flex" v-if="type=='银行卡'">
 				<view class="item-name">所属支行</view>
-				<input type="text" value="" class="item-val" placeholder="" v-model="toUser.bank_branch" />
+				<input type="text" value="" class="item-val" placeholder="" v-model="toUser.bank_branch" disabled/>
 			</view>
 			<view class="base-item flex" v-if="type=='银行卡'">
 				<view class="item-name">开户行姓名</view>
-				<input type="text" value="" class="item-val" placeholder="" v-model="toUser.bank_name" />
+				<input type="text" value="" class="item-val" placeholder="" v-model="toUser.bank_name" disabled/>
 			</view>
 			<view class="base-item flex" v-if="type=='银行卡'">
 				<view class="item-name">银行卡账号</view>
-				<input type="text" value="" class="item-val" placeholder="" v-model="toUser.bank_card" />
+				<input type="text" value="" class="item-val" placeholder="" v-model="toUser.bank_card" disabled/>
 			</view>
 		</view>
 	</view>

pages/sellout/sellout.vue

@@ -8,10 +8,10 @@
 		<view class="out-wrapper" v-for="item in list" :class="{'outt': item.status == 2}">
 			<view class="out-top flex">
 				<view class="buy-info flex">
-					<view class="fsz">卖家：</view>
+					<view class="fsz">买家：</view>
 					<image :src="item.user.avatar" mode="" class="user-logo fsz"></image>
 					<view class="user-name fsz clamp">{{item.user.real_name}}</view>
-					<view class="user-phone fsz">
+					<view class="user-phone fsz" @click="call(item.user.phone)">
 						{{item.user.phone}}
 					</view>
 				</view>
@@ -24,7 +24,7 @@
 				</view>
 				<view class="info-data">
 					<view class="info-tit">价值：</view>
-					<view class="info-val">300</view>
+					<view class="info-val">{{item.price}}</view>
 				</view>
 			</view>
 			<view class="upimg">
@@ -158,6 +158,14 @@
 			this.loadData()
 		},
 		methods: {
+			call(phone) {
+				uni.makePhoneCall({
+					phoneNumber: phone,
+					fail() {
+						this.$api.msg('请稍后再试')
+					}
+				})
+			},
 			reload() {
 				this.list = []
 				this.page = 1
@@ -220,11 +228,6 @@
 					obj.resone = ''
 					obj.$refs.refuse.close()
 					obj.list[obj.chooseIndex].status = -2
-					// obj.page = 0
-					// obj.list = []
-					// obj.loaded = false
-					// obj.loadingType = 'more'
-					// obj.loadData()
 				})
 				
 			},

pages/vip/fwbDetail.vue

@@ -27,7 +27,7 @@
 			<image src="../../static/img/fwb.png" mode=""></image>
 		</view>
 		<scroll-view scroll-y="true" :style="{'height': height}" class="scoll-wrap" @scrolltolower="loadData()">
-			<view class="buy-item" v-for="item in list" v-if="(nowTime => '12:00' && item.am == 0) || (nowTime < '12:00' && item.am == 1)">
+			<view class="buy-item" v-for="item in list" >
 				<!-- v-if="item.start <= nowTime && item.end > nowTime" -->
 				<view class="item-top">
 					<view class="top-left">
@@ -35,6 +35,7 @@
 					</view>
 					<view class="top-right">
 						{{item.status}}
+						<!-- {{item.am == 1? '上午场':'下午场'}} -->
 					</view>
 				</view>
 				<view class="item-info">
@@ -54,22 +55,24 @@
 						<view class="info-tit">终止释放时间：</view>
 						<view class="info-val">10:20</view>
 					</view> -->
-					<view class="info-data">
-						<view class="info-tit">预约人数：</view>
-						<view class="info-val">{{item.cts}}</view>
+					<view class="info-data" v-if="item.status == '已结束'">
+						<view class="info-tit">开奖时间：</view>
+						<!-- <view class="info-val">{{item.cts}}</view> -->
+						<view class="info-val">{{getNextTime()}}</view>
 					</view>
 					<view class="info-data">
 						<view class="info-tit">价值：</view>
 						<view class="info-val">{{item.price}}</view>
 					</view>
 				</view>
-				<view class="mc-btn yy " @click="item.status == '进行中' ? packageReserve(item): ''" :class="{'could':item.status == '进行中'}">
+				<view class="mc-btn yy " @click="((item.am == 1 && nowTime >= '06:00' && nowTime < '12:00') || (item.am == 0 && nowTime >= '13:00' && nowTime < '17:00')) ? packageReserve(item): ''" :class="{'could':((item.am == 1 && nowTime >= '06:00' && nowTime < '12:00') || (item.am == 0 && nowTime >= '13:00' && nowTime < '17:00'))}">
 					立即预约
 				</view>
 				<!-- <view class="mc-btn pass could" @click="packageExchange(item,2)">
 					合约兑换
 				</view> -->
-				<view class="mc-btn fail" :class="{'could':(item.am == 0 && item.status == '进行中')}" @click="(item.am == 0 && item.status == '进行中')?packageExchange(item,1):''">
+				<!-- <view class="mc-btn fail" :class="{'could':(item.am == 0 && item.status == '进行中')}" @click="(item.am == 0 && item.status == '进行中')?packageExchange(item,1):''"> -->
+				<view class="mc-btn fail" :class="{'could':item.am == 0 }" @click="item.am == 0 ?packageExchange(item,1):''">
 					推广兑换
 				</view>
 			</view>
@@ -113,7 +116,8 @@
 				page: 1,
 				limit: 10,
 				// loaded: false,
-				nowTime: ''
+				nowTime: '',
+				timer: ''
 			}
 		},
 		onReady(res) {
@@ -136,22 +140,51 @@
 			console.log(this.userInfo)
 			this.loadData()
 			this.getUserInfo()
-			this.nowTime = this.getNow()
+			// this.nowTime = this.getNow()
+			clearInterval(this.timer)
+			this.timer = setInterval(()=> {
+				this.nowTime = this.getNow()
+				console.log(this.nowTime)
+			},1000)
+			// this.nowTime = '10:25'
+		},
+		onBackPress() {
+			console.log('页面隐藏onBackPress')
+			clearInterval(this.timer)
+		},
+		onUnload() {
+			console.log('页面隐藏onUnload')
+			clearInterval(this.timer)
+		},
+		onHide() {
+			console.log('页面隐藏')
+			clearInterval(this.timer)
 		},
 		methods: {
 			...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
-			// contrastTimeO(start,end,now) {
-			// 	let startTime = start.replace(':')*1
-			// 	let endTime = end.replace(':')*1
-			// 	let now = now.replace(':')*1
-			// 	if()
-			// }
 			getNow() {
 				let myDate = new Date();
 				let h = myDate.getHours() > 9 ? myDate.getHours() : ('0' + myDate.getHours());       //获取当前小时数(0-23)
 				let m = myDate.getMinutes() > 9 ? myDate.getMinutes() : ('0' + myDate.getMinutes());     //获取当前分钟数(0-59)
 				return ('' + h + ':' + m)
 			},
+			getNextTime() {
+				let myDate = new Date();
+				// let h = myDate.getHours() > 9 ? myDate.getHours() : ('0' + myDate.getHours());       //获取当前小时数(0-23)
+				// let m = myDate.getMinutes() > 9 ? myDate.getMinutes() : ('0' + myDate.getMinutes());     //获取当前分钟数(0-59)
+				let H = myDate.getHours()
+				let M = myDate.getMinutes()
+				let h = ''
+				let m = ''
+				if(M <= 30) {
+					 h = (H +1) > 9 ? (H +1) : ('0' + (H +1))
+					 m = '00'
+				}else {
+					 h = (H +1) > 9 ? (H +1) : ('0' + (H +1))
+					 m = '30'
+				}
+				return ('' + h + ':' + m)
+			},
 			getPackageList() {
 				getPackageList().then(res => {
 					console.log(res,'getPackageList')
@@ -192,12 +225,12 @@
 			// 兑换包
 			packageExchange(item,type) {
 				let nowTime = this.getNow()
-				if(item.start > nowTime) {
-					return this.$api.msg('活动未开始')
-				}
-				if(item.end < nowTime) {
-					return this.$api.msg('活动已结束')
-				}
+				// if(item.start > nowTime) {
+				// 	return this.$api.msg('活动未开始')
+				// }
+				// if(item.end < nowTime) {
+				// 	return this.$api.msg('活动已结束')
+				// }
 				console.log(item)
 				// this.judgeBase()
 				packageExchange({
@@ -222,12 +255,12 @@
 			//预约包
 			packageReserve(item) {
 				let nowTime = this.getNow()
-				if(item.start > nowTime) {
-					return this.$api.msg('活动未开始')
-				}
-				if(item.end < nowTime) {
-					return this.$api.msg('活动已结束')
-				}
+				// if(item.start > nowTime) {
+				// 	return this.$api.msg('活动未开始')
+				// }
+				// if(item.end < nowTime) {
+				// 	return this.$api.msg('活动已结束')
+				// }
 				packageReserve({
 					package_manager: item.id,
 					price: item.price,

pages/vip/mytz.vue

@@ -7,6 +7,9 @@
 				<view class="tzzz" @click="navto('/pages/vip/tzzz')">
 					通证转账
 				</view>
+				<view class="zzjl" @click="navto('/pages/vip/zzjl')">
+					转账记录
+				</view>
 			</view>
 		</view>
 		<view class="navbar">
@@ -257,6 +260,20 @@ page {
 		font-weight: bold;
 		color: #E83F30;
 	}
+	.zzjl {
+		width: 139rpx;
+		line-height: 50rpx;
+		background: #fff;
+		border-radius: 7rpx;
+		position: absolute;
+		top: 90rpx;
+		right: 0;
+		text-align: center;
+		font-size: 26rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #E83F30;
+	}
 	image {
 		position: absolute;
 		top: 0;

pages/vip/zzjl.vue

@@ -0,0 +1,230 @@
+<template>
+	<view class="content">
+		<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>
+		<swiper :style="{'height':height}" :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
+			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
+				<scroll-view :style="{'height':height}" class="list-scroll-content" scroll-y @scrolltolower="loadData">
+					<!-- 空白页 -->
+					<view class="emptyBox" v-if="tabItem.loaded === true && tabItem.orderList.length === 0"><empty ></empty></view>
+
+					<!-- 订单列表 -->
+					<view class="box" v-for="(item, index) in tabItem.orderList" :key="index" >
+						<view class="i-top b-b flex">
+							<view class="time">订单编号：{{ item.order_id }}</view>
+						</view>
+						<view class="order-item flex">
+							<view class="title-box">
+								<view class="title" v-if="tabCurrentIndex == 0">
+									<text>转给"{{ item.to_user }}"</text>
+								</view>
+								<view class="title" v-if="tabCurrentIndex == 1">
+									<text>"{{ item.to_user }}"转入</text>
+								</view>
+								<view class="time">
+									<text>{{ item._add_time }}</text>
+								</view>
+							</view>
+							<view class="money">
+								<text>{{ item.money }}</text>
+							</view>
+						</view>
+						
+					</view>
+					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+	</view>
+</template>
+
+<script>
+import empty from '@/components/empty';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import { zhuanList } from '@/api/wallet.js';
+export default {
+	components: {
+		empty,
+		uniLoadMore
+	},
+	data() {
+		return {
+			height:'',
+			tabCurrentIndex: 0,
+			navList: [
+				{
+					state: 0,
+					text: '转出',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10 //每次信息条数
+				},
+				{
+					state: 1,
+					text: '转入',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10 //每次信息条数
+				}
+			]
+		};
+	},
+	onLoad(options) {},
+	onShow() {
+		this.loadData();
+	},
+	onReady(res) {
+		var obj = this;
+		uni.getSystemInfo({
+			success: resu => {
+				const query = uni.createSelectorQuery();
+				query.select('.swiper-box').boundingClientRect();
+				query.exec(function(res) {
+					console.log(res, 'ddddddddddddd');
+					obj.height = resu.windowHeight - res[0].top + 'px';
+					console.log('打印页面的剩余高度', obj.height);
+				});
+			},
+			fail: res => {}
+		});
+	},
+	methods: {
+		//获取收入支出信息
+		async loadData(source) {
+			//这里是将订单挂载到tab列表下
+			let index = this.tabCurrentIndex;
+			let navItem = this.navList[index];
+			let state = navItem.state;
+			if (source === 'tabChange' && navItem.loaded === true) {
+				//tab切换只有第一次需要加载数据
+				return;
+			}
+			if (navItem.loadingType === 'loading') {
+				//防止重复加载
+				return;
+			}
+			// 修改当前对象状态为加载中
+			navItem.loadingType = 'loading';
+
+			zhuanList({
+				page: navItem.page,
+				limit: navItem.limit,
+				pm: navItem.state
+			})
+				.then(({ data }) => {
+					console.log(data.data);
+					if (data.data.length > 0) {
+						navItem.orderList = navItem.orderList.concat(data.data);
+						console.log(navItem.orderList);
+						navItem.page++;
+					}
+					if (navItem.limit == data.length) {
+						//判断是否还有数据， 有改为 more， 没有改为noMore
+						navItem.loadingType = 'more';
+						return;
+					} else {
+						//判断是否还有数据， 有改为 more， 没有改为noMore
+						navItem.loadingType = 'noMore';
+					}
+					uni.hideLoading();
+					this.$set(navItem, 'loaded', true);
+				})
+				.catch(e => {
+					console.log(e);
+				});
+		},
+		//swiper 切换
+		changeTab(e) {
+			this.tabCurrentIndex = e.target.current;
+			this.loadData('tabChange');
+		},
+		//顶部tab点击
+		tabClick(index) {
+			this.tabCurrentIndex = index;
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page,.center {
+	background: #f8f8f8;
+	height: 100%;
+}
+.emptyBox {
+	width: 100%;
+	height: 100%;
+}
+.navbar {
+	display: flex;
+	height: 40px;
+	padding: 0 5px;
+	background: #fff;
+	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
+	position: relative;
+	z-index: 10;
+	.nav-item {
+		flex: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 15px;
+		color: $font-color-dark;
+		position: relative;
+		&.current {
+			color: #ff4c4c;
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 44px;
+				height: 0;
+				border-bottom: 2px solid #ff4c4c;
+			}
+		}
+	}
+}
+.i-top {
+	background-color: #ffffff;
+	width: 100%;
+	height: 80rpx;
+	padding: 0 30rpx;
+	font-size: $font-base;
+	color: $font-color-dark;
+	position: relative;
+	margin-top: 20rpx;
+}
+.box {
+	background-color: #fff;
+	margin-top: 10rpx;
+}
+.swiper-box {
+	padding-top: 10rpx;
+	.order-item {
+		padding: 20rpx 30rpx;
+		line-height: 1.5;
+		.title-box {
+			.title {
+				font-size: $font-lg;
+				color: $font-color-base;
+			}
+			.time {
+				font-size: $font-base;
+				color: $font-color-light;
+			}
+		}
+		.money {
+			color: #fd5b23;
+			font-size: $font-lg;
+		}
+	}
+}
+
+</style>
+

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://fb.frp.liuniu946.com',//请求地址配置 
+		baseURL:'http://qy.mangguo1688.cn',//请求地址配置 
 		urlFile:'/index',//项目部署所在文件夹
 		userInfo: {}, //登录信息
 		loginInterceptor:false,//是否打开强制登录

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/461d8430-4457-11ec-9950-635d9634d112
+https://ide.dcloud.net.cn/build/download/5082eec0-4605-11ec-ae47-ef7f6fe8b949

utils/upApp.js

@@ -29,14 +29,14 @@ export function getUpApp() {
 		},
 		data: {},
 		success: res => {
+			console.log(res.data.data.file_url,"123")
 			let r = res.data.data;
-			console.log(r)
 			plus.runtime.getProperty(plus.runtime.appid, function(wgtinfo) {
 				// 保存线上版本号
-				let version = r.apk;
+				let version = r.file_url;
 				console.log(version, 'version+++++++++++++++++++++++1+')
 				// 获取线上版本
-				const arr = r.version_code.split('.');
+				const arr = r.app_version.split('.');
 				// 获取当前系统
 				const arr1 = wgtinfo.version.split('.');
 				console.log(wgtinfo.version, 'wgtinfo.version+++++++++++')