123456

api/product.js

@@ -73,10 +73,10 @@ export function searchKeyword(data) {
 }
 
 // 获取热门分类信息
-export function groomList(data,type) {
+export function groomList(data, type) {
 	// 获取产品类型 1 精品推荐 2 热门榜单 3首发新品 4促销单品
 	return request({
-		url: '/api/groom/list/'+type,
+		url: '/api/groom/list/' + type,
 		method: 'get',
 		data
 	});
@@ -84,18 +84,18 @@ export function groomList(data,type) {
 
 
 // 获取秒杀商品详细
-export function seckillGoods(data,id) {
+export function seckillGoods(data, id) {
 	return request({
-		url: '/api/seckill/detail/'+id,
+		url: '/api/seckill/detail/' + id,
 		method: 'get',
 		data
 	});
 }
 
 // 获取拼团商品详细
-export function groupGoods(data,id) {
+export function groupGoods(data, id) {
 	return request({
-		url: '/api/combination/detail/'+id,
+		url: '/api/combination/detail/' + id,
 		method: 'get',
 		data
 	});
@@ -122,18 +122,18 @@ export function getCombinationList(data) {
 }
 
 //取消拼团
-export function getCombinationLisRemove(data,id) {
+export function getCombinationLisRemove(data, id) {
 	return request({
-		url: '/api/combination/remove'+id,
+		url: '/api/combination/remove' + id,
 		method: 'get',
 		data
 	});
 }
 
 //拼团开团页面数据
-export function getCombinationLisPink(data,id) {
+export function getCombinationLisPink(data, id) {
 	return request({
-		url: '/api/combination/pink/'+id,
+		url: '/api/combination/pink/' + id,
 		method: 'get',
 		data
 	});
@@ -158,9 +158,9 @@ export function getSeckillClass(data) {
 	});
 }
 // 获取秒杀列表
-export function getSeckillList(data,id) {
+export function getSeckillList(data, id) {
 	return request({
-		url: '/api/seckill/list/'+id,
+		url: '/api/seckill/list/' + id,
 		method: 'get',
 		data
 	});
@@ -168,19 +168,26 @@ export function getSeckillList(data,id) {
 
 
 // 产品评价数量和好评度
-export function reply_config(data,id) {
+export function reply_config(data, id) {
 	return request({
-		url: '/api/reply/config/'+id,
+		url: '/api/reply/config/' + id,
 		method: 'get',
 		data
 	});
 }
 // 获取产品评论
-export function reply_list(data,id) {
+export function reply_list(data, id) {
 	return request({
-		url: '/api/reply/list/'+id,
+		url: '/api/reply/list/' + id,
 		method: 'get',
 		data
 	});
 }
 
+export function jfShop(data) {
+	return request({
+		url: '/api/product/hot',
+		method: 'get',
+		data
+	});
+}

api/user.js

@@ -1,5 +1,13 @@
 import request from '@/utils/request'
 
+//我的推广
+export function tuiguang(data) {
+	return request({
+		url: '/api/dow',
+		method: 'get',
+		data
+	})
+}
 
 //查看子点位
 export function lookSubpoints(data, id) {
@@ -323,3 +331,12 @@ export function details(data, id) {
 		data
 	});
 }
+
+//种植详情
+export function getJl(data) {
+	return request({
+		url: '/api/many_order/list',
+		method: 'GET',
+		data
+	});
+}

api/wallet.js

@@ -1,9 +1,9 @@
 import request from '@/utils/request'
 
 // 获取用户消费记录
-export function spreadCommission(data,state) {
+export function spreadCommission(data, state) {
 	return request({
-		url: '/api/spread/commission/'+state,
+		url: '/api/spread/commission/' + state,
 		method: 'get',
 		data
 	});
@@ -75,7 +75,7 @@ export function rechargeRoutine(data) {
 // 获取提现支付宝账号
 export function aliInfo(data) {
 	return request({
-		url: '/api/ali/info',
+		url: '/api/auction/pay_list',
 		method: 'get',
 		data
 	});
@@ -125,10 +125,19 @@ export function cashList(data) {
 }
 
 //充值金额
-export function moneyChong(data){
+export function moneyChong(data) {
 	return request({
-		url:'/api/recharge/index',
-		method:'get',
+		url: '/api/recharge/index',
+		method: 'get',
 		data
 	})
 }
+
+//添加收款方式
+export function getMoneyType(data) {
+	return request({
+		url: '/api/auction/pay',
+		method: 'post',
+		data
+	});
+}

manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "微乐购",
+    "name" : "微乐种",
     "appid" : "__UNI__CDE33A2",
     "description" : "",
-    "versionName" : "1.0.2",
-    "versionCode" : 102,
+    "versionName" : "1.9.9",
+    "versionCode" : 199,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */
@@ -15,7 +15,7 @@
             "delay" : 0
         },
         "modules" : {
-            "OAuth" : {}
+            "Payment" : {}
         },
         /* 模块配置 */
         "distribute" : {
@@ -38,14 +38,30 @@
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
             },
             "ios" : {
-                "idfa" : false
+                "idfa" : false,
+                "capabilities" : {
+                    "entitlements" : {
+                        "com.apple.developer.associated-domains" : [ "applinks:static-f2ce8da9-3823-402a-bd21-675f08b3b09b.bspapp.com" ]
+                    }
+                },
+                "privacyDescription" : {
+                    "NSPhotoLibraryUsageDescription" : "使您上传个性化头像",
+                    "NSPhotoLibraryAddUsageDescription" : "使您上传个性化头像",
+                    "NSCameraUsageDescription" : "使用摄像头可以让你更好的上传个性化头像"
+                }
             },
             /* ios打包配置 */
             "sdkConfigs" : {
                 "maps" : {},
                 "oauth" : {},
                 "geolocation" : {},
-                "payment" : {},
+                "payment" : {
+                    "weixin" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appid" : "wxc45bba547e921b9f",
+                        "UniversalLinks" : "https://static-f2ce8da9-3823-402a-bd21-675f08b3b09b.bspapp.com/uni-universallinks/__UNI__CDE33A2/"
+                    }
+                },
                 "push" : {},
                 "share" : {},
                 "speech" : {},
@@ -87,9 +103,13 @@
             "splashscreen" : {
                 "androidStyle" : "default",
                 "android" : {
-                    "hdpi" : "appbase/480.png",
-                    "xhdpi" : "appbase/720.png",
-                    "xxhdpi" : "appbase/1080.png"
+                    "hdpi" : "appbase/480.9.png",
+                    "xhdpi" : "appbase/720.9.png",
+                    "xxhdpi" : "appbase/1080.9.png"
+                },
+                "iosStyle" : "storyboard",
+                "ios" : {
+                    "storyboard" : "C:/Users/Administrator/Desktop/苹果/wlg.zip"
                 }
             }
         }
@@ -106,7 +126,7 @@
         }
     },
     "h5" : {
-        "title" : "微乐购s",
+        "title" : "微乐种s",
         "domain" : "",
         "router" : {
             "base" : "/index/",
@@ -127,5 +147,6 @@
         "sdkConfigs" : {
             "maps" : {}
         }
-    }
+    },
+    "_spaceID" : "f2ce8da9-3823-402a-bd21-675f08b3b09b"
 }

pages.json

@@ -5,12 +5,18 @@
 	"pages": [{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "微乐购",
+				"navigationBarTitleText": "微乐种",
 				"app-plus": {
 					"titleNView": false
 				}
 			}
 		},
+		{
+			"path": "pages/index/integral",
+			"style": {
+				"navigationBarTitleText": "兑换专区"
+			}
+		},
 		{
 			"path": "pages/money/wallet",
 			"style": {
@@ -28,6 +34,12 @@
 				"navigationBarTitleText": "余额转账"
 			}
 		},
+		{
+			"path": "pages/user/about",
+			"style": {
+				"navigationBarTitleText": "关于我们"
+			}
+		},
 		{
 			"path": "pages/shoping/list",
 			"style": {
@@ -485,6 +497,13 @@
 
 			}
 		},
+		{
+			"path": "pages/game/jlDetil",
+			"style": {
+				"navigationBarTitleText": "种植记录"
+
+			}
+		},
 		{
 			"path": "pages/user/shareQrCode",
 			"style": {
@@ -526,7 +545,7 @@
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "喜嗨购",
+		"navigationBarTitleText": "微乐种",
 		"navigationBarBackgroundColor": "#FFFFFF",
 		"backgroundColor": "#f8f8f8"
 	},
@@ -541,18 +560,18 @@
 				"selectedIconPath": "static/tabBar/tab-home-current.png",
 				"text": "首页"
 			},
-			// {
-			// 	"pagePath": "pages/category/category",
-			// 	"iconPath": "static/tabBar/tab-cate.png",
-			// 	"selectedIconPath": "static/tabBar/tab-cate-action.png",
-			// 	"text": "分类"
-			// },
 			{
-				"pagePath": "pages/game/game",
-				"iconPath": "static/tabBar/game.png",
-				"selectedIconPath": "static/tabBar/game-action.png",
-				"text": "种植"
+				"pagePath": "pages/category/category",
+				"iconPath": "static/tabBar/tab-cate.png",
+				"selectedIconPath": "static/tabBar/tab-cate-action.png",
+				"text": "分类"
 			},
+			// {
+			// 	"pagePath": "pages/game/game",
+			// 	"iconPath": "static/tabBar/game.png",
+			// 	"selectedIconPath": "static/tabBar/game-action.png",
+			// 	"text": "种植"
+			// },
 			{
 				"pagePath": "pages/cart/cart",
 				"iconPath": "static/tabBar/tab-cart.png",

pages/category/category.vue

@@ -1,126 +1,255 @@
 <template>
 	<view class="content">
-		<scroll-view scroll-y class="left-aside">
-			<view v-for="item in flist" :key="item.id" class="f-item b-b" :class="{ active: item.id === currentId }" @click="tabtap(item)">{{ item.cate_name }}</view>
-		</scroll-view>
-		<scroll-view scroll-with-animation scroll-y class="right-aside" @scroll="asideScroll" :scroll-top="tabScrollTop">
-			<view v-for="item in flist" :key="item.id" class="s-list" :id="'main-' + item.id">
-				<text class="s-item">{{ item.cate_name }}</text>
-				<view class="t-list ">
-					<view @click="navToList(item.id, titem.id)" class="t-item" v-for="titem in item.children" :key="titem.id">
-						<image :src="titem.pic"></image>
-						<text>{{ titem.cate_name }}</text>
-					</view>
+		<!-- 兼容小程序搜索 -->
+		<!-- #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>
-		</scroll-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 { getCategoryList } from '@/api/product.js';
+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: 9,
+			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() {
+		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) {
-			console.log(item);
+		tabtap(item, index) {
 			// 判断有没有初始化页面高度对象数据
-			if (!this.sizeCalcState) {
-				this.calcSize();
-			}
+			// if (!this.sizeCalcState) {
+			// 	this.calcSize();
+			// }
 			// 获取当前点击的id
 			this.currentId = item.id;
-			console.log(item.top);
+			//获取当前点击的下标
+			this.actionClassInd = index;
 			this.tabScrollTop = item.top;
-			console.log(this.tabScrollTop);
+			// 获取当前选中的对象
+			let ls = this.flist[this.actionClassInd];
+			// 判断当前数据是否已经加载完毕
+			if (ls.loadingType == 'more') {
+				this.getProductsList(ls);
+			}
 		},
 		//右侧栏滚动
-		asideScroll(e) {
-			// 判断有没有初始化页面高度对象数据
-			if (!this.sizeCalcState) {
-				this.calcSize();
+		// 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;
 			}
-			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;
-				}
+			// 判断是否重新加载数据
+			if (type == 'refresh') {
+				item.list = [];
 			}
-		},
-		//计算右侧栏每个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();
+			// 设置数据加载中
+			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);
+					});
 			});
-			this.sizeCalcState = true;
 		},
-		navToList(sid, tid) {
+		//下拉到底部后加载商品列表数据
+		getListMore() {
+			this.getProductsList(this.flist[this.actionClassInd]);
+		},
+		navToDetailPage(item) {
 			// 点击导航跳转到详细页面
 			uni.navigateTo({
-				url: '/pages/product/list?fid='+this.currentId+'&sid='+sid+'&tid='+tid
+				url: '/pages/product/product?id=' + item.id
 			});
 		}
 	}
@@ -128,18 +257,69 @@ export default {
 </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 {
-	display: flex;
+	.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: 200rpx;
+	width: 180rpx;
 	height: 100%;
 	background-color: #fff;
 }
@@ -179,9 +359,10 @@ page,
 .s-item {
 	display: flex;
 	align-items: center;
+	font-weight: bold;
 	height: 70rpx;
 	padding-top: 8rpx;
-	font-size: 28rpx;
+	font-size: 35rpx;
 	color: $font-color-dark;
 }
 .t-list {
@@ -198,19 +379,73 @@ page,
 	}
 }
 .t-item {
+	height: 220rpx;
 	flex-shrink: 0;
 	display: flex;
 	justify-content: center;
 	align-items: center;
-	flex-direction: column;
-	width: 171rpx;
+	flex-direction: row;
+	width: 500rpx;
 	font-size: 26rpx;
 	color: #666;
 	padding-bottom: 20rpx;
+	margin-right: 40rpx;
+	&.active {
+		display: none;
+	}
 
 	image {
-		width: 140rpx;
-		height: 140rpx;
+		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/contract/agreement.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="box">
-		<view class="title pt20 pb30">微乐购用户/会员注册协议</view>
-		<view class="content">欢迎您访问并使用微乐购服务平台！本协议是您与微乐购平台所有者就微乐购平台服务的相关事宜所订立的协议。</view>
+		<view class="title pt20 pb30">微乐种用户/会员注册协议</view>
+		<view class="content">欢迎您访问并使用微乐种服务平台！本协议是您与微乐种平台所有者就微乐种平台服务的相关事宜所订立的协议。</view>
 		<view class="content">
 			为维护您自身权益，请您仔细阅读本协议，您点击“同意并继续”按钮后，本协议即构成对双方具有约束力的法律文件； 阅读本协议过程中，
 			如您不同意本协议或其中任何条款的约定，您应立即停止注册程序。
@@ -63,13 +63,13 @@
 		<view class="content">
 			6.2 本站特有的标识、版面设计、编排方式等版权均属谦沐公司享有,未经本站许可,不得任意复制或转载。
 		</view>
-		<view class="content">6.3 使用本站的任何内容均应注明“来源于微乐购”及署上作者姓名,按法律规定需要支付稿酬的,应当通知本站及作者及支付稿酬,并独立承担一切法律责任。</view>
+		<view class="content">6.3 使用本站的任何内容均应注明“来源于微乐种”及署上作者姓名,按法律规定需要支付稿酬的,应当通知本站及作者及支付稿酬,并独立承担一切法律责任。</view>
 		<view class="content">6.4 本站享有所有作品用于其它用途的优先权,包括但不限于网站、电子杂志、平面出版等,但在使用前会通知作者,并按同行业的标准支付稿酬。</view>
 		<view class="content">6.5 本站所有内容仅代表作者自己的立场和观点,与本站无关,由作者本人承担一切法律责任。</view>
 		<view class="content">6.6 恶意转载本站内容的,本站保留将其诉诸法律的权利。</view>
 		<view class="content">七、责任声明</view>
 		<view class="content">
-			7.1 用户明确同意其使用本站网络服务所存在的风险及一切后果将完全由用户本人承担,微乐购对此不承担任何责任。
+			7.1 用户明确同意其使用本站网络服务所存在的风险及一切后果将完全由用户本人承担,微乐种对此不承担任何责任。
 		</view>
 		<view class="content">
 			7.2 本站无法保证网络服务一定能满足用户的要求,也不保证网络服务的及时性、安全性、准确性。

pages/contract/privacy.vue

@@ -179,7 +179,7 @@
 			本《隐私政策》尊重并保护所有使用服务用户的个人隐私权。为了给您提供更准确、更有个性化的服务,本《隐私政策》会按照本隐私权政策的规定使用和披露您的个人信息。但本《隐私政策》将以高度的勤勉、审慎义务对待这些信息。除本隐私权政策另有规定外,在未征得您事先许可的情况下,本《隐私政策》不会将这些信息对外披露或向第三方提供。本《隐私政策》会不时更新本隐私权政策。您在同意本《隐私政策》服务使用协议之时,即视为您已经同意本隐私权政策全部内容。本隐私权政策属于本《隐私政策》服务使用协议不可分割的一部分。
 		</view>
 		<!-- <view class="title">开发者：宁德市谦沐商务有限公司</view>
-		<view class="title">应用名：微乐购</view>
+		<view class="title">应用名：微乐种</view>
 		<view class="title">公司名称：宁德市谦沐商务有限公司</view>
 		<view class="title">注册地址：福建省宁德市福安市阳头街道工业路150号荣宏外滩C幢1单元303室</view>
 		<view class="title">办公地址：福建省宁德市福安市阳头街道工业路150号荣宏外滩C幢1单元303室</view>

pages/game/game.vue

@@ -4,7 +4,7 @@
 			<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 % 4) + 1) + '.png'" mode=""></image>
+				<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>

pages/game/gameDetail.vue

@@ -66,14 +66,14 @@
 			<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 }}</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" src="" mode=""></image>
+			<image class="ssh" @click="navTo('/pages/game/jlDetil')" src="../../static/game/game14.png" mode=""></image>
 		</view>
 		<view class="u-table">
 			<view class="column">
@@ -151,7 +151,7 @@
 				<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> -->
-				<input class="input" type="text" v-model="goodsNumber" placeholder-class="placeholder" placeholder="请填写积分数量" />
+				<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>
@@ -599,8 +599,8 @@ page {
 }
 
 .edu {
-	margin: 20rpx 190rpx;
-	width: 370rpx;
+	margin: 20rpx auto;
+	width: 700rpx;
 	height: 50rpx;
 	font-size: 30rpx;
 	font-weight: 500;
@@ -627,8 +627,8 @@ page {
 		}
 	}
 	.ssh {
-		width: 140rpx;
-		height: 166rpx;
+		width: 110rpx;
+		height: 136rpx;
 	}
 }
 .u-table {
@@ -819,7 +819,11 @@ page {
 		color: #0c1732;
 		line-height: 56rpx;
 	}
-
+	.input-box {
+		padding: 10rpx;
+		border: 1px #000 solid;
+		border-radius: 10rpx;
+	}
 	.input {
 		width: 400rpx;
 		height: 60rpx;

pages/game/jlDetil.vue

@@ -0,0 +1,215 @@
+<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/index.vue

@@ -1,51 +1,57 @@
 <template>
 	<view class="container">
-		<view class="carousel-section">
-			<!-- 背景色区域 -->
-			<view class="bg"><image src="../../static/index/index13.png" mode=""></image></view>
-			<!-- 标题栏和状态栏占位符 -->
-			<view class="titleNview-placing"></view>
-			<!-- 搜素栏 -->
-			<view class="search flex">
-				<!-- <image src="../../static/index/index09.png" class="address"></image> -->
-				<!-- <view class="shop-name clamp" @click.stop="canChange == 0?nav('/pages/shoping/list'):''">{{ storeInfo.name }}</view> -->
-				<!-- <view class="shop-name clamp">椒江区</view> -->
-				<!-- <image class="shop-jt" src="../../static/index/index07.png" mode=""></image> -->
-				<view class="input-box flex" @click.stop="clickSearch">
-					<view class=" input-content flex">
-						<view class="iconfont iconsearch"></view>
-						<view class="input"><input type="text" disabled value="输入关键字搜索" /></view>
-					</view>
+		<!-- <view class="carousel-section"> -->
+		<!-- 背景色区域 -->
+		<!-- <view class="bg"><image src="../../static/index/index1.png" mode=""></image></view> -->
+		<!-- 标题栏和状态栏占位符 -->
+		<!-- <view class="titleNview-placing"></view> -->
+		<!-- </view> -->
+		<!-- <image class="bg2" src="../../static/index/index2.png" mode=""></image> -->
+		<image class="bg3" src="../../static/index/index3.png" mode=""></image>
+		<view class="tongz flex">
+			<view>
+				<view class="tongz-bg"><image src="../../static/img/tongz-bg.png" mode=""></image></view>
+				<view class="tongz-left flex">
+					<image class="image-left" src="../../static/img/ling.png" mode=""></image>
+					<u-notice-bar
+						style="width: 100%;"
+						mode="vertical"
+						type="none"
+						:volume-icon="false"
+						:more-icon="true"
+						:list="text"
+						@click="goDetails"
+						@getMore="navTo('/pages/index/jieshao')"
+					></u-notice-bar>
 				</view>
 			</view>
-			<swiper class="carousel" autoplay="true" duration="400" interval="5000" :indicator-dots="true" indicator-active-color="#FFFFFF">
-				<!-- <swiper class="carousel" autoplay="true" duration="400" interval="5000"> -->
-				<swiper-item v-for="(item, index) in carouselList" :key="index" class="carousel-item">
-					<image :src="item.pic" mode="aspectFill" @click="bannerNavToUrl(item)"></image>
-				</swiper-item>
-			</swiper>
 		</view>
-		<view class="navbar">
-			<view class="navbar-box flex">
-				<view class="navbar-item" @click="navTo('/pages/category/category')">
-					<image class="nitem-image" src="../../static/index/index03.png" mode=""></image>
-					<view class="nitem-font">全部商品</view>
-				</view>
-				<view class="navbar-item" @click="navTo('/pages/index/jieshao')">
-					<image class="nitem-image" src="../../static/index/index04.png" mode=""></image>
-					<view class="nitem-font">公司介绍</view>
-				</view>
-				<view class="navbar-item" @click="$refs.popupkf.open()">
-					<image class="nitem-image" src="../../static/index/index16.png" mode=""></image>
-					<view class="nitem-font">联系客服</view>
+		<!-- <view class="main-box" v-if="integralList.length != 0">
+			<view class="main-top">
+				<image src="../../static/icon/indexI.png" mode="" class="main-icon"></image>
+				<view class="main-title">积分兑换</view>
+				<view class="main-synopsis">超值体验</view>
+			</view>
+			<view class="main-content">
+				<view class="content-top flex" @click="navTo('/pages/index/integral')">
+					<view class="content-font">
+						<view class="content-title">积分兑换热门好物</view>
+						<view class="content-synopsis">买到就是赚到</view>
+					</view>
+					<image src="../../static/icon/fanhui.png" class="go" mode=""></image>
 				</view>
-
-				<view class="navbar-item" @click="navTo('/pages/user/shareQrCode')">
-					<image class="nitem-image" src="../../static/index/index02.png" mode=""></image>
-					<view class="nitem-font">邀请有礼</view>
+				<view class="commodity flex">
+					<view class="commodity-item" v-for="(item, index) in integralList" :key="item.id" @click="navToDetailPagejf(item)">
+						<image class="commodity-image" :src="item.image" mode=""></image>
+						<view class="commodity-title clamp">{{ item.store_name }}</view>
+						<view class="price clamp">{{ item.result.value[0].integral * 1 }}积分+</view>
+						<view class="vip-price">
+							<text>￥{{ item.result.value[0].price }}</text>
+						</view>
+					</view>
 				</view>
 			</view>
-		</view>
+		</view> -->
 		<view class="product-box" v-if="bastList.length != 0">
 			<view class="product-title">
 				<image class="pt-image" src="../../static/index/index15.png" mode=""></image>
@@ -55,7 +61,7 @@
 			<view class="hotgoods">
 				<view class="hotgoods-item" v-for="item in bastList" :key="item.id" @click="navToDetailPage(item)">
 					<view class="image-wrapper">
-						<image class="image-bg" src="../../static/img/libao-bg.png" mode=""></image>
+						<!-- <image class="image-bg" src="../../static/img/libao-bg.png" mode=""></image> -->
 						<image class="image" :src="item.image" mode="scaleToFill"></image>
 					</view>
 					<view class="title clamp2">{{ item.store_name }}</view>
@@ -94,9 +100,10 @@
 import { lookSubpoints, lookOneself } from '../../api/user.js';
 import seckill from '../../components/seckill/seckill.vue';
 import { loadIndexs } from '@/api/index.js';
+import { article } from '@/api/user.js';
 import { getUserInfo, spread } from '@/api/user.js';
 import { setCoupons } from '@/api/functionalUnit.js';
-import { getBargainList, getProducts } from '@/api/product.js';
+import { getProducts } from '@/api/product.js';
 import { interceptor } from '@/utils/loginUtils';
 import { mapState, mapMutations } from 'vuex';
 // #ifdef H5
@@ -109,8 +116,7 @@ export default {
 	},
 	data() {
 		return {
-			text: 'x18258617070',
-			shareShow: false, //分享海报
+			text: '',
 			pageProportion: 0, //保存页面基于750宽度的比例
 			swiperHeight: 0,
 			checkid: 0,
@@ -121,10 +127,12 @@ export default {
 			swiperLength: 0,
 			carouselList: [], //轮播列表
 			bastList: [], //会员礼包
-			shoplist: [], //商店列表
+			integralList: [], //兑换专区
 			page: 1,
-			limit: 5,
-			bargainlist: []
+			limit: 10,
+			loadType: 'more',
+			text: [],
+			article: []
 		};
 	},
 	computed: {
@@ -132,7 +140,6 @@ export default {
 		...mapState('user', ['hasLogin', 'userInfo'])
 	},
 	onLoad: function(option) {
-		this.getaddress();
 		// #ifdef MP
 		if (option.scene) {
 			// 存储小程序邀请人
@@ -142,9 +149,6 @@ export default {
 			});
 		}
 		// #endif
-		// #ifdef H5
-		this.IndexShare();
-		//#endif
 	},
 	onShow: function() {
 		// 判断是否强制登录
@@ -153,44 +157,21 @@ export default {
 		// 	interceptor();
 		// }
 		this.loadData();
-		this.getProduct();
-		// this.getBargainList();
+		this.getproducts();
 	},
-	//下拉刷新
-	onPullDownRefresh() {
-		this.loadData();
-	},
-	// #ifndef MP
-	// 监听导航栏输入框点击事件
-	onNavigationBarSearchInputClicked(e) {
-		//跳转到搜索页面
-		this.clickSearch();
+	onReachBottom() {
+		this.getproducts();
 	},
-	//点击导航栏 buttons 时触发
-	onNavigationBarButtonTap(e) {
-		const index = e.index;
-		if (index === 0) {
-			this.$api.msg('点击了扫描');
-		} else if (index === 1) {
-			// #ifdef APP-PLUS
-			const pages = getCurrentPages();
-			const page = pages[pages.length - 1];
-			const currentWebview = page.$getAppWebview();
-			currentWebview.hideTitleNViewButtonRedDot({
-				index
-			});
-			// #endif
-			uni.navigateTo({
-				url: '/pages/user/notice'
-			});
-		}
-	},
-	// #endif
 	methods: {
 		...mapMutations(['setLat', 'setLon']),
 		kfClose() {
 			this.$refs.popupkf.close();
 		},
+		goDetails(e) {
+			uni.navigateTo({
+				url: '/pages/index/detail?id=' + this.article[e].id
+			});
+		},
 		// 复制
 		comfirm(text) {
 			console.log(text);
@@ -207,74 +188,6 @@ export default {
 			}
 			this.$refs.popupkp.close();
 		},
-		// #ifdef H5
-		IndexShare() {
-			let obj = this;
-			let pages = getCurrentPages();
-			// 获取当前页面
-			let page = pages[pages.length - 1];
-			let path = '#/' + page.route + '?';
-			// 保存传值
-			for (let i in page.options) {
-				path += i + '=' + page.options[i] + '&';
-			}
-			console.log(obj.Path);
-			// 保存邀请人
-			path += 'spread=' + this.userInfo.uid;
-			let data = {
-				link: this.baseURL + '/index/' + path,
-				title: this.userInfo.nickname + '邀请您进入响亮商城',
-				desc: '欢迎加入响亮商城',
-				imgUrl: 'https://xl.liuniu946.com/index/static/img/logo.jpg'
-			};
-			console.log(data, '分享数据');
-			shareLoad(data);
-		},
-		// #endif
-		getaddress() {
-			console.log('dizhi+++++++++++');
-			let obj = this;
-			// uni.getLocation({
-			// 	type: 'gcj02',
-			// 	success: res => {
-			// 		console.log(res, 123456);
-			// 		obj.setLat(res.latitude);
-			// 		obj.setLon(res.longitude);
-			// 	},
-			// 	fail: err => {
-			// 		console.log(err, 'shi+++++++++++++++');
-			// 		openMap().then(e => {
-			// 			this.getaddress();
-			// 		});
-			// 	}
-			// });
-			weixindata().then(wxOjb => {
-				console.log(wxOjb, '获取微信');
-				wxOjb.getLocation({
-					type: 'gcj02',
-					success: res => {
-						console.log(res, 123456);
-						obj.setLat(res.latitude);
-						obj.setLon(res.longitude);
-					},
-					fail: err => {
-						console.log(err, 'shi+++++++++++++++');
-						openMap().then(e => {
-							this.getaddress();
-						});
-					}
-				});
-			});
-		},
-		//砍价商品推荐详情页
-		navToDetailPages(item) {
-			let id = item.product_id;
-			//let type = 2;
-
-			uni.navigateTo({
-				url: '/pages/product/product?id=' + id
-			});
-		},
 		navTo(url) {
 			if (url == '') {
 				this.$api.msg('暂未开通，敬请期待');
@@ -289,81 +202,14 @@ export default {
 				});
 			}
 		},
-		openSubscribe: function(e) {
-			let page = e;
-			// #ifndef MP
-			uni.navigateTo({
-				url: page
-			});
-			// #endif
-			// #ifdef MP
-			uni.showLoading({
-				title: '正在加载'
-			});
-			openBargainSubscribe()
-				.then(res => {
-					uni.hideLoading();
-					uni.navigateTo({
-						url: page
-					});
-				})
-				.catch(err => {
-					uni.hideLoading();
-				});
-			// #endif
-		},
-		getBargainList() {
-			let that = this;
-
-			getBargainList({
-				page: that.page,
-				limit: that.limit
-			})
-				.then(function(res) {
-					that.$set(that, 'bargainlist', res.data.slice(0, 2));
-					console.log(that.bargainlist);
-				})
-				.catch(res => {
-					console.log(res, 'getBargainList');
-				});
-		},
-		Mask() {
-			this.MaskShow = false;
-			this.shareShow = true;
-			uni.setStorage({
-				key: 'FirstEntry',
-				data: true,
-				success: function() {
-					console.log(uni.getStorageSync('FirstEntry'), 'Mask');
-				}
-			});
-		},
-		Toshare() {
-			if (this.userInfo == '') {
-				getUserInfo({})
-					.then(({ data }) => {
-						this.setUserInfo(data);
-						this.userInfo = data;
-					})
-					.catch(e => {});
-			} else {
-				this.shareShow = false;
-				uni.navigateTo({
-					url: '/pages/user/shareQrCode?spread=' + this.userInfo.uid
-				});
-			}
-		},
-		Tocancel() {
-			this.shareShow = false;
-		},
 		// 监听切换事件
 		listChange(e) {
 			this.checkid = e.detail.current;
 		},
-		// 點擊搜索框
-		clickSearch() {
+		//积分详情页
+		navToDetailPagejf(item) {
 			uni.navigateTo({
-				url: '/pages/product/search'
+				url: '/pages/product/product?id=' + item.id + '&isJF=1'
 			});
 		},
 		// 点击触发领取优惠券
@@ -409,18 +255,24 @@ export default {
 		},
 		// 请求载入数据
 		async loadData() {
+			this.text = [];
+			this.article = [];
 			loadIndexs({})
 				.then(({ data }) => {
 					let goods = data.info;
 					this.carouselList = data.banner;
 					console.log(this.carouselList, 'this.carouselList++++++++');
 					this.swiperLength = this.carouselList.length;
-					// this.bastList = data.giftInfo; //会员礼包
-					uni.stopPullDownRefresh();
+					this.integralList = data.likeInfo; //兑换专区
+					console.log(data.likeInfo, '123456');
 				})
-				.catch(e => {
-					uni.stopPullDownRefresh();
+				.catch(e => {});
+			article({}, 1).then(({ data }) => {
+				data.forEach(e => {
+					this.text.push(e.synopsis);
 				});
+				this.article = data;
+			});
 		},
 		//轮播图切换修改背景色
 		swiperChange(e) {
@@ -435,7 +287,6 @@ export default {
 				url: '/pages/product/product?id=' + id + '&isVip=1'
 			});
 		},
-
 		// 轮播图跳转
 		bannerNavToUrl(item) {
 			// #ifdef H5
@@ -449,10 +300,20 @@ export default {
 				url: item.wap_url
 			});
 		},
-		getProduct() {
-			getProducts().then(res => {
-				console.log(res.data);
-				this.bastList = res.data;
+		getproducts() {
+			const obj = this;
+			if (obj.loadType == 'loading' || obj.loadType == 'nomore') {
+				return;
+			}
+			obj.loadType = 'loading';
+			getProducts({ page: obj.page, limit: obj.limit }).then(({ data }) => {
+				obj.bastList = obj.bastList.concat(data);
+				if (data.length == obj.limit) {
+					obj.page++;
+					obj.loadType = 'more';
+				} else {
+					obj.loadType = 'nomore';
+				}
 			});
 		}
 	}
@@ -462,14 +323,15 @@ export default {
 <style lang="scss">
 .carousel-section {
 	position: relative;
-	padding-top: 10px;
+	width: 750rpx;
+	height: 1310rpx;
 
 	.bg {
 		position: absolute;
 		top: 0;
 		left: 0;
 		width: 750rpx;
-		height: 378rpx;
+		height: 1310rpx;
 
 		image {
 			width: 100%;
@@ -481,132 +343,17 @@ export default {
 		height: var(--status-bar-height);
 		box-sizing: content-box;
 	}
-
-	.search {
-		justify-content: flex-start;
-		padding: 10rpx 32rpx 20rpx;
-		align-items: center;
-
-		.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: #ffffff;
-			padding-left: 10rpx;
-		}
-
-		.shop-jt {
-			margin-left: 8rpx;
-			width: 16rpx;
-			height: 10rpx;
-		}
-
-		.input-box {
-			margin-left: 10rpx;
-			position: relative;
-			z-index: 99;
-			width: 700rpx;
-			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: rgba(255, 255, 255, 0.4);
-
-				.iconsearch {
-					font-size: 50rpx;
-					color: #ffffff;
-				}
-
-				.input {
-					margin-left: 19rpx;
-					flex-grow: 1;
-					color: #ffffff;
-
-					input {
-						font-size: 28rpx;
-
-						color: #ffffff;
-					}
-				}
-			}
-
-			.input-button {
-				padding-left: 20rpx;
-				font-size: $font-base;
-				height: 100%;
-			}
-		}
-	}
 }
-
-.carousel {
-	position: relative;
-	z-index: 3;
-	width: 100%;
-	height: 360rpx;
-
-	.carousel-item {
-		width: 100%;
-		height: 100%;
-		padding: 0 28rpx;
-		overflow: hidden;
-	}
-
-	image {
-		width: 100%;
-		height: 100%;
-		border-radius: $border-radius-sm;
-	}
+.bg2 {
+	margin-top: -60rpx;
+	width: 750rpx;
+	height: 250rpx;
 }
-
-.navbar {
-	position: relative;
-	z-index: 2;
-	margin-top: -200rpx;
+.bg3 {
+	margin-top: -20rpx;
 	width: 750rpx;
-	height: 462rpx;
-	background: #ffffff;
-	border-radius: 40rpx;
-
-	.navbar-box {
-		padding-top: 250rpx;
-
-		.navbar-item {
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			width: 25%;
-
-			.nitem-image {
-				width: 130rpx;
-				height: 130rpx;
-			}
-
-			.nitem-font {
-				font-size: 26rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #000000;
-			}
-		}
-	}
+	height: 750rpx;
 }
-
 .product-box {
 	margin-top: 20rpx;
 	background: #ffffff;
@@ -735,7 +482,121 @@ export default {
 		}
 	}
 }
-
+.main-box {
+	background-color: #ffffff;
+	margin-top: 20rpx;
+	padding: 22rpx 30rpx;
+	.main-top {
+		display: flex;
+		justify-content: flex-start;
+		align-items: center;
+		.main-icon {
+			width: 36rpx;
+			height: 36rpx;
+		}
+		.main-title {
+			margin-left: 8rpx;
+			font-size: 32rpx;
+			font-family: Source Han Sans CN;
+			font-weight: 500;
+			color: #333333;
+		}
+		.main-synopsis {
+			margin-left: 16rpx;
+			font-size: 20rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #95a0b1;
+		}
+	}
+	.main-content {
+		width: 690rpx;
+		background: #f4f4f4;
+		border-radius: 12rpx;
+		margin: 20rpx auto 0;
+		padding-bottom: 10rpx;
+		.xfq {
+			background: linear-gradient(43deg, #ffc063, #ffa163) !important;
+		}
+		.content-top {
+			width: 690rpx;
+			background: linear-gradient(43deg, #73deb2, #52c696);
+			border-radius: 12rpx 12rpx 0px 0px;
+			padding: 24rpx 22rpx 68rpx 27rpx;
+			.content-font {
+				.content-title {
+					font-size: 32rpx;
+					font-family: Source Han Sans CN;
+					font-weight: 500;
+					color: #ffffff;
+				}
+				.content-synopsis {
+					margin-top: 10rpx;
+					font-size: 24rpx;
+					font-family: Source Han Sans CN;
+					font-weight: 400;
+					color: #ffffff;
+				}
+			}
+			.go {
+				width: 30rpx;
+				height: 35rpx;
+				transform: rotate(180deg);
+				-ms-transform: rotate(180deg); /* Internet Explorer */
+				-moz-transform: rotate(180deg); /* Firefox */
+				-webkit-transform: rotate(180deg); /* Safari 和 Chrome */
+				-o-transform: rotate(180deg); /* Opera */
+			}
+		}
+	}
+	.commodity {
+		width: 670rpx;
+		background: #ffffff;
+		border-radius: 8rpx;
+		padding: 2rpx;
+		margin: -50rpx auto 0;
+		flex-wrap: wrap;
+		justify-content: flex-start;
+		.commodity-item {
+			width: 33%;
+			padding: 14rpx 30rpx 22rpx;
+			.commodity-image {
+				width: 160rpx;
+				height: 160rpx;
+			}
+			.commodity-title {
+				margin-top: 14rpx;
+				width: 162rpx;
+				font-size: 24rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #3f3f3f;
+			}
+			.price {
+				font-size: 24rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+			}
+			.vip-price {
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #ff6f0f;
+				image {
+					position: relative;
+					z-index: 10;
+					width: 26rpx;
+					height: 26rpx;
+				}
+				text {
+					display: inline-block;
+					margin-left: 6rpx;
+				}
+			}
+		}
+	}
+}
 .popup-box {
 	width: 522rpx;
 	height: 605rpx;
@@ -826,4 +687,48 @@ export default {
 		}
 	}
 }
+.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/integral.vue

@@ -0,0 +1,242 @@
+<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/money/pay.vue

@@ -6,14 +6,14 @@
 		</view>
 		<view class="pay-type-list">
 			<!-- v-if="ispg == 'android'" -->
-			<!-- <view class="type-item b-b"  @click="changePayType(1)">
+			<view class="type-item b-b" @click="changePayType(1)">
 				<text class="icon iconfont iconweixin"></text>
 				<view class="con">
 					<text class="tit">微信支付</text>
 					<text>推荐使用微信支付</text>
 				</view>
 				<label class="radio"><radio value="" color="#5dbc7c" :checked="payType == 1"></radio></label>
-			</view> -->
+			</view>
 			<!-- <view class="type-item b-b" @click="changePayType(2)">
 				<text class="icon iconfont iconzhifubao"></text>
 				<view class="con"><text class="tit">支付宝支付</text></view>

pages/money/withdrawal.vue

@@ -17,6 +17,7 @@
 				<input class="input" type="number" v-model="withdrawal" placeholder="请输入提现金额" placeholder-class="placeholder" />
 				<view class="buttom" @click="withdrawal = money">全部提现</view>
 			</view>
+			<view class="tip" v-if="withdrawal != 0">提现手续费{{ (withdrawal * 0.05 + 5).toFixed(6) * 1 }},可用阳光抵扣，当前阳光数量{{ userInfo.purple_integral }}</view>
 		</view>
 		<!-- #ifndef MP-WEIXIN -->
 		<view class="list">
@@ -90,7 +91,7 @@
 
 <script>
 import { getMoneyStyle } from '@/utils/rocessor.js';
-import { extractCash, extractBank, aliInfo, bankInfo } from '@/api/wallet.js';
+import { extractCash, extractBank, aliInfo, bankInfo, getMoneyType } 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';
@@ -133,7 +134,7 @@ export default {
 		if (options.type) {
 			this.from = options.type;
 			if (this.from == 'purple') {
-				this.showType = '阳光';
+				this.showType = '肥料';
 			}
 			if (this.from == 'shop') {
 				this.showType = '商家积分';
@@ -150,12 +151,18 @@ export default {
 		// 加载余额信息
 		async loadData() {
 			let obj = this;
+			aliInfo().then(e => {
+				console.log(e, 'eeee');
+				obj.alipay_code = e.data.zfb.payment;
+				obj.alipay_name = e.data.zfb.name;
+				obj.alipay_phone = e.data.zfb.phone;
+			});
 			getUserInfo({})
 				.then(({ data }) => {
 					console.log(data);
 					this.setUserInfo(data);
 					if (obj.from == 'purple') {
-						obj.money = data.purple_integral;
+						obj.money = data.white_integral;
 					}
 					if (obj.from == 'shop') {
 						obj.money = data.business_integral;
@@ -214,7 +221,20 @@ export default {
 				data.bankname = this.bank_name;
 				data.cardnum = this.bank_code;
 			}
+			let zfbData = {
+				type: 2,
+				payment: this.alipay_code,
+				name: this.alipay_name
+			};
 			this.load = true;
+			getMoneyType(zfbData)
+				.then(e => {
+					console.log(e, 'eeeeee');
+					this.$api.prePage().dataUp();
+				})
+				.catch(e => {
+					console.log(e);
+				});
 			extractCash(data)
 				.then(e => {
 					this.loadData();

pages/product/common/productContent.vue

@@ -3,8 +3,8 @@
 		<view class="price-box">
 			<text class="price-tip">¥</text>
 			<view class="price">
-				{{ goodsObjact.price }}
-				<text class="m-price" v-if="goodsObjact.ot_price > goodsObjact.price">¥{{ goodsObjact.ot_price }}</text>
+				{{ goodsObjact.price || 0 }}
+				<!-- <text v-if="goodsObjact.integral != 0">+{{ goodsObjact.integral }}积分</text> -->
 			</view>
 		</view>
 		<text class="title clamp2">{{ goodsObjact.store_name }}</text>
@@ -19,7 +19,7 @@ export default {
 			type: Object,
 			default: function() {
 				return {
-					percent:1
+					percent: 1
 				};
 			}
 		}
@@ -97,7 +97,7 @@ export default {
 		align-items: baseline;
 		height: 64rpx;
 		font-size: 26rpx;
-		color: #FF4C4C;
+		color: #ff4c4c;
 	}
 	.price {
 		font-size: 50rpx;

pages/product/product.vue

@@ -12,14 +12,18 @@
 				</view>
 				<text class="iconfont iconenter"></text>
 			</view>
-			<view class="c-row b-b">
+			<!-- <view class="c-row b-b" v-if="goodsObjact.white_integral != 0">
 				<text>每购买一个送{{ goodsObjact.white_integral }}肥料</text>
 			</view>
+			<view class="c-row b-b" v-if="goodsObjact.give_integral != 0">
+				<text>每购买一个送{{ goodsObjact.give_integral }}商城积分</text>
+			</view>
+			<view class="c-row b-b" v-if="goodsObjact.business_integral != 0">
+				<text>每购买一个送{{ goodsObjact.business_integral }}商家积分</text>
+			</view> -->
 		</view>
 		<!-- 拼货时间及优惠 -->
 		<!-- <discounts @clickCoupon="Getcoupon" :Info="goodsObjact.store_info" :showCoupon="true"></discounts> -->
-		<!-- 猜你喜欢 -->
-		<!-- <guess-like @Addcar='Addcar' @clickNavTo='navToDetailPage' :goodList = 'good_list||[]'></guess-like> -->
 		<!-- 评价 -->
 		<estimate @navTo="navTo('/pages/product/reply?id=' + goodsid)" v-if="reply" :reply="reply" :list="list"></estimate>
 		<!-- 规格信息 -->
@@ -39,7 +43,8 @@
 					<image :src="actionImage"></image>
 					<view class="right">
 						<view class="good-name clamp">{{ goodsObjact.store_name }}</view>
-						<text class="price">¥{{ actionPrice }}</text>
+						<text class="price" v-if="actionIntegral != 0">¥{{ actionPrice }}+{{ actionIntegral }}积分</text>
+						<text class="price" v-else>¥{{ actionPrice }}</text>
 						<!-- <text class="stock">库存：{{ goodsObjact.stock }}件</text> -->
 						<!-- <view class="selected" v-if="goodsType == 0">
 							已选：
@@ -134,6 +139,7 @@ export default {
 			imgList: [],
 			// 对比对象
 			actionPrice: 0, //默认选中商品价格
+			actionIntegral: 0, //默认选中商品积分
 			actionImage: '', //默认选中图片
 			good_list: '', //猜你喜欢列表
 			goodsNumberMax: 0, //最大可购买数量
@@ -207,35 +213,6 @@ export default {
 	computed: {
 		...mapState(['weichatObj', 'baseURL', 'urlFile'])
 	},
-	// 分享
-	// onShareAppMessage(options) {
-	// 	// 设置菜单中的转发按钮触发转发事件时的转发内容
-	// 	let pages = getCurrentPages(); //获取加载的页面
-	// 	let currentPage = pages[pages.length - 1]; //获取当前页面的对象
-	// 	let url = currentPage.route; //当前页面url
-	// 	let item = currentPage.options; //如果要获取url中所带的参数可以查看options
-	// 	let shareObj = {
-	// 		title: this.goodsObjact.store_name,
-	// 		desc: obj.goodsObjact.store_info,
-	// 		path: url + '?id=' + item.id + '&spread=' + this.userInfo.uid, // 默认是当前页面，必须是以‘/’开头的完整路径
-	// 		imageUrl: this.goodsObjact.image,
-	// 		success: function(res) {
-	// 			// 转发成功之后的回调
-	// 			if (res.errMsg == 'shareAppMessage:ok') {
-	// 			}
-	// 		},
-	// 		fail: function() {
-	// 			// 转发失败之后的回调
-	// 			if (res.errMsg == 'shareAppMessage:fail cancel') {
-	// 				// 用户取消转发
-	// 			} else if (res.errMsg == 'shareAppMessage:fail') {
-	// 				// 转发失败，其中 detail message 为详细失败信息
-	// 			}
-	// 		}
-	// 	};
-
-	// 	return shareObj;
-	// },
 	methods: {
 		//选择规格
 		selectSpec(item, arr, ind) {
@@ -251,6 +228,7 @@ export default {
 				obj.buys_show = true;
 				obj.buys_shows = false;
 				obj.actionPrice = obj.productValue[str].price;
+				obj.actionIntegral = obj.productValue[str].integral; //保存默认选中商品积分
 				obj.goodsNumberMax = obj.productValue[str].stock;
 				obj.actionImage = obj.productValue[str].image;
 				obj.uniqueId = obj.productValue[str].unique;
@@ -283,12 +261,6 @@ export default {
 			// 保存当前购买类型
 			this.type = str;
 		},
-		//领取优惠券
-		Getcoupon() {
-			uni.navigateTo({
-				url: '/pages/coupon/getcoupon'
-			});
-		},
 		// 购买数量变化
 		numberChange(e) {
 			this.goodsNumber = e.number;
@@ -318,13 +290,6 @@ export default {
 			}
 		},
 		// #endif
-		//详情页
-		navToDetailPage(item) {
-			let id = item.id;
-			uni.navigateTo({
-				url: '/pages/product/product?id=' + id
-			});
-		},
 		// 跳转页面
 		navTo(url) {
 			uni.navigateTo({
@@ -363,6 +328,7 @@ export default {
 				obj.good_list = data.good_list; //保存猜你喜欢列表
 				obj.reply = data.reply; //保存评论列表
 				let goods = data.storeInfo;
+				goods.integral = data.integral;
 				obj.goodsObjact = goods;
 				console.log(obj.goodsObjact, 'obj.goodsObjact');
 				if (obj.goodsObjact.description != null) {
@@ -385,6 +351,7 @@ export default {
 					console.log(str, 'str');
 					// 设置默认值
 					obj.actionPrice = obj.productValue[str].price;
+					obj.actionIntegral = obj.productValue[str].integral; //保存默认选中商品积分
 					obj.goodsNumberMax = obj.productValue[str].stock;
 					obj.actionImage = obj.productValue[str].image;
 					obj.uniqueId = obj.productValue[str].unique;
@@ -393,6 +360,7 @@ export default {
 					obj.many = 1;
 					obj.productValue = data.productValue; //保存分类查询数据
 					obj.actionPrice = goods.price; //保存默认选中商品价格
+					obj.actionIntegral = goods.integral; //保存默认选中商品积分
 					obj.actionImage = goods.image_base; //保存默认选中商品图片
 					obj.goodsNumberMax = goods.stock; //保存默认选中最大可购买商品数量
 				}
@@ -647,7 +615,7 @@ export default {
 			}
 
 			.price {
-				font-size: 60rpx;
+				font-size: 40rpx;
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #ff6f0f;

pages/public/login.vue

@@ -3,7 +3,7 @@
 		<view class="top"><image src="../../static/img/login-bg.png" mode=""></image></view>
 		<view class="logo">
 			<view class="logo-img"><image src="../../static/img/logo.png" mode=""></image></view>
-			<view class="logo-title">微乐购</view>
+			<view class="logo-title">微乐种</view>
 		</view>
 		<view class="login-box">
 			<view class="username"><image src="../../static/img/phone.png" mode=""></image></view>

pages/public/register.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
 		<view class="status_bar"><!-- 这里是状态栏 --></view>
-		<view class="loginTitle">欢迎注册微乐购商城</view>
+		<view class="loginTitle">欢迎注册微乐种商城</view>
 		<view class="loginText">请认真填写个人信息</view>
 		<view class="login-box">
 			<view class="username">账号</view>
@@ -23,7 +23,7 @@
 			<input class="input-box" type="password" v-model="payPass" placeholder="请输入6位数的交易密码" />
 		</view> -->
 		<view class="login-box">
-			<view class="username">邀请码</view>
+			<view class="username">邀请码(选填)</view>
 			<input class="input-box" type="text" v-model="invitation" placeholder="请输入邀请码" />
 		</view>
 		<label class="two" @click="checkboxChange">
@@ -87,10 +87,10 @@ export default {
 				obj.$api.msg('请输入验证码');
 				return;
 			}
-			if (obj.invitation == '') {
-				obj.$api.msg('请输入邀请码');
-				return;
-			}
+			// if (obj.invitation == '') {
+			// 	obj.$api.msg('请输入邀请码');
+			// 	return;
+			// }
 			if (!obj.istype) {
 				obj.$api.msg('请查看并同意用户协议和隐私政策');
 				return;

pages/set/set.vue

@@ -6,6 +6,7 @@
 			<uni-list-item title="修改密码" @click="navTo('/pages/set/password')"></uni-list-item>
 			<!-- #endif -->
 			<!-- <uni-list-item title="绑定手机" @click="navTo('/pages/set/phone')"></uni-list-item> -->
+			<uni-list-item title="关于我们" @click="navTo('/pages/user/about')"></uni-list-item>
 			<uni-list-item title="隐私政策" @click="navTo('/pages/contract/privacy')"></uni-list-item>
 			<uni-list-item title="会员协议" @click="navTo('/pages/contract/agreement')"></uni-list-item>
 			<uni-list-item title="收货地址" @click="navTo('/pages/set/address')"></uni-list-item>

pages/user/about.vue

@@ -0,0 +1,65 @@
+<template>
+	<view class="conter">
+		<view class="box">
+			<!-- <image src="../../static/img/about.png" class="image" mode=""></image> -->
+			<view class="image"><image src="../../static/img/logo.png" mode=""></image></view>
+			<view class="title">V1.3.9</view>
+		</view>
+		<view class="main">
+			<text>
+				宁德市谦沐商务有限公司，2022年创立于福建宁德 ，公司以网站建设核心业务 专注于创意设计和传播应用 ，探索并实现商业价值最大化，为所有谋求长远发展的企业机构贡献全力。
+				宁德市谦沐商务有限公司注重专业探索，摒弃虚浮夸张，在更深远的认知中，将不断修正服务导向，完善制作品格，以探求精品塑造与理念升华，勇做推动行业发展的中坚力量
+			</text>
+		</view>
+		<view class="tip">
+			宁德市谦沐商务有限公司
+			<br />
+			版权所有
+		</view>
+	</view>
+</template>
+
+<script></script>
+
+<style lang="scss">
+.conter,
+page {
+	background: #f1f1f1;
+	height: 100%;
+}
+.box {
+	width: 100%;
+	text-align: center;
+	.image {
+		width: 162rpx;
+		height: 162rpx;
+		margin: 0 auto;
+		margin-top: 88rpx;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.title {
+		font-size: 30rpx;
+		font-family: PingFangSC;
+		font-weight: 500;
+		color: #666666;
+	}
+}
+.main {
+	background-color: #ffffff;
+	padding: 20rpx 50rpx;
+	margin-top: 70rpx;
+	font-size: 30rpx;
+	font-family: PingFangSC;
+	font-weight: 500;
+	color: #000000;
+	line-height: 54rpx;
+}
+.tip {
+	margin-top: 100rpx;
+	text-align: center;
+	color: #666666;
+}
+</style>

pages/user/purpleJf.vue

@@ -11,10 +11,10 @@
 				<view class="money">{{ userInfo.purple_integral | getMoneyStyle }}</view>
 				<view>当前余额</view>
 			</view>
-			<view class="moneybtn-box">
-				<view class="money-btn"><!-- 					易货券转账 --></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>
 		<view class="info-box flex">
 			<view class="info-item">

pages/user/team.vue

@@ -1,385 +1,409 @@
 <template>
 	<view class="content">
 		<view class="content-money">
-			<view class="status_bar">
-				<!-- 这里是状态栏 -->
-			</view>
+			<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/icon/fanhui.png" mode=""></image></view>
 				<view class="header">我的推广</view>
 			</view>
-			<view class="content-bg">
-				<image src="../../static/img/promotion-bg.png" mode=""></image>
-			</view>
+			<view class="content-bg"><image src="../../static/img/promotion-bg.png" mode=""></image></view>
 			<view class="money-box">
-				<view class="money">{{ all }}</view>
+				<view class="money">{{ navList.count || 0 }}</view>
 				<view>我的推广人数</view>
 			</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 class="list-scroll-content" :style="{ height: maxheight }" scroll-y
-					@scrolltolower="loadData">
-					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-
-					<view v-for="(item, index) in tabItem.orderList" :key="index" class="order-item flex">
-						<view class="title-box flex_item">
-							<view class="title-avatar">
-								<image :src="item.avatar"></image>
-							</view>
-							<view class="list_tpl">
-								<view class="title">
-									<view class="title-name clamp">{{ item.nickname }}</view>
-								</view>
-								<view class="time">
-									<text>{{ item.time }}</text>
-								</view>
-							</view>
-							<!-- <view class="money">
-								<text>{{ item.self_achievement == null ? '未购买' : item.self_achievement + '元' }}</text>
-							</view> -->
-						</view>
-					</view>
-					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
+		<view class="info-box flex">
+			<view class="info-item">
+				<view class="info-font">参与人数</view>
+				<view class="info-num">{{ navList.count || 0 }}</view>
+			</view>
+			<view class="shu"></view>
+			<view class="info-item">
+				<view class="info-font">累计参与积分</view>
+				<view class="info-num">{{ navList.user_price || 0 }}</view>
+			</view>
+		</view>
+		<view class="content-box" v-for="item in navList.user_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.phone }}</view>
+				</view>
+			</view>
+
+			<view class="content-box-right">
+				<view class="state">{{ item.zt == 0 ? '间推' : '直推' }}</view>
+				<view class="box-right">
+					参与积分:
+					<span>{{ item.price }}</span>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 <script>
-	import {
-		myspread
-	} from '@/api/user.js';
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-	export default {
-		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,
-				navList: [{
+import { myspread, tuiguang } from '@/api/user.js';
+import { mapState, mapMutations } from 'vuex';
+export default {
+	data() {
+		return {
+			// 头部图高度
+			maxheight: '',
+			tabCurrentIndex: 0,
+			navList: [
+				{
 					state: 0,
 					text: '直接推荐',
 					loadingType: 'more',
 					orderList: [],
 					page: 1, //当前页数
 					limit: 10 //每次信息条数
-				}],
-				all: '',
-				list: '',
-			};
-		},
-		computed: {
-			...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
+				}
+			],
+			all: '',
+			list: ''
+		};
+	},
+	computed: {
+		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin']),
+		getPhone() {
+			let reg = /(\d{3})\d{4}(\d{4})/;
+			this.navList.user_list.forEach(e => {
+				return e.phone.replace(reg, '$1****$2');
+				console.log(e.phone.replace(reg, '$1****$2'));
+			});
+		}
+	},
+	onLoad(options) {},
+	onShow() {
+		this.loadData();
+	},
+	methods: {
+		// 页面跳转
+		navto(e) {
+			uni.navigateTo({
+				url: e
+			});
 		},
-		onLoad(options) {},
-		onShow() {
-			this.loadData();
+		//获取收入支出信息
+		async loadData(source) {
+			tuiguang().then(res => {
+				console.log(res, 'data');
+				this.navList = res.data;
+			});
 		},
-		methods: {
-			// 页面跳转
-			navto(e) {
-				uni.navigateTo({
-					url: e
-				});
-			},
-			//获取收入支出信息
-			async loadData(source) {
-				//这里是将订单挂载到tab列表下
-				let index = this.tabCurrentIndex;
-				let navItem = this.navList[index];
-				let state = navItem.state;
-				if (source === 'tabChange' && navItem.loaded === true) {
-					//tab切换只有第一次需要加载数据
-					return;
-				}
-				if (navItem.loadingType === 'loading') {
-					//防止重复加载
-					return;
-				}
-				if (navItem.loadingType === 'noMore') {
-					//防止重复加载
-					return;
-				}
-				// 修改当前对象状态为加载中
-				navItem.loadingType = 'loading';
-				myspread({
-						page: navItem.page,
-						limit: navItem.limit
-					})
-					.then(({
-						data
-					}) => {
-						console.log(data);
-						this.all = data.total;
-						if (data.list.length > 0) {
-							this.list = data.list;
-							navItem.orderList = navItem.orderList.concat(data.list);
-							navItem.page++;
-						}
-						this.$nextTick(function() {
-							if (navItem.limit == data.list.length) {
-								//判断是否还有数据， 有改为 more， 没有改为noMore
-								navItem.loadingType = 'more';
-								return;
-							} else {
-								//判断是否还有数据， 有改为 more， 没有改为noMore
-								navItem.loadingType = 'noMore';
-							}
-						});
-						this.$set(navItem, 'loaded', true);
-					})
-					.catch(e => {
-						console.log(e);
-					});
-			},
-			//swiper 切换
-			changeTab(e) {
-				this.tabCurrentIndex = e.target.current;
-				this.loadData('tabChange');
-			},
-			//顶部tab点击
-			tabClick(index) {
-				this.tabCurrentIndex = index;
-			},
-			// 点击返回 我的页面
-			toBack() {
-				uni.switchTab({
-					url: '/pages/user/user'
-				});
-			}
+		// 点击返回 我的页面
+		toBack() {
+			uni.switchTab({
+				url: '/pages/user/user'
+			});
 		}
-	};
+	}
+};
 </script>
 
 <style lang="scss">
-	page {
-		background: #f8f8f8;
-		height: 100%;
-	}
+page {
+	background: #f8f8f8;
+	height: 100%;
+}
 
-	.status_bar {
-		height: var(--status-bar-height);
-		width: 100%;
-		background: #5dbc7c;
-	}
+.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;
 
-	.content-money {
-		position: relative;
-		height: 480rpx;
+	.info-item {
+		width: 50%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		line-height: 1;
 
-		.content-bg {
-			position: absolute;
-			top: 0;
-			left: 0;
-			right: 0;
-			width: 750rpx;
-			height: 480rpx;
+		.info-font {
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #999999;
+		}
 
-			image {
-				width: 100%;
-				height: 100%;
-			}
+		.info-num {
+			margin-top: 30rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #181818;
 		}
+	}
 
-		.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;
-			}
+	.shu {
+		width: 2rpx;
+		height: 74rpx;
+		background: #dcdfe6;
+	}
+}
 
-			.goback-box {
-				position: absolute;
-				left: 18rpx;
-				top: 0;
-				height: 80rpx;
-				display: flex;
-				align-items: center;
-			}
+.status_bar {
+	height: var(--status-bar-height);
+	width: 100%;
+	background: #5dbc7c;
+}
 
-			.goback {
-				z-index: 100;
-				width: 34rpx;
-				height: 34rpx;
-			}
+.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%;
 		}
 	}
 
-	.money-box {
-		position: relative;
-		z-index: 2;
-		padding-top: 90rpx;
-		color: #ffffff;
+	.body-title {
+		height: 80rpx;
 		text-align: center;
+		font-size: 35rpx;
+		position: relative;
 
-		.money {
-			font-size: 72rpx;
+		.header {
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 100%;
+			font-size: 36rpx;
 			font-family: PingFang SC;
 			font-weight: bold;
-			color: #ffffff;
+			color: #fffeff;
+			height: 80rpx;
+			font-size: 36rpx;
+			font-weight: 700;
+			z-index: 9;
+			display: flex;
+			justify-content: center;
+			align-items: center;
 		}
 
-		.text {
-			font-size: 30rpx;
+		.goback-box {
+			position: absolute;
+			left: 18rpx;
+			top: 0;
+			height: 80rpx;
+			display: flex;
+			align-items: center;
+		}
+
+		.goback {
+			z-index: 100;
+			width: 34rpx;
+			height: 34rpx;
 		}
 	}
+}
 
-	.order-item {
-		padding: 20rpx 30rpx;
-		line-height: 1.5;
+.money-box {
+	position: relative;
+	z-index: 2;
+	padding-top: 90rpx;
+	color: #ffffff;
+	text-align: center;
 
-		.title-box {
-			width: 100%;
+	.money {
+		font-size: 72rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #ffffff;
+	}
 
-			.title-avatar {
-				flex-shrink: 0;
-				width: 100rpx;
-				height: 100rpx;
-				margin-right: 25rpx;
-				border-radius: 100%;
+	.text {
+		font-size: 30rpx;
+	}
+}
 
-				image {
-					width: 100%;
-					height: 100%;
-					border-radius: 100%;
-				}
+.order-item {
+	padding: 20rpx 30rpx;
+	line-height: 1.5;
+
+	.title-box {
+		width: 100%;
+
+		.title-avatar {
+			flex-shrink: 0;
+			width: 100rpx;
+			height: 100rpx;
+			margin-right: 25rpx;
+			border-radius: 100%;
+
+			image {
+				width: 100%;
+				height: 100%;
+				border-radius: 100%;
 			}
+		}
 
-			.list_tpl {
-				width: 85%;
-
-				.title {
-					display: flex;
-					justify-content: flex-start;
-					font-size: $font-lg;
-					color: $font-color-base;
-					overflow: hidden; //超出的文本隐藏
-					text-overflow: ellipsis; //溢出用省略号显示
-					white-space: nowrap;
-					line-height: 1;
-					text-align: center;
+		.list_tpl {
+			width: 85%;
 
-					.title-name {
-						max-width: 40%;
-					}
+			.title {
+				display: flex;
+				justify-content: flex-start;
+				font-size: $font-lg;
+				color: $font-color-base;
+				overflow: hidden; //超出的文本隐藏
+				text-overflow: ellipsis; //溢出用省略号显示
+				white-space: nowrap;
+				line-height: 1;
+				text-align: center;
 
-					.dl {
-						margin-left: 10rpx;
-						width: 93rpx;
-						height: 32rpx;
-						border-radius: 16rpx;
+				.title-name {
+					max-width: 40%;
+				}
 
-						image {
-							width: 93rpx;
-							height: 32rpx;
-							border-radius: 16rpx;
-						}
-					}
+				.dl {
+					margin-left: 10rpx;
+					width: 93rpx;
+					height: 32rpx;
+					border-radius: 16rpx;
 
-					.class {
-						display: inline-block;
-						margin-left: 10rpx;
-						padding: 6rpx;
-						text-align: center;
-						border: 1px solid #2e58ff;
+					image {
+						width: 93rpx;
+						height: 32rpx;
 						border-radius: 16rpx;
-						font-size: 20rpx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #2e58ff;
 					}
 				}
 
-				.time {
-					font-size: $font-base;
-					color: $font-color-light;
+				.class {
+					display: inline-block;
+					margin-left: 10rpx;
+					padding: 6rpx;
+					text-align: center;
+					border: 1px solid #2e58ff;
+					border-radius: 16rpx;
+					font-size: 20rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #2e58ff;
 				}
 			}
-		}
 
-		.money {
-			width: 50%;
-			text-align: right;
-			color: #db1935;
-			font-size: $font-lg;
+			.time {
+				font-size: $font-base;
+				color: $font-color-light;
+			}
 		}
 	}
 
-	.yeji {
-		position: relative;
-		margin: -72rpx auto 0;
-		width: 690rpx;
-		height: 143rpx;
-		background: #ffffff;
-		box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(50, 50, 52, 0.06);
-		border-radius: 10rpx;
+	.money {
+		width: 50%;
+		text-align: right;
+		color: #db1935;
+		font-size: $font-lg;
+	}
+}
+
+.yeji {
+	position: relative;
+	margin: -72rpx auto 0;
+	width: 690rpx;
+	height: 143rpx;
+	background: #ffffff;
+	box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(50, 50, 52, 0.06);
+	border-radius: 10rpx;
+	display: flex;
+	align-items: center;
+
+	.yeji-a {
+		width: 50%;
 		display: flex;
+		flex-direction: column;
+		justify-content: center;
 		align-items: center;
 
-		.yeji-a {
-			width: 50%;
+		.yeji-top {
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #333333;
+		}
+
+		.yeji-buttom {
+			font-size: 42rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #333333;
+		}
+	}
+
+	.border {
+		width: 1rpx;
+		height: 51rpx;
+		background: #dddddd;
+	}
+}
+
+.content-box {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin: 30rpx;
+
+	.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: center;
-			align-items: center;
+			justify-content: space-around;
 
-			.yeji-top {
-				font-size: 28rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #333333;
+			.top {
+				font-weight: 500;
+				font-size: 30rpx;
 			}
 
-			.yeji-buttom {
-				font-size: 42rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #333333;
+			.bottom {
+				color: #999999;
 			}
 		}
+	}
 
-		.border {
-			width: 1rpx;
-			height: 51rpx;
-			background: #dddddd;
+	.content-box-right {
+		display: flex;
+		flex-direction: column;
+		width: 230rpx;
+		color: #999999;
+		.state {
+			color: red;
+		}
+		span {
+			color: red;
+			font-size: 28rpx;
 		}
 	}
+}
 </style>

pages/user/user.vue

@@ -1,22 +1,20 @@
 <template>
 	<view class="container">
 		<!-- #ifdef APP-PLUS -->
-		<view class="vheigh"></view>
+		<!-- <view class="vheigh"></view> -->
 		<!-- #endif -->
-		<view class="user-top">
-			<image src="../../static/index/index13.png" mode="" class="user-top-bg"></image>
-			<view class="user-info" @click="navTo('/pages/set/set')">
-				<image class="avtar" :src="userInfo.avatar" mode=""></image>
-				<view class="name">{{ userInfo.nickname }}</view>
-				<view class="phone">{{ userInfo.phone }}</view>
-				<view class="vip-box">
-					<view class="vip">
-						<image class="vip-bg" src="../../static/img/vip.png" mode=""></image>
-						<view class="vip-title">V{{ userInfo.level }}</view>
-					</view>
+		<view class="user-top"><image src="../../static/img/user01.png" mode="" class="user-top-bg"></image></view>
+		<view class="user-info">
+			<image @click="navTo('/pages/set/set')" class="avtar" :src="userInfo.avatar" mode=""></image>
+			<!-- <view class="name">{{ userInfo.nickname }}</view> -->
+			<view @click="navTo('/pages/set/set')" class="phone">{{ userInfo.phone | phone }}</view>
+			<view @click="navTo('/pages/set/set')" class="vip-box">
+				<view class="vip">
+					<image class="vip-bg" src="../../static/img/vip.png" mode=""></image>
+					<view class="vip-title">V{{ userInfo.level }}</view>
 				</view>
 			</view>
-			<view class="sy-box flex">
+			<!-- <view class="sy-box flex">
 				<view class="sy-item" @click="navTo('/pages/user/whiteJf')">
 					<view class="sy-item-name">我的肥料</view>
 					<view class="sy-item-val">{{ userInfo.white_integral || '0.00' }}</view>
@@ -31,18 +29,14 @@
 					<view class="sy-item-name">我的洒水壶</view>
 					<view class="sy-item-val">{{ greenNum }}</view>
 				</view>
-			</view>
+			</view> -->
 		</view>
-		<view class="item-box">
+		<!-- <view class="item-box">
 			<view class="order-section">
 				<view class="order-item" @click="navTo('/pages/user/purpleJf')" hover-class="common-hover" :hover-stay-time="50">
 					<view class="icon"><image class="icon-img" src="/static/icon/myyj.png" mode="aspectFit"></image></view>
 					<text>我的阳光</text>
 				</view>
-				<view class="order-item" @click="navTo('/pages/user/shopJf')" hover-class="common-hover" :hover-stay-time="50">
-					<view class="icon"><image class="icon-img" src="/static/icon/myqb.png" mode="aspectFit"></image></view>
-					<text>能量金豆</text>
-				</view>
 				<view class="order-item" @click="navTo('/pages/user/mallJf')" hover-class="common-hover" :hover-stay-time="50">
 					<view class="icon"><image class="icon-img" src="/static/icon/mygx.png" mode="aspectFit"></image></view>
 					<text>商城积分</text>
@@ -52,9 +46,9 @@
 					<text>我的推广</text>
 				</view>
 			</view>
-		</view>
+		</view> -->
 		<!-- 订单 -->
-		<view class="item-box item-box-b" style="margin-top: -200rpx;">
+		<view class="item-box item-box-b">
 			<view class="box-title flex ">
 				<view class="title"><text>我的订单</text></view>
 				<view class="link" @click="navTo('/pages/order/order?state=0')" hover-class="common-hover"><text class="iconfont iconenter"></text></view>
@@ -104,11 +98,11 @@
 			<view class="">我的收藏</view>
 			<image src="../../static/icon/goto.png" mode="widthFix" class="right-img"></image>
 		</view>
-		<view class="btm-box flex" @click="navTo('/pages/user/shareQrCode')">
+		<!-- <view class="btm-box flex" @click="navTo('/pages/user/shareQrCode')">
 			<image src="../../static/icon/tghb.png" mode="widthFix" class="left-img"></image>
 			<view class="">推广海报</view>
 			<image src="../../static/icon/goto.png" mode="widthFix" class="right-img"></image>
-		</view>
+		</view> -->
 		<view class="btm-box flex" @click="navTo('/pages/set/address')">
 			<image src="../../static/icon/shdz.png" mode="widthFix" class="left-img"></image>
 			<view class="">收货地址</view>
@@ -170,6 +164,18 @@ export default {
 			userMaxDowm: 0 //卡片最高高度
 		};
 	},
+	filters: {
+		phone(value) {
+			if (value != null) {
+				var subStr1 = value.substr(0, 3);
+				var subStr2 = value.substr(value.length - 4, 4);
+				var subStr = subStr1 + '***' + subStr2;
+				console.log(subStr);
+				value = subStr;
+				return value;
+			}
+		}
+	},
 	onShow() {
 		this.loadBaseData();
 		// 判断是否已经登录
@@ -288,85 +294,75 @@ page {
 
 .vheigh {
 	height: var(--status-bar-height);
-	// background-color: #fff;
 }
 
 .user-top {
-	height: 564rpx;
+	height: 500rpx;
 	position: relative;
 
 	.user-top-bg {
 		width: 750rpx;
-		height: 564rpx;
-		// width: 100%;
-		// position: absolute;
+		height: 500rpx;
 	}
-	.user-info {
-		width: 750rpx;
-		position: absolute;
-		top: 50rpx;
+}
+
+.user-info {
+	width: 708rpx;
+	background: #fff;
+	border-radius: 28rpx;
+	background-color: white;
+	margin: -280rpx auto 30rpx;
+	position: relative;
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+	padding: 40rpx 0;
+	.avtar {
+		width: 134rpx;
+		height: 134rpx;
+		border-radius: 50%;
+	}
+	.phone {
+		margin-top: 8rpx;
+		font-size: 29rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #000;
+	}
+	.vip-box {
+		margin-top: 10rpx;
 		display: flex;
-		flex-direction: column;
-		justify-content: center;
 		align-items: center;
-		.avtar {
-			width: 134rpx;
-			height: 134rpx;
-			border-radius: 50%;
-		}
-		.name {
-			margin-top: 10rpx;
-			font-size: 39rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #ffffff;
-		}
-		.phone {
-			margin-top: 8rpx;
-			font-size: 29rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #ffffff;
-		}
-		.vip-box {
-			margin-top: 10rpx;
-			display: flex;
-			align-items: center;
-			line-height: 1;
-			.vip {
+		line-height: 1;
+		.vip {
+			position: relative;
+			margin-left: 12rpx;
+			width: 130rpx;
+			height: 40rpx;
+			.vip-bg {
+				position: absolute;
+				top: 0;
+				left: 0;
+				right: 0;
+				width: 100%;
+				height: 100%;
+			}
+			.vip-title {
 				position: relative;
-				margin-left: 12rpx;
-				width: 130rpx;
-				height: 40rpx;
-				.vip-bg {
-					position: absolute;
-					top: 0;
-					left: 0;
-					right: 0;
-					width: 100%;
-					height: 100%;
-				}
-				.vip-title {
-					position: relative;
-					z-index: 10;
-					font-size: 20rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #93794b;
-					padding-left: 46rpx;
-					line-height: 40rpx;
-				}
+				z-index: 10;
+				font-size: 20rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #93794b;
+				padding-left: 46rpx;
+				line-height: 40rpx;
 			}
 		}
 	}
-
 	.sy-box {
-		position: absolute;
-		bottom: 30rpx;
-		height: 148rpx;
-		width: 750rpx;
-
-		// background-color: #bfa;
+		width: 100%;
+		margin-top: 40rpx;
 		.sy-item {
 			width: 30%;
 			flex-grow: 1;
@@ -374,7 +370,7 @@ page {
 			font-size: 28rpx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #ffffff;
+			color: #000;
 
 			.sy-item-val {
 				font-size: 39rpx;
@@ -383,12 +379,11 @@ page {
 
 		.jg {
 			width: 2rpx;
-			height: 68rpx;
-			background-color: #fff;
+			height: 30rpx;
+			background-color: #b6b6b6;
 		}
 	}
 }
-
 %flex-center {
 	display: flex;
 	flex-direction: column;
@@ -409,7 +404,7 @@ page {
 	background: #fff;
 	border-radius: 28rpx;
 	background-color: white;
-	margin: -40rpx auto 30rpx;
+	margin: 20rpx auto 30rpx;
 	position: relative;
 
 	// margin-top: 20rpx;

pages/user/whiteJf.vue

@@ -11,14 +11,10 @@
 				<view class="money">{{ userInfo.white_integral | getMoneyStyle }}</view>
 				<view>当前余额</view>
 			</view>
-			<!-- <view class="moneybtn-box">
-				<view class="money-btn" @click="navto('/pages/money/withdmoenys?type=yue')">
-					易货券转账
-				</view>
-				<view class="money-btn" @click="navto('/pages/money/recharge')">
-					易货券充值
-				</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">

unpackage/cache/.storyboard

@@ -0,0 +1 @@
+md5=771374d6bee98073a9bf9266d7e63e76

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/82de05b0-e212-11ec-9e41-97e2e4c386af
+https://ide.dcloud.net.cn/build/download/6db09c70-ee1c-11ec-b2e9-891387a8e105

unpackage/cache/appleConfig.ini

@@ -0,0 +1,30 @@
+[appleAppid]
+appleAppid=com.wlg.appname
+
+[appstore]
+appstore=a345c7818898c33f7f08ea15fd19f7d8
+
+[iosStyle]
+iosStyle=storyboard
+
+[universalLinks]
+universalLinks=https://static-f2ce8da9-3823-402a-bd21-675f08b3b09b.bspapp.com/uni-universallinks/__UNI__CDE33A2/
+spaceid=f2ce8da9-3823-402a-bd21-675f08b3b09b
+
+[universalLinks_qq]
+universalLinks_qq=
+spaceid_qq=
+
+[universalLinks_weibo]
+universalLinks_weibo=
+spaceid_weibo=
+
+[iphone]
+app%402x=8d44e4175d5ccf28b99a0c798bd17ee4
+app%403x=917081bcc6a1afa437fa31cee75ab741
+notification%402x=ccfb05125c05bece2b167dee51a6bd5e
+notification%403x=b70411bfeffb73fe9f52ac42206c638c
+settings%402x=c621f5f7396a63a760bd557848ed0b99
+settings%403x=91c4a20e180b6ff66b386b65486ba010
+spotlight%402x=0cc79e1816d3f192e72b11db67a23f50
+spotlight%403x=8d44e4175d5ccf28b99a0c798bd17ee4

unpackage/cache/certdataios

@@ -0,0 +1,3 @@
+iosProfile=C:/Users/Administrator/Desktop/wlgapp.mobileprovision
+ioscertFile=C:/Users/Administrator/Desktop/证书(4).p12
+ioscertPassword=ep/Tdjka4Y7WYqDB6/S7dw==

unpackage/cache/ipa/apple-app-site-association

@@ -0,0 +1,15 @@
+{
+    "applinks" : {
+        "apps" : [],
+        "details" : [
+            {
+                "appID" : "8346YX59CJ.io.dcloud.xhg",
+                "paths" : [ "/uni-universallinks/__UNI__F0D4DD1" ]
+            },
+            {
+                "appID" : "L26A379JSA.com.wlg.appname",
+                "paths" : [ "/uni-universallinks/__UNI__CDE33A2" ]
+            }
+        ]
+    }
+}