3-18-1

api/functionalUnit.js

@@ -63,4 +63,13 @@ export function signUser(data) {
 		method: 'post',
 		data
 	});
+}
+
+// 签到配置
+export function signConfig(data) {
+	return request({
+		url: '/api/sign/config',
+		method: 'get',
+		data
+	});
 }

api/wallet.js

@@ -96,37 +96,62 @@ export function balance(data) {
 		method: 'get',
 		data
 	});
+}
+
+//
+export function yue(data) {
+	return request({
+		url: '/api/now_money/list',
+		method: 'get',
+		data
+	});
 }
-
-//
-export function yue(data) {
-	return request({
-		url: '/api/now_money/list',
-		method: 'get',
-		data
-	});
-}
-
-export function integral(data) {
-	return request({
-		url: '/api/integral/list',
-		method: 'get',
-		data
-	});
+
+export function integral(data) {
+	return request({
+		url: '/api/integral/list',
+		method: 'get',
+		data
+	});
 }
 
-export function getBank(data) {
-	return request({
-		url: '/api/auction/pay_list',
-		method: 'get',
-		data
-	});
-}
-
-export function setBank(data) {
-	return request({
-		url: '/api/auction/pay',
-		method: 'post',
-		data
-	});
+export function getBank(data) {
+	return request({
+		url: '/api/auction/pay_list',
+		method: 'get',
+		data
+	});
+}
+
+export function setBank(data) {
+	return request({
+		url: '/api/auction/pay',
+		method: 'post',
+		data
+	});
+}
+
+export function fllj(data) {
+	return request({
+		url: '/api/cumulative_bill',
+		method: 'get',
+		data
+	});
+}
+
+export function flff(data) {
+	return request({
+		url: '/api/cumulative_grant',
+		method: 'get',
+		data
+	});
 }
+
+
+export function getTj(data) {
+	return request({
+		url: '/api/cumulative',
+		method: 'get',
+		data
+	});
+}

manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "乐品优选",
+    "name" : "亿豪优选",
     "appid" : "__UNI__F0EBD91",
     "description" : "",
     "versionName" : "1.0.0",
@@ -65,7 +65,7 @@
         }
     },
     "h5" : {
-        "title" : "乐品优选",
+        "title" : "亿豪优选",
         "domain" : "",
         "router" : {
             "base" : "/index/",
@@ -74,7 +74,7 @@
         "devServer" : {
             "proxy" : {
                 "/api" : {
-                    "target" : "http://lpyg.liuniu946.com/api",
+                    "target" : "http://yhyx.liuniu946.com/api",
                     // "changeOrigin": true,
                     "pathRewrite" : {
                         "/api" : "" // rewrite path

pages.json

@@ -2,17 +2,24 @@
 	"pages": [{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "乐品优选",
+				"navigationBarTitleText": "亿豪优选",
 				"navigationStyle": "custom"
 			}
-		},
-		{
-				"path": "pages/index/artDetail",
-				"style": {
-					"navigationBarTitleText": "",
-					"navigationStyle": "custom"
-				}
-			},
+		},
+		{
+				"path": "pages/index/sign",
+				"style": {
+					"navigationBarTitleText": "签到",
+					"navigationStyle": "custom"
+				}
+			},
+		{
+				"path": "pages/index/artDetail",
+				"style": {
+					"navigationBarTitleText": "",
+					"navigationStyle": "custom"
+				}
+			},
 		{
 			"path": "pages/public/register",
 			"style": {
@@ -166,20 +173,20 @@
 				// #endif
 				"navigationBarTitleText": "个人中心"
 			}
-		},
-		{
-			"path": "pages/user/jf",
-			"style": {
-				// #ifndef MP-WEIXIN
-				"navigationStyle": "custom",
-				// #endif
-				"navigationBarTitleText": "我的积分"
-			}
+		},
+		{
+			"path": "pages/user/jf",
+			"style": {
+				// #ifndef MP-WEIXIN
+				"navigationStyle": "custom",
+				// #endif
+				"navigationBarTitleText": "我的积分"
+			}
 		},
 		{
 			"path": "pages/user/award",
 			"style": {
-				"navigationBarTitleText": "",
+				"navigationBarTitleText": "",
 				"navigationStyle": "custom",
 				"app-plus": {
 					"titleNView": {
@@ -199,12 +206,12 @@
 			"style": {
 				"navigationBarTitleText": "收藏夹"
 			}
-		},
-		{
-			"path": "pages/user/yjzye",
-			"style": {
-				"navigationBarTitleText": "奖金转余额"
-			}
+		},
+		{
+			"path": "pages/user/yjzye",
+			"style": {
+				"navigationBarTitleText": "奖金转余额"
+			}
 		},
 		{
 			"path": "pages/order/order",
@@ -309,8 +316,14 @@
 					}
 				},
 				// #endif
-				"navigationBarTitleText": "分类"
+				"navigationBarTitleText": "普通商城"
 			}
+		},
+		{
+			"path": "pages/category/jf",
+			"style": {
+				"navigationBarTitleText": "积分商城"
+			}
 		},
 		{
 			"path": "pages/redirect/redirect",
@@ -326,37 +339,44 @@
 			"style": {
 				"navigationBarTitleText": "邀请好友"
 			}
-		},
-		{
-			"path": "pages/user/team",
-			"style": {
-				"navigationBarTitleText": "我的分享",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/user/xzdl",
-			"style": {
-				"navigationBarTitleText": "选择代理"
-			}
-		},
-		{
-			"path": "pages/user/yue",
-			"style": {
-				"navigationBarTitleText": "我的余额",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/user/yjzz",
-			"style": {
-				"navigationBarTitleText": "奖金转账"
-			}
+		},
+		{
+			"path": "pages/user/team",
+			"style": {
+				"navigationBarTitleText": "我的分享",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/user/xzdl",
+			"style": {
+				"navigationBarTitleText": "选择代理"
+			}
+		},
+		{
+			"path": "pages/user/yue",
+			"style": {
+				"navigationBarTitleText": "我的余额",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/user/yjzz",
+			"style": {
+				"navigationBarTitleText": "奖金转账"
+			}
+		},
+		{
+			"path": "pages/user/fh",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": ""
+			}
 		}
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "乐品优选",
+		"navigationBarTitleText": "亿豪优选",
 		"navigationBarBackgroundColor": "#FFFFFF",
 		"backgroundColor": "#f8f8f8"
 	},
@@ -375,7 +395,13 @@
 				"pagePath": "pages/category/category",
 				"iconPath": "static/tabBar/cate.png",
 				"selectedIconPath": "static/tabBar/cate-action.png",
-				"text": "分类"
+				"text": "普通商城"
+			},
+			{
+				"pagePath": "pages/category/jf",
+				"iconPath": "static/tabBar/cate.png",
+				"selectedIconPath": "static/tabBar/cate-action.png",
+				"text": "积分商城"
 			},
 			{
 				"pagePath": "pages/cart/cart",

pages/category/category.vue

@@ -214,263 +214,412 @@ page,
 	}
 }
 </style> -->
-
-<template>
-	<view class="content">
-		<view class="dddd" style="height: 10rpx;"></view>
-		<view class="flex cate-wrap" :style="{'height': height}">
-			<scroll-view scroll-y="true" class="left-wrap" :style="{'height': height}">
-				<view class="left-item" v-for="(leftitem,leftindex) in flist" :class="{'action-item': currentIndex == leftindex}" @click="leftClick(leftindex)">
-					{{leftitem.cate_name}}
-				</view>
-			</scroll-view>
-			<scroll-view scroll-y="true" class="right-wrap" :style="{'height': height}" @scrolltolower="getProducts()">
-				<view class="right-item" v-for="gooditem in list" @click="navto('/pages/product/product?id=' + gooditem.id)">
-					<image :src="gooditem.image" mode="" class="good-img"></image> 
-					<view class="good-info flex">
-						<view class="good-name clamp2">
-							{{gooditem.store_name}}
-						</view>
-						<view class="good-price">
-							￥{{gooditem.price}}
-						</view>
-					</view>
-				</view>
-				<uni-load-more :status="loadingType"></uni-load-more>
-			</scroll-view>
-		</view>
-	</view>
-</template>
-<script>
-	import { getCategoryList,getProducts } from '@/api/product.js';
-	export default {
-		data() {
-			return {
-				sizeCalcState: false,
-				tabScrollTop: 0,
-				currentId: 9,
-				flist: [],
-				height: '',
-				currentIndex: 0,
-				list: [],
-				page: 1,
-				limit: 20,
-				loadingType: 'more',
-				loaded: false,
-			};
-		},
-		onLoad() {
-			this.loadData();
-		},
-		// 监听导航栏输入框点击事件
-		onNavigationBarSearchInputClicked(e) {
-			uni.navigateTo({
-				url: '/pages/product/search'
-			});
-		},
-		onReady(res) {
-			var _this = this;
-			uni.getSystemInfo({
-				success: resu => {
-					const query = uni.createSelectorQuery();
-					query.select('.cate-wrap').boundingClientRect();
-					query.exec(function(res) {
-						_this.height = resu.windowHeight - res[0].top + 'px';
-						console.log('打印页面的剩余高度', _this.height);
-					});
-				},
-				fail: res => {}
-			});
-		},
-		methods: {
-			leftClick(index) {
-				this.currentIndex = index
-				this.getProducts('reload')
-			},
-			getProducts(type) {
-				let index = this.flist[this.currentIndex].id
-				if(type == 'reload') {
-					this.list = []
-					this.page = 1
-					this.loadingType = 'more'
-					this.loaded = false
-				}
-				if(this.loadingType == 'loading' || this.loadingType == 'noMore') {
-					return
-				}
-				this.loadingType = 'loading'
-				getProducts({
-					cid: index
-				}).then(res => {
-					this.list = this.list.concat(res.data)
-					if(this.limit == res.data.length) {
-						this.loadingType = 'more'
-					}else {
-						this.loadingType = 'noMore'
-					}
-					this.loaded = true
-				})
-			},
-			// 载入数据
-			async loadData() {
-				let obj = this;
-				getCategoryList({})
-					.then(({ data }) => {
-						obj.flist = data.map(function(s) {
-							return s;
-						});
-						obj.getProducts()
-					})
-					.catch(err => {
-						console.log(err);
-					});
-			},
-			//一级分类点击
-			tabtap(item) {
-				console.log(item);
-				// 判断有没有初始化页面高度对象数据
-				if (!this.sizeCalcState) {
-					this.calcSize();
-				}
-				// 获取当前点击的id
-				this.currentId = item.id;
-				console.log(item.top);
-				this.tabScrollTop = item.top;
-				console.log(this.tabScrollTop);
-			},
-			//右侧栏滚动
-			asideScroll(e) {
-				// 判断有没有初始化页面高度对象数据
-				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;
-			},
-			navToList(sid, tid) {
-				// 点击导航跳转到详细页面
-				uni.navigateTo({
-					url: '/pages/product/list?fid='+this.currentId+'&sid='+sid+'&tid='+tid
-				});
-			},
-			navto(url) {
-				uni.navigateTo({
-					url
-				})
-			}
-		}
-	};
-</script>
-<style lang="scss">
-	.cate-wrap {
-		width:750rpx;
-		.left-wrap {
-			width: 180rpx;
-			flex-shrink: 0;
-			background-color: #f2f2f2;
-			.left-item {
-				width: 180rpx;
-				height: 100rpx;
-				line-height: 100rpx;
-				font-size: 28rpx;
-				font-weight: 500;
-				color: #666666;
-				text-align: center;
-			}
-			.action-item {
-				background-color: #fff;
-				font-weight: bold;
-				position: relative;
-				&::before {
-					content: '';
-					position: absolute;
-					top: 0;
-					left: 0;
-					width: 3rpx;
-					height: 100rpx;
-					background: #FF7144;
-				}
-			}
-		}
-		.right-wrap {
-			flex-wrap: 1;
-			background-color: #fff;
-			.right-item {
-				width: 520rpx;
-				height: 240rpx;
-				padding: 30rpx 0;
-				margin: 0 auto ;
-				border-bottom: 1px solid #eee;
-				display: flex;
-				justify-content: flex-start;
-				align-items: center;
-				.good-img {
-					width: 180rpx;
-					height: 180rpx;
-					border-radius: 20rpx;
-				}
-				.good-info {
-					flex-direction: column;
-					justify-content: space-between;
-					align-items: flex-start;
-					height: 100%;
-					padding-left: 25rpx;
-					.good-name {
-						font-size: 30rpx;
-						font-weight: bold;
-						color: #333333;
-					}
-					.good-price {
-						font-size: 34rpx;
-						font-weight: bold;
-						color: #FF4C4C;
-					}
-				}
-			}
-		}
-	}
+
+<template>
+	<view class="content">
+		<view class="dddd" style="height: 10rpx;"></view>
+		<!-- <view class="flex cate-wrap" :style="{'height': height}">
+			<scroll-view scroll-y="true" class="left-wrap" :style="{'height': height}">
+				<view class="left-item" v-for="(leftitem,leftindex) in flist" :class="{'action-item': currentIndex == leftindex}" @click="leftClick(leftindex)">
+					{{leftitem.cate_name}}
+				</view>
+			</scroll-view>
+			<scroll-view scroll-y="true" class="right-wrap" :style="{'height': height}" @scrolltolower="getProducts()">
+				<view class="right-item" v-for="gooditem in list" @click="navto('/pages/product/product?id=' + gooditem.id)">
+					<image :src="gooditem.image" mode="" class="good-img"></image> 
+					<view class="good-info flex">
+						<view class="good-name clamp2">
+							{{gooditem.store_name}}
+						</view>
+						<view class="good-price">
+							￥{{gooditem.price}}
+						</view>
+					</view>
+				</view>
+				<uni-load-more :status="loadingType"></uni-load-more>
+			</scroll-view>
+		</view> -->
+		<view class="hotgoods">
+			<view class="hotgoods-item" v-for="bditem in list" :key="bditem.id"
+				@click="navto('/pages/product/product?id=' + bditem.id )" style="height: 520rpx;">
+				<view class="image-wrapper">
+					<image class="image" :src="bditem.image" mode="scaleToFill"></image>
+				</view>
+				<view class="flex" style="flex-direction: column;justify-content: space-between;align-items: flex-start;height: 170rpx;">
+					<view class="title clamp2">{{bditem.store_name}}</view>
+					<view class="hot-price">
+						<view class="price">
+							<text class="font-size-sm"></text>
+							<text>￥{{ bditem.price * 1 }}</text>
+							<text class="give-jf" v-if="bditem.give_consumption*1">赠{{bditem.give_consumption*1}}消费余额</text>
+							<!-- <text class="ot-pirce">￥{{bditem.ot_price}}</text> -->
+						</view>
+						
+					</view>
+				</view>
+		
+			</view>
+		</view>
+		<uni-load-more :status="loadingType"></uni-load-more>
+	</view>
+</template>
+<script>
+	import { getCategoryList,getProducts } from '@/api/product.js';
+	export default {
+		data() {
+			return {
+				sizeCalcState: false,
+				tabScrollTop: 0,
+				currentId: 9,
+				flist: [],
+				height: '',
+				currentIndex: 0,
+				list: [],
+				page: 1,
+				limit: 20,
+				loadingType: 'more',
+				loaded: false,
+			};
+		},
+		onLoad() {
+			this.loadData();
+		},
+		// 监听导航栏输入框点击事件
+		onNavigationBarSearchInputClicked(e) {
+			uni.navigateTo({
+				url: '/pages/product/search'
+			});
+		},
+		onReady(res) {
+			
+		},
+		onReachBottom() {
+			this.getProducts()
+		},
+		methods: {
+			leftClick(index) {
+				this.currentIndex = index
+				this.getProducts('reload')
+			},
+			getProducts(type) {
+				
+				if(type == 'reload') {
+					this.list = []
+					this.page = 1
+					this.loadingType = 'more'
+					this.loaded = false
+				}
+				if(this.loadingType == 'loading' || this.loadingType == 'noMore') {
+					return
+				}
+				this.loadingType = 'loading'
+				getProducts({
+					// cid: index,
+					page: this.page,
+					limit: this.limit,
+					mall_type: 2
+				}).then(res => {
+					this.list = this.list.concat(res.data)
+					this.page++
+					if(this.limit == res.data.length) {
+						this.loadingType = 'more'
+					}else {
+						this.loadingType = 'noMore'
+					}
+					this.loaded = true
+				})
+			},
+			// 载入数据
+			async loadData() {
+				let obj = this;
+				obj.getProducts()
+				// getCategoryList({})
+				// 	.then(({ data }) => {
+				// 		obj.flist = data.map(function(s) {
+				// 			return s;
+				// 		});
+				// 		obj.getProducts()
+				// 	})
+				// 	.catch(err => {
+				// 		console.log(err);
+				// 	});
+			},
+			//一级分类点击
+			tabtap(item) {
+				console.log(item);
+				// 判断有没有初始化页面高度对象数据
+				if (!this.sizeCalcState) {
+					this.calcSize();
+				}
+				// 获取当前点击的id
+				this.currentId = item.id;
+				console.log(item.top);
+				this.tabScrollTop = item.top;
+				console.log(this.tabScrollTop);
+			},
+			//右侧栏滚动
+			asideScroll(e) {
+				// 判断有没有初始化页面高度对象数据
+				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;
+			},
+			navToList(sid, tid) {
+				// 点击导航跳转到详细页面
+				uni.navigateTo({
+					url: '/pages/product/list?fid='+this.currentId+'&sid='+sid+'&tid='+tid
+				});
+			},
+			navto(url) {
+				uni.navigateTo({
+					url
+				})
+			}
+		}
+	};
+</script>
+<style lang="scss">
+	.cate-wrap {
+		width:750rpx;
+		.left-wrap {
+			width: 180rpx;
+			flex-shrink: 0;
+			background-color: #f2f2f2;
+			.left-item {
+				width: 180rpx;
+				height: 100rpx;
+				line-height: 100rpx;
+				font-size: 28rpx;
+				font-weight: 500;
+				color: #666666;
+				text-align: center;
+			}
+			.action-item {
+				background-color: #fff;
+				font-weight: bold;
+				position: relative;
+				&::before {
+					content: '';
+					position: absolute;
+					top: 0;
+					left: 0;
+					width: 3rpx;
+					height: 100rpx;
+					background: #FF7144;
+				}
+			}
+		}
+		.right-wrap {
+			flex-wrap: 1;
+			background-color: #fff;
+			.right-item {
+				width: 520rpx;
+				height: 240rpx;
+				padding: 30rpx 0;
+				margin: 0 auto ;
+				border-bottom: 1px solid #eee;
+				display: flex;
+				justify-content: flex-start;
+				align-items: center;
+				.good-img {
+					width: 180rpx;
+					height: 180rpx;
+					border-radius: 20rpx;
+				}
+				.good-info {
+					flex-direction: column;
+					justify-content: space-between;
+					align-items: flex-start;
+					height: 100%;
+					padding-left: 25rpx;
+					.good-name {
+						font-size: 30rpx;
+						font-weight: bold;
+						color: #333333;
+					}
+					.good-price {
+						font-size: 34rpx;
+						font-weight: bold;
+						color: #FF4C4C;
+					}
+				}
+			}
+		}
+	}
+	.hotgoods {
+		margin-top: 20rpx;
+		width: 100%;
+		display: flex;
+		flex-wrap: wrap;
+		padding: 0 20rpx 30rpx;
+		justify-content: space-between;
+	
+		.hotgoods-item {
+			width: 345rpx;
+			background-color: #ffffff;
+			border-radius: 12rpx;
+			box-shadow: 0 0 15rpx rgba(0, 0, 0, 0.2);
+			margin-bottom: 15rpx;
+	
+			.image-wrapper {
+				width: 345rpx;
+				height: 345rpx;
+				border-radius: 3px;
+				overflow: hidden;
+				position: relative;
+	
+				.image-bg {
+					position: absolute;
+					top: 0;
+					left: 0;
+					right: 0;
+					bottom: 0;
+					width: 100%;
+					height: 100%;
+					opacity: 1;
+					border-radius: 12rpx 12rpx 0 0;
+					z-index: 2;
+				}
+	
+				.image {
+					width: 100%;
+					height: 100%;
+					opacity: 1;
+					border-radius: 12rpx 12rpx 0 0;
+				}
+			}
+	
+			.title {
+				margin-top: 24rpx;
+				padding: 0 20rpx;
+				font-size: 32rpx;
+				font-weight: 500;
+				color: #333333;
+			}
+	
+			.hot-price {
+				display: flex;
+				justify-content: flex-start;
+				align-items: center;
+				// padding: 14rpx 0 30rpx;
+	
+				.hotPrice-box {
+					padding: 2rpx 6rpx;
+	
+					background: linear-gradient(90deg, #c79a4c, #f9df7f);
+					border-radius: 5rpx;
+					text-align: center;
+					line-height: 28rpx;
+					font-size: 20rpx;
+					font-family: Source Han Sans CN;
+					font-weight: 400;
+					color: #ffffff;
+				}
+	
+				.price {
+					margin-left: 10rpx;
+					font-size: 36rpx;
+					color: #ff0000;
+					font-weight: 500;
+					display: flex;
+					justify-content: flex-start;
+					align-items: center;
+					.jf {
+						font-size: 20rpx;
+					}
+					.give-jf {
+						display: inline-block;
+						padding: 8rpx;
+						
+						background: linear-gradient(90deg, #FF834D, #FF2600);
+						border-radius: 12rpx 0px 12rpx 0px;
+						
+						font-size: 22rpx;
+						font-weight: 500;
+						color: #FFFFFF;
+						margin-left: 22rpx;
+					}
+					.ot-pirce {
+						margin-left:10rpx;
+						font-size: 26rpx;
+						font-weight: 500;
+						text-decoration: line-through;
+						color: #999999;
+						align-self: flex-end;
+					}
+					
+				}
+	
+				.yuanPrice {
+					margin-left: 10rpx;
+					font-size: 20rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					text-decoration: line-through;
+					color: #999999;
+				}
+	
+				.cart-icon {
+					image {
+						width: 44rpx;
+						height: 44rpx;
+					}
+				}
+			}
+		}
+	}
+	.ot-pirce {
+		margin-left: 7rpx;
+		font-size: 26rpx;
+		font-weight: 500;
+		text-decoration: line-through;
+		color: #999999;
+		align-self: flex-end;
+	}
 </style>

pages/category/jf.vue

@@ -0,0 +1,387 @@
+<template>
+	<view class="content">
+		<view class="dddd" style="height: 10rpx;"></view>
+		<view class="hotgoods">
+			<view class="hotgoods-item" v-for="bditem in list" :key="bditem.id"
+				@click="navto('/pages/product/product?id=' + bditem.id + '&isjf=1')" style="height: 520rpx;">
+				<view class="image-wrapper">
+					<image class="image" :src="bditem.image" mode="scaleToFill"></image>
+				</view>
+				<view class="flex" style="flex-direction: column;justify-content: space-between;align-items: flex-start;height: 170rpx;">
+					<view class="title clamp2">{{bditem.store_name}}</view>
+					<view class="hot-price">
+						<view class="price">
+							<text class="font-size-sm"></text>
+							<text>{{ bditem.integral * 1 }}积分</text>
+							<!-- <text class="give-jf" v-if="bditem.give_consumption*1">赠{{bditem.give_consumption*1}}消费余额</text> -->
+							<text class="ot-pirce">￥{{bditem.ot_price}}</text>
+						</view>
+						
+					</view>
+				</view>
+		
+			</view>
+		</view>
+		<uni-load-more :status="loadingType"></uni-load-more>
+	</view>
+</template>
+<script>
+	import { getCategoryList,getProducts } from '@/api/product.js';
+	export default {
+		data() {
+			return {
+				sizeCalcState: false,
+				tabScrollTop: 0,
+				currentId: 9,
+				flist: [],
+				height: '',
+				currentIndex: 0,
+				list: [],
+				page: 1,
+				limit: 20,
+				loadingType: 'more',
+				loaded: false,
+			};
+		},
+		onLoad() {
+			this.loadData();
+		},
+		// 监听导航栏输入框点击事件
+		onNavigationBarSearchInputClicked(e) {
+			uni.navigateTo({
+				url: '/pages/product/search'
+			});
+		},
+		onReady(res) {
+			
+		},
+		onReachBottom() {
+			this.getProducts()
+		},
+		methods: {
+			leftClick(index) {
+				this.currentIndex = index
+				this.getProducts('reload')
+			},
+			getProducts(type) {
+				
+				if(type == 'reload') {
+					this.list = []
+					this.page = 1
+					this.loadingType = 'more'
+					this.loaded = false
+				}
+				if(this.loadingType == 'loading' || this.loadingType == 'noMore') {
+					return
+				}
+				this.loadingType = 'loading'
+				getProducts({
+					// cid: index,
+					page: this.page,
+					limit: this.limit,
+					mall_type: 3
+				}).then(res => {
+					this.list = this.list.concat(res.data)
+					this.page++
+					if(this.limit == res.data.length) {
+						this.loadingType = 'more'
+					}else {
+						this.loadingType = 'noMore'
+					}
+					this.loaded = true
+				})
+			},
+			// 载入数据
+			async loadData() {
+				let obj = this;
+				obj.getProducts()
+				// getCategoryList({})
+				// 	.then(({ data }) => {
+				// 		obj.flist = data.map(function(s) {
+				// 			return s;
+				// 		});
+				// 		obj.getProducts()
+				// 	})
+				// 	.catch(err => {
+				// 		console.log(err);
+				// 	});
+			},
+			//一级分类点击
+			tabtap(item) {
+				console.log(item);
+				// 判断有没有初始化页面高度对象数据
+				if (!this.sizeCalcState) {
+					this.calcSize();
+				}
+				// 获取当前点击的id
+				this.currentId = item.id;
+				console.log(item.top);
+				this.tabScrollTop = item.top;
+				console.log(this.tabScrollTop);
+			},
+			//右侧栏滚动
+			asideScroll(e) {
+				// 判断有没有初始化页面高度对象数据
+				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;
+			},
+			navToList(sid, tid) {
+				// 点击导航跳转到详细页面
+				uni.navigateTo({
+					url: '/pages/product/list?fid='+this.currentId+'&sid='+sid+'&tid='+tid
+				});
+			},
+			navto(url) {
+				uni.navigateTo({
+					url
+				})
+			}
+		}
+	};
+</script>
+<style lang="scss">
+	.cate-wrap {
+		width:750rpx;
+		.left-wrap {
+			width: 180rpx;
+			flex-shrink: 0;
+			background-color: #f2f2f2;
+			.left-item {
+				width: 180rpx;
+				height: 100rpx;
+				line-height: 100rpx;
+				font-size: 28rpx;
+				font-weight: 500;
+				color: #666666;
+				text-align: center;
+			}
+			.action-item {
+				background-color: #fff;
+				font-weight: bold;
+				position: relative;
+				&::before {
+					content: '';
+					position: absolute;
+					top: 0;
+					left: 0;
+					width: 3rpx;
+					height: 100rpx;
+					background: #FF7144;
+				}
+			}
+		}
+		.right-wrap {
+			flex-wrap: 1;
+			background-color: #fff;
+			.right-item {
+				width: 520rpx;
+				height: 240rpx;
+				padding: 30rpx 0;
+				margin: 0 auto ;
+				border-bottom: 1px solid #eee;
+				display: flex;
+				justify-content: flex-start;
+				align-items: center;
+				.good-img {
+					width: 180rpx;
+					height: 180rpx;
+					border-radius: 20rpx;
+				}
+				.good-info {
+					flex-direction: column;
+					justify-content: space-between;
+					align-items: flex-start;
+					height: 100%;
+					padding-left: 25rpx;
+					.good-name {
+						font-size: 30rpx;
+						font-weight: bold;
+						color: #333333;
+					}
+					.good-price {
+						font-size: 34rpx;
+						font-weight: bold;
+						color: #FF4C4C;
+					}
+				}
+			}
+		}
+	}
+	.hotgoods {
+		margin-top: 20rpx;
+		width: 100%;
+		display: flex;
+		flex-wrap: wrap;
+		padding: 0 20rpx 30rpx;
+		justify-content: space-between;
+	
+		.hotgoods-item {
+			width: 345rpx;
+			background-color: #ffffff;
+			border-radius: 12rpx;
+			box-shadow: 0 0 15rpx rgba(0, 0, 0, 0.2);
+			margin-bottom: 15rpx;
+	
+			.image-wrapper {
+				width: 345rpx;
+				height: 345rpx;
+				border-radius: 3px;
+				overflow: hidden;
+				position: relative;
+	
+				.image-bg {
+					position: absolute;
+					top: 0;
+					left: 0;
+					right: 0;
+					bottom: 0;
+					width: 100%;
+					height: 100%;
+					opacity: 1;
+					border-radius: 12rpx 12rpx 0 0;
+					z-index: 2;
+				}
+	
+				.image {
+					width: 100%;
+					height: 100%;
+					opacity: 1;
+					border-radius: 12rpx 12rpx 0 0;
+				}
+			}
+	
+			.title {
+				margin-top: 24rpx;
+				padding: 0 20rpx;
+				font-size: 32rpx;
+				font-weight: 500;
+				color: #333333;
+			}
+	
+			.hot-price {
+				display: flex;
+				justify-content: flex-start;
+				align-items: center;
+				// padding: 14rpx 0 30rpx;
+	
+				.hotPrice-box {
+					padding: 2rpx 6rpx;
+	
+					background: linear-gradient(90deg, #c79a4c, #f9df7f);
+					border-radius: 5rpx;
+					text-align: center;
+					line-height: 28rpx;
+					font-size: 20rpx;
+					font-family: Source Han Sans CN;
+					font-weight: 400;
+					color: #ffffff;
+				}
+	
+				.price {
+					margin-left: 10rpx;
+					font-size: 36rpx;
+					color: #ff0000;
+					font-weight: 500;
+					display: flex;
+					justify-content: flex-start;
+					align-items: center;
+					.jf {
+						font-size: 20rpx;
+					}
+					.give-jf {
+						display: inline-block;
+						padding: 8rpx;
+						
+						background: linear-gradient(90deg, #FF834D, #FF2600);
+						border-radius: 12rpx 0px 12rpx 0px;
+						
+						font-size: 22rpx;
+						font-weight: 500;
+						color: #FFFFFF;
+						margin-left: 22rpx;
+					}
+					.ot-pirce {
+						margin-left:10rpx;
+						font-size: 26rpx;
+						font-weight: 500;
+						text-decoration: line-through;
+						color: #999999;
+						align-self: flex-end;
+					}
+					
+				}
+	
+				.yuanPrice {
+					margin-left: 10rpx;
+					font-size: 20rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					text-decoration: line-through;
+					color: #999999;
+				}
+	
+				.cart-icon {
+					image {
+						width: 44rpx;
+						height: 44rpx;
+					}
+				}
+			}
+		}
+	}
+	.ot-pirce {
+		margin-left: 7rpx;
+		font-size: 26rpx;
+		font-weight: 500;
+		text-decoration: line-through;
+		color: #999999;
+		align-self: flex-end;
+	}
+</style>

pages/index/index.vue

@@ -1,808 +1,808 @@
-<template>
-	<view class="container">
-		<!-- 顶部logo and 搜索 start-->
-		<view class="index-top-wrap">
-			<image src="../../static/index/index-top.png" mode="widthFix" class="index-top"></image>
-			<view class="status_bar fud"></view>
-			<view class="top-search flex fud">
-				<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>
-			<!-- 顶部logo and 搜索 end-->
-			<!-- <view class="jg fud" style="background-color: #fff;"></view> -->
-			<!-- 轮播图 start -->
-			<swiper class="top-swiper fud" 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>
-			<!-- 轮播图 end -->
-		</view>
-		<!-- 顶部logo and 搜索 end-->
-		<view class="jg" style="background-color: #fff;"></view>
-		<!-- <view class="swiper-btm flex">
-			<view class="btm-item flex">
-				<image src="../../static/icon/index-gou.png" mode=""></image>
-				<view class="">自用购物返利</view>
-			</view>
-			<view class="btm-item flex">
-				<image src="../../static/icon/index-gou.png" mode=""></image>
-				<view class="">分享好友赚钱</view>
-			</view>
-			<view class="btm-item flex">
-				<image src="../../static/icon/index-gou.png" mode=""></image>
-				<view class="">超值正品优惠</view>
-			</view>
-		</view> -->
-		<!-- 分类 start -->
-		<view class="cate-section flex">
-			<view class="cate-item flex" @click="navto('/pages/category/category')" >
-				<view class="img-wrapper flex">
-					<image src="../../static/icon/in1.png" mode=""></image>
-				</view>
-				<view class="item-title">全部商品</view>
-			</view>
-			<view class="cate-item flex" @click="navto('/pages/user/team')">
-				<view class="img-wrapper flex">
-					<image src="../../static/icon/in2.png" mode=""></image>
-				</view>
-				<view class="item-title">我的团队</view>
-			</view>
-			<view class="cate-item flex" @click="openKf">
-				<view class="img-wrapper flex">
-					<image src="../../static/icon/in3.png" mode=""></image>
-				</view>
-				<view class="item-title">联系客服</view>
-			</view>
-			<view class="cate-item flex" @click="navto('/pages/user/shareQrCode',1)">
-				<view class="img-wrapper flex">
-					<image src="../../static/icon/in4.png" mode=""></image>
-				</view>
-				<view class="item-title">邀请好友</view>
-			</view>
-		</view>
-		<!-- 分类 ed -->
-
-		<!-- 商品列表 start -->
-		<view class="product-box" v-if="navList.bd.list.length > 0">
-			<view class="product-tit flex">
-				<view class="hx"></view>
-				<view class="tit">爆单专区</view>
-				<view class="hx"></view>
-			</view>
-			<view class="hotgoods">
-				<view class="hotgoods-item" v-for="bditem in navList.bd.list" :key="bditem.id"
-					@click="navto('/pages/product/product?id=' + bditem.id + '&isbd=1')" style="height: 520rpx;">
-					<view class="image-wrapper">
-						<image class="image" :src="bditem.image" mode="scaleToFill"></image>
-					</view>
-					<view class="flex" style="flex-direction: column;justify-content: space-between;align-items: flex-start;height: 170rpx;">
-						<view class="title clamp2">{{bditem.store_name}}</view>
-						<view class="hot-price">
-							<view class="price">
-								<text class="font-size-sm"></text>
-								<text>￥{{ bditem.price * 1 }}</text>
-								<text class="give-jf">赠{{bditem.give_integral*1}}积分</text>
-							</view>
-							
-						</view>
-					</view>
-
-				</view>
-			</view>
-		</view>
-		<!-- 商品列表 ed-->
-		<view class="jg" style="background-color: #f5f5f5;height: 20rpx;" v-if="navList.jf.list.length > 0">
-			
-		</view>
-		<!-- 商品列表 start -->
-		<view class="product-box" v-if="navList.jf.list.length > 0">
-			<view class="product-tit flex">
-				<view class="hx"></view>
-				<view class="tit">积分兑换</view>
-				<view class="hx"></view>
-			</view>
-			<view class="hotgoods">
-				<view class="hotgoods-item" v-for="jfitem in navList.jf.list" :key="jfitem.id"
-					@click="navto('/pages/product/product?id=' + jfitem.id + '&isjf=1')" style="height: 520rpx;">
-					<view class="image-wrapper">
-						<image class="image" :src="jfitem.image" mode="scaleToFill"></image>
-					</view>
-					<view class="flex" style="flex-direction: column;justify-content: space-between;align-items: flex-start;height: 170rpx;">
-						<view class="title clamp2">{{jfitem.store_name}}</view>
-						<view class="hot-price">
-							<view class="price">
-								<text class="font-size-sm"></text>
-								<text>￥{{ jfitem.price * 1 }}</text>
-								<!-- <text class="give-jf">赠2000积分</text> -->
-								<text class="ot-pirce" v-if="jfitem.ot_price*1 > jfitem.price*1">￥{{ jfitem.ot_price*1 }}</text>
-							</view>
-						</view>
-					</view>
-		
-				</view>
-			</view>
-		</view>
-		<!-- 商品列表 ed-->
-		
-		<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="cancel">取消</view>
-						<view class="comfirm" @click="comfirm(text)">复制微信</view>
-					</view>
-				</view>
-			</view>
-		</uni-popup>
-	</view>
-</template>
-
-<script>
-	import {
-		loadIndexs,
-		groom1
-	} from '@/api/index.js';
-	import {
-		getUserInfo,
-		spread
-	} from '@/api/user.js';
-	import {
-		getBargainList,
-		getProducts,
-		goodsDetail,
-		poster
-	} from '@/api/product.js';
-	import {
-		saveUrl,
-		interceptor
-	} from '@/utils/loginUtils';
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-	// #ifdef H5
-	import {
-		weixindata,
-		shareLoad
-	} from '@/utils/wxAuthorized';
-	// #endif
-	export default {
-		data() {
-			return {
-				text: '', //客服微信
-				page: 1,
-				limitt: 20,
-				loadingType: 'more',
-				current: 0,
-				shareShow: false, //分享海报
-				pageProportion: 0, //保存页面基于750宽度的比例
-				swiperHeight: 0,
-				checkid: 0,
-				titleNViewBackground: '',
-				swiperCurrent: 0,
-				swiperLength: 0,
-				carouselList: [], //轮播列表
-				page: 1,
-				limit: 5,
-				firstList: [],
-				goodList: [], //商品列表
-				shopList: [],
-				shareImage: '',
-				navList:{
-					bd: {
-						page: 1,
-						limit: 10,
-						loaded: false,
-						loadingType: 'more',
-						list: [],
-						status: 1
-					},
-					jf: {
-						page: 1,
-						limit: 10,
-						loaded: false,
-						loadingType: 'more',
-						list: [],
-						status: 3
-					}
-				}
-			};
-		},
-		computed: {
-			...mapState('user', ['hasLogin', 'userInfo'])
-		},
-		onReachBottom() {
-
-		},
-		onLoad: function(option) {
-			// #ifdef MP
-			if (option.scene) {
-				// 存储小程序邀请人
-				uni.setStorage({
-					key: 'spread_code',
-					data: option.scene
-				});
-			}
-			// #endif
-		},
-		onShow: function() {
-			this.getGoodList()
-			this.getGoodList(2)
-			this.loadData();
-			this.groom1()
-		},
-		methods: {
-			//获取复购商品
-			groom1() {
-				groom1().then(res => {
-					console.log(res)
-					this.fgList = res.data.list
-				})
-			},
-			getGoodList(type=1) {
-				let that = this;
-				let item ;
-				if(type == 1) {
-					item = that.navList.bd
-				}else {
-					item = that.navList.jf
-				}
-				if(item.loadingType == 'loading' || item.loadingType == 'nomore') {
-					return 
-				}
-				item.loadingType = 'loading'
-				getProducts({
-					cid: item.status,
-					page: item.page,
-					limit: item.limit
-				}).then(res => {
-					item.list = item.list.concat(res.data)
-					// if(item.limit == res.data) {
-					// 	item.loadingType = 'more'
-					// }else {
-					// 	item.loadingType = 'nomore'
-					// }
-				})
-			},
-			navto(url, type = 0) {
-				if (type == 1) {
-					if (!this.hasLogin) {
-						// 保存地址
-						saveUrl();
-						// 登录拦截
-						interceptor();
-					} else {
-						uni.navigateTo({
-							url,
-							fail() {
-								uni.switchTab({
-									url
-								})
-							}
-						})
-					}
-				} else {
-					uni.navigateTo({
-						url,
-						fail() {
-							uni.switchTab({
-								url
-							})
-						}
-					})
-				}
-
-			},
-			navTo(url) {
-				if (url == '') {
-					this.$api.msg('暂未开通，敬请期待');
-				} else {
-					this.navto(url)
-				}
-			},
-			// 點擊搜索框
-			clickSearch() {
-				uni.navigateTo({
-					url: '/pages/product/search'
-				});
-			},
-			// 监听图片加载完成
-			onImageError(key, index) {
-				this[key][index].image = '/static/error/errorImage.jpg';
-			},
-			// 请求载入数据
-			async loadData() {
-				loadIndexs({})
-					.then(({
-						data
-					}) => {
-						let goods = data.info;
-						console.log(goods, '商品信息');
-						this.carouselList = data.banner;
-						this.swiperLength = this.carouselList.length;
-						this.bastList = data.giftInfo; //会员礼包
-						data.info.firstList.forEach(e => {
-							e.isVip = e.store_type ? "3" : "0"
-						})
-						this.firstList = data.info.firstList //首页商品
-						uni.stopPullDownRefresh();
-					})
-					.catch(e => {
-						uni.stopPullDownRefresh();
-					});
-			},
-			//轮播图切换修改背景色
-			swiperChange(e) {
-				const index = e.detail.current;
-				this.swiperCurrent = index;
-				this.titleNViewBackground = this.carouselList[index].background;
-			},
-			// 轮播图跳转
-			bannerNavToUrl(item) {
-				// #ifdef H5
-				console.log(item.wap_url.indexOf('http'), 'banner');
-				if (item.wap_url.indexOf('http') >= 0) {
-					window.location.href = item.wap_url;
-				}
-				// #endif
-				//测试数据没有写id，用title代替
-				uni.navigateTo({
-					url: item.wap_url
-				});
-			},
-			comfirm(text) {
-				console.log(text);
-				const result = this.uniCopy(text);
-				if (result === false) {
-					uni.showToast({
-						title: '不支持'
-					});
-				} else {
-					uni.showToast({
-						title: '复制成功',
-						icon: 'none'
-					});
-				}
-				this.$refs.popupkf.close();
-			},
-			uniCopy(content) {
-				/**
-				 * 小程序端 和 app端的复制逻辑
-				 */
-				//#ifndef H5
-				uni.setClipboardData({
-					data: content,
-					success: function() {
-						console.log('success');
-						return true;
-					}
-				});
-				//#endif
-
-				/**
-				 * H5端的复制逻辑
-				 */
-				// #ifdef H5
-				if (!document.queryCommandSupported('copy')) {
-					//为了兼容有些浏览器 queryCommandSupported 的判断
-					// 不支持
-					return false;
-				}
-				let textarea = document.createElement('textarea');
-				textarea.value = content;
-				textarea.readOnly = 'readOnly';
-				document.body.appendChild(textarea);
-				textarea.select(); // 选择对象
-				textarea.setSelectionRange(0, content.length); //核心
-				let result = document.execCommand('copy'); // 执行浏览器复制命令
-				textarea.remove();
-				return result;
-				// #endif
-			},
-			// 打开客服
-			openKf() {
-				this.$refs.popupkf.open();
-			},
-			// 关闭客服
-			cancel() {
-				this.$refs.popupkf.close();
-			},
-		}
-	};
-</script>
-
-<style lang="scss">
-	page {
-		background: #ffff;
-		min-height: 100%;
-		height: auto;
-	}
-
-	// 顶部搜索
-	.top-search {
-		height: 80rpx;
-		padding: 0 20rpx;
-		margin-bottom: 20rpx;
-		// background-color: #fff;
-	
-		.top-logo {
-			width: 50rpx;
-			// height: 50rpx;
-			margin-right: 10rpx;
-	
-			image {
-				width: 48rpx;
-			}
-	
-		}
-	
-		.search-box {
-			justify-content: center;
-			width: 698rpx;
-			height: 60rpx;
-			background: #EEEEEE;
-			// box-shadow: 0px 10rpx 20rpx 0px rgba(4, 114, 69, 0.22);
-			border-radius: 30rpx;
-	
-			.search {
-				width: 34rpx;
-				height: 34rpx;
-			}
-	
-			.search-font {
-				margin-left: 14rpx;
-				font-size: 28rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #CBCBCB;
-			}
-		}
-	}
-	
-	// 顶部轮播图
-	.top-swiper {
-		width: 690rpx;
-		height: 365rpx;
-	
-		// margin: 20rpx 0 0;
-		border-radius: 20rpx;
-		margin: auto;
-		image {
-			width: 690rpx;
-			height: 365rpx;
-			border-radius: 20rpx;
-		}
-	}
-	.swiper-btm {
-		height: 60rpx;
-		width: 750rpx;
-		background-color: #fff;
-		margin-bottom: 20rpx;
-		font-size: 26rpx;
-		font-weight: 500;
-		color: #333333;
-
-		.btm-item {
-			flex-grow: 1;
-			justify-content: center;
-
-			image {
-				width: 25rpx;
-				height: 25rpx;
-				margin-right: 14rpx;
-			}
-		}
-	}
-
-	.jg {
-		height: 20rpx;
-		background: #F8F8F8;
-	}
-
-	// 分类
-	.cate-section {
-		justify-content: space-around;
-		background-color: #fff;
-		padding: 0rpx 0 30rpx;
-
-		.cate-item {
-			flex-grow: 0;
-			width: 20%;
-			flex-direction: column;
-			text-align: center;
-			align-items: center;
-			justify-content: center;
-
-			.img-wrapper {
-				width: 100rpx;
-				height: 100rpx;
-				border-radius: 20rpx;
-				position: relative;
-
-				image {
-					width: 100rpx;
-					height: 100rpx;
-					position: absolute;
-					left: 50%;
-					top: 50%;
-					transform: translate(-50%, -50%);
-				}
-			}
-
-			.item-title {
-				margin-top: 15rpx;
-				font-size: 24rpx;
-				font-weight: 500;
-				color: #3F3F3F;
-			}
-		}
-	}
-
-	.product-box {
-		margin-top: 20rpx;
-		background: #ffffff;
-		padding: 26rpx 0 20rpx;
-
-		.product-tit {
-			justify-content: center;
-
-			image {
-				width: 609rpx;
-				height: 31rpx;
-			}
-			.hx {
-				width: 120rpx;
-				height: 1rpx;
-				background: #363636;
-				color: #363636;
-				line-height: 28px;
-			}
-					
-			.tit {
-				margin: 0 70rpx;
-				font-size: 32rpx;
-				font-weight: 500;
-				color: #363636;
-			}
-		}
-
-		.in-ban {
-			margin-top: 40rpx;
-			width: 750rpx;
-			height: 220rpx;
-		}
-	}
-
-	.hotgoods {
-		margin-top: 38rpx;
-		width: 100%;
-		display: flex;
-		flex-wrap: wrap;
-		padding: 0 20rpx 30rpx;
-		justify-content: space-between;
-
-		.hotgoods-item {
-			width: 345rpx;
-			background-color: #ffffff;
-			border-radius: 12rpx;
-			box-shadow: 0 0 15rpx rgba(0, 0, 0, 0.2);
-			margin-bottom: 15rpx;
-
-			.image-wrapper {
-				width: 345rpx;
-				height: 345rpx;
-				border-radius: 3px;
-				overflow: hidden;
-				position: relative;
-
-				.image-bg {
-					position: absolute;
-					top: 0;
-					left: 0;
-					right: 0;
-					bottom: 0;
-					width: 100%;
-					height: 100%;
-					opacity: 1;
-					border-radius: 12rpx 12rpx 0 0;
-					z-index: 2;
-				}
-
-				.image {
-					width: 100%;
-					height: 100%;
-					opacity: 1;
-					border-radius: 12rpx 12rpx 0 0;
-				}
-			}
-
-			.title {
-				margin-top: 24rpx;
-				padding: 0 20rpx;
-				font-size: 32rpx;
-				font-weight: 500;
-				color: #333333;
-			}
-
-			.hot-price {
-				display: flex;
-				justify-content: flex-start;
-				align-items: center;
-				// padding: 14rpx 0 30rpx;
-
-				.hotPrice-box {
-					padding: 2rpx 6rpx;
-
-					background: linear-gradient(90deg, #c79a4c, #f9df7f);
-					border-radius: 5rpx;
-					text-align: center;
-					line-height: 28rpx;
-					font-size: 20rpx;
-					font-family: Source Han Sans CN;
-					font-weight: 400;
-					color: #ffffff;
-				}
-
-				.price {
-					margin-left: 10rpx;
-					font-size: 36rpx;
-					color: #ff0000;
-					font-weight: 500;
-					display: flex;
-					justify-content: flex-start;
-					align-items: center;
-					.jf {
-						font-size: 20rpx;
-					}
-					.give-jf {
-						display: inline-block;
-						padding: 8rpx;
-						
-						background: linear-gradient(90deg, #FF834D, #FF2600);
-						border-radius: 12rpx 0px 12rpx 0px;
-						
-						font-size: 22rpx;
-						font-weight: 500;
-						color: #FFFFFF;
-						margin-left: 22rpx;
-					}
-					.ot-pirce {
-						margin-left: 7rpx;
-						font-size: 26rpx;
-						font-weight: 500;
-						text-decoration: line-through;
-						color: #999999;
-						align-self: flex-end;
-					}
-					
-				}
-
-				.yuanPrice {
-					margin-left: 10rpx;
-					font-size: 20rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					text-decoration: line-through;
-					color: #999999;
-				}
-
-				.cart-icon {
-					image {
-						width: 44rpx;
-						height: 44rpx;
-					}
-				}
-			}
-		}
-	}
-
-	.popup-box {
-		width: 522rpx;
-		height: 605rpx;
-		background-color: #ffffff;
-		border-radius: 20rpx;
-		position: relative;
-
-		.img {
-			position: relative;
-			top: -56rpx;
-			left: 0;
-			width: 522rpx;
-			height: 132rpx;
-			display: flex;
-			justify-content: center;
-
-			image {
-				border-radius: 20rpx 20rpx 0 0;
-				width: 450rpx;
-				height: 132rpx;
-			}
-		}
-
-		.mian {
-			margin-top: -44rpx;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			// padding: 32rpx 32rpx;
-			background-color: #ffffff;
-			border-radius: 0 0 20rpx 20rpx;
-			text-align: center;
-
-			.delivery {
-				font-size: 40rpx;
-				color: #333333;
-				display: flex;
-				align-items: center;
-				flex-direction: column;
-
-				image {
-					margin-top: 48rpx;
-					width: 172rpx;
-					height: 160rpx;
-				}
-			}
-
-			.nocancel {
-				font-size: 32rpx;
-				color: #333333;
-				margin-top: 14rpx;
-			}
-
-			.comfirm-box {
-				margin-top: 52rpx;
-				display: flex;
-				// margin-bottom: 32rpx;
-
-				// justify-content: space-around;
-				.cancel {
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					width: 197rpx;
-					height: 74rpx;
-					border: 1px solid #dcc786;
-					border-radius: 38rpx;
-
-					font-size: 32rpx;
-					color: #605128;
-				}
-
-				.comfirm {
-					margin-left: 32rpx;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					width: 197rpx;
-					height: 74rpx;
-					background: linear-gradient(-90deg, #d1ba77 0%, #f7e8ad 100%);
-					border-radius: 38px;
-					font-size: 32rpx;
-					color: #605128;
-				}
-			}
-		}
-	}
-	.index-top-wrap {
-		position: relative;
-		.index-top {
-			width: 750rpx;
-			position: absolute;
-		}
-		.fud {
-			position: relative;
-		}
-	}
+<template>
+	<view class="container">
+		<!-- 顶部logo and 搜索 start-->
+		<view class="index-top-wrap">
+			<image src="../../static/index/index-top.png" mode="widthFix" class="index-top"></image>
+			<view class="status_bar fud"></view>
+			<view class="top-search flex fud">
+				<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>
+			<!-- 顶部logo and 搜索 end-->
+			<!-- <view class="jg fud" style="background-color: #fff;"></view> -->
+			<!-- 轮播图 start -->
+			<swiper class="top-swiper fud" 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>
+			<!-- 轮播图 end -->
+		</view>
+		<!-- 顶部logo and 搜索 end-->
+		<view class="jg" style="background-color: #fff;"></view>
+		<!-- <view class="swiper-btm flex">
+			<view class="btm-item flex">
+				<image src="../../static/icon/index-gou.png" mode=""></image>
+				<view class="">自用购物返利</view>
+			</view>
+			<view class="btm-item flex">
+				<image src="../../static/icon/index-gou.png" mode=""></image>
+				<view class="">分享好友赚钱</view>
+			</view>
+			<view class="btm-item flex">
+				<image src="../../static/icon/index-gou.png" mode=""></image>
+				<view class="">超值正品优惠</view>
+			</view>
+		</view> -->
+		<!-- 分类 start -->
+		<view class="cate-section flex">
+			<view class="cate-item flex" @click="navto('/pages/category/category')" >
+				<view class="img-wrapper flex">
+					<image src="../../static/icon/in1.png" mode=""></image>
+				</view>
+				<view class="item-title">普通商城</view>
+			</view>
+			<view class="cate-item flex" @click="navto('/pages/user/team')">
+				<view class="img-wrapper flex">
+					<image src="../../static/icon/in2.png" mode=""></image>
+				</view>
+				<view class="item-title">我的团队</view>
+			</view>
+			<view class="cate-item flex" @click="openKf">
+				<view class="img-wrapper flex">
+					<image src="../../static/icon/in3.png" mode=""></image>
+				</view>
+				<view class="item-title">联系客服</view>
+			</view>
+			<view class="cate-item flex" @click="navto('/pages/user/shareQrCode',1)">
+				<view class="img-wrapper flex">
+					<image src="../../static/icon/in4.png" mode=""></image>
+				</view>
+				<view class="item-title">邀请好友</view>
+			</view>
+		</view>
+		<!-- 分类 ed -->
+
+		<!-- 商品列表 start -->
+		<view class="product-box" v-if="navList.bd.list.length > 0">
+			<view class="product-tit flex">
+				<view class="hx"></view>
+				<view class="tit">爆单专区</view>
+				<view class="hx"></view>
+			</view>
+			<view class="hotgoods">
+				<view class="hotgoods-item" v-for="bditem in navList.bd.list" :key="bditem.id"
+					@click="navto('/pages/product/product?id=' + bditem.id + '&isbd=1')" style="height: 520rpx;">
+					<view class="image-wrapper">
+						<image class="image" :src="bditem.image" mode="scaleToFill"></image>
+					</view>
+					<view class="flex" style="flex-direction: column;justify-content: space-between;align-items: flex-start;height: 170rpx;">
+						<view class="title clamp2">{{bditem.store_name}}</view>
+						<view class="hot-price">
+							<view class="price">
+								<text class="font-size-sm"></text>
+								<text>￥{{ bditem.price * 1 }}</text>
+								<text class="give-jf" >赠7000可收益额度</text>
+							</view>
+							
+						</view>
+					</view>
+
+				</view>
+			</view>
+		</view>
+		<!-- 商品列表 ed-->
+<!-- 		<view class="jg" style="background-color: #f5f5f5;height: 20rpx;" v-if="navList.jf.list.length > 0">
+			
+		</view> -->
+		<!-- 商品列表 start -->
+<!-- 		<view class="product-box" v-if="navList.jf.list.length > 0">
+			<view class="product-tit flex">
+				<view class="hx"></view>
+				<view class="tit">积分兑换</view>
+				<view class="hx"></view>
+			</view>
+			<view class="hotgoods">
+				<view class="hotgoods-item" v-for="jfitem in navList.jf.list" :key="jfitem.id"
+					@click="navto('/pages/product/product?id=' + jfitem.id + '&isjf=1')" style="height: 520rpx;">
+					<view class="image-wrapper">
+						<image class="image" :src="jfitem.image" mode="scaleToFill"></image>
+					</view>
+					<view class="flex" style="flex-direction: column;justify-content: space-between;align-items: flex-start;height: 170rpx;">
+						<view class="title clamp2">{{jfitem.store_name}}</view>
+						<view class="hot-price">
+							<view class="price">
+								<text class="font-size-sm"></text>
+								<text>￥{{ jfitem.price * 1 }}</text>
+								<text class="ot-pirce" v-if="jfitem.ot_price*1 > jfitem.price*1">￥{{ jfitem.ot_price*1 }}</text>
+							</view>
+						</view>
+					</view>
+		
+				</view>
+			</view>
+		</view> -->
+		<!-- 商品列表 ed-->
+		
+		<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="cancel">取消</view>
+						<view class="comfirm" @click="comfirm(text)">复制微信</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		loadIndexs,
+		groom1
+	} from '@/api/index.js';
+	import {
+		getUserInfo,
+		spread
+	} from '@/api/user.js';
+	import {
+		getBargainList,
+		getProducts,
+		goodsDetail,
+		poster
+	} from '@/api/product.js';
+	import {
+		saveUrl,
+		interceptor
+	} from '@/utils/loginUtils';
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	// #ifdef H5
+	import {
+		weixindata,
+		shareLoad
+	} from '@/utils/wxAuthorized';
+	// #endif
+	export default {
+		data() {
+			return {
+				text: '', //客服微信
+				page: 1,
+				limitt: 20,
+				loadingType: 'more',
+				current: 0,
+				shareShow: false, //分享海报
+				pageProportion: 0, //保存页面基于750宽度的比例
+				swiperHeight: 0,
+				checkid: 0,
+				titleNViewBackground: '',
+				swiperCurrent: 0,
+				swiperLength: 0,
+				carouselList: [], //轮播列表
+				page: 1,
+				limit: 5,
+				firstList: [],
+				goodList: [], //商品列表
+				shopList: [],
+				shareImage: '',
+				navList:{
+					bd: {
+						page: 1,
+						limit: 10,
+						loaded: false,
+						loadingType: 'more',
+						list: [],
+						status: 1
+					},
+					jf: {
+						page: 1,
+						limit: 10,
+						loaded: false,
+						loadingType: 'more',
+						list: [],
+						status: 3
+					}
+				}
+			};
+		},
+		computed: {
+			...mapState('user', ['hasLogin', 'userInfo'])
+		},
+		onReachBottom() {
+this.getGoodList()
+		},
+		onLoad: function(option) {
+			// #ifdef MP
+			if (option.scene) {
+				// 存储小程序邀请人
+				uni.setStorage({
+					key: 'spread_code',
+					data: option.scene
+				});
+			}
+			// #endif
+		},
+		onShow: function() {
+			this.getGoodList()
+			// this.getGoodList(2)
+			this.loadData();
+			this.groom1()
+		},
+		methods: {
+			//获取复购商品
+			groom1() {
+				groom1().then(res => {
+					console.log(res)
+					this.fgList = res.data.list
+				})
+			},
+			getGoodList(type=1) {
+				let that = this;
+				let item ;
+				if(type == 1) {
+					item = that.navList.bd
+				}else {
+					item = that.navList.jf
+				}
+				if(item.loadingType == 'loading' || item.loadingType == 'nomore') {
+					return 
+				}
+				item.loadingType = 'loading'
+				getProducts({
+					mall_type: item.status,
+					page: item.page,
+					limit: item.limit,
+					// mall_type: 3,//1-bd 2-pt 3-jf
+				}).then(res => {
+					item.list = item.list.concat(res.data)
+					// if(item.limit == res.data) {
+					// 	item.loadingType = 'more'
+					// }else {
+					// 	item.loadingType = 'nomore'
+					// }
+				})
+			},
+			navto(url, type = 0) {
+				if (type == 1) {
+					if (!this.hasLogin) {
+						// 保存地址
+						saveUrl();
+						// 登录拦截
+						interceptor();
+					} else {
+						uni.navigateTo({
+							url,
+							fail() {
+								uni.switchTab({
+									url
+								})
+							}
+						})
+					}
+				} else {
+					uni.navigateTo({
+						url,
+						fail() {
+							uni.switchTab({
+								url
+							})
+						}
+					})
+				}
+
+			},
+			navTo(url) {
+				if (url == '') {
+					this.$api.msg('暂未开通，敬请期待');
+				} else {
+					this.navto(url)
+				}
+			},
+			// 點擊搜索框
+			clickSearch() {
+				uni.navigateTo({
+					url: '/pages/product/search'
+				});
+			},
+			// 监听图片加载完成
+			onImageError(key, index) {
+				this[key][index].image = '/static/error/errorImage.jpg';
+			},
+			// 请求载入数据
+			async loadData() {
+				loadIndexs({})
+					.then(({
+						data
+					}) => {
+						let goods = data.info;
+						console.log(goods, '商品信息');
+						this.carouselList = data.banner;
+						this.swiperLength = this.carouselList.length;
+						this.bastList = data.giftInfo; //会员礼包
+						data.info.firstList.forEach(e => {
+							e.isVip = e.store_type ? "3" : "0"
+						})
+						this.firstList = data.info.firstList //首页商品
+						uni.stopPullDownRefresh();
+					})
+					.catch(e => {
+						uni.stopPullDownRefresh();
+					});
+			},
+			//轮播图切换修改背景色
+			swiperChange(e) {
+				const index = e.detail.current;
+				this.swiperCurrent = index;
+				this.titleNViewBackground = this.carouselList[index].background;
+			},
+			// 轮播图跳转
+			bannerNavToUrl(item) {
+				// #ifdef H5
+				console.log(item.wap_url.indexOf('http'), 'banner');
+				if (item.wap_url.indexOf('http') >= 0) {
+					window.location.href = item.wap_url;
+				}
+				// #endif
+				//测试数据没有写id，用title代替
+				uni.navigateTo({
+					url: item.wap_url
+				});
+			},
+			comfirm(text) {
+				console.log(text);
+				const result = this.uniCopy(text);
+				if (result === false) {
+					uni.showToast({
+						title: '不支持'
+					});
+				} else {
+					uni.showToast({
+						title: '复制成功',
+						icon: 'none'
+					});
+				}
+				this.$refs.popupkf.close();
+			},
+			uniCopy(content) {
+				/**
+				 * 小程序端 和 app端的复制逻辑
+				 */
+				//#ifndef H5
+				uni.setClipboardData({
+					data: content,
+					success: function() {
+						console.log('success');
+						return true;
+					}
+				});
+				//#endif
+
+				/**
+				 * H5端的复制逻辑
+				 */
+				// #ifdef H5
+				if (!document.queryCommandSupported('copy')) {
+					//为了兼容有些浏览器 queryCommandSupported 的判断
+					// 不支持
+					return false;
+				}
+				let textarea = document.createElement('textarea');
+				textarea.value = content;
+				textarea.readOnly = 'readOnly';
+				document.body.appendChild(textarea);
+				textarea.select(); // 选择对象
+				textarea.setSelectionRange(0, content.length); //核心
+				let result = document.execCommand('copy'); // 执行浏览器复制命令
+				textarea.remove();
+				return result;
+				// #endif
+			},
+			// 打开客服
+			openKf() {
+				this.$refs.popupkf.open();
+			},
+			// 关闭客服
+			cancel() {
+				this.$refs.popupkf.close();
+			},
+		}
+	};
+</script>
+
+<style lang="scss">
+	page {
+		background: #ffff;
+		min-height: 100%;
+		height: auto;
+	}
+
+	// 顶部搜索
+	.top-search {
+		height: 80rpx;
+		padding: 0 20rpx;
+		margin-bottom: 20rpx;
+		// background-color: #fff;
+	
+		.top-logo {
+			width: 50rpx;
+			// height: 50rpx;
+			margin-right: 10rpx;
+	
+			image {
+				width: 48rpx;
+			}
+	
+		}
+	
+		.search-box {
+			justify-content: center;
+			width: 698rpx;
+			height: 60rpx;
+			background: #EEEEEE;
+			// box-shadow: 0px 10rpx 20rpx 0px rgba(4, 114, 69, 0.22);
+			border-radius: 30rpx;
+	
+			.search {
+				width: 34rpx;
+				height: 34rpx;
+			}
+	
+			.search-font {
+				margin-left: 14rpx;
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #CBCBCB;
+			}
+		}
+	}
+	
+	// 顶部轮播图
+	.top-swiper {
+		width: 690rpx;
+		height: 365rpx;
+	
+		// margin: 20rpx 0 0;
+		border-radius: 20rpx;
+		margin: auto;
+		image {
+			width: 690rpx;
+			height: 365rpx;
+			border-radius: 20rpx;
+		}
+	}
+	.swiper-btm {
+		height: 60rpx;
+		width: 750rpx;
+		background-color: #fff;
+		margin-bottom: 20rpx;
+		font-size: 26rpx;
+		font-weight: 500;
+		color: #333333;
+
+		.btm-item {
+			flex-grow: 1;
+			justify-content: center;
+
+			image {
+				width: 25rpx;
+				height: 25rpx;
+				margin-right: 14rpx;
+			}
+		}
+	}
+
+	.jg {
+		height: 20rpx;
+		background: #F8F8F8;
+	}
+
+	// 分类
+	.cate-section {
+		justify-content: space-around;
+		background-color: #fff;
+		padding: 0rpx 0 30rpx;
+
+		.cate-item {
+			flex-grow: 0;
+			width: 20%;
+			flex-direction: column;
+			text-align: center;
+			align-items: center;
+			justify-content: center;
+
+			.img-wrapper {
+				width: 100rpx;
+				height: 100rpx;
+				border-radius: 20rpx;
+				position: relative;
+
+				image {
+					width: 100rpx;
+					height: 100rpx;
+					position: absolute;
+					left: 50%;
+					top: 50%;
+					transform: translate(-50%, -50%);
+				}
+			}
+
+			.item-title {
+				margin-top: 15rpx;
+				font-size: 24rpx;
+				font-weight: 500;
+				color: #3F3F3F;
+			}
+		}
+	}
+
+	.product-box {
+		margin-top: 20rpx;
+		background: #ffffff;
+		padding: 26rpx 0 20rpx;
+
+		.product-tit {
+			justify-content: center;
+
+			image {
+				width: 609rpx;
+				height: 31rpx;
+			}
+			.hx {
+				width: 120rpx;
+				height: 1rpx;
+				background: #363636;
+				color: #363636;
+				line-height: 28px;
+			}
+					
+			.tit {
+				margin: 0 70rpx;
+				font-size: 32rpx;
+				font-weight: 500;
+				color: #363636;
+			}
+		}
+
+		.in-ban {
+			margin-top: 40rpx;
+			width: 750rpx;
+			height: 220rpx;
+		}
+	}
+
+	.hotgoods {
+		margin-top: 38rpx;
+		width: 100%;
+		display: flex;
+		flex-wrap: wrap;
+		padding: 0 20rpx 30rpx;
+		justify-content: space-between;
+
+		.hotgoods-item {
+			width: 345rpx;
+			background-color: #ffffff;
+			border-radius: 12rpx;
+			box-shadow: 0 0 15rpx rgba(0, 0, 0, 0.2);
+			margin-bottom: 15rpx;
+
+			.image-wrapper {
+				width: 345rpx;
+				height: 345rpx;
+				border-radius: 3px;
+				overflow: hidden;
+				position: relative;
+
+				.image-bg {
+					position: absolute;
+					top: 0;
+					left: 0;
+					right: 0;
+					bottom: 0;
+					width: 100%;
+					height: 100%;
+					opacity: 1;
+					border-radius: 12rpx 12rpx 0 0;
+					z-index: 2;
+				}
+
+				.image {
+					width: 100%;
+					height: 100%;
+					opacity: 1;
+					border-radius: 12rpx 12rpx 0 0;
+				}
+			}
+
+			.title {
+				margin-top: 24rpx;
+				padding: 0 20rpx;
+				font-size: 32rpx;
+				font-weight: 500;
+				color: #333333;
+			}
+
+			.hot-price {
+				display: flex;
+				justify-content: flex-start;
+				align-items: center;
+				// padding: 14rpx 0 30rpx;
+
+				.hotPrice-box {
+					padding: 2rpx 6rpx;
+
+					background: linear-gradient(90deg, #c79a4c, #f9df7f);
+					border-radius: 5rpx;
+					text-align: center;
+					line-height: 28rpx;
+					font-size: 20rpx;
+					font-family: Source Han Sans CN;
+					font-weight: 400;
+					color: #ffffff;
+				}
+
+				.price {
+					margin-left: 10rpx;
+					font-size: 36rpx;
+					color: #ff0000;
+					font-weight: 500;
+					display: flex;
+					justify-content: flex-start;
+					align-items: center;
+					.jf {
+						font-size: 20rpx;
+					}
+					.give-jf {
+						display: inline-block;
+						padding: 8rpx;
+						
+						background: linear-gradient(90deg, #FF834D, #FF2600);
+						border-radius: 12rpx 0px 12rpx 0px;
+						
+						font-size: 22rpx;
+						font-weight: 500;
+						color: #FFFFFF;
+						margin-left: 22rpx;
+					}
+					.ot-pirce {
+						margin-left: 7rpx;
+						font-size: 26rpx;
+						font-weight: 500;
+						text-decoration: line-through;
+						color: #999999;
+						align-self: flex-end;
+					}
+					
+				}
+
+				.yuanPrice {
+					margin-left: 10rpx;
+					font-size: 20rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					text-decoration: line-through;
+					color: #999999;
+				}
+
+				.cart-icon {
+					image {
+						width: 44rpx;
+						height: 44rpx;
+					}
+				}
+			}
+		}
+	}
+
+	.popup-box {
+		width: 522rpx;
+		height: 605rpx;
+		background-color: #ffffff;
+		border-radius: 20rpx;
+		position: relative;
+
+		.img {
+			position: relative;
+			top: -56rpx;
+			left: 0;
+			width: 522rpx;
+			height: 132rpx;
+			display: flex;
+			justify-content: center;
+
+			image {
+				border-radius: 20rpx 20rpx 0 0;
+				width: 450rpx;
+				height: 132rpx;
+			}
+		}
+
+		.mian {
+			margin-top: -44rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			// padding: 32rpx 32rpx;
+			background-color: #ffffff;
+			border-radius: 0 0 20rpx 20rpx;
+			text-align: center;
+
+			.delivery {
+				font-size: 40rpx;
+				color: #333333;
+				display: flex;
+				align-items: center;
+				flex-direction: column;
+
+				image {
+					margin-top: 48rpx;
+					width: 172rpx;
+					height: 160rpx;
+				}
+			}
+
+			.nocancel {
+				font-size: 32rpx;
+				color: #333333;
+				margin-top: 14rpx;
+			}
+
+			.comfirm-box {
+				margin-top: 52rpx;
+				display: flex;
+				// margin-bottom: 32rpx;
+
+				// justify-content: space-around;
+				.cancel {
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					width: 197rpx;
+					height: 74rpx;
+					border: 1px solid #dcc786;
+					border-radius: 38rpx;
+
+					font-size: 32rpx;
+					color: #605128;
+				}
+
+				.comfirm {
+					margin-left: 32rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					width: 197rpx;
+					height: 74rpx;
+					background: linear-gradient(-90deg, #d1ba77 0%, #f7e8ad 100%);
+					border-radius: 38px;
+					font-size: 32rpx;
+					color: #605128;
+				}
+			}
+		}
+	}
+	.index-top-wrap {
+		position: relative;
+		.index-top {
+			width: 750rpx;
+			position: absolute;
+		}
+		.fud {
+			position: relative;
+		}
+	}
 </style>

pages/order/order.vue

@@ -58,7 +58,7 @@
 							<button v-if="item._status._title == '未支付'" @click.stop="orderPay(item)" class="action-btn recom">立即支付</button>
 							<button v-if="item._status._title == '待评价'" class="action-btn">评价</button>
 							<button v-if="item._status._title == '待收货'" @click.stop="orderTake(item, index)" class="action-btn">确认收货</button>
-							<button v-if="item._status._title == '未发货'" class="action-btn" @click.stop="orderRefund(item)">申请退款</button>
+							<!-- <button v-if="item._status._title == '未发货'" class="action-btn" @click.stop="orderRefund(item)">申请退款</button> -->
 						</view>
 					</view>
 
@@ -106,14 +106,14 @@ export default {
 					page: 1, //当前页数
 					limit: 10 //每次信息条数
 				},
-				{
-					state: 3,
-					text: '待评价',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				},
+				// {
+				// 	state: 3,
+				// 	text: '待评价',
+				// 	loadingType: 'more',
+				// 	orderList: [],
+				// 	page: 1, //当前页数
+				// 	limit: 10 //每次信息条数
+				// },
 				{
 					state: 4,
 					text: '已完成',

pages/order/orderDetail.vue

@@ -40,12 +40,12 @@
 							<view class="attr-box">
 								{{ goodsItem.attrInfo ? goodsItem.attrInfo.suk : '' }} x {{ goodsItem.cart_num + '' + (goodsItem.productInfo.unit_name ||'') }}
 							</view>
-							<view>
+							<!-- <view>
 								<view v-if="status._type ==  3">
 									<view @click="evaluate(goodsItem)" class="yesevaluate" v-if="goodsItem.is_reply > 0"><text>已评价</text></view>
 									<view @click="evaluate(goodsItem)" class="evaluate" v-if="goodsItem.is_reply < 1"><text>去评价</text></view>
 								</view>
-							</view>
+							</view> -->
 						</view>
 					</view>
 				</view>

pages/product/product.vue

@@ -12,8 +12,8 @@
 			<view class="title flex">
 				<view class="title-box">
 					<text class="price-tip">¥</text>
-					<text class="price" v-if="userInfo && userInfo.level == 1">{{ goodsObjact.vip_repurchase*1 || ''}}</text>
-					<text class="price" v-if="userInfo && userInfo.level == 2">{{ goodsObjact.agent_repurchase*1 || ''}}</text>
+					<text class="price" v-if="userInfo && userInfo.level == 1">{{ goodsObjact.vip_repurchase*1 || ''}}</text>
+					<text class="price" v-if="userInfo && userInfo.level == 2">{{ goodsObjact.agent_repurchase*1 || ''}}</text>
 					<text class="price" v-if="(!hasLogin || userInfo.level == 0)">{{ goodsObjact.price*1 }}</text>
 					<text class="m-price" v-if="goodsObjact.ot_price > goodsObjact.price">¥{{ goodsObjact.ot_price }}</text>
 					<!-- <text class="coupon-tip">7折</text> -->
@@ -34,34 +34,18 @@
 		</view>
 
 		<view class="introduce-section">
-			<view class="price-box" v-if="goodsType == 0">
-				<text class="price-tip">¥</text>
-				<text class="price">{{ goodsObjact.price}}</text>
+			<view class="price-box" v-if="goodsType == 0">
+				<template v-if="isjf != 1">
+					<text class="price-tip">¥</text>
+					<text class="price">{{ goodsObjact.price}}</text>
+				</template>
+				<template v-if="isjf == 1">
+					<text class="price">{{ goodIntegral}}积分</text>
+				</template>
 				<text class="m-price" v-if="goodsObjact.ot_price > goodsObjact.price">¥{{ goodsObjact.ot_price }}</text>
 			</view>
 			<text class="title" v-if="goodsType == 0">{{ goodsObjact.store_name }}</text>
 		</view>
-		<view class="c-list">
-			<view class="c-row b-b" @click="toggleSpec">
-				<text class="tit">购买数量</text>
-				<view class="con">
-					<text class="selected-text">{{ goodsNumber }}</text>
-				</view>
-				<text class="iconfont iconenter"></text>
-			</view>
-			<view class="c-row b-b" v-if="goodsType == 1">
-				<text class="tit">限购数量</text>
-				<view class="con">
-					<text class="selected-text">{{ goodsObjact.num + goodsObjact.unit_name }}</text>
-				</view>
-			</view>
-			<!-- <view class="c-row b-b" v-if="goodsObjact.is_integral == 1 && goodsType == 0">
-				<text class="tit">积分</text>
-				<view class="bz-list con">
-					<text>最高抵扣￥{{ moneyNum(goodsObjact.use_max_integral) == 0 ? moneyNum(goodsObjact.price) : moneyNum(goodsObjact.use_max_integral) }}</text>
-				</view>
-			</view> -->
-		</view>
 		<view class="detail-desc">
 			<view class="d-header"><text>商品详情</text></view>
 			<rich-text class="detail-centent" :nodes="goodsObjact.description"></rich-text>
@@ -69,16 +53,16 @@
 		</view>
 		<!-- 底部操作菜单 -->
 		<view class="page-bottom" v-if="goodsType == 0">
-			<view class="action-btn-group">
-				<view class="shoucang flex" @click="toFavorite(goodsObjact)" v-if="isjf == 0 && isbd == 0">
-					<image src="../../static/icon/sc-ico.png" mode=""></image>
-					<view class="">
-						收藏
-					</view>
-				</view>
-				<view class="buy-now">
-					<button type="primary" class=" action-btn no-border buy-now-btn" @click.stop="toggleSpec(2)" v-if="isjf==0 && isbd == 0">加入购物车</button>
-					<button type="primary" class=" action-btn no-border  add-cart-btn" @click.stop="toggleSpec(1)">立即购买</button>
+			<view class="action-btn-group">
+				<view class="shoucang flex" @click="toFavorite(goodsObjact)" v-if="isjf == 0 && isbd == 0">
+					<image src="../../static/icon/sc-ico.png" mode=""></image>
+					<view class="">
+						收藏
+					</view>
+				</view>
+				<view class="buy-now">
+					<button type="primary" class=" action-btn no-border buy-now-btn" @click.stop="toggleSpec(2)" v-if="isjf==0 && isbd == 0">加入购物车</button>
+					<button type="primary" class=" action-btn no-border  add-cart-btn" @click.stop="toggleSpec(1)">立即购买</button>
 				</view>
 				
 			</view>
@@ -92,7 +76,8 @@
 					<image :src="actionImage"></image>
 					<view class="right">
 						<view class="good-name clamp">{{ goodsObjact.store_name }}</view>
-						<text class="price">¥{{ actionPrice * goodsNumber }}</text>
+						<text class="price" v-if="isjf == 1">¥{{ (goodIntegral * goodsNumber).toFixed(2) }}</text>
+						<text class="price" v-else>¥{{ (actionPrice * goodsNumber).toFixed(2) }}</text>
 						<!-- <text class="price jf">{{ goodIntegral }}</text> -->
 						<!-- <text class="stock">库存：{{ goodsObjact.stock }}件</text> -->
 						<!-- <view class="selected" v-if="goodsType == 0">
@@ -139,10 +124,10 @@ import { goodsDetail, cartAdd, collectAdd, collectDel, seckillGoods, groupGoods
 import { weixindata,shareLoad } from '@/utils/wxAuthorized';
 import weixinObj from "@/plugin/jweixin-module/index.js";
 import { userInfo } from 'os';
-// #endif
-	import {
-		mapState,
-		mapMutations
+// #endif
+	import {
+		mapState,
+		mapMutations
 	} from 'vuex';
 export default {
 	components: {
@@ -159,7 +144,7 @@ export default {
 		}
 	},
 	data() {
-		return {
+		return {
 			isfg: 0,
 			details: '',
 			reply: '', //评论
@@ -209,22 +194,22 @@ export default {
 				h: '', //时
 				i: '', //分
 				s: '' //秒
-			},
-			is_bk: 0,
-			is_xf: 0,
-			goodIntegral: 0,//需要使用的积分
-			isbd: 0,
+			},
+			is_bk: 0,
+			is_xf: 0,
+			goodIntegral: 0,//需要使用的积分
+			isbd: 0,
 			isjf: 0,
 		};
 	},
 	async onLoad(options) {
-		let obj = this;
-
-		if(options.isbd) {
-			obj.isbd = options.isbd
-		}
-		if(options.isjf) {
-			obj.isjf = options.isjf
+		let obj = this;
+
+		if(options.isbd) {
+			obj.isbd = options.isbd
+		}
+		if(options.isjf) {
+			obj.isjf = options.isjf
 		}
 		//保存商品id
 		this.goodsid = options.id;
@@ -270,7 +255,7 @@ export default {
 		// #ifdef H5
 		...mapState(['weichatObj', 'baseURL', 'urlFile']),
 		
-		// #endif
+		// #endif
 		...mapState('user', ['userInfo','hasLogin'])
 	},
 	methods: {
@@ -297,21 +282,21 @@ export default {
 				let store_info = data.system_store; // 保存店铺信息
 				console.log(store_info);
 				obj.storeObjact = store_info;
-				obj.goodsObjact = goods;
-				if (obj.goodsObjact.description != null) {
-					obj.goodsObjact.description = obj.goodsObjact.description.replace(/\<img/gi, '<img class="rich-img"');
-				} //小程序商品详情图超出屏幕问题
+				obj.goodsObjact = goods;
+				if (obj.goodsObjact.description != null) {
+					obj.goodsObjact.description = obj.goodsObjact.description.replace(/\<img/gi, '<img class="rich-img"');
+				} //小程序商品详情图超出屏幕问题
 				// console.log()
 				obj.reply = data.reply; //保存评论列表
 				obj.imgList = goods.slider_image; //保存轮播图
 				obj.specList = data.productAttr; //保存分类列表
 				console.log(data.productAttr);
 				obj.productValue = data.productValue; //保存分类查询数据
-				 //保存默认选中商品价格
-				obj.actionPrice = goods.price;
+				 //保存默认选中商品价格
+				obj.actionPrice = goods.price;
 				obj.actionImage = goods.image_base; //保存默认选中商品价格
 				obj.goodsNumberMax = goods.stock; //保存默认选中最大可购买商品数量
-				obj.shopId = data.mer_id; //保存商店id
+				obj.shopId = data.mer_id; //保存商店id
 			
 				// 保存默认选中的对象
 				obj.specSelected = []; //初始化默认选择对象
@@ -326,11 +311,11 @@ export default {
 				let str = obj.specSelected.join(',');
 				// 设置默认值
 				obj.actionImage = obj.productValue[str].image;
-				obj.uniqueId = obj.productValue[str].unique;
-				obj.goodIntegral = obj.productValue[str].integral
-				if(obj.isbd == 1) {
-					obj.goodsNumberMax = 1
-				}
+				obj.uniqueId = obj.productValue[str].unique;
+				obj.goodIntegral = obj.productValue[str].integral
+				if(obj.isbd == 1) {
+					obj.goodsNumberMax = 1
+				}
 				console.log(obj.goodIntegral,'obj.goodIntegral')
 				// #ifdef H5
 				obj.shareDate();
@@ -366,10 +351,10 @@ export default {
 			this.goodsNumber = e.number;
 		},
 		//规格弹窗开关
-		toggleSpec(str) {
-			if(this.userInfo && this.userInfo.identity == 0 && this.isfg == 1) {
-				this.$api.msg('复购商品需店员以上才能购买!')
-				return
+		toggleSpec(str) {
+			if(this.userInfo && this.userInfo.identity == 0 && this.isfg == 1) {
+				this.$api.msg('复购商品需店员以上才能购买!')
+				return
 			}
 			if (this.specClass === 'show') {
 				this.specClass = 'hide';
@@ -383,7 +368,7 @@ export default {
 			this.type = str;
 		},
 		//选择规格
-		selectSpec(item, arr, ind) {
+		selectSpec(item, arr, ind) {
 			let obj = this
 			arr.attr_value.forEach(function(e) {
 				e.check = false;
@@ -393,16 +378,16 @@ export default {
 			let str = this.specSelected.join(',');
 			this.specSelectedName = this.specSelected.join(' ');
 			if (this.productValue[str]) {
-				let data = this.productValue[str];
-				this.actionPrice = data.price;
+				let data = this.productValue[str];
+				this.actionPrice = data.price;
 				this.goodsNumberMax = data.stock;
 				this.actionImage = data.image;
-				this.uniqueId = data.unique;
-				this.goodIntegral = data.integral
+				this.uniqueId = data.unique;
+				this.goodIntegral = data.integral
 				console.log(this.goodIntegral,'xuanz')
-			}
-			if(this.is_xf == 1) {
-				this.goodsNumberMax = 1
+			}
+			if(this.is_xf == 1) {
+				this.goodsNumberMax = 1
 			}
 		},
 		//分享
@@ -622,9 +607,9 @@ page {
 		margin: 0 12rpx;
 		color: $font-color-light;
 		text-decoration: line-through;
-	}
-	.pt {
-		text-decoration:none;
+	}
+	.pt {
+		text-decoration:none;
 	}
 	.coupon-tip {
 		align-items: center;
@@ -1090,37 +1075,37 @@ page {
 			font-size: 46rpx;
 		}
 	}
-	.action-btn-group {
+	.action-btn-group {
 		width: 100%;
 		display: flex;
 		height: 98rpx;
 		overflow: hidden;
-		position: relative;
-		.shoucang {
-			width: 100rpx;
-			height: 100rpx;
-			background: #FFFFFF;
-			flex-direction: column;
-			justify-content: center;
-			font-size: 20rpx;
-			image {
-				width: 36rpx;
-				height: 35rpx;
-				margin-bottom: 10rpx;
-			}
+		position: relative;
+		.shoucang {
+			width: 100rpx;
+			height: 100rpx;
+			background: #FFFFFF;
+			flex-direction: column;
+			justify-content: center;
+			font-size: 20rpx;
+			image {
+				width: 36rpx;
+				height: 35rpx;
+				margin-bottom: 10rpx;
+			}
+		}
+		.buy-now {
+			flex-grow: 1;
+			// width: 650rpx;
+			display: flex;
 		}
-		.buy-now {
-			flex-grow: 1;
-			// width: 650rpx;
-			display: flex;
-		}
-		.action-btn {
-			flex-shrink: 0;
+		.action-btn {
+			flex-shrink: 0;
 			flex-grow: 1;
 			display: flex;
 			align-items: center;
 			justify-content: center;
-			// width: 580rpx;
+			// width: 580rpx;
 			flex-grow: 1;
 			height: 100%;
 			font-size: 34rpx;
@@ -1157,15 +1142,15 @@ page {
 		font-size: $font-lg;
 		line-height: 1;
 	}
-}
-.detail-centent {
-	img {
-		vertical-align: top;
-	}
-}
-/* 商品详情中限制图片大小 */
-/deep/ .rich-img {
-	width: 100% !important;
-	height: auto;
+}
+.detail-centent {
+	img {
+		vertical-align: top;
+	}
+}
+/* 商品详情中限制图片大小 */
+/deep/ .rich-img {
+	width: 100% !important;
+	height: auto;
 }
 </style>

pages/product/search.vue

@@ -40,7 +40,7 @@
 					<view class="nav-item" :class="{ current: newOrder == 1 }" @click="newGoodsTab()">新品</view>
 				</view>
 				<scroll-view scroll-y class="cate-list" @scrolltolower='getProducts'>
-					<view class="guess-section">
+					<!-- <view class="guess-section">
 						<view v-for="(item, index) in goodsList" :key="index" class="guess-item" @click="navToDetailPage(item)">
 							<view class="image-wrapper"><image :src="item.image" mode="aspectFill"></image></view>
 							<text class="title clamp margin-c-20">{{ item.store_name }}</text>
@@ -55,6 +55,27 @@
 								</view>
 							</view>
 						</view>
+					</view> -->
+					<view class="hotgoods">
+						<view class="hotgoods-item" v-for="bditem in goodsList" :key="bditem.id"
+							@click="navToDetailPage(bditem)" style="height: 520rpx;">
+							<view class="image-wrapper">
+								<image class="image" :src="bditem.image" mode="scaleToFill"></image>
+							</view>
+							<view class="flex" style="flex-direction: column;justify-content: space-between;align-items: flex-start;height: 170rpx;">
+								<view class="title clamp2">{{bditem.store_name}}</view>
+								<view class="hot-price">
+									<view class="price">
+										<text class="font-size-sm"></text>
+										<text>￥{{ bditem.price * 1 }}</text>
+										<text class="give-jf" v-if="bditem.give_consumption*1">赠{{bditem.give_consumption*1}}消费余额</text>
+										<!-- <text class="ot-pirce">￥{{bditem.ot_price}}</text> -->
+									</view>
+									
+								</view>
+							</view>
+					
+						</view>
 					</view>
 					<uni-load-more :status="loadingType"></uni-load-more>
 				</scroll-view>
@@ -132,7 +153,8 @@ export default {
 				page: obj.page,
 				limit: obj.limit,
 				news: obj.newOrder,
-				keyword: this.keyword
+				keyword: this.keyword,
+				mall_type: 2
 			};
 			// 判断是否为销售数量排序
 			if (this.searchType === 1) {
@@ -227,10 +249,13 @@ export default {
 		},
 		navToDetailPage(item) {
 			//测试数据没有写id，用title代替
-			let id = item.id;
-			uni.navigateTo({
-				url: '/pages/product/product?id=' + id
-			});
+			let id = item.id;
+			
+				uni.navigateTo({
+					url: '/pages/product/product?id=' + id
+				});
+			
+			
 		}
 	}
 };
@@ -282,7 +307,7 @@ page,
 	height: calc(100% - 44px);
 	/* #endif */
 	.search-hot {
-		padding: 25rpx;
+		padding: 25rpx 0;
 		.title {
 			font-size: $font-lg;
 			color: $font-color-light;
@@ -448,5 +473,127 @@ page,
 .cate-list {
 	height: 100%;
 	padding-top: 40px;
-}
+}
+.hotgoods {
+		// margin-top: 38rpx;
+		width: 100%;
+		display: flex;
+		flex-wrap: wrap;
+		padding: 0 20rpx 30rpx;
+		justify-content: space-between;
+
+		.hotgoods-item {
+			width: 345rpx;
+			background-color: #ffffff;
+			border-radius: 12rpx;
+			box-shadow: 0 0 15rpx rgba(0, 0, 0, 0.2);
+			margin-bottom: 15rpx;
+
+			.image-wrapper {
+				width: 345rpx;
+				height: 345rpx;
+				border-radius: 3px;
+				overflow: hidden;
+				position: relative;
+
+				.image-bg {
+					position: absolute;
+					top: 0;
+					left: 0;
+					right: 0;
+					bottom: 0;
+					width: 100%;
+					height: 100%;
+					opacity: 1;
+					border-radius: 12rpx 12rpx 0 0;
+					z-index: 2;
+				}
+
+				.image {
+					width: 100%;
+					height: 100%;
+					opacity: 1;
+					border-radius: 12rpx 12rpx 0 0;
+				}
+			}
+
+			.title {
+				margin-top: 24rpx;
+				padding: 0 20rpx;
+				font-size: 32rpx;
+				font-weight: 500;
+				color: #333333;
+			}
+
+			.hot-price {
+				display: flex;
+				justify-content: flex-start;
+				align-items: center;
+				// padding: 14rpx 0 30rpx;
+
+				.hotPrice-box {
+					padding: 2rpx 6rpx;
+
+					background: linear-gradient(90deg, #c79a4c, #f9df7f);
+					border-radius: 5rpx;
+					text-align: center;
+					line-height: 28rpx;
+					font-size: 20rpx;
+					font-family: Source Han Sans CN;
+					font-weight: 400;
+					color: #ffffff;
+				}
+
+				.price {
+					margin-left: 10rpx;
+					font-size: 36rpx;
+					color: #ff0000;
+					font-weight: 500;
+					display: flex;
+					justify-content: flex-start;
+					align-items: center;
+					.jf {
+						font-size: 20rpx;
+					}
+					.give-jf {
+						display: inline-block;
+						padding: 8rpx;
+						
+						background: linear-gradient(90deg, #FF834D, #FF2600);
+						border-radius: 12rpx 0px 12rpx 0px;
+						
+						font-size: 22rpx;
+						font-weight: 500;
+						color: #FFFFFF;
+						margin-left: 22rpx;
+					}
+					.ot-pirce {
+						margin-left: 7rpx;
+						font-size: 26rpx;
+						font-weight: 500;
+						text-decoration: line-through;
+						color: #999999;
+						align-self: flex-end;
+					}
+					
+				}
+
+				.yuanPrice {
+					margin-left: 10rpx;
+					font-size: 20rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					text-decoration: line-through;
+					color: #999999;
+				}
+
+				.cart-icon {
+					image {
+						width: 44rpx;
+						height: 44rpx;
+					}
+				}
+			}
+		}
+	}
 </style>

pages/public/register.vue

@@ -83,7 +83,7 @@ export default {
 				obj.$api.msg('两次密码不正确');
 				return;
 			}
-			// if ((obj.invitation = '')) {
+			// if ((obj.invitation == '')) {
 			// 	obj.$api.msg('请输入邀请码');
 			// 	return;
 			// }

pages/user/fh.vue

@@ -0,0 +1,457 @@
+<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/tg-bg.png" mode=""></image></view>
+			<view class="money-box">
+				<view class="money">{{ type == 1?'会员分红池':(type== 2? '合伙人分红池': (type == 3? '股东分红池': '董事分红池')) }}</view>
+				<!-- <view>我的奖金</view> -->
+			</view>
+			<!-- <view class="moneybtn-box">
+				<view class="money-btn" @click="navto('/pages/user/yjzz')">奖金转账</view>
+				<view class="money-btn" @click="navto('/pages/user/yjzye')">奖金转余额</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">{{userInfo.brokerage || '0'}}</view>
+			</view>
+			<view class="shu"></view>
+			<view class="info-item">
+				<view class="info-font">释放金额</view>
+				<view class="info-num">{{userInfo.extractTotalPrice || '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.nickname }}</text>
+								</view>
+								<view class="time">
+									<text>{{ item.create_time }}</text>
+								</view>
+							</view>
+							<view class="money">
+								<view>{{  item.price }}</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 { getCommissionInfo,getUser } from '@/api/user.js';
+import { getMoneyStyle } from '@/utils/rocessor.js';
+import { mapGetters } from 'vuex';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import empty from '@/components/empty';
+import { spreadCommission, userBalance,extractBank,fllj, flff, getTj } from '@/api/wallet.js';
+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 {
+			type: 1,
+			userInfo: {},
+			yj: '',
+			height: '',
+			// 头部图高度
+			maxheight: '',
+			tabCurrentIndex: 0,
+			orderStatusSum: 0,
+			recharge: 0,
+			navList: [
+				{
+					state:1,
+					text: '累计',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10 //每次信息条数
+				},
+				{
+					state: 2,
+					text: '发放',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10 //每次信息条数
+				}
+			],
+			money: ''
+		};
+	},
+	onLoad(options) {
+		if(options.state) {
+			this.type = options.state
+		}
+		this.loadData();
+		this.getTj()
+	},
+	onShow() {
+		this.extractBank()
+		this.getUserInfo()
+		
+	},
+	methods: {
+		getTj() {
+			getTj({
+				type: this.type
+			}).then(res => {
+				console.log(res)
+			})
+		},
+		getUserInfo() {
+			getUser({}).then(({ data }) => {
+				this.userInfo = data
+			});
+		},
+		extractBank() {
+			extractBank().then(res => {
+				console.log(res)
+				this.yj = res.data.brokerage_price
+			})
+		},
+		toBack() {
+			uni.switchTab({
+				url: '/pages/user/user'
+			});
+		},
+		// 页面跳转
+		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' || navItem.loadingType == 'noMore') {
+				//防止重复加载
+				return;
+			}
+			// 修改当前对象状态为加载中
+			navItem.loadingType = 'loading';
+			let qdata = {
+				page: navItem.page,
+				limit: navItem.limit,
+				type: obj.type
+			}
+			if(state == 1 ) {
+				fllj(qdata).then(res => {
+					navItem.orderList = navItem.orderList.concat(res.data.data)
+					if(navItem.limit == res.data.data.length) {
+						navItem.loadingType = 'more'
+					}else {
+						navItem.loadingType = 'noMore'
+					}
+					navItem.loaded = true
+				})
+			}
+			if(state == 2) {
+				flff(qdata).then(res => {
+					navItem.orderList = navItem.orderList.concat(res.data.data)
+					if(navItem.limit == res.data.data.length) {
+						navItem.loadingType = 'more'
+					}else {
+						navItem.loadingType = 'noMore'
+					}
+					navItem.loaded = true
+				})
+			}
+		},
+
+		//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;
+	/* #ifdef H5 */
+	padding-top: 90rpx;
+	/* #endif */
+	color: #ffffff;
+	text-align: center;
+	/* #ifdef APP-PLUS */
+	height: 200rpx;
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	/* #endif */
+	/* #ifdef MP-WEIXIN */
+	padding-top: 40rpx;
+	/* #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 0;
+	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/user.vue

@@ -1,931 +1,1065 @@
-<template>
-	<view class="container">
-		<view class="vheigh"></view>
-		<view class="top-image">
-			<image src="../../static/img/user-top.png" mode=""></image>
-		</view>
-		<view class="" style="height: 120rpx;"></view>
-		<view class="user-box">
-			<view class="user-info flex">
-				<image class="avatar" :src="userInfo.avatar" mode="" v-if="userInfo.avatar"
-					@click="navTo('/pages/set/userinfo')"></image>
-				<image class="avatar" src="../../static/error/missing-face.png" mode="" v-else></image>
-				<view class="user-name-id">
-					<view class="user-name clamp2">{{ userInfo.nickname || '游客'}}</view>
-					
-					<view class="user-uid" v-if="userInfo.uid">ID号:{{ userInfo.uid || ''}}</view>
-				</view>
-			</view>
-			<view class="user-money flex">
-				<view class="user-money-item" @click="navTo('/pages/user/yue')">
-					<view class="user-money-num">{{ userInfo.now_money*1 || 0 }}</view>
-					<view class="user-money-font"> 余额</view>
-				</view>
-				<view class="user-xian"></view>
-				<view class="user-money-item" @click="navTo('/pages/user/award')">
-					<view class="user-money-num">{{ userInfo.brokerage_price*1 || 0 }}</view>
-					<view class="user-money-font">奖金</view>
-				</view>
-				<view class="user-xian"></view>
-				<view class="user-money-item" @click="navTo('/pages/user/jf')">
-					<view class="user-money-num">{{ userInfo.integral*1 || 0 }}</view>
-					<view class="user-money-font">积分</view>
-				</view>
-				<view class="user-xian"></view>
-				<view class="user-money-item" >
-					<view class="user-money-num">{{ userInfo.profit*1 || 0 }}</view>
-					<view class="user-money-font">可收益额度</view>
-				</view>
-				<!-- <view class="user-money-item" @click="navTo('/pages/user/team')">
-					<view class="user-money-num">{{ userInfo.spread_count || 0 }}</view>
-					<view class="user-money-font">我的推广</view>
-				</view> -->
-			</view>
-			<!-- <image src="../../static/icon/u-set.png" mode="" class="u-set" @click="navTo('/pages/set/userinfo')">
-			</image> -->
-			<view class="user-leve" v-if="userInfo.level > 0">
-				<image src="../../static/icon/gp.png" mode="widthFix"></image>
-				<view class="">
-					{{userInfo.level == 1 ? '会员': (userInfo.level == 2?'合伙人':(userInfo.level == 3?'股东': '董事'))}}
-				</view>
-			</view>
-		</view>
-		<view class="main-box">
-			<view class="title flex" @click="navTo('/pages/order/order?state=0')">
-				<view class="title-left">
-					<view class="title-font">我的订单</view>
-				</view>
-				<image class="title-right" src="../../static/icon/back.png" mode=""></image>
-			</view>
-			<view class="main flex">
-				<view class="oitem" @click="navTo('/pages/order/order?state=0')">
-					<image class="oitem-image" src="../../static/icon/o1.png" mode=""></image>
-					<view class="oitem-font">待付款</view>
-				</view>
-				<view class="oitem" @click="navTo('/pages/order/order?state=1')">
-					<image class="oitem-image" src="../../static/icon/o2.png" mode=""></image>
-					<view class="oitem-font">待发货</view>
-				</view>
-				<view class="oitem" @click="navTo('/pages/order/order?state=2')">
-					<image class="oitem-image" src="../../static/icon/o3.png" mode=""></image>
-					<view class="oitem-font">待收货</view>
-				</view>
-				<view class="oitem" @click="navTo('/pages/order/order?state=3')">
-					<image class="oitem-image" src="../../static/icon/o4.png" mode=""></image>
-					<view class="oitem-font">已完成</view>
-				</view>
-			</view>
-		</view>
-		<view class="user-list flex" @click="navTo('/pages/user/shareQrCode')">
-			<view class="user-list-image">
-				<image src="../../static/icon/u1.png" mode="heightFix" class="left-img"></image>
-			</view>
-			<view class="user-list-tit">
-				邀请海报
-			</view>
-			<image src="../../static/icon/back.png" mode="" class="right-img"></image>
-		</view>
-		<view class="user-list flex" @click="navTo('/pages/user/team')">
-			<view class="user-list-image">
-				<image src="../../static/icon/u2.png" mode="heightFix" class="left-img"></image>
-			</view>
-			<view class="user-list-tit">
-				我的分享
-			</view>
-			<image src="../../static/icon/back.png" mode="heightFix" class="right-img"></image>
-		</view>
-		<view class="user-list flex" @click="navTo('/pages/user/favorites')">
-			<view class="user-list-image">
-				<image src="../../static/icon/u3.png" mode="heightFix" class="left-img"></image>
-			</view>
-			<view class="user-list-tit">
-				我的收藏
-			</view>
-			<image src="../../static/icon/back.png" mode="heightFix" class="right-img"></image>
-		</view>
-		<view class="user-list flex" @click="openKf()">
-			<view class="user-list-image flex">
-				<image src="../../static/icon/u4.png" mode="heightFix" class="left-img"></image>
-			</view>
-			<view class="user-list-tit">
-				客服中心
-			</view>
-			<image src="../../static/icon/back.png" mode="heightFix" class="right-img"></image>
-		</view>
-		<view class="user-list flex" @click="navTo('/pages/set/address')">
-			<view class="user-list-image">
-				<image src="../../static/icon/u5.png" mode="heightFix" class="left-img"></image>
-			</view>
-			<view class="user-list-tit">
-				收货地址
-			</view>
-			<image src="../../static/icon/back.png" mode="heightFix" class="right-img"></image>
-		</view>
-		<view class="user-list flex" @click="navTo('/pages/set/userinfo')">
-			<view class="user-list-image">
-				<image src="../../static/icon/u6.png" mode="heightFix" class="left-img"></image>
-			</view>
-			<view class="user-list-tit">
-				设置
-			</view>
-			<image src="../../static/icon/back.png" mode="heightFix" class="right-img"></image>
-		</view>
-		<view class="" style="height: 20rpx;">
-		</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="cancel">取消</view>
-						<view class="comfirm" @click="comfirm(text)">复制微信</view>
-					</view>
-				</view>
-			</view>
-		</uni-popup>
-	</view>
-</template>
-<script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-	import uniList from '@/components/uni-list/uni-list.vue';
-	import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
-	import {
-		orderData,
-		getUserInfo,
-		check
-	} from '@/api/user.js';
-	import {
-		saveUrl,
-		interceptor
-	} from '@/utils/loginUtils.js';
-	let startY = 0,
-		moveY = 0,
-		pageAtTop = true;
-	export default {
-		components: {
-			uniList,
-			uniListItem
-		},
-		data() {
-			return {
-				current: 2,
-				id: '', //是否已签到
-				store_name: '',
-				achievement: '',
-				code: '',
-				text: '' //客服微信
-			};
-		},
-		onShow() {
-			// 判断是否已经登录
-			// if (this.hasLogin) {
-			// 	this.loadBaseData();
-			// }
-			this.loadBaseData();
-		},
-		filters: {
-			phone(e) {
-				var subStr1 = e.substr(0, 3);
-				var subStr2 = e.substr(e.length - 4, 4);
-				var subStr = subStr1 + '...' + subStr2;
-				e = subStr;
-				return e;
-			}
-		},
-		onReady() {
-			// 初始化获取页面宽度
-			uni.createSelectorQuery()
-				.select('.container')
-				.fields({
-						size: true
-					},
-					data => {
-						// 计算最多下拉的高度
-						this.userDowm = Math.floor((data.width / 750) * 185);
-						// 计算最大触发修改高度事件
-						this.userMaxDowm = Math.floor((data.width / 750) * 250);
-					}
-				)
-				.exec();
-		},
-		computed: {
-			...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
-		},
-		methods: {
-			...mapMutations('user', ['setUserInfo']),
-			qhx() {
-				check({
-						verify_code: this.code,
-						is_confirm: 1 //1是核销，0是查看
-					})
-					.then(e => {
-						this.$api.msg('核销成功');
-						this.close();
-					})
-					.catch(e => {
-						console.log(e);
-					});
-			},
-			sao() {
-				let obj = this;
-
-				// #ifndef H5
-				uni.scanCode({
-					success(e) {
-						obj.code = e.result;
-						obj.$refs.popuphx.open();
-						console.log(obj.$refs.popuphx);
-					}
-				});
-				// #endif
-			},
-			comfirm(text) {
-				console.log(text);
-				const result = this.uniCopy(text);
-				if (result === false) {
-					uni.showToast({
-						title: '不支持'
-					});
-				} else {
-					uni.showToast({
-						title: '复制成功',
-						icon: 'none'
-					});
-				}
-				this.$refs.popupkf.close();
-			},
-			uniCopy(content) {
-				/**
-				 * 小程序端 和 app端的复制逻辑
-				 */
-				//#ifndef H5
-				uni.setClipboardData({
-					data: content,
-					success: function() {
-						console.log('success');
-						return true;
-					}
-				});
-				//#endif
-
-				/**
-				 * H5端的复制逻辑
-				 */
-				// #ifdef H5
-				if (!document.queryCommandSupported('copy')) {
-					//为了兼容有些浏览器 queryCommandSupported 的判断
-					// 不支持
-					return false;
-				}
-				let textarea = document.createElement('textarea');
-				textarea.value = content;
-				textarea.readOnly = 'readOnly';
-				document.body.appendChild(textarea);
-				textarea.select(); // 选择对象
-				textarea.setSelectionRange(0, content.length); //核心
-				let result = document.execCommand('copy'); // 执行浏览器复制命令
-				textarea.remove();
-				return result;
-				// #endif
-			},
-			// 加载初始数据
-			loadBaseData() {
-				getUserInfo({})
-					.then(({
-						data
-					}) => {
-						console.log(data.nickname)
-						this.setUserInfo(data);
-					})
-					.catch(e => {
-						console.log(e);
-					});
-			},
-			/**
-			 * 统一跳转接口,拦截未登录路由
-			 * navigator标签现在默认没有转场动画，所以用view
-			 */
-			navTo(url) {
-				console.log(url);
-				if (!this.hasLogin) {
-					// 保存地址
-					saveUrl();
-					// 登录拦截
-					interceptor();
-				} else {
-					uni.navigateTo({
-						url
-					});
-				}
-			},
-			close() {
-				this.$refs.popuphx.close();
-				this.code = '';
-			},
-			// 打开客服
-			openKf() {
-				this.$refs.popupkf.open();
-			},
-			// 关闭客服
-			cancel() {
-				this.$refs.popupkf.close();
-			},
-			// 打开绑定
-			open() {
-				this.$refs.gspass.open();
-			},
-			cast() {
-				set_waiter({
-						uid: this.id
-					})
-					.then(e => {
-						this.$api.msg('绑定成功');
-						this.$refs.gspass.close();
-						this.id = '';
-					})
-					.catch(err => {
-						this.$refs.gspass.close();
-						this.id = '';
-					});
-			},
-			cancelpass() {
-				this.$refs.gspass.close();
-				this.id = '';
-			}
-		}
-	};
-</script>
-<style lang="scss">
-	%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,
-	page {
-		min-height: 100%;
-		height: auto;
-		background-color: #fff;
-	}
-
-	.vheigh {
-		height: var(--status-bar-height);
-		background-color: $base-color;
-	}
-
-	.top-image {
-		position: absolute;
-		top: 0;
-		left: 0;
-		right: 0;
-		height: 529rpx;
-
-		image {
-			width: 100%;
-			height: 100%;
-		}
-	}
-
-	.popup-box {
-		width: 522rpx;
-		height: 605rpx;
-		background-color: #ffffff;
-		border-radius: 20rpx;
-		position: relative;
-
-		.img {
-			position: relative;
-			top: -56rpx;
-			left: 0;
-			width: 522rpx;
-			height: 132rpx;
-			display: flex;
-			justify-content: center;
-
-			image {
-				border-radius: 20rpx 20rpx 0 0;
-				width: 450rpx;
-				height: 132rpx;
-			}
-		}
-
-		.mian {
-			margin-top: -44rpx;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			// padding: 32rpx 32rpx;
-			background-color: #ffffff;
-			border-radius: 0 0 20rpx 20rpx;
-			text-align: center;
-
-			.delivery {
-				font-size: 40rpx;
-				color: #333333;
-				display: flex;
-				align-items: center;
-				flex-direction: column;
-
-				image {
-					margin-top: 48rpx;
-					width: 172rpx;
-					height: 160rpx;
-				}
-			}
-
-			.nocancel {
-				font-size: 32rpx;
-				color: #333333;
-				margin-top: 14rpx;
-			}
-
-			.comfirm-box {
-				margin-top: 52rpx;
-				display: flex;
-				// margin-bottom: 32rpx;
-
-				// justify-content: space-around;
-				.cancel {
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					width: 197rpx;
-					height: 74rpx;
-					border: 1px solid #dcc786;
-					border-radius: 38rpx;
-
-					font-size: 32rpx;
-					color: #605128;
-				}
-
-				.comfirm {
-					margin-left: 32rpx;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					width: 197rpx;
-					height: 74rpx;
-					background: linear-gradient(-90deg, #d1ba77 0%, #f7e8ad 100%);
-					border-radius: 38px;
-					font-size: 32rpx;
-					color: #605128;
-				}
-			}
-		}
-	}
-
-	.user-box {
-		position: relative;
-		z-index: 2;
-		width: 690rpx;
-		margin: 0 auto;
-		/* #ifdef MP-WEIXIN */
-		margin: -100rpx auto 0;
-		/* #endif */
-		
-		border-radius: 20rpx;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		padding: 54rpx 0 30rpx;
-		line-height: 1;
-		position: relative;
-
-		.u-set {
-			position: absolute;
-			top: 85rpx;
-			right: 40rpx;
-			width: 44rpx;
-			height: 44rpx;
-		}
-		.user-leve {
-			width: 161rpx;
-			height: 51rpx;
-			background: #FFFFFF;
-			border-radius: 25rpx;
-			position: absolute;
-			top: 85rpx;
-			right: 40rpx;
-			display: flex;
-			justify-content: flex-start;
-			align-items: center;
-			padding-left: 20rpx;
-			image {
-				width: 25rpx;
-				margin-right: 10rpx;
-			}
-			font-size: 26rpx;
-			font-weight: 500;
-			color: #FF4C4C;
-		}
-		.user-info {
-			justify-content: flex-start;
-			width: 100%;
-			padding-left: 40rpx;
-
-			.avatar {
-				border-radius: 50%;
-				width: 132rpx;
-				height: 132rpx;
-				background-color: #eee;
-				margin-right: 18rpx;
-			}
-
-			.user-uid {
-				padding-top: 10rpx;
-				font-size: 24rpx;
-				font-weight: 500;
-				color: #fff;
-			}
-		}
-
-
-		.user-name {
-			width: 300rpx;
-			margin-top: 14rpx;
-			// font-size: 30rpx;
-			font-size: $ltl-size-big;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #fff;
-		}
-
-		.user-shop {
-			margin-top: 10rpx;
-			display: flex;
-			justify-content: flex-start;
-			align-items: center;
-
-			.user-shop-item {
-				position: relative;
-				margin: 0 10rpx;
-				width: 180rpx;
-				height: 55rpx;
-
-				.user-shop-icon {
-					position: absolute;
-					top: 0;
-					left: 0;
-					right: 0;
-					width: 180rpx;
-					height: 55rpx;
-				}
-
-				.user-shopname {
-					padding-left:60rpx;
-					position: relative;
-					z-index: 2;
-					font-size: 30rpx;
-					font-weight: 500;
-					color: #977843;
-					line-height: 55rpx;
-					text-align: left;
-				}
-			}
-		}
-
-		// .user-shop {
-		// 	margin-top: 10rpx;
-		// 	display: flex;
-		// 	justify-content: center;
-		// 	align-items: center;
-
-		// 	.user-shop-icon {
-		// 		width: 22rpx;
-		// 		height: 22rpx;
-		// 	}
-
-		// 	.user-shopname {
-		// 		margin-left: 6rpx;
-		// 		font-size: 20rpx;
-		// 		font-family: PingFang SC;
-		// 		font-weight: 500;
-		// 		color: #ff7e3e;
-		// 	}
-		// }
-
-		.user-money {
-			width: 100%;
-			margin-top: 50rpx;
-			justify-content: center;
-
-			.user-money-item {
-				width: 50%;
-				display: flex;
-				flex-direction: column;
-				justify-content: center;
-				align-items: center;
-
-				.user-money-num {
-					font-size: 36rpx;
-					font-family: PingFang SC;
-					font-weight: bold;
-					color: #fff;
-				}
-
-				.user-money-font {
-					margin-top: 20rpx;
-					font-size: $ltl-size-lg;
-					font-weight: 500;
-					color: #fff;
-				}
-			}
-
-			.user-xian {
-				width: 1px;
-				height: 77rpx;
-				background: #eeeeee;
-			}
-		}
-	}
-
-	.main-box {
-		position: relative;
-		margin:-10rpx auto 0;
-		border-radius: 25rpx 25rpx 0 0;
-		width: 750rpx;
-		background: #ffffff;
-		box-shadow: 0px 4rpx 14rpx 0px rgba(229, 229, 229, 0.46);
-
-		.title {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			padding: 24rpx;
-			// border-bottom: 1px solid #eeeeee;
-
-			.title-left {
-				display: flex;
-				align-items: center;
-
-				.title-icon {
-					width: 32rpx;
-					height: 32rpx;
-				}
-
-				.title-font {
-					margin-left: 20rpx;
-					font-size:30rpx;
-					font-family: PingFang SC;
-					font-weight: bold;
-					color: #333333;
-				}
-			}
-
-			.title-right {
-				width: 14rpx;
-				height: 24rpx;
-			}
-		}
-
-		.main {
-			padding: 0rpx 0 30rpx;
-
-			.jg {
-				width: 1px;
-				height: 100rpx;
-				background: #eeeeee;
-			}
-
-			.item {
-				padding-bottom: 20rpx;
-				width: 25%;
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-
-				.item-num {
-					font-size: 36rpx;
-					font-family: PingFang SC;
-					font-weight: bold;
-					color: #333333;
-				}
-
-				.item-font {
-					margin-top: 18rpx;
-					font-size: 22rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #666666;
-				}
-			}
-
-			.oitem {
-				width: 33%;
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-
-				.oitem-image {
-					height: 76rpx;
-					width: 76rpx;
-				}
-
-				.oitem-font {
-					margin-top: 20rpx;
-					font-size: 24rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-				}
-			}
-		}
-	}
-
-	.tool-list {
-		width: 690rpx;
-		margin: 20rpx auto 0;
-		background: #ffffff;
-		box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-		border-radius: 20rpx;
-	}
-
-	.psw-wrapper {
-		width: 548rpx;
-		padding: 20rpx 0;
-		background-color: #ffffff;
-		border-radius: 15rpx 15rpx;
-
-		.psw-title {
-			width: 100%;
-			font-size: 35rpx;
-			padding: 0 0 40rpx;
-			text-align: center;
-			font-weight: 800;
-		}
-
-		.psw-content {
-			width: 100%;
-			font-size: 32rpx;
-			text-align: center;
-		}
-
-		.psw-price {
-			font-weight: bold;
-			font-size: 68rpx;
-			text-align: center;
-			padding-top: 10rpx;
-		}
-
-		.psw-jg {
-			height: 1px;
-			width: 500rpx;
-			background-color: #eee;
-			margin: auto;
-		}
-
-		.psw-paytype {
-			justify-content: space-between;
-			padding: 10rpx 25rpx 30rpx;
-			font-size: 26rpx;
-		}
-
-		.psw-ipt {
-			display: block;
-			background-color: #dce3ed;
-			height: 90rpx;
-			width: 464rpx;
-			padding-left: 30rpx;
-			margin: 0 auto;
-			font-size: 80rpx;
-		}
-
-		.psw-btn text {
-			display: inline-block;
-			text-align: center;
-			width: 50%;
-			padding-top: 29rpx;
-			font-size: 35rpx;
-		}
-
-		.psw-qd {
-			color: #ff4c4c;
-		}
-	}
-
-	.hx-wrapper {
-		width: 536rpx;
-		height: 630rpx;
-		position: relative;
-
-		// background-color: #fff;
-		.hx-img {
-			width: 536rpx;
-			height: 281rpx;
-
-			image {
-				width: 536rpx;
-				height: 281rpx;
-			}
-		}
-
-		.hx-close {
-			position: absolute;
-			left: 243rpx;
-			bottom: -80rpx;
-			width: 52rpx;
-			height: 52rpx;
-
-			image {
-				width: 52rpx;
-				height: 52rpx;
-			}
-		}
-
-		.hx-body {
-			width: 536rpx;
-			height: 349rpx;
-			background-color: #fff;
-			border-radius: 0 0 10rpx 10rpx;
-
-			.hx-title {
-				width: 536rpx;
-				font-size: 36rpx;
-				font-weight: 500;
-				color: #333333;
-				line-height: 1;
-				padding-top: 42rpx;
-				text-align: center;
-			}
-
-			input {
-				width: 439rpx;
-				height: 68rpx;
-				background: #dbf3e9;
-				border-radius: 10rpx;
-				margin: 39rpx auto 0;
-				padding-left: 26rpx;
-
-				.hx-placeholder {
-					font-size: 26rpx;
-					font-weight: 500;
-					color: #ff4c4c;
-				}
-			}
-
-			.hx-btn {
-				margin: 44rpx auto 0;
-				width: 353rpx;
-				height: 71rpx;
-				background: #ff4c4c;
-				border-radius: 34rpx;
-				font-size: 36rpx;
-				font-weight: 500;
-				color: #f8f9f9;
-				line-height: 71rpx;
-				text-align: center;
-			}
-		}
-	}
-
-	.user-list {
-		width: 691rpx;
-		height: 104rpx;
-		background: #FFFFFF;
-		// box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-		border-radius: 28rpx;
-		margin: 0 auto;
-		padding: 0 25rpx;
-		.user-list-image {
-			width: 60rpx;
-			.left-img {
-				display: block;
-				height: 40rpx;
-			}
-		}
-		
-
-		.user-list-tit {
-			padding-left: 20rpx;
-			flex-grow: 1;
-			font-size: 29rpx;
-			font-weight: bold;
-			color: #5D5D5D;
-		}
-
-		.right-img {
-			width: 13rpx;
-			height: 23rpx;
-		}
-	}
+<template>
+	<view class="container">
+		<view class="vheigh"></view>
+		<view class="top-image">
+			<image src="../../static/img/user-top.png" mode=""></image>
+		</view>
+		<view class="user-box">
+			<view class="user-info flex">
+				<image class="avatar" :src="userInfo.avatar" mode="" v-if="userInfo.avatar"
+					@click="navTo('/pages/set/userinfo')"></image>
+				<image class="avatar" src="../../static/error/missing-face.png" mode="" v-else></image>
+				<view class="user-name-id">
+					<view class="user-name clamp2">{{ userInfo.nickname || '游客'}}</view>
+					
+					<view class="user-uid" v-if="userInfo.uid">ID号:{{ userInfo.uid || ''}}</view>
+				</view>
+			</view>
+			<view class="user-money flex">
+				<view class="user-money-item" @click="navTo('/pages/user/yue')">
+					<view class="user-money-num">{{ userInfo.now_money*1 || 0 }}</view>
+					<view class="user-money-font"> 余额</view>
+				</view>
+				<view class="user-xian"></view>
+				<view class="user-money-item" @click="navTo('/pages/user/award')">
+					<view class="user-money-num">{{ userInfo.brokerage_price*1 || 0 }}</view>
+					<view class="user-money-font">奖金</view>
+				</view>
+				<view class="user-xian"></view>
+				<view class="user-money-item" @click="navTo('/pages/user/jf')">
+					<view class="user-money-num">{{ userInfo.integral*1 || 0 }}</view>
+					<view class="user-money-font">积分</view>
+				</view>
+				<!-- <view class="user-xian"></view> -->
+				<!-- <view class="user-money-item" >
+					<view class="user-money-num">{{ userInfo.profit*1 || 0 }}</view>
+					<view class="user-money-font">可收益额度</view>
+				</view>
+				<view class="user-xian"></view>
+				<view class="user-money-item" @click="navTo('/pages/user/team')">
+					<view class="user-money-num">{{ userInfo.consumption || 0 }}</view>
+					<view class="user-money-font">消费余额</view>
+				</view> -->
+			</view>
+			<view class="user-money flex">
+				<!-- <view class="user-money-item" @click="navTo('/pages/user/yue')">
+					<view class="user-money-num">{{ userInfo.now_money*1 || 0 }}</view>
+					<view class="user-money-font"> 余额</view>
+				</view>
+				<view class="user-xian"></view>
+				<view class="user-money-item" @click="navTo('/pages/user/award')">
+					<view class="user-money-num">{{ userInfo.brokerage_price*1 || 0 }}</view>
+					<view class="user-money-font">奖金</view>
+				</view>
+				<view class="user-xian"></view>
+				<view class="user-money-item" @click="navTo('/pages/user/jf')">
+					<view class="user-money-num">{{ userInfo.integral*1 || 0 }}</view>
+					<view class="user-money-font">积分</view>
+				</view>
+				<view class="user-xian"></view> -->
+				<view class="user-money-item" >
+					<view class="user-money-num">{{ userInfo.profit*1 || 0 }}</view>
+					<view class="user-money-font">可收益额度</view>
+				</view>
+				<view class="user-xian"></view>
+				<view class="user-money-item" @click="navTo('/pages/user/team')">
+					<view class="user-money-num">{{ userInfo.consumption || 0 }}</view>
+					<view class="user-money-font">消费余额</view>
+				</view>
+			</view>
+			<!-- <image src="../../static/icon/u-set.png" mode="" class="u-set" @click="navTo('/pages/set/userinfo')">
+			</image> -->
+			<view class="user-leve" v-if="userInfo.level > 0">
+				<image src="../../static/icon/gp.png" mode="widthFix"></image>
+				<view class="">
+					{{userInfo.level == 1 ? '会员': (userInfo.level == 2?'合伙人':(userInfo.level == 3?'股东': '董事'))}}
+				</view>
+			</view>
+		</view>
+		<view class="qd-wrap" @click="navTo('/pages/index/sign')">
+			<image src="../../static/icon/qd.png" mode=""></image>
+			<view class="qd-info">
+				<view class="">
+					签到领取积分
+				</view>
+				<view class="tit">
+					已累计签到{{sum_sgin_day}}天
+				</view>
+			</view>
+			<view class="qd-btn" v-if="!is_day_sgin">
+				立即签到
+			</view>
+			<view class="qd-btn" v-if="is_day_sgin" style="background: #999;">
+				已签到
+			</view>
+		</view>
+		<view class="main-box">
+			<view class="title flex">
+				<view class="title-left">
+					<view class="title-font">分红池</view>
+				</view>
+				<!-- <image class="title-right" src="../../static/icon/back.png" mode=""></image> -->
+			</view>
+			<view class="main flex">
+				<view class="oitem" @click="navTo('/pages/user/fh?state=1')">
+					<image class="oitem-image" src="../../static/icon/fh1.png" mode=""></image>
+					<view class="oitem-font">会员</view>
+				</view>
+				<view class="oitem" @click="navTo('/pages/user/fh?state=2')">
+					<image class="oitem-image" src="../../static/icon/fh2.png" mode=""></image>
+					<view class="oitem-font">合伙人</view>
+				</view>
+				<view class="oitem" @click="navTo('/pages/user/fh?state=3')">
+					<image class="oitem-image" src="../../static/icon/fh3.png" mode=""></image>
+					<view class="oitem-font">股东</view>
+				</view>
+				<view class="oitem" @click="navTo('/pages/user/fh?state=4')">
+					<image class="oitem-image" src="../../static/icon/fh4.png" mode=""></image>
+					<view class="oitem-font">董事</view>
+				</view>
+			</view>
+		</view>
+		
+		<view class="main-box">
+			<view class="title flex" @click="navTo('/pages/order/order?state=0')">
+				<view class="title-left">
+					<view class="title-font">我的订单</view>
+				</view>
+				<image class="title-right" src="../../static/icon/back.png" mode=""></image>
+			</view>
+			<view class="main flex">
+				<view class="oitem" @click="navTo('/pages/order/order?state=0')">
+					<image class="oitem-image" src="../../static/icon/o1.png" mode=""></image>
+					<view class="oitem-font">待付款</view>
+				</view>
+				<view class="oitem" @click="navTo('/pages/order/order?state=1')">
+					<image class="oitem-image" src="../../static/icon/o2.png" mode=""></image>
+					<view class="oitem-font">待发货</view>
+				</view>
+				<view class="oitem" @click="navTo('/pages/order/order?state=2')">
+					<image class="oitem-image" src="../../static/icon/o3.png" mode=""></image>
+					<view class="oitem-font">待收货</view>
+				</view>
+				<view class="oitem" @click="navTo('/pages/order/order?state=3')">
+					<image class="oitem-image" src="../../static/icon/o4.png" mode=""></image>
+					<view class="oitem-font">已完成</view>
+				</view>
+			</view>
+		</view>
+		<view class="user-list flex" @click="navTo('/pages/user/shareQrCode')">
+			<view class="user-list-image">
+				<image src="../../static/icon/u1.png" mode="heightFix" class="left-img"></image>
+			</view>
+			<view class="user-list-tit">
+				邀请海报
+			</view>
+			<image src="../../static/icon/back.png" mode="" class="right-img"></image>
+		</view>
+		<view class="user-list flex" @click="navTo('/pages/user/team')">
+			<view class="user-list-image">
+				<image src="../../static/icon/u2.png" mode="heightFix" class="left-img"></image>
+			</view>
+			<view class="user-list-tit">
+				我的分享
+			</view>
+			<image src="../../static/icon/back.png" mode="heightFix" class="right-img"></image>
+		</view>
+		<view class="user-list flex" @click="navTo('/pages/user/favorites')">
+			<view class="user-list-image">
+				<image src="../../static/icon/u3.png" mode="heightFix" class="left-img"></image>
+			</view>
+			<view class="user-list-tit">
+				我的收藏
+			</view>
+			<image src="../../static/icon/back.png" mode="heightFix" class="right-img"></image>
+		</view>
+		<view class="user-list flex" @click="openKf()">
+			<view class="user-list-image flex">
+				<image src="../../static/icon/u4.png" mode="heightFix" class="left-img"></image>
+			</view>
+			<view class="user-list-tit">
+				客服中心
+			</view>
+			<image src="../../static/icon/back.png" mode="heightFix" class="right-img"></image>
+		</view>
+		<view class="user-list flex" @click="navTo('/pages/set/address')">
+			<view class="user-list-image">
+				<image src="../../static/icon/u5.png" mode="heightFix" class="left-img"></image>
+			</view>
+			<view class="user-list-tit">
+				收货地址
+			</view>
+			<image src="../../static/icon/back.png" mode="heightFix" class="right-img"></image>
+		</view>
+		<view class="user-list flex" @click="navTo('/pages/set/userinfo')">
+			<view class="user-list-image">
+				<image src="../../static/icon/u6.png" mode="heightFix" class="left-img"></image>
+			</view>
+			<view class="user-list-tit">
+				设置
+			</view>
+			<image src="../../static/icon/back.png" mode="heightFix" class="right-img"></image>
+		</view>
+		<view class="" style="height: 20rpx;">
+		</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="cancel">取消</view>
+						<view class="comfirm" @click="comfirm(text)">复制微信</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+<script>
+	import { signList, integral,signUser,signConfig } from '@/api/functionalUnit.js';
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	import uniList from '@/components/uni-list/uni-list.vue';
+	import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
+	import {
+		orderData,
+		getUserInfo,
+		check
+	} from '@/api/user.js';
+	import {
+		saveUrl,
+		interceptor
+	} from '@/utils/loginUtils.js';
+	let startY = 0,
+		moveY = 0,
+		pageAtTop = true;
+	export default {
+		components: {
+			uniList,
+			uniListItem
+		},
+		data() {
+			return {
+				current: 2,
+				id: '', //是否已签到
+				store_name: '',
+				achievement: '',
+				code: '',
+				text: '' ,//客服微信
+				is_day_sgin: false,
+				sum_sgin_day: 0,
+			};
+		},
+		onShow() {
+			// 判断是否已经登录
+			// if (this.hasLogin) {
+			// 	this.loadBaseData();
+			// }
+			this.loadBaseData();
+			this.signConfig()
+		},
+		filters: {
+			phone(e) {
+				var subStr1 = e.substr(0, 3);
+				var subStr2 = e.substr(e.length - 4, 4);
+				var subStr = subStr1 + '...' + subStr2;
+				e = subStr;
+				return e;
+			}
+		},
+		onReady() {
+			// 初始化获取页面宽度
+			uni.createSelectorQuery()
+				.select('.container')
+				.fields({
+						size: true
+					},
+					data => {
+						// 计算最多下拉的高度
+						this.userDowm = Math.floor((data.width / 750) * 185);
+						// 计算最大触发修改高度事件
+						this.userMaxDowm = Math.floor((data.width / 750) * 250);
+					}
+				)
+				.exec();
+		},
+		computed: {
+			...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
+		},
+		methods: {
+			...mapMutations('user', ['setUserInfo']),
+			qhx() {
+				check({
+						verify_code: this.code,
+						is_confirm: 1 //1是核销，0是查看
+					})
+					.then(e => {
+						this.$api.msg('核销成功');
+						this.close();
+					})
+					.catch(e => {
+						console.log(e);
+					});
+			},
+			sao() {
+				let obj = this;
+
+				// #ifndef H5
+				uni.scanCode({
+					success(e) {
+						obj.code = e.result;
+						obj.$refs.popuphx.open();
+						console.log(obj.$refs.popuphx);
+					}
+				});
+				// #endif
+			},
+			comfirm(text) {
+				console.log(text);
+				const result = this.uniCopy(text);
+				if (result === false) {
+					uni.showToast({
+						title: '不支持'
+					});
+				} else {
+					uni.showToast({
+						title: '复制成功',
+						icon: 'none'
+					});
+				}
+				this.$refs.popupkf.close();
+			},
+			uniCopy(content) {
+				/**
+				 * 小程序端 和 app端的复制逻辑
+				 */
+				//#ifndef H5
+				uni.setClipboardData({
+					data: content,
+					success: function() {
+						console.log('success');
+						return true;
+					}
+				});
+				//#endif
+
+				/**
+				 * H5端的复制逻辑
+				 */
+				// #ifdef H5
+				if (!document.queryCommandSupported('copy')) {
+					//为了兼容有些浏览器 queryCommandSupported 的判断
+					// 不支持
+					return false;
+				}
+				let textarea = document.createElement('textarea');
+				textarea.value = content;
+				textarea.readOnly = 'readOnly';
+				document.body.appendChild(textarea);
+				textarea.select(); // 选择对象
+				textarea.setSelectionRange(0, content.length); //核心
+				let result = document.execCommand('copy'); // 执行浏览器复制命令
+				textarea.remove();
+				return result;
+				// #endif
+			},
+			// 加载初始数据
+			loadBaseData() {
+				getUserInfo({})
+					.then(({
+						data
+					}) => {
+						console.log(data.nickname)
+						this.setUserInfo(data);
+						
+						this.getsignUser()
+					})
+					.catch(e => {
+						console.log(e);
+					});
+			},
+			/**
+			 * 统一跳转接口,拦截未登录路由
+			 * navigator标签现在默认没有转场动画，所以用view
+			 */
+			navTo(url) {
+				console.log(url);
+				if (!this.hasLogin) {
+					// 保存地址
+					saveUrl();
+					// 登录拦截
+					interceptor();
+				} else {
+					uni.navigateTo({
+						url
+					});
+				}
+			},
+			close() {
+				this.$refs.popuphx.close();
+				this.code = '';
+			},
+			// 打开客服
+			openKf() {
+				this.$refs.popupkf.open();
+			},
+			// 关闭客服
+			cancel() {
+				this.$refs.popupkf.close();
+			},
+			// 打开绑定
+			open() {
+				this.$refs.gspass.open();
+			},
+			cast() {
+				set_waiter({
+						uid: this.id
+					})
+					.then(e => {
+						this.$api.msg('绑定成功');
+						this.$refs.gspass.close();
+						this.id = '';
+					})
+					.catch(err => {
+						this.$refs.gspass.close();
+						this.id = '';
+					});
+			},
+			cancelpass() {
+				this.$refs.gspass.close();
+				this.id = '';
+			},
+			getsignUser() {
+				
+				signUser({
+					sign: 1
+				}).then(res => {
+					console.log('daole')
+					console.log(res)
+					this.is_day_sgin = res.data.is_day_sgin
+					this.sum_sgin_day = res.data.sum_sgin_day
+				})
+			},
+			signConfig() {
+				signConfig().then(res => {
+					console.log(res);
+				})
+			}
+		}
+	};
+</script>
+<style lang="scss">
+	%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,
+	page {
+		min-height: 100%;
+		height: auto;
+		background-color: #fff;
+	}
+
+	.vheigh {
+		height: var(--status-bar-height);
+		background-color: $base-color;
+	}
+
+	.top-image {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		height: 529rpx;
+
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	.popup-box {
+		width: 522rpx;
+		height: 605rpx;
+		background-color: #ffffff;
+		border-radius: 20rpx;
+		position: relative;
+
+		.img {
+			position: relative;
+			top: -56rpx;
+			left: 0;
+			width: 522rpx;
+			height: 132rpx;
+			display: flex;
+			justify-content: center;
+
+			image {
+				border-radius: 20rpx 20rpx 0 0;
+				width: 450rpx;
+				height: 132rpx;
+			}
+		}
+
+		.mian {
+			margin-top: -44rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			// padding: 32rpx 32rpx;
+			background-color: #ffffff;
+			border-radius: 0 0 20rpx 20rpx;
+			text-align: center;
+
+			.delivery {
+				font-size: 40rpx;
+				color: #333333;
+				display: flex;
+				align-items: center;
+				flex-direction: column;
+
+				image {
+					margin-top: 48rpx;
+					width: 172rpx;
+					height: 160rpx;
+				}
+			}
+
+			.nocancel {
+				font-size: 32rpx;
+				color: #333333;
+				margin-top: 14rpx;
+			}
+
+			.comfirm-box {
+				margin-top: 52rpx;
+				display: flex;
+				// margin-bottom: 32rpx;
+
+				// justify-content: space-around;
+				.cancel {
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					width: 197rpx;
+					height: 74rpx;
+					border: 1px solid #dcc786;
+					border-radius: 38rpx;
+
+					font-size: 32rpx;
+					color: #605128;
+				}
+
+				.comfirm {
+					margin-left: 32rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					width: 197rpx;
+					height: 74rpx;
+					background: linear-gradient(-90deg, #d1ba77 0%, #f7e8ad 100%);
+					border-radius: 38px;
+					font-size: 32rpx;
+					color: #605128;
+				}
+			}
+		}
+	}
+
+	.user-box {
+		position: relative;
+		z-index: 2;
+		width: 690rpx;
+		margin: 0 auto;
+		/* #ifdef MP-WEIXIN */
+		margin: -200rpx auto 0;
+		/* #endif */
+		
+		border-radius: 20rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding: 54rpx 0 30rpx;
+		line-height: 1;
+		position: relative;
+
+		.u-set {
+			position: absolute;
+			top: 85rpx;
+			right: 40rpx;
+			width: 44rpx;
+			height: 44rpx;
+		}
+		.user-leve {
+			width: 161rpx;
+			height: 51rpx;
+			background: #FFFFFF;
+			border-radius: 25rpx;
+			position: absolute;
+			top: 85rpx;
+			right: 40rpx;
+			display: flex;
+			justify-content: flex-start;
+			align-items: center;
+			padding-left: 20rpx;
+			image {
+				width: 25rpx;
+				margin-right: 10rpx;
+			}
+			font-size: 26rpx;
+			font-weight: 500;
+			color: #FF4C4C;
+		}
+		.user-info {
+			justify-content: flex-start;
+			width: 100%;
+			padding-left: 40rpx;
+
+			.avatar {
+				border-radius: 50%;
+				width: 132rpx;
+				height: 132rpx;
+				background-color: #eee;
+				margin-right: 18rpx;
+			}
+
+			.user-uid {
+				padding-top: 10rpx;
+				font-size: 24rpx;
+				font-weight: 500;
+				color: #fff;
+			}
+		}
+
+
+		.user-name {
+			width: 300rpx;
+			margin-top: 14rpx;
+			// font-size: 30rpx;
+			font-size: $ltl-size-big;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #fff;
+		}
+
+		.user-shop {
+			margin-top: 10rpx;
+			display: flex;
+			justify-content: flex-start;
+			align-items: center;
+
+			.user-shop-item {
+				position: relative;
+				margin: 0 10rpx;
+				width: 180rpx;
+				height: 55rpx;
+
+				.user-shop-icon {
+					position: absolute;
+					top: 0;
+					left: 0;
+					right: 0;
+					width: 180rpx;
+					height: 55rpx;
+				}
+
+				.user-shopname {
+					padding-left:60rpx;
+					position: relative;
+					z-index: 2;
+					font-size: 30rpx;
+					font-weight: 500;
+					color: #977843;
+					line-height: 55rpx;
+					text-align: left;
+				}
+			}
+		}
+
+		// .user-shop {
+		// 	margin-top: 10rpx;
+		// 	display: flex;
+		// 	justify-content: center;
+		// 	align-items: center;
+
+		// 	.user-shop-icon {
+		// 		width: 22rpx;
+		// 		height: 22rpx;
+		// 	}
+
+		// 	.user-shopname {
+		// 		margin-left: 6rpx;
+		// 		font-size: 20rpx;
+		// 		font-family: PingFang SC;
+		// 		font-weight: 500;
+		// 		color: #ff7e3e;
+		// 	}
+		// }
+
+		.user-money {
+			width: 100%;
+			margin-top: 50rpx;
+			justify-content: center;
+
+			.user-money-item {
+				width: 50%;
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				align-items: center;
+
+				.user-money-num {
+					font-size: 36rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #fff;
+				}
+
+				.user-money-font {
+					margin-top: 20rpx;
+					font-size: $ltl-size-lg;
+					font-weight: 500;
+					color: #fff;
+				}
+			}
+
+			.user-xian {
+				width: 1px;
+				height: 77rpx;
+				background: #eeeeee;
+			}
+		}
+	}
+
+	.main-box {
+		// position: relative;
+		margin:-10rpx auto 0;
+		border-radius: 25rpx 25rpx 0 0;
+		width: 750rpx;
+		background: #ffffff;
+		box-shadow: 0px 4rpx 14rpx 0px rgba(229, 229, 229, 0.46);
+
+		.title {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 24rpx;
+			// border-bottom: 1px solid #eeeeee;
+
+			.title-left {
+				display: flex;
+				align-items: center;
+
+				.title-icon {
+					width: 32rpx;
+					height: 32rpx;
+				}
+
+				.title-font {
+					margin-left: 20rpx;
+					font-size:30rpx;
+					font-weight: bold;
+					color: #333333;
+				}
+			}
+
+			.title-right {
+				width: 14rpx;
+				height: 24rpx;
+			}
+		}
+
+		.main {
+			padding: 0rpx 0 30rpx;
+
+			.jg {
+				width: 1px;
+				height: 100rpx;
+				background: #eeeeee;
+			}
+
+			.item {
+				padding-bottom: 20rpx;
+				width: 25%;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+
+				.item-num {
+					font-size: 36rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #333333;
+				}
+
+				.item-font {
+					margin-top: 18rpx;
+					font-size: 22rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #666666;
+				}
+			}
+
+			.oitem {
+				width: 33%;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+
+				.oitem-image {
+					height: 76rpx;
+					width: 76rpx;
+				}
+
+				.oitem-font {
+					margin-top: 20rpx;
+					font-size: 24rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+				}
+			}
+		}
+	}
+
+	.tool-list {
+		width: 690rpx;
+		margin: 20rpx auto 0;
+		background: #ffffff;
+		box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+		border-radius: 20rpx;
+	}
+
+	.psw-wrapper {
+		width: 548rpx;
+		padding: 20rpx 0;
+		background-color: #ffffff;
+		border-radius: 15rpx 15rpx;
+
+		.psw-title {
+			width: 100%;
+			font-size: 35rpx;
+			padding: 0 0 40rpx;
+			text-align: center;
+			font-weight: 800;
+		}
+
+		.psw-content {
+			width: 100%;
+			font-size: 32rpx;
+			text-align: center;
+		}
+
+		.psw-price {
+			font-weight: bold;
+			font-size: 68rpx;
+			text-align: center;
+			padding-top: 10rpx;
+		}
+
+		.psw-jg {
+			height: 1px;
+			width: 500rpx;
+			background-color: #eee;
+			margin: auto;
+		}
+
+		.psw-paytype {
+			justify-content: space-between;
+			padding: 10rpx 25rpx 30rpx;
+			font-size: 26rpx;
+		}
+
+		.psw-ipt {
+			display: block;
+			background-color: #dce3ed;
+			height: 90rpx;
+			width: 464rpx;
+			padding-left: 30rpx;
+			margin: 0 auto;
+			font-size: 80rpx;
+		}
+
+		.psw-btn text {
+			display: inline-block;
+			text-align: center;
+			width: 50%;
+			padding-top: 29rpx;
+			font-size: 35rpx;
+		}
+
+		.psw-qd {
+			color: #ff4c4c;
+		}
+	}
+
+	.hx-wrapper {
+		width: 536rpx;
+		height: 630rpx;
+		position: relative;
+
+		// background-color: #fff;
+		.hx-img {
+			width: 536rpx;
+			height: 281rpx;
+
+			image {
+				width: 536rpx;
+				height: 281rpx;
+			}
+		}
+
+		.hx-close {
+			position: absolute;
+			left: 243rpx;
+			bottom: -80rpx;
+			width: 52rpx;
+			height: 52rpx;
+
+			image {
+				width: 52rpx;
+				height: 52rpx;
+			}
+		}
+
+		.hx-body {
+			width: 536rpx;
+			height: 349rpx;
+			background-color: #fff;
+			border-radius: 0 0 10rpx 10rpx;
+
+			.hx-title {
+				width: 536rpx;
+				font-size: 36rpx;
+				font-weight: 500;
+				color: #333333;
+				line-height: 1;
+				padding-top: 42rpx;
+				text-align: center;
+			}
+
+			input {
+				width: 439rpx;
+				height: 68rpx;
+				background: #dbf3e9;
+				border-radius: 10rpx;
+				margin: 39rpx auto 0;
+				padding-left: 26rpx;
+
+				.hx-placeholder {
+					font-size: 26rpx;
+					font-weight: 500;
+					color: #ff4c4c;
+				}
+			}
+
+			.hx-btn {
+				margin: 44rpx auto 0;
+				width: 353rpx;
+				height: 71rpx;
+				background: #ff4c4c;
+				border-radius: 34rpx;
+				font-size: 36rpx;
+				font-weight: 500;
+				color: #f8f9f9;
+				line-height: 71rpx;
+				text-align: center;
+			}
+		}
+	}
+
+	.user-list {
+		width: 691rpx;
+		height: 104rpx;
+		background: #FFFFFF;
+		// box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+		border-radius: 28rpx;
+		margin: 0 auto;
+		padding: 0 25rpx;
+		.user-list-image {
+			width: 60rpx;
+			.left-img {
+				display: block;
+				height: 40rpx;
+			}
+		}
+		
+
+		.user-list-tit {
+			padding-left: 20rpx;
+			flex-grow: 1;
+			font-size: 29rpx;
+			font-weight: bold;
+			color: #5D5D5D;
+		}
+
+		.right-img {
+			width: 13rpx;
+			height: 23rpx;
+		}
+	}
+	.qd-wrap {
+		position: relative;
+		margin: auto;
+		margin-bottom: 10rpx;
+		width: 690rpx;
+		height: 115rpx;
+		background-color: #fff;
+		border-radius: 20rpx;
+		box-shadow: 0px 1rpx 10rpx #999;
+		display: flex;
+		// justify-content: ;
+		align-items: center;
+		padding: 0 40rpx;
+		image {
+			width: 68rpx;
+			height: 70rpx;
+			flex-shrink: 0;
+		}
+		.qd-info {
+			flex-grow: 1;
+			padding-left: 30rpx;
+			font-size:30rpx;
+			font-weight: bold;
+			color: #333333;
+			.tit {
+				font-size: 28rpx;
+				color: #999;
+				font-weight: 500;
+			}
+		}
+		.qd-btn {
+			flex-shrink: 0;
+			width: 160rpx;
+			height: 60rpx;
+			color: #fff;
+			font-size: 26rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			background-color: #ff4c4d;
+			border-radius: 30rpx;
+		}
+	}
 </style>

store/index.js

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

unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
-<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>乐品优选</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.5841170f.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.f747b261.js></script><script src=/index/static/js/index.6fdab0b7.js></script></body></html>
+<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>亿豪优选</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.63b34199.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.2784987b.js></script><script src=/index/static/js/index.d4b64d85.js></script></body></html>