123

pages/product/product.vue

@@ -3,7 +3,9 @@
 		<view class="carousel">
 			<swiper indicator-dots :circular="true" duration="400">
 				<swiper-item class="swiper-item" v-for="(item, index) in imgList" :key="index">
-					<view class="image-wrapper"><image :src="item" class="loaded" mode="aspectFill"></image></view>
+					<view class="image-wrapper">
+						<image :src="item" class="loaded" mode="aspectFill"></image>
+					</view>
 				</swiper-item>
 			</swiper>
 		</view>
@@ -18,15 +20,9 @@
 				</view>
 				<view class="flex timeStop">
 					<view>距离结束</view>
-					<uni-countdown
-						color="#ffffff"
-						background-color="#D65B3F"
-						splitor-color="#FFFFFF"
-						:show-day="false"
-						:hour="seckillObj.stopTimeH"
-						:minute="seckillObj.stopTimeM"
-						:second="seckillObj.stopTimeS"
-					></uni-countdown>
+					<uni-countdown color="#ffffff" background-color="#D65B3F" splitor-color="#FFFFFF" :show-day="false"
+						:hour="seckillObj.stopTimeH" :minute="seckillObj.stopTimeM"
+						:second="seckillObj.stopTimeS"></uni-countdown>
 				</view>
 			</view>
 		</view>
@@ -37,7 +33,8 @@
 				<text class="price-tip">¥</text>
 				<text class="price">{{ goodsObjact.price }}</text>
 				<text class="price-tip" v-if="goodsObjact.max_use_integral * 1 > 0">+</text>
-				<text class="price" v-if="goodsObjact.max_use_integral * 1 > 0">{{ goodsObjact.max_use_integral }}积分</text>
+				<text class="price"
+					v-if="goodsObjact.max_use_integral * 1 > 0">{{ goodsObjact.max_use_integral }}积分</text>
 				<text class="m-price" v-if="goodsObjact.ot_price > goodsObjact.price">¥{{ goodsObjact.ot_price }}</text>
 				<!-- <text class="coupon-tip">7折</text> -->
 			</view>
@@ -62,7 +59,9 @@
 					<text class="name">{{ reply.nickname }}</text>
 					<text class="con">{{ reply.comment }}</text>
 					<view class="con_box">
-						<view class="con_image" v-for="item in reply.pics"><image :src="item"></image></view>
+						<view class="con_image" v-for="item in reply.pics">
+							<image :src="item"></image>
+						</view>
 					</view>
 					<view class="bot">
 						<text class="attr"></text>
@@ -108,7 +107,9 @@
 				<image :src="shopInfo.logo" mode=" aspectFit" class="shop-img"></image>
 				<text class="font-size-lg">{{ shopInfo.title }}</text>
 			</view>
-			<navigator :url="'/pages/shoping/index?merid=' + shopId"><view class="shop-button">进店逛逛</view></navigator>
+			<navigator :url="'/pages/shoping/index?merid=' + shopId">
+				<view class="shop-button">进店逛逛</view>
+			</navigator>
 		</view>
 		<view class="detail-desc">
 			<!-- <view class="d-header">
@@ -128,7 +129,8 @@
 				<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 class="iconfont "
+					:class="{ iconlike: !goodsObjact.userCollect, iconlikefill: goodsObjact.userCollect }"></text>
 				<text>收藏</text>
 			</view>
 
@@ -137,7 +139,8 @@
 				<button type="primary" class=" action-btn no-border  add-cart-btn" @click="toggleSpec(1)">立即购买</button>
 			</view>
 			<view class="action-btn-group" v-if="goodsObjact.max_use_integral != 0">
-				<button type="primary" class=" action-btn no-border  add-cart-btn" style="width: 750rpx;" @click="toggleSpec(1)">立即购买</button>
+				<button type="primary" class=" action-btn no-border  add-cart-btn" style="width: 750rpx;"
+					@click="toggleSpec(1)">立即购买</button>
 			</view>
 		</view>
 		<!-- 秒杀商品购买 -->
@@ -165,7 +168,8 @@
 					<image :src="actionImage"></image>
 					<view class="right">
 						<view class="good-name clamp">{{ goodsObjact.store_name }}</view>
-						<text class="price" v-if="goodsObjact.max_use_integral > 0">¥{{ actionPrice }}+{{ goodsObjact.max_use_integral * 1 }}积分</text>
+						<text class="price"
+							v-if="goodsObjact.max_use_integral > 0">¥{{ actionPrice }}+{{ goodsObjact.max_use_integral * 1 }}积分</text>
 						<text class="price" v-else>¥{{ actionPrice }}</text>
 						<!-- <text class="stock">库存：{{ goodsObjact.stock }}件</text> -->
 						<!-- <view class="selected" v-if="goodsType == 0">
@@ -177,13 +181,8 @@
 				<view v-for="(item, index) in specList" :key="index" class="attr-list">
 					<text>{{ item.attr_name }}</text>
 					<view class="item-list">
-						<text
-							v-for="(childItem, childIndex) in item.attr_value"
-							:key="childIndex"
-							class="tit"
-							:class="{ selected: childItem.check }"
-							@click="selectSpec(childItem, item, index)"
-						>
+						<text v-for="(childItem, childIndex) in item.attr_value" :key="childIndex" class="tit"
+							:class="{ selected: childItem.check }" @click="selectSpec(childItem, item, index)">
 							{{ childItem.attr }}
 						</text>
 					</view>
@@ -191,7 +190,8 @@
 				<view class="attr-list">
 					<text>购买数量</text>
 					<view class="item-list">
-						<uni-number-box class="step" :isMin="true" :value="goodsNumber" :min="1" :max="goodsNumberMax" @eventChange="numberChange"></uni-number-box>
+						<uni-number-box class="step" :isMin="true" :value="goodsNumber" :min="1" :max="goodsNumberMax"
+							@eventChange="numberChange"></uni-number-box>
 					</view>
 				</view>
 				<button class="btn" @click.stop="buy">完成</button>
@@ -204,1105 +204,1245 @@
 </template>
 
 <script>
-import share from '@/components/share';
-import uniNumberBox from '@/components/uni-number-box.vue';
-import uniCountdown from '@/components/uni-countdown/uni-countdown.vue';
-import { goodsDetail, cartAdd, collectAdd, collectDel, seckillGoods, groupGoods } from '@/api/product.js';
-import { getShoping } from '@/api/shoping.js';
-// import { weixindata } from '@/utils/wxAuthorized';
-import { mapState } from 'vuex';
-// #ifdef H5
-import { weixindata, weixinlocation, shareLoad } from '@/utils/wxAuthorized';
-// #endif
-export default {
-	components: {
-		share,
-		uniNumberBox,
-		uniCountdown
-	},
-	filters: {
-		address(val) {
-			let str = '';
-			if (val) {
-				str = val[0] + ' ' + val[1];
-			}
-			return str;
-		}
-	},
-	data() {
-		return {
-			paying: false, //是否正在支付
-			details: '',
-			reply: '', //评论
-			type: 1, //默认支付方式add为
-			goodsNumber: 1, //购买数量
-			goodsid: '', //商品id
-			specClass: 'none', //显示隐藏弹窗
-			shareList: [], //分享列表
-			goodsObjact: {}, //保存商品数据
-			storeObjact: {}, //保存店铺数据
-			//图片循环
-			imgList: [],
-			specList: [],
-			// 对比对象
-			productValue: [],
-			actionPrice: 0, //默认选中商品价格
-			actionIntegral: 0, //默认选中商品积分
-			actionImage: '', //默认选中图片
-			uniqueId: '', //选中的商品分类
-			specSelected: [], //选中的分类
-			specSelectedName: '', //选中分类名称
-			goodsNumberMax: 0, //最大可购买数量
-			shopId: '', //商店id
-			//商店信息
-			shopInfo: {
-				logo: '',
-				title: ''
-			}, //商店信息
-			goodsType: 0, //商品类型1秒杀商品0为普通商品2为拼团商品
-			// 秒杀数据保存
-			seckillObj: {
-				stopTime: 0, //结束时间
-				stop: false, //是否结束
-				stopTimeH: 0, //小时
-				stopTimeM: 0, //分钟
-				stopTimeS: 0 //秒钟
-			},
-			// 拼团数据保存
-			pink: {
-				id: '', //拼团编号
-				uid: '', //用户编号
-				people: '', //拼团人数
-				price: '', //拼团价格
-				stop_time: '', //拼团结束时间
-				nickname: '', //团长昵称
-				avatar: '', //团长头像
-				count: '', //拼团剩余人数
-				h: '', //时
-				i: '', //分
-				s: '' //秒
-			}
-		};
-	},
-	async onLoad(options) {
-		let obj = this;
-		//保存商品id
-		this.goodsid = options.id;
-		// 判断有无人邀请
-		if (options.spread) {
-			// 存储邀请人
-			uni.setStorageSync('spread', options.spread);
-		}
-		// 判断是否为秒杀商品
-		if (options.type == 1) {
-			// 保存商品类型
-			this.goodsType = 1;
-			// 保存结束时间
-			this.seckillObj.stopTime = options.stoptime;
-			// 获取当前时间毫秒数
-			let stoptime = options.stoptime * 1000;
-			// 获取当前时间
-			let acitonTime = new Date();
-			// 判断当前时间是否大于结束时间
-			if (acitonTime.getTime() > stoptime) {
-				// 当前秒杀时间已经结束
-				this.seckillObj.stop = true;
-			} else {
-				// 计算倒计时
-				this.timeComputed(stoptime, this.seckillObj);
-			}
-			this.seckillGoods();
-			return;
-		}
-		if (options.type == 2) {
-			// 保存当前拼团商品类型
-			this.goodsType = 2;
-			// 家在数据
-			this.groupGoods();
-			return;
-		}
-		if (this.goodsType == 0) {
-			// 加载普通商品详情
-			this.goodsDetail();
-		}
-	},
-	computed: {
-		// #ifdef H5
-		...mapState(['weichatObj', 'baseURL', 'urlFile']),
-		...mapState('user', ['userInfo'])
-		// #endif
-	},
-	methods: {
-		// 分享
-		// #ifdef H5
-		IndexShare() {
-			let obj = this;
-			// console.log('dddddddffffffffffffff')
-			// 设置菜单中的转发按钮触发转发事件时的转发内容
-			let pages = getCurrentPages(); //获取加载的页面
-			let currentPage = pages[pages.length - 1]; //获取当前页面的对象
-			let url = '/' + currentPage.route; //当前页面url
-			let item = currentPage.options; //如果要获取url中所带的参数可以查看options
-			let shareObj = {
-				title: obj.goodsObjact.store_name, // 默认是小程序的名称(可以写slogan等)
-				link: obj.baseURL + url + '?id=' + item.id + '&spread=' + obj.userInfo.uid, // 默认是当前页面，必须是以‘/’开头的完整路径
-				desc: obj.goodsObjact.store_name + '   价格：' + obj.goodsObjact.price,
-				imgUrl: obj.goodsObjact.image,
-				success: function(res) {
-					// 转发成功之后的回调
-					if (res.errMsg == 'shareAppMessage:ok') {
-					}
-				},
-				fail: function() {
-					// 转发失败之后的回调
-					if (res.errMsg == 'shareAppMessage:fail cancel') {
-						// 用户取消转发
-					} else if (res.errMsg == 'shareAppMessage:fail') {
-						// 转发失败，其中 detail message 为详细失败信息
-					}
-				}
-			};
-			console.log(shareObj, '8888888888888888888');
-			shareLoad(shareObj);
-		},
-		// #endif
-		navTo(url) {
-			uni.navigateTo({
-				url
-			});
-		},
-		//获取商店信息
-		getShoping() {
-			let obj = this;
-			getShoping({
-				mer_id: this.shopId
-			})
-				.then(function({ data }) {
-					console.log(data);
-					obj.shopInfo = data;
-				})
-				.catch(e => {
-					console.log(e);
-				});
-		},
-		// 转换字符串为数字
-		moneyNum: function(value) {
-			return +value;
-		},
-		navToProductGoods() {
-			uni.redirectTo({
-				url: '/pages/product/product?id=' + this.goodsObjact.product_id
-			});
+	import share from '@/components/share';
+	import uniNumberBox from '@/components/uni-number-box.vue';
+	import uniCountdown from '@/components/uni-countdown/uni-countdown.vue';
+	import {
+		goodsDetail,
+		cartAdd,
+		collectAdd,
+		collectDel,
+		seckillGoods,
+		groupGoods
+	} from '@/api/product.js';
+	import {
+		getShoping
+	} from '@/api/shoping.js';
+	// import { weixindata } from '@/utils/wxAuthorized';
+	import {
+		mapState
+	} from 'vuex';
+	// #ifdef H5
+	import {
+		weixindata,
+		weixinlocation,
+		shareLoad
+	} from '@/utils/wxAuthorized';
+	// #endif
+	export default {
+		components: {
+			share,
+			uniNumberBox,
+			uniCountdown
 		},
-		// 获取拼团商品详情
-		groupGoods() {
-			let obj = this;
-			groupGoods({}, this.goodsid).then(function({ data }) {
-				obj.pink = data.pink[0]; //保存拼团信息
-				let goods = data.storeInfo;
-				obj.goodsObjact = goods;
-				console.log(goods, '123456');
-				obj.imgList = goods.images; //保存轮播图
-				obj.specList = data.productAttr; //保存分类列表
-				obj.productValue = data.productValue; //保存分类查询数据
-				obj.actionPrice = goods.price; //保存默认选中商品价格
-				obj.actionImage = goods.image_base; //保存默认选中商品图片
-				obj.goodsNumberMax = 1; //保存默认选中最大可购买商品数量
-				obj.shopId = data.mer_id; //保存商店id
-				if (obj.shopId > 0) {
-					obj.getShoping();
+		filters: {
+			address(val) {
+				let str = '';
+				if (val) {
+					str = val[0] + ' ' + val[1];
 				}
-				// #ifdef H5
-				obj.shareDate();
-				// #endif
-			});
+				return str;
+			}
 		},
-		// 获取秒杀商品详情
-		seckillGoods() {
-			let obj = this;
-			seckillGoods({}, this.goodsid).then(function({ data }) {
-				let goods = data.storeInfo;
-				obj.goodsObjact = goods;
-				obj.imgList = goods.images; //保存轮播图
-				obj.specList = data.productAttr; //保存分类列表
-				obj.productValue = data.productValue; //保存分类查询数据
-				obj.actionPrice = goods.price; //保存默认选中商品价格
-				obj.actionImage = goods.image_base; //保存默认选中商品价格
-				obj.goodsNumberMax = goods.num; //保存默认选中最大可购买商品数量
-				obj.shopId = data.mer_id; //保存商店id
-				if (obj.shopId > 0) {
-					obj.getShoping();
+		data() {
+			return {
+				paying: false, //是否正在支付
+				details: '',
+				reply: '', //评论
+				type: 1, //默认支付方式add为
+				goodsNumber: 1, //购买数量
+				goodsid: '', //商品id
+				specClass: 'none', //显示隐藏弹窗
+				shareList: [], //分享列表
+				goodsObjact: {}, //保存商品数据
+				storeObjact: {}, //保存店铺数据
+				//图片循环
+				imgList: [],
+				specList: [],
+				// 对比对象
+				productValue: [],
+				actionPrice: 0, //默认选中商品价格
+				actionIntegral: 0, //默认选中商品积分
+				actionImage: '', //默认选中图片
+				uniqueId: '', //选中的商品分类
+				specSelected: [], //选中的分类
+				specSelectedName: '', //选中分类名称
+				goodsNumberMax: 0, //最大可购买数量
+				shopId: '', //商店id
+				//商店信息
+				shopInfo: {
+					logo: '',
+					title: ''
+				}, //商店信息
+				goodsType: 0, //商品类型1秒杀商品0为普通商品2为拼团商品
+				// 秒杀数据保存
+				seckillObj: {
+					stopTime: 0, //结束时间
+					stop: false, //是否结束
+					stopTimeH: 0, //小时
+					stopTimeM: 0, //分钟
+					stopTimeS: 0 //秒钟
+				},
+				// 拼团数据保存
+				pink: {
+					id: '', //拼团编号
+					uid: '', //用户编号
+					people: '', //拼团人数
+					price: '', //拼团价格
+					stop_time: '', //拼团结束时间
+					nickname: '', //团长昵称
+					avatar: '', //团长头像
+					count: '', //拼团剩余人数
+					h: '', //时
+					i: '', //分
+					s: '' //秒
 				}
-				// #ifdef H5
-				obj.shareDate();
-				// #endif
-			});
-		},
-		// 计算倒计时时间
-		timeComputed(da, ar) {
-			let obj = ar;
-			// 设置到期时间
-			let time = new Date(da);
-			// 获取当前时间
-			let actTime = new Date();
-			// 获取到期时间具体值
-			let tH = time.getHours();
-			let tM = time.getMinutes();
-			let tS = time.getSeconds();
-			// 获取当前时间具体值
-			let aH = actTime.getHours();
-			let aM = actTime.getMinutes();
-			let aS = actTime.getSeconds();
-			// 计算时间，保存需要多少时间到期
-			obj.stopTimeH = tH - aH;
-			obj.stopTimeM = tM - aM;
-			obj.stopTimeS = tS - aS;
+			};
 		},
-		// 获取商品信息
-		goodsDetail() {
+		async onLoad(options) {
 			let obj = this;
-			goodsDetail({}, this.goodsid).then(function({ data }) {
-				obj.details = data;
-				let goods = data.storeInfo;
-				let store_info = data.system_store; // 保存店铺信息
-				console.log(store_info);
-				obj.storeObjact = store_info;
-				obj.goodsObjact = goods;
-				//商品详情图超出屏幕问题
-				if (obj.goodsObjact.description != null) {
-					obj.goodsObjact.description = obj.goodsObjact.description.replace(/<img/g, '<img class="rich-img"').replace(/<p>\s*<img/g, '<p class="pHeight"><img');
-				}
-				if (obj.goodsObjact.rule != null) {
-					obj.goodsObjact.rule = '<p>' + obj.goodsObjact.rule.replace(/\n/g, '</p><p>').trim() + '</p>';
-				}
-				obj.reply = data.reply; //保存评论列表
-				obj.imgList = goods.slider_image; //保存轮播图
-				obj.specList = data.productAttr; //保存分类列表
-				console.log(data.productAttr);
-				obj.productValue = data.productValue; //保存分类查询数据
-				obj.actionPrice = goods.price; //保存默认选中商品价格
-				obj.actionIntegral = goods.integral; //保存默认选中商品积分
-				obj.actionImage = goods.image_base; //保存默认选中商品价格
-				obj.goodsNumberMax = goods.stock; //保存默认选中最大可购买商品数量
-				obj.shopId = data.mer_id; //保存商店id
-				// 保存默认选中的对象
-				obj.specSelected = []; //初始化默认选择对象
-				for (let i = 0; i < obj.specList.length; i++) {
-					// 设置默认数据
-					let attrValue = obj.specList[i].attr_value[0];
-					attrValue.check = true;
-					obj.specSelected.push(attrValue.attr);
+			//保存商品id
+			this.goodsid = options.id;
+			// 判断有无人邀请
+			if (options.spread) {
+				// 存储邀请人
+				uni.setStorageSync('spread', options.spread);
+			}
+			// 判断是否为秒杀商品
+			if (options.type == 1) {
+				// 保存商品类型
+				this.goodsType = 1;
+				// 保存结束时间
+				this.seckillObj.stopTime = options.stoptime;
+				// 获取当前时间毫秒数
+				let stoptime = options.stoptime * 1000;
+				// 获取当前时间
+				let acitonTime = new Date();
+				// 判断当前时间是否大于结束时间
+				if (acitonTime.getTime() > stoptime) {
+					// 当前秒杀时间已经结束
+					this.seckillObj.stop = true;
+				} else {
+					// 计算倒计时
+					this.timeComputed(stoptime, this.seckillObj);
 				}
-
-				//保存默认选中的对象字符串名称
-				let str = obj.specSelected.join(',');
-				// 设置默认值
-				obj.actionImage = obj.productValue[str].image;
-				obj.uniqueId = obj.productValue[str].unique;
-				// #ifdef H5
-				obj.shareDate();
-				// #endif
-			});
-		},
-		// #ifdef H5
-		// 加载微信html5页面分享方法
-		shareDate() {
-			let obj = this;
-			// 保存分享人id链接
-			let url = window.location.href + '&spread=' + this.userInfo.uid;
-			// 判断是否微信浏览器
-			let bool = uni.getStorageSync('weichatBrowser') || '';
-			if (bool) {
-				// 过滤微信强制添加的链接地址
-				url = url.replace(/[\?,&]from=singlemessage/g, '');
-				let data = {
-					link: url, // 分享链接
-					imgUrl: obj.goodsObjact.image, // 分享图标
-					desc: obj.goodsObjact.store_info,
-					title: obj.goodsObjact.store_name,
-					success: function(e) {
-						console.log(e);
-					}
-				};
-				weixindata(data);
+				this.seckillGoods();
+				return;
 			}
-		},
-		// #endif
-		// 购买数量变化
-		numberChange(e) {
-			this.goodsNumber = e.number;
-		},
-		//规格弹窗开关
-		toggleSpec(str) {
-			if (this.specClass === 'show') {
-				this.specClass = 'hide';
-				setTimeout(() => {
-					this.specClass = 'none';
-				}, 250);
-			} else if (this.specClass === 'none') {
-				this.specClass = 'show';
+			if (options.type == 2) {
+				// 保存当前拼团商品类型
+				this.goodsType = 2;
+				// 家在数据
+				this.groupGoods();
+				return;
 			}
-			// 保存当前购买类型
-			this.type = str;
-		},
-		//选择规格
-		selectSpec(item, arr, ind) {
-			arr.attr_value.forEach(function(e) {
-				e.check = false;
-			});
-			item.check = true;
-			this.specSelected[ind] = item.attr;
-			let str = this.specSelected.join(',');
-			this.specSelectedName = this.specSelected.join(' ');
-			if (this.productValue[str]) {
-				let data = this.productValue[str];
-				this.actionPrice = data.price;
-				this.goodsNumberMax = data.stock;
-				this.actionIntegral = data.integral;
-				this.actionImage = data.image;
-				this.uniqueId = data.unique;
+			if (this.goodsType == 0) {
+				// 加载普通商品详情
+				this.goodsDetail();
 			}
 		},
-		//分享
-		share() {
-			this.$refs.share.toggleMask();
+		computed: {
+			// #ifdef H5
+			...mapState(['weichatObj', 'baseURL', 'urlFile']),
+			...mapState('user', ['userInfo'])
+			// #endif
 		},
-		//收藏
-		toFavorite(item) {
-			let obj = this;
-			item.userCollect = !item.userCollect;
-			if (!item.userCollect) {
-				collectDel({ id: obj.goodsid, category: 'product' }).then(function(e) {
-					uni.showToast({
-						title: '成功取消收藏',
-						type: 'top',
-						duration: 1500
-					});
+		methods: {
+			// 分享
+			// #ifdef H5
+			IndexShare() {
+				let obj = this;
+				// console.log('dddddddffffffffffffff')
+				// 设置菜单中的转发按钮触发转发事件时的转发内容
+				let pages = getCurrentPages(); //获取加载的页面
+				let currentPage = pages[pages.length - 1]; //获取当前页面的对象
+				let url = '/' + currentPage.route; //当前页面url
+				let item = currentPage.options; //如果要获取url中所带的参数可以查看options
+				let shareObj = {
+					title: obj.goodsObjact.store_name, // 默认是小程序的名称(可以写slogan等)
+					link: obj.baseURL + url + '?id=' + item.id + '&spread=' + obj.userInfo
+						.uid, // 默认是当前页面，必须是以‘/’开头的完整路径
+					desc: obj.goodsObjact.store_name + '   价格：' + obj.goodsObjact.price,
+					imgUrl: obj.goodsObjact.image,
+					success: function(res) {
+						// 转发成功之后的回调
+						if (res.errMsg == 'shareAppMessage:ok') {}
+					},
+					fail: function() {
+						// 转发失败之后的回调
+						if (res.errMsg == 'shareAppMessage:fail cancel') {
+							// 用户取消转发
+						} else if (res.errMsg == 'shareAppMessage:fail') {
+							// 转发失败，其中 detail message 为详细失败信息
+						}
+					}
+				};
+				console.log(shareObj, '8888888888888888888');
+				shareLoad(shareObj);
+			},
+			// #endif
+			navTo(url) {
+				uni.navigateTo({
+					url
 				});
-			} else {
-				collectAdd({ id: obj.goodsid, category: 'product' }).then(function(e) {
-					uni.showToast({
-						title: '成功加入收藏',
-						type: 'top',
-						duration: 1500
+			},
+			//获取商店信息
+			getShoping() {
+				let obj = this;
+				getShoping({
+						mer_id: this.shopId
+					})
+					.then(function({
+						data
+					}) {
+						console.log(data);
+						obj.shopInfo = data;
+					})
+					.catch(e => {
+						console.log(e);
 					});
+			},
+			// 转换字符串为数字
+			moneyNum: function(value) {
+				return +value;
+			},
+			navToProductGoods() {
+				uni.redirectTo({
+					url: '/pages/product/product?id=' + this.goodsObjact.product_id
 				});
-			}
-		},
-		// 立即购买
-		buy() {
-			let obj = this;
-			console.log(1111);
-			let data = {
-				cartNum: obj.goodsNumber, //商品数量
-				uniqueId: obj.uniqueId, //商品标签
-				new: '1', //商品是否新增加到购物车1为不加入0为加入
-				mer_id: obj.shopId,
-				is_consumer: 0
-				// type: 0,//0为余额支付  1为消费券支付 2为积分支付
-			};
-			if (obj.paying) {
-				return;
-			}
-			obj.paying = true;
-			if (obj.type == 2) {
-				data.new = 0;
-			}
-			if (obj.goodsType == 0) {
-				data.productId = obj.goodsid; //商品编号
-			}
-			// 判断是否为秒杀商品
-			if (obj.goodsType == 1) {
-				data.secKillId = obj.goodsid; //秒杀商品编号
-				data.productId = obj.goodsObjact.product_id; //商品编号
-				// 判断是否秒杀已经结束
-				if (obj.seckillObj.stop) {
-					uni.showModal({
-						title: '提示',
-						content: '当前活动已经结束',
-						showCancel: false
-					});
-					return;
+			},
+			// 获取拼团商品详情
+			groupGoods() {
+				let obj = this;
+				groupGoods({}, this.goodsid).then(function({
+					data
+				}) {
+					obj.pink = data.pink[0]; //保存拼团信息
+					let goods = data.storeInfo;
+					obj.goodsObjact = goods;
+					console.log(goods, '123456');
+					obj.imgList = goods.images; //保存轮播图
+					obj.specList = data.productAttr; //保存分类列表
+					obj.productValue = data.productValue; //保存分类查询数据
+					obj.actionPrice = goods.price; //保存默认选中商品价格
+					obj.actionImage = goods.image_base; //保存默认选中商品图片
+					obj.goodsNumberMax = 1; //保存默认选中最大可购买商品数量
+					obj.shopId = data.mer_id; //保存商店id
+					if (obj.shopId > 0) {
+						obj.getShoping();
+					}
+					// #ifdef H5
+					obj.shareDate();
+					// #endif
+				});
+			},
+			// 获取秒杀商品详情
+			seckillGoods() {
+				let obj = this;
+				seckillGoods({}, this.goodsid).then(function({
+					data
+				}) {
+					let goods = data.storeInfo;
+					obj.goodsObjact = goods;
+					obj.imgList = goods.images; //保存轮播图
+					obj.specList = data.productAttr; //保存分类列表
+					obj.productValue = data.productValue; //保存分类查询数据
+					obj.actionPrice = goods.price; //保存默认选中商品价格
+					obj.actionImage = goods.image_base; //保存默认选中商品价格
+					obj.goodsNumberMax = goods.num; //保存默认选中最大可购买商品数量
+					obj.shopId = data.mer_id; //保存商店id
+					if (obj.shopId > 0) {
+						obj.getShoping();
+					}
+					// #ifdef H5
+					obj.shareDate();
+					// #endif
+				});
+			},
+			// 计算倒计时时间
+			timeComputed(da, ar) {
+				let obj = ar;
+				// 设置到期时间
+				let time = new Date(da);
+				// 获取当前时间
+				let actTime = new Date();
+				// 获取到期时间具体值
+				let tH = time.getHours();
+				let tM = time.getMinutes();
+				let tS = time.getSeconds();
+				// 获取当前时间具体值
+				let aH = actTime.getHours();
+				let aM = actTime.getMinutes();
+				let aS = actTime.getSeconds();
+				// 计算时间，保存需要多少时间到期
+				obj.stopTimeH = tH - aH;
+				obj.stopTimeM = tM - aM;
+				obj.stopTimeS = tS - aS;
+			},
+			// 获取商品信息
+			goodsDetail() {
+				let obj = this;
+				goodsDetail({}, this.goodsid).then(function({
+					data
+				}) {
+					obj.details = data;
+					let goods = data.storeInfo;
+					let store_info = data.system_store; // 保存店铺信息
+					console.log(store_info);
+					obj.storeObjact = store_info;
+					obj.goodsObjact = goods;
+					//商品详情图超出屏幕问题
+					if (obj.goodsObjact.description != null) {
+						obj.goodsObjact.description = obj.goodsObjact.description.replace(/<img/g,
+							'<img class="rich-img"').replace(/<p>\s*<img/g, '<p class="pHeight"><img');
+					}
+					if (obj.goodsObjact.rule != null) {
+						obj.goodsObjact.rule = '<p>' + obj.goodsObjact.rule.replace(/\n/g, '</p><p>').trim() +
+							'</p>';
+					}
+					obj.reply = data.reply; //保存评论列表
+					obj.imgList = goods.slider_image; //保存轮播图
+					obj.specList = data.productAttr; //保存分类列表
+					console.log(data.productAttr);
+					obj.productValue = data.productValue; //保存分类查询数据
+					obj.actionPrice = goods.price; //保存默认选中商品价格
+					obj.actionIntegral = goods.integral; //保存默认选中商品积分
+					obj.actionImage = goods.image_base; //保存默认选中商品价格
+					obj.goodsNumberMax = goods.stock; //保存默认选中最大可购买商品数量
+					obj.shopId = data.mer_id; //保存商店id
+					// 保存默认选中的对象
+					obj.specSelected = []; //初始化默认选择对象
+					for (let i = 0; i < obj.specList.length; i++) {
+						// 设置默认数据
+						let attrValue = obj.specList[i].attr_value[0];
+						attrValue.check = true;
+						obj.specSelected.push(attrValue.attr);
+					}
+
+					//保存默认选中的对象字符串名称
+					let str = obj.specSelected.join(',');
+					// 设置默认值
+					obj.actionImage = obj.productValue[str].image;
+					obj.uniqueId = obj.productValue[str].unique;
+					// #ifdef H5
+					obj.shareDate();
+					// #endif
+				});
+			},
+			// #ifdef H5
+			// 加载微信html5页面分享方法
+			shareDate() {
+				let obj = this;
+				// 保存分享人id链接
+				let url = window.location.href + '&spread=' + this.userInfo.uid;
+				// 判断是否微信浏览器
+				let bool = uni.getStorageSync('weichatBrowser') || '';
+				if (bool) {
+					// 过滤微信强制添加的链接地址
+					url = url.replace(/[\?,&]from=singlemessage/g, '');
+					let data = {
+						link: url, // 分享链接
+						imgUrl: obj.goodsObjact.image, // 分享图标
+						desc: obj.goodsObjact.store_info,
+						title: obj.goodsObjact.store_name,
+						success: function(e) {
+							console.log(e);
+						}
+					};
+					weixindata(data);
 				}
-			}
-			// 判断是否为拼团商品
-			if (obj.goodsType == 2) {
-				data.combinationId = obj.goodsid; //拼团编号
-				data.productId = obj.goodsObjact.product_id; //商品编号
-			}
-			cartAdd(data)
-				.then(function({ data }) {
-					obj.paying = false;
-					if (obj.type == 1) {
-						// 跳转到支付页
-						uni.navigateTo({
-							url: '/pages/order/createOrder?id=' + data.cartId + '&goodsType=' + obj.goodsType
+			},
+			// #endif
+			// 购买数量变化
+			numberChange(e) {
+				this.goodsNumber = e.number;
+			},
+			//规格弹窗开关
+			toggleSpec(str) {
+				if (this.specClass === 'show') {
+					this.specClass = 'hide';
+					setTimeout(() => {
+						this.specClass = 'none';
+					}, 250);
+				} else if (this.specClass === 'none') {
+					this.specClass = 'show';
+				}
+				// 保存当前购买类型
+				this.type = str;
+			},
+			//选择规格
+			selectSpec(item, arr, ind) {
+				arr.attr_value.forEach(function(e) {
+					e.check = false;
+				});
+				item.check = true;
+				this.specSelected[ind] = item.attr;
+				let str = this.specSelected.join(',');
+				this.specSelectedName = this.specSelected.join(' ');
+				if (this.productValue[str]) {
+					let data = this.productValue[str];
+					this.actionPrice = data.price;
+					this.goodsNumberMax = data.stock;
+					this.actionIntegral = data.integral;
+					this.actionImage = data.image;
+					this.uniqueId = data.unique;
+				}
+			},
+			//分享
+			share() {
+				this.$refs.share.toggleMask();
+			},
+			//收藏
+			toFavorite(item) {
+				let obj = this;
+				item.userCollect = !item.userCollect;
+				if (!item.userCollect) {
+					collectDel({
+						id: obj.goodsid,
+						category: 'product'
+					}).then(function(e) {
+						uni.showToast({
+							title: '成功取消收藏',
+							type: 'top',
+							duration: 1500
 						});
-					}
-					if (obj.type == 2) {
+					});
+				} else {
+					collectAdd({
+						id: obj.goodsid,
+						category: 'product'
+					}).then(function(e) {
 						uni.showToast({
-							title: '成功加入购物车',
+							title: '成功加入收藏',
 							type: 'top',
-							duration: 2000
+							duration: 1500
 						});
-						obj.toggleSpec();
-					}
+					});
+				}
+			},
+			// 立即购买
+			buy() {
+				let obj = this;
+				console.log(obj.paying, 1111);
+				let data = {
+					cartNum: obj.goodsNumber, //商品数量
+					uniqueId: obj.uniqueId, //商品标签
+					new: '1', //商品是否新增加到购物车1为不加入0为加入
+					mer_id: obj.shopId,
+					is_consumer: 0
+					// type: 0,//0为余额支付  1为消费券支付 2为积分支付
+				};
+				uni.showLoading({
+					title: '购买中'
 				})
-				.catch(e => {
-					obj.paying = false;
-					console.log(e);
-				});
-		},
-		stopPrevent() {}
-	}
-};
+				if (obj.paying) {
+					console.log(222);
+					return;
+				}
+				obj.paying = true;
+				if (obj.type == 2) {
+					data.new = 0;
+				}
+				if (obj.goodsType == 0) {
+					data.productId = obj.goodsid; //商品编号
+				}
+				// 判断是否为秒杀商品
+				if (obj.goodsType == 1) {
+					data.secKillId = obj.goodsid; //秒杀商品编号
+					data.productId = obj.goodsObjact.product_id; //商品编号
+					// 判断是否秒杀已经结束
+					if (obj.seckillObj.stop) {
+						uni.showModal({
+							title: '提示',
+							content: '当前活动已经结束',
+							showCancel: false
+						});
+						return;
+					}
+				}
+				// 判断是否为拼团商品
+				if (obj.goodsType == 2) {
+					data.combinationId = obj.goodsid; //拼团编号
+					data.productId = obj.goodsObjact.product_id; //商品编号
+				}
+				cartAdd(data)
+					.then(function({
+						data
+					}) {
+						uni.hideLoading()
+						if (obj.type == 1) {
+							// 跳转到支付页
+							uni.navigateTo({
+								url: '/pages/order/createOrder?id=' + data.cartId + '&goodsType=' + obj
+									.goodsType
+							});
+						}
+						if (obj.type == 2) {
+							uni.showToast({
+								title: '成功加入购物车',
+								type: 'top',
+								duration: 2000
+							});
+							obj.toggleSpec();
+						}
+						obj.paying = false;
+					})
+					.catch(e => {
+						uni.hideLoading()
+						obj.paying = false;
+						console.log(e);
+					});
+			},
+			stopPrevent() {}
+		}
+	};
 </script>
 
 <style lang="scss">
-page {
-	background: $page-color-base;
-}
-//秒杀底部高度
-.seckillBottom {
-	height: 110rpx;
-}
-// 文章页底部高度撑开
-.contentBottomHeight {
-	height: 110rpx;
-}
-//默认商品底部高度
-.goodsBottom {
-	height: 160rpx;
-}
-.iconenter {
-	font-size: $font-base + 2rpx;
-	color: #888;
-}
-.carousel {
-	/* #ifdef APP-PLUS */
-	padding-top: var(--status-bar-height);
-	/* #endif */
-	height: 722rpx;
-	position: relative;
-	swiper {
-		height: 100%;
-	}
-	.image-wrapper {
-		width: 100%;
-		height: 100%;
-	}
-	.swiper-item {
-		display: flex;
-		justify-content: center;
-		align-content: center;
-		// height: 750rpx;
-		height: 710rpx;
-		overflow: hidden;
-		image {
-			width: 100%;
-			height: 100%;
-		}
+	page {
+		background: $page-color-base;
 	}
-}
-// 秒杀
-.seckill-box-title {
-	background: linear-gradient(90deg, rgba(239, 78, 81, 1) 0%, rgba(244, 113, 59, 1) 100%) !important;
-	.price,
-	.price-tip,
-	.timeStop,
-	.m-price {
-		color: #ffffff !important;
-	}
-	.price-tip {
-		font-size: $font-base;
+
+	//秒杀底部高度
+	.seckillBottom {
+		height: 110rpx;
 	}
-	.price {
-		font-size: 45rpx !important;
-		font-weight: bold;
+
+	// 文章页底部高度撑开
+	.contentBottomHeight {
+		height: 110rpx;
 	}
-	.timeStop {
+
+	//默认商品底部高度
+	.goodsBottom {
+		height: 160rpx;
 	}
-}
-// 底部拼团、秒杀支付按钮
-.goods-pay-box {
-	position: fixed;
-	left: 0;
-	bottom: 0;
-	z-index: 95;
-	width: 750rpx;
-	height: 100rpx;
-	line-height: 1;
-	color: #ffffff;
-	text-align: center;
-	font-size: $font-lg;
-	.bgLine {
-		background: linear-gradient(90deg, rgba(239, 78, 81, 1) 0%, rgba(244, 113, 59, 1) 100%);
+
+	.iconenter {
+		font-size: $font-base + 2rpx;
+		color: #888;
 	}
-	// 拼团支付按钮
-	.goods-pay {
-		display: flex;
-		align-content: center;
-		flex-wrap: wrap;
-		justify-content: center;
-		.goods-buttom,
-		.goods-buttom-money {
+
+	.carousel {
+		/* #ifdef APP-PLUS */
+		padding-top: var(--status-bar-height);
+		/* #endif */
+		height: 722rpx;
+		position: relative;
+
+		swiper {
+			height: 100%;
+		}
+
+		.image-wrapper {
 			width: 100%;
+			height: 100%;
 		}
-		.goods-buttom-money {
-			font-size: $font-base;
+
+		.swiper-item {
+			display: flex;
+			justify-content: center;
+			align-content: center;
+			// height: 750rpx;
+			height: 710rpx;
+			overflow: hidden;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
 		}
 	}
-	.goods-pay-stop,
-	.goods-pay {
-		padding: 15rpx 0;
-		height: 100%;
-		width: 100%;
-	}
-	.goods-pay-stop {
-		background: $color-gray;
-		line-height: 70rpx;
-	}
-}
-/* 标题简介 */
-.introduce-section {
-	background: #fff;
-	padding: 20rpx 30rpx;
-	.title {
-		font-size: 32rpx;
-		color: $font-color-dark;
-		height: 50rpx;
-		line-height: 50rpx;
-	}
-	.price-box {
-		display: flex;
-		align-items: baseline;
-		height: 64rpx;
-		padding: 10rpx 0;
-		font-size: 26rpx;
-		color: $uni-color-primary;
-	}
-	.price {
-		font-size: $font-lg + 2rpx;
-	}
-	.m-price {
-		margin: 0 12rpx;
-		color: $font-color-light;
-		text-decoration: line-through;
-	}
-	.coupon-tip {
-		align-items: center;
-		padding: 4rpx 10rpx;
-		background: $uni-color-primary;
-		font-size: $font-sm;
-		color: #fff;
-		border-radius: 6rpx;
-		line-height: 1;
-		transform: translateY(-4rpx);
-	}
-	.bot-row {
-		display: flex;
-		align-items: center;
-		height: 50rpx;
-		font-size: $font-sm;
-		color: $font-color-light;
-		text {
-			flex: 1;
+
+	// 秒杀
+	.seckill-box-title {
+		background: linear-gradient(90deg, rgba(239, 78, 81, 1) 0%, rgba(244, 113, 59, 1) 100%) !important;
+
+		.price,
+		.price-tip,
+		.timeStop,
+		.m-price {
+			color: #ffffff !important;
 		}
-	}
-}
-/* 分享 */
-.share-section {
-	display: flex;
-	align-items: center;
-	color: $font-color-base;
-	background: linear-gradient(left, #fdf5f6, #fbebf6);
-	padding: 12rpx 30rpx;
-	.share-icon {
-		display: flex;
-		align-items: center;
-		width: 70rpx;
-		height: 30rpx;
-		line-height: 1;
-		border: 1px solid $uni-color-primary;
-		border-radius: 4rpx;
-		position: relative;
-		overflow: hidden;
-		font-size: 22rpx;
-		color: $uni-color-primary;
-		&:after {
-			content: '';
-			width: 50rpx;
-			height: 50rpx;
-			border-radius: 50%;
-			left: -20rpx;
-			top: -12rpx;
-			position: absolute;
-			background: $uni-color-primary;
+
+		.price-tip {
+			font-size: $font-base;
 		}
+
+		.price {
+			font-size: 45rpx !important;
+			font-weight: bold;
+		}
+
+		.timeStop {}
 	}
-	.iconfavorfill {
-		position: relative;
-		z-index: 1;
-		font-size: 24rpx;
-		margin-left: 2rpx;
-		margin-right: 10rpx;
-		color: #fff;
-		line-height: 1;
-	}
-	.tit {
-		font-size: $font-base;
-		margin-left: 10rpx;
-	}
-	.iconprompt {
-		padding: 10rpx;
-		font-size: 30rpx;
+
+	// 底部拼团、秒杀支付按钮
+	.goods-pay-box {
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		z-index: 95;
+		width: 750rpx;
+		height: 100rpx;
 		line-height: 1;
-	}
-	.share-btn {
-		flex: 1;
-		text-align: right;
-		font-size: $font-sm;
-		color: $uni-color-primary;
-	}
-	.iconenter {
-		font-size: $font-sm;
-		margin-left: 4rpx;
-		color: $uni-color-primary;
-	}
-}
-
-.c-list {
-	margin-top: 20rpx;
-	font-size: $font-sm + 2rpx;
-	color: $font-color-base;
-	background: #fff;
-	.c-row {
-		display: flex;
-		align-items: center;
-		padding: 20rpx 30rpx;
-		position: relative;
-	}
-	.tit {
-		width: 140rpx;
-	}
-	.con {
-		flex: 1;
-		color: $font-color-dark;
-		.selected-text {
-			margin-right: 10rpx;
+		color: #ffffff;
+		text-align: center;
+		font-size: $font-lg;
+
+		.bgLine {
+			background: linear-gradient(90deg, rgba(239, 78, 81, 1) 0%, rgba(244, 113, 59, 1) 100%);
 		}
-	}
-	.bz-list {
-		height: 40rpx;
-		font-size: $font-sm + 2rpx;
-		color: $font-color-dark;
-		text {
-			display: inline-block;
-			margin-right: 30rpx;
+
+		// 拼团支付按钮
+		.goods-pay {
+			display: flex;
+			align-content: center;
+			flex-wrap: wrap;
+			justify-content: center;
+
+			.goods-buttom,
+			.goods-buttom-money {
+				width: 100%;
+			}
+
+			.goods-buttom-money {
+				font-size: $font-base;
+			}
+		}
+
+		.goods-pay-stop,
+		.goods-pay {
+			padding: 15rpx 0;
+			height: 100%;
+			width: 100%;
+		}
+
+		.goods-pay-stop {
+			background: $color-gray;
+			line-height: 70rpx;
 		}
 	}
-	.con-list {
-		flex: 1;
-		display: flex;
-		flex-direction: column;
-		color: $font-color-dark;
-		line-height: 40rpx;
-	}
-	.red {
-		color: $uni-color-primary;
-	}
-}
-
-/* 评价 */
-.eva-section {
-	display: flex;
-	flex-direction: column;
-	padding: 20rpx 30rpx;
-	background: #fff;
-	margin-top: 16rpx;
-	.e-header {
-		display: flex;
-		align-items: center;
-		height: 70rpx;
-		font-size: $font-sm + 2rpx;
-		color: $font-color-light;
-		.tit {
-			font-size: $font-base + 2rpx;
+
+	/* 标题简介 */
+	.introduce-section {
+		background: #fff;
+		padding: 20rpx 30rpx;
+
+		.title {
+			font-size: 32rpx;
 			color: $font-color-dark;
-			margin-right: 4rpx;
+			height: 50rpx;
+			line-height: 50rpx;
 		}
-		.tip {
-			flex: 1;
-			text-align: right;
+
+		.price-box {
+			display: flex;
+			align-items: baseline;
+			height: 64rpx;
+			padding: 10rpx 0;
+			font-size: 26rpx;
+			color: $uni-color-primary;
 		}
-		.iconenter {
-			margin-left: 10rpx;
+
+		.price {
+			font-size: $font-lg + 2rpx;
 		}
-	}
-}
-.eva-box {
-	display: flex;
-	padding: 20rpx 0;
-	.portrait {
-		flex-shrink: 0;
-		width: 80rpx;
-		height: 80rpx;
-		border-radius: 100px;
-	}
-	.right {
-		flex: 1;
-		display: flex;
-		flex-direction: column;
-		font-size: $font-base;
-		color: $font-color-base;
-		padding-left: 26rpx;
-		.con {
-			font-size: $font-base;
-			color: $font-color-dark;
-			padding: 20rpx 0;
+
+		.m-price {
+			margin: 0 12rpx;
+			color: $font-color-light;
+			text-decoration: line-through;
+		}
+
+		.coupon-tip {
+			align-items: center;
+			padding: 4rpx 10rpx;
+			background: $uni-color-primary;
+			font-size: $font-sm;
+			color: #fff;
+			border-radius: 6rpx;
+			line-height: 1;
+			transform: translateY(-4rpx);
 		}
-		.bot {
+
+		.bot-row {
 			display: flex;
-			justify-content: space-between;
+			align-items: center;
+			height: 50rpx;
 			font-size: $font-sm;
 			color: $font-color-light;
+
+			text {
+				flex: 1;
+			}
 		}
 	}
-}
-
-.eva-boxs {
-	width: 100%;
-	overflow: hidden;
-	padding: 10px 28rpx;
-	background: #f4f4f4;
-	border-radius: 12rpx;
-	font-size: $font-sm + 2rpx;
-	color: #333;
-	.portrait {
-		flex-shrink: 0;
-		width: 80rpx;
-		height: 80rpx;
-		border-radius: 100px;
-	}
-	.right {
-		flex: 1;
+
+	/* 分享 */
+	.share-section {
 		display: flex;
-		flex-direction: column;
-		font-size: $font-base;
+		align-items: center;
 		color: $font-color-base;
-		.con {
+		background: linear-gradient(left, #fdf5f6, #fbebf6);
+		padding: 12rpx 30rpx;
+
+		.share-icon {
+			display: flex;
+			align-items: center;
+			width: 70rpx;
+			height: 30rpx;
+			line-height: 1;
+			border: 1px solid $uni-color-primary;
+			border-radius: 4rpx;
+			position: relative;
+			overflow: hidden;
+			font-size: 22rpx;
+			color: $uni-color-primary;
+
+			&:after {
+				content: '';
+				width: 50rpx;
+				height: 50rpx;
+				border-radius: 50%;
+				left: -20rpx;
+				top: -12rpx;
+				position: absolute;
+				background: $uni-color-primary;
+			}
+		}
+
+		.iconfavorfill {
+			position: relative;
+			z-index: 1;
+			font-size: 24rpx;
+			margin-left: 2rpx;
+			margin-right: 10rpx;
+			color: #fff;
+			line-height: 1;
+		}
+
+		.tit {
 			font-size: $font-base;
-			color: $font-color-dark;
+			margin-left: 10rpx;
 		}
-		.bot {
-			display: flex;
-			justify-content: space-between;
+
+		.iconprompt {
+			padding: 10rpx;
+			font-size: 30rpx;
+			line-height: 1;
+		}
+
+		.share-btn {
+			flex: 1;
+			text-align: right;
 			font-size: $font-sm;
-			color: $font-color-light;
+			color: $uni-color-primary;
+		}
+
+		.iconenter {
+			font-size: $font-sm;
+			margin-left: 4rpx;
+			color: $uni-color-primary;
 		}
 	}
-}
-/*  详情 */
-.detail-desc {
-	background: #fff;
-	margin-top: 16rpx;
-	/deep/ img {
-		max-width: 100% !important;
-		display: inline !important;
-	}
-	/deep/ div {
-		max-width: 100% !important;
-	}
-	.d-header {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		height: 80rpx;
-		font-size: $font-base + 2rpx;
-		color: $font-color-dark;
-		position: relative;
 
-		text {
-			padding: 0 20rpx;
-			background: #fff;
+	.c-list {
+		margin-top: 20rpx;
+		font-size: $font-sm + 2rpx;
+		color: $font-color-base;
+		background: #fff;
+
+		.c-row {
+			display: flex;
+			align-items: center;
+			padding: 20rpx 30rpx;
 			position: relative;
-			z-index: 1;
 		}
-		&:after {
-			position: absolute;
-			left: 50%;
-			top: 50%;
-			transform: translateX(-50%);
-			width: 300rpx;
-			height: 0;
-			content: '';
-			border-bottom: 1px solid #ccc;
+
+		.tit {
+			width: 140rpx;
+		}
+
+		.con {
+			flex: 1;
+			color: $font-color-dark;
+
+			.selected-text {
+				margin-right: 10rpx;
+			}
+		}
+
+		.bz-list {
+			height: 40rpx;
+			font-size: $font-sm + 2rpx;
+			color: $font-color-dark;
+
+			text {
+				display: inline-block;
+				margin-right: 30rpx;
+			}
+		}
+
+		.con-list {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			color: $font-color-dark;
+			line-height: 40rpx;
+		}
+
+		.red {
+			color: $uni-color-primary;
+		}
+	}
+
+	/* 评价 */
+	.eva-section {
+		display: flex;
+		flex-direction: column;
+		padding: 20rpx 30rpx;
+		background: #fff;
+		margin-top: 16rpx;
+
+		.e-header {
+			display: flex;
+			align-items: center;
+			height: 70rpx;
+			font-size: $font-sm + 2rpx;
+			color: $font-color-light;
+
+			.tit {
+				font-size: $font-base + 2rpx;
+				color: $font-color-dark;
+				margin-right: 4rpx;
+			}
+
+			.tip {
+				flex: 1;
+				text-align: right;
+			}
+
+			.iconenter {
+				margin-left: 10rpx;
+			}
 		}
 	}
-}
 
-/* 规格选择弹窗 */
-.attr-content {
-	padding: 10rpx 30rpx;
-	.a-t {
+	.eva-box {
 		display: flex;
-		image {
-			width: 170rpx;
-			height: 170rpx;
+		padding: 20rpx 0;
+
+		.portrait {
 			flex-shrink: 0;
-			margin-top: -40rpx;
-			border-radius: 8rpx;
+			width: 80rpx;
+			height: 80rpx;
+			border-radius: 100px;
 		}
+
 		.right {
+			flex: 1;
 			display: flex;
 			flex-direction: column;
-			padding-left: 24rpx;
-			font-size: $font-sm + 2rpx;
+			font-size: $font-base;
 			color: $font-color-base;
-			line-height: 42rpx;
-			.good-name {
-				padding-top: 20rpx;
-				max-width: 320rpx;
-				font-size: 30rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #1d2023;
-				line-height: 42rpx;
-				margin-bottom: 15rpx;
-			}
-			.price {
-				font-size: 60rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #ff6f0f;
-				// font-size: $font-lg;
-				// color: $uni-color-primary;
-				// margin-bottom: 10rpx;
+			padding-left: 26rpx;
+
+			.con {
+				font-size: $font-base;
+				color: $font-color-dark;
+				padding: 20rpx 0;
 			}
-			.selected-text {
-				margin-right: 10rpx;
+
+			.bot {
+				display: flex;
+				justify-content: space-between;
+				font-size: $font-sm;
+				color: $font-color-light;
 			}
 		}
 	}
-	.attr-list {
-		display: flex;
-		flex-direction: column;
-		font-size: $font-base + 2rpx;
-		color: $font-color-base;
-		padding-top: 30rpx;
-		padding-left: 10rpx;
-	}
-	.item-list {
-		padding: 20rpx 0 0;
-		display: flex;
-		flex-wrap: wrap;
-		text {
+
+	.eva-boxs {
+		width: 100%;
+		overflow: hidden;
+		padding: 10px 28rpx;
+		background: #f4f4f4;
+		border-radius: 12rpx;
+		font-size: $font-sm + 2rpx;
+		color: #333;
+
+		.portrait {
+			flex-shrink: 0;
+			width: 80rpx;
+			height: 80rpx;
+			border-radius: 100px;
+		}
+
+		.right {
+			flex: 1;
 			display: flex;
-			align-items: center;
-			justify-content: center;
-			background: #eee;
-			margin-right: 20rpx;
-			margin-bottom: 20rpx;
-			border-radius: 100rpx;
-			min-width: 60rpx;
-			height: 60rpx;
-			padding: 0 20rpx;
+			flex-direction: column;
 			font-size: $font-base;
-			color: $font-color-dark;
-		}
-		.selected {
-			background: #fbebee;
-			color: $uni-color-primary;
+			color: $font-color-base;
+
+			.con {
+				font-size: $font-base;
+				color: $font-color-dark;
+			}
+
+			.bot {
+				display: flex;
+				justify-content: space-between;
+				font-size: $font-sm;
+				color: $font-color-light;
+			}
 		}
 	}
-}
-
-/*  弹出层 */
-.popup {
-	position: fixed;
-	left: 0;
-	top: 0;
-	right: 0;
-	bottom: 0;
-	z-index: 99;
-
-	&.show {
-		display: block;
-		.mask {
-			animation: showPopup 0.2s linear both;
+
+	/*  详情 */
+	.detail-desc {
+		background: #fff;
+		margin-top: 16rpx;
+
+		/deep/ img {
+			max-width: 100% !important;
+			display: inline !important;
 		}
-		.layer {
-			animation: showLayer 0.2s linear both;
+
+		/deep/ div {
+			max-width: 100% !important;
+		}
+
+		.d-header {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 80rpx;
+			font-size: $font-base + 2rpx;
+			color: $font-color-dark;
+			position: relative;
+
+			text {
+				padding: 0 20rpx;
+				background: #fff;
+				position: relative;
+				z-index: 1;
+			}
+
+			&:after {
+				position: absolute;
+				left: 50%;
+				top: 50%;
+				transform: translateX(-50%);
+				width: 300rpx;
+				height: 0;
+				content: '';
+				border-bottom: 1px solid #ccc;
+			}
 		}
 	}
-	&.hide {
-		.mask {
-			animation: hidePopup 0.2s linear both;
+
+	/* 规格选择弹窗 */
+	.attr-content {
+		padding: 10rpx 30rpx;
+
+		.a-t {
+			display: flex;
+
+			image {
+				width: 170rpx;
+				height: 170rpx;
+				flex-shrink: 0;
+				margin-top: -40rpx;
+				border-radius: 8rpx;
+			}
+
+			.right {
+				display: flex;
+				flex-direction: column;
+				padding-left: 24rpx;
+				font-size: $font-sm + 2rpx;
+				color: $font-color-base;
+				line-height: 42rpx;
+
+				.good-name {
+					padding-top: 20rpx;
+					max-width: 320rpx;
+					font-size: 30rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #1d2023;
+					line-height: 42rpx;
+					margin-bottom: 15rpx;
+				}
+
+				.price {
+					font-size: 60rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #ff6f0f;
+					// font-size: $font-lg;
+					// color: $uni-color-primary;
+					// margin-bottom: 10rpx;
+				}
+
+				.selected-text {
+					margin-right: 10rpx;
+				}
+			}
 		}
-		.layer {
-			animation: hideLayer 0.2s linear both;
+
+		.attr-list {
+			display: flex;
+			flex-direction: column;
+			font-size: $font-base + 2rpx;
+			color: $font-color-base;
+			padding-top: 30rpx;
+			padding-left: 10rpx;
+		}
+
+		.item-list {
+			padding: 20rpx 0 0;
+			display: flex;
+			flex-wrap: wrap;
+
+			text {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				background: #eee;
+				margin-right: 20rpx;
+				margin-bottom: 20rpx;
+				border-radius: 100rpx;
+				min-width: 60rpx;
+				height: 60rpx;
+				padding: 0 20rpx;
+				font-size: $font-base;
+				color: $font-color-dark;
+			}
+
+			.selected {
+				background: #fbebee;
+				color: $uni-color-primary;
+			}
 		}
 	}
-	&.none {
-		display: none;
-	}
-	.mask {
+
+	/*  弹出层 */
+	.popup {
 		position: fixed;
+		left: 0;
 		top: 0;
-		width: 100%;
-		height: 100%;
-		z-index: 1;
-		background-color: rgba(0, 0, 0, 0.4);
-	}
-	.layer {
-		position: fixed;
-		z-index: 99;
+		right: 0;
 		bottom: 0;
-		width: 100%;
-		min-height: 30vh;
-		border-radius: 10rpx 10rpx 0 0;
-		background-color: #fff;
-		.btn {
-			height: 66rpx;
-			line-height: 66rpx;
-			border-radius: 100rpx;
-			// background: $uni-color-primary;
-			background: $base-color;
-			font-size: $font-base + 2rpx;
-			color: #fff;
-			margin: 30rpx auto 20rpx;
+		z-index: 99;
+
+		&.show {
+			display: block;
+
+			.mask {
+				animation: showPopup 0.2s linear both;
+			}
+
+			.layer {
+				animation: showLayer 0.2s linear both;
+			}
 		}
-	}
-	@keyframes showPopup {
-		0% {
-			opacity: 0;
+
+		&.hide {
+			.mask {
+				animation: hidePopup 0.2s linear both;
+			}
+
+			.layer {
+				animation: hideLayer 0.2s linear both;
+			}
 		}
-		100% {
-			opacity: 1;
+
+		&.none {
+			display: none;
 		}
-	}
-	@keyframes hidePopup {
-		0% {
-			opacity: 1;
+
+		.mask {
+			position: fixed;
+			top: 0;
+			width: 100%;
+			height: 100%;
+			z-index: 1;
+			background-color: rgba(0, 0, 0, 0.4);
 		}
-		100% {
-			opacity: 0;
+
+		.layer {
+			position: fixed;
+			z-index: 99;
+			bottom: 0;
+			width: 100%;
+			min-height: 30vh;
+			border-radius: 10rpx 10rpx 0 0;
+			background-color: #fff;
+
+			.btn {
+				height: 66rpx;
+				line-height: 66rpx;
+				border-radius: 100rpx;
+				// background: $uni-color-primary;
+				background: $base-color;
+				font-size: $font-base + 2rpx;
+				color: #fff;
+				margin: 30rpx auto 20rpx;
+			}
 		}
-	}
-	@keyframes showLayer {
-		0% {
-			transform: translateY(120%);
+
+		@keyframes showPopup {
+			0% {
+				opacity: 0;
+			}
+
+			100% {
+				opacity: 1;
+			}
 		}
-		100% {
-			transform: translateY(0%);
+
+		@keyframes hidePopup {
+			0% {
+				opacity: 1;
+			}
+
+			100% {
+				opacity: 0;
+			}
 		}
-	}
-	@keyframes hideLayer {
-		0% {
-			transform: translateY(0);
+
+		@keyframes showLayer {
+			0% {
+				transform: translateY(120%);
+			}
+
+			100% {
+				transform: translateY(0%);
+			}
 		}
-		100% {
-			transform: translateY(120%);
+
+		@keyframes hideLayer {
+			0% {
+				transform: translateY(0);
+			}
+
+			100% {
+				transform: translateY(120%);
+			}
 		}
 	}
-}
-
-/* 底部操作菜单 */
-.page-bottom {
-	position: fixed;
-	left: 0rpx;
-	bottom: 0rpx;
-	z-index: 95;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	width: 750rpx;
-	height: 98rpx;
-	background: rgba(255, 255, 255, 0.9);
-	box-shadow: 0 0 20rpx 0 rgba(0, 0, 0, 0.5);
-	// border-radius: 16rpx;
-	.p-b-btn {
+
+	/* 底部操作菜单 */
+	.page-bottom {
+		position: fixed;
+		left: 0rpx;
+		bottom: 0rpx;
+		z-index: 95;
 		display: flex;
-		flex-direction: column;
-		align-items: center;
 		justify-content: center;
-		font-size: $font-sm;
-		color: $font-color-base;
-		width: 100rpx;
-		height: 98rpx;
-		.iconfont {
-			font-size: 40rpx;
-			line-height: 48rpx;
-			color: $font-color-light;
-		}
-		&.active,
-		&.active .iconfont {
-			color: $uni-color-primary;
-		}
-		.icon-fenxiang2 {
-			font-size: 42rpx;
-			transform: translateY(-2rpx);
-		}
-		.iconlikefill {
-			font-size: 46rpx;
-		}
-	}
-	.action-btn-group {
-		display: flex;
+		align-items: center;
+		width: 750rpx;
 		height: 98rpx;
-		// border-radius: 100px;
-		overflow: hidden;
-		// margin-left: 20rpx;
-		position: relative;
-		// &:after {
-		// 	content: '';
-		// 	position: absolute;
-		// 	top: 50%;
-		// 	right: 50%;
-		// 	transform: translateY(-50%);
-		// 	height: 28rpx;
-		// 	width: 0;
-		// 	border-right: 1px solid rgba(255, 255, 255, 0.5);
-		// }
-		.action-btn {
+		background: rgba(255, 255, 255, 0.9);
+		box-shadow: 0 0 20rpx 0 rgba(0, 0, 0, 0.5);
+
+		// border-radius: 16rpx;
+		.p-b-btn {
 			display: flex;
+			flex-direction: column;
 			align-items: center;
 			justify-content: center;
-			width: 350rpx;
-			height: 100%;
-			font-size: $font-base;
-			padding: 0;
-			border-radius: 0;
-			// background: transparent;
-			background: #31332d;
-			&.buy-now-btn {
-				background-color: #303e49;
+			font-size: $font-sm;
+			color: $font-color-base;
+			width: 100rpx;
+			height: 98rpx;
+
+			.iconfont {
+				font-size: 40rpx;
+				line-height: 48rpx;
+				color: $font-color-light;
 			}
-			&.add-cart-btn {
-				background-color: $base-color;
+
+			&.active,
+			&.active .iconfont {
+				color: $uni-color-primary;
+			}
+
+			.icon-fenxiang2 {
+				font-size: 42rpx;
+				transform: translateY(-2rpx);
+			}
+
+			.iconlikefill {
+				font-size: 46rpx;
+			}
+		}
+
+		.action-btn-group {
+			display: flex;
+			height: 98rpx;
+			// border-radius: 100px;
+			overflow: hidden;
+			// margin-left: 20rpx;
+			position: relative;
+
+			// &:after {
+			// 	content: '';
+			// 	position: absolute;
+			// 	top: 50%;
+			// 	right: 50%;
+			// 	transform: translateY(-50%);
+			// 	height: 28rpx;
+			// 	width: 0;
+			// 	border-right: 1px solid rgba(255, 255, 255, 0.5);
+			// }
+			.action-btn {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 350rpx;
+				height: 100%;
+				font-size: $font-base;
+				padding: 0;
+				border-radius: 0;
+				// background: transparent;
+				background: #31332d;
+
+				&.buy-now-btn {
+					background-color: #303e49;
+				}
+
+				&.add-cart-btn {
+					background-color: $base-color;
+				}
 			}
 		}
 	}
-}
-// 商店头
-.shop-box {
-	background-color: #ffffff;
-	margin-top: 20rpx;
-	margin-bottom: 10rpx;
-	padding: 20rpx;
-	.shop-img {
-		border-radius: 300rpx;
-		height: 80rpx;
-		width: 80rpx;
-		margin-right: 20rpx;
-	}
-	.shop-button {
-		border-radius: 100rpx;
-		padding: 10rpx 20rpx;
-		color: $color-red;
-		border: 1px solid $color-red;
-		font-size: $font-lg;
-		line-height: 1;
+
+	// 商店头
+	.shop-box {
+		background-color: #ffffff;
+		margin-top: 20rpx;
+		margin-bottom: 10rpx;
+		padding: 20rpx;
+
+		.shop-img {
+			border-radius: 300rpx;
+			height: 80rpx;
+			width: 80rpx;
+			margin-right: 20rpx;
+		}
+
+		.shop-button {
+			border-radius: 100rpx;
+			padding: 10rpx 20rpx;
+			color: $color-red;
+			border: 1px solid $color-red;
+			font-size: $font-lg;
+			line-height: 1;
+		}
 	}
-}
-</style>
+</style>

pages/user/user.vue

@@ -5,33 +5,51 @@
 		<!-- #endif -->
 		<!-- <scroll-view class="content-box" scroll-y="true"> -->
 		<view class="user-section">
-			<view class="bg"><image src="../../static/user/ground.png" mode=""></image></view>
+			<view class="bg">
+				<image src="../../static/user/ground.png" mode=""></image>
+			</view>
 			<!-- top -->
 			<view class="user-box">
 				<view class="user-info-box ">
 					<view class="detail flex" @click="navTo('/pages/userinfo/userinfo')">
-						<view class="portrait-box"><image class="portrait" :src="userInfo.avatar || '/static/error/missing-face.png'"></image></view>
+						<view class="portrait-box">
+							<image class="portrait" :src="userInfo.avatar || '/static/error/missing-face.png'"></image>
+						</view>
 						<view class="info-box">
 							<view class="username">{{ userInfo.nickname || '游客' }}</view>
-							<view class="font-size-sm" v-if="userInfo.uid">邀请码:{{ userInfo.uid }}<text v-if="userInfo.level == 1" style="color: #5dbc7c;margin-left: 10rpx;">会员</text><text v-if="userInfo.level == 2" style="color: #dab176;margin-left: 10rpx;">副店长</text><text v-if="userInfo.level == 3" style="color: #dab176;margin-left: 10rpx;">店长</text></view>
-							<view class="font-size-sm" style="color: #5dbc7c;" v-if="userInfo.level == 1 && userInfo.service == 0">{{'会员股权:' + userInfo.vip.stock_rights + '  消费股权:' + userInfo.vip.consume_rights}}</view>
+							<view class="font-size-sm" v-if="userInfo.uid">邀请码:{{ userInfo.uid }}<text
+									v-if="userInfo.level == 1" style="color: #5dbc7c;margin-left: 10rpx;">会员</text><text
+									v-if="userInfo.level == 2"
+									style="color: #dab176;margin-left: 10rpx;">副店长</text><text
+									v-if="userInfo.level == 3" style="color: #dab176;margin-left: 10rpx;">店长</text>
+							</view>
+							<view class="font-size-sm" style="color: #5dbc7c;"
+								v-if="userInfo.level == 1 && userInfo.service == 0">
+								{{'会员股权:' + userInfo.vip.stock_rights + '  消费股权:' + userInfo.vip.consume_rights}}
+							</view>
 						</view>
 					</view>
 					<view class="config">
-						<view class="setting " @click="navTo('/pages/userinfo/userinfo')"><image src="../../static/user/set.png" mode=""></image></view>
+						<view class="setting " @click="navTo('/pages/userinfo/userinfo')">
+							<image src="../../static/user/set.png" mode=""></image>
+						</view>
 						设置
 					</view>
 				</view>
 				<view class="sy-box flex">
 					<view class="sy-item">
 						<view class="sy-item-name">团队等级</view>
-						<view class="sy-item-val">{{ userInfo.group_level_info != null? userInfo.group_level_info.name : '无' }}</view>
-					</view>        
+						<view class="sy-item-val">
+							{{ userInfo.group_level_info != null? userInfo.group_level_info.name : '无' }}
+						</view>
+					</view>
 					<view class="jg"></view>
 					<view class="sy-item">
 						<view class="sy-item-name">极差奖励等级</view>
 						<!-- <view class="sy-item-val">{{jcdj}}</view> -->
-						<view class="sy-item-val">{{userInfo.award_level_info!= null? userInfo.award_level_info.name : '无'}}</view>
+						<view class="sy-item-val">
+							{{userInfo.award_level_info!= null? userInfo.award_level_info.name : '无'}}
+						</view>
 					</view>
 					<view class="jg"></view>
 					<view class="sy-item">
@@ -44,27 +62,33 @@
 		</view>
 		<view class="item-box">
 			<image class="arc" src="/static/img/arc.png"></image>
-			<view class="mendian" >
+			<view class="mendian">
 				<view class="mendian-lift" v-if="userInfo.level == 1 && userInfo.service == 0">
-					<view class="img"><image src="../../static/img/mendian01.png" mode=""></image></view>
+					<view class="img">
+						<image src="../../static/img/mendian01.png" mode=""></image>
+					</view>
 					<text class="null-mendian">{{ userInfo.store_name}}</text>
 				</view>
 				<view class="mendian-lift" v-else>
 				</view>
 				<view class="mendian-lift" @click="openhym" v-if="userInfo.vip &&userInfo.vip.card_no">
-					NO:{{userInfo.vip.card_no}}<image src="../../static/icon/hym.png" mode="" class="hym" >
+					NO:{{userInfo.vip.card_no}}
+					<image src="../../static/icon/hym.png" mode="" class="hym">
 				</view>
 				<view class="mendian-lift" @click="openhym" v-else>
-					NO:{{userInfo.SN}}<image src="../../static/icon/hym.png" mode="" class="hym" >
+					NO:{{userInfo.SN}}
+					<image src="../../static/icon/hym.png" mode="" class="hym">
 				</view>
 			</view>
 			<view class="my-order">
 				<view class="box-title flex borde-b">
 					<view class="title"><text>我的订单</text></view>
-					<view class="link" @click="navTo('/pages/order/order?state=5')" hover-class="common-hover"><text class="iconfont iconenter"></text></view>
+					<view class="link" @click="navTo('/pages/order/order?state=5')" 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=1')" hover-class="common-hover" :hover-stay-time="50">
+					<view class="order-item" @click="navTo('/pages/order/order?state=1')" hover-class="common-hover"
+						:hover-stay-time="50">
 						<view class=" icon1 position-relative">
 							<image class="icon-img" src="/static/icon/i2.png" mode="aspectFit"></image>
 							<view class="corner" v-if="orderInfo.unshipped_count > 0">
@@ -73,7 +97,8 @@
 						</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="order-item" @click="navTo('/pages/order/order?state=2')" hover-class="common-hover"
+						:hover-stay-time="50">
 						<view class="icon1 position-relative">
 							<image class="icon-img" src="/static/icon/i3.png" mode="aspectFit"></image>
 							<view class="corner" v-if="orderInfo.received_count > 0">
@@ -82,7 +107,8 @@
 						</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="order-item" @click="navTo('/pages/order/order?state=3')" hover-class="common-hover"
+						:hover-stay-time="50">
 						<view class="icon1 position-relative">
 							<image class="icon-img" src="/static/icon/i4.png" mode="aspectFit"></image>
 							<view class="corner" v-if="orderInfo.evaluated_count > 0">
@@ -91,12 +117,42 @@
 						</view>
 						<text>待评价</text>
 					</view>
-					<view class="order-item" @click="navTo('/pages/order/refundOrder?state=0')" hover-class="common-hover" :hover-stay-time="50">
-						<view class=" icon1 position-relative"><image class="icon-img" src="/static/icon/i1.png" mode="aspectFit"></image></view>
+					<view class="order-item" @click="navTo('/pages/order/refundOrder?state=0')"
+						hover-class="common-hover" :hover-stay-time="50">
+						<view class=" icon1 position-relative">
+							<image class="icon-img" src="/static/icon/i1.png" mode="aspectFit"></image>
+						</view>
 						<text>退款</text>
 					</view>
 				</view>
 			</view>
+			<view class="my-order">
+				<view class="box-title flex borde-b">
+					<view class="title"><text>我的单数</text></view>
+				</view>
+				<view class="order-section">
+					<view class="order-item">
+						<view class="order-num">
+							{{userInfo.suit_num || 0}}
+						</view>
+						<text>套装单数</text>
+					</view>
+					<view class="xian"></view>
+					<view class="order-item">
+						<view class="order-num">
+							{{userInfo.recommend_suit_num || 0}}
+						</view>
+						<text>直推单数</text>
+					</view>
+					<view class="xian"></view>
+					<view class="order-item">
+						<view class="order-num">
+							{{userInfo.group_suit_num || 0}}
+						</view>
+						<text>团队单数</text>
+					</view>
+				</view>
+			</view>
 		</view>
 		<!-- <view class="cover-container"> -->
 		<view class="vip" @click="navTo('/pages/wallet/openMember')"></view>
@@ -105,35 +161,55 @@
 
 		<view class="item-box " v-if="isShowIllegality">
 			<view class="order-section  order">
-				<view class="order-item" @click="navTo('/pages/wallet/wallet')" hover-class="common-hover" :hover-stay-time="50">
-					<view class=" icon position-relative"><image class="icon-img" src="../../static/user/balance.png" mode="aspectFit"></image></view>
+				<view class="order-item" @click="navTo('/pages/wallet/wallet')" hover-class="common-hover"
+					:hover-stay-time="50">
+					<view class=" icon position-relative">
+						<image class="icon-img" src="../../static/user/balance.png" mode="aspectFit"></image>
+					</view>
 					<text>我的余额</text>
 				</view>
-				 <view class="order-item" @click="navTo('/pages/award/award')" hover-class="common-hover" :hover-stay-time="50">
-					<view class=" icon position-relative"><image class="icon-img" src="../../static/user/commission.png" mode="aspectFit"></image></view>
+				<view class="order-item" @click="navTo('/pages/award/award')" hover-class="common-hover"
+					:hover-stay-time="50">
+					<view class=" icon position-relative">
+						<image class="icon-img" src="../../static/user/commission.png" mode="aspectFit"></image>
+					</view>
 					<text>我的佣金</text>
-				</view> 
-				<view class="order-item" @click="navTo('/pages/coupon/consumer')" hover-class="common-hover" :hover-stay-time="50">
-					<view class=" icon position-relative"><image class="icon-img" src="../../static/user/coupon.png" mode="aspectFit"></image></view>
+				</view>
+				<view class="order-item" @click="navTo('/pages/coupon/consumer')" hover-class="common-hover"
+					:hover-stay-time="50">
+					<view class=" icon position-relative">
+						<image class="icon-img" src="../../static/user/coupon.png" mode="aspectFit"></image>
+					</view>
 					<text>我的消费券</text>
 				</view>
-				<view class="order-item" @click="navTo('/pages/scoreAccumulate/scoreAccumulate')" hover-class="common-hover" :hover-stay-time="50">
-					<view class=" icon position-relative"><image class="icon-img" src="../../static/user/integral.png" mode="aspectFit"></image></view>
+				<view class="order-item" @click="navTo('/pages/scoreAccumulate/scoreAccumulate')"
+					hover-class="common-hover" :hover-stay-time="50">
+					<view class=" icon position-relative">
+						<image class="icon-img" src="../../static/user/integral.png" mode="aspectFit"></image>
+					</view>
 					<text>我的积分</text>
 				</view>
 			</view>
 			<!-- 浏览历史 -->
 			<view class="history-section ">
 				<uni-list>
-					<uni-list-item v-if="isShowIllegality" title="我的推广" @click="navTo('/pages/myteam/myteam')" thumb="/static/user/tuiguang.png"></uni-list-item>
-					<uni-list-item title="邀请海报" @click="navTo('/pages/shareQrCode/index')" thumb="/static/user/haibao.png"></uni-list-item>
-					<uni-list-item title="兑换会员卡" @click="go" thumb="/static/icon/czhy.png" v-if="userInfo.level == 0"></uni-list-item>
+					<uni-list-item v-if="isShowIllegality" title="我的推广" @click="navTo('/pages/myteam/myteam')"
+						thumb="/static/user/tuiguang.png"></uni-list-item>
+					<uni-list-item title="邀请海报" @click="navTo('/pages/shareQrCode/index')"
+						thumb="/static/user/haibao.png"></uni-list-item>
+					<uni-list-item title="兑换会员卡" @click="go" thumb="/static/icon/czhy.png"
+						v-if="userInfo.level == 0"></uni-list-item>
 					<!-- <uni-list-item title="兑换会员卡" @click="go" thumb="/static/icon/czhy.png"></uni-list-item> -->
-					<uni-list-item title="我的收藏" @click="navTo('/pages/favorites/favorites')" thumb="/static/user/collect.png"></uni-list-item>
-					<uni-list-item title="百业推广" @click="navTo('/pages/myteam/myteamQian')" thumb="/static/user/tui.png"></uni-list-item>
-					<uni-list-item title="收货地址" @click="navTo('/pages/address/address')" thumb="/static/user/address.png"></uni-list-item>
-					<uni-list-item title="商家入口" @click="navTo('/pages/merchant/merchant')" thumb="/static/user/shopping.png" v-if="userInfo.service == 1 || type==1"></uni-list-item>
-					<uni-list-item :title="'商家入驻'+(type==-1?'':type==0?'(审核中)':type==1?'(成功)':'(失败)')" @click="navTo('/pages/merchant/becomeShop')" thumb="/static/user/complete.png"></uni-list-item>
+					<uni-list-item title="我的收藏" @click="navTo('/pages/favorites/favorites')"
+						thumb="/static/user/collect.png"></uni-list-item>
+					<uni-list-item title="百业推广" @click="navTo('/pages/myteam/myteamQian')"
+						thumb="/static/user/tui.png"></uni-list-item>
+					<uni-list-item title="收货地址" @click="navTo('/pages/address/address')"
+						thumb="/static/user/address.png"></uni-list-item>
+					<uni-list-item title="商家入口" @click="navTo('/pages/merchant/merchant')"
+						thumb="/static/user/shopping.png" v-if="userInfo.service == 1 || type==1"></uni-list-item>
+					<uni-list-item :title="'商家入驻'+(type==-1?'':type==0?'(审核中)':type==1?'(成功)':'(失败)')"
+						@click="navTo('/pages/merchant/becomeShop')" thumb="/static/user/complete.png"></uni-list-item>
 				</uni-list>
 			</view>
 		</view>
@@ -144,10 +220,9 @@
 					我的会员码
 				</view>
 				<view class="hym-val">
-					<tki-qrcode :key="hym" cid="tki-qrcode-canvas" ref="qrcode"
-						:val="hym" :size="300" unit="upx" background="#ffffff"
-						foreground="#333333" pdground="#333333" icon="" :iconSize="0" :lv="3" :onval="true"
-						:loadMake="true" :usingComponents="true" />
+					<tki-qrcode :key="hym" cid="tki-qrcode-canvas" ref="qrcode" :val="hym" :size="300" unit="upx"
+						background="#ffffff" foreground="#333333" pdground="#333333" icon="" :iconSize="0" :lv="3"
+						:onval="true" :loadMake="true" :usingComponents="true" />
 				</view>
 				<view class="hym-num">
 					会员编号：{{hym}}
@@ -158,16 +233,20 @@
 			<view class="popup-box">
 				<view class="img">
 					<view class="img-font">兑换会员卡</view>
-					<view class="img-bg"><image src="../../static/img/img009.png" mode=""></image></view>
+					<view class="img-bg">
+						<image src="../../static/img/img009.png" mode=""></image>
+					</view>
 				</view>
 				<view class="mian">
 					<view class="main-item">
 						<view class="font">卡号</view>
-						<input type="text" v-model="card" class="input" placeholder="请输入卡号" placeholder-class="input-font" />
+						<input type="text" v-model="card" class="input" placeholder="请输入卡号"
+							placeholder-class="input-font" />
 					</view>
 					<view class="main-item" style="margin-top: 40rpx;">
 						<view class="font">密码</view>
-						<input type="password" v-model="pwd" placeholder="请输入密码" class="input" placeholder-class="input-font" />
+						<input type="password" v-model="pwd" placeholder="请输入密码" class="input"
+							placeholder-class="input-font" />
 					</view>
 					<view class="main-item" style="margin-top: 40rpx;">
 						<view class="font">选择门店</view>
@@ -183,840 +262,933 @@
 	</view>
 </template>
 <script>
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
-import { verification,storeIndex } from '@/api/merchant.js';
-import { mapState, mapMutations } from 'vuex';
-import uniList from '@/components/uni-list/uni-list.vue';
-import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
-import { orderData, orderVerific } from '@/api/user.js';
-import { getUserInfo } from '@/api/login.js';
-import tkiQrcodes from '@/components/tki-qrcode/tki-qrcode.vue';
-let startY = 0,
-	moveY = 0,
-	pageAtTop = true;
-export default {
-	components: {
-		uniList,
-		uniListItem,
-		uniPopup,
-		tkiQrcodes
-	},
-	data() {
-		return {
-			type: -1,//-1无事发生0审核中1成功2失败
-			hym: '',//会员编号
-			coverTransform: 'translateY(0px)',
-			coverTransition: '0s',
-			moving: false,
-			userDowm: 0, //卡片升级专属高度
-			userMaxDowm: 0, //卡片最高高度
-			orderinfo: {
-				complete_count: 0,
-				received_count: 0,
-				unshipped_count: 0,
-				order_count: 0
-			},
-			// 判断是否已经点击过一次取消关注公众号
-			watchful: true,
-			card: '',
-			pwd: '',
-			// storeInfo: {
-			// 	name: ''
-			// },
-			qrsize: 80, // 二维码大小
-			cid: 'tki-qrcode-canvas', //canvasId，页面存在多个二维码组件时需设置不同的ID
-			size: 500, //生成的二维码大小
-			unit: 'upx', //大小单位尺寸
-			// show: true,//默认使用组件中的image标签显示二维码
-			val: '', //要生成的内容
-			background: '#ffffff', //二维码背景色
-			foreground: '#333333', //二维码前景色
-			pdground: '#333333', //二维码角标色
-			icon: '', //二维码图标URL（必须是本地图片，网络图需要先下载至本地）
-			iconSize: 40, //二维码图标大小
-			lv: 3, //容错级别
-			onval: true, //监听val值变化自动重新生成二维码
-			loadMake: false, //组件初始化完成后自动生成二维码，val需要有值
-			usingComponents: false, //是否使用了自定义组件模式（主要是为了修复非自定义组件模式时 v-if 无法生成二维码的问题）
-			showLoading: true, //是否显示loading
-			loadingText: '二维码生成中', //loading文字
-			src: '', // 二维码生成后的图片地址或base64
-			ratio: 1, //页面比例用于计算
-			ctxSrc: '', //要显示的图片
-			loading: true, //是否载入图片中
-		};
-	},
-	onShow() {
-		// 判断是否已经登录
-		if (this.hasLogin) {
-			this.loadBaseData();
-		}
-	},
-	onReady() {
-		// 初始化获取页面宽度
-		uni.createSelectorQuery()
-			.select('.container')
-			.fields(
-				{
-					size: true
+	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+	import {
+		verification,
+		storeIndex
+	} from '@/api/merchant.js';
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	import uniList from '@/components/uni-list/uni-list.vue';
+	import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
+	import {
+		orderData,
+		orderVerific
+	} from '@/api/user.js';
+	import {
+		getUserInfo
+	} from '@/api/login.js';
+	import tkiQrcodes from '@/components/tki-qrcode/tki-qrcode.vue';
+	let startY = 0,
+		moveY = 0,
+		pageAtTop = true;
+	export default {
+		components: {
+			uniList,
+			uniListItem,
+			uniPopup,
+			tkiQrcodes
+		},
+		data() {
+			return {
+				type: -1, //-1无事发生0审核中1成功2失败
+				hym: '', //会员编号
+				coverTransform: 'translateY(0px)',
+				coverTransition: '0s',
+				moving: false,
+				userDowm: 0, //卡片升级专属高度
+				userMaxDowm: 0, //卡片最高高度
+				orderinfo: {
+					complete_count: 0,
+					received_count: 0,
+					unshipped_count: 0,
+					order_count: 0
 				},
-				data => {
-					// 计算最多下拉的高度
-					this.userDowm = Math.floor((data.width / 750) * 200);
-					// 计算最大触发修改高度事件
-					this.userMaxDowm = Math.floor((data.width / 750) * 250);
-				}
-			)
-			.exec();
-	},
-	computed: {
-		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin']),
-		jcdj(){
-			if(this.userInfo.award_level_info != null) {
-				if(this.userInfo.group_level_info != null){
-					return this.userInfo.award_level_info.id < this.userInfo.group_level_info.id ? this.userInfo.award_level_info.name : this.userInfo.group_level_info.name
-				} else {
-					return this.userInfo.award_level_info.name
-				}
-			}else {
-				if(this.userInfo.group_level_info != null){
-					return this.userInfo.group_level_info.name
-				}else {
-					return '无'
-				}
-			}
-			
+				// 判断是否已经点击过一次取消关注公众号
+				watchful: true,
+				card: '',
+				pwd: '',
+				// storeInfo: {
+				// 	name: ''
+				// },
+				qrsize: 80, // 二维码大小
+				cid: 'tki-qrcode-canvas', //canvasId，页面存在多个二维码组件时需设置不同的ID
+				size: 500, //生成的二维码大小
+				unit: 'upx', //大小单位尺寸
+				// show: true,//默认使用组件中的image标签显示二维码
+				val: '', //要生成的内容
+				background: '#ffffff', //二维码背景色
+				foreground: '#333333', //二维码前景色
+				pdground: '#333333', //二维码角标色
+				icon: '', //二维码图标URL（必须是本地图片，网络图需要先下载至本地）
+				iconSize: 40, //二维码图标大小
+				lv: 3, //容错级别
+				onval: true, //监听val值变化自动重新生成二维码
+				loadMake: false, //组件初始化完成后自动生成二维码，val需要有值
+				usingComponents: false, //是否使用了自定义组件模式（主要是为了修复非自定义组件模式时 v-if 无法生成二维码的问题）
+				showLoading: true, //是否显示loading
+				loadingText: '二维码生成中', //loading文字
+				src: '', // 二维码生成后的图片地址或base64
+				ratio: 1, //页面比例用于计算
+				ctxSrc: '', //要显示的图片
+				loading: true, //是否载入图片中
+			};
 		},
-		// #ifdef H5
-		...mapState(['weichatObj']),
-		// #endif
-		...mapState(['isShowIllegality','canChange','storeInfo'])
-	},
-	methods: {
-		...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
-		// 打开会员码
-		openhym() {
-			if(this.userInfo.vip.card_no){
-				this.hym = this.userInfo.vip.card_no
-			}else {
-				this.hym = this.userInfo.SN
+		onShow() {
+			// 判断是否已经登录
+			if (this.hasLogin) {
+				this.loadBaseData();
 			}
-			this.$refs.hympop.open()
-			
 		},
-		// 加载初始数据
-		loadBaseData() {
-			let obj = this;
-			getUserInfo({})
-				.then(({ data }) => {
-					orderData({})
-						.then(({ data }) => {
-							obj.setOrderInfo(data);
-						})
-						.catch(e => {
-							obj.setOrderInfo({
-								complete_count: 0, //完成
-								received_count: 0, //待收货
-								unshipped_count: 0, //待发货
-								order_count: 0, //订单总数
-								unpaid_count: 0 //待付款
+		onReady() {
+			// 初始化获取页面宽度
+			uni.createSelectorQuery()
+				.select('.container')
+				.fields({
+						size: true
+					},
+					data => {
+						// 计算最多下拉的高度
+						this.userDowm = Math.floor((data.width / 750) * 200);
+						// 计算最大触发修改高度事件
+						this.userMaxDowm = Math.floor((data.width / 750) * 250);
+					}
+				)
+				.exec();
+		},
+		computed: {
+			...mapState('user', ['userInfo', 'orderInfo', 'hasLogin']),
+			jcdj() {
+				if (this.userInfo.award_level_info != null) {
+					if (this.userInfo.group_level_info != null) {
+						return this.userInfo.award_level_info.id < this.userInfo.group_level_info.id ? this.userInfo
+							.award_level_info.name : this.userInfo.group_level_info.name
+					} else {
+						return this.userInfo.award_level_info.name
+					}
+				} else {
+					if (this.userInfo.group_level_info != null) {
+						return this.userInfo.group_level_info.name
+					} else {
+						return '无'
+					}
+				}
+
+			},
+			// #ifdef H5
+			...mapState(['weichatObj']),
+			// #endif
+			...mapState(['isShowIllegality', 'canChange', 'storeInfo'])
+		},
+		methods: {
+			...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
+			// 打开会员码
+			openhym() {
+				if (this.userInfo.vip.card_no) {
+					this.hym = this.userInfo.vip.card_no
+				} else {
+					this.hym = this.userInfo.SN
+				}
+				this.$refs.hympop.open()
+
+			},
+			// 加载初始数据
+			loadBaseData() {
+				let obj = this;
+				getUserInfo({})
+					.then(({
+						data
+					}) => {
+						orderData({})
+							.then(({
+								data
+							}) => {
+								obj.setOrderInfo(data);
+							})
+							.catch(e => {
+								obj.setOrderInfo({
+									complete_count: 0, //完成
+									received_count: 0, //待收货
+									unshipped_count: 0, //待发货
+									order_count: 0, //订单总数
+									unpaid_count: 0 //待付款
+								});
 							});
-						});
-					obj.setUserInfo(data);
+						obj.setUserInfo(data);
 
-					// 判断是否已经关注公众号
-					if (data.wechat.subscribe == 0 && obj.watchful) {
-						uni.showModal({
-							title: '温馨提醒',
-							content: '为提供更好的服务，请关注公众号。',
-							success: res => {
-								obj.watchful = false;
-								// 判断是否点击了确认
-								if (res.confirm) {
-									uni.navigateTo({
-										url: '/pages/shareQrCode/wechatQr'
-									});
+						// 判断是否已经关注公众号
+						if (data.wechat.subscribe == 0 && obj.watchful) {
+							uni.showModal({
+								title: '温馨提醒',
+								content: '为提供更好的服务，请关注公众号。',
+								success: res => {
+									obj.watchful = false;
+									// 判断是否点击了确认
+									if (res.confirm) {
+										uni.navigateTo({
+											url: '/pages/shareQrCode/wechatQr'
+										});
+									}
 								}
-							}
-						});
-					}
-				})
-				.catch(e => {
-					console.log(e);
-				});
-				storeIndex({}).then(e =>{
-					if(!e.data.apply){
+							});
+						}
+					})
+					.catch(e => {
+						console.log(e);
+					});
+				storeIndex({}).then(e => {
+					if (!e.data.apply) {
 						obj.type = -1;
-						if(e.data.store_info) {
+						if (e.data.store_info) {
 							obj.type = 1;
 						}
-					}else {
+					} else {
 						obj.type = e.data.apply.status;
 					}
 				})
-		},
-		/**
-		 * 统一跳转接口,拦截未登录路由
-		 * navigator标签现在默认没有转场动画，所以用view
-		 */
-		navTo(url) {
-			if (!this.hasLogin) {
-				url = '/pages/public/login';
-				// #ifdef H5
-				let weichatBrowser = uni.getStorageSync('weichatBrowser');
-				// 判断是否为微信浏览器
-				if (weichatBrowser) {
+			},
+			/**
+			 * 统一跳转接口,拦截未登录路由
+			 * navigator标签现在默认没有转场动画，所以用view
+			 */
+			navTo(url) {
+				if (!this.hasLogin) {
+					url = '/pages/public/login';
+					// #ifdef H5
+					let weichatBrowser = uni.getStorageSync('weichatBrowser');
+					// 判断是否为微信浏览器
+					if (weichatBrowser) {
+						url = '/pages/public/wxLogin';
+					}
+					// #endif
+					// #ifdef MP-WEIXIN
 					url = '/pages/public/wxLogin';
+					// #endif
+				}
+				uni.navigateTo({
+					url
+				});
+			},
+			/**
+			 *  会员卡下拉和回弹
+			 *  1.关闭bounce避免ios端下拉冲突
+			 *  2.由于touchmove事件的缺陷（以前做小程序就遇到，比如20跳到40，h5反而好很多），下拉的时候会有掉帧的感觉
+			 *    transition设置0.1秒延迟，让css来过渡这段空窗期
+			 *  3.回弹效果可修改曲线值来调整效果，推荐一个好用的bezier生成工具 http://cubic-bezier.com/
+			 */
+			coverTouchstart(e) {
+				// console.log(e);
+				if (pageAtTop === false) {
+					return;
 				}
-				// #endif
-				// #ifdef MP-WEIXIN
-				url = '/pages/public/wxLogin';
-				// #endif
-			}
-			uni.navigateTo({
-				url
-			});
-		},
-		/**
-		 *  会员卡下拉和回弹
-		 *  1.关闭bounce避免ios端下拉冲突
-		 *  2.由于touchmove事件的缺陷（以前做小程序就遇到，比如20跳到40，h5反而好很多），下拉的时候会有掉帧的感觉
-		 *    transition设置0.1秒延迟，让css来过渡这段空窗期
-		 *  3.回弹效果可修改曲线值来调整效果，推荐一个好用的bezier生成工具 http://cubic-bezier.com/
-		 */
-		coverTouchstart(e) {
-			// console.log(e);
-			if (pageAtTop === false) {
-				return;
-			}
 
-			this.coverTransition = 'transform .1s linear';
-			startY = e.touches[0].clientY;
-		},
-		coverTouchmove(e) {
-			// console.log(e);
-			moveY = e.touches[0].clientY;
-			let moveDistance = moveY - startY;
-			let maxDowm = this.userMaxDowm;
-			let Dowm = this.userDowm;
-			if (moveDistance < 0) {
-				this.moving = false;
-				return;
-			}
-			this.moving = true;
-			if (moveDistance >= Dowm && moveDistance < maxDowm) {
-				moveDistance = Dowm;
-			}
+				this.coverTransition = 'transform .1s linear';
+				startY = e.touches[0].clientY;
+			},
+			coverTouchmove(e) {
+				// console.log(e);
+				moveY = e.touches[0].clientY;
+				let moveDistance = moveY - startY;
+				let maxDowm = this.userMaxDowm;
+				let Dowm = this.userDowm;
+				if (moveDistance < 0) {
+					this.moving = false;
+					return;
+				}
+				this.moving = true;
+				if (moveDistance >= Dowm && moveDistance < maxDowm) {
+					moveDistance = Dowm;
+				}
 
-			if (moveDistance > 0 && moveDistance <= Dowm) {
-				this.coverTransform = `translateY(${moveDistance}px)`;
-			}
-		},
-		coverTouchend() {
-			if (this.moving === false) {
-				return;
-			}
-			this.moving = false;
-			this.coverTransition = 'transform 0.3s cubic-bezier(.21,1.93,.53,.64)';
-			this.coverTransform = 'translateY(0px)';
-		},
-		// 核销
-		openQr() {
-			let obj = this;
-			// #ifndef H5
-			uni.scanCode({
-				success(e) {
-					obj.orderVerific(e.result);
+				if (moveDistance > 0 && moveDistance <= Dowm) {
+					this.coverTransform = `translateY(${moveDistance}px)`;
 				}
-			});
-			// #endif
-			// #ifdef H5
-			this.weichatObj.scanQRCode({
-				needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
-				scanType: ['qrCode', 'barCode'], // 可以指定扫二维码还是一维码，默认二者都有
-				success: function(res) {
-					obj.orderVerific(res.resultStr); // 当needResult 为 1 时，扫码返回的结果
+			},
+			coverTouchend() {
+				if (this.moving === false) {
+					return;
 				}
-			});
-			// #endif
-		},
-		// 核销请求
-		orderVerific(data) {
-			orderVerific({
-				verify_code: data
-			})
-				.then(e => {
-					uni.showModal({
-						title: '核销',
-						content: '已核销成功',
-						showCancel: false
-					});
-				})
-				.catch(e => {
-					uni.showModal({
-						title: '错误',
-						content: JSON.stringify(e),
-						showCancel: false
-					});
-					console.log(e);
+				this.moving = false;
+				this.coverTransition = 'transform 0.3s cubic-bezier(.21,1.93,.53,.64)';
+				this.coverTransform = 'translateY(0px)';
+			},
+			// 核销
+			openQr() {
+				let obj = this;
+				// #ifndef H5
+				uni.scanCode({
+					success(e) {
+						obj.orderVerific(e.result);
+					}
 				});
-		},
-		// 选择门店
-		chooseStore() {
-			if(this.canChange == 0) {
-				return
-			}else {
-				uni.navigateTo({
-					url: '/pages/shoping/list?type=3'
+				// #endif
+				// #ifdef H5
+				this.weichatObj.scanQRCode({
+					needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
+					scanType: ['qrCode', 'barCode'], // 可以指定扫二维码还是一维码，默认二者都有
+					success: function(res) {
+						obj.orderVerific(res.resultStr); // 当needResult 为 1 时，扫码返回的结果
+					}
 				});
+				// #endif
+			},
+			// 核销请求
+			orderVerific(data) {
+				orderVerific({
+						verify_code: data
+					})
+					.then(e => {
+						uni.showModal({
+							title: '核销',
+							content: '已核销成功',
+							showCancel: false
+						});
+					})
+					.catch(e => {
+						uni.showModal({
+							title: '错误',
+							content: JSON.stringify(e),
+							showCancel: false
+						});
+						console.log(e);
+					});
+			},
+			// 选择门店
+			chooseStore() {
+				if (this.canChange == 0) {
+					return
+				} else {
+					uni.navigateTo({
+						url: '/pages/shoping/list?type=3'
+					});
+				}
+
+			},
+			go() {
+				this.$refs.popup.open();
+			},
+			cancel() {
+				this.$refs.popup.close();
+				this.card = '';
+				this.pwd = '';
+				// this.storeInfo = { name: '' };
+			},
+			comfirm() {
+				verification({
+						card_number: this.card,
+						card_password: this.pwd,
+						type: 0,
+						is_confirm: 1,
+						reg_store_id: this.storeInfo.id
+					})
+					.then(e => {
+						console.log(e);
+						this.card = '';
+						this.pwd = '';
+						// this.storeInfo = { name: '' };
+						this.loadBaseData()
+					})
+					.catch(e => {
+						console.log(e);
+						this.card = '';
+						this.pwd = '';
+						// this.storeInfo = { name: '' };
+					});
+				this.$refs.popup.close();
 			}
-			
-		},
-		go() {
-			this.$refs.popup.open();
-		},
-		cancel() {
-			this.$refs.popup.close();
-			this.card = '';
-			this.pwd = '';
-			// this.storeInfo = { name: '' };
-		},
-		comfirm() {
-			verification({
-				card_number: this.card,
-				card_password: this.pwd,
-				type: 0,
-				is_confirm: 1,
-				reg_store_id: this.storeInfo.id
-			})
-				.then(e => {
-					console.log(e);
-					this.card = '';
-					this.pwd = '';
-					// this.storeInfo = { name: '' };
-					this.loadBaseData()
-				})
-				.catch(e => {
-					console.log(e);
-					this.card = '';
-					this.pwd = '';
-					// this.storeInfo = { name: '' };
-				});
-			this.$refs.popup.close();
 		}
-	}
-};
+	};
 </script>
 <style lang="scss">
-%flex-center {
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	align-items: center;
-}
-%section {
-	display: flex;
-	justify-content: space-around;
-	align-content: center;
-	background: #fff;
-	border-radius: 10rpx;
-}
-.container {
-	height: 100%;
-	background-color: #ffffff;
-	/* #ifdef APP-PLUS */
-	.bar-height {
-		height: var(--status-bar-height);
-		background-color: $base-color;
+	%flex-center {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
 	}
-	/* #endif */
-}
-.content-box {
-	height: 100%;
-}
-
-.user-section {
-	height: 435rpx;
-	padding: 60rpx 0 0 0;
-	position: relative;
-	.bg {
-		position: absolute;
-		height: 480rpx;
-		width: 100%;
-		left: 0;
-		top: 0;
-		image {
-			width: 100%;
-			height: 100%;
-		}
-		// background-color: $base-color;
+
+	%section {
+		display: flex;
+		justify-content: space-around;
+		align-content: center;
+		background: #fff;
+		border-radius: 10rpx;
 	}
-}
-.user-box {
-	position: relative;
-	z-index: 0;
-	margin: 0 auto;
-	width: 90%;
-	background-color: #e9f8f1;
-}
-.user-info-box {
-	width: 100%;
-	padding-left: 20rpx;
-	margin: 0 auto;
-	display: flex;
-	align-items: stretch;
-	border-radius: 20rpx;
-	color: white;
-	display: flex;
-	justify-content: space-between;
-	
-	.detail {
-		margin: 20rpx 0 0 0;
-		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;
-			color: black;
-			.username {
-				font-size: $font-lg + 6rpx;
-				height: 100%;
-			}
+
+	.container {
+		height: 100%;
+		background-color: #ffffff;
+
+		/* #ifdef APP-PLUS */
+		.bar-height {
+			height: var(--status-bar-height);
+			background-color: $base-color;
 		}
+
+		/* #endif */
 	}
-	.config {
-		margin-top: 60rpx;
-		font-size: 28rpx;
-		font-family: PingFang SC;
-		font-weight: 500;
-		color: #52c696;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		width: 165rpx;
-		height: 64rpx;
-		background: #ffffff;
-		border-radius: 32px 0px 0px 32px;
-		.setting {
-			width: 32rpx;
-			height: 32rpx;
+
+	.content-box {
+		height: 100%;
+	}
+
+	.user-section {
+		height: 435rpx;
+		padding: 60rpx 0 0 0;
+		position: relative;
+
+		.bg {
+			position: absolute;
+			height: 480rpx;
+			width: 100%;
+			left: 0;
+			top: 0;
+
 			image {
 				width: 100%;
 				height: 100%;
 			}
 
-			// margin-right: 51rpx;
-		}
-	}
-	
-}
-
-.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;
-			font-size: 30rpx;
+			// background-color: $base-color;
 		}
 	}
-	.e-b {
-		font-size: $font-sm;
-		color: #d8cba9;
-		margin-top: 10rpx;
-	}
-}
-.vip {
-	margin: 0 30rpx;
-	margin-top: -50rpx;
-	height: 170rpx;
-	background-image: url('../../static/user/upgrade.png');
-	background-size: 100% 170rpx;
-}
-.cover-container {
-	display: flex;
-	flex-direction: column;
-	background: $page-color-base;
-	padding: 0 30rpx;
-	position: relative;
-	background: #f5f5f5;
-	padding-bottom: 20rpx;
-	margin-top: -110rpx;
-
-	.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;
+
+	.user-box {
+		position: relative;
+		z-index: 0;
+		margin: 0 auto;
+		width: 90%;
+		background-color: #e9f8f1;
 	}
-}
-
-.item-box {
-	position: relative;
-	background-color: white;
-	top: -80rpx;
-	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-	.arc {
-		position: absolute;
-		left: 0;
-		top: -34rpx;
+
+	.user-info-box {
 		width: 100%;
-		height: 36rpx;
-	}
-	.mendian {
-		padding: 0 40rpx;
-		height: 60rpx;
-		background-color: #ffffff;
+		padding-left: 20rpx;
+		margin: 0 auto;
+		display: flex;
+		align-items: stretch;
+		border-radius: 20rpx;
+		color: white;
 		display: flex;
 		justify-content: space-between;
-		align-items: center;
-		margin-bottom: 20rpx;
-		.mendian-lift {
-			display: flex;
-			line-height: 36rpx;
-			.null-mendian {
-				font-size: 28rpx;
-				font-weight: bold;
+
+		.detail {
+			margin: 20rpx 0 0 0;
+			height: 130rpx;
+
+			.portrait-box {
+				height: 100%;
+
+				.portrait {
+					width: 130rpx;
+					height: 100%;
+					border: 5rpx solid #fff;
+					border-radius: 50%;
+				}
 			}
-			.hym {
-				width: 40rpx;
-				height: 40rpx;
-				margin-left: 10rpx;
+
+			.info-box {
+				margin-left: 20rpx;
+				line-height: 1.5;
+				color: black;
+
+				.username {
+					font-size: $font-lg + 6rpx;
+					height: 100%;
+				}
 			}
-			.img {
-				margin: 0 10rpx 0;
-				width: 36rpx;
-				height: 36rpx;
+		}
+
+		.config {
+			margin-top: 60rpx;
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #52c696;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			width: 165rpx;
+			height: 64rpx;
+			background: #ffffff;
+			border-radius: 32px 0px 0px 32px;
+
+			.setting {
+				width: 32rpx;
+				height: 32rpx;
 
 				image {
 					width: 100%;
 					height: 100%;
 				}
+
+				// margin-right: 51rpx;
 			}
 		}
 
-		.mendian-right {
-			display: flex;
-			align-items: center;
-			// line-height: 60rpx;
-			.duihuan {
-				font-size: 24rpx;
+	}
+
+	.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;
+				font-size: 30rpx;
 			}
 		}
+
+		.e-b {
+			font-size: $font-sm;
+			color: #d8cba9;
+			margin-top: 10rpx;
+		}
 	}
-	.my-order {
-		width: 680rpx;
-		margin: auto;
-		// margin-top: 10rpx;
-		// padding: 0 20rpx;
-		border-radius: 20rpx;
-		box-shadow: 0px 0px 5px rgba(0,0,0,0.2);
+
+	.vip {
+		margin: 0 30rpx;
+		margin-top: -50rpx;
+		height: 170rpx;
+		background-image: url('../../static/user/upgrade.png');
+		background-size: 100% 170rpx;
 	}
-	.box-title {
-		line-height: 1;
-		padding: 30rpx;
-		.title {
-			font-size: $font-lg;
-			font-weight: bold;
-		}
-		.link {
-			font-size: $font-base - 2rpx;
-			color: $font-color-light;
+
+	.cover-container {
+		display: flex;
+		flex-direction: column;
+		background: $page-color-base;
+		padding: 0 30rpx;
+		position: relative;
+		background: #f5f5f5;
+		padding-bottom: 20rpx;
+		margin-top: -110rpx;
+
+		.arc {
+			position: absolute;
+			left: 0;
+			top: -34rpx;
+			width: 100%;
+			height: 36rpx;
 		}
 	}
-	// .order{
-	// 	margin-top: 70rpx;
-	// }
-	.order-section {
+
+	.tj-sction {
 		@extend %section;
-		padding: 28rpx 0;
 
-		.order-item {
+		.tj-item {
 			@extend %flex-center;
-			// width: 120rpx;
-			width: 25%;
-			height: 120rpx;
-			border-radius: 10rpx;
+			flex-direction: column;
+			height: 140rpx;
 			font-size: $font-sm;
+			color: #75787d;
+		}
+
+		.num {
+			font-size: $font-lg;
 			color: $font-color-dark;
+			margin-bottom: 8rpx;
 		}
-		.iconfont {
-			font-size: 48rpx;
-			margin-bottom: 18rpx;
-			color: #fa436a;
+	}
+
+	.item-box {
+		position: relative;
+		background-color: white;
+		top: -80rpx;
+		box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+
+		.arc {
+			position: absolute;
+			left: 0;
+			top: -34rpx;
+			width: 100%;
+			height: 36rpx;
 		}
-		.icon-shouhoutuikuan {
-			font-size: 44rpx;
+
+		.mendian {
+			padding: 0 40rpx;
+			height: 60rpx;
+			background-color: #ffffff;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-bottom: 20rpx;
+
+			.mendian-lift {
+				display: flex;
+				line-height: 36rpx;
+
+				.null-mendian {
+					font-size: 28rpx;
+					font-weight: bold;
+				}
+
+				.hym {
+					width: 40rpx;
+					height: 40rpx;
+					margin-left: 10rpx;
+				}
+
+				.img {
+					margin: 0 10rpx 0;
+					width: 36rpx;
+					height: 36rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+			}
+
+			.mendian-right {
+				display: flex;
+				align-items: center;
+
+				// line-height: 60rpx;
+				.duihuan {
+					font-size: 24rpx;
+				}
+			}
 		}
-		.icon {
-			height: 88rpx;
-			width: 90rpx;
-			margin-bottom: 18rpx;
-			background-size: 100%;
-			background-repeat: no-repeat;
-			background-position: center;
-			.icon-img {
-				width: 100%;
-				height: 100%;
+
+		.my-order {
+			width: 680rpx;
+			margin: 40rpx auto 0;
+			// margin-top: 10rpx;
+			// padding: 0 20rpx;
+			border-radius: 20rpx;
+			box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.2);
+		}
+
+		.box-title {
+			line-height: 1;
+			padding: 30rpx;
+
+			.title {
+				font-size: $font-lg;
+				font-weight: bold;
+			}
+
+			.link {
+				font-size: $font-base - 2rpx;
+				color: $font-color-light;
 			}
 		}
-		.icon1 {
-			height: 50rpx;
-			width: 48rpx;
-			margin-bottom: 18rpx;
-			background-size: 100%;
-			background-repeat: no-repeat;
-			background-position: center;
-			.icon-img {
-				width: 100%;
-				height: 100%;
+
+		// .order{
+		// 	margin-top: 70rpx;
+		// }
+		.order-section {
+			@extend %section;
+			padding: 40rpx 0;
+			align-items: center;
+
+			.order-item {
+				@extend %flex-center;
+				// width: 120rpx;
+				width: 25%;
+				border-radius: 10rpx;
+				font-size: $font-sm;
+				color: $font-color-dark;
+
+			}
+
+			.xian {
+				height: 30rpx;
+				width: 1rpx;
+				background: #000000;
+			}
+
+			.order-num {
+				font-size: $font-sm + 10rpx;
+				margin-bottom: 10rpx;
+			}
+
+			.iconfont {
+				font-size: 48rpx;
+				margin-bottom: 18rpx;
+				color: #fa436a;
+			}
+
+			.icon-shouhoutuikuan {
+				font-size: 44rpx;
+			}
+
+			.icon {
+				height: 88rpx;
+				width: 90rpx;
+				margin-bottom: 18rpx;
+				background-size: 100%;
+				background-repeat: no-repeat;
+				background-position: center;
+
+				.icon-img {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.icon1 {
+				height: 50rpx;
+				width: 48rpx;
+				margin-bottom: 18rpx;
+				background-size: 100%;
+				background-repeat: no-repeat;
+				background-position: center;
+
+				.icon-img {
+					width: 100%;
+					height: 100%;
+				}
 			}
 		}
 	}
-}
-
-.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;
+
+	.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;
-		image {
-			display: inline-block;
-			width: 160rpx;
-			height: 160rpx;
-			margin-right: 20rpx;
-			border-radius: 10rpx;
-		}
-	}
-}
-.popup-box {
-	width: 650rpx;
-	padding-bottom: 30rpx;
-	background-color: #ffffff;
-	border-radius: 20rpx;
-	position: relative;
-	.img {
-		position: relative;
-		top: -56rpx;
-		left: 0;
-		width: 650rpx;
-		height: 132rpx;
-		z-index: 100;
-		text-align: center;
-		line-height: 132rpx;
-		.img-bg {
-			position: absolute;
-			left: 50%;
-			top: 0;
-			margin-left: -250rpx;
-			border-radius: 20rpx 20rpx 0 0;
-			width: 500rpx;
-			height: 132rpx;
+
+		.h-list {
+			white-space: nowrap;
+			padding: 30rpx 30rpx 0;
+
 			image {
-				width: 100%;
-				height: 100%;
+				display: inline-block;
+				width: 160rpx;
+				height: 160rpx;
+				margin-right: 20rpx;
+				border-radius: 10rpx;
 			}
 		}
-		.img-font {
-			line-height: 120rpx;
-			position: relative;
-			z-index: 10;
-			text-align: center;
-			font-size: 32rpx;
-			font-weight: bold;
-			color: #54300f;
-		}
 	}
 
-	.mian {
-		margin-top: -10rpx;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		// padding: 32rpx 32rpx;
+	.popup-box {
+		width: 650rpx;
+		padding-bottom: 30rpx;
 		background-color: #ffffff;
-		border-radius: 0 0 20rpx 20rpx;
-		text-align: center;
-		padding: 20rpx;
-		width: 100%;
-		.main-item {
-			display: flex;
-			width: 580rpx;
-			align-items: center;
-			padding: 20rpx 40rpx;
-			border-radius: 10rpx;
-			background: #f5f2e5;
-			height: 100rpx;
-			.font {
-				color: #623324;
-				font-size: 30rpx;
-			}
-			.input {
-				margin-left: 20rpx;
-				text-align: left;
-				color: #cdc0b3;
-				font-size: 28rpx;
+		border-radius: 20rpx;
+		position: relative;
+
+		.img {
+			position: relative;
+			top: -56rpx;
+			left: 0;
+			width: 650rpx;
+			height: 132rpx;
+			z-index: 100;
+			text-align: center;
+			line-height: 132rpx;
+
+			.img-bg {
+				position: absolute;
+				left: 50%;
+				top: 0;
+				margin-left: -250rpx;
+				border-radius: 20rpx 20rpx 0 0;
+				width: 500rpx;
+				height: 132rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
 			}
-			.input-font {
-				color: #cdc0b3;
-				font-size: 28rpx;
+
+			.img-font {
+				line-height: 120rpx;
+				position: relative;
+				z-index: 10;
+				text-align: center;
+				font-size: 32rpx;
+				font-weight: bold;
+				color: #54300f;
 			}
 		}
 
-		.comfirm-box {
-			margin-top: 80rpx;
+		.mian {
+			margin-top: -10rpx;
 			display: flex;
-			// margin-bottom: 32rpx;
+			flex-direction: column;
+			align-items: center;
+			// padding: 32rpx 32rpx;
+			background-color: #ffffff;
+			border-radius: 0 0 20rpx 20rpx;
+			text-align: center;
+			padding: 20rpx;
+			width: 100%;
 
-			// justify-content: space-around;
-			.cancel {
+			.main-item {
 				display: flex;
+				width: 580rpx;
 				align-items: center;
-				justify-content: center;
-				width: 260rpx;
+				padding: 20rpx 40rpx;
+				border-radius: 10rpx;
+				background: #f5f2e5;
 				height: 100rpx;
-				border: 1px solid #dcc786;
-				border-radius: 10px;
 
-				font-size: 32rpx;
-				color: #605128;
+				.font {
+					color: #623324;
+					font-size: 30rpx;
+				}
+
+				.input {
+					margin-left: 20rpx;
+					text-align: left;
+					color: #cdc0b3;
+					font-size: 28rpx;
+				}
+
+				.input-font {
+					color: #cdc0b3;
+					font-size: 28rpx;
+				}
 			}
 
-			.comfirm {
-				margin-left: 60rpx;
+			.comfirm-box {
+				margin-top: 80rpx;
 				display: flex;
-				align-items: center;
-				justify-content: center;
-				width: 260rpx;
-				height: 100rpx;
-				background: linear-gradient(-90deg, #d1ba77 0%, #f7e8ad 100%);
-				border-radius: 10px;
-				font-size: 32rpx;
-				color: #605128;
+				// margin-bottom: 32rpx;
+
+				// justify-content: space-around;
+				.cancel {
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					width: 260rpx;
+					height: 100rpx;
+					border: 1px solid #dcc786;
+					border-radius: 10px;
+
+					font-size: 32rpx;
+					color: #605128;
+				}
+
+				.comfirm {
+					margin-left: 60rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					width: 260rpx;
+					height: 100rpx;
+					background: linear-gradient(-90deg, #d1ba77 0%, #f7e8ad 100%);
+					border-radius: 10px;
+					font-size: 32rpx;
+					color: #605128;
+				}
 			}
 		}
 	}
-}
-.hym-wrap {
-	width: 500rpx;
-	height: 500rpx;
-	background-color: #fff;
-	text-align: center;
-	border-radius: 20rpx;
-	.hym-tit {
-		color: $base-color;
-		padding: 20rpx 0;
-		font-size: 48rpx;
-	}
-	.hym-val {
-		width: 300rpx;
-		height: 300rpx;
-		margin: auto;
-	}
-	.hym-num {
-		font-size: 28rpx;
-		font-weight: bold;
-		padding-top: 20rpx;
-	}
-}
-.sy-box {
-	height: 148rpx;
-	// background-color: #bfa;
-	.sy-item {
-		width: 30%;
-		flex-grow: 1;
+
+	.hym-wrap {
+		width: 500rpx;
+		height: 500rpx;
+		background-color: #fff;
 		text-align: center;
-		font-size: 24rpx;
-		font-family: PingFang SC;
-		font-weight: 500;
-		color: #3bbc88;
-		.sy-item-val {
-			margin-top: 6rpx;
-			font-size: 28rpx;
+		border-radius: 20rpx;
+
+		.hym-tit {
+			color: $base-color;
+			padding: 20rpx 0;
+			font-size: 48rpx;
+		}
+
+		.hym-val {
+			width: 300rpx;
+			height: 300rpx;
+			margin: auto;
 		}
-		.sy-item-name {
-			color: #000000;
+
+		.hym-num {
+			font-size: 28rpx;
+			font-weight: bold;
+			padding-top: 20rpx;
 		}
 	}
-	.jg {
-		width: 2rpx;
-		height: 40rpx;
-		background-color: #d4ded8;
+
+	.sy-box {
+		height: 148rpx;
+
+		// background-color: #bfa;
+		.sy-item {
+			width: 30%;
+			flex-grow: 1;
+			text-align: center;
+			font-size: 24rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #3bbc88;
+
+			.sy-item-val {
+				margin-top: 6rpx;
+				font-size: 28rpx;
+			}
+
+			.sy-item-name {
+				color: #000000;
+			}
+		}
+
+		.jg {
+			width: 2rpx;
+			height: 40rpx;
+			background-color: #d4ded8;
+		}
 	}
-}
-</style>
+</style>