11-17

api/user.js

@@ -127,4 +127,13 @@ export function repurchase(data){
 		method:'get',
 		data
 	})
+}
+
+// 推广的人数
+export function getSpreadPeople(data) {
+	return request({
+		url: '/api/spread/people',
+		method: 'post',
+		data
+	})
 }

manifest.json

@@ -73,7 +73,7 @@
         "devServer" : {
             "proxy" : {
                 "/api" : {
-                    "target" : "http://fh.frp.liuniu946.com/api",
+                    "target" : "http://fh.liuniu946.com/api",
                     // "changeOrigin": true,
                     "pathRewrite" : {
                         "/api" : "" // rewrite path

pages.json

@@ -2,41 +2,22 @@
 	"pages": [{
 			"path": "pages/index/index",
 			"style": {
-				"enablePullDownRefresh": true,
-				// #ifdef MP
+				"enablePullDownRefresh": true,
 				"navigationStyle": "custom",
-				// #endif
 				// #ifndef MP
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent",
-						"searchInput": {
-							"backgroundColor": "rgba(231, 231, 231,.7)",
-							"borderRadius": "16px",
-							"placeholder": "请输入关键字",
-							"disabled": true,
-							"placeholderColor": "#606266",
-							"align": "left"
-						}
-						// "buttons": [
-						// 	{
-						// 		"fontSrc": "/static/yticon.ttf",
-						// 		"text": "\ue60d",
-						// 		"fontSize": "26",
-						// 		"color": "#303133",
-						// 		"float": "left",
-						// 		"background": "rgba(0,0,0,0)"
-						// 	},
-						// 	{
-						// 		"fontSrc": "/static/yticon.ttf",
-						// 		"text": "\ue744",
-						// 		"fontSize": "27",
-						// 		"color": "#303133",
-						// 		"background": "rgba(0,0,0,0)"
-						// 	}
-						// ]
-					}
-				},
+				// "app-plus": {
+				// 	"titleNView": {
+				// 		"type": "transparent",
+				// 		"searchInput": {
+				// 			"backgroundColor": "rgba(231, 231, 231,.7)",
+				// 			"borderRadius": "16px",
+				// 			"placeholder": "请输入关键字",
+				// 			"disabled": true,
+				// 			"placeholderColor": "#606266",
+				// 			"align": "left"
+				// 		}
+				// 	}
+				// },
 				// #endif
 				"navigationBarTitleText": "商城首页"
 			}
@@ -464,6 +445,13 @@
 			"style": {
 				"navigationBarTitleText": "邀请好友"
 			}
+		},
+		{
+			"path": "pages/user/extension",
+			"style": {
+				"navigationBarTitleText": "我的团队",
+				"navigationStyle": "custom"
+			}
 		}
 	],
 	"subPackages": [
@@ -505,7 +493,7 @@
 	},
 	"tabBar": {
 		"color": "#C0C4CC",
-		"selectedColor": "#5DBC7C",
+		"selectedColor": "#ecd0a9",
 		"borderStyle": "black",
 		"backgroundColor": "#ffffff",
 		"list": [{
@@ -514,18 +502,18 @@
 				"selectedIconPath": "static/tabBar/tab-home-current.png",
 				"text": "首页"
 			},
-			{
-				"pagePath": "pages/category/category",
-				"iconPath": "static/tabBar/tab-cate.png",
-				"selectedIconPath": "static/tabBar/tab-cate-current.png",
-				"text": "分类"
-			},
-			{
-				"pagePath": "pages/cart/cart",
-				"iconPath": "static/tabBar/tab-cart.png",
-				"selectedIconPath": "static/tabBar/tab-cart-current.png",
-				"text": "购物车"
-			},
+			// {
+			// 	"pagePath": "pages/category/category",
+			// 	"iconPath": "static/tabBar/tab-cate.png",
+			// 	"selectedIconPath": "static/tabBar/tab-cate-current.png",
+			// 	"text": "分类"
+			// },
+			// {
+			// 	"pagePath": "pages/cart/cart",
+			// 	"iconPath": "static/tabBar/tab-cart.png",
+			// 	"selectedIconPath": "static/tabBar/tab-cart-current.png",
+			// 	"text": "购物车"
+			// },
 			{
 				"pagePath": "pages/user/user",
 				"iconPath": "static/tabBar/tab-my.png",

pages/index/index.vue

@@ -2,29 +2,29 @@
 	<view class="container">
 		<!-- 小程序头部兼容 -->
 		<!-- #ifdef MP -->
-		<view class="input-box flex" @click="clickSearch">
+		<!-- <view class="input-box flex" @click="clickSearch">
 			<view class=" input-content flex">
 				<view class="iconfont iconsearch"></view>
 				<view class="input"><input type="text" disabled placeholder="请输入搜索内容" /></view>
 			</view>
-		</view>
-		<view class="mp-height"></view>
+		</view> -->
+		<!-- <view class="mp-height"></view> -->
 		<!-- #endif -->
 		<!-- 头部轮播 -->
 		<view class="carousel-section">
 			<!-- 标题栏和状态栏占位符 -->
-			<view class="titleNview-placing"></view>
+			<!-- <view class="titleNview-placing"></view> -->
 			<!-- 背景色区域 -->
-			<view class="titleNview-background" :style="{ backgroundColor: '#5DBC7C' }"></view>
+			<!-- <view class="titleNview-background" :style="{ backgroundColor: '#5DBC7C' }"></view> -->
 			<swiper class="carousel" autoplay="true" duration="400" interval="5000" @change="swiperChange">
 				<swiper-item v-for="(item, index) in carouselList" :key="index" class="carousel-item" @click="bannerNavToUrl(item)"><image :src="item.pic" /></swiper-item>
 			</swiper>
 			<!-- 自定义swiper指示器 -->
-			<view class="swiper-dots">
+			<!-- <view class="swiper-dots">
 				<text class="num">{{ swiperCurrent + 1 }}</text>
 				<text class="sign">/</text>
 				<text class="num">{{ swiperLength }}</text>
-			</view>
+			</view> -->
 		</view>	
 		<!-- <view class="ad-1"><image src="/static/temp/ad1.jpg" mode="scaleToFill"></image></view> -->
 		<!-- <view class="recommend flex">
@@ -98,37 +98,58 @@
 		</swiper> -->
 
 		<!-- 精品 商品 -->
-		<template v-if="hasLogin && userInfo.level < 1">
-			<view class="f-header m-t" >
-				<view class="f-left-icon"></view>
-				<view class="tit-box"><text class="tit"> 礼包商品</text></view>
-				<navigator url="/pages/product/giftList?type=1"><text class="iconfont iconenter">更多</text></navigator>
+		<!-- <template v-if="hasLogin && userInfo.level < 1"> -->
+		
+		<!-- 商品1 -->
+		<view class="good-wrap">
+			<view class="good-tit" style="color: #81541F;">
+				科姿魅颜·科粉社代理
+			</view>
+			<view class="item-wrap"  v-for="(item, index) in giftList">
+				<view class="item-img">
+					<image :src="item.image" mode=""></image>
+				</view>
+				<view class="item-btm">
+					<view class="item-price flex">
+						<view class="price-tit">特惠价</view>
+						<view class="price-logo">¥</view>
+						<view class="price-val">{{item.price}}</view>
+					</view>
+					<view class="item-btn" @click="navToGiftDetailPage(item)">
+						立刻购买
+					</view>
+				</view>
 			</view>
-			<view class="guess-section">
-				<view class="good" v-for="(item, index) in giftList" :key="index" @click="navToGiftDetailPage(item)">
-					<view class="image-wrapper">
-						<image :src="item.image" mode="scaleToFill"></image>
+		</view>
+		<view class="good-wrap" v-if="bdList.length >0">
+			<view class="good-tit" style="color: #81541F;">
+				科姿魅颜·报单专区
+			</view>
+			<view class="item-wrap"  v-for="(item, index) in bdList">
+				<view class="item-img">
+					<image :src="item.image" mode=""></image>
+				</view>
+				<view class="item-btm">
+					<view class="item-price flex">
+						<view class="price-tit">特惠价</view>
+						<view class="price-logo">¥</view>
+						<view class="price-val">{{item.price}}</view>
 					</view>
-					<view class="good-info">
-						<view class="info-title clamp2">
-							{{item.store_name}}
-						</view>
-						<view class="info-price">
-							￥{{item.price}}
-						</view>
+					<view class="item-btn" @click="navToLevelDetailPage(item)">
+						立刻购买
 					</view>
 				</view>
 			</view>
-		</template>
+		</view>
 		
 		<!-- 最新 商品 -->
-		<view class="f-header m-t">
+		<!-- <view class="f-header m-t">
 			<view class="f-left-icon"></view>
 			<view class="tit-box"><text class="tit">常规商品</text></view>
 			<navigator url="/pages/product/classify?type=0"><text class="iconfont iconenter">更多</text></navigator>
 		</view>
 		<view class="guess-section">
-			<view v-for="(item, index) in productList" :key="index" class="guess-item" @click="navToDetailPage(item)">
+			<view v-for="(item, index) in bdList" :key="index" class="guess-item" @click="navToDetailPage(item)">
 				<view class="image-wrapper"><image :src="item.image" mode="scaleToFill"></image></view>
 				<text class="title clamp margin-c-20">{{ item.store_name }}</text>
 				<view class="cmy-hr"></view>
@@ -142,7 +163,7 @@
 					</view>
 				</view>
 			</view>
-		</view>
+		</view> -->
 		<!-- 促销 商品 -->
 		<!-- <view class="f-header m-t">
 			<view class="f-left-icon"></view>
@@ -165,11 +186,6 @@
 				</view>
 			</view>
 		</view> -->
-		<view class="Mask" v-show="shareShow">
-			<image @click="share" src="http://shicai.liuniu946.com/static/img/shareimg4.png"></image>
-			<view class="Toshare" @click="Toshare"></view>
-			<view class="Tocancel" @click="Tocancel"></view>
-		</view>
 	</view>
 </template>
 
@@ -225,6 +241,7 @@ export default {
 	},
 	data() {
 		return {
+			bdList: [],
 			giftList: [],//礼包商品
 			productList: [],//常规商品
 			shareShow: false, //分享海报
@@ -296,7 +313,8 @@ export default {
 			interceptor();
 		}
 		this.getProducts()
-		this.getGiftList()
+		this.getGiftList()
+		this.getBdList()
 		this.loadData();
 		this.getBargainList();
 	},
@@ -333,12 +351,26 @@ export default {
 	methods: {
 		getGiftList() {
 			getProducts({
-				is_up_level: 1
+				is_up_level: 0,
+				is_agent: 1,
+				page:1,
+				limit:1
 			}).then( ({data}) => {
 				console.log(data)
 				this.giftList = data
 			})
 		},
+		getBdList() {
+			getProducts({
+				is_up_level: 1,
+				// is_agent: 1,
+				page:1,
+				limit:1
+			}).then( ({data}) => {
+				console.log(data)
+				this.bdList = data
+			})
+		},
 		getProducts() {
 			getProducts().then( ({data}) => {
 				console.log(data)
@@ -503,6 +535,14 @@ export default {
 		},
 		navToGiftDetailPage(item) {
 			let id = item.id;
+			console.log(item)
+			uni.navigateTo({
+				url: '/pages/product/product?id=' + id + '&gtype=0'
+			});
+		},
+		navToLevelDetailPage(item) {
+			let id = item.id;
+			console.log(item)
 			uni.navigateTo({
 				url: '/pages/product/product?id=' + id + '&gtype=1'
 			});
@@ -721,7 +761,7 @@ page {
 /* #endif */
 
 page {
-	background: #f7f8f7;
+	background: #edce9d;
 }
 .m-t {
 	margin-top: 16rpx;
@@ -729,7 +769,7 @@ page {
 /* 头部 轮播图 */
 .carousel-section {
 	position: relative;
-	padding-top: 10px;
+	// padding-top: 10px;
 	overflow: hidden;
 
 	.titleNview-placing {
@@ -748,18 +788,18 @@ page {
 	}
 	.carousel {
 		width: 100%;
-		height: 240rpx;
+		height: 985rpx;
 		.carousel-item {
 			width: 100%;
 			height: 100%;
-			padding: 0 28rpx;
+			// padding: 0 28rpx;
 			overflow: hidden;
 		}
 
 		image {
 			width: 100%;
 			height: 100%;
-			border-radius: $border-radius-sm;
+			// border-radius: $border-radius-sm;
 		}
 	}
 }
@@ -1161,5 +1201,96 @@ page {
 				}
 			}
 
+		}
+		.good-wrap {
+			padding-top: 50rpx;
+			margin-bottom: 10rpx;
+			// position: relative;
+			// .goodbg {
+			// 	position: absolute;
+			// 	top: 0;
+			// 	left: 0;
+				
+			// }
+			.good-tit {
+				text-align: center;
+				font-size: 48rpx;
+				font-family: Source Han Serif SC;
+				font-weight: bold;
+				color: #81541F;
+				text-shadow: 0px 3rpx 3rpx #FFFFFF;
+				background: linear-gradient(0deg, rgba(4, 0, 0, 0.23) 0%, rgba(255, 255, 255, 0.23) 100%);
+				-webkit-background-clip: text;
+				// -webkit-text-fill-color: transparent;
+				color: #81541F;
+				margin-bottom: 40rpx;
+			}
+			.item-wrap {
+				margin: auto;
+				width: 694rpx;
+				height: 606rpx;
+				background: rgb(241, 210, 162);
+				border: 1px solid #F8E1C2;
+				box-shadow: 0px 4px 25px 0px rgba(0, 0, 0, 0.1);
+				border-radius: 12px;
+				padding: 26rpx;
+				.item-img {
+					display: block;
+					width: 642rpx;
+					height: 476rpx;
+					background-color: #eee;
+					border-radius: 14rpx 14rpx 14rpx 14rpx;
+					image {
+						width: 100%;
+						height: 100%;
+						border-radius: 14rpx 14rpx 14rpx 14rpx;
+					}
+				}
+				.item-btm {
+					display: flex;
+					height: 100rpx;
+					justify-content: space-between;
+					align-items: center;
+					// position: relative;
+					.item-price {
+						font-size: 27rpx;
+						font-family: Source Han Serif SC;
+						font-weight: bold;
+						color:rgba(153, 0, 0, 1);
+						justify-content: flex-start;
+						align-items: flex-end;
+						.price-tit {
+							color: rgba(84, 50, 11, 1);
+						}
+						.price-logo {
+							display: inline-block;
+							padding: 0 5rpx 0 15rpx;
+						}
+						.price-val {
+							// padding-top: 10rpx;
+							font-size: 54rpx;
+							position: relative;
+							top: 8rpx;
+						}
+						
+					}
+					.item-btn {
+						width: 168rpx;
+						line-height: 50rpx;
+						height: 50rpx;
+						background: linear-gradient(-22deg,  rgba(123, 75, 20, 1),rgba(123, 75, 20, 0.5),);
+						text-align: center;
+						border-radius: 25rpx;
+						font-size: 29rpx;
+						font-family: Source Han Serif SC;
+						font-weight: 600;
+						color: #F7E6CF;
+						// position: absolute;
+						// right: 0;
+						// bottom: 0;
+						// top: 0;
+					}
+				}
+			}
 		}
 </style>

pages/money/pay.vue

@@ -26,7 +26,7 @@
 					<text class="tit">余额支付</text>
 					<text>可用余额 ¥{{ now_money }}</text>
 				</view>
-				<label class="radio"><radio value="" color="#5dbc7c" :checked="payType == 3"></radio></label>
+				<label class="radio"><radio value="" color="#d8a668" :checked="payType == 3"></radio></label>
 			</view>
 		</view>
 		<text class="mix-btn" :class="{ clickbg: payLoding }" @click="!payLoding ? confirm() : ''">确认支付</text>
@@ -58,7 +58,12 @@ export default {
 			froms: '', //保存h5中数据来源对象
 			// #endif
 			pinkid: '', //保存拼团商品id
-			gtype: 0,
+			gtype: 0,
+			// is_agent: 0,
+			// agent_province: '',
+			// agent_city:'',
+			// agent_area:'',
+			// recommended:'',
 		};
 	},
 	computed: {
@@ -224,13 +229,19 @@ export default {
 			let obj = this;
 			// 获取下单页面数据
 			let prepage = obj.$api.prePage();
-
+			console.log(prepage.addressData.real_name,'prepage.addressData.real_name')
 			let data = {
 				real_name: prepage.addressData.real_name, //联系人名称
 				phone: prepage.addressData.phone, //联系人号码
 				couponId: prepage.couponChecked.id, //优惠券编号
 				addressId: prepage.addressData.id, //支付地址id
-				useIntegral: prepage.checkedPoints ? 1 : 0, //是否积分抵扣1为是0为否
+				useIntegral: prepage.checkedPoints ? 1 : 0, //是否积分抵扣1为是0为否
+				is_agent: prepage.is_agent,
+				agent_province: prepage.agent_province,
+				agent_city: prepage.agent_city,
+				agent_area: prepage.agent_area,
+				recommended: prepage.recommended,
+				bonus: prepage.bonus,
 				payType: obj.payName, //支付类型  weixin-微信 yue-余额
 				mark: prepage.desc, //备注
 				// #ifdef H5
@@ -243,7 +254,8 @@ export default {
 				from: 'app', //来源
 				// #endif
 				shipping_type: 1 ,//提货方式 1 快递 2自提
-				is_up_level: obj.gtype
+				is_up_level: obj.gtype,
+				
 			};
 			// 判断是否拼团商品
 			if (obj.pinkid) {

pages/money/paySuccess.vue

@@ -35,7 +35,7 @@
 	}
 	.success-icon{
 		font-size: 160upx;
-		color: #5dbc7c;
+		color: #ecd0a9;
 		margin-top: 100upx;
 	}
 	.tit{

pages/money/wallet.vue

@@ -1,8 +1,9 @@
 <template>
 	<view class="content">
 		<view class="content-money">
-			<view class="money-box">
-				<view class="text">余额（元）</view>
+			<view class="money-box">
+				<image src="../../static/img/yuebg.png" mode="" class="bg"></image>
+				<view class="text"></view>
 				<view class="money">{{ money | getMoneyStyle }}</view>
 			</view>
 			<!-- <view class="moneyTx" @click="navto('/pages/money/withdrawal')">提现</view> -->
@@ -226,13 +227,28 @@ page {
 	padding-top: var(--status-bar-height);
 	height: 368rpx;
 	color: #ffffff;
-	text-align: center;
+	text-align: center;
+	position: relative;
+	.bg {
+		position: absolute;
+		width: 750rpx;
+		height: 400rpx;
+		top: 0;
+		left: 0;
+	}
 	.text {
 		padding-top: 147rpx;
-		font-size: $font-sm;
+		font-size: $font-sm;
+		position: relative;
 	}
-	.money {
-		font-size: 56rpx;
+	.money {
+		// width: 750rpx;
+		text-align: center;
+		font-size: 82rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #FFFFFF;
+		position: relative;
 	}
 }
 
@@ -254,7 +270,8 @@ page {
 		color: $font-color-dark;
 		position: relative;
 		&.current {
-			color: $base-color;
+			color: #000000;
+			font-weight: bold;
 			&:after {
 				content: '';
 				position: absolute;
@@ -263,7 +280,7 @@ page {
 				transform: translateX(-50%);
 				width: 44px;
 				height: 0;
-				border-bottom: 2px solid $base-color;
+				border-bottom: 2px solid rgba(154, 94, 25, 1);
 			}
 		}
 	}
@@ -286,7 +303,7 @@ page {
 			}
 		}
 		.money {
-			color: #fd5b23;
+			color: rgba(239, 58, 85, 1);
 			font-size: $font-lg;
 		}
 	}

pages/order/createOrder.vue

@@ -95,7 +95,7 @@
 			</view> -->
 			<view class="yt-list-cell b-b" v-if="gtype == 0">
 				<text class="cell-tit clamp">积分抵扣{{ '（当前积分：' + integralAll + '）' }}</text>
-				<view class="cell-tip"><radio @click="checkedPoints = !checkedPoints" color=" #5dbc7c" :checked="checkedPoints" /></view>
+				<view class="cell-tip"><radio @click="checkedPoints = !checkedPoints" color="#d8a668" :checked="checkedPoints" /></view>
 			</view>
 			<view class="yt-list-cell b-b">
 				<text class="cell-tit clamp">运费</text>
@@ -213,7 +213,13 @@ export default {
 			integralShow: false, //是否显示积分抵扣金额
 			payType: true, //是否可支付
 			pinkid: '' ,//保存拼团商品id
-			gtype: 0,
+			gtype: 0,
+			is_agent: '',
+			agent_province: '',
+			agent_city:'',
+			agent_area:'',
+			recommended:'',
+			bonus: '',
 		};
 	},
 	onLoad(option) {
@@ -228,8 +234,16 @@ export default {
 		}
 		if(option.gtype) {
 			this.gtype = option.gtype
-		}
-		this.getUserInfo();
+		}
+		this.is_agent = option.is_agent
+		this.agent_province = option.agent_province
+		this.agent_city = option.agent_city
+		this.agent_area = option.agent_area
+		this.recommended = option.recommended
+		this.bonus = option.bonus
+		this.getUserInfo();
+
+		
 	},
 	watch: {
 		checkedPoints(newValue, oldValue) {
@@ -342,7 +356,7 @@ export default {
 				// 计算金额
 				this.payMoneyNub();
 				// 加载优惠券
-				obj.couponsOrder(data.priceGroup.totalPrice);
+				// obj.couponsOrder(data.priceGroup.totalPrice);
 			});
 		},
 		// 购买数量变化

pages/product/common/productBottom.vue

@@ -1,15 +1,15 @@
 <template>
 	<view class="page-bottom">
-		<navigator url="/pages/index/index" open-type="switchTab" class="p-b-btn">
+		<!-- <navigator url="/pages/index/index" open-type="switchTab" class="p-b-btn">
 			<text class="iconfont iconhome"></text>
 			<text>首页</text>
 		</navigator>
 		<view class="p-b-btn" :class="{ active: goodsObjact.userCollect }" @click="toFavorite(goodsObjact)">
 			<text class="iconfont " :class="{ iconlike: !goodsObjact.userCollect, iconlikefill: goodsObjact.userCollect }"></text>
 			<text>收藏</text>
-		</view>
+		</view> -->
 		<view class="action-btn-group">
-			<button type="primary" class=" action-btn no-border add-cart-btn" @click="buy(2)" v-if="is_up==0">加入购物车</button>
+			<!-- <button type="primary" class=" action-btn no-border add-cart-btn" @click="buy(2)" v-if="is_up==0">加入购物车</button> -->
 			<button type="primary" class=" action-btn no-border buy-now-btn" @click="buy(1)" :class="{'action': is_up==1 }">立即购买</button>
 		</view>
 	</view>
@@ -77,7 +77,7 @@ export default {
 	justify-content: center;
 	align-items: center;
 	width: 750rpx;
-	height: 120rpx;
+	height: 98rpx;
 	background-color: #ffffff;
 	/* box-shadow: 0 0 20rpx 0 rgba(0, 0, 0, 0.5);
 	border-radius: 16rpx; */
@@ -109,10 +109,11 @@ export default {
 	}
 	.action-btn-group {
 		display: flex;
-		height: 76rpx;
-		border-radius: 100px;
+		height: 98rpx;
+		// font-size: 36rpx;
+		// border-radius: 100px;
 		overflow: hidden;
-		margin-left: 20rpx;
+		// margin-left: 20rpx;
 		position: relative;
 		&:after {
 			content: '';
@@ -129,21 +130,24 @@ export default {
 			display: flex;
 			align-items: center;
 			justify-content: center;
-			width: 270rpx;
+			width: 750rpx;
 			height: 100%;
-			font-size: $font-base;
+			font-size: 36rpx;
+			letter-spacing: 8rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
 			padding: 0;
 			border-radius: 0;
 			background: transparent;
 			&.buy-now-btn {
-				background-color: #303e49;
+				background-color: #d8a668;
 			}
 			&.add-cart-btn {
 				background-color: $base-color;
 			}
 		}
 		.action {
-			width: 540rpx;
+			// width: 540rpx;
 		}
 	}
 }

pages/product/common/productContent.vue

@@ -1,11 +1,7 @@
 <template>
 	<view class="introduce-section">
-		<text class="title clamp2">{{ goodsObjact.store_name }}</text>
-		<!-- <button open-type="share" class="shareDate">
-			<image class="share-img" src="../../../static/img/img57.png"></image>
-			好物推荐
-		</button> -->
-		<text class="info" v-if="goodsObjact.store_info">{{ goodsObjact.store_info }}</text>
+		
+		<!-- <text class="info" v-if="goodsObjact.store_info">{{ goodsObjact.store_info }}</text> -->
 		<!-- <view class="progress-box">
 			<progress :percent="goodsObjact.percent | parseIntTo" activeColor="#F65527" font-size="10" show-info border-radius="5" stroke-width="9" />
 			<view class="number">剩余{{ goodsObjact.percent | parseIntTo }}%</view>
@@ -14,10 +10,11 @@
 			<text class="price-tip">¥</text>
 			<view class="price">
 				{{ goodsObjact.price }}
-				<text class="text">/份</text>
+				<!-- <text class="text">/份</text> -->
 				<text class="m-price" v-if="goodsObjact.ot_price > goodsObjact.price">¥{{ goodsObjact.ot_price }}</text>
 			</view>
-		</view>
+		</view>
+		<text class="title clamp2">{{ goodsObjact.store_name }}</text>
 		<!-- <view class="price-green">
 			￥{{ goodsObjact.ot_price }}
 			<text>市场价</text>
@@ -61,8 +58,13 @@ export default {
 	background: #fff;
 	padding: 35rpx 0rpx;
 	padding-left: 35rpx;
-	.title {
-		font-size: 32rpx;
+	.title {
+		font-size: 30rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #1D2023;
+		// line-height: 42px;
+		// font-size: 32rpx;
 		color: $font-color-dark;
 		.tip-o {
 			color: #ff3334;
@@ -113,9 +115,10 @@ export default {
 		height: 64rpx;
 		padding: 10rpx 0;
 		font-size: 26rpx;
-		color: $uni-color-primary;
+		color: rgba(239, 58, 85, 1);
 	}
-	.price {
+	.price {
+		color: rgba(239, 58, 85, 1);
 		font-size: $font-lg + 6rpx;
 		.text {
 			padding-left: 5rpx;

pages/product/product.vue

@@ -361,6 +361,12 @@ export default {
 				productId: obj.goodsid, //商品编号
 				uniqueId: obj.uniqueId,
 				is_up_level: obj.is_up == 1? 1: 0,//1为礼包产品 0为普通
+				is_agent: obj.is_agent,
+				agent_province: obj.goodsObjact.agent_province,
+				agent_city:obj.goodsObjact.agent_city,
+				agent_area:obj.goodsObjact.agent_area,
+				recommended:obj.goodsObjact.recommended,
+				bonus: obj.goodsObjact.bonus
 			};
 
 			if (obj.type == 2) {
@@ -372,7 +378,7 @@ export default {
 					if (obj.type == 1) {
 						// 跳转到支付页
 						uni.navigateTo({
-							url: '/pages/order/createOrder?id=' + da.cartId + '&gtype=' + obj.is_up
+							url: '/pages/order/createOrder?id=' + da.cartId + '&gtype=' + obj.is_up + '&is_agent=' + obj.goodsObjact.is_agent + '&agent_province=' + obj.goodsObjact.agent_province + '&agent_city=' + obj.goodsObjact.agent_city + '&agent_area=' + obj.goodsObjact.agent_area + '&recommended=' + obj.goodsObjact.recommended + '&bonus=' + obj.goodsObjact.bonus
 						});
 					}
 					if (obj.type == 2) {
@@ -453,7 +459,7 @@ export default {
 			height: 66rpx;
 			line-height: 66rpx;
 			border-radius: 100rpx;
-			background: $uni-color-primary;
+			background: #d8a668;
 			font-size: $font-base + 2rpx;
 			color: #fff;
 			margin: 30rpx auto 20rpx;
@@ -525,7 +531,7 @@ export default {
 
 			.price {
 				font-size: $font-lg;
-				color: $uni-color-primary;
+				color: #d8a668;
 				margin: 10rpx 0rpx;
 			}
 

pages/public/register.vue

@@ -17,7 +17,8 @@
 				<view class="login_img"><image src="/static/icon/img04.png"></image></view>
 				<view class="login_name"><input class="uni-input" type="password" v-model="repassword" focus placeholder="请重复输入密码" /></view>
 			</view>
-			<view class="login_input flex" style="display: none;">
+			<view class="login_input flex" >
+				<!-- style="display: none;" -->
 				<!-- <view class="login_input flex"> -->
 				<view class="login_img"><image src="/static/icon/img07.png"></image></view>
 				<view class="login_name"><input class="uni-input" type="text" v-model="invitation" focus placeholder="请输入邀请码" /></view>

pages/set/userinfo.vue

@@ -13,7 +13,10 @@
   		<input class="input" v-model="userInfo.uid" type="text" disabled="true" placeholder-class="placeholder" style="color: #999;" />
   	</view>
   	<view class="submit-box flex" >
-  		<view class="submit" @click="edit">确认修改</view>
+  		<view class="submit" @click="edit">确认修改</view>
+		<view class="submit out" @click="toLogout" >
+			退出登录
+		</view>
   	</view>
   	
   </view>
@@ -157,7 +160,8 @@
   	}
   }
   .submit-box{
-  		 padding-top: 157rpx;
+  		 padding-top: 157rpx;
+		 flex-direction: column;
   		.submit{
   			margin: 40rpx auto;
   			width: 560rpx;
@@ -166,7 +170,12 @@
   			text-align: center;
   			padding:26rpx 0rpx;
   			border-radius: 50rpx;
-  		}
+  		}
+		.out {
+			color: $base-color;
+			border: 1px solid $base-color;
+			background: #fff;
+		}
   	}
     .jg {
       margin-bottom: 20rpx;

pages/user/award.vue

@@ -1,11 +1,12 @@
 <template>
 	<view class="content">
 		<view class="content-money">
-			<view class="money-box">
-				<view class="text">佣金（元）</view>
-				<view class="money">{{ money | getMoneyStyle }}</view>		
+			<view class="money-box">
+				<image src="../../static/img/jfbg.png" mode="" class="bg"></image>
+				<view class="text"></view>
+				<view class="money">{{ userInfo.brokerage_price | getMoneyStyle }}</view>		
 			</view>
-			<view class="moneyTx" @click="navto('./withdrawal')">提现</view>
+			<!-- <view class="moneyTx" @click="navto('./withdrawal')">提现</view> -->
 			<!-- <view class="flex buttom-box">
 				<view class="buttom" @click="navto('/pages/money/recharge')">
 					<view class="icon"><image src="/static/icon/i6.png" mode="aspectFill" class="icon-img"></image></view>
@@ -21,7 +22,7 @@
 		<view class="navbar">
 			<view v-for="(item,index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index}" @click="tabClick(index)">{{ item.text }}</view>
 		</view>
-		<swiper :current="tabCurrentIndex" :style="{'height':maxheight+'px'}" class="swiper-box" duration="300" @change="changeTab">
+		<swiper :current="tabCurrentIndex" :style="{'height':maxheight}" class="swiper-box" duration="300" @change="changeTab">
 			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
 				<scroll-view scroll-y="true" class="list-scroll-content" @scrolltolower="loadData">
 					<!-- 空白页 -->
@@ -44,7 +45,12 @@
 					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
 				</scroll-view>
 			</swiper-item>
-		</swiper>
+		</swiper>
+		<view class="btm-wrap">
+			<view class="btn" @click="navto('./withdrawal')">
+				立即提现
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -57,27 +63,27 @@ import empty from '@/components/empty';
 export default {
 	filters: {
 		getMoneyStyle
+	},
+	computed: {
+		...mapState('user',['userInfo'])
 	},
 	components: {
 		empty,
 		uniLoadMore
 	},
-	onReady() {
-		//初始化获取页面宽度
-		uni.createSelectorQuery().select('.content')
-			.fields(
-			{
-				size:true
-			},
-			data => {
-				console.log(data);
-				console.log(Math.floor((data.width /750) * 300));
-				//保存头部高度
-				this.maxheight =data.height - Math.floor((data.width / 750) * 570);
-				console.log(this.maxheight);
-				}
-			)
-			.exec();
+	onReady(res) {
+		var _this = this;
+		uni.getSystemInfo({
+			success: resu => {
+				const query = uni.createSelectorQuery();
+				query.select('.swiper-box').boundingClientRect();
+				query.exec(function(res) {
+					_this.maxheight = resu.windowHeight - res[0].top + 'px';
+					console.log('打印页面的剩余高度', _this.maxheight);
+				});
+			},
+			fail: res => {}
+		});
 	},
 	data() {
 		return {
@@ -228,13 +234,23 @@ page {
 	padding-top: var(--status-bar-height);
 	height: 368rpx;
 	color: #ffffff;
-	text-align: center;
+	text-align: center;
+	position: relative;
+	.bg {
+		position: absolute;
+		width: 750rpx;
+		height: 400rpx;
+		top: 0;
+		left: 0;
+	}
 	.text {
 		padding-top: 147rpx;
-		font-size: $font-sm;
+		font-size: $font-sm;
+		position: relative;
 	}
 	.money {
-		font-size: 56rpx;
+		font-size: 80rpx;
+		position: relative;
 	}
 }
 
@@ -256,7 +272,8 @@ page {
 		color: $font-color-dark;
 		position: relative;
 		&.current {
-			color: $base-color;
+			color: #000;
+			font-weight: bold;
 			&:after {
 				content: '';
 				position: absolute;
@@ -265,7 +282,7 @@ page {
 				transform: translateX(-50%);
 				width: 44px;
 				height: 0;
-				border-bottom: 2px solid $base-color;
+				border-bottom: 2px solid rgba(154, 94, 25, 1);
 			}
 		}
 	}
@@ -273,7 +290,8 @@ page {
 //列表
 
 .swiper-box {
-	padding-top: 10rpx;
+	padding-top: 10rpx;
+	padding-bottom: 143rpx;
 	.order-item {
 		padding: 20rpx 30rpx;
 		line-height: 1.5;
@@ -288,7 +306,7 @@ page {
 			}
 		}
 		.money {
-			color: #fd5b23;
+			color: rgba(239, 58, 85, 1);
 			font-size: $font-lg;
 		}
 	}
@@ -301,5 +319,26 @@ page {
 	.empty-content {
 		background-color: #ffffff;
 	}
+}
+.btm-wrap {
+	height: 140rpx;
+	width: 750rpx;
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	background-color: #fff;
+	.btn {
+		width: 674rpx;
+		height: 88rpx;
+		line-height: 88rpx;
+		margin: auto;
+		background: linear-gradient(-22deg, #9A5E19, #9A5E19);
+		border-radius: 44rpx;
+		text-align: center;
+		font-size: 36rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #FFFFFF;
+	}
 }
 </style>

pages/user/extension.vue

@@ -0,0 +1,428 @@
+ <template>
+ 	<view class="content">
+ 		<view class="content-money">
+ 			<view class="money-box">
+ 				<image class="tuiguang_bg" src="../../static/img/teambg.png"></image>
+ 			 <view class="money-frame">
+ 				 <view class="money_num">
+ 					{{total || '0'}}
+ 					<text class="money_ren">人</text>
+ 				</view>
+ 			 </view>
+ 			</view>
+ 			<!-- <view class="flex buttom-box">
+ 				<view class="buttom"  @click="tabClick(0)">
+ 					<view class="money">{{total || 0}}</view>
+ 					<text class="text" :class="{ current: tabCurrentIndex === 0 }">一级推广</text>
+ 				</view>
+ 				<view class="buttom"  @click="tabClick(1)">
+ 					<view class="money">{{totalLevel || 0}}</view>
+ 					<text class="text" :class="{ current: tabCurrentIndex === 1 }">二级推广</text>
+ 				</view>
+ 			</view> -->
+ 		</view>
+ 		<swiper :current="tabCurrentIndex" :style="{ height: maxheight }" class="swiper-box" duration="300" @change="changeTab" disable-touch>
+ 			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
+ 				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
+ 					<!-- 空白页 -->
+ 					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
+ 
+ 					<!-- 订单列表 -->
+ 					<view v-for="(item, index) in tabItem.orderList" :key="index" class="order-item flex">
+ 						<view class="title-box flex_item">
+ 							<view class="title-avatar"><image :src="item.avatar"></image></view>
+ 							<view class="list_tpl">
+								<view class="title">
+									<text>{{ item.nickname }}</text>
+								</view>
+ 								<view class="time">
+ 									<text>{{ item.time }}</text>
+ 								</view>
+ 							</view>
+ 						</view>
+ 					</view>
+ 					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
+ 				</scroll-view>
+ 			</swiper-item>
+ 		</swiper>
+ 	</view>
+ </template>
+ <script>
+ import { getExtensionData,getUserInfo ,getSpreadPeople} from '@/api/user.js';
+ import { mapState, mapMutations } from 'vuex';
+ import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+ import empty from '@/components/empty';
+ export default {
+ 	components: {
+ 		empty,
+ 		uniLoadMore,
+ 	},
+ 	onReady(res) {
+ 		var _this = this;
+ 		uni.getSystemInfo({
+ 			success: resu => {
+ 				const query = uni.createSelectorQuery();
+ 				query.select('.swiper-box').boundingClientRect();
+ 				query.exec(function(res) {
+ 					_this.maxheight = resu.windowHeight - res[0].top + 'px';
+ 					console.log('打印页面的剩余高度', _this.maxheight);
+ 				});
+ 			},
+ 			fail: res => {}
+ 		});
+ 	},
+ 	data() {
+ 		return {
+ 			// 头部图高度
+ 			maxheight: '',
+ 			tabCurrentIndex: 0,
+ 			navList: [
+ 				{
+ 					state: 0,
+ 					text: '一级推广',
+ 					loadingType: 'more',
+ 					orderList: [],
+ 					page: 1, //当前页数
+ 					limit: 10 //每次信息条数
+ 				},
+ 				{
+ 					state: 1,
+ 					text: '二级推广',
+ 					loadingType: 'more',
+ 					orderList: [],
+ 					page: 1, //当前页数
+ 					limit: 10 //每次信息条数
+ 				}
+ 			],
+ 			all:'',
+ 			list:'',
+ 			total:'',
+ 			totalLevel:'',
+ 			img:'http://kaifa.crmeb.net/uploads/attach/2019/08/20190807/723adbdd4e49a0f9394dfc700ab5dba3.png',
+			userInfo: {},
+ 		};
+ 	},
+ 	onLoad(options) {},
+ 	onShow() {
+ 		this.loadData();
+		this.loadAll()
+ 	},
+ 	methods: {
+ 		// 页面跳转
+ 		navto(e) {
+ 			uni.navigateTo({
+ 				url: e
+ 			});
+ 		},
+ 		//获取推广人数信息
+ 		async loadData(source) {
+ 			//这里是将订单挂载到tab列表下
+ 			let index = this.tabCurrentIndex;
+ 			let navItem = this.navList[index];
+ 			let state = navItem.state;
+ 			if (source === 'tabChange' && navItem.loaded === true) {
+ 				//tab切换只有第一次需要加载数据
+ 				return;
+ 			}
+ 			if (navItem.loadingType === 'loading') {
+ 				//防止重复加载
+ 				return;
+ 			}
+ 			if (navItem.loadingType === 'noMore') {
+ 				//防止重复加载
+ 				return;
+ 			}
+ 			// 修改当前对象状态为加载中
+ 			navItem.loadingType = 'loading';
+ 			getSpreadPeople(
+ 				{
+ 					page: navItem.page,
+ 					limit: navItem.limit,
+ 					keyword:'',
+					// sort: 'ASC/DESC',
+					// level: index,
+ 					// sort:'uid desc'
+					// sort: 'pay_price ASC'
+ 					grade:state
+ 				},
+ 			)
+ 				.then(({ data }) => {
+ 					console.log(data);
+ 					
+ 					this.total = data.total;
+ 					this.totalLevel =data.totalLevel;
+ 					// this.all = this.total + this.totalLevel;
+ 					if (data.list.length > 0) {
+ 						this.list = data.list;
+ 						navItem.orderList = navItem.orderList.concat(data.list);
+ 						navItem.page++;
+ 					}
+ 					this.$nextTick(function(){
+ 						if (navItem.limit == data.list.length) {
+ 							//判断是否还有数据， 有改为 more， 没有改为noMore
+ 							navItem.loadingType = 'more';
+ 							return;
+ 						} else {
+ 							//判断是否还有数据， 有改为 more， 没有改为noMore
+ 							navItem.loadingType = 'noMore';
+ 						}
+ 					})
+ 					this.$set(navItem, 'loaded', true);
+ 				})
+ 				.catch(e => {
+ 					console.log(e);
+ 				});
+ 		},
+ 		//swiper 切换
+ 		changeTab(e) {
+ 			this.tabCurrentIndex = e.target.current;
+ 			this.loadData('tabChange');
+ 		},
+ 		//顶部tab点击
+ 		tabClick(index) {
+ 			this.tabCurrentIndex = index;
+ 		},
+ 		// 点击返回 我的页面
+ 		toBack(){
+ 			uni.switchTab({
+ 				url:'/pages/user/user'
+ 			})
+ 		},
+		loadAll(){
+			getUserInfo().then(res => {
+				this.userInfo = res.data
+				console.log(res,'6666666666666666666')
+			});
+		}
+ 	}
+ };
+ </script>
+ 
+ <style lang="scss">
+ page {
+ 	background: #ffffff;
+ 	height: 100%;
+ }
+ .content-money {
+ 	// padding-bottom: 30rpx;
+ 	background: $page-color-base;
+ 	.buttom-box {
+ 		position: relative;
+ 		background-color: #ffffff;
+ 		text-align: center;
+ 		padding: 30rpx 0;
+ 		.buttom {
+ 			flex-grow: 1;
+ 		}
+ 		.money{
+ 			
+ 			font-size: 32rpx;
+ 			font-weight: bold;
+ 			color: #fff;
+ 		}
+ 		.text {
+ 			padding-bottom: 26rpx;
+ 			font-size: 28rpx;
+ 			font-weight: 500;
+ 			color: #666666;
+ 			&.current {
+ 				border-bottom: 2px solid #ff4c4c;
+ 			}
+ 		}
+ 		.icon {
+ 			height: 50rpx;
+ 			width: 48rpx;
+ 			margin: 0 auto;
+ 			.icon-img {
+ 				width: 100%;
+ 				height: 100%;
+ 			}
+ 		}
+ 	}
+ }
+ .money-box {
+ 	// background: $base-color;
+ 	height: 400rpx;
+ 	color: #FF4C4C;
+ 	text-align: center;
+ 	font-size: 35rpx;
+ 	position: relative;
+ 	// padding-top: 60rpx;
+ 	.header{
+ 		position: absolute;
+ 		left: 0;
+ 		top: 0;
+ 		width: 100%;
+ 		height: 80rpx;
+ 		font-size: 36rpx;
+ 		font-weight: bold;
+ 		z-index: 99;
+ 		display: flex;
+ 		justify-content: center;
+ 		align-items: center;
+ 	}
+ 	.goback-box{
+ 		position: absolute;
+ 		left: 29rpx;
+ 		top: 0;
+ 		height: 80rpx;
+ 		display: flex;
+ 		align-items: center;
+ 	}
+ 	.goback{
+ 		z-index: 100;
+ 		width: 34rpx;
+ 		height: 34rpx;
+ 	}
+ 	.tuiguang_bg {
+ 		width: 100%;
+ 		height: 400rpx;
+ 		position: relative;
+ 	}
+ 	.money_img{
+ 		width: 100%;
+ 		height: 120rpx;
+ 		text-align: center;
+ 		padding-top: 50rpx;
+ 		padding-bottom: 135rpx;
+ 		image{
+ 			width:120rpx;
+ 			height: 120rpx;
+ 			border: 4rpx solid #FD5F6F;
+ 			border-radius: 50%;
+ 		}
+ 	}
+ 	.money-frame {
+ 		position: absolute;
+ 		top: 0;
+ 		width: 100%;
+ 		padding-top: 120rpx;
+ 		// left: 30rpx;
+ 		// height: 460rpx;
+ 		// display: flex;
+ 		// align-items: flex-start;
+ 		// flex-direction: column;
+ 		// justify-content: center;
+ 	}
+ 	.money_name{
+ 		width: 100%;
+ 		text-align: center;
+ 		font-size: 32rpx;
+ 		font-family: PingFang SC;
+ 		font-weight: bold;
+ 		color: #FFFFFF;
+ 		
+ 	}
+ 	.money_num {
+		padding-top: 50rpx;
+ 		font-size: 72rpx;
+ 		font-family: PingFang SC;
+ 		font-weight: bold;
+ 		color: #fff;
+ 		.money_ren {
+ 			font-size: 36rpx;
+ 		}
+ 	}
+ }
+ 
+ // 列表
+ 
+ .swiper-box {
+ 	// padding-top: 10rpx;
+ 	.order-item {
+		// margin-top: 20rpx;
+ 		padding: 20rpx 30rpx;
+ 		line-height: 1.5;
+ 		.title-box {
+ 			width: 100%;
+ 			.title-avatar{
+ 				width: 100rpx;
+ 				height: 100rpx;
+ 				margin-right: 25rpx;
+ 				image{
+ 					width: 100%;
+ 					height: 100%;
+ 					border-radius: 100%;
+ 				}
+ 			}
+ 			.list_tpl{
+ 				width: 85%;
+ 				.title {
+ 					font-size: $font-lg;
+ 					color: $font-color-base;
+ 					overflow:hidden;            //超出的文本隐藏
+ 					text-overflow:ellipsis;     //溢出用省略号显示
+ 					white-space:nowrap;
+					 justify-content: flex-start;
+					image {
+						margin-left: 9rpx;
+						width: 147rpx;
+						height: 32rpx;
+					}
+ 				}
+ 				.time {
+ 					margin-top: 15rpx;
+ 					font-size: 22rpx;
+ 					color: $font-color-light;
+ 				}
+ 			}
+ 		}
+ 		.money {
+ 			color: #DB1935;
+ 			font-size: $font-lg;
+ 		}
+ 	}
+ }
+ .list-scroll-content {
+ 	height: 100%;
+ }
+ .content {
+ 	height: 100%;
+ 	.empty-content {
+ 		background-color: #ffffff;
+ 	}
+ }
+ .tg-wrapper {
+	width: 100%;
+	background-color: #f7f7f7;
+	
+	padding: 20rpx 0;
+	.tg-box {
+		display: flex;
+		justify-content: center;
+		width: 690rpx;
+		height: 143rpx;
+		background-color: #fff;
+		margin: 0 auto;
+		align-items: center;
+		.tg-item {
+			width: 33%;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+			.tg-tit {
+				font-size: 24rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #333333;
+				
+			}
+			.tg-val {
+				padding-top: 15rpx;
+				font-size: 34rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #333333;
+				
+			}
+		}
+		.tg-jg {
+			width: 1rpx;
+			height: 51rpx;
+			background: #DDDDDD;
+		}
+	}
+ }
+ </style>
+ 

pages/user/user.vue

@@ -1,38 +1,56 @@
 <template>
 	<view class="container">
 		<view class="vheigh"></view>
-		<scroll-view class="content-box" scroll-y="true">
-			<view class="user-section">
-				<view class="bg"></view>
-				<view class="user-info-box ">
-					<view class="detail flex" @click="navTo('/pages/set/userinfo')">
-						<view class="portrait-box">
-							<image class="portrait" :src="userInfo.avatar || '/static/error/missing-face.png'"></image>
+		<view class="user">
+			<!-- 背景图片 -->
+			<view class="top-bg"></view>
+			<!-- 用户头像和信息 -->
+			<view class="infor">
+				<!-- 用户信息 -->
+				<view class="infor-left" @click="navTo('/pages/set/userinfo')">
+					<image :src=" userInfo.avatar || '../../static/error/missing-face.png' "></image>
+					<view class="info-box">
+						<view class="username clamp2">{{ userInfo.nickname || '游客' }}</view>
+						<view class="phone" v-if="userInfo.phone">{{userInfo.phone | phone}}</view>
+						<view class="phone" v-if="userInfo.level >= 1">
+							<text v-if="userInfo.valid_time != 0">会员到期: {{userInfo.valid_time}}</text>
+							<text v-if="userInfo.valid_time == 0">会员已到期</text>
+							<text v-if="userInfo.commission_time != 0" style="display: inline-block;padding-left: 20rpx;">分红到期: {{userInfo.commission_time}}</text>
+							<text v-if="userInfo.commission_time == 0" style="display: inline-block;padding-left: 20rpx;">分红已到期</text>
+							<text class="show-btn" @click.stop="longTime" style="display: inline-block;padding-left: 20rpx;text-decoration:underline;font-weight: bold;">续期</text>
 						</view>
-						<view class="info-box">
-							<view class="username">{{ userInfo.nickname || '游客' }}</view>
-							<view class="font-size-sm" v-if="userInfo.uid">邀请码:{{ userInfo.uid }}</view>
-						</view>
-					</view>
-					<view class="config iconfont">
-						<text class="setting iconsetting" @click="navTo('/pages/set/set')"></text>
 					</view>
-
 				</view>
-				
-				<!-- 会员卡功能 -->
-				<!-- <view class="vip-card-box">
-					<image class="card-bg" src="/static/img/vip-card-bg.png" mode=""></image>
-					<view class="b-btn">我要升级</view>
-					<view class="tit">
-						<text class="iconfont icon-iLinkapp-"></text>
-						升级专享优惠权益
+			</view>
+			<!-- 我的订单 -->
+			<view class="order-box">
+				<view class="my-order" @click="navTo('/pages/order/order')">
+					<view class="order">我的订单</view>
+					<image src="../../static/img/xiangxia.png" mode="scaleToFill"></image>
+				</view>
+				<!-- 订单栏 -->
+				<view class="order-section">
+					<view class="order-item" @click="navTo('/pages/order/order?state=0')">
+						<image src="../../static/img/img19.png" mode="scaleToFill"></image>
+						<view class="text">待付款</view>
 					</view>
-					<text class="e-m">DCloud Union</text>
-					<text class="e-b">开通会员开发无bug 一测就上线</text>
-				</view> -->
+					<view class="order-item" @click="navTo('/pages/order/order?state=1')">
+						<image src="../../static/img/img20.png" mode="scaleToFill"></image>
+						<view class="text">待发货</view>
+					</view>
+					<view class="order-item" @click="navTo('/pages/order/order?state=2')">
+						<image src="../../static/img/img21.png" mode="scaleToFill"></image>
+						<view class="text">待收货</view>
+					</view>
+					<view class="order-item" @click="navTo('/pages/order/order?state=4')">
+						<image src="../../static/img/img22.png" mode="scaleToFill"></image>
+						<view class="text">已完成</view>
+					</view>
+				</view>
 			</view>
-			<template v-if="userInfo.level >= 1">
+		</view>
+		<!-- <scroll-view class="content-box" scroll-y="true"> -->
+		<!-- <template v-if="userInfo.level >= 1">
 				<view class="show-time" >
 					<view v-if="userInfo.valid_time != 0">会员到期: {{userInfo.valid_time}}</view>
 					<view v-if="userInfo.valid_time == 0">会员已到期</view>
@@ -42,143 +60,120 @@
 					<view v-if="userInfo.commission_time == 0">分红已到期</view>
 					<view class="show-btn" @click="longTime">续期</view>
 				</view>
-			</template>
-			<view class="cover-container">
-				<!-- <image class="arc" src="/static/img/arc.png"></image> -->
-
-				<view class="tj-sction">
-					<view class="tj-item" @click="navTo('/pages/money/wallet')">
-						<text class="num">{{ userInfo.now_money || '0.00' }}</text>
-						<text>余额</text>
-					</view>
-					<view class="tj-item" @click="navTo('/pages/user/award')">
-						<text class="num">{{ userInfo.brokerage_price || '0.00' }}</text>
-						<text>佣金</text>
-					</view>
-					<view class="tj-item" @click="navTo('/pages/user/scoreAccumulate')">
-						<text class="num">{{ userInfo.integral || '0.00' }}</text>
-						<text>积分</text>
-					</view>
-				</view>
-				<!-- 订单 -->
-
-				<view class="item-box">
-					<!-- <view class="box-title flex borde-b">
-						<view class="title"><text>我的订单</text></view>
-						<view class="link" @click="navTo('/pages/order/order?state=0')" hover-class="common-hover">
-							<text>全部订单</text>
-							<text class="iconfont iconenter"></text>
-						</view>
-					</view> -->
-					<view class="order-section">
-						<view class="order-item" @click="navTo('/pages/order/order?state=0')" hover-class="common-hover"
-							:hover-stay-time="50">
-							<view class=" icon position-relative">
-								<image class="icon-img" src="/static/icon/i1.png" mode="aspectFit"></image>
-								<view class="corner" v-if="orderInfo.unpaid_count > 0">
-									<text>{{ orderInfo.unpaid_count }}</text>
-								</view>
+			</template> -->
+		<view class="cover-container">
+			<view class="item-box">
+				<!-- <view class="order-section">
+					<view class="order-item" @click="navTo('/pages/order/order?state=0')" hover-class="common-hover"
+						:hover-stay-time="50">
+						<view class=" icon position-relative">
+							<image class="icon-img" src="/static/icon/i1.png" mode="aspectFit"></image>
+							<view class="corner" v-if="orderInfo.unpaid_count > 0">
+								<text>{{ orderInfo.unpaid_count }}</text>
 							</view>
-							<text>待付款</text>
 						</view>
-						<view class="order-item" @click="navTo('/pages/order/order?state=1')" hover-class="common-hover"
-							:hover-stay-time="50">
-							<view class=" icon position-relative">
-								<image class="icon-img" src="/static/icon/i2.png" mode="aspectFit"></image>
-								<view class="corner" v-if="orderInfo.unshipped_count > 0">
-									<text>{{ orderInfo.unshipped_count }}</text>
-								</view>
+						<text>待付款</text>
+					</view>
+					<view class="order-item" @click="navTo('/pages/order/order?state=1')" hover-class="common-hover"
+						:hover-stay-time="50">
+						<view class=" icon position-relative">
+							<image class="icon-img" src="/static/icon/i2.png" mode="aspectFit"></image>
+							<view class="corner" v-if="orderInfo.unshipped_count > 0">
+								<text>{{ orderInfo.unshipped_count }}</text>
 							</view>
-							<text>待发货</text>
 						</view>
-						<view class="order-item" @click="navTo('/pages/order/order?state=2')" hover-class="common-hover"
-							:hover-stay-time="50">
-							<view class="icon position-relative">
-								<image class="icon-img" src="/static/icon/i3.png" mode="aspectFit"></image>
-								<view class="corner" v-if="orderInfo.received_count > 0">
-									<text>{{ orderInfo.received_count }}</text>
-								</view>
+						<text>待发货</text>
+					</view>
+					<view class="order-item" @click="navTo('/pages/order/order?state=2')" hover-class="common-hover"
+						:hover-stay-time="50">
+						<view class="icon position-relative">
+							<image class="icon-img" src="/static/icon/i3.png" mode="aspectFit"></image>
+							<view class="corner" v-if="orderInfo.received_count > 0">
+								<text>{{ orderInfo.received_count }}</text>
 							</view>
-							<text>待收货</text>
 						</view>
-						<view class="order-item" @click="navTo('/pages/order/order?state=3')" hover-class="common-hover"
-							:hover-stay-time="50">
-							<view class="icon position-relative">
-								<image class="icon-img" src="/static/icon/i4.png" mode="aspectFit"></image>
-								<!-- <view class="corner" v-if="orderInfo.complete_count > 0">
-									<text>{{ orderInfo.complete_count }}</text>
-								</view> -->
-							</view>
-							<text>已完成</text>
+						<text>待收货</text>
+					</view>
+					<view class="order-item" @click="navTo('/pages/order/order?state=3')" hover-class="common-hover"
+						:hover-stay-time="50">
+						<view class="icon position-relative">
+							<image class="icon-img" src="/static/icon/i4.png" mode="aspectFit"></image>
 						</view>
+						<text>已完成</text>
 					</view>
-				</view>
-				<view class="item-box">
-					<!-- <view class="box-title flex borde-b">
-						<view class="title"><text>我的资产</text></view>
-					</view> -->
-					<view class="order-section">
-						<view class="order-item" @click="navTo('/pages/money/wallet')" hover-class="common-hover"
-							:hover-stay-time="50">
-							<view class="icon">
-								<image class="icon-img" src="/static/icon/u1.png" mode="aspectFit"></image>
-							</view>
-							<text>我的钱包</text>
+				</view> -->
+			</view>
+			<view class="item-box">
+				<view class="order-section">
+					<view class="order-item" @click="navTo('/pages/money/wallet')" hover-class="common-hover"
+						:hover-stay-time="50">
+						<view class="icon">
+							<image class="icon-img" src="/static/icon/u1.png" mode="aspectFit"></image>
 						</view>
-						<view class="order-item" @click="navTo('/pages/user/award')" hover-class="common-hover"
-							:hover-stay-time="50">
-							<view class="icon">
-								<image class="icon-img" src="/static/icon/u2.png" mode="aspectFit"></image>
-							</view>
-							<text>佣金</text>
+						<text>购物卡</text>
+					</view>
+					<view class="order-item" @click="navTo('/pages/user/award')" hover-class="common-hover"
+						:hover-stay-time="50">
+						<view class="icon">
+							<image class="icon-img" src="/static/icon/u2.png" mode="aspectFit"></image>
 						</view>
-						<view class="order-item" @click="navTo('/pages/user/scoreAccumulate')"
-							hover-class="common-hover" :hover-stay-time="50">
-							<view class="icon">
-								<image class="icon-img" src="/static/icon/u3.png" mode="aspectFit"></image>
-							</view>
-							<text>积分</text>
+						<text>我的收益</text>
+					</view>
+					<view class="order-item" @click="navTo('/pages/user/scoreAccumulate')" hover-class="common-hover"
+						:hover-stay-time="50">
+						<view class="icon">
+							<image class="icon-img" src="/static/icon/u3.png" mode="aspectFit"></image>
 						</view>
+						<text>我的积分</text>
+					</view>
+					<view class="order-item" @click="navTo('/pages/user/extension')" hover-class="common-hover"
+						:hover-stay-time="50">
+						<view class="icon">
+							<image class="icon-img" src="/static/icon/u4.png" mode="aspectFit"></image>
+						</view>
+						<text>我的团队</text>
 					</view>
 				</view>
-
-
-				<!-- 续期 -->
-
-
-				<view class="history-section icon">
-					<!-- <view class="sec-header">
-						<text class="iconfont iconfavor"></text>
-						<text>浏览历史</text>
+			</view>
+			<!-- 续期 -->
+			<view class="history-section icon">
+				<uni-list>
+
+					<uni-list-item title="推广海报" @click="navTo('/pages/user/shareQrCode')" thumb="/static/icon/tuiguang.png">
+					</uni-list-item>
+					<!-- <uni-list-item title="我的卡卷" @click="navTo('/pages/user/coupon')" thumb="/static/icon/img12.png"></uni-list-item> -->
+					<uni-list-item title="收货地址" @click="navTo('/pages/set/address')" thumb="/static/icon/dizhi.png">
+					</uni-list-item>
+					<!-- <uni-list-item title="商户入驻" @click="navTo('/pages/set/address')" thumb="/static/icon/img05.png"></uni-list-item> -->
+					<uni-list-item title="联系客服" @click="openPopup"
+						thumb="/static/icon/kefu.png">
+					</uni-list-item>
+					<!-- <uni-list-item title="关于我们" @click="navTo('/pages/shareQrCode/index')" thumb="/static/icon/img09.png"></uni-list-item> -->
+
+				</uni-list>
+			</view>
+		</view>
+		<!-- </scroll-view> -->
+		<uni-popup ref="popup" 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>
-					<scroll-view scroll-x class="h-list">
-						<image
-							class="h-list-image"
-							@click="navTo('/pages/product/product')"
-							src="https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1553105186633&di=c121a29beece4e14269948d990f9e720&imgtype=0&src=http%3A%2F%2Fimg004.hc360.cn%2Fm8%2FM04%2FDE%2FDE%2FwKhQplZ-QteEBvsbAAAAADUkobU751.jpg"
-							mode="aspectFill"
-						></image>
-					</scroll-view> -->
-
-					<uni-list>
-
-						<uni-list-item title="我的钱包" @click="navTo('/pages/money/wallet')"
-							thumb="/static/icon/img11.png"></uni-list-item>
-						<!-- <uni-list-item title="我的卡卷" @click="navTo('/pages/user/coupon')" thumb="/static/icon/img12.png"></uni-list-item> -->
-						<uni-list-item title="我的收藏" @click="navTo('/pages/user/favorites')"
-							thumb="/static/icon/img02.png"></uni-list-item>
-						<!-- <uni-list-item title="商户入驻" @click="navTo('/pages/set/address')" thumb="/static/icon/img05.png"></uni-list-item> -->
-						<uni-list-item title="邀请好友" @click="navTo('/pages/user/shareQrCode')"
-							thumb="/static/icon/img10.png"></uni-list-item>
-						<!-- <uni-list-item title="关于我们" @click="navTo('/pages/shareQrCode/index')" thumb="/static/icon/img09.png"></uni-list-item> -->
-
-					</uni-list>
 				</view>
 			</view>
-		</scroll-view>
+		</uni-popup>
 	</view>
 </template>
 <script>
+	import uniCopy from '@/utils/uni-copy.js';
 	import {
 		mapState,
 		mapMutations
@@ -202,13 +197,24 @@
 			uniList,
 			uniListItem
 		},
+		filters: {
+			phone(val) {
+				let str = ''
+				if(val) {
+					val = "" + val;
+					str = val.substr(0,3) + "****" + val.substr(7)
+				}
+				return str
+			}
+		},
 		data() {
 			return {
 				coverTransform: 'translateY(0px)',
 				coverTransition: '0s',
 				moving: false,
 				userDowm: 0, //卡片升级专属高度
-				userMaxDowm: 0 //卡片最高高度
+				userMaxDowm: 0 ,//卡片最高高度
+				text: '123456',
 			};
 		},
 		onShow() {
@@ -364,6 +370,32 @@
 						}
 					}
 				})
+			},
+			openPopup() {
+				this.$refs.popup.open()
+			},
+			// 客服弹窗 - 复制微信
+			comfirm(value) {
+				
+				let content = value; //需要复制的内容
+				console.log('复制的内容:', content);
+				// content = typeof content === 'string' ? content : content.toString(); // 复制内容，必须字符串，数字需要转换为字符串
+				const result = uniCopy({content});
+				if (result === false) {
+					uni.showToast({
+						title: '不支持'
+					});
+				} else {
+					uni.showToast({
+						title: '复制成功',
+						icon: 'none'
+					});
+				}
+				this.$refs.popup.close();
+			},
+			// 客服弹窗 - 取消
+			cancel() {
+				this.$refs.popup.close();
 			}
 		}
 	};
@@ -417,49 +449,7 @@
 		}
 	}
 
-	.user-info-box {
-		height: 180rpx;
-		color: white;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		position: relative;
-		z-index: 1;
-
-		.detail {
-			height: 130rpx;
-
-			.portrait-box {
-				height: 100%;
-
-				.portrait {
-					width: 130rpx;
-					height: 100%;
-					border: 5rpx solid #fff;
-					border-radius: 50%;
-				}
-			}
-
-			.info-box {
-				margin-left: 20rpx;
-				line-height: 1.5;
-
-				.username {
-					font-size: $font-lg + 6rpx;
-					height: 100%;
-				}
-			}
-		}
-
-		.config {
-			font-size: 48rpx;
-			height: 130rpx;
 
-			.setting {
-				margin-right: 51rpx;
-			}
-		}
-	}
 
 	.vip-card-box {
 		display: flex;
@@ -515,7 +505,7 @@
 
 	.cover-container {
 		background: $page-color-base;
-		// margin-top: -150rpx;
+		margin-top: 165rpx;
 		padding: 0 30rpx;
 		position: relative;
 		background: #f5f5f5;
@@ -592,8 +582,8 @@
 			}
 
 			.icon {
-				height: 50rpx;
-				width: 48rpx;
+				height: 90rpx;
+				width: 88rpx;
 				margin-bottom: 18rpx;
 				background-size: 100%;
 				background-repeat: no-repeat;
@@ -663,4 +653,249 @@
 			background-color: $base-color;
 		}
 	}
+
+	.user {
+		position: relative;
+		.top-bg {
+			width: 750rpx;
+			height: 480rpx;
+			position: relative;
+			background: #ecd0a9;
+			border-radius: 0 0 25rpx 25rpx;
+		}
+
+		.infor {
+			// height: 126.5rpx;
+			width: 100%;
+			// height: 100%;
+			// background-color: pink;
+			position: absolute;
+			top: 15%;
+			
+			display: flex;
+			justify-content: space-around; // 水平平均分布
+			align-items: center; // 垂直居中 
+			// margin-top: 60rpx;
+			text-align: center;
+
+			.infor-left {
+				width: 100%;
+				height: 126rpx;
+				display: flex;
+				align-items: center;
+				// padding-left: 23rpx;
+				flex-direction: column;
+
+				image {
+					width: 126rpx;
+					height: 126rpx;
+					border-radius: 50%;
+					flex-shrink: 0;
+					background-color: #fff;
+				}
+
+				.info-box {
+					// margin-left: 21rpx;
+					// width: 750rpx;
+					.username {
+						padding-top: 10rpx;
+						width: 300rpx;
+						margin: auto;
+						text-align: center;
+						font-size: 34rpx;
+						font-family: PingFang SC;
+						font-weight: bold;
+						color: #54320B;
+					}
+					
+					.phone {
+						padding-top: 10rpx;
+						font-size: 26rpx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #fff;
+						font-size: 20rpx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #54320B;
+					}
+				}
+
+				
+			}
+
+			.infor-right {
+				width: 165rpx;
+				height: 64rpx;
+				background: #FFFFFF;
+				border-radius: 32px 0px 0px 32px;
+				display: flex;
+				align-items: center; // 垂直居中 
+				padding-left: 20rpx;
+
+				image {
+					width: 32rpx;
+					height: 31rpx;
+				}
+
+				.setting {
+					font-size: 28rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #3F7C1F;
+					padding-left: 10rpx;
+				}
+			}
+		}
+
+		// 我的订单
+		.order-box {
+			width: 710rpx;
+			height: 221rpx;
+			background: #FFFFFF;
+			box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(50, 50, 52, 0.06);
+			border-radius: 20rpx;
+			position: absolute;
+			top: 400rpx;
+			// display: flex;
+			// justify-content: center; // 水平居中
+			margin-left: 20rpx;
+			// margin: auto;
+
+			.my-order {
+				height: 73rpx;
+				width: 100%;
+				border-bottom: 2rpx solid #F5F5F5;
+				display: flex;
+				align-items: center;
+				justify-content: flex-start;
+
+				.order {
+					font-size: 30rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #333333;
+					margin-left: 36rpx;
+					margin-right: 520rpx;
+				}
+
+				image {
+					width: 12rpx;
+					height: 22rpx;
+				}
+			}
+
+			.order-section {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+
+				.order-item {
+					flex: 1;
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					justify-content: center;
+					margin-top: 30rpx;
+
+					image {
+						width: 42rpx;
+						height: 42rpx;
+					}
+
+					.text {
+						margin-top: 20rpx;
+						font-size: 24rpx;
+						color: #333333;
+					}
+				}
+			}
+		}
+	}
+	.popup-box {
+		width: 522rpx;
+		height: 605rpx;
+		background-color: #ffffff;
+		border-radius: 20rpx;
+		position: relative;
+		.img {
+			position: relative;
+			top: -56rpx;
+			left: 0;
+			width: 522rpx;
+			height: 132rpx;
+			display: flex;
+			justify-content: center;
+			image {
+				border-radius: 20rpx 20rpx 0 0;
+				width: 450rpx;
+				height: 132rpx;
+			}
+		}
+	
+		.mian {
+			margin-top: -44rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			// padding: 32rpx 32rpx;
+			background-color: #ffffff;
+			border-radius: 0 0 20rpx 20rpx;
+			text-align: center;
+	
+			.delivery {
+				font-size: 40rpx;
+				color: #333333;
+				display: flex;
+				align-items: center;
+				flex-direction: column;
+				.title {
+				}
+				image {
+					margin-top: 48rpx;
+					width: 172rpx;
+					height: 160rpx;
+				}
+			}
+	
+			.nocancel {
+				font-size: 32rpx;
+				color: #333333;
+				margin-top: 14rpx;
+			}
+	
+			.comfirm-box {
+				margin-top: 52rpx;
+				display: flex;
+				// margin-bottom: 32rpx;
+	
+				// justify-content: space-around;
+				.cancel {
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					width: 197rpx;
+					height: 74rpx;
+					border: 1px solid #dcc786;
+					border-radius: 38rpx;
+	
+					font-size: 32rpx;
+					color: #605128;
+				}
+	
+				.comfirm {
+					margin-left: 32rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					width: 197rpx;
+					height: 74rpx;
+					background: linear-gradient(-90deg, #d1ba77 0%, #f7e8ad 100%);
+					border-radius: 38px;
+					font-size: 32rpx;
+					color: #605128;
+				}
+			}
+		}
+	}
 </style>

pages/user/withdrawal.vue

@@ -58,7 +58,7 @@
 								<text v-if="aliData.fullname">真实姓名({{ aliData.fullname }})</text>
 							</view>
 						</view>
-						<view class="right"><radio value="alipay" color="#5dbc7c" :checked="type == 'alipay'" /></view>
+						<view class="right"><radio value="alipay" color="#d8a567" :checked="type == 'alipay'" /></view>
 					</view>
 				</label>
 				<label>
@@ -73,7 +73,7 @@
 								<text v-if="bankData.fullname">真实姓名({{ bankData.fullname }})</text>
 							</view>
 						</view>
-						<view class="right"><radio value="bank" color="#5dbc7c" :checked="type == 'bank'" /></view>
+						<view class="right"><radio value="bank" color="#d8a567" :checked="type == 'bank'" /></view>
 					</view>
 				</label>
 			</radio-group>
@@ -296,7 +296,7 @@ page {
 
 		.buttom {
 			// color: $font-color-spec;
-			color: #5dbc7c;
+			color: #d8a567;
 			font-size: $font-base;
 		}
 	}

uni.scss

@@ -4,7 +4,7 @@ $page-row-spacing: 30rpx;
 $page-color-base: #f8f8f8;//页面背景颜色
 $page-color-light: #f8f6fc;
 // 主题颜色
-$base-color: #5dbc7c;//项目颜色
+$base-color: #d8a567;//项目颜色
 $box-shadow-color:#5dbc7c;//阴影颜色
 $font-color:#5dbc7c;//字体颜色
 $font-color-spec: #5dbc7c;//可操作文字颜色

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.f4fc78fe.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.bece9ffc.js></script><script src=/index/static/js/index.97382fea.js></script></body></html>
+            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.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.21572a26.js></script><script src=/index/static/js/index.2fb7fed8.js></script></body></html>