123456

pages.json

@@ -14,7 +14,7 @@
 				"navigationStyle": "custom",
 				"navigationBarTitleText": "菜单"
 			}
-			
+
 		},
 		// #ifndef MP
 		{
@@ -49,7 +49,7 @@
 				}
 			}
 		},
-		
+
 		{
 			"path": "pages/redirect/redirect",
 			"style": {
@@ -71,41 +71,6 @@
 				}
 			}
 		},
-		{
-			"path": "pages/product/groupBooking/index",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "超值拼团",
-				"navigationBarBackgroundColor": "#901b21",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/product/groupBooking/detail",
-			"style": {
-				"navigationBarTitleText": "拼团列表",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
-		},
-		{
-			"path": "pages/product/groupBooking/inviteImg",
-			"style": {
-				"navigationBarTitleText": "拼团邀请图",
-				"app-plus": {
-					"titleNView": false
-				}
-			}
-		},
-		{
-			"path": "pages/product/groupBooking/productGroup",
-			"style": {
-				"navigationBarTitleText": "商品详情"
-			}
-		},
 		// #ifndef MP
 		{
 			"path": "pages/product/reply",
@@ -119,28 +84,6 @@
 			}
 		},
 		// #endif
-		{
-			"path": "pages/product/exchange",
-			"style": {
-				"navigationBarTitleText": "兑换券"
-				// "app-plus": {
-				// 	"titleNView": {
-				// 		"type": "transparent"
-				// 	}
-				// }
-			}
-		},
-		{
-			"path": "pages/product/exchangeDetail",
-			"style": {
-				"navigationBarTitleText": "兑换券详情"
-				// "app-plus": {
-				// 	"titleNView": {
-				// 		"type": "transparent"
-				// 	}
-				// }
-			}
-		},
 		{
 			"path": "pages/product/product",
 			"style": {
@@ -152,22 +95,6 @@
 				}
 			}
 		},
-		{
-			"path": "pages/product/seckill",
-			"style": {
-				"navigationBarTitleText": "限时秒杀",
-				"navigationBarBackgroundColor": "#901b21",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/product/pointsExchange",
-			"style": {
-				"navigationBarTitleText": "积分兑换",
-				"navigationBarBackgroundColor": "#901b21",
-				"navigationBarTextStyle": "white"
-			}
-		},
 		{
 			"path": "pages/product/list",
 			"style": {
@@ -175,14 +102,6 @@
 				"navigationBarTitleText": "商品列表"
 			}
 		},
-		{
-			"path": "pages/product/discount",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "优惠券"
-			}
-			
-		},
 		// #ifndef MP
 		{
 			"path": "pages/product/jmszg",
@@ -231,45 +150,18 @@
 		},
 		{
 			"path": "pages/set/address",
-			
+
 			"style": {
 				"enablePullDownRefresh": true,
-				// #ifdef APP-PLUS
-				"navigationStyle": "custom",
-				// #endif
-				// #ifndef MP || APP-PLUS
-				"app-plus": {
-					"titleNView": {
-						"buttons": [{
-							"text": "新增",
-							"fontSize": "14",
-							"color": "#FFFFFF",
-							"width": "40px"
-						}]
-					}
-				},
-				// #endif
 				"navigationBarTitleText": "收货地址"
 			}
 		},
-		{
-			"path": "pages/set/point",
-			"style": {
-				"navigationBarTitleText": "自提点管理"
-			}
-		},
 		{
 			"path": "pages/set/addressManage",
 			"style": {
 				"navigationBarTitleText": ""
 			}
 		},
-		{
-			"path": "pages/set/pointManage",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
 		// #ifndef MP
 		{
 			"path": "pages/set/phone",
@@ -293,19 +185,9 @@
 			"path": "pages/cart/cart",
 			"style": {
 				"navigationBarTitleText": "我的订单",
-				"navigationBarBackgroundColor": "#901b21",
-				"navigationBarTextStyle": "white"
+				"navigationBarBackgroundColor": "#f8f1f2"
 			}
 		},
-		// {
-		// 	"path": "pages/user/user",
-		// 	"style": {
-		// 		// #ifndef MP-WEIXIN
-		// 		"navigationStyle": "custom",
-		// 		// #endif
-		// 		"navigationBarTitleText": "个人中心"
-		// 	}
-		// },
 		{
 			"path": "pages/user/user",
 			"style": {
@@ -314,17 +196,9 @@
 			}
 		}
 	],
-	"subPackages": [
-		{
+	"subPackages": [{
 			"root": "user",
-			"pages": [
-				{
-					"path": "page/storeCommission",
-					"style": {
-						"navigationBarTitleText": "门店佣金"
-					}
-				},
-				{
+			"pages": [{
 					"path": "page/orderDetail",
 					"style": {
 						"navigationBarTitleText": "订单详情"
@@ -336,42 +210,6 @@
 						"navigationBarTitleText": "邀请好友"
 					}
 				},
-				{
-					"path": "page/shareEx",
-					"style": {
-						"navigationBarTitleText": ""
-					}
-				},
-				{
-					"path": "page/depositAdmin",
-					"style": {
-						"navigationBarTitleText": "押金管理"
-					}
-				},
-				{
-					"path": "page/myex",
-					"style": {
-						"navigationBarTitleText": "我的兑换券"
-					}
-				},
-				{
-					"path": "page/dlcenter",
-					"style": {
-						"navigationBarTitleText": "代理收益"
-					}
-				},
-				{
-					"path": "page/refundAdmin",
-					"style": {
-						"navigationBarTitleText": "退款管理"
-					}
-				},
-				{
-					"path": "page/wipe",
-					"style": {
-						"navigationBarTitleText": "自提管理"
-					}
-				},
 				{
 					"path": "page/award",
 					"style": {
@@ -387,28 +225,17 @@
 				{
 					"path": "page/scoreAccumulate",
 					"style": {
-						"navigationBarTitleText": "我的积分"
+						"navigationBarTitleText": "我的积分",
+						"navigationBarBackgroundColor": "#ee2f72",
+						"navigationBarTextStyle": "white"
 					}
 				},
 				{
 					"path": "page/extension",
 					"style": {
-						"navigationBarTitleText": "我的推广"
-						// "navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "page/revenueCenter",
-					"style": {
-						"navigationBarTitleText": "收益报告",
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "page/recommend",
-					"style": {
-						"navigationBarTitleText": "推荐充值码",
-						"navigationStyle": "custom"
+						"navigationBarTitleText": "我的推广",
+						"navigationBarBackgroundColor": "#ee2f72",
+						"navigationBarTextStyle": "white"
 					}
 				},
 				{
@@ -422,19 +249,12 @@
 					"style": {
 						"navigationBarTitleText": "付款"
 					}
-				},
-				{
-					"path": "page/delivery",
-					"style": {
-						"navigationBarTitleText": "送货管理"
-					}
 				}
 			]
 		},
 		{
 			"root": "pages/order",
-			"pages": [
-				{
+			"pages": [{
 					"path": "order",
 					"style": {
 						"navigationBarTitleText": "我的订单",
@@ -452,7 +272,7 @@
 						}
 					}
 				},
-				
+
 				{
 					"path": "orderDetail",
 					"style": {
@@ -504,53 +324,32 @@
 				}
 			]
 		},
-		// {
-		// 	"root": "pages/menu",
-		// 	"pages": [
-		// 		{
-		// 			"path": "menu",
-		// 			"style": {
-		// 				"navigationBarTitleText": "全部商品",
-		// 				"enablePullDownRefresh": false,
-		// 				"navigationStyle": "custom",
-		// 				"app-plus": {
-		// 					"bounce": "none"
-		// 				}
-		// 			}
-		// 		}
-		// 	]
-		// },
 		{
 			"root": "pages/recommend",
-			"pages": [
-				{
-					"path": "recommend",
-					"style": {
-						"navigationBarTitleText": "为你推荐",
-						"app-plus": {
-							"bounce": "none"
-						}
+			"pages": [{
+				"path": "recommend",
+				"style": {
+					"navigationBarTitleText": "为你推荐",
+					"app-plus": {
+						"bounce": "none"
 					}
 				}
-			]
-		},{
+			}]
+		}, {
 			"root": "pages/exchange",
-			"pages": [
-				{
-					"path": "exchange",
-					"style": {
-						"navigationBarTitleText": "兑换券",
-						"app-plus": {
-							"bounce": "none"
-						}
+			"pages": [{
+				"path": "exchange",
+				"style": {
+					"navigationBarTitleText": "兑换券",
+					"app-plus": {
+						"bounce": "none"
 					}
 				}
-			]
+			}]
 		},
 		{
 			"root": "pages/money",
-			"pages": [
-				{
+			"pages": [{
 					"path": "pay",
 					"style": {
 						"navigationBarTitleText": "支付"
@@ -566,8 +365,9 @@
 					"path": "wallet",
 					"style": {
 						"navigationBarTitleText": "我的钱包",
-						"navigationBarBackgroundColor": "#921a23",
+						"navigationBarBackgroundColor": "#ee2f72",
 						"navigationBarTextStyle": "white"
+
 					}
 				},
 				{
@@ -589,29 +389,13 @@
 					}
 				}
 			]
-		},
-		{
-			"root": "pages/tool",
-			"pages": [
-				{
-					"path": "phoneBill",
-					"style": {
-						"navigationBarTitleText": "话费充值"
-					}
-				},
-				{
-					"path": "entity",
-					"style": {
-						"navigationBarTitleText": ""
-					}
-				}
-			]
 		}
+
 	],
 	"globalStyle": {
-		"navigationBarTextStyle": "white",
+		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",
-		"navigationBarBackgroundColor": "#901b21",
+		"navigationBarBackgroundColor": "#ffffff",
 		"backgroundColor": "#f8f8f8"
 	},
 	"tabBar": {
@@ -624,7 +408,7 @@
 				"iconPath": "static/tabBar/tab-home.png",
 				"selectedIconPath": "static/tabBar/home.png",
 				"text": "首页"
-			},{
+			}, {
 				"pagePath": "pages/menu/menu",
 				"iconPath": "static/tabBar/tab-menu.png",
 				"selectedIconPath": "static/tabBar/menu.png",

pages/cart/cart.vue

@@ -1,11 +1,7 @@
 <template>
 	<view class="container">
-		<view class="bg">
-			<image src="https://zccy.liuniu946.com/static/img/cart-bg.png" mode=""></image>
-		</view>
 		<view class="navbar">
-			<view v-for="(item, index) in navList" :key="index" class="nav-item" @click="navChoose(index)"
-				:class="{ navC: index == navIc }">{{ item.text }}</view>
+			<view v-for="(item, index) in navList" :key="index" class="nav-item" @click="navChoose(index)" :class="{ navC: index == navIc }">{{ item.text }}</view>
 		</view>
 		<!-- 订单列表 -->
 		<swiper :current="navIc" class="swiper-box" duration="300" @change="changeTab">
@@ -18,8 +14,7 @@
 						</view>
 						<view class="goods-box" v-for="(item, index) in i.cartInfo">
 							<view class="goods-left flex">
-								<image class="goods-img"
-									:src="item.productInfo.image || '../../static/error/errorImage.jpg'"></image>
+								<image class="goods-img" :src="item.productInfo.image || '../../static/error/errorImage.jpg'"></image>
 								<view class="goods-name">
 									<view class="p clamp2">{{ item.productInfo.store_name }}</view>
 									<view class="span">{{ i.shipping_type == 1 ? '送货上门' : '到店自提' }}</view>
@@ -34,9 +29,9 @@
 						<view class="i-td">
 							<view class="td-left"></view>
 							<view class="i-bottom">
-								共计{{i.total_num}}件商品
+								共计{{ i.total_num }}件商品
 								<text>合计 ￥{{ i.pay_price }}</text>
-								( {{(i.pay_postage*1 + i.pay_postage_sh*1) > 0 ? '含物流费用￥' + (i.pay_postage*1 + i.pay_postage_sh*1) + '，' : '免邮，' }} 不含押金)
+								( {{ i.pay_postage * 1 + i.pay_postage_sh * 1 > 0 ? '含物流费用￥' + (i.pay_postage * 1 + i.pay_postage_sh * 1) + '，' : '免邮，' }} 不含押金)
 							</view>
 						</view>
 						<view class="btn-box" v-if="tabItem.state == 0">
@@ -65,57 +60,17 @@
 </template>
 
 <script>
-	import {
-		orderList,
-		orderCancel,
-		orderDel,
-		orderTake
-	} from '@/api/order.js';
-	import { mapState, mapMutations } from 'vuex';
-	export default {
-		computed: {
-			...mapState('user', ['userInfo'])
-		},
-		data() {
-			return {
-				navIc: 0,
-				navList: [{
-						state: 0,
-						text: '待付款',
-						loadingType: 'more',
-						orderList: [],
-						page: 1, //当前页数
-						limit: 10 //每次信息条数
-					},
-					{
-						state: 1,
-						text: '待发货',
-						loadingType: 'more',
-						orderList: [],
-						page: 1, //当前页数
-						limit: 10 //每次信息条数
-					},
-					{
-						state: 2,
-						text: '待收货',
-						loadingType: 'more',
-						orderList: [],
-						page: 1, //当前页数
-						limit: 10 //每次信息条数
-					},
-					{
-						state: 3,
-						text: '已完成',
-						loadingType: 'more',
-						orderList: [],
-						page: 1, //当前页数
-						limit: 10 //每次信息条数
-					}
-				]
-			};
-		},
-		onShow() {
-			this.navList = [{
+import { orderList, orderCancel, orderDel, orderTake } from '@/api/order.js';
+import { mapState, mapMutations } from 'vuex';
+export default {
+	computed: {
+		...mapState('user', ['userInfo'])
+	},
+	data() {
+		return {
+			navIc: 0,
+			navList: [
+				{
 					state: 0,
 					text: '待付款',
 					loadingType: 'more',
@@ -148,366 +103,389 @@
 					limit: 10 //每次信息条数
 				}
 			]
-			this.loadData();
-		},
-		methods: {
-			navChoose(index) {
-				this.navIc = index;
-				this.loadData();
+		};
+	},
+	onShow() {
+		this.navList = [
+			{
+				state: 0,
+				text: '待付款',
+				loadingType: 'more',
+				orderList: [],
+				page: 1, //当前页数
+				limit: 10 //每次信息条数
 			},
-			price(price) {
-				return (price * 1).toFixed(2);
+			{
+				state: 1,
+				text: '待发货',
+				loadingType: 'more',
+				orderList: [],
+				page: 1, //当前页数
+				limit: 10 //每次信息条数
 			},
-			//swiper 切换
-			changeTab(e) {
-				this.navIc = e.target.current;
-				this.loadData('tabChange');
+			{
+				state: 2,
+				text: '待收货',
+				loadingType: 'more',
+				orderList: [],
+				page: 1, //当前页数
+				limit: 10 //每次信息条数
 			},
-			//获取订单列表
-			loadData(source) {
-				//这里是将订单挂载到tab列表下
-				let index = this.navIc;
-				let navItem = this.navList[index];
-				let state = navItem.state;
-				if (source === 'tabChange' && navItem.loaded === true) {
-					//tab切换只有第一次需要加载数据
-					return;
-				}
-				if (navItem.loadingType === 'loading') {
-					//防止重复加载
-					return;
-				}
-				if (navItem.loadingType === 'noMore') {
-					//防止重复加载
-					return;
-				}
-				// 修改当前对象状态为加载中
-				navItem.loadingType = 'loading';
-				orderList({
-						type: state,
-						page: navItem.page,
-						limit: navItem.limit
-					})
-					.then(({
-						data
-					}) => {
-						console.log(data);
-						let arr = data.map(e => {
-							console.log(e, 123456)
-							let b = this.orderStateExp(e.status);
-							e.stateTip = b.stateTip;
-							e.stateTipColor = b.stateTipColor;
-							return e;
-						});
-						navItem.orderList = navItem.orderList.concat(arr);
-						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);
+			{
+				state: 3,
+				text: '已完成',
+				loadingType: 'more',
+				orderList: [],
+				page: 1, //当前页数
+				limit: 10 //每次信息条数
+			}
+		];
+		this.loadData();
+	},
+	methods: {
+		navChoose(index) {
+			this.navIc = index;
+			this.loadData();
+		},
+		price(price) {
+			return (price * 1).toFixed(2);
+		},
+		//swiper 切换
+		changeTab(e) {
+			this.navIc = e.target.current;
+			this.loadData('tabChange');
+		},
+		//获取订单列表
+		loadData(source) {
+			//这里是将订单挂载到tab列表下
+			let index = this.navIc;
+			let navItem = this.navList[index];
+			let state = navItem.state;
+			if (source === 'tabChange' && navItem.loaded === true) {
+				//tab切换只有第一次需要加载数据
+				return;
+			}
+			if (navItem.loadingType === 'loading') {
+				//防止重复加载
+				return;
+			}
+			if (navItem.loadingType === 'noMore') {
+				//防止重复加载
+				return;
+			}
+			// 修改当前对象状态为加载中
+			navItem.loadingType = 'loading';
+			orderList({
+				type: state,
+				page: navItem.page,
+				limit: navItem.limit
+			})
+				.then(({ data }) => {
+					console.log(data);
+					let arr = data.map(e => {
+						console.log(e, 123456);
+						let b = this.orderStateExp(e.status);
+						e.stateTip = b.stateTip;
+						e.stateTipColor = b.stateTipColor;
+						return e;
 					});
-			},
-			orderTake(item, index) {
-				let obj = this;
-				uni.showModal({
-					title: '是否确认收货？',
-					success: (res) => {
-						if (res.confirm) {
-							orderTake({
-									uni: item.order_id
-								})
-								.then(e => {
-									obj.navList[obj.navIc].orderList.splice(index, 1);
-									uni.showToast({
-										title: '收货成功'
-									});
-								})
-								.catch(e => {
-									console.log(e);
-								});
-						} else if (res.cancel) {
-							console.log('取消')
-						}
-
+					navItem.orderList = navItem.orderList.concat(arr);
+					navItem.page++;
+					if (navItem.limit == data.length) {
+						//判断是否还有数据， 有改为 more， 没有改为noMore
+						navItem.loadingType = 'more';
+						return;
+					} else {
+						//判断是否还有数据， 有改为 more， 没有改为noMore
+						navItem.loadingType = 'noMore';
 					}
-				});
-			},
-			//跳转到订单详情
-			goToOrderDetail(e) {
-				uni.navigateTo({
-					url: '/pages/order/orderDetail?id=' + e.order_id
-				});
-			},
-			showCode(e) {
-				uni.navigateTo({
-					url: '/pages/order/verifyCode?id=' + e.order_id
+					uni.hideLoading();
+					this.$set(navItem, 'loaded', true);
 				})
-			},
-			orderStateExp(state) {
-				let stateTip = '',
-					stateTipColor = '#fa436a';
-				switch (+state) {
-					case 0:
-						stateTip = '待发货';
-						break;
-					case 1:
-						stateTip = '待收货';
-						break;
-					case 2:
-						stateTip = '已完成';
-						break;
-					case 3:
-						stateTip = '待评价';
-						break;
-					case 4:
-						stateTip = '已完成';
-						stateTipColor = '#901b21';
-						break;
-					case 9:
-						stateTip = '订单已关闭';
-						stateTipColor = '#909399';
-						break;
-
-						//更多自定义
-				}
-				return {
-					stateTip,
-					stateTipColor
-				};
-			},
-			qxzf(item) {
-				uni.showModal({
-					title: '订单取消',
-					content: '是否取消订单？',
-					success: e => {
-						if (e.confirm) {
-							uni.showLoading({
-								title: '请稍后'
-							});
-							orderCancel({ id: item.order_id })
-								.then(e => {
-									uni.showToast({
-										title: '取消成功',
-										duration: 2000,
-										position: 'top'
-									});
-								})
-								.catch(e => {
-									console.log(e);
+				.catch(e => {
+					console.log(e);
+				});
+		},
+		orderTake(item, index) {
+			let obj = this;
+			uni.showModal({
+				title: '是否确认收货？',
+				success: res => {
+					if (res.confirm) {
+						orderTake({
+							uni: item.order_id
+						})
+							.then(e => {
+								obj.navList[obj.navIc].orderList.splice(index, 1);
+								uni.showToast({
+									title: '收货成功'
 								});
-							//取消订单后删除待付款中该项
-							let list = this.navList[this.navIc].orderList;
-							let index = list.findIndex(val => val.id === item.id);
-							index !== -1 && list.splice(index, 1);
-							uni.hideLoading();
-						}
+							})
+							.catch(e => {
+								console.log(e);
+							});
+					} else if (res.cancel) {
+						console.log('取消');
 					}
-				});
-			},
-			ljzf(e) {
-				let yajin = 0
-				e.cartInfo.forEach(item => {
-					console.log(item.deposit)
-					yajin += item.deposit*1
-				})
-				console.log(yajin)
-				uni.navigateTo({
-					url: '/pages/money/pay?type=1&ordid=' + e.order_id + '&money=' + (e.pay_price*1 + yajin)
-				});
-			},
-			sqth(i) {
-				uni.navigateTo({
-					url: '/pages/order/orderRefund?id=' + i.order_id
-				})
+				}
+			});
+		},
+		//跳转到订单详情
+		goToOrderDetail(e) {
+			uni.navigateTo({
+				url: '/pages/order/orderDetail?id=' + e.order_id
+			});
+		},
+		showCode(e) {
+			uni.navigateTo({
+				url: '/pages/order/verifyCode?id=' + e.order_id
+			});
+		},
+		orderStateExp(state) {
+			let stateTip = '',
+				stateTipColor = '#fa436a';
+			switch (+state) {
+				case 0:
+					stateTip = '待发货';
+					break;
+				case 1:
+					stateTip = '待收货';
+					break;
+				case 2:
+					stateTip = '已完成';
+					break;
+				case 3:
+					stateTip = '待评价';
+					break;
+				case 4:
+					stateTip = '已完成';
+					stateTipColor = '#901b21';
+					break;
+				case 9:
+					stateTip = '订单已关闭';
+					stateTipColor = '#909399';
+					break;
+
+				//更多自定义
 			}
+			return {
+				stateTip,
+				stateTipColor
+			};
+		},
+		qxzf(item) {
+			uni.showModal({
+				title: '订单取消',
+				content: '是否取消订单？',
+				success: e => {
+					if (e.confirm) {
+						uni.showLoading({
+							title: '请稍后'
+						});
+						orderCancel({ id: item.order_id })
+							.then(e => {
+								uni.showToast({
+									title: '取消成功',
+									duration: 2000,
+									position: 'top'
+								});
+							})
+							.catch(e => {
+								console.log(e);
+							});
+						//取消订单后删除待付款中该项
+						let list = this.navList[this.navIc].orderList;
+						let index = list.findIndex(val => val.id === item.id);
+						index !== -1 && list.splice(index, 1);
+						uni.hideLoading();
+					}
+				}
+			});
+		},
+		ljzf(e) {
+			let yajin = 0;
+			e.cartInfo.forEach(item => {
+				console.log(item.deposit);
+				yajin += item.deposit * 1;
+			});
+			console.log(yajin);
+			uni.navigateTo({
+				url: '/pages/money/pay?type=1&ordid=' + e.order_id + '&money=' + (e.pay_price * 1 + yajin)
+			});
+		},
+		sqth(i) {
+			uni.navigateTo({
+				url: '/pages/order/orderRefund?id=' + i.order_id
+			});
 		}
-	};
+	}
+};
 </script>
 
 <style lang="scss" scoped>
-	page {
-		height: 100%;
-	}
+page {
+	height: 100%;
 
-	.container {
-		width: 100%;
-		height: 100%;
-		position: fixed;
+	background: #f8f1f2;
+}
 
-		.bg {
-			position: absolute;
-			top: 0;
-			width: 0;
-			width: 100%;
-			height: 100%;
+.container {
+	width: 100%;
+	height: 100%;
+	position: fixed;
 
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-
-		.navbar {
-			position: relative;
-			z-index: 10;
-			margin: 20rpx;
-			display: flex;
-			border-radius: 40rpx;
-			background-color: #901b21;
+	.navbar {
+		position: relative;
+		z-index: 10;
+		margin: 20rpx;
+		display: flex;
+		border-radius: 40rpx;
+		background-color: #ee2f72;
 
-			.nav-item {
-				margin: 0 10rpx;
-				text-align: center;
-				flex: 1;
-				color: #ffffff;
-				font-size: 28rpx;
-				margin: 10rpx;
-				line-height: 60rpx;
-			}
-
-			.navC {
-				background-color: #ffffff;
-				color: #901b21;
-				line-height: 60rpx;
-				border-radius: 50rpx;
-			}
+		.nav-item {
+			margin: 0 10rpx;
+			text-align: center;
+			flex: 1;
+			color: #ffffff;
+			font-size: 28rpx;
+			margin: 10rpx;
+			line-height: 60rpx;
 		}
 
-		.swiper-box,
-		.tab-content,
-		.scroll-y {
-			height: calc(100vh - 44px);
+		.navC {
+			background-color: #ffffff;
+			color: #ee2f72;
+			line-height: 60rpx;
+			border-radius: 50rpx;
 		}
+	}
 
-		.order-item {
-			display: grid;
-			margin-bottom: 20rpx;
-		}
+	.swiper-box,
+	.tab-content,
+	.scroll-y {
+		height: calc(100vh - 44px);
+	}
 
-		.btn-box {
-			border-top: 1px solid #f2f2f2;
-			height: 100rpx;
-			width: 100%;
-			padding-right: 20rpx;
-			background-color: #ffffff;
-			display: flex;
-			justify-content: flex-end;
-			align-items: center;
+	.order-item {
+		display: grid;
+		margin-bottom: 20rpx;
+	}
 
-			.btn {
-				margin-left: 10rpx;
-				width: 144rpx;
-				height: 55rpx;
-				border: 1px solid #901b21;
-				border-radius: 28rpx;
-				font-size: 26rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #901b21;
-				line-height: 55rpx;
-				text-align: center;
-			}
+	.btn-box {
+		border-top: 1px solid #f2f2f2;
+		height: 100rpx;
+		width: 100%;
+		padding-right: 20rpx;
+		background-color: #ffffff;
+		display: flex;
+		justify-content: flex-end;
+		align-items: center;
 
-			.btn-look {
-				margin-left: 10rpx;
-				width: 144rpx;
-				height: 55rpx;
-				border: 1px solid #ebebeb;
-				border-radius: 28rpx;
-				font-size: 26rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #999999;
-				line-height: 55rpx;
-				text-align: center;
-			}
+		.btn {
+			margin-left: 10rpx;
+			width: 144rpx;
+			height: 55rpx;
+			border: 1px solid #901b21;
+			border-radius: 28rpx;
+			font-size: 26rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #901b21;
+			line-height: 55rpx;
+			text-align: center;
 		}
 
-		.i-td {
-			display: flex;
-			justify-content: space-between;
-			background-color: #ffffff;
-			padding: 20rpx;
+		.btn-look {
+			margin-left: 10rpx;
+			width: 144rpx;
+			height: 55rpx;
+			border: 1px solid #ebebeb;
+			border-radius: 28rpx;
+			font-size: 26rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
 			color: #999999;
-			font-size: 25rpx;
+			line-height: 55rpx;
+			text-align: center;
+		}
+	}
 
-			.i-bottom {
-				span {
-					margin: 0 10rpx;
+	.i-td {
+		display: flex;
+		justify-content: space-between;
+		background-color: #ffffff;
+		padding: 20rpx;
+		color: #999999;
+		font-size: 25rpx;
 
-					b {
-						font-size: 28rpx;
-						color: #4f4f4f;
-					}
+		.i-bottom {
+			span {
+				margin: 0 10rpx;
+
+				b {
+					font-size: 28rpx;
+					color: #4f4f4f;
 				}
 			}
 		}
+	}
 
-		.goods-box {
-			height: 100%;
-			display: flex;
-			justify-content: space-between;
-			background-color: #f7f7f7;
-			padding: 20rpx;
+	.goods-box {
+		height: 100%;
+		display: flex;
+		justify-content: space-between;
+		background-color: #f7f7f7;
+		padding: 20rpx;
 
-			.goods-left {
-				align-items: flex-start;
+		.goods-left {
+			align-items: flex-start;
 
-				.goods-img {
-					width: 160rpx;
-					height: 160rpx;
-				}
+			.goods-img {
+				width: 160rpx;
+				height: 160rpx;
+			}
 
-				.goods-name {
-					margin: 10rpx 40rpx;
-					color: #666666;
-					font-size: 30rpx;
+			.goods-name {
+				margin: 10rpx 40rpx;
+				color: #666666;
+				font-size: 30rpx;
 
-					.p {
-						max-width: 300rpx;
-						margin-bottom: 10rpx;
-					}
+				.p {
+					max-width: 300rpx;
+					margin-bottom: 10rpx;
+				}
 
-					.span {
-						width: 120rpx;
-						background-color: #ffeae5;
-						color: #fd5b23;
-						text-align: center;
-						font-size: 24rpx;
-						padding: 5rpx;
-						border-radius: 5rpx;
-					}
+				.span {
+					width: 120rpx;
+					background-color: #ffeae5;
+					color: #fd5b23;
+					text-align: center;
+					font-size: 24rpx;
+					padding: 5rpx;
+					border-radius: 5rpx;
 				}
 			}
+		}
 
-			.goods-price {
-				margin: 10rpx 0;
-				text-align: right;
-				display: grid;
-				color: #999999;
-				font-size: 24rpx;
-				position: relative;
+		.goods-price {
+			margin: 10rpx 0;
+			text-align: right;
+			display: grid;
+			color: #999999;
+			font-size: 24rpx;
+			position: relative;
 
-				b {
-					color: #901b21;
-					font-size: 35rpx;
-				}
+			b {
+				color: #901b21;
+				font-size: 35rpx;
+			}
 
-				.num {
-					position: absolute;
-					bottom: 20rpx;
-					right: 10rpx;
-				}
+			.num {
+				position: absolute;
+				bottom: 20rpx;
+				right: 10rpx;
 			}
 		}
 	}
+}
 </style>

pages/menu/Child/chooseListBar.vue

@@ -4,40 +4,35 @@
 			<view class="box">
 				<view class="top">
 					<view class="top-left">
-						<view class="quan">
-							<view class="qzq">
-
-							</view>
-						</view>
-						<view class="top-font">
-							已选商品
-						</view>
+						<view class="quan"><view class="qzq"></view></view>
+						<view class="top-font">已选商品</view>
 					</view>
 					<view class="top-right" @click="clearCart">
 						<image src="../../../static/icon/clear.png" mode=""></image>
-						<view class="right-clear">
-							清空购物车
-						</view>
+						<view class="right-clear">清空购物车</view>
 					</view>
 				</view>
-				<scroll-view :key="item.id" scroll-y class="scoroll">
-					<view v-for="(item, index) in cartList">
+				<scroll-view scroll-y class="scoroll">
+					<view v-for="(item, index) in cartList" :key="item.id">
 						<view class="cart-item" :class="{ 'b-b': index !== cartList.length - 1 }">
 							<view class="image-wrapper">
-								<image :src="item.productInfo.image" :class="[item.loaded]" mode="aspectFill" lazy-load
-									@load="onImageLoad('cartList', index)" @error="onImageError('cartList', index)">
-								</image>
+								<image
+									:src="item.productInfo.image"
+									:class="[item.loaded]"
+									mode="aspectFill"
+									lazy-load
+									@load="onImageLoad('cartList', index)"
+									@error="onImageError('cartList', index)"
+								></image>
 							</view>
 							<view class="item-right">
 								<text class="clamp title">{{ item.productInfo.store_name }}</text>
 								<text class="attr">{{ item.productInfo.attrInfo.suk }}</text>
-								<text class="price"
-									style="margin-top: 30rpx;">¥{{ item.productInfo.attrInfo.price }}</text>
+								<text class="price" style="margin-top: 30rpx;">¥{{ item.productInfo.attrInfo.price }}</text>
 							</view>
 							<view class="item-num">
 								<view class="munbox flex">
-									<image src="../../../static/icon/reduce.png" mode="" @click="reduce(item, index)">
-									</image>
+									<image src="../../../static/icon/reduce.png" mode="" @click="reduce(item, index)"></image>
 									<input type="number" :value="item.cart_num" disabled />
 									<image src="../../../static/icon/add.png" mode="" @click="add(item)"></image>
 								</view>
@@ -46,7 +41,6 @@
 					</view>
 					<view class="db"></view>
 				</scroll-view>
-
 			</view>
 		</uni-popup>
 		<view class="action-section">
@@ -67,528 +61,510 @@
 </template>
 
 <script>
-	import {
-		getCartList,
-		getCartNum,
-		cartDel
-	} from '@/api/user.js';
-	import {
-		mapState
-	} from 'vuex';
-	import uniNumberBox from '@/components/uni-number-box.vue';
-	import {
-		saveUrl,
-		interceptor
-	} from '@/utils/loginUtils.js';
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
-	export default {
-		components: {
-			uniNumberBox,
-			uniPopup
-		},
-		data() {
-			return {
-				total: 0, //总价格
-				allChecked: false, //全选状态  true|false
-				empty: false, //空白页现实  true|false
-				cartList: [],
-				num: '',
-				show: false
-			};
-		},
-		mounted() {
-			this.loadData();
-		},
-		watch: {
-			//显示空白页
-			// cartList(e) {
-			// 	let empty = e.length === 0 ? true : false;
-			// 	if (this.empty !== empty) {
-			// 		this.empty = empty;
-			// 	}
-
-			// }
-			cartList: {
-				deep: true, //深度监听
-				immediate: true,
-				handler(newValue, oldValue) {
-					let empty = newValue.length === 0 ? true : false;
-					if (this.empty !== empty) {
-						this.empty = empty;
-					}
+import { getCartList, getCartNum, cartDel } from '@/api/user.js';
+import { mapState } from 'vuex';
+import uniNumberBox from '@/components/uni-number-box.vue';
+import { saveUrl, interceptor } from '@/utils/loginUtils.js';
+import uniPopup from '@/components/uni-popup/uni-popup.vue';
+export default {
+	components: {
+		uniNumberBox,
+		uniPopup
+	},
+	data() {
+		return {
+			total: 0, //总价格
+			allChecked: false, //全选状态  true|false
+			empty: false, //空白页现实  true|false
+			cartList: [],
+			num: '',
+			show: false
+		};
+	},
+	mounted() {
+		this.loadData();
+	},
+	watch: {
+		cartList: {
+			deep: true, //深度监听
+			immediate: true,
+			handler(newValue, oldValue) {
+				let empty = newValue.length === 0 ? true : false;
+				if (this.empty !== empty) {
+					this.empty = empty;
 				}
 			}
-		},
-		computed: {
-			...mapState('user', ['hasLogin'])
-		},
-		methods: {
-			reduce(item, index) {
-				if (item.cart_num == 1) {
-					uni.showModal({
-						content: '删除该商品？',
-						success: e => {
-							if (e.confirm) {
-								this.deleteCartItem(index);
-							}
+		}
+	},
+	computed: {
+		...mapState('user', ['hasLogin'])
+	},
+	methods: {
+		reduce(item, index) {
+			if (item.cart_num == 1) {
+				uni.showModal({
+					content: '删除该商品？',
+					success: e => {
+						if (e.confirm) {
+							this.deleteCartItem(index);
 						}
-					});
-				} else {
-					item.cart_num--;
-					getCartNum({
-							id: item.id,
-							number: item.cart_num
-						})
-						.then(e => {
-							console.log(e);
-						})
-						.catch(function(e) {
-							console.log(e);
-						});
-					this.calcTotal(item);
-				}
-			},
-			add(item) {
-				console.log(item);
-				if (item.productInfo.stock > item.cart_num) {
-					item.cart_num++;
-					getCartNum({
-							id: item.id,
-							number: item.cart_num
-						})
-						.then(e => {
-							console.log(e);
-						})
-						.catch(function(e) {
-							console.log(e);
-						});
-					this.calcTotal(item);
-				} else {
-					return;
-				}
-			},
-			//请求数据
-			async loadData() {
-				let obj = this;
-				getCartList({})
-					.then(function(e) {
-						console.log(e, '111');
-						// 获取当前购物车物品增加数量
-						let nub = obj.cartList.length;
-						// 获取之前对象数组
-						let aArray = obj.cartList.reverse();
-						// 获取返回数据对象数组
-						let bArray = e.data.valid.reverse();
-						obj.cartList = bArray
-							.map((item, ind) => {
-								// 设置返回数据默认为勾选状态
-								item.checked = true;
-								// 获取相同数组之前对象的数据
-								let carlist = aArray[ind];
-								// 判断之前是否已经加载完毕
-								if (carlist && carlist.loaded == 'loaded') {
-									item.loaded = 'loaded';
-								}
-
-								return item;
-							})
-							.reverse();
-						obj.calcTotal(); //计算总价
-						obj.show = true;
+					}
+				});
+			} else {
+				item.cart_num--;
+				getCartNum({
+					id: item.id,
+					number: item.cart_num
+				})
+					.then(e => {
+						console.log(e);
 					})
 					.catch(function(e) {
 						console.log(e);
 					});
-			},
-			//监听image加载完成
-			onImageLoad(key, index) {
-				// 修改载入完成后图片class样式
-				this.$set(this[key][index], 'loaded', 'loaded');
-			},
-			//监听image加载失败
-			onImageError(key, index) {
-				this[key][index].image = '/static/error/errorImage.jpg';
-			},
-			showPopup() {
-				this.$refs.popup.open();
-			},
-			// 跳转到登录页
-			navToLogin() {
-				// 保存地址
-				saveUrl();
-				// 登录拦截
-				interceptor();
-			},
-			//数量
-			numberChange(data) {
-				let arr = this.cartList[data.index];
-				arr.cart_num = data.number;
+				this.calcTotal(item);
+			}
+		},
+		add(item) {
+			console.log(item);
+			if (item.productInfo.stock > item.cart_num) {
+				item.cart_num++;
 				getCartNum({
-						id: arr.id,
-						number: data.number
-					})
+					id: item.id,
+					number: item.cart_num
+				})
 					.then(e => {
 						console.log(e);
 					})
 					.catch(function(e) {
 						console.log(e);
 					});
-				this.calcTotal();
-			},
-			//删除
-			deleteCartItem(index) {
-				const obj = this;
-				let list = this.cartList;
-				let row = list[index];
-				let id = row.id;
-				cartDel({
-					ids: id
-				});
-				this.cartList.splice(index, 1);
-				uni.hideLoading();
-				this.calcTotal();
-				if (this.num == 0) {
-					obj.$emit('delChoose');
-				}
-			},
-			//清空
-			clearCart() {
-				const obj = this
-				uni.showModal({
-					content: '清空购物车？',
-					success: e => {
-						if (e.confirm) {
-							let st = this.cartList.map(e => {
-								return e.id;
-							});
-							cartDel({
-								ids: st.join(',')
-							}).then(e => {
-								obj.$emit('delChoose');
-								console.log(e);
-							});
-							this.cartList = [];
-							this.$refs.popup.close();
-							(this.total = 0), (this.num = 0);
-						}
-					}
-				});
-			},
-			//计算总价
-			calcTotal() {
-				console.log('111111');
-				let list = this.cartList;
-				let total = 0;
-				let num = 0;
-				let checked = true;
-				list.forEach(item => {
-					console.log(item, '123123')
-					num += item.cart_num;
-					total += item.productInfo.attrInfo.price * item.cart_num;
+				this.calcTotal(item);
+			} else {
+				return;
+			}
+		},
+		//请求数据
+		async loadData() {
+			let obj = this;
+			getCartList({})
+				.then(function(e) {
+					console.log(e, '111');
+					// 获取当前购物车物品增加数量
+					let nub = obj.cartList.length;
+					// 获取之前对象数组
+					let aArray = obj.cartList.reverse();
+					// 获取返回数据对象数组
+					let bArray = e.data.valid.reverse();
+					obj.cartList = bArray
+						.map((item, ind) => {
+							// 设置返回数据默认为勾选状态
+							item.checked = true;
+							// 获取相同数组之前对象的数据
+							let carlist = aArray[ind];
+							// 判断之前是否已经加载完毕
+							if (carlist && carlist.loaded == 'loaded') {
+								item.loaded = 'loaded';
+							}
+
+							return item;
+						})
+						.reverse();
+					obj.calcTotal(); //计算总价
+					obj.show = true;
+				})
+				.catch(function(e) {
+					console.log(e);
 				});
-				this.num = num * 1;
-				this.allChecked = checked;
-				this.total = Number(total.toFixed(2));
-			},
-			//创建订单
-			createOrder() {
-				let list = this.cartList;
-				let goodsData = [];
-				list.forEach(item => {
-					if (item.checked) {
-						goodsData.push(item.id);
-					}
+		},
+		//监听image加载完成
+		onImageLoad(key, index) {
+			// 修改载入完成后图片class样式
+			this.$set(this[key][index], 'loaded', 'loaded');
+		},
+		//监听image加载失败
+		onImageError(key, index) {
+			this[key][index].image = '/static/error/errorImage.jpg';
+		},
+		showPopup() {
+			this.$refs.popup.open();
+		},
+		// 跳转到登录页
+		navToLogin() {
+			// 保存地址
+			saveUrl();
+			// 登录拦截
+			interceptor();
+		},
+		//数量
+		numberChange(data) {
+			let arr = this.cartList[data.index];
+			arr.cart_num = data.number;
+			getCartNum({
+				id: arr.id,
+				number: data.number
+			})
+				.then(e => {
+					console.log(e);
+				})
+				.catch(function(e) {
+					console.log(e);
 				});
-				this.$emit('createOrder', goodsData)
-
+			this.calcTotal();
+		},
+		//删除
+		deleteCartItem(index) {
+			const obj = this;
+			let list = this.cartList;
+			let row = list[index];
+			let id = row.id;
+			cartDel({
+				ids: id
+			});
+			this.cartList.splice(index, 1);
+			uni.hideLoading();
+			this.calcTotal();
+			if (this.num == 0) {
+				obj.$emit('delChoose');
 			}
+		},
+		//清空
+		clearCart() {
+			const obj = this;
+			uni.showModal({
+				content: '清空购物车？',
+				success: e => {
+					if (e.confirm) {
+						let st = this.cartList.map(e => {
+							return e.id;
+						});
+						cartDel({
+							ids: st.join(',')
+						}).then(e => {
+							obj.$emit('delChoose');
+							console.log(e);
+						});
+						this.cartList = [];
+						this.$refs.popup.close();
+						(this.total = 0), (this.num = 0);
+					}
+				}
+			});
+		},
+		//计算总价
+		calcTotal() {
+			console.log('111111');
+			let list = this.cartList;
+			let total = 0;
+			let num = 0;
+			let checked = true;
+			list.forEach(item => {
+				console.log(item, '123123');
+				num += item.cart_num;
+				total += item.productInfo.attrInfo.price * item.cart_num;
+			});
+			this.num = num * 1;
+			this.allChecked = checked;
+			this.total = Number(total.toFixed(2));
+		},
+		//创建订单
+		createOrder() {
+			let list = this.cartList;
+			let goodsData = [];
+			list.forEach(item => {
+				if (item.checked) {
+					goodsData.push(item.id);
+				}
+			});
+			this.$emit('createOrder', goodsData);
 		}
-	};
+	}
+};
 </script>
 
 <style lang="scss">
-	.container {
-		padding-bottom: 134rpx;
-		background-color: $page-color-base;
-
-		/* 空白页 */
-		.empty {
-			position: fixed;
-			left: 0;
-			top: 0;
-			width: 100%;
-			height: 100vh;
-			padding-bottom: 100rpx;
-			display: flex;
-			justify-content: center;
-			flex-direction: column;
-			align-items: center;
-			background: #fff;
+.container {
+	padding-bottom: 134rpx;
+	background-color: $page-color-base;
 
-			.emptyImg {
-				width: 300rpx;
-				height: 250rpx;
-				margin-bottom: 30rpx;
-			}
+	/* 空白页 */
+	.empty {
+		position: fixed;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 100vh;
+		padding-bottom: 100rpx;
+		display: flex;
+		justify-content: center;
+		flex-direction: column;
+		align-items: center;
+		background: #fff;
 
-			.empty-tips {
-				display: flex;
-				font-size: $font-sm + 2rpx;
-				color: $font-color-disabled;
+		.emptyImg {
+			width: 300rpx;
+			height: 250rpx;
+			margin-bottom: 30rpx;
+		}
 
-				.navigator {
-					color: $uni-color-primary;
-					margin-left: 16rpx;
-				}
+		.empty-tips {
+			display: flex;
+			font-size: $font-sm + 2rpx;
+			color: $font-color-disabled;
+
+			.navigator {
+				color: $uni-color-primary;
+				margin-left: 16rpx;
 			}
 		}
 	}
+}
 
-	.box {
-		max-height: 700rpx;
-		position: relative;
-		background: #ffffff;
-		border-radius: 20rpx 20rpx 0rpx 0rpx;
+.box {
+	max-height: 700rpx;
+	position: relative;
+	background: #ffffff;
+	border-radius: 20rpx 20rpx 0rpx 0rpx;
+
+	.top {
+		height: 90rpx;
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 0 30rpx 0 36rpx;
 
-		.top {
-			height: 90rpx;
-			width: 100%;
+		.top-left {
 			display: flex;
-			justify-content: space-between;
+			justify-content: flex-start;
 			align-items: center;
-			padding: 0 30rpx 0 36rpx;
 
-			.top-left {
-				display: flex;
-				justify-content: flex-start;
-				align-items: center;
+			.quan {
+				width: 24rpx;
+				height: 24rpx;
+				border: 1px solid #ee2f72;
+				border-radius: 50%;
+				position: relative;
+				flex-shrink: 0;
 
-				.quan {
-					width: 24rpx;
-					height: 24rpx;
-					border: 1px solid #901B21;
+				.qzq {
+					position: absolute;
+					top: 50%;
+					left: 50%;
+					margin: -8rpx 0 0 -8rpx;
+					width: 12rpx;
+					height: 12rpx;
+					background: #ee2f72;
 					border-radius: 50%;
-					position: relative;
-					flex-shrink: 0;
-
-					.qzq {
-						position: absolute;
-						top: 50%;
-						left: 50%;
-						margin: -8rpx 0 0 -8rpx;
-						width: 12rpx;
-						height: 12rpx;
-						background: #901B21;
-						border-radius: 50%;
-					}
-				}
-
-				.top-font {
-					margin-left: 10rpx;
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
 				}
 			}
 
-			.top-right {
+			.top-font {
+				margin-left: 10rpx;
 				font-size: 28rpx;
 				font-family: PingFang SC;
 				font-weight: 500;
-				color: #999999;
-				display: flex;
-				align-items: center;
+				color: #333333;
+			}
+		}
 
-				image {
-					width: 28rpx;
-					height: 28rpx;
-				}
+		.top-right {
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #999999;
+			display: flex;
+			align-items: center;
 
-				.right-clear {
-					margin-left: 6rpx;
-				}
+			image {
+				width: 28rpx;
+				height: 28rpx;
+			}
+
+			.right-clear {
+				margin-left: 6rpx;
 			}
 		}
+	}
 
-		.scoroll {
-			max-height: 600rpx;
+	.scoroll {
+		max-height: 600rpx;
+	}
+}
+
+.db {
+	width: 750rpx;
+	height: 150rpx;
+}
+
+/* 购物车列表项 */
+.cart-item {
+	position: relative;
+	display: flex;
+	padding: 18rpx 29rpx 60rpx 30rpx;
+	border-top: 1px solid #eeeeee;
+
+	.image-wrapper {
+		width: 160rpx;
+		height: 160rpx;
+		flex-shrink: 0;
+		position: relative;
+
+		image {
+			border-radius: 2rpx;
 		}
 	}
 
-	.db {
-		width: 750rpx;
-		height: 100rpx;
+	.checkbox {
+		position: absolute;
+		left: -16rpx;
+		top: -16rpx;
+		z-index: 8;
+		font-size: 44rpx;
+		line-height: 1;
+		padding: 4rpx;
+		color: $font-color-disabled;
+		background: #fff;
+		border-radius: 50px;
 	}
 
-	/* 购物车列表项 */
-	.cart-item {
-		position: relative;
+	.item-right {
 		display: flex;
-		padding: 18rpx 29rpx 60rpx 30rpx;
-		border-top: 1px solid #EEEEEE;
-
-		.image-wrapper {
-			width: 160rpx;
-			height: 160rpx;
-			flex-shrink: 0;
-			position: relative;
+		flex-direction: column;
+		flex: 1;
+		overflow: hidden;
+		position: relative;
+		padding-left: 30rpx;
+
+		.title,
+		.price {
+			font-size: $font-base + 2rpx;
+			color: #ee2f72;
+			height: 40rpx;
+			line-height: 40rpx;
+		}
 
-			image {
-				border-radius: 2rpx;
-			}
+		.attr {
+			font-size: $font-sm + 2rpx;
+			color: $font-color-light;
+			height: 50rpx;
+			line-height: 50rpx;
 		}
 
-		.checkbox {
-			position: absolute;
-			left: -16rpx;
-			top: -16rpx;
-			z-index: 8;
-			font-size: 44rpx;
-			line-height: 1;
-			padding: 4rpx;
-			color: $font-color-disabled;
-			background: #fff;
-			border-radius: 50px;
+		.price {
+			height: 50rpx;
+			line-height: 50rpx;
 		}
 
-		.item-right {
-			display: flex;
-			flex-direction: column;
-			flex: 1;
-			overflow: hidden;
-			position: relative;
-			padding-left: 30rpx;
-
-			.title,
-			.price {
-				font-size: $font-base + 2rpx;
-				color: $font-color-dark;
-				height: 40rpx;
-				line-height: 40rpx;
-			}
+		.step {
+			margin-top: 20rpx;
+		}
+	}
 
-			.attr {
-				font-size: $font-sm + 2rpx;
-				color: $font-color-light;
-				height: 50rpx;
-				line-height: 50rpx;
-			}
+	.item-num {
+		position: absolute;
+		bottom: 60rpx;
+		right: 30rpx;
 
-			.price {
-				height: 50rpx;
-				line-height: 50rpx;
-			}
+		.munbox {
+			width: 144rpx;
+			height: 44rpx;
 
-			.step {
-				margin-top: 20rpx;
+			input {
+				display: inline-block;
+				text-align: center;
 			}
-		}
-
-		.item-num {
-			position: absolute;
-			bottom: 60rpx;
-			right: 30rpx;
 
-			.munbox {
-				width: 144rpx;
+			image {
+				flex-shrink: 0;
+				width: 44rpx;
 				height: 44rpx;
-
-				input {
-					display: inline-block;
-					text-align: center;
-				}
-
-				image {
-					flex-shrink: 0;
-					width: 44rpx;
-					height: 44rpx;
-				}
 			}
 		}
 	}
-
-	/* 底部栏 */
-	.action-section {
-		/* #ifdef H5 */
-		margin-bottom: 100rpx;
-		/* #endif */
-		position: fixed;
-		bottom: 0;
-		z-index: 1000;
+}
+
+/* 底部栏 */
+.action-section {
+	/* #ifdef H5 */
+	margin-bottom: 100rpx;
+	/* #endif */
+	position: fixed;
+	bottom: 0;
+	z-index: 1000;
+	display: flex;
+	align-items: center;
+	width: 100%;
+	height: 100rpx;
+	background: #ffffff;
+
+	.total-box {
+		width: 490rpx;
+		height: 100rpx;
+		background: #fff6e1;
+		padding-left: 50rpx;
 		display: flex;
 		align-items: center;
-		width: 100%;
-		height: 100rpx;
-		background: #ffffff;
-
-		.total-box {
-			width: 490rpx;
-			height: 100rpx;
-			background: #ecd49e;
-			padding-left: 50rpx;
-			display: flex;
-			align-items: center;
-
-			.bg {
-				position: relative;
-				width: 56rpx;
-				height: 58rpx;
 
-				image {
-					width: 100%;
-					height: 100%;
-				}
+		.bg {
+			position: relative;
+			width: 56rpx;
+			height: 58rpx;
 
-				.num {
-					position: absolute;
-					top: -10rpx;
-					right: -10rpx;
-					min-width: 30rpx;
-					padding: 0 5rpx;
-					display: inline-block;
-					height: 30rpx;
-					background: #f23030;
-					border-radius: 50%;
-					font-size: 24rpx;
-					font-family: PingFang SC;
-					font-weight: bold;
-					color: #ffffff;
-					text-align: center;
-					line-height: 30rpx;
-				}
+			image {
+				width: 100%;
+				height: 100%;
 			}
 
-			.total-price {
+			.num {
+				position: absolute;
+				top: -10rpx;
+				right: -10rpx;
+				min-width: 30rpx;
+				padding: 0 5rpx;
+				display: inline-block;
+				height: 30rpx;
+				background: #ff7144;
+				border-radius: 50%;
 				font-size: 24rpx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #901b21;
-				margin-left: 30rpx;
-
-				text {
-					font-size: 32rpx;
-				}
+				color: #ffffff;
+				text-align: center;
+				line-height: 30rpx;
 			}
 		}
 
-		.confirm-btn {
-			border-radius: 0;
-			width: 260rpx;
-			height: 100rpx;
-			background: #901b21;
-			text-align: center;
-			line-height: 100rpx;
-			font-size: 38rpx;
+		.total-price {
+			font-size: 24rpx;
 			font-family: PingFang SC;
-			font-weight: 500;
-			color: #ffffff;
+			font-weight: bold;
+			color: #ee2f72;
+			margin-left: 30rpx;
+
+			text {
+				font-size: 32rpx;
+			}
 		}
 	}
 
-	/* 复选框选中状态 */
-	.action-section .checkbox.checked,
-	.cart-item .checkbox.checked {
-		color: $base-color;
+	.confirm-btn {
+		border-radius: 0;
+		width: 260rpx;
+		height: 100rpx;
+		background: #ee2f72;
+		text-align: center;
+		line-height: 100rpx;
+		font-size: 38rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #ffffff;
 	}
+}
+
+/* 复选框选中状态 */
+.action-section .checkbox.checked,
+.cart-item .checkbox.checked {
+	color: $base-color;
+}
 </style>

pages/menu/Child/dialogBar.vue

@@ -77,7 +77,7 @@ export default {
 	methods: {
 		loadData() {
 			const obj = this;
-			console.log(this.showItem,'dangqian duixiang ')
+			console.log(this.showItem, 'dangqian duixiang ');
 			goodsDetail({}, this.showItem.id).then(({ data }) => {
 				console.log(data);
 				let goods = data.storeInfo;
@@ -251,7 +251,7 @@ page {
 
 			#span {
 				font-size: 45rpx;
-				color: #901b21;
+				color: #ee2f72;
 				line-height: 70rpx;
 			}
 
@@ -321,7 +321,7 @@ page {
 			width: 279rpx;
 			height: 84rpx;
 			line-height: 84rpx;
-			background-color: #901b21;
+			background-color: #ee2f72;
 			text-align: center;
 			border-radius: 40rpx;
 			color: #ffffff;
@@ -358,7 +358,7 @@ page {
 	top: 0;
 	left: 0;
 	right: 0;
-	
+
 	width: 100%;
 	height: 100%;
 	background-color: rgba(0, 0, 0, 0.4);

pages/money/recharge.vue

@@ -2,7 +2,7 @@
 	<view class="content">
 		<view class="now">
 			<view>当前余额：</view>
-			<view class="now-money">￥{{new_money}}</view>
+			<view class="now-money">￥{{ new_money }}</view>
 		</view>
 		<view class="main-jg"></view>
 		<view class="add-wrapper">
@@ -21,7 +21,7 @@
 		<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 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>
@@ -56,17 +56,16 @@
 			</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 ,userBalance} from '@/api/wallet.js';
+import { rechargeWechat, userBalance } from '@/api/wallet.js';
 // #endif
 // #ifdef MP
-import { rechargeRoutine ,userBalance} from '@/api/wallet.js';
+import { rechargeRoutine, userBalance } from '@/api/wallet.js';
 // #endif
 import { mapState } from 'vuex';
 import { orderData, getUserInfo } from '@/api/user.js';
@@ -82,12 +81,12 @@ export default {
 			addTags: [300, 200, 150, 100, 50],
 			currentIndex: 0,
 			addMoney: 0,
-			isSect: false ,//是否选择微信充值
-			new_money: 0,
+			isSect: false, //是否选择微信充值
+			new_money: 0
 		};
 	},
 	onLoad(options) {
-		this.userBalance()
+		this.userBalance();
 	},
 	computed: {
 		// #ifdef H5
@@ -107,138 +106,137 @@ export default {
 		},
 		// 提交
 		confirm() {
-			if(this.money == 0){
+			if (this.money == 0) {
 				return this.$api.msg('请输入充值金额');
 			}
-			if(!this.isSect) {
+			if (!this.isSect) {
 				return this.$api.msg('请选择支付方式');
 			}
 			let obj = this;
 			if (wx.requestSubscribeMessage) {
-			    wx.requestSubscribeMessage({
-			    	tmplIds: ['HgPU5FHUTwqGNSkJ7IsAP0XkJZV3UUf9fjUWUD3ebZY'],
-			    	success(res) {
-			    		console.log(res,'订阅消息')
-			    	},
-			    	fail(err) {
-			    		console.log(err)
-			    	},
-			    	complete() {
-			    		obj.payLoding = true;
-			    		// #ifdef H5
-			    		rechargeWechat({
-			    			price: obj.money,
-			    			from: obj.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: obj.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?isshow=false'
-			    						});
-			    					}
-			    				});
-			    		
-			    				obj.payLoding = false;
-			    			})
-			    			.catch(e => {
-			    				obj.payLoding = false;
-			    				console.log(e);
-			    			});
-			    		// #endif
-			    	}
-			    })
+				wx.requestSubscribeMessage({
+					tmplIds: ['HgPU5FHUTwqGNSkJ7IsAP0XkJZV3UUf9fjUWUD3ebZY'],
+					success(res) {
+						console.log(res, '订阅消息');
+					},
+					fail(err) {
+						console.log(err);
+					},
+					complete() {
+						obj.payLoding = true;
+						// #ifdef H5
+						rechargeWechat({
+							price: obj.money,
+							from: obj.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: obj.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?isshow=false'
+										});
+									}
+								});
+
+								obj.payLoding = false;
+							})
+							.catch(e => {
+								obj.payLoding = false;
+								console.log(e);
+							});
+						// #endif
+					}
+				});
 			} else {
-			    obj.payLoding = true;
-			    // #ifdef H5
-			    rechargeWechat({
-			    	price: obj.money,
-			    	from: obj.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?isshow=false'
-			    				});
-			    			}
-			    		});
-			    
-			    		obj.payLoding = false;
-			    	})
-			    	.catch(e => {
-			    		obj.payLoding = false;
-			    		console.log(e);
-			    	});
-			    // #endif
+				obj.payLoding = true;
+				// #ifdef H5
+				rechargeWechat({
+					price: obj.money,
+					from: obj.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?isshow=false'
+								});
+							}
+						});
+
+						obj.payLoding = false;
+					})
+					.catch(e => {
+						obj.payLoding = false;
+						console.log(e);
+					});
+				// #endif
 			}
-			
 		},
 		//获取订单列表
 		loadData(source) {
@@ -292,13 +290,13 @@ export default {
 			}
 		},
 		btnClick() {
-			this.isSect = !this.isSect
+			this.isSect = !this.isSect;
 		},
 		userBalance() {
-			userBalance().then( res => {
-				this.new_money = res.data.now_money
-				console.log(res)
-			})
+			userBalance().then(res => {
+				this.new_money = res.data.now_money;
+				console.log(res);
+			});
 		}
 	}
 };
@@ -431,7 +429,7 @@ page {
 	display: flex;
 	justify-content: space-between;
 	line-height: 86rpx;
-	background-color: #fff;
+	background-color: #ffffff;
 	// margin-bottom: 21rpx;
 
 	view {
@@ -443,7 +441,7 @@ page {
 	.now-money {
 		font-size: 32rpx;
 		font-weight: bold;
-		color: #901b21;
+		color: #ee2f72;
 	}
 }
 
@@ -475,7 +473,7 @@ page {
 			height: 30rpx;
 			font-size: 32rpx;
 			font-weight: 500;
-			color: #000;
+			color: #000000;
 			line-height: 40px;
 			text-align: right;
 
@@ -516,7 +514,7 @@ page {
 
 		.action {
 			color: #fff;
-			background-color: #901b21;
+			background-color: #ee2f72;
 		}
 	}
 }
@@ -543,7 +541,7 @@ page {
 	.btn {
 		width: 36rpx;
 		height: 36rpx;
-		border: 4rpx #901b21 solid;
+		border: 4rpx #ee2f72 solid;
 		border-radius: 8rpx 8rpx;
 		image {
 			// display: none;
@@ -555,7 +553,7 @@ page {
 		}
 	}
 	.actiont {
-		border:none;
+		border: none;
 	}
 }
 .main-jg {

pages/money/wallet.vue

@@ -2,16 +2,25 @@
 	<view class="content">
 		<view class="content-money">
 			<view class="money-box">
-				<view class="money"><text class="money-icon">￥</text>{{ userInfo.now_money | getMoneyStyle }}</view>
+				<view class="money">
+					<text class="money-icon">￥</text>
+					{{ userInfo.now_money | getMoneyStyle }}
+				</view>
 			</view>
 		</view>
 		<view class="navbar">
-			<view v-for="(item, index) in navList" :key="index" class="nav-item"
-				:class="{ current: tabCurrentIndex === index }" @click="tabClick(index)" v-if="item.text!=='全部'">
-				{{ item.text }}</view>
+			<view
+				v-for="(item, index) in navList"
+				:key="index"
+				class="nav-item"
+				:class="{ current: tabCurrentIndex === index }"
+				@click="tabClick(index)"
+				v-if="item.text !== '全部'"
+			>
+				{{ item.text }}
+			</view>
 		</view>
-		<swiper :current="tabCurrentIndex" :style="{'height':maxheight+'px'}" class="swiper-box" duration="300"
-			@change="changeTab">
+		<swiper :current="tabCurrentIndex" :style="{ height: maxheight + 'px' }" 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">
 					<!-- 空白页 -->
@@ -41,360 +50,343 @@
 </template>
 
 <script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-	import {
-		spreadCommission,
-		userBalance
-	} from '@/api/wallet.js';
-	import {
+import { mapState, mapMutations } from 'vuex';
+import { spreadCommission, userBalance } from '@/api/wallet.js';
+import { getMoneyStyle } from '@/utils/rocessor.js';
+import { getUserInfo } from '@/api/user.js';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import empty from '@/components/empty';
+export default {
+	filters: {
 		getMoneyStyle
-	} from '@/utils/rocessor.js';
-	import {
-		getUserInfo
-	} from '@/api/user.js';
-	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-	import empty from '@/components/empty';
-	export default {
-		filters: {
-			getMoneyStyle
-		},
-		components: {
-			empty,
-			uniLoadMore
+	},
+	components: {
+		empty,
+		uniLoadMore
+	},
+	onReady() {
+		// 初始化获取页面宽度
+		uni.createSelectorQuery()
+			.select('.content')
+			.fields(
+				{
+					size: true
+				},
+				data => {
+					console.log(data);
+					console.log(Math.floor((data.width / 750) * 300));
+					// 保存头部高度
+					this.maxheight = data.height - Math.floor((data.width / 750) * 570);
+					console.log(this.maxheight);
+				}
+			)
+			.exec();
+	},
+	data() {
+		return {
+			// 头部图高度
+			maxheight: '',
+			tabCurrentIndex: 0,
+			navList: [
+				{
+					state: 2,
+					text: '收入',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10 //每次信息条数
+				},
+				{
+					state: 1,
+					text: '支出',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10 //每次信息条数
+				}
+			],
+			money: ''
+		};
+	},
+	computed: {
+		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
+	},
+	onLoad(options) {},
+	onShow() {
+		this.loadData();
+		// 获取用户余额
+		getUserInfo({})
+			.then(({ data }) => {
+				this.setUserInfo(data);
+				// 获取用户数据完毕后在获取订单数据防止多次跳转到登录页
+			})
+			.catch(e => {
+				console.log(e);
+			});
+	},
+	methods: {
+		...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
+		// 页面跳转
+		navto(e) {
+			uni.navigateTo({
+				url: e
+			});
 		},
-		onReady() {
-			// 初始化获取页面宽度
-			uni.createSelectorQuery()
-				.select('.content')
-				.fields({
-						size: true
-					},
-					data => {
-						console.log(data);
-						console.log(Math.floor((data.width / 750) * 300));
-						// 保存头部高度
-						this.maxheight = data.height - Math.floor((data.width / 750) * 570);
-						console.log(this.maxheight);
+		//获取收入支出信息
+		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';
+
+			spreadCommission(
+				{
+					page: navItem.page,
+					limit: navItem.limit
+				},
+				state
+			)
+				.then(({ data }) => {
+					console.log(data, '获取数据');
+					// if (data.count > 0) {
+					// 	navItem.orderList = navItem.orderList.concat(data.list);
+					// 	console.log(navItem.orderList);
+					// 	navItem.page++;
+					// }
+					if (data.length > 0) {
+						data.forEach(item => {
+							console.log(item.list, '内部列表');
+							navItem.orderList = navItem.orderList.concat(item.list);
+						});
+						// navItem.orderList = navItem.orderList.concat(data[0].list);
+						console.log(navItem.orderList);
+						navItem.page++;
 					}
-				)
-				.exec();
-		},
-		data() {
-			return {
-				// 头部图高度
-				maxheight: '',
-				tabCurrentIndex: 0,
-				navList: [{
-						state: 2,
-						text: '收入',
-						loadingType: 'more',
-						orderList: [],
-						page: 1, //当前页数
-						limit: 10 //每次信息条数
-					},
-					{
-						state: 1,
-						text: '支出',
-						loadingType: 'more',
-						orderList: [],
-						page: 1, //当前页数
-						limit: 10 //每次信息条数
-					},
-
-				],
-				money: ''
-			};
-		},
-		computed: {
-			...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
-		},
-		onLoad(options) {},
-		onShow() {
-			this.loadData();
-			// 获取用户余额
-			getUserInfo({})
-				.then(({
-					data
-				}) => {
-					this.setUserInfo(data);
-					// 获取用户数据完毕后在获取订单数据防止多次跳转到登录页
+					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);
 				});
 		},
-		methods: {
-			...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
-			// 页面跳转
-			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';
-
-				spreadCommission({
-							page: navItem.page,
-							limit: navItem.limit
-						},
-						state
-					)
-					.then(({
-						data
-					}) => {
-						console.log(data,'获取数据');
-						// if (data.count > 0) {
-						// 	navItem.orderList = navItem.orderList.concat(data.list);
-						// 	console.log(navItem.orderList);
-						// 	navItem.page++;
-						// }
-						if (data.length > 0) {
-							data.forEach(item => {
-								console.log(item.list,'内部列表')
-								navItem.orderList = navItem.orderList.concat(item.list)
-							})
-							// navItem.orderList = navItem.orderList.concat(data[0].list);
-							console.log(navItem.orderList);
-							navItem.page++;
-						}
-						if (navItem.limit == data.length) {
-							//判断是否还有数据， 有改为 more， 没有改为noMore
-							navItem.loadingType = 'more';
-							return;
-						} else {
-							//判断是否还有数据， 有改为 more， 没有改为noMore
-							navItem.loadingType = 'noMore';
-						}
-						uni.hideLoading();
-						this.$set(navItem, 'loaded', true);
 
-					})
-					.catch(e => {
-						console.log(e);
-					});
-			},
-
-			//swiper 切换
-			changeTab(e) {
-				this.tabCurrentIndex = e.target.current;
-				this.loadData('tabChange');
-			},
-			//顶部tab点击
-			tabClick(index) {
-				this.tabCurrentIndex = index;
-			},
-			addmoney() {
-				uni.navigateTo({
-					url: '/pages/money/recharge'
-				})
-			}
+		//swiper 切换
+		changeTab(e) {
+			this.tabCurrentIndex = e.target.current;
+			this.loadData('tabChange');
+		},
+		//顶部tab点击
+		tabClick(index) {
+			this.tabCurrentIndex = index;
+		},
+		addmoney() {
+			uni.navigateTo({
+				url: '/pages/money/recharge'
+			});
 		}
-	};
+	}
+};
 </script>
 
 <style lang="scss">
-	page {
-		background: #ffffff;
-		height: 100%;
+page {
+	background: #ffffff;
+	height: 100%;
+}
+
+.content-money {
+	padding-bottom: 30rpx;
+	background: $page-color-base;
+
+	.moneyTx {
+		position: absolute;
+		top: 150rpx;
+		right: 0rpx;
+		width: 150rpx;
+		padding: 10rpx 30rpx;
+		border: 2px solid #ffffff;
+		border-top-left-radius: 99rpx;
+		border-bottom-left-radius: 99rpx;
+		color: #ffffff;
+		line-height: 1;
+		font-size: $font-base;
 	}
 
-	.content-money {
-		padding-bottom: 30rpx;
-		background: $page-color-base;
-
-		.moneyTx {
-			position: absolute;
-			top: 150rpx;
-			right: 0rpx;
-			width: 150rpx;
-			padding: 10rpx 30rpx;
-			border: 2px solid #ffffff;
-			border-top-left-radius: 99rpx;
-			border-bottom-left-radius: 99rpx;
-			color: #ffffff;
-			line-height: 1;
-			font-size: $font-base;
+	.buttom-box {
+		background-color: #ffffff;
+		text-align: center;
+		margin: 0 30rpx;
+		padding: 20rpx 0;
+		border-radius: $border-radius-sm;
+		margin-top: -60rpx;
+
+		.buttom {
+			font-size: $font-lg;
+			flex-grow: 1;
 		}
 
-		.buttom-box {
-			background-color: #ffffff;
-			text-align: center;
-			margin: 0 30rpx;
-			padding: 20rpx 0;
-			border-radius: $border-radius-sm;
-			margin-top: -60rpx;
+		.interval {
+			width: 2px;
+			height: 60rpx;
+			background-color: #eeeeee;
+		}
 
-			.buttom {
-				font-size: $font-lg;
-				flex-grow: 1;
-			}
+		.icon {
+			height: 50rpx;
+			width: 48rpx;
+			margin: 0 auto;
 
-			.interval {
-				width: 2px;
-				height: 60rpx;
-				background-color: #eeeeee;
+			.icon-img {
+				width: 100%;
+				height: 100%;
 			}
+		}
+	}
+}
 
-			.icon {
-				height: 50rpx;
-				width: 48rpx;
-				margin: 0 auto;
+.money-box {
+	background-color: $base-color;
+	height: 265rpx;
+	color: #ffffff;
+	text-align: center;
 
-				.icon-img {
-					width: 100%;
-					height: 100%;
-				}
-			}
-		}
+	.text {
+		padding-top: 147rpx;
+		font-size: $font-sm;
 	}
 
-	.money-box {
-		// background-color: $base-color;
-		// padding-top: var(--status-bar-height);
-		height: 265rpx;
+	.money {
+		padding-top: 100rpx;
+		// margin: auto 0;
+		font-size: 56rpx;
+		font-weight: bold;
 		color: #ffffff;
-		text-align: center;
-		background-image: url(../../static/img/wallertbg.png);
-		background-size: 100%;
-		background-position: bottom;
 
-		.text {
-			padding-top: 147rpx;
-			font-size: $font-sm;
-		}
-
-		.money {
-			padding-top: 100rpx;
-			// margin: auto 0;
-			font-size: 56rpx;
+		.money-icon {
+			font-size: 38rpx;
 			font-weight: bold;
-			color: #FFFFFF;
-
-			.money-icon {
-				font-size: 38rpx;
-				font-weight: bold;
-				color: #FFFFFF;
-			}
+			color: #ffffff;
 		}
 	}
-
-	.navbar {
+}
+
+.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;
-		height: 40px;
-		padding: 0 5px;
-		background: #fff;
-		box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 15px;
+		color: #999999;
 		position: relative;
-		z-index: 10;
-
-		.nav-item {
-			flex: 1;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			height: 100%;
-			font-size: 15px;
-			color: #999999;
-			position: relative;
 
-			&.current {
-				color: $base-color;
+		&.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;
-				}
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 44px;
+				height: 0;
+				border-bottom: 2px solid $base-color;
 			}
 		}
 	}
+}
 
-	// 列表
-
-	.swiper-box {
-		padding-top: 10rpx;
+// 列表
 
-		.order-item {
-			padding: 20rpx 30rpx;
-			line-height: 1.5;
-			position: relative;
-
-			// border-bottom: 1rpx black solid;
-			.title-box {
-				.title {
-					font-size: $font-lg;
-					color: $font-color-base;
-				}
+.swiper-box {
+	padding-top: 10rpx;
 
-				.time {
-					font-size: $font-base;
-					color: $font-color-light;
-				}
-			}
+	.order-item {
+		padding: 20rpx 30rpx;
+		line-height: 1.5;
+		position: relative;
 
-			.money {
-				// color: #fd5b23;
-				color: #901B21;
+		// border-bottom: 1rpx black solid;
+		.title-box {
+			.title {
 				font-size: $font-lg;
+				color: $font-color-base;
 			}
 
-			.jg {
-				width: 701rpx;
-				height: 2rpx;
-				background: #F0F4F8;
-				margin: 0 auto;
-				position: absolute;
-				bottom: 0;
+			.time {
+				font-size: $font-base;
+				color: $font-color-light;
 			}
 		}
-	}
-
-	.list-scroll-content {
-		height: 100%;
-	}
 
-	.content {
-		height: 100%;
+		.money {
+			// color: #fd5b23;
+			color: #901b21;
+			font-size: $font-lg;
+		}
 
-		.empty-content {
-			background-color: #ffffff;
+		.jg {
+			width: 701rpx;
+			height: 2rpx;
+			background: #f0f4f8;
+			margin: 0 auto;
+			position: absolute;
+			bottom: 0;
 		}
 	}
+}
 
-	.add-btn {
-		position: fixed;
-		bottom: 51rpx;
-		right: 39rpx;
-		width: 674rpx;
-		height: 88rpx;
-		background: #901B21;
-		border-radius: 44rpx;
-		color: #fff;
-		text-align: center;
-		line-height: 88rpx;
-		font-size: 34rpx;
+.list-scroll-content {
+	height: 100%;
+}
+
+.content {
+	height: 100%;
+
+	.empty-content {
+		background-color: #ffffff;
 	}
+}
+
+.add-btn {
+	position: fixed;
+	bottom: 51rpx;
+	right: 39rpx;
+	width: 674rpx;
+	height: 88rpx;
+	background: #ee2f72;
+	border-radius: 44rpx;
+	color: #fff;
+	text-align: center;
+	line-height: 88rpx;
+	font-size: 34rpx;
+}
 </style>

pages/set/addressManage.vue

@@ -13,10 +13,10 @@
 			<pickerAddress class="input" @change="onCityClick">{{ addressDetail || '请选择地址' }}</pickerAddress>
 			<text class="iconfont iconlocation"></text>
 		</view>
-		<view class="row b-b" @click="onLatlngClick">
+		<!-- <view class="row b-b" @click="onLatlngClick">
 			<text class="tit">经纬度</text>
-			<text>{{latlng || '请选择经纬度'}}</text>
-		</view>
+			<text>{{ latlng || '请选择经纬度' }}</text>
+		</view> -->
 		<view class="row b-b">
 			<text class="tit">详细地址</text>
 			<input class="input" type="text" v-model="addressData.area" placeholder="街道、小区、楼号、门牌" placeholder-class="placeholder" />
@@ -28,11 +28,11 @@
 				:switch-checked="addressData.default"
 				:show-switch="true"
 				:show-arrow="false"
-				switch-color="#921a23"
+				switch-color="#ee2f72"
 				@switchChange="switchChange"
 			></uni-list-item>
 		</uni-list>
-		<view class="del-btn" v-if="showDel"><text @click="delAddr">删除地址</text></view>
+		<!-- <view class="del-btn" v-if="showDel"><text @click="delAddr">删除地址</text></view> -->
 		<button class="add-btn" @click="confirm">提交</button>
 	</view>
 </template>
@@ -41,7 +41,7 @@
 import uniList from '@/components/uni-list/uni-list.vue';
 import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
 import uniPopup from '@/components/uni-popup/uni-popup.vue';
-import  pickerAddress from '@/components/wangding-pickerAddress/wangding-pickerAddress.vue';
+import pickerAddress from '@/components/wangding-pickerAddress/wangding-pickerAddress.vue';
 import { addressEdit } from '@/api/user.js';
 export default {
 	components: {
@@ -71,11 +71,11 @@ export default {
 	},
 	computed: {
 		latlng() {
-			let str = ''
-			if(this.addressData.latitude !== '' && this.addressData.longitude !== '') {
-				str = this.addressData.latitude + ' , ' + this.addressData.longitude
+			let str = '';
+			if (this.addressData.latitude !== '' && this.addressData.longitude !== '') {
+				str = this.addressData.latitude + ' , ' + this.addressData.longitude;
 			}
-			return str
+			return str;
 		}
 	},
 	onLoad(option) {
@@ -108,7 +108,7 @@ export default {
 	},
 	methods: {
 		// 选中城市切换
-		onCityClick({data}) {
+		onCityClick({ data }) {
 			let address = this.addressData.address;
 			address.province = data[0];
 			address.city = data[1];
@@ -116,21 +116,20 @@ export default {
 			this.addressDetail = data.join('');
 		},
 		onLatlngClick() {
-			let obj = this 
-			console.log('选择经纬度')
+			let obj = this;
+			console.log('选择经纬度');
 			wx.chooseLocation({
 				success(res) {
-					console.log(res,'地图选择')
-					if(res.address == '') {
+					console.log(res, '地图选择');
+					if (res.address == '') {
 						obj.$api.msg('请选择地址');
-					}else {
-						obj.$set(obj.addressData,'latitude',res.latitude)
-						obj.$set(obj.addressData,'longitude',res.longitude)
-						obj.$set(obj,'detail_address',res.address)
+					} else {
+						obj.$set(obj.addressData, 'latitude', res.latitude);
+						obj.$set(obj.addressData, 'longitude', res.longitude);
+						obj.$set(obj, 'detail_address', res.address);
 					}
-					
 				}
-			})
+			});
 		},
 		//地图选择地址
 		chooseLocation() {
@@ -166,22 +165,22 @@ export default {
 				this.$api.msg('请填写门牌号信息');
 				return;
 			}
-			if(!data.latitude || !data.longitude) {
-				this.$api.msg('请选择经纬度');
-				return;
-			}
-			if(obj.detail_address.indexOf(data.address.province) == -1) {
-				this.$api.msg('地址和经纬度不一致');
-				return;
-			}
-			if(obj.detail_address.indexOf(data.address.city) == -1) {
-				this.$api.msg('地址和经纬度不一致');
-				return;
-			}
-			if(obj.detail_address.indexOf(data.address.district) == -1) {
-				this.$api.msg('地址和经纬度不一致');
-				return;
-			}
+			// if (!data.latitude || !data.longitude) {
+			// 	this.$api.msg('请选择经纬度');
+			// 	return;
+			// }
+			// if (obj.detail_address.indexOf(data.address.province) == -1) {
+			// 	this.$api.msg('地址和经纬度不一致');
+			// 	return;
+			// }
+			// if (obj.detail_address.indexOf(data.address.city) == -1) {
+			// 	this.$api.msg('地址和经纬度不一致');
+			// 	return;
+			// }
+			// if (obj.detail_address.indexOf(data.address.district) == -1) {
+			// 	this.$api.msg('地址和经纬度不一致');
+			// 	return;
+			// }
 
 			//this.$api.prePage()获取上一页实例，可直接调用上页所有数据和方法，在App.vue定义
 			addressEdit({
@@ -194,15 +193,15 @@ export default {
 				},
 				detail: data.area,
 				is_default: data.default,
-				id: data.id||"",
-				type:1,
+				id: data.id || '',
+				type: 1,
 				latitude: data.latitude,
 				longitude: data.longitude
 			}).then(function(e) {
 				obj.$api.prePage().refreshList();
 				uni.showToast({
-					title:'提交成功',
-					duration:2000
+					title: '提交成功',
+					duration: 2000
 				});
 				setTimeout(function() {
 					uni.navigateBack();
@@ -280,4 +279,4 @@ page {
 .alert-box {
 	background-color: #ffffff;
 }
-</style>
+</style>

pages/set/point.vue

@@ -1,222 +0,0 @@
-<template>
-	<view class="content b-t">
-		<view class="list" v-for="(item, index) in addressList" :key="index" @click="checkAddress(item)">
-			<view class="wrapper">
-				<view class="address-box">
-					<text class="name">{{ item.name }}</text>
-					<!-- <text class="mobile">{{ item.phone }}</text> -->
-				</view>
-				<view class="u-box">
-					<text class="address">营业时间：{{item.day_time}}</text>
-				</view>
-				<view class="u-box">
-					<text class="address">地址：{{ item.address }} {{ item.detailed_address }}</text>
-				</view>
-				<view class="u-box">
-					<text class="address">电话：{{item.phone}}</text>
-				</view>
-			</view>
-			<view class="buttom">
-				<!-- <view class="default-buttom" @click.stop="defaultUp(item,index)">
-					<view class="iconfont iconroundcheckfill checkbox" :class="{ checked: item.is_default == 1 }"></view>
-					<text class="text">设为默认地址</text>
-				</view> -->
-				<view class="operation">
-					<view @click.stop="addAddress('edit', item)">
-						<text class="iconfont iconedit"></text>
-						<text class="text">编辑</text>
-					</view>
-					<view class="blank"></view>
-					<view @click.stop="delAddress(item)">
-						<text class="iconfont icondelete"></text>
-						<text class="text">删除</text>
-					</view>
-				</view>
-			</view>
-		</view>
-		<button class="add-btn" @click="addAddress('add')">新增自提点</button>
-	</view>
-</template>
-
-<script>
-import { getAddressList,setAddressDefault,addressDel ,getPoint, delPoint} from '@/api/user.js';
-export default {
-	data() {
-		return {
-			source: 0,
-			addressList: []
-		};
-	},
-	onLoad(option) {
-		this.source = option.source||0
-		this.loadAddress();
-	},
-	methods: {
-		// 加载地址
-		loadAddress() {
-			uni.showLoading({
-				title: '加载中...',
-				mask: true
-			})
-			getPoint({
-				page: 1,
-				limit: 100
-			}).then(({data}) => {
-				uni.hideLoading()
-				console.log(data.data,'point++++++++++++++++')
-				this.addressList = data.data;
-			}).catch( err => {
-				uni.hideLoading()
-				console.log(err)
-			})
-		},
-		// 设为默认地址
-		defaultUp(data,ind) {
-			this.addressList=this.addressList.map((e) => {
-				e.is_default=0
-				return e
-			})
-			this.addressList[ind].is_default=1
-			setAddressDefault({
-				id: data.id
-			}).then(({ data }) => {
-				this.loadAddress();
-			}).catch((e) => {
-				console.log(e);
-			});
-		},
-		//删除地址
-		delAddress(item) {
-			delPoint({},item.id).then(({data})=>{
-				this.$api.msg('删除成功')
-			})
-			let s = this.addressList.indexOf(item);
-			this.addressList.splice(s, 1);
-		},
-		//选择地址
-		checkAddress(item) {
-			if (this.source == 1) {
-				//this.$api.prePage()获取上一页实例，在App.vue定义
-				this.$api.prePage().addressData = item;
-				console.log(this.$api.prePage().addressData,'99999999+++++++++99999999999')
-				uni.navigateBack();
-			}
-		},
-		// 添加地址
-		addAddress(type, item) {
-			uni.navigateTo({
-				url: `/pages/set/pointManage?type=${type}&data=${JSON.stringify(item)}`
-			});
-		},
-		//添加或修改成功之后回调
-		refreshList() {
-			// 重新加载地址
-			this.loadAddress()
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page {
-	padding-bottom: 120rpx;
-	padding-top: 20rpx;
-	background-color: $page-color-base;
-}
-.content {
-	position: relative;
-}
-.list {
-	align-items: center;
-	padding: 20rpx 30rpx;
-	background: #fff;
-	margin: 20rpx;
-	margin-top: 0;
-	.buttom {
-		display: flex;
-		align-items: center;
-		justify-content: flex-end;
-		padding-top: 10rpx;
-		.checkbox {
-			font-size: 44rpx;
-			line-height: 1;
-			padding: 4rpx;
-			color: $font-color-disabled;
-			background: #fff;
-			border-radius: 50px;
-		}
-		.checkbox.checked {
-			color: $base-color;
-		}
-		.default-buttom {
-			display: flex;
-			align-items: center;
-		}
-		.operation {
-			display: flex;
-			align-items: center;
-			.blank {
-				width: 30rpx;
-			}
-		}
-		.text {
-			padding-left: 10rpx;
-			font-size: 24rpx;
-			color: #666666;
-		}
-	}
-}
-.wrapper {
-	display: flex;
-	flex-direction: column;
-	flex: 1;
-	border-bottom: 1px solid #f0f0f0;
-	padding-bottom: 20rpx;
-}
-.address-box {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	.address {
-		font-size: $font-base + 2rpx;
-		color: $font-color-dark;
-	}
-	.mobile {
-		font-size: $font-base;
-		color: rgba(51, 51, 51, 1);
-	}
-}
-.u-box {
-	font-size: $font-base;
-	color: $font-color-light;
-	margin-top: 16rpx;
-	.name {
-		margin-right: 30rpx;
-	}
-}
-.icon-bianji {
-	display: flex;
-	align-items: center;
-	height: 80rpx;
-	font-size: 40rpx;
-	color: $font-color-light;
-	padding-left: 30rpx;
-}
-
-.add-btn {
-	position: fixed;
-	left: 30rpx;
-	right: 30rpx;
-	bottom: 16rpx;
-	z-index: 95;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	width: 690rpx;
-	height: 80rpx;
-	font-size: $font-lg;
-	color: #fff;
-	background-color: $base-color;
-	border-radius: 10rpx;
-}
-</style>

pages/set/pointManage.vue

@@ -1,263 +0,0 @@
-<template>
-	<view class="content">
-		<view class="row b-b">
-			<text class="tit">自提点名称</text>
-			<input class="input" type="text" v-model="name" placeholder="请请填写自提点名称" placeholder-class="placeholder" />
-		</view>
-		<view class="row b-b">
-			<text class="tit">联系电话</text>
-			<input class="input" type="number" v-model="phone" placeholder="请填写联系电话" placeholder-class="placeholder" />
-		</view>
-		<view class="row b-b">
-			<text class="tit">自提点地址</text>
-			<pickerAddress class="input" @change="onCityClick">{{ address || '请选择自提地址' }}</pickerAddress>
-			<text class="iconfont iconlocation"></text>
-		</view>
-		<view class="row b-b">
-			<text class="tit">详细地址</text>
-			<input class="input" type="text" v-model="detailed_address" placeholder="请填写详细地址" placeholder-class="placeholder" />
-		</view>
-		<view class="row b-b" @click="chooseLocation">
-			<text class="tit">经纬度</text>
-			<input class="input" type="text" v-model="latlng" placeholder="请输入经纬度" placeholder-class="placeholder" />
-		</view>
-		<view class="row b-b">
-			<text class="tit">营业开始时间</text>
-			<picker mode="time" :value="time"  @change="bindBgTimeChange"  class="input">
-				<view class="uni-input">{{ bgTime }}</view>
-			</picker>
-		</view>
-		<view class="row b-b">
-			<text class="tit">营业结束时间</text>
-			<picker mode="time" :value="time" @change="bindEdTimeChange"  class="input">
-				<view class="uni-input">{{ edTime }}</view>
-			</picker>
-		</view>
-		<uni-list class="margin-t-20">
-			<uni-list-item title="是否显示" :switch-checked="show" :show-switch="true" :show-arrow="false" switch-color="#921a23" @switchChange="switchChange"></uni-list-item>
-		</uni-list>
-		<view class="del-btn" v-if="showDel"><text @click="delAddr">删除地址</text></view>
-		<button class="add-btn" @click="confirm">提交</button>
-	</view>
-</template>
-
-<script>
-import uniList from '@/components/uni-list/uni-list.vue';
-import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
-import pickerAddress from '@/components/wangding-pickerAddress/wangding-pickerAddress.vue';
-import { addressEdit, editPoint } from '@/api/user.js';
-export default {
-	components: {
-		uniList,
-		uniListItem,
-		pickerAddress,
-		uniPopup
-	},
-	data() {
-		return {
-			name: '', //自提点名称
-			phone: '', //自提点电话
-			show: true, //是否显示
-			addressDetail: '',
-			showDel: false,
-			latlng: '',
-			detailed_address: '', //用户自填详细字段
-			address: '', //【省、市、区】
-			point_id: 0, //自提点id
-			bgTime: '00:00', //自提点开始营业时间
-			edTime: '00:00', //自提点结束营业时间
-			time: '00:00',
-			timeOptions: [
-				['00', '01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23'],
-				['00', '05', '10', '15', '20', '25', '30', '35', '40', '45', '50', '55']
-			]
-		};
-	},
-	onLoad(option) {
-		let title = '新增自提点';
-		if (option.type === 'edit') {
-			title = '编辑自提点';
-			let data = JSON.parse(option.data);
-			console.log(data);
-
-			this.name = data.name;
-			this.show = data.is_show == 1 ? true : false;
-			this.latlng = data.latitude + ',' + data.longitude;
-			this.detailed_address = data.detailed_address;
-			this.address = data.address;
-			this.phone = data.phone;
-			this.point_id = data.id;
-			let time = data.day_time
-			let arr = time.split(' - ')
-			this.bgTime = arr[0].slice(0,5)
-			this.edTime = arr[1].slice(0,5)
-			console.log(arr,'arr++++++++++++++++++++++++')
-		}
-		this.manageType = option.type;
-		uni.setNavigationBarTitle({
-			title
-		});
-	},
-	methods: {
-		// 选中城市切换
-		onCityClick({ data }) {
-			// let address = this.detailed_address;
-			let province = data[0];
-			let city = data[1];
-			let district = data[2];
-			this.address = province + ',' + city + ',' + district;
-		},
-		//地图选择地址
-		chooseLocation() {
-			uni.chooseLocation({
-				success: res => {
-					console.log('纬度：' + res.latitude);
-					console.log('经度：' + res.longitude);
-					this.latlng = res.latitude + ',' + res.longitude;
-				}
-			});
-		},
-		// 设置是否为显示
-		switchChange(e) {
-			this.show = e.value;
-		},
-		//提交
-		confirm() {
-			let obj = this;
-			if (!obj.name) {
-				this.$api.msg('请填写自提点名称');
-				return;
-			}
-			if (!/(^1[3|4|5|7|8][0-9]{9}$)/.test(obj.phone)) {
-				this.$api.msg('请输入正确的手机号码');
-				return;
-			}
-			if (!obj.address) {
-				this.$api.msg('请选择地址');
-				return;
-			}
-			if (!obj.latlng) {
-				this.$api.msg('请输入经纬度');
-				return;
-			}
-			let bgH = obj.bgTime.slice(0,2)*1
-			let edH = obj.edTime.slice(0,2)*1
-			// if(bgH > edH) {
-			// 	this.$api.msg('请输入正确的经营时间')
-			// 	return
-			// }else if( bgH == edH) {
-			// 	let bgM = obj.bgTime.slice(3,5)*1
-			// 	let edM = obj.edTime.slice(3,5)*1
-			// 	if(bgM > edM) {
-			// 		this.$api.msg('请输入正确的经营时间')
-			// 		return
-			// 	}
-			// }
-			uni.showLoading({
-				title: '提交中...',
-				mask: true
-			})
-			//this.$api.prePage()获取上一页实例，可直接调用上页所有数据和方法，在App.vue定义
-			editPoint(
-				{
-					name: obj.name,
-					phone: obj.phone,
-					address: obj.address.split(','),
-					detailed_address: obj.detailed_address,
-					latlng: obj.latlng,
-					is_show: obj.show ? 1 : 0,
-					day_time: [obj.bgTime+':00',obj.edTime+':00']
-				},
-				obj.point_id
-			).then(function(e) {
-				uni.hideLoading()
-				obj.$api.prePage().refreshList();
-				uni.showToast({
-					title: '提交成功',
-					duration: 2000
-				});
-				setTimeout(function() {
-					uni.navigateBack();
-				}, 800);
-			})
-		},
-		bindBgTimeChange(e) {
-			console.log(e,'shijian')
-			this.bgTime = e.detail.value
-		},
-		bindEdTimeChange(e) {
-			this.edTime = e.detail.value
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page {
-	background: $page-color-base;
-	padding-top: 16rpx;
-}
-
-.row {
-	display: flex;
-	align-items: center;
-	position: relative;
-	padding: 0 30rpx;
-	height: 110rpx;
-	background: #fff;
-
-	.tit {
-		flex-shrink: 0;
-		width: 300rpx;
-		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;
-	}
-}
-.default-row {
-	margin-top: 16rpx;
-	.tit {
-		flex: 1;
-	}
-	switch {
-		transform: translateX(16rpx) scale(0.9);
-	}
-}
-.del-btn {
-	width: 750rpx;
-	height: 99rpx;
-	margin-top: 28rpx;
-	font-size: 30rpx;
-	font-weight: 500;
-	color: #901b21;
-	background-color: #fff;
-	line-height: 99rpx;
-	padding-left: 42rpx;
-}
-.add-btn {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	width: 690rpx;
-	height: 80rpx;
-	margin: 60rpx auto;
-	font-size: $font-lg;
-	color: #fff;
-	background-color: $base-color;
-	border-radius: 10rpx;
-	// box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
-}
-
-.alert-box {
-	background-color: #ffffff;
-}
-</style>

pages/set/set.vue

@@ -1,28 +1,4 @@
 <template>
-	<!-- 	<view class="container">
-		<uni-list>
-		    <uni-list-item title="个人资料" @click="navTo('/pages/set/userinfo')" ></uni-list-item>
-			<uni-list-item title="修改密码" @click="navTo('/pages/set/password')" ></uni-list-item>
-		    <uni-list-item title="实名认证" @click="navTo('/pages/set/phone')" ></uni-list-item>
-		    <uni-list-item title="收货地址" @click="navTo('/pages/set/address')" ></uni-list-item>
-		</uni-list>
-		<uni-list class="margin-t-20">
-		    <uni-list-item title="消息推送" :switch-checked='true' :show-switch="true" :show-arrow="false" switch-color='#5dbc7c'  @switchChange='switchChange'> 
-			</uni-list-item>
-		</uni-list>
-		
-		<uni-list class="margin-t-20">
-		    <uni-list-item title="清除缓存" ></uni-list-item>
-		    <uni-list-item title="检查更新" >
-				<template slot="right">
-					当前版本 1.0.3
-				</template>
-			</uni-list-item>
-		</uni-list>
-		<view class="list-cell log-out-btn" @click="toLogout">
-			<text class="cell-tit">退出登录</text>
-		</view>
-	</view> -->
 	<view class="container">
 		<view class="row b-b flex jg">
 			<text class="tit">头像</text>
@@ -38,269 +14,160 @@
 		</view>
 		<view class="row b-b flex">
 			<text class="tit">用户账号</text>
-			<input class="input" v-model="userInfo.account || userInfo.phone" type="number" disabled="true"
-				placeholder-class="placeholder" />
+			<input class="input" v-model="userInfo.account || userInfo.phone" type="number" disabled="true" placeholder-class="placeholder" />
 		</view>
 		<view class="submit-box ">
 			<view class="submit" @click="edit">确认修改</view>
-			<!-- <view class="out" @click="toLogout">退出登录</view> -->
 			<view class="submit submit1" @click="toLogout">退出登录</view>
 		</view>
-
 	</view>
 </template>
 
 <script>
-	// import uniList from "@/components/uni-list/uni-list.vue"
-	// import uniListItem from "@/components/uni-list-item/uni-list-item.vue"
-	// import { logout } from '@/api/set.js';
-	// import {  
-	//     mapMutations  
-	// } from 'vuex';
-	// export default {
-	// 	components: {
-	// 		uniList,uniListItem
-	// 	},
-	// 	data() {
-	// 		return {
-
-	// 		};
-	// 	},
-	// 	methods:{
-	// 		...mapMutations('user',['logout']),
-	// 		navTo(url){
-	// 			uni.navigateTo({
-	// 				url:url
-	// 			})
-	// 		},
-	// 		//退出登录
-	// 		toLogout(){
-	// 			let obj = this;
-	// 			uni.showModal({
-	// 			    content: '确定要退出登录么',
-	// 			    success: (e)=>{
-	// 			    	if(e.confirm){
-	// 						logout({}).then((e) => {
-	// 							uni.navigateBack();
-	// 						}).catch((e) => {
-	// 							console.log(e);
-	// 						})
-	// 			    		obj.logout();
-	// 			    	}
-	// 			    }
-	// 			});
-	// 		},
-	// 		//switch切换触发方法
-	// 		switchChange(e){
-	// 			console.log(e);
-	// 			let statusTip = e.value ? '打开': '关闭';
-	// 			this.$api.msg(`${statusTip}消息推送`);
-	// 		},
-
-	// 	}
-	// }
-	import uniList from '@/components/uni-list/uni-list.vue';
-	import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-	import {
-		logout
-	} from '@/api/set.js';
-
-	import {
-		uploads,
-		edit,
-		upload
-	} from '@/api/user.js';
-	export default {
-		components: {
-			uniList,
-			uniListItem
-		},
-		data() {
-			return {
-				// nickName:'李淡淡',
-				// id:'HFBNXISN',
-				// account:'13745262356',
-				userInfo: {},
-				pics: []
-			};
-		},
-		onLoad() {
-			this.userInfo = uni.getStorageSync('userInfo') || '';
-			console.log(this.userInfo)
-		},
-		methods: {
-			...mapMutations('user', ['logout']),
-			//退出登录
-			toLogout() {
-				let obj = this;
-				uni.showModal({
-					content: '确定要退出登录么',
-					success: e => {
-						if (e.confirm) {
-							logout({}).then(e => {
-									obj.logout();
-									uni.switchTab({
-										url: '/pages/index/index'
-									})
-								})
-								.catch(e => {
-									console.log(e);
+import uniList from '@/components/uni-list/uni-list.vue';
+import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
+import { mapState, mapMutations } from 'vuex';
+import { logout } from '@/api/set.js';
+
+import { uploads, edit, upload } from '@/api/user.js';
+export default {
+	components: {
+		uniList,
+		uniListItem
+	},
+	data() {
+		return {
+			userInfo: {},
+			pics: []
+		};
+	},
+	onLoad() {
+		this.userInfo = uni.getStorageSync('userInfo') || '';
+		console.log(this.userInfo);
+	},
+	methods: {
+		...mapMutations('user', ['logout']),
+		//退出登录
+		toLogout() {
+			let obj = this;
+			uni.showModal({
+				content: '确定要退出登录么',
+				success: e => {
+					if (e.confirm) {
+						logout({})
+							.then(e => {
+								obj.logout();
+								uni.switchTab({
+									url: '/pages/index/index'
 								});
-						}
+							})
+							.catch(e => {
+								console.log(e);
+							});
 					}
-				});
-			},
-			imgsub() {
-				let obj = this
-				// 		console.log('上传头像')
-				// this.$util.uploadImageOne('upload/image', function(res) {
-				// 	console.log('------',res);
-				// 	// this.pics.push(res.data.pathreplace(/http:\/\/mer.crmeb.net/,'http://zccy.liuniu946.com'));
-				// 	obj.userInfo.avatar = res.data.path.replace(/http:\/\/mer.crmeb.net/,'http://zccy.frp.liuniu946.com')
-				// 	// obj.$set(this, 'pics', this.pics);
-				// 	// obj.$set(this, 'extract_pic', this.pics[0])
-				// });
-				// uploads({
-				// 	filename: ''
-				// }).then(data => {
-				// 	console.log("data",data);
-				// 	this.userInfo.avatar = data[0].url;
-				// })
-				upload({
-					filename: ''
-				}).then(res => {
-					console.log(res, '上传图片')
-					console.log(res[0].url)
-					obj.userInfo.avatar = res[0].url
-					// console.log(obj.userInfo.avatar)
-				});
-			},
-			edit() {
-				const that = this;
-				uni.showLoading({
-					title: '提交中...',
-					mask: true
-				})
-				edit({
-					avatar: this.userInfo.avatar,
-					nickname: this.userInfo.nickname
-				}).then(e => {
-					uni.hideLoading()
+				}
+			});
+		},
+		imgsub() {
+			let obj = this;
+			upload({
+				filename: ''
+			}).then(res => {
+				console.log(res, '上传图片');
+				console.log(res[0].url);
+				obj.userInfo.avatar = res[0].url;
+			});
+		},
+		edit() {
+			const that = this;
+			uni.showLoading({
+				title: '提交中...',
+				mask: true
+			});
+			edit({
+				avatar: this.userInfo.avatar,
+				nickname: this.userInfo.nickname
+			})
+				.then(e => {
+					uni.hideLoading();
 					that.$api.msg('修改成功');
 					setTimeout(() => {
 						uni.switchTab({
 							url: '/pages/user/user'
 						});
 					}, 1000);
-				}).catch(e => {
+				})
+				.catch(e => {
 					console.log(e);
 					that.$api.msg('修改失败');
-				})
-			}
+				});
 		}
-	};
+	}
+};
 </script>
 
-<style lang='scss'>
-	/* page{
-		background: $page-color-base;
+<style lang="scss">
+page {
+	background-color: #f3f3f3;
+	min-height: 100%;
+
+	.container {
+		height: 100%;
 	}
-	.list-cell{
-		display:flex;
-		align-items:baseline;
-		padding: 20rpx $page-row-spacing;
-		line-height:60rpx;
-		position:relative;
-		background: #fff;
-		justify-content: center;
-		&.log-out-btn{
-			margin-top: 40rpx;
-			.cell-tit{
-				color: $uni-color-primary;
-				text-align: center;
-				margin-right: 0;
-			}
-		}
-		.cell-tit{
-			flex: 1;
-			font-size: $font-base + 2rpx;
-			color: $font-color-dark;
-			margin-right:10rpx;
-		}
-		.cell-tip{
-			font-size: $font-base;
-			color: $font-color-light;
-		}
-		switch{
-			transform: translateX(16rpx) scale(.84);
-		}
-	} */
-	page {
-		background-color: #f3f3f3;
-		min-height: 100%;
+}
 
-		.container {
-			height: 100%;
+.row {
+	background-color: #fff;
+	padding: 42rpx 25rpx;
+	font-size: 30rpx;
+	color: #333333;
 
-		}
+	image {
+		width: 80rpx;
+		height: 80rpx;
+		border-radius: 50%;
 	}
 
-	.row {
-		background-color: #fff;
-		padding: 42rpx 25rpx;
-		font-size: 30rpx;
+	.input {
+		text-align: right;
 		color: #333333;
-
-		image {
-			width: 80rpx;
-			height: 80rpx;
-			border-radius: 50%;
-		}
-
-		.input {
-			text-align: right;
-			color: #333333;
-		}
 	}
+}
 
-	.submit-box {
-		padding-top: 157rpx;
-
-		.submit {
-			margin: 40rpx auto;
-			width: 560rpx;
-			background-color: #901b21;
-			color: #FFFFFF;
-			text-align: center;
-			padding: 26rpx 0rpx;
-			border-radius: 50rpx;
-		}
+.submit-box {
+	padding-top: 157rpx;
 
-		.submit1 {
-			background-color: #FFFFFF;
-			color:#901b21 ;
-			border: 1px solid #901b21;
-		}
-	}
-
-	.jg {
-		margin-bottom: 20rpx;
+	.submit {
+		margin: 40rpx auto;
+		width: 560rpx;
+		background-color: #ee2f72;
+		color: #ffffff;
+		text-align: center;
+		padding: 26rpx 0rpx;
+		border-radius: 50rpx;
 	}
 
-	.out {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		margin: 0 auto 30rpx;
-		width: 560rpx;
-		height: 80rpx;
-		border: 1px solid #58BAB0;
-		background: #FFFFFF;
-		border-radius: 40px;
-		color: #58BAB0;
+	.submit1 {
+		background-color: #ffffff;
+		color: #ee2f72;
+		border: 1px solid #ee2f72;
 	}
+}
+
+.jg {
+	margin-bottom: 20rpx;
+}
+
+.out {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	margin: 0 auto 30rpx;
+	width: 560rpx;
+	height: 80rpx;
+	border: 1px solid #58bab0;
+	background: #ffffff;
+	border-radius: 40px;
+	color: #58bab0;
+}
 </style>

pages/tool/entity.vue

@@ -1,327 +0,0 @@
-<template>
-	<view class="content">
-		<scroll-view scroll-y="true" :style="{'height': height}" class="stk-list-wrap">
-			<view class="" style="height: 20rpx;"></view>
-			<view class="stk-wrap" v-for="item in list">
-				<image src="https://zccy.liuniu946.com/static/img/stk.png" mode="" class="stk-bg"></image>
-				<view class="stk-name">
-					<image src="/static/icon/stk-logo.png" mode=""></image>
-					{{item.name}}
-				</view>
-				<view class="stk-info flex">
-					<view class="info-no">
-						卡号：<text>{{item.code}}</text>
-					</view>
-					<view class="info-state">
-						{{type==1?'已发放':'已核销'}}
-					</view>
-				</view>
-			</view>
-			<uni-load-more :status="loadingType"></uni-load-more>
-			<view class="btm-btn">
-				<view class="btn" @click="opentc">
-					{{type==1?'实体卡发放':'实体卡核销'}}
-				</view>
-			</view>
-		</scroll-view>
-		<uni-popup ref="popupStk" type="center">
-			<view class="stk-tc">
-				<image src="https://zccy.liuniu946.com/static/img/gift-bg.png" mode="" class="gift-bg"></image>
-				<view class="gift-bg-mb"></view>
-				<image src="https://zccy.liuniu946.com/static/img/stk-gift.png" mode="" class="gift"></image>
-				<view class="" style="height: 145rpx;">
-					
-				</view>
-				<view class="tc-tit">
-					{{type==1?'实体卡发放':'实体卡核销'}}
-				</view>
-				<input type="text" class="tc-inp" placeholder="请输入卡号" v-model="code">
-				<input type="text" class="tc-inp tc-inp-km" placeholder="请输入卡密" v-model="password" v-if="type == 2">
-				<view class="tc-btn" @click="gonew">
-					{{type==1?'立即发放':'立即核销'}}
-				</view>
-				<view class="" style="height: 50rpx;">
-					
-				</view>
-			</view>
-		</uni-popup>
-	</view>
-</template>
-
-<script>
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
-	import { sendStk, checkStk, getStk } from '@/api/user.js'
-	export default {
-		components: {
-			uniPopup
-		},
-		data() {
-			return {
-				height: '',
-				type: 0,
-				code: '',//卡号
-				password: '',//卡密
-				uping: false,
-				loaded: false,
-				loadingType: 'more',
-				page: 1,
-				limit: 100,
-				list: []
-			}
-		},
-		onLoad(opt) {
-			this.type = opt.type
-			if (opt.type == 1) {
-				uni.setNavigationBarTitle({
-					title: '发放实体卡'
-				})
-				
-			} else {
-				uni.setNavigationBarTitle({
-					title: '核销实体卡'
-				})
-			}
-			this.getBase()
-		},
-		onShow() {
-			console.log(this.$store.state.baseURL)
-		},
-		onReachBottom() {
-			this.getBase()
-		},
-		onReady(res) {
-			var obj = this;
-			uni.getSystemInfo({
-				success: resu => {
-					const query = uni.createSelectorQuery();
-					query.select('.stk-list-wrap').boundingClientRect();
-					query.exec(function(res) {
-						obj.height = resu.windowHeight - res[0].top + 'px';
-					});
-				},
-				fail: res => {}
-			});
-		},
-		methods: {
-			getBase(type) {
-				let obj = this
-				if(type == 'reload') {
-					obj.page = 1,
-					obj.loadingType = 'more'
-					obj.list = []
-				}
-				if(obj.loadingType == 'loading' || obj.loadingType == 'noMore') {
-					return
-				}
-				obj.loadingType = 'loading'
-				getStk({
-					page: obj.page,
-					limit: obj.limit,
-					status: obj.type
-				}).then(res => {
-					console.log(res)
-					obj.list = obj.list.concat(res.data.list.list.data)
-					if(res.data.list.list.data.length == obj.limit) {
-						obj.loadingType = 'more'
-					}else {
-						obj.loadingType = 'noMore'
-					}
-				})
-			},
-			opentc() {
-				this.$refs.popupStk.open()
-			},
-			gonew() {
-				let obj = this
-				if(obj.uping) {
-					return
-				}
-				if(obj.code == '') {
-					return obj.$api.msg('请输入卡号')
-				}
-				if(obj.type == 2) {
-					if(obj.password == '') {
-						return obj.$api.msg('请输入卡密')
-					}
-				}
-				obj.uping = true
-				if(obj.type == 1) {
-					sendStk({
-						code: obj.code
-					}).then(res => {
-						obj.$refs.popupStk.close()
-						obj.code = ''
-						obj.password = ''
-						obj.getBase('reload')
-						uni.showToast({
-							title:'发放成功',
-							duration:2000
-						});
-						obj.uping = false
-					}).catch(err => {
-						obj.uping = false
-					})
-				}else if(obj.type == 2) {
-					checkStk({
-						code: obj.code,
-						password: obj.password
-					}).then(res => {
-						obj.$refs.popupStk.close()
-						obj.code = ''
-						obj.password = ''
-						obj.getBase('reload')
-						uni.showToast({
-							title:'核销成功',
-							duration:2000
-						});
-						obj.uping = false
-					}).catch(err => {
-						obj.uping = false
-					})
-				}
-				
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.stk-list-wrap {
-		position: relative;
-		padding-bottom: 156rpx;
-
-		.btm-btn {
-			// background-color: #f8f8f8;
-			position: fixed;
-			height: 156rpx;
-			bottom: 0;
-			width: 750rpx;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-
-			.btn {
-				border-radius: 20rpx;
-				background-color: #901b21;
-				color: #fff;
-				width: 622rpx;
-				height: 86rpx;
-				line-height: 86rpx;
-				text-align: center;
-			}
-		}
-
-		.stk-wrap {
-			width: 705rpx;
-			height: 204rpx;
-			margin: 0 auto 20rpx;
-			position: relative;
-
-			.stk-bg {
-				width: 705rpx;
-				height: 204rpx;
-				position: absolute;
-				top: 0;
-			}
-
-			.stk-name {
-				position: absolute;
-				display: flex;
-				height: 40rpx;
-				align-items: center;
-				font-size: 36rpx;
-				color: #6b4713;
-				font-weight: bold;
-				top: 46rpx;
-				left: 24rpx;
-
-				image {
-					width: 39rpx;
-					height: 36rpx;
-					margin-right: 10rpx;
-				}
-			}
-
-			.stk-info {
-				position: absolute;
-				bottom: 0;
-				height: 90rpx;
-				width: 705rpx;
-				padding: 0 24rpx;
-				font-size: 26rpx;
-
-				.info-no {
-					text {
-						color: #8f1b1f;
-					}
-				}
-
-				// background-color: red;
-			}
-		}
-	}
-
-	.stk-tc {
-		width: 560rpx;
-		// height: 550rpx;
-		background-color: #fff;
-		border-radius: 20rpx;
-		position: relative;
-		.gift, .gift-bg, .gift-bg-mb,  {
-			position: absolute;
-			left: 0;
-			right: 0;
-			margin: auto;
-		}
-		.tc-tit, .tc-inp, .tc-btn {
-			margin: auto;
-		}
-		.gift {
-			top: -93rpx;
-			width: 177rpx;
-			height: 186rpx;
-		}
-		.gift-bg-mb {
-			top: 0;
-			width: 456rpx;
-			height: 90rpx;
-			background-color: #fff;
-		}
-		.gift-bg {
-			top: -90rpx;
-			width: 456rpx;
-			height: 180rpx;
-		}
-		.tc-tit {
-			font-weight: bold;
-			color: #333333;
-			font-size: 36rpx;
-			text-align: center;
-		}
-		.tc-inp {
-			display: block;
-			margin: 20rpx auto;
-			width: 440rpx;
-			height: 70rpx;
-			background-color: #f5f5f5;
-			top: 210rpx;
-			padding-left: 20rpx;
-			border-radius: 15rpx;
-			font-size: 32rpx;
-		}
-		.tc-inp-km {
-			top: 305rpx;
-		}
-		.tc-btn {
-			width: 405rpx;
-			height: 86rpx;
-			margin-top: 45rpx;
-			background-color: #901b21;
-			border-radius: 43rpx;
-			text-align: center;
-			color: #fff;
-			line-height: 86rpx;
-			font-size: 36rpx;
-		}
-	}
-</style>

pages/tool/phoneBill.vue

@@ -1,330 +0,0 @@
-<template>
-	<view class="content">
-		<view class="cz-top">
-			<!-- 背景半圆 -->
-			<view class="top-bg"></view>
-			<view class="top-tit">
-				充值号码
-			</view>
-			<input type="number" class="top-phone" placeholder="请输入充值号码" v-model="phone">
-		</view>
-		<view class="tc-wrap">
-			<view class="tc-tit">
-				请选择充值套餐
-			</view>
-			<view class="tc-list flex">
-				<view class="list-item flex" v-for="(item,index) in list" :class="{'item-action': index == actionIndex}" @click="choosTc(item,index)">
-					<view class="item-val">
-						{{item.get_money}}<text class="dw">元</text>
-					</view>
-					<view class="item-price">
-						售价{{item.price}}元
-					</view>
-				</view>
-			</view>
-			<view class="tc-pay flex">
-				<view class="pay-tit">
-					应付金额
-				</view>
-				<view class="pay-price">
-					￥{{action.price}}元
-				</view>
-			</view>
-		</view>
-		<view class="pay-type-list">
-			<view class="type-item b-b" @click="changePayType(1)">
-				<text class="icon iconfont iconweixin"></text>
-				<view class="con">
-					<text class="tit">微信支付</text>
-				</view>
-				<label class="radio">
-					<radio value="" color="#921a23" :checked="payType == 1"></radio>
-				</label>
-			</view>
-			<!-- <view class="type-item" @click="changePayType(3)">
-				<text class="icon iconfont iconyue"></text>
-				<view class="con">
-					<text class="tit">余额支付</text>
-				</view>
-				<label class="radio">
-					<radio value="" color="#921a23" :checked="payType == 3"></radio>
-				</label>
-			</view> -->
-		</view>
-		<view class="sub-btn" @click="gopay">
-			立即充值
-		</view>
-	</view>
-</template>
-
-<script>
-	import { getPhoneTc, phonePay } from '@/api/index.js'
-	export default {
-		data() {
-			return {
-				action: {},
-				list: [],
-				phone: '',
-				payType: 1, //支付类型 1-》微信 3-》余额
-				actionIndex: 0,
-				payMoney: 0,
-				loaded: false,//是否提交中
-			}
-		},
-		onLoad() {
-			this.getTc()
-		},
-		onShow() {
-
-		},
-		onReachBottom() {
-
-		},
-		onReady() {
-
-		},
-		methods: {
-			// 选择支付方式
-			changePayType(index) {
-				this.payType = index
-			},
-			// 选择套餐
-			choosTc(item,index) {
-				this.actionIndex = index
-				this.action = item
-			},
-			gopay() {
-				let obj = this
-				if(obj.loaded) {
-					return
-				}
-				if(obj.phone == '') {
-					return obj.$api.msg('请输入充值号码')
-				}
-				if (!/(^1[2|3|4|5|6|7|8|9][0-9]{9}$)/.test(obj.phone)) {
-					return obj.$api.msg('请输入正确的手机号码')
-					
-				}
-				obj.loaded = true
-				phonePay({
-					rechar_id: obj.action.id,
-					mobile: obj.phone
-				}).then(res => {
-					console.log(res)
-					let da = res.data
-					let data = {
-						// #ifdef H5
-						timestamp: da.timestamp,
-						// #endif
-						// #ifdef MP
-						timeStamp: da.timestamp,
-						// #endif
-						nonceStr: da.nonceStr,
-						package: da.package,
-						signType: da.signType,
-						paySign: da.paySign,
-						success: function(res) {
-							// obj.paySuccessTo();
-							uni.showToast({
-								title:'充值成功',
-								duration:2000
-							});
-							obj.loaded = false
-						},
-						fail: () => {
-							obj.loaded = false
-						},
-					};
-					wx.requestPayment(data);
-				})
-				
-			},
-			// 获取套餐
-			getTc() {
-				getPhoneTc().then(res => {
-					console.log(res)
-					this.list = res.data.recharge_quota
-					this.action = res.data.recharge_quota[0]
-				})
-			},
-		}
-	}
-</script>
-
-<style lang="scss">
-	.cz-top {
-		height: 450rpx;
-		width: 750rpx;
-		// overflow: hidden;
-		position: relative;
-
-		.top-bg {
-			position: absolute;
-			bottom: 0;
-			left: -825rpx;
-			margin: auto;
-			width: 2400rpx;
-			height: 2400rpx;
-			border-radius: 50%;
-			background-color: #901b21;
-		}
-
-		.top-tit {
-			position: relative;
-			padding: 50rpx 27rpx 30rpx;
-			font-size: 26rpx;
-			font-weight: bold;
-			color: #FFFFFF;
-		}
-
-		.top-phone {
-			position: relative;
-			font-size: 28rpx;
-			font-weight: bold;
-			color: #FFFFFF;
-			display: block;
-			border-bottom: 1px solid #ffff;
-			width: 696rpx;
-			height: 70rpx;
-			line-height: 70rpx;
-			margin: auto;
-		}
-	}
-
-	.tc-wrap {
-		width: 694rpx;
-		min-height: 308rpx;
-		background: #FFFFFF;
-		box-shadow: 0px 0px 20px 0px rgba(50, 50, 52, 0.06);
-		border-radius: 21rpx;
-		margin: -200rpx auto 0;
-		position: relative;
-		padding: 30rpx;
-
-		.tc-tit {
-			font-size: 28rpx;
-			font-weight: bold;
-			color: #010101;
-		}
-
-		.tc-list {
-			flex-wrap: wrap;
-			justify-content: flex-start;
-			padding: 20rpx 0;
-
-			.list-item {
-				width: 200rpx;
-				height: 129rpx;
-				background: #fff4f5;
-				border-radius: 7px;
-				flex-direction: column;
-				justify-content: center;
-				align-items: center;
-				margin-right: 10rpx;
-				margin-bottom: 10rpx;
-
-				.item-val {
-					font-size: 36rpx;
-					font-weight: bold;
-					color: #ff4c4c;
-					padding-bottom: 15rpx;
-
-					.dw {
-
-						font-size: 26rpx;
-					}
-				}
-
-				.item-price {
-					font-size: 21rpx;
-					font-weight: bold;
-					color: #999999;
-				}
-			}
-
-			.item-action {
-				background: #901b21;
-				.item-val {
-					color: #fff;
-				}
-				.item-price {
-					color: #fff;
-				}
-			}
-		}
-
-		.tc-pay {
-			font-size: 28rpx;
-			justify-content: space-between;
-			font-weight: bold;
-			color: #333333;
-
-			.pay-price {
-				color: #FF0000;
-			}
-		}
-	}
-
-	.pay-type-list {
-		margin: auto;
-		margin-top: 20rpx;
-		background-color: #fff;
-		padding-left: 60upx;
-		width: 694rpx;
-		border-radius: 20rpx;
-
-		.type-item {
-			height: 120upx;
-			padding: 20upx 0;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			padding-right: 60upx;
-			font-size: 30upx;
-			position: relative;
-		}
-
-		.icon {
-			width: 100upx;
-			font-size: 52upx;
-		}
-
-		.iconyue {
-			color: #fe8e2e;
-		}
-
-		.iconweixin {
-			color: #36cb59;
-		}
-
-		.iconzhifubao {
-			color: #01aaef;
-		}
-
-		.tit {
-			font-size: $font-lg;
-			color: $font-color-dark;
-			margin-bottom: 4upx;
-		}
-
-		.con {
-			flex: 1;
-			display: flex;
-			flex-direction: column;
-			font-size: $font-sm;
-			color: $font-color-light;
-		}
-	}
-	.sub-btn {
-		width: 680rpx;
-		height: 83rpx;
-		background-color: #901b21;
-		border-radius: 42rpx;
-		margin: 74rpx auto 20rpx;
-		font-size: 32rpx;
-		font-weight: bold;
-		color: #fff;
-		text-align: center;
-		line-height: 83rpx;
-	}
-</style>

pages/user/user.vue

@@ -3,7 +3,7 @@
 		<view class="vheigh"></view>
 		<view class="bg"><image src="../../static/img/mybg.png" mode=""></image></view>
 		<view class="user-section flex">
-			<view class="detail" @click="navTo('/pages/set/userinfo')">
+			<view class="detail" @click="navTo('/pages/set/set')">
 				<view class="portrait-box"><image class="portrait" :src="userInfo.avatar || '/static/error/missing-face.png'"></image></view>
 				<view class="info-box">
 					<view class="username">{{ userInfo.nickname || '游客' }}</view>
@@ -20,176 +20,50 @@
 			<view class="balance-main">
 				<view class="tj-item" @click="navTo('/pages/money/wallet')">
 					<view class="tj-img"><image src="../../static/icon/my1.png" mode=""></image></view>
-					<view class="tj-num">￥2000</view>
+					<view class="tj-num">￥{{ userInfo.now_money * 1 || 0 }}</view>
 					<view class="tj-font">我的余额</view>
 				</view>
-				<view class="tj-item" @click="navTo('/user/page/scoreAccumulate')">
-					<view class="tj-img"><image src="../../static/icon/my2.png" mode=""></image></view>
-					<view class="tj-num">￥2000</view>
-					<view class="tj-font">我的佣金</view>
-				</view>
 				<view class="tj-item" @click="navTo('/user/page/scoreAccumulate')">
 					<view class="tj-img"><image src="../../static/icon/my3.png" mode=""></image></view>
-					<view class="tj-num">￥2000</view>
+					<view class="tj-num">￥{{ userInfo.integral * 1 || 0 }}</view>
 					<view class="tj-font">我的积分</view>
 				</view>
 				<view class="tj-item" @click="navTo('/user/page/extension')">
 					<view class="tj-img"><image src="../../static/icon/my4.png" mode=""></image></view>
-					<view class="tj-num">￥2000</view>
+					<view class="tj-num">{{ userInfo.spead_count || 0 }}</view>
 					<view class="tj-font">我的推广</view>
 				</view>
 			</view>
 		</view>
 		<view class="cover-container">
-			<view class="item-box">
-				<view class="user-item">
-					<text>我的工具</text>
-					<!-- <text class="iconfont iconenter" @click="loadMore()"></text> -->
-				</view>
-				<view class="order-section">
-					<view class="order-item" @click="navTo('/pages/tool/entity?type=1')" hover-class="common-hover" :hover-stay-time="50" v-if="isAdmin">
-						<view class="o-ic">
-							<view class="icon"><image class="icon-img" src="/static/icon/ffstk.png" mode="aspectFit"></image></view>
-							<text>发放实体卡</text>
-						</view>
-						<view class="order-img"><image src="../../static/img/img74.png" mode=""></image></view>
-					</view>
-					<view class="order-item" @click="navTo('/pages/tool/entity?type=2')" hover-class="common-hover" :hover-stay-time="50" v-if="isAdmin">
-						<view class="o-ic">
-							<view class="icon"><image class="icon-img" src="/static/icon/hxstk.png" mode="aspectFit"></image></view>
-							<text>核销实体卡</text>
-						</view>
-						<view class="order-img"><image src="../../static/img/img74.png" mode=""></image></view>
-					</view>
-					<view class="order-item" @click="navTo('/user/page/revenueCenter')" hover-class="common-hover" :hover-stay-time="50" v-if="isAdmin">
-						<view class="o-ic">
-							<view class="icon"><image class="icon-img" src="/static/icon/u9.png" mode="aspectFit"></image></view>
-							<text>收益报告</text>
-						</view>
-						<view class="order-img"><image src="../../static/img/img74.png" mode=""></image></view>
-					</view>
-					<view class="order-item" @click="navTo('/user/page/dlcenter')" hover-class="common-hover" :hover-stay-time="50" v-if="isArea_admin">
-						<view class="o-ic">
-							<view class="icon"><image class="icon-img" src="/static/icon/dl.png" mode="aspectFit"></image></view>
-							<text>代理收益</text>
-						</view>
-						<view class="order-img"><image src="../../static/img/img74.png" mode=""></image></view>
+			<view class="order-section">
+				<view class="order-item" @click="navTo('/user/page/shareQrCode')" hover-class="common-hover" :hover-stay-time="50">
+					<view class="o-ic">
+						<view class="icon"><image class="icon-img" src="/static/icon/1-my.png" mode="widthFix"></image></view>
+						<view class="text">邀请海报</view>
 					</view>
-					<view class="order-item" @click="navTo('/user/page/recommend')" hover-class="common-hover" :hover-stay-time="50" v-if="isAdmin">
-						<view class="o-ic">
-							<view class="icon"><image class="icon-img" src="/static/icon/u10.png" mode="aspectFit"></image></view>
-							<text>推荐充值</text>
-						</view>
-						<view class="order-img"><image src="../../static/img/img74.png" mode=""></image></view>
-					</view>
-					<view class="order-item" @click="navTo('/user/page/storeCommission')" hover-class="common-hover" :hover-stay-time="50" v-if="isAdmin">
-						<view class="o-ic">
-							<view class="icon"><image class="icon-img" src="/static/icon/s-cms.png" mode="aspectFit"></image></view>
-							<text>门店佣金</text>
-						</view>
-						<view class="order-img"><image src="../../static/img/img74.png" mode=""></image></view>
-					</view>
-					<!-- <view class="order-item" @click="navTo('/pages/tool/phoneBill')" hover-class="common-hover"
-							:hover-stay-time="50" >
-							<view class="o-ic">
-								<view class="icon">
-									<image class="icon-img" src="/static/icon/phone.png" mode="aspectFit"></image>
-								</view>
-								<text>话费充值</text>
-							</view>
-							<view class="order-img">
-								<image src="../../static/img/img74.png" mode=""></image>
-							</view>
-						</view> -->
-					<view class="order-item" @click="navTo('/user/page/award')" hover-class="common-hover" :hover-stay-time="50">
-						<view class="o-ic">
-							<view class="icon"><image class="icon-img" src="/static/icon/gryj.png" mode="aspectFit"></image></view>
-							<text>个人佣金</text>
-						</view>
-						<view class="order-img"><image src="../../static/img/img74.png" mode=""></image></view>
-					</view>
-					<view class="order-item" @click="readQr()" hover-class="common-hover" :hover-stay-time="50" v-if="!isAdmin">
-						<view class="o-ic">
-							<view class="icon"><image class="icon-img" src="/static/icon/1-my.png" mode="aspectFit"></image></view>
-							<text>扫码充值</text>
-						</view>
-						<view class="order-img"><image src="../../static/img/img74.png" mode=""></image></view>
-					</view>
-					<view class="order-item" @click="navTo('/user/page/wipe')" hover-class="common-hover" :hover-stay-time="50" v-if="isAdmin">
-						<view class="o-ic">
-							<view class="icon"><image class="icon-img" src="/static/icon/u6.png" mode="aspectFit"></image></view>
-							<text>提货管理</text>
-						</view>
-
-						<view class="order-img"><image src="../../static/img/img74.png" mode=""></image></view>
-					</view>
-					<view class="order-item" @click="navTo('/user/page/delivery')" hover-class="common-hover" :hover-stay-time="50" v-if="isAdmin">
-						<view class="o-ic">
-							<view class="icon"><image class="icon-img" src="/static/icon/u12.png" mode="aspectFit"></image></view>
-							<text>送货管理</text>
-						</view>
-
-						<view class="order-img"><image src="../../static/img/img74.png" mode=""></image></view>
-					</view>
-					<view class="order-item" @click="navTo('/user/page/refundAdmin?state=0&isUser=' + isUser)" hover-class="common-hover" :hover-stay-time="50" v-if="isAdmin">
-						<view class="o-ic">
-							<view class="icon"><image class="icon-img" src="/static/icon/u7.png" mode="aspectFit"></image></view>
-							<text>退货管理</text>
-						</view>
-						<view class="order-img"><image src="../../static/img/img74.png" mode=""></image></view>
-					</view>
-					<view class="order-item" @click="navTo('/user/page/depositAdmin')" hover-class="common-hover" :hover-stay-time="50" v-if="isAdmin">
-						<view class="o-ic">
-							<view class="icon"><image class="icon-img" src="/static/icon/u11.png" mode="aspectFit"></image></view>
-							<text>押金管理</text>
-						</view>
-						<view class="order-img"><image src="../../static/img/img74.png" mode=""></image></view>
-					</view>
-					<view class="order-item" @click="navTo('/pages/set/point')" hover-class="common-hover" :hover-stay-time="50" v-if="isAdmin">
-						<view class="o-ic">
-							<view class="icon"><image class="icon-img" src="/static/icon/5-my.png" mode="aspectFit"></image></view>
-							<text>自提点管理</text>
-						</view>
-						<view class="order-img"><image src="../../static/img/img74.png" mode=""></image></view>
-					</view>
-					<view class="order-item" @click="navTo('/pages/set/address')" hover-class="common-hover" :hover-stay-time="50">
-						<view class="o-ic">
-							<view class="icon"><image class="icon-img" src="/static/icon/3-my.png" mode="aspectFit"></image></view>
-							<text>收货地址</text>
-						</view>
-						<view class="order-img"><image src="../../static/img/img74.png" mode=""></image></view>
-					</view>
-					<view class="order-item" @click="navTo('/user/page/shareQrCode')" hover-class="common-hover" :hover-stay-time="50">
-						<view class="o-ic">
-							<view class="icon"><image class="icon-img" src="/static/icon/2-my.png" mode="aspectFit"></image></view>
-							<text>推广海报</text>
-						</view>
-						<view class="order-img"><image src="../../static/img/img74.png" mode=""></image></view>
+					<view class="order-img"><image src="../../static/img/img74.png" mode=""></image></view>
+				</view>
+				<view class="order-item" hover-class="common-hover" :hover-stay-time="50" @click="showPopup">
+					<view class="o-ic">
+						<view class="icon"><image class="icon-img" src="/static/icon/2-my.png" mode="widthFix"></image></view>
+						<view class="text">客服中心</view>
 					</view>
-
-					<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="o-ic">
-							<view class="icon"><image class="icon-img" src="/static/icon/4-my.png" mode="aspectFit"></image></view>
-							<text>联系客服</text>
-						</view>
-
-						<!-- <view class="txt">
-								联系客服
-							</view> -->
-						<view class="order-img"><image src="../../static/img/img74.png" mode=""></image></view>
+					<view class="order-img"><image src="../../static/img/img74.png" mode=""></image></view>
+				</view>
+				<view class="order-item" @click="navTo('/pages/set/address')" hover-class="common-hover" :hover-stay-time="50">
+					<view class="o-ic">
+						<view class="icon"><image class="icon-img" src="/static/icon/3-my.png" mode="widthFix"></image></view>
+						<view class="text">收货地址</view>
 					</view>
-					<!-- <view class="order-item" hover-class="common-hover" :hover-stay-time="50">
-							<view class="icon"><image class="icon-img" src="/static/icon/u4.png" mode="aspectFit"></image></view>
-							<text>关于我们</text>
-						</view> -->
-					<view class="order-item" hover-class="common-hover" :hover-stay-time="50" @click="showBind">
-						<view class="o-ic">
-							<view class="icon"><image class="icon-img" src="/static/icon/ztd.png" mode="aspectFit"></image></view>
-							<text>绑定管理账号</text>
-						</view>
-						<view class="order-img"><image src="../../static/img/img74.png" mode=""></image></view>
+					<view class="order-img"><image src="../../static/img/img74.png" mode=""></image></view>
+				</view>
+				<view class="order-item" @click="navTo('/pages/set/set')" hover-class="common-hover" :hover-stay-time="50">
+					<view class="o-ic">
+						<view class="icon"><image class="icon-img" src="/static/icon/4-my.png" mode="widthFix"></image></view>
+						<view class="text">设置</view>
 					</view>
+					<view class="order-img"><image src="../../static/img/img74.png" mode=""></image></view>
 				</view>
 			</view>
 		</view>
@@ -209,36 +83,6 @@
 				</view>
 			</view>
 		</uni-popup>
-		<uni-popup ref="popupadmin" type="center">
-			<view class="bind-admin-wappper">
-				<view class="title">绑定管理账号</view>
-				<view class="admin-item">
-					<view class="item-name">账号</view>
-					<view class="item-val"><input type="text" v-model="adminName" placeholder="请输入管理账号" /></view>
-				</view>
-				<view class="admin-item">
-					<view class="item-name">密码</view>
-					<view class="item-val"><input type="password" v-model="adminPsw" placeholder="请输入管理密码" /></view>
-				</view>
-				<view class="btn-wrapper">
-					<view class="btn" @click="adminClose">取消</view>
-					<view class="btn btn1" @click="adminQr">确定</view>
-				</view>
-			</view>
-		</uni-popup>
-		<uni-popup ref="popupStk" type="center">
-			<view class="stk-tc">
-				<image src="https://zccy.liuniu946.com/static/img/gift-bg.png" mode="" class="gift-bg"></image>
-				<view class="gift-bg-mb"></view>
-				<image src="https://zccy.liuniu946.com/static/img/stk-gift.png" mode="" class="gift"></image>
-				<view class="" style="height: 145rpx;"></view>
-				<view class="tc-tit">{{ type == 1 ? '实体卡发放' : '实体卡核销' }}</view>
-				<input type="text" class="tc-inp" placeholder="请输入卡号" v-model="code" />
-				<input type="text" class="tc-inp tc-inp-km" placeholder="请输入卡密" v-model="password" v-if="type == 2" />
-				<view class="tc-btn" @click="gonew">{{ type == 1 ? '立即发放' : '立即核销' }}</view>
-				<view class="" style="height: 50rpx;"></view>
-			</view>
-		</uni-popup>
 	</view>
 </template>
 <script>
@@ -258,33 +102,13 @@ export default {
 	},
 	data() {
 		return {
-			coverTransform: 'translateY(0px)',
-			coverTransition: '0s',
-			moving: false,
-			userDowm: 0, //卡片升级专属高度
-			userMaxDowm: 0, //卡片最高高度,
-			userIdentity: false, //是否展示管理页面
-			text: '',
-			isUser: 0,
-			integral: '', //积分获取
-			mycount: 0,
-			adminName: '',
-			adminPsw: '',
-			isAdmin: false,
-			isArea_admin: false,
-			code: '',
-			password: '',
-			type: '',
-			uping: false
+			text: '123456'
 		};
 	},
 	onShow() {
-		this.getWx(5);
-		console.log(this.userInfo);
 		// 判断是否已经登录
 		if (this.hasLogin) {
 			this.loadBaseData();
-			// this.getSpreadCount();
 			console.log(this.userInfo);
 		}
 	},
@@ -318,34 +142,11 @@ export default {
 	},
 	methods: {
 		...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
-		// 获取微信客服
-		getWx(id) {
-			getArticleDetail({}, id).then(({ data }) => {
-				console.log(data, 'wx');
-				this.text = data.synopsis;
-			});
-		},
 		// 加载初始数据
 		loadBaseData() {
 			getUserInfo({})
 				.then(({ data }) => {
 					this.setUserInfo(data);
-					// this.getSpreadCount()
-					console.log(data, '++++++++++++');
-					if (this.userInfo.store_info.length != 0) {
-						this.isAdmin = true;
-					}
-					if (data.store_info instanceof Array) {
-						if (this.userInfo.store_info.length == 0) {
-							this.isAdmin = false;
-						} else {
-							this.isAdmin = true;
-						}
-					}
-					if (Object.prototype.toString.call(data.store_info) === '[object Object]') {
-						this.isAdmin = true;
-					}
-					this.isArea_admin = data.area_admin == 0 ? false : true;
 					// 获取用户数据完毕后在获取订单数据防止多次跳转到登录页
 					orderData({})
 						.then(({ data }) => {
@@ -382,14 +183,6 @@ export default {
 				});
 			}
 		},
-		changeIdentity() {
-			this.userIdentity = !this.userIdentity;
-			if (this.isUser === 0) {
-				this.isUser = 1;
-			} else if (this.isUser === 1) {
-				this.isUser = 0;
-			}
-		},
 		showPopup() {
 			this.$refs.popup.open();
 		},
@@ -410,155 +203,7 @@ export default {
 				});
 			}
 			this.$refs.popup.close();
-		},
-		getSpreadCount() {
-			getSpreadCount({}, 4).then(res => {
-				// console.log(res,'提现++++++')
-				this.mycount = res.data.count;
-				console.log(this.mycount, '提现++++++');
-			});
-		},
-		showBind() {
-			if (!this.hasLogin) {
-				// 保存地址
-				saveUrl();
-				// 登录拦截
-				interceptor();
-			} else {
-				this.$refs.popupadmin.open();
-			}
-		},
-		adminQr() {
-			if (!this.adminName) {
-				return this.$api.msg('请输入管理账号');
-			}
-			if (!this.adminPsw) {
-				return this.$api.msg('请输入管理密码');
-			}
-			uni.showLoading({
-				title: '提交绑定...',
-				mask: true
-			});
-			// bindAdmin
-			console.log(this.adminName, this.adminPsw, 'dddddddddddddddddd');
-			bindAdmin({
-				admin_account: this.adminName,
-				admin_password: this.adminPsw
-			})
-				.then(res => {
-					console.log(res, 'bindAdmin+++++++++++++++++++++');
-					uni.hideLoading();
-					this.$refs.popupadmin.close();
-					this.$api.msg('绑定成功');
-					this.loadBaseData();
-				})
-				.catch(err => {
-					console.log(err);
-
-					this.$refs.popupadmin.close();
-				});
-		},
-		adminClose() {
-			this.adminName = '';
-			this.adminPsw = '';
-			this.$refs.popupadmin.close();
-		},
-		// 扫描支付
-		readQr() {
-			let obj = this;
-			if (!this.hasLogin) {
-				// 保存地址
-				saveUrl();
-				// 登录拦截
-				interceptor();
-			} else {
-				// #ifndef H5
-				uni.scanCode({
-					success(e) {
-						// console.log(e,'e++++++++++++')
-						uni.navigateTo({
-							url: '/user/page/pay' + e.result
-						});
-					}
-				});
-				// #endif
-				// #ifdef H5
-				this.weichatObj.scanQRCode({
-					needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
-					scanType: ['qrCode', 'barCode'], // 可以指定扫二维码还是一维码，默认二者都有
-					success: function(res) {
-						uni.navigateTo({
-							url: '/user/page/pay' + res.result
-						});
-					}
-				});
-				// #endif
-			}
-		},
-		openStk(type) {
-			this.type = type;
-			this.$refs.popupStk.open();
-		},
-		gonew() {
-			let obj = this;
-			if (obj.uping) {
-				return;
-			}
-			if (obj.code == '') {
-				return obj.$api.msg('请输入卡号');
-			}
-			if (obj.type == 2) {
-				if (obj.password == '') {
-					return obj.$api.msg('请输入卡密');
-				}
-			}
-			obj.uping = true;
-			if (obj.type == 1) {
-				sendStk({
-					code: obj.code
-				})
-					.then(res => {
-						obj.$refs.popupStk.close();
-						uni.showToast({
-							title: '发放成功',
-							duration: 2000
-						});
-						obj.uping = false;
-					})
-					.catch(err => {
-						obj.uping = false;
-					});
-			} else if (obj.type == 2) {
-				checkStk({
-					code: obj.code,
-					password: obj.password
-				})
-					.then(res => {
-						obj.$refs.popupStk.close();
-
-						uni.showToast({
-							title: '核销成功',
-							duration: 2000
-						});
-						obj.uping = false;
-					})
-					.catch(err => {
-						obj.uping = false;
-					});
-			}
 		}
-		/**
-		 * 获取个人用户信息
-		 */
-		// getUserInfo() {
-		// 	console.log('getuserInfo')
-		// 	let that = this;
-		// 	getUserInfo().then(res => {
-		// 		that.userInfo = res.data,
-		// 		that.is_promoter = res.data.is_promoter
-		// 		that.extension_status = res.data.extension_status
-		// 	});
-		// },
 	}
 };
 </script>
@@ -668,155 +313,61 @@ page,
 	z-index: 10;
 	margin-top: 50rpx;
 	width: 750rpx;
-	height: 20rpx;
+	height: 30rpx;
 	background: #ffffff;
 	border-radius: 30rpx 30rpx 0px 0px;
 }
 .cover-container {
-	background: $page-color-base;
-	// margin-top: -150rpx;
-	// padding: 0 30rpx;
 	position: relative;
-	background: #f5f5f5;
-	padding-bottom: 20rpx;
-
-	.arc {
-		position: absolute;
-		left: 0;
-		top: -34rpx;
-		width: 100%;
-		height: 36rpx;
-	}
-}
-
-.tj-sction {
-	@extend %section;
-
-	.tj-item {
-		@extend %flex-center;
-		flex-direction: column;
-		height: 140rpx;
-		font-size: $font-sm;
-		color: #75787d;
-	}
-
-	.num {
-		font-size: $font-lg;
-		color: $font-color-dark;
-		margin-bottom: 8rpx;
-	}
-}
-
-.item-box {
-	// border-radius: 10rpx;
-	background-color: white;
+	background: #ffffff;
 	margin-top: 20rpx;
+}
 
-	.box-title {
-		line-height: 1;
-		padding: 30rpx;
-
-		.title {
-			font-size: $font-lg;
-			font-weight: bold;
-		}
-
-		.link {
-			font-size: $font-base - 2rpx;
-			color: $font-color-light;
-		}
-	}
-
-	.order-section {
-		padding: 28rpx;
-		padding-bottom: 0;
-
-		.order-item {
+.order-section {
+	.order-item {
+		padding: 60rpx 55rpx 0 43rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		.o-ic {
 			display: flex;
-			justify-content: space-between;
-			width: 100%;
-			height: 120rpx;
-			border-radius: 10rpx;
-			font-size: $font-sm;
-			color: $font-color-dark;
-
-			.o-ic {
-				margin: auto 0;
+			align-items: center;
+			.icon {
+				margin-right: 20rpx;
 				display: flex;
-
-				.icon {
-					margin-right: 20rpx;
-
-					image {
-						width: 52rpx;
-						height: 43rpx;
-					}
-				}
-
-				text {
-					color: #3b3b3b;
-					font-size: 30rpx;
-					font-family: SourceHanSansCN-Regular;
-				}
-			}
-
-			.order-img {
-				margin: auto 0;
-
-				// margin: auto 50rpx;
+				justify-content: center;
+				align-items: center;
 				image {
-					width: 16rpx;
-					height: 28rpx;
+					width: 32rpx;
 				}
 			}
-		}
 
-		.iconfont {
-			font-size: 48rpx;
-			margin-bottom: 18rpx;
-			color: #fa436a;
+			.text {
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #363636;
+			}
 		}
 
-		.icon-shouhoutuikuan {
-			font-size: 44rpx;
+		.order-img {
+			width: 16rpx;
+			height: 28rpx;
+			image {
+				width: 16rpx;
+				height: 28rpx;
+			}
 		}
 	}
-}
-
-.history-section {
-	// padding: 30rpx 0 0;
-	margin-top: 20rpx;
-	background: #fff;
-	border-radius: 10rpx;
 
-	.sec-header {
-		display: flex;
-		align-items: center;
-		font-size: $font-base;
-		color: $font-color-dark;
-		line-height: 40rpx;
-		margin-left: 30rpx;
-		padding-top: 30rpx;
-
-		.iconfont {
-			font-size: 44rpx;
-			color: $color-red;
-			margin-right: 16rpx;
-			line-height: 40rpx;
-		}
+	.iconfont {
+		font-size: 48rpx;
+		margin-bottom: 18rpx;
+		color: #fa436a;
 	}
 
-	.h-list {
-		white-space: nowrap;
-		padding: 30rpx 30rpx 0;
-
-		.h-list-image {
-			display: inline-block;
-			width: 160rpx;
-			height: 160rpx;
-			margin-right: 20rpx;
-			border-radius: 10rpx;
-		}
+	.icon-shouhoutuikuan {
+		font-size: 44rpx;
 	}
 }
 
@@ -837,11 +388,11 @@ page,
 	position: relative;
 	z-index: 10;
 	background: #ffffff;
-
+	margin-top: -3rpx;
 	.balance-main {
-		display: flex;
 		padding-top: 40rpx;
-		color: #ffffff;
+		display: flex;
+		align-items: center;
 
 		.tj-item {
 			display: flex;
@@ -861,7 +412,7 @@ page,
 			}
 
 			.tj-num {
-				font-size: 25rpx;
+				font-size: 28rpx;
 				font-family: PingFang SC;
 				font-weight: 500;
 				color: #363636;
@@ -874,30 +425,9 @@ page,
 				color: #363636;
 			}
 		}
-
-		.jg {
-			width: 2rpx;
-			height: 81rpx;
-			margin-top: 18rpx;
-			background-color: #c5868a;
-		}
 	}
 }
 
-.foot-wrapper {
-	width: 373rpx;
-	height: 79rpx;
-	background: #ffffff;
-	box-shadow: 0px 3px 10px 0px rgba(180, 183, 187, 0.8);
-	border-radius: 11rpx;
-	margin: 46rpx auto 20rpx;
-	text-align: center;
-	line-height: 79rpx;
-	font-size: 30rpx;
-	font-weight: bold;
-	color: #901b21;
-}
-
 .popup-box {
 	width: 522rpx;
 	height: 605rpx;
@@ -1066,71 +596,4 @@ page,
 	width: 52rpx;
 	height: 43rpx;
 }
-.stk-tc {
-	width: 560rpx;
-	// height: 550rpx;
-	background-color: #fff;
-	border-radius: 20rpx;
-	position: relative;
-	.gift,
-	.gift-bg,
-	.gift-bg-mb {
-		position: absolute;
-		left: 0;
-		right: 0;
-		margin: auto;
-	}
-	.tc-tit,
-	.tc-inp,
-	.tc-btn {
-		margin: auto;
-	}
-	.gift {
-		top: -93rpx;
-		width: 177rpx;
-		height: 186rpx;
-	}
-	.gift-bg-mb {
-		top: 0;
-		width: 456rpx;
-		height: 90rpx;
-		background-color: #fff;
-	}
-	.gift-bg {
-		top: -90rpx;
-		width: 456rpx;
-		height: 180rpx;
-	}
-	.tc-tit {
-		font-weight: bold;
-		color: #333333;
-		font-size: 36rpx;
-		text-align: center;
-	}
-	.tc-inp {
-		display: block;
-		margin: 20rpx auto;
-		width: 440rpx;
-		height: 70rpx;
-		background-color: #f5f5f5;
-		top: 210rpx;
-		padding-left: 20rpx;
-		border-radius: 15rpx;
-		font-size: 32rpx;
-	}
-	.tc-inp-km {
-		top: 305rpx;
-	}
-	.tc-btn {
-		width: 405rpx;
-		height: 86rpx;
-		margin-top: 45rpx;
-		background-color: #901b21;
-		border-radius: 43rpx;
-		text-align: center;
-		color: #fff;
-		line-height: 86rpx;
-		font-size: 36rpx;
-	}
-}
 </style>

user/page/delivery.vue

@@ -1,687 +0,0 @@
-<template>
-	<view class="content">
-		<view class="navbar">
-			<view v-for="(itemn, index) in navList" :key="index" class="nav-item"
-				:class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ itemn.text }}</view>
-		</view>
-		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" :style="{ height: height}"
-			@change="changeTab">
-			<swiper-item v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view scroll-y="true" :style="{ height: height}" style="padding-top: 20rpx;"
-					@scrolltolower="loadData()">
-					<empty v-if="navList[tabCurrentIndex].goodList.length === 0"></empty>
-					<view class="good" v-for="item in tabItem.goodList">
-						<view class="good-top">
-							<view class="top-num">订单编号:{{ item.order_id }}</view>
-							<view class="top-status" v-if="tabCurrentIndex == 2">{{item.shipping_type == 1?'外送': '自提'}}
-							</view>
-						</view>
-						<view class="goods-buttom" v-for="itemt in item._info">
-							<view class="good-img">
-								<image :src="itemt.cart_info.productInfo.image" mode=""></image>
-							</view>
-							<view class="good-infos">
-								<view class="good-title clamp">{{ itemt.cart_info.productInfo.store_name }}</view>
-								<view class="good-tag">{{ itemt.cart_info.productInfo.suk}}</view>
-								<view class="num" style="display: inline-block;padding-left: 10rpx;">
-									x{{ itemt.cart_info.cart_num }}
-								</view>
-								<view class="good-price">
-									￥{{itemt.cart_info.productInfo.price}}
-								</view>
-							</view>
-
-						</view>
-						<view class="fh-btn-wrap" v-if="tabCurrentIndex != 3">
-							<view class="fh-btn-tit">
-								收货信息
-							</view>
-							<view class="fh-btn-info">
-								<view class="">
-									收货人：<text>{{item.real_name}}</text>
-								</view>
-								<view class="" v-if="item.shipping_type == 1">
-									配送费：<text>￥{{(item.pay_postage_sh*1 + item.pay_postage*1) | getMoneyStyle}}</text>
-								</view>
-								<view class="">
-									联系方式：<text>{{item.user_phone}}</text>
-								</view>
-								<view class="">
-									{{item.shipping_type == 1?'配送时间': '自提时间'}}：<text>{{item.time_area || '暂无'}}</text>
-								</view>
-								<view class="" v-if="item.shipping_type == 1">
-									收货地址：<text>{{ item.user_address}}</text>
-								</view>
-							</view>
-							<view class="fh-btn" @click="delivery(item)" v-if="tabCurrentIndex == 0">
-								送货
-							</view>
-						</view>
-						<view class="fh-btn-wrap" v-if="tabCurrentIndex == 3">
-							<view class="fh-btn-tit">
-								购买信息
-							</view>
-							<view class="fh-btn-info">
-								<view class="">
-									购买人：<text>{{item.nickname}}</text>
-								</view>
-								<view class="">
-									下单时间：<text>{{item.add_time}}</text>
-								</view>
-								<view class="" v-if="item.verify_time">
-									核销时间：<text>{{item.verify_time | time}}</text>
-								</view>
-							</view>
-						</view>
-						<view class="fh-btn-wrap" v-if="tabCurrentIndex != 0 && item.shipping_type == 1">
-							<view class="fh-btn-tit">
-								送货信息
-							</view>
-							<view class="fh-btn-info">
-								<view class="">
-									送货人：<text>{{item.delivery_name}}</text>
-								</view>
-
-								<view class="">
-									联系方式：<text>{{item.delivery_id}}</text>
-								</view>
-							</view>
-						</view>
-						<view class="fh-btn-wrap" v-if="item.shipping_type == 2 && item.point.name">
-							<view class="fh-btn-tit">
-								自提点信息
-							</view>
-							<view class="fh-btn-info">
-								<view class="">
-									自提点：<text>{{item.point.name}}</text>
-								</view>
-								<view class="">
-									详细地址：<text>{{item.point.detailed_address}}</text>
-								</view>
-								<view class="">
-									联系方式：<text>{{item.point.phone}}</text>
-								</view>
-							</view>
-						</view>
-					</view>
-					<uni-load-more :status="loadingType"></uni-load-more>
-				</scroll-view>
-			</swiper-item>
-
-		</swiper>
-
-		<uni-popup ref="popuphx" class="agree-wrapper">
-			<view class="hx-wrapper">
-				<view class="hx-img">
-					<image src="../../static/img/hxbg.png" mode=""></image>
-				</view>
-				<view class="hx-body">
-					<!-- <template v-if="isAuto">
-						<picker @change="bindPickerChange" :range="chooseList">
-							<input type="text" v-model="shrname" placeholder="姓名: 请选择送货人"
-								placeholder-class="hx-placeholder" disabled />
-							<input type="text" v-model="shrphone" placeholder="手机号: 暂未选择送货人"
-								placeholder-class="hx-placeholder" disabled />
-						</picker>
-					</template> -->
-					<!-- <template v-if="!isAuto"> -->
-					<picker @change="bindPickerChange" :range="chooseList">
-						<view class="hx-btn" style="margin-top: 10rpx;margin-bottom: 20rpx;">
-							下拉选择
-						</view>
-					</picker>
-
-					<input type="text" v-model="shrname" placeholder="姓名: 请输入送货人" placeholder-class="hx-placeholder" />
-					<input type="text" v-model="shrphone" placeholder="手机号: 请输入手机号"
-						placeholder-class="hx-placeholder" />
-					<!-- </template> -->
-
-					<!-- <view class="hx-btn" @click="changeAuto" style="color: #901b21;background-color: #fff;border: 1px solid #901b21;">
-						{{isAuto?'切换手动':'切换列表'}}
-					</view> -->
-					<view class="hx-btn" @click="qrsh">
-						立即送货
-					</view>
-
-				</view>
-				<view class="hx-close" @click="close">
-					<image src="../../static/icon/close.png" mode=""></image>
-				</view>
-			</view>
-		</uni-popup>
-	</view>
-</template>
-
-<script>
-	import {
-		orderData,
-		getUserInfo,
-		getSpreadCount,
-		bindAdmin,
-		orderVerific,
-		getAllList,
-		getSHY
-	} from '@/api/user.js';
-	import {
-		delivery,
-		getAdminExchangeList
-	} from '@/api/order.js';
-	import {
-		getMoneyStyle
-	} from '@/utils/rocessor.js';
-	import empty from '@/components/empty';
-	import uniPopup from '@/components/uni-popup/uni-popup.vue'
-	export default {
-		components: {
-			empty,
-			uniPopup
-		},
-		onReady() {
-			var obj = this;
-			uni.getSystemInfo({
-				success: resu => {
-					const query = uni.createSelectorQuery();
-					query.select('.swiper-box').boundingClientRect();
-					query.exec(function(res) {
-						console.log(res, 'ddddddddddddd');
-						obj.height = resu.windowHeight - res[0].top + 'px';
-						console.log('打印页面的剩余高度', obj.height);
-					});
-				},
-				fail: res => {}
-			});
-		},
-		filters: {
-			getMoneyStyle,
-			time(val) {
-				let str = ''
-				let obj = this
-
-				function add0(m) {
-					return m < 10 ? '0' + m : m
-				}
-				if (val) {
-					let time = new Date(val * 1000);
-					let y = time.getFullYear();
-					let m = time.getMonth() + 1;
-					let d = time.getDate();
-					let h = time.getHours();
-					let mm = time.getMinutes();
-					let s = time.getSeconds();
-					str = y + '-' + add0(m) + '-' + add0(d) + ' ' + add0(h) + ':' + add0(mm) + ':' + add0(s);
-				}
-				return str
-			}
-		},
-		data() {
-			return {
-				isAuto: false,
-				height: '',
-				tabCurrentIndex: 0,
-				navList: [{
-						text: '待送货',
-						status: 1,
-						loadingType: 'more',
-						page: 1,
-						limit: 10,
-						goodList: [],
-						loaded: false
-					},
-					{
-						text: '待收货',
-						status: 2, //已支付，待收货
-						loadingType: 'more',
-						page: 1,
-						limit: 10,
-						goodList: [],
-						loaded: false
-					},
-					{
-						text: '已完成',
-						status: 3,
-						loadingType: 'more',
-						page: 1,
-						limit: 10,
-						goodList: [],
-						loaded: false
-					},
-					{
-						text: '兑换券',
-						status: 1,
-						loadingType: 'more',
-						page: 1,
-						limit: 10,
-						goodList: [],
-						loaded: false
-					}
-				],
-				// loadingType: 'more',
-				// page: 1,
-				// limit: 40,
-				// goodList: [],
-				shrname: '',
-				shrphone: '',
-				choosItem: {
-					order_id: 0
-				},
-				shrList: [],
-				chooseList: []
-			}
-		},
-		onLoad() {
-			this.loadData()
-			this.getSHY()
-		},
-		methods: {
-			changeAuto() {
-				this.isAuto = !this.isAuto
-			},
-			//swiper 切换
-			changeTab(e) {
-				this.tabCurrentIndex = e.target.current;
-				this.loadData('tab');
-			},
-			//swiper 切换
-			changeTab(e) {
-				this.tabCurrentIndex = e.target.current;
-				this.loadData('tab');
-			},
-			//顶部tab点击
-			tabClick(index) {
-				this.tabCurrentIndex = index;
-				this.loadData('tab');
-			},
-			bindPickerChange(e) {
-				console.log(e.detail.value)
-				this.shrname = this.shrList[e.detail.value].name
-				this.shrphone = this.shrList[e.detail.value].phone
-			},
-			getSHY() {
-				getSHY().then(({
-					data
-				}) => {
-					// console.log(res)
-					this.shrList = data.data
-					console.log(this.shrList, 'this.shrList')
-					this.shrList.forEach(e => {
-						this.chooseList.push(e.name)
-					})
-				})
-			},
-			// 立即送货
-			qrsh() {
-				let obj = this
-				delivery({
-					order_id: obj.choosItem.order_id,
-					delivery_type: 'send',
-					delivery_name: obj.shrname,
-					delivery_id: obj.shrphone,
-				}).then(res => {
-					console.log(res, '发货成功')
-					uni.showToast({
-						title: '发货成功',
-						duration: 2000
-					});
-					let s = obj.navList[obj.tabCurrentIndex].goodList.indexOf(obj.choosItem);
-					obj.navList[obj.tabCurrentIndex].goodList.splice(s, 1);
-					obj.close()
-				})
-
-			},
-			// 关闭弹窗
-			close() {
-				this.$refs.popuphx.close()
-			},
-			// 保存发货订单信息
-			delivery(item) {
-				// this.choosItem = item
-				this.$set(this, 'choosItem', item)
-				this.$refs.popuphx.open()
-			},
-			loadData(tab) {
-				let obj = this
-				let index = obj.tabCurrentIndex
-				let navItem = obj.navList[index]
-				if (navItem.loadingType == 'loading') {
-					return
-				}
-				if (navItem.loadingType == 'noMore') {
-					return
-				}
-				if (tab == 'tab' && navItem.loaded) {
-					return
-				}
-				navItem.loadingType = 'loading'
-				if (index == 3) {
-					getAdminExchangeList({
-						status: navItem.status,
-						limit: navItem.limit,
-						page: navItem.page
-					}).then(({
-						data
-					}) => {
-						navItem.page++
-						navItem.goodList = navItem.goodList.concat(data)
-						console.log(data.length)
-						if (navItem.limit == data.length) {
-							navItem.loadingType = 'more'
-							// return
-						} else {
-							navItem.loadingType = 'noMore'
-						}
-						obj.$set(navItem, 'loaded', true)
-					})
-				} else {
-					getAllList({
-						status: navItem.status,
-						limit: navItem.limit,
-						page: navItem.page
-					}).then(({
-						data
-					}) => {
-						navItem.page++
-						navItem.goodList = navItem.goodList.concat(data)
-						console.log(data.length)
-						if (navItem.limit == data.length) {
-							navItem.loadingType = 'more'
-							// return
-						} else {
-							navItem.loadingType = 'noMore'
-						}
-						obj.$set(navItem, 'loaded', true)
-					})
-				}
-
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.good {
-		width: 702rpx;
-
-		// height: 304rpx;
-		background: #ffffff;
-		box-shadow: 0px 0px 20px 0px rgba(50, 50, 52, 0.06);
-		border-radius: 10rpx;
-		padding: 0 30rpx 20rpx;
-		margin: 0 auto 20rpx;
-		position: relative;
-
-		.good-top {
-			height: 85rpx;
-			font-size: 24rpx;
-			font-weight: 400;
-			color: #666666;
-			line-height: 85rpx;
-			display: flex;
-			justify-content: space-between;
-
-			.top-status {
-				font-size: 28rpx;
-				font-weight: 500;
-				color: #EF041F;
-			}
-		}
-
-		.goods-buttom {
-			height: 160rpx;
-			margin-bottom: 10rpx;
-			display: flex;
-			position: relative;
-
-			.good-img {
-				width: 160rpx;
-				height: 160rpx;
-
-				// overflow: hidden;
-				image {
-					width: 160rpx;
-					height: 160rpx;
-				}
-			}
-
-			.good-title {
-				width: 350rpx;
-				padding-top: 6rpx;
-				font-size: 26rpx;
-				font-weight: 500;
-				color: #3F454B;
-				line-height: 1;
-				padding-left: 10rpx;
-			}
-
-			.shop-info {
-				padding-top: 11rpx;
-				font-size: 24rpx;
-				font-weight: 500;
-				color: #DCB876;
-				line-height: 1;
-
-				// padding-left: 10rpx;
-				image {
-					width: 24rpx;
-					height: 24rpx;
-					margin-left: 14rpx;
-					margin-right: 4rpx;
-				}
-			}
-
-			.good-tag {
-				display: inline-block;
-				height: 36rpx;
-				background: #ffeee9;
-				// opacity: 0.2;
-				border-radius: 5rpx;
-				font-size: 20rpx;
-				font-weight: 500;
-				color: #F23030;
-				padding: 0 9rpx;
-				line-height: 36rpx;
-				margin-top: 15rpx;
-				margin-left: 10rpx;
-			}
-
-			.num {
-				// position: absolute;
-				// top: 10rpx;
-				// right: 10rpx;
-				color: #999999;
-				font-size: 24rpx;
-			}
-
-			.good-price {
-				display: inline-block;
-				position: absolute;
-				top: 5rpx;
-				right: 10rpx;
-				color: #999999;
-				font-size: 24rpx;
-			}
-
-		}
-
-		.fh-btn-wrap {
-			display: flex;
-			// height: 55rpx;
-			flex-direction: column;
-			// justify-content: flex-end;
-			// width: ;
-			font-size: 28rpx;
-			color: #999999;
-
-			.fh-btn-tit {
-				color: #000000;
-				font-weight: bold;
-			}
-
-			.fh-btn-info {
-				padding-left: 20rpx;
-			}
-
-			.fh-btn {
-				margin-top: 10rpx;
-				align-self: flex-end;
-				width: 144rpx;
-				height: 55rpx;
-				border: 1px solid #901b21;
-				border-radius: 28rpx;
-				font-size: 26rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #901b21;
-				line-height: 55rpx;
-				text-align: center;
-			}
-		}
-
-		.good-hj {
-			line-height: 1;
-			height: 26rpx;
-			font-size: 26rpx;
-			font-weight: 500;
-			color: #333333;
-			text-align: right;
-		}
-
-		.good-num {
-			text-align: left;
-			font-size: 26rpx;
-			font-weight: 500;
-			line-height: 1;
-			color: #333333;
-			position: absolute;
-			right: 31rpx;
-			top: 136rpx;
-		}
-	}
-
-	.hx-wrapper {
-		width: 536rpx;
-		height: 700rpx;
-		position: relative;
-
-		background-color: #fff;
-		border-radius: 20rpx;
-
-		.hx-img {
-			width: 536rpx;
-			height: 281rpx;
-
-			image {
-				width: 536rpx;
-				height: 281rpx;
-			}
-		}
-
-		.sr-btn {
-			margin-top: 20rpx;
-			display: inline-block;
-			// width: 200rpx;
-			padding: 0 10rpx;
-			height: 50rpx;
-			line-height: 50rpx;
-			border-radius: 20rpx;
-			border: 1px solid #901b21;
-			font-size: 28rpx;
-		}
-
-		.hx-close {
-			position: absolute;
-			left: 243rpx;
-			bottom: -80rpx;
-			width: 52rpx;
-			height: 52rpx;
-
-			image {
-				width: 52rpx;
-				height: 52rpx;
-			}
-		}
-
-		.hx-body {
-			width: 536rpx;
-			height: 349rpx;
-			background-color: #fff;
-			border-radius: 0 0 10rpx 10rpx;
-			padding-top: 20rpx;
-
-			.hx-title {
-				width: 536rpx;
-				font-size: 36rpx;
-				font-weight: 500;
-				color: #333333;
-				line-height: 1;
-				padding-top: 42rpx;
-				text-align: center;
-			}
-
-			input {
-				width: 439rpx;
-				height: 68rpx;
-				background: #eeddde;
-				border-radius: 10rpx;
-				margin: 0 auto 39rpx;
-				padding-left: 26rpx;
-
-				.hx-placeholder {
-					font-size: 26rpx;
-					font-weight: 500;
-					color: #901b21;
-				}
-			}
-
-			.hx-btn {
-				margin: 20rpx auto 0;
-				width: 353rpx;
-				height: 71rpx;
-				background: #901b21;
-				border-radius: 34rpx;
-				font-size: 36rpx;
-				font-weight: 500;
-				color: #F8F9F9;
-				line-height: 71rpx;
-				text-align: center;
-			}
-
-
-		}
-	}
-
-	.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;
-				}
-			}
-		}
-	}
-</style>

user/page/depositAdmin.vue

@@ -1,978 +0,0 @@
-<template>
-	<view class="content">
-		<!-- <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"> -->
-		<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-search">
-			<input type="number" class="search-key" placeholder="请输入用户手机号码" v-model="userphone" />
-			<image src="../../static/icon/search.png" mode="" class="search-logo"></image>
-			<view class="search-btn" @click.stop="search">搜索</view>
-		</view>
-
-		<!-- 普通商品退押金 -->
-		<template v-if="tabCurrentIndex==0">
-			<scroll-view scroll-y="true" :style="{'height': height}" class="scoll-wrap" @scrolltolower="loadData()"
-				style="padding-top: 20rpx;">
-				<empty v-if="navList[0].loaded === true && navList[0].orderList.length === 0"></empty>
-				<!-- 订单列表 -->
-				<view v-for="(item, index) in navList[0].orderList" :key="index" class="order-item">
-					<view class="i-top b-b">
-						<!-- <view class=""></view> -->
-						<text class="time">订单编号：{{ item.order_id }}</text>
-						<text class="state" style=" color: #901b21; "
-							v-if="item.deposit*1 > 0">{{item.deposit_status== 0? '押金未退': '押金已退' }}</text>
-						<text class="state" style=" color: #901b21; "
-							v-if="item.deposit*1 == 0">无押金</text>
-						<text v-if="item.status === 4" class="del-btn iconfont icondelete"
-							@click="deleteOrder(index)"></text>
-					</view>
-					<view class="goods-box-single" v-for="(goodsItem, goodsIndex) in item._info" :key="goodsIndex">
-						<image class="goods-img" :src="goodsItem.cart_info.productInfo.image" mode="scaleToFill">
-						</image>
-						<view class="right">
-							<view class="flex-start">
-								<text class="title clamp2">{{ goodsItem.cart_info.productInfo.store_name }}</text>
-								<text class="price"
-									style="flex-grow: 1;text-align: right;color: #901B21;font-size: 30rpx;font-weight: bold;">
-									{{ goodsItem.cart_info.productInfo.price | moneyNum }}
-									<!-- 押金：{{item.deposit}} -->
-								</text>
-							</view>
-							<view class="row flex">
-								<text class="attr-box">x {{ goodsItem.cart_info.cart_num }}</text>
-							</view>
-						</view>
-					</view>
-
-					<view class="price-box" v-if="item.deposit*1 > 0">
-						<text
-							style="color: #901b21;display: inline-block;margin-right: 8rpx;">押金：{{item.deposit}}</text>
-						已退还：{{item.deposit_back}}
-					</view>
-					<view class="action-box b-t" v-if="(item.deposit*1 > 0) && (item.deposit != item.deposit_back*1)">
-						<button class="action-btn" @click.stop="backDeposit(item)">退还押金</button>
-					</view>
-
-				</view>
-				<uni-load-more :status="navList[0].loadingType"></uni-load-more>
-			</scroll-view>
-		</template>
-		<!-- 兑换券退押金 -->
-		<template v-if="tabCurrentIndex==1">
-			<scroll-view scroll-y="true" :style="{'height': height}" class="scoll-wrap" @scrolltolower="loadData()"
-				style="padding-top: 20rpx;">
-				<empty v-if="navList[1].loaded === true && navList[1].orderList.length === 0"></empty>
-				<!-- 订单列表 -->
-				<view v-for="(item, index) in navList[1].orderList" :key="index" class="order-item">
-					<view class="i-top b-b">
-						<!-- <view class=""></view> -->
-						<text class="time">订单编号：{{ item.order_id }}</text>
-						<text class="state" style=" color: #901b21; "
-							v-if="item.deposit*1 > 0">{{item.deposit_status== 0? '押金未退': '押金已退' }}</text>
-						<text class="state" style=" color: #901b21; "
-							v-if="item.deposit*1 == 0">无押金</text>
-						<text v-if="item.status === 4" class="del-btn iconfont icondelete"
-							@click="deleteOrder(index)"></text>
-					</view>
-					<view class="goods-box-single" v-for="(goodsItem, goodsIndex) in item._info" :key="goodsIndex">
-						<image class="goods-img" :src="goodsItem.cart_info.productInfo.image" mode="scaleToFill">
-						</image>
-						<view class="right">
-							<view class="flex-start">
-								<text class="title clamp2">{{ goodsItem.cart_info.productInfo.store_name }}</text>
-								<text class="price"
-									style="flex-grow: 1;text-align: right;color: #901B21;font-size: 30rpx;font-weight: bold;">
-									{{ goodsItem.cart_info.productInfo.price | moneyNum }}
-									<!-- 押金：{{item.deposit}} -->
-								</text>
-							</view>
-							<view class="row flex">
-								<text class="attr-box">x {{ goodsItem.cart_info.cart_num }}</text>
-							</view>
-						</view>
-					</view>
-
-					<view class="price-box" v-if="item.deposit*1 > 0">
-						<text
-							style="color: #901b21;display: inline-block;margin-right: 8rpx;">押金：{{item.deposit}}</text>
-						已退还：{{item.deposit_back}}
-					</view>
-					<view class="action-box b-t" v-if="(item.deposit*1 > 0) && (item.deposit != item.deposit_back*1)">
-						<button class="action-btn" @click.stop="backDeposit(item)">退还押金</button>
-					</view>
-
-				</view>
-				<uni-load-more :status="navList[1].loadingType"></uni-load-more>
-			</scroll-view>
-		</template>
-		<!-- 押金退款弹窗 -->
-		<uni-popup ref="popupadmin" type="center">
-			<view class="bind-admin-wappper">
-				<view class="title">押金退还</view>
-				<view class="admin-item">
-					<view class="item-name">订单号</view>
-					<view class="item-val"><input type="text" v-model="orderId" placeholder="订单号不能为空" disabled /></view>
-				</view>
-				<view class="admin-item">
-					<view class="item-name">退还金额</view>
-					<view class="item-val"><input type="text" v-model="backNum" placeholder="请输入退还金额" /></view>
-				</view>
-				<view class="btn-wrapper">
-					<view class="btn" @click="backClose">取消</view>
-					<view class="btn btn1" @click="qrbackDeposit">确定</view>
-				</view>
-			</view>
-		</uni-popup>
-	</view>
-</template>
-
-<script>
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
-	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-	import empty from '@/components/empty';
-	import {
-		orderList,
-		orderCancel,
-		orderDel,
-		orderTake,
-		GetAdminOrderList,
-		backDeposit,
-		getAdminExchangeList,
-		backExchangeDeposit
-	} from '@/api/order.js';
-	export default {
-		components: {
-			uniLoadMore,
-			empty,
-			uniPopup
-		},
-		filters: {
-			moneyNum(value) {
-				return +value;
-			}
-		},
-		data() {
-			return {
-				height: '',
-				backIndex: 0,
-				backMaxNum: 0,
-				backNum: '',
-				orderId: '',
-				loaded: false,
-				tabCurrentIndex: 0,
-				orderList: [],
-				loadingType: 'more',
-				page: 1,
-				limit: 10,
-				navList: [{
-						text: '普通商品',
-						loadingType: 'more',
-						orderList: [],
-						page: 1, //当前页数
-						limit: 10,
-						loaded: false,
-
-					},
-					{
-						text: '兑换券',
-						loadingType: 'more',
-						orderList: [],
-						page: 1, //当前页数
-						limit: 10, //每次信息条数
-						loaded: false
-					}
-				],
-				// navList: [{
-				// 	state: 3,
-				// 	text: '已完成',
-				// 	loadingType: 'more',
-				// 	orderList: [],
-				// 	page: 1, //当前页数
-				// 	limit: 10 //每次信息条数
-				// }],
-				isUser: true,
-				userphone: '',
-				keyword: '',
-			};
-		},
-		onLoad(options) {
-			/**
-			 * 修复app端点击除全部订单外的按钮进入时不加载数据的问题
-			 * 替换onLoad下代码即可
-			 */
-			// console.log(options);
-			// this.isUser = options.isUser;
-			// console.log(this.isUser);
-			// this.tabCurrentIndex = +options.state;
-			// // #ifndef MP
-			// this.loadData();
-			// // #endif
-			// // #ifdef MP
-			// if (options.state == 0) {
-			// 	this.loadData();
-			// }
-			// // #endif
-			this.loadData()
-		},
-		onReady(res) {
-			var obj = this;
-			uni.getSystemInfo({
-				success: resu => {
-					const query = uni.createSelectorQuery();
-					query.select('.scoll-wrap').boundingClientRect();
-					query.exec(function(res) {
-						console.log(res, 'ddddddddddddd');
-						obj.height = resu.windowHeight - res[0].top + 'px';
-						console.log('打印页面的剩余高度', obj.height);
-					});
-				},
-				fail: res => {}
-			});
-		},
-		// #ifdef APP-PLUS || H5
-		onBackPress(e) {
-			uni.switchTab({
-				url: '/pages/user/user'
-			});
-			return true;
-		},
-		// #endif
-		methods: {
-			//顶部tab点击
-			tabClick(index) {
-				this.tabCurrentIndex = index;
-				this.loadData('tab')
-			},
-			// 转换金额为数字
-			moneyNum(value) {
-				return +value;
-			},
-			//获取订单列表
-			loadData(source) {
-				//这里是将订单挂载到tab列表下
-				let obj = this
-				let index = obj.tabCurrentIndex
-				let navItem = obj.navList[index]
-				if (navItem.loadingType === 'loading') {
-					//防止重复加载
-					return;
-				}
-				if (navItem.loadingType === 'noMore') {
-					//防止重复加载
-					return;
-				}
-				if (navItem.loaded && source == 'tab') {
-					return
-				}
-				// 修改当前对象状态为加载中
-				navItem.loadingType = 'loading';
-				if (index == 0) {
-					GetAdminOrderList({
-							status: 3,
-							page: navItem.page,
-							limit: navItem.limit,
-							user_phone: obj.keyword
-						})
-						.then(({
-							data
-						}) => {
-							console.log(data, 'ddddddddddd');
-							let arr = data.map(e => {
-								let b = this.orderStateExp(e.status);
-								e.stateTip = b.stateTip;
-								e.stateTipColor = b.stateTipColor;
-								return e;
-							});
-							navItem.orderList = navItem.orderList.concat(arr);
-							console.log(navItem.orderList);
-							navItem.page++;
-							if (navItem.limit == data.length) {
-								//判断是否还有数据， 有改为 more， 没有改为noMore
-								navItem.loadingType = 'more';
-								// return;
-							} else {
-								//判断是否还有数据， 有改为 more， 没有改为noMore
-								navItem.loadingType = 'noMore';
-							}
-							// uni.hideLoading();
-							this.$set(navItem, 'loaded', true);
-						})
-						.catch(e => {
-							console.log(e);
-						});
-
-
-				}
-				if (index == 1) {
-					getAdminExchangeList({
-						page: 1,
-						limit: 10,
-						user_phone: obj.keyword
-					}).then(({
-						data
-					}) => {
-						console.log(data, 'ddddddddddd');
-						let arr = data.map(e => {
-							let b = this.orderStateExp(e.status);
-							e.stateTip = b.stateTip;
-							e.stateTipColor = b.stateTipColor;
-							return e;
-						});
-						navItem.orderList = navItem.orderList.concat(arr);
-						console.log(navItem.orderList);
-						navItem.page++;
-						if (navItem.limit == data.length) {
-							//判断是否还有数据， 有改为 more， 没有改为noMore
-							navItem.loadingType = 'more';
-							// return;
-						} else {
-							//判断是否还有数据， 有改为 more， 没有改为noMore
-							navItem.loadingType = 'noMore';
-						}
-						// uni.hideLoading();
-						this.$set(navItem, 'loaded', true);
-					})
-				}
-
-
-			},
-			//订单状态文字和颜色
-			orderStateExp(state) {
-				let stateTip = '',
-					stateTipColor = '#fa436a';
-				switch (+state) {
-					case 0:
-						stateTip = '待付款';
-						break;
-					case 1:
-						stateTip = '待发货';
-						break;
-					case 2:
-						stateTip = '待收货';
-						break;
-					case 3:
-						stateTip = '待评价';
-						break;
-					case 4:
-						stateTip = '已完成';
-						stateTipColor = '#901b21';
-						break;
-					case 9:
-						stateTip = '订单已关闭';
-						stateTipColor = '#909399';
-						break;
-
-						//更多自定义
-				}
-				return {
-					stateTip,
-					stateTipColor
-				};
-			},
-			backDeposit(item) {
-				let obj = this
-				if (obj.tabCurrentIndex == 0) {
-					obj.orderId = item.order_id
-				} else {
-					obj.orderId = item.id
-				}
-
-				obj.backMaxNum = item.deposit * 1 - item.deposit_back * 1
-				this.$refs.popupadmin.open()
-				obj.backIndex = obj.navList[obj.tabCurrentIndex].orderList.indexOf(item)
-				console.log(item, 'ddddddddddddddddddddd', obj.backIndex)
-			},
-			qrbackDeposit() {
-				let obj = this
-				if (obj.backNum == '') {
-					obj.$api.msg('请输入退还押金')
-					return
-				}
-				if (obj.backNum * 1 > obj.backMaxNum * 1) {
-					obj.$api.msg('退还金额大于押金')
-					return
-				}
-				if (obj.orderId == '') {
-					obj.$api.msg('请选择订单')
-					return
-				}
-				if (obj.tabCurrentIndex == 0) {
-					backDeposit({
-						order_id: obj.orderId,
-						refund_price: obj.backNum
-					}).then(res => {
-						uni.showToast({
-							title: '退还成功',
-							duration: 2000
-						});
-						console.log(res)
-						obj.navList[obj.tabCurrentIndex].orderList[obj.backIndex].deposit_status = 1
-						obj.navList[obj.tabCurrentIndex].orderList[obj.backIndex].deposit_back = obj.backNum * 1 +
-							obj.navList[obj.tabCurrentIndex].orderList[obj.backIndex]
-							.deposit_back * 1
-						obj.$refs.popupadmin.close()
-						obj.orderId = ''
-						obj.backMaxNum = ''
-						obj.backNum = ''
-					})
-				} else {
-					backExchangeDeposit({
-						id: obj.orderId,
-						refund_price: obj.backNum
-					}).then(res => {
-						uni.showToast({
-							title: '退还成功',
-							duration: 2000
-						});
-						console.log(res)
-						obj.navList[obj.tabCurrentIndex].orderList[obj.backIndex].deposit_status = 1
-						obj.navList[obj.tabCurrentIndex].orderList[obj.backIndex].deposit_back = obj.backNum * 1 +
-							obj.navList[obj.tabCurrentIndex].orderList[obj.backIndex]
-							.deposit_back * 1
-						obj.$refs.popupadmin.close()
-						obj.orderId = ''
-						obj.backMaxNum = ''
-						obj.backNum = ''
-					})
-				}
-
-			},
-			backClose() {
-				let obj = this
-				obj.$refs.popupadmin.close()
-				obj.orderId = ''
-				obj.backMaxNum = ''
-				obj.backNum = ''
-			},
-			search() {
-				let obj = this
-				if (obj.userphone == '') {
-					obj.keyword = ''
-				} else {
-					const reg = /^(\+?0?86-?)?1[\d]\d{9}$/;
-					if (!reg.test(obj.userphone)) {
-						obj.$api.msg('请填写正确的手机号码');
-						return;
-					}
-				}
-				obj.keyword = obj.userphone
-				obj.navList[obj.tabCurrentIndex].orderList = []
-				obj.navList[obj.tabCurrentIndex].loadingType = 'more'
-				obj.navList[obj.tabCurrentIndex].page = 1
-				obj.loadData()
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	page,
-	.content {
-		background: $page-color-base;
-		height: 100%;
-	}
-
-	.swiper-box {
-		height: calc(100% - 40px);
-	}
-
-	.list-scroll-content {
-		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;
-				}
-			}
-		}
-	}
-
-	.uni-swiper-item {
-		height: auto;
-	}
-
-	.order-item {
-		display: flex;
-		flex-direction: column;
-		padding-left: 30rpx;
-		background: #fff;
-		margin-bottom: 16rpx;
-
-		.i-top {
-			display: flex;
-			align-items: center;
-			height: 80rpx;
-			padding-right: 30rpx;
-			font-size: $font-base;
-			color: $font-color-dark;
-			position: relative;
-
-			.time {
-				flex: 1;
-			}
-
-			.state {
-				color: $base-color;
-			}
-
-			.del-btn {
-				padding: 10rpx 0 10rpx 36rpx;
-				font-size: $font-lg;
-				color: $font-color-light;
-				position: relative;
-
-				&:after {
-					content: '';
-					width: 0;
-					height: 30rpx;
-					border-left: 1px solid $border-color-dark;
-					position: absolute;
-					left: 20rpx;
-					top: 50%;
-					transform: translateY(-50%);
-				}
-			}
-		}
-
-		/* 多条商品 */
-		.goods-box {
-			height: 160rpx;
-			padding: 20rpx 0;
-			white-space: nowrap;
-
-			.goods-item {
-				width: 120rpx;
-				height: 120rpx;
-				display: inline-block;
-				margin-right: 24rpx;
-			}
-
-			.goods-img {
-				display: block;
-				width: 100%;
-				height: 100%;
-			}
-		}
-
-		/* 单条商品 */
-		.goods-box-single {
-			display: flex;
-			padding: 20rpx 0;
-
-			.goods-img {
-				display: block;
-				width: 120rpx;
-				height: 120rpx;
-			}
-
-			.right {
-				flex: 1;
-				display: flex;
-				flex-direction: column;
-				padding: 0 30rpx 0 24rpx;
-				overflow: hidden;
-
-				.row {
-					margin-top: 10rpx;
-					justify-content: space-between;
-				}
-
-				.row_title {
-					// padding:5rpx 10rpx;
-					// background-color: #dddddd;
-					// border-radius: 10rpx;
-					// font-size: 22rpx;
-					// color: #ffffff;
-					display: inline-block;
-					padding: 7rpx 11rpx;
-					font-size: 20rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #fd5b23;
-					background: #ffeae5;
-					border-radius: 5rpx;
-				}
-
-				.title {
-					font-size: $font-base + 2rpx;
-					color: $font-color-dark;
-					line-height: 1;
-					width: 80%;
-				}
-
-				.attr-box {
-					display: flex;
-					justify-content: flex-end;
-					font-size: $font-sm + 2rpx;
-					color: $font-color-light;
-				}
-
-				.price {
-					display: inline;
-					font-size: $font-base + 2rpx;
-					color: $font-color-dark;
-
-					&:before {
-						content: '￥';
-						font-size: $font-sm;
-					}
-				}
-			}
-		}
-
-		.price-box {
-			display: flex;
-			justify-content: flex-end;
-			align-items: baseline;
-			padding: 20rpx 30rpx;
-			font-size: $font-sm + 2rpx;
-			color: $font-color-light;
-
-			.num {
-				margin: 0 8rpx;
-				color: $font-color-dark;
-			}
-
-			.price {
-				font-size: $font-lg;
-				color: $font-color-dark;
-
-				&:before {
-					content: '￥';
-					font-size: $font-sm;
-					margin: 0 2rpx 0 8rpx;
-				}
-			}
-		}
-
-		.action-box {
-			display: flex;
-			justify-content: flex-end;
-			align-items: center;
-			height: 100rpx;
-			position: relative;
-			padding-right: 30rpx;
-
-		}
-
-		.action-btn {
-			width: 160rpx;
-			height: 60rpx;
-			margin: 0;
-			margin-left: 24rpx;
-			padding: 0;
-			text-align: center;
-			line-height: 60rpx;
-			font-size: $font-sm + 2rpx;
-			color: $font-color-dark;
-			background: #fff;
-			border-radius: 100px;
-			color: #901b21;
-			border: #901b21;
-
-			&:after {
-				border-radius: 100px;
-			}
-
-			&.recom {
-				color: $base-color;
-
-				&:after {
-					border-color: $base-color;
-				}
-			}
-
-			&.evaluate {
-				color: $color-yellow;
-
-				&:after {
-					border-color: $color-yellow;
-				}
-			}
-		}
-	}
-
-	/* load-more */
-	.uni-load-more {
-		display: flex;
-		flex-direction: row;
-		height: 80rpx;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.uni-load-more__text {
-		font-size: 28rpx;
-		color: #999;
-	}
-
-	.uni-load-more__img {
-		height: 24px;
-		width: 24px;
-		margin-right: 10px;
-	}
-
-	.uni-load-more__img>view {
-		position: absolute;
-	}
-
-	.uni-load-more__img>view view {
-		width: 6px;
-		height: 2px;
-		border-top-left-radius: 1px;
-		border-bottom-left-radius: 1px;
-		background: #999;
-		position: absolute;
-		opacity: 0.2;
-		transform-origin: 50%;
-		animation: load 1.56s ease infinite;
-	}
-
-	.uni-load-more__img>view view:nth-child(1) {
-		transform: rotate(90deg);
-		top: 2px;
-		left: 9px;
-	}
-
-	.uni-load-more__img>view view:nth-child(2) {
-		transform: rotate(180deg);
-		top: 11px;
-		right: 0;
-	}
-
-	.uni-load-more__img>view view:nth-child(3) {
-		transform: rotate(270deg);
-		bottom: 2px;
-		left: 9px;
-	}
-
-	.uni-load-more__img>view view:nth-child(4) {
-		top: 11px;
-		left: 0;
-	}
-
-	.load1,
-	.load2,
-	.load3 {
-		height: 24px;
-		width: 24px;
-	}
-
-	.load2 {
-		transform: rotate(30deg);
-	}
-
-	.load3 {
-		transform: rotate(60deg);
-	}
-
-	.load1 view:nth-child(1) {
-		animation-delay: 0s;
-	}
-
-	.load2 view:nth-child(1) {
-		animation-delay: 0.13s;
-	}
-
-	.load3 view:nth-child(1) {
-		animation-delay: 0.26s;
-	}
-
-	.load1 view:nth-child(2) {
-		animation-delay: 0.39s;
-	}
-
-	.load2 view:nth-child(2) {
-		animation-delay: 0.52s;
-	}
-
-	.load3 view:nth-child(2) {
-		animation-delay: 0.65s;
-	}
-
-	.load1 view:nth-child(3) {
-		animation-delay: 0.78s;
-	}
-
-	.load2 view:nth-child(3) {
-		animation-delay: 0.91s;
-	}
-
-	.load3 view:nth-child(3) {
-		animation-delay: 1.04s;
-	}
-
-	.load1 view:nth-child(4) {
-		animation-delay: 1.17s;
-	}
-
-	.load2 view:nth-child(4) {
-		animation-delay: 1.3s;
-	}
-
-	.load3 view:nth-child(4) {
-		animation-delay: 1.43s;
-	}
-
-	@-webkit-keyframes load {
-		0% {
-			opacity: 1;
-		}
-
-		100% {
-			opacity: 0.2;
-		}
-	}
-
-	.bind-admin-wappper {
-		width: 600rpx;
-		height: 682rpx;
-		border-radius: 20rpx;
-		background-color: #fff;
-
-		.title {
-			padding-top: 70rpx;
-			font-size: 42rpx;
-			text-align: center;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #901b21;
-		}
-
-		.admin-item {
-			.item-name {
-				padding-top: 55rpx;
-				padding-bottom: 20rpx;
-				font-size: 32rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #333333;
-				padding-left: 68rpx;
-			}
-
-			.item-val {
-				width: 470rpx;
-				height: 70rpx;
-				line-height: 70rpx;
-				margin: 0 auto;
-				background: #ffffff;
-				border: 1px solid #999999;
-				border-radius: 6px;
-				outline: none;
-
-				input {
-					padding-left: 20rpx;
-					display: block;
-					height: 70rpx;
-					line-height: 70rpx;
-				}
-			}
-		}
-
-		.btn-wrapper {
-			margin-top: 60rpx;
-			display: flex;
-			justify-content: space-between;
-			height: 50rpx;
-			padding: 0 65rpx;
-
-			.btn {
-				// margin-right: 22rpx;
-				text-align: center;
-				font-size: 30rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				line-height: 70rpx;
-				color: #666666;
-				width: 224rpx;
-				height: 70rpx;
-				border-radius: 6rpx;
-				border: 1px solid #999999;
-			}
-
-			.btn1 {
-				color: #fff;
-				background-color: #901b21;
-			}
-		}
-	}
-
-	.top-search {
-		width: 750rpx;
-		height: 100rpx;
-		// padding-top: 20rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		position: relative;
-
-		.search-key {
-			width: 700rpx;
-			height: 70rpx;
-			padding-left: 100rpx;
-			background: #FFFFFF;
-			box-shadow: 0px 1rpx 21rpx 0px rgba(144, 27, 33, 0.12);
-			border-radius: 35rpx;
-			position: relative;
-		}
-
-		.search-logo {
-			width: 36rpx;
-			height: 36rpx;
-			position: absolute;
-			top: 0;
-			bottom: 0;
-			left: 50rpx;
-			margin: auto;
-		}
-
-		.search-btn {
-			width: 150rpx;
-			height: 70rpx;
-			border-radius: 30rpx;
-			color: rgb(144, 27, 33);
-			text-align: center;
-			line-height: 70rpx;
-			position: absolute;
-			top: 0;
-			bottom: 0;
-			right: 10rpx;
-			margin: auto;
-			// background-color: red;
-			z-index: 9;
-		}
-	}
-</style>

user/page/dlcenter.vue

@@ -1,425 +0,0 @@
-<template>
-	<view class="center">
-		<view class="top">
-			<image src="../../static/img/sybg.png" mode="" class="sybg"></image>
-			<view class="top-card">
-				<view class="card-tit">
-					<view class="tit-point"></view>
-					代理收益总览
-				</view>
-				<view class="card-icon">
-					<image src="../../static/icon/moneyget.png" mode=""></image>
-				</view>
-				<view class="now-tit">
-					本月收益
-				</view>
-				<view class="now-money">
-					{{month_momey}}
-				</view>
-				<view class="card-btm flex">
-					<view class="card-info flex">
-						<image src="../../static/icon/dayget.png" mode=""></image>
-						<view class="info-wrap">
-							<view class="info-tit">
-								今日收益
-							</view>
-							<view class="info-val">
-								￥{{today_momey}}
-							</view>
-						</view>
-					</view>
-					<view class="card-info flex">
-						<image src="../../static/icon/daydd.png" mode=""></image>
-						<view class="info-wrap">
-							<view class="info-tit">
-								今日订单
-							</view>
-							<view class="info-val dan">
-								{{today_count }}
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="mid-tit flex">
-			<view class="mid-left flex">
-				<image src="../../static/icon/time.png" mode=""></image>
-				<view class="left-tit">
-					本月订单数
-				</view>
-			</view>
-			<view class="mid-right">
-			     {{month_count}}单
-			</view>
-		</view>
-		<view class="btm-tab">
-			<view class="tab-tit flex">
-				<view class="tab-top-left tab-content">
-					每月营业额
-				</view>
-				<view class="tab-top-center tab-content">
-					订单数
-				</view>
-				<view class="tab-top-right tab-content">
-					金额
-				</view>
-			</view>
-			<scroll-view scroll-y="true" class="list-wrapper" :style="{'height':height}">
-				<!-- 空白页 -->
-				<empty v-if=" loaded && monthList.length == 0"></empty>
-				<view v-for="item in monthList" class="flex list" :key="item.time">
-					<view class="tab-top-left tab-content ">
-						{{item.time | time}}
-					</view>
-					<view class="tab-top-center tab-content">
-						{{item.frontNumber}}单
-					</view>
-					<view class="tab-top-right tab-content money">
-						￥{{item.frontPrice}}
-					</view>
-				</view>
-				<uni-load-more :status="loadingType" v-if="loadingType == 'loading'"></uni-load-more>
-			</scroll-view>
-		</view>
-
-	</view>
-</template>
-
-<script>
-	import {
-		getOrderTime,
-		getOrderData,
-		getOrderMonth,
-		getAreaOrderMonth,
-		getAreaOrderDay
-	} from '@/api/wallet.js'
-	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-	import empty from '@/components/empty';
-	export default {
-		components: {
-			empty,
-			uniLoadMore
-		},
-		data() {
-			let start = new Date(new Date().toLocaleDateString()).getTime()
-			return {
-				height: '',
-				list: [],
-				loadingType: 'more',
-				page: 1,
-				limit: 10,
-				monthList: {},
-				loaded: false,
-				month_momey: '',//月营业额
-				today_momey: '',//日营业额
-				tiday_start: start/1000,//今日零点时间戳
-				today_count: '',//今日订单数
-			}
-		},
-		computed: {
-			month_count() {
-				if(this.monthList.length > 0) {
-					return this.monthList[0].frontNumber
-				}else {
-					return 0
-				}
-				
-			}
-		},
-		filters: {
-			time(val) {
-				let str = ''
-				if (val) {
-					val = val + ''
-					let str1 = val.slice(0, 4)
-					let str2 = val.slice(4, )
-					return str = str1 + '年' + str2 + '月'
-				}
-				return str
-			}
-		},
-		onReady(res) {
-			var _this = this;
-			uni.getSystemInfo({
-				success: resu => {
-					const query = uni.createSelectorQuery();
-					query.select('.list-wrapper').boundingClientRect();
-					query.exec(function(res) {
-						console.log(res, 'ddddddddddddd');
-						_this.height = resu.windowHeight - res[0].top + 'px';
-						console.log('打印页面的剩余高度', _this.height);
-					});
-				},
-				fail: res => {}
-			});
-		},
-		onLoad() {
-			 console.log(this.tiday_start,'start')
-			this.getOrderMonth()
-			this.getMonth()
-			this.getTaday()
-			this.getTadayCount()
-		},
-		methods: {
-			// 获取每月数据
-			getOrderMonth() {
-				this.loadingType = 'loading'
-				getAreaOrderMonth().then(({
-					data
-				}) => {
-					console.log(data,'// 获取每月数据')
-					this.loadingType = 'noMore'
-					let arr = []
-					for (let val in data) {
-						arr.push({
-							time: +val.replace(/-/, ''),
-							frontPrice: data[val].frontPrice,
-							frontNumber: data[val].frontNumber
-						})
-					}
-					this.monthList = arr.sort(function(a, b) {
-						return b.time - a.time
-					})
-				})
-			},
-			// 获取本月营业额
-			getMonth() {
-				getAreaOrderDay({
-					type: 1
-				}).then(({
-					data
-				}) => {
-					console.log(data, '本月营业额')
-					this.month_momey = data.time
-				})
-			},
-			// 获取本日营业额
-			getTaday() {
-				getAreaOrderDay({
-					start: this.tiday_start,
-					type: 1
-				}).then(({data}) => {
-					console.log(data, '本日收益')
-					this.today_momey = data.time
-				})
-			},
-			//获取本日订单数
-			getTadayCount() {
-				getAreaOrderDay({
-					start: this.tiday_start,
-					type: 0
-				}).then(({data}) => {
-					console.log(data, '本日单数')
-					this.today_count= data.time
-				})
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.top {
-		height: 585rpx;
-		// background-color: #f6f7f8;
-		position: relative;
-
-		.sybg {
-			position: absolute;
-			width: 100%;
-			height: 265rpx;
-		}
-
-		.top-card {
-			width: 688rpx;
-			height: 398rpx;
-			padding: 32rpx;
-			background: #FFFFFF;
-			box-shadow: -2rpx 4rpx 18rpx 0px rgba(0, 110, 238, 0.2);
-			border-radius: 24rpx;
-			position: absolute;
-			right: 0;
-			left: 0;
-			bottom: 40rpx;
-			margin: 0 auto;
-
-			.now-tit {
-				text-align: right;
-				font-size: 24rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #999999;
-			}
-
-			.now-money {
-				padding-top: 10rpx;
-				text-align: right;
-				font-size: 72rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #901B21;
-
-				&::before {
-					content: '￥';
-					font-size: 44rpx;
-					position: relative;
-					bottom: 5rpx;
-				}
-			}
-
-			.card-icon {
-				position: absolute;
-				top: 100rpx;
-				left: 48rpx;
-				width: 224rpx;
-				height: 122rpx;
-
-				image {
-					width: 100%;
-					height: 100%;
-				}
-			}
-
-			.card-tit {
-				display: flex;
-				align-items: center;
-
-				.tit-point {
-					display: inline-block;
-					width: 12rpx;
-					height: 32rpx;
-					background: #901B21;
-					border-radius: 3rpx;
-					margin-right: 17rpx;
-				}
-
-				font-size: 32rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #333333;
-			}
-
-			.card-btm {
-				position: absolute;
-				bottom: 32rpx;
-				width: 624rpx;
-				height: 122rpx;
-				background: linear-gradient(180deg, rgba(220, 184, 118, 0.12) 0%, rgba(220, 184, 118, 0) 100%);
-				border-radius: 12rpx;
-
-				.card-info {
-					width: 50%;
-					flex-shrink: 0;
-					padding-left: 30rpx;
-					justify-content: flex-start;
-					align-items: center;
-
-					image {
-						width: 48rpx;
-						height: 48rpx;
-					}
-
-					.info-wrap {
-						padding-left: 20rpx;
-
-						.info-tit {
-							font-size: 28rpx;
-							font-family: PingFang SC;
-							font-weight: 500;
-							color: #999999;
-						}
-
-						.info-val {
-							// padding-top: 15rpx;
-							font-size: 36rpx;
-							font-family: PingFang SC;
-							font-weight: bold;
-							color: #DCB876;
-							text-align: center;
-						}
-
-						.dan {
-							&::after {
-								content: '单';
-								font-size: 32rpx;
-								position: relative;
-								bottom: 3rpx;
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	.mid-tit {
-		background-color: #fff;
-		height: 80rpx;
-		padding: 0 30rpx 0 33rpx;
-		justify-content: space-between;
-		align-items: center;
-		margin-bottom: 12rpx;
-
-		.mid-left {
-
-			image {
-				margin-right: 13rpx;
-				width: 33rpx;
-				height: 33rpx;
-			}
-		}
-	}
-
-	.btm-tab {
-		background-color: #fff;
-
-		// padding: 0 30rpx 0 35rpx;
-		.tab-top-left {
-			text-align: left;
-			padding-left: 35rpx;
-		}
-
-		.tab-top-center {
-			text-align: center;
-		}
-
-		.tab-top-right {
-			text-align: right;
-			padding-right: 30rpx;
-		}
-
-		.tab-tit {
-			height: 72rpx;
-			font-size: 24rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #999999;
-
-			.tab-content {
-				width: 33%;
-			}
-
-		}
-	}
-
-	.list-wrapper {
-		background-color: #fff;
-
-		.list {
-			height: 70rpx;
-
-			view {
-				width: 33.3%;
-				flex-shrink: 0;
-				font-size: 28rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #333333;
-			}
-
-			.money {
-				color: #901B21;
-			}
-		}
-	}
-</style>

user/page/extension.vue

@@ -1,428 +1,398 @@
 <template>
- 	<view class="content">
- 		<view class="content-money">
- 			<view class="money-box">
- 				<!-- <view class="goback-box" @click="toBack">
- 					<image class="goback" src="https://37shop.liuniu946.com/front/img/fanhui.png" mode=""></image>
- 				</view>
- 				<view class="header">我的推广</view> -->
- 				<image class="tuiguang_bg" src="../../static/img/tgbg.png"></image>
- 				<view class="money-frame">
- 					<!-- <view class="money_name">我的推广</view> -->
- 					<view class="money_num">
- 						{{userInfo.spread_count || '0'}}
- 						<text class="money_ren">人</text>
- 					</view>
- 				</view>
- 			</view>
- 			<view class="flex buttom-box">
- 				<view class="buttom" @click="tabClick(0)">
- 					<view class="money">{{total || 0}}</view>
- 					<text class="text" :class="{ current: tabCurrentIndex === 0 }">一级推广</text>
- 				</view>
- 				<view class="buttom" @click="tabClick(1)">
- 					<view class="money">{{totalLevel || 0}}</view>
- 					<text class="text" :class="{ current: tabCurrentIndex === 1 }">二级推广</text>
- 				</view>
- 			</view>
- 		</view>
- 		<swiper :current="tabCurrentIndex" :style="{ height: maxheight + 'px' }" 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 flex_item">
- 							<view class="title-avatar">
- 								<image :src="item.avatar"></image>
- 							</view>
- 							<view class="list_tpl">
- 								<view class="title">
- 									<text>{{ item.nickname }}</text>
- 								</view>
- 								<view class="time">
- 									<text>{{ item.spread_time }}</text>
- 								</view>
- 							</view>
- 						</view>
- 					</view>
- 					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
- 				</scroll-view>
- 			</swiper-item>
- 		</swiper>
- 	</view>
- </template>
- <script>
- 	import {
- 		getExtensionData,
- 		getUserInfo,
- 		getSpreadPeople
- 	} from '@/api/user.js';
- 	import {
- 		mapState,
- 		mapMutations
- 	} from 'vuex';
- 	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
- 	import empty from '@/components/empty';
- 	export default {
- 		components: {
- 			empty,
- 			uniLoadMore,
- 		},
- 		onReady() {
- 			// 初始化获取页面宽度
- 			uni.createSelectorQuery()
- 				.select('.content')
- 				.fields({
- 						size: true
- 					},
- 					data => {
- 						// console.log(data);
- 						// console.log(Math.floor((data.width / 750) * 300));
- 						// 保存头部高度
- 						this.maxheight = data.height - Math.floor((data.width / 750) * 470) - 44;
- 						// console.log(this.maxheight);
- 					}
- 				)
- 				.exec();
- 		},
- 		data() {
- 			return {
- 				// 头部图高度
- 				maxheight: '',
- 				tabCurrentIndex: 0,
- 				navList: [{
- 						state: 0,
- 						text: '一级推广',
- 						loadingType: 'more',
- 						orderList: [],
- 						page: 1, //当前页数
- 						limit: 10 //每次信息条数
- 					},
- 					{
- 						state: 1,
- 						text: '二级推广',
- 						loadingType: 'more',
- 						orderList: [],
- 						page: 1, //当前页数
- 						limit: 10 //每次信息条数
- 					}
- 				],
- 				all: '',
- 				list: '',
- 				total: '',
- 				totalLevel: '',
- 				img: 'http://kaifa.crmeb.net/uploads/attach/2019/08/20190807/723adbdd4e49a0f9394dfc700ab5dba3.png',
- 				userInfo: {}
- 			};
- 		},
- 		onLoad(options) {},
- 		onShow() {
- 			this.loadData();
- 			this.loadAll()
- 		},
- 		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;
- 				}
- 				if (navItem.loadingType === 'noMore') {
- 					//防止重复加载
- 					return;
- 				}
- 				// 修改当前对象状态为加载中
- 				navItem.loadingType = 'loading';
- 				getSpreadPeople({
- 						page: navItem.page,
- 						limit: navItem.limit,
- 						keyword: '',
- 						// sort: 'ASC/DESC',
- 						// level: index,
- 						// sort:'uid desc'
- 						// sort: 'pay_price ASC'
- 						grade: state
- 					}, )
- 					.then(({
- 						data
- 					}) => {
- 						console.log(data);
-
- 						this.total = data.total;
- 						this.totalLevel = data.totalLevel;
- 						// this.all = this.total + this.totalLevel;
- 						if (data.list.length > 0) {
- 							this.list = data.list;
- 							navItem.orderList = navItem.orderList.concat(data.list);
- 							navItem.page++;
- 						}
- 						this.$nextTick(function() {
- 							if (navItem.limit == data.list.length) {
- 								//判断是否还有数据， 有改为 more， 没有改为noMore
- 								navItem.loadingType = 'more';
- 								return;
- 							} else {
- 								//判断是否还有数据， 有改为 more， 没有改为noMore
- 								navItem.loadingType = 'noMore';
- 							}
- 						})
- 						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;
- 			},
- 			// 点击返回 我的页面
- 			toBack() {
- 				uni.switchTab({
- 					url: '/pages/user/user'
- 				})
- 			},
- 			loadAll() {
- 				getUserInfo().then(res => {
- 					this.userInfo = res.data
- 					console.log(res, '6666666666666666666')
- 				});
- 			}
- 		}
- 	};
- </script>
-
- <style lang="scss">
- 	page {
- 		background: #ffffff;
- 		height: 100%;
- 	}
-
- 	.content-money {
- 		padding-bottom: 30rpx;
- 		background: $page-color-base;
-
- 		.buttom-box {
- 			position: relative;
- 			background-color: #ffffff;
- 			text-align: center;
- 			margin: 0 30rpx;
- 			padding: 30rpx 0;
- 			box-shadow: 0px 0px 20px 0px rgba(50, 50, 52, 0.06);
- 			border-radius: $border-radius-sm;
- 			margin-top: -60rpx;
-
- 			.buttom {
- 				flex-grow: 1;
- 			}
-
- 			.money {
-
- 				font-size: 32rpx;
- 				font-weight: bold;
- 				color: #921a23;
- 			}
-
- 			.text {
- 				padding-bottom: 26rpx;
- 				font-size: 28rpx;
- 				font-weight: 500;
- 				color: #666666;
-
- 				&.current {
- 					border-bottom: 2px solid #921a23;
- 				}
- 			}
-
- 			.icon {
- 				height: 50rpx;
- 				width: 48rpx;
- 				margin: 0 auto;
-
- 				.icon-img {
- 					width: 100%;
- 					height: 100%;
- 				}
- 			}
- 		}
- 	}
-
- 	.money-box {
- 		// background: $base-color;
- 		height: 380rpx;
- 		color: #ffffff;
- 		text-align: center;
- 		font-size: 35rpx;
- 		position: relative;
-
- 		// padding-top: 60rpx;
- 		.header {
- 			position: absolute;
- 			left: 0;
- 			top: 0;
- 			width: 100%;
- 			height: 80rpx;
- 			font-size: 36rpx;
- 			font-weight: bold;
- 			z-index: 99;
- 			display: flex;
- 			justify-content: center;
- 			align-items: center;
- 		}
-
- 		.goback-box {
- 			position: absolute;
- 			left: 29rpx;
- 			top: 0;
- 			height: 80rpx;
- 			display: flex;
- 			align-items: center;
- 		}
-
- 		.goback {
- 			z-index: 100;
- 			width: 34rpx;
- 			height: 34rpx;
- 		}
-
- 		.tuiguang_bg {
- 			width: 100%;
- 			height: 400rpx;
- 			position: relative;
- 		}
-
- 		.money_img {
- 			width: 100%;
- 			height: 120rpx;
- 			text-align: center;
- 			padding-top: 50rpx;
- 			padding-bottom: 135rpx;
-
- 			image {
- 				width: 120rpx;
- 				height: 120rpx;
- 				border: 4rpx solid #FD5F6F;
- 				border-radius: 50%;
- 			}
- 		}
-
- 		.money-frame {
- 			position: absolute;
- 			top: 0;
- 			width: 100%;
- 			padding-top: 120rpx;
- 			// left: 30rpx;
- 			// height: 460rpx;
- 			// display: flex;
- 			// align-items: flex-start;
- 			// flex-direction: column;
- 			// justify-content: center;
- 		}
-
- 		.money_name {
- 			width: 100%;
- 			text-align: center;
- 			font-size: 32rpx;
- 			font-family: PingFang SC;
- 			font-weight: bold;
- 			color: #FFFFFF;
-
- 		}
-
- 		.money_num {
- 			font-size: 72rpx;
- 			font-family: PingFang SC;
- 			font-weight: bold;
- 			color: #FFFFFF;
-
- 			.money_ren {
- 				font-size: 36rpx;
- 			}
- 		}
- 	}
-
- 	// 列表
-
- 	.swiper-box {
- 		padding-top: 10rpx;
-
- 		.order-item {
- 			padding: 20rpx 30rpx;
- 			line-height: 1.5;
-
- 			.title-box {
- 				width: 100%;
-
- 				.title-avatar {
- 					width: 100rpx;
- 					height: 100rpx;
- 					margin-right: 25rpx;
-
- 					image {
- 						width: 100%;
- 						height: 100%;
- 						border-radius: 100%;
- 					}
- 				}
-
- 				.list_tpl {
- 					width: 85%;
-
- 					.title {
- 						font-size: $font-lg;
- 						color: $font-color-base;
- 						overflow: hidden; //超出的文本隐藏
- 						text-overflow: ellipsis; //溢出用省略号显示
- 						white-space: nowrap;
- 					}
-
- 					.time {
- 						margin-top: 15rpx;
- 						font-size: 22rpx;
- 						color: $font-color-light;
- 					}
- 				}
- 			}
-
- 			.money {
- 				color: #DB1935;
- 				font-size: $font-lg;
- 			}
- 		}
- 	}
-
- 	.list-scroll-content {
- 		height: 100%;
- 	}
-
- 	.content {
- 		height: 100%;
-
- 		.empty-content {
- 			background-color: #ffffff;
- 		}
- 	}
- </style>
+	<view class="content">
+		<view class="content-money">
+			<view class="money-box">
+				<view class="money-frame">
+					<view class="money_num">
+						{{ userInfo.spread_count || '0' }}
+						<text class="money_ren">人</text>
+					</view>
+				</view>
+			</view>
+			<view class="flex buttom-box">
+				<view class="buttom" @click="tabClick(0)">
+					<view class="money">{{ total || 0 }}</view>
+					<text class="text" :class="{ current: tabCurrentIndex === 0 }">一级推广</text>
+				</view>
+				<view class="buttom" @click="tabClick(1)">
+					<view class="money">{{ totalLevel || 0 }}</view>
+					<text class="text" :class="{ current: tabCurrentIndex === 1 }">二级推广</text>
+				</view>
+			</view>
+		</view>
+		<swiper :current="tabCurrentIndex" :style="{ height: maxheight + 'px' }" 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 flex_item">
+							<view class="title-avatar"><image :src="item.avatar"></image></view>
+							<view class="list_tpl">
+								<view class="title">
+									<text>{{ item.nickname }}</text>
+								</view>
+								<view class="time">
+									<text>{{ item.spread_time }}</text>
+								</view>
+							</view>
+						</view>
+					</view>
+					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+	</view>
+</template>
+<script>
+import { getExtensionData, getUserInfo, getSpreadPeople } from '@/api/user.js';
+import { mapState, mapMutations } from 'vuex';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import empty from '@/components/empty';
+export default {
+	components: {
+		empty,
+		uniLoadMore
+	},
+	onReady() {
+		// 初始化获取页面宽度
+		uni.createSelectorQuery()
+			.select('.content')
+			.fields(
+				{
+					size: true
+				},
+				data => {
+					// console.log(data);
+					// console.log(Math.floor((data.width / 750) * 300));
+					// 保存头部高度
+					this.maxheight = data.height - Math.floor((data.width / 750) * 470) - 44;
+					// console.log(this.maxheight);
+				}
+			)
+			.exec();
+	},
+	data() {
+		return {
+			// 头部图高度
+			maxheight: '',
+			tabCurrentIndex: 0,
+			navList: [
+				{
+					state: 0,
+					text: '一级推广',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10 //每次信息条数
+				},
+				{
+					state: 1,
+					text: '二级推广',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10 //每次信息条数
+				}
+			],
+			all: '',
+			list: '',
+			total: '',
+			totalLevel: '',
+			img: 'http://kaifa.crmeb.net/uploads/attach/2019/08/20190807/723adbdd4e49a0f9394dfc700ab5dba3.png',
+			userInfo: {}
+		};
+	},
+	onLoad(options) {},
+	onShow() {
+		this.loadData();
+		this.loadAll();
+	},
+	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;
+			}
+			if (navItem.loadingType === 'noMore') {
+				//防止重复加载
+				return;
+			}
+			// 修改当前对象状态为加载中
+			navItem.loadingType = 'loading';
+			getSpreadPeople({
+				page: navItem.page,
+				limit: navItem.limit,
+				keyword: '',
+				grade: state
+			})
+				.then(({ data }) => {
+					console.log(data);
+
+					this.total = data.total;
+					this.totalLevel = data.totalLevel;
+					// this.all = this.total + this.totalLevel;
+					if (data.list.length > 0) {
+						this.list = data.list;
+						navItem.orderList = navItem.orderList.concat(data.list);
+						navItem.page++;
+					}
+					this.$nextTick(function() {
+						if (navItem.limit == data.list.length) {
+							//判断是否还有数据， 有改为 more， 没有改为noMore
+							navItem.loadingType = 'more';
+							return;
+						} else {
+							//判断是否还有数据， 有改为 more， 没有改为noMore
+							navItem.loadingType = 'noMore';
+						}
+					});
+					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;
+		},
+		// 点击返回 我的页面
+		toBack() {
+			uni.switchTab({
+				url: '/pages/user/user'
+			});
+		},
+		loadAll() {
+			getUserInfo().then(res => {
+				this.userInfo = res.data;
+				console.log(res, '6666666666666666666');
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background: #ffffff;
+	height: 100%;
+}
+
+.content-money {
+	padding-bottom: 30rpx;
+	background: $page-color-base;
+
+	.buttom-box {
+		position: relative;
+		background-color: #ffffff;
+		text-align: center;
+		margin: 0 30rpx;
+		padding: 30rpx 0;
+		box-shadow: 0px 0px 20px 0px rgba(50, 50, 52, 0.06);
+		border-radius: $border-radius-sm;
+		margin-top: -60rpx;
+
+		.buttom {
+			flex-grow: 1;
+		}
+
+		.money {
+			font-size: 32rpx;
+			font-weight: bold;
+			color: #ee2f72;
+		}
+
+		.text {
+			padding-bottom: 26rpx;
+			font-size: 28rpx;
+			font-weight: 500;
+			color: #666666;
+
+			&.current {
+				border-bottom: 2px solid #ee2f72;
+			}
+		}
+
+		.icon {
+			height: 50rpx;
+			width: 48rpx;
+			margin: 0 auto;
+
+			.icon-img {
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+}
+
+.money-box {
+	background: #ee2f72;
+	height: 380rpx;
+	color: #ffffff;
+	text-align: center;
+	font-size: 35rpx;
+	position: relative;
+	.header {
+		position: absolute;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 80rpx;
+		font-size: 36rpx;
+		font-weight: bold;
+		z-index: 99;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.goback-box {
+		position: absolute;
+		left: 29rpx;
+		top: 0;
+		height: 80rpx;
+		display: flex;
+		align-items: center;
+	}
+
+	.goback {
+		z-index: 100;
+		width: 34rpx;
+		height: 34rpx;
+	}
+
+	.money_img {
+		width: 100%;
+		height: 120rpx;
+		text-align: center;
+		padding-top: 50rpx;
+		padding-bottom: 135rpx;
+
+		image {
+			width: 120rpx;
+			height: 120rpx;
+			border: 4rpx solid #fd5f6f;
+			border-radius: 50%;
+		}
+	}
+
+	.money-frame {
+		position: absolute;
+		top: 0;
+		width: 100%;
+		padding-top: 120rpx;
+		// left: 30rpx;
+		// height: 460rpx;
+		// display: flex;
+		// align-items: flex-start;
+		// flex-direction: column;
+		// justify-content: center;
+	}
+
+	.money_name {
+		width: 100%;
+		text-align: center;
+		font-size: 32rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #ffffff;
+	}
+
+	.money_num {
+		font-size: 72rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #ffffff;
+
+		.money_ren {
+			font-size: 36rpx;
+		}
+	}
+}
+
+// 列表
+
+.swiper-box {
+	padding-top: 10rpx;
+
+	.order-item {
+		padding: 20rpx 30rpx;
+		line-height: 1.5;
+
+		.title-box {
+			width: 100%;
+
+			.title-avatar {
+				width: 100rpx;
+				height: 100rpx;
+				margin-right: 25rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+					border-radius: 100%;
+				}
+			}
+
+			.list_tpl {
+				width: 85%;
+
+				.title {
+					font-size: $font-lg;
+					color: $font-color-base;
+					overflow: hidden; //超出的文本隐藏
+					text-overflow: ellipsis; //溢出用省略号显示
+					white-space: nowrap;
+				}
+
+				.time {
+					margin-top: 15rpx;
+					font-size: 22rpx;
+					color: $font-color-light;
+				}
+			}
+		}
+
+		.money {
+			color: #db1935;
+			font-size: $font-lg;
+		}
+	}
+}
+
+.list-scroll-content {
+	height: 100%;
+}
+
+.content {
+	height: 100%;
+
+	.empty-content {
+		background-color: #ffffff;
+	}
+}
+</style>

user/page/myex.vue

@@ -1,539 +0,0 @@
-<template>
-	<view class="content">
-		<view class="navbar">
-			<view v-for="(itemn, index) in navList" :key="index" class="nav-item"
-				:class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ itemn.text }}</view>
-		</view>
-		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" :style="{ height: height}"
-			@change="changeTab">
-			<swiper-item v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view scroll-y="true" :style="{ height: height}" style="padding-top: 20rpx;"
-					@scrolltolower="getMyex()">
-					<empty v-if="tabItem.loaded && tabItem.list.length === 0"></empty>
-					<view class="order-item" v-for="i in tabItem.list" :key="i.id">
-						<view class="i-td">
-							<view class="td-left">订单编号：{{ i.order_id }}</view>
-							<view class="td-right" v-if="i.status == 0" style="color: #901b21;font-weight: bold;">未使用
-							</view>
-							<view class="td-right" v-if="i.status == 1">已使用</view>
-						</view>
-						<view class="goods-box">
-							<view class="goods-left flex">
-								<image class="goods-img"
-									:src="i.cart_info.productInfo.image || '../../static/error/errorImage.jpg'"></image>
-								<view class="goods-name">
-									<view class="p clamp2">{{ i.cart_info.productInfo.store_name }}</view>
-								</view>
-							</view>
-							<view class="goods-price">
-								<!-- <view class="">￥{{ price(i.price) }}</view> -->
-								<!-- <view class="num">x{{ item.cart_num }}</view> -->
-								<br />
-							</view>
-						</view>
-						<view class="i-td">
-							<view class="td-left"></view>
-							<view class="i-bottom clamp" v-if="i.gift_uid == userInfo.uid">由{{i.user.nickname}}赠送</view>
-							<view class="i-bottom clamp" v-if="i.gift_uid != 0 && i.gift_uid !== userInfo.uid"
-								style="font-size: 28rpx; color: #999;">已赠送给{{i.gift_user.nickname}}</view>
-							<view class="i-bottom" style="">
-								<text>合计 ￥{{ i.pay_price*1  + i.deposit*1}}</text>
-							</view>
-						</view>
-						<view class="btn-box">
-							<!-- 				<view class="clamp" style="font-size: 28rpx; color: #999;" v-if="i.gift_uid == userInfo.uid">由{{i.user.nickname}}赠送</view>
-							<view class="clamp" v-if="i.gift_uid != 0 && i.gift_uid !== userInfo.uid" style="font-size: 28rpx; color: #999;">已赠送给{{i.gift_user.nickname}}</view> -->
-							<view class="btn" @click.stop="showCode(i)"
-								v-if="i.status == 0 && i.gift_uid == userInfo.uid">出示券码
-							</view>
-							<view class="btn" @click.stop="showCode(i)" v-if="i.status == 0 && i.gift_uid == 0">出示券码
-							</view>
-							<view class="btn" @click.stop="shareF(i)" v-if="i.status == 0 && i.gift_uid == 0">赠送好友
-							</view>
-						</view>
-					</view>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-
-		<!-- <uni-load-more :status="loadingType"></uni-load-more>
-		<uni-popup ref="popuphx" class="agree-wrapper">
-
-		</uni-popup> -->
-	</view>
-</template>
-
-<script>
-	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-	import empty from '@/components/empty';
-	import {
-		orderList,
-		orderGive,
-		getUserList,
-		getMyexchange
-	} from '../../api/order.js'
-	import uniPopup from '@/components/uni-popup/uni-popup.vue'
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-	export default {
-		components: {
-			uniLoadMore,
-			empty,
-			uniPopup
-		},
-		computed: {
-			...mapState('user', ['userInfo']),
-			canPut() {
-				return this.chooseuser == '' ? false : true
-			}
-		},
-		data() {
-			return {
-				height: '',
-				tabCurrentIndex: 0,
-				navList: [{
-						type: 0,
-						text: '未使用',
-						list: [],
-						page: 1,
-						limit: 10,
-						loadingType: 'more',
-						loaded: false,
-					},
-					{
-						type: 1,
-						text: '已使用',
-						list: [],
-						page: 1,
-						limit: 10,
-						loadingType: 'more',
-						loaded: false,
-					}, {
-						type: 9,
-						text: '已送出',
-						list: [],
-						page: 1,
-						limit: 10,
-						loadingType: 'more',
-						loaded: false,
-					}
-				],
-				list: [],
-				page: 1,
-				limit: 10,
-				loadingType: 'more',
-				loaded: false,
-				toname: '',
-				jzUid: '',
-				wxId: '',
-				// userList: [],
-				// canPut: false,//是否可转
-				showList: [],
-				userList: [],
-				chooseuser: '',
-				userData: {},
-				userLoaded: false
-			}
-		},
-		onShow() {
-			this.getMyex()
-			// this.getUserList()
-		},
-		// onReachBottom() {
-		// 	this.getMyex()
-		// },
-		onReady() {
-			var obj = this;
-			uni.getSystemInfo({
-				success: resu => {
-					const query = uni.createSelectorQuery();
-					query.select('.swiper-box').boundingClientRect();
-					query.exec(function(res) {
-						console.log(res, 'ddddddddddddd');
-						obj.height = resu.windowHeight - res[0].top + 'px';
-						console.log('打印页面的剩余高度', obj.height);
-					});
-				},
-				fail: res => {}
-			});
-		},
-		methods: {
-			//swiper 切换
-			changeTab(e) {
-				this.tabCurrentIndex = e.target.current;
-				this.getMyex('tab');
-			},
-			//swiper 切换
-			changeTab(e) {
-				this.tabCurrentIndex = e.target.current;
-				this.getMyex('tab');
-			},
-			//顶部tab点击
-			tabClick(index) {
-				this.tabCurrentIndex = index;
-				this.getMyex('tab');
-			},
-			getUserList() {
-				let obj = this
-				getUserList({
-					keyword: obj.toname
-				}).then(res => {
-					console.log(res, 'userList')
-
-					this.showList = []
-					this.chooseuser = ''
-					this.userData = {}
-					this.userList = res.data
-					this.userLoaded = true
-					res.data.forEach(item => {
-						this.showList.push('ID：' + item.uid + ',昵称：' + item.nickname)
-					})
-				})
-			},
-			price(price) {
-				return (price * 1).toFixed(2);
-			},
-			getMyex(tab) {
-				let obj = this
-				let index = obj.tabCurrentIndex
-				let navItem = obj.navList[index]
-				if (navItem.loadingType == 'loading' || navItem.loadingType == 'noMore') {
-					return
-				}
-				if(tab == 'tab' && navItem.loaded ) {
-					return
-				}
-				navItem.loadingType = 'loading'
-				getMyexchange({
-					// type: 10086,
-					page: navItem.page,
-					limit: navItem.limit,
-					type: navItem.type
-				}).then(({
-					data
-				}) => {
-					navItem.list = navItem.list.concat(data)
-					navItem.page++
-					if (data.length == navItem.limit) {
-						navItem.loadingType = 'more'
-						return
-					} else {
-						navItem.loadingType = 'noMore'
-					}
-					obj.$set(navItem, 'loaded', true)
-				})
-			},
-			showCode(e) {
-				uni.navigateTo({
-					url: '/pages/order/verifyCode?id=' + e.order_id + '&type=exchange' + '&vcode=' + e.verify_code
-				})
-			},
-			shareF(e) {
-				console.log(e)
-				let obj = this
-				this.wxId = e.order_id
-				uni.navigateTo({
-					url: '/user/page/shareEx?shareid=' + e.id + '&scene=' + obj.userInfo.uid + '&logo=' + obj
-						.userInfo.avatar + '&nickname=' + obj.userInfo.nickname + '&goodimg=' + e.cart_info
-						.productInfo.image + '&type=1'
-				})
-				// this.$refs.popuphx.open()
-
-				// orderGive({
-
-				// },e.cartInfo[0].product_attr_unique).then(res => {
-				// 	console.log(res)
-				// })
-			},
-			qhx() {
-				let obj = this
-				if (obj.userData == '') {
-					obj.$api.msg('请选择好友')
-					return
-				}
-				orderGive({
-					uid: obj.userData.uid
-				}, this.wxId).then(res => {
-					console.log(res)
-					console.log()
-					obj.$refs.popuphx.close()
-					uni.showToast({
-						title: '赠送成功',
-						duration: 2000
-					});
-					obj.page = 1
-					obj.list = []
-					obj.loadingType = 'more'
-					obj.getMyex()
-				})
-			},
-			close() {
-				this.$refs.popuphx.close()
-				this.jzUid = ''
-				this.wxId = ''
-			},
-			PickerDire(e) {
-				console.log(e, 'xuan')
-				this.chooseuser = this.showList[e.detail.value]
-				this.userData = this.userList[e.detail.value]
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	page {
-		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,
-	.tab-content,
-	.scroll-y {
-		height: calc(100vh - 44px);
-	}
-
-	.order-item {
-		display: grid;
-		margin-bottom: 20rpx;
-	}
-
-	.btn-box {
-		border-top: 1px solid #f2f2f2;
-		height: 100rpx;
-		width: 100%;
-		padding-right: 20rpx;
-		background-color: #ffffff;
-		display: flex;
-		justify-content: flex-end;
-		align-items: center;
-
-		.btn {
-			margin-left: 10rpx;
-			width: 144rpx;
-			height: 55rpx;
-			border: 1px solid #901b21;
-			border-radius: 28rpx;
-			font-size: 26rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #901b21;
-			line-height: 55rpx;
-			text-align: center;
-		}
-
-		.btn-look {
-			margin-left: 10rpx;
-			width: 144rpx;
-			height: 55rpx;
-			border: 1px solid #ebebeb;
-			border-radius: 28rpx;
-			font-size: 26rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #999999;
-			line-height: 55rpx;
-			text-align: center;
-		}
-	}
-
-	.i-td {
-		display: flex;
-		justify-content: space-between;
-		background-color: #ffffff;
-		padding: 20rpx;
-		color: #999999;
-		font-size: 25rpx;
-
-		.i-bottom {
-			span {
-				margin: 0 10rpx;
-
-				b {
-					font-size: 28rpx;
-					color: #4f4f4f;
-				}
-			}
-		}
-	}
-
-	.goods-box {
-		height: 100%;
-		display: flex;
-		justify-content: space-between;
-		background-color: #f7f7f7;
-		padding: 20rpx;
-
-		.goods-left {
-			align-items: flex-start;
-
-			.goods-img {
-				width: 160rpx;
-				height: 160rpx;
-			}
-
-			.goods-name {
-				margin: 10rpx 40rpx;
-				color: #666666;
-				font-size: 30rpx;
-
-				.p {
-					max-width: 300rpx;
-					margin-bottom: 10rpx;
-				}
-
-				.span {
-					width: 120rpx;
-					background-color: #ffeae5;
-					color: #fd5b23;
-					text-align: center;
-					font-size: 24rpx;
-					padding: 5rpx;
-					border-radius: 5rpx;
-				}
-			}
-		}
-
-		.goods-price {
-			margin: 10rpx 0;
-			text-align: right;
-			display: grid;
-			color: #999999;
-			font-size: 24rpx;
-			position: relative;
-
-			b {
-				color: #901b21;
-				font-size: 35rpx;
-			}
-
-			.num {
-				position: absolute;
-				bottom: 20rpx;
-				right: 10rpx;
-			}
-		}
-	}
-
-	.hx-wrapper {
-		width: 536rpx;
-		height: 630rpx;
-		position: relative;
-
-		// background-color: #fff;
-		.hx-img {
-			width: 536rpx;
-			height: 281rpx;
-
-			image {
-				width: 536rpx;
-				height: 281rpx;
-			}
-		}
-
-		.hx-close {
-			position: absolute;
-			left: 243rpx;
-			bottom: -80rpx;
-			width: 52rpx;
-			height: 52rpx;
-
-			image {
-				width: 52rpx;
-				height: 52rpx;
-			}
-		}
-
-		.hx-body {
-			width: 536rpx;
-			height: 300rpx;
-			background-color: #fff;
-			border-radius: 0 0 10rpx 10rpx;
-
-			.hx-title {
-				width: 536rpx;
-				font-size: 36rpx;
-				font-weight: 500;
-				color: #333333;
-				line-height: 1;
-				padding-top: 42rpx;
-				text-align: center;
-			}
-
-			.choose-user {
-				width: 439rpx;
-				margin: 20rpx auto 0;
-			}
-
-			input {
-				width: 439rpx;
-				height: 68rpx;
-				background: #eeddde;
-				border-radius: 10rpx;
-				margin: 0rpx auto 0;
-				padding-left: 26rpx;
-
-				.hx-placeholder {
-					font-size: 26rpx;
-					font-weight: 500;
-					color: #901b21;
-				}
-			}
-
-			.hx-btn {
-				margin: 44rpx auto 0;
-				width: 353rpx;
-				height: 71rpx;
-				background: #901b21;
-				border-radius: 34rpx;
-				font-size: 36rpx;
-				font-weight: 500;
-				color: #F8F9F9;
-				line-height: 71rpx;
-				text-align: center;
-			}
-
-			.action {
-				background: #999
-			}
-
-
-		}
-	}
-</style>

user/page/notice.vue

@@ -1,153 +0,0 @@
-<template>
-	<view>
-		<view class="notice-item">
-			<text class="time">11:30</text>
-			<view class="content">
-				<text class="title">新品上市，全场满199减50</text>
-				<view class="img-wrapper">
-					<image class="pic" src="https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1556465765776&di=57bb5ff70dc4f67dcdb856e5d123c9e7&imgtype=0&src=http%3A%2F%2Fimg.zcool.cn%2Fcommunity%2F01fd015aa4d95fa801206d96069229.jpg%401280w_1l_2o_100sh.jpg"></image>
-				</view>
-				<text class="introduce">
-					虽然做了一件好事，但很有可能因此招来他人的无端猜测，例如被质疑是否藏有其他利己动机等，乃至谴责。即便如此，还是要做好事。
-				</text>
-				<view class="bot b-t">
-					<text>查看详情</text>
-					<text class="more-icon iconfont iconenter"></text>
-				</view>
-			</view>
-		</view>
-		<view class="notice-item">
-			<text class="time">昨天 12:30</text>
-			<view class="content">
-				<text class="title">新品上市，全场满199减50</text>
-				<view class="img-wrapper">
-					<image class="pic" src="https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=3761064275,227090144&fm=26&gp=0.jpg"></image>
-					<view class="cover">
-						活动结束
-					</view>
-				</view>
-				<view class="bot b-t">
-					<text>查看详情</text>
-					<text class="more-icon iconfont iconenter"></text>
-				</view>
-			</view>
-		</view>
-		<view class="notice-item">
-			<text class="time">2019-07-26 12:30</text>
-			<view class="content">
-				<text class="title">新品上市，全场满199减50</text>
-				<view class="img-wrapper">
-					<image class="pic" src="https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1556465765776&di=57bb5ff70dc4f67dcdb856e5d123c9e7&imgtype=0&src=http%3A%2F%2Fimg.zcool.cn%2Fcommunity%2F01fd015aa4d95fa801206d96069229.jpg%401280w_1l_2o_100sh.jpg"></image>
-					<view class="cover">
-						活动结束
-					</view>
-				</view>
-				<text class="introduce">新品上市全场2折起，新品上市全场2折起，新品上市全场2折起，新品上市全场2折起，新品上市全场2折起</text>
-				<view class="bot b-t">
-					<text>查看详情</text>
-					<text class="more-icon iconfont iconenter"></text>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-
-			}
-		},
-		methods: {
-
-		}
-	}
-</script>
-
-<style lang='scss'>
-	page {
-		background-color: #f7f7f7;
-		padding-bottom: 30upx;
-	}
-
-	.notice-item {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-	}
-
-	.time {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		height: 80upx;
-		padding-top: 10upx;
-		font-size: 26upx;
-		color: #7d7d7d;
-	}
-
-	.content {
-		width: 710upx;
-		padding: 0 24upx;
-		background-color: #fff;
-		border-radius: 4upx;
-	}
-
-	.title {
-		display: flex;
-		align-items: center;
-		height: 90upx;
-		font-size: 32upx;
-		color: #303133;
-	}
-
-	.img-wrapper {
-		width: 100%;
-		height: 260upx;
-		position: relative;
-	}
-
-	.pic {
-		display: block;
-		width: 100%;
-		height: 100%;
-		border-radius: 6upx;
-	}
-
-	.cover {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		position: absolute;
-		left: 0;
-		top: 0;
-		width: 100%;
-		height: 100%;
-		background-color: rgba(0, 0, 0, .5);
-		font-size: 36upx;
-		color: #fff;
-	}
-
-	.introduce {
-		display: inline-block;
-		padding: 16upx 0;
-		font-size: 28upx;
-		color: #606266;
-		line-height: 38upx;
-	}
-
-	.bot {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		height: 80upx;
-		font-size: 24upx;
-		color: #707070;
-		position: relative;
-	}
-
-	.more-icon {
-		font-size: 32upx;
-	}
-</style>

user/page/recommend.vue

@@ -1,184 +0,0 @@
-<template>
-	<view class="recommend">
-		<image src="../../static/img/rmbg.png" mode="" class="bg"></image>
-		<image src="https://zccy.liuniu946.com/static/img/ewmbg1.png" mode="" class="ewmbg"></image>
-		<view class="tit">
-			充值
-		</view>
-		<view class="sotre-name">
-			{{userInfo.store_info.name}}充值码 >
-		</view>
-		<view class="store-info">
-			<image :src="userInfo.store_info.image" mode="" class="store-logo"></image>
-			<view class="store-name">
-				{{userInfo.store_info.name}}
-			</view>
-		</view>
-		<view class="ewm-wrapper">
-			<tki-qrcode :key="'?store_id='+userInfo.store_info.id + '&store_logo=' + userInfo.store_info.image + '&store_name=' + userInfo.store_info.name" cid="tki-qrcode-canvas" ref="qrcode"
-				:val="'?store_id='+userInfo.store_info.id + '&store_logo=' + userInfo.store_info.image + '&store_name=' + userInfo.store_info.name" :size="426" unit="upx" background="#ffffff"
-				foreground="#333333" pdground="#333333" icon="" :iconSize="0" :lv="3" :onval="true"
-				:loadMake="true" :usingComponents="true" />
-			<view class="ewm-tit">
-				扫描二维码完成充值
-			</view>
-		</view>
-		<view class="record-wrapper" @click="goCode">
-			<view class="record-left">
-				<image src="../../static/icon/recode.png" mode=""></image>
-				充值记录
-			</view>
-			<view class="record-right">
-				<image src="../../static/img/img39.png" mode=""></image>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import { mapState, mapMutations } from 'vuex';
-	
-	import tkiQrcode from '@/components/tki-qrcode/tki-qrcode.vue';
-	export default {
-		components: {
-			tkiQrcode
-		},
-		data() {
-			return {
-				
-			}
-		},
-		computed: {
-			...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
-		},
-		onLoad() {
-			console.log(this.userInfo)
-		},
-		methods: {
-			goCode() {
-				uni.navigateTo({
-					url: '/user/page/recode'
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	page {
-		height: 100%;
-		background-color: #343434;
-	}
-	.recommend {
-		height: 100%;
-		width: 750rpx;
-		
-		position: relative;
-		.store-info {
-			width: 750rpx;
-			height: 300rpx;
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-			align-items: center;
-			position: absolute;
-			top: 237rpx;
-			.store-logo {
-				width: 140rpx;
-				height: 140rpx;
-				border-radius: 50%;
-				background-color: #eee;
-			}
-			.store-name {
-				padding-top: 20rpx;
-				font-size: 34rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #333333;
-			}
-		}
-		.bg {
-			width: 750rpx;
-			height: 486rpx;
-			position: absolute;
-			top: 0;
-			left: 0;
-		}
-		.ewmbg {
-			width: 671rpx;
-			height: 966rpx;
-			position: absolute;
-			top: 237rpx;
-			left: 0;
-			right: 0;
-			margin: 0 auto;
-		}
-		.tit {
-			// display: inline-block;
-			font-size: 40rpx;
-			font-family: Source Han Sans CN;
-			font-weight: 400;
-			color: #FFFFFF;
-			position: absolute;
-			top: 95rpx;
-			left: 26rpx;
-		}
-		.sotre-name {
-			font-size: 29rpx;
-			font-family: Source Han Sans CN;
-			font-weight: 400;
-			color: rgba(255, 255, 255, 0.7);
-			position: absolute;
-			top: 160rpx;
-			left: 28rpx;
-			// line-height: 67px;
-		}
-		.ewm-wrapper {
-			width: 429rpx;
-			height: 426rpx;
-			// background-color: red;
-			position: absolute;
-			top: 577rpx;
-			left: 0;
-			right: 0;
-			margin: 0 auto;
-			.ewm-tit {
-				font-size: 24rpx;
-				font-family: Source Han Sans CN;
-				font-weight: 400;
-				color: #999999;
-				position: absolute;
-				text-align: center;
-				bottom: -50rpx;
-				left: 0;
-				right: 0;
-				margin: 0 auto;
-			}
-		}
-		.record-wrapper {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			position: absolute;
-			top: 1099rpx;
-			padding: 0 72rpx;
-			width: 750rpx;
-			.record-left {
-				display: flex;
-				align-items: center;
-			}
-			image {
-				width: 32rpx;
-				height: 30rpx;
-				margin-right: 11rpx;
-			}
-			.record-right {
-				image {
-					width: 12rpx;
-					height: 21rpx;
-					margin-right: 11rpx;
-				}
-			}
-		}
-	}
-</style>

user/page/refundAdmin.vue

@@ -1,1060 +0,0 @@
-<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-search">
-			<input type="number" class="search-key" placeholder="请输入用户手机号码" v-model="userphone" />
-			<image src="../../static/icon/search.png" mode="" class="search-logo"></image>
-			<view class="search-btn" @click.stop="search">搜索</view>
-		</view>
-		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab"
-			:style="{ height: height}">
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData" :style="{ height: height}">
-					<!-- 空白页 -->
-					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-
-					<!-- 订单列表 -->
-					<view @click="goToOrderDetail(item)" v-for="(item, index) in tabItem.orderList" :key="index"
-						class="order-item">
-						<view class="i-top b-b">
-							<!-- <view class=""></view> -->
-							<text class="time">订单编号：{{ item.order_id }}</text>
-							<text class="state" style=" color: #901b21; font-size: 26rpx;font-weight: 500; "
-								v-if="tabCurrentIndex === 0">待退款</text>
-							<text class="state" style=" color: #901b21; " v-else>已退款</text>
-							<text v-if="item.status === 4" class="del-btn iconfont icondelete"
-								@click="deleteOrder(index)"></text>
-						</view>
-
-						<scroll-view v-if="item._info > 1" class="goods-box" scroll-x>
-							<view v-for="(goodsItem, goodsIndex) in item._info" :key="goodsIndex" class="goods-item">
-								<image class="goods-img" :src="goodsItem.cart_info.productInfo.image" mode="aspectFill">
-								</image>
-							</view>
-						</scroll-view>
-						<view class="goods-box-single" v-for="itemt in item._info">
-							<image class="goods-img" :src="itemt.cart_info.productInfo.image" mode="scaleToFill">
-							</image>
-							<view class="right">
-								<view class="flex-start">
-									<text class="title clamp">{{ itemt.cart_info.productInfo.store_name }}</text>
-									<text class="price"
-										style="flex-grow: 1;text-align: right;color: #901B21;font-size: 30rpx;font-weight: bold;">
-										{{ itemt.cart_info.productInfo.price | moneyNum }}
-									</text>
-								</view>
-								<view class="row flex">
-									<!-- <text class="row_title">{{ goodsItem.productInfo.attrInfo ? '商品退款' : '押金退款' }}</text> -->
-									<text class="attr-box">x {{ itemt.cart_info.cart_num}}</text>
-								</view>
-							</view>
-						</view>
-						<view class="flex">
-							
-							<view class="price-box">
-								<text
-									style="color: #901b21;display: inline-block;margin-right: 8rpx;">押金：{{item.deposit}}</text>
-								已退还：{{item.deposit_back}}
-							</view>
-							<view class="price-box" v-if="tabCurrentIndex==0">
-								退款金额：
-								<text class="price">{{ moneyNum(item.pay_price) }}</text>
-							</view>
-						</view>
-						
-						<view class="action-box b-t" v-if="tabCurrentIndex === 0">
-							<button @click.stop="backdeposit(item)" class="action-btn">退还押金</button>
-							<button @click.stop="agreeRefund(item)" class="action-btn">同意退款</button>
-						</view>
-					</view>
-					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-		<uni-popup ref="popupagree" class="agree-wrapper">
-			<view class="agree">
-				<image src="https://zccy.liuniu946.com/static/img/agreebg.png" mode=""></image>
-				<view class="tap1">确认同意该笔退款吗？</view>
-				<view class="tap2">一旦操作将无法再次退还押金</view>
-				<view class="btn-wrapper flex">
-					<view @click="cansel">取消</view>
-					<view class="tybtn" @click="agree">继续</view>
-				</view>
-			</view>
-		</uni-popup>
-		<!-- 押金退款弹窗 -->
-		<uni-popup ref="popupadmin" type="center">
-			<view class="bind-admin-wappper">
-				<view class="title">押金退还</view>
-				<view class="admin-item">
-					<view class="item-name">订单号</view>
-					<view class="item-val"><input type="text" v-model="orderId" placeholder="订单号不能为空" disabled /></view>
-				</view>
-				<view class="admin-item">
-					<view class="item-name">退还金额</view>
-					<view class="item-val"><input type="text" v-model="backNum" placeholder="请输入退还金额" /></view>
-				</view>
-				<view class="btn-wrapper">
-					<view class="btn" @click="backClose">取消</view>
-					<view class="btn btn1" @click="qrbackDeposit">确定</view>
-				</view>
-			</view>
-		</uni-popup>
-	</view>
-</template>
-
-<script>
-	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-	import empty from '@/components/empty';
-	import {
-		orderList,
-		orderCancel,
-		orderDel,
-		orderTake,
-		GetAdminOrderList,
-		aOrderRefund,
-		backDeposit
-	} from '@/api/order.js';
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
-	// import empty from '@/components/empty.vue'
-	export default {
-		components: {
-			uniLoadMore,
-			empty,
-			uniPopup
-		},
-		onReady() {
-			var _this = this;
-			uni.getSystemInfo({
-				success: resu => {
-					const query = uni.createSelectorQuery();
-					query.select('.swiper-box').boundingClientRect();
-					query.exec(function(res) {
-						console.log(res, 'ddddddddddddd');
-						_this.height = resu.windowHeight - res[0].top + 'px';
-						console.log('打印页面的剩余高度', _this.height);
-					});
-				},
-				fail: res => {}
-			});
-		},
-		data() {
-			return {
-				agreeItem: {},
-				height: 0,
-				// maxheight: 0,
-				currentIndex: 0,
-				refList: [], //退款列表
-				navList: [{
-						state: -1,
-						text: '待退款',
-						loadingType: 'more',
-						orderList: [],
-						page: 1, //当前页数
-						limit: 10
-					},
-					{
-						state: -2,
-						text: '已退款',
-						loadingType: 'more',
-						orderList: [],
-						page: 1, //当前页数
-						limit: 10 //每次信息条数
-					}
-				],
-				tabCurrentIndex: 0,
-				orderId: '',
-				backMaxNum: 0,
-				backNum: '',
-				backIndex: '',
-				userphone: '',
-				keyword: '',
-
-			};
-		},
-		filters: {
-			moneyNum(value) {
-				return +value;
-			}
-		},
-		onLoad(options) {
-			/**
-			 * 修复app端点击除全部订单外的按钮进入时不加载数据的问题
-			 * 替换onLoad下代码即可
-			 */
-			console.log(options);
-			this.isUser = options.isUser;
-			console.log(this.isUser);
-			this.tabCurrentIndex = +options.state;
-			// #ifndef MP
-			console.log('dddddddddddddddddddd')
-			this.loadData();
-			// #endif
-			// #ifdef MP
-			if (options.state == 0) {
-				this.loadData();
-			}
-			// #endif
-		},
-		// #ifdef APP-PLUS || H5
-		onBackPress(e) {
-			uni.switchTab({
-				url: '/pages/user/user'
-			});
-			return true;
-		},
-		// #endif
-		methods: {
-			moneyNum(value) {
-				return +value;
-			},
-			// 确认收货
-			orderTake(item, index) {
-				let obj = this;
-				uni.showModal({
-					title: '是否确认收货？',
-					success: () => {
-						orderTake({
-								uni: item.order_id
-							})
-							.then(e => {
-								obj.navList[obj.tabCurrentIndex].orderList.splice(index, 1);
-								uni.showToast({
-									title: '收货成功'
-								});
-							})
-							.catch(e => {
-								console.log(e);
-							});
-					}
-				});
-			},
-			//跳转到订单详情
-			goToOrderDetail(e) {
-				console.log('dddd')
-				uni.navigateTo({
-					// url: '/pages/order/orderDetail?id=' + e.order_id
-					url: '/user/page/orderDetail?id=' + e.order_id
-				});
-			},
-			// 申请退款
-			orderRefund(e) {
-				uni.navigateTo({
-					url: '/pages/order/orderRefund?id=' + e.order_id
-				});
-			},
-			// 订单支付
-			orderPay(e) {
-				uni.navigateTo({
-					url: '/pages/money/pay?type=1&ordid=' + e.order_id + '&money=' + e.pay_price
-				});
-			},
-			//获取订单列表
-			loadData(source) {
-				//这里是将订单挂载到tab列表下
-				let obj =this
-				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;
-				}
-				if (navItem.loadingType === 'noMore') {
-					//防止重复加载
-					return;
-				}
-				// 修改当前对象状态为加载中
-				navItem.loadingType = 'loading';
-				console.log('jiazai+++++++++++++++')
-				GetAdminOrderList({
-						status: state,
-						page: navItem.page,
-						limit: navItem.limit,
-						user_phone: obj.keyword
-					})
-					.then(({
-						data
-					}) => {
-						console.log(data, 'data+++++++++++++++++++++++++++')
-						// let arr = data.map(e => {
-						// 	let b = this.orderStateExp(e.status);
-						// 	e.stateTip = b.stateTip;
-						// 	e.stateTipColor = b.stateTipColor;
-						// 	return e;
-						// });
-
-						let arr = data.map(e => {
-							return e
-						})
-						console.log(data)
-						navItem.orderList = navItem.orderList.concat(arr);
-
-						console.log(data.length, 'ddddddddddddddddddd');
-						navItem.page++;
-						if (navItem.limit == data.length) {
-							//判断是否还有数据， 有改为 more， 没有改为noMore
-							navItem.loadingType = 'more';
-							return;
-						} else {
-							//判断是否还有数据， 有改为 more， 没有改为noMore
-							navItem.loadingType = 'noMore';
-							console.log(navItem.loadingType)
-						}
-						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;
-			},
-			//删除订单
-			deleteOrder(index) {
-				uni.showLoading({
-					title: '请稍后'
-				});
-				setTimeout(() => {
-					this.navList[this.tabCurrentIndex].orderList.splice(index, 1);
-					uni.hideLoading();
-				}, 600);
-			},
-			//取消订单
-			cancelOrder(item) {
-				uni.showModal({
-					title: '订单取消',
-					content: '是否取消订单？',
-					success: e => {
-						if (e.confirm) {
-							uni.showLoading({
-								title: '请稍后'
-							});
-							orderCancel({
-									id: item.order_id
-								})
-								.then(e => {
-									uni.showToast({
-										title: '取消成功',
-										duration: 2000,
-										position: 'top'
-									});
-								})
-								.catch(e => {
-									console.log(e);
-								});
-							//取消订单后删除待付款中该项
-							let list = this.navList[this.tabCurrentIndex].orderList;
-							let index = list.findIndex(val => val.id === item.id);
-							index !== -1 && list.splice(index, 1);
-							uni.hideLoading();
-						}
-					}
-				});
-			},
-
-			//订单状态文字和颜色
-			orderStateExp(state) {
-				let stateTip = '',
-					stateTipColor = '#fa436a';
-				switch (+state) {
-					case 0:
-						stateTip = '待付款';
-						break;
-					case 1:
-						stateTip = '待发货';
-						break;
-					case 2:
-						stateTip = '待收货';
-						break;
-					case 3:
-						stateTip = '待评价';
-						break;
-					case 4:
-						stateTip = '已完成';
-						stateTipColor = '#901b21';
-						break;
-					case 9:
-						stateTip = '订单已关闭';
-						stateTipColor = '#909399';
-						break;
-
-						//更多自定义
-				}
-				return {
-					stateTip,
-					stateTipColor
-				};
-			},
-			agreeRefund(item) {
-				this.agreeItem = item
-				console.log('同意');
-				this.$refs.popupagree.open();
-			},
-			search() {
-				let obj = this
-				if (obj.userphone == '') {
-					obj.keyword = ''
-				} else {
-					const reg = /^(\+?0?86-?)?1[\d]\d{9}$/;
-					if (!reg.test(obj.userphone)) {
-						obj.$api.msg('请填写正确的手机号码');
-						return;
-					}
-				}
-				obj.keyword = obj.userphone
-				obj.navList[obj.tabCurrentIndex].orderList = []
-				obj.navList[obj.tabCurrentIndex].loadingType = 'more'
-				obj.navList[obj.tabCurrentIndex].page = 1
-				obj.loadData()
-			},
-			//取消
-			cansel() {
-				this.$refs.popupagree.close();
-			},
-			//同意退款
-			agree() {
-				aOrderRefund({
-					order_id: this.agreeItem.order_id,
-					price: this.agreeItem.pay_price * 1,
-					type: 1,
-				}).then(res => {
-					console.log(res)
-					this.$api.msg('退款成功')
-					let s = this.navList[this.tabCurrentIndex].orderList.indexOf(this.agreeItem);
-					this.navList[this.tabCurrentIndex].orderList.splice(s, 1);
-				}).catch(err => {
-					console.log(err)
-				})
-				this.$refs.popupagree.close();
-			},
-			// 打开退还押金弹窗
-			backdeposit(item) {
-				let obj = this
-				obj.orderId = item.order_id
-				obj.backMaxNum = item.deposit * 1 - item.deposit_back * 1
-				this.$refs.popupadmin.open()
-				obj.backIndex = obj.navList[obj.tabCurrentIndex].orderList.indexOf(item)
-				console.log(item, 'ddddddddddddddddddddd', obj.backIndex)
-			},
-			// 关闭退还押金弹窗
-			backClose() {
-				let obj = this
-				obj.$refs.popupadmin.close()
-				obj.orderId = ''
-				obj.backMaxNum = ''
-				obj.backNum = ''
-			},
-			// 确认退还押金
-			qrbackDeposit() {
-				let obj = this
-				if (obj.backNum == '') {
-					obj.$api.msg('请输入退还押金')
-					return
-				}
-				if (obj.backNum * 1 > obj.backMaxNum * 1) {
-					obj.$api.msg('退还金额大于押金')
-					return
-				}
-				if (obj.orderId == '') {
-					obj.$api.msg('请选择订单')
-					return
-				}
-
-				backDeposit({
-					order_id: obj.orderId,
-					refund_price: obj.backNum
-				}).then(res => {
-					uni.showToast({
-						title: '退还成功',
-						duration: 2000
-					});
-					console.log(res)
-					obj.navList[obj.tabCurrentIndex].orderList[obj.backIndex].deposit_back = obj.backNum * 1 +
-						obj.navList[obj.tabCurrentIndex].orderList[obj.backIndex]
-						.deposit_back * 1
-					obj.$refs.popupadmin.close()
-					obj.orderId = ''
-					obj.backMaxNum = ''
-					obj.backNum = ''
-				})
-
-			},
-		}
-	};
-</script>
-
-<style lang="scss" scoped>
-	page,
-	.content {
-		background: $page-color-base;
-		height: 100%;
-	}
-
-	.swiper-box {
-		height: calc(100% - 40px);
-	}
-
-	.list-scroll-content {
-		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;
-				}
-			}
-		}
-	}
-
-	.uni-swiper-item {
-		height: auto;
-	}
-
-	.order-item {
-		display: flex;
-		flex-direction: column;
-		padding-left: 30rpx;
-		background: #fff;
-		margin-top: 16rpx;
-
-		.i-top {
-			display: flex;
-			align-items: center;
-			height: 80rpx;
-			padding-right: 30rpx;
-			font-size: $font-base;
-			color: $font-color-dark;
-			position: relative;
-
-			.time {
-				flex: 1;
-			}
-
-			.state {
-				color: $base-color;
-			}
-
-			.del-btn {
-				padding: 10rpx 0 10rpx 36rpx;
-				font-size: $font-lg;
-				color: $font-color-light;
-				position: relative;
-
-				&:after {
-					content: '';
-					width: 0;
-					height: 30rpx;
-					border-left: 1px solid $border-color-dark;
-					position: absolute;
-					left: 20rpx;
-					top: 50%;
-					transform: translateY(-50%);
-				}
-			}
-		}
-
-		/* 多条商品 */
-		.goods-box {
-			height: 160rpx;
-			padding: 20rpx 0;
-			white-space: nowrap;
-
-			.goods-item {
-				width: 120rpx;
-				height: 120rpx;
-				display: inline-block;
-				margin-right: 24rpx;
-			}
-
-			.goods-img {
-				display: block;
-				width: 100%;
-				height: 100%;
-			}
-		}
-
-		/* 单条商品 */
-		.goods-box-single {
-			display: flex;
-			padding: 20rpx 0;
-
-			.goods-img {
-				display: block;
-				width: 120rpx;
-				height: 120rpx;
-			}
-
-			.right {
-				flex: 1;
-				display: flex;
-				flex-direction: column;
-				padding: 0 30rpx 0 24rpx;
-				overflow: hidden;
-
-				.row {
-					margin-top: 10rpx;
-					justify-content: flex-end;
-				}
-
-				.row_title {
-					padding: 5rpx 10rpx;
-					background-color: #dddddd;
-					border-radius: 10rpx;
-					font-size: 22rpx;
-					color: #ffffff;
-					background: #ffeee9;
-					border-radius: 5rpx;
-					color: #f55e5c;
-				}
-
-				.title {
-					font-size: $font-base + 2rpx;
-					color: $font-color-dark;
-					line-height: 1;
-					width: 80%;
-				}
-
-				.attr-box {
-					display: flex;
-					justify-content: flex-end;
-					font-size: $font-sm + 2rpx;
-					color: $font-color-light;
-				}
-
-				.price {
-					display: inline;
-					font-size: $font-base + 2rpx;
-					color: $font-color-dark;
-
-					&:before {
-						content: '￥';
-						font-size: $font-sm;
-					}
-				}
-			}
-		}
-
-		.price-box {
-			display: flex;
-			justify-content: flex-end;
-			align-items: baseline;
-			padding: 20rpx 30rpx;
-			font-size: $font-sm + 2rpx;
-			color: $font-color-light;
-
-			.num {
-				margin: 0 8rpx;
-				color: $font-color-dark;
-			}
-
-			.price {
-				font-size: 26rpx;
-				color: #333;
-
-				&:before {
-					content: '￥';
-					font-size: $font-sm;
-					margin: 0 2rpx 0 8rpx;
-				}
-			}
-		}
-
-		.action-box {
-			display: flex;
-			justify-content: flex-end;
-			align-items: center;
-			height: 100rpx;
-			position: relative;
-			padding-right: 30rpx;
-		}
-
-		.action-btn {
-			display: inline-block;
-			// width: 150rpx;
-			height: 48rpx;
-			background: linear-gradient(90deg, #962c32, #942026);
-			border-radius: 24rpx;
-			// width: 160rpx;
-			// height: 60rpx;
-			margin: 0;
-			margin-left: 24rpx;
-			// padding: 0;
-			text-align: center;
-			line-height: 48rpx;
-			font-size: 26rpx;
-			color: #fff;
-
-			// background: #fff;
-			// border-radius: 100px;
-			&:after {
-				border-radius: 100px;
-			}
-
-			&.recom {
-				color: $base-color;
-
-				&:after {
-					border-color: $base-color;
-				}
-			}
-
-			&.evaluate {
-				color: $color-yellow;
-
-				&:after {
-					border-color: $color-yellow;
-				}
-			}
-		}
-	}
-
-	/* load-more */
-	.uni-load-more {
-		display: flex;
-		flex-direction: row;
-		height: 80rpx;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.uni-load-more__text {
-		font-size: 28rpx;
-		color: #999;
-	}
-
-	.uni-load-more__img {
-		height: 24px;
-		width: 24px;
-		margin-right: 10px;
-	}
-
-	.uni-load-more__img>view {
-		position: absolute;
-	}
-
-	.uni-load-more__img>view view {
-		width: 6px;
-		height: 2px;
-		border-top-left-radius: 1px;
-		border-bottom-left-radius: 1px;
-		background: #999;
-		position: absolute;
-		opacity: 0.2;
-		transform-origin: 50%;
-		animation: load 1.56s ease infinite;
-	}
-
-	.uni-load-more__img>view view:nth-child(1) {
-		transform: rotate(90deg);
-		top: 2px;
-		left: 9px;
-	}
-
-	.uni-load-more__img>view view:nth-child(2) {
-		transform: rotate(180deg);
-		top: 11px;
-		right: 0;
-	}
-
-	.uni-load-more__img>view view:nth-child(3) {
-		transform: rotate(270deg);
-		bottom: 2px;
-		left: 9px;
-	}
-
-	.uni-load-more__img>view view:nth-child(4) {
-		top: 11px;
-		left: 0;
-	}
-
-	.load1,
-	.load2,
-	.load3 {
-		height: 24px;
-		width: 24px;
-	}
-
-	.load2 {
-		transform: rotate(30deg);
-	}
-
-	.load3 {
-		transform: rotate(60deg);
-	}
-
-	.load1 view:nth-child(1) {
-		animation-delay: 0s;
-	}
-
-	.load2 view:nth-child(1) {
-		animation-delay: 0.13s;
-	}
-
-	.load3 view:nth-child(1) {
-		animation-delay: 0.26s;
-	}
-
-	.load1 view:nth-child(2) {
-		animation-delay: 0.39s;
-	}
-
-	.load2 view:nth-child(2) {
-		animation-delay: 0.52s;
-	}
-
-	.load3 view:nth-child(2) {
-		animation-delay: 0.65s;
-	}
-
-	.load1 view:nth-child(3) {
-		animation-delay: 0.78s;
-	}
-
-	.load2 view:nth-child(3) {
-		animation-delay: 0.91s;
-	}
-
-	.load3 view:nth-child(3) {
-		animation-delay: 1.04s;
-	}
-
-	.load1 view:nth-child(4) {
-		animation-delay: 1.17s;
-	}
-
-	.load2 view:nth-child(4) {
-		animation-delay: 1.3s;
-	}
-
-	.load3 view:nth-child(4) {
-		animation-delay: 1.43s;
-	}
-
-	@-webkit-keyframes load {
-		0% {
-			opacity: 1;
-		}
-
-		100% {
-			opacity: 0.2;
-		}
-	}
-
-	.agree-wrapper {
-		.agree {
-			width: 522rpx;
-			height: 605rpx;
-			background: #ffffff;
-			border-radius: 20rpx;
-			text-align: center;
-
-			image {
-				width: 522rpx;
-				height: 307rpx;
-				// background: linear-gradient(90deg, #962C32, #942026);
-				border-radius: 20rpx;
-			}
-
-			.tap1 {
-				padding-top: 47.5rpx;
-				font-size: 36rpx;
-				font-weight: 500;
-				color: #333333;
-				line-height: 1;
-			}
-
-			.tap2 {
-				padding-top: 22rpx;
-				font-size: 30rpx;
-				font-weight: 500;
-				color: #999999;
-				line-height: 1;
-			}
-
-			.btn-wrapper {
-				padding-top: 55.5rpx;
-				justify-content: center;
-
-				view {
-					width: 197rpx;
-					height: 61rpx;
-					border: 1px solid #901b21;
-					border-radius: 31px;
-					background: #ffffff;
-					font-size: 24rpx;
-					font-weight: 500;
-					color: #901b21;
-					line-height: 61rpx;
-				}
-
-				.tybtn {
-					margin-left: 22.8rpx;
-					color: #fff;
-					background-color: #901b21;
-				}
-			}
-		}
-	}
-
-	.bind-admin-wappper {
-		width: 600rpx;
-		height: 682rpx;
-		border-radius: 20rpx;
-		background-color: #fff;
-
-		.title {
-			padding-top: 70rpx;
-			font-size: 42rpx;
-			text-align: center;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #901b21;
-		}
-
-		.admin-item {
-			.item-name {
-				padding-top: 55rpx;
-				padding-bottom: 20rpx;
-				font-size: 32rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #333333;
-				padding-left: 68rpx;
-			}
-
-			.item-val {
-				width: 470rpx;
-				height: 70rpx;
-				line-height: 70rpx;
-				margin: 0 auto;
-				background: #ffffff;
-				border: 1px solid #999999;
-				border-radius: 6px;
-				outline: none;
-
-				input {
-					padding-left: 20rpx;
-					display: block;
-					height: 70rpx;
-					line-height: 70rpx;
-				}
-			}
-		}
-
-		.btn-wrapper {
-			margin-top: 60rpx;
-			display: flex;
-			justify-content: space-between;
-			height: 50rpx;
-			padding: 0 65rpx;
-
-			.btn {
-				// margin-right: 22rpx;
-				text-align: center;
-				font-size: 30rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				line-height: 70rpx;
-				color: #666666;
-				width: 224rpx;
-				height: 70rpx;
-				border-radius: 6rpx;
-				border: 1px solid #999999;
-			}
-
-			.btn1 {
-				color: #fff;
-				background-color: #901b21;
-			}
-		}
-	}
-	.top-search {
-		width: 750rpx;
-		height: 100rpx;
-		// padding-top: 20rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		position: relative;
-	
-		.search-key {
-			width: 700rpx;
-			height: 70rpx;
-			padding-left: 100rpx;
-			background: #FFFFFF;
-			box-shadow: 0px 1rpx 21rpx 0px rgba(144, 27, 33, 0.12);
-			border-radius: 35rpx;
-			position: relative;
-		}
-	
-		.search-logo {
-			width: 36rpx;
-			height: 36rpx;
-			position: absolute;
-			top: 0;
-			bottom: 0;
-			left: 50rpx;
-			margin: auto;
-		}
-	
-		.search-btn {
-			width: 150rpx;
-			height: 70rpx;
-			border-radius: 30rpx;
-			color: rgb(144, 27, 33);
-			text-align: center;
-			line-height: 70rpx;
-			position: absolute;
-			top: 0;
-			bottom: 0;
-			right: 10rpx;
-			margin: auto;
-			// background-color: red;
-			z-index: 9;
-		}
-	}
-</style>

user/page/revenueCenter.vue

@@ -1,422 +0,0 @@
-<template>
-	<view class="center">
-		<view class="top">
-			<image src="../../static/img/sybg.png" mode="" class="sybg"></image>
-			<view class="top-card">
-				<view class="card-tit">
-					<view class="tit-point"></view>
-					营业额总览
-				</view>
-				<view class="card-icon">
-					<image src="../../static/icon/moneyget.png" mode=""></image>
-				</view>
-				<view class="now-tit">
-					本月营业额
-				</view>
-				<view class="now-money">
-					{{month_momey}}
-				</view>
-				<view class="card-btm flex">
-					<view class="card-info flex">
-						<image src="../../static/icon/dayget.png" mode=""></image>
-						<view class="info-wrap">
-							<view class="info-tit">
-								今日营业额
-							</view>
-							<view class="info-val">
-								￥{{today_momey}}
-							</view>
-						</view>
-					</view>
-					<view class="card-info flex">
-						<image src="../../static/icon/daydd.png" mode=""></image>
-						<view class="info-wrap">
-							<view class="info-tit">
-								今日订单
-							</view>
-							<view class="info-val dan">
-								{{today_count }}
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="mid-tit flex">
-			<view class="mid-left flex">
-				<image src="../../static/icon/time.png" mode=""></image>
-				<view class="left-tit">
-					本月订单数
-				</view>
-			</view>
-			<view class="mid-right">
-			     {{month_count}}单
-			</view>
-		</view>
-		<view class="btm-tab">
-			<view class="tab-tit flex">
-				<view class="tab-top-left tab-content">
-					每月营业额
-				</view>
-				<view class="tab-top-center tab-content">
-					订单数
-				</view>
-				<view class="tab-top-right tab-content">
-					金额
-				</view>
-			</view>
-			<scroll-view scroll-y="true" class="list-wrapper" :style="{'height':height}">
-				<!-- 空白页 -->
-				<empty v-if=" loaded && monthList.length == 0"></empty>
-				<view v-for="item in monthList" class="flex list" :key="item.time">
-					<view class="tab-top-left tab-content ">
-						{{item.time | time}}
-					</view>
-					<view class="tab-top-center tab-content">
-						{{item.frontNumber}}单
-					</view>
-					<view class="tab-top-right tab-content money">
-						￥{{item.frontPrice}}
-					</view>
-				</view>
-				<uni-load-more :status="loadingType" v-if="loadingType == 'loading'"></uni-load-more>
-			</scroll-view>
-		</view>
-
-	</view>
-</template>
-
-<script>
-	import {
-		getOrderTime,
-		getOrderData,
-		getOrderMonth
-	} from '@/api/wallet.js'
-	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-	import empty from '@/components/empty';
-	export default {
-		components: {
-			empty,
-			uniLoadMore
-		},
-		data() {
-			let start = new Date(new Date().toLocaleDateString()).getTime()
-			return {
-				height: '',
-				list: [],
-				loadingType: 'more',
-				page: 1,
-				limit: 10,
-				monthList: {},
-				loaded: false,
-				month_momey: '',//月营业额
-				today_momey: '',//日营业额
-				tiday_start: start/1000,//今日零点时间戳
-				today_count: '',//今日订单数
-			}
-		},
-		computed: {
-			month_count() {
-				if(this.monthList.length > 0) {
-					return this.monthList[0].frontNumber
-				}else {
-					return 0
-				}
-				
-			}
-		},
-		filters: {
-			time(val) {
-				let str = ''
-				if (val) {
-					val = val + ''
-					let str1 = val.slice(0, 4)
-					let str2 = val.slice(4, )
-					return str = str1 + '年' + str2 + '月'
-				}
-				return str
-			}
-		},
-		onReady(res) {
-			var _this = this;
-			uni.getSystemInfo({
-				success: resu => {
-					const query = uni.createSelectorQuery();
-					query.select('.list-wrapper').boundingClientRect();
-					query.exec(function(res) {
-						console.log(res, 'ddddddddddddd');
-						_this.height = resu.windowHeight - res[0].top + 'px';
-						console.log('打印页面的剩余高度', _this.height);
-					});
-				},
-				fail: res => {}
-			});
-		},
-		onLoad() {
-			 console.log(this.tiday_start,'start')
-			this.getOrderMonth()
-			this.getMonth()
-			this.getTaday()
-			this.getTadayCount()
-		},
-		methods: {
-			// 获取每月数据
-			getOrderMonth() {
-				this.loadingType = 'loading'
-				getOrderMonth().then(({
-					data
-				}) => {
-					this.loadingType = 'noMore'
-					let arr = []
-					for (let val in data) {
-						arr.push({
-							time: +val.replace(/-/, ''),
-							frontPrice: data[val].frontPrice,
-							frontNumber: data[val].frontNumber
-						})
-					}
-					this.monthList = arr.sort(function(a, b) {
-						return b.time - a.time
-					})
-				})
-			},
-			// 获取本月营业额
-			getMonth() {
-				getOrderTime({
-					type: 1
-				}).then(({
-					data
-				}) => {
-					console.log(data, '本月营业额')
-					this.month_momey = data.time
-				})
-			},
-			// 获取本日营业额
-			getTaday() {
-				getOrderTime({
-					start: this.tiday_start,
-					type: 1
-				}).then(({data}) => {
-					console.log(data, '本日营业额')
-					this.today_momey = data.time
-				})
-			},
-			//获取本日订单数
-			getTadayCount() {
-				getOrderTime({
-					start: this.tiday_start,
-					type: 0
-				}).then(({data}) => {
-					console.log(data, '本日单数')
-					this.today_count= data.time
-				})
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.top {
-		height: 585rpx;
-		// background-color: #f6f7f8;
-		position: relative;
-
-		.sybg {
-			position: absolute;
-			width: 100%;
-			height: 265rpx;
-		}
-
-		.top-card {
-			width: 688rpx;
-			height: 398rpx;
-			padding: 32rpx;
-			background: #FFFFFF;
-			box-shadow: -2rpx 4rpx 18rpx 0px rgba(0, 110, 238, 0.2);
-			border-radius: 24rpx;
-			position: absolute;
-			right: 0;
-			left: 0;
-			bottom: 40rpx;
-			margin: 0 auto;
-
-			.now-tit {
-				text-align: right;
-				font-size: 24rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #999999;
-			}
-
-			.now-money {
-				padding-top: 10rpx;
-				text-align: right;
-				font-size: 72rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #901B21;
-
-				&::before {
-					content: '￥';
-					font-size: 44rpx;
-					position: relative;
-					bottom: 5rpx;
-				}
-			}
-
-			.card-icon {
-				position: absolute;
-				top: 100rpx;
-				left: 48rpx;
-				width: 224rpx;
-				height: 122rpx;
-
-				image {
-					width: 100%;
-					height: 100%;
-				}
-			}
-
-			.card-tit {
-				display: flex;
-				align-items: center;
-
-				.tit-point {
-					display: inline-block;
-					width: 12rpx;
-					height: 32rpx;
-					background: #901B21;
-					border-radius: 3rpx;
-					margin-right: 17rpx;
-				}
-
-				font-size: 32rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #333333;
-			}
-
-			.card-btm {
-				position: absolute;
-				bottom: 32rpx;
-				width: 624rpx;
-				height: 122rpx;
-				background: linear-gradient(180deg, rgba(220, 184, 118, 0.12) 0%, rgba(220, 184, 118, 0) 100%);
-				border-radius: 12rpx;
-
-				.card-info {
-					width: 50%;
-					flex-shrink: 0;
-					padding-left: 30rpx;
-					justify-content: flex-start;
-					align-items: center;
-
-					image {
-						width: 48rpx;
-						height: 48rpx;
-					}
-
-					.info-wrap {
-						padding-left: 20rpx;
-
-						.info-tit {
-							font-size: 28rpx;
-							font-family: PingFang SC;
-							font-weight: 500;
-							color: #999999;
-						}
-
-						.info-val {
-							// padding-top: 15rpx;
-							font-size: 36rpx;
-							font-family: PingFang SC;
-							font-weight: bold;
-							color: #DCB876;
-							text-align: center;
-						}
-
-						.dan {
-							&::after {
-								content: '单';
-								font-size: 32rpx;
-								position: relative;
-								bottom: 3rpx;
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	.mid-tit {
-		background-color: #fff;
-		height: 80rpx;
-		padding: 0 30rpx 0 33rpx;
-		justify-content: space-between;
-		align-items: center;
-		margin-bottom: 12rpx;
-
-		.mid-left {
-
-			image {
-				margin-right: 13rpx;
-				width: 33rpx;
-				height: 33rpx;
-			}
-		}
-	}
-
-	.btm-tab {
-		background-color: #fff;
-
-		// padding: 0 30rpx 0 35rpx;
-		.tab-top-left {
-			text-align: left;
-			padding-left: 35rpx;
-		}
-
-		.tab-top-center {
-			text-align: center;
-		}
-
-		.tab-top-right {
-			text-align: right;
-			padding-right: 30rpx;
-		}
-
-		.tab-tit {
-			height: 72rpx;
-			font-size: 24rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #999999;
-
-			.tab-content {
-				width: 33%;
-			}
-
-		}
-	}
-
-	.list-wrapper {
-		background-color: #fff;
-
-		.list {
-			height: 70rpx;
-
-			view {
-				width: 33.3%;
-				flex-shrink: 0;
-				font-size: 28rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #333333;
-			}
-
-			.money {
-				color: #901B21;
-			}
-		}
-	}
-</style>

user/page/scoreAccumulate.vue

@@ -1,12 +1,10 @@
 <template>
 	<view class="content">
-		<view class="top-wrapper">{{ userInfo.integral||0.00}}</view>
+		<view class="top-wrapper">{{ userInfo.integral || 0.0 }}</view>
 		<view class="navbar">
-			<view v-for="(item,index) in navList" :key="index" class="nav-item"
-				:class="{ current: tabCurrentIndex === index}" @click="tabClick(index)">{{ item.text }}</view>
+			<view 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"
-			:style="{'height': height}">
+		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab" :style="{ height: height }">
 			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
 				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
 					<!-- 空白页 -->
@@ -34,236 +32,228 @@
 </template>
 
 <script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-	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
-		},
-		computed: {
-			...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
-		},
-		onReady(res) {
-			var obj = this;
-			uni.getSystemInfo({
-				success: resu => {
-					const query = uni.createSelectorQuery();
-					query.select('.swiper-box').boundingClientRect();
-					query.exec(function(res) {
-						obj.height = resu.windowHeight - res[0].top + 'px';
-						console.log('打印页面的剩余高度', obj.height);
-					});
-				},
-				fail: res => {}
-			});
-		},
-		data() {
-			return {
-				height: '',
-				maxheight: 0,
-				tabCurrentIndex: 0,
-				navList: [{
-						state: 1,
-						text: '收入',
-						loadingType: 'more',
-						orderList: [],
-						page: 1, //当前页面
-						limit: 10 //每次信息条数
-					},
-					{
-						state: 0,
-						text: '支出',
-						loadingType: 'more',
-						orderList: [],
-						page: 1, //当前页面
-						limit: 10 //每次信息条数
-					},
-				],
-				score: 0 //积分
-			};
-		},
-		onShow() {
-			// 载入积分数据
-			this.loadData();
-		},
-		methods: {
-			// 页面跳转
-			navto(e) {
-				uni.navigateTo({
-					url: e
+import { mapState, mapMutations } from 'vuex';
+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
+	},
+	computed: {
+		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
+	},
+	onReady(res) {
+		var obj = this;
+		uni.getSystemInfo({
+			success: resu => {
+				const query = uni.createSelectorQuery();
+				query.select('.swiper-box').boundingClientRect();
+				query.exec(function(res) {
+					obj.height = resu.windowHeight - res[0].top + 'px';
+					console.log('打印页面的剩余高度', obj.height);
 				});
 			},
-			//获取收入支出信息
-			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;
+			fail: res => {}
+		});
+	},
+	data() {
+		return {
+			height: '',
+			maxheight: 0,
+			tabCurrentIndex: 0,
+			navList: [
+				{
+					state: 1,
+					text: '收入',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页面
+					limit: 10 //每次信息条数
+				},
+				{
+					state: 0,
+					text: '支出',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页面
+					limit: 10 //每次信息条数
 				}
-				// 修改当前对象状态为加载中
-				navItem.loadingType = 'loading';
+			],
+			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
-					}) => {
-						console.log(data)
+			integrallist(
+				{
+					page: navItem.page,
+					limit: navItem.limit
+				},
+				state
+			)
+				.then(({ data }) => {
+					console.log(data);
 
-						if (data.length > 0) {
-							let list = []
-							data.forEach((item) => {
-								if (item.pm === state) {
-									list.push(item)
-								}
-							})
-							navItem.orderList = navItem.orderList.concat(list);
-							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);
-					});
-			},
+					if (data.length > 0) {
+						let list = [];
+						data.forEach(item => {
+							if (item.pm === state) {
+								list.push(item);
+							}
+						});
+						navItem.orderList = navItem.orderList.concat(list);
+						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;
-			}
+		//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%;
-	}
+page {
+	background: #ffffff;
+	height: 100%;
+}
 
-	.navbar {
+.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;
-		height: 40px;
-		padding: 0 5px;
-		background: #fff;
-		box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 15px;
+		color: $font-color-dark;
 		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;
 
-			&.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;
-				}
+			&: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;
+.swiper-box {
+	height: calc(100% - 44px);
+	padding-top: 10rpx;
 
-		.order-item {
-			padding: 20rpx 30rpx;
-			line-height: 1.5;
+	.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;
-				}
+		.title-box {
+			.title {
+				font-size: $font-lg;
+				color: $font-color-base;
 			}
 
-			.money {
-				color: #fd5b23;
-				font-size: $font-lg;
+			.time {
+				font-size: $font-base;
+				color: $font-color-light;
 			}
 		}
-	}
 
-	.list-scroll-content {
-		height: 100%;
+		.money {
+			color: #fd5b23;
+			font-size: $font-lg;
+		}
 	}
+}
 
-	.content {
-		height: 100%;
+.list-scroll-content {
+	height: 100%;
+}
 
-		.empty-content {
-			background-color: #ffffff;
-		}
-	}
+.content {
+	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;
+	.empty-content {
+		background-color: #ffffff;
 	}
+}
+
+.top-wrapper {
+	width: 750rpx;
+	height: 265rpx;
+	background: #ee2f72;
+	color: #ffffff;
+	font-size: 72rpx;
+	font-family: PingFang SC;
+	font-weight: bold;
+	color: #ffffff;
+	line-height: 265rpx;
+	text-align: center;
+}
 </style>

user/page/shareEx.vue

@@ -1,181 +0,0 @@
-<template>
-	<view class="content">
-		<image src="../../static/img/share-card.jpg" mode="" class="bg"></image>
-		<view class="">
-			
-		</view>
-		<view class="share-user-logo">
-			<image :src="userlogo" mode=""></image>
-		</view>
-		<view class="good">
-			<image :src="goodimg" mode=""></image>
-		</view>
-		<view class="good-tit">
-			子臣鸭汤兑换券
-		</view>
-		<button class="share-btn" open-type="share" v-if="couldshare == 1">
-			立即分享
-		</button>
-		<view class="share-btn" v-if="couldshare == 2" @click="getGift">
-			{{jsspan}}
-		</view>
-	</view>
-</template>
-
-<script>
-	import { getGift } from '@/api/order.js'
-	export default {
-		data() {
-			return {
-				userlogo: '',
-				shareId: '',
-				nickname: '',
-				goodimg: '',
-				couldshare: 0,
-				jsspan: '立即领取'
-			}
-		},
-		onLoad(opt) {
-			this.userlogo = opt.logo
-			this.shareId = opt.shareid
-			this.nickname = opt.nickname
-			this.goodimg = opt.goodimg
-			this.couldshare = opt.type
-		
-			// #ifdef MP
-			if(opt.type == 2 ) {
-				if (opt.scene) {
-					// 存储小程序邀请人
-					uni.setStorage({
-						key: 'spread_code',
-						data: opt.scene
-					});
-				}
-			}
-			// #endif
-		},
-		// 分享
-		onShareAppMessage(options) {
-			let obj = this
-			// 设置菜单中的转发按钮触发转发事件时的转发内容
-			let pages = getCurrentPages(); //获取加载的页面
-			let currentPage = pages[pages.length - 1]; //获取当前页面的对象
-			let url = currentPage.route; //当前页面url
-			let item = currentPage.options; //如果要获取url中所带的参数可以查看options
-			// let name = this.goodsObjact.store_name || this.goodsObjact.title;
-			let shareObj = {
-				title: obj.nickname + '分享您一张子臣鸭汤兑换券', // 默认是小程序的名称(可以写slogan等)
-				path: url + '?shareid=' + item.shareid + '&scene=' + item.scene + '&goodimg=' + item.goodimg + '&logo=' + item.logo + '&type=2' + '&nickname='+ item.nickname, // 默认是当前页面，必须是以‘/’开头的完整路径
-				imageUrl: item.goodimg,
-				success: function(res) {
-					console.log(shareObj.path, 'path+++++++++++++++++++');
-					// 转发成功之后的回调
-					if (res.errMsg == 'shareAppMessage:ok') {
-					}
-				},
-				fail: function() {
-					// 转发失败之后的回调
-					if (res.errMsg == 'shareAppMessage:fail cancel') {
-						// 用户取消转发
-					} else if (res.errMsg == 'shareAppMessage:fail') {
-						// 转发失败，其中 detail message 为详细失败信息
-					}
-				}
-			};
-		
-			return shareObj;
-		},
-		methods: {
-			getGift() {
-				let obj = this
-				console.log('ddd')
-				getGift({},this.shareId).then(res => {
-					console.log(res)
-					uni.showToast({
-						title:'领取成功',
-						duration:2000
-					});
-					obj.jsspan = '已领取'
-					setTimeout(()=> {
-						uni.switchTab({
-							url: '/pages/index/index'
-						})
-					},1500)
-					
-				}).catch(err => {
-					console.log(err)
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	page {
-		background-color: #901b21;
-		width: 100%;
-		height: 100%
-	}
-	.content {
-		position: relative;
-		background-color: #901b21;
-		min-height: 100%;
-		.bg {
-			// position: absolute;
-			width: 750rpx;
-			height: 1334rpx;
-		}
-		.share-btn {
-			width: 492rpx;
-			height: 86rpx;
-			background-color: #ebd49e;
-			border-radius: 43rpx;
-			text-align: center;
-			line-height: 86rpx;
-			color: #901b21;
-			font-weight: bold;
-			font-size: 36rpx;
-			position: absolute;
-			top: 1159rpx;
-			left: 130rpx;
-		}
-		.share-user-logo {
-			position: absolute;
-			top: 400rpx;
-			left: 0;
-			right: 0;
-			margin: auto;
-			width: 118rpx;
-			height: 118rpx;
-			border-radius: 50%;
-			image {
-				width: 118rpx;
-				height: 118rpx;
-				border-radius: 50%;
-			}
-		}
-		.good {
-			width: 290rpx;
-			height: 290rpx;
-			border-radius: 20rpx;
-			position: absolute;
-			top: 560rpx;
-			left: 0;
-			right: 0;
-			margin: auto;
-			image {
-				width: 290rpx;
-				height: 290rpx;
-				border-radius: 20rpx;
-			}
-		}
-		.good-tit {
-			position: absolute;
-			font-size: 32rpx;
-			color: #901b21;
-			text-align: center;
-			width: 750rpx;
-			top: 880rpx;
-		}
-	}
-</style>

user/page/storeCommission.vue

@@ -1,188 +0,0 @@
-<template>
-	<view class="content">
-		<view class="cms-top">
-			<image src="../../static/img/wallertbg.png" mode="" class="top-bg"></image>
-			<view class="top-num">
-				<view style="font-size: 52rpx;padding-bottom: 10rpx;">{{all}}</view>
-				<view class="">
-					可提佣金
-				</view>
-			</view>
-		</view>
-		<scroll-view scroll-y="true" class="scroll-wrap" :style="{'height': height}">
-			<view v-for="(item, index) in list" :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 class="jg"></view>
-			</view>
-			<uni-load-more :status="loadingType"></uni-load-more>
-		</scroll-view>
-		<view class="tx-btn" @click="navTo('/user/page/withdrawal')" v-if="all*1 > 0">
-			立即提现
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		getStoreCms
-	} from '@/api/user.js'
-	export default {
-		data() {
-			return {
-				page: 1,
-				limit: 10,
-				loadingType: 'more',
-				loaded: false,
-				list: [],
-				all: '',
-				height: ''
-			}
-		},
-		onLoad() {
-			
-		},
-		onShow() {
-			this.page = 1
-			this.loadingType =  'more'
-			this.loaded = false
-			this.list = []
-			this.all = ''
-			this.getStoreCms()
-		},
-		onReady(res) {
-			var obj = this;
-			uni.getSystemInfo({
-				success: resu => {
-					const query = uni.createSelectorQuery();
-					query.select('.scroll-wrap').boundingClientRect();
-					query.exec(function(res) {
-						console.log(res, 'ddddddddddddd');
-						obj.height = resu.windowHeight - res[0].top + 'px';
-						console.log('打印页面的剩余高度', obj.height);
-					});
-				},
-				fail: res => {}
-			});
-		},
-		methods: {
-			navTo(url) {
-				uni.navigateTo({
-					url
-				})
-			},
-			getStoreCms() {
-				let obj = this
-				if(obj.loadingType == 'loading' || obj.loadingType == 'noMore') {
-					return
-				}
-				obj.loadingType = 'loading'
-				getStoreCms().then(({
-					data
-				}) => {
-					obj.all = data.all
-					obj.list = obj.list.concat(data.data.data)
-					obj.page++
-					if(data.data.data.length == obj.limit) {
-						obj.loadingType = 'more'
-					}else {
-						obj.loadingType = 'noMore'
-					}
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.cms-top {
-		width: 750rpx;
-		height: 400rpx;
-		position: relative;
-
-		.top-bg {
-			width: 750rpx;
-			height: 400rpx;
-			position: absolute;
-		}
-
-		.top-num {
-			padding-top: 120rpx;
-			width: 750rpx;
-			color: #fff;
-			font-size: 32rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #FFFFFF;
-			text-align: center;
-			position: relative;
-
-			text {
-				font-size: 47rpx;
-			}
-		}
-	}
-	.order-item {
-		padding: 20rpx 30rpx;
-		line-height: 1.5;
-		position: relative;
-	
-		// border-bottom: 1rpx black solid;
-		.title-box {
-			.title {
-				font-size: $font-lg;
-				color: $font-color-base;
-			}
-	
-			.time {
-				font-size: $font-base;
-				color: $font-color-light;
-			}
-		}
-	
-		.money {
-			// color: #fd5b23;
-			color: #901B21;
-			font-size: $font-lg;
-		}
-	
-		.jg {
-			width: 701rpx;
-			height: 2rpx;
-			background: #F0F4F8;
-			margin: 0 auto;
-			position: absolute;
-			bottom: 0;
-		}
-	}
-	.tx-btn {
-		position: absolute;
-		bottom: 50rpx;
-		left: 0;
-		right: 0;
-		margin: auto;
-		width: 674rpx;
-		height: 88rpx;
-		background: #901b21;
-		border-radius: 44rpx;
-		font-size: 36rpx;
-		font-family: PingFang SC;
-		font-weight: 500;
-		color: #FFFFFF;
-		text-align: center;
-		line-height: 88rpx;
-		z-index: 99;
-	}
-	.scroll-wrap {
-		padding-bottom: 168rpx;
-	}
-</style>

user/page/wipe.vue

@@ -1,672 +0,0 @@
-<template>
-	<view class="wipe-wrapper">
-
-		<view class="wipe-top flex">
-			<view class="top-left" @click="smsh">
-				<image src="../../static/icon/sm.png" mode=""></image>
-				扫码核销
-			</view>
-			<view class="top-right" @click="srhx">
-				<image src="../../static/icon/sr.png" mode=""></image>
-				输入核销
-			</view>
-			<view class="top-jg"></view>
-		</view>
-		<scroll-view scroll-y="true" @scrolltolower="loadData" class="good-content" :style="{'height': height}">
-			<view>
-				<!-- <empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty> -->
-				<empty v-if="goodList.length === 0"></empty>
-				<view class="good" v-for="item in goodList">
-					<view class="good-top">
-						<view class="top-num">订单编号:{{ item.order_id }}</view>
-						<view class="top-status">待核销</view>
-					</view>
-					<view class="goods-box-single" v-for="itemt in item._info">
-						<image class="goods-img" :src="itemt.cart_info.productInfo.image" mode="scaleToFill"></image>
-						<view class="right">
-							<view class="flex-start">
-								<text class="title clamp">{{ itemt.cart_info.productInfo.store_name }}</text>
-								<text class="price"
-									style="flex-grow: 1;text-align: right;color: #901B21;font-size: 30rpx;font-weight: bold;">
-									{{ itemt.cart_info.productInfo.price }}
-								</text>
-							</view>
-							<view class="row flex">
-								<!-- <text class="row_title">{{ goodsItem.productInfo.attrInfo ? '商品退款' : '押金退款' }}</text> -->
-								<text class="attr-box">x {{ itemt.cart_info.cart_num}}</text>
-							</view>
-						</view>
-					</view>
-					
-					<view class="fh-btn-wrap" style="padding-bottom:10rpx;">
-						<view class="fh-btn-tit">
-							自提信息
-						</view>
-						<view class="fh-btn-info">
-							<view class="">
-								自提人：<text>{{item.real_name}}</text>
-							</view>
-							
-							<view class="">
-								联系方式：<text>{{item.user_phone}}</text>
-							</view>
-							<view class="">
-								自提时间：<text>{{item.time_area}}</text>
-							</view>
-						</view>
-					</view>
-					<view class="fh-btn-wrap" style="padding-bottom:10rpx;" v-if="item.point.name">
-						<view class="fh-btn-tit">
-							自提点信息
-						</view>
-						<view class="fh-btn-info">
-							<view class="">
-								自提点：<text>{{item.point.name}}</text>
-							</view>
-							<view class="">
-								详细地址：<text>{{item.point.detailed_address}}}</text>
-							</view>
-							<view class="">
-								联系方式：<text>{{item.point.phone}}</text>
-							</view>
-						</view>
-					</view>
-					<view class="good-hj">一共{{ item.total_num }}件商品
-						实付：￥{{ (item.total_price*1 + item.deposit*1).toFixed(2) }}
-					</view>
-				</view>
-				<uni-load-more :status="loadingType"></uni-load-more>
-			</view>
-		</scroll-view>
-
-
-		<uni-popup ref="popuphx" class="agree-wrapper">
-			<view class="hx-wrapper">
-				<view class="hx-img">
-					<image src="../../static/img/hxbg.png" mode=""></image>
-				</view>
-				<view class="hx-body">
-					<view class="hx-title">
-						输入核销码核销
-					</view>
-					<input type="text" v-model="code" placeholder="请输入核销码" placeholder-class="hx-placeholder" />
-					<view class="hx-btn" @click="qhx">
-						立即核销
-					</view>
-				</view>
-				<view class="hx-close" @click="close">
-					<image src="../../static/icon/close.png" mode=""></image>
-				</view>
-			</view>
-		</uni-popup>
-	</view>
-</template>
-
-<script>
-	import {
-		orderData,
-		getUserInfo,
-		getSpreadCount,
-		bindAdmin,
-		orderVerific,
-		getAllList,
-		exchangeOrderVerific
-	} from '@/api/user.js';
-	import empty from '@/components/empty';
-	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-	import uniPopup from '@/components/uni-popup/uni-popup.vue'
-
-	export default {
-		components: {
-			empty,
-			uniPopup
-		},
-		data() {
-			return {
-				height: '',
-				code: '',
-				limit: 10,
-				page: 1,
-				goodList: [], //待核销商品，
-				loadingType: 'more',
-				loaded: '',
-			};
-		},
-		onLoad() {
-			this.loadData()
-		},
-		onReady(res) {
-			var _this = this;
-			uni.getSystemInfo({
-				success: resu => {
-					const query = uni.createSelectorQuery();
-					query.select('.good-content').boundingClientRect();
-					query.exec(function(res) {
-						console.log(res, 'ddddddddddddd');
-						_this.height = resu.windowHeight - res[0].top + 'px';
-						console.log('打印页面的剩余高度', _this.height);
-					});
-				},
-				fail: res => {}
-			});
-		},
-		methods: {
-			loadData() {
-				let obj = this
-				if (obj.loadingType == 'loading') {
-					return
-				}
-				if (obj.loadingType == 'noMore') {
-					return
-				}
-				obj.loadingType = 'loading'
-				getAllList({
-					status: 5,
-					limit: obj.limit,
-					page: obj.page
-				}).then(({
-					data
-				}) => {
-					obj.page++
-					obj.goodList = obj.goodList.concat(data)
-					console.log(data.length)
-					if (obj.limit == data.length) {
-						obj.loadingType = 'more'
-					} else {
-						obj.loadingType = 'noMore'
-					}
-				})
-			},
-			srhx() {
-				this.$refs.popuphx.open()
-
-			},
-			close() {
-				this.$refs.popuphx.close()
-
-			},
-			smsh() {
-				// #ifdef H5
-				let wx = require('jweixin-module');
-				wx.scanQRCode({
-					needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
-					scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是一维码，默认二者都有
-					success: function(res) {
-						var result = res.resultStr; // 当needResult 为 1 时，扫码返回的结果
-						orderVerific({
-							verify_code: this.code,
-							is_confirm: 1,
-						}).then(res => {
-							console.log(res, '++++++++++++++++++++++++++++++')
-							this.$refs.popuphx.close()
-							this.code = ''
-							uni.showToast({
-								title: '核销成功',
-								duration: 2000
-							});
-						}).catch(err => {
-							console.log('dddd')
-						})
-					}
-				});
-				// #endif
-				// #ifndef H5
-				uni.scanCode({
-					success: (res) => {
-						this.code = res.result
-						this.srhx()
-						// orderVerific({
-						// 	verify_code: this.code,
-						// 	is_confirm: 1,
-						// }).then( res => {
-
-						// 	this.$api.msg(res.msg)
-						// 	console.log(res,'++++++++++++++++++++++++++++++')
-						// 	this.$refs.popuphx.close()
-						// 	this.code = ''
-						// }).catch( err => {
-						// 	console.log('dddd')
-						// })
-					}
-				})
-				// #endif
-
-			},
-			qhx() {
-				if (this.code == '') {
-					return this.$api.msg('请输入核销码')
-				}
-				uni.showLoading({
-					title: '核销中...',
-					mask: true
-				})
-				if (this.code.indexOf('ticket:') != -1) {
-					exchangeOrderVerific({
-						verify_code: this.code,
-						is_confirm: 1,
-					}).then(res => {
-						uni.hideLoading()
-						// this.$api.msg(res.msg) 
-
-						console.log(res, '++++++++++++++++++++++++++++++')
-						this.$refs.popuphx.close()
-						this.code = ''
-						this.page = 1
-						this.loadingType = 'more'
-						this.goodList = []
-						uni.showToast({
-							title: '核销成功',
-							duration: 2000
-						});
-						this.loadData()
-					}).catch(err => {
-						console.log('dddd')
-					})
-				} else {
-					orderVerific({
-						verify_code: this.code,
-						is_confirm: 1,
-					}).then(res => {
-						uni.hideLoading()
-						// this.$api.msg(res.msg) 
-
-						console.log(res, '++++++++++++++++++++++++++++++')
-						this.$refs.popuphx.close()
-						this.code = ''
-						this.page = 1
-						this.loadingType = 'more'
-						this.goodList = []
-						uni.showToast({
-							title: '核销成功',
-							duration: 2000
-						});
-						this.loadData()
-					}).catch(err => {
-						console.log('dddd')
-					})
-				}
-
-			}
-		}
-	};
-</script>
-
-<style lang="scss" scoped>
-	page {
-		height: 100%;
-		background-color: #f8f6f6;
-	}
-
-	.wipe-wrapper {
-		.wipe-top {
-			justify-content: space-around;
-			width: 750rpx;
-			height: 80rpx;
-			background: #ffffff;
-			box-shadow: 0px 0px 20px 0px rgba(50, 50, 52, 0.06);
-			font-size: 28rpx;
-			font-weight: 500;
-			color: #ef041f;
-			line-height: 80rpx;
-			text-align: center;
-			position: relative;
-			z-index: 10;
-
-			.top-left {
-				vertical-align: middle;
-				width: 50%;
-
-				image {
-					width: 27rpx;
-					height: 25rpx;
-					margin-right: 10rpx;
-				}
-			}
-
-			.top-right {
-				vertical-align: middle;
-				width: 50%;
-
-				image {
-					width: 27rpx;
-					height: 25rpx;
-					margin-right: 10rpx;
-				}
-			}
-
-			.top-jg {
-				width: 2rpx;
-				height: 80rpx;
-				background: #f0f0f0;
-				position: absolute;
-				// background: red;
-			}
-		}
-	}
-
-	.good-content {
-		height: 100%;
-		padding-top: 20rpx;
-	}
-
-	.good {
-		width: 702rpx;
-		// height: 304rpx;
-
-		background: #ffffff;
-		box-shadow: 0px 0px 20px 0px rgba(50, 50, 52, 0.06);
-		border-radius: 10rpx;
-		padding: 0 30rpx;
-		padding-bottom: 20rpx;
-		margin: 0 auto 20rpx;
-		position: relative;
-
-		.goods-box-single {
-			display: flex;
-			padding: 20rpx 0;
-
-			.goods-img {
-				display: block;
-				width: 120rpx;
-				height: 120rpx;
-			}
-
-			.right {
-				flex: 1;
-				display: flex;
-				flex-direction: column;
-				padding: 0 30rpx 0 24rpx;
-				overflow: hidden;
-
-				.row {
-					margin-top: 10rpx;
-					justify-content: flex-end;
-				}
-
-				.row_title {
-					padding: 5rpx 10rpx;
-					background-color: #dddddd;
-					border-radius: 10rpx;
-					font-size: 22rpx;
-					color: #ffffff;
-					background: #ffeee9;
-					border-radius: 5rpx;
-					color: #f55e5c;
-				}
-
-				.title {
-					font-size: $font-base + 2rpx;
-					color: $font-color-dark;
-					line-height: 1;
-					width: 80%;
-				}
-
-				.attr-box {
-					display: flex;
-					justify-content: flex-end;
-					font-size: $font-sm + 2rpx;
-					color: $font-color-light;
-				}
-
-				.price {
-					display: inline;
-					font-size: $font-base + 2rpx;
-					color: $font-color-dark;
-
-					&:before {
-						content: '￥';
-						font-size: $font-sm;
-					}
-				}
-			}
-		}
-
-		.good-top {
-			height: 85rpx;
-			font-size: 24rpx;
-			font-weight: 400;
-			color: #666666;
-			line-height: 85rpx;
-			display: flex;
-			justify-content: space-between;
-
-			.top-status {
-				font-size: 28rpx;
-				font-weight: 500;
-				color: #EF041F;
-			}
-		}
-
-		.goods-buttom {
-			height: 160rpx;
-			display: flex;
-
-			.good-img {
-				width: 160rpx;
-				height: 160rpx;
-
-				// overflow: hidden;
-				image {
-					width: 160rpx;
-					height: 160rpx;
-				}
-			}
-
-			.good-title {
-				width: 350rpx;
-				padding-top: 6rpx;
-				font-size: 26rpx;
-				font-weight: 500;
-				color: #3F454B;
-				line-height: 1;
-				padding-left: 10rpx;
-			}
-
-			.shop-info {
-				padding-top: 11rpx;
-				font-size: 24rpx;
-				font-weight: 500;
-				color: #DCB876;
-				line-height: 1;
-
-				// padding-left: 10rpx;
-				image {
-					width: 24rpx;
-					height: 24rpx;
-					margin-left: 14rpx;
-					margin-right: 4rpx;
-				}
-			}
-
-			.good-tag {
-				display: inline-block;
-				height: 36rpx;
-				background: #ffeee9;
-				// opacity: 0.2;
-				border-radius: 5rpx;
-				font-size: 20rpx;
-				font-weight: 500;
-				color: #F23030;
-				padding: 0 9rpx;
-				line-height: 36rpx;
-				margin-top: 15rpx;
-				margin-left: 10rpx;
-			}
-
-		}
-
-		.good-hj {
-			line-height: 1;
-			height: 26rpx;
-			font-size: 26rpx;
-			font-weight: 500;
-			color: #333333;
-			text-align: right;
-		}
-
-		.good-price {
-			text-align: left;
-			font-size: 26rpx;
-			font-weight: 500;
-			line-height: 1;
-			color: #333333;
-			position: absolute;
-			right: 31rpx;
-			top: 98rpx;
-		}
-
-		.good-num {
-			text-align: left;
-			font-size: 26rpx;
-			font-weight: 500;
-			line-height: 1;
-			color: #333333;
-			position: absolute;
-			right: 31rpx;
-			top: 136rpx;
-		}
-	}
-
-	.hx-wrapper {
-		width: 536rpx;
-		height: 630rpx;
-		position: relative;
-
-		// background-color: #fff;
-		.hx-img {
-			width: 536rpx;
-			height: 281rpx;
-
-			image {
-				width: 536rpx;
-				height: 281rpx;
-			}
-		}
-
-		.hx-close {
-			position: absolute;
-			left: 243rpx;
-			bottom: -80rpx;
-			width: 52rpx;
-			height: 52rpx;
-
-			image {
-				width: 52rpx;
-				height: 52rpx;
-			}
-		}
-
-		.hx-body {
-			width: 536rpx;
-			height: 349rpx;
-			background-color: #fff;
-			border-radius: 0 0 10rpx 10rpx;
-
-			.hx-title {
-				width: 536rpx;
-				font-size: 36rpx;
-				font-weight: 500;
-				color: #333333;
-				line-height: 1;
-				padding-top: 42rpx;
-				text-align: center;
-			}
-
-			input {
-				width: 439rpx;
-				height: 68rpx;
-				background: #eeddde;
-				border-radius: 10rpx;
-				margin: 39rpx auto 0;
-				padding-left: 26rpx;
-
-				.hx-placeholder {
-					font-size: 26rpx;
-					font-weight: 500;
-					color: #901b21;
-				}
-			}
-
-			.hx-btn {
-				margin: 44rpx auto 0;
-				width: 353rpx;
-				height: 71rpx;
-				background: #901b21;
-				border-radius: 34rpx;
-				font-size: 36rpx;
-				font-weight: 500;
-				color: #F8F9F9;
-				line-height: 71rpx;
-				text-align: center;
-			}
-
-
-		}
-	}
-
-	.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;
-				}
-			}
-		}
-	}
-	.fh-btn-wrap {
-		display: flex;
-		// height: 55rpx;
-		flex-direction: column;
-		// justify-content: flex-end;
-		// width: ;
-		font-size: 28rpx;
-		color: #999999;
-		.fh-btn-tit {
-			color: #000000;
-			font-weight: bold;
-		}
-		.fh-btn-info {
-			padding-left: 20rpx;
-		}
-		.fh-btn {
-			margin-top: 10rpx;
-			align-self: flex-end;
-			width: 144rpx;
-			height: 55rpx;
-			border: 1px solid #901b21;
-			border-radius: 28rpx;
-			font-size: 26rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #901b21;
-			line-height: 55rpx;
-			text-align: center;
-		}
-	}
-</style>