1-10-1

components/datalist.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="dataList">
-		<view class="list">
+		<view class="list" v-if="data.length > 0">
 			<view class="item" v-for="d in data" @click="navto('/pages/product/product?id=' + d.id + '&is_integral=' + 1)">
 				<view class="img">
 					<image :src="d.image" mode=""></image>

pages.json

@@ -123,14 +123,17 @@
 		{
 			"path": "pages/product/exchange",
 			"style": {
-				"navigationBarBackgroundColor": "transparent",
+				// "navigationBarBackgroundColor": "transparent",
 				"navigationBarTextStyle": "white",
 				"app-plus": {
-					"titleNView": {
-						"type": "float",
-						"titleText": "兑换专区"
-					}
+					"titleNView": false
 				}
+				// "app-plus": {
+				// 	"titleNView": {
+				// 		"type": "float",
+				// 		"titleText": "兑换专区"
+				// 	}
+				// }
 			}
 		},
 		{
@@ -359,7 +362,7 @@
 		{
 			"path": "pages/user/JDcool",
 			"style": {
-				"navigationBarTitleText": "基金池",
+				"navigationBarTitleText": "基金",
 				"app-plus": {
 					"titleNView": false
 				}
@@ -436,7 +439,7 @@
 		{
 			"path": "pages/money/wallet",
 			"style": {
-				"navigationBarTitleText": "红利券",
+				"navigationBarTitleText": "红利",
 				"app-plus": {
 					"titleNView": false
 				}
@@ -529,6 +532,12 @@
 			"style": {
 				"navigationBarTitleText": "商品详情"
 			}
+		},
+		{
+			"path": "pages/cart/cartt",
+			"style": {
+				"navigationBarTitleText": "美容专区"
+			}
 		}
 	],
 	"subPackages": [{
@@ -586,11 +595,17 @@
 				"text": "分类"
 			},
 			{
-				"pagePath": "pages/cart/cart",
-				"iconPath": "static/tabBar/tab-cart.png",
-				"selectedIconPath": "static/tabBar/tab-cart-current.png",
-				"text": "购物车"
+				"pagePath": "pages/cart/cartt",
+				"iconPath": "static/tabBar/tab-mrz.png",
+				"selectedIconPath": "static/tabBar/tab-mrz-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/cart/cartt.vue

@@ -0,0 +1,183 @@
+<template>
+	<view class="content">
+		<empty v-if="loaded && list.length === 0"></empty>
+		<view class="good-wrap">
+			
+			<view class="good" v-for="item in list" @click="gotoDetail(item)">
+				<image :src="item.image" mode="" class="goo-img"></image>
+				<view class="good-tit clamp">
+					{{item.store_name}}
+				</view>
+				<view class="good-price flex">
+					<view class="new-price">
+						¥{{item.price}}
+					</view>
+					<!-- <view class="old-price">
+							¥{{item.}}
+						</view> -->
+				</view>
+			</view>
+		</view>
+		<uni-load-more :status="loadingType"></uni-load-more>
+		<view class="sq" @click="navto('/pages/category/apply')">
+			<image src="../../static/user/u3.png" mode="" class="sq-logo"></image>
+			<view class="sq-tit">
+				申请
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+	import empty from '@/components/empty';
+	
+	import { getProducts } from '@/api/product.js'
+	export default {
+		components: {
+			empty,
+			uniLoadMore
+		},
+		data() {
+			return {
+				page: 1,
+				limit: 10,
+				list: [],
+				loadingType: 'more',
+				loaded: false
+			}
+		},
+		onLoad() {
+			this.getProductList()
+		},
+		onReachBottom() {
+			this.getProductList()
+		},
+		methods: {
+			navto(url) {
+				uni.navigateTo({
+					url: url
+				})
+			},
+			gotoDetail(item) {
+				uni.navigateTo({
+					url: '/pages/product/product?id=' + item.id
+				})
+			},
+			getProductList() {
+				let obj = this
+				if(obj.loadingType == 'loading' || obj.loadingType == 'noMore') {
+					return
+				}
+				obj.loadingType = 'loading'
+				getProducts({
+					page: obj.page,
+					limit: obj.limit,
+					is_gold: 0,
+					is_integral: 0
+				}).then(({data}) => {
+					obj.list = obj.list.concat(data)
+					obj.page++
+					if(data.length == obj.limit) {
+						obj.loadingType = 'more'
+					}else {
+						obj.loadingType = 'noMore'
+					}
+					this.loaded = true
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.good-wrap {
+		display: flex;
+		// padding: 0 0 20rpx 20rpx;
+		padding-left: 20rpx;
+		padding-top: 20rpx;
+		flex-wrap: wrap;
+	}
+	
+	.good {
+		width: 345rpx;
+		height: 480rpx;
+		margin-right: 20rpx;
+		margin-bottom: 20rpx;
+		background: #FFFFFF;
+		box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+		border-radius: 10rpx;
+		position: relative;
+		.xrlb {
+			position: absolute;
+			display: inline-block;
+			padding: 5rpx 10rpx;
+			background-color: #FF4C4C;
+			color: #fff;
+			text-align: center;
+			border-radius: 0 10rpx 10rpx 0;
+			// width: 100rpx;
+			top: 0;
+			left: 0;
+		}
+		.goo-img {
+			width: 345rpx;
+			height: 345rpx;
+			border-radius: 10rpx 10rpx 0 0;
+			// background-color: #bfa;
+		}
+	
+		.good-tit {
+			padding: 15rpx 20rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #333333;
+			line-height: 35rpx;
+		}
+	
+		.good-price {
+			padding-left: 20rpx;
+			justify-content: flex-start;
+	
+			.new-price {
+				font-size: 36rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #FF4C4C;
+			}
+	
+			.old-price {
+				padding-left: 8rpx;
+				font-size: 26rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				text-decoration: line-through;
+				color: #999999;
+	
+			}
+		}
+	}
+	.sq {
+		position: fixed;
+		bottom: 300rpx;
+		right: 20rpx;
+		// background-color: red;
+		border-radius: 50%;
+		box-shadow: 0px 0 10rpx #999;
+		width: 100rpx;
+		height: 100rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		.sq-logo {
+			width: 40rpx;
+			height: 40rpx;
+		}
+		.sq-tit {
+			padding-top: 10rpx;
+			font-size: 22rpx;
+		}
+	}
+</style>

pages/category/fillTable.vue

@@ -2,28 +2,32 @@
 	<view class="content">
 		<view class="item">
 			<view class="item-tit">店铺名称</view>
-			<input type="text" v-model="store.name" placeholder="请输入店铺名称" />
+			<input type="text" v-model="store.name" placeholder="请输入店铺名称" :disabled="type == 'look'"/>
 		</view>
 		<view class="item">
 			<view class="item-tit">店铺logo</view>
 			<view class="up-wrapper">
-				<image :src="store.image" mode="" v-if="store.image" @click.stop="upImg"></image>
-				<image src="../../static/img/add.png" mode="" v-else @click.stop="upImg"></image>
+				<image :src="store.image" mode="" v-if="store.image" @click.stop="type != 'look'?upImg():''"></image>
+				<image src="../../static/img/add.png" mode="" v-else @click.stop="type != 'look'?upImg():''"></image>
 			</view>
 		</view>
 		<view class="item">
 			<view class="item-tit">联系电话</view>
-			<input type="number" v-model="store.phone" placeholder="请输入商家电话" />
+			<input type="number" v-model="store.phone" placeholder="请输入商家电话" v-if="type != 'look'"/>
+			<input type="number" v-model="store.phone" placeholder="请输入商家电话" :disabled="type == 'look'" v-else @click="call(store.phone)"/>
 		</view>
 		<view class="item">
 			<view class="item-tit">营业时间</view>
-			<picker mode="time" :value="bgtime" @change="bindBgtimeChange" class="picker">
-				<view class="uni-input">{{ bgtime }}</view>
-			</picker>
-			<view class="line">至</view>
-			<picker mode="time" :value="edtime" @change="bindEdtimeChange" class="picker prcker-t">
-				<view class="uni-input">{{ edtime }}</view>
-			</picker>
+			<template v-if="type != 'look'">
+				<picker mode="time" :value="bgtime" @change="bindBgtimeChange" class="picker">
+					<view class="uni-input">{{ bgtime }}</view>
+				</picker>
+				<view class="line">至</view>
+				<picker mode="time" :value="edtime" @change="bindEdtimeChange" class="picker prcker-t">
+					<view class="uni-input">{{ edtime }}</view>
+				</picker>
+			</template>
+			<input type="text" v-model="store.day_time" placeholder="" :disabled="type == 'look'" v-if="type == 'look'"/>
 		</view>
 		<view class="item" @click="getLocation" v-if="type == 'add'">
 			<view class="item-tit">经纬度</view>
@@ -31,9 +35,9 @@
 		</view>
 		<view class="item">
 			<view class="item-tit">详细地址</view>
-			<input type="text" v-model="store.detailed_address" placeholder="请输入详细地址" />
+			<input type="text" v-model="store.detailed_address" placeholder="请输入详细地址" :disabled="type == 'look'"/>
 		</view>
-		<view class="item">
+		<view class="item" v-if="type != 'look'">
 			<view class="item-tit">申请等级</view>
 			<input type="text" v-model="chooselevel" placeholder="请选择申请等级" disabled v-if="type=='edit'"/>
 			<template v-if="type == 'add'">
@@ -45,10 +49,17 @@
 		</view>
 		<view class="sub" @click="sub" v-if="type == 'edit'">确认修改</view>
 		<view class="sub" @click="add" v-if="type == 'add'">提交</view>
+		<view class="sub" @click="goto" v-if="type == 'look'">
+			一键导航
+		</view>
 	</view>
 </template>
 
 <script>
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
 	import {
 		myStore,
 		editStore
@@ -77,10 +88,24 @@
 				type: 'edit'
 			};
 		},
+		computed: {
+			...mapState('user',['showStore'])
+		},
 		onLoad(opt) {
 			if (opt.type == 'edit') {
 				this.loadData();
 			}
+			if(opt.type == 'look') {
+				this.type = 'look'
+				uni.setNavigationBarTitle({
+					title: '美容院详情'
+				})
+				this.store = uni.getStorageSync('showStore')
+				let arr = this.store.day_time.split('- ')
+				console.log(arr,'arr')
+				this.bgtime = arr[0]
+				this.edtime = arr[1]
+			}
 			if (opt.type == 'add') {
 				this.type = 'add';
 				this.bgtime = '00:00';
@@ -88,6 +113,18 @@
 			}
 		},
 		methods: {
+			goto() {
+				let latitude = this.store.latitude
+				let longitude = this.store.longitude
+				let address = this.store.name
+				window.location.href =
+					`http://apis.map.qq.com/uri/v1/marker?marker=coord:${latitude},${longitude};addr:${address}`;
+			},
+			call(phone) {
+				uni.makePhoneCall({
+					phoneNumber:phone
+				})
+			},
 			bindLevelChange(e) {
 				console.log(e)
 				this.chooselevel = this.levelList[e.detail.value];

pages/index/cpzq.vue

@@ -10,12 +10,12 @@
 					公司简介
 				</view>
 			</view>
-			<view class="right" @click="navto('/pages/index/artList?cid=1')">
+			<!-- <view class="right" @click="navto('/pages/index/artList?cid=1')">
 				<view class="jj-more-tit">
 					更多
 				</view>
 				<image src="../../static/img/img39.png" mode="" class="jj-more"></image>
-			</view>
+			</view> -->
 		</view>
 		<view class="jj-wrap" v-if="gsjjList.length > 0">
 			<view class="jj" v-for="gs in gsjjList" @click="navto('/pages/index/artDetail?id=' + gs.id)">
@@ -31,21 +31,26 @@
 			</view>
 		</view>
 		<!-- 产品简介 -->
-		<view class="jj-tit" style="margin-top: 20rpx;" v-if="cpjjList.length > 0">
+		<view class="jj-tit" style="margin-top: 20rpx;">
 			<view class="left">
 				<image src="../../static/icon/cpjj.png" mode="" class="jj-log"></image>
 				<view class="jj-title">
-					产品简介
+					商城简介
 				</view>
 			</view>
-			<view class="right" @click="navto('/pages/index/artList?cid=2')">
+			<!-- <view class="right" @click="navto('/pages/index/artList?cid=2')">
 				<view class="jj-more-tit">
 					更多
 				</view>
 				<image src="../../static/img/img39.png" mode="" class="jj-more"></image>
+			</view> -->
+		</view>
+		<view class="scjj" style="padding: 20rpx;background-color: #fff;">
+			<view class="" v-html="content">
+				
 			</view>
 		</view>
-		<view class="jj-wrap" v-if="cpjjList.length > 0">
+		<!-- <view class="jj-wrap" v-if="cpjjList.length > 0">
 			<view class="jj" v-for="cp in cpjjList" @click="navto('/pages/index/artDetail?id=' + cp.id)">
 				<image :src="cp.image_input[0]" mode="" class="jj-img"></image>
 				<view class="jj-info">
@@ -57,20 +62,22 @@
 					</view>
 				</view>
 			</view>
-		</view>
+		</view> -->
 	</view>
 </template>
 
 <script>
 	import {
 		loadIndexs,
-		getArticleList
+		getArticleList,
+		getArtDetai
 	} from '@/api/index.js';
 	export default {
 		data() {
 			return {
 				cpjjList: [],
-				gsjjList: []
+				gsjjList: [],
+				content: ''
 			}
 		},
 		onShow() {
@@ -84,13 +91,14 @@
 				})
 			},
 			getArticleList() {
-				getArticleList({
-					pages: 1,
-					limit: 3
-				},2).then(({data}) => {
-					console.log(data)
-					this.cpjjList = data
-				})
+				// getArticleList({
+				// 	pages: 1,
+				// 	limit: 3
+				// },2).then(({data}) => {
+				// 	console.log(data)
+				// 	this.cpjjList = data
+				// })
+				let obj = this
 				getArticleList({
 					pages: 1,
 					limit: 3
@@ -98,6 +106,13 @@
 					console.log(data)
 					this.gsjjList = data
 				})
+				getArtDetai({},6).then(res => {
+					console.log(res)
+					obj.content = res.data.content
+					if(obj.content != null){
+						obj.content = obj.content.replace(/<img/g,"<img style='max-width:100%;height:auto;min-width:100%;'");
+					}//小程序商品详情图超出屏幕问题
+				})
 			},
 		}
 	}

pages/index/index.vue

@@ -57,7 +57,7 @@
 			<navigator url="/pages/index/cpzq">
 				<view class="cate-item">
 					<image src="../../static/icon/cpzq.png"></image>
-					<text>产品专区</text>
+					<text>公司简介</text>
 				</view>
 			</navigator>
 		</view>

pages/money/wallet.vue

@@ -3,7 +3,7 @@
 		<view class="content-money">
 			<view class="money-box">
 				<view class="goback-box" @click="toBack"><image class="goback" src="../../static/img/fanhui.png" mode=""></image></view>
-				<view class="header">红利券</view>
+				<view class="header">红利</view>
 				<image class="money_bg" src="../../static/img/anchor12.png"></image>
 				<view class="money">{{ userInfo.brokerage_price | getMoneyStyle }}</view>
 			</view>

pages/order/createOrder.vue

@@ -71,7 +71,7 @@
 				<text class="cell-tip">￥{{ payAllMoney }}</text>
 			</view>
 			<view class="yt-list-cell b-b"  v-if="checkedPoints && integralShow">
-				<text class="cell-tit clamp">积分抵扣</text>
+				<text class="cell-tit clamp">金券抵扣</text>
 				<text class="cell-tip">-￥{{ integralMoney }}</text>
 			</view>
 			<view class="yt-list-cell b-b" v-if="moneyAll.vipPrice > 0">

pages/order/evaluate.vue

@@ -1,405 +1,405 @@
-<template>
-	<view class="content">
-		<view class="order-item">
-			<view class="goods-box-single">
-				<image class="goods-img" :src="productInfo.image" mode="aspectFill"></image>
-				<view class="right position-relative">
-					<view class="flex">
-						<text class="title">{{ productInfo.store_name }}</text>
-						<view class="title-right">
-							<view class="price">{{ productInfo.price }}</view>
-							<view class="attr-box">x{{ list.cart_num }}</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view>
-				<view class="flex_item zhil">
-					<view>商品质量</view>
-					<view><uniRate text="1" size="20" margin="10" :value="rateValue1" @change="rateChange1"></uniRate></view>
-				</view>
-				<view class="flex_item zhil">
-					<view>服务态度</view>
-					<view><uniRate text="1" size="20" margin="10" :value="rateValue2" @change="rateChange2"></uniRate></view>
-				</view>
-				<view class="equity_box">
-					<view class="text-box uni-textarea">
-						<textarea placeholder-style="color:#999" :placeholder="placeholder" @blur="bindTextAreaBlur"></textarea>
-					</view>
-					<view class="">
-						<view class="add-img-box flex_item">
-							<view class="add-img-item" v-for="(item, index) in imgList" :key="index">
-								<image class="add-img" @click.stop="imgInfo(index)" :src="item.url" mode="aspectFill"></image>
-								<image class="add-img-del" @click.stop="delImg(index)" src="/static/img/delete.png"></image>
-							</view>
-							<view v-if="imgList.length < 9" class="add-img-item" @click.stop="scImg()">
-								<image class="add-img" src="/static/img/add.png"></image>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view @click.stop="submit" class="address-box submit-box"><text class="submit-btn">提交评论</text></view>
-	</view>
-</template>
-
-<script>
-import { product, upload, order_comment } from '@/api/order.js';
-import uniRate from '@/components/uni-rate/uni-rate.vue';
-export default {
-	components: {
-		uniRate
-	},
-	data() {
-		return {
-			list: '', //订单详情
-			productInfo: '',
-			text: '', //评论内容
-			placeholder: '商品满足你的期待么？说说你的想法，分享给想买的他们吧~',
-			imgList: [],
-			unique: '', //商品唯一标识码
-			cloudimgList: [],
-			rateValue1: '', //商品质量
-			rateValue2: '', //服务态度
-			imgCount: 6 //最多支持9张上传，可以修改
-		};
-	},
-	onLoad(option) {
-		this.unique = option.unique;
-		this.loadOrder();
-	},
-	onShow() {},
-	methods: {
-		//text
-		bindTextAreaBlur: function(e) {
-			this.text = e.detail.value;
-		},
-		//获取收入支出信息
-		async loadOrder() {
-			product({
-				unique: this.unique
-			}).then(e => {
-				this.list = e.data;
-				this.productInfo = e.data.productInfo;
-			});
-		},
-		//商品质量评分
-		rateChange1(val) {
-			this.rateValue1 = val.value;
-		},
-		//服务态度评分
-		rateChange2(val) {
-			this.rateValue2 = val.value;
-		},
-		//单张上传图片
-		scImg() {
-			let obj = this;
-			console.log(obj.imgCount, 11);
-			if (obj.imgCount == 0) {
-				uni.showToast({
-					title: '最多添加6张图片',
-					icon: 'none'
-				});
-				return;
-			}
-			upload({
-				file: ''
-			})
-				.then(e => {
-					console.log(e,'e')
-					obj.imgList = [...obj.imgList, ...e];
-					console.log(obj.imgList,'imgList')
-					obj.imgCount = 10 - obj.imgList.length;
-					console.log(obj.imgCount ,'imgCount ')
-				})
-				.catch(e => {});
-		},
-		//提交评论
-		submit(e) {
-			let obj = this;
-			if (obj.imgList.length < 1) {
-				uni.showToast({
-					title: '请添加图片',
-					icon: 'none'
-				});
-				return;
-			}
-			for (let i = 0; i < obj.imgList.length; i++) {
-				obj.cloudimgList.push(obj.imgList[i].url);
-			}
-			let arr = obj.cloudimgList.join(',');
-			order_comment({
-				pics: arr,
-				comment: obj.text,
-				product_score: obj.rateValue1,
-				service_score: obj.rateValue2,
-				unique: obj.unique,
-				
-			})
-				.then(e => {
-					uni.navigateTo({
-						url: '/pages/order/order?state=4'
-					});
-				})
-				.catch(e => {
-					uni.navigateTo({
-						url: '/pages/order/order?state=4'
-					});
-				});
-		},
-		//点击图片显示大图
-		imgInfo(i) {
-			let tempList = [];
-			console.log(111);
-			this.imgList.forEach(e => {
-				tempList.push(e.url);
-			});
-			console.log(tempList);
-			//显示图片
-			uni.previewImage({
-				current: i,
-				loop: false,
-				urls: tempList,
-				indicator: 'default'
-			});
-		},
-		//删除图片
-		delImg(i) {
-			uni.showModal({
-				content: '确定删除这张吗',
-				success: res => {
-					if (res.confirm) {
-						this.imgList.splice(i, 1);
-						this.imgCount++;
-					} else if (res.cancel) {
-					}
-				}
-			});
-		},
-		// 页面跳转
-		navto(e) {
-			uni.navigateTo({
-				url: e
-			});
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page {
-	background: #ffffff;
-	height: 100%;
-	.content {
-		background: #ffffff;
-		height: 100%;
-	}
-}
-/* 多条商品 */
-.order-item {
-	display: flex;
-	flex-direction: column;
-	padding: 0rpx 30rpx;
-	background: #fff;
-	margin-top: 20rpx;
-	/* 单条商品 */
-	.goods-box-single {
-		display: flex;
-		padding: 20rpx 0;
-		.goods-img {
-			display: block;
-			width: 120rpx;
-			height: 120rpx;
-		}
-		.right {
-			flex: 1;
-			display: flex;
-			flex-direction: column;
-			padding: 0 30rpx 0 24rpx;
-			overflow: hidden;
-			height: 100%;
-			.title {
-				align-self: flex-start;
-				font-size: $font-base + 2rpx;
-				color: $font-color-dark;
-				height: 80rpx;
-				overflow:hidden; 
-				text-overflow:ellipsis;
-				display:-webkit-box; 
-				-webkit-box-orient:vertical;
-				-webkit-line-clamp:2; 
-			}
-			.title-right {
-				flex-shrink: 0;
-				text-align: right;
-				align-self: flex-start;
-			}
-			.attr-box {
-				font-size: $font-sm + 2rpx;
-				color: $font-color-light;
-			}
-			.price {
-				font-size: $font-base + 2rpx;
-				color: $font-color-dark;
-				&:before {
-					content: '￥';
-					font-size: $font-sm;
-					margin: 0 2rpx 0 8rpx;
-				}
-			}
-		}
-	}
-}
-.equity_box {
-	background-color: #fafafa;
-	border-radius: 10rpx;
-	padding: 25rpx 25rpx;
-	margin: 25rpx 0rpx;
-	.text-box {
-		height: 200rpx;
-		textarea {
-			font-size: 25rpx;
-			width: 100%;
-			height: 100%;
-			overflow: hidden;
-			text-overflow: ellipsis;
-			display: -webkit-box;
-			-webkit-box-orient: vertical;
-			-webkit-line-clamp: 5;
-		}
-	}
-}
-.zhil {
-	font-size: 28rpx !important;
-	padding: 15rpx 15rpx;
-}
-.submit-box {
-	bottom: 0;
-	left: 0;
-	width: 750rpx;
-}
-.submit-btn {
-	margin-top: 10px;
-	display: inline-block;
-	width: 670rpx;
-	height: 96rpx;
-	line-height: 96rpx;
-	text-align: center;
-	background-color: #1BCC26 !important;
-	opacity: 1;
-	border-radius: 32rpx;
-	border-width: 8rpx;
-	border-color: rgba(255, 255, 255, 1);
-	box-shadow: 0rpx 8rpx 12rpx rgba(0, 0, 0, 0.16);
-	border-radius: 56rpx;
-	font-size: 39rpx;
-	font-weight: bold;
-	color: rgba(255, 255, 255, 1);
-}
-.submit-btn-txt {
-	font-size: 39rpx;
-	font-weight: bold;
-	line-height: 47rpx;
-	color: rgba(255, 255, 255, 1);
-	opacity: 1;
-}
-.map-box {
-	width: 484rpx;
-	height: 256rpx;
-	border-width: 4rpx;
-	border-color: rgba(255, 255, 255, 1);
-	box-shadow: 0rpx 0rpx 24rpx rgba(0, 0, 0, 0.16);
-	/* border-radius: 12rpx; */
-	position: relative;
-}
-.map {
-	position: absolute;
-	top: 0;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	width: 476rpx;
-	height: 250rpx;
-}
-.map-img {
-	position: absolute;
-	top: 90rpx;
-	left: 156rpx;
-	width: 230rpx;
-	height: 68rpx;
-	background-color: rgba(51, 51, 51, 0.64);
-	border-width: 1rpx;
-	border-color: rgba(0, 0, 0, 0);
-	border-radius: 34px;
-
-	font-size: 28rpx;
-	font-weight: bold;
-	line-height: 66rpx;
-	color: rgba(255, 255, 255, 1);
-	text-align: center;
-}
-.address-box {
-	padding: 15rpx 40rpx;
-	margin-bottom: 10px;
-}
-.label {
-	font-size: 36rpx;
-	font-weight: bold;
-	line-height: 50rpx;
-	color: #222222;
-}
-.label-img {
-	padding-left: 40rpx;
-}
-
-.add-img-box {
-	width: 100%;
-	flex-direction: row;
-	flex-wrap: wrap;
-	margin-top: 50rpx;
-}
-.add-img-item {
-	width: 180rpx;
-	height: 180rpx;
-	border-radius: 24rpx;
-	position: relative;
-	margin: 0rpx 20rpx;
-	margin-bottom: 25rpx;
-	.add-img {
-		width: 100%;
-		height: 100%;
-		border-radius: 24rpx;
-	}
-}
-.add-img-camera {
-	flex: 1;
-}
-.add-img-del {
-	position: absolute;
-	width: 40rpx;
-	height: 40rpx;
-	left: 155rpx;
-	bottom: 155rpx;
-	//background-color: rgba(238, 0, 0, 1);
-	border-radius: 20rpx;
-}
-.address-time {
-	width: 484rpx;
-	height: 88rpx;
-	background-color: rgba(245, 245, 245, 1);
-	opacity: 1;
-	border-radius: 24rpx;
-	text-align: center;
-
-	font-size: 35rpx;
-	font-weight: 500;
-	color: rgba(51, 51, 51, 1);
-}
-.line {
-	width: 750rpx;
-	height: 1px;
-	transform: scaleY(0.3);
-	background-color: rgba(0, 0, 0, 0.5);
-}
+<template>
+	<view class="content">
+		<view class="order-item">
+			<view class="goods-box-single">
+				<image class="goods-img" :src="productInfo.image" mode="aspectFill"></image>
+				<view class="right position-relative">
+					<view class="flex">
+						<text class="title">{{ productInfo.store_name }}</text>
+						<view class="title-right">
+							<view class="price">{{ productInfo.price }}</view>
+							<view class="attr-box">x{{ list.cart_num }}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view>
+				<view class="flex_item zhil">
+					<view>商品质量</view>
+					<view><uniRate text="1" size="20" margin="10" :value="rateValue1" @change="rateChange1"></uniRate></view>
+				</view>
+				<view class="flex_item zhil">
+					<view>服务态度</view>
+					<view><uniRate text="1" size="20" margin="10" :value="rateValue2" @change="rateChange2"></uniRate></view>
+				</view>
+				<view class="equity_box">
+					<view class="text-box uni-textarea">
+						<textarea placeholder-style="color:#999" :placeholder="placeholder" @blur="bindTextAreaBlur"></textarea>
+					</view>
+					<view class="">
+						<view class="add-img-box flex_item">
+							<view class="add-img-item" v-for="(item, index) in imgList" :key="index">
+								<image class="add-img" @click.stop="imgInfo(index)" :src="item.url" mode="aspectFill"></image>
+								<image class="add-img-del" @click.stop="delImg(index)" src="/static/img/delete.png"></image>
+							</view>
+							<view v-if="imgList.length < 9" class="add-img-item" @click.stop="scImg()">
+								<image class="add-img" src="/static/img/add.png"></image>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view @click.stop="submit" class="address-box submit-box"><text class="submit-btn">提交评论</text></view>
+	</view>
+</template>
+
+<script>
+import { product, upload, order_comment } from '@/api/order.js';
+import uniRate from '@/components/uni-rate/uni-rate.vue';
+export default {
+	components: {
+		uniRate
+	},
+	data() {
+		return {
+			list: '', //订单详情
+			productInfo: '',
+			text: '', //评论内容
+			placeholder: '商品满足你的期待么？说说你的想法，分享给想买的他们吧~',
+			imgList: [],
+			unique: '', //商品唯一标识码
+			cloudimgList: [],
+			rateValue1: '', //商品质量
+			rateValue2: '', //服务态度
+			imgCount: 6 //最多支持9张上传，可以修改
+		};
+	},
+	onLoad(option) {
+		this.unique = option.unique;
+		this.loadOrder();
+	},
+	onShow() {},
+	methods: {
+		//text
+		bindTextAreaBlur: function(e) {
+			this.text = e.detail.value;
+		},
+		//获取收入支出信息
+		async loadOrder() {
+			product({
+				unique: this.unique
+			}).then(e => {
+				this.list = e.data;
+				this.productInfo = e.data.productInfo;
+			});
+		},
+		//商品质量评分
+		rateChange1(val) {
+			this.rateValue1 = val.value;
+		},
+		//服务态度评分
+		rateChange2(val) {
+			this.rateValue2 = val.value;
+		},
+		//单张上传图片
+		scImg() {
+			let obj = this;
+			console.log(obj.imgCount, 11);
+			if (obj.imgCount == 0) {
+				uni.showToast({
+					title: '最多添加6张图片',
+					icon: 'none'
+				});
+				return;
+			}
+			upload({
+				file: ''
+			})
+				.then(e => {
+					console.log(e,'e')
+					obj.imgList = [...obj.imgList, ...e];
+					console.log(obj.imgList,'imgList')
+					obj.imgCount = 10 - obj.imgList.length;
+					console.log(obj.imgCount ,'imgCount ')
+				})
+				.catch(e => {});
+		},
+		//提交评论
+		submit(e) {
+			let obj = this;
+			if (obj.imgList.length < 1) {
+				uni.showToast({
+					title: '请添加图片',
+					icon: 'none'
+				});
+				return;
+			}
+			for (let i = 0; i < obj.imgList.length; i++) {
+				obj.cloudimgList.push(obj.imgList[i].url);
+			}
+			let arr = obj.cloudimgList.join(',');
+			order_comment({
+				pics: arr,
+				comment: obj.text,
+				product_score: obj.rateValue1,
+				service_score: obj.rateValue2,
+				unique: obj.unique,
+				
+			})
+				.then(e => {
+					uni.navigateTo({
+						url: '/pages/order/order?state=4'
+					});
+				})
+				.catch(e => {
+					uni.navigateTo({
+						url: '/pages/order/order?state=4'
+					});
+				});
+		},
+		//点击图片显示大图
+		imgInfo(i) {
+			let tempList = [];
+			console.log(111);
+			this.imgList.forEach(e => {
+				tempList.push(e.url);
+			});
+			console.log(tempList);
+			//显示图片
+			uni.previewImage({
+				current: i,
+				loop: false,
+				urls: tempList,
+				indicator: 'default'
+			});
+		},
+		//删除图片
+		delImg(i) {
+			uni.showModal({
+				content: '确定删除这张吗',
+				success: res => {
+					if (res.confirm) {
+						this.imgList.splice(i, 1);
+						this.imgCount++;
+					} else if (res.cancel) {
+					}
+				}
+			});
+		},
+		// 页面跳转
+		navto(e) {
+			uni.navigateTo({
+				url: e
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background: #ffffff;
+	height: 100%;
+	.content {
+		background: #ffffff;
+		height: 100%;
+	}
+}
+/* 多条商品 */
+.order-item {
+	display: flex;
+	flex-direction: column;
+	padding: 0rpx 30rpx;
+	background: #fff;
+	margin-top: 20rpx;
+	/* 单条商品 */
+	.goods-box-single {
+		display: flex;
+		padding: 20rpx 0;
+		.goods-img {
+			display: block;
+			width: 120rpx;
+			height: 120rpx;
+		}
+		.right {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			padding: 0 30rpx 0 24rpx;
+			overflow: hidden;
+			height: 100%;
+			.title {
+				align-self: flex-start;
+				font-size: $font-base + 2rpx;
+				color: $font-color-dark;
+				height: 80rpx;
+				overflow:hidden; 
+				text-overflow:ellipsis;
+				display:-webkit-box; 
+				-webkit-box-orient:vertical;
+				-webkit-line-clamp:2; 
+			}
+			.title-right {
+				flex-shrink: 0;
+				text-align: right;
+				align-self: flex-start;
+			}
+			.attr-box {
+				font-size: $font-sm + 2rpx;
+				color: $font-color-light;
+			}
+			.price {
+				font-size: $font-base + 2rpx;
+				color: $font-color-dark;
+				&:before {
+					content: '￥';
+					font-size: $font-sm;
+					margin: 0 2rpx 0 8rpx;
+				}
+			}
+		}
+	}
+}
+.equity_box {
+	background-color: #fafafa;
+	border-radius: 10rpx;
+	padding: 25rpx 25rpx;
+	margin: 25rpx 0rpx;
+	.text-box {
+		height: 200rpx;
+		textarea {
+			font-size: 25rpx;
+			width: 100%;
+			height: 100%;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			display: -webkit-box;
+			-webkit-box-orient: vertical;
+			-webkit-line-clamp: 5;
+		}
+	}
+}
+.zhil {
+	font-size: 28rpx !important;
+	padding: 15rpx 15rpx;
+}
+.submit-box {
+	bottom: 0;
+	left: 0;
+	width: 750rpx;
+}
+.submit-btn {
+	margin-top: 10px;
+	display: inline-block;
+	width: 670rpx;
+	height: 96rpx;
+	line-height: 96rpx;
+	text-align: center;
+	background-color: #1BCC26 !important;
+	opacity: 1;
+	border-radius: 32rpx;
+	border-width: 8rpx;
+	border-color: rgba(255, 255, 255, 1);
+	box-shadow: 0rpx 8rpx 12rpx rgba(0, 0, 0, 0.16);
+	border-radius: 56rpx;
+	font-size: 39rpx;
+	font-weight: bold;
+	color: rgba(255, 255, 255, 1);
+}
+.submit-btn-txt {
+	font-size: 39rpx;
+	font-weight: bold;
+	line-height: 47rpx;
+	color: rgba(255, 255, 255, 1);
+	opacity: 1;
+}
+.map-box {
+	width: 484rpx;
+	height: 256rpx;
+	border-width: 4rpx;
+	border-color: rgba(255, 255, 255, 1);
+	box-shadow: 0rpx 0rpx 24rpx rgba(0, 0, 0, 0.16);
+	/* border-radius: 12rpx; */
+	position: relative;
+}
+.map {
+	position: absolute;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	width: 476rpx;
+	height: 250rpx;
+}
+.map-img {
+	position: absolute;
+	top: 90rpx;
+	left: 156rpx;
+	width: 230rpx;
+	height: 68rpx;
+	background-color: rgba(51, 51, 51, 0.64);
+	border-width: 1rpx;
+	border-color: rgba(0, 0, 0, 0);
+	border-radius: 34px;
+
+	font-size: 28rpx;
+	font-weight: bold;
+	line-height: 66rpx;
+	color: rgba(255, 255, 255, 1);
+	text-align: center;
+}
+.address-box {
+	padding: 15rpx 40rpx;
+	margin-bottom: 10px;
+}
+.label {
+	font-size: 36rpx;
+	font-weight: bold;
+	line-height: 50rpx;
+	color: #222222;
+}
+.label-img {
+	padding-left: 40rpx;
+}
+
+.add-img-box {
+	width: 100%;
+	flex-direction: row;
+	flex-wrap: wrap;
+	margin-top: 50rpx;
+}
+.add-img-item {
+	width: 180rpx;
+	height: 180rpx;
+	border-radius: 24rpx;
+	position: relative;
+	margin: 0rpx 20rpx;
+	margin-bottom: 25rpx;
+	.add-img {
+		width: 100%;
+		height: 100%;
+		border-radius: 24rpx;
+	}
+}
+.add-img-camera {
+	flex: 1;
+}
+.add-img-del {
+	position: absolute;
+	width: 40rpx;
+	height: 40rpx;
+	left: 155rpx;
+	bottom: 155rpx;
+	//background-color: rgba(238, 0, 0, 1);
+	border-radius: 20rpx;
+}
+.address-time {
+	width: 484rpx;
+	height: 88rpx;
+	background-color: rgba(245, 245, 245, 1);
+	opacity: 1;
+	border-radius: 24rpx;
+	text-align: center;
+
+	font-size: 35rpx;
+	font-weight: 500;
+	color: rgba(51, 51, 51, 1);
+}
+.line {
+	width: 750rpx;
+	height: 1px;
+	transform: scaleY(0.3);
+	background-color: rgba(0, 0, 0, 0.5);
+}
 </style>

pages/product/common/productBottom.vue

@@ -5,7 +5,7 @@
 			<text>收藏</text>
 		</view>
 		<view class="action-btn-group">
-			<button type="primary" class=" action-btn no-border add-cart-btn" @click="buy(2)">加入购物车</button>
+			<!-- <button type="primary" class=" action-btn no-border add-cart-btn" @click="buy(2)">加入购物车</button> -->
 			<button type="primary" class=" action-btn no-border buy-now-btn" @click="buy(1)">立即购买</button>
 		</view>
 	</view>
@@ -124,7 +124,7 @@ export default {
 			display: flex;
 			align-items: center;
 			justify-content: center;
-			width: 375rpx;
+			width: 750rpx;
 			height: 100%;
 			font-size: $font-base;
 			padding: 0;

pages/product/common/productContent.vue

@@ -8,6 +8,9 @@
 			</view>
 			<view class="" v-if="isgold == 1" style="color: #ffac60;">
 				可获金豆{{goodsObjact.price}}
+			</view>
+			<view class="" v-if="goodsObjact.is_integral == 1" style="color: #ffac60;">
+				最多可抵扣{{goodsObjact.max_integral}}
 			</view>
 		</view>
 		<text class="title clamp2">{{ goodsObjact.store_name }}</text>

pages/product/evaluate.vue

@@ -0,0 +1,405 @@
+<template>
+	<view class="content">
+		<view class="order-item">
+			<view class="goods-box-single">
+				<image class="goods-img" :src="productInfo.image" mode="aspectFill"></image>
+				<view class="right position-relative">
+					<view class="flex">
+						<text class="title">{{ productInfo.store_name }}</text>
+						<view class="title-right">
+							<view class="price">{{ productInfo.price }}</view>
+							<view class="attr-box">x{{ list.cart_num }}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view>
+				<view class="flex_item zhil">
+					<view>商品质量</view>
+					<view><uniRate text="1" size="20" margin="10" :value="rateValue1" @change="rateChange1"></uniRate></view>
+				</view>
+				<view class="flex_item zhil">
+					<view>服务态度</view>
+					<view><uniRate text="1" size="20" margin="10" :value="rateValue2" @change="rateChange2"></uniRate></view>
+				</view>
+				<view class="equity_box">
+					<view class="text-box uni-textarea">
+						<textarea placeholder-style="color:#999" :placeholder="placeholder" @blur="bindTextAreaBlur"></textarea>
+					</view>
+					<view class="">
+						<view class="add-img-box flex_item">
+							<view class="add-img-item" v-for="(item, index) in imgList" :key="index">
+								<image class="add-img" @click.stop="imgInfo(index)" :src="item.url" mode="aspectFill"></image>
+								<image class="add-img-del" @click.stop="delImg(index)" src="/static/img/delete.png"></image>
+							</view>
+							<view v-if="imgList.length < 9" class="add-img-item" @click.stop="scImg()">
+								<image class="add-img" src="/static/img/add.png"></image>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view @click.stop="submit" class="address-box submit-box"><text class="submit-btn">提交评论</text></view>
+	</view>
+</template>
+
+<script>
+import { product, upload, order_comment } from '@/api/order.js';
+import uniRate from '@/components/uni-rate/uni-rate.vue';
+export default {
+	components: {
+		uniRate
+	},
+	data() {
+		return {
+			list: '', //订单详情
+			productInfo: '',
+			text: '', //评论内容
+			placeholder: '商品满足你的期待么？说说你的想法，分享给想买的他们吧~',
+			imgList: [],
+			unique: '', //商品唯一标识码
+			cloudimgList: [],
+			rateValue1: '', //商品质量
+			rateValue2: '', //服务态度
+			imgCount: 6 //最多支持9张上传，可以修改
+		};
+	},
+	onLoad(option) {
+		this.unique = option.unique;
+		this.loadOrder();
+	},
+	onShow() {},
+	methods: {
+		//text
+		bindTextAreaBlur: function(e) {
+			this.text = e.detail.value;
+		},
+		//获取收入支出信息
+		async loadOrder() {
+			product({
+				unique: this.unique
+			}).then(e => {
+				this.list = e.data;
+				this.productInfo = e.data.productInfo;
+			});
+		},
+		//商品质量评分
+		rateChange1(val) {
+			this.rateValue1 = val.value;
+		},
+		//服务态度评分
+		rateChange2(val) {
+			this.rateValue2 = val.value;
+		},
+		//单张上传图片
+		scImg() {
+			let obj = this;
+			console.log(obj.imgCount, 11);
+			if (obj.imgCount == 0) {
+				uni.showToast({
+					title: '最多添加6张图片',
+					icon: 'none'
+				});
+				return;
+			}
+			upload({
+				file: ''
+			})
+				.then(e => {
+					console.log(e,'e')
+					obj.imgList = [...obj.imgList, ...e];
+					console.log(obj.imgList,'imgList')
+					obj.imgCount = 10 - obj.imgList.length;
+					console.log(obj.imgCount ,'imgCount ')
+				})
+				.catch(e => {});
+		},
+		//提交评论
+		submit(e) {
+			let obj = this;
+			if (obj.imgList.length < 1) {
+				uni.showToast({
+					title: '请添加图片',
+					icon: 'none'
+				});
+				return;
+			}
+			for (let i = 0; i < obj.imgList.length; i++) {
+				obj.cloudimgList.push(obj.imgList[i].url);
+			}
+			let arr = obj.cloudimgList.join(',');
+			order_comment({
+				pics: arr,
+				comment: obj.text,
+				product_score: obj.rateValue1,
+				service_score: obj.rateValue2,
+				unique: obj.unique,
+				
+			})
+				.then(e => {
+					uni.navigateTo({
+						url: '/pages/order/order?state=4'
+					});
+				})
+				.catch(e => {
+					uni.navigateTo({
+						url: '/pages/order/order?state=4'
+					});
+				});
+		},
+		//点击图片显示大图
+		imgInfo(i) {
+			let tempList = [];
+			console.log(111);
+			this.imgList.forEach(e => {
+				tempList.push(e.url);
+			});
+			console.log(tempList);
+			//显示图片
+			uni.previewImage({
+				current: i,
+				loop: false,
+				urls: tempList,
+				indicator: 'default'
+			});
+		},
+		//删除图片
+		delImg(i) {
+			uni.showModal({
+				content: '确定删除这张吗',
+				success: res => {
+					if (res.confirm) {
+						this.imgList.splice(i, 1);
+						this.imgCount++;
+					} else if (res.cancel) {
+					}
+				}
+			});
+		},
+		// 页面跳转
+		navto(e) {
+			uni.navigateTo({
+				url: e
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background: #ffffff;
+	height: 100%;
+	.content {
+		background: #ffffff;
+		height: 100%;
+	}
+}
+/* 多条商品 */
+.order-item {
+	display: flex;
+	flex-direction: column;
+	padding: 0rpx 30rpx;
+	background: #fff;
+	margin-top: 20rpx;
+	/* 单条商品 */
+	.goods-box-single {
+		display: flex;
+		padding: 20rpx 0;
+		.goods-img {
+			display: block;
+			width: 120rpx;
+			height: 120rpx;
+		}
+		.right {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			padding: 0 30rpx 0 24rpx;
+			overflow: hidden;
+			height: 100%;
+			.title {
+				align-self: flex-start;
+				font-size: $font-base + 2rpx;
+				color: $font-color-dark;
+				height: 80rpx;
+				overflow:hidden; 
+				text-overflow:ellipsis;
+				display:-webkit-box; 
+				-webkit-box-orient:vertical;
+				-webkit-line-clamp:2; 
+			}
+			.title-right {
+				flex-shrink: 0;
+				text-align: right;
+				align-self: flex-start;
+			}
+			.attr-box {
+				font-size: $font-sm + 2rpx;
+				color: $font-color-light;
+			}
+			.price {
+				font-size: $font-base + 2rpx;
+				color: $font-color-dark;
+				&:before {
+					content: '￥';
+					font-size: $font-sm;
+					margin: 0 2rpx 0 8rpx;
+				}
+			}
+		}
+	}
+}
+.equity_box {
+	background-color: #fafafa;
+	border-radius: 10rpx;
+	padding: 25rpx 25rpx;
+	margin: 25rpx 0rpx;
+	.text-box {
+		height: 200rpx;
+		textarea {
+			font-size: 25rpx;
+			width: 100%;
+			height: 100%;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			display: -webkit-box;
+			-webkit-box-orient: vertical;
+			-webkit-line-clamp: 5;
+		}
+	}
+}
+.zhil {
+	font-size: 28rpx !important;
+	padding: 15rpx 15rpx;
+}
+.submit-box {
+	bottom: 0;
+	left: 0;
+	width: 750rpx;
+}
+.submit-btn {
+	margin-top: 10px;
+	display: inline-block;
+	width: 670rpx;
+	height: 96rpx;
+	line-height: 96rpx;
+	text-align: center;
+	background-color: #1BCC26 !important;
+	opacity: 1;
+	border-radius: 32rpx;
+	border-width: 8rpx;
+	border-color: rgba(255, 255, 255, 1);
+	box-shadow: 0rpx 8rpx 12rpx rgba(0, 0, 0, 0.16);
+	border-radius: 56rpx;
+	font-size: 39rpx;
+	font-weight: bold;
+	color: rgba(255, 255, 255, 1);
+}
+.submit-btn-txt {
+	font-size: 39rpx;
+	font-weight: bold;
+	line-height: 47rpx;
+	color: rgba(255, 255, 255, 1);
+	opacity: 1;
+}
+.map-box {
+	width: 484rpx;
+	height: 256rpx;
+	border-width: 4rpx;
+	border-color: rgba(255, 255, 255, 1);
+	box-shadow: 0rpx 0rpx 24rpx rgba(0, 0, 0, 0.16);
+	/* border-radius: 12rpx; */
+	position: relative;
+}
+.map {
+	position: absolute;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	width: 476rpx;
+	height: 250rpx;
+}
+.map-img {
+	position: absolute;
+	top: 90rpx;
+	left: 156rpx;
+	width: 230rpx;
+	height: 68rpx;
+	background-color: rgba(51, 51, 51, 0.64);
+	border-width: 1rpx;
+	border-color: rgba(0, 0, 0, 0);
+	border-radius: 34px;
+
+	font-size: 28rpx;
+	font-weight: bold;
+	line-height: 66rpx;
+	color: rgba(255, 255, 255, 1);
+	text-align: center;
+}
+.address-box {
+	padding: 15rpx 40rpx;
+	margin-bottom: 10px;
+}
+.label {
+	font-size: 36rpx;
+	font-weight: bold;
+	line-height: 50rpx;
+	color: #222222;
+}
+.label-img {
+	padding-left: 40rpx;
+}
+
+.add-img-box {
+	width: 100%;
+	flex-direction: row;
+	flex-wrap: wrap;
+	margin-top: 50rpx;
+}
+.add-img-item {
+	width: 180rpx;
+	height: 180rpx;
+	border-radius: 24rpx;
+	position: relative;
+	margin: 0rpx 20rpx;
+	margin-bottom: 25rpx;
+	.add-img {
+		width: 100%;
+		height: 100%;
+		border-radius: 24rpx;
+	}
+}
+.add-img-camera {
+	flex: 1;
+}
+.add-img-del {
+	position: absolute;
+	width: 40rpx;
+	height: 40rpx;
+	left: 155rpx;
+	bottom: 155rpx;
+	//background-color: rgba(238, 0, 0, 1);
+	border-radius: 20rpx;
+}
+.address-time {
+	width: 484rpx;
+	height: 88rpx;
+	background-color: rgba(245, 245, 245, 1);
+	opacity: 1;
+	border-radius: 24rpx;
+	text-align: center;
+
+	font-size: 35rpx;
+	font-weight: 500;
+	color: rgba(51, 51, 51, 1);
+}
+.line {
+	width: 750rpx;
+	height: 1px;
+	transform: scaleY(0.3);
+	background-color: rgba(0, 0, 0, 0.5);
+}
+</style>

pages/product/exchange.vue

@@ -10,7 +10,7 @@
 				<view class="quantity">
 					{{ userInfo.integral }}
 				</view>
-				<view class="button">
+				<view class="button" @click="navto('/pages/user/jinquan')">
 					查看明细
 				</view>
 			</view>
@@ -34,7 +34,7 @@ import { getUserInfo } from '@/api/user.js';
 		data() {
 			return {
 				page: 1,
-				limit: 10,
+				limit: 1000,
 				loadingType: 'loadmore',
 				data: []
 			}
@@ -48,9 +48,17 @@ import { getUserInfo } from '@/api/user.js';
 		onLoad() {
 			this.loadData();
 			this.getData()
-		},
+		},
+		// onReachBottom() {
+		// 	this.loadData()
+		// },
 		methods: {
-			...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
+			...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
+			navto(url) {
+				uni.navigateTo({
+					url:url
+				})
+			},
 			// 點擊搜索框
 			clickSearch() {
 				uni.navigateTo({

pages/product/jindouProduct.vue

@@ -5,7 +5,7 @@
 			<view class="data">
 				<view class="title">我的金豆</view>
 				<view class="quantity">{{ userInfo.gold }}</view>
-				<view class="button">查看明细</view>
+				<view class="button" @click="navto('/pages/user/jindou')">查看明细</view>
 			</view>
 		</view>
 		<view class="line">热门兑换</view>
@@ -23,7 +23,7 @@ export default {
 		return {
 			data: {
 				page: 1,
-				limit: 10,
+				limit: 1000,
 				loadingType: 'loadmore',
 				data: []
 			}
@@ -46,8 +46,14 @@ export default {
 			uni.navigateTo({
 				url: '/pages/product/search'
 			});
+		},
+		navto(url) {
+			uni.navigateTo({
+				url:url
+			})
 		},
-		loadData() {
+		loadData() {
+			
 			getUserInfo({})
 				.then(({ data }) => {
 					this.setUserInfo(data);

pages/product/list.vue

@@ -114,7 +114,9 @@ export default {
 			let obj = this;
 			let data = {
 				page: obj.page,
-				limit: obj.limit,
+				limit: obj.limit,
+				is_gold: 0,
+				is_integral: 0,
 				sid: obj.cateId //分类id
 			};
 			//没有更多直接返回

pages/product/realyWhole.vue

@@ -91,7 +91,7 @@
 					whole_id: obj.goodItem.whole.id,
 					time_id: obj.time_id,
 					price: obj.goodItem.price,
-					to_uid: obj.goodItem.to_uid,
+					to_uid: obj.goodItem.uid,
 					first_price: obj.goodItem.first_price,
 					last_id: obj.goodItem.id
 				}

pages/product/search.vue

@@ -131,7 +131,9 @@ export default {
 			let data = {
 				page: obj.page,
 				limit: obj.limit,
-				news: obj.newOrder,
+				news: obj.newOrder,
+				is_gold: 0,
+				is_integral: 0,
 				keyword: this.keyword
 			};
 			// 判断是否为销售数量排序

pages/product/store.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="store">
 		<view class="list">
-			<view class="item" v-for="(item,index) in list">
+			<view class="item" v-for="(item,index) in list" @click="lookmore(item)">
 				<view class="left">
 					<view class="img">
 						<image :src="item.image" mode=""></image>
@@ -27,19 +27,41 @@
 
 <script>
 import { openMap } from '@/utils/rocessor.js';
-import { storeList } from '@/api/index.js'
+import { storeList } from '@/api/index.js'
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
 export default {
 	data(){
 		return {
 			latitude:'',
 			longitude:'',
-			list:[],
+			list:[],
+			showStore: {}
 		}
 	},
 	onLoad() {
 		this.getaddress();
 	},
-	methods:{
+	methods:{
+		...mapMutations('user',['setShowStore']),
+		lookmore(item) {
+			this.showStore = item
+			console.log(item)
+			// this.setShowStore(item)
+			uni.setStorage({
+				key: 'showStore',
+				data: item,
+				success() {
+					console.log(item,'item++++')
+					uni.navigateTo({
+						url: '/pages/category/fillTable?type=look'
+					})
+				}
+			})
+			
+		},
 		loadData(){
 			const obj = this;
 			console.log(obj.longitude)

pages/product/wholesale.vue

@@ -183,7 +183,8 @@
 			getNewList() {
 				getNewList({
 					page: 1,
-					limit: 100
+					limit: 100,
+					time_id: this.wid
 				}).then(res => {
 					console.log(res, 'getNewList')
 					this.newlist = res.data

pages/user/JDcool.vue

@@ -5,7 +5,7 @@
 				<view class="goback-box" @click="toBack">
 					<image class="goback" src="../../static/img/fanhui.png" mode=""></image>
 				</view>
-				<view class="header">基金池</view>
+				<view class="header">基金</view>
 				<image class="money_bg" src="../../static/img/anchor8.png"></image>
 				<view class="money">{{jd}}</view>
 				<view class="tip">

pages/user/buySellDetail.vue

@@ -31,6 +31,12 @@
 					订单信息
 				</view>
 			</view>
+			<view class="info-wrap">
+				<view class="info-tit">
+					场次:
+				</view>
+				<view class="info-val">{{chooseItem.time_id_title*1 > 9 ? (chooseItem.time_id_title + ':00') : ( '0' + chooseItem.time_id_title + ':00')}}</view>
+			</view>
 			<view class="info-wrap">
 				<view class="info-tit">
 					订单编号:
@@ -251,7 +257,7 @@
 
 	.good-info {
 		width: 750rpx;
-		height: 253rpx;
+		min-height: 253rpx;
 		padding: 30rpx;
 		background: #FFFFFF;
 		margin: 20rpx 0;

pages/user/jindou.vue

@@ -156,10 +156,13 @@ export default {
 			this.tabCurrentIndex = index;
 		},
 		// 点击返回 我的页面
-		toBack() {
-			uni.switchTab({
-				url: '/pages/user/user'
-			});
+		toBack() {
+			uni.navigateBack({
+				
+			})
+			// uni.switchTab({
+			// 	url: '/pages/user/user'
+			// });
 		}
 	}
 };

pages/user/user.vue

@@ -1,750 +1,750 @@
-<template>
-	<view class="container">
-		<scroll-view class="content-box" scroll-y="true">
-			<view class="user-section">
-				<view class="bg">
-					<image src="/static/user/bg.png" mode=""></image>
-				</view>
-				<view class="user-info-box ">
-					<view class="detail flex">
-						<view class="portrait-box" @click="navTo('/pages/set/userinfo')">
-							<image class="portrait" :src="userInfo.avatar || '/static/error/missing-face.png'"></image>
-						</view>
-						<view class="info-box">
-							<view class="info-top flex">
-								<view class="username clamp">{{ userInfo.nickname || '游客' }}</view>
-								<view class="vip" v-if="userInfo.level > 0">
-									<image class="vip-bg" src="../../static/img/vip.png" mode=""></image>
-									<view class="vip-title">V{{ userInfo.level }}会员</view>
-								</view>
-							</view>
-							<view class="font-size-sm">UID：{{ userInfo.uid }}</view>
-						</view>
-					</view>
-					<view class="my-info flex" @click="navTo('/pages/set/userinfo')" v-if="hasLogin">
-						<image src="../../static/user/set.png" mode=""></image>
-						<view class="title">设置</view>
-					</view>
-				</view>
-			</view>
-			<!-- 订单 -->
-			<view class="item-box item-box-b">
-				<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
-							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/user/order1.png" mode="aspectFit"></image>
-							<view class="corner" v-if="orderInfo.unpaid_count > 0">
-								<text>{{ orderInfo.unpaid_count }}</text>
-							</view>
-						</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/user/order2.png" mode="aspectFit"></image>
-							<view class="corner" v-if="orderInfo.unshipped_count > 0">
-								<text>{{ orderInfo.unshipped_count }}</text>
-							</view>
-						</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/user/order3.png" mode="aspectFit"></image>
-							<view class="corner" v-if="orderInfo.received_count > 0">
-								<text>{{ orderInfo.received_count }}</text>
-							</view>
-						</view>
-						<text>待收货</text>
-					</view>
-					<view class="order-item" @click="navTo('/pages/order/order?state=4')" hover-class="common-hover"
-						:hover-stay-time="50">
-						<view class="icon position-relative">
-							<image class="icon-img" src="/static/user/order4.png" mode="aspectFit"></image>
-						</view>
-						<text>已完成</text>
-					</view>
-				</view>
-			</view>
-			<view class="vip-box" @click="navTo('/pages/category/vip')">
-				<image src="../../static/user/open-m.png" mode=""></image>
-			</view>
-			<view>
-				<view class="item-box item-box-a">
-					<view class="order-section">
-						<view class="order-item" @click="navTo('/pages/money/wallet')" hover-class="common-hover"
-							:hover-stay-time="50">
-							<view class="icon icon-b">
-								<image class="icon-img" src="/static/user/yue.png" mode="aspectFit"></image>
-							</view>
-							<view class="order-font">红利券</view>
-						</view>
-						<view class="order-item" @click="navTo('/pages/user/award')" hover-class="common-hover"
-							:hover-stay-time="50">
-							<view class="icon icon-b">
-								<image class="icon-img" src="/static/user/yongjin.png" mode="aspectFit"></image>
-							</view>
-							<view class="order-font">我的余额</view>
-						</view>
-						<view class="order-item" @click="navTo('/pages/user/jindou')" hover-class="common-hover"
-							:hover-stay-time="50">
-							<view class="icon icon-b">
-								<image class="icon-img" src="/static/user/yaoqing.png" mode="aspectFit"></image>
-							</view>
-							<view class="order-font">我的金豆</view>
-						</view>
-						<view class="order-item" @click="navTo('/pages/user/jinquan')" hover-class="common-hover"
-							:hover-stay-time="50">
-							<view class="icon icon-b">
-								<image class="icon-img" src="/static/user/jinquan.png" mode="aspectFit"></image>
-							</view>
-							<view class="order-font">我的金券</view>
-						</view>
-					</view>
-				</view>
-				<view class="history-section icon">
-					<uni-list>
-						
-						<uni-list-item title="批发订单" @click="navTo('/pages/user/myWholesale')"
-							thumb="/static/user/u1.png"></uni-list-item>
-							
-						<uni-list-item title="基金池" @click="navTo('/pages/user/JDcool')" thumb="/static/user/u2.png">
-						</uni-list-item>
-						<uni-list-item title='我的推广' @click="navTo('/pages/user/team')"
-							thumb="/static/user/tuiguang1.png">	</uni-list-item>
-						<uni-list-item title="申请美容院" @click="navTo('/pages/category/apply')"
-							thumb="/static/user/u3.png"></uni-list-item>
-						<uni-list-item title="分享海报" @click="navTo('/pages/user/shareQrCode')"
-							thumb="/static/user/u4.png"></uni-list-item>
-						<uni-list-item title="我的收藏" @click="navTo('/pages/user/favorites')" thumb="/static/user/u5.png">
-						</uni-list-item>
-						<uni-list-item title="收货地址" @click="navTo('/pages/set/address')" thumb="/static/user/u6.png">
-						</uni-list-item>
-						<uni-list-item title="交易密码" @click="navTo('/pages/money/moneyPwd')" thumb="/static/user/u7.png">
-						</uni-list-item>
-					</uni-list>
-				</view>
-			</view>
-		</scroll-view>
-	</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
-	} 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 {};
-		},
-		onShow() {
-			// 判断是否已经登录
-			if (this.hasLogin) {
-				this.loadBaseData();
-			}
-		},
-		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', 'setOrderInfo']),
-			// 加载初始数据
-			loadBaseData() {
-				getUserInfo({})
-					.then(({
-						data
-					}) => {
-						this.setUserInfo(data);
-						// 获取用户数据完毕后在获取订单数据防止多次跳转到登录页
-						orderData({})
-							.then(({
-								data
-							}) => {
-								this.setOrderInfo(data);
-							})
-							.catch(e => {
-								this.setOrderInfo({
-									complete_count: 0, //完成
-									received_count: 0, //待收货
-									unshipped_count: 0, //待发货
-									order_count: 0, //订单总数
-									unpaid_count: 0 //待付款
-								});
-							});
-					})
-					.catch(e => {
-						console.log(e);
-					});
-			},
-			/**
-			 * 统一跳转接口,拦截未登录路由
-			 * navigator标签现在默认没有转场动画，所以用view
-			 */
-			navTo(url) {
-				// if (!this.hasLogin) {
-				//  // 保存地址
-				// 	saveUrl();
-				//  	// 登录拦截
-				// 	interceptor();
-				//  } else {
-				uni.navigateTo({
-					url
-				});
-				// }
-			}
-		}
-	};
-</script>
-<style lang="scss">
-	page {
-		height: 100%;
-		background-color: $page-color-base;
-	}
-
-	%flex-center {
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-	}
-
-	%section {
-		display: flex;
-		justify-content: space-around;
-		align-content: center;
-		background: #fff;
-		border-radius: 10rpx;
-	}
-
-	.container {
-		height: 100%;
-		background-color: #fff;
-	}
-
-	.content-box {
-		height: 100%;
-	}
-
-	.user-section {
-		height: 420rpx;
-		padding: 50rpx 0rpx 0 30rpx;
-		position: relative;
-
-		.bg {
-			position: absolute;
-			left: 0;
-			top: 0;
-			width: 750rpx;
-			height: 420rpx;
-
-			image {
-				width: 750rpx;
-				height: 420rpx;
-			}
-		}
-	}
-
-	.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 + 2rpx;
-					height: 100%;
-					max-width: 200rpx;
-				}
-
-				.vip {
-					position: relative;
-					margin-left: 12rpx;
-					width: 120rpx;
-					height: 40rpx;
-
-					.vip-bg {
-						position: absolute;
-						top: 0;
-						left: 0;
-						right: 0;
-						width: 100%;
-						height: 100%;
-					}
-
-					.vip-title {
-						position: relative;
-						z-index: 10;
-						font-size: 20rpx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #93794b;
-						padding-left: 36rpx;
-						line-height: 40rpx;
-					}
-				}
-
-				.username-t {
-					font-size: $font-lg + 6rpx;
-					// height: 32rpx;
-					display: flex;
-					align-items: center;
-
-					image {
-						display: inline-block;
-						margin-left: 10rpx;
-						width: 147rpx;
-						height: 32rpx;
-					}
-				}
-
-				.user-get {
-					font-size: $font-lg;
-
-					text {
-						font-size: $font-lg + 6rpx;
-					}
-				}
-			}
-		}
-
-		.config {
-			font-size: 48rpx;
-			height: 130rpx;
-
-			.setting {
-				margin-right: 51rpx;
-			}
-		}
-
-		.my-info {
-			margin-right: 30rpx;
-			width: 130rpx;
-			height: 50rpx;
-			border: 1px solid #ffffff;
-			border-radius: 26rpx;
-			justify-content: center;
-
-			image {
-				width: 30rpx;
-				height: 30rpx;
-			}
-
-			.title {
-				padding-left: 9rpx;
-				font-size: 24rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #ffffff;
-			}
-		}
-	}
-
-	.vip-card-box {
-		display: flex;
-		flex-direction: column;
-		color: #f7d680;
-		height: 240rpx;
-		background: linear-gradient(left, rgba(0, 0, 0, 0.7), rgba(0, 0, 0, 0.8));
-		border-radius: 16rpx 16rpx 0 0;
-		overflow: hidden;
-		position: relative;
-		padding: 20rpx 24rpx;
-
-		.card-bg {
-			position: absolute;
-			top: 20rpx;
-			right: 0;
-			width: 380rpx;
-			height: 260rpx;
-		}
-
-		.b-btn {
-			position: absolute;
-			right: 20rpx;
-			top: 16rpx;
-			width: 132rpx;
-			height: 40rpx;
-			text-align: center;
-			line-height: 40rpx;
-			font-size: 22rpx;
-			color: #36343c;
-			border-radius: 20px;
-			background: linear-gradient(left, #f9e6af, #ffd465);
-			z-index: 1;
-		}
-
-		.tit {
-			font-size: $font-base + 2rpx;
-			color: #f7d680;
-			margin-bottom: 28rpx;
-
-			.iconfont {
-				color: #f6e5a3;
-				margin-right: 16rpx;
-			}
-		}
-
-		.e-b {
-			font-size: $font-sm;
-			color: #d8cba9;
-			margin-top: 10rpx;
-		}
-	}
-
-	.cover-container {
-		background: $page-color-base;
-		margin-top: -150rpx;
-		padding: 0 30rpx;
-		position: relative;
-		background: #f5f5f5;
-		padding-bottom: 20rpx;
-
-		.arc {
-			position: absolute;
-			left: 0;
-			top: -34rpx;
-			width: 100%;
-			height: 36rpx;
-		}
-	}
-
-	.tj-sction {
-		@extend %section;
-
-		.tj-item {
-			@extend %flex-center;
-			flex-direction: column;
-			height: 140rpx;
-			font-size: $font-sm;
-			color: #75787d;
-		}
-
-		.num {
-			font-size: $font-lg;
-			color: $font-color-dark;
-			margin-bottom: 8rpx;
-		}
-	}
-
-	.vip-box {
-		width: 710rpx;
-		height: 90rpx;
-		margin: 32rpx auto 0;
-
-		image {
-			width: 100%;
-			height: 100%;
-		}
-	}
-
-	.item-box {
-		// width: 710rpx;
-		// height: 221rpx;
-		// background: #FFFFFF;
-		// box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-		// border-radius: 20rpx;
-		// position: relative;
-		// top: -150rpx;
-		// left: 0;
-		// right: 0;
-		// margin: 0 auto -150rpx;
-		margin: 20rpx 0;
-
-		.box-title {
-			background-color: #fff;
-			line-height: 1;
-			// padding: 30rpx;
-			padding: 0 36rpx 0 35rpx;
-			height: 73rpx;
-			border-radius: 20rpx 20rpx 0 0;
-
-			.title {
-				font-weight: bold;
-				font-size: 30rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #333333;
-			}
-
-			.link {
-				font-size: $font-base - 2rpx;
-				color: $font-color-light;
-			}
-		}
-
-		.order-section {
-			height: 146rpx;
-			@extend %section;
-
-			// padding: 28rpx 0;
-			.order-item {
-				@extend %flex-center;
-				width: 120rpx;
-				height: 146rpx;
-				border-radius: 10rpx;
-				font-size: $font-sm;
-				color: $font-color-dark;
-			}
-
-			.iconfont {
-				font-size: 48rpx;
-				margin-bottom: 18rpx;
-				color: #fa436a;
-			}
-
-			.icon-shouhoutuikuan {
-				font-size: 44rpx;
-			}
-
-			.icon {
-				height: 50rpx;
-				width: 48rpx;
-				margin-bottom: 18rpx;
-				background-size: 100%;
-				background-repeat: no-repeat;
-				background-position: center;
-
-				.icon-img {
-					width: 100%;
-					height: 100%;
-				}
-			}
-
-			.icon-b {
-				height: 90rpx;
-				width: 88rpx;
-			}
-		}
-	}
-
-	.history-section {
-		// padding: 30rpx 0 0;
-		margin-top: 20rpx;
-		background: #fff;
-		border-radius: 10rpx;
-
-		.sec-header {
-			display: flex;
-			align-items: center;
-			font-size: $font-base;
-			color: $font-color-dark;
-			line-height: 40rpx;
-			margin-left: 30rpx;
-			padding-top: 30rpx;
-
-			.iconfont {
-				font-size: 44rpx;
-				color: $color-red;
-				margin-right: 16rpx;
-				line-height: 40rpx;
-			}
-		}
-
-		.h-list {
-			white-space: nowrap;
-			padding: 30rpx 30rpx 0;
-
-			.h-list-image {
-				display: inline-block;
-				width: 160rpx;
-				height: 160rpx;
-				margin-right: 20rpx;
-				border-radius: 10rpx;
-			}
-		}
-	}
-
-	.up-box {
-		margin: 21rpx auto;
-		width: 710rpx;
-		height: 90rpx;
-		background: linear-gradient(73deg, #ffffff 0%, #fffbeb 0%, #fff1da 0%, #fed591 100%);
-		border-radius: 20rpx;
-
-		image {
-			width: 100%;
-			height: 100%;
-			border-radius: 20rpx;
-		}
-	}
-
-	.item-box-b {
-		width: 710rpx;
-		height: 221rpx;
-		background: #ffffff;
-		box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.5);
-		border-radius: 20rpx;
-		position: relative;
-		top: -150rpx;
-		left: 0;
-		right: 0;
-		margin: 0 auto -150rpx;
-	}
-
-	.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;
-				}
-			}
-		}
-	}
-
-	.outlogin {
-		margin: 40rpx auto;
-		width: 500rpx;
-		background-color: #fff;
-		color: #ff4c4b;
-		border: 1px solid #ff4c4b;
-		text-align: center;
-		padding: 10rpx 0rpx;
-		border-radius: 50rpx;
-	}
-
-	.order-font {
-		margin-top: -24rpx;
-	}
+<template>
+	<view class="container">
+		<scroll-view class="content-box" scroll-y="true">
+			<view class="user-section">
+				<view class="bg">
+					<image src="/static/user/bg.png" mode=""></image>
+				</view>
+				<view class="user-info-box ">
+					<view class="detail flex">
+						<view class="portrait-box" @click="navTo('/pages/set/userinfo')">
+							<image class="portrait" :src="userInfo.avatar || '/static/error/missing-face.png'"></image>
+						</view>
+						<view class="info-box">
+							<view class="info-top flex">
+								<view class="username clamp">{{ userInfo.nickname || '游客' }}</view>
+								<view class="vip" v-if="userInfo.level > 0">
+									<image class="vip-bg" src="../../static/img/vip.png" mode=""></image>
+									<view class="vip-title">{{ userInfo.level_name }}</view>
+								</view>
+							</view>
+							<view class="font-size-sm">UID：{{ userInfo.uid }}</view>
+						</view>
+					</view>
+					<view class="my-info flex" @click="navTo('/pages/set/userinfo')" v-if="hasLogin">
+						<image src="../../static/user/set.png" mode=""></image>
+						<view class="title">设置</view>
+					</view>
+				</view>
+			</view>
+			<!-- 订单 -->
+			<view class="item-box item-box-b">
+				<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
+							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/user/order1.png" mode="aspectFit"></image>
+							<view class="corner" v-if="orderInfo.unpaid_count > 0">
+								<text>{{ orderInfo.unpaid_count }}</text>
+							</view>
+						</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/user/order2.png" mode="aspectFit"></image>
+							<view class="corner" v-if="orderInfo.unshipped_count > 0">
+								<text>{{ orderInfo.unshipped_count }}</text>
+							</view>
+						</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/user/order3.png" mode="aspectFit"></image>
+							<view class="corner" v-if="orderInfo.received_count > 0">
+								<text>{{ orderInfo.received_count }}</text>
+							</view>
+						</view>
+						<text>待收货</text>
+					</view>
+					<view class="order-item" @click="navTo('/pages/order/order?state=4')" hover-class="common-hover"
+						:hover-stay-time="50">
+						<view class="icon position-relative">
+							<image class="icon-img" src="/static/user/order4.png" mode="aspectFit"></image>
+						</view>
+						<text>已完成</text>
+					</view>
+				</view>
+			</view>
+			<!-- <view class="vip-box" @click="navTo('/pages/category/vip')">
+				<image src="../../static/user/open-m.png" mode=""></image>
+			</view> -->
+			<view>
+				<view class="item-box item-box-a">
+					<view class="order-section">
+						<view class="order-item" @click="navTo('/pages/money/wallet')" hover-class="common-hover"
+							:hover-stay-time="50">
+							<view class="icon icon-b">
+								<image class="icon-img" src="/static/user/yue.png" mode="aspectFit"></image>
+							</view>
+							<view class="order-font">红利</view>
+						</view>
+						<view class="order-item" @click="navTo('/pages/user/award')" hover-class="common-hover"
+							:hover-stay-time="50">
+							<view class="icon icon-b">
+								<image class="icon-img" src="/static/user/yongjin.png" mode="aspectFit"></image>
+							</view>
+							<view class="order-font">我的余额</view>
+						</view>
+						<view class="order-item" @click="navTo('/pages/user/jindou')" hover-class="common-hover"
+							:hover-stay-time="50">
+							<view class="icon icon-b">
+								<image class="icon-img" src="/static/user/yaoqing.png" mode="aspectFit"></image>
+							</view>
+							<view class="order-font">我的金豆</view>
+						</view>
+						<view class="order-item" @click="navTo('/pages/user/jinquan')" hover-class="common-hover"
+							:hover-stay-time="50">
+							<view class="icon icon-b">
+								<image class="icon-img" src="/static/user/jinquan.png" mode="aspectFit"></image>
+							</view>
+							<view class="order-font">我的金券</view>
+						</view>
+					</view>
+				</view>
+				<view class="history-section icon">
+					<uni-list>
+
+						<uni-list-item title="批发订单" @click="navTo('/pages/user/myWholesale')"
+							thumb="/static/user/u1.png"></uni-list-item>
+
+						<uni-list-item title="基金" @click="navTo('/pages/user/JDcool')" thumb="/static/user/u2.png">
+						</uni-list-item>
+						<uni-list-item title='我的推广' @click="navTo('/pages/user/team')"
+							thumb="/static/user/tuiguang1.png"> </uni-list-item>
+						<!-- <uni-list-item title="申请美容院" @click="navTo('/pages/category/apply')"
+							thumb="/static/user/u3.png"></uni-list-item> -->
+						<uni-list-item title="分享海报" @click="navTo('/pages/user/shareQrCode')"
+							thumb="/static/user/u4.png"></uni-list-item>
+						<uni-list-item title="我的收藏" @click="navTo('/pages/user/favorites')" thumb="/static/user/u5.png">
+						</uni-list-item>
+						<uni-list-item title="收货地址" @click="navTo('/pages/set/address')" thumb="/static/user/u6.png">
+						</uni-list-item>
+						<uni-list-item title="交易密码" @click="navTo('/pages/money/moneyPwd')" thumb="/static/user/u7.png">
+						</uni-list-item>
+					</uni-list>
+				</view>
+			</view>
+		</scroll-view>
+	</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
+	} 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 {};
+		},
+		onShow() {
+			// 判断是否已经登录
+			if (this.hasLogin) {
+				this.loadBaseData();
+			}
+		},
+		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', 'setOrderInfo']),
+			// 加载初始数据
+			loadBaseData() {
+				getUserInfo({})
+					.then(({
+						data
+					}) => {
+						this.setUserInfo(data);
+						// 获取用户数据完毕后在获取订单数据防止多次跳转到登录页
+						orderData({})
+							.then(({
+								data
+							}) => {
+								this.setOrderInfo(data);
+							})
+							.catch(e => {
+								this.setOrderInfo({
+									complete_count: 0, //完成
+									received_count: 0, //待收货
+									unshipped_count: 0, //待发货
+									order_count: 0, //订单总数
+									unpaid_count: 0 //待付款
+								});
+							});
+					})
+					.catch(e => {
+						console.log(e);
+					});
+			},
+			/**
+			 * 统一跳转接口,拦截未登录路由
+			 * navigator标签现在默认没有转场动画，所以用view
+			 */
+			navTo(url) {
+				if (!this.hasLogin) {
+					// 保存地址
+					saveUrl();
+					// 登录拦截
+					interceptor();
+				} else {
+					uni.navigateTo({
+						url
+					});
+				}
+			}
+		}
+	};
+</script>
+<style lang="scss">
+	page {
+		height: 100%;
+		background-color: $page-color-base;
+	}
+
+	%flex-center {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+	}
+
+	%section {
+		display: flex;
+		justify-content: space-around;
+		align-content: center;
+		background: #fff;
+		border-radius: 10rpx;
+	}
+
+	.container {
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.content-box {
+		height: 100%;
+	}
+
+	.user-section {
+		height: 420rpx;
+		padding: 50rpx 0rpx 0 30rpx;
+		position: relative;
+
+		.bg {
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 750rpx;
+			height: 420rpx;
+
+			image {
+				width: 750rpx;
+				height: 420rpx;
+			}
+		}
+	}
+
+	.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 + 2rpx;
+					height: 100%;
+					max-width: 200rpx;
+				}
+
+				.vip {
+					position: relative;
+					margin-left: 12rpx;
+					width: 150rpx;
+					height: 40rpx;
+
+					.vip-bg {
+						position: absolute;
+						top: 0;
+						left: 0;
+						right: 0;
+						width: 100%;
+						height: 100%;
+					}
+
+					.vip-title {
+						position: relative;
+						z-index: 10;
+						font-size: 20rpx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #93794b;
+						padding-left: 40rpx;
+						line-height: 40rpx;
+					}
+				}
+
+				.username-t {
+					font-size: $font-lg + 6rpx;
+					// height: 32rpx;
+					display: flex;
+					align-items: center;
+
+					image {
+						display: inline-block;
+						margin-left: 10rpx;
+						width: 147rpx;
+						height: 32rpx;
+					}
+				}
+
+				.user-get {
+					font-size: $font-lg;
+
+					text {
+						font-size: $font-lg + 6rpx;
+					}
+				}
+			}
+		}
+
+		.config {
+			font-size: 48rpx;
+			height: 130rpx;
+
+			.setting {
+				margin-right: 51rpx;
+			}
+		}
+
+		.my-info {
+			margin-right: 30rpx;
+			width: 130rpx;
+			height: 50rpx;
+			border: 1px solid #ffffff;
+			border-radius: 26rpx;
+			justify-content: center;
+
+			image {
+				width: 30rpx;
+				height: 30rpx;
+			}
+
+			.title {
+				padding-left: 9rpx;
+				font-size: 24rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #ffffff;
+			}
+		}
+	}
+
+	.vip-card-box {
+		display: flex;
+		flex-direction: column;
+		color: #f7d680;
+		height: 240rpx;
+		background: linear-gradient(left, rgba(0, 0, 0, 0.7), rgba(0, 0, 0, 0.8));
+		border-radius: 16rpx 16rpx 0 0;
+		overflow: hidden;
+		position: relative;
+		padding: 20rpx 24rpx;
+
+		.card-bg {
+			position: absolute;
+			top: 20rpx;
+			right: 0;
+			width: 380rpx;
+			height: 260rpx;
+		}
+
+		.b-btn {
+			position: absolute;
+			right: 20rpx;
+			top: 16rpx;
+			width: 132rpx;
+			height: 40rpx;
+			text-align: center;
+			line-height: 40rpx;
+			font-size: 22rpx;
+			color: #36343c;
+			border-radius: 20px;
+			background: linear-gradient(left, #f9e6af, #ffd465);
+			z-index: 1;
+		}
+
+		.tit {
+			font-size: $font-base + 2rpx;
+			color: #f7d680;
+			margin-bottom: 28rpx;
+
+			.iconfont {
+				color: #f6e5a3;
+				margin-right: 16rpx;
+			}
+		}
+
+		.e-b {
+			font-size: $font-sm;
+			color: #d8cba9;
+			margin-top: 10rpx;
+		}
+	}
+
+	.cover-container {
+		background: $page-color-base;
+		margin-top: -150rpx;
+		padding: 0 30rpx;
+		position: relative;
+		background: #f5f5f5;
+		padding-bottom: 20rpx;
+
+		.arc {
+			position: absolute;
+			left: 0;
+			top: -34rpx;
+			width: 100%;
+			height: 36rpx;
+		}
+	}
+
+	.tj-sction {
+		@extend %section;
+
+		.tj-item {
+			@extend %flex-center;
+			flex-direction: column;
+			height: 140rpx;
+			font-size: $font-sm;
+			color: #75787d;
+		}
+
+		.num {
+			font-size: $font-lg;
+			color: $font-color-dark;
+			margin-bottom: 8rpx;
+		}
+	}
+
+	.vip-box {
+		width: 710rpx;
+		height: 90rpx;
+		margin: 32rpx auto 0;
+
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	.item-box {
+		// width: 710rpx;
+		// height: 221rpx;
+		// background: #FFFFFF;
+		// box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+		// border-radius: 20rpx;
+		// position: relative;
+		// top: -150rpx;
+		// left: 0;
+		// right: 0;
+		// margin: 0 auto -150rpx;
+		margin: 20rpx 0;
+
+		.box-title {
+			background-color: #fff;
+			line-height: 1;
+			// padding: 30rpx;
+			padding: 0 36rpx 0 35rpx;
+			height: 73rpx;
+			border-radius: 20rpx 20rpx 0 0;
+
+			.title {
+				font-weight: bold;
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #333333;
+			}
+
+			.link {
+				font-size: $font-base - 2rpx;
+				color: $font-color-light;
+			}
+		}
+
+		.order-section {
+			height: 146rpx;
+			@extend %section;
+
+			// padding: 28rpx 0;
+			.order-item {
+				@extend %flex-center;
+				width: 120rpx;
+				height: 146rpx;
+				border-radius: 10rpx;
+				font-size: $font-sm;
+				color: $font-color-dark;
+			}
+
+			.iconfont {
+				font-size: 48rpx;
+				margin-bottom: 18rpx;
+				color: #fa436a;
+			}
+
+			.icon-shouhoutuikuan {
+				font-size: 44rpx;
+			}
+
+			.icon {
+				height: 50rpx;
+				width: 48rpx;
+				margin-bottom: 18rpx;
+				background-size: 100%;
+				background-repeat: no-repeat;
+				background-position: center;
+
+				.icon-img {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.icon-b {
+				height: 90rpx;
+				width: 88rpx;
+			}
+		}
+	}
+
+	.history-section {
+		// padding: 30rpx 0 0;
+		margin-top: 20rpx;
+		background: #fff;
+		border-radius: 10rpx;
+
+		.sec-header {
+			display: flex;
+			align-items: center;
+			font-size: $font-base;
+			color: $font-color-dark;
+			line-height: 40rpx;
+			margin-left: 30rpx;
+			padding-top: 30rpx;
+
+			.iconfont {
+				font-size: 44rpx;
+				color: $color-red;
+				margin-right: 16rpx;
+				line-height: 40rpx;
+			}
+		}
+
+		.h-list {
+			white-space: nowrap;
+			padding: 30rpx 30rpx 0;
+
+			.h-list-image {
+				display: inline-block;
+				width: 160rpx;
+				height: 160rpx;
+				margin-right: 20rpx;
+				border-radius: 10rpx;
+			}
+		}
+	}
+
+	.up-box {
+		margin: 21rpx auto;
+		width: 710rpx;
+		height: 90rpx;
+		background: linear-gradient(73deg, #ffffff 0%, #fffbeb 0%, #fff1da 0%, #fed591 100%);
+		border-radius: 20rpx;
+
+		image {
+			width: 100%;
+			height: 100%;
+			border-radius: 20rpx;
+		}
+	}
+
+	.item-box-b {
+		width: 710rpx;
+		height: 221rpx;
+		background: #ffffff;
+		box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.5);
+		border-radius: 20rpx;
+		position: relative;
+		top: -150rpx;
+		left: 0;
+		right: 0;
+		margin: 0 auto -150rpx;
+	}
+
+	.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;
+				}
+			}
+		}
+	}
+
+	.outlogin {
+		margin: 40rpx auto;
+		width: 500rpx;
+		background-color: #fff;
+		color: #ff4c4b;
+		border: 1px solid #ff4c4b;
+		text-align: center;
+		padding: 10rpx 0rpx;
+		border-radius: 50rpx;
+	}
+
+	.order-font {
+		margin-top: -24rpx;
+	}
 </style>

store/model/user.js

@@ -7,13 +7,25 @@ let state = {
 		order_count: 0, //订单总数
 		unpaid_count: 0 //待付款
 	}, //订单信息
-	hasLogin: false, //是否登录
+	hasLogin: false, //是否登录
+	showStore: {}
 }
 
 let mutations = {
 	// 登录
 	login(state) {
 		state.hasLogin = true;
+	},
+	setShowStore(state, provider) {
+		console.log(provider,'provider')
+		state.showStore = provider;
+		uni.setStorage({
+			key: 'showStore',
+			data: provider,
+			success() {
+				console.log(uni.getStorage('showStore'))
+			}
+		})
 	},
 	// 退出登录
 	logout(state, provider) {

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.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.6808189b.js></script><script src=/index/static/js/index.1cd43078.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.6808189b.js></script><script src=/index/static/js/index.ea2da74d.js></script></body></html>