11-13

api/set.js

@@ -70,3 +70,11 @@ export function getAddressDetail(data,id) {
 	});
 }
 
+//交易密码设置
+export function transaction(data) {
+        return request({
+                url: '/api/transaction',
+                method: 'post',
+                data
+        });
+}

api/user.js

@@ -217,4 +217,21 @@ export function becomeVip(data) {
 		method: 'post',
 		data
 	});
+}
+
+// 获取用户名称
+export function nickname(data) {
+	return request({
+		url: '/api/nickname',
+		method: 'get',
+		data
+	});
+}
+
+export function transfer(data) {
+        return request({
+                url: '/api/transfer',
+                method: 'post',
+                data
+        });
 }

manifest.json

@@ -1,16 +1,16 @@
 {
-    "name" : "正一健康",
-    "appid" : "__UNI__A53E8B3",
+    "name" : "分包",
+    "appid" : "__UNI__20ABE35",
     "description" : "",
-    "versionName" : "1.0.9",
-    "versionCode" : 109,
+    "versionName" : "1.0.4",
+    "versionCode" : 104,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */
         "usingComponents" : true,
         "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
+            "alwaysShowBeforeRender" : false,
+            "waiting" : false,
             "autoclose" : true,
             "delay" : 0
         },
@@ -57,13 +57,13 @@
             "splashscreen" : {
                 "androidStyle" : "default",
                 "android" : {
-                    "hdpi" : "unpackage/启动图/480.9.png",
-                    "xhdpi" : "unpackage/启动图/720.9.png",
-                    "xxhdpi" : "unpackage/启动图/1080.9.png"
+                    "hdpi" : "unpackage/启动图/qd480x762.png",
+                    "xhdpi" : "unpackage/启动图/qd720x1242.png",
+                    "xxhdpi" : "unpackage/启动图/qd1080x1882.png"
                 },
-                "iosStyle" : "storyboard",
+                "iosStyle" : "common",
                 "ios" : {
-                    "storyboard" : "C:/Users/Administrator/Desktop/正一/正一.zip"
+                    "storyboard" : ""
                 }
             },
             "icons" : {

pages.json

@@ -152,12 +152,12 @@
 				"navigationBarTitleText": ""
 			}
 		},
-		{
-			"path": "pages/set/phone",
-			"style": {
-				"navigationBarTitleText": "实名认证"
-			}
-		},
+		// {
+		// 	"path": "pages/set/phone",
+		// 	"style": {
+		// 		"navigationBarTitleText": "实名认证"
+		// 	}
+		// },
 		{
 			"path": "pages/set/password",
 			"style": {
@@ -307,6 +307,23 @@
 				"navigationBarTitleText": "充值"
 			}
 		},
+		{
+			"path": "pages/money/moneyPwd",
+			"style": {
+				"navigationBarTitleText": "交易密码"
+			}
+		},
+		{
+			"path": "pages/index/sign",
+			"style": {
+				"navigationBarTitleText": "每日签到",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
+		},
 		{
 			"path": "pages/category/category",
 			"style": {
@@ -542,24 +559,6 @@
 				"selectedIconPath": "static/tabBar/tab-home-current.png",
 				"text": "首页"
 			},
-			// {
-			// 	"pagePath": "pages/purchase/purchase",
-			// 	"iconPath": "static/tabBar/tab-home.png",
-			// 	"selectedIconPath": "static/tabBar/tab-home-current.png",
-			// 	"text": "买入"
-			// },
-			// {
-			// 	"pagePath": "pages/sellout/sellout",
-			// 	"iconPath": "static/tabBar/tab-home.png",
-			// 	"selectedIconPath": "static/tabBar/tab-home-current.png",
-			// 	"text": "卖出"
-			// },
-			// {
-			// 	"pagePath": "pages/appointment/appointment",
-			// 	"iconPath": "static/tabBar/tab-cate.png",
-			// 	"selectedIconPath": "static/tabBar/tab-cate-current.png",
-			// 	"text": "我的预约"
-			// },
 			{
 				"pagePath": "pages/category/category",
 				"iconPath": "static/tabBar/tab-cate.png",

pages/appointment/appointment.vue

@@ -42,7 +42,7 @@
 								<view class="info-tit">价值：</view>
 								<view class="info-val">{{item.price}}</view>
 							</view>
-							<view class="upimg" v-if="item.status == 1">
+							<!-- <view class="upimg" v-if="item.status >= 1">
 								<view class="up-tit">
 									打款凭证：
 								</view>
@@ -52,8 +52,8 @@
 								<view class="" style="color: #0F253A;font-weight: bold;font-size: 26rpx;" v-else>
 									上传支付凭证
 								</view>
-							</view>
-							<view class="btn-wrap flex" v-if="item.status == 1 || item.status == 2">
+							</view> -->
+							<view class="btn-wrap flex" v-if="item.status == 1">
 								<!-- <view class="btn" @click="open(item.id)"> -->
 								<view class="btn" @click="navto('/pages/purchase/upload?id=' + item.id + '&paytype=' + JSON.stringify(item.touser) )">
 									提交凭证
@@ -196,6 +196,13 @@
 			});
 		},
 		methods: {
+			refresh() {
+				this.navList[1].list = []
+				this.navList[1].page = 1
+				this.navList[1].loaded = false
+				this.navList[1].loadingType = 'more'
+				this.loadData()
+			},
 			lookimg(src) {
 				console.log(src,'chooseImg++++++')
 				this.chooseImg = src

pages/index/index.vue

@@ -30,7 +30,7 @@
 			</view> -->
 		</view>
 		<!-- 分类 -->
-		<view class="cate-section">
+		<!-- <view class="cate-section">
 			<view class="cate-item" @click="navToTab('/pages/category/category')">
 				<image src="/static/icon/c3.png"></image>
 				<text>全部分类</text>
@@ -53,13 +53,13 @@
 					<text>分享有礼</text>
 				</view>
 			</navigator>
-		</view>
+		</view> -->
 		
 		<!-- 好货推荐 -->
 		<view class="store-wrapper">
 			<view class="title-wrapper flex">
 				<image src="/static/icon/t3.png" mode=""></image>
-				<view class="">好货推荐</view>
+				<view class="">积分商品</view>
 				<view class="title-b">优选商品低价入手</view>
 			</view>
 			<view class="goods-wrapper flex">

pages/index/sign.vue

@@ -0,0 +1,178 @@
+<template>
+	<view>
+		<view class="title-box">
+			<view class=" title-conetnt  position-relative">
+				<view class="title-img"><image src="/static/img/img08.png" mode="aspectFit"></image></view>
+				<view class="title-content-box">
+					<view class="title-text">已连续签到</view>
+					<view class="title-day-text">
+						<text class="title-day">{{actionDay}}</text>
+						<text>天</text>
+					</view>
+					<view class="title-button" :class="{'signAction':signTrue}" @click="signTrue?'':integral()">{{signTrue?'已签到':'立即签到'}}</view>
+				</view>
+			</view>
+			<view class="title-tip"><text>共获得{{sum_integral}}通证,总签到{{allSign}}天</text></view>
+		</view>
+		<calendar class="sign-date-box" :checks="signList" checksClass="" :checkTextShow="true" checksIcon="/static/img/img07.png"></calendar>
+	</view>
+</template>
+
+<script>
+import calendar from '../../components/ss-calendar/ss-calendar.vue';
+import { signList, integral,signUser } from '@/api/functionalUnit.js';
+export default {
+	components: {
+		calendar
+	},
+	data() {
+		return {
+			money: '', //保存当前月份
+			year: '', //保存当前年份
+			day: '', //保存当前日期
+			signList: [] ,//签到日子列表
+			actionDay:0,//连续签到天数
+			allSign:0,//累计签到
+			sum_integral:0,//累计获得积分
+			signTrue:false,
+		};
+	},
+	onLoad() {
+		this.signUser();
+		this.getData();
+		this.loadList();
+	},
+	methods: {
+		// 获取当前时间
+		getData(current) {
+			const date = current ? new Date(current) : new Date();
+			this.year = date.getFullYear();//保存当前年份
+			this.month = date.getMonth() + 1;//保存当前月份
+			this.day = date.getDate();//保存当前日期
+		},
+		//获取签到用户信息
+		signUser(){
+			signUser({all:1}).then(({data}) => {
+				this.actionDay = data.sign_num;//连续签到天数
+				this.allSign = data.sum_sgin_day;//累计签到天数
+				this.sum_integral = data.sum_integral;//累计总积分
+			})
+		},
+		// 签到
+		integral() {
+			integral({})
+				.then(e => {
+					// 改为已签到
+					this.signTrue = true;
+					this.actionDay++;
+					// 保存签到成功
+					this.signList.push(this.day);
+					uni.showToast({
+						title: '签到成功',
+						duration: 2000,
+						position: 'top'
+					});
+					this.signUser()
+				})
+				.catch(e => {
+					console.log(e);
+				});
+		},
+		// 获取签到列表
+		loadList() {
+			let obj = this;
+			let present = this.day; //保存当前天数用于后续计算
+			let actionDay = 0; //用于计算活跃天数
+			let arr = []; //保存返回数组；
+			signList({
+				page: 1,
+				limit: 31
+			}).then(e => {
+				arr = e.data.map((e, ind) => {
+					let time = e.add_time.split('-');
+					let day = parseInt(time[2].replace(/^0/i, ''));
+					let year = time[0];
+					let month = +time[1];
+					if (obj.year == year && obj.month == month) {
+						return day;
+					}
+				});
+				this.signList = arr;
+				// 判断今天是否已经签到
+				if(arr[0]==this.day){
+					this.signTrue = true;
+				}
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background: $page-color-base;
+}
+.sign-date-box {
+	margin: 25rpx;
+	border-radius: 15rpx;
+	margin-top: -70rpx;
+}
+.title-box {
+	background-color: $base-color;
+	padding-top: 120rpx;
+	color: #ffffff;
+	height: 590rpx;
+	.title-conetnt {
+		height: 350rpx;
+		width: 350rpx;
+		margin: 0 auto;
+		text-align: center;
+		.title-img {
+			position: absolute;
+			top: 0;
+			left: 0;
+			height: 100%;
+			width: 100%;
+			image {
+				height: 100%;
+				width: 100%;
+			}
+		}
+		.title-content-box {
+			position: absolute;
+			width: 100%;
+			.title-day-text {
+				padding: 20rpx;
+				font-size: $font-base - 2rpx;
+				.title-day {
+					font-size: 60rpx;
+				}
+			}
+			.title-text {
+				font-size: 26rpx;
+				padding-top: 100rpx;
+			}
+			.title-button {
+				background-color: #fe7e51;
+				border-radius: 99rpx;
+				width: 200rpx;
+				height: 64rpx;
+				margin: 0 auto;
+				line-height: 64rpx;
+				text-align: center;
+				font-size: $font-base;
+				&.signAction{
+					background-color: $font-color-light;
+				}
+			}
+		}
+	}
+}
+.title-tip {
+	color: #ffffff;
+	font-size: $font-base - 2rpx;
+	padding-top: 20rpx;
+	text-align: center;
+	margin-top: -40rpx;
+}
+</style>

pages/money/moneyPwd.vue

@@ -0,0 +1,165 @@
+<template>
+	<view class="container">
+		<view class="row b-b" v-if="userInfo.transaction">
+			<text class="tit">原密码</text>
+			<input class="input" v-model="oldPassword" type="text" placeholder="请填写原密码" placeholder-class="placeholder" />
+		</view>
+		<!-- <view class="row b-b">
+			<text class="tit">验证码</text>
+			<input class="input" v-model="captcha" type="text" placeholder="请填写验证码" placeholder-class="placeholder" />
+			<view class="code" @click="verification">{{ countDown == 0 ? '验证码' : countDown }}</view>
+		</view> -->
+		<view class="row b-b">
+			<text class="tit">新密码</text>
+			<input class="input" v-model="password" type="password" placeholder="请填写6位新密码" placeholder-class="placeholder" />
+		</view>
+		<view class="row b-b">
+			<text class="tit">再次输入</text>
+			<input class="input" v-model="yzpassword" type="password" placeholder="请重新填写6位新密码" placeholder-class="placeholder" />
+		</view>
+		<button class="add-btn" :class="{'bg-gray':loding}" @click="loding?'':confirm()">提交</button>
+	</view>
+</template>
+
+<script>
+import { verify } from '@/api/login.js';
+import { mapState } from 'vuex';
+import { transaction } from '@/api/set.js';
+export default {
+	data() {
+		return {
+			time: '', //保存倒计时对象
+			countDown: 0, //倒计时
+			// account: '', //手机号
+			// captcha: '', //验证码
+			oldPassword:'',//老密码
+			password: '' ,//新密码
+			yzpassword:'',//重复输入
+			loding:false,//是否载入中
+		};
+	},
+	computed: {
+		...mapState('user',['userInfo'])
+	},
+	onLoad() {
+		if(this.userInfo.phone == null){
+			this.account = '';
+		}else{
+			this.account = this.userInfo.phone;
+			this.show = false;
+		}
+	},
+	watch: {
+		// 监听倒计时
+		countDown(i) {
+			if (i == 0) {
+				clearInterval(this.time);
+			}
+		}
+	},
+	methods: {
+		confirm(e) {
+			const reg = /^[0-9]{6}$/;
+			console.log(this.yzpassword)
+			if(!reg.test(this.yzpassword)){
+				uni.showModal({
+					title: '错误',
+					content: '请输入6位数字支付密码',
+					showCancel: false,
+				});
+				return false
+			}
+			if(this.yzpassword!=this.password){
+				uni.showModal({
+					title: '错误',
+					content: '密码不一致请重新输入',
+					showCancel: false,
+				});
+				return  false
+			}
+			this.loding = true;
+			transaction({
+				pass: this.password,
+				oldpass: this.oldPassword,
+			})
+				.then(({ data }) => {
+					this.loding = false;
+					uni.showModal({
+						title: '提示',
+						content: '修改成功',
+						showCancel: false,
+						confirmText: '返回个人中心',
+						success: res => {
+							uni.switchTab({
+								url:'/pages/user/user'
+							})
+						}
+					});
+					
+				})
+				.catch(err => {
+					this.loding = false;
+					console.log(err);
+				});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background: $page-color-base;
+}
+.container {
+	padding-top: 30rpx;
+}
+.row {
+	display: flex;
+	align-items: center;
+	position: relative;
+	padding: 0 30rpx;
+	height: 110rpx;
+	background: #fff;
+
+	.tit {
+		flex-shrink: 0;
+		width: 120rpx;
+		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;
+	}
+}
+.add-btn {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 690rpx;
+	height: 80rpx;
+	margin: 60rpx auto;
+	font-size: $font-lg;
+	color: #fff;
+	background: #ff4c4c;
+	border-radius: 10rpx;
+	// box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
+}
+
+.bg-gray{
+	background-color: $color-gray;
+}
+.code {
+	color: #5dbc7c;
+	font-size: 23rpx;
+	border-left: 1px solid #eeeeee;
+	width: 150rpx;
+	flex-shrink: 0;
+	text-align: center;
+}
+</style>

pages/money/pay.vue

@@ -6,16 +6,16 @@
 		</view>
 		<view class="pay-type-list">
 			<!-- #ifndef APP-PLUS -->
-			<view class="type-item b-b" @click="changePayType(1)">
+			<!-- <view class="type-item b-b" @click="changePayType(1)">
 				<text class="icon iconfont iconweixin"></text>
 				<view class="con">
 					<text class="tit">微信支付</text>
 					<text>推荐使用微信支付</text>
 				</view>
 				<label class="radio"><radio value="" color="#5dbc7c" :checked="payType == 1"></radio></label>
-			</view>
+			</view> -->
 			<!-- #endif -->
-			<view class="type-item b-b" @click="changePayType(1)">
+			<!-- <view class="type-item b-b" @click="changePayType(1)">
 				<text class="icon iconfont iconweixin"></text>
 				<view class="con">
 					<text class="tit">微信支付</text>
@@ -27,7 +27,7 @@
 				<text class="icon iconfont iconzhifubao"></text>
 				<view class="con"><text class="tit">支付宝支付</text></view>
 				<label class="radio"><radio value="" color="#5dbc7c" :checked="payType == 2"></radio></label>
-			</view>
+			</view> -->
 			<!-- #ifdef APP-PLUS -->
 			<!-- #endif -->
 			<view class="type-item" @click="changePayType(3)">

pages/order/createOrder.vue

@@ -211,7 +211,7 @@ export default {
 			},
 			payPrice: 0, //总支付金额
 			orderKey: '', //订单id
-			checkedPoints: false, //判断是否积分抵扣
+			checkedPoints: true, //判断是否积分抵扣
 			integralAll: 0, //可使用的积分
 			integralMoney: 0, //积分抵扣金额
 			integralShow: false, //是否显示积分抵扣金额
@@ -368,6 +368,10 @@ export default {
 				this.$api.msg('请选择收货地址');
 				return false;
 			}
+			if(this.payAllMoney > this.integralAll) {
+				this.$api.msg('您的积分不足');
+				return
+			}
 			console.log(this.isdrop,'dddddddddddddddddddddddddd')
 			let url =  '/pages/money/pay?key='+ this.orderKey + '&isdrop=' + this.isdrop
 			if(this.pinkid){

pages/purchase/purchase.vue

@@ -17,7 +17,7 @@
 			<view class="item-info">
 				<view class="info-data">
 					<view class="info-tit">收益：</view>
-					<view class="info-val">{{item.day}}天/{{item.proportion}}%</view>
+					<view class="info-val">{{item.day}}天/{{item.proportion}}</view>
 				</view>
 				<!-- <view class="info-data">
 					<view class="info-tit">：</view>
@@ -25,7 +25,7 @@
 				</view> -->
 				<view class="info-data">
 					<view class="info-tit">可获通证：</view>
-					<view class="info-val">1.0%</view>
+					<view class="info-val">{{item.pass}}</view>
 				</view>
 				<view class="info-data">
 					<view class="info-tit">价值：</view>

pages/purchase/upload.vue

@@ -1,6 +1,16 @@
 <template>
 	<view class="content">
-		<view class="choose-wrap flex">
+		
+		
+		<view class="tit">
+			上传支付凭证
+		</view>
+		<view class="up-wrap" @click="imgsub('upimg')">
+			<image :src="upimg" mode="" v-if="upimg"></image>
+			<image v-else src="../../static/img/upimg.png" mode=""></image>
+		</view>
+		<view class="btn" @click="evaluationUpload">提交审核</view>
+		<view class=" flex btn" style="justify-content: center;">
 			<view class="zftype">
 				支付方式：
 			</view>
@@ -45,14 +55,6 @@
 				<input type="text" value="" class="item-val" placeholder="" v-model="toUser.bank_card" />
 			</view>
 		</view>
-		<view class="tit">
-			上传支付凭证
-		</view>
-		<view class="up-wrap" @click="imgsub('upimg')">
-			<image :src="upimg" mode="" v-if="upimg"></image>
-			<image v-else src="../../static/img/upimg.png" mode=""></image>
-		</view>
-		<view class="btn" @click="evaluationUpload">提交审核</view>
 	</view>
 </template>
 
@@ -112,6 +114,7 @@
 						title:'提交成功',
 						duration:2000
 					});
+					obj.$api.prePage().refresh();
 					setTimeout(() => {
 						uni.navigateBack({
 							
@@ -170,7 +173,7 @@
 		font-size: 30rpx;
 		font-family: PingFang SC;
 		font-weight: bold;
-		color: #333333;
+		// color: #333333;
 	}
 	.base-info {
 		margin: auto;

pages/sellout/sellout.vue

@@ -42,9 +42,9 @@
 				<view class="mc-btn pass" @click="passPackage(item)">
 					通过
 				</view>
-				<view class="mc-btn fail" @click="openrefuse">
+				<!-- <view class="mc-btn fail" @click="openrefuse(item)">
 					拒绝
-				</view>
+				</view> -->
 			</template>
 			
 		</view>
@@ -54,7 +54,7 @@
 				<view class="box-tit">
 					请输入拒绝原因
 				</view>
-				<textarea :value="resone" placeholder="请输入拒绝原因" class="resone-wrapper" focus />
+				<textarea v-model="resone" placeholder="请输入拒绝原因" class="resone-wrapper" focus />
 				<view class="btn-wrap">
 					<view class="btn" @click="refusFali">
 						取消
@@ -145,7 +145,8 @@
 				limit: 10,
 				loaded: false,
 				chooseImg: '',//选择要查看的图片
-				choose_order: ''
+				choose_order: '',
+				chooseIndex: 0,
 			}
 		},
 		onLoad() {
@@ -157,6 +158,12 @@
 			this.loadData()
 		},
 		methods: {
+			reload() {
+				this.list = []
+				this.page = 1
+				this.loadingType = 'more'
+				this.loadData()
+			},
 			lookimg(src) {
 				console.log(src,'chooseImg++++++')
 				this.chooseImg = src
@@ -171,7 +178,7 @@
 				packageOrder({
 					page: obj.page,
 					limit: obj.limit,
-					status: 1
+					status: 2
 				}).then(({
 					data
 				}) => {
@@ -187,7 +194,9 @@
 				})
 
 			},
-			openrefuse() {
+			openrefuse(item) {
+				this.choose_order = item.id
+				this.chooseIndex = this.list.indexOf(item)
 				this.$refs.refuse.open()
 			},
 			//取消拒绝
@@ -210,11 +219,12 @@
 				}).then(res => {
 					obj.resone = ''
 					obj.$refs.refuse.close()
-					obj.page = 0
-					obj.list = []
-					obj.loaded = false
-					obj.loadingType = 'more'
-					obj.loadData()
+					obj.list[obj.chooseIndex].status = -2
+					// obj.page = 0
+					// obj.list = []
+					// obj.loaded = false
+					// obj.loadingType = 'more'
+					// obj.loadData()
 				})
 				
 			},
@@ -222,19 +232,23 @@
 				this.chooseImg = ''
 				this.$refs.lookimg.close()
 			},
-			passPackage() {
+			passPackage(item) {
+				let index = this.list.indexOf(item)
+				console.log(index,'index')
 				packageAudit({
 					re: '',
-					id: obj.choose_order,
+					id: item.id,
 					status: 3
 				}).then(res => {
+					uni.showToast({
+						title:'审核通过',
+						duration:2000
+					});
 					console.log(res)
-					obj.$refs.refuse.close()
-					obj.page = 0
-					obj.list = []
-					obj.loaded = false
-					obj.loadingType = 'more'
-					obj.loadData()
+					this.list[index].status = 3
+					
+					// this.reload()
+					
 				})
 			}
 		}
@@ -352,7 +366,7 @@
 					border-radius: 20rpx;
 					width: 153rpx;
 					height: 152rpx;
-					background-color: red;
+					background-color: #ccc;
 				}
 			}
 		}
@@ -373,7 +387,7 @@
 		.pass {
 			color: #FF4C4C;
 			border: 2px solid #FF4C4C;
-			right: 190rpx;
+			right: 36rpx;
 		}
 
 		.fail {

pages/set/userdata.vue

@@ -21,6 +21,14 @@
 				<view class="item-name">昵称</view>
 				<input type="text" value="" class="item-val" placeholder="输入您的昵称" v-model="nickname" />
 			</view>
+			<view class="base-item flex">
+				<view class="item-name">ID</view>
+				<input type="text" value="" class="item-val" placeholder="输入您的昵称" v-model="uid" disabled/>
+			</view>
+			<view class="base-item flex">
+				<view class="item-name">会员等级</view>
+				<input type="text" class="item-val" placeholder="" v-model="vip_name" disabled/>
+			</view>
 			<view class="base-item flex">
 				<view class="item-name">手机号</view>
 				<input type="text" value="" class="item-val" placeholder="输入您的手机号" v-model="phone" />
@@ -93,6 +101,8 @@
 				// birthday: '',
 				city: '',
 				card_id: '',//身份证
+				uid: '',
+				vip_name: ''
 			}
 		},
 		onLoad() {
@@ -102,7 +112,8 @@
 			obj.alipay_no = obj.userInfo.alipay_no || '',
 			obj.bank_branch = obj.userInfo.bank_branch || ''
 			obj.account_Bank = obj.userInfo.account_Bank || ''
-			obj.bank_card = obj.userInfo.bank_card || '',
+			obj.bank_card = obj.userInfo.bank_card || ''
+			obj.uid = obj.userInfo.uid
 			obj.bank_name = obj.userInfo.bank_name || ''
 			// obj.birthday = obj.userInfo.birthday || ''
 			// obj.card_id: obj.userInfo.card_id  || ''
@@ -111,6 +122,8 @@
 			obj.phone = obj.userInfo.phone || ''
 			obj.real_name = obj.userInfo.real_name || ''
 			obj.nickname = obj.userInfo.nickname || ''
+			console.log(obj.userInfo.vip_name,'obj.userInfo.vip_name')
+			obj.vip_name = obj.userInfo.vip_name || '暂无'
 		},
 		methods: {
 			...mapMutations('user', ['setUserInfo', 'setOrderInfo','logout']),

pages/user/shareQrCode.vue

@@ -1,161 +1,181 @@
 <template>
-	<view class="container" v-if="loaded">
-		<image @longtap="bc_code" class="backImg" :src="backImg"></image>
-		<!-- <view class="tki-qrcode"><canvas @longtap="bc_code" canvas-id="qrcode" /></view> -->
-		<view class="tki-qrcode">
-			<tki-qrcode :key="'http://shop.zhengyjk1994.com/register?petent=' + userInfo.uid" cid="tki-qrcode-canvas"
-				ref="qrcode"
-				:val="'http://shop.zhengyjk1994.com/register?petent=' + userInfo.uid"
-				:size="300" unit="upx" background="#ffffff" foreground="#333333" pdground="#333333" icon=""
-				:iconSize="40" :lv="3" :onval="true" :loadMake="true" :usingComponents="true" />
+	<view class="content">
+		<!-- <view class="user-logo">
+			<image :src="userInfo.avatar" mode=""></image>
+			<view class="user-name">{{userInfo.nickname}}</view>
+		</view> -->
+		<image src="../../static/img/sharebase.png" mode="" class="sharebg" ></image>
+		<view class="code-warpper">
+			<view class="code-content">
+				<tki-qrcode
+					:cid="cid"
+					ref="qrcode"
+					:val="val"
+					:size="size"
+					:unit="unit"
+					:background="background"
+					:foreground="foreground"
+					:pdground="pdground"
+					:iconSize="iconSize"
+					:lv="lv"
+					:onval="onval"
+					:loadMake="loadMake"
+					:usingComponents="usingComponents"
+					@result="qrR"
+				/>
+			</view>
+			<view class="code">
+				邀请码：{{userInfo.uid}}
+			</view>
 		</view>
-	</view>
-</template>
-
+		<view class="btm">
+			<!-- 向商家出示二维码 -->
+		</view>
+	</view>
+</template>
+
 <script>
-	import {
-		spreadBanner
-	} from '@/api/user.js';
-	import tkiQrcode from '@/components/tki-qrcode/tki-qrcode.vue'
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
+	import { orderDetail } from '@/api/order.js';
+	import tkiQrcode from '@/components/tki-qrcode/tki-qrcode.vue';
+	import { mapState, mapMutations } from 'vuex';
 	export default {
-		components: {
+		comments:{
 			tkiQrcode
 		},
 		data() {
 			return {
-				url: '',
-				backImg: '',
-				loaded: false
-			};
-		},
-		onLoad() {
-			this.spread();
+				id:'',
+				// code: '10250035810',
+				cid: 'tki-qrcode-canvas', //canvasId，页面存在多个二维码组件时需设置不同的ID
+				size: 300, //生成的二维码大小
+				unit: 'upx', //大小单位尺寸
+				show: true,//默认使用组件中的image标签显示二维码
+				val: '', //要生成的内容
+				background: '#ffffff', //二维码背景色
+				foreground: '#333333', //二维码前景色
+				pdground: '#333333', //二维码角标色
+				icon: '', //二维码图标URL（必须是本地图片，网络图需要先下载至本地）
+				iconSize: 40, //二维码图标大小
+				lv: 3, //容错级别
+				onval: true, //监听val值变化自动重新生成二维码
+				loadMake: true, //组件初始化完成后自动生成二维码，val需要有值
+				usingComponents: false, //是否使用了自定义组件模式（主要是为了修复非自定义组件模式时 v-if 无法生成二维码的问题）
+				showLoading: false, //是否显示loading
+				loadingText: '二维码生成中', //loading文字
+				src: '', // 二维码生成后的图片地址或base64
+				ratio: 1, //页面比例用于计算
+				ctxSrc: '', //要显示的图片
+				loading: true,//是否载入图片中
+				canHeight: '',//画布高度
+				canWeidth: ''//画布宽度
+			}
 		},
 		computed: {
 			...mapState('user', ['userInfo', 'orderInfo', 'hasLogin']),
-			cpSize() {
-				if (this.unit == "upx") {
-					return uni.upx2px(this.size)
-				} else {
-					return this.size
-				}
-			},
+			...mapState(['baseURL'])
+		},
+		onShow() {
+			console.log(this.userInfo)
+			// 判断是否已经登录
+			if (this.hasLogin) {
+				// this.loadBaseData();
+				// this.getSpreadCount()
+				console.log(this.userInfo)
+				// console.log(this.userInfo)
+			}
+		},
+		onLoad(opt) {
+			this.val = this.baseURL + '/register?spread=' + this.userInfo.uid
+			// if(opt.id) {
+			// 	this.id = opt.id
+			// 	orderDetail({}, this.id).then(e => {
+			// 		this.val = e.data._verify_code;
+			// 		this.val = this.val.replace(/\s/g, '')
+			// 	});
+			// }else {
+			// 	this.val = opt.code.replace(/\s/g, '')
+			// }
+			// console.log(this.val )
 		},
 		methods: {
-			spread() {
-				let obj = this;
-				uni.showLoading({
-					title: '二维码生成中...'
-				})
-				spreadBanner({
-					type: 2
-				}).then(({
-					data
-				}) => {
-					uni.hideLoading()
-					console.log(data)
-					obj.backImg = data[0].pic;
-					console.log(obj.backImg, 'obj.backImg')
-					this.loaded = true
-					
-				}).catch(err => {
-					console.log(err)
-					uni.hideLoading()
-				});
-			},
-			bc_code() {
-				let that = this;
-				console.log('保存二维码', this.backImg)
-				uni.downloadFile({ //获得二维码的临时地址
-					url: this.backImg,
-					success: (res) => {
-						//console.log('获取url',res)
-						if (res.statusCode == 200) {
-							uni.saveImageToPhotosAlbum({
-								filePath: res.tempFilePath, //传入临时地址
-								success() {
-									that.$api.msg('保存成功') //封装的提示
-								},
-								fail() {
-									that.$api.msg('保存失败')
-								}
-							})
-						}
-					}
-				})
+			// 生成二维码后返回base64
+			qrR(res) {
+				this.src = res;
 			},
-		},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content {
+		position: relative;
+		background-color: #ff341a;
+		height: 100vh;
+		min-height: 100%;
 	}
-</script>
-
-<style lang="scss">
 	page {
-		width: 100%;
+		height: 100vh;
 		min-height: 100%;
-
-		.container {
-			width: 100%;
-			height: 100%;
-		}
+		background-color: #ff341a;
 	}
-
-	.backImg {
-		position: absolute;
-		width: 100%;
-		height: 100%;
-	}
-
-	.portrait {
-		width: 100%;
-		text-align: center;
-		padding-top: 80rpx;
-		padding-bottom: 30rpx;
-
+	.user-logo {
+		height: 300rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
 		image {
-			width: 250rpx;
-			height: 250rpx;
+			width: 102rpx;
+			height: 102rpx;
+			border-radius: 50%;
 		}
+		.user-name {
+			padding-top: 25rpx;
+			font-size: 34rpx;
+			font-family: SourceHanSansCN;
+			font-weight: 400;
+			color: #2B2B2B;
+		}
+		
 	}
-
-	.text {
-		text-align: center;
-		width: 100%;
-		color: #FFFFFF;
-		font-size: 55rpx;
-		letter-spacing: 15rpx;
-	}
-
-	.uid-name {
-		padding: 50rpx 0rpx;
-		text-align: center;
-		width: 100%;
-		color: #FFFFFF;
+	.code-warpper {
+		width: 515rpx;
+		height: 515rpx;
+		margin: 0 auto;
+		// border: 3rpx solid #901B21;
+		padding-top: 46rpx;
+		position: absolute;
+		top:600rpx;
+		left: 0;
+		right: 0;
+		margin: auto;
+		.code-content {
+			width: 300rpx;
+			height: 300rpx;
+			// background-color: red;
+			margin: 0 auto;
+		}
+		.code {
+			padding-top: 31rpx;
+			font-size: 36rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #333333;
+			text-align: center;
+		}
 	}
-
-	.copy-btn {
-		color: #FFFFFF;
-		background-color: #4BA6ED;
-		border-radius: 50rpx;
-		width: 170rpx;
-		line-height: 70rpx;
-		margin: 0rpx auto;
+	.btm {
+		padding-top: 45rpx;
+		font-size: 30rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #333333;
 		text-align: center;
 	}
-
-	.tki-qrcode {
-		position: fixed;
-		bottom: 10%;
-		left: 30%;
-	}
-
-	canvas {
-		width: 150px;
-		height: 150px;
-		margin: auto;
-
-	}
+	.sharebg {
+		width: 750rpx;
+		height: 1206rpx;
+		position: absolute;
+		top: 0;
+	}
 </style>

pages/user/user.vue

@@ -12,6 +12,9 @@
 					<view class="info-box">
 						<view class="username">{{ userInfo.nickname || '游客' }}</view>
 						<view class="phone" v-if="userInfo.phone">{{userInfo.phone | phone}}</view>
+						<view class="phone">
+							{{userInfo.vip_name || ''}}
+						</view>
 					</view>
 				</view>
 				<!-- 设置 -->
@@ -62,6 +65,10 @@
 					<view class="tool-img"><image src="../../static/icon/g1.png" mode=""></image></view>
 					<view class="tool-name">服务包专区</view>
 				</view>
+				<view class="tool-item" @click="nav('/pages/index/sign')" v-if="userInfo.level > 0">
+					<view class="tool-img"><image src="../../static/icon/g10.png" mode=""></image></view>
+					<view class="tool-name">每日签到</view>
+				</view>
 				<view class="tool-item" @click="nav('/pages/user/shareQrCode')">
 					<view class="tool-img"><image src="../../static/icon/g2.png" mode=""></image></view>
 					<view class="tool-name">推广二维码</view>
@@ -74,14 +81,18 @@
 					<view class="tool-img"><image src="../../static/icon/g4.png" mode=""></image></view>
 					<view class="tool-name">我的地址</view>
 				</view>
-				<view class="tool-item" @click="nav('/pages/set/password')">
+				<!-- <view class="tool-item" @click="nav('/pages/set/password')">
 					<view class="tool-img"><image src="../../static/icon/g6.png" mode=""></image></view>
 					<view class="tool-name">修改密码</view>
-				</view>
+				</view> -->
 				<view class="tool-item" @click="open()">
 					<view class="tool-img"><image src="../../static/icon/g7.png" mode=""></image></view>
 					<view class="tool-name">联系客服</view>
 				</view>
+				<view class="tool-item" @click="nav('/pages/money/moneyPwd')">
+					<view class="tool-img"><image src="../../static/icon/g9.png" mode=""></image></view>
+					<view class="tool-name">交易密码</view>
+				</view>
 				<view class="tool-item" @click="nav('/pages/set/userdata')">
 					<view class="tool-img"><image src="../../static/icon/g8.png" mode=""></image></view>
 					<view class="tool-name">设置</view>
@@ -309,7 +320,7 @@
 			display: flex;
 			justify-content: space-around; // 水平平均分布
 			align-items: center; // 垂直居中 
-			margin-top: 80rpx;
+			margin-top: 60rpx;
 			text-align: center;
 			.infor-left {
 				width: 100%;
@@ -643,7 +654,7 @@
 	}
 	.my-tools {
 		width: 710rpx;
-		height: 418rpx;
+		// height: 418rpx;
 		background: #FFFFFF;
 		box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
 		border-radius: 20rpx;

pages/vip/extension.vue

@@ -3,7 +3,7 @@
 		<!-- 头部 -->
 		<view class="header">
 			<image src="../../static/img/hybg.png" mode="scaleToFill"></image>
-			<view class="money">{{+integralAll || 0}}</view>
+			<view class="money">{{brokerage_price || 0}}</view>
 		</view>
 		<!-- 收入和支出 -->
 		<view class="navbar">
@@ -18,7 +18,7 @@
 					<view class="cost">
 						<view class="award" v-for="item in tabItem.orderList">
 							<view class="award-left">
-								<view class="text clamp">{{ item.mark }}</view>
+								<view class="text clamp">{{ item.title }}</view>
 								<view class="time">{{ item.add_time }}</view>
 							</view>
 							<view class="award-right">{{ item.pm == 1 ? '+' : '-' }}{{ item.number }}</view>
@@ -36,7 +36,7 @@
 import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
 import empty from '@/components/empty';
 //接口
-import { integral } from '@/api/wallet.js';
+import { integral ,spreadCommission} from '@/api/wallet.js';
 import { getUserInfo } from '@/api/user.js';
 export default {
 	components: {
@@ -49,7 +49,7 @@ export default {
 			tabCurrentIndex: 0,
 			navList: [
 				{
-					state: 1,
+					state: 3,
 					text: '收入',
 					loadingType: 'more',
 					orderList: [],
@@ -57,7 +57,7 @@ export default {
 					limit: 10 //每次信息条数
 				},
 				{
-					state: 0,
+					state: 4,
 					text: '支出',
 					loadingType: 'more',
 					orderList: [],
@@ -67,7 +67,7 @@ export default {
 			],
 			list: [],
 			// money: '',
-			integralAll: '',//当前积分
+			brokerage_price: '',//当前积分
 		};
 	},
 	onLoad() {
@@ -92,7 +92,7 @@ export default {
 		//加载用户信息
 		userinfo() {
 			getUserInfo({}).then(({ data }) => {
-				this.integralAll = data.integral;
+				this.brokerage_price = data.brokerage_price;
 			});
 		},
 		//swiper 切换
@@ -115,12 +115,12 @@ export default {
 				return;
 			}
 			navItem.loadingType == 'loading';
-			integral({
+			spreadCommission({
 				page: navItem.page,
 				limit: navItem.limit,
-				pm: navItem.state
-			}).then(res => {
-				navItem.orderList = navItem.orderList.concat(res.data);
+				// pm: navItem.state
+			},navItem.state).then(res => {
+				navItem.orderList = navItem.orderList.concat(res.data[0].list);
 				if (navItem.limit == res.data.length) {
 					navItem.loadingType = 'more';
 					return;

pages/vip/fwbDetail.vue

@@ -5,20 +5,20 @@
 				
 			</view>
 			<view class="user-data flex">
-				<view class="data" @click="navto('/pages/vip/contract')">
+				<!-- <view class="data" @click="navto('/pages/vip/contract')">
 					<view class="data-val">200</view>
 					<view class="data-tit">合约收益</view>
-				</view>
+				</view> -->
 				<view class="data" @click="navto('/pages/vip/extension')">
-					<view class="data-val">200</view>
+					<view class="data-val">{{(userInfo.brokerage_price*1).toFixed(0)}}</view>
 					<view class="data-tit">推广收益</view>
 				</view>
 				<view class="data" @click="navto('/pages/vip/mytz')">
-					<view class="data-val">{{userInfo.now_money}}</view>
+					<view class="data-val">{{(userInfo.now_money*1).toFixed(0)}}</view>
 					<view class="data-tit">我的通证</view>
 				</view>
 				<view class="data" @click="navto('/pages/user/integral')">
-					<view class="data-val">{{userInfo.integral}}</view>
+					<view class="data-val">{{(userInfo.integral*1).toFixed(0)}}</view>
 					<view class="data-tit">我的积分</view>
 				</view>
 			</view>
@@ -27,7 +27,8 @@
 			<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">
+			<view class="buy-item" v-for="item in list" v-if="(nowTime => '12:00' && item.am == 0) || (nowTime < '12:00' && item.am == 1)">
+				<!-- v-if="item.start <= nowTime && item.end > nowTime" -->
 				<view class="item-top">
 					<view class="top-left">
 						<image src="../../static/icon/mrlogo.png" mode=""></image><text class="top-name clamp">{{item.name || ''}}</text>
@@ -39,7 +40,7 @@
 				<view class="item-info">
 					<view class="info-data">
 						<view class="info-tit">收益：</view>
-						<view class="info-val">{{item.day}}天/{{item.proportion}}%</view>
+						<view class="info-val">{{item.day}}天/{{item.proportion}}</view>
 					</view>
 					<!-- <view class="info-data">
 						<view class="info-tit">开始时间：</view>
@@ -47,7 +48,7 @@
 					</view> -->
 					<view class="info-data">
 						<view class="info-tit">可获通证：</view>
-						<view class="info-val">{{item.pass}}%</view>
+						<view class="info-val">{{item.pass}}</view>
 					</view>
 					<!-- <view class="info-data">
 						<view class="info-tit">终止释放时间：</view>
@@ -62,13 +63,13 @@
 						<view class="info-val">{{item.price}}</view>
 					</view>
 				</view>
-				<view class="mc-btn yy could" @click="packageReserve(item)">
+				<view class="mc-btn yy " @click="item.status == '进行中' ? packageReserve(item): ''" :class="{'could':item.status == '进行中'}">
 					立即预约
 				</view>
-				<view class="mc-btn pass could" @click="packageExchange(item,2)">
+				<!-- <view class="mc-btn pass could" @click="packageExchange(item,2)">
 					合约兑换
-				</view>
-				<view class="mc-btn fail" :class="{'could':item.am == 0}" @click="item.am == 0?packageExchange(item,1):''">
+				</view> -->
+				<view class="mc-btn fail" :class="{'could':(item.am == 0 && item.status == '进行中')}" @click="(item.am == 0 && item.status == '进行中')?packageExchange(item,1):''">
 					推广兑换
 				</view>
 			</view>
@@ -112,7 +113,7 @@
 				page: 1,
 				limit: 10,
 				// loaded: false,
-				
+				nowTime: ''
 			}
 		},
 		onReady(res) {
@@ -130,14 +131,27 @@
 				fail: res => {}
 			});
 		},
-		onLoad() {
+		onShow() {
 			// this.getPackageList()
 			console.log(this.userInfo)
 			this.loadData()
 			this.getUserInfo()
+			this.nowTime = this.getNow()
 		},
 		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)
+			},
 			getPackageList() {
 				getPackageList().then(res => {
 					console.log(res,'getPackageList')
@@ -177,6 +191,13 @@
 			},
 			// 兑换包
 			packageExchange(item,type) {
+				let nowTime = this.getNow()
+				if(item.start > nowTime) {
+					return this.$api.msg('活动未开始')
+				}
+				if(item.end < nowTime) {
+					return this.$api.msg('活动已结束')
+				}
 				console.log(item)
 				// this.judgeBase()
 				packageExchange({
@@ -200,7 +221,13 @@
 			},
 			//预约包
 			packageReserve(item) {
-				// this.judgeBase()
+				let nowTime = this.getNow()
+				if(item.start > nowTime) {
+					return this.$api.msg('活动未开始')
+				}
+				if(item.end < nowTime) {
+					return this.$api.msg('活动已结束')
+				}
 				packageReserve({
 					package_manager: item.id,
 					price: item.price,
@@ -255,7 +282,7 @@
 			position: relative;
 			.data {
 				display: flex;
-				width: 25%;
+				width: 33.3%;
 				flex-direction: column;
 				justify-content: center;
 				align-items: center;
@@ -378,7 +405,8 @@
 			border: 2px solid #EBEBEB;
 		}
 		.yy {
-			right: 344rpx;
+			// right: 344rpx;
+			right: 190rpx;
 		}
 		.pass {
 			right: 190rpx;
@@ -408,6 +436,7 @@
 			align-items: center;
 			height: 100rpx;
 			width: 136rpx;
+			background-color: #fff;
 			image {
 				width: 48rpx;
 				height: 48rpx;

pages/vip/tzzz.vue

@@ -1,4 +1,4 @@
-<template>
+<!-- <template>
 	<view class="content">
 		<view class="jg" style="height: 20rpx;"></view>
 		<view class="user-info">
@@ -87,3 +87,278 @@
 		text-align: center;
 	}
 </style>
+ -->
+ 
+ <template>
+ 	<view class="content">
+ 		<view class="content-money">
+ 			<view class="flex">
+ 				<view class="buttom">
+ 					<view class="icon">{{ userInfo.now_money | getMoneyStyle }}</view>
+ 					<text class="text">可用通证</text>
+ 				</view>
+ 			</view>
+ 		</view>
+ 		<view class="name" v-if="name != ''">
+ 			用户昵称：{{name}}
+ 		</view>
+ 		<u-form ref="uForm" class="item">
+ 			<u-form-item label-width='150' label="用户编号"><u-input type="text" v-model="card" @blur="userName"/></u-form-item>
+ 			<u-form-item label-width='150' label="支付密码"><u-input type="password" v-model="password" /></u-form-item>
+ 		</u-form>
+ 		<view class="row-box">
+ 			<view class="title">转账金额</view>
+ 			<view class="row">
+ 				<text class="tit">￥</text>
+ 				<input class="input" type="number" v-model="withdrawal" placeholder='转入金额' placeholder-class="placeholder" />
+ 				<view class="buttom" @click="withdrawal = userInfo.now_money">全部转账</view>
+ 			</view>
+ 		</view>
+ 		
+ 		<button class="add-btn up" :class="{'action':loding}" @click="!loding?confirm():''">转入</button>
+ 	</view>
+ </template>
+ 
+ <script>
+ import { getMoneyStyle } from '@/utils/rocessor.js';
+ import { getUserInfo,transfer,nickname } from '@/api/user.js';
+ import { mapMutations,mapState } from 'vuex';
+ export default {
+ 	filters: {
+ 		getMoneyStyle
+ 	},
+ 	data() {
+ 		return {
+ 			money: '0.00', //可提现金额
+ 			withdrawal: '', //提现金额
+ 			password:'',//支付密码
+ 			card:'',//转账卡号
+ 			name:'',
+ 			// #ifdef H5
+ 			weichatBsrowser: false,
+ 			// #endif
+ 			loding:false,
+ 		};
+ 	},
+ 	onLoad(options) {
+ 		// #ifdef H5
+ 		this.weichatBsrowser = uni.getStorageSync('weichatBrowser');
+ 		// #endif
+ 		this.dataUp();
+ 	},
+ 	computed: {
+ 		...mapState('user', ['userInfo']) 
+ 	},
+ 	methods: {
+ 		...mapMutations('user', ['setUserInfo', 'login']),
+ 		// 更新数据
+ 		dataUp(){
+ 			let obj = this;
+ 			getUserInfo({}).then((e) => {
+ 				obj.login();
+ 				// 保存返回用户数据
+ 				obj.setUserInfo(e.data);
+ 			}).catch((e) => {
+ 				console.log(e);
+ 			})
+ 		},
+ 		// 切换选中对象
+ 		tabRadio(e) {
+ 			this.type = e.detail.value;
+ 		},
+ 		userName() {
+ 			if(this.card != ''){
+ 				nickname({uid:this.card}).then(data => {
+ 					this.name = data.msg
+ 				})
+ 			}
+ 			console.log(this.card)
+ 		},
+ 		// 提交
+ 		confirm() {
+ 			let obj = this;
+ 			obj.loding = true;
+ 			if(obj.withdrawal == 0){
+ 				obj.loding = false;
+ 				uni.showModal({
+ 					title:"提示",
+ 					content:"转账金额不要为0"
+ 				})
+ 				return;
+ 			}
+ 			if(obj.card == obj.userInfo.uid){
+ 				obj.loding = false;
+ 				uni.showModal({
+ 					title:"提示",
+ 					content:"不要输入自己的用户编号"
+ 				})
+ 			}else{
+ 				
+ 				let data = {
+ 					to_uid:obj.card, //编号
+ 					pass: obj.password, //交易密码
+ 					merber: obj.withdrawal //金额
+ 				}
+ 				transfer(data)
+ 					.then(e => {
+ 						// 允许按钮点击
+ 						obj.loding = false;
+ 						// 初始化提现金额
+ 						obj.withdrawal = ''
+ 						uni.showToast({
+ 							title: '提交成功',
+ 							duration: 2000,
+ 							position: 'top'
+ 						});
+ 						obj.dataUp();
+ 					})
+ 					.catch(e => {
+ 						obj.$api.msg(e.msg)
+ 						obj.loding = false;
+ 						console.log();
+ 					});
+ 			}
+ 			
+ 		}
+ 	}
+ };
+ </script>
+ 
+ <style lang="scss">
+ page {
+ 	height: 100%;
+ }
+ .content-money {
+ 	padding: 30rpx 0;
+ 	background: #ffffff;
+ }
+ 
+ .item{
+ 	padding: 0 $page-row-spacing;
+ 	background-color: #FFFFFF;
+ }
+ .flex {
+ 	background-color: #ffffff;
+ 	text-align: center;
+ 	margin: 0 30rpx;
+ 	border-radius: $border-radius-sm;
+ 	justify-content: center;
+ 	.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: $base-color;
+ 			font-size: $font-base;
+ 		}
+ 	}
+ }
+ .add-btn {
+ 	background: $base-color;
+ 	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;
+ 	color: #fff;
+ 	// box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
+ }
+ .name {
+ 	background: #fff;
+ 	padding: 30rpx;
+ }
+ .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>
+ 

pages/vip/vip.vue

@@ -19,7 +19,7 @@
 						会员卡
 					</view>
 					<view class="info-val">
-						100通行证 终身付费会员
+						100通证 终身付费会员
 					</view>
 				</view>
 			</view>
@@ -69,7 +69,7 @@
 		</view>
 		<view class="bottom-btn">
 			<view class="btm-left">
-				永久付费会员100通行证
+				永久付费会员100通证
 			</view>
 			<view class="btm-right" @click="readyPay()">
 				马上开通
@@ -96,6 +96,9 @@
 		},
 		methods:{
 			...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
+			getUserInfoA() {
+				
+			},
 			getUserInfoB() {
 				getUserInfo({})
 					.then(({ data }) => {
@@ -124,6 +127,15 @@
 				if(obj.userInfo.level > 0) {
 					return obj.$api.msg('您已开通会员')
 				}
+				getUserInfo()
+					.then(({ data }) => {
+						
+						this.setUserInfo(data);
+						if(data.now_money*1 < 100) {
+							return obj.$api.msg('您的通证不足100')
+						}
+					})
+				
 				console.log('点击');
 				try {
 					let obj = this;

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://service.dcloud.net.cn/build/download/36d50f30-1f49-11ec-8f6e-796fb5877224
+https://ide.dcloud.net.cn/build/download/461d8430-4457-11ec-9950-635d9634d112

unpackage/cache/certdata

@@ -1,3 +1,3 @@
-andrCertfile=D:/工作/项目2/正一药业/zhengyi/unpackage/res/zy.keystore
-andrCertAlias=com.zy.inc
+andrCertfile=D:/gsxm/xwfb/unpackage/res/scfb.keystore
+andrCertAlias=inc.scfb.com
 andrCertPass=7IwuiYJfyRjKKTfhI7sjzw==