2022-8-30

appbase/cartinfo.txt

@@ -1,2 +0,0 @@
-证书别名： com.wlg.com
-证书密码： 112233

pages.json

@@ -2,7 +2,8 @@
 	"easycom": {
 		"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
 	},
-	"pages": [{
+	"pages": [
+		{
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarBackgroundColor": "#111111",
@@ -13,35 +14,6 @@
 				}
 			}
 		},
-		{
-			"path": "pages/index/integral",
-			"style": {
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle": "white", 
-				"navigationBarTitleText": "兑换专区"
-			}
-		},
-		{
-			"path": "pages/money/wallet",
-			"style": {
-				"navigationBarTitleText": "我的余额",
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle":"white"
-				// "app-plus": {
-				// 	"titleNView": {
-				// 		"type": "transparent"
-				// 	}
-				// }
-			}
-		},
-		{
-			"path": "pages/user/yuezz",
-			"style": {
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle": "white", 
-				"navigationBarTitleText": "余额转账"
-			}
-		},
 		{
 			"path": "pages/user/myvip",
 			"style": {
@@ -56,15 +28,6 @@
 				"navigationBarTextStyle":"white"
 			}
 		},
-		{
-			"path": "pages/shoping/list",
-			"style": {
-				"navigationBarTitleText": "店铺列表",
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle":"white"
-
-			}
-		},
 		{
 			"path": "pages/public/start",
 			"style": {
@@ -103,28 +66,6 @@
 				}
 			}
 		},
-		{
-			"path": "pages/user/jiedianDetails",
-			
-			"style": {
-				"navigationBarTitleText": "节点团队",
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle": "white", 
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
-		},
-		{
-			"path": "pages/user/teamList",
-			"style": {
-				"navigationBarTitleText": "我的推广",
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle":"white"
-			}
-		},
 		{
 			"path": "pages/public/login",
 			"style": {
@@ -165,14 +106,6 @@
 				}
 			}
 		},
-		{
-			"path": "pages/user/jiedian",
-			"style": {
-				"navigationBarTitleText": "我的节点",
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle":"white"
-			}
-		},
 		{
 			"path": "pages/user/team",
 			"style": {
@@ -182,97 +115,6 @@
 				"navigationBarTextStyle":"white"
 			}
 		},
-		{
-			"path": "pages/user/cash",
-			"style": {
-				"navigationBarTitleText": "我的现金",
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle":"white"
-			}
-		},
-		{
-			"path": "pages/user/whiteJf",
-			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTitleText": "我的肥料",
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle":"white"
-			}
-		},
-		{
-			"path": "pages/user/greenJf",
-			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTitleText": "我的水滴",
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle":"white"
-			}
-		},
-		{
-			"path": "pages/user/purpleJf",
-			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTitleText": "我的阳光",
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle":"white"
-			}
-		},
-		{
-			"path": "pages/user/mallJf",
-			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTitleText": "我的阳光",
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle":"white"
-			}
-		},
-		{
-			"path": "pages/user/shopJf",
-			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTitleText": "能量金豆",
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle":"white"
-			}
-		},
-		{
-			"path": "pages/user/wenpiao",
-			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTitleText": "文票",
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle":"white"
-			}
-		},
-		{
-			"path": "pages/user/greenChange",
-			"style": {
-				"navigationBarTitleText": "洒水壶兑换",
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle":"white"
-			}
-		},
-		{
-			"path": "pages/money/withdmoenys",
-			"style": {
-				"navigationBarTitleText": "转账",
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle":"white"
-			}
-		},
-		{
-			"path": "pages/product/reply",
-			"style": {
-				"navigationBarTitleText": "商品评价",
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle": "white", 
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
-		},
 		{
 			"path": "pages/product/product",
 			"style": {
@@ -286,23 +128,6 @@
 				}
 			}
 		},
-		{
-			"path": "pages/product/seckill",
-			"style": {
-				"navigationBarTitleText": "限时秒杀",
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle":"white"
-			}
-		},
-		{
-			"path": "pages/product/list",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "商品列表",
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle":"white"
-			}
-		},
 		{
 			"path": "pages/product/search",
 			"style": {
@@ -336,19 +161,6 @@
 				"navigationBarTitleText": "搜索"
 			}
 		},
-		{
-			"path": "pages/product/classify",
-			"style": {
-				"navigationStyle": "custom",
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle": "white", 
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
-		},
 		{
 			"path": "pages/set/set",
 			"style": {
@@ -357,22 +169,6 @@
 				"navigationBarTextStyle": "white"
 			}
 		},
-		{
-			"path": "pages/set/address",
-			"style": {
-				"navigationBarTitleText": "收货地址",
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle":"white"
-			}
-		},
-		{
-			"path": "pages/set/addressManage",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle":"white"
-			}
-		},
 		{
 			"path": "pages/set/phone",
 			"style": {
@@ -381,28 +177,12 @@
 				"navigationBarTextStyle":"white"
 			}
 		},
-		{
-			"path": "pages/set/user",
-			"style": {
-				"navigationBarTitleText": "绑定上级",
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle":"white"
-			}
-		},
 		{
 			"path": "pages/contract/privacy",
 			"style": {
 				"navigationBarTitleText": "隐私政策"
 			}
 		},
-		{
-			"path": "pages/contract/start",
-			"style": {
-				"navigationBarTitleText": "温馨提示",
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle":"white"
-			}
-		},
 		{
 			"path": "pages/contract/agreement",
 			"style": {
@@ -411,14 +191,6 @@
 				"navigationBarTextStyle":"white"
 			}
 		},
-		{
-			"path": "pages/set/password",
-			"style": {
-				"navigationBarTitleText": "修改支付密码",
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle":"white"
-			}
-		},
 		{
 			"path": "pages/set/userinfo",
 			"style": {
@@ -426,15 +198,7 @@
 				"navigationBarBackgroundColor": "#111111",
 				"navigationBarTextStyle":"white"
 			}
-		}, {
-			"path": "pages/cart/cart",
-			"style": {
-				"navigationBarTitleText": "购物车",
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle":"white"
-			}
-		},
-
+		}, 
 		{
 			"path": "pages/user/user",
 			"style": {
@@ -446,50 +210,6 @@
 				"navigationBarTextStyle":"white"
 			}
 		},
-		{
-			"path": "pages/user/award",
-			"style": {
-				"navigationBarTitleText": "奖励明细",
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle": "white", 
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
-		},
-		{
-			"path": "pages/user/withdrawal",
-			"style": {
-				"navigationBarTitleText": "奖励提现",
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle":"white"
-			}
-		},
-		{
-			"path": "pages/user/notice",
-			"style": {
-				"navigationBarTitleText": "通知",
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle":"white"
-			}
-		},
-		{
-			"path": "pages/user/favorites",
-			"style": {
-				"navigationBarTitleText": "收藏夹",
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle":"white"
-			}
-		}, {
-			"path": "pages/user/coupon",
-			"style": {
-				"navigationBarTitleText": "我的卡卷",
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle":"white"
-			}
-		},
 		{
 			"path": "pages/order/order",
 			"style": {
@@ -512,14 +232,6 @@
 				}
 			}
 		},
-		{
-			"path": "pages/order/expressInfo",
-			"style": {
-				"navigationBarTitleText": "快递详情",
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle":"white"
-			}
-		},
 		{
 			"path": "pages/order/orderDetail",
 			"style": {
@@ -531,14 +243,6 @@
 				}
 			}
 		},
-		{
-			"path": "pages/order/evaluate",
-			"style": {
-				"navigationBarTitleText": "评论",
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle":"white"
-			}
-		},
 		{
 			"path": "pages/order/orderRefund",
 			"style": {
@@ -578,14 +282,6 @@
 				"navigationBarTextStyle": "white"
 			}
 		},
-		{
-			"path": "pages/money/account",
-			"style": {
-				"navigationBarTitleText": "提现账号",
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle":"white"
-			}
-		},
 		{
 			"path": "pages/money/withdrawal",
 			"style": {
@@ -602,32 +298,6 @@
 				"navigationBarTextStyle":"white"
 			}
 		},
-		{
-			"path": "pages/category/category",
-			"style": {
-				// #ifdef APP-PLUS
-				"navigationStyle": "custom",
-				// #endif
-				// #ifndef MP
-				"app-plus": {
-					"bounce": "none",
-					"titleNView": {
-						"searchInput": {
-							"backgroundColor": "rgba(231, 231, 231,.7)",
-							"borderRadius": "16px",
-							"placeholder": "商品搜索",
-							"disabled": true,
-							"placeholderColor": "#606266",
-							"align": "left"
-						}
-					}
-				},
-				// #endif
-				"navigationBarTitleText": "分类",
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle":"white"
-			}
-		},
 		{
 			"path": "pages/redirect/redirect",
 			"style": {
@@ -639,37 +309,6 @@
 				}
 			}
 		},
-		{
-			"path": "pages/category/business",
-			"style": {
-				"navigationBarTitleText": "商圈",
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle":"white"
-			}
-		},
-		{
-			"path": "pages/game/game",
-			"style": {
-				"navigationBarTitleText": "种植",
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle":"white"
-
-			}
-		},
-		{
-			"path": "pages/game/gl",
-			"style": {
-				"navigationBarTitleText": "攻略"
-
-			}
-		},
-		{
-			"path": "pages/game/jlDetil",
-			"style": {
-				"navigationBarTitleText": "种植记录"
-
-			}
-		},
 		{
 			"path": "pages/user/shareQrCode",
 			"style": {
@@ -678,47 +317,13 @@
 				"navigationBarTextStyle":"white"
 			}
 		},
-		{
-			"path": "pages/user/myGreenCard",
-			"style": {
-				"navigationBarTitleText": "我的洒水壶"
-			}
-		},
-		{
-			"path": "pages/user/joinShop",
-			"style": {
-				"navigationBarTitleText": "商家入驻"
-			}
-		},
-		{
-			"path": "pages/game/gameDetail",
-			"style": {
-				"navigationBarTitleText": "种植"
-			}
-
-		}, {
-			"path": "pages/index/jieshao",
-			"style": {
-				"navigationBarTitleText": "公司介绍",
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle": "white", 
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/index/detail",
-			"style": {
-				"navigationBarTitleText": "公司介绍",
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle": "white", 
-				"enablePullDownRefresh": false
-			}
-		}, {
+		 {
 			"path": "pages/index/cangp",
 			"style": {
 				"navigationBarTitleText": "藏品",
 				"navigationBarBackgroundColor": "#111111",
 				"navigationBarTextStyle": "white", 
+				"navigationStyle": "custom",
 				"enablePullDownRefresh": false
 			}
 
@@ -817,18 +422,11 @@
 				"selectedIconPath": "static/tabBar/tab06.png",
 				"text": "首页"
 			},
-
-			// {
-			// 	"pagePath": "pages/category/category",
-			// 	"iconPath": "static/tabBar/tab-cate.png",
-			// 	"selectedIconPath": "static/tabBar/tab-cate-action.png",
-			// 	"text": "分类"
-			// },
 			{
 				"pagePath": "pages/index/cangp",
 				"iconPath": "static/tabBar/tab05.png",
 				"selectedIconPath": "static/tabBar/tab08.png",
-				"text": "藏品"
+				"text": "盲盒"
 			},
 			{
 				"pagePath": "pages/index/bazaar",

pages/activity/bargain/index.vue

@@ -1,267 +0,0 @@
-<template>
-	<view>
-		<block v-if="bargain.length>0">
-			<div class="bargain-record" ref="container">
-				<div class="item" v-for="(item, index) in bargain" :key="index">
-					<div class="picTxt acea-row row-between-wrapper">
-						<div class="pictrue">
-							<image :src="item.image" />
-						</div>
-						<div class="text acea-row row-column-around">
-							<div class="line1" style="width: 100%;">{{ item.title }}</div>
-							<count-down :justify-left="'justify-content:left'" :is-day="true" :tip-text="'倒计时 '" :day-text="' 天 '" :hour-text="' 时 '" :minute-text="' 分 '"
-							 :second-text="' 秒'" :datatime="item.datatime" v-if="item.status === 1"></count-down>
-							<div class="successTxt font-color-red" v-else-if="item.status === 3">砍价成功</div>
-							<div class="endTxt" v-else>活动已结束</div>
-							<div class="money font-color-red">
-								已砍至<span class="symbol">￥</span><span class="num">{{ item.residue_price }}</span>
-							</div>
-						</div>
-					</div>
-					<div class="bottom acea-row row-between-wrapper">
-						<div class="purple" v-if="item.status === 1">活动进行中</div>
-						<div class="success" v-else-if="item.status === 3">砍价成功</div>
-						<div class="end" v-else>活动已结束</div>
-						<div class="acea-row row-middle row-right">
-							<div class="bnt cancel" v-if="item.status === 1" @click="getBargainUserCancel(item.bargain_id)">
-								取消活动
-							</div>
-							<div class="bnt bg-color-red" v-if="item.status === 1" @click="goDetail(item.bargain_id)">
-								继续砍价
-							</div>
-							<!-- <div class="bnt bg-color-red" v-else @click="goList">重开一个</div> -->
-						</div>
-					</div>
-				</div>
-				<Loading :loaded="status" :loading="loadingList"></Loading>
-			</div>
-		</block>
-		<block v-if="bargain.length == 0">
-			<emptyPage title="暂无砍价记录～"></emptyPage>
-		</block>
-	</view>
-</template>
-<script>
-	import CountDown from "@/components/countDown";
-	import emptyPage from '@/components/emptyPage.vue'
-	import {
-		getBargainUserList,
-		getBargainUserCancel
-	} from "@/api/activity";
-	import {
-		userinfos
-	} from '@/api/user.js';
-	import Loading from "@/components/Loading";
-
-	export default {
-		name: "BargainRecord",
-		components: {
-			CountDown,
-			Loading,
-			emptyPage
-		},
-		props: {},
-		data: function() {
-			return {
-				bargain: [],
-				status: false, //砍价列表是否获取完成 false 未完成 true 完成
-				loadingList: false, //当前接口是否请求完成 false 完成 true 未完成
-				page: 1, //页码
-				limit: 20, //数量
-				userInfo: {}
-			};
-		},
-		onLoad: function() {
-			this.getBargainUserList();
-			this.getUserInfo();
-			// this.$scroll(this.$refs.container, () => {
-			//   !this.loadingList && this.getBargainUserList();
-			// });
-		},
-		methods: {
-			goDetail: function(id) {
-				// this.$router.push({
-				// 	path: "/activity/dargain_detail/" + id +'&bargain='+ userInfo.uid
-				// });
-				uni.navigateTo({
-					url: `/pages/activity/goods_bargain_details/index?id=${id}&bargain=${this.userInfo.uid}`
-				})
-			},
-			// 砍价列表
-			goList: function() {
-				uni.navigateTo({
-					url: '/pages/activity/goods_bargain/index'
-				})
-			},
-			getBargainUserList: function() {
-				var that = this;
-				if (that.loadingList) return;
-				if (that.status) return;
-				getBargainUserList({
-						page: that.page,
-						limit: that.limit
-					})
-					.then(res => {
-						that.status = res.data.length < that.limit;
-						that.bargain.push.apply(that.bargain, res.data);
-						that.page++;
-						that.loadingList = false;
-					})
-					.catch(res => {
-						that.$dialog.error(res.msg);
-					});
-			},
-			getBargainUserCancel: function(bargainId) {
-				var that = this;
-				uni.showModal({
-				    title: '提示',
-				    content: '确定取消砍价商品吗',
-				    success: function (res) {
-				        if (res.confirm) {
-				            console.log('用户点击确定');
-							getBargainUserCancel({
-									bargainId: bargainId
-								})
-								.then(res => {
-									that.status = false;
-									that.loadingList = false;
-									that.page = 1;
-									that.bargain = [];
-									that.getBargainUserList();
-									uni.showToast({
-										title:res.msg
-									});
-								})
-								.catch(res => {
-									uni.showToast({
-										title:res
-									});
-								});
-				        } else if (res.cancel) {
-				            console.log('用户点击取消');
-				        }
-				    }
-				});
-			},
-			/**
-			 * 获取个人用户信息
-			 */
-			getUserInfo: function() {
-				let that = this;
-				userinfos().then(res => {
-					that.userInfo = res.data;
-				});
-			},
-		},
-		onReachBottom() {
-			this.getBargainUserList();
-		}
-	};
-</script>
-
-<style lang="scss">
-	page{
-		background-color: #f5f5f5;
-	}
-	/*砍价记录*/
-	.bargain-record .item .picTxt .text .time .styleAll {
-		color: #fc4141;
-		font-size:24rpx;
-	}
-	.bargain-record .item .picTxt .text .time .red {
-		color: #999;
-		font-size:24rpx;
-	}
-	.bargain-record .item {
-		background-color: #fff;
-		margin-bottom: 12upx;
-	}
-
-	.bargain-record .item .picTxt {
-		height: 210upx;
-		border-bottom: 1px solid #f0f0f0;
-		padding: 0 30upx;
-	}
-
-	.bargain-record .item .picTxt .pictrue {
-		width: 150upx;
-		height: 150upx;
-	}
-
-	.bargain-record .item .picTxt .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 6upx;
-	}
-
-	.bargain-record .item .picTxt .text {
-		width: 515upx;
-		font-size: 30upx;
-		color: #282828;
-		height: 150upx;
-	}
-
-	.bargain-record .item .picTxt .text .time {
-		font-size: 24upx;
-		color: #868686;
-		justify-content: left !important;
-	}
-	
-	.bargain-record .item .picTxt .text .successTxt{
-		font-size:24rpx;
-	}
-	
-	.bargain-record .item .picTxt .text .endTxt{
-		font-size:24rpx;
-		color: #999;
-	}
-	.bargain-record .item .picTxt .text .money {
-		font-size: 24upx;
-	}
-
-	.bargain-record .item .picTxt .text .money .num {
-		font-size: 32upx;
-		font-weight: bold;
-	}
-
-	.bargain-record .item .picTxt .text .money .symbol {
-		font-weight: bold;
-	}
-
-	.bargain-record .item .bottom {
-		height: 100upx;
-		padding: 0 30upx;
-		font-size: 27upx;
-	}
-
-	.bargain-record .item .bottom .purple {
-		color: #f78513;
-	}
-
-	.bargain-record .item .bottom .end {
-		color: #999;
-	}
-
-	.bargain-record .item .bottom .success {
-		color: #e93323;
-	}
-
-	.bargain-record .item .bottom .bnt {
-		font-size: 27upx;
-		color: #fff;
-		width: 176upx;
-		height: 60upx;
-		border-radius: 32upx;
-		text-align: center;
-		line-height: 60upx;
-	}
-
-	.bargain-record .item .bottom .bnt.cancel {
-		color: #aaa;
-		border: 1px solid #ddd;
-	}
-
-	.bargain-record .item .bottom .bnt~.bnt {
-		margin-left: 18upx;
-	}
-</style>

pages/cart/cart.vue

@@ -1,587 +0,0 @@
-<template>
-	<view class="container">
-		<!-- 空白页 -->
-		<view v-if="!hasLogin || empty === true" class="empty">
-			<image src="/static/error/emptyCart.png" class="emptyImg" mode="aspectFit"></image>
-			<view v-if="hasLogin" class="empty-tips">
-				空空如也
-				<navigator class="navigator" v-if="hasLogin" url="../index/index" open-type="switchTab">随便逛逛></navigator>
-			</view>
-			<view v-else class="empty-tips">
-				空空如也
-				<view class="navigator" @click="navToLogin">去登陆></view>
-			</view>
-		</view>
-		<view v-else>
-			<!-- 购物车头部 -->
-			<view class="cart-hand flex">
-				<view class="hand-tit">
-					购物车共
-					<text>{{ ' ' + cartList.length }} 件</text>
-					商品
-				</view>
-				<view class="hand-btn" @click="clearCart()">清空购物车</view>
-			</view>
-			<!-- 列表 -->
-			<view class="cart-list">
-				<block 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>
-							<view class="iconfont iconroundcheckfill checkbox" :class="{ checked: item.checked }" @click="check('item', index)"></view>
-						</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">¥{{ item.productInfo.price }}</text>
-							<!-- <uni-number-box
-								class="step"
-								:min="1"
-								:max="item.productInfo.stock"
-								:value="item.cart_num > item.productInfo.stock ? item.productInfo.stock : item.cart_num"
-								:isMax="item.cart_num >= item.productInfo.stock ? true : false"
-								:isMin="item.cart_num === 1"
-								:index="index"
-								@eventChange="numberChange"
-							></uni-number-box> -->
-							<view class="munbox flex">
-								<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>
-						</view>
-						<!-- <text class="del-btn iconfont iconclose" @click="deleteCartItem(index)"></text> -->
-					</view>
-				</block>
-			</view>
-			<!-- 底部菜单栏 -->
-			<view class="action-section">
-				<view class="checkbox">
-					<view class="iconfont iconroundcheckfill icon-checked-box" @click="check('all')" :class="{ 'icon-checked': allChecked }"></view>
-					<!-- <view class="clear-btn" @click="allChecked ? clearCart() : ''" :class="{ show: allChecked }"><text>清空</text></view> -->
-				</view>
-				<view class="total-box">
-					<text class="price">¥{{ total }}</text>
-					<!-- <text class="coupon">
-						已优惠
-						<text>74.35</text>
-						元
-					</text> -->
-				</view>
-				<button type="primary" class="no-border confirm-btn" @click="createOrder">去结算</button>
-			</view>
-		</view>
-	</view>
-</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';
-export default {
-	components: {
-		uniNumberBox
-	},
-	data() {
-		return {
-			total: 0, //总价格
-			allChecked: false, //全选状态  true|false
-			empty: false, //空白页现实  true|false
-			cartList: []
-		};
-	},
-	onShow() {
-		// 只有登录时才加载数据
-		if (this.hasLogin) {
-			this.loadData();
-		}
-	},
-	watch: {
-		//显示空白页
-		cartList(e) {
-			let empty = e.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);
-						}
-					}
-				});
-			} else {
-				item.cart_num--;
-				this.newNumberChange(item);
-			}
-		},
-		add(item) {
-			console.log(item);
-			if (item.productInfo.stock > item.cart_num) {
-				item.cart_num++;
-				this.newNumberChange(item);
-			} else {
-				return;
-			}
-		},
-		//请求数据
-		async loadData() {
-			let obj = this;
-			getCartList({})
-				.then(function(e) {
-					// 获取当前购物车物品增加数量
-					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(); //计算总价
-				})
-				.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';
-		},
-		// 跳转到登录页
-		navToLogin() {
-			// 保存地址
-			saveUrl();
-			// 登录拦截
-			interceptor();
-		},
-		//选中状态处理
-		check(type, index) {
-			if (type === 'item') {
-				this.cartList[index].checked = !this.cartList[index].checked;
-			} else {
-				const checked = !this.allChecked;
-				const list = this.cartList;
-				list.forEach(item => {
-					item.checked = checked;
-				});
-				this.allChecked = checked;
-			}
-			this.calcTotal(type);
-		},
-		//数量
-		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.calcTotal();
-		},
-		newNumberChange(item) {
-			getCartNum({
-				id: item.id,
-				number: item.cart_num
-			})
-				.then(e => {
-					console.log(e);
-				})
-				.catch(function(e) {
-					console.log(e);
-				});
-			this.calcTotal();
-		},
-		//删除
-		deleteCartItem(index) {
-			let list = this.cartList;
-			let row = list[index];
-			let id = row.id;
-			cartDel({
-				ids: id
-			});
-			this.cartList.splice(index, 1);
-			uni.hideLoading();
-			this.calcTotal();
-		},
-		//清空
-		clearCart() {
-			uni.showModal({
-				content: '清空购物车？',
-				success: e => {
-					if (e.confirm) {
-						let st = this.cartList.map(e => {
-							return e.id;
-						});
-						cartDel({
-							ids: st.join(',')
-						}).then(e => {
-							console.log(e);
-						});
-						this.cartList = [];
-					}
-				}
-			});
-		},
-		//计算总价
-		calcTotal() {
-			let list = this.cartList;
-			if (list.length === 0) {
-				this.empty = true;
-				return;
-			}
-			let total = 0;
-			let checked = true;
-			list.forEach(item => {
-				if (item.checked === true) {
-					total += item.productInfo.price * item.cart_num;
-				} else if (checked === true) {
-					checked = false;
-				}
-			});
-			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);
-				}
-			});
-
-			uni.navigateTo({
-				url: '/pages/order/createOrder?id=' + goodsData.join(',')
-			});
-		}
-	}
-};
-</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;
-
-		.emptyImg {
-			width: 300rpx;
-			height: 250rpx;
-			margin-bottom: 30rpx;
-		}
-
-		.empty-tips {
-			display: flex;
-			font-size: $font-sm + 2rpx;
-			color: $font-color-disabled;
-
-			.navigator {
-				color: #f65067;
-				margin-left: 16rpx;
-			}
-		}
-	}
-}
-
-/* 购物车列表项 */
-.cart-item {
-	width: 710rpx;
-	height: 210rpx;
-	background: #ffffff;
-	box-shadow: 0px 0px 10rpx 0rpx rgba(0, 0, 0, 0.1);
-	border-radius: 10rpx;
-	margin: 20rpx auto;
-
-	display: flex;
-	position: relative;
-	padding: 30rpx 26rpx 30rpx 80rpx;
-
-	.image-wrapper {
-		width: 150rpx;
-		height: 150rpx;
-		flex-shrink: 0;
-		position: relative;
-
-		image {
-			border-radius: 8rpx;
-		}
-	}
-
-	.checkbox {
-		position: absolute;
-		top: 0;
-		bottom: 0;
-		left: -65rpx;
-		margin: auto 0;
-		height: 50rpx;
-		z-index: 8;
-		font-size: 44rpx;
-		line-height: 1;
-		padding: 4rpx;
-		color: $font-color-disabled;
-		background: #fff;
-		border-radius: 50px;
-	}
-
-	.item-right {
-		display: flex;
-		flex-direction: column;
-		flex: 1;
-		overflow: hidden;
-		position: relative;
-		padding-left: 30rpx;
-
-		.munbox {
-			width: 144rpx;
-			height: 44rpx;
-			position: absolute;
-			bottom: 0;
-			right: 0;
-
-			input {
-				display: inline-block;
-				text-align: center;
-			}
-
-			image {
-				flex-shrink: 0;
-				width: 44rpx;
-				height: 44rpx;
-			}
-		}
-
-		.title,
-		.price {
-			font-size: $font-base + 2rpx;
-			color: $font-color-dark;
-			height: 40rpx;
-			line-height: 40rpx;
-		}
-
-		.attr {
-			font-size: $font-sm + 2rpx;
-			color: $font-color-light;
-			height: 50rpx;
-			line-height: 50rpx;
-
-			font-size: 26rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #999999;
-		}
-
-		.price {
-			// height: 50rpx;
-			// line-height: 50rpx;
-			padding-top: 20rpx;
-			font-size: 34rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #ff4c4c;
-		}
-
-		.step {
-			margin-top: 20rpx;
-		}
-
-		.title {
-			font-size: 34rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #333333;
-		}
-	}
-
-	.del-btn {
-		padding: 4rpx 10rpx;
-		font-size: 34rpx;
-		height: 50rpx;
-		color: $font-color-light;
-	}
-}
-
-/* 底部栏 */
-.action-section {
-	/* #ifdef H5 */
-	margin-bottom: 100rpx;
-	/* #endif */
-	position: fixed;
-	left: 30rpx;
-	bottom: 30rpx;
-	z-index: 95;
-	display: flex;
-	align-items: center;
-	width: 690rpx;
-	height: 100rpx;
-	padding: 0 30rpx;
-	background: rgba(255, 255, 255, 0.9);
-	box-shadow: 0 0 20rpx 0 rgba(0, 0, 0, 0.5);
-	border-radius: 16rpx;
-
-	.checkbox {
-		height: 52rpx;
-		position: relative;
-
-		.icon-checked-box {
-			border-radius: 50rpx;
-			background-color: #ffffff;
-			width: 52rpx;
-			height: 100%;
-			position: relative;
-			z-index: 5;
-			font-size: 53rpx;
-			line-height: 1;
-			color: $font-color-light;
-		}
-
-		.icon-checked {
-			color: $base-color;
-		}
-	}
-
-	.clear-btn {
-		position: absolute;
-		left: 26rpx;
-		top: 0;
-		z-index: 4;
-		width: 0;
-		height: 52rpx;
-		line-height: 52rpx;
-		padding-left: 38rpx;
-		font-size: $font-base;
-		color: #fff;
-		background: $font-color-disabled;
-		border-radius: 0 50px 50px 0;
-		opacity: 0;
-		transition: 0.2s;
-
-		&.show {
-			opacity: 1;
-			width: 120rpx;
-		}
-	}
-
-	.total-box {
-		flex: 1;
-		display: flex;
-		flex-direction: column;
-		text-align: right;
-		padding-right: 40rpx;
-
-		.price {
-			font-size: $font-lg;
-			color: $font-color-dark;
-		}
-
-		.coupon {
-			font-size: $font-sm;
-			color: $font-color-light;
-
-			text {
-				color: $font-color-dark;
-			}
-		}
-	}
-
-	.confirm-btn {
-		padding: 0 38rpx;
-		margin: 0;
-		border-radius: 100px;
-		height: 76rpx;
-		line-height: 76rpx;
-		font-size: $font-base + 2rpx;
-		background: $base-color;
-	}
-}
-
-/* 复选框选中状态 */
-.action-section .checkbox.checked,
-.cart-item .checkbox.checked {
-	color: $base-color;
-}
-
-.cart-hand {
-	width: 750rpx;
-	height: 88rpx;
-	background: #ffffff;
-	font-size: 30rpx;
-	font-family: PingFang SC;
-	font-weight: bold;
-	color: #333333;
-	line-height: 88rpx;
-	padding-left: 28rpx;
-	padding-right: 26rpx;
-
-	.hand-tit {
-		text {
-			color: #ff4c4c;
-		}
-	}
-
-	.hand-btn {
-		width: 164rpx;
-		height: 62rpx;
-		border: 2rpx solid #ff4c4c;
-		border-radius: 31rpx;
-		font-size: 26rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #ff4c4c;
-		line-height: 62rpx;
-		text-align: center;
-	}
-}
-</style>

pages/category/business.vue

@@ -1,312 +0,0 @@
-<template>
-	<view class="center">
-		<!-- <view class="search-top">
-			<view class="search flex">
-				<view class="shop-name clamp">椒江区</view>
-				<image class="shop-jt" src="../../static/icon/dsjh.png" mode=""></image>
-				<view class="input-box flex">
-					<view class=" input-content flex">
-						<image src="../../static/icon/search-h.png" mode="" class="" style="width: 32rpx;height: 32rpx;">
-						</image>
-						<view class="input"><input type="text" value="输入关键字搜索" /></view>
-					</view>
-				</view>
-				<view class="search-tit" @click.stop="clickSearch">
-					搜索
-				</view>
-			</view>
-			<view class="shop">
-				<view class="shop-title">
-					<view class="shop-item">
-						<view class="sitem-font">智能排序</view>
-						<image class="jt-down" src="../../static/index/index06.png" mode=""></image>
-					</view>
-					<view class="shop-item">
-						<view class="sitem-font">位置距离</view>
-						<image class="jt-down" src="../../static/index/index06.png" mode=""></image>
-					</view>
-					<view class="shop-item">
-						<view class="sitem-font">折扣优惠</view>
-						<image class="jt-down" src="../../static/index/index06.png" mode=""></image>
-					</view>
-					<view class="shop-item">
-						<view class="sitem-font">筛选</view>
-						<image class="jt-down" src="../../static/index/index06.png" mode=""></image>
-					</view>
-				</view>
-			</view>
-		</view> -->
-		<!-- <view class="jg" style="height: 180rpx;">
-			
-		</view>
-		<view class="shop">
-			<view class="shop-main flex" v-for="(item, index) in 100" :key="index">
-				<image class="main-left" src="../../static/index/index13.png" mode=""></image>
-				<view class="main-right flex">
-					<view class="shopm-info">
-						<view class="shopm-title">
-							<view class="shopmt-font clamp">李家烤肉11111111111111111111111111111111111111111111</view>
-							<view class="shopmt-good">荐</view>
-						</view>
-						<view class="address">椒江区市府大道200号</view>
-						<view class="shopmt-tip">消费最高可得10%积分</view>
-					</view>
-					<view class="right">
-						<view class="mright-top">
-							<image class="mrt-image" src="../../static/index/index10.png" mode=""></image>
-							<view class="mrt-font">距离0.3KM</view>
-						</view>
-						<view class="mright-bottom">
-							<image class="mrb-item" src="../../static/index/index14.png" mode=""></image>
-							<image class="mrb-item" src="../../static/index/index11.png" mode=""></image>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view> -->
-		<view class="kong"><u-empty mode="data" text="敬请期待"></u-empty></view>
-	</view>
-</template>
-
-<script>
-export default {
-	data() {
-		return {};
-	}
-};
-</script>
-
-<style lang="less">
-.kong {
-	height: 100vh;
-}
-
-.search-top {
-	position: fixed;
-	top: 0;
-	z-index: 99;
-}
-
-.search {
-	justify-content: flex-start;
-	padding: 10rpx 32rpx 20rpx;
-	align-items: center;
-	background-color: #fff;
-
-	.address {
-		width: 32rpx;
-		height: 38rpx;
-	}
-
-	.shop-name {
-		height: 38rpx;
-		position: relative;
-		top: -4rpx;
-		z-index: 100;
-		font-size: 30rpx;
-		font-family: PingFang SC;
-		font-weight: 500;
-		color: #666;
-		padding-left: 10rpx;
-	}
-
-	.shop-jt {
-		margin-left: 8rpx;
-		width: 16rpx;
-		height: 10rpx;
-	}
-
-	.input-box {
-		margin-left: 10rpx;
-		position: relative;
-		z-index: 99;
-		width: 520rpx;
-		height: 60rpx;
-		// background: rgba(255, 255, 255, 0.4);
-		border-radius: 30rpx;
-
-		.input-content {
-			position: relative;
-			z-index: 11;
-			// border-radius: 99rpx;
-			flex-grow: 1;
-			padding: 5rpx 30rpx;
-			background: #f6f6f6;
-
-			.iconsearch {
-				font-size: 50rpx;
-				color: #ffffff;
-			}
-
-			.input {
-				margin-left: 19rpx;
-				flex-grow: 1;
-				color: #666;
-				background: #f6f6f6;
-
-				input {
-					font-size: 28rpx;
-				}
-			}
-		}
-
-		.input-button {
-			padding-left: 20rpx;
-			// font-size: $font-base;
-			height: 100%;
-		}
-	}
-
-	.search-tit {
-		font-size: 28rpx;
-		font-family: PingFang SC;
-		font-weight: 500;
-		color: #666666;
-		flex-shrink: 0;
-		padding-left: 10rpx;
-	}
-}
-
-.shop {
-	// margin-top: 20rpx;
-	background: #ffffff;
-	padding: 0 12rpx;
-
-	.shop-title {
-		padding: 30rpx 0 20rpx;
-		display: flex;
-		align-items: center;
-		border-bottom: 1px solid #e3e6e7;
-
-		.shop-item {
-			width: 25%;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-
-			.sitem-font {
-				font-size: 26rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #333333;
-			}
-
-			.jt-down {
-				width: 10rpx;
-				height: 8rpx;
-				margin-left: 12rpx;
-			}
-		}
-	}
-
-	.shop-main {
-		padding: 32rpx 18rpx 0 12rpx;
-		align-items: flex-start;
-		justify-content: flex-start;
-
-		.main-left {
-			width: 180rpx;
-			height: 180rpx;
-			border-radius: 10rpx;
-		}
-
-		.main-right {
-			width: 500rpx;
-			justify-content: space-between;
-			align-items: flex-start;
-			margin-left: 20rpx;
-			padding: 13rpx 0 35rpx;
-			border-bottom: 1px solid #eaeced;
-
-			.shopm-info {
-				max-width: 60%;
-				line-height: 1;
-
-				.shopm-title {
-					display: flex;
-					justify-content: flex-start;
-
-					.shopmt-font {
-						font-size: 34rpx;
-						font-family: PingFang SC;
-						font-weight: bold;
-						color: #333333;
-					}
-
-					.shopmt-good {
-						margin-left: 6rpx;
-						width: 30rpx;
-						height: 30rpx;
-						border: 1px solid #ff4c4c;
-						border-radius: 5rpx;
-						font-size: 20rpx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #ff4c4c;
-						text-align: center;
-						line-height: 30rpx;
-					}
-				}
-
-				.address {
-					margin-top: 16rpx;
-					font-size: 24rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #666666;
-				}
-
-				.shopmt-tip {
-					position: relative;
-					margin-top: 52rpx;
-					padding: 8rpx;
-					background: #fcf3f0;
-					border-radius: 16rpx 16rpx 16rpx 0px;
-					font-size: 20rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #ff440d;
-				}
-			}
-
-			.right {
-				height: 100%;
-				margin-top: 5rpx;
-				display: flex;
-				flex-direction: column;
-
-				.mright-top {
-					display: flex;
-					justify-content: flex-end;
-					align-items: center;
-
-					.mrt-image {
-						width: 20rpx;
-						height: 28rpx;
-					}
-
-					.mrt-font {
-						margin-left: 8rpx;
-						font-size: 22rpx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #666666;
-					}
-				}
-
-				.mright-bottom {
-					margin-top: 80rpx;
-					display: flex;
-					justify-content: flex-end;
-
-					.mrb-item {
-						width: 46rpx;
-						height: 46rpx;
-						margin-left: 14rpx;
-					}
-				}
-			}
-		}
-	}
-}
-</style>

pages/category/category.vue

@@ -1,451 +0,0 @@
-<template>
-	<view class="content">
-		<!-- 兼容小程序搜索 -->
-		<!-- #ifdef MP -->
-		<navigator url="/pages/product/search">
-			<view class="input-box flex">
-				<view class=" input-content flex">
-					<view class="iconfont iconsearch"></view>
-					<view class="input"><input disabled placeholder="请输入搜索内容" /></view>
-				</view>
-			</view>
-		</navigator>
-		<!-- #endif -->
-		<!-- #ifdef H5 -->
-		<!-- <view class="cate-bg"></view> -->
-		<!-- #endif -->
-
-		<div class="classBox">
-			<scroll-view scroll-y class="left-aside">
-				<view class="f-item b-b" :class="{ active: item.id === currentId }" v-for="(item, index) in flist" :key="item.id" @click="tabtap(item, index)">
-					{{ item.cate_name }}
-				</view>
-			</scroll-view>
-
-			<scroll-view scroll-with-animation scroll-y class="right-aside" :scroll-top="tabScrollTop" @scrolltolower="getListMore">
-				<view class="t-list " v-if="flist.length > 0">
-					<view @click="navToDetailPage(titem)" class="t-item" v-for="titem in flist[actionClassInd].list" :key="titem.id" id="'main-' + item.id">
-						<image :src="titem.image" mode="scaleToFill" :lazy-load="true"></image>
-						<view class="font">
-							<view class="title">{{ titem.store_name }}</view>
-							<view class="font-bottom">
-								<view class="price">￥{{ titem.price }}</view>
-								<view class="shop"><view class="shop-text">马上购</view></view>
-							</view>
-						</view>
-					</view>
-					<view class="text-center"><uni-load-more :status="flist[actionClassInd].loadingType"></uni-load-more></view>
-				</view>
-				<!-- </view> -->
-			</scroll-view>
-		</div>
-	</view>
-</template>
-
-<script>
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-import { getProducts, getCategoryList, newgetList } from '@/api/product.js';
-export default {
-	components: {
-		uniLoadMore
-	},
-	data() {
-		return {
-			sizeCalcState: false,
-			tabScrollTop: 0,
-			currentId: 5,
-			flist: [],
-			commodity: [], //商品列表
-			current: 0,
-			page: 1, //当前页数
-			limit: 6, //每次加载数据条数
-			loadingType: 'more', //加载更多状态
-			actionClassInd: 0
-		};
-	},
-	onLoad() {
-		this.loadData();
-	},
-	//下拉刷新
-	onPullDownRefresh() {
-		this.loadData('refresh');
-	},
-	// 监听导航栏输入框点击事件
-	onNavigationBarSearchInputClicked(e) {
-		uni.navigateTo({
-			url: '/pages/product/search'
-		});
-	},
-	//监听页面是否滚动到底部加载更多
-	onReachBottom() {
-		this.loadData();
-	},
-	methods: {
-		// 载入数据
-		async loadData(type = 'add', loading) {
-			let obj = this;
-			let data = {
-				page: obj.page,
-				limit: obj.limit
-			};
-			//没有更多直接返回
-			if (type === 'add') {
-				if (obj.loadingType === 'nomore') {
-					return;
-				}
-				obj.loadingType = 'loading';
-			} else {
-				obj.loadingType = 'more';
-			}
-			if (type === 'refresh') {
-				// 清空数组
-				obj.page = 1;
-			}
-			getCategoryList({})
-				.then(({ data }) => {
-					console.log('------', data);
-					obj.flist = data.map(function(s) {
-						s.list = []; //用于保存当前分类下商品对象的数据
-						s.loadingType = 'more'; //判断当前商品分类数据是否已经加载完毕
-						s.page = 1; //当前商品分类加载的商品页数
-						s.limit = 10; //每次家在数据加载的数据条数
-						return s;
-					});
-					console.log(obj.flist, '数据');
-					obj.currentId = obj.flist[0].id;
-					// 开始处理数据
-					// for (var i = 0; i < obj.flist.length; i++) {
-					// }
-					obj.getProductsList(obj.flist[0]);
-				})
-				.catch(err => {
-					console.log(err);
-				});
-		},
-		//一级分类点击
-		tabtap(item, index) {
-			// 判断有没有初始化页面高度对象数据
-			// if (!this.sizeCalcState) {
-			// 	this.calcSize();
-			// }
-			// 获取当前点击的id
-			this.currentId = item.id;
-			//获取当前点击的下标
-			this.actionClassInd = index;
-			this.tabScrollTop = item.top;
-			// 获取当前选中的对象
-			let ls = this.flist[this.actionClassInd];
-			// 判断当前数据是否已经加载完毕
-			if (ls.loadingType == 'more') {
-				this.getProductsList(ls);
-			}
-		},
-		//右侧栏滚动
-		// asideScroll(e) {
-		// 	console.log('开始处理数据');
-		// 	// 判断有没有初始化页面高度对象数据
-		// 	// if (!this.sizeCalcState) {
-		// 	// 	this.calcSize();
-		// 	// }
-		// 	// 获取当前滚轮高度
-		// 	let scrollTop = e.detail.scrollTop;
-		// 	let box = 0; //列表包裹框高度初始化
-		// 	let bottom = 10; //距离页面底部多少像素左侧列表切换到最后一个一级分类
-		// 	// 查询当前页面对象
-		// 	let view = uni.createSelectorQuery().select('.content');
-		// 	view.fields(
-		// 		{
-		// 			id: true,
-		// 			dataset: true,
-		// 			rect: true,
-		// 			size: true,
-		// 			scrollOffset: true
-		// 		},
-		// 		function(e) {
-		// 			// 保存包裹框高度
-		// 			box = e.height;
-		// 		}
-		// 	).exec();
-		// 	// 获取所有距离顶部大于滚轮距离页面高度的所有分类
-		// 	let tabs = this.flist.filter(item => item.top - 10 <= scrollTop).reverse();
-		// 	if (tabs.length > 0) {
-		// 		// 判断是否已经到达滚轮底部
-		// 		if (box + scrollTop + bottom >= e.detail.scrollHeight) {
-		// 			this.currentId = this.flist[this.flist.length - 1].id;
-		// 		} else {
-		// 			this.currentId = tabs[0].id;
-		// 		}
-		// 	}
-		// },
-		//计算右侧栏每个tab的高度等信息
-		// calcSize() {
-		// 	let h = 0;
-		// 	this.flist.forEach(item => {
-		// 		let view = uni.createSelectorQuery().select('#main-' + item.id);
-		// 		view.fields(
-		// 			{
-		// 				size: true
-		// 			},
-		// 			data => {
-		// 				item.top = h;
-		// 				h += data.height;
-		// 				item.bottom = h;
-		// 			}
-		// 		).exec();
-		// 	});
-		// 	this.sizeCalcState = true;
-		// },
-		// 加载分类下商品数据
-		getProductsList(item, type = 'add') {
-			console.log(item);
-			const obj = this;
-			const requestData = {
-				page: item.page,
-				limit: item.limit,
-				cid: item.id
-			};
-			// 判断数据是否加载中
-			if (item.loadingType == 'nomore' || item.loadingType == 'loading') {
-				return;
-			}
-			// 判断是否重新加载数据
-			if (type == 'refresh') {
-				item.list = [];
-			}
-			// 设置数据加载中
-			item.loadingType = 'loading';
-			return new Promise((ok, erro) => {
-				getProducts(requestData)
-					.then(({ data }) => {
-						// item.list = data.map((s,ind) => {
-						// 	return s;
-						// });
-						data.forEach((sj, index) => {
-							item.list.push(sj);
-						});
-						if (item.limit == data.length) {
-							item.page++;
-							item.loadingType = 'more';
-						} else {
-							item.loadingType = 'nomore';
-						}
-						if (type === 'refresh') {
-							if (loading == 1) {
-								uni.hideLoading();
-							} else {
-								uni.stopPullDownRefresh();
-							}
-						}
-					})
-					.catch(err => {
-						console.log(err);
-					});
-			});
-		},
-		//下拉到底部后加载商品列表数据
-		getListMore() {
-			this.getProductsList(this.flist[this.actionClassInd]);
-		},
-		navToDetailPage(item) {
-			// 点击导航跳转到详细页面
-			uni.navigateTo({
-				url: '/pages/product/product?id=' + item.id
-			});
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.text-center {
-	width: 100%;
-	text-align: center;
-}
-/* #ifdef MP || APP-PLUS*/
-.input-box {
-	padding: 25rpx;
-	/* #ifdef APP-PLUS */
-	margin-top: var(--status-bar-height);
-	/* #endif */
-	background-color: #fe8119;
-	height: 44px;
-	.iconsearch {
-		font-size: 50rpx;
-	}
-	.input-content {
-		border-radius: 99rpx;
-		flex-grow: 1;
-		padding: 5rpx 30rpx;
-		// background-color: rgba(231, 231, 231, 0.7);
-		background: #ffffff;
-		.input {
-			flex-grow: 1;
-			input {
-				font-size: $font-base;
-			}
-		}
-	}
-	.input-button {
-		padding-left: 20rpx;
-		font-size: $font-base;
-		height: 100%;
-	}
-}
-/* #endif */
-
-page,
-.content {
-	height: 100%;
-	background-color: #f8f8f8;
-}
-.content {
-	.cate-bg {
-		position: fixed;
-		top: 0;
-		width: 750rpx;
-		height: 44px;
-		z-index: 10;
-		// background: linear-gradient(90deg, #FF8E00, #FE762F);
-		background: #12ada9;
-	}
-	.classBox {
-		// padding-top: 44px;
-		display: flex;
-		height: calc(100% - 44px);
-		/* #ifdef APP-PLUS || MP */
-		height: calc(100% - 88px);
-		/* #endif */
-	}
-}
-.left-aside {
-	flex-shrink: 0;
-	width: 180rpx;
-	height: 100%;
-	background-color: #fff;
-}
-.f-item {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	width: 100%;
-	height: 100rpx;
-	font-size: 28rpx;
-	color: $font-color-base;
-	position: relative;
-	&.active {
-		color: $base-color;
-		background: #f8f8f8;
-		&:before {
-			content: '';
-			position: absolute;
-			left: 0;
-			top: 50%;
-			transform: translateY(-50%);
-			height: 36rpx;
-			width: 8rpx;
-			background-color: $base-color;
-			border-radius: 0 4px 4px 0;
-			opacity: 0.8;
-		}
-	}
-}
-
-.right-aside {
-	flex: 1;
-	overflow: hidden;
-	padding-left: 20rpx;
-	padding-right: 20rpx;
-}
-.s-item {
-	display: flex;
-	align-items: center;
-	font-weight: bold;
-	height: 70rpx;
-	padding-top: 8rpx;
-	font-size: 35rpx;
-	color: $font-color-dark;
-}
-.t-list {
-	display: flex;
-	flex-wrap: wrap;
-	border-radius: 15rpx;
-	width: 100%;
-	background: #fff;
-	padding-top: 12rpx;
-	&:after {
-		content: '';
-		flex: 99;
-		height: 0;
-	}
-}
-.t-item {
-	height: 220rpx;
-	flex-shrink: 0;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	flex-direction: row;
-	width: 500rpx;
-	font-size: 26rpx;
-	color: #666;
-	padding-bottom: 20rpx;
-	margin-right: 40rpx;
-	&.active {
-		display: none;
-	}
-
-	image {
-		width: 200rpx;
-		height: 200rpx;
-		margin-top: 30rpx;
-		margin-left: 20rpx;
-	}
-	.font {
-		margin-left: 25rpx;
-		margin-top: 30rpx;
-		width: 500rpx;
-		.title {
-			font-weight: bold;
-			font-size: $font-base;
-			color: $font-color-dark;
-			word-break: break-all;
-			display: -webkit-box;
-			-webkit-line-clamp: 2;
-			-webkit-box-orient: vertical;
-			overflow: hidden;
-		}
-		.font-bottom {
-			height: 60rpx;
-			width: 100%;
-			display: flex;
-			margin-top: 76rpx;
-			justify-content: space-between;
-			.shop {
-				width: 137rpx;
-				height: 52rpx;
-				background: linear-gradient(270deg, #ff8149, #ff4e00);
-				border-radius: 26rpx;
-
-				.shop-text {
-					font-size: 26rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #ffffff;
-					margin-left: 30rpx;
-					margin-top: 10rpx;
-				}
-			}
-			.price {
-				margin-top: 14rpx;
-				width: 88rpx;
-				height: 26rpx;
-				font-size: 34rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #fb3a2f;
-				line-height: 34rpx;
-			}
-		}
-	}
-}
-</style>

pages/collection/bank.vue

@@ -1,142 +0,0 @@
-<template>
-	<view class="content">
-		<view class="box">
-			<view class="item ">
-				<text>姓名</text>
-				<input type="text" v-model="name" value="" placeholder="请输入真实姓名" />
-			</view>
-			<view class="item top">
-				<text>银行卡号</text>
-				<input type="text" v-model="id" value="" placeholder="请输入银行卡账号" />
-			</view>
-			<view class="item">
-				<text>所属银行</text>
-				<input type="text" v-model="idName" value="" placeholder="请输入银行" />
-			</view>
-			<view class="item">
-				<text>所属支行</text>
-				<input type="text" v-model="bankname" value="" placeholder="请输入所属支行" />
-			</view>
-			<view class="item">
-				<text>手机号</text>
-				<input type="text" v-model="phone" value="" placeholder="请输入手机号" />
-			</view>
-		</view>
-		<view class="button" @click="confirm()">确认</view>
-	</view>
-</template>
-
-<script>
-import { auction, pay_list } from '@/api/wallet.js';
-import { orderData, getUserInfo } from '@/api/user.js';
-import { mapState, mapMutations } from 'vuex';
-export default {
-	computed: {
-		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
-	},
-	data() {
-		return {
-			name: '',
-			id: '',
-			idName: '',
-			phone: '',
-			bankname: ''
-		};
-	},
-	onLoad() {
-		pay_list().then(({ data }) => {
-			if (data.bank != '') {
-				this.name = data.bank.name;
-				this.id = data.bank.payment;
-				this.phone = data.bank.phone;
-				this.idName = data.bank.bank;
-				this.bankname = data.bank.bank_name;
-			}
-		});
-	},
-	methods: {
-		...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
-		confirm() {
-			let obj = this;
-			if (!obj.name) {
-				return this.$api.msg('请输入提款人姓名');
-			}
-			if (!obj.idName) {
-				return this.$api.msg('请输入所属银行');
-			}
-			if (!obj.id) {
-				return this.$api.msg('请输入银行卡号');
-			}
-			if (!obj.phone) {
-				return this.$api.msg('请输入手机号码');
-			}
-			if (!obj.bankname) {
-				return this.$api.msg('请输入所属支行');
-			}
-			auction({
-				type: 3,
-				name: obj.name,
-				bank: obj.idName,
-				payment: obj.id,
-				phone: obj.phone,
-				bank_name: obj.bankname
-			}).then(e => {
-				obj.$api.msg('修改成功');
-			});
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page,
-.content {
-	height: 100%;
-	padding: 0;
-	margin: 0;
-}
-.top {
-	border-top: 1rpx solid #f3f3f3;
-	border-bottom: 1rpx solid #f3f3f3;
-}
-.box {
-	background: #ffffff;
-	margin: 20rpx 0 70rpx 0;
-	.item {
-		display: flex;
-		align-items: center;
-		text {
-			margin: 0 40rpx 0 25rpx;
-			width: 150rpx;
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: 400;
-			color: #333333;
-			line-height: 100rpx;
-		}
-		input {
-			width: 500rpx;
-			height: 100rpx;
-			display: inline-block;
-			font-size: 28rpx;
-			font-family: PingFang SC;
-			font-weight: 400;
-			color: #999999;
-			line-height: 100rpx;
-		}
-	}
-}
-.button {
-	text-align: center;
-	width: 560rpx;
-	height: 80rpx;
-	background: #fd3b39;
-	border-radius: 40rpx;
-	font-size: 30rpx;
-	font-family: PingFangSC;
-	font-weight: 500;
-	color: #ffffff;
-	line-height: 80rpx;
-	margin: 0 auto;
-}
-</style>

pages/collection/collection.vue

@@ -1,145 +0,0 @@
-<template>
-	<view class="content">
-		<view class="collection-box">
-			<view class="collection-item">
-				<view class="left">
-					<view class="img"><image src="../../static/user/mybank.png" mode=""></image></view>
-					<view class="bank">银行卡</view>
-				</view>
-				<view class="gg" @click="nav('/pages/collection/bank')">
-					<view class="status" v-if="bankData.name != null">{{ bankData.name}}</view>
-					<view class="status" v-else>未添加</view>
-					<view class="img1"><text class="iconfont iconenter"></text></view>
-				</view>
-			</view>
-			<view class="collection-item">
-				<view class="left">
-					<view class="img"><image src="../../static/user/zfb.png" mode=""></image></view>
-					<view class="bank">支付宝</view>
-				</view>
-				<view class="gg" @click="nav('/pages/collection/zfb')">
-					<view class="status" v-if="aliData.name != null">{{aliData.name}}</view>
-					<view class="status" v-else>未添加</view>
-					<view class="img1"><text class="iconfont iconenter"></text></view>
-				</view>
-			</view>
-			<view class="collection-item">
-				<view class="left">
-					<view class="img">
-						<image src="../../static/user/wx.png" mode=""></image>
-					</view>
-					<view class="bank">
-						微信
-					</view>
-				</view>
-				<view class="gg" @click="nav('/pages/collection/wx')">
-					<view class="status" v-if="wx.name != null">{{wx.name}}</view>
-					<view class="status" v-else>未添加</view>
-					<view class="img1">
-						<text class="iconfont iconenter"></text>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-import { mapState, mapMutations } from 'vuex';
-import { pay_list } from '../../api/wallet.js'
-export default {
-	data() {
-		return {
-			aliData: {},
-			bankData: {},
-			wx:{},
-		};
-	},
-	computed: {
-		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin']),
-	},
-	onShow() {
-		this.loadDate();
-	},
-	methods: {
-		nav(url) {
-			uni.navigateTo({
-				url
-			});
-		},
-		loadDate() {
-			pay_list().then(({data}) =>{
-				this.wx = data.wx
-				this.aliData = data.zfb
-				this.bankData = data.bank
-			})
-		}
-	}
-};
-</script>
-<style lang="scss">
-page,
-.content {
-	height: 100%;
-	margin: 0;
-	height: 0;
-}
-
-.collection-box {
-	background: #ffffff;
-	margin: 50rpx 20rpx;
-	width: 710rpx;
-	display: flex;
-	flex-direction: column;
-
-	.collection-item {
-		margin: 35rpx 30rpx;
-		display: flex;
-		justify-content: space-between;
-
-		.left {
-			display: flex;
-
-			.img {
-				height: 40rpx;
-				width: 40rpx;
-
-				image {
-					height: 100%;
-					width: 100%;
-				}
-			}
-
-			.bank {
-				margin-left: 25rpx;
-				font-size: 26rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #333333;
-			}
-		}
-
-		.gg {
-			display: flex;
-
-			.status {
-				font-size: 26rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #999999;
-				margin-right: 20rpx;
-			}
-
-			.img1 {
-				width: 15rpx;
-				height: 25rpx;
-
-				image {
-					width: 100%;
-					height: 100%;
-				}
-			}
-		}
-	}
-}
-</style>

pages/collection/wx.vue

@@ -1,157 +0,0 @@
-<template>
-	<view class="content">
-		<view class="box">
-			<view class="wx">
-				<text>姓名</text>
-				<input type="text" v-model="name" value="" placeholder="请输入姓名" />
-			</view>
-			<view class="wx">
-				<text>微信号</text>
-				<input type="text" v-model="code" value="" placeholder="请输入微信号" />
-			</view>
-			<view class="wx">
-				<text>手机号</text>
-				<input type="text" v-model="phone" value="" placeholder="请输入手机号" />
-			</view>
-			<view class="erweima">
-				<text>微信收款码</text>
-				<view class="img" @click="uploads()">
-					<image src="../../static/user/erweima.png" mode="" v-if="image == ''"></image>
-					<image :src="image" mode="" v-else></image>
-				</view>
-			</view>
-		</view>
-		<view class="button" @click="confirm()">
-			确认
-		</view>
-	</view>
-</template>
-
-<script>
-	import { upload } from '@/api/order.js'
-	import { auction,pay_list } from '@/api/wallet.js';
-	export default {
-		data() {
-			return {
-				code:'',
-				name:'',
-				image:'',
-				phone:''
-			};
-		},
-		onLoad() {
-			pay_list().then(({data}) =>{
-				if(data.wx != ''){
-					this.name = data.wx.name
-					this.code = data.wx.payment
-					this.image = data.wx.image
-					this.phone = data.wx.phone
-				}
-			})
-		},
-		methods: {
-			uploads(){
-				upload({
-					filename: ''
-				}).then(data => {
-					this.image = data[0].url;
-				})
-			},
-			confirm() {
-				let obj = this;
-				if (!obj.name) {
-					return this.$api.msg('请输入提款人姓名');
-				}
-				if (!obj.code) {
-					return this.$api.msg('请输入微信账号');
-				}
-				if (!obj.image) {
-					return this.$api.msg('请上传微信二维码');
-				}
-				if (!obj.phone) {
-					return this.$api.msg('请输入手机号码');
-				}
-				auction({
-					type:1,
-					name: obj.name,
-					payment: obj.code,
-					image: obj.image,
-					phone: obj.phone,
-				})
-					.then(e => {
-						obj.$api.msg('修改成功');
-					})
-					.catch(e => {
-						console.log(e);
-					});
-			},
-		}
-	}
-</script>
-
-<style lang="scss">
-page , .content{
-	height: 100%;
-	margin: 0;
-	padding: 0;
-	
-}
-.box{
-	margin:20rpx 0  100rpx 0;
-	width: 100%;
-	background: #FFFFFF;
-	
-	.wx{
-		border-bottom: #F0F0F0 solid 1rpx;
-		padding: 20rpx 0 30rpx 0;
-		display: flex;
-		text{
-			width: 150rpx;
-			margin: 0 30rpx;
-		}
-		input {
-			height: 100rpx;
-			display: inline-block;
-			font-size: 28rpx;
-			font-family: PingFang SC;
-			font-weight: 400;
-			color: #999999;
-			line-height: 100rpx;
-		}
-	}
-	.erweima{
-		padding: 30rpx 0;
-		display: flex;
-		text{
-			margin: 0 30rpx;
-			width: 150rpx;
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: 400;
-			color: #333333;
-			
-		}
-		.img{
-			width: 160rpx;
-			height: 160rpx;
-			image{
-				width: 100%;
-				height: 100%;
-			}
-		}
-	}
-}
-.button{
-	margin: 0 auto;
-	width: 560rpx;
-	height: 80rpx;
-	background: #FD3B39;
-	border-radius: 40rpx;
-	font-size: 30rpx;
-	font-family: PingFangSC;
-	font-weight: 500;
-	color: #FFFFFF;
-	line-height: 80rpx;
-	text-align: center;
-}
-</style>

pages/collection/zfb.vue

@@ -1,124 +0,0 @@
-<template>
-	<view class="content">
-		<view class="box">
-			<view class="item top">
-				<text>真实姓名</text>
-				<input type="text" v-model="name" value="" placeholder="请输入真实姓名" />
-			</view>
-			<view class="item">
-				<text>支付宝账号</text>
-				<input type="text" v-model="id" value="" placeholder="请输入支付宝账号" />
-			</view>
-			<view class="item">
-				<text>手机号</text>
-				<input type="text" v-model="phone" value="" placeholder="请输入手机号" />
-			</view>
-		</view>
-		<view class="button" @click="confirm()">确认</view>
-	</view>
-</template>
-
-<script>
-import { orderData, getUserInfo } from '@/api/user.js';
-import { mapState, mapMutations } from 'vuex';
-import { auction,pay_list } from '@/api/wallet.js';
-export default {
-	computed: {
-		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
-	},
-	data() {
-		return {
-			name: '',
-			id: '',
-			phone:''
-		};
-	},
-	onLoad() {
-		pay_list().then(({data}) =>{
-			if(data.zfb != ''){
-				this.name = data.zfb.name
-				this.id = data.zfb.payment
-				this.phone = data.zfb.phone
-			}
-		})
-	},
-	methods: {
-		...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
-		confirm() {
-			let obj = this;
-			if (!obj.name) {
-				return this.$api.msg('请输入提款人姓名');
-			}
-			if (!obj.id) {
-				return this.$api.msg('请输入支付宝账号');
-			}
-			if (!obj.phone) {
-				return this.$api.msg('请输入手机号码');
-			}
-			auction({
-				type:2,
-				name: obj.name,
-				payment: obj.id,
-				phone: obj.phone,
-			})
-				.then(e => {
-					obj.$api.msg('修改成功');
-				})
-				.catch(e => {
-					console.log(e);
-				});
-		},
-	}
-};
-</script>
-
-<style lang="scss">
-page,
-.content {
-	height: 100%;
-	padding: 0;
-	margin: 0;
-}
-.top {
-	border-bottom: 1rpx solid #f3f3f3;
-}
-.box {
-	background: #ffffff;
-	margin: 20rpx 0 70rpx 0;
-	.item {
-		display: flex;
-		align-items: center;
-		text {
-			margin: 0 40rpx 0 25rpx;
-			width: 150rpx;
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: 400;
-			color: #333333;
-			line-height: 100rpx;
-		}
-		input {
-			height: 100rpx;
-			display: inline-block;
-			font-size: 28rpx;
-			font-family: PingFang SC;
-			font-weight: 400;
-			color: #999999;
-			line-height: 100rpx;
-		}
-	}
-}
-.button {
-	text-align: center;
-	width: 560rpx;
-	height: 80rpx;
-	background: #FD3B39;
-	border-radius: 40rpx;
-	font-size: 30rpx;
-	font-family: PingFangSC;
-	font-weight: 500;
-	color: #ffffff;
-	line-height: 80rpx;
-	margin: 0 auto;
-}
-</style>

pages/game/game.vue

@@ -1,163 +0,0 @@
-<template>
-	<view class="center">
-		<view class="box" v-for="(item, index) in gameList">
-			<view class="game-box" @click="goGame(item.id, index)">
-				<view class="title">超有趣的种茶游戏</view>
-				<view class="box-title">{{ item.name }}</view>
-				<image :src="'../../static/img/game0' + ((index % 7) + 1) + '.png'" mode=""></image>
-				<view class="game-box-content">
-					施肥时间
-					<view class="game-box-content1">每天{{ item.add_time }}</view>
-				</view>
-			</view>
-		</view>
-		<!-- 	<view class="game-box" @click="goGame(1)">
-			<image src="../../static/img/game02.png" mode=""></image>
-			<view class="game-box-content" style="color: #BA4FBC;">开打时间
-				<view class="game-box-content1" style="background-color: #BA4FBC;">
-					每天10:00
-				</view>
-			</view>
-		</view>
-		<view class="game-box" @click="goGame(2)">
-			<image src="../../static/img/game03.png" mode=""></image>
-			<view class="game-box-content" style="color: #E88B2D;">开打时间
-				<view class="game-box-content1" style="background-color: #E88B2D;">
-					每天10:00
-				</view>
-			</view>
-		</view>
-		<view class="game-box" @click="goGame(3)">
-			<image src="../../static/img/game04.png" mode=""></image>
-			<view class="game-box-content" style="color: #FF6E3E;">开打时间
-				<view class="game-box-content1" style="background-color: #FF6E3E;">
-					每天10:00
-				</view>
-			</view>
-		</view>
-		<view class="game-box" @click="goGame(4)">
-			<image src="../../static/img/game05.png" mode=""></image>
-			<view class="game-box-content" style="color:#21BB9F;">开打时间
-				<view class="game-box-content1" style="background-color: #21BB9F;">
-					每天10:00
-				</view>
-			</view>
-		</view> -->
-		<!-- <view class="kong">
-			<u-empty mode="data" text="敬请期待"></u-empty>
-		</view> -->
-		<!-- <u-tabbar activeColor="#EE0979" v-model="current" :list="tabbar" :mid-button="true"></u-tabbar> -->
-	</view>
-</template>
-
-<script>
-import { getGame } from '@/api/game.js';
-export default {
-	data() {
-		return {
-			add_time: '', //开始事件
-			end_time: '', //结束时间
-			gameList: '' //游戏列表
-		};
-	},
-	onShow() {
-		getGame().then(res => {
-			// console.log(res, 'res');
-			this.gameList = res.data.data;
-			res.data.data.forEach(e => {
-				// this.end_time =
-				var end = e.add_time.split(' ');
-				e.add_time = end[1];
-			});
-		});
-	},
-	methods: {
-		goGame(e, index) {
-			console.log(e, '点击跳转');
-			uni.navigateTo({
-				url: './gameDetail?id=' + e + '&index=' + index
-			});
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.center {
-	width: 750rpx;
-	padding: 0;
-	margin: 20rpx;
-}
-
-.game-box {
-	position: relative;
-	// margin: 10rpx;
-	width: 690rpx;
-	height: 280rpx;
-
-	image {
-		width: 100%;
-		height: 100%;
-	}
-	.title {
-		font-size: 42rpx;
-		font-family: zihun100hao;
-		font-weight: normal;
-		color: #29554e;
-		position: absolute;
-		z-index: 99;
-		top: 40rpx;
-		left: 60rpx;
-		display: flex;
-	}
-	.box-title {
-		font-family: Cursive;
-		font-weight: 500;
-		position: absolute;
-		z-index: 99;
-		top: 120rpx;
-		left: 60rpx;
-		display: flex;
-		color: #29554e;
-		font-size: 40rpx;
-		font-weight: 500;
-	}
-}
-
-.game-box-content {
-	top: 180rpx;
-	left: 60rpx;
-	line-height: 60rpx;
-	position: absolute;
-	font-size: 30rpx;
-	font-weight: 500;
-	color: #8f6afd;
-	padding-left: 20rpx;
-	width: 360rpx;
-	height: 60rpx;
-	background: #ffffff;
-	border-radius: 30rpx;
-	align-items: center;
-
-	.game-box-content1 {
-		align-items: center;
-		position: absolute;
-		right: 0;
-		top: 0;
-		line-height: 60rpx;
-		text-align: center;
-		width: 220rpx;
-		height: 60rpx;
-		background: #754af0;
-		border-radius: 30rpx;
-		font-size: 30rpx;
-		font-weight: 500;
-		color: #ffffff;
-	}
-}
-
-// .kong {
-// 	height: 100vh;
-// 	width: 750rpx;
-// }
-</style>

pages/game/gameDetail.vue

@@ -1,966 +0,0 @@
-<template>
-	<view class="content">
-		<view class="game-top-bg">
-			<image src="../../static/game/game06.png" mode=""></image>
-			<view class="hl"><image src="../../static/game/game3.gif" mode=""></image></view>
-			<view class="tz"><image src="../../static/game/game2.gif" mode=""></image></view>
-			<view class="game-top-time">
-				第{{ guaishouList.stage }}期
-
-				<view class="yueyue" v-if="isGb">
-					&nbsp;&nbsp;距离种茶
-					<span>{{ state == 0 ? '开始' : '结束' }}</span>
-					仅剩
-					<span v-if="state == 0">
-						<span>{{ kai.day }}</span>
-						天
-						<span>{{ kai.hours }}</span>
-						时
-						<span>{{ kai.minutes }}</span>
-						分
-						<span>{{ kai.seconds }}</span>
-						秒
-					</span>
-					<span v-else>
-						<span>{{ hour.day }}</span>
-						天
-						<span>{{ hour.hours }}</span>
-						时
-						<span>{{ hour.minutes }}</span>
-						分
-						<span>{{ hour.seconds }}</span>
-						秒
-					</span>
-				</view>
-				<view class="yueyue" style="margin-left: 200rpx;" v-else>已结束</view>
-			</view>
-			<view class="game-top-xl">
-				<view class="xl" v-if="guaishouList.number != guaishouList.money * 1">血量值:&nbsp;{{ guaishouList.number }}/{{ guaishouList.money * 1 }}</view>
-				<view class="xl" v-else>种茶成功!</view>
-				<view class="xl-t">
-					<!-- 血量进度条 暂未开发! -->
-					<!-- <prog value= "80"></prog> -->
-					<!-- change进度条变化时候触发 -->
-					<bing-progress
-						change="change"
-						:value="getJd"
-						width="474rpx"
-						noActiveColor="#08D29B"
-						infoColor="#fff"
-						:isActiveCircular="false"
-						barBorderRadius="20px"
-						:disabled="true"
-						infoContent="value"
-						infoEndText="%"
-						handleWidth="0"
-						infoFontSize="24px"
-						strokeWidth="34rpx"
-						:continuous="true"
-						:subContinuous="true"
-						infoAlign="center"
-						activeColor="#08D29B"
-					></bing-progress>
-				</view>
-			</view>
-			<!-- <view class="xgs"><image :src="'../../static/game/reb0' + ((index % 5) + 1) + '.png'" mode=""></image></view> -->
-			<view class="id">名称:{{ guaishouList.name }}&nbsp&nbsp&nbsp期数Id:{{ guaishouList.stage }}</view>
-			<!-- <view class="gl"><image src="../../static/game/game08.png" mode=""></image></view> -->
-		</view>
-		<view class="edu">本次参与额度:1~{{ guaishouList.upper_limit * 1 }},单次投注最高额度{{ guaishouList.single * 1 }}</view>
-		<view class="bottom-box flex">
-			<image class="gl" @click="navTo('/pages/game/gl')" src="../../static/game/game08.png" mode=""></image>
-			<view class="button">
-				<image v-if="isGoumai == false" src="../../static/game/game07.png" mode="" @click="yue"></image>
-				<image v-else src="../../static/game/game10.png" mode=""></image>
-			</view>
-			<image class="ssh" @click="navTo('/pages/game/jlDetil')" src="../../static/game/game14.png" mode=""></image>
-		</view>
-		<view class="u-table">
-			<view class="column">
-				<view class="table-box" @click="navTo('/pages/user/mallJf')">
-					<view class="table-img"><image src="../../static/game/game04.png" mode=""></image></view>
-					<view class="table-title">
-						<view class="table-top">{{ userInfo.integral * 1 }}</view>
-						<view class="table-top">我的阳光</view>
-					</view>
-				</view>
-				<view class="table-box" @click="navTo('../user/whiteJf')">
-					<view class="table-img3"><image src="../../static/game/game03.png" mode=""></image></view>
-					<view class="table-title">
-						<view class="table-top">{{ userInfo.white_integral * 1 }}</view>
-						<view class="table-top">我的肥料</view>
-					</view>
-				</view>
-				<!-- <view class="table-box" @click="navTo('../user/shopJf')">
-					<view class="table-img2"><image src="../../static/game/game05.png" mode=""></image></view>
-					<view class="table-title">
-						<view class="table-top">{{ userInfo.business_integral * 1 }}</view>
-						<view class="table-top">能量金豆</view>
-					</view>
-				</view> -->
-			</view>
-			<!-- <view class="aa"></view> -->
-			<view class="bb"></view>
-			<!-- <view class="column"></view> -->
-			<!-- <view class="column">
-				<view class="table-box" @click="navTo('../user/whiteJf')">
-					<view class="table-img3"><image src="../../static/game/game03.png" mode=""></image></view>
-					<view class="table-title">
-						<view class="table-top">{{ userInfo.white_integral * 1 }}</view>
-						<view class="table-top">我的肥料</view>
-					</view>
-				</view>
-				<view class="table-box" @click="navTo('/pages/user/greenJf')">
-					<view class="table-img4"><image src="../../static/game/game02.png" mode=""></image></view>
-					<view class="table-title">
-						<view class="table-top">{{ greenDe }}</view>
-						<view class="table-top">我的水滴</view>
-					</view>
-				</view>
-			</view> -->
-		</view>
-		<!-- <view class="daoj-box">
-			<view class="daoj-title">道具专区</view>
-			<view class="daoj-main flex" @click="navTo('/pages/user/greenChange')">
-				<view class="daoj-item flex">
-					<image class="daoj-bg" src="../../static/game/game12.png" mode=""></image>
-					<view class="daoj-info">
-						<view class="daoj-font">洒水桶*1</view>
-						<view class="daoj-font">70水滴</view>
-						<view class="btn">立即兑换</view>
-					</view>
-				</view>
-				<view class="daoj-item flex daoj-item2">
-					<image class="daoj-bg" src="../../static/game/game13.png" mode=""></image>
-					<view class="daoj-info">
-						<view class="daoj-font">洒水桶*5</view>
-						<view class="daoj-font">350水滴</view>
-						<view class="btn2">立即兑换</view>
-					</view>
-				</view>
-			</view>
-		</view> -->
-		<!-- <uni-popup ref="popup" type="center">
-			<view class="yue-box">
-				<view class="yue-tit">
-					抢购
-				</view>
-				<view class="yue-content">
-					您有{{number}}张绿卡可直接抢购,要使用吗?
-				</view>
-				<view class="comfirm-box">
-					<view class="cancel" @click="kfClose()">不使用</view>
-					<view class="comfirm" @click="comfirm()">使用</view>
-				</view>
-			</view>
-		</uni-popup> -->
-		<uni-popup ref="popupYue" type="center">
-			<view class="yue-box">
-				<view class="yue-tit">抢购数量</view>
-				<!-- numberChange购买数量变化   goodsNumberMax最大可购买数 -->
-				<!-- <uni-number-box class="step" :isMin="true" :value="goodsNumber" :min="1" :max="goodsNumberMax" @eventChange="numberChange"></uni-number-box> -->
-				<view class="input-box"><input class="input" type="text" v-model="goodsNumber" placeholder-class="placeholder" placeholder="请填写积分数量" /></view>
-				<!-- <view class="yue-content">请填写积分数量</view> -->
-				<view class="comfirm-box">
-					<view class="cancel" @click="quxiao()">取消</view>
-					<view class="comfirm" @click="quire()">确定</view>
-				</view>
-			</view>
-		</uni-popup>
-		<!-- <uni-popup ref="popupButton" type="bottom">
-			<view class="zhifu-box">
-				<view class="zhifu-title">
-					请选择支付方式
-				</view>
-				<view>
-					<radio-group name="" @change="radioChange">
-						<label class="zhifu-content">
-							<view class="bai">
-								<image src="../../static/game/game04.png" mode=""></image>
-								<text>白积分支付</text>
-							</view>
-							<radio style="transform:scale(0.7); color: #ff0000;" v-model="bai" checked="true" />
-						</label>
-						<label class="zhifu-content">
-							<view class="bai">
-
-
-								<image src="../../static/game/game02.png" mode=""></image>
-								<text>肥料支付</text>
-							</view>
-							<radio style="transform:scale(0.7); color:#ff0000" v-model="hong" />
-						</label>
-						<label class="zhifu-content">
-							<view class="bai">
-								<image src="../../static/game/game05.png" mode=""></image>
-								<text>紫积分支付</text>
-							</view>
-							<radio style="transform:scale(0.7);color: #ff0000;" v-model="zi" />
-						</label>
-					</radio-group>
-				</view>
-				<view class="zhifu-bottom">
-					<view class="zhifu-left">
-						<text>合计:&nbsp;</text><text>{{goodsNumber}}</text>
-					</view>
-					<view class="zhifu-right" @click="buy">
-						立即支付
-					</view>
-
-				</view>
-			</view>
-		</uni-popup> -->
-		<!-- 		<uni-popup ref="popupPass" type="center">
-			<!-- <view class="yue-box">
-				<view class="yue-tit">
-					请输入交易密码
-				</view>
-				<view class="password">
-					<input type="password" v-model="passWord" focus placeholder="请填写交易密码">
-				</view>
-				<!-- numberChange购买数量变化   goodsNumberMax最大可购买数 -->
-		<!-- <uni-number-box class="step" :isMin="true" :value="goodsNumber" :min="1" :max="goodsNumberMax"
-					@eventChange="numberChange"></uni-number-box> -->
-		<!-- <view class="yue-content">
-					请填写积分数量
-				</view> -->
-		<!-- <view class="comfirm-box">
-					<view class="cancel" @click="quxiaoPass()">取消</view>
-					<view class="comfirm" @click="quirePass(passWord)">确定</view>
-				</view>
-			</view> -->
-		<!-- 	</uni-popup> -->
-	</view>
-</template>
-
-<script>
-import { greenList, userinfo } from '@/api/user.js';
-import { mapState, mapMutations } from 'vuex';
-import { getTime, timeComputed } from '@/utils/rocessor.js';
-import { getGameDetail, getPurchase } from '@/api/game.js';
-import bingProgress from '@/components/bing-progress/bing-progress.vue';
-import uniNumberBox from '@/components/uni-number-box.vue';
-export default {
-	components: {
-		uniNumberBox
-	},
-	data() {
-		return {
-			kai: {}, //开始时间
-			state: 0, //活动状态
-			xuhaolan: 1690,
-			name: '',
-			isGb: true,
-			// goodsNumberMin: 1,
-			greenDe: 0, //绿积分
-			index: 0,
-			timer: '',
-			hour: {},
-			guaishouList: [], //怪兽详情
-			id: 0, //详情id
-			isGoumai: false, //是否购买
-			passWord: '', //交易密码
-			bai: 0,
-			hong: 0,
-			zi: 0,
-			// goodsNumberMax: 1000, //最大可购买数
-			goodsNumber: '', //购买数量
-			number: 8,
-			bianhua: 0, //变化
-			xiaoguaishou: '',
-			imageList: [
-				{
-					image: '../../static/game/game01.png'
-					// color: '#7F69D8'
-				},
-				{
-					image: '../../static/game/reb02.png'
-				},
-				{
-					image: '../../static/game/reb03.png'
-				},
-				{
-					image: '../../static/game/reb01.png'
-				},
-				{
-					image: '../../static/game/reb04.png'
-				}
-			] //小怪兽图片
-		};
-	},
-	computed: {
-		...mapState('user', ['hasLogin', 'userInfo']),
-		getJd() {
-			return (this.guaishouList.number / this.guaishouList.money) * 1 * 100;
-		}
-	},
-	// beforeDestroy() {
-	// 	clearInterval(this.timer)
-	// },
-	onLoad(option) {
-		console.log(this.userInfo, 'userInfo');
-		// this.xiaoguaishou = this.imageList[option.id].image
-		this.uid = option.id;
-		this.index = option.index;
-		this.getDTime();
-		let obj = this;
-		const time = setInterval(function() {
-			obj.bianhua++;
-			if (obj.bianhua == 2) {
-				clearInterval(time);
-			}
-		}, 6);
-	},
-	onShow() {
-		// this.getDTime();
-		this.jtDg();
-		// this.getDetail()
-		if (this.timer) {
-			clearInterval(this.timer);
-		}
-		// let getTimes = uni.getStorageSync('time')
-		// this.isGb !=getTimes
-		// // uni.clearStorage('time')
-		// console.log(getTimes, 'uni.setStorageSync');
-
-		this.getGreen();
-		this.getUerInfo();
-	},
-	methods: {
-		//监听打怪状态
-		jtDg() {
-			console.log(this.xuhaolan == this.guaishouList.money * 1, '2323');
-		},
-		...mapMutations('user', ['setUserInfo']),
-		getUerInfo() {
-			userinfo({})
-				.then(({ data }) => {
-					this.setUserInfo(data);
-				})
-				.catch(e => {
-					console.log(e);
-				});
-		},
-		navTo(url) {
-			uni.navigateTo({
-				url
-			});
-		},
-		getGreen() {
-			greenList().then(res => {
-				this.greenDe = res.data.count;
-				// console.log(res, '率积分');
-			});
-		},
-		getDetail() {
-			getGameDetail({
-				id: this.uid
-			}).then(res => {
-				this.guaishouList = res.data;
-				console.log(res.data, 'res.data');
-			});
-		},
-		//计算倒计时
-		getDTime() {
-			let obj = this;
-			getGameDetail({
-				id: this.uid
-			}).then(res => {
-				this.guaishouList = res.data;
-				console.log(res, 'res');
-				if (this.guaishouList.number == this.guaishouList.money * 1) {
-					this.$api.msg('种植成功!');
-				}
-				this.bianhua = 3000;
-				//当前时间
-				let dqTime = Math.round(new Date().getTime() / 1000).toString();
-
-				console.log(dqTime, 'if()');
-				//开始事件
-				let add_time = res.data.add_time;
-				if (dqTime >= add_time) {
-					this.state = 1;
-				}
-				// this.getDTime()
-				//获取结束时间
-				let endTime = res.data.end_time;
-				// console.log(endTime, 'this.guaishouList.end_time');
-				//开启倒计时
-				obj.timer = setInterval(getShijian, 1000);
-
-				function getShijian() {
-					let kai = timeComputed(add_time * 1000);
-					obj.kai = kai;
-					// console.log(obj.kai,'kai');
-					let da = timeComputed(endTime * 1000);
-					obj.hour = da;
-					Object.values(obj.hour).forEach(e => {});
-					if (obj.hour.day == 0 && obj.hour.hours == 0 && obj.hour.minutes == 0 && obj.hour.seconds == 0) {
-						obj.isGb = false;
-					}
-				}
-			});
-		},
-		radioChange() {},
-		//购买积分
-		buy() {
-			this.$refs.popupButton.close();
-			this.$refs.popupPass.open();
-		},
-		//交易密码取消
-		quxiaoPass() {
-			this.$refs.popupPass.close();
-		},
-		//交易密码确认
-		quirePass() {
-			console.log(this.passWord, 'passWord');
-			this.$refs.popupPass.close();
-			this.isGoumai = true;
-		},
-		//购买数量
-		numberChange(e) {
-			this.goodsNumber = e.number;
-			// console.log(this.goodsNumber, 'e');
-			// this.$refs.popupButton.open()
-		},
-		//抢购数量取消
-		quxiao() {
-			this.$refs.popupYue.close();
-		},
-		//抢购数量确认
-		quire() {
-			console.log(this.goodsNumber, 'this.goodsNumber');
-
-			this.$refs.popupYue.close();
-			// this.$refs.popupButton.open()
-			//投注
-			getPurchase({
-				//众筹场次id
-				id: this.uid,
-				price: this.goodsNumber
-				//投注额度
-			}).then(res => {
-				console.log(res, '投注信息');
-
-				uni.showToast({
-					title: '投注成功',
-					duration: 2000
-				});
-				this.getUerInfo();
-				this.getDetail();
-			});
-		},
-		//预约界面使用
-		comfirm() {
-			this.$refs.popup.close();
-			this.$refs.popupYue.open();
-		},
-		//预约界面不使用
-		kfClose() {
-			this.$refs.popup.close();
-		},
-
-		//点击抢购
-		yue() {
-			console.log('asda');
-			if (this.isGb == false) {
-				this.$refs.popupYue.close();
-				// uni.showModal({
-				// 	title:"活动已结束！"
-				// })
-				// uni.showLoading({
-				// 	title:"活动已结束!"
-				// })
-				this.$api.msg('活动已结束!');
-			} else {
-				this.$refs.popupYue.open();
-			}
-			// this.$refs.popupYue.open()
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page {
-	background: #f2ffec;
-	width: 750rpx;
-	height: 100%;
-	padding: 0;
-	margin: 0;
-}
-.content {
-	padding-bottom: 50rpx;
-}
-
-.popup {
-	width: 100rpx;
-	height: 100rpx;
-}
-
-.game-top-bg {
-	position: relative;
-	width: 750rpx;
-	height: 650rpx;
-
-	image {
-		width: 100%;
-		height: 100%;
-	}
-}
-
-.hl {
-	position: absolute;
-	top: 320rpx;
-	left: 30rpx;
-	width: 225rpx;
-	height: 218rpx;
-}
-
-.tz {
-	position: absolute;
-	top: 400rpx;
-	left: 0;
-	width: 100%;
-	height: 360rpx;
-}
-
-.game-top-time {
-	line-height: 50rpx;
-	padding-left: 100rpx;
-	position: absolute;
-	top: 30rpx;
-	left: 20rpx;
-	width: 710rpx;
-	height: 50rpx;
-	background: #000000;
-	opacity: 0.61;
-	border-radius: 25rpx;
-	font-size: 32rpx;
-	font-weight: 500;
-	color: #fff;
-
-	.yueyue {
-		margin-left: 10rpx;
-		display: inline-block;
-		font-size: 28rpx;
-	}
-
-	span {
-		width: 42rpx;
-		height: 42rpx;
-		background: #5655ef;
-		border-radius: 10rpx;
-	}
-}
-
-.game-top-xl {
-	position: absolute;
-	text-align: center;
-	left: 140rpx;
-	top: 90rpx;
-
-	// line-height: 75rpx;
-	.xl {
-		font-size: 34rpx;
-		font-weight: 500;
-		color: #ffffff;
-	}
-
-	.xl-t {
-		margin-top: 10rpx;
-		// width: 474rpx;
-		// height: 31rpx;
-		// background: #A38CF4;
-		// border: 3rpx solid #FFFFFF;
-		// border-radius: 13rpx;
-	}
-}
-
-.xgs {
-	position: absolute;
-	top: 200rpx;
-	left: 210rpx;
-	width: 330rpx;
-	height: 260rpx;
-
-	image {
-		width: 100%;
-		height: 100%;
-	}
-}
-
-.id {
-	text-align: center;
-	position: absolute;
-	top: 575rpx;
-	left: 210rpx;
-	width: 340rpx;
-	height: 60rpx;
-	background: #000000;
-	opacity: 0.64;
-	border-radius: 20rpx;
-	font-size: 32rpx;
-	font-weight: bold;
-	color: #ffffff;
-	line-height: 60rpx;
-}
-
-.edu {
-	margin: 20rpx auto;
-	width: 700rpx;
-	height: 50rpx;
-	font-size: 30rpx;
-	font-weight: 500;
-	color: #ffffff;
-	background: #1b1e2f;
-	opacity: 0.57;
-	border-radius: 25rpx;
-	line-height: 50rpx;
-	text-align: center;
-}
-
-.bottom-box {
-	padding: 0 20rpx;
-	.gl {
-		width: 140rpx;
-		height: 166rpx;
-	}
-	.button {
-		width: 430rpx;
-		height: 120rpx;
-		image {
-			width: 100%;
-			height: 100%;
-		}
-	}
-	.ssh {
-		width: 110rpx;
-		height: 136rpx;
-	}
-}
-.u-table {
-	display: flex;
-	flex-direction: column;
-	justify-content: space-around;
-	margin: 20rpx 30rpx;
-	width: 688rpx;
-	// height: 488rpx;
-	height: 244rpx;
-	background: #ffffff;
-	border: 3rpx solid #08d29b;
-	box-shadow: 0px 0px 20rpx 0rpx rgba(50, 50, 52, 0.06);
-	border-radius: 20rpx;
-	position: relative;
-
-	.aa {
-		width: 685rpx;
-		top: 244rpx;
-		position: absolute;
-		height: 2rpx;
-		background: #08d29b;
-	}
-
-	.bb {
-		width: 2rpx;
-		height: 244rpx;
-		background: #08d29b;
-		margin-left: 343rpx;
-		top: 0;
-		position: absolute;
-	}
-
-	.column {
-		display: flex;
-		align-items: center;
-		justify-content: space-around;
-	}
-
-	.table-box {
-		margin-left: 70rpx;
-		width: 50%;
-		display: flex;
-		align-items: center;
-
-		.table-img {
-			width: 130rpx;
-			height: 130rpx;
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-		.table-img2 {
-			width: 108rpx;
-			height: 106rpx;
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-		.table-img3 {
-			width: 100rpx;
-			height: 110rpx;
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-		.table-img4 {
-			width: 72rpx;
-			height: 110rpx;
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-
-		.table-title {
-			padding-left: 15rpx;
-			display: flex;
-			flex-direction: column;
-
-			.table-top {
-				overflow: hidden;
-				white-space: nowrap;
-				text-overflow: ellipsis;
-				width: 180rpx;
-				font-size: 30rpx;
-				font-weight: bold;
-				color: #333333;
-				// line-height: 75px;
-			}
-		}
-	}
-}
-
-.daoj-box {
-	margin: 20rpx auto 0;
-	width: 688rpx;
-	background: #ffffff;
-	border: 4rpx solid #08d29b;
-	box-shadow: 0px 0px 29rpx 0px rgba(50, 50, 52, 0.06);
-	border-radius: 29rpx;
-	.daoj-title {
-		width: 250rpx;
-		height: 80rpx;
-		line-height: 90rpx;
-		background: #08d29b;
-		border-radius: 14rpx 0px 86rpx 0px;
-		font-size: 38rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #ffffff;
-		line-height: 80rpx;
-		text-align: center;
-	}
-	.daoj-main {
-		padding: 30rpx 20rpx 50rpx;
-		.daoj-item2 {
-			background: linear-gradient(90deg, #7679ef, #5255c4) !important;
-		}
-		.daoj-item {
-			justify-content: flex-start;
-			width: 314rpx;
-			background: linear-gradient(90deg, #ffc65e, #fca315);
-			border-radius: 14rpx;
-			padding: 10rpx 14rpx 20rpx 10rpx;
-			.daoj-bg {
-				width: 140rpx;
-				height: 140rpx;
-			}
-			.daoj-info {
-				margin-left: 10rpx;
-				.daoj-font {
-					font-size: 32rpx;
-					font-family: PingFang SC;
-					font-weight: bold;
-					color: #ffffff;
-				}
-				.btn {
-					width: 150rpx;
-					height: 40rpx;
-					background: #ffffff;
-					border-radius: 35rpx;
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: bold;
-					color: #fca315;
-					line-height: 40rpx;
-					text-align: center;
-				}
-				.btn2 {
-					width: 150rpx;
-					height: 40rpx;
-					background: #ffffff;
-					border-radius: 35rpx;
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: bold;
-					color: #5557c7;
-					line-height: 40rpx;
-					text-align: center;
-				}
-			}
-		}
-	}
-}
-
-.yue-box {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: space-around;
-
-	width: 582rpx;
-	height: 377rpx;
-	background: #ffffff;
-	border-radius: 20rpx;
-
-	.yue-tit {
-		align-items: center;
-		font-size: 42rpx;
-		font-weight: 500;
-		color: #0c1732;
-		line-height: 56rpx;
-	}
-	.input-box {
-		padding: 10rpx;
-		border: 1px #000 solid;
-		border-radius: 10rpx;
-	}
-	.input {
-		width: 400rpx;
-		height: 60rpx;
-		font-size: 40rpx;
-	}
-
-	.placeholder {
-		font-size: 40rpx;
-	}
-
-	.password {
-		text-align: center;
-		align-items: center;
-	}
-
-	.yue-content {
-		font-size: 30rpx;
-		font-weight: 500;
-		color: #0c1732;
-	}
-
-	.comfirm-box {
-		width: 90%;
-		display: flex;
-		justify-content: space-between;
-
-		.cancel {
-			text-align: center;
-			line-height: 78rpx;
-			width: 248rpx;
-			height: 78rpx;
-			border: 2rpx solid #999999;
-			border-radius: 10rpx;
-			font-size: 34rpx;
-			font-weight: 500;
-			color: #333333;
-		}
-
-		.comfirm {
-			text-align: center;
-			width: 248rpx;
-			height: 78rpx;
-			background: #ff5454;
-			border-radius: 10rpx;
-			font-size: 34rpx;
-			font-weight: 500;
-			color: #ffffff;
-			line-height: 78rpx;
-		}
-	}
-}
-
-.zhifu-box {
-	padding: 25rpx 0 0 25rpx;
-	width: 750rpx;
-	height: 495rpx;
-	background: #ffffff;
-	border-radius: 10rpx 10rpx 0rpx 0rpx;
-
-	.zhifu-title {
-		display: flex;
-		flex-direction: left;
-		font-size: 28rpx;
-		font-weight: bold;
-		color: #333333;
-	}
-
-	.zhifu-content {
-		display: flex;
-		justify-content: space-between;
-
-		.bai {
-			margin: 30rpx 0;
-			display: flex;
-
-			align-items: center;
-
-			image {
-				width: 45rpx;
-				height: 45rpx;
-			}
-
-			text {
-				margin-left: 20rpx;
-				font-size: 28rpx;
-				font-weight: 400;
-				color: #3f454b;
-			}
-		}
-	}
-
-	.zhifu-bottom {
-		width: 750rpx;
-		position: absolute;
-		bottom: 0;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-
-		.zhifu-left {
-			display: flex;
-			align-items: center;
-
-			text:nth-child(1) {
-				font-size: 28rpx;
-				font-weight: 400;
-				color: #3f454b;
-			}
-
-			text {
-				font-size: 36rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #ff4c4c;
-				line-height: 55px;
-			}
-		}
-
-		.zhifu-right {
-			line-height: 98rpx;
-			text-align: center;
-			width: 360rpx;
-			height: 98rpx;
-			background: #ff4c4c;
-			font-size: 32rpx;
-			font-weight: bold;
-			color: #ffffff;
-		}
-	}
-}
-</style>

pages/game/gl.vue

@@ -1,75 +0,0 @@
-<template>
-	<view class="center">
-		<view class="bg"><image src="../../static/img/game-bg.png" mode=""></image></view>
-		<view class="main-box">
-			<view class="title">玩法说明</view>
-			<view class="main-item">
-				<view class="main-title">种植技巧</view>
-				<view class="main-info">1、种植需要消耗肥料，肥料通过购买商品获得。</view>
-				<view class="main-info">2、参与种植成功后，三期后可以拿到107%种植肥料的阳光和30%种植肥料的商城积分。</view>
-				<view class="main-info">
-					3、参与种植如果失败，例如第四期失败将返还第一期和第四期种植肥料总和的101%的阳光，第二期和第三期种植肥料总和的70%的阳光和总和的30%的水滴和总和的30%的商城积分
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script></script>
-
-<style lang="less">
-.center,
-page {
-	padding-top: 268rpx;
-	height: auto;
-	min-height: 100%;
-	background: #a4e5d3;
-}
-.bg {
-	position: absolute;
-	top: 0;
-	left: 0;
-	right: 0;
-	width: 750rpx;
-	height: 1500rpx;
-	image {
-		width: 100%;
-		height: 100%;
-	}
-}
-.main-box {
-	margin: 0 auto;
-	width: 626rpx;
-	padding: 114rpx 64rpx 98rpx 50rpx;
-	background: #ffffff;
-	border-radius: 34rpx;
-	position: relative;
-	border: #369275 2px solid;
-	.title {
-		position: absolute;
-		left: 50%;
-		top: -35rpx;
-		width: 324rpx;
-		height: 70rpx;
-		margin-left: -162rpx;
-		text-align: center;
-		line-height: 70rpx;
-		background-color: #369275;
-		border-radius: 50rpx;
-		color: #ffffff;
-		border-radius: 2px #fff solid;
-		font-size: 42rpx;
-	}
-	.main-item {
-		.main-title {
-			font-size: 32rpx;
-			font-family: SourceHanSansCN;
-			font-weight: bold;
-			color: #324658;
-		}
-		.main-info {
-			margin-top: 10rpx;
-		}
-	}
-}
-</style>

pages/game/jlDetil.vue

@@ -1,215 +0,0 @@
-<template>
-	<view>
-		<swiper :style="{ height: height }" class="swiper-box" duration="300">
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view scroll-y="true" class="list-scroll-content" @scrolltolower="loadData">
-					<!-- 空白页 -->
-					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-
-					<!-- 订单列表 -->
-					<view>
-						<view class="order-item flex" v-for="(item, index) in tabItem.orderList">
-							<view class="title-box">
-								<view class="title">
-									<text>植物名称:{{ item.name }}</text>
-								</view>
-								<view class="time">
-									<text>{{ item.create_time }}</text>
-								</view>
-								<view class="time">
-									<text>场次:第{{ item.stage }}期</text>
-								</view>
-							</view>
-							<view class="money">
-								<view>植物进度:{{ item.price * 1 }}</view>
-								<!-- <view class="">
-									{{item.status==0&&item.is_return==1}}   待返还
-									{{item.status==0&&item.is_return==0}}   进行中
-									{{item.status==1}}   打怪成功
-									{{item.status==2}}   打怪失败
-								</view> -->
-								<view class="money" v-if="item.status == 0 && item.is_return == 1">待发放</view>
-								<view class="money" v-else-if="item.status == 0 && item.is_return == 0">进行中</view>
-								<view class="money" v-else-if="item.status == 1">种植成功</view>
-								<view class="money" v-else-if="item.status == 2">种植失败</view>
-							</view>
-						</view>
-					</view>
-					<uni-load-more :status="tabItem.loadingType" v-if="!(tabItem.orderList.length == 0 && tabItem.loaded)"></uni-load-more>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-	</view>
-</template>
-
-<script>
-import { getJl } from '@/api/user.js';
-import { mapState, mapMutations } from 'vuex';
-import { getMoneyStyle } from '@/utils/rocessor.js';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-import empty from '@/components/empty';
-export default {
-	components: {
-		empty,
-		uniLoadMore
-	},
-	filters: {
-		getMoneyStyle
-	},
-	data() {
-		return {
-			zc: 0,
-			sr: 0,
-			height: '',
-			// 头部图高度
-			maxheight: '',
-			tabCurrentIndex: 0,
-			orderStatusSum: 0,
-			recharge: 0,
-			navList: [
-				{
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				}
-			],
-			money: ''
-		};
-	},
-	computed: {
-		...mapState('user', ['userInfo'])
-	},
-	onReady(res) {
-		var _this = this;
-		uni.getSystemInfo({
-			success: resu => {
-				const query = uni.createSelectorQuery();
-				query.select('.swiper-box').boundingClientRect();
-				query.exec(function(res) {
-					_this.height = resu.windowHeight - res[0].top + 'px';
-					console.log('打印页面的剩余高度', _this.height);
-				});
-			},
-			fail: res => {}
-		});
-	},
-	// onPullDownRefresh() {
-	// 	this.loadData()
-	// },
-	onLoad() {
-		this.loadData();
-	},
-	methods: {
-		...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
-		async loadData() {
-			let obj = this;
-			//这里是将订单挂载到tab列表下
-			// let index = this.tabCurrentIndex;
-			let navItem = obj.navList[0];
-			// let state = navItem.state;
-			if (navItem.loaded === true) {
-				//tab切换只有第一次需要加载数据
-				return;
-			}
-			if (navItem.loadingType === 'loading') {
-				//防止重复加载
-				return;
-			}
-			// 修改当前对象状态为加载中
-			navItem.loadingType = 'loading';
-			// console.log(navItem.loadingType);
-
-			getJl({
-				page: navItem.page,
-				limit: navItem.limit
-				// pm: navItem.state
-			})
-				.then(({ data }) => {
-					console.log(data.data, '2222');
-					// obj.zc = data.zc
-					// obj.sr = data.sr
-					navItem.orderList = navItem.orderList.concat(data.data);
-					console.log(navItem.orderList, 'item');
-					navItem.page++;
-					if (navItem.limit == data.data.length) {
-						navItem.loadingType = 'more';
-					} else {
-						navItem.loadingType = 'noMore';
-					}
-					obj.$set(navItem, 'loaded', true);
-				})
-				.catch(e => {
-					console.log(e);
-				});
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-//列表
-.swiper-box {
-	.order-item:last-child {
-		margin-bottom: 60rpx;
-	}
-
-	.order-item {
-		padding: 20rpx 30rpx;
-		line-height: 1.5;
-
-		.title-box {
-			.title {
-				font-size: $font-lg;
-				color: $font-color-base;
-			}
-
-			.time {
-				font-size: $font-base;
-				color: $font-color-light;
-			}
-		}
-
-		.money {
-			color: #fd5b23;
-			font-size: $font-lg;
-			text-align: right;
-
-			.status {
-				color: $font-color-light;
-			}
-		}
-	}
-}
-
-.list-scroll-content {
-	background: #ffffff;
-	height: 100%;
-}
-
-.content {
-	height: 100%;
-
-	.empty-content {
-		background-color: #ffffff;
-	}
-}
-
-.btn-box {
-	width: 674rpx;
-	height: 88rpx;
-	background: linear-gradient(0deg, #2e58ff, #32c6ff);
-	border-radius: 44rpx;
-	font-size: 36rpx;
-	font-family: PingFang SC;
-	font-weight: 500;
-	color: #ffffff;
-	text-align: center;
-	line-height: 88rpx;
-	position: fixed;
-	bottom: 48rpx;
-	left: 0;
-	right: 0;
-	margin: 0 auto;
-}
-</style>

pages/index/cangp.vue

@@ -1,425 +1,215 @@
 <template>
 	<view class="container">
-		<view class="top">
-			<!-- <image class="top-bg" src="../../static/img/top-bg.png" mode=""></image> -->
-			<view class="top-main flex">
-				<view class="search-box flex" @click="clickSearch()">
-					<image class="search" src="../../static/icon/search-h.png" mode=""></image>
-					<view class="search-font">输入关键词搜索</view>
-				</view>
+		<view class="topNav">
+			<view class="hgHeight">
+				
 			</view>
-			<!-- <swiper class="carousel" autoplay="true" duration="400" interval="5000" @change="swiperChange">
-				<swiper-item v-for="(item, index) in carouselList" :key="index" class="carousel-item" @click="bannerNavToUrl(item)">
-					<image :src="item.pic" />
-				</swiper-item>
-			</swiper> -->
-		</view>
-		<view class="box">
-			<view class="box-title">
-				<view class="left">
-					艺绘
-				</view>
-				<view class="right" @click="navTo('/pages/index/cangp')">
-					查看更多 >
-				</view>
+			<view class="flex">
+			<view class="titleItem" @click="tabList(0)" :class="{action:onIndex==0}">
+				我的盲盒
+			</view>
+			<view class="titleItem" @click="tabList(1)" :class="{action:onIndex==1}">
+				NFT合成
 			</view>
-			<view class="box-content" v-for="(item,index) in list" @click="buy(item)">
-				<view class="img" >
-					<image :src="item.image" mode=""></image>
-				</view>
-				<view class="content-title">
-					<view class="title">
-						{{item.store_name}}
-					</view>
-					<view class="text">
-						黑道研究会 发行
-					</view>
-					<view class="text">
-						发行数量: {{item.stock}}份
-					</view>
-				</view>
 			</view>
-			<!-- <view class="box-content">
-				<view class="img">
-					<image src="../../static/index/nvwang.png" mode=""></image>
-				</view>
-				<view class="content-title">
-					<view class="">
-						黑道女王
-					</view>
-					<view class="text">
-						黑道研究会 发行
-					</view>
-					<view class="text">
-						发行数量: 14521份
-					</view>
-				</view>
-			</view> -->
 		</view>
-		<view class="btm" style="height: 44px;"></view>
-		
-		
-		<!-- 客服 -->
-		<!-- <uni-popup ref="popupkf" type="center">
-			<view class="popup-box">
-				<view class="img"><image src="../../static/img/img009.png" mode=""></image></view>
-				<view class="mian">
-					<view class="delivery">
-						<view class="title">已经为您定制专属客服</view>
-						<image src="../../static/img/img010.png" mode=""></image>
-					</view>
-					<view class="nocancel">客服VX:{{ text }}</view>
-					<view class="comfirm-box">
-						<view class="cancel" @click="kfClose()">取消</view>
-						<view class="comfirm" @click="comfirm(text)">复制微信</view>
-					</view>
+		<!-- 我的盲盒 -->
+		<view class="ls" v-show="onIndex==0">
+			<view class="ll" v-for="(item,index) in mh.list">
+				<!-- <image class="imgBox" src="" mode="scaleToFill"></image> -->
+				<view class="title clamp margin-t-20">
+					盲盒首发
+				</view>
+				<view class="tip flex margin-t-10">
+					<view class="clamp">官方发行</view>
+					<view class="buttom" @click="navTo(item)">打开</view>
 				</view>
 			</view>
-		</uni-popup> -->
-		
+			<u-loadmore class='clearFloat' lineColor='#FFFFFF' iconColor='#FFFFFF' color="#FFFFFF" :status="mh.loadingType" />
+		</view>
+		<!-- NFT合成 -->
+		<view class="ls" v-show="onIndex==1">
+			<u-loadmore class='clearFloat' lineColor='#FFFFFF' iconColor='#FFFFFF' color="#FFFFFF" :status="nft.loadingType" />
+		</view>
 	</view>
 </template>
 
 <script>
 	import {
-		getBargainList,
-		getProducts
-	} from '@/api/product.js';
-	// import {mapState} from 'vuex'
-	import {loadIndexs} from '@/api/index.js'
-import { mapState, mapMutations } from 'vuex';
-// #ifdef H5
-import { weixindata, shareLoad } from '@/utils/wxAuthorized';
-// #endif
-export default {
-	data() {
-		return {
-			isSc:2,
-			text: '',
-			checkid: 0,
-			titleNViewBackground: '',
-			longitude: 0, //经度
-			latitude: 0, //纬度
-			swiperCurrent: 0,
-			swiperLength: 0,
-			carouselList: [], //轮播列表
-			bastList: [], //会员礼包
-			integralList: [], //兑换专区
-			list:[],//卡片信息
-			page: 1,
-			limit: 10,
-			loadType: 'more',
-			text: [],
-			article: []
-		};
-	},
-	computed: {
-		...mapState(['loginInterceptor', 'baseURL']),
-		...mapState('user', ['hasLogin', 'userInfo'])
-	},
-	onLoad: function(option) {
-		if(this.hasLogin){
-			this.loadIndex()
-			this.getProduct()
-		}
-	},
-	onShow: function() {
-	},
-	// onReachBottom() {
-	// 	this.getproducts();
-	// },
-	methods: {
-		...mapMutations(['setLat', 'setLon']),
-		loadIndex(){
-			let obj = this
-			loadIndexs().then(res=>{
-				// console.log(res,'res');
-				obj.carouselList = res.data.banner
-				// console.log(res,'res');
-				// obj.list = res.data.info.fastList
-				
-			})
-		},
-		getProduct(){
-			let obj = this
-			getProducts().then(res=>{
-				// obj.carouselList = res.data.banner
-				// console.log(res,'res');
-				obj.list = res.data
-				
-			})
-		},
-		buy(item){
-			console.log(item,'res');
-			uni.navigateTo({
-				url:'/pages/product/product?id='+item.id+'&isSc='+this.isSc
-			})
-		}
-		,
-		navTo(url){
-			uni.switchTab({
-				url
-			})
+		mapState
+	} from 'vuex';
+	// #ifdef H5
+	import {
+		weixindata
+	} from '@/utils/wxAuthorized';
+	// #endif
+	export default {
+		data() {
+			return {
+				onIndex: 0, //当前选中的分类
+				// 盲盒里诶啊哦
+				mh: {
+					page: 1,
+					limit: 10,
+					list: [{}, {}, {}, {}],
+					loaded: false,
+					loadingType: 'loadmore'
+				},
+				// nft合成列表
+				nft: {
+					page: 1,
+					limit: 10,
+					list: [],
+					loaded: false,
+					loadingType: 'loadmore'
+				}
+			};
 		},
-		
-		// 點擊搜索框
-		clickSearch() {
-			uni.navigateTo({
-				// url: '/pages/product/search'
-			});
+		computed: {
+			...mapState(['loginInterceptor', 'baseURL']),
+			...mapState('user', ['hasLogin', 'userInfo'])
 		},
-		swiperChange(){
-			uni.navigateTo({
-				url: '/pages/product/search'
-			});
+		onLoad: function(option) {},
+		methods: {
+			info() {
+
+			},
+			tabList(index) {
+				// 保存当前选中的对象
+				this.onIndex = index;
+			},
+			// 加载盲盒
+			lodingMh(source) {
+				let navItem = this.mh.list;
+				if (source === 'tabChange' && navItem.loaded === true) {
+					//tab切换只有第一次需要加载数据
+					return;
+				}
+				if (navItem.loadingType === 'loading') {
+					//防止重复加载
+					return;
+				}
+				// 修改当前对象状态为加载中
+				navItem.loadingType = 'loading';
+				cashList({
+						page: navItem.page,
+						limit: navItem.limit,
+						pm: state
+					})
+					.then(({
+						data
+					}) => {
+						if (data.list.length > 0) {
+							navItem.orderList = navItem.orderList.concat(data.list);
+							navItem.page++;
+						}
+						if (navItem.limit == data.list.length) {
+							//判断是否还有数据， 有改为 more， 没有改为noMore
+							navItem.loadingType = 'loadmore';
+							return;
+						} else {
+							//判断是否还有数据， 有改为 more， 没有改为noMore
+							navItem.loadingType = 'nomore';
+						}
+						uni.hideLoading();
+						navItem.loaded = true;
+					})
+					.catch(e => {
+						console.log(e);
+					});
+			},
+			navTo(url) {
+				uni.switchTab({
+					url
+				})
+			},
 		}
-	
-		
-		
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-page{
-	width: 750rpx;
-	height: 100%;
-	background: #111111;
-}
-	.top {
-		position: relative;
-		width: 100%;
-		// height: 360rpx;
-
-		.top-bg {
-			position: absolute;
-			top: 0;
-			left: 0;
-			right: 0;
-			width: 100%;
-			height: 100%;
-		}
-
-		.top-main {
-			position: relative;
-			z-index: 2;
-			padding: 30rpx;
-
-			.search-box {
-				justify-content: center;
-				width: 698rpx;
-				height: 60rpx;
-				background: #191919;
-				
-				// box-shadow: 0px 10rpx 20rpx 0px rgba(4, 114, 69, 0.22);
-				border-radius: 30rpx;
+	page {
+		width: 750rpx;
+		min-height: 100%;
+		background: #111111;
+	}
 
-				.search {
-					width: 34rpx;
-					height: 34rpx;
-				}
+	.container {
+		/* #ifdef APP */
+		padding-top: var(--status-bar-height);
+		/* #endif */
+	}
 
-				.search-font {
-					margin-left: 14rpx;
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #a4a4a4;
-				}
-			}
+	.topNav {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		z-index: 999;
+		padding: 30rpx;
+		background-color: #181820;
+		.hgHeight{
+			height: var(--status-bar-height);
 		}
-	}
-	.box{
-		margin: 0 30rpx;
-		.box-title{
-			display: flex;
-			justify-content: space-between;
-			.left{
-				font-size: 38rpx;
-				font-family: PingFang SC;
+		.titleItem {
+			width: 336rpx;
+			height: 80rpx;
+			border-radius: 10rpx;
+			text-align: center;
+			line-height: 80rpx;
+			font-size: $font-base;
+			color: #FFFFFF;
+			border: 1px solid #FFFFFF;
+
+			&.action {
 				font-weight: bold;
-				color: #FFFFFF;
-				line-height: 120rpx;
-			}
-			.right{
-				
-				font-size: 24rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #FFFFFF;
-				line-height: 120rpx;
-			}
-			
-		}
-		.box-content{
-			width: 690rpx;
-			height: 915rpx;
-			margin: 50rpx 0;
-			.img{
-				width: 690rpx;
-				height: 690rpx;
-		
-				image{
-					width: 100%;
-					height: 100%;
-				}
-			}
-			.content-title{
-				margin-top: -10rpx;
-				padding: 30rpx 20rpx ;
-				
-				border-bottom-left-radius: 10rpx;
-				border-bottom-right-radius: 10rpx;
-				border: 2rpx solid #533A6A;
-				// box-shadow: 0px 0px 20rpx 0px rgba(79,59,103,0.0600);
-				
-				.title{
-					font-size: 39rpx;
-					font-weight: bold;
-					color: #FFFFFF;
-					margin-bottom: 20rpx;
-					
-				}
-				.text{
-					margin: 10rpx 0;
-					color: #FFFFFF;
-					font-size: 28rpx;
-				}
+				color: #9F570E;
+				background: linear-gradient(270deg, #FFE7C4, #FFCE8A);
 			}
 		}
 	}
-.popup-box {
-	width: 522rpx;
-	height: 605rpx;
-	background-color: #ffffff;
-	border-radius: 20rpx;
-	position: relative;
 
-	.img {
-		position: relative;
-		top: -56rpx;
-		left: 0;
-		width: 522rpx;
-		height: 132rpx;
-		display: flex;
-		justify-content: center;
+	.ls {
+		color: #FFFFFF;
+		padding: 30rpx;
+		padding-top: 140rpx;
 
-		image {
-			border-radius: 20rpx 20rpx 0 0;
-			width: 450rpx;
-			height: 132rpx;
+		.clearFloat {
+			clear: both;
+		}
+		.ll:nth-child(even) {
+			margin-left: 30rpx;
 		}
-	}
-
-	.mian {
-		margin-top: -44rpx;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		// padding: 32rpx 32rpx;
-		background-color: #ffffff;
-		border-radius: 0 0 20rpx 20rpx;
-		text-align: center;
 
-		.delivery {
-			font-size: 40rpx;
-			color: #333333;
-			display: flex;
-			align-items: center;
-			flex-direction: column;
+		.ll {
+			width: 330rpx;
+			line-height: 1;
+			margin-bottom: 30rpx;
+			float: left;
 
-			.title {
+			.imgBox {
+				background-color: #1D1D22;
+				width: 330rpx;
+				height: 330rpx;
 			}
 
-			image {
-				margin-top: 48rpx;
-				width: 172rpx;
-				height: 160rpx;
+			.title {
+				font-size: $font-sm;
 			}
-		}
-
-		.nocancel {
-			font-size: 32rpx;
-			color: #333333;
-			margin-top: 14rpx;
-		}
-
-		.comfirm-box {
-			margin-top: 52rpx;
-			display: flex;
-			// margin-bottom: 32rpx;
 
-			// justify-content: space-around;
-			.cancel {
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				width: 197rpx;
-				height: 74rpx;
-				border: 1px solid #dcc786;
-				border-radius: 38rpx;
+			.tip {
+				font-size: $font-sm - 4rpx;
 
-				font-size: 32rpx;
-				color: #605128;
+				.buttom {
+					width: 98rpx;
+					padding: 10rpx 0;
+					text-align: center;
+					background: linear-gradient(270deg, #FFE7C4, #FFCE8A);
+					border-radius: 20rpx;
+					color: #9F570E;
+				}
 			}
 
-			.comfirm {
-				margin-left: 32rpx;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				width: 197rpx;
-				height: 74rpx;
-				background: linear-gradient(-90deg, #d1ba77 0%, #f7e8ad 100%);
-				border-radius: 38px;
-				font-size: 32rpx;
-				color: #605128;
-			}
-		}
-	}
-}
-.tongz {
-	width: 690rpx;
-	height: 70rpx;
-	margin: 32rpx auto 0;
-	padding: 18rpx 30rpx 18rpx 24rpx;
-	align-items: center;
-	position: relative;
-	.tongz-bg {
-		position: absolute;
-		top: 0;
-		right: 0;
-		left: 0;
-		width: 690rpx;
-		height: 70rpx;
-		image {
-			width: 100%;
-			height: 100%;
-		}
-	}
-	.tongz-left {
-		width: 640rpx;
-		.image-left {
-			width: 28rpx;
-			height: 34rpx;
-		}
-		.tongz-font {
-			margin-left: 22rpx;
-			font-size: 28rpx;
-			font-family: Source Han Sans CN;
-			font-weight: 400;
-			color: #0f253a;
-		}
-	}
-	.tongz-right {
-		position: relative;
-		z-index: 11;
-		width: 12rpx;
-		height: 26rpx;
-		image {
-			width: 100%;
-			height: 100%;
 		}
 	}
-}
 </style>

pages/index/detail.vue

@@ -1,97 +0,0 @@
-<template>
-	<view class="center">
-		<view class="title clamp">{{ item.title }}</view>
-		<view class="time">{{ item.add_time }}</view>
-		<view class="main" v-for="(ls, index) in item.content" :key="index">
-			<view v-if="ls.type == 'rich-text'" v-html="ls.value" class="main"></view>
-			<video v-if="ls.type == 'video' && ls.value" :src="ls.value" style="width:100%;height: 300px" frameborder="0"></video>
-		</view>
-	</view>
-</template>
-
-<script>
-import { details } from '@/api/user.js';
-export default {
-	data() {
-		return {
-			id: '',
-			item: ''
-		};
-	},
-	onLoad(option) {
-		this.id = option.id;
-		this.loadData();
-	},
-	methods: {
-		loadData() {
-			details({}, this.id).then(({ data }) => {
-				console.log(data);
-				data.content = data.content.replace(/<img/g, '<img class="rich-img"').replace(/<p>\s*<img/g, '<p class="pHeight"><img');
-				data.content = this.getVideo(data.content);
-				this.item = data;
-			});
-		},
-		// 富文本视频解析
-		getVideo(data) {
-			let videoList = [];
-			let videoReg = /<video.*?(?:>|\/>)/gi; //匹配到字符串中的 video 标签
-			let srcReg = /src=[\'\"]?([^\'\"]*)[\'\"]?/i; //匹配到字符串中的 video 标签 的路径
-			let arr = data.match(videoReg) || []; // arr 为包含所有video标签的数组
-			let articleList = data.split('</video>'); // 把字符串  从视频标签分成数组
-			arr.forEach((item, index) => {
-				var src = item.match(srcReg);
-				videoList.push(src[1]); //所要显示的字符串中 所有的video 标签 的路径
-			});
-			let needArticleList = [];
-			articleList.forEach((item, index) => {
-				if (item != '' && item != undefined) {
-					//  常见的标签渲染
-					needArticleList.push({
-						type: 'rich-text',
-						value: item + '</video>'
-					});
-				}
-				let articleListLength = articleList.length; // 插入到原有video 标签位置
-				if (index < articleListLength && videoList[index] != undefined) {
-					needArticleList.push({
-						type: 'video',
-						value: videoList[index]
-					});
-				}
-			});
-			return needArticleList;
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.center {
-	min-height: 100%;
-	height: auto;
-	background: #ffffff;
-	padding: 30rpx 24rpx 0;
-}
-.title {
-	font-size: 32rpx;
-	font-family: PingFang SC;
-	font-weight: bold;
-	color: #333333;
-}
-.time {
-	font-size: 24rpx;
-	font-family: PingFangSC;
-	font-weight: 500;
-	color: #999999;
-	margin-top: 40rpx;
-}
-.main {
-	margin-top: 60rpx;
-}
-/deep/ .main {
-	.rich-img {
-		width: 100% !important;
-		height: auto;
-	}
-}
-</style>

pages/index/index.vue

@@ -4,7 +4,7 @@
 			<!-- <image class="top-bg" src="../../static/img/top-bg.png" mode=""></image> -->
 			<view class="top-main flex">
 				<view class="search-box flex" @click="clickSearch()">
-					<image class="search" src="../../static/icon/search-h.png" mode=""></image>
+					<image class="search" src="../../static/img/search-h.png" mode=""></image>
 					<view class="search-font">输入关键词搜索</view>
 				</view>
 			</view>

pages/index/integral.vue

@@ -1,242 +0,0 @@
-<template>
-	<view class="main">
-		<!-- <view class="top-search">
-			<input type="text" class="search-key" placeholder="请输入关键字" v-model="keyword" />
-			<image src="../../static/icon/search.png" mode="" class="search-logo"></image>
-			<view class="search-btn" @click.stop="search">搜索</view>
-		</view> -->
-		<scroll-view scroll-y="true" :style="{ height: height }" class="scoll-wrap" @scrolltolower="getArticleList()">
-			<view class="list-box-h">
-				<view v-for="(item, index) in list" :key="index" class="guess-item" @click="navToDetailPage(item)">
-					<image :src="item.image"></image>
-					<view class="guess-box">
-						<view class="title clamp2">{{ item.store_name }}</view>
-						<view class="flex itemContent">
-							<view>
-								<view class="price flex">{{ item.result.value[0].price }}元+</view>
-								<view class="price">{{ item.result.value[0].integral }}积分</view>
-							</view>
-							<view class="btn">立即购买</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<uni-load-more :status="loadingType"></uni-load-more>
-		</scroll-view>
-	</view>
-</template>
-
-<script>
-import { jfShop } from '@/api/product.js';
-export default {
-	data() {
-		return {
-			height: '',
-			list: [],
-			page: 1,
-			limit: 10,
-			loadingType: 'more',
-			total_pages: 0,
-			keyword: ''
-		};
-	},
-	onLoad(opt) {
-		this.getArticleList();
-	},
-	onReachBottom() {
-		this.getArticleList();
-	},
-	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 => {}
-		});
-	},
-	methods: {
-		navToDetailPage(item) {
-			uni.navigateTo({
-				url: '/pages/product/product?id=' + item.id + '&isJF=1'
-			});
-		},
-		getArticleList() {
-			let obj = this;
-			if (obj.loadingType == 'noMore' || obj.loadingType == 'loading') {
-				return;
-			}
-			obj.loadingType = 'loading';
-			jfShop({
-				page: obj.page,
-				limit: obj.limit
-			}).then(({ data }) => {
-				console.log(data, 'data');
-				obj.list = obj.list.concat(data);
-				// obj.total_pages = data.meta.pagination.total_pages
-				obj.page++;
-				if (obj.page <= obj.total_pages) {
-					obj.loadingType = 'more';
-				} else {
-					obj.loadingType = 'noMore';
-				}
-				// if (data.length == obj.limit) {
-				// 	obj.loadingType = 'more'
-				// } else {
-				// 	obj.loadingType = 'noMore'
-				// }
-			});
-		},
-		search() {
-			let obj = this;
-			obj.page = 1;
-			obj.list = [];
-			obj.loadingType = 'more';
-			obj.getArticleList();
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-page {
-	background-color: #fff;
-	min-height: 100%;
-}
-
-.list-box-h {
-	padding: 20rpx;
-}
-
-.guess-item {
-	padding: 10rpx;
-	display: flex;
-	min-width: 100%;
-	width: 0;
-	margin-bottom: 20rpx;
-	background: #ffffff;
-	border-radius: 10rpx;
-	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-
-	image {
-		width: 200rpx;
-		height: 200rpx;
-		border-radius: 10rpx;
-		flex-shrink: 0;
-	}
-
-	.guess-box {
-		width: 100%;
-		padding: 5px;
-		position: relative;
-		.itemContent {
-			position: absolute;
-			width: 100%;
-			padding: 20rpx 10rpx;
-			bottom: 0;
-			right: 0;
-		}
-		.title {
-			font-size: 30rpx;
-			font-weight: bold;
-			color: #333333;
-			height: 2.5em;
-			line-height: 1.25em;
-		}
-
-		.price-box {
-			justify-content: flex-start;
-
-			.yuanprice {
-				font-size: 26rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				text-decoration: line-through;
-				color: #999999;
-				padding-right: 6rpx;
-			}
-
-			image {
-				width: 14rpx;
-				height: 16rpx;
-			}
-
-			.jiang {
-				padding-left: 2rpx;
-				font-size: 24rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #b59467;
-			}
-		}
-
-		.price {
-			font-size: 36rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #ff6f0f;
-		}
-
-		.btn {
-			background: #16cc9f;
-			border-radius: 28rpx;
-			font-size: 28rpx;
-			font-weight: 500;
-			color: #ffffff;
-			float: right;
-			padding: 10rpx 20rpx;
-		}
-	}
-}
-.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 5rpx #16cc9f;
-		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: #16cc9f;
-		text-align: center;
-		line-height: 70rpx;
-		position: absolute;
-		top: 0;
-		bottom: 0;
-		right: 10rpx;
-		margin: auto;
-		// background-color: red;
-		z-index: 9;
-	}
-}
-</style>

pages/index/jieshao.vue

@@ -1,125 +0,0 @@
-<template>
-	<view class="content">
-		<view class="main">
-			<view v-for="(item, index) in list">
-				<view class="first" v-if="index == 0" @click="navToList(item.id)">
-					<view class="title">{{ item.title }}</view>
-					<view class="image"><image :src="item.image_input[0]" mode=""></image></view>
-					<view class="time">更新时间:{{ item.add_time }}</view>
-				</view>
-				<view class="item flex" @click="navToList(item.id)" v-else>
-					<view class="item-left"><image :src="item.image_input[0]" mode=""></image></view>
-					<view class="item-right">
-						<view class="item-font clamp">{{ item.title }}</view>
-						<view class="item-time">更新时间:{{ item.add_time }}</view>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-import { article } from '@/api/user.js';
-export default {
-	data() {
-		return {
-			list: []
-		};
-	},
-	onLoad() {
-		this.loadData();
-	},
-	methods: {
-		// 载入数据
-		async loadData() {
-			let obj = this;
-			article({ page: 1, limit: 1000 }, 1).then(({ data }) => {
-				this.list = data;
-			});
-		},
-		navToList(id) {
-			uni.navigateTo({
-				url: '/pages/index/detail?id=' + id
-			});
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page,
-.content {
-	height: auto;
-	min-height: 100%;
-	background: #f5f5f5;
-}
-.main {
-	margin-top: 20rpx;
-	background: #ffffff;
-	.first {
-		padding: 50rpx 0 18rpx;
-		margin: 0 22rpx;
-		border-bottom: 1px solid #e0e0e0;
-		.title {
-			font-size: 32rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #333333;
-		}
-		.image {
-			width: 710rpx;
-			height: 400rpx;
-			background: #4cd964;
-			margin-top: 20rpx;
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-		.time {
-			margin-top: 20rpx;
-			font-size: 26rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #666666;
-		}
-	}
-	.item {
-		padding: 26rpx 0 18rpx;
-		margin: 0 22rpx;
-		justify-content: flex-start;
-		align-items: flex-start;
-		border-bottom: 1px solid #e0e0e0;
-		.item-left {
-			width: 224rpx;
-			height: 160rpx;
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-		.item-right {
-			width: 458rpx;
-			height: 160rpx;
-			margin-left: 24rpx;
-			padding: 18rpx 0;
-			display: flex;
-			flex-direction: column;
-			justify-content: space-between;
-			.item-font {
-				font-size: 32rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #333333;
-			}
-			.item-time {
-				font-size: 28rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #666666;
-			}
-		}
-	}
-}
-</style>

pages/money/account.vue

@@ -1,236 +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>
-
-		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<view class="row b-b">
-					<text class="tit">姓名</text>
-					<input class="input" v-model="tabItem.orderList.name" type="text" placeholder="提款人姓名" placeholder-class="placeholder" />
-				</view>
-				<view class="row b-b">
-					<text class="tit">{{ tabIndex == 0 ? '账号' : '银行卡号' }}</text>
-					<input class="input" v-model="tabItem.orderList.code" type="text" placeholder="请输入账号" placeholder-class="placeholder" />
-				</view>
-				<view class="row b-b" v-if="tabIndex == 1">
-					<text class="tit">所属银行</text>
-					<input class="input" v-model="tabItem.orderList.bankName" type="text" placeholder="请输入账号" placeholder-class="placeholder" />
-				</view>
-			</swiper-item>
-		</swiper>
-
-		<button class="add-btn up" @click="confirm">提交申请</button>
-	</view>
-</template>
-
-<script>
-import { aliInfo, bankInfo, setAliInfo, setBankInfo } from '@/api/wallet.js';
-export default {
-	data() {
-		return {
-			tabCurrentIndex: 0,
-			navList: [
-				{
-					state: 0,
-					text: '支付宝',
-					loadingType: 'more',
-					orderList: {
-						name: '',
-						code: '',
-						id:''
-					}
-				},
-				{
-					state: 1,
-					text: '银行卡',
-					loadingType: 'more',
-					orderList: {
-						name: '',
-						code: '',
-						bankName: '',
-						id:''
-					}
-				}
-			]
-		};
-	},
-
-	onLoad(options) {
-		this.tabCurrentIndex = +options.state || 0;
-		this.loadAli();
-		this.loadBank();
-	},
-
-	methods: {
-		//加载数据
-		loadAli(source) {
-			aliInfo({}).then(({data}) => {
-				let order = this.navList[0].orderList;
-				this.$set(order,'name',data.fullname)
-				this.$set(order,'code',data.alino)
-				this.$set(order,'id',data.id)
-			});
-		},
-		loadBank() {
-			bankInfo({}).then(({data}) => {
-				let order = this.navList[1].orderList;
-				this.$set(order,'name',data.fullname);
-				this.$set(order,'code',data.bankno);
-				this.$set(order,'bankName',data.bank);
-				this.$set(order,'id',data.id)
-			});
-		},
-		//swiper 切换
-		changeTab(e) {
-			this.tabCurrentIndex = e.target.current;
-		},
-		//顶部tab点击
-		tabClick(index) {
-			this.tabCurrentIndex = index;
-		},
-		// 提交保存
-		confirm() {
-			let obj = this;
-			let arr = obj.navList[obj.tabCurrentIndex].orderList;
-			if (obj.tabCurrentIndex == 1) {
-				obj.setBankInfo({
-					fullname: arr.name,
-					bank: arr.bankName,
-					bankno: arr.code,
-					id:arr.id
-				});
-			}
-			if (obj.tabCurrentIndex == 0) {
-				obj.setAliInfo({
-					fullname: arr.name,
-					alino: arr.code,
-					id:arr.id
-				});
-			}
-		},
-		/* 保存银行卡详细 */
-		setBankInfo(obj) {
-			setBankInfo(obj)
-				.then(e => {
-					uni.showToast({
-						title: '修改成功',
-						duration: 2000,
-						position: 'top'
-					});
-					this.$api.prePage().dataUp()
-					setTimeout(() => {
-						uni.navigateBack()
-					},1500)
-				})
-				.catch(e => {
-					console.log(e);
-				});
-		},
-		// 修改支付宝信息
-		setAliInfo(obj) {
-			setAliInfo(obj)
-				.then(e => {
-					uni.showToast({
-						title: '修改成功',
-						duration: 2000,
-						position: 'top'
-					});
-					this.$api.prePage().dataUp()
-					setTimeout(() => {
-						uni.navigateBack()
-					},1500)
-				})
-				.catch(e => {
-					console.log(e);
-				});
-		},
-	}
-};
-</script>
-
-<style lang="scss">
-.row {
-	display: flex;
-	align-items: center;
-	position: relative;
-	padding: 0 30rpx;
-	height: 110rpx;
-	background: #fff;
-	.tit {
-		flex-shrink: 0;
-		width: 120rpx;
-		font-size: 30rpx;
-		color: $font-color-dark;
-	}
-	.input {
-		flex: 1;
-		font-size: 30rpx;
-		color: $font-color-dark;
-	}
-	.iconlocation {
-		font-size: 36rpx;
-		color: $font-color-light;
-	}
-}
-page,
-.content {
-	background: $page-color-base;
-	height: 100%;
-}
-
-.swiper-box {
-	height: 750rpx;
-}
-
-.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;
-			}
-		}
-	}
-}
-
-.add-btn {
-	&.up {
-		background-color: $base-color;
-		color: #fff;
-	}
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	width: 690rpx;
-	height: 80rpx;
-	margin: 0 auto;
-	margin-top: 30rpx;
-	font-size: $font-lg;
-	border-radius: 10rpx;
-	// box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
-}
-</style>

pages/money/withdmoenys.vue

@@ -1,335 +0,0 @@
-<template>
-	<view class="content">
-		<view class="content-money">
-			<view class="flex" v-if="type == 'xl'">
-				<view class="buttom">
-					<view class="icon">{{ userInfo.business_integral | getMoneyStyle }}</view>
-					<text class="text">可用能量金豆</text>
-				</view>
-			</view>
-			<view class="flex" v-if="type == 'yue'">
-				<view class="buttom">
-					<view class="icon">{{ userInfo.now_money | getMoneyStyle }}</view>
-					<text class="text">可用余额</text>
-				</view>
-			</view>
-			<!-- <view class="flex" v-if="type == 'cash'">
-				<view class="buttom">
-					<view class="icon">{{ userInfo.cash | getMoneyStyle }}</view>
-					<text class="text">可用现金</text>
-				</view>
-			</view> -->
-		</view>
-		<view class="row-box">
-			<view class="title">收款人ID</view>
-			<view class="row"><input class="input" type="number" v-model="card" placeholder="请输入收款人ID" placeholder-class="placeholder" /></view>
-		</view>
-		<view class="row-box">
-			<view class="title">转账金额</view>
-			<view class="row">
-				<!-- <text class="tit">￥</text> -->
-				<input class="input" type="number" v-model="withdrawal" placeholder="转入金额" placeholder-class="placeholder" />
-				<view class="buttom" v-if="type == 'xl'" @click="withdrawal = userInfo.business_integral">全部转账</view>
-				<view class="buttom" v-if="type == 'yue'" @click="withdrawal = userInfo.now_money">全部转账</view>
-				<view class="buttom" v-if="type == 'cash'" @click="withdrawal = userInfo.cash">全部转账</view>
-			</view>
-		</view>
-		<!-- <view class="tip" v-if="withdrawal != 0 && type == 'xl'">实际转入{{ realmoney }}响亮积分,{{ gy }}响亮积分流入公益池</view> -->
-
-		<button class="add-btn up" :class="{ action: loding }" @click="!loding ? confirm() : ''">提交申请</button>
-	</view>
-</template>
-
-<script>
-import { getMoneyStyle } from '@/utils/rocessor.js';
-import { getUserInfo, transfer, yuetransfer, cashtransfer, yueXhg } from '@/api/user.js';
-import { mapMutations, mapState } from 'vuex';
-export default {
-	filters: {
-		getMoneyStyle
-	},
-	data() {
-		return {
-			money: '0.00', //可提现金额
-			withdrawal: '', //提现金额
-			password: '', //支付密码
-			card: '', //转账卡号
-			name: '',
-			// #ifdef H5
-			weichatBsrowser: false,
-			// #endif
-			loding: false,
-			type: 'xl'
-		};
-	},
-	onLoad(options) {
-		// #ifdef H5
-		this.weichatBsrowser = uni.getStorageSync('weichatBrowser');
-		// #endif
-		this.dataUp();
-		if (options.type) {
-			this.type = options.type;
-			console.log(this.type);
-		}
-	},
-	computed: {
-		...mapState('user', ['userInfo']),
-		realmoney() {
-			return (this.withdrawal * 0.9).toFixed(2) * 1;
-		},
-		gy() {
-			return (this.withdrawal * 0.08).toFixed(2) * 1;
-		}
-	},
-	methods: {
-		...mapMutations('user', ['setUserInfo', 'login']),
-		// 更新数据
-		dataUp() {
-			let obj = this;
-			getUserInfo({})
-				.then(e => {
-					obj.login();
-					// 保存返回用户数据
-					obj.setUserInfo(e.data);
-				})
-				.catch(e => {
-					console.log(e);
-				});
-		},
-		// 切换选中对象
-		// tabRadio(e) {
-		// 	this.type = e.detail.value;
-		// },
-		// 提交
-		confirm() {
-			let obj = this;
-			obj.loding = true;
-			if (obj.withdrawal == 0) {
-				obj.loding = false;
-				uni.showModal({
-					title: '提示',
-					content: '转账金额不能为0'
-				});
-				return;
-			}
-			if (obj.card == obj.userInfo.phone) {
-				obj.loding = false;
-				uni.showModal({
-					title: '提示',
-					content: '不要输入自己的用户账号'
-				});
-			} else {
-				console.log(obj.type, 'type');
-				if (obj.type == 'xl') {
-					yueXhg({
-						phone: obj.card, //编号
-						money: obj.withdrawal, //金额
-						type: 2
-					})
-						.then(e => {
-							console.log('输入了');
-							// 允许按钮点击
-							obj.loding = false;
-							// 初始化提现金额
-							obj.withdrawal = '';
-							uni.showToast({
-								title: '提交成功',
-								duration: 2000,
-								position: 'top'
-							});
-							obj.dataUp();
-						})
-						.catch(e => {
-							obj.$api.msg(e.msg);
-							obj.loding = false;
-							console.log();
-						});
-				}
-				if (obj.type == 'yue') {
-					yueXhg({
-						phone: obj.card, //编号
-						money: obj.withdrawal, //金额
-						type: 1
-					})
-						.then(e => {
-							console.log('输入了');
-							// 允许按钮点击
-							obj.loding = false;
-							// 初始化提现金额
-							obj.withdrawal = '';
-							uni.showToast({
-								title: '提交成功',
-								duration: 2000,
-								position: 'top'
-							});
-							obj.dataUp();
-						})
-						.catch(e => {
-							obj.$api.msg(e.msg);
-							obj.loding = false;
-							console.log();
-						});
-				}
-				// if (obj.type == 'cash') {
-				// 	cashtransfer(data)
-				// 		.then(e => {
-				// 			// 允许按钮点击
-				// 			obj.loding = false;
-				// 			// 初始化提现金额
-				// 			obj.withdrawal = '';
-				// 			uni.showToast({
-				// 				title: '提交成功',
-				// 				duration: 2000,
-				// 				position: 'top'
-				// 			});
-				// 			obj.dataUp();
-				// 		})
-				// 		.catch(e => {
-				// 			obj.$api.msg(e.msg);
-				// 			obj.loding = false;
-				// 			console.log();
-				// 		});
-				// }
-			}
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page {
-	height: 100%;
-}
-.content-money {
-	padding: 30rpx 0;
-	background: #ffffff;
-}
-
-.item {
-	padding: 0 $page-row-spacing;
-	background-color: #ffffff;
-}
-.flex {
-	background-color: #ffffff;
-	text-align: center;
-	margin: 0 30rpx;
-	border-radius: $border-radius-sm;
-	justify-content: center;
-	.buttom {
-		font-size: $font-lg;
-		width: 50%;
-	}
-	.interval {
-		width: 2px;
-		height: 60rpx;
-		background-color: #eeeeee;
-	}
-	.icon {
-		background-size: 100%;
-		font-size: 42rpx;
-		color: $font-color-dark;
-		font-weight: bold;
-		background-repeat: no-repeat;
-		background-position: center;
-	}
-	.text {
-		color: $font-color-light;
-	}
-}
-
-.row-box {
-	margin-top: 30rpx;
-	padding: 20rpx 30rpx;
-	background: #fff;
-	.title {
-		font-size: $font-base + 2rpx;
-		color: $font-color-dark;
-	}
-	.row {
-		display: flex;
-		align-items: center;
-		position: relative;
-		height: 80rpx;
-		.tit {
-			flex-shrink: 0;
-			width: 40rpx;
-			font-size: 30rpx;
-			color: $font-color-dark;
-		}
-		.input {
-			flex: 1;
-			font-size: 30rpx;
-			color: $font-color-dark;
-		}
-		.iconlocation {
-			font-size: 36rpx;
-			color: $font-color-light;
-		}
-
-		.buttom {
-			color: #f21f5d;
-			font-size: $font-base;
-		}
-	}
-}
-.add-btn {
-	width: 520rpx;
-	height: 80rpx;
-	border: 2rpx solid #f21f5d;
-	border-radius: 40rpx;
-	margin: 140rpx auto;
-	font-family: PingFang SC;
-	font-weight: bold;
-	color: #f21f5d;
-}
-.name {
-	background: #fff;
-	padding: 30rpx;
-}
-.list {
-	padding-left: 30rpx;
-	margin-top: 30rpx;
-	background-color: #ffffff;
-	.box {
-		display: flex;
-		align-items: center;
-		width: 100%;
-		height: 120rpx;
-		border-bottom: 1px solid $border-color-light;
-		.icon {
-			font-size: 48rpx;
-			padding-right: 20rpx;
-			.icon-img {
-				height: 50rpx;
-				width: 50rpx;
-			}
-		}
-		.iconweixin1 {
-			color: #18bf16;
-		}
-		.iconzhifubao {
-			color: #08aaec;
-		}
-		.title-box {
-			flex-grow: 1;
-			text-align: left;
-			.title {
-				font-size: $font-base + 2rpx;
-				color: $font-color-base;
-			}
-			.node {
-				font-size: $font-sm;
-				color: $font-color-light;
-			}
-		}
-	}
-}
-.tip {
-	padding: 20rpx;
-	color: #ff0000;
-}
-/deep/ .uni-radio-input {
-	width: 45rpx;
-	height: 45rpx;
-}
-</style>

pages/public/login.vue

@@ -7,16 +7,16 @@
 			艺绘
 		</view>
 		<view class="bg">
-			<image src="../../static/public/pbbg.png" mode=""></image>
+			<image src="../../static/img/pbbg.png" mode=""></image>
 		</view>
 
 		<view class="register-content">
 			<view class="res-box">
-				<image src="../../static/public/pb03.png" mode=""></image>
+				<image src="../../static/img/pb03.png" mode=""></image>
 				<input class="input" type="number" v-model="phone" placeholder="请输入手机号">
 			</view>
 			<view class="res-box">
-				<image src="../../static/public/pb02.png" mode=""></image>
+				<image src="../../static/img/pb02.png" mode=""></image>
 				<input class="input" type="password" v-model="loginPass" placeholder="请输入密码">
 			</view>
 			<!-- <view class="res-box">

pages/public/register.vue

@@ -7,24 +7,24 @@
 			艺绘
 		</view>
 		<view class="bg">
-			<image src="../../static/public/pbbg.png" mode=""></image>
+			<image src="../../static/img/pbbg.png" mode=""></image>
 		</view>
 
 		<view class="register-content">
 			<view class="res-box">
-				<image src="../../static/public/pb03.png" mode=""></image>
+				<image src="../../static/img/pb03.png" mode=""></image>
 				<view class="input-box">
 					<input class="input" type="number" v-model="phone" placeholder="请输入手机号">
 				</view>
 			</view>
 			<view class="res-box">
-				<image src="../../static/public/pb02.png" mode=""></image>
+				<image src="../../static/img/pb02.png" mode=""></image>
 				<view class="input-box">
 					<input class="input" type="password" v-model="loginPass" placeholder="请输入密码">
 				</view>
 			</view>
 			<view class="res-box">
-				<image src="../../static/public/pb01.png" mode=""></image>
+				<image src="../../static/img/pb01.png" mode=""></image>
 				<view class="input-box">
 					<input class="input" type="number" v-model="code" placeholder="请输入验证码">
 					<view class="time" @click="getYzm" v-show="isHq">

pages/set/address.vue

@@ -1,208 +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.real_name }}</text>
-					<text class="mobile">{{ item.phone }}</text>
-				</view>
-				<view class="u-box">
-					<text class="address">{{ item.province + item.city + item.district }} {{ item.detail }}</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 } from '@/api/user.js';
-export default {
-	data() {
-		return {
-			source: 0,
-			addressList: []
-		};
-	},
-	onLoad(option) {
-		this.source = option.source||0
-		this.loadAddress();
-	},
-	methods: {
-		// 加载地址
-		loadAddress() {
-			getAddressList({
-				page: 1,
-				limit: 100
-			}).then(({ data }) => {
-				this.addressList = data;
-			});
-		},
-		// 设为默认地址
-		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) {
-			addressDel({
-				id: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;
-				uni.navigateBack();
-			}
-		},
-		// 添加地址
-		addAddress(type, item) {
-			uni.navigateTo({
-				url: `/pages/set/addressManage?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: space-between;
-		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/addressManage.vue

@@ -1,219 +0,0 @@
-<template>
-	<view class="content">
-		<view class="row b-b">
-			<text class="tit">联系人</text>
-			<input class="input" type="text" v-model="addressData.name" placeholder="收货人姓名" placeholder-class="placeholder" />
-		</view>
-		<view class="row b-b">
-			<text class="tit">手机号</text>
-			<input class="input" type="number" v-model="addressData.mobile" placeholder="收货人手机号码" placeholder-class="placeholder" />
-		</view>
-		<view class="row b-b">
-			<text class="tit">地址</text>
-			<pickerAddress class="input" @change="onCityClick">{{addressDetail||'请选择地址'}}</pickerAddress>
-			<text class="iconfont iconlocation"></text>
-		</view>
-		<view class="row b-b">
-			<text class="tit">门牌号</text>
-			<input class="input" type="text" v-model="addressData.area" placeholder="楼号、门牌" placeholder-class="placeholder" />
-		</view>
-
-		<uni-list class="margin-t-20">
-			<uni-list-item
-				title="设为默认"
-				:switch-checked="addressData.default"
-				:show-switch="true"
-				:show-arrow="false"
-				switch-color="#5dbc7c"
-				@switchChange="switchChange"
-			></uni-list-item>
-		</uni-list>
-
-		<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 } from '@/api/user.js';
-export default {
-	components: {
-		uniList,
-		uniListItem,
-		pickerAddress,
-		uniPopup
-	},
-	data() {
-		return {
-			addressDetail: '',
-			addressData: {
-				name: '',
-				mobile: '',
-				address: {
-					province: '',
-					city: '',
-					district: ''
-				},
-				area: '',
-				default: false
-			}
-		};
-	},
-	onLoad(option) {
-		let title = '新增收货地址';
-		if (option.type === 'edit') {
-			title = '编辑收货地址';
-			let data = JSON.parse(option.data);
-			console.log(data);
-
-			this.addressData = {
-				name: data.real_name,
-				mobile: data.phone,
-				address: {
-					province: data.province,
-					city: data.city,
-					district: data.district
-				},
-				area: data.detail,
-				default: data.is_default == 1,
-				id: data.id
-			};
-			this.addressDetail = data.province + data.city + data.district;
-		}
-		this.manageType = option.type;
-		uni.setNavigationBarTitle({
-			title
-		});
-	},
-	methods: {
-		// 选中城市切换
-		onCityClick({data}) {
-			let address = this.addressData.address;
-			address.province = data[0];
-			address.city = data[1];
-			address.district = data[2];
-			this.addressDetail = data.join('');
-		},
-		//地图选择地址
-		chooseLocation() {
-			uni.chooseLocation({
-				success: data => {
-					console.log(data);
-					this.addressData.addressName = data.name;
-					this.addressData.address = data.name;
-				}
-			});
-		},
-		// 设置是否为默认地址
-		switchChange(e) {
-			this.addressData.default = e.value;
-		},
-		//提交
-		confirm() {
-			let obj = this;
-			let data = this.addressData;
-			if (!data.name) {
-				this.$api.msg('请填写收货人姓名');
-				return;
-			}
-			if (!/(^1[3|4|5|7|8][0-9]{9}$)/.test(data.mobile)) {
-				this.$api.msg('请输入正确的手机号码');
-				return;
-			}
-			if (!data.address) {
-				this.$api.msg('请在地图选择所在位置');
-				return;
-			}
-			if (!data.area) {
-				this.$api.msg('请填写门牌号信息');
-				return;
-			}
-
-			//this.$api.prePage()获取上一页实例，可直接调用上页所有数据和方法，在App.vue定义
-			addressEdit({
-				real_name: data.name,
-				phone: data.mobile,
-				address: {
-					province: data.address.province,
-					city: data.address.city,
-					district: data.address.district
-				},
-				detail: data.area,
-				is_default: data.default,
-				id: data.id||"",
-				type:1
-			}).then(function(e) {
-				obj.$api.prePage().refreshList();
-				uni.showToast({
-					title:'提交成功',
-					duration:2000
-				});
-				setTimeout(function() {
-					uni.navigateBack();
-				}, 800);
-			});
-		}
-	}
-};
-</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: 120rpx;
-		font-size: 30rpx;
-		color: $font-color-dark;
-	}
-	.input {
-		flex: 1;
-		font-size: 30rpx;
-		color: $font-color-dark;
-	}
-	.iconlocation {
-		font-size: 36rpx;
-		color: $font-color-light;
-	}
-}
-.default-row {
-	margin-top: 16rpx;
-	.tit {
-		flex: 1;
-	}
-	switch {
-		transform: translateX(16rpx) scale(0.9);
-	}
-}
-.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/user.vue

@@ -1,167 +0,0 @@
-<template>
-	<view class="container">
-		<view class="row b-b">
-			<text class="tit">手机号</text>
-			<input class="input" v-model="account" type="text" placeholder="请填写手机号" placeholder-class="placeholder" />
-		</view>
-		<view>
-			<!-- <view class="row b-b">
-				<text class="tit">验证码</text>
-				<input class="input" v-model="captcha" type="text" placeholder="请填写验证码" placeholder-class="placeholder" />
-				<view class="code" @click="verification">{{ countDown == 0 ? '验证码' : countDown }}</view>
-			</view> -->
-			<button class="add-btn" :class="{ 'bg-gray': loding }" @click="loding ? '' : confirm()">提交</button>
-		</view>
-	</view>
-</template>
-
-<script>
-import { mapState, mapMutations } from 'vuex';
-import { spread, userinfo } from '@/api/user.js';
-export default {
-	data() {
-		return {
-			time: '', //保存倒计时对象
-			countDown: 0, //倒计时
-			account: '', //手机号
-			captcha: '', //验证码
-			password: '', //新密码
-			loding: false //是否载入中
-		};
-	},
-	watch: {
-		// 监听倒计时
-		countDown(i) {
-			if (i == 0) {
-				clearInterval(this.time);
-			}
-		}
-	},
-	computed: {
-		...mapState(['userInfo'])
-	},
-	onLoad() {
-		if (this.userInfo.phone == null) {
-			this.account = '';
-		} else {
-			this.account = this.userInfo.phone;
-			this.show = false;
-		}
-	},
-	methods: {
-		...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
-		//发送验证码
-		verification() {
-			let obj = this;
-			if (this.account == '') {
-				this.$api.msg('请输入电话号码');
-				return;
-			}
-			if (!/(^1[2|3|4|5|6|7|8|9][0-9]{9}$)/.test(this.account)) {
-				this.$api.msg('请输入正确的手机号');
-				return;
-			}
-			// 判断是否在倒计时
-			if (obj.countDown > 0) {
-				return false;
-			} else {
-				obj.countDown = 60;
-				obj.time = setInterval(() => {
-					obj.countDown--;
-				}, 1000);
-				//调用验证码接口
-				verify({
-					phone: obj.account,
-					type: 'BDING_CODE'
-				})
-					.then(({ data }) => {})
-					.catch(err => {
-						console.log(err);
-					});
-			}
-		},
-		confirm(e) {
-			let obj = this;
-			obj.loding = true;
-			spread({
-				phone: obj.account,
-			})
-				.then(({ data }) => {
-					obj.$api.msg('绑定成功！');
-					userinfo({})
-						.then(({ data }) => {
-							this.setUserInfo(data);
-						})
-						.catch(e => {
-							console.log(e);
-						});
-					setTimeout(function() {
-						obj.loding = false;
-						uni.navigateBack({
-							
-						})
-					}, 1000);
-				})
-				.catch(err => {
-					obj.loding = false;
-					console.log(err);
-				});
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page {
-	background: $page-color-base;
-}
-.row {
-	display: flex;
-	align-items: center;
-	position: relative;
-	padding: 0 30rpx;
-	height: 110rpx;
-	background: #fff;
-
-	.tit {
-		flex-shrink: 0;
-		width: 120rpx;
-		font-size: 30rpx;
-		color: $font-color-dark;
-	}
-	.input {
-		flex: 1;
-		font-size: 30rpx;
-		color: $font-color-dark;
-	}
-	.iconlocation {
-		font-size: 36rpx;
-		color: $font-color-light;
-	}
-}
-.add-btn {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	width: 690rpx;
-	height: 80rpx;
-	margin: 60rpx auto;
-	font-size: $font-lg;
-	color: #fff;
-	background-color: $base-color;
-	border-radius: 10rpx;
-	// box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
-}
-
-.bg-gray {
-	background-color: $color-gray;
-}
-.code {
-	color: #5dbc7c;
-	font-size: 23rpx;
-	border-left: 1px solid #eeeeee;
-	width: 150rpx;
-	flex-shrink: 0;
-	text-align: center;
-}
-</style>

pages/shoping/list.vue

@@ -1,262 +0,0 @@
-<template>
-	<view class="content">
-		<view class="varHeight"></view>
-		<view class="jg" style="height: 20rpx;"></view>
-		<block :key="ind" v-for="(lss, ind) in list">
-			<view class="goodsList-item" v-if="lss.show" @click="chooseStore(lss)">
-				<view class="info-top flex">
-					<image :src="lss.image" lazy-load mode="scaleToFill"></image>
-					<view class="store-name clamp2">
-						{{lss.name}}
-					</view>
-				</view>
-				<view class="tag">
-					门店
-				</view>
-				<view class="goodsList-content">
-					<view class="info-tit">地区：<text class="info-val">{{lss.address}}</text></view>
-					<view class="info-tit">电话：<text class="info-val">{{lss.phone }}</text></view>
-					<view class="info-tit">地址：<text class="info-val">{{lss.detailed_address}}</text></view>
-				</view>
-			</view>
-		</block>
-		<view class="jg" style="height: 20rpx;"></view>
-	</view>
-</template>
-<script>
-import { mapState, mapMutations } from 'vuex';
-import { store_list } from '@/api/index.js';
-export default {
-	data() {
-		return {
-			// 当前选中的滑块
-			list: [],
-			keyword: '' ,//查询中的内容
-			type: 0,//3->开通会员选择门店  4->自提选择门店  5->附近门店进入不做任何操作
-		};
-	},
-	watch: {
-		keyword(newValue, oldValue) {
-			this.keyword = newValue;
-			console.log(newValue);
-			this.search();
-		}
-	},
-	computed: {
-		...mapState(['latitude','longitude'])
-	},
-	onLoad(opt) {
-		if(opt.type) {
-			this.type = opt.type
-		}
-		this.getShoping();
-	},
-	// #ifndef MP
-	// 点击键盘搜索事件
-	onNavigationBarSearchInputConfirmed(e) {
-		this.search();
-	},
-	// 搜索栏内容变化事件
-	onNavigationBarSearchInputChanged(e) {
-		this.keyword = e.text;
-	},
-	// #endif
-	methods: {
-		...mapMutations(['setLat', 'setLon','setStoreInfo']),
-		// 查询店铺信息
-		search(title) {
-			let obj = this;
-			obj.list.forEach(e => {
-				if (e.title.indexOf(obj.keyword) >= 0) {
-					e.show = true;
-				} else {
-					e.show = false;
-				}
-			});
-		},
-		// 跳转店铺页面
-		navProduct(item) {
-			uni.navigateTo({
-				url: './index?merid=' + item.id
-			});
-		},
-		//获取商店信息
-		getShoping() {
-			let obj = this;
-			console.log(obj.longitude,obj.latitude)
-			store_list({})
-				.then(function({ data }) {
-					console.log(data)
-					obj.list = data.list.map(e => {
-						e.show = true;
-						return e;
-					});
-				})
-				.catch(e => {
-					console.log(e);
-				});
-		},
-		//选择门店
-		chooseStore(item) {
-			if(this.type == 3) {
-				this.$api.prePage().storeInfo = item
-				uni.navigateBack({
-					
-				})
-			}else if(this.type == 4) {
-				this.$api.prePage().shopAddress = item
-				uni.navigateBack({
-					
-				})
-				
-			}else if(this.type == 5) {
-				
-			}else {
-				this.setStoreInfo(item)
-				uni.navigateBack({
-					
-				})
-			}
-			
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page,
-.content {
-	height: 100%;
-}
-.varHeight {
-	height: var(--status-bar-height);
-}
-$slider-color: #fe9398; //滑块左侧颜色
-.goodsList-item {
-	// background-color: #ffffff;
-	// padding: 30rpx;
-	// border-bottom: 1px solid $border-color-light;
-	margin: 0 auto 20rpx;
-	width: 710rpx;
-	height: 231rpx;
-	padding: 25rpx 20rpx;
-	background: #FFFFFF;
-	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-	border-radius: 10rpx;
-	position: relative;
-	.tag {
-		width: 60rpx;
-		line-height: 40rpx;
-		background: #FF6F0F;
-		border-radius: 5rpx;
-		font-size: 24rpx;
-		font-family: PingFang SC;
-		font-weight: 500;
-		color: #FFFFFF;
-		text-align: center;
-		position: absolute;
-		top: 25rpx;
-		right: 20rpx;
-	}
-	.info-top {
-		justify-content: flex-start;
-		.store-name {
-			max-width: 500rpx;
-			font-size: 32rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #333333;
-			padding-left: 11rpx;
-		}
-	}
-	image {
-		flex-shrink: 0;
-		// border-radius: $border-radius-sm;
-		// height: 180rpx;
-		// width: 180rpx;
-		width: 65rpx;
-		height: 65rpx;
-		border-radius: 50%;
-	}
-	.slider {
-		margin-top: 15rpx;
-		justify-content: flex-start;
-		.slider-box {
-			width: 196rpx;
-			border-radius: 99px;
-			border: 1px solid $slider-color;
-			height: 16rpx;
-			.slider-action {
-				background-color: $slider-color;
-				height: 100%;
-			}
-		}
-		.sales-nub {
-			color: $font-color-light;
-			font-size: 24rpx;
-			height: 2.5em;
-			overflow: hidden;
-		}
-	}
-	.goodsList-content {
-		// margin-left: 20rpx;
-		flex-grow: 1;
-		// height: 180rpx;
-		position: relative;
-		padding-top: 20rpx;
-		.info-tit {
-			line-height: 1.5;
-			font-size: 24rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #333333;
-			.info-val {
-				font-weight: 500;
-				
-			}
-		}
-		.title {
-			font-size: $font-base;
-			color: $font-color-dark;
-			font-weight: 500;
-			width: 0;
-			min-width: 100%;
-		}
-		.goods-money {
-			position: absolute;
-			left: 0;
-			bottom: 0;
-			width: 100%;
-			.money-box {
-				.money {
-					font-size: $font-lg + 10rpx;
-					color: $color-red;
-					font-weight: bold;
-				}
-				.otMoney-box {
-					font-size: $font-sm;
-					.otMoney {
-						color: $font-color-light;
-						padding-right: 20rpx;
-					}
-					.sales {
-						color: $font-color-light;
-					}
-				}
-			}
-			.cart {
-				font-size: $font-base - 2rpx;
-				border-radius: 99px;
-				padding: 10rpx 20rpx;
-				line-height: 1;
-				color: #ffffff;
-				background-color: $color-gray;
-				&.seckill-action {
-					border: 1px solid $color-red;
-					background-color: $color-red;
-				}
-			}
-		}
-	}
-}
-</style>

pages/user/award.vue

@@ -1,457 +0,0 @@
-<template>
-	<view class="content">
-		<view class="content-money">
-			<view class="status_bar"><!-- 这里是状态栏 --></view>
-			<view class="body-title">
-				<view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view>
-				<view class="header">我的消费补贴券</view>
-			</view>
-			<view class="content-bg"><image src="../../static/img/yongjin-bg.png" mode=""></image></view>
-			<view class="money-box">
-				<view class="money">{{ userInfo.brokerage_price }}</view>
-				<view>我的消费补贴券</view>
-			</view>
-			<view class="money-btn" @click="navto('/pages/money/withdrawal')">
-				消费补贴券转换
-				<text>></text>
-			</view>
-		</view>
-		<view class="info-box flex">
-			<view class="info-item">
-				<view class="info-font">累计收入</view>
-				<view class="info-num">{{ orderStatusSum }}</view>
-			</view>
-			<view class="shu"></view>
-			<view class="info-item">
-				<view class="info-font">累计支出</view>
-				<view class="info-num">{{ recharge }}</view>
-			</view>
-		</view>
-		<view class="navbar">
-			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
-		</view>
-		<swiper :current="tabCurrentIndex" :style="{ height: maxheight }" class="swiper-box" duration="300" @change="changeTab">
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view scroll-y="true" class="list-scroll-content" @scrolltolower="loadData">
-					<!-- 空白页 -->
-					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-					<!-- 订单列表 -->
-					<view>
-						<view class="order-item flex" v-for="(item, index) in tabItem.orderList" :key="index">
-							<view class="title-box">
-								<view class="title">
-									<text>{{ item.title }}</text>
-								</view>
-								<view class="time">
-									<text>{{ item.add_time }}</text>
-								</view>
-							</view>
-							<view class="money">
-								<view>{{ (item.pm == 0 ? '-' : '+') + item.number }}</view>
-								<view v-if="item.status == 0" class="status">待发放</view>
-							</view>
-						</view>
-					</view>
-					<uni-load-more :status="tabItem.loadingType" v-if="!(tabItem.orderList.length == 0 && tabItem.loaded)"></uni-load-more>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-	</view>
-</template>
-
-<script>
-import { spreadCommission, userBalance } from '@/api/wallet.js';
-import { getMoneyStyle } from '@/utils/rocessor.js';
-import { mapState, mapMutations } from 'vuex';
-import uniLoadMore from '@/uview-ui/components/u-loadmore/u-loadmore.vue';
-import empty from '@/uview-ui/components/u-empty/u-empty.vue';
-export default {
-	filters: {
-		getMoneyStyle
-	},
-	computed: {
-		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
-	},
-	components: {
-		empty,
-		uniLoadMore
-	},
-	onReady(res) {
-		var _this = this;
-		uni.getSystemInfo({
-			success: resu => {
-				const query = uni.createSelectorQuery();
-				query.select('.swiper-box').boundingClientRect();
-				query.exec(function(res) {
-					_this.maxheight = resu.windowHeight - res[0].top + 'px';
-					console.log('打印页面的剩余高度', _this.height);
-				});
-			},
-			fail: res => {}
-		});
-	},
-	data() {
-		return {
-			// 头部图高度
-			maxheight: '',
-			tabCurrentIndex: 0,
-			orderStatusSum: 0,
-			recharge: 0,
-			navList: [
-				{
-					state: 0,
-					text: '收入',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10, //每次信息条数
-					loaded: false
-				},
-				{
-					state: 1,
-					text: '支出',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10, //每次信息条数
-					loaded: false
-				}
-			],
-			money: ''
-		};
-	},
-	onShow() {
-		this.loadData();
-	},
-	methods: {
-		// 页面跳转
-		navto(e) {
-			uni.navigateTo({
-				url: e
-			});
-		},
-		//获取收入支出信息
-		async loadData(source) {
-			let obj = this;
-			//这里是将订单挂载到tab列表下
-			let index = this.tabCurrentIndex;
-			let navItem = this.navList[index];
-			let state = navItem.state + 3;
-			if (source === 'tabChange' && navItem.loaded === true) {
-				//tab切换只有第一次需要加载数据
-				return;
-			}
-			if (navItem.loadingType === 'loading') {
-				//防止重复加载
-				return;
-			}
-			// 修改当前对象状态为加载中
-			navItem.loadingType = 'loading';
-			console.log(state,"123456");
-			spreadCommission(
-				{
-					page: navItem.page,
-					limit: navItem.limit
-				},
-				state
-			)
-				.then(({ data }) => {
-					console.log(data, '2211111');
-					obj.recharge = data.income;
-					obj.orderStatusSum = data.expend;
-					if (data.list.length > 0) {
-						data.list[0].list.forEach(e => {
-							console.log(e, '123456');
-							if (e.title == '市场分红') {
-								e.title = '市场分红补贴';
-							}
-							if (e.title == '礼包推荐奖') {
-								e.title = '礼包推荐补贴';
-							}
-						});
-						navItem.orderList = navItem.orderList.concat(data.list[0].list);
-						console.log(navItem.orderList);
-						navItem.page++;
-					} else {
-						navItem.loadingType = 'noMore';
-					}
-					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);
-				});
-		},
-		// 点击返回 我的页面
-		toBack() {
-			uni.navigateBack({});
-		},
-		//swiper 切换
-		changeTab(e) {
-			this.tabCurrentIndex = e.target.current;
-			this.loadData('tabChange');
-		},
-		//顶部tab点击
-		tabClick(index) {
-			this.tabCurrentIndex = index;
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page {
-	background: #f1f1f1;
-	height: 100%;
-}
-
-.status_bar {
-	height: var(--status-bar-height);
-	width: 100%;
-}
-
-.content-money {
-	position: relative;
-	height: 480rpx;
-
-	.content-bg {
-		position: absolute;
-		top: 0;
-		left: 0;
-		right: 0;
-		width: 750rpx;
-		height: 480rpx;
-
-		image {
-			width: 100%;
-			height: 100%;
-		}
-	}
-
-	.body-title {
-		height: 80rpx;
-		text-align: center;
-		font-size: 35rpx;
-		position: relative;
-
-		.header {
-			position: absolute;
-			left: 0;
-			top: 0;
-			width: 100%;
-			font-size: 36rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #fffeff;
-			height: 80rpx;
-			font-size: 36rpx;
-			font-weight: 700;
-			z-index: 9;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-		}
-
-		.goback-box {
-			position: absolute;
-			left: 18rpx;
-			top: 0;
-			height: 80rpx;
-			display: flex;
-			align-items: center;
-		}
-
-		.goback {
-			z-index: 100;
-			width: 34rpx;
-			height: 34rpx;
-		}
-	}
-}
-
-.info-box {
-	width: 670rpx;
-	height: 186rpx;
-	background: #ffffff;
-	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-	border-radius: 20rpx;
-	margin: -100rpx auto 0;
-	position: relative;
-	z-index: 2;
-
-	.info-item {
-		width: 50%;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		line-height: 1;
-
-		.info-font {
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #999999;
-		}
-
-		.info-num {
-			margin-top: 30rpx;
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #181818;
-		}
-	}
-
-	.shu {
-		width: 2rpx;
-		height: 74rpx;
-		background: #dcdfe6;
-	}
-}
-
-.money-box {
-	position: relative;
-	z-index: 2;
-	padding-top: 90rpx;
-	color: #ffffff;
-	text-align: center;
-
-	.money {
-		font-size: 72rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #ffffff;
-	}
-
-	.text {
-		font-size: 30rpx;
-	}
-}
-
-.money-btn {
-	position: relative;
-	z-index: 2;
-	color: #ffffff;
-	padding-right: 50rpx;
-	text-align: right;
-	font-size: 30rpx;
-	font-family: PingFang SC;
-	font-weight: bold;
-	color: #ffffff;
-
-	text {
-		display: inline-block;
-		padding-left: 10rpx;
-	}
-}
-
-.navbar {
-	margin-top: 20rpx;
-	display: flex;
-	height: 88rpx;
-	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: #999999;
-		position: relative;
-
-		&.current {
-			color: #000;
-
-			&:after {
-				content: '';
-				position: absolute;
-				left: 50%;
-				bottom: 0;
-				transform: translateX(-50%);
-				width: 44px;
-				height: 0;
-				border-bottom: 2px solid #fe5b38;
-			}
-		}
-	}
-}
-
-//列表
-.swiper-box {
-	.order-item:last-child {
-		margin-bottom: 60rpx;
-	}
-
-	.order-item {
-		padding: 20rpx 30rpx;
-		line-height: 1.5;
-
-		.title-box {
-			.title {
-				font-size: $font-lg;
-				color: $font-color-base;
-			}
-
-			.time {
-				font-size: $font-base;
-				color: $font-color-light;
-			}
-		}
-
-		.money {
-			color: #fd5b23;
-			font-size: $font-lg;
-			text-align: right;
-
-			.status {
-				color: $font-color-light;
-			}
-		}
-	}
-}
-
-.list-scroll-content {
-	background: #ffffff;
-	height: 100%;
-}
-
-.content {
-	height: 100%;
-
-	.empty-content {
-		background-color: #ffffff;
-	}
-}
-
-.btn-box {
-	width: 674rpx;
-	height: 88rpx;
-	background: linear-gradient(0deg, #2e58ff, #32c6ff);
-	border-radius: 44rpx;
-	font-size: 36rpx;
-	font-family: PingFang SC;
-	font-weight: 500;
-	color: #ffffff;
-	text-align: center;
-	line-height: 88rpx;
-	position: fixed;
-	bottom: 48rpx;
-	left: 0;
-	right: 0;
-	margin: 0 auto;
-}
-</style>

pages/user/cash.vue

@@ -1,417 +0,0 @@
-<template>
-	<view class="content">
-		<view class="content-money">
-			<view class="status_bar"><!-- 这里是状态栏 --></view>
-			<view class="body-title">
-				<view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view>
-				<view class="header">我的现金</view>
-			</view>
-			<view class="content-bg"><image src="../../static/img/cash-bg.png" mode=""></image></view>
-			<view class="money-box">
-				<view class="money">{{ userInfo.cash }}</view>
-				<view>我的现金</view>
-			</view>
-			<view class="moneybtn-box">
-				<view class="money-btn" @click="navto('/pages/money/withdmoenys?type=cash')">
-					现金转账
-				</view>
-				<view class="money-btn" @click="navto('/pages/user/withdrawal')">
-					现金提现
-				</view>
-			</view>
-		</view>
-		<view class="info-box flex">
-			<view class="info-item">
-				<view class="info-font">累计收入</view>
-				<view class="info-num">{{recharge}}</view>
-			</view>
-			<view class="shu"></view>
-			<view class="info-item">
-				<view class="info-font">累计支出</view>
-				<view class="info-num">{{orderStatusSum}}</view>
-			</view>
-		</view>
-		<view class="navbar">
-			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
-		</view>
-		<swiper :current="tabCurrentIndex" :style="{ height: maxheight }" class="swiper-box" duration="300" @change="changeTab">
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view scroll-y="true" class="list-scroll-content" @scrolltolower="loadData">
-					<!-- 空白页 -->
-					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-
-					<!-- 订单列表 -->
-					<view>
-						<view class="order-item flex" v-for="(item, index) in tabItem.orderList" :key="index">
-							<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">
-								<view>{{ (item.pm == 0 ? '-' : '+') + item.number }}</view>
-								<view v-if="item.status == 0" class="status">待发放</view>
-							</view>
-						</view>
-					</view>
-					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-	</view>
-</template>
-
-<script>
-import { cashList, userBalance } from '@/api/wallet.js';
-import { getMoneyStyle } from '@/utils/rocessor.js';
-import { mapState, mapMutations } from 'vuex';
-import uniLoadMore from '@/uview-ui/components/u-loadmore/u-loadmore.vue';
-import empty from '@/uview-ui/components/u-empty/u-empty.vue';
-export default {
-	filters: {
-		getMoneyStyle
-	},
-	computed: {
-		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
-	},
-	components: {
-		empty,
-		uniLoadMore
-	},
-	onReady(res) {
-		var _this = this;
-		uni.getSystemInfo({
-			success: resu => {
-				const query = uni.createSelectorQuery();
-				query.select('.swiper-box').boundingClientRect();
-				query.exec(function(res) {
-					_this.maxheight = resu.windowHeight - res[0].top + 'px';
-					console.log('打印页面的剩余高度', _this.height);
-				});
-			},
-			fail: res => {}
-		});
-	},
-	data() {
-		return {
-			// 头部图高度
-			maxheight: '',
-			tabCurrentIndex: 0,
-			orderStatusSum: 0,
-			recharge: 0,
-			navList: [
-				{
-					state: 1,
-					text: '收入',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				},
-				{
-					state: 0,
-					text: '支出',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				}
-			],
-			money: ''
-		};
-	},
-	onLoad(options) {},
-	onShow() {
-		this.loadData();
-	},
-	methods: {
-		// 页面跳转
-		navto(e) {
-			uni.navigateTo({
-				url: e
-			});
-		},
-		// 点击返回 我的页面
-		toBack() {
-			uni.navigateBack({});
-		},
-		//获取收入支出信息
-		async loadData(source) {
-			let obj = this
-			//这里是将订单挂载到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';
-
-			cashList(
-				{
-					page: navItem.page,
-					limit: navItem.limit,
-					pm: state
-				}
-			)
-				.then(({ data }) => {
-					obj.recharge = data.income;
-					obj.orderStatusSum = data.expend;
-					if (data.list.length > 0) {
-						navItem.orderList = navItem.orderList.concat(data.list);
-						console.log(navItem.orderList);
-						navItem.page++;
-					}
-					if (navItem.limit == data.list.length) {
-						//判断是否还有数据， 有改为 more， 没有改为noMore
-						navItem.loadingType = 'more';
-						return;
-					} else {
-						//判断是否还有数据， 有改为 more， 没有改为noMore
-						navItem.loadingType = 'noMore';
-					}
-					uni.hideLoading();
-					this.$set(navItem, 'loaded', true);
-				})
-				.catch(e => {
-					console.log(e);
-				});
-		},
-
-		//swiper 切换
-		changeTab(e) {
-			this.tabCurrentIndex = e.target.current;
-			this.loadData('tabChange');
-		},
-		//顶部tab点击
-		tabClick(index) {
-			this.tabCurrentIndex = index;
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page {
-	background: #f1f1f1;
-	height: 100%;
-}
-.status_bar {
-	height: var(--status-bar-height);
-	width: 100%;
-}
-.content-money {
-	position: relative;
-	height: 480rpx;
-	.content-bg {
-		position: absolute;
-		top: 0;
-		left: 0;
-		right: 0;
-		width: 750rpx;
-		height: 480rpx;
-		image {
-			width: 100%;
-			height: 100%;
-		}
-	}
-	.body-title {
-		height: 80rpx;
-		text-align: center;
-		font-size: 35rpx;
-		position: relative;
-		.header {
-			position: absolute;
-			left: 0;
-			top: 0;
-			width: 100%;
-			font-size: 36rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #fffeff;
-			height: 80rpx;
-			font-size: 36rpx;
-			font-weight: 700;
-			z-index: 9;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-		}
-		.goback-box {
-			position: absolute;
-			left: 18rpx;
-			top: 0;
-			height: 80rpx;
-			display: flex;
-			align-items: center;
-		}
-
-		.goback {
-			z-index: 100;
-			width: 34rpx;
-			height: 34rpx;
-		}
-	}
-}
-.info-box {
-	width: 670rpx;
-	height: 186rpx;
-	background: #ffffff;
-	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-	border-radius: 20rpx;
-	margin: -100rpx auto 0;
-	position: relative;
-	z-index: 2;
-	.info-item {
-		width: 50%;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		line-height: 1;
-		.info-font {
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #999999;
-		}
-		.info-num {
-			margin-top: 30rpx;
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #181818;
-		}
-	}
-	.shu {
-		width: 2rpx;
-		height: 74rpx;
-		background: #dcdfe6;
-	}
-}
-.moneybtn-box {
-	display: flex;
-	justify-content: space-between;
-	position: relative;
-	z-index: 2;
-	color: #ffffff;
-	padding:20rpx 50rpx ;
-	font-size: 30rpx;
-	font-family: PingFang SC;
-	font-weight: bold;
-	color: #FFFFFF;
-}
-.money-box {
-	position: relative;
-	z-index: 2;
-	padding-top: 90rpx;
-	color: #ffffff;
-	text-align: center;
-	.money {
-		font-size: 72rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #ffffff;
-	}
-	.text {
-		font-size: 30rpx;
-	}
-}
-
-.navbar {
-	margin-top: 20rpx;
-	display: flex;
-	height: 88rpx;
-	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: #999999;
-		position: relative;
-		&.current {
-			color: #000;
-			&:after {
-				content: '';
-				position: absolute;
-				left: 50%;
-				bottom: 0;
-				transform: translateX(-50%);
-				width: 44px;
-				height: 0;
-				border-bottom: 2px solid #fe5b38;
-			}
-		}
-	}
-}
-//列表
-.swiper-box {
-	.order-item:last-child {
-		margin-bottom: 60rpx;
-	}
-	.order-item {
-		padding: 20rpx 30rpx;
-		line-height: 1.5;
-		.title-box {
-			.title {
-				font-size: $font-lg;
-				color: $font-color-base;
-			}
-			.time {
-				font-size: $font-base;
-				color: $font-color-light;
-			}
-		}
-		.money {
-			color: #fd5b23;
-			font-size: $font-lg;
-			text-align: right;
-			.status {
-				color: $font-color-light;
-			}
-		}
-	}
-}
-.list-scroll-content {
-	background: #ffffff;
-	height: 100%;
-}
-.content {
-	height: 100%;
-	.empty-content {
-		background-color: #ffffff;
-	}
-}
-.btn-box {
-	width: 674rpx;
-	height: 88rpx;
-	background: linear-gradient(0deg, #2e58ff, #32c6ff);
-	border-radius: 44rpx;
-	font-size: 36rpx;
-	font-family: PingFang SC;
-	font-weight: 500;
-	color: #ffffff;
-	text-align: center;
-	line-height: 88rpx;
-	position: fixed;
-	bottom: 48rpx;
-	left: 0;
-	right: 0;
-	margin: 0 auto;
-}
-</style>

pages/user/coupon.vue

@@ -1,310 +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>
-		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<!-- 空白页 -->
-				<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-				<view v-for="(item, index) in tabItem.orderList" :key="index" class="row flex">
-					<view class="list-money flex">
-						<image :src="item._type == 2 ? '/static/img/img03.png' : '/static/img/img02.png'" mode="scaleToFill"></image>
-						<view class="list-money-text">
-							<view class="tit" :class="{ action: item._type} == 2">
-								<text>{{ item.coupon_price }}</text>
-							</view>
-							<view class="price">
-								<text>满{{ item.use_min_price }}元</text>
-							</view>
-						</view>
-					</view>
-					<view class="list-interval position-relative">
-						<view class="bottom"></view>
-						<view class="top"></view>
-					</view>
-					<view class="row_list_right">
-						<view class="right_top">
-							<text class="right_title" :class="{ action: item._type == 2}">{{ item.coupon_title }}</text>
-						</view>
-						<view class="right_time">
-							<text>{{ item._add_time }}-{{ item.end_time }}</text>
-						</view>
-						<view class="right_use action" v-if="item._type == 2">
-							<text>{{ item._msg }}</text>
-						</view>
-						<view class="right_use noAction" v-if="item._type == 0">
-							<text>{{ item._msg }}</text>
-						</view>
-					</view>
-				</view>
-				<uni-load-more :status="tabItem.loadingType"></uni-load-more>
-			</swiper-item>
-		</swiper>
-	</view>
-</template>
-
-<script>
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-import empty from '@/components/empty';
-import { getCouponsList } from '@/api/order.js';
-export default{
-	components: {
-		uniLoadMore,
-		empty
-	},
-	data() {
-		return {
-			tabCurrentIndex: 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 //每次信息条数
-				}
-			]
-		};
-	},
-	onLoad(options) {
-		this.loadData();
-	},
-	methods: {
-		//返回首页
-		navTo(){
-			uni.switchTab({
-				url: '/pages/index/index'
-			});
-		},
-		//获取订单列表
-		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';
-			getCouponsList(
-				{
-					page: navItem.page,
-					limit: navItem.limit
-				},
-				index
-			)
-				.then(({ data }) => {
-					let da = data.map(e => {
-						e.coupon_price = +e.coupon_price.replace(',', '');
-						e.use_min_price = +e.use_min_price.replace(',', '');
-						return e
-					});
-					navItem.orderList = navItem.orderList.concat(da);
-					console.log(navItem.orderList);
-					navItem.page++;
-					if (navItem.limit == data.length) {
-						// 判断是否还有数据，有改为more，没有改为noMore
-						navItem.loadingType = 'more';
-						return;
-					}else {
-						navItem.loadingType = 'noMore';
-					}
-					uni.hideLoading();
-					this.$set(navItem, 'loaded', true);
-				})
-				.catch(e => {
-					console.log(e);
-				})
-		},
-		//swiper 切换
-		changeTab(e) {
-			this.tabCurrentIndex = e.target.current;
-			this.loadData('tabChange');
-		},
-		//顶部tab点击
-		tabClick(index) {
-			this.tabCurrentIndex = index;
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-// 卡卷可用时颜色
-$card-color-action: #fc4141;
-page,
-.content {
-	background: $page-color-base;
-	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: #bc253a;
-			&:after {
-				content: '';
-				position: absolute;
-				left: 50%;
-				bottom: 0;
-				transform: translateX(-50%);
-				width: 44px;
-				height: 0;
-				border-bottom: 2px solid #bc253a;
-			}
-		}
-	}
-}
-
-.swiper-box {
-	height: calc(100% - 40px);
-	.tab-content {
-		padding: 25rpx 0px;
-		font-size: 28rpx;
-		color: #1b1b1b;
-	}
-}
-
-.row {
-	border-radius: 15rpx;
-	margin: 0 25rpx;
-	margin-bottom: 25rpx;
-	height: 200rpx;
-	overflow: hidden;
-	background-color: #ffffff;
-	.list-interval {
-		border: 1px dashed $border-color-light;
-		height: 100%;
-		.top,
-		.bottom {
-			border-radius: 100rpx;
-			width: 30rpx;
-			height: 30rpx;
-			position: absolute;
-			background-color: $page-color-base;
-			right: -15rpx;
-		}
-		.top {
-			top: -18rpx;
-		}
-		.bottom {
-			bottom: -18rpx;
-		}
-	}
-	.list-money {
-		height: 100%;
-		image {
-			height: 100%;
-			width: 20rpx;
-		}
-		.list-money-text {
-			width: 220rpx;
-			padding: 0 25rpx;
-			text-align: center;
-			color: $font-color-light;
-			.tit {
-				padding: 15rpx 0rpx;
-				font-size: 55rpx;
-				font-weight: bold;
-				&.action {
-					color: $card-color-action;
-				}
-			}
-			.price {
-				padding-bottom: 25rpx;
-			}
-		}
-	}
-	.row_list_right {
-		flex-grow: 1;
-		padding-left: 25rpx;
-		line-height: 1;
-		.right_time {
-			color: $font-color-light;
-			font-size: $font-sm;
-		}
-		.right_use {
-			margin: 15rpx 0;
-			padding: 10rpx;
-			width: 140rpx;
-			text_align: center;
-			border-radius: 50rpx;
-			color: #fff;
-			font-size: $font-sm - 4rpx;
-			&.action {
-				background-color: $card-color-action;
-			}
-			&.noAction {
-				background-color: $color-gray;
-			}
-		}
-		.right_top {
-			margin: 15rpx 0;
-			font-size: $font-lg;
-			height: 50rpx;
-			color: $font-color-light;
-			.right_name {
-				font-weight: bold;
-			}
-			.right_title {
-				font-weight: bold;
-				&.action {
-					color: $font-color-base;
-				}
-			}
-		}
-	}
-	
-	.iconlocation {
-		font-size: 36rpx;
-		color: $font-color-light;
-	}
-}
-// uni-load-more
-.uni-load-more {
-	display: flex;
-	flex-direction: row;
-	height: 80rpx;
-	align-items: center;
-	justify-content: center;
-}
-</style>

pages/user/favorites.vue

@@ -1,156 +0,0 @@
-<template>
-	<view class="container">
-		<!-- 空白页 -->
-		<empty v-if="favoriteList.length < 1"></empty>
-		<view class="favorites flex" v-for="ls in favoriteList" @click="toproduct(ls.pid)">
-			<view class="favorites_img"><image :src="ls.image"></image></view>
-			<view class="favorites_list">
-				<view class="favorites_name">{{ ls.store_name }}</view>
-				<view class="favorites_peice flex">
-					<view>
-						<text>￥{{ ls.price }}</text>
-					</view>
-					<view class="icon_del" @click.prevent.stop="del(ls.pid)" v-show="delshow">
-						<text class="iconfont icondelete"></text>
-						<text>取消</text>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-import { getcollectList, delcollect } from '@/api/user.js';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-import empty from '@/components/empty';
-export default {
-	components: {
-		uniLoadMore,
-		empty
-	},
-	data() {
-		return {
-			tabCurrentIndex: 0,
-			favoriteList: '',
-			delshow: true
-		};
-	},
-	onLoad() {
-		this.loadData();
-	},
-	methods: {
-		//获取收藏夹列表
-		loadData() {
-			let obj = this;
-			getcollectList({
-				page: '1',
-				limit: '10'
-			})
-				.then(function(e) {
-					obj.favoriteList = e.data;
-					console.log(obj.favoriteList);
-				})
-				.catch(function(e) {
-					console.log(e);
-				});
-		},
-		//跳转商品详情页
-		toproduct(item) {
-			let id = item;
-			uni.navigateTo({
-				url: `/pages/product/product?id=${id}`
-			})
-		},
-		//删除收藏夹商品
-		del(item) {
-			let obj = this;
-			uni.showModal({
-				title: '提示',
-				content: '是否取消收藏该商品',
-				success: e => {
-					if (e.confirm) {
-						delcollect({
-							id: item,
-							category: 'product'
-						})
-							.then(function(e) {
-								uni.showToast({
-									title: '已取消收藏',
-									duration: 1500,
-								});
-								obj.loadData();
-							})
-							.catch(function(e) {
-								console.log(e);
-							});
-					}
-				}
-			});
-		},
-	}
-}
-</script>
-
-<style lang="scss">
-page {
-	height: 100%;
-}
-%flex-center {
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	align-items: center;
-}
-%section {
-	display: flex;
-	justify-content: space-around;
-	align-content: center;
-	background: #fff;
-	border-radius: 10rpx;
-}
-.container {
-	height: 100%;
-	background-color: $page-color-base;
-	padding: 15rpx 0rpx;
-	font-size: 28rpx;
-}
-.favorites {
-	width: 90%;
-	background-color: #ffffff;
-	border-radius: 15rpx;
-	margin: 15rpx auto;
-	padding: 25rpx 25rpx;
-	margin-bottom: 25rpx;
-}
-.favorites_img {
-	width: 80px !important;
-	height: 80px;
-}
-.favorites_img image {
-	width: 100%;
-	height: 100%;
-}
-.favorites_list {
-	width: 70%;
-	padding-left: 20rpx;
-}
-.icon_del {
-	color: $font-color-base;
-	z-index: 9999;
-	font-weight: bold;
-}
-.favorites_name {
-	height: 80rpx;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	display: -webkit-box;
-	-webkit-box-orient: vertial;
-	-webkit-line-clamp: 2;
-}
-.favorites_peice {
-	margin-top: 25rpx;
-	color: #db1935;
-	font-weight: bold;
-}
-</style>

pages/user/greenChange.vue

@@ -1,142 +0,0 @@
-<template>
-	<view class="content">
-		<view class="tab flex">
-			<view class="tab-name">可用于兑换的水滴：</view>
-			<view class="tab-val">{{ userInfo.green_integral || '0' }}</view>
-		</view>
-		<view class="tab flex">
-			<view class="tab-name">兑换比例：</view>
-			<view class="tab-val">{{ bl }}:1</view>
-		</view>
-		<view class="tab flex">
-			<view class="tab-name">可兑换洒水壶数量：</view>
-			<view class="tab-val">{{ could }}</view>
-		</view>
-		<view class="tab flex">
-			<view class="tab-name">申请兑换洒水壶数量：</view>
-			<input type="number" class="tab-val" placeholder="请输入兑换洒水壶数量" placeholder-style="font-size:28rpx;" v-model="changeNum" />
-			<!-- <view class="tab-val">
-				{{sqss}}
-			</view> -->
-		</view>
-		<view class="sub" :class="{ loading: load }" @click="exchangeGreen">立即兑换</view>
-	</view>
-</template>
-
-<script>
-import { mapState, mapMutations } from 'vuex';
-import { getGreenBl, getUserInfo, exchangeGreen } from '@/api/user.js';
-export default {
-	data() {
-		return {
-			bl: 0,
-			load: true,
-			changeNum: ''
-		};
-	},
-	onLoad() {},
-	onShow() {
-		this.getGreenBl();
-	},
-	onReachBottom() {},
-	onReady() {},
-	computed: {
-		...mapState('user', ['userInfo']),
-		could() {
-			if (this.userInfo.green_integral == 0) {
-				return 0;
-			} else {
-				return Math.floor(this.userInfo.green_integral / this.bl);
-			}
-		}
-	},
-	methods: {
-		...mapMutations('user', ['setUserInfo']),
-		getGreenBl() {
-			getGreenBl().then(res => {
-				console.log(res);
-				this.bl = res.data.bl;
-				this.getUserInfo();
-			});
-		},
-		getUserInfo() {
-			let obj = this;
-			getUserInfo().then(res => {
-				obj.setUserInfo(res.data);
-				obj.load = false;
-			});
-		},
-		exchangeGreen() {
-			let obj = this;
-			if (obj.load) {
-				return;
-			}
-			if (obj.changeNum == '') {
-				return obj.$api.msg('请输入兑换绿卡数量');
-			}
-			if (obj.userInfo.green_integral == 0) {
-				return obj.$api.msg('您的绿积分不足');
-			}
-			if (obj.changeNum * 1 > obj.could) {
-				return obj.$api.msg('您的绿积分不足');
-			}
-			obj.load = true;
-			exchangeGreen({
-				num: obj.changeNum
-			})
-				.then(({ data }) => {
-					console.log(data);
-					uni.showToast({
-						title: '提交成功',
-						duration: 2000,
-						position: 'top'
-					});
-					obj.getGreenBl();
-					// obj.load = false
-				})
-				.catch(err => {
-					obj.load = false;
-				});
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.tab {
-	font-size: 32rpx;
-	font-weight: 500;
-	color: #333333;
-	line-height: 110rpx;
-	border-bottom: 1px solid #eee;
-	width: 710rpx;
-	margin: auto;
-
-	.tab-name {
-		flex-shrink: 0;
-	}
-
-	.tab-val {
-		flex-grow: 1;
-		text-align: right;
-		font-size: 48rpx;
-		font-weight: bold;
-	}
-}
-
-.sub {
-	width: 670rpx;
-	line-height: 88rpx;
-	background: #ff4c4c;
-	border-radius: 10rpx;
-	font-size: 32rpx;
-	font-weight: bold;
-	color: #ffffff;
-	text-align: center;
-	margin: 60rpx auto 0;
-}
-
-.loading {
-	background: #999;
-}
-</style>

pages/user/greenJf.vue

@@ -1,443 +0,0 @@
-<template>
-	<view class="content">
-		<view class="content-money">
-			<view class="status_bar"><!-- 这里是状态栏 --></view>
-			<view class="body-title">
-				<view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view>
-				<view class="header">我的水滴</view>
-			</view>
-			<view class="content-bg"><image src="../../static/img/myyue.png" mode=""></image></view>
-			<view class="money-box">
-				<view class="money">{{ userInfo.green_integral | getMoneyStyle }}</view>
-				<view>当前余额</view>
-			</view>
-			<view class="moneybtn-box">
-				<view class="money-btn"></view>
-				<view class="money-btn" @click="navto('/pages/user/greenChange')">兑换洒水壶 ></view>
-			</view>
-		</view>
-		<view class="info-box flex">
-			<view class="info-item">
-				<view class="info-font">累计收入</view>
-				<view class="info-num">{{ recharge || 0 }}</view>
-			</view>
-			<view class="shu"></view>
-			<view class="info-item">
-				<view class="info-font">累计支出</view>
-				<view class="info-num">{{ orderStatusSum || 0 }}</view>
-			</view>
-		</view>
-		<view class="navbar">
-			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
-		</view>
-		<swiper :current="tabCurrentIndex" :style="{ height: height }" class="swiper-box" duration="300" @change="changeTab">
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view scroll-y="true" class="list-scroll-content" @scrolltolower="loadData">
-					<!-- 空白页 -->
-					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-
-					<!-- 订单列表 -->
-					<view>
-						<view class="order-item flex" v-for="(item, index) in tabItem.orderList" :key="index">
-							<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">
-								<view>{{ (item.pm == 0 ? '-' : '+') + item.number }}</view>
-							</view>
-						</view>
-					</view>
-					<uni-load-more :status="tabItem.loadingType" v-if="!(tabItem.orderList.length == 0 && tabItem.loaded)"></uni-load-more>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-	</view>
-</template>
-
-<script>
-import { mapState, mapMutations } from 'vuex';
-import { getGreenJf, getUserInfo } from '@/api/user.js';
-import { spreadCommission, userBalance } from '@/api/wallet.js';
-import { getMoneyStyle } from '@/utils/rocessor.js';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-import empty from '@/components/empty';
-export default {
-	filters: {
-		getMoneyStyle
-	},
-	components: {
-		empty,
-		uniLoadMore
-	},
-	onReady(res) {
-		var _this = this;
-		uni.getSystemInfo({
-			success: resu => {
-				const query = uni.createSelectorQuery();
-				query.select('.swiper-box').boundingClientRect();
-				query.exec(function(res) {
-					_this.height = resu.windowHeight - res[0].top + 'px';
-					console.log('打印页面的剩余高度', _this.height);
-				});
-			},
-			fail: res => {}
-		});
-	},
-	data() {
-		return {
-			height: '',
-			// 头部图高度
-			maxheight: '',
-			tabCurrentIndex: 0,
-			orderStatusSum: 0,
-			recharge: 0,
-			navList: [
-				{
-					state: 0,
-					text: '支出',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				},
-				{
-					state: 1,
-					text: '收入',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				}
-			],
-			money: ''
-		};
-	},
-	onLoad(options) {},
-	onShow() {
-		this.loadData();
-		// 获取用户余额
-		getUserInfo({}).then(({ data }) => {
-			this.money = data.now_money;
-			this.setUserInfo(data);
-		});
-	},
-	computed: {
-		...mapState('user', ['userInfo'])
-	},
-	methods: {
-		...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
-		toBack() {
-			uni.navigateBack({});
-		},
-		// 页面跳转
-		navto(e) {
-			uni.navigateTo({
-				url: e
-			});
-		},
-		//获取收入支出信息
-		async loadData(source) {
-			let obj = this;
-			//这里是将订单挂载到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';
-
-			getGreenJf({
-				page: navItem.page,
-				limit: navItem.limit,
-				pm: navItem.state
-			})
-				.then(({ data }) => {
-					obj.zc = data.zc;
-					obj.sr = data.sr;
-					navItem.orderList = navItem.orderList.concat(data.list);
-					navItem.page++;
-					if (navItem.limit == data.list.length) {
-						navItem.loadingType = 'more';
-					} else {
-						navItem.loadingType = 'noMore';
-					}
-					obj.$set(navItem, 'loaded', true);
-					// this.$set(navItem, 'loaded', true);
-				})
-				.catch(e => {
-					console.log(e);
-				});
-		},
-
-		//swiper 切换
-		changeTab(e) {
-			this.tabCurrentIndex = e.target.current;
-			this.loadData('tabChange');
-		},
-		//顶部tab点击
-		tabClick(index) {
-			this.tabCurrentIndex = index;
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page {
-	background: #f1f1f1;
-	height: 100%;
-}
-
-.status_bar {
-	height: var(--status-bar-height);
-	width: 100%;
-}
-
-.content-money {
-	position: relative;
-	height: 480rpx;
-
-	.content-bg {
-		position: absolute;
-		top: 0;
-		left: 0;
-		right: 0;
-		width: 750rpx;
-		height: 480rpx;
-
-		image {
-			width: 100%;
-			height: 100%;
-		}
-	}
-
-	.body-title {
-		height: 80rpx;
-		text-align: center;
-		font-size: 35rpx;
-		position: relative;
-
-		.header {
-			position: absolute;
-			left: 0;
-			top: 0;
-			width: 100%;
-			font-size: 36rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #fffeff;
-			height: 80rpx;
-			font-size: 36rpx;
-			font-weight: 700;
-			z-index: 9;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-		}
-
-		.goback-box {
-			position: absolute;
-			left: 18rpx;
-			top: 0;
-			height: 80rpx;
-			display: flex;
-			align-items: center;
-		}
-
-		.goback {
-			z-index: 100;
-			width: 34rpx;
-			height: 34rpx;
-		}
-	}
-}
-
-.info-box {
-	width: 670rpx;
-	height: 186rpx;
-	background: #ffffff;
-	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-	border-radius: 20rpx;
-	margin: -100rpx auto 0;
-	position: relative;
-	z-index: 2;
-
-	.info-item {
-		width: 50%;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		line-height: 1;
-
-		.info-font {
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #999999;
-		}
-
-		.info-num {
-			margin-top: 30rpx;
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #181818;
-		}
-	}
-
-	.shu {
-		width: 2rpx;
-		height: 74rpx;
-		background: #dcdfe6;
-	}
-}
-
-.money-box {
-	position: relative;
-	z-index: 2;
-	padding-top: 70rpx;
-	color: #ffffff;
-	text-align: center;
-	/* #ifdef APP-PLUS */
-	padding-top: 30rpx;
-
-	/* #endif */
-	.money {
-		font-size: 72rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #ffffff;
-	}
-
-	.text {
-		font-size: 30rpx;
-	}
-}
-
-.moneybtn-box {
-	display: flex;
-	justify-content: space-between;
-	position: relative;
-	z-index: 2;
-	color: #ffffff;
-	padding: 20rpx 50rpx;
-	font-size: 30rpx;
-	font-family: PingFang SC;
-	font-weight: bold;
-	color: #ffffff;
-}
-
-.navbar {
-	margin-top: 20rpx;
-	display: flex;
-	height: 88rpx;
-	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: #999999;
-		position: relative;
-
-		&.current {
-			color: #000;
-
-			&:after {
-				content: '';
-				position: absolute;
-				left: 50%;
-				bottom: 0;
-				transform: translateX(-50%);
-				width: 44px;
-				height: 0;
-				border-bottom: 2px solid #fe5b38;
-			}
-		}
-	}
-}
-
-//列表
-.swiper-box {
-	.order-item:last-child {
-		margin-bottom: 60rpx;
-	}
-
-	.order-item {
-		padding: 20rpx 30rpx;
-		line-height: 1.5;
-
-		.title-box {
-			.title {
-				font-size: $font-lg;
-				color: $font-color-base;
-			}
-
-			.time {
-				font-size: $font-base;
-				color: $font-color-light;
-			}
-		}
-
-		.money {
-			color: #fd5b23;
-			font-size: $font-lg;
-			text-align: right;
-
-			.status {
-				color: $font-color-light;
-			}
-		}
-	}
-}
-
-.list-scroll-content {
-	background: #ffffff;
-	height: 100%;
-}
-
-.content {
-	height: 100%;
-
-	.empty-content {
-		background-color: #ffffff;
-	}
-}
-
-.btn-box {
-	width: 674rpx;
-	height: 88rpx;
-	background: linear-gradient(0deg, #2e58ff, #32c6ff);
-	border-radius: 44rpx;
-	font-size: 36rpx;
-	font-family: PingFang SC;
-	font-weight: 500;
-	color: #ffffff;
-	text-align: center;
-	line-height: 88rpx;
-	position: fixed;
-	bottom: 48rpx;
-	left: 0;
-	right: 0;
-	margin: 0 auto;
-}
-</style>

pages/user/jiedian.vue

@@ -1,185 +0,0 @@
-<template>
-	<view class="contant">
-		<view class="jiedian-box" v-for="(item, index) in jieList">
-			<view class="box-top">
-				<view class="title-top">
-					<view class="img"><image src="../../static/img/jiedian01.png" mode=""></image></view>
-					<view class="title">响亮节点</view>
-				</view>
-				<view class="xiangqing" @click="navTo(item.id)">
-					详情
-					<text>></text>
-				</view>
-				<!-- <text class="xiangqing" @click="navTo(item.id)">
-						详情>
-					</text> -->
-			</view>
-			<view class="box-bottom">
-				<view class="shouyi">
-					<view class="jiedian">节点收益</view>
-					<view class="number">{{ item.get }}</view>
-				</view>
-				<view class="shouyi">
-					<view class="jiedian">团队人数</view>
-					<view class="number">{{ item.children_num }}</view>
-				</view>
-				<view class="shouyi">
-					<view class="jiedian">参加时间</view>
-					<view class="number">{{ item.add_time | getTime }}</view>
-				</view>
-			</view>
-		</view>
-		<uni-load-more :status="loadingType"></uni-load-more>
-	</view>
-</template>
-
-<script>
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-import { lookSubpoints, lookOneself } from '../../api/user.js';
-export default {
-	data() {
-		return {
-			jieList: [],
-			page: 1, //当前页数
-			limit: 10, //每次信息条数
-			loadingType: 'more'
-		};
-	},
-	filters: {
-		getTime(val) {
-			let str = '';
-			if (val) {
-				const date = new Date(val * 1000);
-				const year = date.getFullYear();
-				const mon = date.getMonth() + 1;
-				const day = date.getDate();
-				const hours = date.getHours();
-				const minu = date.getMinutes();
-				const sec = date.getSeconds();
-				str = year + '-' + mon + '-' + day + ' ' + hours + ':' + minu + ':' + sec;
-			}
-			return str;
-		}
-	},
-	// onLoad() {
-	// 	this.lookMyjiedian()
-	// },
-	onShow() {
-		this.lookMyjiedian();
-	},
-	onReachBottom() {
-		this.lookMyjiedian();
-	},
-	methods: {
-		lookMyjiedian() {
-			let obj = this;
-			if (obj.loadingType == 'noMore' || obj.loadingType == 'loading') {
-				return;
-			}
-			obj.loadingType = 'loading';
-			lookOneself({
-				page: obj.page,
-				limit: obj.limit
-			}).then(res => {
-				console.log(res);
-				obj.jieList = obj.jieList.concat(res.data.points);
-				if (res.data.points.length != obj.limit) {
-					obj.loadingType = 'noMore';
-				} else {
-					obj.loadingType = 'more';
-					obj.page++;
-				}
-				console.log(obj.loadingType, '2222222');
-			});
-		},
-		navTo(id) {
-			uni.navigateTo({
-				url: './jiedianDetails?id=' + id
-			});
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page,
-.contant {
-	// background: #F3F3F3;
-
-	margin: 0;
-	padding: 0;
-	height: 100%;
-	width: 100%;
-}
-
-.jiedian-box {
-	background: #ffffff;
-	display: flex;
-	flex-direction: column;
-	padding: 30rpx;
-	justify-content: space-between;
-	margin: 20rpx 30rpx;
-	border-radius: 15rpx;
-	box-shadow: 2px 2px 0px #ebeef5;
-}
-
-.box-top {
-	display: flex;
-	justify-content: space-between;
-	text-align: center;
-	line-height: 1;
-	.title-top {
-		display: flex;
-		justify-content: center;
-		text-align: center;
-
-		.img {
-			width: 40rpx;
-			height: 40rpx;
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-
-		.title {
-			margin-left: 5rpx;
-			font-size: 32rpx;
-			font-weight: bold;
-		}
-	}
-
-	.xiangqing {
-		color: red;
-		font-size: 28rpx;
-		line-height: 40rpx;
-		text {
-			display: inline-block;
-			margin-left: 10rpx;
-		}
-	}
-}
-
-.box-bottom {
-	margin-top: 20rpx;
-	display: flex;
-	flex-direction: column;
-	justify-content: space-between;
-	text-align: center;
-}
-
-.shouyi {
-	margin: 6rpx 0;
-	display: flex;
-	justify-content: space-between;
-}
-
-.jiedian {
-	font-size: 26rpx;
-	color: #999999;
-}
-
-.number {
-}
-</style>

pages/user/jiedianDetails.vue

@@ -1,317 +0,0 @@
-<template>
-	<view class="content">
-		<view class="bg">
-			<image src="../../static/img/jiedianBg.png" mode=""></image>
-		</view>
-		<view class="box">
-			<view class="box-left">
-				<view class="top">
-					{{childrenNum}}
-				</view>
-				<view class="bottom">
-					总人数
-				</view>
-			</view>
-			<view class="box-left">
-				<view class="top">
-					{{money}}
-				</view>
-				<view class="bottom">
-					收益
-				</view>
-			</view>
-		</view>
-		<view class="box-1">
-			<view class="tuandui-box" v-for="item in childrenList" @click="next(item.id)">
-				<view class="box-img">
-					<image :src="item.user.avatar" mode=""></image>
-				</view>
-				<view class="box-content">
-					<view class="content-top">
-						<view class="content-top-left">
-							<view class="name clamp">
-								{{item.user.nickname}}
-							</view>
-							<view class="time">
-								{{item.add_time | getTime}}加入
-							</view>
-						</view>
-						<view class="content-top-right">
-							收益：{{item.get}}
-						</view>
-					</view>
-					<view class="content-bottom">
-						<view class="xianlu">
-							线路：{{item.way}}
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<uni-load-more :status="loadingType"></uni-load-more>
-		<view class="btn" v-if="parentList.length != 0" @click="back()">
-			返回上一层
-		</view>
-	</view>
-</template>
-
-<script>
-	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-	import {
-		lookSubpoints,
-		lookOneself
-	} from '../../api/user.js'
-	export default {
-		components: {
-			uniLoadMore
-		},
-		data() {
-			return {
-				dtailId: '',
-				parentList:[],//父亲节点
-				childrenList: [],
-				jieList: [],
-				childrenNum: '',
-				limit:10,
-				page:1,
-				loadingType:'more',
-				money: '',
-
-			};
-		},
-		filters: {
-			getTime(val) {
-				let str = ''
-				if (val) {
-					const date = new Date(val * 1000);
-					const year = date.getFullYear();
-					const mon = date.getMonth() + 1;
-					const day = date.getDate();
-					const hours = date.getHours();
-					const minu = date.getMinutes();
-					const sec = date.getSeconds();
-					str = year + '-' + mon + '-' + day + ' ' + hours + ':' + minu + ':' + sec;
-				}
-				return str
-			}
-		},
-		onLoad(option) {
-			this.detailId = option.id
-			this.lookDetail()
-			this.lookMyjiedian()
-
-		},
-		methods: {
-			lookMyjiedian() {
-				let obj = this
-				lookOneself().then(res => {
-
-					console.log(res);
-					obj.jieList = res.data.points;
-					console.log(obj.jieList, '11');
-					obj.childrenNum = obj.jieList[0].children_num
-					obj.money = obj.jieList[0].get
-					console.log(obj.childrenNum, obj.money);
-				})
-			},
-			lookDetail() {
-				let obj = this
-				if(obj.loadingType=='loading' || obj.loadingType=='noMore'){
-					console.log("进入");
-					return
-				}
-				obj.loadingType = 'loading'
-				lookSubpoints({
-					page:obj.page,
-					limit:obj.limit
-				}, obj.detailId).then(res => {
-					obj.childrenList =obj.childrenList.concat(res.data.children) 
-					console.log(res,'xuhaolam');
-					if(res.data.children.length!=obj.limit){
-						console.log(res, '详细数据123');
-						
-						obj.loadingType='noMore'
-						
-					}else{
-						obj.loadingType='more'
-						obj.page++
-					}
-					console.log(obj.childrenList, '详细数据1');
-				})
-			},
-			next(id) {
-				console.log(id,"id");
-				if(this.parentList.length == 11) {
-					return
-				}
-				this.parentList.push(this.detailId)
-				this.detailId = id
-				this.loadingType='more'
-				this.childrenList = [],
-				this.lookDetail()
-			},
-			back() {
-				this.detailId = this.parentList.pop();
-				this.loadingType='more'
-				this.childrenList = [],
-				this.lookDetail()
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	page,
-	.content {
-		padding: 0;
-		margin: 0;
-		height: 100%;
-		width: 100%;
-		background: #F3F3F3;
-	}
-
-	.box-1 {
-		// margin: 0 auto;
-		background: #FFFFFF;
-		margin-top: 40rpx;
-	}
-
-	.bg {
-		position: relative;
-		width: 750rpx;
-		height: 360rpx;
-
-		image {
-			height: 100%;
-			width: 100%;
-		}
-	}
-
-	.box {
-
-		position: relative;
-		display: flex;
-		justify-content: space-around;
-		margin-top: -180rpx;
-
-		.box-left {
-			z-index: 99;
-			width: 280rpx;
-			height: 160rpx;
-			display: flex;
-			flex-direction: column;
-			text-align: center;
-			justify-content: center;
-			background-color: #FFFFFF;
-			border-radius: 10rpx;
-		}
-
-		.top {
-			font-size: 36rpx;
-			font-weight: bold;
-		}
-
-		.bottom {
-			font-size: 24rpx;
-			color: #999999;
-			margin-top: 10rpx;
-			font-weight: bold;
-
-		}
-	}
-
-	.tuandui-box {
-		margin: 0 auto;
-		width: 690rpx;
-
-		display: flex;
-
-		padding: 20rpx;
-		border-bottom: 2rpx solid #F3F3F3;
-		;
-
-		.box-img {
-			border-radius: 50%;
-			width: 80rpx;
-			height: 80rpx;
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-
-		.box-content {
-			margin-left: 15rpx;
-			width: 100%;
-			display: flex;
-			flex-direction: column;
-			justify-content: space-between;
-
-
-			.content-top {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-
-				.content-top-left {
-					display: flex;
-					justify-content: space-between;
-					line-height: 40rpx;
-
-					.name {
-						width: 120rpx;
-						white-space: nowrap;
-						overflow: hidden;
-						text-overflow: ellipsis;
-						font-size: 30rpx;
-						font-weight: bold;
-					}
-					.time {
-						color: #999999;
-						margin-left: 15rpx;
-						font-size: 22rpx;
-					}
-				}
-
-				.content-top-right {
-					color: #303133;
-					font-size: 26rpx;
-				}
-			}
-
-			.content-bottom {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-
-				.xianlu {
-					color: #999999;
-					font-size: 22rpx;
-				}
-
-				.number {
-					color: #303133;
-					font-size: 26rpx;
-				}
-			}
-		}
-	}
-.btn {
-	position: fixed;
-	bottom: 30rpx;
-	left: 0;
-	right: 0;
-	margin: 0 auto;
-	width: 604rpx;
-	height: 90rpx;
-	border: 2px solid #F21F5D;
-	border-radius: 45rpx;
-	font-size: 34rpx;
-	font-family: SourceHanSansCN;
-	font-weight: 400;
-	color: #EF0E74;
-	line-height: 90rpx;
-	text-align: center;
-}
-</style>

pages/user/joinShop.vue

@@ -1,245 +0,0 @@
-<template>
-	<view class="content">
-		<view class="jg"></view>
-		<view class="tab">
-			<view class="tab-item flex">
-				<view class="item-name">店铺名称</view>
-				<input type="text" placeholder="请输入店铺名称" class="item-val" v-model="merchant_name">
-			</view>
-			<view class="tab-item flex">
-				<view class="item-name">联系人：</view>
-				<input type="text" placeholder="请输入联系人" class="item-val" v-model="link_user">
-			</view>
-			<view class="tab-item flex">
-				<view class="item-name">联系手机：</view>
-				<input type="text" placeholder="请输入联系手机" class="item-val" v-model="link_tel">
-			</view>
-			<view class="tab-item flex">
-				<view class="item-name">省市区：</view>
-				<pickerAddress class="item-val" :class="{'nosz': addressDetail == ''}" @change="onCityClick">
-					{{addressDetail||'请选择地址'}}
-				</pickerAddress>
-			</view>
-			<view class="tab-item flex">
-				<view class="item-name">详细地址：</view>
-				<input type="text" placeholder="请输入详细地址" class="item-val" v-model="address">
-			</view>
-			<view class="up-img flex" style="justify-content: flex-start;">
-				<view class="item-name">商户证书：</view>
-				<image :src="charter" mode="" @click="imgsub" v-if="charter"></image>
-				<image src="../../static/img/add.png" mode="" @click="imgsub" v-else></image>
-			</view>
-		</view>
-		<view class="sub" @click="sub" :class="{'hui': load}">
-			申请入驻
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		upload
-	} from '@/api/order.js'
-	import {
-		ssrz
-	} from '@/api/user.js'
-	import pickerAddress from '@/components/wangding-pickerAddress/wangding-pickerAddress.vue';
-	export default {
-		components: {
-			pickerAddress,
-		},
-		data() {
-			return {
-				ssq: [],
-				addressDetail: '',
-				address: '',
-				merchant_name: '',
-				link_user: '',
-				link_tel: '',
-				charter: '',
-				load: false
-			}
-		},
-		methods: {
-			imgsub() {
-				let obj = this
-				console.log('上传头像')
-				uni.chooseImage({
-					count: 1, //默认9
-					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
-					sourceType: ['album', 'camera'], //从相册选择、摄像头
-						success: function(res) {
-									obj.charter = res.tempFilePaths[0]
-									console.log(obj.charter,'obj.charter');
-								}
-				})
-				upload({
-					filename: ''
-				}).then(res => {
-					console.log(res[0].url, 'url')
-					obj.charter = res[0].url
-				});
-
-			},
-			bindIndustryChange(e) {
-				this.industry = this.industryList[e.detail.value]
-			},
-			//职称选择
-			handleTap2(name) {
-				this.$refs[name].show()
-			},
-			//职称选择
-			handleChange2(item) {},
-			//职称选择
-			handleConfirm2(item) {
-				let obj = this;
-				obj.doctor_level = item.item.name;
-				obj.level_id = item.item.id;
-				console.log(obj.doctor_level, obj.level_id)
-			},
-			// 选中城市切换
-			// 选中城市切换
-			onCityClick({
-				data
-			}) {
-				console.log(data)
-				this.ssq = data
-				this.addressDetail = data.join(' ');
-			},
-			// 发布
-			sub() {
-				let obj = this
-				if (obj.load) {
-					return
-				}
-				if (obj.merchant_name == '') {
-					return obj.$api.msg('请输入店铺名称')
-				}
-				if (obj.link_user == '') {
-					return obj.$api.msg('请输入联系人')
-				}
-				if (obj.link_tel == '') {
-					return obj.$api.msg('请输入联系电话')
-				}
-				if (obj.addressDetail == '') {
-					return obj.$api.msg('请选择省市区')
-				}
-				if (obj.address == '') {
-					return obj.$api.msg('请输入详细地址')
-				}
-				if (obj.charter == '') {
-					return obj.$api.msg('请上传商户证书')
-				}
-				obj.load = true
-				ssrz({
-					address: obj.address,
-					merchant_name: obj.merchant_name,
-					link_user: obj.link_user,
-					link_tel: obj.link_tel,
-					charter: obj.charter,
-					province: obj.ssq[0],
-					city: obj.ssq[1],
-					district: obj.ssq[2]
-				}).then(res => {
-					obj.load = false
-					uni.showToast({
-						title: '提交成功',
-						duration: 2000
-					});
-					uni.switchTab({
-						url:'./user'
-					})
-				}).catch(err => {
-					obj.load = false
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.place {
-		color: #999;
-	}
-
-	.jg {
-		height: 20rpx;
-	}
-
-	.tab {
-		width: 690rpx;
-		margin: auto;
-		border-radius: 10px;
-		background-color: #fff;
-		margin-bottom: 20rpx;
-
-		.tab-item {
-			padding: 0 20rpx;
-			font-size: 30rpx;
-			align-items: flex-start;
-			line-height: 100rpx;
-			border-bottom: 1px #F0F0F0 solid;
-
-			image {
-				height: 160rpx;
-				width: 160rpx;
-			}
-
-			&:last-of-type {
-				border-bottom: none;
-			}
-
-			.item-name {
-				flex-shrink: 0;
-				width: 220rpx;
-				color: #333333;
-			}
-
-			.item-val {
-				display: inline-block;
-				flex-grow: 1;
-				text-align: left;
-				line-height: 100rpx;
-				height: 100rpx;
-			}
-
-			.nosz {
-				color: #999;
-			}
-		}
-	}
-
-	.sub {
-		text-align: center;
-		width: 560rpx;
-		line-height: 80rpx;
-		background: #fc4141;
-		border-radius: 40rpx;
-		color: #fff;
-		font-size: 30rpx;
-		font-weight: 500;
-		margin: 80rpx auto 0;
-	}
-
-	.up-img {
-		justify-content: flex-start;
-		align-items: flex-start;
-		padding: 28rpx 20rpx;
-		font-size: 30rpx;
-
-		.item-name {
-			flex-shrink: 0;
-			width: 220rpx;
-			color: #333333;
-		}
-
-		image {
-			width: 160rpx;
-			height: 160rpx;
-		}
-	}
-
-	.hui {
-		background-color: #999;
-	}
-</style>

pages/user/mallJf.vue

@@ -1,455 +0,0 @@
-<template>
-	<view class="content">
-		<view class="content-money">
-			<view class="status_bar"><!-- 这里是状态栏 --></view>
-			<view class="body-title">
-				<view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view>
-				<view class="header">我的阳光</view>
-			</view>
-			<view class="content-bg"><image src="../../static/img/myyue.png" mode=""></image></view>
-			<view class="money-box">
-				<view class="money">{{ userInfo.integral | getMoneyStyle }}</view>
-				<view>当前余额</view>
-			</view>
-			<view class="moneybtn-box">
-				<!-- <view class="money-btn" @click="navto('/pages/money/withdmoenys?type=xl')">
-					商城积分转账
-				</view> -->
-				<!-- <view class="money-btn" @click="navto('/pages/money/recharge')">
-					易货券充值
-				</view> -->
-			</view>
-		</view>
-		<view class="info-box flex">
-			<view class="info-item">
-				<view class="info-font">累计收入</view>
-				<view class="info-num">{{ sr || 0 }}</view>
-			</view>
-			<view class="shu"></view>
-			<view class="info-item">
-				<view class="info-font">累计支出</view>
-				<view class="info-num">{{ zc || 0 }}</view>
-			</view>
-		</view>
-		<view class="navbar">
-			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
-		</view>
-		<swiper :current="tabCurrentIndex" :style="{ height: height }" class="swiper-box" duration="300" @change="changeTab">
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view scroll-y="true" class="list-scroll-content" @scrolltolower="loadData">
-					<!-- 空白页 -->
-					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-
-					<!-- 订单列表 -->
-					<view>
-						<view class="order-item flex" v-for="(item, index) in tabItem.orderList" :key="index">
-							<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">
-								<view>{{ (item.pm == 0 ? '-' : '+') + item.number }}</view>
-							</view>
-						</view>
-					</view>
-					<uni-load-more :status="tabItem.loadingType" v-if="!(tabItem.orderList.length == 0 && tabItem.loaded)"></uni-load-more>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-	</view>
-</template>
-
-<script>
-import { mapState, mapMutations } from 'vuex';
-import { GetIntegral, getUserInfo } from '@/api/user.js';
-import { spreadCommission, userBalance } from '@/api/wallet.js';
-import { getMoneyStyle } from '@/utils/rocessor.js';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-import empty from '@/components/empty';
-export default {
-	filters: {
-		getMoneyStyle
-	},
-	components: {
-		empty,
-		uniLoadMore
-	},
-	onReady(res) {
-		var _this = this;
-		uni.getSystemInfo({
-			success: resu => {
-				const query = uni.createSelectorQuery();
-				query.select('.swiper-box').boundingClientRect();
-				query.exec(function(res) {
-					_this.height = resu.windowHeight - res[0].top + 'px';
-					console.log('打印页面的剩余高度', _this.height);
-				});
-			},
-			fail: res => {}
-		});
-	},
-	data() {
-		return {
-			zc: 0,
-			sr: 0,
-			height: '',
-			// 头部图高度
-			maxheight: '',
-			tabCurrentIndex: 0,
-			orderStatusSum: 0,
-			recharge: 0,
-			navList: [
-				{
-					state: 0,
-					text: '支出',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				},
-				{
-					state: 1,
-					text: '收入',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				}
-			],
-			money: ''
-		};
-	},
-	onLoad(options) {},
-	onShow() {
-		this.loadData();
-		// 获取用户余额
-		getUserInfo({}).then(({ data }) => {
-			this.money = data.now_money;
-			this.setUserInfo(data);
-		});
-	},
-	computed: {
-		...mapState('user', ['userInfo'])
-	},
-	methods: {
-		...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
-		toBack() {
-			uni.switchTab({
-				url: '/pages/user/user',
-				fail() {
-					uni.switchTab({
-						url: '/pages/index/index'
-					});
-				}
-			});
-		},
-		// 页面跳转
-		navto(e) {
-			uni.navigateTo({
-				url: e
-			});
-		},
-		//获取收入支出信息
-		async loadData(source) {
-			let obj = this;
-			//这里是将订单挂载到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';
-
-			GetIntegral({
-				page: navItem.page,
-				limit: navItem.limit,
-				pm: navItem.state
-			})
-				.then(({ data }) => {
-					obj.zc = data.zc;
-					obj.sr = data.sr;
-					navItem.orderList = navItem.orderList.concat(data.list);
-					navItem.page++;
-					if (navItem.limit == data.list.length) {
-						navItem.loadingType = 'more';
-					} else {
-						navItem.loadingType = 'noMore';
-					}
-					obj.$set(navItem, 'loaded', true);
-				})
-				.catch(e => {
-					console.log(e);
-				});
-		},
-
-		//swiper 切换
-		changeTab(e) {
-			this.tabCurrentIndex = e.target.current;
-			this.loadData('tabChange');
-		},
-		//顶部tab点击
-		tabClick(index) {
-			this.tabCurrentIndex = index;
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page {
-	background: #f1f1f1;
-	height: 100%;
-}
-
-.status_bar {
-	height: var(--status-bar-height);
-	width: 100%;
-}
-
-.content-money {
-	position: relative;
-	height: 480rpx;
-
-	.content-bg {
-		position: absolute;
-		top: 0;
-		left: 0;
-		right: 0;
-		width: 750rpx;
-		height: 480rpx;
-
-		image {
-			width: 100%;
-			height: 100%;
-		}
-	}
-
-	.body-title {
-		height: 80rpx;
-		text-align: center;
-		font-size: 35rpx;
-		position: relative;
-
-		.header {
-			position: absolute;
-			left: 0;
-			top: 0;
-			width: 100%;
-			font-size: 36rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #fffeff;
-			height: 80rpx;
-			font-size: 36rpx;
-			font-weight: 700;
-			z-index: 9;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-		}
-
-		.goback-box {
-			position: absolute;
-			left: 18rpx;
-			top: 0;
-			height: 80rpx;
-			display: flex;
-			align-items: center;
-		}
-
-		.goback {
-			z-index: 100;
-			width: 34rpx;
-			height: 34rpx;
-		}
-	}
-}
-
-.info-box {
-	width: 670rpx;
-	height: 186rpx;
-	background: #ffffff;
-	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-	border-radius: 20rpx;
-	margin: -100rpx auto 0;
-	position: relative;
-	z-index: 2;
-
-	.info-item {
-		width: 50%;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		line-height: 1;
-
-		.info-font {
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #999999;
-		}
-
-		.info-num {
-			margin-top: 30rpx;
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #181818;
-		}
-	}
-
-	.shu {
-		width: 2rpx;
-		height: 74rpx;
-		background: #dcdfe6;
-	}
-}
-
-.money-box {
-	position: relative;
-	z-index: 2;
-	padding-top: 70rpx;
-	color: #ffffff;
-	text-align: center;
-	/* #ifdef APP-PLUS */
-	padding-top: 30rpx;
-
-	/* #endif */
-	.money {
-		font-size: 72rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #ffffff;
-	}
-
-	.text {
-		font-size: 30rpx;
-	}
-}
-
-.moneybtn-box {
-	display: flex;
-	justify-content: space-between;
-	position: relative;
-	z-index: 2;
-	color: #ffffff;
-	padding: 20rpx 50rpx;
-	font-size: 30rpx;
-	font-family: PingFang SC;
-	font-weight: bold;
-	color: #ffffff;
-}
-
-.navbar {
-	margin-top: 20rpx;
-	display: flex;
-	height: 88rpx;
-	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: #999999;
-		position: relative;
-
-		&.current {
-			color: #000;
-
-			&:after {
-				content: '';
-				position: absolute;
-				left: 50%;
-				bottom: 0;
-				transform: translateX(-50%);
-				width: 44px;
-				height: 0;
-				border-bottom: 2px solid #fe5b38;
-			}
-		}
-	}
-}
-
-//列表
-.swiper-box {
-	.order-item:last-child {
-		margin-bottom: 60rpx;
-	}
-
-	.order-item {
-		padding: 20rpx 30rpx;
-		line-height: 1.5;
-
-		.title-box {
-			.title {
-				font-size: $font-lg;
-				color: $font-color-base;
-			}
-
-			.time {
-				font-size: $font-base;
-				color: $font-color-light;
-			}
-		}
-
-		.money {
-			color: #fd5b23;
-			font-size: $font-lg;
-			text-align: right;
-
-			.status {
-				color: $font-color-light;
-			}
-		}
-	}
-}
-
-.list-scroll-content {
-	background: #ffffff;
-	height: 100%;
-}
-
-.content {
-	height: 100%;
-
-	.empty-content {
-		background-color: #ffffff;
-	}
-}
-
-.btn-box {
-	width: 674rpx;
-	height: 88rpx;
-	background: linear-gradient(0deg, #2e58ff, #32c6ff);
-	border-radius: 44rpx;
-	font-size: 36rpx;
-	font-family: PingFang SC;
-	font-weight: 500;
-	color: #ffffff;
-	text-align: center;
-	line-height: 88rpx;
-	position: fixed;
-	bottom: 48rpx;
-	left: 0;
-	right: 0;
-	margin: 0 auto;
-}
-</style>

pages/user/myGreenCard.vue

@@ -1,212 +0,0 @@
-<template>
-	<view class="content">
-		<view class="" style="height: 20rpx;"></view>
-		<empty v-if="list.length === 0 && loaded"></empty>
-		<view class="green-card-wrap" v-for="(gitem, gindex) in list" :key="gindex">
-			<image :src="'../../static/img/green' + ((gitem.id + 1) % 5) + '.png'" mode="" class="card-bg"></image>
-			<view class="card-info flex">
-				<image :src="'../../static/img/ginfo' + ((gitem.id + 1) % 5) + '.png'" mode="" class="info-img"></image>
-				<view class="info-detail">
-					<view class="card-name">我的洒水壶</view>
-					<!-- 1买 2赠 -->
-					<view class="card-from">来源：{{ gitem.type == 1 ? '水滴兑换' : '赠送获得' }}</view>
-					<view class="card-time">获得时间:{{ gitem.create_time }}</view>
-				</view>
-				<view class="card-btn-wrap flex" v-if="gitem.status == 0 && gitem.type == 1"><view class="card-btn" @click="openZs(gitem)">转赠</view></view>
-			</view>
-		</view>
-		<uni-load-more :status="loadingType"></uni-load-more>
-		<uni-popup ref="popup" type="center">
-			<view class="zs-wrap">
-				<view class="zs-tit">赠送洒水壶</view>
-				<view class="zs-uid flex">
-					<view class="to-uid">赠送对象UID：</view>
-					<input type="number" v-model="toUid" placeholder="请输入赠送对象UID" />
-				</view>
-				<view class="zs-btns">
-					<view class="zs-btn" @click="closeZs">取消</view>
-					<view class="zs-btn" style="color: #ff567f;" @click="giveGreen()">赠送</view>
-				</view>
-			</view>
-		</uni-popup>
-	</view>
-</template>
-
-<script>
-import { getGreenCardList, giveGreen } from '@/api/user.js';
-import empty from '@/components/empty';
-export default {
-	components: {
-		empty
-	},
-	data() {
-		return {
-			zsItem: {},
-			toUid: '',
-			loaded: false,
-			list: [],
-			page: 1,
-			limit: 10,
-			loadingType: 'more'
-		};
-	},
-	onLoad() {},
-	onShow() {
-		this.getGreenCardList();
-	},
-	onReachBottom() {
-		this.getGreenCardList();
-	},
-	onReady() {},
-	methods: {
-		getGreenCardList() {
-			let obj = this;
-			if (obj.loadingType == 'loading' || obj.loadingType == 'noMore') {
-				return;
-			}
-			obj.loadingType = 'loading';
-			getGreenCardList().then(res => {
-				console.log(res);
-
-				obj.list = obj.list.concat(res.data.data);
-				obj.page++;
-				if (obj.limi == res.data.data.length) {
-					obj.loadingType = 'more';
-				} else {
-					obj.loadingType = 'noMore';
-				}
-				obj.loaded = true;
-			});
-		},
-		giveGreen() {
-			let obj = this;
-			console.log(obj.zsItem);
-			if (obj.toUid == '') {
-				return obj.$api.msg('请输入赠送对象UID');
-			}
-			giveGreen({
-				id: obj.zsItem.id,
-				uid: obj.toUid
-			}).then(res => {
-				this.closeZs();
-				uni.showToast({
-					title: '赠送成功',
-					duration: 2000,
-					position: 'top'
-				});
-				let s = obj.list.indexOf(obj.zsItem);
-				obj.list.splice(s, 1);
-			});
-		},
-		closeZs() {
-			this.$refs.popup.close();
-		},
-		openZs(item) {
-			this.zsItem = item;
-			this.$refs.popup.open();
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.green-card-wrap {
-	width: 700rpx;
-	height: 184rpx;
-	margin: 0 auto 20rpx;
-	position: relative;
-
-	.card-bg {
-		width: 700rpx;
-		height: 184rpx;
-	}
-
-	.card-info {
-		position: absolute;
-		top: 0;
-		left: 0;
-		width: 700rpx;
-		height: 184rpx;
-		padding: 0 35rpx;
-
-		.info-img {
-			width: 112rpx;
-			height: 112rpx;
-		}
-
-		.info-detail {
-			flex-grow: 1;
-			padding-left: 30rpx;
-			color: #ffffff;
-			font-size: 24rpx;
-			font-weight: 500;
-
-			.card-name {
-				font-size: 36rpx;
-				font-weight: bold;
-			}
-
-			.card-from {
-			}
-
-			.card-time {
-			}
-		}
-
-		.card-btn-wrap {
-			width: 132rpx;
-			height: 100%;
-
-			.card-btn {
-				width: 132rpx;
-				height: 53rpx;
-				background: #ffffff;
-				border-radius: 27rpx;
-				font-size: 26rpx;
-				font-weight: 500;
-				text-align: center;
-				line-height: 53rpx;
-				color: #ff567f;
-			}
-		}
-	}
-}
-
-.zs-wrap {
-	width: 600rpx;
-	height: 300rpx;
-	background-color: #fff;
-	border-radius: 20rpx;
-	text-align: center;
-	position: relative;
-
-	.zs-tit {
-		font-size: 32rpx;
-		font-weight: bold;
-		padding: 40rpx 0 50rpx;
-	}
-
-	.zs-uid {
-		font-size: 28rpx;
-		padding: 0 40rpx;
-
-		.to-uid {
-			flex-shrink: 0;
-		}
-	}
-
-	.zs-btns {
-		width: 100%;
-		display: flex;
-		position: absolute;
-		bottom: 0;
-		height: 80rpx;
-		font-size: 32rpx;
-		line-height: 80rpx;
-
-		.zs-btn {
-			width: 50%;
-		}
-	}
-}
-</style>

pages/user/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>

pages/user/purpleJf.vue

@@ -1,444 +0,0 @@
-<template>
-	<view class="content">
-		<view class="content-money">
-			<view class="status_bar"><!-- 这里是状态栏 --></view>
-			<view class="body-title">
-				<view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view>
-				<view class="header">我的阳光</view>
-			</view>
-			<view class="content-bg"><image src="../../static/img/myyue.png" mode=""></image></view>
-			<view class="money-box">
-				<view class="money">{{ userInfo.integral | getMoneyStyle }}</view>
-				<view>当前余额</view>
-			</view>
-			<!-- <view class="moneybtn-box">
-				<view class="money-btn"></view>
-				<view class="money-btn" @click="navto('/pages/money/withdrawal?type=purple')">阳光提现 ></view>
-			</view> -->
-		</view>
-		<view class="info-box flex">
-			<view class="info-item">
-				<view class="info-font">累计收入</view>
-				<view class="info-num">{{ sr || 0 }}</view>
-			</view>
-			<view class="shu"></view>
-			<view class="info-item">
-				<view class="info-font">累计支出</view>
-				<view class="info-num">{{ zc || 0 }}</view>
-			</view>
-		</view>
-		<view class="navbar">
-			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
-		</view>
-		<swiper :current="tabCurrentIndex" :style="{ height: height }" class="swiper-box" duration="300" @change="changeTab">
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view scroll-y="true" class="list-scroll-content" @scrolltolower="loadData">
-					<!-- 空白页 -->
-					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-
-					<!-- 订单列表 -->
-					<view>
-						<view class="order-item flex" v-for="(item, index) in tabItem.orderList" :key="index">
-							<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">
-								<view>{{ (item.pm == 0 ? '-' : '+') + item.number }}</view>
-							</view>
-						</view>
-					</view>
-					<uni-load-more :status="tabItem.loadingType" v-if="!(tabItem.orderList.length == 0 && tabItem.loaded)"></uni-load-more>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-	</view>
-</template>
-
-<script>
-import { mapState, mapMutations } from 'vuex';
-import { getPurpleJf, getUserInfo, GetIntegral } from '@/api/user.js';
-import { spreadCommission, userBalance } from '@/api/wallet.js';
-import { getMoneyStyle } from '@/utils/rocessor.js';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-import empty from '@/components/empty';
-export default {
-	filters: {
-		getMoneyStyle
-	},
-	components: {
-		empty,
-		uniLoadMore
-	},
-	onReady(res) {
-		var _this = this;
-		uni.getSystemInfo({
-			success: resu => {
-				const query = uni.createSelectorQuery();
-				query.select('.swiper-box').boundingClientRect();
-				query.exec(function(res) {
-					_this.height = resu.windowHeight - res[0].top + 'px';
-					console.log('打印页面的剩余高度', _this.height);
-				});
-			},
-			fail: res => {}
-		});
-	},
-	data() {
-		return {
-			zc: 0,
-			sr: 0,
-			height: '',
-			// 头部图高度
-			maxheight: '',
-			tabCurrentIndex: 0,
-			orderStatusSum: 0,
-			recharge: 0,
-			navList: [
-				{
-					state: 0,
-					text: '支出',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				},
-				{
-					state: 1,
-					text: '收入',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				}
-			],
-			money: ''
-		};
-	},
-	onLoad(options) {},
-	onShow() {
-		this.loadData();
-		// 获取用户余额
-		getUserInfo({}).then(({ data }) => {
-			this.money = data.now_money;
-			this.setUserInfo(data);
-		});
-	},
-	computed: {
-		...mapState('user', ['userInfo'])
-	},
-	methods: {
-		...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
-		toBack() {
-			uni.navigateBack({});
-		},
-		// 页面跳转
-		navto(e) {
-			uni.navigateTo({
-				url: e
-			});
-		},
-		//获取收入支出信息
-		async loadData(source) {
-			let obj = this;
-			//这里是将订单挂载到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';
-
-			GetIntegral({
-				page: navItem.page,
-				limit: navItem.limit,
-				pm: navItem.state
-			})
-				.then(({ data }) => {
-					obj.zc = data.zc;
-					obj.sr = data.sr;
-					navItem.orderList = navItem.orderList.concat(data.list);
-					navItem.page++;
-					if (navItem.limit == data.list.length) {
-						navItem.loadingType = 'more';
-					} else {
-						navItem.loadingType = 'noMore';
-					}
-					obj.$set(navItem, 'loaded', true);
-				})
-				.catch(e => {
-					console.log(e);
-				});
-		},
-
-		//swiper 切换
-		changeTab(e) {
-			this.tabCurrentIndex = e.target.current;
-			this.loadData('tabChange');
-		},
-		//顶部tab点击
-		tabClick(index) {
-			this.tabCurrentIndex = index;
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page {
-	background: #f1f1f1;
-	height: 100%;
-}
-
-.status_bar {
-	height: var(--status-bar-height);
-	width: 100%;
-}
-
-.content-money {
-	position: relative;
-	height: 480rpx;
-
-	.content-bg {
-		position: absolute;
-		top: 0;
-		left: 0;
-		right: 0;
-		width: 750rpx;
-		height: 480rpx;
-
-		image {
-			width: 100%;
-			height: 100%;
-		}
-	}
-
-	.body-title {
-		height: 80rpx;
-		text-align: center;
-		font-size: 35rpx;
-		position: relative;
-
-		.header {
-			position: absolute;
-			left: 0;
-			top: 0;
-			width: 100%;
-			font-size: 36rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #fffeff;
-			height: 80rpx;
-			font-size: 36rpx;
-			font-weight: 700;
-			z-index: 9;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-		}
-
-		.goback-box {
-			position: absolute;
-			left: 18rpx;
-			top: 0;
-			height: 80rpx;
-			display: flex;
-			align-items: center;
-		}
-
-		.goback {
-			z-index: 100;
-			width: 34rpx;
-			height: 34rpx;
-		}
-	}
-}
-
-.info-box {
-	width: 670rpx;
-	height: 186rpx;
-	background: #ffffff;
-	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-	border-radius: 20rpx;
-	margin: -100rpx auto 0;
-	position: relative;
-	z-index: 2;
-
-	.info-item {
-		width: 50%;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		line-height: 1;
-
-		.info-font {
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #999999;
-		}
-
-		.info-num {
-			margin-top: 30rpx;
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #181818;
-		}
-	}
-
-	.shu {
-		width: 2rpx;
-		height: 74rpx;
-		background: #dcdfe6;
-	}
-}
-
-.money-box {
-	position: relative;
-	z-index: 2;
-	padding-top: 70rpx;
-	/* #ifdef APP-PLUS */
-	padding-top: 30rpx;
-	/* #endif */
-	color: #ffffff;
-	text-align: center;
-
-	.money {
-		font-size: 72rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #ffffff;
-	}
-
-	.text {
-		font-size: 30rpx;
-	}
-}
-
-.moneybtn-box {
-	display: flex;
-	justify-content: space-between;
-	position: relative;
-	z-index: 2;
-	color: #ffffff;
-	padding: 20rpx 50rpx;
-	font-size: 30rpx;
-	font-family: PingFang SC;
-	font-weight: bold;
-	color: #ffffff;
-}
-
-.navbar {
-	margin-top: 20rpx;
-	display: flex;
-	height: 88rpx;
-	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: #999999;
-		position: relative;
-
-		&.current {
-			color: #000;
-
-			&:after {
-				content: '';
-				position: absolute;
-				left: 50%;
-				bottom: 0;
-				transform: translateX(-50%);
-				width: 44px;
-				height: 0;
-				border-bottom: 2px solid #fe5b38;
-			}
-		}
-	}
-}
-
-//列表
-.swiper-box {
-	.order-item:last-child {
-		margin-bottom: 60rpx;
-	}
-
-	.order-item {
-		padding: 20rpx 30rpx;
-		line-height: 1.5;
-
-		.title-box {
-			.title {
-				font-size: $font-lg;
-				color: $font-color-base;
-			}
-
-			.time {
-				font-size: $font-base;
-				color: $font-color-light;
-			}
-		}
-
-		.money {
-			color: #fd5b23;
-			font-size: $font-lg;
-			text-align: right;
-
-			.status {
-				color: $font-color-light;
-			}
-		}
-	}
-}
-
-.list-scroll-content {
-	background: #ffffff;
-	height: 100%;
-}
-
-.content {
-	height: 100%;
-
-	.empty-content {
-		background-color: #ffffff;
-	}
-}
-
-.btn-box {
-	width: 674rpx;
-	height: 88rpx;
-	background: linear-gradient(0deg, #2e58ff, #32c6ff);
-	border-radius: 44rpx;
-	font-size: 36rpx;
-	font-family: PingFang SC;
-	font-weight: 500;
-	color: #ffffff;
-	text-align: center;
-	line-height: 88rpx;
-	position: fixed;
-	bottom: 48rpx;
-	left: 0;
-	right: 0;
-	margin: 0 auto;
-}
-</style>

pages/user/scoreAccumulate.vue

@@ -1,426 +0,0 @@
-<template>
-	<view class="content">
-		<view class="content-money">
-			<view class="status_bar"><!-- 这里是状态栏 --></view>
-			<view class="body-title">
-				<view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view>
-				<view class="header">响亮积分</view>
-			</view>
-			<view class="content-bg"><image src="../../static/img/myjf.png" mode=""></image></view>
-			<view class="money-box">
-				<view class="money">{{userInfo.integral | getMoneyStyle}}</view>
-				<view>我的响亮积分</view>
-			</view>
-			<view class="money-btn" @click="navto('/pages/money/withdmoenys')">
-				积分转账
-				<text>></text>
-			</view>
-		</view>
-		<view class="info-box flex">
-			<view class="info-item">
-				<view class="info-font">累计收入</view>
-				<view class="info-num">{{recharge}}</view>
-			</view>
-			<view class="shu"></view>
-			<view class="info-item">
-				<view class="info-font">累计支出</view>
-				<view class="info-num">{{orderStatusSum}}</view>
-			</view>
-		</view>
-		<view class="navbar">
-			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
-		</view>
-		<swiper :current="tabCurrentIndex" :style="{ height: height }" class="swiper-box" duration="300" @change="changeTab">
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view scroll-y="true" class="list-scroll-content" @scrolltolower="loadData">
-					<!-- 空白页 -->
-					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-	
-					<!-- 订单列表 -->
-					<view>
-						<view class="order-item flex" v-for="(item, index) in tabItem.orderList" :key="index">
-							<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">
-								<view>{{ (item.pm == 0 ? '-' : '+') + item.number }}</view>
-								<view v-if="item.status == 0" class="status">待发放</view>
-							</view>
-						</view>
-					</view>
-					<uni-load-more :status="tabItem.loadingType" v-if="!(tabItem.orderList.length == 0 && tabItem.loaded)"></uni-load-more>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-	</view>
-</template>
-
-<script>
-import { integrallist } from '@/api/functionalUnit.js';
-import { getMoneyStyle } from '@/utils/rocessor.js';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-import empty from '@/components/empty';
-import { mapState, mapMutations } from 'vuex';
-export default {
-	filters: {
-		getMoneyStyle
-	},
-	components: {
-		empty,
-		uniLoadMore
-	},
-	computed: {
-		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
-	},
-	onReady(res) {
-		var _this = this;
-		uni.getSystemInfo({
-			success: resu => {
-				const query = uni.createSelectorQuery();
-				query.select('.swiper-box').boundingClientRect();
-				query.exec(function(res) {
-					_this.height = resu.windowHeight - res[0].top + 'px';
-					console.log('打印页面的剩余高度', _this.height);
-				});
-			},
-			fail: res => {}
-		});
-	},
-	data() {
-		return {
-			height: '',
-			// 头部图高度
-			maxheight:'',
-			tabCurrentIndex: 0,
-			orderStatusSum: 0,
-			recharge: 0,
-			navList: [
-				// {
-				// 	state: 0,
-				// 	text: '全部',
-				// 	loadingType: 'more',
-				// 	orderList: [],
-				// 	page: 1, //当前页数
-				// 	limit: 10 //每次信息条数
-				// },
-				{
-					state: 0,
-					text: '支出',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				},
-				{
-					state: 1,
-					text: '收入',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				}
-			],
-		};
-	},
-	onLoad(options) {},
-	onShow() {
-		this.loadData();
-	},
-	methods: {
-		// 页面跳转
-		navto(e) {
-			uni.navigateTo({
-				url: e
-			});
-		},
-		//获取收入支出信息
-		async loadData(source) {
-			let obj = this
-			//这里是将订单挂载到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,
-					pm: state
-				},
-			)
-				.then(({ data }) => {
-					obj.recharge = data.income;
-					obj.orderStatusSum = data.expend;
-					if (data.list.length > 0) {
-						console.log(data);
-						navItem.orderList = navItem.orderList.concat(data.list);
-						console.log(navItem.orderList);
-						navItem.page++;
-					}
-					if (navItem.limit == data.list.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;
-		},
-		toBack() {
-			uni.navigateBack({
-				
-			})
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page {
-	background: #f1f1f1;
-	height: 100%;
-}
-.status_bar {
-	height: var(--status-bar-height);
-	width: 100%;
-}
-.content-money {
-	position: relative;
-	height: 480rpx;
-	.content-bg {
-		position: absolute;
-		top: 0;
-		left: 0;
-		right: 0;
-		width: 750rpx;
-		height: 480rpx;
-		image {
-			width: 100%;
-			height: 100%;
-		}
-	}
-	.body-title {
-		height: 80rpx;
-		text-align: center;
-		font-size: 35rpx;
-		position: relative;
-		.header {
-			position: absolute;
-			left: 0;
-			top: 0;
-			width: 100%;
-			font-size: 36rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #fffeff;
-			height: 80rpx;
-			font-size: 36rpx;
-			font-weight: 700;
-			z-index: 9;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-		}
-		.goback-box {
-			position: absolute;
-			left: 18rpx;
-			top: 0;
-			height: 80rpx;
-			display: flex;
-			align-items: center;
-		}
-
-		.goback {
-			z-index: 100;
-			width: 34rpx;
-			height: 34rpx;
-		}
-	}
-}
-.info-box {
-	width: 670rpx;
-	height: 186rpx;
-	background: #ffffff;
-	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-	border-radius: 20rpx;
-	margin: -100rpx auto 0;
-	position: relative;
-	z-index: 2;
-	.info-item {
-		width: 50%;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		line-height: 1;
-		.info-font {
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #999999;
-		}
-		.info-num {
-			margin-top: 30rpx;
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #181818;
-		}
-	}
-	.shu {
-		width: 2rpx;
-		height: 74rpx;
-		background: #dcdfe6;
-	}
-}
-.money-box {
-	position: relative;
-	z-index: 2;
-	padding-top: 90rpx;
-	color: #ffffff;
-	text-align: center;
-	.money {
-		font-size: 72rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #ffffff;
-	}
-	.text {
-		font-size: 30rpx;
-	}
-}
-.money-btn {
-	position: relative;
-	z-index: 2;
-	color: #ffffff;
-	padding-right: 50rpx;
-	text-align: right;
-	font-size: 30rpx;
-	font-family: PingFang SC;
-	font-weight: bold;
-	color: #FFFFFF;
-	text {
-		display: inline-block;
-		padding-left: 10rpx;
-	}
-}
-
-.navbar {
-	margin-top: 20rpx;
-	display: flex;
-	height: 88rpx;
-	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: #999999;
-		position: relative;
-		&.current {
-			color: #000;
-			&:after {
-				content: '';
-				position: absolute;
-				left: 50%;
-				bottom: 0;
-				transform: translateX(-50%);
-				width: 44px;
-				height: 0;
-				border-bottom: 2px solid #fe5b38;
-			}
-		}
-	}
-}
-//列表
-.swiper-box {
-	.order-item:last-child {
-		margin-bottom: 60rpx;
-	}
-	.order-item {
-		padding: 20rpx 30rpx;
-		line-height: 1.5;
-		.title-box {
-			.title {
-				font-size: $font-lg;
-				color: $font-color-base;
-			}
-			.time {
-				font-size: $font-base;
-				color: $font-color-light;
-			}
-		}
-		.money {
-			color: #fd5b23;
-			font-size: $font-lg;
-			text-align: right;
-			.status {
-				color: $font-color-light;
-			}
-		}
-	}
-}
-.list-scroll-content {
-	background: #ffffff;
-	height: 100%;
-}
-.content {
-	height: 100%;
-	.empty-content {
-		background-color: #ffffff;
-	}
-}
-.btn-box {
-	width: 674rpx;
-	height: 88rpx;
-	background: linear-gradient(0deg, #2e58ff, #32c6ff);
-	border-radius: 44rpx;
-	font-size: 36rpx;
-	font-family: PingFang SC;
-	font-weight: 500;
-	color: #ffffff;
-	text-align: center;
-	line-height: 88rpx;
-	position: fixed;
-	bottom: 48rpx;
-	left: 0;
-	right: 0;
-	margin: 0 auto;
-}
-</style>

pages/user/shopJf.vue

@@ -1,449 +0,0 @@
-<template>
-	<view class="content">
-		<view class="content-money">
-			<view class="status_bar"><!-- 这里是状态栏 --></view>
-			<view class="body-title">
-				<view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view>
-				<view class="header">能量金豆</view>
-			</view>
-			<view class="content-bg"><image src="../../static/img/myyue.png" mode=""></image></view>
-			<view class="money-box">
-				<view class="money">{{ userInfo.business_integral | getMoneyStyle }}</view>
-				<view>当前余额</view>
-			</view>
-			<view class="moneybtn-box">
-				<view class="money-btn" @click="navto('/pages/money/withdmoenys?type=xl')">能量金豆转账</view>
-				<!-- <view class="money-btn" @click="navto('/pages/money/withdrawal?type=shop')">
-					{{userInfo.is_merchant == 1? '提现 >': ''}}
-				</view> -->
-			</view>
-		</view>
-		<view class="info-box flex">
-			<view class="info-item">
-				<view class="info-font">累计收入</view>
-				<view class="info-num">{{ recharge || 0 }}</view>
-			</view>
-			<view class="shu"></view>
-			<view class="info-item">
-				<view class="info-font">累计支出</view>
-				<view class="info-num">{{ orderStatusSum || 0 }}</view>
-			</view>
-		</view>
-		<view class="navbar">
-			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
-		</view>
-		<swiper :current="tabCurrentIndex" :style="{ height: height }" class="swiper-box" duration="300" @change="changeTab">
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view scroll-y="true" class="list-scroll-content" @scrolltolower="loadData">
-					<!-- 空白页 -->
-					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-
-					<!-- 订单列表 -->
-					<view>
-						<view class="order-item flex" v-for="(item, index) in tabItem.orderList" :key="index">
-							<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">
-								<view>{{ (item.pm == 0 ? '-' : '+') + item.number }}</view>
-							</view>
-						</view>
-					</view>
-					<uni-load-more :status="tabItem.loadingType" v-if="!(tabItem.orderList.length == 0 && tabItem.loaded)"></uni-load-more>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-	</view>
-</template>
-
-<script>
-import { mapState, mapMutations } from 'vuex';
-import { getShopIntegral, getUserInfo } from '@/api/user.js';
-import { spreadCommission, userBalance } from '@/api/wallet.js';
-import { getMoneyStyle } from '@/utils/rocessor.js';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-import empty from '@/components/empty';
-export default {
-	filters: {
-		getMoneyStyle
-	},
-	components: {
-		empty,
-		uniLoadMore
-	},
-	onReady(res) {
-		var _this = this;
-		uni.getSystemInfo({
-			success: resu => {
-				const query = uni.createSelectorQuery();
-				query.select('.swiper-box').boundingClientRect();
-				query.exec(function(res) {
-					_this.height = resu.windowHeight - res[0].top + 'px';
-					console.log('打印页面的剩余高度', _this.height);
-				});
-			},
-			fail: res => {}
-		});
-	},
-	data() {
-		return {
-			height: '',
-			// 头部图高度
-			maxheight: '',
-			tabCurrentIndex: 0,
-			orderStatusSum: 0,
-			recharge: 0,
-			navList: [
-				{
-					state: 0,
-					text: '支出',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10, //每次信息条数
-					loaded: false
-				},
-				{
-					state: 1,
-					text: '收入',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10, //每次信息条数
-					loaded: false
-				}
-			],
-			money: ''
-		};
-	},
-	onLoad(options) {},
-	onShow() {
-		this.loadData();
-		// 获取用户余额
-		getUserInfo({}).then(({ data }) => {
-			this.money = data.now_money;
-			this.setUserInfo(data);
-		});
-	},
-	computed: {
-		...mapState('user', ['userInfo'])
-	},
-	methods: {
-		...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
-		toBack() {
-			uni.navigateBack({});
-		},
-		// 页面跳转
-		navto(e) {
-			uni.navigateTo({
-				url: e
-			});
-		},
-		//获取收入支出信息
-		async loadData(source) {
-			console.log('hao lan da sha bi');
-			let obj = this;
-			//这里是将订单挂载到tab列表下
-			let index = this.tabCurrentIndex;
-			let navItem = this.navList[index];
-			let state = navItem.state;
-			console.log(state, 'state');
-			console.log(source, navItem.loaded, '+++++++++++++++++');
-			if (source === 'tabChange' && navItem.loaded === true) {
-				//tab切换只有第一次需要加载数据
-				return;
-			}
-			if (navItem.loadingType === 'loading') {
-				//防止重复加载
-				return;
-			}
-			// 修改当前对象状态为加载中
-			navItem.loadingType = 'loading';
-
-			getShopIntegral({
-				page: navItem.page,
-				limit: navItem.limit,
-				pm: navItem.state
-			})
-				.then(({ data }) => {
-					console.log(data, 'data++++++++++');
-					obj.zc = data.zc;
-					obj.sr = data.sr;
-					navItem.orderList = navItem.orderList.concat(data.list);
-					navItem.page++;
-					if (navItem.limit == data.list.length) {
-						navItem.loadingType = 'more';
-					} else {
-						navItem.loadingType = 'noMore';
-					}
-					obj.$set(navItem, 'loaded', true);
-				})
-				.catch(e => {
-					console.log(e);
-				});
-		},
-
-		//swiper 切换
-		changeTab(e) {
-			this.tabCurrentIndex = e.target.current;
-			this.loadData('tabChange');
-		},
-		//顶部tab点击
-		tabClick(index) {
-			this.tabCurrentIndex = index;
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page {
-	background: #f1f1f1;
-	height: 100%;
-}
-
-.status_bar {
-	height: var(--status-bar-height);
-	width: 100%;
-}
-.moneybtn-box {
-	display: flex;
-	justify-content: space-between;
-	position: relative;
-	z-index: 2;
-	color: #ffffff;
-	padding: 20rpx 50rpx;
-	font-size: 30rpx;
-	font-family: PingFang SC;
-	font-weight: bold;
-	color: #ffffff;
-}
-
-.content-money {
-	position: relative;
-	height: 480rpx;
-
-	.content-bg {
-		position: absolute;
-		top: 0;
-		left: 0;
-		right: 0;
-		width: 750rpx;
-		height: 480rpx;
-
-		image {
-			width: 100%;
-			height: 100%;
-		}
-	}
-
-	.body-title {
-		height: 80rpx;
-		text-align: center;
-		font-size: 35rpx;
-		position: relative;
-
-		.header {
-			position: absolute;
-			left: 0;
-			top: 0;
-			width: 100%;
-			font-size: 36rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #fffeff;
-			height: 80rpx;
-			font-size: 36rpx;
-			font-weight: 700;
-			z-index: 9;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-		}
-
-		.goback-box {
-			position: absolute;
-			left: 18rpx;
-			top: 0;
-			height: 80rpx;
-			display: flex;
-			align-items: center;
-		}
-
-		.goback {
-			z-index: 100;
-			width: 34rpx;
-			height: 34rpx;
-		}
-	}
-}
-
-.info-box {
-	width: 670rpx;
-	height: 186rpx;
-	background: #ffffff;
-	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-	border-radius: 20rpx;
-	margin: -100rpx auto 0;
-	position: relative;
-	z-index: 2;
-
-	.info-item {
-		width: 50%;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		line-height: 1;
-
-		.info-font {
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #999999;
-		}
-
-		.info-num {
-			margin-top: 30rpx;
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #181818;
-		}
-	}
-
-	.shu {
-		width: 2rpx;
-		height: 74rpx;
-		background: #dcdfe6;
-	}
-}
-
-.money-box {
-	position: relative;
-	z-index: 2;
-	padding-top: 70rpx;
-	/* #ifdef APP-PLUS */
-	padding-top: 30rpx;
-	/* #endif */
-	color: #ffffff;
-	text-align: center;
-
-	.money {
-		font-size: 72rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #ffffff;
-	}
-
-	.text {
-		font-size: 30rpx;
-	}
-}
-
-.navbar {
-	margin-top: 20rpx;
-	display: flex;
-	height: 88rpx;
-	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: #999999;
-		position: relative;
-
-		&.current {
-			color: #000;
-
-			&:after {
-				content: '';
-				position: absolute;
-				left: 50%;
-				bottom: 0;
-				transform: translateX(-50%);
-				width: 44px;
-				height: 0;
-				border-bottom: 2px solid #fe5b38;
-			}
-		}
-	}
-}
-
-//列表
-.swiper-box {
-	.order-item:last-child {
-		margin-bottom: 60rpx;
-	}
-
-	.order-item {
-		padding: 20rpx 30rpx;
-		line-height: 1.5;
-
-		.title-box {
-			.title {
-				font-size: $font-lg;
-				color: $font-color-base;
-			}
-
-			.time {
-				font-size: $font-base;
-				color: $font-color-light;
-			}
-		}
-
-		.money {
-			color: #fd5b23;
-			font-size: $font-lg;
-			text-align: right;
-
-			.status {
-				color: $font-color-light;
-			}
-		}
-	}
-}
-
-.list-scroll-content {
-	background: #ffffff;
-	height: 100%;
-}
-
-.content {
-	height: 100%;
-
-	.empty-content {
-		background-color: #ffffff;
-	}
-}
-
-.btn-box {
-	width: 674rpx;
-	height: 88rpx;
-	background: linear-gradient(0deg, #2e58ff, #32c6ff);
-	border-radius: 44rpx;
-	font-size: 36rpx;
-	font-family: PingFang SC;
-	font-weight: 500;
-	color: #ffffff;
-	text-align: center;
-	line-height: 88rpx;
-	position: fixed;
-	bottom: 48rpx;
-	left: 0;
-	right: 0;
-	margin: 0 auto;
-}
-</style>

pages/user/team.vue

@@ -3,7 +3,7 @@
 		<view class="content-money">
 			<view class="status_bar"><!-- 这里是状态栏 --></view>
 			<view class="body-title">
-				<view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view>
+				<view class="goback-box" @click="toBack"><image class="goback" src="../../static/img/fanhui.png" mode=""></image></view>
 				<view class="header">我的推广</view>
 			</view>
 			<view class="content-bg"><image src="../../static/img/promotion-bg.png" mode=""></image></view>

pages/user/teamList.vue

@@ -1,144 +0,0 @@
-<template>
-	<view class="content">
-		<empty v-if="list && list.length == 0"></empty>
-		<view class="" style="background-color: #fff;">
-			<view class="content-box" v-for="item in list">
-				<view class="content-box-left">
-					<view class="left-img"><image :src="item.avatar" mode=""></image></view>
-					<view class="right-title">
-						<!-- <view class="top">{{ item.nickname }}</view> -->
-						<view class="bottom">ID:{{ item.uid }}</view>
-						<view class="bottom " style="font-size: 24rpx;">昵称:{{ item.nickname }}</view>
-					</view>
-				</view>
-				<view class="content-box-right">
-					<view class="box-right">
-						参与金额:
-						<span>{{ item.sells }}</span>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-import { myspread } from '@/api/user.js';
-import empty from '@/components/empty';
-import { mapState, mapMutations } from 'vuex';
-export default {
-	components: {
-		empty
-	},
-	data() {
-		return {
-			list: [],
-			key: '',
-			page: 1,
-			limit: 20,
-			loadingType: 'more'
-		};
-	},
-	computed: {
-		...mapState(['wlgsbList'])
-	},
-	onLoad(opt) {
-		this.key = opt.type * 1;
-	},
-	onShow() {
-		this.loadData();
-	},
-	onReachBottom() {
-		this.loadData();
-	},
-	onReady() {},
-	methods: {
-		...mapMutations(['setSbList']),
-		//获取收入支出信息
-		async loadData(source) {
-			let obj = this;
-			if (obj.loadingType == 'loading' || obj.loadingType == 'noMore') {
-				//防止重复加载
-				return;
-			}
-			// 修改当前对象状态为加载中
-			obj.loadingType = 'loading';
-			myspread({ page: obj.page, limit: obj.limit, grade: obj.key }).then(({ data }) => {
-				obj.list = obj.list.concat(data.list);
-				console.log(obj.list);
-				obj.page++;
-				if (obj.limit == data.list.length) {
-					//判断是否还有数据， 有改为 more， 没有改为noMore
-					obj.loadingType = 'more';
-					return;
-				} else {
-					//判断是否还有数据， 有改为 more， 没有改为noMore
-					obj.loadingType = 'noMore';
-				}
-			});
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.content,
-page {
-	height: auto;
-	min-height: 100%;
-	background: #111;
-}
-.content-box {
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	// margin: 30rpx 0;
-	background-color: #111;
-	padding: 0 20rpx 10rpx;
-	border-bottom: 1px solid #fff;
-	.content-box-left {
-		display: flex;
-
-		.left-img {
-			width: 100rpx;
-			height: 100rpx;
-			border-radius: 50%;
-			overflow: hidden;
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-
-		.right-title {
-			margin-left: 15rpx;
-			display: flex;
-			flex-direction: column;
-			justify-content: space-around;
-
-			.top {
-				font-weight: 500;
-				font-size: 30rpx;
-			}
-
-			.bottom {
-				color: #fff;
-			}
-		}
-	}
-
-	.content-box-right {
-		display: flex;
-		flex-direction: column;
-		width: 230rpx;
-		color: #fff;
-		.state {
-			color: red;
-		}
-		span {
-			color: #fff;
-			font-size: 28rpx;
-		}
-	}
-}
-</style>

pages/user/wenpiao.vue

@@ -1,478 +0,0 @@
-<template>
-	<view class="content">
-		<view class="content-money">
-			<view class="status_bar">
-				<!-- 这里是状态栏 -->
-			</view>
-			<view class="body-title">
-				<view class="goback-box" @click="toBack">
-					<image class="goback" src="../../static/icon/fanhui.png" mode=""></image>
-				</view>
-				<view class="header">文票</view>
-			</view>
-			<view class="content-bg">
-				<image src="../../static/img/myyue.png" mode=""></image>
-			</view>
-			<view class="money-box">
-				<view class="money">{{userInfo.paper_ticket | getMoneyStyle}}</view>
-				<view>当前余额</view>
-			</view>
-			<!-- <view class="moneybtn-box">
-				<view class="money-btn">
-
-				</view>
-				<view class="money-btn" >
-					提现 >
-				</view>
-			</view> -->
-		</view>
-		<view class="info-box flex">
-			<view class="info-item">
-				<view class="info-font">累计收入</view>
-				<view class="info-num">{{recharge || 0}}</view>
-			</view>
-			<view class="shu"></view>
-			<view class="info-item">
-				<view class="info-font">累计支出</view>
-				<view class="info-num">{{orderStatusSum || 0}}</view>
-			</view>
-		</view>
-		<view class="navbar">
-			<view v-for="(item, index) in navList" :key="index" class="nav-item"
-				:class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
-		</view>
-		<swiper :current="tabCurrentIndex" :style="{ height: height }" class="swiper-box" duration="300"
-			@change="changeTab">
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view scroll-y="true" class="list-scroll-content" @scrolltolower="loadData">
-					<!-- 空白页 -->
-					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-
-					<!-- 订单列表 -->
-					<view>
-						<view class="order-item flex" v-for="(item, index) in tabItem.orderList" :key="index">
-							<view class="title-box">
-								<view class="title">
-									<text>{{ item.title }}</text>
-								</view>
-								<view class="time">
-									<text>{{ item.add_time }}</text>
-								</view>
-							</view>
-							<view class="money">
-								<view>{{ (item.pm == 0 ? '-' : '+') + item.number }}</view>
-							</view>
-						</view>
-					</view>
-					<uni-load-more :status="tabItem.loadingType"
-						v-if="!(tabItem.orderList.length == 0 && tabItem.loaded)"></uni-load-more>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-	</view>
-</template>
-
-<script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-	import {
-		getGreenJf,
-		getUserInfo,
-		getWenpiao
-	} from '@/api/user.js'
-	import {
-		spreadCommission,
-		userBalance
-	} from '@/api/wallet.js';
-	import {
-		getMoneyStyle
-	} from '@/utils/rocessor.js';
-	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-	import empty from '@/components/empty';
-	export default {
-		filters: {
-			getMoneyStyle
-		},
-		components: {
-			empty,
-			uniLoadMore
-		},
-		onReady(res) {
-			var _this = this;
-			uni.getSystemInfo({
-				success: resu => {
-					const query = uni.createSelectorQuery();
-					query.select('.swiper-box').boundingClientRect();
-					query.exec(function(res) {
-						_this.height = resu.windowHeight - res[0].top + 'px';
-						console.log('打印页面的剩余高度', _this.height);
-					});
-				},
-				fail: res => {}
-			});
-		},
-		data() {
-			return {
-				height: '',
-				// 头部图高度
-				maxheight: '',
-				tabCurrentIndex: 0,
-				orderStatusSum: 0,
-				recharge: 0,
-				navList: [{
-						state: 0,
-						text: '支出',
-						loadingType: 'more',
-						orderList: [],
-						page: 1, //当前页数
-						limit: 10 //每次信息条数
-					},
-					{
-						state: 1,
-						text: '收入',
-						loadingType: 'more',
-						orderList: [],
-						page: 1, //当前页数
-						limit: 10 //每次信息条数
-					}
-				],
-				money: ''
-			};
-		},
-		onLoad(options) {},
-		onShow() {
-			this.loadData();
-			// 获取用户余额
-			getUserInfo({}).then(({
-				data
-			}) => {
-				this.money = data.now_money;
-				this.setUserInfo(data);
-			});
-		},
-		computed: {
-			...mapState('user', ['userInfo'])
-		},
-		methods: {
-			...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
-			toBack() {
-				uni.switchTab({
-					url: '/pages/user/user',
-					fail() {
-						uni.switchTab({
-							url: '/pages/index/index'
-						})
-					}
-				})
-			},
-			// 页面跳转
-			navto(e) {
-				uni.navigateTo({
-					url: e
-				});
-			},
-			//获取收入支出信息
-			async loadData(source) {
-				let obj = this
-				//这里是将订单挂载到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';
-
-				getWenpiao({
-						page: navItem.page,
-						limit: navItem.limit,
-						pm: navItem.state
-					})
-					.then(({
-						data
-					}) => {
-						console.log(data,'data')
-						obj.zc = data.zc
-						obj.sr = data.sr
-						navItem.orderList = navItem.orderList.concat(data.list)
-						navItem.page++
-						if (navItem.limit == data.list.length) {
-							navItem.loadingType = 'more'
-						} else {
-							navItem.loadingType = 'noMore'
-						}
-						obj.$set(navItem, 'loaded', true);
-					})
-					.catch(e => {
-						console.log(e);
-					});
-			},
-
-			//swiper 切换
-			changeTab(e) {
-				this.tabCurrentIndex = e.target.current;
-				this.loadData('tabChange');
-			},
-			//顶部tab点击
-			tabClick(index) {
-				this.tabCurrentIndex = index;
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	page {
-		background: #f1f1f1;
-		height: 100%;
-	}
-
-	.status_bar {
-		height: var(--status-bar-height);
-		width: 100%;
-	}
-
-	.content-money {
-		position: relative;
-		height: 480rpx;
-
-		.content-bg {
-			position: absolute;
-			top: 0;
-			left: 0;
-			right: 0;
-			width: 750rpx;
-			height: 480rpx;
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-
-		.body-title {
-			height: 80rpx;
-			text-align: center;
-			font-size: 35rpx;
-			position: relative;
-
-			.header {
-				position: absolute;
-				left: 0;
-				top: 0;
-				width: 100%;
-				font-size: 36rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #fffeff;
-				height: 80rpx;
-				font-size: 36rpx;
-				font-weight: 700;
-				z-index: 9;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-			}
-
-			.goback-box {
-				position: absolute;
-				left: 18rpx;
-				top: 0;
-				height: 80rpx;
-				display: flex;
-				align-items: center;
-			}
-
-			.goback {
-				z-index: 100;
-				width: 34rpx;
-				height: 34rpx;
-			}
-		}
-	}
-
-	.info-box {
-		width: 670rpx;
-		height: 186rpx;
-		background: #ffffff;
-		box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-		border-radius: 20rpx;
-		margin: -100rpx auto 0;
-		position: relative;
-		z-index: 2;
-
-		.info-item {
-			width: 50%;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			line-height: 1;
-
-			.info-font {
-				font-size: 30rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #999999;
-			}
-
-			.info-num {
-				margin-top: 30rpx;
-				font-size: 30rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #181818;
-			}
-		}
-
-		.shu {
-			width: 2rpx;
-			height: 74rpx;
-			background: #dcdfe6;
-		}
-	}
-
-	.money-box {
-		position: relative;
-		z-index: 2;
-		padding-top: 70rpx;
-		color: #ffffff;
-		text-align: center;
-		/* #ifdef APP-PLUS */
-		padding-top: 30rpx;
-
-		/* #endif */
-		.money {
-			font-size: 72rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #ffffff;
-		}
-
-		.text {
-			font-size: 30rpx;
-		}
-	}
-
-	.moneybtn-box {
-		display: flex;
-		justify-content: space-between;
-		position: relative;
-		z-index: 2;
-		color: #ffffff;
-		padding: 20rpx 50rpx;
-		font-size: 30rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #FFFFFF;
-	}
-
-	.navbar {
-		margin-top: 20rpx;
-		display: flex;
-		height: 88rpx;
-		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: #999999;
-			position: relative;
-
-			&.current {
-				color: #000;
-
-				&:after {
-					content: '';
-					position: absolute;
-					left: 50%;
-					bottom: 0;
-					transform: translateX(-50%);
-					width: 44px;
-					height: 0;
-					border-bottom: 2px solid #fe5b38;
-				}
-			}
-		}
-	}
-
-	//列表
-	.swiper-box {
-		.order-item:last-child {
-			margin-bottom: 60rpx;
-		}
-
-		.order-item {
-			padding: 20rpx 30rpx;
-			line-height: 1.5;
-
-			.title-box {
-				.title {
-					font-size: $font-lg;
-					color: $font-color-base;
-				}
-
-				.time {
-					font-size: $font-base;
-					color: $font-color-light;
-				}
-			}
-
-			.money {
-				color: #fd5b23;
-				font-size: $font-lg;
-				text-align: right;
-
-				.status {
-					color: $font-color-light;
-				}
-			}
-		}
-	}
-
-	.list-scroll-content {
-		background: #ffffff;
-		height: 100%;
-	}
-
-	.content {
-		height: 100%;
-
-		.empty-content {
-			background-color: #ffffff;
-		}
-	}
-
-	.btn-box {
-		width: 674rpx;
-		height: 88rpx;
-		background: linear-gradient(0deg, #2e58ff, #32c6ff);
-		border-radius: 44rpx;
-		font-size: 36rpx;
-		font-family: PingFang SC;
-		font-weight: 500;
-		color: #ffffff;
-		text-align: center;
-		line-height: 88rpx;
-		position: fixed;
-		bottom: 48rpx;
-		left: 0;
-		right: 0;
-		margin: 0 auto;
-	}
-</style>

pages/user/whiteJf.vue

@@ -1,444 +0,0 @@
-<template>
-	<view class="content">
-		<view class="content-money">
-			<view class="status_bar"><!-- 这里是状态栏 --></view>
-			<view class="body-title">
-				<view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view>
-				<view class="header">我的肥料</view>
-			</view>
-			<view class="content-bg"><image src="../../static/img/myyue.png" mode=""></image></view>
-			<view class="money-box">
-				<view class="money">{{ userInfo.white_integral | getMoneyStyle }}</view>
-				<view>当前余额</view>
-			</view>
-			<view class="moneybtn-box">
-				<view class="money-btn"></view>
-				<view class="money-btn" @click="navto('/pages/money/withdrawal?type=purple')">肥料提现</view>
-			</view>
-		</view>
-		<view class="info-box flex">
-			<view class="info-item">
-				<view class="info-font">累计收入</view>
-				<view class="info-num">{{ sr || 0 }}</view>
-			</view>
-			<view class="shu"></view>
-			<view class="info-item">
-				<view class="info-font">累计支出</view>
-				<view class="info-num">{{ zc || 0 }}</view>
-			</view>
-		</view>
-		<view class="navbar">
-			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
-		</view>
-		<swiper :current="tabCurrentIndex" :style="{ height: height }" class="swiper-box" duration="300" @change="changeTab">
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view scroll-y="true" class="list-scroll-content" @scrolltolower="loadData">
-					<!-- 空白页 -->
-					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-
-					<!-- 订单列表 -->
-					<view>
-						<view class="order-item flex" v-for="(item, index) in tabItem.orderList" :key="index">
-							<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">
-								<view>{{ (item.pm == 0 ? '-' : '+') + item.number }}</view>
-							</view>
-						</view>
-					</view>
-					<uni-load-more :status="tabItem.loadingType" v-if="!(tabItem.orderList.length == 0 && tabItem.loaded)"></uni-load-more>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-	</view>
-</template>
-
-<script>
-import { mapState, mapMutations } from 'vuex';
-import { getWhiteJf, getUserInfo } from '@/api/user.js';
-import { spreadCommission, userBalance } from '@/api/wallet.js';
-import { getMoneyStyle } from '@/utils/rocessor.js';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-import empty from '@/components/empty';
-export default {
-	filters: {
-		getMoneyStyle
-	},
-	components: {
-		empty,
-		uniLoadMore
-	},
-	onReady(res) {
-		var _this = this;
-		uni.getSystemInfo({
-			success: resu => {
-				const query = uni.createSelectorQuery();
-				query.select('.swiper-box').boundingClientRect();
-				query.exec(function(res) {
-					_this.height = resu.windowHeight - res[0].top + 'px';
-					console.log('打印页面的剩余高度', _this.height);
-				});
-			},
-			fail: res => {}
-		});
-	},
-	data() {
-		return {
-			zc: 0,
-			sr: 0,
-			height: '',
-			// 头部图高度
-			maxheight: '',
-			tabCurrentIndex: 0,
-			orderStatusSum: 0,
-			recharge: 0,
-			navList: [
-				{
-					state: 0,
-					text: '支出',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				},
-				{
-					state: 1,
-					text: '收入',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				}
-			],
-			money: ''
-		};
-	},
-	onLoad(options) {},
-	onShow() {
-		this.loadData();
-		// 获取用户余额
-		getUserInfo({}).then(({ data }) => {
-			this.money = data.now_money;
-			this.setUserInfo(data);
-		});
-	},
-	computed: {
-		...mapState('user', ['userInfo'])
-	},
-	methods: {
-		...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
-		toBack() {
-			uni.navigateBack({});
-		},
-		// 页面跳转
-		navto(e) {
-			uni.navigateTo({
-				url: e
-			});
-		},
-		//获取收入支出信息
-		async loadData(source) {
-			let obj = this;
-			//这里是将订单挂载到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';
-
-			getWhiteJf({
-				page: navItem.page,
-				limit: navItem.limit,
-				pm: navItem.state
-			})
-				.then(({ data }) => {
-					this.zc = data.zc;
-					this.sr = data.sr;
-					navItem.orderList = navItem.orderList.concat(data.list);
-					navItem.page++;
-					if (navItem.limit == data.list.length) {
-						navItem.loadingType = 'more';
-					} else {
-						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;
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page {
-	background: #f1f1f1;
-	height: 100%;
-}
-
-.status_bar {
-	height: var(--status-bar-height);
-	width: 100%;
-}
-
-.content-money {
-	position: relative;
-	height: 480rpx;
-
-	.content-bg {
-		position: absolute;
-		top: 0;
-		left: 0;
-		right: 0;
-		width: 750rpx;
-		height: 480rpx;
-
-		image {
-			width: 100%;
-			height: 100%;
-		}
-	}
-
-	.body-title {
-		height: 80rpx;
-		text-align: center;
-		font-size: 35rpx;
-		position: relative;
-
-		.header {
-			position: absolute;
-			left: 0;
-			top: 0;
-			width: 100%;
-			font-size: 36rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #fffeff;
-			height: 80rpx;
-			font-size: 36rpx;
-			font-weight: 700;
-			z-index: 9;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-		}
-
-		.goback-box {
-			position: absolute;
-			left: 18rpx;
-			top: 0;
-			height: 80rpx;
-			display: flex;
-			align-items: center;
-		}
-
-		.goback {
-			z-index: 100;
-			width: 34rpx;
-			height: 34rpx;
-		}
-	}
-}
-
-.info-box {
-	width: 670rpx;
-	height: 186rpx;
-	background: #ffffff;
-	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-	border-radius: 20rpx;
-	margin: -100rpx auto 0;
-	position: relative;
-	z-index: 2;
-
-	.info-item {
-		width: 50%;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		line-height: 1;
-
-		.info-font {
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #999999;
-		}
-
-		.info-num {
-			margin-top: 30rpx;
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #181818;
-		}
-	}
-
-	.shu {
-		width: 2rpx;
-		height: 74rpx;
-		background: #dcdfe6;
-	}
-}
-
-.money-box {
-	position: relative;
-	z-index: 2;
-	padding-top: 70rpx;
-	color: #ffffff;
-	text-align: center;
-	/* #ifdef APP-PLUS */
-	padding-top: 30rpx;
-
-	/* #endif */
-	.money {
-		font-size: 72rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #ffffff;
-	}
-
-	.text {
-		font-size: 30rpx;
-	}
-}
-
-.moneybtn-box {
-	display: flex;
-	justify-content: space-between;
-	position: relative;
-	z-index: 2;
-	color: #ffffff;
-	padding: 20rpx 50rpx;
-	font-size: 30rpx;
-	font-family: PingFang SC;
-	font-weight: bold;
-	color: #ffffff;
-}
-
-.navbar {
-	margin-top: 20rpx;
-	display: flex;
-	height: 88rpx;
-	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: #999999;
-		position: relative;
-
-		&.current {
-			color: #000;
-
-			&:after {
-				content: '';
-				position: absolute;
-				left: 50%;
-				bottom: 0;
-				transform: translateX(-50%);
-				width: 44px;
-				height: 0;
-				border-bottom: 2px solid #fe5b38;
-			}
-		}
-	}
-}
-
-//列表
-.swiper-box {
-	.order-item:last-child {
-		margin-bottom: 60rpx;
-	}
-
-	.order-item {
-		padding: 20rpx 30rpx;
-		line-height: 1.5;
-
-		.title-box {
-			.title {
-				font-size: $font-lg;
-				color: $font-color-base;
-			}
-
-			.time {
-				font-size: $font-base;
-				color: $font-color-light;
-			}
-		}
-
-		.money {
-			color: #fd5b23;
-			font-size: $font-lg;
-			text-align: right;
-
-			.status {
-				color: $font-color-light;
-			}
-		}
-	}
-}
-
-.list-scroll-content {
-	background: #ffffff;
-	height: 100%;
-}
-
-.content {
-	height: 100%;
-
-	.empty-content {
-		background-color: #ffffff;
-	}
-}
-
-.btn-box {
-	width: 674rpx;
-	height: 88rpx;
-	background: linear-gradient(0deg, #2e58ff, #32c6ff);
-	border-radius: 44rpx;
-	font-size: 36rpx;
-	font-family: PingFang SC;
-	font-weight: 500;
-	color: #ffffff;
-	text-align: center;
-	line-height: 88rpx;
-	position: fixed;
-	bottom: 48rpx;
-	left: 0;
-	right: 0;
-	margin: 0 auto;
-}
-</style>

pages/user/withdrawal.vue

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

pages/user/yuezz.vue

@@ -1,279 +0,0 @@
-<template>
- 	<view class="content">
- 		<view class="content-money">
- 			<view class="flex">
- 				<view class="buttom">
- 					<view class="icon">{{ userInfo.now_money | getMoneyStyle }}</view>
- 					<text class="text">可转金额</text>
- 				</view>
- 			</view>
- 		</view>
- 		<view class="name" v-if="name != ''">
- 			用户昵称：{{name}}
- 		</view>
-		<view class="item-wrap" style="padding: 0 20rpx;background-color: #fff;">
-			<u-form ref="uForm" class="item">
-				<u-form-item label-width='150' label="用户编号"><u-input type="text" v-model="card" @blur="userName"/></u-form-item>
-				<u-form-item label-width='150' label="支付密码"><u-input type="password" v-model="password" /></u-form-item>
-			</u-form>
-		</view>
- 		
- 		<view class="row-box">
- 			<view class="title">转账金额</view>
- 			<view class="row">
- 				<text class="tit">￥</text>
- 				<input class="input" type="number" v-model="withdrawal" placeholder='转入金额' placeholder-class="placeholder" />
- 				<view class="buttom" @click="withdrawal = userInfo.now_money">全部转账</view>
- 			</view>
- 		</view>
- 		
- 		<button class="add-btn up" :class="{'action':loding}" @click="!loding?confirm():''">转入</button>
- 	</view>
- </template>
- 
- <script>
- import { getMoneyStyle } from '@/utils/rocessor.js';
- import { getUserInfo,transfer,nickname } from '@/api/user.js';
- import { mapMutations,mapState } from 'vuex';
- export default {
- 	filters: {
- 		getMoneyStyle
- 	},
- 	data() {
- 		return {
- 			money: '0.00', //可提现金额
- 			withdrawal: '', //提现金额
- 			password:'',//支付密码
- 			card:'',//转账卡号
- 			name:'',
- 			// #ifdef H5
- 			weichatBsrowser: false,
- 			// #endif
- 			loding:false,
- 		};
- 	},
- 	onLoad(options) {
- 		// #ifdef H5
- 		this.weichatBsrowser = uni.getStorageSync('weichatBrowser');
- 		// #endif
- 		this.dataUp();
- 	},
- 	computed: {
- 		...mapState('user', ['userInfo']) 
- 	},
- 	methods: {
- 		...mapMutations('user', ['setUserInfo', 'login']),
- 		// 更新数据
- 		dataUp(){
- 			let obj = this;
- 			getUserInfo({}).then((e) => {
- 				obj.login();
- 				// 保存返回用户数据
- 				obj.setUserInfo(e.data);
- 			}).catch((e) => {
- 				console.log(e);
- 			})
- 		},
- 		// 切换选中对象
- 		tabRadio(e) {
- 			this.type = e.detail.value;
- 		},
- 		userName() {
- 			if(this.card != ''){
- 				nickname({uid:this.card}).then(data => {
- 					this.name = data.msg
- 				}).catch(err => {
-					this.$api.msg('请确认用户编号是否正确')
-				})
- 			}
- 			console.log(this.card)
- 		},
- 		// 提交
- 		confirm() {
- 			let obj = this;
- 			obj.loding = true;
- 			if(obj.withdrawal == 0){
- 				obj.loding = false;
- 				uni.showModal({
- 					title:"提示",
- 					content:"转账金额不要为0"
- 				})
- 				return;
- 			}
- 			if(obj.card == obj.userInfo.uid){
- 				obj.loding = false;
- 				uni.showModal({
- 					title:"提示",
- 					content:"不要输入自己的用户编号"
- 				})
- 			}else{
- 				
- 				let data = {
- 					to_uid:obj.card, //编号
- 					pass: obj.password, //交易密码
- 					merber: obj.withdrawal //金额
- 				}
- 				transfer(data)
- 					.then(e => {
- 						// 允许按钮点击
- 						obj.loding = false;
- 						// 初始化提现金额
- 						obj.withdrawal = ''
- 						uni.showToast({
- 							title: '提交成功',
- 							duration: 2000,
- 							position: 'top'
- 						});
- 						obj.dataUp();
- 					})
- 					.catch(e => {
- 						obj.$api.msg(e.msg)
- 						obj.loding = false;
- 						console.log();
- 					});
- 			}
- 			
- 		}
- 	}
- };
- </script>
- 
- <style lang="scss">
- page {
- 	height: 100%;
- }
- .content-money {
- 	padding: 30rpx 0;
- 	background: #ffffff;
- }
- 
-.item{
- 	padding: 0 $page-row-spacing;
- 	background-color: #FFFFFF;
-	
- }
- .flex {
- 	background-color: #ffffff;
- 	text-align: center;
- 	margin: 0 30rpx;
- 	border-radius: $border-radius-sm;
- 	justify-content: center;
- 	.buttom {
- 		font-size: $font-lg;
- 		width: 50%;
- 	}
- 	.interval {
- 		width: 2px;
- 		height: 60rpx;
- 		background-color: #eeeeee;
- 	}
- 	.icon {
- 		background-size: 100%;
- 		font-size: 42rpx;
- 		color: $font-color-dark;
- 		font-weight: bold;
- 		background-repeat: no-repeat;
- 		background-position: center;
- 	}
- 	.text {
- 		color: $font-color-light;
- 	}
- }
- 
- .row-box {
- 	margin-top: 30rpx;
- 	padding: 20rpx 30rpx;
- 	background: #fff;
- 	.title {
- 		font-size: $font-base + 2rpx;
- 		color: $font-color-dark;
- 	}
- 	.row {
- 		display: flex;
- 		align-items: center;
- 		position: relative;
- 		height: 80rpx;
- 		.tit {
- 			flex-shrink: 0;
- 			width: 40rpx;
- 			font-size: 30rpx;
- 			color: $font-color-dark;
- 		}
- 		.input {
- 			flex: 1;
- 			font-size: 30rpx;
- 			color: $font-color-dark;
- 		}
- 		.iconlocation {
- 			font-size: 36rpx;
- 			color: $font-color-light;
- 		}
- 
- 		.buttom {
- 			color: $base-color;
- 			font-size: $font-base;
- 		}
- 	}
- }
- .add-btn {
- 	background: $base-color;
- 	display: flex;
- 	align-items: center;
- 	justify-content: center;
- 	width: 690rpx;
- 	height: 80rpx;
- 	margin: 0 auto;
- 	margin-top: 30rpx;
- 	font-size: $font-lg;
- 	border-radius: 10rpx;
- 	color: #fff;
- 	// box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
- }
- .name {
- 	background: #fff;
- 	padding: 30rpx;
- }
- .list {
- 	padding-left: 30rpx;
- 	margin-top: 30rpx;
- 	background-color: #ffffff;
- 	.box {
- 		display: flex;
- 		align-items: center;
- 		width: 100%;
- 		height: 120rpx;
- 		border-bottom: 1px solid $border-color-light;
- 		.icon {
- 			font-size: 48rpx;
- 			padding-right: 20rpx;
- 			.icon-img {
- 				height: 50rpx;
- 				width: 50rpx;
- 			}
- 		}
- 		.iconweixin1 {
- 			color: #18bf16;
- 		}
- 		.iconzhifubao {
- 			color: #08aaec;
- 		}
- 		.title-box {
- 			flex-grow: 1;
- 			text-align: left;
- 			.title {
- 				font-size: $font-base + 2rpx;
- 				color: $font-color-base;
- 			}
- 			.node {
- 				font-size: $font-sm;
- 				color: $font-color-light;
- 			}
- 		}
- 	}
- }
- /deep/ .uni-radio-input {
- 	width: 45rpx;
- 	height: 45rpx;
- }
- </style>
-