5-27

api/user.js

@@ -1,104 +1,114 @@
-import request from '@/utils/request'
-
-// 订单统计信息
-export function orderData(data) {
-	return request({
-		url: '/api/order/data',
-		method: 'get',
-		data
-	});
-}
-
-// 获取用户信息
-export function getUserInfo(data) {
-	return request({
-		url: '/api/userinfo',
-		method: 'get',
-		data
-	});
-}
-
-// 用户分享图
-export function spreadBanner(data) {
-	return request({
-		url: '/api/spread/banner',
-		method: 'get',
-		data
-	});
-}
-
-// 获取地址列表
-export function getAddressList(data) {
-	return request({
-		url: '/api/address/list',
-		method: 'get',
-		data
-	});
-}
-// 修改地址
-export function addressEdit(data) {
-	return request({
-		url: '/api/address/edit',
-		method: 'post',
-		data
-	});
-}
-// 删除地址
-export function addressDel(data) {
-	return request({
-		url: '/api/address/del',
-		method: 'post',
-		data
-	});
-}
-// 设为默认地址
-export function setAddressDefault(data) {
-	return request({
-		url: '/api/address/default/set',
-		method: 'post',
-		data
-	});
-}
-// 购物车列表
-export function getCartList(data) {
-	return request({
-		url: '/api/cart/list',
-		method: 'get',
-		data
-	});
-}
-
-// 修改购物车数量
-export function getCartNum(data) {
-	return request({
-		url: '/api/cart/num',
-		method: 'post',
-		data
-	});
-}
-//删除购物车
-export function cartDel(data) {
-	return request({
-		url: '/api/cart/del',
-		method: 'post',
-		data
-	});
-}
-//获取收藏夹列表
-export function getcollectList(data) {
-	return request({
-		url: '/api/collect/user',
-		method: 'get',
-		data
-	});
-}
-// 取消收藏
-export function delcollect(data) {
-	return request({
-		url: '/api/collect/del',
-		method: 'post',
-		data
-	});
-}
-
-
+import request from '@/utils/request'
+
+// 订单统计信息
+export function orderData(data) {
+	return request({
+		url: '/api/order/data',
+		method: 'get',
+		data
+	});
+}
+
+// 获取用户信息
+export function getUserInfo(data) {
+	return request({
+		url: '/api/userinfo',
+		method: 'get',
+		data
+	});
+}
+
+// 用户分享图
+export function spreadBanner(data) {
+	return request({
+		url: '/api/spread/banner',
+		method: 'get',
+		data
+	});
+}
+
+// 获取地址列表
+export function getAddressList(data) {
+	return request({
+		url: '/api/address/list',
+		method: 'get',
+		data
+	});
+}
+// 修改地址
+export function addressEdit(data) {
+	return request({
+		url: '/api/address/edit',
+		method: 'post',
+		data
+	});
+}
+// 删除地址
+export function addressDel(data) {
+	return request({
+		url: '/api/address/del',
+		method: 'post',
+		data
+	});
+}
+// 设为默认地址
+export function setAddressDefault(data) {
+	return request({
+		url: '/api/address/default/set',
+		method: 'post',
+		data
+	});
+}
+// 购物车列表
+export function getCartList(data) {
+	return request({
+		url: '/api/cart/list',
+		method: 'get',
+		data
+	});
+}
+
+// 修改购物车数量
+export function getCartNum(data) {
+	return request({
+		url: '/api/cart/num',
+		method: 'post',
+		data
+	});
+}
+//删除购物车
+export function cartDel(data) {
+	return request({
+		url: '/api/cart/del',
+		method: 'post',
+		data
+	});
+}
+//获取收藏夹列表
+export function getcollectList(data) {
+	return request({
+		url: '/api/collect/user',
+		method: 'get',
+		data
+	});
+}
+// 取消收藏
+export function delcollect(data) {
+	return request({
+		url: '/api/collect/del',
+		method: 'post',
+		data
+	});
+}
+
+//获取推广信息
+
+export function getExtensionData(data) {
+	return request({
+		url: '/api/spread/people',
+		method: 'post',
+		data
+	})
+}
+
+

js_sdk/xb-copy/uni-copy.js

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

manifest.json

@@ -1,6 +1,6 @@
 {
-    "name" : "基础项目",
-    "appid" : "__UNI__F0EBD91",
+    "name" : "子臣餐饮",
+    "appid" : "__UNI__B86D5A3",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -58,13 +58,15 @@
     "mp-weixin" : {
         /* 小程序特有相关 */
         "usingComponents" : true,
-        "appid" : "",
+        "appid" : "wx30873ca6fca74723",
         "setting" : {
-            "urlCheck" : true
+            "urlCheck" : true,
+            "es6" : false,
+            "minified" : false
         }
     },
     "h5" : {
-        "title" : "商城",
+        "title" : "子臣餐饮",
         "domain" : "",
         "router" : {
             "base" : "/index/",
@@ -73,13 +75,15 @@
         "devServer" : {
             "proxy" : {
                 "/api" : {
-                    "target" : "http://192.168.0.101/api",
+                    // "target" : "http://192.168.0.101/api",
+                    "target" : "http://base.liuniu946.com/api",
                     // "changeOrigin": true,
                     "pathRewrite" : {
                         "/api" : "" // rewrite path
                     }
                 }
-            }
+            },
+            "https" : true
         }
     }
 }

pages.json

@@ -50,7 +50,7 @@
 					}
 				}
 			}
-		},{
+		}, {
 			"path": "pages/public/register",
 			"style": {
 				"navigationBarTitleText": "注册",
@@ -114,14 +114,14 @@
 			}
 		},
 		{
-			"path": "pages/product/groupBooking/productCollage",//拼团商品
+			"path": "pages/product/groupBooking/productCollage", //拼团商品
 			"style": {
 				"app-plus": {
 					"titleNView": {
 						"type": "transparent"
 					}
 				},
-				"navigationBarTitleText":"商品详情"
+				"navigationBarTitleText": "商品详情"
 			}
 		},
 		{
@@ -283,7 +283,7 @@
 				"navigationBarTextStyle": "white"
 			}
 		},
-		
+
 		{
 			"path": "pages/user/user",
 			"style": {
@@ -353,7 +353,13 @@
 		{
 			"path": "pages/user/scoreAccumulate",
 			"style": {
-				"navigationBarTitleText": "积分明细"
+				"navigationBarTitleText": "我的积分"
+			}
+		},
+		{
+			"path": "pages/user/extension",
+			"style": {
+				"navigationBarTitleText": "我的推广"
 			}
 		},
 		{
@@ -397,7 +403,7 @@
 			"style": {
 				"navigationBarTitleText": "创建订单"
 			}
-		},  {
+		}, {
 			"path": "pages/money/pay",
 			"style": {
 				"navigationBarTitleText": "支付"
@@ -480,37 +486,37 @@
 			}
 		}
 	],
-	"subPackages": [
-		{
-			"root": "pages/activity",
-			"name": "activity",
-			"pages":[{
-					"path": "goods_bargain/index",
-					"style": {
-						"navigationStyle": "custom"
+	"subPackages": [{
+		"root": "pages/activity",
+		"name": "activity",
+		"pages": [{
+				"path": "goods_bargain/index",
+				"style": {
+					"navigationStyle": "custom"
 						// #ifdef MP
-						,"navigationBarTextStyle": "#fff"
-						// #endif
-					}
-				},
-				{
-					"path": "goods_bargain_details/index",
-					"style": {
-						"navigationStyle": "custom"
+						,
+					"navigationBarTextStyle": "#fff"
+					// #endif
+				}
+			},
+			{
+				"path": "goods_bargain_details/index",
+				"style": {
+					"navigationStyle": "custom"
 						// #ifdef MP
-						,"navigationBarTextStyle": "#fff"
-						// #endif
-					}
-				},
-				{
-					"path": "bargain/index",
-					"style": {
-						"navigationBarTitleText": "砍价记录"
-					}
+						,
+					"navigationBarTextStyle": "#fff"
+					// #endif
 				}
-			]
-		}
-	],
+			},
+			{
+				"path": "bargain/index",
+				"style": {
+					"navigationBarTitleText": "砍价记录"
+				}
+			}
+		]
+	}],
 	"globalStyle": {
 		"navigationBarTextStyle": "white",
 		"navigationBarTitleText": "uni-app",
@@ -548,4 +554,4 @@
 			}
 		]
 	}
-}
+}

pages/money/recharge.vue

@@ -1,442 +1,480 @@
-<template>
-	<view class="content">
-		<view class="now">
-			<view>当前余额：</view>
-			<view class="now-money">￥300</view>
-		</view>
-		<view class="add-wrapper">
-			<view class="add-box">
-				<view class="add-log">￥</view>
-				<input type="number" v-model="money" placeholder="请输入充值金额" placeholder-class="place"
-					@keyup="clearNoNum()" />
-			</view>
-			<view class="jg" style="height: 1px; background-color: #E6E6E6;"></view>
-			<view class="add-tags">
-				<view class="tag" v-for="(item,index) in addTags" :key="item" @click="tagClick(index)"
-					:class="{'action':currentIndex === index && money == addTags[index]}"><text>{{item}}</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="money" placeholder="请输入充值金额"
-					placeholder-class="placeholder" />
-			</view>
-		</view>
-
-		<view class="list">
-			<radio-group @change="tabRadio">
-				<!-- #ifdef APP-PLUS -->
-				<label>
-					<view class="box">
-						<view class="icon iconfont iconzhifubao"></view>
-						<view class="title-box">
-							<view class="title"><text>支付宝充值</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 iconweixin1"></view>
-						<view class="title-box">
-							<view class="title"><text>微信充值</text></view>
-							<view class="node"><text>真实姓名(代勇明)</text></view>
-						</view>
-						<view class="right">
-							<radio value="weixin" color=" #5dbc7c" :checked="type == 'weixin'" />
-						</view>
-					</view>
-				</label>
-				<!-- #endif -->
-			</radio-group>
-		</view>
-		<button class="add-btn up" :class="{ 'active-bg': payLoding }"
-			@click="!payLoding ? confirm() : ''">确认充值</button>
-	</view>
-</template>
-
-<script>
-	import {
-		getMoneyStyle
-	} from '@/utils/rocessor.js';
-	// #ifdef H5
-	import {
-		rechargeWechat
-	} from '@/api/wallet.js';
-	// #endif
-	// #ifdef MP
-	import {
-		rechargeRoutine
-	} from '@/api/wallet.js';
-	// #endif
-	import {
-		mapState
-	} from 'vuex';
-	export default {
-		filters: {
-			getMoneyStyle
-		},
-		data() {
-			return {
-				type: 'weixin',
-				money: '', //充值金额
-				payLoding: false, //是否加载中
-				addTags: [300, 200, 150, 100, 50],
-				currentIndex: 0,
-				addMoney: 0
-			};
-		},
-		onLoad(options) {},
-		computed: {
-			// #ifdef H5
-			...mapState(['weichatObj'])
-			// #endif
-		},
-		methods: {
-			// 跳转
-			navTo(url) {
-				uni.navigateTo({
-					url: url
-				});
-			},
-			// 切换选中对象
-			tabRadio(e) {
-				this.type = e;
-			},
-			// 提交
-			confirm() {
-				let obj = this;
-				obj.payLoding = true;
-				// #ifdef H5
-				rechargeWechat({
-						price: this.money,
-						from: this.type
-					})
-					.then(e => {
-						let da = e.data.data;
-						obj.weichatObj.chooseWXPay({
-							timestamp: da.timestamp,
-							nonceStr: da.nonceStr,
-							package: da.package,
-							signType: da.signType,
-							paySign: da.paySign,
-							success: function(res) {
-								uni.showToast({
-									title: '充值成功',
-									duration: 2000,
-									position: 'top'
-								});
-							}
-						});
-						obj.payLoding = false;
-					})
-					.catch(e => {
-						obj.payLoding = false;
-						console.log(e);
-					});
-				// #endif
-				// #ifdef MP
-				rechargeRoutine({
-						price: this.money
-					})
-					.then(e => {
-						let da = e.data;
-						wx.requestPayment({
-							timeStamp: da.timestamp,
-							nonceStr: da.nonceStr,
-							package: da.package,
-							signType: da.signType,
-							paySign: da.paySign,
-							success: function(res) {
-								uni.redirectTo({
-									url: '/pages/money/paySuccess'
-								});
-							},
-
-						})
-
-						obj.payLoding = false;
-					})
-					.catch(e => {
-						obj.payLoding = false;
-						console.log(e);
-					});
-				// #endif
-			},
-			//获取订单列表
-			loadData(source) {
-				console.log(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';
-				setTimeout(() => {
-					let orderList = [];
-					orderList.forEach(item => {
-						navItem.orderList.push(item);
-					});
-					//loaded新字段用于表示数据加载完毕，如果为空可以显示空白页
-					this.$set(navItem, 'loaded', true);
-					//判断是否还有数据， 有改为 more， 没有改为noMore
-					navItem.loadingType = 'more';
-				}, 600);
-			},
-			tagClick(index) {
-				this.currentIndex = index
-				this.money = this.addTags[index]
-
-			},
-			clearNoNum() {
-				this.money = this.money.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3')
-				switch (this.money) {
-					case '300':
-						this.currentIndex = 0
-						break;
-					case '200':
-						this.currentIndex = 1
-						break;
-					case '150':
-						this.currentIndex = 2
-						break;
-					case '100':
-						this.currentIndex = 3
-						break;
-					case '50':
-						this.currentIndex = 4
-						break;
-				}
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	page {
-		height: 100%;
-	}
-
-	.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);
-	}
-
-	.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;
-				font-size: $font-base;
-			}
-		}
-	}
-
-	.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;
-			}
-
-			.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;
-	}
-
-	.active-bg {
-		background-color: $color-gray !important;
-	}
-
-	.now {
-		width: 100%;
-		height: 86rpx;
-		padding: 0 26rpx 0 47rpx;
-		display: flex;
-		justify-content: space-between;
-		line-height: 86rpx;
-		background-color: #fff;
-		margin-bottom: 21rpx;
-
-		view {
-			font-size: 28rpx;
-			font-weight: 500;
-			color: #333333;
-		}
-
-		.now-money {
-			font-size: 32rpx;
-			font-weight: bold;
-			color: #901B21;
-		}
-	}
-
-	.add-wrapper {
-		width: 750rpx;
-		height: 338rpx;
-		padding-left: 30rpx;
-		background: #FFFFFF;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-
-		.add-box {
-			width: 100%;
-			height: 103rpx;
-			display: flex;
-			flex-direction: row;
-			justify-content: space-between;
-			padding: 0 39rpx 0 10rpx;
-			align-items: center;
-
-			.add-log {
-				font-size: 37rpx;
-				font-weight: bold;
-			}
-
-			input {
-				width: 218rpx;
-				height: 30rpx;
-				font-size: 32rpx;
-				font-weight: 500;
-				color: #000;
-				line-height: 40px;
-				text-align: right;
-
-				.place {
-					color: #BFBFBF;
-				}
-			}
-		}
-
-		.jg {
-			width: 100%;
-		}
-
-		.add-tags {
-			height: 234rpx;
-			padding-top: 47rpx;
-			padding-bottom: 17rpx;
-			display: flex;
-			flex-direction: row;
-			flex-wrap: wrap;
-
-			// justify-content: space-between;
-			.tag {
-				width: 210rpx;
-				height: 70rpx;
-				background-color: #F0F0F0;
-				border-radius: 4rpx;
-				margin: 0 30rpx 30rpx 0;
-				text-align: center;
-				line-height: 70rpx;
-				font-size: 22rpx;
-
-				text {
-					font-size: 32rpx;
-					font-weight: 500;
-				}
-			}
-
-			.action {
-				color: #fff;
-				background-color: #901b21;
-			}
-		}
-
-	}
+<template>
+	<view class="content">
+		<view class="now">
+			<view>当前余额：</view>
+			<view class="now-money">￥300</view>
+		</view>
+		<view class="main-jg"></view>
+		<view class="add-wrapper">
+			<view class="add-box">
+				<view class="add-log">￥</view>
+				<input type="number" v-model="money" placeholder="请输入充值金额" placeholder-class="place" @keyup="clearNoNum()" />
+			</view>
+			<view class="jg" style="height: 1px; background-color: #E6E6E6;"></view>
+			<view class="add-tags">
+				<view class="tag" v-for="(item, index) in addTags" :key="item" @click="tagClick(index)" :class="{ action: currentIndex === index && money == addTags[index] }">
+					<text>{{ item }}</text>
+					元
+				</view>
+			</view>
+		</view>
+		<view class="main-jg"></view>
+		<view class="btn-wrapper">
+			<view class="icon iconfont iconweixin1"><view>微信充值</view></view>
+			<view class="btn" @click="btnClick" :class="{'actiont': isSect}"><image src="../../static/icon/btncz.png" mode="" :class="{'action':!isSect}"></image></view>
+		</view>
+		<!-- <view class="row-box">
+			<view class="title">充值金额</view>
+			<view class="row">
+				<text class="tit">￥</text>
+				<input class="input" type="number" v-model="money" placeholder="请输入充值金额" placeholder-class="placeholder" />
+			</view>
+		</view> -->
+		<view class="list">
+			<radio-group @change="tabRadio">
+				<!-- #ifdef APP-PLUS -->
+				<label>
+					<view class="box">
+						<view class="icon iconfont iconzhifubao"></view>
+						<view class="title-box">
+							<view class="title"><text>支付宝充值</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 iconweixin1"></view>
+						<view class="title-box">
+							<view class="title"><text>微信充值</text></view>
+							<view class="node"><text>真实姓名(代勇明)</text></view>
+						</view>
+						<view class="right"><radio value="weixin" color=" #5dbc7c" :checked="type == 'weixin'" /></view>
+					</view>
+				</label>
+				<!-- #endif -->
+			</radio-group>
+		</view>
+		<button class="add-btn up" :class="{ 'active-bg': payLoding }" @click="!payLoding ? confirm() : ''">立即充值</button>
+		
+	</view>
+</template>
+
+<script>
+import { getMoneyStyle } from '@/utils/rocessor.js';
+// #ifdef H5
+import { rechargeWechat } from '@/api/wallet.js';
+// #endif
+// #ifdef MP
+import { rechargeRoutine } from '@/api/wallet.js';
+// #endif
+import { mapState } from 'vuex';
+export default {
+	filters: {
+		getMoneyStyle
+	},
+	data() {
+		return {
+			type: 'weixin',
+			money: '', //充值金额
+			payLoding: false, //是否加载中
+			addTags: [300, 200, 150, 100, 50],
+			currentIndex: 0,
+			addMoney: 0,
+			isSect: false //是否选择微信充值
+		};
+	},
+	onLoad(options) {},
+	computed: {
+		// #ifdef H5
+		...mapState(['weichatObj'])
+		// #endif
+	},
+	methods: {
+		// 跳转
+		navTo(url) {
+			uni.navigateTo({
+				url: url
+			});
+		},
+		// 切换选中对象
+		tabRadio(e) {
+			this.type = e;
+		},
+		// 提交
+		confirm() {
+			let obj = this;
+			obj.payLoding = true;
+			// #ifdef H5
+			rechargeWechat({
+				price: this.money,
+				from: this.type
+			})
+				.then(e => {
+					let da = e.data.data;
+					obj.weichatObj.chooseWXPay({
+						timestamp: da.timestamp,
+						nonceStr: da.nonceStr,
+						package: da.package,
+						signType: da.signType,
+						paySign: da.paySign,
+						success: function(res) {
+							uni.showToast({
+								title: '充值成功',
+								duration: 2000,
+								position: 'top'
+							});
+						}
+					});
+					obj.payLoding = false;
+				})
+				.catch(e => {
+					obj.payLoding = false;
+					console.log(e);
+				});
+			// #endif
+			// #ifdef MP
+			rechargeRoutine({
+				price: this.money
+			})
+				.then(e => {
+					let da = e.data;
+					wx.requestPayment({
+						timeStamp: da.timestamp,
+						nonceStr: da.nonceStr,
+						package: da.package,
+						signType: da.signType,
+						paySign: da.paySign,
+						success: function(res) {
+							uni.redirectTo({
+								url: '/pages/money/paySuccess'
+							});
+						}
+					});
+
+					obj.payLoding = false;
+				})
+				.catch(e => {
+					obj.payLoding = false;
+					console.log(e);
+				});
+			// #endif
+		},
+		//获取订单列表
+		loadData(source) {
+			console.log(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';
+			setTimeout(() => {
+				let orderList = [];
+				orderList.forEach(item => {
+					navItem.orderList.push(item);
+				});
+				//loaded新字段用于表示数据加载完毕，如果为空可以显示空白页
+				this.$set(navItem, 'loaded', true);
+				//判断是否还有数据， 有改为 more， 没有改为noMore
+				navItem.loadingType = 'more';
+			}, 600);
+		},
+		tagClick(index) {
+			this.currentIndex = index;
+			this.money = this.addTags[index];
+		},
+		clearNoNum() {
+			this.money = this.money.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3');
+			switch (this.money) {
+				case '300':
+					this.currentIndex = 0;
+					break;
+				case '200':
+					this.currentIndex = 1;
+					break;
+				case '150':
+					this.currentIndex = 2;
+					break;
+				case '100':
+					this.currentIndex = 3;
+					break;
+				case '50':
+					this.currentIndex = 4;
+					break;
+			}
+		},
+		btnClick() {
+			this.isSect = !this.isSect
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	height: 100%;
+	background-color: #fff;
+}
+
+.add-btn {
+	&.modified {
+		color: $base-color;
+	}
+
+	&.up {
+		background-color: $base-color;
+		color: #fff;
+	}
+
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 604rpx;
+	height: 90rpx;
+	margin: 0 auto;
+	margin-top: 30rpx;
+	font-size: $font-lg;
+	border-radius: 10rpx;
+	// box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
+}
+
+.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;
+			font-size: $font-base;
+		}
+	}
+}
+
+.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;
+		}
+
+		.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;
+}
+
+.active-bg {
+	background-color: $color-gray !important;
+}
+
+.now {
+	width: 100%;
+	height: 86rpx;
+	padding: 0 26rpx 0 47rpx;
+	display: flex;
+	justify-content: space-between;
+	line-height: 86rpx;
+	background-color: #fff;
+	// margin-bottom: 21rpx;
+
+	view {
+		font-size: 28rpx;
+		font-weight: 500;
+		color: #333333;
+	}
+
+	.now-money {
+		font-size: 32rpx;
+		font-weight: bold;
+		color: #901b21;
+	}
+}
+
+.add-wrapper {
+	width: 750rpx;
+	height: 338rpx;
+	padding-left: 30rpx;
+	background: #ffffff;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	// margin-bottom: 22rpx;
+	.add-box {
+		width: 100%;
+		height: 103rpx;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		padding: 0 39rpx 0 10rpx;
+		align-items: center;
+
+		.add-log {
+			font-size: 37rpx;
+			font-weight: bold;
+		}
+
+		input {
+			width: 218rpx;
+			height: 30rpx;
+			font-size: 32rpx;
+			font-weight: 500;
+			color: #000;
+			line-height: 40px;
+			text-align: right;
+
+			.place {
+				color: #bfbfbf;
+			}
+		}
+	}
+
+	.jg {
+		width: 100%;
+	}
+
+	.add-tags {
+		height: 234rpx;
+		padding-top: 47rpx;
+		padding-bottom: 17rpx;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: wrap;
+
+		// justify-content: space-between;
+		.tag {
+			width: 210rpx;
+			height: 70rpx;
+			background-color: #f0f0f0;
+			border-radius: 4rpx;
+			margin: 0 30rpx 30rpx 0;
+			text-align: center;
+			line-height: 70rpx;
+			font-size: 22rpx;
+
+			text {
+				font-size: 32rpx;
+				font-weight: 500;
+			}
+		}
+
+		.action {
+			color: #fff;
+			background-color: #901b21;
+		}
+	}
+}
+.btn-wrapper {
+	padding: 49rpx 32rpx 0 40rpx;
+	height: 183rpx;
+	display: flex;
+	justify-content: space-between;
+	background-color: #fff;
+	.iconweixin1 {
+		color: #18bf16;
+		font-size: 48rpx;
+		display: flex;
+		view {
+			// display: inline-block;
+			height: 48rpx;
+			text-align: 48rpx;
+			padding-left: 20rpx;
+			// padding-top: 10rpx;
+			color: #000000;
+			font-size: 30rpx;
+		}
+	}
+	.btn {
+		width: 36rpx;
+		height: 36rpx;
+		border: 4rpx #901b21 solid;
+		border-radius: 8rpx 8rpx;
+		image {
+			// display: none;
+			width: 100%;
+			height: 100%;
+		}
+		.action {
+			display: none;
+		}
+	}
+	.actiont {
+		border:none;
+	}
+}
+.main-jg {
+	width: 100%;
+	height: 21rpx;
+	background-color: #f8f6f6;
+}
 </style>

pages/money/wallet.vue

@@ -244,12 +244,12 @@ page {
 .money-box {
 	// background-color: $base-color;
 	// padding-top: var(--status-bar-height);
-	height: 368rpx;
+	height: 265rpx;
 	color: #ffffff;
 	text-align: center;
 	background-image: url(../../static/img/wallertbg.png);
-	background-size: 100% 100%;
-	margin-top: -1rpx;
+	background-size: 100%;
+	background-position: bottom;
 	.text {
 		padding-top: 147rpx;
 		font-size: $font-sm;

pages/public/wxLogin.vue

@@ -1,12 +1,13 @@
+
 <template>
 	<view class="content">
-		<!-- #ifdef MP -->
-		<image class="bg-img" ：src="/static/img/img09.png" mode=" scaleToFill"></image>
+		<!-- #ifndef H5 -->
+		<image class="bg-img" :src="baseURL + urlFile + '/img/img09.png'" mode=" scaleToFill"></image>
 		<view class="logo-img-box">
-			<image class="logo-img" src="/static/img/img10.png" mode=" aspectFit"></image>
-			<button class="userInfo" type="warn" open-type="getUserInfo" @getuserinfo="userInfoData">
+			<image class="logo-img" src="https://zhibo.liuniu946.com/img/logo001.png" mode="aspectFit"></image>
+			<button class="userInfo" type="warn" @click="getUserProfile">
 				<text class="iconfont iconweixin"></text>
-				<text>微信授权登录</text>
+				<text @click="clickSq">微信授权登录</text>
 			</button>
 		</view>
 		<!-- #endif -->
@@ -28,9 +29,11 @@
 import { loginWinxin } from '@/utils/wxAuthorized';
 // #endif
 // #ifdef MP-WEIXIN
+import { loginWinxinMp } from '@/utils/wxMinProgram';
 import { wechatMpAuth } from '@/api/wx';
 // #endif
-import { mapMutations } from 'vuex';
+import { logout } from '@/api/set.js';
+import { mapMutations, mapState } from 'vuex';
 import { getUserInfo, bangding } from '@/api/login.js';
 export default {
 	data() {
@@ -43,16 +46,27 @@ export default {
 	},
 	onLoad(option) {
 		this.loadData();
+
+	},
+	computed: {
+		...mapState(['baseURL', 'urlFile'])
 	},
 	methods: {
+		...mapMutations(['login', 'setUserInfo']),
+		clickSq() {
+			console.log('授权');
+		},
 		loadData() {
 			// #ifdef H5
 			loginWinxin();
 			// #endif
+			// #ifdef MP
+			loginWinxinMp();
+			// #endif
 		},
 		// #ifndef H5
 		// 用户确认授权
-		userInfoData(e) {
+		getUserProfile(e) {
 			const that = this;
 			// #ifdef MP-WEIXIN
 			if (!this.loding) {
@@ -60,7 +74,16 @@ export default {
 					desc: '用于完善会员资料', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
 					success: res => {
 						that.userInfo = res;
-						that.loadMp();
+						if(!!res.iv){
+							that.loadMp(res);
+						}else{
+							uni.showModal({
+								title: '问题',
+								content: '您的微信版本过低请升级微信',
+								showCancel: false,
+							});
+						}
+						
 					},
 					fail: err => {
 						console.log('getUserProfile出错', err);
@@ -71,29 +94,27 @@ export default {
 		},
 		// #endif
 		// #ifdef MP-WEIXIN
-		loadMp(option) {
+		loadMp(user) {
 			let obj = this;
 			obj.loding = true;
-			// 获取登录授权页数据
-			let user = obj.userInfo;
 			// 获取推广人id
 			let spread_spid = uni.getStorageSync('spread') || '';
-			// let spread_code = uni.getStorageSync('spread_code') || '';
+			let spread_code = uni.getStorageSync('spread_code') || '';
 			uni.showLoading({
 				title: '授权中',
 				mask: true
 			});
 			wx.login({
-				success(e) {
-					wechatMpAuth({
+				success(e) {
+					console.log('wx.login',user)
+					let pushData = {
 						code: e.code,
 						iv: user.iv,
 						encryptedData: user.encryptedData,
 						spread_spid: spread_spid,
-						// #ifdef MP
 						spread_code: spread_code
-						// #endif
-					})
+					};
+					wechatMpAuth(pushData)
 						.then(({ data }) => {
 							obj.loding = false;
 							obj.wchatAuth(data);
@@ -101,7 +122,6 @@ export default {
 						})
 						.catch(e => {
 							obj.loding = false;
-							uni.hideLoading();
 						});
 				},
 				fill: function(e) {
@@ -117,29 +137,118 @@ export default {
 			// 获取用户基础信息
 			getUserInfo({})
 				.then(e => {
+					console.log('--获取用户基础信息getUserInfo--', e);
 					uni.hideLoading();
 					obj.login();
 					// 保存返回用户数据
 					obj.setUserInfo(e.data);
 					obj.ToIndex();
-					// if (e.data.phone == null || !e.data.phone ) {
-					// 	obj.MaskShow = true;
-					// } else {
-					// 	obj.ToIndex();
-					// }
 				})
 				.catch(e => {
 					uni.hideLoading();
 				});
 		},
 		// #endif
+		// #ifdef MP-WEIXIN
+		// loadMp(option) {
+		// 	let obj = this;
+		// 	obj.loding = true;
+		// 	// 获取登录授权页数据
+		// 	let user = obj.userInfo;
+		// 	// 获取推广人id
+		// 	let spread_spid = uni.getStorageSync('spread') || '';
+		// 	// uni.showLoading({
+		// 	// 	title: '授权中',
+		// 	// 	mask: true
+		// 	// });
+		// 	loginWinxinMp().then(e => {
+		// 		this.code = e.code;
+		// 		wechatMpAuth({
+		// 				code: this.code,
+		// 				iv: user.target.iv,
+		// 				encryptedData: user.target.encryptedData,
+		// 				spread_spid: spread_spid
+		// 			})
+		// 			.then(({
+		// 				data
+		// 			}) => {
+		// 				uni.showModal({
+		// 					title: '用户确认授权wechatMpAuth',
+		// 					content: JSON.stringify(data)
+		// 				})
+		// 				obj.login();
+		// 				obj.loding = false;
+		// 				obj.wchatAuth(data);
+		// 				uni.hideLoading();
+		// 			})
+		// 			.catch(e => {
+		// 				uni.showModal({
+		// 					title: '用户确认授权wechatMpAuth失败',
+		// 					content: JSON.stringify(e)
+		// 				})
+		// 				obj.loding = false;
+		// 				uni.hideLoading();
+		// 			});
+		// 	});
+		// },
+		// wchatAuth(data) {
+		// 	let obj = this;
+		// 	
+		// 	// 保存token
+		// 	uni.setStorageSync('token', data.token);
+		// 	// 获取用户基础信息
+		// 	getUserInfo({})
+		// 		.then(e => {
+		// 			uni.showModal({
+		// 				title:'获取用户基础信息',
+		// 				content:JSON.stringify(e)
+		// 			})
+		// 			uni.hideLoading();
+		// 			obj.login();
+		// 			// 保存返回用户数据
+		// 			obj.setUserInfo(e.data);
+		// 			if (e.data.status == 0) {
+		// 				uni.showModal({
+		// 					title: '提示',
+		// 					content: '您的账号存在异常，暂时无法登陆',
+		// 					showCancel: true,
+		// 					success() {
+		// 						obj.toLogout();
+		// 					}
+		// 				})
+		// 			} else {
+		// 				obj.ToIndex();
+		// 			}
+		// 			// obj.ToIndex();
+		// 			// if (e.data.phone == null || !e.data.phone ) {
+		// 			// 	obj.MaskShow = true;
+		// 			// } else {
+		// 			// 	obj.ToIndex();
+		// 			// }
+		// 		})
+		// 		.catch(e => {
+		// 			uni.hideLoading();
+		// 		});
+		// },
+		// #endif
+		toLogout() {
+			logout({})
+				.then(e => {
+					uni.navigateBack();
+				})
+				.catch(e => {
+					console.log(e);
+				});
+		},
 		ToIndex() {
 			let obj = this;
 			let ur = uni.getStorageSync('present') || '/pages/index/index';
+			console.log('---登录跳转---', ur);
 			// 用于处理缓存bug
 			if (ur == 'pages/product/product') {
 				ur = '/pages/index/index';
-			}
+			}
+			
 			uni.switchTab({
 				url: ur,
 				fail(e) {
@@ -221,6 +330,7 @@ export default {
 page,
 .content {
 	height: 100%;
+	background: #ffffff;
 }
 
 .Mask {
@@ -229,6 +339,7 @@ page,
 	width: 100%;
 	height: 100%;
 	background-color: rgba(51, 51, 51, 0.7);
+
 	.Mask-box {
 		margin: auto;
 		margin-top: 320rpx;
@@ -239,16 +350,19 @@ page,
 		left: 10%;
 		background-color: #ffffff;
 		border-radius: 15rpx;
+
 		.title {
 			text-align: center;
 			font-size: 35rpx;
 			font-weight: 700;
 		}
+
 		.text {
 			font-size: 30rpx;
 			color: #848484;
 			padding-top: 50rpx;
 		}
+
 		.btn_box {
 			margin: 70rpx 0 0 0;
 			display: flex;
@@ -267,25 +381,39 @@ page,
 	border: none;
 	margin: 0 20rpx;
 }
-.bg-img,
-.logo-img-box {
+
+.bg-img {
 	position: absolute;
 	top: 0;
 	left: 0;
 	width: 100%;
 	height: 100%;
+}
+.logo-img-box{
+	width: 100%;
+	height: 100vh;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	// justify-content: center;
 }
-.logo-img {
-	margin-top: 20vh;
-	margin-left: 176rpx;
-	width: 385rpx;
-	height: 394rpx;
+
+.logo-img {
+	margin-top: 180rpx;
+	background-color: pink;
+	width: 300rpx;
+	height: 300rpx;
+	border-radius: 50%;
 }
-.userInfo {
+
+.userInfo {
+	width: 80%;
 	margin: 0 100rpx;
-	margin-top: 50rpx;
+	margin-top: 80rpx;
 	color: #ffffff;
 	border-radius: 99rpx;
-	background-color: $base-color !important;
+	// background-color: $base-color !important;
+	background-color: #901b23 !important;
 }
+
 </style>

pages/user/extension.vue

@@ -0,0 +1,180 @@
+<template>
+	<view class="extension-wrapper">
+		<view class="top-wrapper">{{allNum||0.00}}<text> 人</text></view>
+		<view class="middle">
+			<view class="middle-left" @click="changeAction">
+				<view class="middle-num">9</view>
+				<view class="middle-title" :class="{'action': isAction}">一级推广</view>
+			</view>
+			<view class="middle-center">
+				
+			</view>
+			<view class="middle-right" @click="changeAction">
+				<view class="middle-num">55</view>
+				<view class="middle-title" :class="{'action': !isAction}">二级推广</view>
+			</view>
+		</view>
+		<scroll-view scroll-y="true" @scrolltolower="loadData" class="list-scroll-content">
+			<view class="list">
+				<view class="list-item">
+					<view class="item-left"><image src="../../static/error/missing-face.png" mode=""></image></view>
+					<view class="item-right">
+						<view class="item-name">假猪套天下第一</view>
+						<view class="item-time">2020-12-3 12:30:00</view>
+					</view>
+				</view>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	import {getExtensionData} from '@/api/user.js'
+	export default {
+		data() {
+			return {
+				allNum: 0,//总推广人数
+				isAction: true
+			}
+		},
+		onShow() {
+			this.getInfo()
+		},
+		methods: {
+			getInfo() {
+				console.log('hello world')
+			},
+			changeAction() {
+				this.isAction = !this.isAction
+			},
+			loadData() {
+				console.log('ddddd')
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page {
+		background-color: #f8f8f8;
+		height: 100%;
+	}
+	.extension-wrapper {
+		// position: relative;
+		background-color: #f8f8f8;
+		height: 100%;
+		.top-wrapper {
+			width: 750rpx;
+			height: 265rpx;
+			background-image: url(../../static/img/wallertbg.png);
+			background-size: 100%;
+			background-position: bottom;
+			// font-size: ;
+			color: #FFFFFF;
+			font-size: 72rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #FFFFFF;
+			line-height: 265rpx;
+			text-align: center;
+			text {
+				font-size: 40rpx;
+			}
+		}
+		.middle {
+			width: 702rpx;
+			height: 120rpx;
+			background: #FFFFFF;
+			box-shadow: 0px 0px 20px 0px rgba(50, 50, 52, 0.06);
+			border-radius: 10rpx;
+			background-color: #fff;
+			display: flex;
+			position: relative;
+			left: 24rpx;
+			top: -60rpx;
+			margin-bottom: -40rpx;
+			.middle-center {
+				width: 2px;
+				height: 54rpx;
+				background: #EEEEEE;
+				position: absolute;
+				right: 0;
+				left: 0;
+				top: 0;
+				bottom: 0;
+				margin: auto;
+			}
+			.middle-left, .middle-right {
+				padding-top: 24rpx;
+				width: 50%;
+				height: 120rpx;
+				text-align: center;
+				line-height: 1;
+				// display: flex;
+				.middle-num {
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #901B21;
+					padding-bottom: 17rpx;
+				}
+				.middle-title {
+					font-size: 28rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #666666;
+					display: inline-block;
+					padding-bottom: 15rpx;
+				}
+				.action {
+					border-bottom: 5rpx #901B21 solid;
+					
+				}
+			}
+		}
+		.list-scroll-content {
+			height: 100%;
+			background-color: #fff;
+			.list {
+				width: 100%;
+				// height: 20rpx;
+				background-color: #fff;
+				.list-item {
+					padding: 30rpx 0 19rpx 23rpx;
+					height: 129rpx;
+					display: flex;
+					.item-left {
+						width: 80rpx;
+						height: 80rpx;
+						border-radius: 50%;
+						background-color: #bfa;
+						image {
+							width: 100%;
+							height: 100%;
+						}
+					}
+					.item-right {
+						padding-left: 20rpx;
+						padding-top: 9rpx;
+						.item-name {
+							font-size: 30rpx;
+							line-height: 1;
+							font-family: PingFangSC;
+							font-weight: 500;
+							color: #3F454B;
+							padding-bottom: 10rpx;
+						}
+						.item-time {
+							font-size: 22rpx;
+							line-height: 1;
+							font-family: PingFang SC;
+							font-weight: 400;
+							color: #999999;
+						}
+					}
+				}
+			}
+		}
+		
+	}
+</style>

pages/user/scoreAccumulate.vue

@@ -1,200 +1,217 @@
-<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 :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
-					<!-- 空白页 -->
-					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-
-					<!-- 订单列表 -->
-					<view v-for="(item, index) in tabItem.orderList" :key="index" class="order-item flex">
-						<view class="title-box">
-							<view class="title">
-								<text>{{ item.mark }}</text>
-							</view>
-							<view class="time">
-								<text>{{ item.add_time }}</text>
-							</view>
-						</view>
-						<view class="money">
-							<text>{{ (item.pm == 0 ? '-' : '+') + item.number }}</text>
-						</view>
-					</view>
-					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-	</view>
-</template>
-
-<script>
-	
-import { integrallist } from '@/api/functionalUnit.js';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-import empty from '@/components/empty';
-export default {
-	components: {
-		empty,
-		uniLoadMore
-	},
-	onReady() {
-		
-	},
-	data() {
-		return {
-			tabCurrentIndex: 0,
-			navList: [
-				{
-					state: 0,
-					text: '全部',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				},
-			],
-		};
-	},
-	onShow() {
-		// 载入积分数据
-		this.loadData();
-	},
-	methods: {
-		// 页面跳转
-		navto(e) {
-			uni.navigateTo({
-				url: e
-			});
-		},
-		//获取收入支出信息
-		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';
-
-			integrallist(
-				{
-					page: navItem.page,
-					limit: navItem.limit
-				},
-				state
-			)
-				.then(({ data }) => {
-					if (data.length > 0) {
-						navItem.orderList = navItem.orderList.concat(data);
-						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 {
-	background: #ffffff;
-	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: $base-color;
-			&:after {
-				content: '';
-				position: absolute;
-				left: 50%;
-				bottom: 0;
-				transform: translateX(-50%);
-				width: 44px;
-				height: 0;
-				border-bottom: 2px solid $base-color;
-			}
-		}
-	}
-}
-// 列表
-
-.swiper-box {
-	height: calc(100% - 44px);
-	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;
-		}
-	}
-}
-.list-scroll-content {
-	height: 100%;
-}
-.content {
-	height: 100%;
-	.empty-content {
-		background-color: #ffffff;
-	}
-}
-</style>
+<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> -->
+		<view class="top-wrapper">{{score||0.00}}</view>
+		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
+			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
+				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
+					<!-- 空白页 -->
+					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
+
+					<!-- 订单列表 -->
+					<view v-for="(item, index) in tabItem.orderList" :key="index" class="order-item flex">
+						<view class="title-box">
+							<view class="title">
+								<text>{{ item.mark }}</text>
+							</view>
+							<view class="time">
+								<text>{{ item.add_time }}</text>
+							</view>
+						</view>
+						<view class="money">
+							<text>{{ (item.pm == 0 ? '-' : '+') + item.number }}</text>
+						</view>
+					</view>
+					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+	</view>
+</template>
+
+<script>
+	
+import { integrallist } from '@/api/functionalUnit.js';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import empty from '@/components/empty';
+export default {
+	components: {
+		empty,
+		uniLoadMore
+	},
+	onReady() {
+		
+	},
+	data() {
+		return {
+			tabCurrentIndex: 0,
+			navList: [
+				{
+					state: 0,
+					text: '全部',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10 //每次信息条数
+				},
+			],
+			score: 0 //积分
+		};
+	},
+	onShow() {
+		// 载入积分数据
+		this.loadData();
+	},
+	methods: {
+		// 页面跳转
+		navto(e) {
+			uni.navigateTo({
+				url: e
+			});
+		},
+		//获取收入支出信息
+		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';
+
+			integrallist(
+				{
+					page: navItem.page,
+					limit: navItem.limit
+				},
+				state
+			)
+				.then(({ data }) => {
+					if (data.length > 0) {
+						navItem.orderList = navItem.orderList.concat(data);
+						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 {
+	background: #ffffff;
+	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: $base-color;
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 44px;
+				height: 0;
+				border-bottom: 2px solid $base-color;
+			}
+		}
+	}
+}
+// 列表
+
+.swiper-box {
+	height: calc(100% - 44px);
+	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;
+		}
+	}
+}
+.list-scroll-content {
+	height: 100%;
+}
+.content {
+	height: 100%;
+	.empty-content {
+		background-color: #ffffff;
+	}
+}
+.top-wrapper {
+	width: 750rpx;
+	height: 265rpx;
+	background-image: url(../../static/img/wallertbg.png);
+	background-size: 100%;
+	background-position: bottom;
+	// font-size: ;
+	color: #FFFFFF;
+	font-size: 72rpx;
+	font-family: PingFang SC;
+	font-weight: bold;
+	color: #FFFFFF;
+	line-height: 265rpx;
+	text-align: center;
+}
+</style>

pages/user/user.vue

@@ -170,7 +170,7 @@
 							<view class="icon"><image class="icon-img" src="/static/icon/u2.png" mode="aspectFit"></image></view>
 							<text>收货地址</text>
 						</view>
-						<view class="order-item" @click="navTo('/pages/user/award')" hover-class="common-hover" :hover-stay-time="50">
+						<view class="order-item" hover-class="common-hover" :hover-stay-time="50" @click="showPopup">
 							<view class="icon" v-if="userIdentity"><image class="icon-img" src="/static/icon/u8.png" mode="aspectFit"></image></view>
 							<view class="icon" v-else><image class="icon-img" src="/static/icon/u3.png" mode="aspectFit"></image></view>
 							<text>联系客服</text>
@@ -209,15 +209,33 @@
 				</view> -->
 			</view>
 		</scroll-view>
-		<!-- </view> -->
+		<!-- </view> -->
+		<uni-popup ref="popup" type="center">
+			<view class="popup-box">
+				<view class="img"><image src="https://37shop.liuniu946.com/front/img/img009.png" mode=""></image></view>
+				<view class="mian">
+					<view class="delivery">
+						<view class="title">已经为您定制专属客服</view>
+						<image src="https://37shop.liuniu946.com/front/img/img010.png" mode=""></image>
+					</view>
+					<view class="nocancel">客服VX:{{ text }}</view>
+					<view class="comfirm-box">
+						<view class="cancel" @click="cancel">取消</view>
+						<view class="comfirm" @click="comfirm(text)">复制微信</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 <script>
 import { mapState, mapMutations } from 'vuex';
 import uniList from '@/components/uni-list/uni-list.vue';
-import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
+import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
+import uniPopup from '@/components/uni-popup/uni-popup.vue';
 import { orderData, userinfo } from '@/api/user.js';
-import { saveUrl, interceptor } from '@/utils/loginUtils.js';
+import { saveUrl, interceptor } from '@/utils/loginUtils.js';
+import uniCopy from '@/js_sdk/xb-copy/uni-copy.js';
 let startY = 0,
 	moveY = 0,
 	pageAtTop = true;
@@ -233,7 +251,8 @@ export default {
 			moving: false,
 			userDowm: 0, //卡片升级专属高度
 			userMaxDowm: 0 ,//卡片最高高度,
-			userIdentity: false
+			userIdentity: false,
+			text: 'ch125221'
 		};
 	},
 	onShow() {
@@ -376,6 +395,27 @@ export default {
 		},
 		changeIdentity() {
 			this.userIdentity = !this.userIdentity
+		},
+		showPopup() {
+			this.$refs.popup.open()
+		},
+		cancel() {
+			this.$refs.popup.close()
+		},
+		comfirm(text) {
+			console.log(text)
+			const result = uniCopy(text);
+			if (result === false) {
+				uni.showToast({
+					title: '不支持'
+				});
+			} else {
+				uni.showToast({
+					title: '复制成功',
+					icon: 'none'
+				});
+			}
+			this.$refs.popup.close()
 		}
 	}
 };
@@ -745,5 +785,91 @@ page {
 	font-size: 30rpx;
 	font-weight: bold;
 	color: #901B21;
+}
+.popup-box {
+	width: 522rpx;
+	height: 605rpx;
+	background-color: #ffffff;
+	border-radius: 20rpx;
+	position: relative;
+	.img {
+		position: relative;
+		top: -56rpx;
+		left: 0;
+		width: 522rpx;
+		height: 132rpx;
+		display: flex;
+		justify-content: center;
+		image {
+			border-radius: 20rpx 20rpx 0 0;
+			width: 450rpx;
+			height: 132rpx;
+		}
+	}
+
+	.mian {
+		margin-top: -44rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		// padding: 32rpx 32rpx;
+		background-color: #ffffff;
+		border-radius: 0 0 20rpx 20rpx;
+		text-align: center;
+
+		.delivery {
+			font-size: 40rpx;
+			color: #333333;
+			display: flex;
+			align-items: center;
+			flex-direction: column;
+			.title {
+			}
+			image {
+				margin-top: 48rpx;
+				width: 172rpx;
+				height: 160rpx;
+			}
+		}
+
+		.nocancel {
+			font-size: 32rpx;
+			color: #333333;
+			margin-top: 14rpx;
+		}
+
+		.comfirm-box {
+			margin-top: 52rpx;
+			display: flex;
+			// margin-bottom: 32rpx;
+
+			// justify-content: space-around;
+			.cancel {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 197rpx;
+				height: 74rpx;
+				border: 1px solid #dcc786;
+				border-radius: 38rpx;
+
+				font-size: 32rpx;
+				color: #605128;
+			}
+
+			.comfirm {
+				margin-left: 32rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 197rpx;
+				height: 74rpx;
+				background: linear-gradient(-90deg, #d1ba77 0%, #f7e8ad 100%);
+				border-radius: 38px;
+				font-size: 32rpx;
+				color: #605128;
+			}
+		}
+	}
 }
 </style>

store/index.js

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