diff --git a/App.vue b/App.vue
index 3705ce8..cb17a2b 100644
--- a/App.vue
+++ b/App.vue
@@ -30,6 +30,7 @@
 		data() {
 			return {
 				audioTeam: [],
+				timer: null
 			}
 		},
 		globalData: {
@@ -108,22 +109,6 @@
 				// console.log("jpush连接", connectEnable)
 			})
 
-
-			// 设置别名
-			// jpushModule.setAlias({
-			// 	'alias': uni.getStorageSync('userId'),
-			// 	'sequence': 1
-			// })
-			//
-			// jpushModule.addTagAliasListener(result => {
-			// 	let code = result.code
-			// 	let sequence = result.sequence
-			// 	let tags = result.tags
-			// 	let tag = result.tag
-			// 	let tagEnable = result.tagEnable
-			// 	let alias = result.alias
-			// 	console.log(alias, '别名')
-			// })
 			// 通知事件回调
 			jpushModule.addNotificationListener(result => {
 				let notificationEventType = result.notificationEventType
@@ -132,8 +117,6 @@
 				let content = result.content
 				let extras = result.extras
 
-				console.log("通知", result)
-
 				if (result.extras.type == 'ORDER_CREATE' && result.extras.mp3.length > 0) {
 					if (result.extras.mp3[0] == '微信') this.audioTeam.push('/static/audio/wechat.MP3')
 					if (result.extras.mp3[0] == '支付宝') this.audioTeam.push('/static/audio/pay.MP3')
@@ -287,37 +270,24 @@
 		methods: {
 			//网络检测
 			checknetwork() {
-
 				uni.onNetworkStatusChange(function(res) {
-
 					if (res.isConnected) {
-
 						uni.reLaunch({
 							url: '/pages/index/index'
 						})
-
 					} else {
-
+						let that = this;
 						uni.showModal({
-
 							title: '系统提示',
-
 							content: '当前设备无网络或网络较差',
-
 							cancelText: '取消',
-
 							confirmText: '确定',
-
 							success: (res) => {
-
 								if (res.confirm) {
-
+									that.timer = null;
 									uni.reLaunch({
-
 										url: '/pages/index/index'
-
 									})
-
 								} else {
 
 									// #ifdef H5
@@ -325,25 +295,17 @@
 									uni.navigateTo({
 										url: '/pages/users/login/login_copy'
 									})
-
 									// #endif
 
 									// #ifdef APP-PLUS
-
+									that.timer = null;
 									plus.runtime.quit()
-
 									// #endif
-
 								}
-
 							}
-
 						})
-
 					}
-
 				})
-
 			},
 			/**
 			 * 语音播报
diff --git a/api/order.js b/api/order.js
index 49cb8fd..06b76cd 100644
--- a/api/order.js
+++ b/api/order.js
@@ -9,6 +9,14 @@
 // +----------------------------------------------------------------------
 import request from "@/utils/request.js";
 
+/**
+ * 退款订单
+ * @param numType 
+ */
+export function refundListNew(data) {
+	return request.get("refund/list", data);
+}
+
 /**
  * 校验支付密码是否正确
  * @param numType 
diff --git a/api/store.js b/api/store.js
index 2965e37..e4b2f32 100644
--- a/api/store.js
+++ b/api/store.js
@@ -300,6 +300,19 @@ export function getStoreCategory(id, data) {
 		noAuth: true
 	});
 }
+
+/**
+ * 新获取商品分类
+ * @param {Object} id 商铺 id
+ * @param {Object} data
+ */
+export function getProductCategoryList(data) {
+	return request.get("store/product/category/index", data, {
+		noAuth: true
+	});
+}
+
+
 /**
  * 关注商铺
  * @param {Object} type_id 商铺 id
diff --git a/components/addcartWindow/index.vue b/components/addcartWindow/index.vue
index 7392081..71de4ea 100644
--- a/components/addcartWindow/index.vue
+++ b/components/addcartWindow/index.vue
@@ -1,9 +1,11 @@
 <template>
 	<view :style="viewColor">
-		<view class="product-window" :class="(attr.cartAttr === true ? 'on' : '') + ' ' + (iSbnt || destri?'join':'') + ' ' + (isPresell ?'presell-window':'product-window')">
+		<view class="product-window"
+			:class="(attr.cartAttr === true ? 'on' : '') + ' ' + (iSbnt || destri?'join':'') + ' ' + (isPresell ?'presell-window':'product-window')">
 			<view class="textpic acea-row row-between-wrapper">
 				<view class="pictrue">
-					<image :src="(attr.productSelect&&attr.productSelect.image) ? attr.productSelect.image : ''" @click="loookImg"></image>
+					<image :src="(attr.productSelect&&attr.productSelect.image) ? attr.productSelect.image : ''"
+						@click="loookImg"></image>
 				</view>
 				<view class="text">
 					<view class="line1">
@@ -13,7 +15,8 @@
 						<view>
 							预售价
 							￥<text class="num">{{ attr.productSelect.price }}</text>
-							<text v-if="presell_type === 2">定金￥<text class="num">{{ attr.productSelect.down_price }}</text></text>
+							<text v-if="presell_type === 2">定金￥<text
+									class="num">{{ attr.productSelect.down_price }}</text></text>
 						</view>
 						<text class="stock" v-if='isShow'>库存: {{ attr.productSelect.stock }}</text>
 						<text class='stock' v-if="limitNum">限量: {{attr.productSelect.quota_show}}</text>
@@ -22,11 +25,12 @@
 						<view class="acea-row row-middle">
 							<view class="acea-row row-middle">
 								<text>￥</text><text class="num">{{ attr.productSelect.price }}</text>
-								<view v-if="attr.productSelect && attr.productSelect.svip_price" class="acea-row row-middle">
-									<text class='vip-money'>￥{{attr.productSelect.svip_price}}</text>
+								<view v-if="attr.productSelect && attr.productSelect.svip_price"
+									class="acea-row row-middle">
+									<!-- <text class='vip-money'>￥{{attr.productSelect.svip_price}}</text>
 									<view class="vipImg">
 										<image :src="`${domain}/static/images/svip.png`"></image>
-									</view>
+									</view> -->
 								</view>
 							</view>
 						</view>
@@ -41,9 +45,9 @@
 			<view class="productWinList">
 				<view class="item" v-for="(item, indexw) in attr.productAttr" :key="indexw">
 					<view class="title">{{ item.attr_name }}</view>
-					<view class="listn acea-row row-middle">	
-						<view class="itemn" :class="item.index === itemn.attr ? 'on' : ''" v-for="(itemn, indexn) in item.attr_value"
-						 @click="tapAttr(indexw, indexn)" :key="indexn">
+					<view class="listn acea-row row-middle">
+						<view class="itemn" :class="item.index === itemn.attr ? 'on' : ''"
+							v-for="(itemn, indexn) in item.attr_value" @click="tapAttr(indexw, indexn)" :key="indexn">
 							{{ itemn.attr }}
 						</view>
 					</view>
@@ -67,8 +71,12 @@
 	// +----------------------------------------------------------------------
 	// | Author: CRMEB Team <admin@crmeb.com>
 	// +----------------------------------------------------------------------
-	import { mapGetters } from "vuex";
-	import { HTTP_REQUEST_URL } from '@/config/app';
+	import {
+		mapGetters
+	} from "vuex";
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app';
 	export default {
 		computed: mapGetters(['viewColor']),
 		props: {
@@ -114,11 +122,10 @@
 				domain: HTTP_REQUEST_URL,
 			}
 		},
-		mounted(){
-		},
+		mounted() {},
 		methods: {
 			//  查看大图
-			loookImg(){
+			loookImg() {
 				let self = this
 				let arr = [self.attr.productSelect.image ? self.attr.productSelect.image : self.image]
 				uni.previewImage({
@@ -172,72 +179,89 @@
 		padding-bottom: calc(140rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
 		transform: translate3d(0, 100%, 0);
 		transition: all .3s cubic-bezier(.25, .5, .5, .9);
+
 		&.presell-window {
 			padding-bottom: 200rpx;
 		}
 	}
+
 	.product-window.on {
 		transform: translate3d(0, 0, 0);
 	}
+
 	.product-window.join {
 		padding-bottom: 30rpx;
 	}
+
 	.product-window .textpic {
 		padding: 0 80rpx 0 30rpx;
 		margin-top: 29rpx;
 		position: relative;
 	}
+
 	.product-window .textpic .pictrue {
 		width: 150rpx;
 		height: 150rpx;
 	}
+
 	.product-window .textpic .pictrue image {
 		width: 100%;
 		height: 100%;
 		border-radius: 10rpx;
 	}
+
 	.product-window .textpic .text {
 		width: 460rpx;
 		font-size: 32rpx;
 		color: #202020;
 	}
+
 	.product-window .textpic .text .money {
 		font-size: 24rpx;
 		margin-top: 40rpx;
 		color: var(--view-priceColor);
 	}
+
 	.product-window .textpic .text .money .num {
 		font-size: 36rpx;
 	}
+
 	.product-window .textpic .text .money .stock {
 		color: #999;
 		margin-left: 18rpx;
 	}
+
 	.vip-money {
 		color: #282828;
 		font-size: 22rpx;
 		margin-left: 6rpx;
 	}
+
 	.vipImg {
 		width: 65rpx;
 		height: 28rpx;
 		margin-left: 4rpx;
+
 		image {
 			width: 100%;
 			height: 100%;
 			display: block;
 		}
 	}
+
 	.product-window .textpic .text .presell_price {
 		color: #FF7F00;
+
 		.num {
 			display: inline-block;
 			margin-right: 20rpx;
 		}
+
 		.stock {
 			margin-left: 0;
 		}
 	}
+
 	.product-window .textpic .iconfont {
 		position: absolute;
 		right: 30rpx;
@@ -245,22 +269,27 @@
 		font-size: 35rpx;
 		color: #8a8a8a;
 	}
+
 	.product-window .productWinList {
 		max-height: 395rpx;
 		overflow: auto;
 		margin-top: 36rpx;
 	}
+
 	.product-window .productWinList .item~.item {
 		margin-top: 36rpx;
 	}
+
 	.product-window .productWinList .item .title {
 		font-size: 30rpx;
 		color: #999;
 		padding: 0 30rpx;
 	}
+
 	.product-window .productWinList .item .listn {
 		padding: 0 30rpx 0 16rpx;
 	}
+
 	.product-window .productWinList .item .listn .itemn {
 		border: 1px solid #bbb;
 		font-size: 26rpx;
@@ -269,11 +298,13 @@
 		border-radius: 6rpx;
 		margin: 14rpx 0 0 14rpx;
 	}
+
 	.product-window .productWinList .item .listn .itemn.on {
 		color: #fff;
 		background-color: var(--view-theme);
 		border-color: var(--view-theme);
 	}
+
 	.product-window .cart {
 		margin-top: 36rpx;
 		padding: 0 30rpx;
@@ -286,14 +317,17 @@
 		-ms-flex-pack: justify;
 		justify-content: space-between;
 	}
+
 	.product-window .cart .title {
 		font-size: 30rpx;
 		color: #999;
 		line-height: 54rpx;
 	}
+
 	.product-window .cart .carnum {
 		height: 54rpx;
 	}
+
 	.product-window .cart .carnum view {
 		border: 1px solid #a4a4a4;
 		width: 84rpx;
@@ -303,28 +337,34 @@
 		color: #a4a4a4;
 		font-size: 45rpx;
 	}
+
 	.product-window .cart .carnum .reduce {
 		border-right: 0;
 		border-radius: 6rpx 0 0 6rpx;
 		line-height: 48rpx;
 	}
+
 	.product-window .cart .carnum .reduce.on {
 		border-color: #e3e3e3;
 		color: #dedede;
 	}
+
 	.product-window .cart .carnum .plus {
 		border-left: 0;
 		border-radius: 0 6rpx 6rpx 0;
 		line-height: 46rpx;
 	}
+
 	.product-window .cart .carnum .plus.on {
 		border-color: #e3e3e3;
 		color: #dedede;
 	}
+
 	.product-window .cart .carnum .num {
 		color: #282828;
 		font-size: 28rpx;
 	}
+
 	.product-window .joinBnt {
 		font-size: 30rpx;
 		width: 620rpx;
@@ -334,13 +374,15 @@
 		line-height: 86rpx;
 		color: #fff;
 		margin: 100rpx auto 0 auto;
-		&.b-color{
+
+		&.b-color {
 			background-color: var(--view-theme);
 		}
 	}
+
 	.product-window .joinBnt.on {
 		background-color: #bbb;
 		color: #fff;
 		background-image: none;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/components/addressWindow/index.vue b/components/addressWindow/index.vue
index de545a3..36735b7 100644
--- a/components/addressWindow/index.vue
+++ b/components/addressWindow/index.vue
@@ -3,12 +3,15 @@
 		<view class="address-window" :class="address.address==true?'on':''">
 			<view class='title'>选择地址<text class='iconfont icon-guanbi' @tap='close'></text></view>
 			<scroll-view scroll-y="true" class='list'>
-				<view class='item acea-row row-between-wrapper' :class='active==index?"t-color":""' v-for="(item,index) in addressList"
-				 @tap='tapAddress(index,item.address_id)' :key='index'>
+				<view class='item acea-row row-between-wrapper' :class='active==index?"t-color":""'
+					v-for="(item,index) in addressList" @tap='tapAddress(index,item.address_id)' :key='index'>
 					<text class='iconfont icon-ditu' :class='active==index?"t-color":""'></text>
 					<view class='address'>
-						<view class='name' :class='active==index?"t-color":""'>{{item.real_name}}<text class='phone'>{{item.phone}}</text></view>
-						<view class='line1'>{{item.province}}{{item.city}}{{item.district}}{{item.street || ''}}{{item.detail}}</view>
+						<view class='name' :class='active==index?"t-color":""'>{{item.real_name}}<text
+								class='phone'>{{item.phone}}</text></view>
+						<view class='line1'>
+							{{item.province}}{{item.city}}{{item.district}}{{item.street || ''}}{{item.detail}}
+						</view>
 					</view>
 					<text class='iconfont icon-complete' :class='active==index?"t-color":""'></text>
 				</view>
@@ -34,9 +37,15 @@
 	// +----------------------------------------------------------------------
 	// | Author: CRMEB Team <admin@crmeb.com>
 	// +----------------------------------------------------------------------
-	import { getAddressList } from '@/api/user.js';
-	import { mapGetters } from "vuex";
-	import { HTTP_REQUEST_URL } from '@/config/app';
+	import {
+		getAddressList
+	} from '@/api/user.js';
+	import {
+		mapGetters
+	} from "vuex";
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app';
 	export default {
 		props: {
 			pagesUrl: {
@@ -87,7 +96,7 @@
 				let that = this;
 				getAddressList({
 					page: 1,
-					limit: 5
+					limit: 100
 				}).then(res => {
 					let addressList = res.data.list;
 					//处理默认选中项
@@ -114,9 +123,11 @@
 		transform: translate3d(0, 100%, 0);
 		transition: all .3s cubic-bezier(.25, .5, .5, .9);
 	}
+
 	.address-window.on {
 		transform: translate3d(0, 0, 0);
 	}
+
 	.address-window .title {
 		font-size: 32rpx;
 		font-weight: bold;
@@ -125,15 +136,18 @@
 		line-height: 123rpx;
 		position: relative;
 	}
+
 	.address-window .title .iconfont {
 		position: absolute;
 		right: 30rpx;
 		color: #8a8a8a;
 		font-size: 35rpx;
 	}
-	.address-window .list{
+
+	.address-window .list {
 		max-height: 650rpx;
 	}
+
 	.address-window .list .item {
 		margin-left: 30rpx;
 		padding-right: 30rpx;
@@ -142,26 +156,32 @@
 		font-size: 25rpx;
 		color: #333;
 	}
+
 	.address-window .list .item .iconfont {
 		font-size: 37rpx;
 		color: #2c2c2c;
 	}
+
 	.address-window .list .item .iconfont.icon-complete {
 		font-size: 30rpx;
 		color: #fff;
 	}
+
 	.address-window .list .item .address {
 		width: 560rpx;
 	}
+
 	.address-window .list .item .address .name {
 		font-size: 28rpx;
 		font-weight: bold;
 		color: #282828;
 		margin-bottom: 4rpx;
 	}
+
 	.address-window .list .item .address .name .phone {
 		margin-left: 18rpx;
 	}
+
 	.address-window .addressBnt {
 		font-size: 30rpx;
 		font-weight: bold;
@@ -174,17 +194,22 @@
 		margin: 85rpx auto;
 		background-color: var(--view-theme);
 	}
+
 	.address-window .pictrue {
 		text-align: center;
 	}
-	.address-window .pictrue image,.address-window .pictrue uni-image {
+
+	.address-window .pictrue image,
+	.address-window .pictrue uni-image {
 		width: 414rpx;
 		height: 305rpx;
 	}
-	.address-window .pictrue view{	
+
+	.address-window .pictrue view {
 		color: #999;
 	}
+
 	.t-color {
-		color: var(--view-theme)!important;
+		color: var(--view-theme) !important;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/components/customTab.vue b/components/customTab.vue
index ef96390..3ce94ae 100644
--- a/components/customTab.vue
+++ b/components/customTab.vue
@@ -3,8 +3,7 @@
 		<view v-if="newData.status && newData.status.status" style="height: 100rpx;"></view>
 		<view class="foot" v-if="newData.status && newData.status.status">
 			<view class="page-footer" id="target" :style="{'background-color':newData.bgColor.color[0].item}">
-				<view class="foot-item" v-for="(item,index) in newData.menuList" :key="index"
-					@click="goRouter(item)">
+				<view class="foot-item" v-for="(item,index) in newData.menuList" :key="index" @click="goRouter(item)">
 					<block v-if="item.link == activeRouter">
 						<image :src="item.imgList[0]"></image>
 						<view class="txt" :style="{color:newData.activeTxtColor.color[0].item}">{{item.name}}
@@ -30,7 +29,7 @@
 	// +----------------------------------------------------------------------
 	// | Author: CRMEB Team <admin@crmeb.com>
 	// +----------------------------------------------------------------------
-	export default{
+	export default {
 		props: {
 			newData: {
 				type: Object,
@@ -41,15 +40,15 @@
 				default: '',
 			}
 		},
-		data(){
+		data() {
 			return {
-				
+
 			}
 		},
 		mounted() {
-			
+
 		},
-		methods:{	
+		methods: {
 			goRouter(item) {
 				var pages = getCurrentPages();
 				var page = (pages[pages.length - 1]).$page.fullPath;
@@ -65,7 +64,6 @@
 			},
 		}
 	}
-	
 </script>
 
 <style lang="scss" scoped>
@@ -85,9 +83,11 @@
 		box-shadow: 0px 0px 17rpx 1rpx rgba(206, 206, 206, 0.32);
 		padding-bottom: constant(safe-area-inset-bottom); ///兼容 IOS<11.2/
 		padding-bottom: env(safe-area-inset-bottom); ///兼容 IOS>11.2/
-		&.filter{
+
+		&.filter {
 			filter: blur(2rpx);
 		}
+
 		.foot-item {
 			display: flex;
 			width: max-content;
@@ -95,6 +95,7 @@
 			justify-content: center;
 			flex-direction: column;
 			position: relative;
+
 			.count-num {
 				position: absolute;
 				display: flex;
@@ -111,14 +112,16 @@
 				padding: 4rpx;
 			}
 		}
+
 		.foot-item image {
 			height: 50rpx;
 			width: 50rpx;
 			text-align: center;
 			margin: 0 auto;
 		}
+
 		.foot-item .txt {
 			font-size: 24rpx;
 		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/components/easy-loadimage/easy-loadimage.vue b/components/easy-loadimage/easy-loadimage.vue
index 508ccbf..10b135f 100644
--- a/components/easy-loadimage/easy-loadimage.vue
+++ b/components/easy-loadimage/easy-loadimage.vue
@@ -1,56 +1,63 @@
 <template>
-    <view class="easy-loadimage" :id="uid">
-        <image class="origin-img" :src="imageSrc" mode="aspectFill" v-if="loadImg&&!isLoadError" v-show="showImg"
-        	:class="{'no-transition':!openTransition,'show-transition':showTransition&&openTransition}"
-        	@load="handleImgLoad" @error="handleImgError">
-        </image>
-       <view class="loadfail-img" v-else-if="isLoadError" :style="{ 'background-image': `url(${domain}/static/images/loadfail.png)`}"></view>
-       <view :class="['loading-img','spin-circle',loadingMode]" v-show="!showImg&&!isLoadError" :style="{ 'background-image': `url(${domain}/static/images/loading.gif)`}"></view>
-    </view>
+	<view class="easy-loadimage" :id="uid">
+		<image class="origin-img" :src="imageSrc" mode="aspectFill" v-if="loadImg&&!isLoadError" v-show="showImg"
+			:class="{'no-transition':!openTransition,'show-transition':showTransition&&openTransition}"
+			@load="handleImgLoad" @error="handleImgError">
+		</image>
+		<view class="loadfail-img" v-else-if="isLoadError"
+			:style="{ 'background-image': `url(${domain}/static/easy-loadimage/loadfail.png)`}"></view>
+		<view :class="['loading-img','spin-circle',loadingMode]" v-show="!showImg&&!isLoadError"
+			:style="{ 'background-image': `url(${domain}/static/easy-loadimage/loading.gif)`}"></view>
+	</view>
 </template>
 <script>
-// +----------------------------------------------------------------------
-// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
-// +----------------------------------------------------------------------
-// | Author: CRMEB Team <admin@crmeb.com>
-// +----------------------------------------------------------------------
-import { throttle } from '@/libs/uniApi';
-import { HTTP_REQUEST_URL } from '@/config/app';
-// 生成全局唯一id
-function generateUUID() {
-    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
-        let r = Math.random()*16|0, v = c == 'x' ? r : (r&0x3|0x8);
-        return v.toString(16);
-    })
-}
-export default{
-    props:{
-			imageSrc:{
+	// +----------------------------------------------------------------------
+	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+	// +----------------------------------------------------------------------
+	// | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved.
+	// +----------------------------------------------------------------------
+	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+	// +----------------------------------------------------------------------
+	// | Author: CRMEB Team <admin@crmeb.com>
+	// +----------------------------------------------------------------------
+	import {
+		throttle
+	} from '@/libs/uniApi';
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app';
+	// 生成全局唯一id
+	function generateUUID() {
+		return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+			let r = Math.random() * 16 | 0,
+				v = c == 'x' ? r : (r & 0x3 | 0x8);
+			return v.toString(16);
+		})
+	}
+	export default {
+		props: {
+			imageSrc: {
 				type: String,
 			},
-			mode:{
+			mode: {
 				type: String,
 			},
-			loadingMode:{
+			loadingMode: {
 				type: String,
-				default:'looming-gray'
+				default: 'looming-gray'
 			},
-			openTransition:{
+			openTransition: {
 				type: Boolean,
-				default:true,
+				default: true,
 			},
-			viewHeight:{
-				type:Number,
-				default() {
-						return uni.getSystemInfoSync().windowHeight;
+			viewHeight: {
+				type: Number,
+				default () {
+					return uni.getSystemInfoSync().windowHeight;
 				}
 			}
-    },
-    data(){
+		},
+		data() {
 			const that = this;
 			return {
 				domain: HTTP_REQUEST_URL,
@@ -65,7 +72,7 @@ export default{
 					if (that.loadImg || that.isLoadError) return;
 					const id = that.uid
 					const query = uni.createSelectorQuery().in(that);
-          let t = 0;
+					let t = 0;
 					query.select('#' + id).boundingClientRect(data => {
 						if (!data) return;
 						if (data.top - that.viewHeight < 0) {
@@ -75,15 +82,15 @@ export default{
 					}).exec()
 				}, 200)
 			}
-    },
-    methods:{
+		},
+		methods: {
 			init() {
 				this.$nextTick(this.onScroll)
 			},
-			handleBorderLoad(){
+			handleBorderLoad() {
 				this.borderLoaded = 1;
 			},
-			handleBorderError(){
+			handleBorderError() {
 				this.borderLoaded = 2;
 			},
 			handleImgLoad(e) {
@@ -98,88 +105,107 @@ export default{
 			onScroll() {
 				this.scrollFn();
 			},
-    },
-    mounted() {
-      this.init()
-      uni.$on('scroll', this.scrollFn);
-      this.onScroll();
-    },
+		},
+		mounted() {
+			this.init()
+			uni.$on('scroll', this.scrollFn);
+			this.onScroll();
+		},
 		beforeDestroy() {
 			uni.$off('scroll', this.scrollFn);
 		}
-}
+	}
 </script>
 
 <style scoped>
-    /* 官方优化图片tips */
-    image{
-        will-change: transform
-    } 
-    /* 渐变过渡效果处理 */
-    image.origin-img{
-			width: 100%;
-			height: 100%;
-			opacity: 0.3;
-			max-height: 360rpx;
-    }
-    image.origin-img.show-transition{
-			transition: opacity .5s;
-			opacity: 1;
-    }
-    image.origin-img.no-transition{
-      opacity: 1;
-    }
-    /* 加载失败、加载中的占位图样式控制 */
-    .loadfail-img{
-			 height: 100%;
-			 background-repeat: no-repeat;
-			 background-size: 50%;
-			 background-position: center;
-    }
-    .loading-img{
-      height: 100%;
-			background-position: center;
-    }
-    /* 转圈 */
-    .spin-circle{
-			background-repeat: no-repeat;
-			background-size: 60%;
-    }
-    /* 动态灰色若隐若现 */
-    .looming-gray{
-			animation: looming-gray 1s infinite linear;
-			background-color: #e3e3e3;
-    }
-    @keyframes looming-gray{
-			0%   {background-color:#e3e3e3aa;}
-			50%  {background-color:#e3e3e3;}
-			100% {background-color:#e3e3e3aa;}
-    } 
-    /* 骨架屏1 */
-    .skeleton-1{
-			background-color: #e3e3e3;
-			background-image: linear-gradient(100deg, rgba(255, 255, 255, 0), rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0) 80%);
-			background-size: 100rpx 100%;
-			background-repeat: repeat-y;
-			background-position:0 0;
-			animation: skeleton-1 .6s infinite;
-    }
-    @keyframes skeleton-1 {
-			to {
-					background-position: 200% 0;
-			}
-    }
-    /* 骨架屏2 */
-    .skeleton-2{
-			background-image: linear-gradient(-90deg, #fefefe 0%, #e6e6e6 50%,#fefefe 100%);
-			background-size: 400% 400%;
-			background-position:0 0;
-			animation: skeleton-2 1.2s ease-in-out infinite;
-    }
-    @keyframes skeleton-2{
-			to {
-				background-position: -135% 0;
-			}
-    }
-</style>
+	/* 官方优化图片tips */
+	image {
+		will-change: transform
+	}
 
+	/* 渐变过渡效果处理 */
+	image.origin-img {
+		width: 100%;
+		height: 100%;
+		opacity: 0.3;
+		max-height: 360rpx;
+	}
+
+	image.origin-img.show-transition {
+		transition: opacity .5s;
+		opacity: 1;
+	}
+
+	image.origin-img.no-transition {
+		opacity: 1;
+	}
+
+	/* 加载失败、加载中的占位图样式控制 */
+	.loadfail-img {
+		height: 100%;
+		background-repeat: no-repeat;
+		background-size: 50%;
+		background-position: center;
+	}
+
+	.loading-img {
+		height: 100%;
+		background-position: center;
+	}
+
+	/* 转圈 */
+	.spin-circle {
+		background-repeat: no-repeat;
+		background-size: 60%;
+	}
+
+	/* 动态灰色若隐若现 */
+	.looming-gray {
+		animation: looming-gray 1s infinite linear;
+		background-color: #e3e3e3;
+	}
+
+	@keyframes looming-gray {
+		0% {
+			background-color: #e3e3e3aa;
+		}
+
+		50% {
+			background-color: #e3e3e3;
+		}
+
+		100% {
+			background-color: #e3e3e3aa;
+		}
+	}
+
+	/* 骨架屏1 */
+	.skeleton-1 {
+		background-color: #e3e3e3;
+		background-image: linear-gradient(100deg, rgba(255, 255, 255, 0), rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0) 80%);
+		background-size: 100rpx 100%;
+		background-repeat: repeat-y;
+		background-position: 0 0;
+		animation: skeleton-1 .6s infinite;
+	}
+
+	@keyframes skeleton-1 {
+		to {
+			background-position: 200% 0;
+		}
+	}
+
+	/* 骨架屏2 */
+	.skeleton-2 {
+		background-image: linear-gradient(-90deg, #fefefe 0%, #e6e6e6 50%, #fefefe 100%);
+		background-size: 400% 400%;
+		background-position: 0 0;
+		animation: skeleton-2 1.2s ease-in-out infinite;
+	}
+
+	@keyframes skeleton-2 {
+		to {
+			background-position: -135% 0;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/productConSwiper/index.vue b/components/productConSwiper/index.vue
index 821b5c4..27475a5 100644
--- a/components/productConSwiper/index.vue
+++ b/components/productConSwiper/index.vue
@@ -1,45 +1,43 @@
 <template>
 	<view class='product-bg'>
-		<swiper :indicator-dots="indicatorDots" indicator-active-color="#e93323" :autoplay="autoplay" :circular="circular"
-		 :interval="interval" :duration="duration" @change="change" v-if="isPlay">
+		<swiper :indicator-dots="indicatorDots" :current='current' indicator-active-color="#e93323" :autoplay="autoplay"
+			:circular="circular" :interval="interval" :duration="duration" @change="change" v-if="isPlay">
 			<!-- #ifndef APP-PLUS -->
-			<swiper-item v-if="videoline && videoline != '' && videoline != 'https:'">
-				<view class="item">
-					<video id="myVideo" :src='videoline && (videoline.substring(0,4) == "http" || videoline.substring(0,5) == "https") ? videoline : ("http:" + videoline)'
-					 objectFit="cover" controls style="width:100%;height:100% " show-mute-btn="true"
-					 auto-pause-if-navigate @ended="endedFun()"></video>
-					<view class="poster" v-if="controls">
-						<image class="image" :src="videoCoverImg"></image>
-					</view>
-					<view class="stop" v-if="controls" @tap="bindPause">
-						<image class="image" src="../../static/images/stop.png"></image>
-					</view>
-				</view>
-			</swiper-item>
-			<!-- #endif -->
-			<!-- #ifdef APP-PLUS -->
-			<swiper-item v-if="videoline">
-				<view class="item">
-					<view class="poster" v-show="controls">
-						<image class="image" :src="videoCoverImg"></image>
-					</view>
-					<view class="stop" v-show="controls" @tap="bindPause">
-						<image class="image" src="../../static/images/stop.png"></image>
-					</view>
-				</view>
-			</swiper-item>
-			<!-- #endif -->
 			<block v-for="(item,index) in imgUrls" :key='index'>
-				<swiper-item>
-					<image :src="item" class="slide-image" @click='getpreviewImage(item)' mode="widthFix" />
+				<swiper-item v-if="isVideoUrl(item)">
+					<video :src="isVideoUrl(item,true)" objectFit="cover" controls style="width:100%;height:100% "
+						show-center-play-btn show-mute-btn="true" auto-pause-if-navigate
+						:enable-progress-gesture="false" :poster="item+coverUrl"></video>
+				</swiper-item>
+				<swiper-item v-else>
+					<image :src="item" class="slide-image" @click='getpreviewImage(item)' />
 				</swiper-item>
 			</block>
+			<!-- #endif -->
+
+			<!-- #ifdef APP-PLUS -->
+			<block v-for="(item,index) in imgUrls" :key='index'>
+				<swiper-item v-if="isVideoUrl(item)">
+					<view>
+						<image :src="item+coverUrl" class="slide-image" />
+						<image class="image-play-icon" src="../../static/images/stop.png"
+							@click='videoPlay(item,index)'>
+						</image>
+					</view>
+				</swiper-item>
+
+				<swiper-item v-else>
+					<image :src="item" class="slide-image" @click='getpreviewImage(item)' />
+				</swiper-item>
+			</block>
+			<!-- #endif -->
 		</swiper>
+
 		<!-- #ifdef APP-PLUS -->
 		<view v-if="!isPlay" style="width: 100%; height: 750rpx;">
-			<video id="myVideo" :src='videoline && (videoline.substring(0,4) == "http" || videoline.substring(0,5) == "https") ? videoline : "http:" + videoline'
-			 objectFit="cover" controls style="width:100%;height:100% " show-center-play-btn show-mute-btn="true"
-			 auto-pause-if-navigate :enable-progress-gesture="false" :poster="videoCoverImg" @pause="videoPause" @ended="endedFun()"></video>
+			<video id="myVideo" :src='playingUrl' objectFit="cover" controls style="width:100%;height:100% "
+				show-center-play-btn show-mute-btn="true" auto-pause-if-navigate :enable-progress-gesture="false"
+				:poster="playingUrl+coverUrl" @pause="videoPause" @ended="endedFun()"></video>
 
 		</view>
 		<!-- #endif -->
@@ -50,7 +48,7 @@
 	// +----------------------------------------------------------------------
 	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 	// +----------------------------------------------------------------------
-	// | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved.
+	// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
 	// +----------------------------------------------------------------------
 	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 	// +----------------------------------------------------------------------
@@ -74,6 +72,10 @@
 		},
 		data() {
 			return {
+				coverUrl: '?spm=a2c4e.11153940.blogcont573781.6.c1032027sQ46VG&x-oss-process=video/snapshot,t_1000,m_fast',
+				current: '0',
+				videoTypeList: ['mp4', 'avi', 'mov', 'wmv', 'mkv', 'flv', 'mpeg', '3gp', 'webm'],
+				playingUrl: '',
 				indicatorDots: true,
 				circular: true,
 				autoplay: true,
@@ -97,6 +99,25 @@
 			// #endif
 		},
 		methods: {
+			isVideoUrl(url, getRightUrl) {
+				const str = url;
+				const lastIndex = str.lastIndexOf(".");
+				let extension;
+				if (lastIndex !== -1) {
+					extension = str.substring(lastIndex + 1);
+				} else {
+					extension = 'jpg'
+				}
+				if (getRightUrl) return url.replace(/\\/g, "")
+				return this.videoTypeList.includes(extension)
+			},
+
+			videoPlay(url, index) {
+				this.playingUrl = url
+				this.current = index
+				console.log(this.current)
+				this.bindPause()
+			},
 			getpreviewImage: function(item) {
 				uni.previewImage({
 					urls: this.imgUrls,
@@ -109,6 +130,7 @@
 				this.autoplay = true
 				// #endif
 			},
+
 			bindPause: function() {
 				// #ifndef APP-PLUS
 				this.videoContext.play();
@@ -119,7 +141,7 @@
 				// #ifdef APP-PLUS
 				this.isPlay = false
 				this.videoContext = uni.createVideoContext('myVideo', this);
-				this.$nextTick(()=>{
+				this.$nextTick(() => {
 					this.videoContext.play();
 				})
 				// #endif
@@ -140,15 +162,18 @@
 		height: 750rpx;
 		position: relative;
 	}
+
 	.product-bg swiper {
 		width: 100%;
 		height: 100%;
 		position: relative;
 	}
+
 	.product-bg .slide-image {
-		width: 100%;
-		height: 100%;
+		width: 750rpx;
+		height: 750rpx;
 	}
+
 	.product-bg .pages {
 		position: absolute;
 		background-color: #fff;
@@ -161,15 +186,18 @@
 		font-size: 24rpx;
 		color: #050505;
 	}
+
 	#myVideo {
 		width: 100%;
 		height: 100%
 	}
+
 	.product-bg .item {
 		position: relative;
 		width: 100%;
 		height: 100%;
 	}
+
 	.product-bg .item .poster {
 		position: absolute;
 		top: 0;
@@ -178,10 +206,12 @@
 		width: 100%;
 		z-index: 9;
 	}
+
 	.product-bg .item .poster .image {
 		width: 100%;
 		height: 100%;
 	}
+
 	.product-bg .item .stop {
 		position: absolute;
 		top: 50%;
@@ -192,8 +222,18 @@
 		margin-left: -68rpx;
 		z-index: 9;
 	}
+
 	.product-bg .item .stop .image {
 		width: 100%;
 		height: 100%;
 	}
-</style>
+
+	.image-play-icon {
+		position: absolute;
+		width: 100rpx;
+		height: 100rpx;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+	}
+</style>
\ No newline at end of file
diff --git a/components/recommend/index.vue b/components/recommend/index.vue
index db01500..ded0312 100644
--- a/components/recommend/index.vue
+++ b/components/recommend/index.vue
@@ -63,7 +63,7 @@
 		</view>
 
 		<!-- tab导航 -->
-		<view class="tabs" v-if="showTab">
+		<view class="tabs" v-if="showTab" :style="{top:'calc(98rpx + var(--status-bar-height))'}">
 			<block v-for="(item,indx) in tabsArr" :key="indx">
 				<view v-if="indx>0" style="width: 3rpx;height: 36rpx;background-color: #ccc;"></view>
 				<view :class="{'tabs-item-active':item.val==currTabs}" class="tabs-item" @click="changeTab(item.val)">
@@ -280,6 +280,11 @@
 	}
 
 	.tabs {
+		position: sticky;
+		top: 0;
+		z-index: 900;
+		background: #fff;
+		padding-bottom: 20rpx;
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
@@ -323,6 +328,7 @@
 	.recommend .recommendList {
 		padding: 0 20rpx;
 		min-height: 100rpx;
+		min-height: calc(100vh - 82rpx - var(--status-bar-height));
 	}
 
 	.recommend .recommendList.on {
diff --git a/manifest.json b/manifest.json
index 1753aac..838486c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,352 +1,352 @@
 {
-	"name": "惠农生活",
-	"appid": "__UNI__3A527D1",
-	"description": "",
-	"versionName": "2.0.37",
-	"versionCode": 2037,
-	"transformPx": false,
-	/* 5+App特有相关 */
-	"app-plus": {
-		"titleNView": true,
-		"usingComponents": true,
-		"nvueCompiler": "uni-app",
-		"nvueStyleCompiler": "uni-app",
-		"compilerVersion": 3,
-		"compatible": {
-			"ignoreVersion": true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持 
-		},
-		"splashscreen": {
-			"alwaysShowBeforeRender": false,
-			"waiting": false,
-			"autoclose": true,
-			"delay": 0
-		},
-		/* 模块配置 */
-		"modules": {
-			"VideoPlayer": {},
-			"OAuth": {},
-			"Payment": {},
-			"Share": {},
-			"iBeacon": {},
-			"Maps": {},
-			"Geolocation": {},
-			"UniMP": {
-				"description": "uni小程序"
-			},
-			"Push": {},
-			"Barcode": {},
-			"Camera": {}
-		},
-		"safearea": {
-			"bottom": {
-				"offset": "none"
-			}
-		},
-		/* 应用发布信息 */
-		"distribute": {
-			/* android打包配置 */
-			"android": {
-				"permissions": [
-					"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.BATTERY_STATS\"/>",
-					"<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
-					"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_CONFIGURATION\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
-					"<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
-				],
-				"abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"],
-				"permissionExternalStorage": {
-					"request": "none",
-					"prompt": "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"
-				},
-				"permissionPhoneState": {
-					"request": "none" //拨打电话权限关闭
-				},
-				"minSdkVersion": 23,
-				"targetSdkVersion": 30
-			},
-			/* ios打包配置 */
-			"ios": {
-				"privacyDescription": {
-					"NSPhotoLibraryUsageDescription": "上传用户头像保存分享海报",
-					"NSPhotoLibraryAddUsageDescription": "上传用户头像保存分享海报",
-					"NSCameraUsageDescription": "上传用户头像保存分享海报",
-					"NSLocationWhenInUseUsageDescription": "根据客户地理位置推荐最近门店",
-					"NSLocationAlwaysUsageDescription": "根据客户地理位置推荐最近门店"
-				},
-				"idfa": false,
-				"dSYMs": false
-			},
-			/* SDK配置 */
-			"sdkConfigs": {
-				"maps": {
-					"amap": {
-						"appkey_ios": "0a3202688624938fd5d2f37b52c30d5d",
-						"appkey_android": "0354f5ddc11e2ea76c5aac647f44d945",
-						"name": "amapIvoVHpJR"
-					}
-				},
-				"payment": {
-					"weixin": {
-						"__platform__": ["ios", "android"],
-						"appid": "wx2e8f79ff281284f5",
-						"UniversalLinks": "https://shop.lihaink.cn/"
-					}
-				},
-				"share": {
-					"weixin": {
-						"appid": "wx2e8f79ff281284f5",
-						"UniversalLinks": "https://shop.lihaink.cn/"
-					}
-				},
-				"geolocation": {
-					"amap": {
-						"name": "amapIvoVHpJR",
-						"__platform__": ["ios", "android"],
-						"appkey_ios": "0a3202688624938fd5d2f37b52c30d5d",
-						"appkey_android": "0354f5ddc11e2ea76c5aac647f44d945"
-					}
-				},
-				"push": {},
-				"oauth": {
-					"weixin": {
-						"appid": "wx2e8f79ff281284f5",
-						"UniversalLinks": "https://shop.lihaink.cn/"
-					}
-				},
-				"ad": {}
-			},
-			"icons": {
-				"android": {
-					"hdpi": "unpackage/res/icons/72x72.png",
-					"xhdpi": "unpackage/res/icons/96x96.png",
-					"xxhdpi": "unpackage/res/icons/144x144.png",
-					"xxxhdpi": "unpackage/res/icons/192x192.png"
-				},
-				"ios": {
-					"appstore": "unpackage/res/icons/1024x1024.png",
-					"ipad": {
-						"app": "unpackage/res/icons/76x76.png",
-						"app@2x": "unpackage/res/icons/152x152.png",
-						"notification": "unpackage/res/icons/20x20.png",
-						"notification@2x": "unpackage/res/icons/40x40.png",
-						"proapp@2x": "unpackage/res/icons/167x167.png",
-						"settings": "unpackage/res/icons/29x29.png",
-						"settings@2x": "unpackage/res/icons/58x58.png",
-						"spotlight": "unpackage/res/icons/40x40.png",
-						"spotlight@2x": "unpackage/res/icons/80x80.png"
-					},
-					"iphone": {
-						"app@2x": "unpackage/res/icons/120x120.png",
-						"app@3x": "unpackage/res/icons/180x180.png",
-						"notification@2x": "unpackage/res/icons/40x40.png",
-						"notification@3x": "unpackage/res/icons/60x60.png",
-						"settings@2x": "unpackage/res/icons/58x58.png",
-						"settings@3x": "unpackage/res/icons/87x87.png",
-						"spotlight@2x": "unpackage/res/icons/80x80.png",
-						"spotlight@3x": "unpackage/res/icons/120x120.png"
-					}
-				}
-			},
-			"splashscreen": {
-				"useOriginalMsgbox": true,
-				"androidStyle": "common"
-			}
-		},
-		"nativePlugins": {
-			"JG-JCore": {
-				"JPUSH_APPKEY_IOS": "8a5efd65cda14fafa6e64ad3",
-				"JPUSH_CHANNEL_IOS": "8a5efd65cda14fafa6e64ad3",
-				"JPUSH_APPKEY_ANDROID": "b5f679f4357018605ea6fd2e",
-				"JPUSH_CHANNEL_ANDROID": "",
-				"__plugin_info__": {
-					"name": "JG-JCore",
-					"description": "极光推送JCore插件",
-					"platforms": "Android,iOS",
-					"url": "",
-					"android_package_name": "uni.UNI3A527D1",
-					"ios_bundle_id": "",
-					"isCloud": false,
-					"bought": -1,
-					"pid": "",
-					"parameters": {
-						"JPUSH_APPKEY_IOS": {
-							"des": "[iOS]极光portal配置应用信息时分配的AppKey",
-							"key": "JCore:APP_KEY",
-							"value": "daebe19b547c43128796a078"
-						},
-						"JPUSH_CHANNEL_IOS": {
-							"des": "[iOS]用于统计分发渠道，不需要可填默认值developer-default",
-							"key": "JCore:CHANNEL",
-							"value": ""
-						},
-						"JPUSH_APPKEY_ANDROID": {
-							"des": "[Android]极光portal配置应用信息时分配的AppKey",
-							"key": "JPUSH_APPKEY",
-							"value": ""
-						},
-						"JPUSH_CHANNEL_ANDROID": {
-							"des": "[Android]用于统计分发渠道，不需要可填默认值developer-default",
-							"key": "JPUSH_CHANNEL",
-							"value": ""
-						}
-					}
-				}
-			},
-			"JG-JPush": {
-				"JPUSH_ISPRODUCTION_IOS": "true",
-				"JPUSH_ADVERTISINGID_IOS": "",
-				"JPUSH_DEFAULTINITJPUSH_IOS": "true",
-				"JPUSH_OPPO_APPKEY": "",
-				"JPUSH_OPPO_APPID": "",
-				"JPUSH_OPPO_APPSECRET": "",
-				"JPUSH_VIVO_APPKEY": "",
-				"JPUSH_VIVO_APPID": "",
-				"JPUSH_MEIZU_APPKEY": "",
-				"JPUSH_MEIZU_APPID": "",
-				"JPUSH_XIAOMI_APPKEY": "",
-				"JPUSH_XIAOMI_APPID": "",
-				"__plugin_info__": {
-					"name": "JG-JPush",
-					"description": "极光推送Hbuilder插件",
-					"platforms": "Android,iOS",
-					"url": "",
-					"android_package_name": "uni.UNI3A527D1",
-					"ios_bundle_id": "",
-					"isCloud": false,
-					"bought": -1,
-					"pid": "",
-					"parameters": {
-						"JPUSH_ISPRODUCTION_IOS": {
-							"des": "[iOS]是否是生产环境，是填true，不是填false或者不填",
-							"key": "JPush:ISPRODUCTION",
-							"value": ""
-						},
-						"JPUSH_ADVERTISINGID_IOS": {
-							"des": "[iOS]广告标识符（IDFA）如果不需要使用IDFA，可不填",
-							"key": "JPush:ADVERTISINGID",
-							"value": ""
-						},
-						"JPUSH_DEFAULTINITJPUSH_IOS": {
-							"des": "[iOS]是否默认初始化，是填true，不是填false或者不填",
-							"key": "JPush:DEFAULTINITJPUSH",
-							"value": ""
-						},
-						"JPUSH_OPPO_APPKEY": {
-							"des": "厂商OPPO-appkey,示例：OP-12345678",
-							"key": "OPPO_APPKEY",
-							"value": ""
-						},
-						"JPUSH_OPPO_APPID": {
-							"des": "厂商OPPO-appId,示例：OP-12345678",
-							"key": "OPPO_APPID",
-							"value": ""
-						},
-						"JPUSH_OPPO_APPSECRET": {
-							"des": "厂商OPPO-appSecret,示例：OP-12345678",
-							"key": "OPPO_APPSECRET",
-							"value": ""
-						},
-						"JPUSH_VIVO_APPKEY": {
-							"des": "厂商VIVO-appkey,示例：12345678",
-							"key": "com.vivo.push.api_key",
-							"value": ""
-						},
-						"JPUSH_VIVO_APPID": {
-							"des": "厂商VIVO-appId,示例：12345678",
-							"key": "com.vivo.push.app_id",
-							"value": ""
-						},
-						"JPUSH_MEIZU_APPKEY": {
-							"des": "厂商MEIZU-appKey,示例：MZ-12345678",
-							"key": "MEIZU_APPKEY",
-							"value": ""
-						},
-						"JPUSH_MEIZU_APPID": {
-							"des": "厂商MEIZU-appId,示例：MZ-12345678",
-							"key": "MEIZU_APPID",
-							"value": ""
-						},
-						"JPUSH_XIAOMI_APPKEY": {
-							"des": "厂商XIAOMI-appKey,示例：MI-12345678",
-							"key": "XIAOMI_APPKEY",
-							"value": ""
-						},
-						"JPUSH_XIAOMI_APPID": {
-							"des": "厂商XIAOMI-appId,示例：MI-12345678",
-							"key": "XIAOMI_APPID",
-							"value": ""
-						}
-					}
-				}
-			}
-		}
-	},
-	/* 快应用特有相关 */
-	"quickapp": {},
-	/* 小程序特有相关 */
-	"mp-weixin": {
-		"appid": "wx5fb1cc8edb3f8baa",
-		"setting": {
-			"urlCheck": false,
-			"minified": true,
-			"postcss": true,
-			"es6": true
-		},
-		"permission": {
-			"scope.userLocation": {
-				"desc": "获取您的位置"
-			}
-		},
-		"requiredPrivateInfos": ["getLocation", "chooseAddress"],
-		"usingComponents": true,
-		"__usePrivacyCheck__": true
-	},
-	"mp-alipay": {
-		"usingComponents": true
-	},
-	"mp-baidu": {
-		"usingComponents": true
-	},
-	"mp-toutiao": {
-		"usingComponents": true
-	},
-	"h5": {
-		"devServer": {
-			"https": false
-		},
-		"router": {
-			"mode": "history",
-			"base": ""
-		},
-		"domain": "",
-		"sdkConfigs": {
-			"maps": {
-				"qqmap": {
-					"key": "SMJBZ-WCHK4-ZPZUA-DSIXI-XDDVQ-XWFX7"
-				}
-			}
-		},
-		"title": "加载中...",
-		"template": "template.h5.html",
-		"optimization": {
-			"treeShaking": {
-				"enable": true
-			}
-		}
-	}
-}
\ No newline at end of file
+    "name" : "惠农生活",
+    "appid" : "__UNI__3A527D1",
+    "description" : "",
+    "versionName" : "2.0.52",
+    "versionCode" : 2052,
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "titleNView" : true,
+        "usingComponents" : true,
+        "nvueCompiler" : "uni-app",
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "compatible" : {
+            "ignoreVersion" : true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持 
+        },
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : false,
+            "waiting" : false,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        /* 模块配置 */
+        "modules" : {
+            "VideoPlayer" : {},
+            "OAuth" : {},
+            "Payment" : {},
+            "Share" : {},
+            "iBeacon" : {},
+            "Maps" : {},
+            "Geolocation" : {},
+            "UniMP" : {
+                "description" : "uni小程序"
+            },
+            "Push" : {},
+            "Barcode" : {},
+            "Camera" : {}
+        },
+        "safearea" : {
+            "bottom" : {
+                "offset" : "none"
+            }
+        },
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.BATTERY_STATS\"/>",
+                    "<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_CONFIGURATION\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
+                ],
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
+                "permissionExternalStorage" : {
+                    "request" : "none",
+                    "prompt" : "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"
+                },
+                "permissionPhoneState" : {
+                    "request" : "none" //拨打电话权限关闭
+                },
+                "minSdkVersion" : 23,
+                "targetSdkVersion" : 30
+            },
+            /* ios打包配置 */
+            "ios" : {
+                "privacyDescription" : {
+                    "NSPhotoLibraryUsageDescription" : "上传用户头像保存分享海报",
+                    "NSPhotoLibraryAddUsageDescription" : "上传用户头像保存分享海报",
+                    "NSCameraUsageDescription" : "上传用户头像保存分享海报",
+                    "NSLocationWhenInUseUsageDescription" : "根据客户地理位置推荐最近门店",
+                    "NSLocationAlwaysUsageDescription" : "根据客户地理位置推荐最近门店"
+                },
+                "idfa" : false,
+                "dSYMs" : false
+            },
+            /* SDK配置 */
+            "sdkConfigs" : {
+                "maps" : {
+                    "amap" : {
+                        "appkey_ios" : "0a3202688624938fd5d2f37b52c30d5d",
+                        "appkey_android" : "0354f5ddc11e2ea76c5aac647f44d945",
+                        "name" : "amapIvoVHpJR"
+                    }
+                },
+                "payment" : {
+                    "weixin" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appid" : "wx2e8f79ff281284f5",
+                        "UniversalLinks" : "https://shop.lihaink.cn/"
+                    }
+                },
+                "share" : {
+                    "weixin" : {
+                        "appid" : "wx2e8f79ff281284f5",
+                        "UniversalLinks" : "https://shop.lihaink.cn/"
+                    }
+                },
+                "geolocation" : {
+                    "amap" : {
+                        "name" : "amapIvoVHpJR",
+                        "__platform__" : [ "ios", "android" ],
+                        "appkey_ios" : "0a3202688624938fd5d2f37b52c30d5d",
+                        "appkey_android" : "0354f5ddc11e2ea76c5aac647f44d945"
+                    }
+                },
+                "push" : {},
+                "oauth" : {
+                    "weixin" : {
+                        "appid" : "wx2e8f79ff281284f5",
+                        "UniversalLinks" : "https://shop.lihaink.cn/"
+                    }
+                },
+                "ad" : {}
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
+            },
+            "splashscreen" : {
+                "useOriginalMsgbox" : true,
+                "androidStyle" : "common"
+            }
+        },
+        "nativePlugins" : {
+            "JG-JCore" : {
+                "JPUSH_APPKEY_IOS" : "8a5efd65cda14fafa6e64ad3",
+                "JPUSH_CHANNEL_IOS" : "8a5efd65cda14fafa6e64ad3",
+                "JPUSH_APPKEY_ANDROID" : "b5f679f4357018605ea6fd2e",
+                "JPUSH_CHANNEL_ANDROID" : "",
+                "__plugin_info__" : {
+                    "name" : "JG-JCore",
+                    "description" : "极光推送JCore插件",
+                    "platforms" : "Android,iOS",
+                    "url" : "",
+                    "android_package_name" : "uni.UNI3A527D1",
+                    "ios_bundle_id" : "",
+                    "isCloud" : false,
+                    "bought" : -1,
+                    "pid" : "",
+                    "parameters" : {
+                        "JPUSH_APPKEY_IOS" : {
+                            "des" : "[iOS]极光portal配置应用信息时分配的AppKey",
+                            "key" : "JCore:APP_KEY",
+                            "value" : "daebe19b547c43128796a078"
+                        },
+                        "JPUSH_CHANNEL_IOS" : {
+                            "des" : "[iOS]用于统计分发渠道，不需要可填默认值developer-default",
+                            "key" : "JCore:CHANNEL",
+                            "value" : ""
+                        },
+                        "JPUSH_APPKEY_ANDROID" : {
+                            "des" : "[Android]极光portal配置应用信息时分配的AppKey",
+                            "key" : "JPUSH_APPKEY",
+                            "value" : ""
+                        },
+                        "JPUSH_CHANNEL_ANDROID" : {
+                            "des" : "[Android]用于统计分发渠道，不需要可填默认值developer-default",
+                            "key" : "JPUSH_CHANNEL",
+                            "value" : ""
+                        }
+                    }
+                }
+            },
+            "JG-JPush" : {
+                "JPUSH_ISPRODUCTION_IOS" : "true",
+                "JPUSH_ADVERTISINGID_IOS" : "",
+                "JPUSH_DEFAULTINITJPUSH_IOS" : "true",
+                "JPUSH_OPPO_APPKEY" : "",
+                "JPUSH_OPPO_APPID" : "",
+                "JPUSH_OPPO_APPSECRET" : "",
+                "JPUSH_VIVO_APPKEY" : "",
+                "JPUSH_VIVO_APPID" : "",
+                "JPUSH_MEIZU_APPKEY" : "",
+                "JPUSH_MEIZU_APPID" : "",
+                "JPUSH_XIAOMI_APPKEY" : "",
+                "JPUSH_XIAOMI_APPID" : "",
+                "__plugin_info__" : {
+                    "name" : "JG-JPush",
+                    "description" : "极光推送Hbuilder插件",
+                    "platforms" : "Android,iOS",
+                    "url" : "",
+                    "android_package_name" : "uni.UNI3A527D1",
+                    "ios_bundle_id" : "",
+                    "isCloud" : false,
+                    "bought" : -1,
+                    "pid" : "",
+                    "parameters" : {
+                        "JPUSH_ISPRODUCTION_IOS" : {
+                            "des" : "[iOS]是否是生产环境，是填true，不是填false或者不填",
+                            "key" : "JPush:ISPRODUCTION",
+                            "value" : ""
+                        },
+                        "JPUSH_ADVERTISINGID_IOS" : {
+                            "des" : "[iOS]广告标识符（IDFA）如果不需要使用IDFA，可不填",
+                            "key" : "JPush:ADVERTISINGID",
+                            "value" : ""
+                        },
+                        "JPUSH_DEFAULTINITJPUSH_IOS" : {
+                            "des" : "[iOS]是否默认初始化，是填true，不是填false或者不填",
+                            "key" : "JPush:DEFAULTINITJPUSH",
+                            "value" : ""
+                        },
+                        "JPUSH_OPPO_APPKEY" : {
+                            "des" : "厂商OPPO-appkey,示例：OP-12345678",
+                            "key" : "OPPO_APPKEY",
+                            "value" : ""
+                        },
+                        "JPUSH_OPPO_APPID" : {
+                            "des" : "厂商OPPO-appId,示例：OP-12345678",
+                            "key" : "OPPO_APPID",
+                            "value" : ""
+                        },
+                        "JPUSH_OPPO_APPSECRET" : {
+                            "des" : "厂商OPPO-appSecret,示例：OP-12345678",
+                            "key" : "OPPO_APPSECRET",
+                            "value" : ""
+                        },
+                        "JPUSH_VIVO_APPKEY" : {
+                            "des" : "厂商VIVO-appkey,示例：12345678",
+                            "key" : "com.vivo.push.api_key",
+                            "value" : ""
+                        },
+                        "JPUSH_VIVO_APPID" : {
+                            "des" : "厂商VIVO-appId,示例：12345678",
+                            "key" : "com.vivo.push.app_id",
+                            "value" : ""
+                        },
+                        "JPUSH_MEIZU_APPKEY" : {
+                            "des" : "厂商MEIZU-appKey,示例：MZ-12345678",
+                            "key" : "MEIZU_APPKEY",
+                            "value" : ""
+                        },
+                        "JPUSH_MEIZU_APPID" : {
+                            "des" : "厂商MEIZU-appId,示例：MZ-12345678",
+                            "key" : "MEIZU_APPID",
+                            "value" : ""
+                        },
+                        "JPUSH_XIAOMI_APPKEY" : {
+                            "des" : "厂商XIAOMI-appKey,示例：MI-12345678",
+                            "key" : "XIAOMI_APPKEY",
+                            "value" : ""
+                        },
+                        "JPUSH_XIAOMI_APPID" : {
+                            "des" : "厂商XIAOMI-appId,示例：MI-12345678",
+                            "key" : "XIAOMI_APPID",
+                            "value" : ""
+                        }
+                    }
+                }
+            }
+        }
+    },
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "wx5fb1cc8edb3f8baa",
+        "setting" : {
+            "urlCheck" : false,
+            "minified" : true,
+            "postcss" : true,
+            "es6" : true
+        },
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "获取您的位置"
+            }
+        },
+        "requiredPrivateInfos" : [ "getLocation", "chooseAddress" ],
+        "usingComponents" : true,
+        "__usePrivacyCheck__" : true
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "h5" : {
+        "devServer" : {
+            "https" : false
+        },
+        "router" : {
+            "mode" : "history",
+            "base" : ""
+        },
+        "domain" : "",
+        "sdkConfigs" : {
+            "maps" : {
+                "qqmap" : {
+                    "key" : "SMJBZ-WCHK4-ZPZUA-DSIXI-XDDVQ-XWFX7"
+                }
+            }
+        },
+        "title" : "加载中...",
+        "template" : "template.h5.html",
+        "optimization" : {
+            "treeShaking" : {
+                "enable" : true
+            }
+        }
+    }
+}
diff --git a/pages.json b/pages.json
index a4cd27f..8f2929b 100644
--- a/pages.json
+++ b/pages.json
@@ -25,7 +25,7 @@
 		}, {
 			"path": "pages/whole_sale/index",
 			"style": {
-				"enablePullDownRefresh": true,
+				"enablePullDownRefresh": false,
 				"navigationBarTitleText": "批发",
 				"navigationStyle": "custom"
 			}
@@ -34,7 +34,9 @@
 			"style": {
 				"enablePullDownRefresh": true,
 				"navigationBarTitleText": "工作台",
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"backgroundColorTop": "#40AE36",
+				"backgroundTextStyle": "light"
 			}
 		}, {
 			"path": "pages/order_addcart/order_addcart",
@@ -105,6 +107,13 @@
 				// #endif
 			}
 		},
+		{
+			"path": "pages/goods_details/videoPlay",
+			"style": {
+				"navigationBarTitleText": "视屏详情"
+
+			}
+		},
 		{
 			"path": "pages/goods_cate/goods_cate",
 			"style": {
@@ -578,7 +587,8 @@
 					"path": "order_list/index",
 					"style": {
 						"navigationBarTitleText": "我的订单",
-						"navigationStyle": "custom"
+						"navigationStyle": "custom",
+						"enablePullDownRefresh": true
 					}
 				},
 				{
@@ -1515,7 +1525,9 @@
 		"backgroundColor": "#F8F8F8"
 			//#ifndef H5 
 			,
-		"titleNView": true
+		"titleNView": true,
+		"backgroundColorTop": "#40AE36",
+		"backgroundTextStyle": "light"
 			//#endif
 			//#ifdef H5
 			,
diff --git a/pages/chat/customer_list/chat.vue b/pages/chat/customer_list/chat.vue
index 8358e16..257fe40 100644
--- a/pages/chat/customer_list/chat.vue
+++ b/pages/chat/customer_list/chat.vue
@@ -1,2037 +1,2165 @@
 <template>
-  <div class="broadcast-details" :style="'height:'+windowH+'px'">
-    <view class="hd-wrapper" :class="active === true ? 'on' : ''" :style="viewColor" @click="stoppress">
-      <view class="store-wrapper" v-if="storeInfo">
-        <view class="left">
-          <image :src="storeInfo.mer_avatar" mode=""></image>
-          <view class="txt">{{storeInfo.mer_name}}</view>
-        </view>
-        <view class="acea-row store-opeation">
-          <navigator v-if="hide_mer_status != 1 && storeInfo.mer_id"
-            :url="'/pages/store/home/index?id='+storeInfo.mer_id" class="link" open-type="redirect">进店</navigator>
-          <text v-if="storeInfo.service_phone" class="iconfont icon-dadianhua01" @click="goCustomer"></text>
-        </view>
-      </view>
-      <scroll-view scroll-y="true" style="height: 100%;overflow: hidden;" :scroll-top="scrollTop"
-        scroll-with-animation="true" @scrolltoupper="bindScroll">
-        <div class="chat" ref="chat">
-          <Loading :loaded="status" :loading="loading"></Loading>
-          <view v-if="storeInfo" style="height: 100rpx;"></view>
-          <!-- 客服聊天列表 -->
-          <block v-for="(items,index) in history" v-if="userId != 0" :key="index">
-            <div class="create_time">{{items.time}}</div>
-            <block v-for="(item,j) in items.children" :key="item.service_log_id">
-              <!-- 左边 -->
-              <div class="item acea-row row-top" v-if="item.send_type == 0">
-                <div v-if="item.msn_type !== 100" class="pictrue" @click="userDetail(item.user.uid)">
-                  <image :src="item.user.avatar ? item.user.avatar : '/static/images/f.png'" mode=""></image>
-                </div>
-                <view v-if="item.msn_type === 100" class="recall-msg">对方撤回了一条消息</view>
+	<div class="broadcast-details" :style="'height:'+windowH+'px'">
+		<view class="hd-wrapper" :class="active === true ? 'on' : ''" :style="viewColor" @click="stoppress">
+			<view class="store-wrapper" v-if="storeInfo">
+				<view class="left">
+					<image :src="storeInfo.mer_avatar" mode=""></image>
+					<view class="txt line1">{{storeInfo.mer_name}}</view>
+				</view>
+				<view class="acea-row store-opeation">
+					<navigator v-if="hide_mer_status != 1 && storeInfo.mer_id"
+						:url="'/pages/store/home/index?id='+storeInfo.mer_id" class="link" open-type="redirect">进店
+					</navigator>
+					<text v-if="storeInfo.service_phone" class="iconfont icon-dadianhua01" @click="goCustomer"></text>
+				</view>
+			</view>
+			<scroll-view scroll-y="true" style="height: 100%;overflow: hidden;" :scroll-top="scrollTop"
+				scroll-with-animation="true" @scrolltoupper="bindScroll">
+				<div class="chat" ref="chat">
+					<Loading :loaded="status" :loading="loading"></Loading>
+					<view v-if="storeInfo" style="height: 100rpx;"></view>
+					<!-- 客服聊天列表 -->
+					<block v-for="(items,index) in history" v-if="userId != 0" :key="index">
+						<div class="create_time">{{items.time}}</div>
+						<block v-for="(item,j) in items.children" :key="item.service_log_id">
+							<!-- 左边 -->
+							<div class="item acea-row row-top" v-if="item.send_type == 0">
+								<div v-if="item.msn_type !== 100" class="pictrue" @click="userDetail(item.user.uid)">
+									<image :src="item.user.avatar ? item.user.avatar : '/static/images/f.png'" mode="">
+									</image>
+								</div>
+								<view v-if="item.msn_type === 100" class="recall-msg">对方撤回了一条消息</view>
 
-                <div class="text">
-                  <div class="acea-row">
-                    <!--退款订单链接-->
-                    <navigator v-if="item.msn_type === 6 && item.refundOrder && item.refundOrder.refund_order_id"
-                      open-type="navigate" :url="'/pages/order_details/index?order_id='+item.refundOrder.order_id">
-                      <div class="broadcast-details_num">
-                        <span>退款单号：{{ item.refundOrder.refund_order_sn }}</span>
-                      </div>
-                      <div class="conter acea-row row-middle">
-                        <div class="broadcast-details_order noPad" v-for="(val, inx) in item.refundOrder.refundProduct"
-                          :key="item.service_log_id">
-                          <div class="broadcast-details_box noPad" v-if="inx == 0">
-                            <div class="broadcast_details_img">
-                              <image :src="val.product.cart_info.product.image" />
-                              <div class="broadcast_details_model">
-                                {{item.refundOrder.refund_num}}件商品
-                              </div>
-                            </div>
-                            <div class="broadcast_details_picBox noPad">
-                              <div class="broadcast_details_tit">{{val.product.cart_info.product.store_name}}</div>
-                              <div class="broadcast_details_pic">
-                                ￥{{ item.refundOrder.refund_price }}
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </navigator>
-                    <!--订单链接-->
-                    <div v-if="item.msn_type === 5 && item.orderInfo && item.orderInfo.order_id">
-                      <div class="broadcast-details_num acea-row row-middle">
-                        <span>订单号：{{ item.orderInfo.order_sn }}</span>
-                        <!-- #ifdef H5 -->
-                        <button class="copy copy-data" :data-clipboard-text="item.orderInfo.order_sn">复制</button>
-                        <!-- #endif -->
-                        <!-- #ifndef H5 -->
-                        <button class="copy" @tap.stop="copyText(item.orderInfo.order_sn)">复制</button>
-                        <!-- #endif -->
-                      </div>
-                      <navigator
-                        :url="'/pages/admin/orderDetail/index?id='+item.orderInfo.order_id+'&mer_id='+item.orderInfo.mer_id"
-                        open-type="open-type" class="conter acea-row row-middle">
-                        <div class="broadcast-details_order noPad" v-for="(val, inx) in item.orderInfo.orderProduct"
-                          :key="val.id">
-                          <div class="broadcast-details_box noPad" v-if="inx == 0">
-                            <div class="broadcast_details_img">
-                              <image :src="val.cart_info.product.image" />
-                              <div class="broadcast_details_model">
-                                {{item.orderInfo.total_num}}件商品
-                              </div>
-                            </div>
-                            <div class="broadcast_details_picBox noPad">
-                              <div class="broadcast_details_tit">{{val.cart_info.product.store_name}}</div>
-                              <div class="broadcast_details_pic">
-                                ￥{{ item.orderInfo.pay_price }}
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </navigator>
-                    </div>
-                    <!--商品链接-->
-                    <div class="conter acea-row row-middle" v-if="item.msn_type === 4 && item.product">
-                      <div class=" noPad">
-                        <navigator class="acea-row row-column-around noPad" v-if="item.product.product_id"
-                          :url="`/pages/goods_details/index?id=${item.product.product_id}`" open-type="navigate">
-                          <div class="broadcast_details_img_no">
-                            <image :src="item.product.image" />
-                          </div>
-                          <div class="broadcast_details_picBox_no noPad">
-                            <div class="broadcast_details_pic">
-                              ￥{{ item.product.price }}
-                            </div>
-                            <div class="broadcast_details_tit_no line1">{{item.product.store_name}}</div>
-                          </div>
-                        </navigator>
-                      </div>
-                    </div>
-                    <!--预售商品链接-->
-                    <div class="conter acea-row row-middle"
-                      v-if="item.msn_type === 7 && item.presell && item.presell.product">
-                      <div class=" noPad">
-                        <navigator class="acea-row row-column-around noPad" v-if="item.presell.product_presell_id"
-                          :url="`/pages/activity/presell_details/index?id=${item.presell.product_presell_id}`"
-                          open-type="navigate">
-                          <div class="broadcast_details_img_no">
-                            <image :src="item.presell.product.image" />
-                          </div>
-                          <div class="broadcast_details_picBox_no noPad">
-                            <div class="broadcast_details_pic">
-                              ￥{{ item.presell.price }}
-                            </div>
-                            <div class="broadcast_details_tit_no line1">{{item.presell.store_name}}</div>
-                          </div>
-                        </navigator>
-                      </div>
-                    </div>
-                    <!--拼团商品链接-->
-                    <div class="conter acea-row row-middle"
-                      v-if="item.msn_type === 8 && item.productGroup && item.productGroup.product">
-                      <div class=" noPad">
-                        <navigator class="acea-row row-column-around noPad" v-if="item.productGroup.product_group_id"
-                          :url="`/pages/activity/combination_details/index?id=${item.productGroup.product_group_id}`"
-                          open-type="navigate">
-                          <div class="broadcast_details_img_no">
-                            <image :src="item.productGroup.product.image" />
-                          </div>
-                          <div class="broadcast_details_picBox_no noPad">
-                            <div class="broadcast_details_pic">
-                              ￥{{ item.productGroup.product.price }}
-                            </div>
-                            <div class="broadcast_details_tit_no line1">{{item.productGroup.product.store_name}}</div>
-                          </div>
-                        </navigator>
-                      </div>
-                    </div>
-                    <div class="conter acea-row row-middle" v-if="item.msn_type === 3">
-                      <image :src="item.msn" @click="clickImg(item.msn)" mode="heightFix" />
-                    </div>
-                    <div class="conter acea-row row-middle" v-if="item.msn_type === 2">
-                      <i class="em" :class="item.msn" :style="'background-image:url('+ httpUrl +')'"></i>
-                    </div>
-                    <div class="conter acea-row row-middle" v-if="item.msn_type === 1">
-                      {{item.msn}}
-                    </div>
+								<div class="text">
+									<div class="acea-row">
+										<!--退款订单链接-->
+										<navigator
+											v-if="item.msn_type === 6 && item.refundOrder && item.refundOrder.refund_order_id"
+											open-type="navigate"
+											:url="'/pages/order_details/index?order_id='+item.refundOrder.order_id">
+											<div class="broadcast-details_num">
+												<span>退款单号：{{ item.refundOrder.refund_order_sn }}</span>
+											</div>
+											<div class="conter acea-row row-middle">
+												<div class="broadcast-details_order noPad"
+													v-for="(val, inx) in item.refundOrder.refundProduct"
+													:key="item.service_log_id">
+													<div class="broadcast-details_box noPad" v-if="inx == 0">
+														<div class="broadcast_details_img">
+															<image :src="val.product.cart_info.product.image" />
+															<div class="broadcast_details_model">
+																{{item.refundOrder.refund_num}}件商品
+															</div>
+														</div>
+														<div class="broadcast_details_picBox noPad">
+															<div class="broadcast_details_tit">
+																{{val.product.cart_info.product.store_name}}
+															</div>
+															<div class="broadcast_details_pic">
+																￥{{ item.refundOrder.refund_price }}
+															</div>
+														</div>
+													</div>
+												</div>
+											</div>
+										</navigator>
+										<!--订单链接-->
+										<div v-if="item.msn_type === 5 && item.orderInfo && item.orderInfo.order_id">
+											<div class="broadcast-details_num acea-row row-middle">
+												<span>订单号：{{ item.orderInfo.order_sn }}</span>
+												<!-- #ifdef H5 -->
+												<button class="copy copy-data"
+													:data-clipboard-text="item.orderInfo.order_sn">复制</button>
+												<!-- #endif -->
+												<!-- #ifndef H5 -->
+												<button class="copy"
+													@tap.stop="copyText(item.orderInfo.order_sn)">复制</button>
+												<!-- #endif -->
+											</div>
+											<navigator
+												:url="'/pages/admin/orderDetail/index?id='+item.orderInfo.order_id+'&mer_id='+item.orderInfo.mer_id"
+												open-type="open-type" class="conter acea-row row-middle">
+												<div class="broadcast-details_order noPad"
+													v-for="(val, inx) in item.orderInfo.orderProduct" :key="val.id">
+													<div class="broadcast-details_box noPad" v-if="inx == 0">
+														<div class="broadcast_details_img">
+															<image :src="val.cart_info.product.image" />
+															<div class="broadcast_details_model">
+																{{item.orderInfo.total_num}}件商品
+															</div>
+														</div>
+														<div class="broadcast_details_picBox noPad">
+															<div class="broadcast_details_tit">
+																{{val.cart_info.product.store_name}}
+															</div>
+															<div class="broadcast_details_pic">
+																￥{{ item.orderInfo.pay_price }}
+															</div>
+														</div>
+													</div>
+												</div>
+											</navigator>
+										</div>
+										<!--商品链接-->
+										<div class="conter acea-row row-middle"
+											v-if="item.msn_type === 4 && item.product">
+											<div class=" noPad">
+												<navigator class="acea-row row-column-around noPad"
+													v-if="item.product.product_id"
+													:url="`/pages/goods_details/index?id=${item.product.product_id}`"
+													open-type="navigate">
+													<div class="broadcast_details_img_no">
+														<image :src="item.product.image" />
+													</div>
+													<div class="broadcast_details_picBox_no noPad">
+														<div class="broadcast_details_pic">
+															￥{{ item.product.price }}
+														</div>
+														<div class="broadcast_details_tit_no line1">
+															{{item.product.store_name}}
+														</div>
+													</div>
+												</navigator>
+											</div>
+										</div>
+										<!--预售商品链接-->
+										<div class="conter acea-row row-middle"
+											v-if="item.msn_type === 7 && item.presell && item.presell.product">
+											<div class=" noPad">
+												<navigator class="acea-row row-column-around noPad"
+													v-if="item.presell.product_presell_id"
+													:url="`/pages/activity/presell_details/index?id=${item.presell.product_presell_id}`"
+													open-type="navigate">
+													<div class="broadcast_details_img_no">
+														<image :src="item.presell.product.image" />
+													</div>
+													<div class="broadcast_details_picBox_no noPad">
+														<div class="broadcast_details_pic">
+															￥{{ item.presell.price }}
+														</div>
+														<div class="broadcast_details_tit_no line1">
+															{{item.presell.store_name}}
+														</div>
+													</div>
+												</navigator>
+											</div>
+										</div>
+										<!--拼团商品链接-->
+										<div class="conter acea-row row-middle"
+											v-if="item.msn_type === 8 && item.productGroup && item.productGroup.product">
+											<div class=" noPad">
+												<navigator class="acea-row row-column-around noPad"
+													v-if="item.productGroup.product_group_id"
+													:url="`/pages/activity/combination_details/index?id=${item.productGroup.product_group_id}`"
+													open-type="navigate">
+													<div class="broadcast_details_img_no">
+														<image :src="item.productGroup.product.image" />
+													</div>
+													<div class="broadcast_details_picBox_no noPad">
+														<div class="broadcast_details_pic">
+															￥{{ item.productGroup.product.price }}
+														</div>
+														<div class="broadcast_details_tit_no line1">
+															{{item.productGroup.product.store_name}}
+														</div>
+													</div>
+												</navigator>
+											</div>
+										</div>
+										<div class="conter acea-row row-middle" v-if="item.msn_type === 3">
+											<image :src="item.msn" @click="clickImg(item.msn)" mode="heightFix" />
+										</div>
+										<div class="conter acea-row row-middle" v-if="item.msn_type === 2">
+											<i class="em" :class="item.msn"
+												:style="'background-image:url('+ httpUrl +')'"></i>
+										</div>
+										<div class="conter acea-row row-middle" v-if="item.msn_type === 1">
+											{{item.msn}}
+										</div>
 
-                  </div>
-                </div>
-              </div>
-              <!-- 右边 -->
-              <div class="item acea-row row-top row-right" v-else @longpress="longTime(items,index,item,j)">
-                <div class="text textR">
-                  <!-- <div class="name">{{ item.user.nickname }}</div> -->
-                  <div class="acea-row ">
-                    <!--退款订单链接-->
-                    <navigator v-if="item.msn_type === 6 && item.refundOrder.refund_order_id" open-type="navigate">
-                      <div class="broadcast-details_num acea-row row-middle">
-                        <text>订单号：{{ item.refundOrder.refund_order_sn }}</text>
-                        <!-- #ifdef H5 -->
-                        <button class="copy copy-data"
-                          :data-clipboard-text="item.refundOrder.refund_order_sn">复制</button>
-                        <!-- #endif -->
-                        <!-- #ifndef H5 -->
-                        <button class="copy" @tap.stop="copyText(item.refundOrder.refund_order_sn)">复制</button>
-                        <!-- #endif -->
-                      </div>
-                      <div class="conter acea-row row-middle">
-                        <div class="broadcast-details_order noPad" v-for="(val, inx) in item.refundOrder.refundProduct"
-                          :key="val.id">
-                          <div class="broadcast-details_box noPad" v-if="inx == 0">
-                            <div class="broadcast_details_img">
-                              <image :src="val.product.cart_info.product.image" />
-                              <div class="broadcast_details_model">
-                                {{item.refundOrder.refund_num}}件商品
-                              </div>
-                            </div>
-                            <div class="broadcast_details_picBox noPad">
-                              <div class="broadcast_details_tit">{{val.product.cart_info.product.store_name}}</div>
-                              <div class="broadcast_details_pic">
-                                ￥{{ item.refundOrder.refund_price }}
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </navigator>
-                    <!--订单链接-->
-                    <div v-if="item.msn_type === 5 && item.orderInfo.order_id">
-                      <div class="broadcast-details_num acea-row row-middle">
-                        <text>订单号：{{ item.orderInfo.order_sn }}</text>
-                        <!-- #ifdef H5 -->
-                        <button class="copy copy-data" :data-clipboard-text="item.orderInfo.order_sn">复制</button>
-                        <!-- #endif -->
-                        <!-- #ifndef H5 -->
-                        <button class="copy" @tap.stop="copyText(item.orderInfo.order_sn)">复制</button>
-                        <!-- #endif -->
-                      </div>
-                      <navigator
-                        :url="'/pages/admin/orderDetail/index?id='+item.orderInfo.order_id+'&mer_id='+item.orderInfo.mer_id"
-                        open-type="navigate" class="conter acea-row row-middle">
-                        <div class="broadcast-details_order noPad" v-for="(val, inx) in item.orderInfo.orderProduct"
-                          :key="val.id">
-                          <div class="broadcast-details_box noPad" v-if="inx == 0">
-                            <div class="broadcast_details_img">
-                              <image :src="val.cart_info.product.image" />
-                              <div class="broadcast_details_model">
-                                {{item.orderInfo.total_num}}件商品
-                              </div>
-                            </div>
-                            <div class="broadcast_details_picBox noPad">
-                              <div class="broadcast_details_tit">{{val.cart_info.product.store_name}}</div>
-                              <div class="broadcast_details_pic">
-                                ￥{{ item.orderInfo.pay_price }}
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </navigator>
-                    </div>
-                    <!--商品链接-->
-                    <div class="conter acea-row row-middle" v-if="item.msn_type === 4 && item.product">
-                      <div class=" acea-row row-column-around noPad">
-                        <navigator class="acea-row row-column-around noPad" v-if="item.product.product_id"
-                          :url="`/pages/goods_details/index?id=${item.product.product_id}`">
-                          <div class="broadcast_details_img_no">
-                            <image :src="item.product.image" />
-                          </div>
-                          <div class="broadcast_details_picBox_no noPad">
-                            <div class="broadcast_details_pic">
-                              ￥{{ item.product.price }}
-                            </div>
-                            <div class="broadcast_details_tit_no line1">{{item.product.store_name}}</div>
-                          </div>
-                        </navigator>
-                      </div>
-                    </div>
-                    <!--预售商品链接-->
-                    <div class="conter acea-row row-middle"
-                      v-if="item.msn_type === 7 && item.presell && item.presell.product">
-                      <div class=" acea-row row-column-around noPad">
-                        <navigator class="acea-row row-column-around noPad" v-if="item.presell.product_presell_id"
-                          :url="`/pages/activity/presell_details/index?id=${item.presell.product_presell_id}`"
-                          open-type="navigate">
-                          <div class="broadcast_details_img_no">
-                            <image :src="item.presell.product.image" />
-                          </div>
-                          <div class="broadcast_details_picBox_no noPad">
-                            <div class="broadcast_details_pic">
-                              ￥{{ item.presell.price }}
-                            </div>
-                            <div class="broadcast_details_tit_no line1">{{item.presell.store_name}}</div>
-                          </div>
-                        </navigator>
-                      </div>
-                    </div>
-                    <!--拼团商品链接-->
-                    <div class="conter acea-row row-middle"
-                      v-if="item.msn_type === 8 && item.productGroup && item.productGroup.product">
-                      <div class=" acea-row row-column-around noPad">
-                        <navigator class="acea-row row-column-around noPad" v-if="item.productGroup.product_group_id"
-                          :url="`/pages/activity/combination_details/index?id=${item.productGroup.product_group_id}`"
-                          open-type="navigate">
-                          <div class="broadcast_details_img_no">
-                            <image :src="item.productGroup.product.image" />
-                          </div>
-                          <div class="broadcast_details_picBox_no noPad">
-                            <div class="broadcast_details_pic">
-                              ￥{{ item.productGroup.product.price }}
-                            </div>
-                            <div class="broadcast_details_tit_no line1">{{item.productGroup.product.store_name}}</div>
-                          </div>
-                        </navigator>
-                      </div>
-                    </div>
-                    <div class="conter acea-row row-middle" v-if="item.msn_type === 3">
-                      <image :src="item.msn" @click="clickImg(item.msn)" mode="heightFix" />
-                    </div>
-                    <div class="conter acea-row row-middle" v-if="item.msn_type === 2">
-                      <i class="em" :class="item.msn" :style="'background-image:url('+ httpUrl +')'"></i>
-                    </div>
-                    <div class="conter acea-row row-middle" v-if="item.msn_type === 1">
-                      {{item.msn}}
-                    </div>
-                    <view class="recall" :class="'recall'+index+j"
-                      v-if="item.longpress && press && (item.msn_type === 1 || (new Date().getTime()/1000 - item.send_time) <= 120)">
-                      <view class="recall-item" v-if="item.msn_type === 1">
-                        <!-- #ifdef H5 -->
-                        <view class="copy copy-data" :data-clipboard-text="item.msn">
-                          <text class="iconfont icon-fuzhi"></text>
-                          复制
-                        </view>
-                        <!-- #endif -->
-                        <!-- #ifndef H5 -->
-                        <view class="copy copy-data" @tap.stop="copyText(item.msn)">
-                          <text class="iconfont icon-fuzhi"></text>
-                          复制
-                        </view>
-                        <!-- #endif -->
-                      </view>
-                      <view v-if="(new Date().getTime()/1000 - item.send_time) <= 120" class="recall-item"
-                        @click.stop="reverstMsg(item)">
-                        <view class="iconfont icon-chehui"></view>撤回
-                      </view>
-                    </view>
-                  </div>
-                </div>
-                <div v-if="item.msn_type != 100" class="pictrue">
-                  <image :src="item.service.avatar ? item.service.avatar : '/static/images/f.png'" />
-                </div>
-                <view v-if="item.msn_type === 100" class="recall-msg">你撤回了一条消息</view>
-              </div>
-            </block>
-          </block>
-          <!-- 客户聊天列表 -->
-          <block v-for="(items,index) in history" v-if="userId == 0" :key="items.time">
-            <div class="create_time">{{items.time}}</div>
-            <block v-for="(item,j) in items.children" :key="item.service_log_id">
-              <!-- 左边 -->
-              <div class="item acea-row row-top" v-if="item.send_type == 1">
-                <div v-if="item.msn_type !== 100" class="pictrue">
-                  <image :src="item.service.avatar ? item.service.avatar : '/static/images/f.png'" mode=""></image>
-                </div>
-                <view v-if="item.msn_type === 100" class="recall-msg">对方撤回了一条消息</view>
-                <div class="text">
-                  <!-- <div class="name">{{ item.service.nickname }}</div> -->
-                  <div class="acea-row">
-                    <!--退款订单链接-->
-                    <navigator v-if="item.msn_type === 6 && item.refundOrder.refund_order_id" open-type="navigate"
-                      :url="'/pages/order_details/index?order_id='+item.refundOrder.order_id">
-                      <div class="broadcast-details_num">
-                        <text>退款单号：{{ item.refundOrder.refund_order_sn }}</text>
-                      </div>
-                      <div class="conter acea-row row-middle">
-                        <!-- :key="item.service_log_id" -->
-                        <div class="broadcast-details_order noPad" v-for="(val, inx) in item.refundOrder.refundProduct">
-                          <div class="broadcast-details_box noPad" v-if="inx == 0">
-                            <div class="broadcast_details_img">
-                              <image :src="val.product.cart_info.product.image" />
-                              <div class="broadcast_details_model">
-                                {{item.refundOrder.refund_num}}件商品
-                              </div>
-                            </div>
-                            <div class="broadcast_details_picBox noPad">
-                              <div class="broadcast_details_tit">{{val.product.cart_info.product.store_name}}</div>
-                              <div class="broadcast_details_pic">
-                                ￥{{ val.product.cart_info.productAttr.price }}
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </navigator>
-                    <!--订单链接-->
-                    <div v-if="item.msn_type === 5 && item.orderInfo.order_id">
-                      <div class="broadcast-details_num acea-row row-middle">
-                        <text>订单号：{{ item.orderInfo.order_sn }}</text>
-                        <!-- #ifdef H5 -->
-                        <button class="copy copy-data" :data-clipboard-text="item.orderInfo.order_sn">复制</button>
-                        <!-- #endif -->
-                        <!-- #ifndef H5 -->
-                        <button class="copy" @tap.stop="copyText(item.orderInfo.order_sn)">复制</button>
-                        <!-- #endif -->
-                      </div>
-                      <navigator :url="'/pages/order_details/index?order_id='+item.orderInfo.order_id"
-                        open-type="navigate" class="conter acea-row row-middle">
-                        <!-- :key="item.service_log_id" -->
-                        <div class="broadcast-details_order noPad" v-for="(val, inx) in item.orderInfo.orderProduct">
-                          <div class="broadcast-details_box noPad" v-if="inx == 0">
-                            <div class="broadcast_details_img">
-                              <image :src="val.cart_info.product.image" />
-                              <div class="broadcast_details_model">
-                                {{item.orderInfo.total_num}}件商品
-                              </div>
-                            </div>
-                            <div class="broadcast_details_picBox noPad">
-                              <div class="broadcast_details_tit">{{val.cart_info.product.store_name}}</div>
-                              <div class="broadcast_details_pic">
-                                ￥{{ item.orderInfo.pay_price }}
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </navigator>
-                    </div>
-                    <!--商品链接-->
-                    <div class="conter acea-row row-middle" v-if="item.msn_type === 4 && item.product">
-                      <div class=" noPad">
-                        <navigator class="acea-row row-column-around noPad" v-if="item.product.product_id"
-                          :url="`/pages/goods_details/index?id=${item.product.product_id}`" open-type="navigate">
-                          <div class="broadcast_details_img_no">
-                            <image :src="item.product.image" />
-                          </div>
-                          <div class="broadcast_details_picBox_no noPad">
-                            <div class="broadcast_details_pic">
-                              ￥{{ item.product.price }}
-                            </div>
-                            <div class="broadcast_details_tit_no line1">{{item.product.store_name}}</div>
-                          </div>
-                        </navigator>
-                      </div>
-                    </div>
-                    <!--预售商品链接-->
-                    <div class="conter acea-row row-middle"
-                      v-if="item.msn_type === 7 && item.presell && item.presell.product">
-                      <div class=" noPad">
-                        <navigator class="acea-row row-column-around noPad" v-if="item.presell.product_presell_id"
-                          :url="`/pages/activity/presell_details/index?id=${item.presell.product_presell_id}`"
-                          open-type="navigate">
-                          <div class="broadcast_details_img_no">
-                            <image :src="item.presell.product.image" />
-                          </div>
-                          <div class="broadcast_details_picBox_no noPad">
-                            <div class="broadcast_details_pic">
-                              ￥{{ item.presell.price }}
-                            </div>
-                            <div class="broadcast_details_tit_no line1">{{item.presell.store_name}}</div>
-                          </div>
-                        </navigator>
-                      </div>
-                    </div>
-                    <!--拼团商品链接-->
-                    <div class="conter acea-row row-middle"
-                      v-if="item.msn_type === 8 && item.productGroup && item.productGroup.product">
-                      <div class="noPad">
-                        <navigator class="acea-row row-column-around noPad" v-if="item.productGroup.product_group_id"
-                          :url="`/pages/activity/combination_details/index?id=${item.productGroup.product_group_id}`"
-                          open-type="navigate">
-                          <div class="broadcast_details_img_no">
-                            <image :src="item.productGroup.product.image" />
-                          </div>
-                          <div class="broadcast_details_picBox_no noPad">
-                            <div class="broadcast_details_pic">
-                              ￥{{ item.productGroup.product.price }}
-                            </div>
-                            <div class="broadcast_details_tit_no line1">{{item.productGroup.product.store_name}}</div>
-                          </div>
-                        </navigator>
-                      </div>
-                    </div>
-                    <div class="conter acea-row row-middle" v-if="item.msn_type === 3">
-                      <image :src="item.msn" @click="clickImg(item.msn)" mode="heightFix" />
-                    </div>
-                    <div class="conter acea-row row-middle" v-if="item.msn_type === 2">
-                      <i class="em" :class="item.msn" :style="'background-image:url('+ httpUrl +')'"></i>
-                    </div>
-                    <div class="conter acea-row row-middle" v-if="item.msn_type === 1">
-                      {{item.msn}}
-                    </div>
+									</div>
+								</div>
+							</div>
+							<!-- 右边 -->
+							<div class="item acea-row row-top row-right" v-else
+								@longpress="longTime(items,index,item,j)">
+								<div class="text textR">
+									<!-- <div class="name">{{ item.user.nickname }}</div> -->
+									<div class="acea-row ">
+										<!--退款订单链接-->
+										<navigator v-if="item.msn_type === 6 && item.refundOrder.refund_order_id"
+											open-type="navigate">
+											<div class="broadcast-details_num acea-row row-middle">
+												<text>订单号：{{ item.refundOrder.refund_order_sn }}</text>
+												<!-- #ifdef H5 -->
+												<button class="copy copy-data"
+													:data-clipboard-text="item.refundOrder.refund_order_sn">复制</button>
+												<!-- #endif -->
+												<!-- #ifndef H5 -->
+												<button class="copy"
+													@tap.stop="copyText(item.refundOrder.refund_order_sn)">复制</button>
+												<!-- #endif -->
+											</div>
+											<div class="conter acea-row row-middle">
+												<div class="broadcast-details_order noPad"
+													v-for="(val, inx) in item.refundOrder.refundProduct" :key="val.id">
+													<div class="broadcast-details_box noPad" v-if="inx == 0">
+														<div class="broadcast_details_img">
+															<image :src="val.product.cart_info.product.image" />
+															<div class="broadcast_details_model">
+																{{item.refundOrder.refund_num}}件商品
+															</div>
+														</div>
+														<div class="broadcast_details_picBox noPad">
+															<div class="broadcast_details_tit">
+																{{val.product.cart_info.product.store_name}}
+															</div>
+															<div class="broadcast_details_pic">
+																￥{{ item.refundOrder.refund_price }}
+															</div>
+														</div>
+													</div>
+												</div>
+											</div>
+										</navigator>
+										<!--订单链接-->
+										<div v-if="item.msn_type === 5 && item.orderInfo.order_id">
+											<div class="broadcast-details_num acea-row row-middle">
+												<text>订单号：{{ item.orderInfo.order_sn }}</text>
+												<!-- #ifdef H5 -->
+												<button class="copy copy-data"
+													:data-clipboard-text="item.orderInfo.order_sn">复制</button>
+												<!-- #endif -->
+												<!-- #ifndef H5 -->
+												<button class="copy"
+													@tap.stop="copyText(item.orderInfo.order_sn)">复制</button>
+												<!-- #endif -->
+											</div>
+											<navigator
+												:url="'/pages/admin/orderDetail/index?id='+item.orderInfo.order_id+'&mer_id='+item.orderInfo.mer_id"
+												open-type="navigate" class="conter acea-row row-middle">
+												<div class="broadcast-details_order noPad"
+													v-for="(val, inx) in item.orderInfo.orderProduct" :key="val.id">
+													<div class="broadcast-details_box noPad" v-if="inx == 0">
+														<div class="broadcast_details_img">
+															<image :src="val.cart_info.product.image" />
+															<div class="broadcast_details_model">
+																{{item.orderInfo.total_num}}件商品
+															</div>
+														</div>
+														<div class="broadcast_details_picBox noPad">
+															<div class="broadcast_details_tit">
+																{{val.cart_info.product.store_name}}
+															</div>
+															<div class="broadcast_details_pic">
+																￥{{ item.orderInfo.pay_price }}
+															</div>
+														</div>
+													</div>
+												</div>
+											</navigator>
+										</div>
+										<!--商品链接-->
+										<div class="conter acea-row row-middle"
+											v-if="item.msn_type === 4 && item.product">
+											<div class=" acea-row row-column-around noPad">
+												<navigator class="acea-row row-column-around noPad"
+													v-if="item.product.product_id"
+													:url="`/pages/goods_details/index?id=${item.product.product_id}`">
+													<div class="broadcast_details_img_no">
+														<image :src="item.product.image" />
+													</div>
+													<div class="broadcast_details_picBox_no noPad">
+														<div class="broadcast_details_pic">
+															￥{{ item.product.price }}
+														</div>
+														<div class="broadcast_details_tit_no line1">
+															{{item.product.store_name}}
+														</div>
+													</div>
+												</navigator>
+											</div>
+										</div>
+										<!--预售商品链接-->
+										<div class="conter acea-row row-middle"
+											v-if="item.msn_type === 7 && item.presell && item.presell.product">
+											<div class=" acea-row row-column-around noPad">
+												<navigator class="acea-row row-column-around noPad"
+													v-if="item.presell.product_presell_id"
+													:url="`/pages/activity/presell_details/index?id=${item.presell.product_presell_id}`"
+													open-type="navigate">
+													<div class="broadcast_details_img_no">
+														<image :src="item.presell.product.image" />
+													</div>
+													<div class="broadcast_details_picBox_no noPad">
+														<div class="broadcast_details_pic">
+															￥{{ item.presell.price }}
+														</div>
+														<div class="broadcast_details_tit_no line1">
+															{{item.presell.store_name}}
+														</div>
+													</div>
+												</navigator>
+											</div>
+										</div>
+										<!--拼团商品链接-->
+										<div class="conter acea-row row-middle"
+											v-if="item.msn_type === 8 && item.productGroup && item.productGroup.product">
+											<div class=" acea-row row-column-around noPad">
+												<navigator class="acea-row row-column-around noPad"
+													v-if="item.productGroup.product_group_id"
+													:url="`/pages/activity/combination_details/index?id=${item.productGroup.product_group_id}`"
+													open-type="navigate">
+													<div class="broadcast_details_img_no">
+														<image :src="item.productGroup.product.image" />
+													</div>
+													<div class="broadcast_details_picBox_no noPad">
+														<div class="broadcast_details_pic">
+															￥{{ item.productGroup.product.price }}
+														</div>
+														<div class="broadcast_details_tit_no line1">
+															{{item.productGroup.product.store_name}}
+														</div>
+													</div>
+												</navigator>
+											</div>
+										</div>
+										<div class="conter acea-row row-middle" v-if="item.msn_type === 3">
+											<image :src="item.msn" @click="clickImg(item.msn)" mode="heightFix" />
+										</div>
+										<div class="conter acea-row row-middle" v-if="item.msn_type === 2">
+											<i class="em" :class="item.msn"
+												:style="'background-image:url('+ httpUrl +')'"></i>
+										</div>
+										<div class="conter acea-row row-middle" v-if="item.msn_type === 1">
+											{{item.msn}}
+										</div>
+										<view class="recall" :class="'recall'+index+j"
+											v-if="item.longpress && press && (item.msn_type === 1 || (new Date().getTime()/1000 - item.send_time) <= 120)">
+											<view class="recall-item" v-if="item.msn_type === 1">
+												<!-- #ifdef H5 -->
+												<view class="copy copy-data" :data-clipboard-text="item.msn">
+													<text class="iconfont icon-fuzhi"></text>
+													复制
+												</view>
+												<!-- #endif -->
+												<!-- #ifndef H5 -->
+												<view class="copy copy-data" @tap.stop="copyText(item.msn)">
+													<text class="iconfont icon-fuzhi"></text>
+													复制
+												</view>
+												<!-- #endif -->
+											</view>
+											<view v-if="(new Date().getTime()/1000 - item.send_time) <= 120"
+												class="recall-item" @click.stop="reverstMsg(item)">
+												<view class="iconfont icon-chehui"></view>撤回
+											</view>
+										</view>
+									</div>
+								</div>
+								<div v-if="item.msn_type != 100" class="pictrue">
+									<image :src="item.service.avatar ? item.service.avatar : '/static/images/f.png'" />
+								</div>
+								<view v-if="item.msn_type === 100" class="recall-msg">你撤回了一条消息</view>
+							</div>
+						</block>
+					</block>
+					<!-- 客户聊天列表 -->
+					<block v-for="(items,index) in history" v-if="userId == 0" :key="items.time">
+						<div class="create_time">{{items.time}}</div>
+						<block v-for="(item,j) in items.children" :key="item.service_log_id">
+							<!-- 左边 -->
+							<div class="item acea-row row-top" v-if="item.send_type == 1">
+								<div v-if="item.msn_type !== 100" class="pictrue">
+									<image :src="item.service.avatar ? item.service.avatar : '/static/images/f.png'"
+										mode=""></image>
+								</div>
+								<view v-if="item.msn_type === 100" class="recall-msg">对方撤回了一条消息</view>
+								<div class="text">
+									<!-- <div class="name">{{ item.service.nickname }}</div> -->
+									<div class="acea-row">
+										<!--退款订单链接-->
+										<navigator v-if="item.msn_type === 6 && item.refundOrder.refund_order_id"
+											open-type="navigate"
+											:url="'/pages/order_details/index?order_id='+item.refundOrder.order_id">
+											<div class="broadcast-details_num">
+												<text>退款单号：{{ item.refundOrder.refund_order_sn }}</text>
+											</div>
+											<div class="conter acea-row row-middle">
+												<!-- :key="item.service_log_id" -->
+												<div class="broadcast-details_order noPad"
+													v-for="(val, inx) in item.refundOrder.refundProduct">
+													<div class="broadcast-details_box noPad" v-if="inx == 0">
+														<div class="broadcast_details_img">
+															<image :src="val.product.cart_info.product.image" />
+															<div class="broadcast_details_model">
+																{{item.refundOrder.refund_num}}件商品
+															</div>
+														</div>
+														<div class="broadcast_details_picBox noPad">
+															<div class="broadcast_details_tit">
+																{{val.product.cart_info.product.store_name}}
+															</div>
+															<div class="broadcast_details_pic">
+																￥{{ val.product.cart_info.productAttr.price }}
+															</div>
+														</div>
+													</div>
+												</div>
+											</div>
+										</navigator>
+										<!--订单链接-->
+										<div v-if="item.msn_type === 5 && item.orderInfo.order_id">
+											<div class="broadcast-details_num acea-row row-middle">
+												<text>订单号：{{ item.orderInfo.order_sn }}</text>
+												<!-- #ifdef H5 -->
+												<button class="copy copy-data"
+													:data-clipboard-text="item.orderInfo.order_sn">复制</button>
+												<!-- #endif -->
+												<!-- #ifndef H5 -->
+												<button class="copy"
+													@tap.stop="copyText(item.orderInfo.order_sn)">复制</button>
+												<!-- #endif -->
+											</div>
+											<navigator
+												:url="'/pages/order_details/index?order_id='+item.orderInfo.order_id"
+												open-type="navigate" class="conter acea-row row-middle">
+												<!-- :key="item.service_log_id" -->
+												<div class="broadcast-details_order noPad"
+													v-for="(val, inx) in item.orderInfo.orderProduct">
+													<div class="broadcast-details_box noPad" v-if="inx == 0">
+														<div class="broadcast_details_img">
+															<image :src="val.cart_info.product.image" />
+															<div class="broadcast_details_model">
+																{{item.orderInfo.total_num}}件商品
+															</div>
+														</div>
+														<div class="broadcast_details_picBox noPad">
+															<div class="broadcast_details_tit">
+																{{val.cart_info.product.store_name}}
+															</div>
+															<div class="broadcast_details_pic">
+																￥{{ item.orderInfo.pay_price }}
+															</div>
+														</div>
+													</div>
+												</div>
+											</navigator>
+										</div>
+										<!--商品链接-->
+										<div class="conter acea-row row-middle"
+											v-if="item.msn_type === 4 && item.product">
+											<div class=" noPad">
+												<navigator class="acea-row row-column-around noPad"
+													v-if="item.product.product_id"
+													:url="`/pages/goods_details/index?id=${item.product.product_id}`"
+													open-type="navigate">
+													<div class="broadcast_details_img_no">
+														<image :src="item.product.image" />
+													</div>
+													<div class="broadcast_details_picBox_no noPad">
+														<div class="broadcast_details_pic">
+															￥{{ item.product.price }}
+														</div>
+														<div class="broadcast_details_tit_no line1">
+															{{item.product.store_name}}
+														</div>
+													</div>
+												</navigator>
+											</div>
+										</div>
+										<!--预售商品链接-->
+										<div class="conter acea-row row-middle"
+											v-if="item.msn_type === 7 && item.presell && item.presell.product">
+											<div class=" noPad">
+												<navigator class="acea-row row-column-around noPad"
+													v-if="item.presell.product_presell_id"
+													:url="`/pages/activity/presell_details/index?id=${item.presell.product_presell_id}`"
+													open-type="navigate">
+													<div class="broadcast_details_img_no">
+														<image :src="item.presell.product.image" />
+													</div>
+													<div class="broadcast_details_picBox_no noPad">
+														<div class="broadcast_details_pic">
+															￥{{ item.presell.price }}
+														</div>
+														<div class="broadcast_details_tit_no line1">
+															{{item.presell.store_name}}
+														</div>
+													</div>
+												</navigator>
+											</div>
+										</div>
+										<!--拼团商品链接-->
+										<div class="conter acea-row row-middle"
+											v-if="item.msn_type === 8 && item.productGroup && item.productGroup.product">
+											<div class="noPad">
+												<navigator class="acea-row row-column-around noPad"
+													v-if="item.productGroup.product_group_id"
+													:url="`/pages/activity/combination_details/index?id=${item.productGroup.product_group_id}`"
+													open-type="navigate">
+													<div class="broadcast_details_img_no">
+														<image :src="item.productGroup.product.image" />
+													</div>
+													<div class="broadcast_details_picBox_no noPad">
+														<div class="broadcast_details_pic">
+															￥{{ item.productGroup.product.price }}
+														</div>
+														<div class="broadcast_details_tit_no line1">
+															{{item.productGroup.product.store_name}}
+														</div>
+													</div>
+												</navigator>
+											</div>
+										</div>
+										<div class="conter acea-row row-middle" v-if="item.msn_type === 3">
+											<image :src="item.msn" @click="clickImg(item.msn)" mode="heightFix" />
+										</div>
+										<div class="conter acea-row row-middle" v-if="item.msn_type === 2">
+											<i class="em" :class="item.msn"
+												:style="'background-image:url('+ httpUrl +')'"></i>
+										</div>
+										<div class="conter acea-row row-middle" v-if="item.msn_type === 1">
+											{{item.msn}}
+										</div>
 
-                  </div>
-                </div>
-              </div>
-              <!-- 右边 -->
-              <div class="item acea-row row-top row-right" v-else>
-                <div class="text textR">
-                  <!-- <div class="name">{{ item.user.nickname }}</div> -->
-                  <div class="acea-row" @longpress="longTime(items,index,item,j)">
-                    <!--退款订单链接-->
-                    <navigator v-if="item.msn_type === 6 && item.refundOrder.refund_order_id" open-type="navigate"
-                      :url="'/pages/order_details/index?order_id='+item.refundOrder.order_id">
-                      <div class="broadcast-details_num">
-                        <text>退款单号：{{ item.refundOrder.refund_order_sn }}</text>
-                      </div>
-                      <div class="conter acea-row row-middle">
-                        <!-- :key="item.service_log_id" -->
-                        <div class="broadcast-details_order noPad" v-for="(val, inx) in item.refundOrder.refundProduct">
-                          <div class="broadcast-details_box noPad" v-if="inx == 0">
-                            <div class="broadcast_details_img">
-                              <image :src="val.product.cart_info.product.image" />
-                              <div class="broadcast_details_model">
-                                {{item.refundOrder.refund_num}}件商品
-                              </div>
-                            </div>
-                            <div class="broadcast_details_picBox noPad">
-                              <div class="broadcast_details_tit">{{val.product.cart_info.product.store_name}}</div>
-                              <div class="broadcast_details_pic">
-                                共{{item.refundOrder.refund_num}}件商品，
-                                合计 ￥{{ item.refundOrder.refund_price }}
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </navigator>
-                    <!--订单链接-->
-                    <div v-if="item.msn_type === 5 && item.orderInfo.order_id">
-                      <div class="broadcast-details_num acea-row row-middle">
-                        <text>订单号：{{ item.orderInfo.order_sn }}</text>
-                        <!-- #ifdef H5 -->
-                        <button class="copy copy-data" :data-clipboard-text="item.orderInfo.order_sn">复制</button>
-                        <!-- #endif -->
-                        <!-- #ifndef H5 -->
-                        <button class="copy" @tap.stop="copyText(item.orderInfo.order_sn)">复制</button>
-                        <!-- #endif -->
-                      </div>
-                      <navigator :url="'/pages/order_details/index?order_id='+item.orderInfo.order_id"
-                        open-type="navigate" class="conter acea-row row-middle">
-                        <div class="broadcast-details_order noPad" v-for="(val, inx) in item.orderInfo.orderProduct">
-                          <div class="broadcast-details_box noPad" v-if="inx == 0">
-                            <div class="broadcast_details_img">
-                              <image :src="val.cart_info.product.image" />
-                              <div class="broadcast_details_model">
-                                {{item.orderInfo.total_num}}件商品
-                              </div>
-                            </div>
-                            <div class="broadcast_details_picBox noPad">
-                              <div class="broadcast_details_tit">{{val.cart_info.product.store_name}}</div>
-                              <div class="broadcast_details_pic">
-                                ￥{{ item.orderInfo.pay_price }}
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </navigator>
-                    </div>
-                    <!--商品链接-->
-                    <div class="conter acea-row row-middle" v-if="item.msn_type === 4 && item.product">
-                      <div class="acea-row row-column-around noPad">
-                        <navigator class="acea-row row-column-around noPad" v-if="item.product.product_id"
-                          :url="`/pages/goods_details/index?id=${item.product.product_id}`" open-type="navigate">
-                          <div class="broadcast_details_img_no">
-                            <image :src="item.product.image" />
-                          </div>
-                          <div class="broadcast_details_picBox_no noPad">
-                            <div class="broadcast_details_pic">
-                              ￥{{ item.product.price }}
-                            </div>
-                            <div class="broadcast_details_tit_no line1">{{item.product.store_name}}</div>
-                          </div>
-                        </navigator>
-                      </div>
-                    </div>
-                    <!--预售商品链接-->
-                    <div class="conter acea-row row-middle"
-                      v-if="item.msn_type === 7 && item.presell && item.presell.product">
-                      <div class="acea-row row-column-around noPad">
-                        <navigator class="acea-row row-column-around noPad" v-if="item.presell.product_presell_id"
-                          :url="`/pages/activity/presell_details/index?id=${item.presell.product_presell_id}`"
-                          open-type="navigate">
-                          <div class="broadcast_details_img_no">
-                            <image :src="item.presell.product.image" />
-                          </div>
-                          <div class="broadcast_details_picBox_no noPad">
-                            <div class="broadcast_details_pic">
-                              ￥{{ item.presell.price }}
-                            </div>
-                            <div class="broadcast_details_tit_no line1">{{item.presell.store_name}}</div>
-                          </div>
-                        </navigator>
-                      </div>
-                    </div>
-                    <!--拼团商品链接-->
-                    <div class="conter acea-row row-middle"
-                      v-if="item.msn_type === 8 && item.productGroup && item.productGroup.product">
-                      <div class="acea-row row-column-around noPad">
-                        <navigator class="acea-row row-column-around noPad" v-if="item.productGroup.product_group_id"
-                          :url="`/pages/activity/combination_details/index?id=${item.productGroup.product_group_id}`"
-                          open-type="navigate">
-                          <div class="broadcast_details_img_no">
-                            <image :src="item.productGroup.product.image" />
-                          </div>
-                          <div class="broadcast_details_picBox_no noPad">
-                            <div class="broadcast_details_pic">
-                              ￥{{ item.productGroup.product.price }}
-                            </div>
-                            <div class="broadcast_details_tit_no line1">{{item.productGroup.product.store_name}}</div>
-                          </div>
-                        </navigator>
-                      </div>
-                    </div>
-                    <div class="conter acea-row row-middle" v-if="item.msn_type === 3">
-                      <image :src="item.msn" @click="clickImg(item.msn)" mode="heightFix" />
-                    </div>
-                    <div class="conter acea-row row-middle" v-if="item.msn_type === 2">
-                      <i class="em" :class="item.msn" :style="'background-image:url('+ httpUrl +')'"></i>
-                    </div>
-                    <div class="conter acea-row row-middle" v-if="item.msn_type === 1">
-                      {{ item.msn }}
-                    </div>
-                    <view class="recall" :class="'recall'+index+j"
-                      v-if="item.longpress && press && (item.msn_type === 1 || (new Date().getTime()/1000 - item.send_time) <= 120)">
-                      <view class="recall-item" v-if="item.msn_type === 1">
-                        <!-- #ifdef H5 -->
-                        <view class="copy copy-data" :data-clipboard-text="item.msn">
-                          <text class="iconfont icon-fuzhi"></text>
-                          复制
-                        </view>
-                        <!-- #endif -->
-                        <!-- #ifndef H5 -->
-                        <view class="copy copy-data" @tap.stop="copyText(item.msn)">
-                          <text class="iconfont icon-fuzhi"></text>
-                          复制
-                        </view>
-                        <!-- #endif -->
-                      </view>
-                      <view v-if="(new Date().getTime()/1000 - item.send_time) <= 120" class="recall-item"
-                        @click.stop="reverstMsg(item)">
-                        <view class="iconfont icon-chehui"></view>撤回
-                      </view>
-                    </view>
-                  </div>
-                </div>
-                <div v-if="item.msn_type !== 100" class="pictrue">
-                  <image :src="item.user.avatar ? item.user.avatar : '/static/images/f.png'" />
-                </div>
-                <view v-if="item.msn_type === 100" class="recall-msg">你撤回了一条消息</view>
-              </div>
-            </block>
-          </block>
-          <view class="footer_box" v-if="productId || orderId || refund_order_id"></view>
-          <div class="broadcast-details_order footer_count">
-            <!-- 商品信息 -->
-            <div class="broadcast-details_box" v-if="productId && productInfo.product_id">
-              <text class="iconfont icon-guanbi" @click.stop="productId = ''"></text>
-              <div class="broadcast_details_img">
-                <image v-if="!presellId" :src="productInfo.image" />
-                <image v-else :src="productInfo.product.image" />
-              </div>
-              <div class="broadcast_details_picBox">
-                <div class="broadcast_details_tit">{{productInfo.store_name}}</div>
-                <div class="acea-row row-between product_price">
-                  <div class="broadcast_details_pic p-color">
-                    ￥{{ productInfo.price}}
-                  </div>
-                  <div class="broadcast_details_btn product_btn" @click="sendProduct">发送商品</div>
-                </div>
-              </div>
-            </div>
-            <!-- 订单信息 -->
-            <div class="broadcast_box" v-if="orderId && orderInfo.order_id">
-              <text class="iconfont icon-guanbi" @click.stop="orderId = ''"></text>
-              <div class="broadcast-details_num broadcast_num acea-row row-between-wrapper">
-                <text>订单号：{{ orderInfo.order_sn }}</text>
-                <!-- <span class="line1">{{ orderInfo.pay_time }}</span> -->
-              </div>
-              <div class="broadcast-details_box">
-                <div class="broadcast_details_img">
-                  <image :src="cartInfo.cart_info.product.image" />
-                </div>
-                <div class="broadcast_details_picBox">
-                  <div class="broadcast_details_tit">
-                    {{ cartInfo.cart_info.product.store_name }}
-                  </div>
-                  <div>
-                    <div class="broadcast_details_pic">
-                      共{{ orderInfo.total_num }}件商品，合计 <text class="p-color">￥{{ orderInfo.pay_price }}</text>
-                    </div>
-                    <div class="broadcast_details_btn" @click="sendOrder">
-                      发送订单
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <!-- 退款订单 -->
-            <div class="broadcast_box" v-if="refund_order_id && refundDetail.refund_order_id">
-              <text class="iconfont icon-guanbi" @click.stop="refund_order_id = ''"></text>
-              <div class="broadcast-details_num broadcast_num">
-                <text>退款单号：{{ refundDetail.refund_order_sn }}</text>
-              </div>
-              <div class="broadcast-details_box">
-                <div class="broadcast_details_img">
-                  <image :src="refundDetail.refundProduct[0].product.cart_info.product.image" />
-                </div>
-                <div class="broadcast_details_picBox">
-                  <div class="broadcast_details_tit">
-                    {{ refundDetail.refundProduct[0].product.cart_info.product.store_name }}
-                  </div>
-                  <div>
-                    <div class="broadcast_details_pic">
-                      共{{ refundDetail.refund_num }}件商品，
-                      合计 <text class="p-color">￥{{ refundDetail.refund_price}}</text>
-                    </div>
-                    <div class="broadcast_details_btn refund_btn" @click="sendRefundOrder">
-                      发送退款单
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div :style=" active === true ? 'height:' + footerConH + 'rem;' : 'height:' + footerH + 'rem;'"></div>
-      </scroll-view>
-    </view>
-    <view style="height: 100rpx;"></view>
-    <div class="footerCon" :class="active === true ? 'on' : ''" ref="footerCon">
-      <form>
-        <div class="footer acea-row row-between row-bottom" ref="footer">
-          <text @click="uploadImg" class="iconfont icon-tupian2"></text>
-          <text @click="emoticon" class="iconfont icon-biaoqing2"></text>
-          <div class="voice acea-row row-center-wrapper" v-if="voice" @touchstart.prevent="start"
-            @touchmove.prevent="move" @touchend.prevent="end">
-            {{ speak }}
-          </div>
-          <view class="input_count">
-            <input type="text" placeholder-class='placeholder' placeholder="输入内容" class="input" ref="input"
-              v-show="!voice" @input="bindInput" @keyup="keyup" @focus="focus" cursor-spacing="20" v-model="textCon">
-            <div class="send iconfont icon-fasong" :style="'color:'+iconColor" @click="sendTest"></div>
-          </view>
-        </div>
-      </form>
-      <div class="banner slider-banner">
-        <swiper class="swiper-wrapper" :autoplay="autoplay" :circular="circular" :interval="interval"
-          :duration="duration" v-if="emojiGroup.length > 0">
-          <block v-for="(emojiList, index) in emojiGroup" :key="index">
-            <swiper-item>
-              <i class="em" :class="emoji" :style="'background-image:url('+ httpUrl +')'" v-for="emoji in emojiList"
-                :key="emoji" @click="addEmoji(emoji)"></i>
-            </swiper-item>
-          </block>
-        </swiper>
-      </div>
-    </div>
-    <div class="recording" v-if="recording">
-      <image src="/static/images/recording.png" />
-    </div>
-  </div>
+									</div>
+								</div>
+							</div>
+							<!-- 右边 -->
+							<div class="item acea-row row-top row-right" v-else>
+								<div class="text textR">
+									<!-- <div class="name">{{ item.user.nickname }}</div> -->
+									<div class="acea-row" @longpress="longTime(items,index,item,j)">
+										<!--退款订单链接-->
+										<navigator v-if="item.msn_type === 6 && item.refundOrder.refund_order_id"
+											open-type="navigate"
+											:url="'/pages/order_details/index?order_id='+item.refundOrder.order_id">
+											<div class="broadcast-details_num">
+												<text>退款单号：{{ item.refundOrder.refund_order_sn }}</text>
+											</div>
+											<div class="conter acea-row row-middle">
+												<!-- :key="item.service_log_id" -->
+												<div class="broadcast-details_order noPad"
+													v-for="(val, inx) in item.refundOrder.refundProduct">
+													<div class="broadcast-details_box noPad" v-if="inx == 0">
+														<div class="broadcast_details_img">
+															<image :src="val.product.cart_info.product.image" />
+															<div class="broadcast_details_model">
+																{{item.refundOrder.refund_num}}件商品
+															</div>
+														</div>
+														<div class="broadcast_details_picBox noPad">
+															<div class="broadcast_details_tit">
+																{{val.product.cart_info.product.store_name}}
+															</div>
+															<div class="broadcast_details_pic">
+																共{{item.refundOrder.refund_num}}件商品，
+																合计 ￥{{ item.refundOrder.refund_price }}
+															</div>
+														</div>
+													</div>
+												</div>
+											</div>
+										</navigator>
+										<!--订单链接-->
+										<div v-if="item.msn_type === 5 && item.orderInfo.order_id">
+											<div class="broadcast-details_num acea-row row-middle">
+												<text>订单号：{{ item.orderInfo.order_sn }}</text>
+												<!-- #ifdef H5 -->
+												<button class="copy copy-data"
+													:data-clipboard-text="item.orderInfo.order_sn">复制</button>
+												<!-- #endif -->
+												<!-- #ifndef H5 -->
+												<button class="copy"
+													@tap.stop="copyText(item.orderInfo.order_sn)">复制</button>
+												<!-- #endif -->
+											</div>
+											<navigator
+												:url="'/pages/order_details/index?order_id='+item.orderInfo.order_id"
+												open-type="navigate" class="conter acea-row row-middle">
+												<div class="broadcast-details_order noPad"
+													v-for="(val, inx) in item.orderInfo.orderProduct">
+													<div class="broadcast-details_box noPad" v-if="inx == 0">
+														<div class="broadcast_details_img">
+															<image :src="val.cart_info.product.image" />
+															<div class="broadcast_details_model">
+																{{item.orderInfo.total_num}}件商品
+															</div>
+														</div>
+														<div class="broadcast_details_picBox noPad">
+															<div class="broadcast_details_tit">
+																{{val.cart_info.product.store_name}}
+															</div>
+															<div class="broadcast_details_pic">
+																￥{{ item.orderInfo.pay_price }}
+															</div>
+														</div>
+													</div>
+												</div>
+											</navigator>
+										</div>
+										<!--商品链接-->
+										<div class="conter acea-row row-middle"
+											v-if="item.msn_type === 4 && item.product">
+											<div class="acea-row row-column-around noPad">
+												<navigator class="acea-row row-column-around noPad"
+													v-if="item.product.product_id"
+													:url="`/pages/goods_details/index?id=${item.product.product_id}`"
+													open-type="navigate">
+													<div class="broadcast_details_img_no">
+														<image :src="item.product.image" />
+													</div>
+													<div class="broadcast_details_picBox_no noPad">
+														<div class="broadcast_details_pic">
+															￥{{ item.product.price }}
+														</div>
+														<div class="broadcast_details_tit_no line1">
+															{{item.product.store_name}}
+														</div>
+													</div>
+												</navigator>
+											</div>
+										</div>
+										<!--预售商品链接-->
+										<div class="conter acea-row row-middle"
+											v-if="item.msn_type === 7 && item.presell && item.presell.product">
+											<div class="acea-row row-column-around noPad">
+												<navigator class="acea-row row-column-around noPad"
+													v-if="item.presell.product_presell_id"
+													:url="`/pages/activity/presell_details/index?id=${item.presell.product_presell_id}`"
+													open-type="navigate">
+													<div class="broadcast_details_img_no">
+														<image :src="item.presell.product.image" />
+													</div>
+													<div class="broadcast_details_picBox_no noPad">
+														<div class="broadcast_details_pic">
+															￥{{ item.presell.price }}
+														</div>
+														<div class="broadcast_details_tit_no line1">
+															{{item.presell.store_name}}
+														</div>
+													</div>
+												</navigator>
+											</div>
+										</div>
+										<!--拼团商品链接-->
+										<div class="conter acea-row row-middle"
+											v-if="item.msn_type === 8 && item.productGroup && item.productGroup.product">
+											<div class="acea-row row-column-around noPad">
+												<navigator class="acea-row row-column-around noPad"
+													v-if="item.productGroup.product_group_id"
+													:url="`/pages/activity/combination_details/index?id=${item.productGroup.product_group_id}`"
+													open-type="navigate">
+													<div class="broadcast_details_img_no">
+														<image :src="item.productGroup.product.image" />
+													</div>
+													<div class="broadcast_details_picBox_no noPad">
+														<div class="broadcast_details_pic">
+															￥{{ item.productGroup.product.price }}
+														</div>
+														<div class="broadcast_details_tit_no line1">
+															{{item.productGroup.product.store_name}}
+														</div>
+													</div>
+												</navigator>
+											</div>
+										</div>
+										<div class="conter acea-row row-middle" v-if="item.msn_type === 3">
+											<image :src="item.msn" @click="clickImg(item.msn)" mode="heightFix" />
+										</div>
+										<div class="conter acea-row row-middle" v-if="item.msn_type === 2">
+											<i class="em" :class="item.msn"
+												:style="'background-image:url('+ httpUrl +')'"></i>
+										</div>
+										<div class="conter acea-row row-middle" v-if="item.msn_type === 1">
+											{{ item.msn }}
+										</div>
+										<view class="recall" :class="'recall'+index+j"
+											v-if="item.longpress && press && (item.msn_type === 1 || (new Date().getTime()/1000 - item.send_time) <= 120)">
+											<view class="recall-item" v-if="item.msn_type === 1">
+												<!-- #ifdef H5 -->
+												<view class="copy copy-data" :data-clipboard-text="item.msn">
+													<text class="iconfont icon-fuzhi"></text>
+													复制
+												</view>
+												<!-- #endif -->
+												<!-- #ifndef H5 -->
+												<view class="copy copy-data" @tap.stop="copyText(item.msn)">
+													<text class="iconfont icon-fuzhi"></text>
+													复制
+												</view>
+												<!-- #endif -->
+											</view>
+											<view v-if="(new Date().getTime()/1000 - item.send_time) <= 120"
+												class="recall-item" @click.stop="reverstMsg(item)">
+												<view class="iconfont icon-chehui"></view>撤回
+											</view>
+										</view>
+									</div>
+								</div>
+								<div v-if="item.msn_type !== 100" class="pictrue">
+									<image :src="item.user.avatar ? item.user.avatar : '/static/images/f.png'" />
+								</div>
+								<view v-if="item.msn_type === 100" class="recall-msg">你撤回了一条消息</view>
+							</div>
+						</block>
+					</block>
+					<view class="footer_box" v-if="productId || orderId || refund_order_id"></view>
+					<div class="broadcast-details_order footer_count">
+						<!-- 商品信息 -->
+						<div class="broadcast-details_box" v-if="productId && productInfo.product_id">
+							<text class="iconfont icon-guanbi" @click.stop="productId = ''"></text>
+							<div class="broadcast_details_img">
+								<image v-if="!presellId" :src="productInfo.image" />
+								<image v-else :src="productInfo.product.image" />
+							</div>
+							<div class="broadcast_details_picBox">
+								<div class="broadcast_details_tit">{{productInfo.store_name}}</div>
+								<div class="acea-row row-between product_price">
+									<div class="broadcast_details_pic p-color">
+										￥{{ productInfo.price}}
+									</div>
+									<div class="broadcast_details_btn product_btn" @click="sendProduct">发送商品</div>
+								</div>
+							</div>
+						</div>
+						<!-- 订单信息 -->
+						<div class="broadcast_box" v-if="orderId && orderInfo.order_id">
+							<text class="iconfont icon-guanbi" @click.stop="orderId = ''"></text>
+							<div class="broadcast-details_num broadcast_num acea-row row-between-wrapper">
+								<text>订单号：{{ orderInfo.order_sn }}</text>
+								<!-- <span class="line1">{{ orderInfo.pay_time }}</span> -->
+							</div>
+							<div class="broadcast-details_box">
+								<div class="broadcast_details_img">
+									<image :src="cartInfo.cart_info.product.image" />
+								</div>
+								<div class="broadcast_details_picBox">
+									<div class="broadcast_details_tit">
+										{{ cartInfo.cart_info.product.store_name }}
+									</div>
+									<div>
+										<div class="broadcast_details_pic">
+											共{{ orderInfo.total_num }}件商品，合计 <text
+												class="p-color">￥{{ orderInfo.pay_price }}</text>
+										</div>
+										<div class="broadcast_details_btn" @click="sendOrder">
+											发送订单
+										</div>
+									</div>
+								</div>
+							</div>
+						</div>
+						<!-- 退款订单 -->
+						<div class="broadcast_box" v-if="refund_order_id && refundDetail.refund_order_id">
+							<text class="iconfont icon-guanbi" @click.stop="refund_order_id = ''"></text>
+							<div class="broadcast-details_num broadcast_num">
+								<text>退款单号：{{ refundDetail.refund_order_sn }}</text>
+							</div>
+							<div class="broadcast-details_box">
+								<div class="broadcast_details_img">
+									<image :src="refundDetail.refundProduct[0].product.cart_info.product.image" />
+								</div>
+								<div class="broadcast_details_picBox">
+									<div class="broadcast_details_tit">
+										{{ refundDetail.refundProduct[0].product.cart_info.product.store_name }}
+									</div>
+									<div>
+										<div class="broadcast_details_pic">
+											共{{ refundDetail.refund_num }}件商品，
+											合计 <text class="p-color">￥{{ refundDetail.refund_price}}</text>
+										</div>
+										<div class="broadcast_details_btn refund_btn" @click="sendRefundOrder">
+											发送退款单
+										</div>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+				<div :style=" active === true ? 'height:' + footerConH + 'rem;' : 'height:' + footerH + 'rem;'"></div>
+			</scroll-view>
+		</view>
+		<view style="height: 100rpx;"></view>
+		<div class="footerCon" :class="active === true ? 'on' : ''" ref="footerCon">
+			<form>
+				<div class="footer acea-row row-between row-bottom" ref="footer">
+					<text @click="uploadImg" class="iconfont icon-tupian2"></text>
+					<text @click="emoticon" class="iconfont icon-biaoqing2"></text>
+					<div class="voice acea-row row-center-wrapper" v-if="voice" @touchstart.prevent="start"
+						@touchmove.prevent="move" @touchend.prevent="end">
+						{{ speak }}
+					</div>
+					<view class="input_count">
+						<input type="text" placeholder-class='placeholder' placeholder="输入内容" class="input" ref="input"
+							v-show="!voice" @input="bindInput" @keyup="keyup" @focus="focus" cursor-spacing="20"
+							v-model="textCon">
+						<div class="send iconfont icon-fasong" :style="'color:'+iconColor" @click="sendTest"></div>
+					</view>
+				</div>
+			</form>
+			<div class="banner slider-banner">
+				<swiper class="swiper-wrapper" :autoplay="autoplay" :circular="circular" :interval="interval"
+					:duration="duration" v-if="emojiGroup.length > 0">
+					<block v-for="(emojiList, index) in emojiGroup" :key="index">
+						<swiper-item>
+							<i class="em" :class="emoji" :style="'background-image:url('+ httpUrl +')'"
+								v-for="emoji in emojiList" :key="emoji" @click="addEmoji(emoji)"></i>
+						</swiper-item>
+					</block>
+				</swiper>
+			</div>
+		</div>
+		<div class="recording" v-if="recording">
+			<image src="/static/images/recording.png" />
+		</div>
+	</div>
 </template>
 <script>
-  // +----------------------------------------------------------------------
-  // | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
-  // +----------------------------------------------------------------------
-  // | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved.
-  // +----------------------------------------------------------------------
-  // | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
-  // +----------------------------------------------------------------------
-  // | Author: CRMEB Team <admin@crmeb.com>
-  // +----------------------------------------------------------------------
-  import emojiList from "@/utils/emoji";
-  import Socket from "@/libs/chat";
-  // #ifdef H5
-  import ClipboardJS from "@/plugin/clipboard/clipboard.js";
-  // #endif
-  import { getChatRecord, getMerHistory, chatReverstApi, hasServiceApi } from "@/api/user";
-  import { getProductDetail, getPresellProductDetail, getStoreDetail } from "@/api/store";
-  import { getCombinationDetail } from "@/api/activity";
-  import { getOrderDetail, refundDetail } from "@/api/order";
-  import Loading from "@/components/Loading";
-  import { TOKENNAME, HTTP_REQUEST_URL } from '@/config/app.js';
-  import { toLogin } from '@/libs/login.js';
-  import { configMap } from "@/utils";
-  import { mapGetters } from "vuex";
-  const chunk = function(arr, num) {
-    num = num * 1 || 1;
-    var ret = [];
-    arr.forEach(function(item, i) {
-      if (i % num === 0) {
-        ret.push([]);
-      }
-      ret[ret.length - 1].push(item);
-    });
-    return ret;
-  };
-  const NAME = "CustomerService";
-  const PATH = 'pages/chat/customer_list/chat'
-  const app = getApp();
-  export default {
-    name: NAME,
-    components: {
-      Loading,
-    },
-    props: {
-      couponList: {
-        type: Array,
-        default: () => []
-      }
-    },
-    computed: configMap(['hide_mer_status'], mapGetters(['isLogin', 'viewColor', 'uid'])),
-    data: function() {
-      return {
-        url: `${HTTP_REQUEST_URL}/api/upload/image`,
-        headers: {
-          "Authori-zation": "Bearer " + this.$store.state.app.token
-        },
-        emojiGroup: chunk(emojiList, 21),
-        active: false,
-        voice: false,
-        speak: "按住 说话",
-        recording: false,
-        swiperOption: {
-          pagination: {
-            el: ".swiper-pagination",
-            clickable: true
-          },
-          speed: 1000,
-          observer: true,
-          observeParents: true
-        },
-        percent: 0,
-        footerConH: 0,
-        footerH: 1.08,
-        socket: null,
-        toUid: 0,
-        page: 1,
-        limit: 30,
-        loading: false,
-        loaded: false,
-        history: [],
-        sendColor: false,
-        sendtxt: "",
-        productId: 0,
-        presellId: 0,
-        combinationId: 0,
-        productInfo: {},
-        orderId: "",
-        orderInfo: {},
-        cartInfo: {},
-        autoplay: false,
-        circular: true,
-        interval: 3000,
-        duration: 500,
-        upload_max: 2, //图片大小
-        //上传的图片地址
-        uploadImages: [],
-        //展示的图片地址
-        uploads: [],
-        // 超出限制数组
-        exceeded_list: [],
-        windowH: 0,
-        isBQ: false,
-        scrollTop: 0, //滚动距离
-        textCon: '', //文字
-        iconColor: '#CCCCCC',
-        mer_id: 0, //商铺id
-        refund_order_id: 0, //退款订单id
-        refundDetail: '', //退款订单详情
-        userId: 0, //客服----用户id
-        pageType: 0, //页面区分
-        status: false, //砍价列表是否获取完成 false 未完成 true 完成
-        storeInfo: '',
-        isBack: false,
-        httpUrl: '',
-        press: false,
-        index: 0,
-        j: 0
-      };
-    },
-    watch: {
-      textCon: function(nval, oVal) {
-        if (nval == "") {
-          this.iconColor = '#CCCCCC'
-        } else {
-          this.iconColor = '#86C956'
-        }
-      }
-    },
-    beforeDestroy() {
-      uni.$off(["socket_open", "reply", "chat", "send_chat", "socket_error", "socket_close"])
-    },
-    onUnload() {
-      this.wsEnd();
-    },
-    onLoad(option) {
-      let self = this
-      this.toUid = option.uid || 0;
-      this.productId = parseInt(option.productId) || 0;
-      this.presellId = parseInt(option.presellId) || 0;
-      this.combinationId = parseInt(option.combinationId) || 0;
-      this.orderId = option.order_id || ""
-      this.mer_id = option.mer_id || 0
-      this.refund_order_id = option.refund_order_id || 0
-      this.userId = option.userId || 0
-      uni.getSystemInfo({
-        success: function(res) {
-          self.windowH = res.windowHeight
-        }
-      })
-      // #ifdef H5
-      this.$nextTick(function() {
-        var clipboard = new ClipboardJS('.copy-data');
-        clipboard.on('success', function(e) {
-          self.$util.Tips({
-            title: '复制成功'
-          })
-          self.press = false;
-        });
-        clipboard.on('error', function(e) {
-          self.$util.Tips({
-            title: '复制失败'
-          })
-        });
-      });
-      // #endif
-    },
-    onReady() {
-      this.httpUrl = `${HTTP_REQUEST_URL}/static/look.png`;
-    },
-    mounted: function() {
-      let that = this
-      if (that.isLogin) {
-        if (that.userId == 0) {
-          // 用户
-          that.getHistory();
-          that.getproductInfo();
-          that.getOrderInfo();
-          that.getRefundDetail();
-          that.getStoreDetail();
-        } else {
-          // 客服
-          that.getMerHistory();
-        }
-        uni.$on("socket_open", () => {
-          if (that.userId == 0) {
-            that.socket.send({
-              data: {
-                mer_id: that.mer_id
-              },
-              type: "chat_start"
-            });
-          } else {
-            that.socket.send({
-              data: {
-                uid: that.userId,
-                mer_id: that.mer_id
-              },
-              type: "service_chat_start"
-            });
-          }
-        });
-        uni.$on(["reply", "chat", "send_chat"], data => {
-          data.longpress = false
-          if (that.history.length > 0 && that.history[that.history.length - 1]['children'].length > 0) {
-            let index = that.history[that.history.length - 1]['children'].length - 1
-            let item = that.history[that.history.length - 1]['children'][index]
-            if (data.send_time - item.send_time > 300) {
-              that.history.push({ time: data.create_time, children: [data] })
-            } else {
-              that.history[that.history.length - 1]['children'].push(data);
-            }
-          } else {
-            that.history.push({ time: data.create_time, children: [data] })
-          }
-          that.deleteMsg(data);
-          that.height();
-        });
-        uni.$on("socket_error", () => {
-          if (!that.isBack) {
-            let self = this
-            uni.showModal({
-              title: '提示',
-              content: '连接失败,是否重新连接',
-              success: function(res) {
-                if (res.confirm) {
-                  self.wsStart()
-                } else if (res.cancel) {
-                  uni.navigateBack();
-                }
-              }
-            });
-          }
-        });
-        uni.$on("err_tip", data => {
-          if (!this.isBack) {
-            uni.showModal({
-              title: '提示',
-              content: data,
-              success: function(res) {
-                if (res.confirm) {
-                  console.log('用户点击确定');
-                } else if (res.cancel) {
-                  console.log('用户点击取消');
-                }
-              }
-            });
-          }
-        });
-        uni.$on("socket_close", () => {
-          if (!this.isBack) {
-            let curRoute = this.$mp.page.route;
-            let self = this
-            uni.showModal({
-              title: '提示',
-              content: '连接断开，是否重新连接',
-              success: function(res) {
-                if (res.confirm) {
-                  self.wsStart()
-                } else if (res.cancel) {
-                  uni.navigateBack();
-                }
-              }
-            });
-          }
-        })
-        that.hasService();
-        that.wsStart();
-      } else {
-        toLogin()
-      }
-    },
-    methods: {
-      userDetail(uid) {
-        this.wsEnd()
-        uni.redirectTo({
-          url: `/pages/chat/customer_info/index?uid=${uid}&mer_id=${this.mer_id}`
-        })
-      },
-      /*判断店铺是否有在线客服*/
-      hasService() {
-        hasServiceApi(this.mer_id).then(res => {
-          this.height();
-          if (this.userId == 0) {
-            // 用户
-            this.getHistory();
-          } else {
-            // 客服
-            this.getMerHistory();
-          }
-        }).catch(err => {
-          return this.$util.Tips({
-            title: err
-          }, {
-            tab: 3,
-            url: 1
-          });
-        });
-      },
-      // 联系客服拨打电话
-      async goCustomer() {
-        // #ifdef APP-PLUS
-        let result = await this.$store.dispatch("permission/requestPermissions",
-          'CALL_PHONE')
-        if (result !== 1) return;
-        // #endif
-        uni.makePhoneCall({
-          // 手机号
-          phoneNumber: this.storeInfo.service_phone,
-          // 成功回调
-          success: (res) => {},
-          // 失败回调
-          fail: (res) => {}
-        });
-      },
-      // 获取店铺详情
-      getStoreDetail() {
-        getStoreDetail(this.mer_id).then(res => {
-          this.storeInfo = res.data
-        })
-      },
-      // ws连接
-      wsStart() {
-        this.socket = new Socket();
-        this.height();
-      },
-      // ws关闭
-      wsEnd() {
-        let that = this;
-        if (that.userId == 0) {
-          that.socket.send({
-            data: {
-              mer_id: that.mer_id
-            },
-            type: "chat_end"
-          });
-        } else {
-          that.socket.send({
-            data: {
-              uid: that.userId,
-              mer_id: that.mer_id
-            },
-            type: "service_chat_end"
-          });
-        }
-        that.isBack = true
-        that.socket && that.socket.onClose();
-      },
-      // 删除数组中已撤回的消息
-      deleteMsg(data) {
-        let that = this;
-        that.history.forEach(function(item, index) {
-          item.children.forEach(function(itx, i) {
-            if (data.msn_type == 100 && data.msn == itx.service_log_id) {
-              item.children.splice(i, 1)
-            }
-          });
-        });
-      },
-      // 退款订单
-      getRefundDetail() {
-        if (this.refund_order_id) {
-          refundDetail(this.refund_order_id).then(res => {
-            this.refundDetail = res.data
-          })
-        }
-      },
-      async uploadImg() {
-        // #ifdef APP-PLUS
-        let result = await this.$store.dispatch("permission/requestPermissions",
-          'CAMERA')
-        if (result !== 1) return;
-        // #endif
-        let self = this
-        self.$util.uploadImageOne('upload/image', function(res) {
-          if (res.status == 200) {
-            self.sendMsg(res.data.path, 3)
-          }
-        });
-      },
-      /*长按事件*/
-      longTime(items, index, item, j) {
-        item.longpress = true
-        this.history[this.index]['children'][this.j]['longpress'] = false
-        this.press = true
-        this.index = index;
-        this.j = j
-        this.history[this.index]['children'][this.j]['longpress'] = true
-      },
-      stoppress() {
-        this.press = false
-      },
-      reverstMsg(item) {
-        this.sendMsg(item.service_log_id, 100)
-        setTimeout(function() {
-          item.longpress = false;
-        }, 300)
-      },
-      getOrderInfo() {
-        if (!this.orderId) return;
-        getOrderDetail(this.orderId).then(res => {
-          this.orderInfo = res.data;
-          if (this.orderInfo.orderProduct.length) {
-            this.cartInfo = this.orderInfo.orderProduct[0];
-          }
-        });
-      },
-      getproductInfo() {
-        let that = this;
-        if (!that.productId && !that.presellId && !that.combinationId) return;
-        if (that.presellId || that.combinationId) {
-          if (that.presellId) {
-            getPresellProductDetail(that.presellId).then(res => {
-              that.productInfo = res.data;
-            });
-          } else if (that.combinationId) {
-            getCombinationDetail(that.combinationId).then(res => {
-              that.productInfo = res.data.product;
-            });
-          }
-        } else {
-          getProductDetail(that.productId).then(res => {
-            that.productInfo = res.data;
-          });
-        }
-      },
-      scroll() {
-        if (window.scrollY < 300 && !this.loaded && !this.loading)
-          this.getHistory();
-      },
-      imageuploaded(res) {
-        if (res.status !== 200)
-          return this.$util.Tips({
-            title: res.msg || "上传图片失败"
-          });
-        this.sendMsg(res.data.url, 3);
-      },
-      // 用户聊天记录
-      getHistory() {
-        if (this.loading || this.loaded) return;
-        this.loading = true;
-        getChatRecord(this.mer_id, {
-            page: this.page,
-            limit: this.limit
-          }).then(({ data }) => {
-            let arr = this.getChatTime(data.list)
-            let newArr = []
-            for (var j in arr) {
-              let key = j
-              let item = {}
-              item.time = key;
-              arr[j].forEach(function(itm, i) {
-                itm.longpress = false
-              });
-              item.children = arr[j]
-              newArr.push(item)
-            }
-            this.history = newArr.concat(this.history);
-            if (this.page === 1) {
-              this.$nextTick(function() {
-                this.height();
-              });
-            }
-            this.page++;
-            this.loading = false;
-            this.loaded = data.length < this.limit;
-          })
-          .catch(err => {
-            this.$util.Tips({
-              title: err.message || "加载失败"
-            });
-          });
-      },
-      // 处理聊天时间
-      getChatTime(list) {
-        let arr = {}
-        let currentTime = ''
-        for (var i = 0; i < list.length; i++) {
-          if (i == 0) {
-            let time = list[i]['create_time']
-            arr[time] = [list[i]]
-            currentTime = time
-          } else {
-            if ((list[i]['send_time'] - list[i - 1]['send_time']) <= 300) {
-              arr[currentTime].push(list[i])
-            } else {
-              let time = list[i]['create_time']
-              currentTime = time
-              if (arr[time]) {
-                arr[currentTime].push(list[i])
-              } else {
-                arr[time] = [list[i]]
-              }
-            }
-          }
-        }
-        return arr;
-      },
-      // 客服聊天记录
-      getMerHistory() {
-        if (this.loading || this.loaded) return;
-        this.loading = true;
-        const last_id = this.history.length ? this.history[0].service_log_id : '';
-        getMerHistory(this.userId, this.mer_id, {
-            page: this.page,
-            limit: this.limit,
-            last_id
-          })
-          .then(({
-            data
-          }) => {
-            let arr = this.getChatTime(data.list)
-            let newArr = []
-            for (var j in arr) {
-              let key = j
-              let item = {}
-              item.time = key;
-              arr[j].forEach(function(itm, i) {
-                itm.longpress = false
-              });
-              item.children = arr[j]
-              newArr.push(item)
-            }
-            this.history = newArr.concat(this.history);
+	// +----------------------------------------------------------------------
+	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+	// +----------------------------------------------------------------------
+	// | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved.
+	// +----------------------------------------------------------------------
+	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+	// +----------------------------------------------------------------------
+	// | Author: CRMEB Team <admin@crmeb.com>
+	// +----------------------------------------------------------------------
+	import emojiList from "@/utils/emoji";
+	import Socket from "@/libs/chat";
+	// #ifdef H5
+	import ClipboardJS from "@/plugin/clipboard/clipboard.js";
+	// #endif
+	import {
+		getChatRecord,
+		getMerHistory,
+		chatReverstApi,
+		hasServiceApi
+	} from "@/api/user";
+	import {
+		getProductDetail,
+		getPresellProductDetail,
+		getStoreDetail
+	} from "@/api/store";
+	import {
+		getCombinationDetail
+	} from "@/api/activity";
+	import {
+		getOrderDetail,
+		refundDetail
+	} from "@/api/order";
+	import Loading from "@/components/Loading";
+	import {
+		TOKENNAME,
+		HTTP_REQUEST_URL
+	} from '@/config/app.js';
+	import {
+		toLogin
+	} from '@/libs/login.js';
+	import {
+		configMap
+	} from "@/utils";
+	import {
+		mapGetters
+	} from "vuex";
+	const chunk = function(arr, num) {
+		num = num * 1 || 1;
+		var ret = [];
+		arr.forEach(function(item, i) {
+			if (i % num === 0) {
+				ret.push([]);
+			}
+			ret[ret.length - 1].push(item);
+		});
+		return ret;
+	};
+	const NAME = "CustomerService";
+	const PATH = 'pages/chat/customer_list/chat'
+	const app = getApp();
+	export default {
+		name: NAME,
+		components: {
+			Loading,
+		},
+		props: {
+			couponList: {
+				type: Array,
+				default: () => []
+			}
+		},
+		computed: configMap(['hide_mer_status'], mapGetters(['isLogin', 'viewColor', 'uid'])),
+		data: function() {
+			return {
+				url: `${HTTP_REQUEST_URL}/api/upload/image`,
+				headers: {
+					"Authori-zation": "Bearer " + this.$store.state.app.token
+				},
+				emojiGroup: chunk(emojiList, 21),
+				active: false,
+				voice: false,
+				speak: "按住 说话",
+				recording: false,
+				swiperOption: {
+					pagination: {
+						el: ".swiper-pagination",
+						clickable: true
+					},
+					speed: 1000,
+					observer: true,
+					observeParents: true
+				},
+				percent: 0,
+				footerConH: 0,
+				footerH: 1.08,
+				socket: null,
+				toUid: 0,
+				page: 1,
+				limit: 30,
+				loading: false,
+				loaded: false,
+				history: [],
+				sendColor: false,
+				sendtxt: "",
+				productId: 0,
+				presellId: 0,
+				combinationId: 0,
+				productInfo: {},
+				orderId: "",
+				orderInfo: {},
+				cartInfo: {},
+				autoplay: false,
+				circular: true,
+				interval: 3000,
+				duration: 500,
+				upload_max: 2, //图片大小
+				//上传的图片地址
+				uploadImages: [],
+				//展示的图片地址
+				uploads: [],
+				// 超出限制数组
+				exceeded_list: [],
+				windowH: 0,
+				isBQ: false,
+				scrollTop: 0, //滚动距离
+				textCon: '', //文字
+				iconColor: '#CCCCCC',
+				mer_id: 0, //商铺id
+				refund_order_id: 0, //退款订单id
+				refundDetail: '', //退款订单详情
+				userId: 0, //客服----用户id
+				pageType: 0, //页面区分
+				status: false, //砍价列表是否获取完成 false 未完成 true 完成
+				storeInfo: '',
+				isBack: false,
+				httpUrl: '',
+				press: false,
+				index: 0,
+				j: 0
+			};
+		},
+		watch: {
+			textCon: function(nval, oVal) {
+				if (nval == "") {
+					this.iconColor = '#CCCCCC'
+				} else {
+					this.iconColor = '#86C956'
+				}
+			}
+		},
+		beforeDestroy() {
+			uni.$off(["socket_open", "reply", "chat", "send_chat", "socket_error", "socket_close"])
+		},
+		onUnload() {
+			this.wsEnd();
+		},
+		onLoad(option) {
+			let self = this
+			this.toUid = option.uid || 0;
+			this.productId = parseInt(option.productId) || 0;
+			this.presellId = parseInt(option.presellId) || 0;
+			this.combinationId = parseInt(option.combinationId) || 0;
+			this.orderId = option.order_id || ""
+			this.mer_id = option.mer_id || 0
+			this.refund_order_id = option.refund_order_id || 0
+			this.userId = option.userId || 0
+			uni.getSystemInfo({
+				success: function(res) {
+					self.windowH = res.windowHeight
+				}
+			})
+			// #ifdef H5
+			this.$nextTick(function() {
+				var clipboard = new ClipboardJS('.copy-data');
+				clipboard.on('success', function(e) {
+					self.$util.Tips({
+						title: '复制成功'
+					})
+					self.press = false;
+				});
+				clipboard.on('error', function(e) {
+					self.$util.Tips({
+						title: '复制失败'
+					})
+				});
+			});
+			// #endif
+		},
+		onReady() {
+			this.httpUrl = `${HTTP_REQUEST_URL}/static/look.png`;
+		},
+		mounted: function() {
+			let that = this
+			if (that.isLogin) {
+				if (that.userId == 0) {
+					// 用户
+					that.getHistory();
+					that.getproductInfo();
+					that.getOrderInfo();
+					that.getRefundDetail();
+					that.getStoreDetail();
+				} else {
+					// 客服
+					that.getMerHistory();
+				}
+				uni.$on("socket_open", () => {
+					if (that.userId == 0) {
+						that.socket.send({
+							data: {
+								mer_id: that.mer_id
+							},
+							type: "chat_start"
+						});
+					} else {
+						that.socket.send({
+							data: {
+								uid: that.userId,
+								mer_id: that.mer_id
+							},
+							type: "service_chat_start"
+						});
+					}
+				});
+				uni.$on(["reply", "chat", "send_chat"], data => {
+					data.longpress = false
+					if (that.history.length > 0 && that.history[that.history.length - 1]['children'].length >
+						0) {
+						let index = that.history[that.history.length - 1]['children'].length - 1
+						let item = that.history[that.history.length - 1]['children'][index]
+						if (data.send_time - item.send_time > 300) {
+							that.history.push({
+								time: data.create_time,
+								children: [data]
+							})
+						} else {
+							that.history[that.history.length - 1]['children'].push(data);
+						}
+					} else {
+						that.history.push({
+							time: data.create_time,
+							children: [data]
+						})
+					}
+					that.deleteMsg(data);
+					that.height();
+				});
+				uni.$on("socket_error", () => {
+					if (!that.isBack) {
+						let self = this
+						uni.showModal({
+							title: '提示',
+							content: '连接失败,是否重新连接',
+							success: function(res) {
+								if (res.confirm) {
+									self.wsStart()
+								} else if (res.cancel) {
+									uni.navigateBack();
+								}
+							}
+						});
+					}
+				});
+				uni.$on("err_tip", data => {
+					if (!this.isBack) {
+						uni.showModal({
+							title: '提示',
+							content: data,
+							success: function(res) {
+								if (res.confirm) {
+									console.log('用户点击确定');
+								} else if (res.cancel) {
+									console.log('用户点击取消');
+								}
+							}
+						});
+					}
+				});
+				uni.$on("socket_close", () => {
+					if (!this.isBack) {
+						let curRoute = this.$mp.page.route;
+						let self = this
+						uni.showModal({
+							title: '提示',
+							content: '连接断开，是否重新连接',
+							success: function(res) {
+								if (res.confirm) {
+									self.wsStart()
+								} else if (res.cancel) {
+									uni.navigateBack();
+								}
+							}
+						});
+					}
+				})
+				that.hasService();
+				that.wsStart();
+			} else {
+				toLogin()
+			}
+		},
+		methods: {
+			userDetail(uid) {
+				this.wsEnd()
+				uni.redirectTo({
+					url: `/pages/chat/customer_info/index?uid=${uid}&mer_id=${this.mer_id}`
+				})
+			},
+			/*判断店铺是否有在线客服*/
+			hasService() {
+				hasServiceApi(this.mer_id).then(res => {
+					this.height();
+					if (this.userId == 0) {
+						// 用户
+						this.getHistory();
+					} else {
+						// 客服
+						this.getMerHistory();
+					}
+				}).catch(err => {
+					return this.$util.Tips({
+						title: err
+					}, {
+						tab: 3,
+						url: 1
+					});
+				});
+			},
+			// 联系客服拨打电话
+			async goCustomer() {
+				// #ifdef APP-PLUS
+				let result = await this.$store.dispatch("permission/requestPermissions",
+					'CALL_PHONE')
+				if (result !== 1) return;
+				// #endif
+				uni.makePhoneCall({
+					// 手机号
+					phoneNumber: this.storeInfo.service_phone,
+					// 成功回调
+					success: (res) => {},
+					// 失败回调
+					fail: (res) => {}
+				});
+			},
+			// 获取店铺详情
+			getStoreDetail() {
+				getStoreDetail(this.mer_id).then(res => {
+					this.storeInfo = res.data
+				})
+			},
+			// ws连接
+			wsStart() {
+				this.socket = new Socket();
+				this.height();
+			},
+			// ws关闭
+			wsEnd() {
+				let that = this;
+				if (that.userId == 0) {
+					that.socket.send({
+						data: {
+							mer_id: that.mer_id
+						},
+						type: "chat_end"
+					});
+				} else {
+					that.socket.send({
+						data: {
+							uid: that.userId,
+							mer_id: that.mer_id
+						},
+						type: "service_chat_end"
+					});
+				}
+				that.isBack = true
+				that.socket && that.socket.onClose();
+			},
+			// 删除数组中已撤回的消息
+			deleteMsg(data) {
+				let that = this;
+				that.history.forEach(function(item, index) {
+					item.children.forEach(function(itx, i) {
+						if (data.msn_type == 100 && data.msn == itx.service_log_id) {
+							item.children.splice(i, 1)
+						}
+					});
+				});
+			},
+			// 退款订单
+			getRefundDetail() {
+				if (this.refund_order_id) {
+					refundDetail(this.refund_order_id).then(res => {
+						this.refundDetail = res.data
+					})
+				}
+			},
+			async uploadImg() {
+				// #ifdef APP-PLUS
+				let result = await this.$store.dispatch("permission/requestPermissions",
+					'CAMERA')
+				if (result !== 1) return;
+				// #endif
+				let self = this
+				self.$util.uploadImageOne('upload/image', function(res) {
+					if (res.status == 200) {
+						self.sendMsg(res.data.path, 3)
+					}
+				});
+			},
+			/*长按事件*/
+			longTime(items, index, item, j) {
+				item.longpress = true
+				this.history[this.index]['children'][this.j]['longpress'] = false
+				this.press = true
+				this.index = index;
+				this.j = j
+				this.history[this.index]['children'][this.j]['longpress'] = true
+			},
+			stoppress() {
+				this.press = false
+			},
+			reverstMsg(item) {
+				this.sendMsg(item.service_log_id, 100)
+				setTimeout(function() {
+					item.longpress = false;
+				}, 300)
+			},
+			getOrderInfo() {
+				if (!this.orderId) return;
+				getOrderDetail(this.orderId).then(res => {
+					this.orderInfo = res.data;
+					if (this.orderInfo.orderProduct.length) {
+						this.cartInfo = this.orderInfo.orderProduct[0];
+					}
+				});
+			},
+			getproductInfo() {
+				let that = this;
+				if (!that.productId && !that.presellId && !that.combinationId) return;
+				if (that.presellId || that.combinationId) {
+					if (that.presellId) {
+						getPresellProductDetail(that.presellId).then(res => {
+							that.productInfo = res.data;
+						});
+					} else if (that.combinationId) {
+						getCombinationDetail(that.combinationId).then(res => {
+							that.productInfo = res.data.product;
+						});
+					}
+				} else {
+					getProductDetail(that.productId).then(res => {
+						that.productInfo = res.data;
+					});
+				}
+			},
+			scroll() {
+				if (window.scrollY < 300 && !this.loaded && !this.loading)
+					this.getHistory();
+			},
+			imageuploaded(res) {
+				if (res.status !== 200)
+					return this.$util.Tips({
+						title: res.msg || "上传图片失败"
+					});
+				this.sendMsg(res.data.url, 3);
+			},
+			// 用户聊天记录
+			getHistory() {
+				if (this.loading || this.loaded) return;
+				this.loading = true;
+				getChatRecord(this.mer_id, {
+						page: this.page,
+						limit: this.limit
+					}).then(({
+						data
+					}) => {
+						let arr = this.getChatTime(data.list)
+						let newArr = []
+						for (var j in arr) {
+							let key = j
+							let item = {}
+							item.time = key;
+							arr[j].forEach(function(itm, i) {
+								itm.longpress = false
+							});
+							item.children = arr[j]
+							newArr.push(item)
+						}
+						this.history = newArr.concat(this.history);
+						if (this.page === 1) {
+							this.$nextTick(function() {
+								this.height();
+							});
+						}
+						this.page++;
+						this.loading = false;
+						this.loaded = data.length < this.limit;
+					})
+					.catch(err => {
+						this.$util.Tips({
+							title: err.message || "加载失败"
+						});
+					});
+			},
+			// 处理聊天时间
+			getChatTime(list) {
+				let arr = {}
+				let currentTime = ''
+				for (var i = 0; i < list.length; i++) {
+					if (i == 0) {
+						let time = list[i]['create_time']
+						arr[time] = [list[i]]
+						currentTime = time
+					} else {
+						if ((list[i]['send_time'] - list[i - 1]['send_time']) <= 300) {
+							arr[currentTime].push(list[i])
+						} else {
+							let time = list[i]['create_time']
+							currentTime = time
+							if (arr[time]) {
+								arr[currentTime].push(list[i])
+							} else {
+								arr[time] = [list[i]]
+							}
+						}
+					}
+				}
+				return arr;
+			},
+			// 客服聊天记录
+			getMerHistory() {
+				if (this.loading || this.loaded) return;
+				this.loading = true;
+				const last_id = this.history.length ? this.history[0].service_log_id : '';
+				getMerHistory(this.userId, this.mer_id, {
+						page: this.page,
+						limit: this.limit,
+						last_id
+					})
+					.then(({
+						data
+					}) => {
+						let arr = this.getChatTime(data.list)
+						let newArr = []
+						for (var j in arr) {
+							let key = j
+							let item = {}
+							item.time = key;
+							arr[j].forEach(function(itm, i) {
+								itm.longpress = false
+							});
+							item.children = arr[j]
+							newArr.push(item)
+						}
+						this.history = newArr.concat(this.history);
 
-            if (this.page === 1) {
-              this.$nextTick(function() {
-                this.height();
-              });
-            }
-            this.page++;
-            this.loading = false;
-            this.loaded = data.length < this.limit;
-          })
-          .catch(err => {
-            this.$util.Tips({
-              title: err.msg || "加载失败"
-            });
-          });
-      },
-      focus: function() {
-        this.active = false;
-      },
-      keyup: function() {
-        if (this.$refs.input.value.length > 0) {
-          this.sendColor = true;
-        } else {
-          this.sendColor = false;
-        }
-      },
-      addEmoji(name) {
-        this.sendMsg(name, 2);
-      },
-      // 聊天表情转换
-      replace_em(str) {
-        str = str.replace(/\[em-([\s\S]*)\]/g, "<span class='em em-$1' style='background-image:url(" + this
-          .httpUrl + ")'></span>");
-        return str;
-      },
-      clickImg(url) {
-        wx.previewImage({
-          urls: [url],
-          current: "",
-          success: function(res) {},
-          fail: function(res) {},
-          complate: function(res) {}
-        })
-      },
-      sendMsg(msn, type) {
-        let self = this;
-        if (this.userId == 0) {
-          this.height();
-          this.socket.send({
-            data: {
-              msn,
-              msn_type: type,
-              // to_uid: this.toUid,
-              mer_id: self.mer_id
-            },
-            type: "send_chat",
-          })
-        } else {
-          this.height();
-          this.socket.send({
-            data: {
-              msn,
-              msn_type: type,
-              // to_uid: this.toUid,
-              uid: self.userId,
-              mer_id: self.mer_id
-            },
-            type: "service_chat",
-          })
-        }
-      },
-      sendTest() {
-        this.sendMsg(this.textCon, 1);
-        this.textCon = ''
-        this.height();
-      },
-      sendProduct() {
-        if (this.presellId || this.combinationId) {
-          if (this.presellId) {
-            this.sendMsg(this.presellId, 7);
-            this.presellId = 0;
-          } else if (this.combinationId) {
-            this.sendMsg(this.combinationId, 8);
-            this.combinationId = 0;
-          }
-        } else {
-          this.sendMsg(this.productId, 4);
-          this.productId = 0;
-        }
-        this.productInfo = {};
-      },
-      sendOrder() {
-        this.sendMsg(this.orderId, 5);
-        this.orderId = 0;
-        this.orderInfo = {};
-      },
-      sendRefundOrder() {
-        this.sendMsg(this.refund_order_id, 6);
-        this.refund_order_id = 0;
-        this.refundDetail = {};
-      },
-      bindInput: function(e) {
-        if (e.detail.value) {
-          this.sendColor = true
-        } else {
-          this.sendColor = false
-        }
-        this.height();
-      },
-      start() {
-        var that = this;
-        this.longClick = 0;
-        this.timeOutEvent = setTimeout(function() {
-          that.longClick = 1;
-        }, 500);
-        that.speak = "松开 结束";
-        that.recording = true;
-      },
-      move() {
-        clearTimeout(this.timeOutEvent);
-        this.timeOutEvent = 0;
-      },
-      end() {
-        clearTimeout(this.timeOutEvent);
-        if (this.timeOutEvent !== 0 && this.longClick === 0) {
-          //点击
-          //此处为点击事件----在此处添加跳转详情页
-        }
-        this.speak = "按住 说话";
-        this.recording = false;
-        return false;
-      },
-      voiceBnt: function() {
-        this.active = false;
-        if (this.voice === true) {
-          this.voice = false;
-          this.$nextTick(function() {
-            this.$refs.input.focus();
-          });
-        } else {
-          this.voice = true;
-        }
-        this.percent = 0;
-        this.footerConH = 0;
-        this.footerH = 0;
-        this.$nextTick(function() {
-          this.height();
-        });
-      },
-      emoticon: function() {
-        this.voice = false;
-        if (this.active === true) {
-          this.active = false;
-          this.isBQ = false
-        } else {
-          this.active = true;
-          this.isBQ = true
-        }
-        this.height();
-      },
-      height() {
-        let self = this
-        var scrollTop = 0
-        let info = uni.createSelectorQuery().select(".chat");
-        setTimeout(res => {
-          (!this.isBack) && info.boundingClientRect(function(data) { //data - 各种参数
-            scrollTop = data.height
-            if (self.active) {
-              self.scrollTop = parseInt(scrollTop) + 500
-            } else {
-              self.scrollTop = parseInt(scrollTop) + 100
-            }
-          }).exec()
-        }, 1000)
-      },
-      // 滚动到头部
-      bindScroll() {
-        if (this.userId == 0) {
-          this.getHistory();
-          this.getproductInfo();
-          this.getOrderInfo();
-          this.getRefundDetail();
-          this.getStoreDetail();
-        } else {
-          this.getMerHistory();
-        }
-      },
-      //#ifndef H5
-      copyText: function(text) {
-        uni.setClipboardData({ data: text });
-      },
-      // #endif
-    }
-  };
+						if (this.page === 1) {
+							this.$nextTick(function() {
+								this.height();
+							});
+						}
+						this.page++;
+						this.loading = false;
+						this.loaded = data.length < this.limit;
+					})
+					.catch(err => {
+						this.$util.Tips({
+							title: err.msg || "加载失败"
+						});
+					});
+			},
+			focus: function() {
+				this.active = false;
+			},
+			keyup: function() {
+				if (this.$refs.input.value.length > 0) {
+					this.sendColor = true;
+				} else {
+					this.sendColor = false;
+				}
+			},
+			addEmoji(name) {
+				this.sendMsg(name, 2);
+			},
+			// 聊天表情转换
+			replace_em(str) {
+				str = str.replace(/\[em-([\s\S]*)\]/g, "<span class='em em-$1' style='background-image:url(" + this
+					.httpUrl + ")'></span>");
+				return str;
+			},
+			clickImg(url) {
+				wx.previewImage({
+					urls: [url],
+					current: "",
+					success: function(res) {},
+					fail: function(res) {},
+					complate: function(res) {}
+				})
+			},
+			sendMsg(msn, type) {
+				let self = this;
+				if (this.userId == 0) {
+					this.height();
+					this.socket.send({
+						data: {
+							msn,
+							msn_type: type,
+							// to_uid: this.toUid,
+							mer_id: self.mer_id
+						},
+						type: "send_chat",
+					})
+				} else {
+					this.height();
+					this.socket.send({
+						data: {
+							msn,
+							msn_type: type,
+							// to_uid: this.toUid,
+							uid: self.userId,
+							mer_id: self.mer_id
+						},
+						type: "service_chat",
+					})
+				}
+			},
+			sendTest() {
+				this.sendMsg(this.textCon, 1);
+				this.textCon = ''
+				this.height();
+			},
+			sendProduct() {
+				if (this.presellId || this.combinationId) {
+					if (this.presellId) {
+						this.sendMsg(this.presellId, 7);
+						this.presellId = 0;
+					} else if (this.combinationId) {
+						this.sendMsg(this.combinationId, 8);
+						this.combinationId = 0;
+					}
+				} else {
+					this.sendMsg(this.productId, 4);
+					this.productId = 0;
+				}
+				this.productInfo = {};
+			},
+			sendOrder() {
+				this.sendMsg(this.orderId, 5);
+				this.orderId = 0;
+				this.orderInfo = {};
+			},
+			sendRefundOrder() {
+				this.sendMsg(this.refund_order_id, 6);
+				this.refund_order_id = 0;
+				this.refundDetail = {};
+			},
+			bindInput: function(e) {
+				if (e.detail.value) {
+					this.sendColor = true
+				} else {
+					this.sendColor = false
+				}
+				this.height();
+			},
+			start() {
+				var that = this;
+				this.longClick = 0;
+				this.timeOutEvent = setTimeout(function() {
+					that.longClick = 1;
+				}, 500);
+				that.speak = "松开 结束";
+				that.recording = true;
+			},
+			move() {
+				clearTimeout(this.timeOutEvent);
+				this.timeOutEvent = 0;
+			},
+			end() {
+				clearTimeout(this.timeOutEvent);
+				if (this.timeOutEvent !== 0 && this.longClick === 0) {
+					//点击
+					//此处为点击事件----在此处添加跳转详情页
+				}
+				this.speak = "按住 说话";
+				this.recording = false;
+				return false;
+			},
+			voiceBnt: function() {
+				this.active = false;
+				if (this.voice === true) {
+					this.voice = false;
+					this.$nextTick(function() {
+						this.$refs.input.focus();
+					});
+				} else {
+					this.voice = true;
+				}
+				this.percent = 0;
+				this.footerConH = 0;
+				this.footerH = 0;
+				this.$nextTick(function() {
+					this.height();
+				});
+			},
+			emoticon: function() {
+				this.voice = false;
+				if (this.active === true) {
+					this.active = false;
+					this.isBQ = false
+				} else {
+					this.active = true;
+					this.isBQ = true
+				}
+				this.height();
+			},
+			height() {
+				let self = this
+				var scrollTop = 0
+				let info = uni.createSelectorQuery().select(".chat");
+				setTimeout(res => {
+					(!this.isBack) && info.boundingClientRect(function(data) { //data - 各种参数
+						scrollTop = data.height
+						if (self.active) {
+							self.scrollTop = parseInt(scrollTop) + 500
+						} else {
+							self.scrollTop = parseInt(scrollTop) + 100
+						}
+					}).exec()
+				}, 1000)
+			},
+			// 滚动到头部
+			bindScroll() {
+				if (this.userId == 0) {
+					this.getHistory();
+					this.getproductInfo();
+					this.getOrderInfo();
+					this.getRefundDetail();
+					this.getStoreDetail();
+				} else {
+					this.getMerHistory();
+				}
+			},
+			//#ifndef H5
+			copyText: function(text) {
+				uni.setClipboardData({
+					data: text
+				});
+			},
+			// #endif
+		}
+	};
 </script>
 
 <style lang="scss" scoped>
-  page {
-    width: 100%;
-    height: 100%;
-  }
-
-  // @import url("@/plugin/emoji-awesome/css/google.min.css");
-  @import "@/plugin/emoji-awesome/css/tuoluojiang.css";
-
-  .noPad {
-    padding: 0 !important;
-    margin-bottom: 0 !important;
-    height: auto !important;
-  }
-
-  .broadcast-details_num {
-    width: 100%;
-    height: 72rpx;
-    line-height: 72rpx;
-    color: #666666;
-    font-size: 26rpx;
-    display: flex;
-    justify-content: space-between;
-    background: #fff;
-    border-bottom: 1px solid #F5F5F5;
-    padding: 0 24rpx;
-    border-radius: 10rpx 10rpx 0 0;
-
-    .line1 {
-      max-width: 203rpx;
-    }
-  }
-
-  uni-swiper-item {
-    background: #fff;
-  }
-
-  .footer_count {
-    margin-top: 20rpx;
-    width: 710rpx;
-    position: fixed;
-    bottom: 120rpx;
-    bottom: calc(120rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
-    bottom: calc(120rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
-    left: 20rpx;
-
-    .broadcast-details_box,
-    .broadcast_box {
-      margin-bottom: 0;
-      position: relative;
-    }
-
-    .icon-guanbi {
-      font-size: 20rpx;
-      color: #C4C4C4;
-      position: absolute;
-      right: 20rpx;
-      top: 20rpx;
-    }
-  }
-
-  .broadcast-details_order {
-    // padding: 15rpx;
-  }
-
-  .copy {
-    color: var(--view-theme);
-    margin-left: 24rpx;
-    font-size: 22rpx;
-    opacity: .5;
-  }
-
-  .broadcast-details_box {
-    padding: 20rpx;
-    display: flex;
-    background: #fff;
-    border-radius: 0 0 10rpx 10rpx;
-    margin-bottom: 24rpx;
-  }
-
-  .broadcast_details_model {
-    width: 100%;
-    height: 43rpx;
-    background: rgba(0, 0, 0, 0.5);
-    border-radius: 0 0 16rpx 16rpx;
-    position: absolute;
-    z-index: 0;
-    bottom: 0;
-    font-size: 22rpx;
-    color: #fff;
-    text-align: center;
-    line-height: 43rpx;
-  }
-
-  .broadcast_details_img {
-    width: 160rpx;
-    height: 160rpx;
-    border-radius: 10px;
-    overflow: hidden;
-    position: relative;
-  }
-
-  .broadcast_details_img uni-image,
-  .broadcast_details_img image {
-    width: 160rpx;
-    height: 160rpx;
-  }
-
-  .broadcast_details_img_no {
-    width: 456rpx;
-    height: 456rpx;
-    border-radius: 10px 10px 0px 0px;
-    overflow: hidden;
-    margin-bottom: 10rpx;
-  }
-
-  .broadcast_details_picBox_no {
-    width: 100%;
-  }
-
-  .broadcast_details_img_no uni-image,
-  .broadcast_details_img_no img {
-    width: 100%;
-    height: 100%;
-  }
-
-  .broadcast_details_tit {
-    font-size: 30rpx;
-    color: #282828;
-    // height: 30rpx;
-    max-width: 400rpx;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    display: -webkit-box;
-    -webkit-line-clamp: 1;
-    -webkit-box-orient: vertical;
-    text-align: left !important;
-  }
-
-  .product_price {
-    margin-top: 66rpx;
-  }
-
-  .broadcast_details_tit_no {
-    font-size: 28rpx;
-    color: #333333;
-    font-weight: 800;
-    text-align: left;
-    margin-top: 5rpx;
-    max-width: 420rpx;
-  }
-
-  .broadcast_details_picBox {
-    width: 75%;
-    margin-left: 24rpx;
-  }
-
-  .broadcast_details_pic {
-    margin-top: 15rpx;
-    font-size: 24rpx;
-    color: #999999;
-    text-align: left;
-  }
-
-  .broadcast_details_pic_num {
-    text-decoration: line-through;
-    font-size: 28rpx;
-    color: rgba(0, 0, 0, 0.5);
-    margin-left: 0.1rem;
-  }
-
-  .broadcast_details_btn {
-    width: 130rpx;
-    height: 50rpx;
-    background: var(--view-theme);
-    opacity: 1;
-    border-radius: 125rpx;
-    color: #fff;
-    font-size: 24rpx;
-    text-align: center;
-    line-height: 50rpx;
-    margin-top: 16px;
-    float: right;
-
-    &.product_btn {
-      margin-top: 0;
-      float: none;
-    }
-
-    &.refund_btn {
-      width: 150rpx;
-    }
-  }
-
-  .p-color {
-    color: var(--view-priceColor);
-  }
-
-  .broadcast-details .chat {
-    padding: 1rpx 23rpx 0 23rpx;
-    margin-bottom: 3rpx;
-
-  }
-
-  .broadcast-details .chat .item {
-    margin-top: 37rpx;
-  }
-
-  .broadcast-details .create_time {
-    dislay: block;
-    width: 100%;
-    text-align: center;
-    color: #999999;
-    font-size: 22rpx;
-    margin: 30rpx 0;
-  }
-
-  .broadcast-details .chat .item .pictrue {
-    width: 80rpx;
-    height: 80rpx;
-    margin-top: 10rpx;
-  }
-
-  .broadcast-details .chat .item .pictrue image {
-    width: 100%;
-    height: 100%;
-    border-radius: 50%;
-  }
-
-  .broadcast-details .chat .item .text {
-    margin-left: 20rpx;
-  }
-
-  .broadcast-details .chat .item .text.textR {
-    text-align: right;
-    margin: 0 20rpx 0 0;
-    position: relative;
-
-    .recall {
-      position: absolute;
-      width: 220rpx;
-      height: 114rpx;
-      border-radius: 6rpx;
-      background: #4C4C4C;
-      color: #fff;
-      top: -140rpx;
-      right: 0;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      z-index: 200;
-
-      &.recall00 {
-        top: auto;
-        bottom: -130rpx;
-
-        &::after {
-          border-top-color: transparent;
-          border-bottom-color: rgba(0, 0, 0, .6);
-          bottom: auto;
-          top: -26rpx;
-        }
-      }
-
-      &::after {
-        content: "";
-        display: block;
-        border: 14rpx solid transparent;
-        border-top-color: rgba(0, 0, 0, .6);
-        position: absolute;
-        bottom: -26rpx;
-        right: 30rpx;
-      }
-
-      .recall-item {
-        text-align: center;
-        margin: 0 30rpx;
-        font-size: 24rpx;
-
-        .copy-data {
-          color: #fff;
-          margin-left: 0;
-          opacity: 1;
-        }
-
-        .iconfont {
-          display: block;
-          font-size: 32rpx;
-          margin-bottom: 8rpx;
-        }
-      }
-    }
-  }
-
-  .broadcast-details .chat .item .text .name {
-    font-size: 24rpx;
-    color: #999;
-  }
-
-  .broadcast-details .chat .item .text .name .return {
-    color: #509efb;
-    margin-left: 17rpx;
-  }
-
-  .broadcast-details .chat .item .text.textR .name .return {
-    margin: 0 0.17rem 0 0;
-  }
-
-  .broadcast-details .chat .item .text .conter {
-    background-color: #fff;
-    border-radius: 8rpx;
-    padding: 16rpx 20rpx;
-    font-size: 30rpx;
-    color: #333;
-    position: relative;
-    max-width: 600rpx;
-    margin-top: 2rpx;
-    word-break: break-all;
-    text-align: left;
-
-    .em {
-      margin: 0;
-    }
-  }
-
-  .recall-msg {
-    display: block;
-    width: 100%;
-    text-align: center;
-    color: #999;
-    font-size: 24rpx;
-    margin: 10rpx 0;
-  }
-
-  .broadcast-details .chat .item .text .spot {
-    width: 15rpx;
-    height: 15rpx;
-    background-color: #c00000;
-    border-radius: 50%;
-    margin-left: 20rpx;
-  }
-
-  .broadcast-details .chat .item .text .conter:before {
-    position: absolute;
-    content: "";
-    width: 0;
-    height: 0;
-    border-bottom: 9rpx solid transparent;
-    border-right: 14rpx solid #fff;
-    border-top: 9rpx solid transparent;
-    left: -14rpx;
-    top: 25rpx;
-  }
-
-  .broadcast-details .chat .item .text.textR .conter:before {
-    left: unset;
-    right: -14rpx;
-    transform: rotateY(180deg);
-  }
-
-  .broadcast-details .chat .item .text .conter img {
-    /* #ifdef H5 */
-    width: 100%;
-    /* #endif */
-    display: block;
-  }
-
-  .broadcast-details .chat .item .text .conter .signal {
-    width: 48rpx;
-    height: 48rpx;
-  }
-
-  .broadcast-details .chat .item .text .conter .signal.signalR {
-    transform: rotate(180deg);
-    -ms-transform: rotate(180deg);
-    -webkit-transform: rotate(180deg);
-  }
-
-  .broadcast-details .footerCon {
-    height: 100rpx;
-    width: 100%;
-    transition: all 0.005s cubic-bezier(0.25, 0.5, 0.5, 0.9);
-    background-color: #fff;
-    position: fixed;
-    bottom: 0;
-    height: calc(100rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
-    height: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
-    left: 0;
-  }
-
-  .broadcast-details .footerCon .banner {
-    background: #fff;
-    margin-top: calc(0rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
-    margin-top: calc(0rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
-  }
-
-  .broadcast-details .footerCon.on {
-    position: relative;
-    top: -300rpx;
-    transform: translate3d(0, 0, 0) !important;
-
-    .banner {
-      margin-top: 0;
-    }
-  }
-
-  .broadcast-details .footerCon .banner .swiper-slide {
-    flex-wrap: wrap;
-    -webkit-flex-wrap: wrap;
-    background-color: #fff;
-    padding-bottom: 50rpx;
-    border-top: 1px solid #f5f5f5;
-  }
-
-  .broadcast-details .footerCon .banner .swiper-slide .emoji-outer,
-  .swiper-slide .em {
-    display: block;
-    width: 50rpx;
-    height: 50rpx;
-    margin: 40rpx 0 0 50rpx;
-  }
-
-  .broadcast-details .footerCon .banner .swiper-container-horizontal>.swiper-pagination-bullets {
-    bottom: 10rpx;
-  }
-
-  .broadcast-details .footerCon .slider-banner .swiper-pagination-bullet-active {
-    background-color: #999;
-  }
-
-  .broadcast-details .recording {
-    width: 300rpx;
-    height: 300rpx;
-    position: fixed;
-    top: 40%;
-    left: 50%;
-    margin-left: -150rpx;
-  }
-
-  .broadcast-details .recording img {
-    width: 100%;
-    height: 100%;
-  }
-
-  .broadcast-details .footer {
-    // width: 100%;
-    background-color: #fff;
-    padding: 17rpx 26rpx;
-    align-items: center;
-
-  }
-
-  .footer_box {
-    margin-top: 260rpx;
-  }
-
-  .broadcast-details .footer image {
-    width: 61rpx;
-    height: 60rpx;
-    display: block;
-  }
-
-  .broadcast-details .footer .icon-biaoqing2,
-  .broadcast-details .footer .icon-tupian2 {
-    font-size: 60rpx;
-    display: block;
-  }
-
-  .broadcast-details .footer .voice {
-    width: 440rpx;
-    border-radius: 10rpx;
-    background-color: #e5e5e5;
-    /* padding: 17rpx 30rpx; */
-    height: 60rpx;
-    padding-left: 20rpx;
-  }
-
-  .broadcast-details .footer .input_count {
-    margin-left: 20rpx;
-    width: 544rpx;
-    box-sizing: border-box;
-    border-radius: 38rpx;
-    background-color: #F6F6F6;
-    padding: 0 80rpx 0 30rpx;
-    height: 76rpx;
-    position: relative;
-  }
-
-  .broadcast-details .footer .placeholder {
-    color: #999999;
-    font-size: 26rpx;
-  }
-
-  .broadcast-details .footer .input {
-    max-height: 150rpx;
-    overflow-y: auto;
-    overflow-x: hidden;
-    color: #999999;
-    height: 76rpx;
-    font-size: 26rpx;
-  }
-
-  .broadcast-details .footer .send {
-    font-size: 48rpx;
-    color: #cccccc;
-    position: absolute;
-    right: 15rpx;
-    top: 15rpx;
-  }
-
-  .em {
-    display: inline-block;
-    width: 50rpx;
-    height: 50rpx;
-    margin: 40rpx 0 0 50rpx;
-  }
-
-  .emoji-outer {
-    position: absolute;
-    right: 70rpx;
-    /* bottom: 12rpx; */
-    width: 50rpx;
-    height: 50rpx;
-    margin: 40rpx 0 0 50rpx;
-  }
-
-  .broadcast-details {
-    display: flex;
-    flex-direction: column;
-    width: 100%;
-    overflow: hidden;
-
-    .hd-wrapper {
-      flex: 1;
-      display: flex;
-      flex-direction: column;
-      overflow: hidden;
-
-      &.on {
-        padding-bottom: 300rpx;
-      }
-    }
-  }
-
-  .store-wrapper {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 15rpx 20rpx;
-    background-color: #fff;
-    width: 100%;
-    position: fixed;
-    top: 0;
-    left: 0;
-    z-index: 100;
-
-    image {
-      width: 60rpx;
-      height: 60rpx;
-      margin-right: 10rpx;
-    }
-
-    .left {
-      display: flex;
-      align-items: center;
-    }
-
-    .link {
-      width: 80rpx;
-      height: 40rpx;
-      line-height: 38rpx;
-      border: 1px solid var(--view-theme);
-      border-radius: 20px;
-      font-size: 24rpx;
-      color: var(--view-theme);
-      text-align: center;
-    }
-
-    .store-opeation {
-      align-items: center;
-
-      .icon-dadianhua01 {
-        color: var(--view-theme);
-        margin-left: 28rpx;
-        font-size: 34rpx;
-      }
-    }
-  }
+	page {
+		width: 100%;
+		height: 100%;
+	}
+
+	// @import url("@/plugin/emoji-awesome/css/google.min.css");
+	@import "@/plugin/emoji-awesome/css/tuoluojiang.css";
+
+	.noPad {
+		padding: 0 !important;
+		margin-bottom: 0 !important;
+		height: auto !important;
+	}
+
+	.broadcast-details_num {
+		width: 100%;
+		height: 72rpx;
+		line-height: 72rpx;
+		color: #666666;
+		font-size: 26rpx;
+		display: flex;
+		justify-content: space-between;
+		background: #fff;
+		border-bottom: 1px solid #F5F5F5;
+		padding: 0 24rpx;
+		border-radius: 10rpx 10rpx 0 0;
+
+		.line1 {
+			max-width: 203rpx;
+		}
+	}
+
+	uni-swiper-item {
+		background: #fff;
+	}
+
+	.footer_count {
+		margin-top: 20rpx;
+		width: 710rpx;
+		position: fixed;
+		bottom: 120rpx;
+		bottom: calc(120rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
+		bottom: calc(120rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
+		left: 20rpx;
+
+		.broadcast-details_box,
+		.broadcast_box {
+			margin-bottom: 0;
+			position: relative;
+		}
+
+		.icon-guanbi {
+			font-size: 20rpx;
+			color: #C4C4C4;
+			position: absolute;
+			right: 20rpx;
+			top: 20rpx;
+		}
+	}
+
+	.broadcast-details_order {
+		// padding: 15rpx;
+	}
+
+	.copy {
+		color: var(--view-theme);
+		margin-left: 24rpx;
+		font-size: 22rpx;
+		opacity: .5;
+	}
+
+	.broadcast-details_box {
+		padding: 20rpx;
+		display: flex;
+		background: #fff;
+		border-radius: 0 0 10rpx 10rpx;
+		margin-bottom: 24rpx;
+	}
+
+	.broadcast_details_model {
+		width: 100%;
+		height: 43rpx;
+		background: rgba(0, 0, 0, 0.5);
+		border-radius: 0 0 16rpx 16rpx;
+		position: absolute;
+		z-index: 0;
+		bottom: 0;
+		font-size: 22rpx;
+		color: #fff;
+		text-align: center;
+		line-height: 43rpx;
+	}
+
+	.broadcast_details_img {
+		width: 160rpx;
+		height: 160rpx;
+		border-radius: 10px;
+		overflow: hidden;
+		position: relative;
+	}
+
+	.broadcast_details_img uni-image,
+	.broadcast_details_img image {
+		width: 160rpx;
+		height: 160rpx;
+	}
+
+	.broadcast_details_img_no {
+		width: 456rpx;
+		height: 456rpx;
+		border-radius: 10px 10px 0px 0px;
+		overflow: hidden;
+		margin-bottom: 10rpx;
+	}
+
+	.broadcast_details_picBox_no {
+		width: 100%;
+	}
+
+	.broadcast_details_img_no uni-image,
+	.broadcast_details_img_no img {
+		width: 100%;
+		height: 100%;
+	}
+
+	.broadcast_details_tit {
+		font-size: 30rpx;
+		color: #282828;
+		// height: 30rpx;
+		max-width: 400rpx;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-line-clamp: 1;
+		-webkit-box-orient: vertical;
+		text-align: left !important;
+	}
+
+	.product_price {
+		margin-top: 66rpx;
+	}
+
+	.broadcast_details_tit_no {
+		font-size: 28rpx;
+		color: #333333;
+		font-weight: 800;
+		text-align: left;
+		margin-top: 5rpx;
+		max-width: 420rpx;
+	}
+
+	.broadcast_details_picBox {
+		width: 75%;
+		margin-left: 24rpx;
+	}
+
+	.broadcast_details_pic {
+		margin-top: 15rpx;
+		font-size: 24rpx;
+		color: #999999;
+		text-align: left;
+	}
+
+	.broadcast_details_pic_num {
+		text-decoration: line-through;
+		font-size: 28rpx;
+		color: rgba(0, 0, 0, 0.5);
+		margin-left: 0.1rem;
+	}
+
+	.broadcast_details_btn {
+		width: 130rpx;
+		height: 50rpx;
+		background: var(--view-theme);
+		opacity: 1;
+		border-radius: 125rpx;
+		color: #fff;
+		font-size: 24rpx;
+		text-align: center;
+		line-height: 50rpx;
+		margin-top: 16px;
+		float: right;
+
+		&.product_btn {
+			margin-top: 0;
+			float: none;
+		}
+
+		&.refund_btn {
+			width: 150rpx;
+		}
+	}
+
+	.p-color {
+		color: var(--view-priceColor);
+	}
+
+	.broadcast-details .chat {
+		padding: 1rpx 23rpx 0 23rpx;
+		margin-bottom: 3rpx;
+
+	}
+
+	.broadcast-details .chat .item {
+		margin-top: 37rpx;
+	}
+
+	.broadcast-details .create_time {
+		dislay: block;
+		width: 100%;
+		text-align: center;
+		color: #999999;
+		font-size: 22rpx;
+		margin: 30rpx 0;
+	}
+
+	.broadcast-details .chat .item .pictrue {
+		width: 80rpx;
+		height: 80rpx;
+		margin-top: 10rpx;
+	}
+
+	.broadcast-details .chat .item .pictrue image {
+		width: 100%;
+		height: 100%;
+		border-radius: 50%;
+	}
+
+	.broadcast-details .chat .item .text {
+		margin-left: 20rpx;
+	}
+
+	.broadcast-details .chat .item .text.textR {
+		text-align: right;
+		margin: 0 20rpx 0 0;
+		position: relative;
+
+		.recall {
+			position: absolute;
+			width: 220rpx;
+			height: 114rpx;
+			border-radius: 6rpx;
+			background: #4C4C4C;
+			color: #fff;
+			top: -140rpx;
+			right: 0;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			z-index: 200;
+
+			&.recall00 {
+				top: auto;
+				bottom: -130rpx;
+
+				&::after {
+					border-top-color: transparent;
+					border-bottom-color: rgba(0, 0, 0, .6);
+					bottom: auto;
+					top: -26rpx;
+				}
+			}
+
+			&::after {
+				content: "";
+				display: block;
+				border: 14rpx solid transparent;
+				border-top-color: rgba(0, 0, 0, .6);
+				position: absolute;
+				bottom: -26rpx;
+				right: 30rpx;
+			}
+
+			.recall-item {
+				text-align: center;
+				margin: 0 30rpx;
+				font-size: 24rpx;
+
+				.copy-data {
+					color: #fff;
+					margin-left: 0;
+					opacity: 1;
+				}
+
+				.iconfont {
+					display: block;
+					font-size: 32rpx;
+					margin-bottom: 8rpx;
+				}
+			}
+		}
+	}
+
+	.broadcast-details .chat .item .text .name {
+		font-size: 24rpx;
+		color: #999;
+	}
+
+	.broadcast-details .chat .item .text .name .return {
+		color: #509efb;
+		margin-left: 17rpx;
+	}
+
+	.broadcast-details .chat .item .text.textR .name .return {
+		margin: 0 0.17rem 0 0;
+	}
+
+	.broadcast-details .chat .item .text .conter {
+		background-color: #fff;
+		border-radius: 8rpx;
+		padding: 16rpx 20rpx;
+		font-size: 30rpx;
+		color: #333;
+		position: relative;
+		max-width: 600rpx;
+		margin-top: 2rpx;
+		word-break: break-all;
+		text-align: left;
+
+		.em {
+			margin: 0;
+		}
+	}
+
+	.recall-msg {
+		display: block;
+		width: 100%;
+		text-align: center;
+		color: #999;
+		font-size: 24rpx;
+		margin: 10rpx 0;
+	}
+
+	.broadcast-details .chat .item .text .spot {
+		width: 15rpx;
+		height: 15rpx;
+		background-color: #c00000;
+		border-radius: 50%;
+		margin-left: 20rpx;
+	}
+
+	.broadcast-details .chat .item .text .conter:before {
+		position: absolute;
+		content: "";
+		width: 0;
+		height: 0;
+		border-bottom: 9rpx solid transparent;
+		border-right: 14rpx solid #fff;
+		border-top: 9rpx solid transparent;
+		left: -14rpx;
+		top: 25rpx;
+	}
+
+	.broadcast-details .chat .item .text.textR .conter:before {
+		left: unset;
+		right: -14rpx;
+		transform: rotateY(180deg);
+	}
+
+	.broadcast-details .chat .item .text .conter img {
+		/* #ifdef H5 */
+		width: 100%;
+		/* #endif */
+		display: block;
+	}
+
+	.broadcast-details .chat .item .text .conter .signal {
+		width: 48rpx;
+		height: 48rpx;
+	}
+
+	.broadcast-details .chat .item .text .conter .signal.signalR {
+		transform: rotate(180deg);
+		-ms-transform: rotate(180deg);
+		-webkit-transform: rotate(180deg);
+	}
+
+	.broadcast-details .footerCon {
+		height: 100rpx;
+		width: 100%;
+		transition: all 0.005s cubic-bezier(0.25, 0.5, 0.5, 0.9);
+		background-color: #fff;
+		position: fixed;
+		bottom: 0;
+		height: calc(100rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
+		height: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
+		left: 0;
+	}
+
+	.broadcast-details .footerCon .banner {
+		background: #fff;
+		margin-top: calc(0rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
+		margin-top: calc(0rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
+	}
+
+	.broadcast-details .footerCon.on {
+		position: relative;
+		top: -300rpx;
+		transform: translate3d(0, 0, 0) !important;
+
+		.banner {
+			margin-top: 0;
+		}
+	}
+
+	.broadcast-details .footerCon .banner .swiper-slide {
+		flex-wrap: wrap;
+		-webkit-flex-wrap: wrap;
+		background-color: #fff;
+		padding-bottom: 50rpx;
+		border-top: 1px solid #f5f5f5;
+	}
+
+	.broadcast-details .footerCon .banner .swiper-slide .emoji-outer,
+	.swiper-slide .em {
+		display: block;
+		width: 50rpx;
+		height: 50rpx;
+		margin: 40rpx 0 0 50rpx;
+	}
+
+	.broadcast-details .footerCon .banner .swiper-container-horizontal>.swiper-pagination-bullets {
+		bottom: 10rpx;
+	}
+
+	.broadcast-details .footerCon .slider-banner .swiper-pagination-bullet-active {
+		background-color: #999;
+	}
+
+	.broadcast-details .recording {
+		width: 300rpx;
+		height: 300rpx;
+		position: fixed;
+		top: 40%;
+		left: 50%;
+		margin-left: -150rpx;
+	}
+
+	.broadcast-details .recording img {
+		width: 100%;
+		height: 100%;
+	}
+
+	.broadcast-details .footer {
+		// width: 100%;
+		background-color: #fff;
+		padding: 17rpx 26rpx;
+		align-items: center;
+
+	}
+
+	.footer_box {
+		margin-top: 260rpx;
+	}
+
+	.broadcast-details .footer image {
+		width: 61rpx;
+		height: 60rpx;
+		display: block;
+	}
+
+	.broadcast-details .footer .icon-biaoqing2,
+	.broadcast-details .footer .icon-tupian2 {
+		font-size: 60rpx;
+		display: block;
+	}
+
+	.broadcast-details .footer .voice {
+		width: 440rpx;
+		border-radius: 10rpx;
+		background-color: #e5e5e5;
+		/* padding: 17rpx 30rpx; */
+		height: 60rpx;
+		padding-left: 20rpx;
+	}
+
+	.broadcast-details .footer .input_count {
+		margin-left: 20rpx;
+		width: 544rpx;
+		box-sizing: border-box;
+		border-radius: 38rpx;
+		background-color: #F6F6F6;
+		padding: 0 80rpx 0 30rpx;
+		height: 76rpx;
+		position: relative;
+	}
+
+	.broadcast-details .footer .placeholder {
+		color: #999999;
+		font-size: 26rpx;
+	}
+
+	.broadcast-details .footer .input {
+		max-height: 150rpx;
+		overflow-y: auto;
+		overflow-x: hidden;
+		color: #999999;
+		height: 76rpx;
+		font-size: 26rpx;
+	}
+
+	.broadcast-details .footer .send {
+		font-size: 48rpx;
+		color: #cccccc;
+		position: absolute;
+		right: 15rpx;
+		top: 15rpx;
+	}
+
+	.em {
+		display: inline-block;
+		width: 50rpx;
+		height: 50rpx;
+		margin: 40rpx 0 0 50rpx;
+	}
+
+	.emoji-outer {
+		position: absolute;
+		right: 70rpx;
+		/* bottom: 12rpx; */
+		width: 50rpx;
+		height: 50rpx;
+		margin: 40rpx 0 0 50rpx;
+	}
+
+	.broadcast-details {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		overflow: hidden;
+
+		.hd-wrapper {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			overflow: hidden;
+
+			&.on {
+				padding-bottom: 300rpx;
+			}
+		}
+	}
+
+	.store-wrapper {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 15rpx 20rpx;
+		background-color: #fff;
+		width: 100%;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 100;
+
+		image {
+			width: 60rpx;
+			height: 60rpx;
+			margin-right: 10rpx;
+		}
+
+		.left {
+			display: flex;
+			align-items: center;
+
+			.txt {
+				max-width: 480rpx;
+			}
+		}
+
+		.link {
+			width: 80rpx;
+			height: 40rpx;
+			line-height: 38rpx;
+			border: 1px solid var(--view-theme);
+			border-radius: 20px;
+			font-size: 24rpx;
+			color: var(--view-theme);
+			text-align: center;
+		}
+
+		.store-opeation {
+			align-items: center;
+
+			.icon-dadianhua01 {
+				color: var(--view-theme);
+				margin-left: 28rpx;
+				font-size: 34rpx;
+			}
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/chat/customer_list/index.vue b/pages/chat/customer_list/index.vue
index cbecb88..0b6ae8e 100644
--- a/pages/chat/customer_list/index.vue
+++ b/pages/chat/customer_list/index.vue
@@ -12,10 +12,11 @@
 						<view class="con line1" v-if="item.last && item.last.msn_type == 2">[表情]</view>
 						<view class="con line1" v-if="item.last && item.last.msn_type == 3">[图片]</view>
 						<view class="con line1" v-if="item.last && item.last.msn_type == 4">[商品]</view>
-						<view class="con line1" v-if="item.last && (item.last.msn_type == 5 || item.last.msn_type == 6)">[订单]</view>
+						<view class="con line1"
+							v-if="item.last && (item.last.msn_type == 5 || item.last.msn_type == 6)">[订单]</view>
 					</view>
 					<view class="right-box">
-						<view class="time">{{item.last && item.last.create_time.split(' ')[1] || ''}}</view>
+						<view class="time">{{item.display_time}}</view>
 						<view class="num" v-if="item.num>0">{{item.num}}</view>
 					</view>
 				</div>
@@ -23,18 +24,21 @@
 			<block v-if="type == 1 && list.length>0" v-for="(item,index) in list" :key="index">
 				<div class="item acea-row" @click="goPage(item)">
 					<view class="logo">
-						<image :src="(item.user && item.user.avatar) ? item.user.avatar : '/static/images/f.png'" mode=""></image>
+						<image :src="(item.user && item.user.avatar) ? item.user.avatar : '/static/images/f.png'"
+							mode=""></image>
 					</view>
 					<view class="info">
 						<view class="name">{{item.user && item.user.nickname}}</view>
 						<view class="con line1" v-if="item.last && item.last.msn_type == 1">{{item.last.msn}}</view>
 						<view class="con line1" v-if="item.last && item.last.msn_type == 2">[表情]</view>
 						<view class="con line1" v-if="item.last && item.last.msn_type == 3">[图片]</view>
-						<view class="con line1" v-if="item.last && (item.last.msn_type == 4 || item.last.msn_type == 7)">[商品]</view>
-						<view class="con line1" v-if="item.last &&  (item.last.msn_type == 5 || item.last.msn_type == 6)">[订单]</view>
+						<view class="con line1"
+							v-if="item.last && (item.last.msn_type == 4 || item.last.msn_type == 7)">[商品]</view>
+						<view class="con line1"
+							v-if="item.last &&  (item.last.msn_type == 5 || item.last.msn_type == 6)">[订单]</view>
 					</view>
 					<view class="right-box">
-						<view class="time">{{item.last && item.last.create_time.split(' ')[1]}}</view>
+						<view class="time">{{item.display_time}}</view>
 						<view class="num" v-if="item.num>0">{{item.num}}</view>
 					</view>
 				</div>
@@ -57,12 +61,19 @@
 	// +----------------------------------------------------------------------
 	import emptyPage from '@/components/emptyPage.vue'
 
-	import { serviceList, serviceUserList } from "@/api/user";
-	import { toLogin } from '@/libs/login.js';
-	import { mapGetters } from "vuex";
+	import {
+		serviceList,
+		serviceUserList
+	} from "@/api/user";
+	import {
+		toLogin
+	} from '@/libs/login.js';
+	import {
+		mapGetters
+	} from "vuex";
 	export default {
 		name: "CustomerList",
-		components:{
+		components: {
 			emptyPage,
 		},
 		data() {
@@ -70,125 +81,125 @@
 				list: [],
 				productId: 0,
 				orderId: "",
-				type: 0 ,// 0 用户 1客服
+				type: 0, // 0 用户 1客服
 				timer: null,
-				page:1,
-				limit:9999,
+				page: 1,
+				limit: 9999,
 				mer_id: '',
 				loading: false,
 				clear: false,
 			};
 		},
-		computed: mapGetters(['isLogin','viewColor']),
+		computed: mapGetters(['isLogin', 'viewColor']),
 		onLoad(optios) {
 			this.type = optios.type;
 			this.mer_id = optios.mer_id;
-			if(this.isLogin){
+			if (this.isLogin) {
 				this.getList(this.mer_id)
 			} else {
 				toLogin()
 			}
 		},
 		onShow(option) {
-			if(this.isLogin){
+			if (this.isLogin) {
 				this.liveUpdate();
 			} else {
 				toLogin()
 			}
 		},
-		onHide(){  
-			if(this.timer) {  
-				clearInterval(this.timer);  
-				this.timer = null; 
-			}   
+		onHide() {
+			if (this.timer) {
+				clearInterval(this.timer);
+				this.timer = null;
+			}
 			this.clear = true;
 		},
 		onUnload() {
-			if(this.timer) {
-				clearInterval(this.timer);  
-				this.timer = null;  
-			}  
+			if (this.timer) {
+				clearInterval(this.timer);
+				this.timer = null;
+			}
 			this.clear = true;
 		},
 		methods: {
-			getList(mer_id) {		
+			getList(mer_id) {
 				this.loading = true;
-				if(this.type == 0){
+				if (this.type == 0) {
 					serviceList({
-						page:this.page,
-						limit:this.limit
+						page: this.page,
+						limit: this.limit
 					}).then(res => {
 						this.list = res.data.list;
-						if(res.status == 400){
+						if (res.status == 400) {
 							clearInterval(this.timer);
-							this.timer = null; 
-							return this.$util.Tips({
-								title: res.message
-							})
-						}	
-					}).finally(v=>{
-						this.loading = false;
-						return this.$util.Tips({
-							title: v
-						})
-					}).catch(err => {
-						return this.$util.Tips({
-							title: err
-						})
-					});
-				}else{
-					serviceUserList(mer_id,{
-						page:this.page,
-						limit:this.limit
-					}).then(res =>{
-						this.list = res.data.list;
-						if(res.status == 400){
-							clearInterval(this.timer);
-							this.timer = null; 
+							this.timer = null;
 							return this.$util.Tips({
 								title: res.message
 							})
 						}
-					}).finally(v=>{
+					}).finally(v => {
+						this.loading = false;
+						return this.$util.Tips({
+							title: v
+						})
+					}).catch(err => {
+						return this.$util.Tips({
+							title: err
+						})
+					});
+				} else {
+					serviceUserList(mer_id, {
+						page: this.page,
+						limit: this.limit
+					}).then(res => {
+						this.list = res.data.list;
+						if (res.status == 400) {
+							clearInterval(this.timer);
+							this.timer = null;
+							return this.$util.Tips({
+								title: res.message
+							})
+						}
+					}).finally(v => {
 						this.loading = false;
 						clearInterval(this.timer);
-						this.timer = null; 
+						this.timer = null;
 						return this.$util.Tips({
 							title: v
 						})
 					}).catch(err => {
 						clearInterval(this.timer);
-						this.timer = null; 
+						this.timer = null;
 						return this.$util.Tips({
 							title: err
 						})
 					});
-				}				
+				}
 			},
 			//实时刷新列表
-			liveUpdate(){
+			liveUpdate() {
 				let that = this;
 				this.clear = false;
-				if(that.timer) {
+				if (that.timer) {
 					clearInterval(that.timer);
-					that.timer = null;	
-				}  
-				that.timer = setInterval(function(){
-					if(that.clear){
+					that.timer = null;
+				}
+				that.timer = setInterval(function() {
+					if (that.clear) {
 						clearInterval(that.timer);
-						return ;
+						return;
 					}
 					// 用户
 					(!that.loading) && that.getList(that.mer_id);
-				},5000);	
+				}, 5000);
 			},
 			goPage(item) {
 				item.num = 0;
-				if(this.type == 0){
+				if (this.type == 0) {
 					uni.navigateTo({
 						url: `/pages/chat/customer_list/chat?mer_id=${item.mer_id}`
 					})
-				}else{
+				} else {
 					uni.navigateTo({
 						url: `/pages/chat/customer_list/chat?userId=${item.user.uid}&mer_id=${item.mer_id}`
 					})
@@ -207,7 +218,8 @@
 			transform: rotate(180deg);
 			font-size: 36rpx;
 		}
-		.popupn{
+
+		.popupn {
 			position: fixed;
 			width: 100%;
 			text-align: center;
@@ -217,65 +229,78 @@
 			height: 90rpx;
 			line-height: 90rpx;
 			z-index: 100;
-			.title{
+
+			.title {
 				max-width: 560rpx;
 				margin: 0 auto;
 				position: relative;
 			}
-			.iconfont{
+
+			.iconfont {
 				display: inline-block;
 				position: relative;
 				top: 4rpx;
 				right: 0;
 			}
-			.mer_logo{
+
+			.mer_logo {
 				width: 34rpx;
 				height: 34rpx;
 				position: relative;
 				top: 6rpx;
-				right: 10px;			
+				right: 10px;
 			}
-			.mer_name{
+
+			.mer_name {
 				display: inline-block;
 				max-width: 650rpx;
 			}
-			.invoice-content{
+
+			.invoice-content {
 				background-color: #ffffff;
 			}
 		}
-		.list_count{
+
+		.list_count {
 			margin-top: 104rpx;
 		}
+
 		.item {
 			align-items: center;
 			border-bottom: 1px solid #eee;
 			padding: 20rpx 30rpx;
 			background-color: #fff;
-			.logo image{
+
+			.logo image {
 				width: 88rpx;
 				height: 88rpx;
 				border-radius: 50%;
 			}
-			.info{
+
+			.info {
 				width: 334rpx;
 				margin-left: 20rpx;
-				.con{
+
+				.con {
 					margin-top: 10rpx;
 					color: #999999;
 					font-size: 24rpx;
 				}
 			}
-			.right-box{
+
+			.right-box {
 				flex: 1;
 				display: flex;
 				flex-direction: column;
 				align-items: flex-end;
 				font-size: 20rpx;
 				color: #BBBBBB;
-				.time{
+
+				.time {
 					margin-bottom: 10rpx;
 				}
-				.num{
+
+				.num {
 					min-width: 6px;
 					background-color: var(--view-theme);
 					border-radius: 15px;
@@ -287,4 +312,4 @@
 			}
 		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/cloud_warehouse/home/home.vue b/pages/cloud_warehouse/home/home.vue
index c17c5be..8ae559f 100644
--- a/pages/cloud_warehouse/home/home.vue
+++ b/pages/cloud_warehouse/home/home.vue
@@ -7,99 +7,77 @@
 		background-color: #f8fafb !important;
 
 		.wholeSale-header {
+			position: sticky;
+			top: 0;
+			z-index: 9;
 			margin-bottom: 20rpx;
-			// background-color: #40AE36;
-
-			.scrollview {
-				display: flex;
-				align-items: center;
-				height: 98rpx;
-				padding-left: 32rpx;
-
-				.scrollview-item {
-					margin-right: 30rpx;
-					font-size: 28rpx;
-					color: #FFFFFF;
-				}
-
-				.scrollview-active {
-					position: relative;
-					font-weight: bold;
-					font-size: 36rpx;
-					color: #FFFFFF;
-
-					&::after {
-						content: "";
-						display: inline-block;
-						position: absolute;
-						bottom: -6rpx;
-						left: 50%;
-						transform: translateX(-50%);
-						width: 100%;
-						height: 6rpx;
-						background-color: #FFFFFF;
-					}
-				}
-			}
+			background-color: #40AE36;
 		}
 
-		.wholeSale-con {
-			margin: 0 20rpx;
+		.wholeSale-section {
+			position: sticky;
+			top: calc(82rpx + var(--status-bar-height));
+			padding: 0rpx 20rpx;
+			background-color: #fff;
+			transition: height .5s;
+			overflow: hidden;
+			margin-bottom: 20rpx;
 
 			.wholeSale-nav {
 				display: flex;
 				align-items: center;
-				margin-bottom: 40rpx;
+				padding-bottom: 20rpx;
 
 				.icon {
 					margin-right: 20rpx;
 				}
-			}
 
-			.search_content {
-				// margin-bottom: 40rpx;
-				flex: 1;
-				height: 70rpx;
-				padding: 2px 2px 2px 21.05rpx;
-				border-radius: 80rpx;
-				background: #EDEFF2;
-				position: relative;
-				box-sizing: border-box;
+				.search_content {
+					flex: 1;
+					height: 70rpx;
+					padding: 2px 2px 2px 21.05rpx;
+					border-radius: 80rpx;
+					background: #EDEFF2;
+					position: relative;
+					box-sizing: border-box;
 
-				.search_content_wrap {
-					width: 100%;
+					.search_content_wrap {
+						width: 100%;
 
-					.icon-sousuo {
-						font-size: 26.32rpx;
-						font-weight: bold;
-						color: #c8c7c6;
-						margin-right: 17.54rpx;
+						.icon-sousuo {
+							font-size: 26.32rpx;
+							font-weight: bold;
+							color: #c8c7c6;
+							margin-right: 17.54rpx;
+						}
+
+						input {
+							width: 80%;
+						}
 					}
 
-					input {
-						width: 80%;
+					.search_btn {
+						width: 106rpx;
+						height: 60rpx;
+						line-height: 60rpx;
+						background: #40AE36;
+						border-radius: 100px;
+						font-size: 28rpx;
+						color: #fff;
 					}
 				}
-
-				.search_btn {
-					width: 106rpx;
-					height: 60rpx;
-					line-height: 60rpx;
-					background: #40AE36;
-					border-radius: 100px;
-					font-size: 28rpx;
-					color: #fff;
-				}
 			}
 
 			.category {
+				position: relative;
 				width: 100%;
 				overflow: auto;
 				margin-bottom: 20rpx;
+				padding-right: 70rpx;
 
 				.category-wrap {
 					display: flex;
-					padding-bottom: 20rpx;
+					padding-bottom: 10rpx;
 
 					.category-item {
 						display: flex;
@@ -140,6 +118,24 @@
 						}
 					}
 				}
+
+				.category-all {
+					position: absolute;
+					right: 0;
+					top: 50%;
+					transform: translateY(-50%);
+					height: 100%;
+					background-color: #f3f3f3;
+					z-index: 10;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					flex-direction: column;
+					font-size: 24rpx;
+					border-radius: 4rpx;
+					width: 70rpx;
+					color: #919191;
+				}
 			}
 
 			.cate {
@@ -169,42 +165,83 @@
 					}
 				}
 			}
+		}
 
-			.comprehensive {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				padding: 0 50rpx;
+		.popup-wrap {
+			background-color: #fff;
+			padding: 20rpx;
 
-				[class^=comprehensive-] {
+			.popup-wrap-title {
+				font-size: 36rpx;
+				color: #333;
+				font-weight: bold;
+				margin-bottom: 20rpx;
+			}
+
+			.popup-wrap-category {
+				width: 100%;
+
+				.popup-wrap-category-wrap {
 					display: flex;
-					align-items: center;
+					flex-wrap: wrap;
 
-					text {
-						margin-right: 12rpx;
-						font-size: 26rpx;
-						color: #666666;
+					.popup-wrap-category-item {
+						display: flex;
+						flex-direction: column;
+						justify-content: center;
+						align-items: center;
+						margin: 0 20rpx 20rpx 0;
+
+						&:nth-child(5n) {
+							margin-right: 0;
+						}
+
+						text {
+							margin-top: 16rpx;
+							font-size: 24rpx;
+							color: #666666;
+							white-space: nowrap;
+						}
+
+						.popup-wrap-category-item-text {
+							width: 120rpx;
+							text-align: center;
+							overflow: hidden;
+							white-space: nowrap;
+							text-overflow: ellipsis;
+						}
 					}
 
-					image {
-						width: 28rpx;
-						height: 28rpx;
-					}
+					.popup-wrap-category-item-active {
+						position: relative;
 
-					.loudou {
-						width: 24rpx;
-						height: 24rpx;
+						.popup-wrap-category-item-img {
+							border: 2px solid #40AE36;
+							border-radius: 50%;
+						}
+
+						text {
+							background-color: #40AE36;
+							color: #fff;
+							padding: 2rpx 10rpx 6rpx 10rpx;
+							border-radius: 50rpx;
+						}
 					}
 				}
 			}
 		}
+
+		.wholeSale-con {
+			height: 100vh;
+			margin: 0 20rpx;
+			padding-bottom: 30rpx;
+		}
 	}
 </style>
 <template>
 	<view class="wholeSale">
-
 		<!-- 顶部 -->
-		<view class="wholeSale-header" style="position: fixed;top: 0;left: 0;width: 100%;z-index: 999;">
+		<view class="wholeSale-header">
 			<!-- 适配不同机 -->
 			<view style="height: var(--status-bar-height);background-color: #40af37;"></view>
 			<view style="display: flex;padding: 20rpx 28rpx;background-color: #40af37;color: #fff;">
@@ -213,11 +250,9 @@
 			</view>
 		</view>
 
-		<!-- 内容 -->
-		<view class="wholeSale-con" style="padding-top: calc(var(--status-bar-height) + 100rpx);">
+		<!-- 分类区域 -->
+		<view class="wholeSale-section" :style="{height:wrapHeight + 'rpx'}">
 			<view class="wholeSale-nav">
-				<!-- <u-icon class="icon" name="arrow-left" size="20" @click="navBack"></u-icon> -->
-				<!-- 搜索 -->
 				<view @click="navTo(`/pages/columnGoods/goods_search/index?back=true&searchVal=${where.keyword}`)"
 					hover-class="none" class="search_content flex_a_c_j_sb">
 					<view class="flex_a_c search_content_wrap">
@@ -225,7 +260,6 @@
 						<input type="text" placeholder="搜索商品名称" :value="where.keyword"
 							placeholder-style="font-size: 30rpx;color:#999;" disabled style="pointer-events: none;">
 					</view>
-					<!-- <button class="search_btn">搜索</button> -->
 				</view>
 			</view>
 
@@ -247,6 +281,11 @@
 						</block>
 					</view>
 				</scroll-view>
+
+				<view class="category-all" v-if="store_category.length > 0" @click="onAllCategory">
+					<view style="margin-bottom: 20rpx;">全部</view>
+					<u-icon name="list"></u-icon>
+				</view>
 			</view>
 
 			<!-- 商品小分类 -->
@@ -262,26 +301,44 @@
 					</view>
 				</scroll-view>
 			</view>
-
-			<!-- 综合查询 -->
-			<!-- <view class="comprehensive">
-				<view class="comprehensive-price">
-					<text>价格</text>
-					<image src="@/static/new_define/priceChange.png"></image>
-				</view>
-				<view class="comprehensive-sales_num">
-					<text>销量</text>
-				</view>
-				<view class="comprehensive-discount">
-					<text>抵扣</text>
-					<image class="loudou" src="@/static/new_define/loudou.png"></image>
-				</view>
-			</view> -->
-
-			<!-- 流水瀑布 -->
-			<WaterfallsFlow :wfList='hostProduct' @itemTap="goDetail" :type="0" />
-			<loadmore :type="isLoading"></loadmore>
 		</view>
+
+		<!-- 内容 -->
+		<view class="wholeSale-con"
+			:style="{height:'calc(100vh - '+wrapHeight+'rpx - 142rpx '+(isShowSmall?' - 48rpx':'')+')'}">
+			<scroll-view :scroll-y="true" @scrolltolower="onScrollBottom" @scroll="onScroll" style="height: 100%;"
+				@scrolltoupper="scrolltoupper" :refresher-threshold="0">
+				<view>
+					<!-- 流水瀑布 -->
+					<WaterfallsFlow :wfList='hostProduct' @itemTap="goDetail" :type="0" />
+					<loadmore :type="isLoading" style="margin-bottom:20rpx ;"></loadmore>
+				</view>
+			</scroll-view>
+		</view>
+
+		<!-- 弹框大分类 -->
+		<uni-popup ref="popup" type="top" border-radius="10px 10px 0 0" z-index="1000">
+			<view class="popup-wrap">
+				<view style="height: var(--status-bar-height);"></view>
+				<view class="popup-wrap-title">分类</view>
+				<view class="popup-wrap-category">
+					<view class="popup-wrap-category-wrap">
+						<block v-for="(item,index) in store_category" :key="index">
+							<view class="popup-wrap-category-item" :class="{'category-item-active': index==cate_change}"
+								@click="changeCate(index)">
+								<u--image class="popup-wrap-category-item-img" width="108rpx" :src="item.pic"
+									height="108rpx" shape="circle">
+									<template v-slot:loading>
+										<u-loading-icon color="#999" size="15" />
+									</template>
+								</u--image>
+								<text class="popup-wrap-category-item-text">{{item.cate_name}}</text>
+							</view>
+						</block>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 
@@ -310,27 +367,60 @@
 					page: 1,
 					limit: 20,
 					mer_type: 1, //1-里海云仓, 2-云市场, 3-名优特产
-					mer_cate_id: '',
+					cate_pid: '',
 					keyword: '',
 					deduction_rate: '', //抵扣比例
 					rand: 1
-				}
+				},
+				wrapHeight: 300,
+				isShowSmall: false,
+				scrollTop: 0,
 			}
 		},
 		onLoad(option) {
 			this.getStoreCategory();
 			this.getProductslist(true);
 		},
-		onReachBottom() {
-			this.getProductslist();
-		},
-		onPageScroll() {
+
+		onPageScroll(e) {
 			uni.$emit('scroll');
 		},
-		onPullDownRefresh() {
-			this.getProductslist(true);
+
+		watch: {
+			'where.cate_pid'(newVal, oldVal) {
+				if (newVal && !oldVal) {
+					this.wrapHeight = 300 + 48;
+					this.isShowSmall = true;
+				}
+				if (!newVal && oldVal) {
+					this.wrapHeight = 300;
+					this.isShowSmall = false;
+				}
+			}
 		},
 		methods: {
+			onAllCategory() {
+				this.$refs.popup.open();
+			},
+
+			scrolltoupper() {
+				this.getProductslist(true);
+			},
+
+			onScrollBottom(e) {
+				this.getProductslist();
+			},
+
+			onScroll(e) {
+				if (this.scrollTop >= e.target.scrollTop) { //上拉
+					this.wrapHeight = 300;
+					if (this.where.cate_pid) this.wrapHeight = this.wrapHeight + 48;
+				} else {
+					this.wrapHeight = 0;
+				}
+				this.scrollTop = e.target.scrollTop;
+			},
+
 			navTo(url) {
 				uni.navigateTo({
 					url: url,
@@ -344,12 +434,11 @@
 					}
 				})
 			},
+
 			navBack() {
 				uni.navigateBack();
 			},
-			tabsChange(e) {
-				this.tabsCurr = e;
-			},
+
 			changeCate(e) {
 				this.cate_change = e;
 				this.store_category_children = [];
@@ -359,13 +448,15 @@
 					store_category_id: ''
 				})
 				this.cate_change_children = 0;
-				this.where.mer_cate_id = this.store_category[e].store_category_id;
+				this.where.cate_pid = this.store_category[e].store_category_id;
 				this.getProductslist(true);
+
+				this.$refs.popup && this.$refs.popup.close();
 			},
 			changeChildrenCate(e) {
 				this.cate_change_children = e;
-				this.where.mer_cate_id = this.store_category_children[e].store_category_id;
-				if (e == 0) this.where.mer_cate_id = this.store_category[this.cate_change]
+				this.where.cate_pid = this.store_category_children[e].store_category_id;
+				if (e == 0) this.where.cate_pid = this.store_category[this.cate_change]
 					.store_category_id; // 如若选中全部, 则取父级id
 				this.getProductslist(true);
 			},
@@ -391,6 +482,7 @@
 				}
 				if (this.isLoading == -1) return;
 				this.isLoading = 1;
+
 				getProductslist(this.where).then(res => {
 					this.where.limit = res.data.limit
 					this.where.page = res.data.page
diff --git a/pages/cloud_warehouse/market/market.vue b/pages/cloud_warehouse/market/market.vue
index 282a92b..9abb926 100644
--- a/pages/cloud_warehouse/market/market.vue
+++ b/pages/cloud_warehouse/market/market.vue
@@ -1,50 +1,437 @@
+<template>
+	<view class="wholeSale">
+
+		<!-- 适配不同机 -->
+		<view class="wholeSale-header">
+			<view style="height: var(--status-bar-height);background-color: #40af37;"></view>
+			<view
+				style="display: flex;padding: 20rpx 28rpx;background-color: #40af37;color: #fff;justify-content: space-between;">
+				<view style="display: flex;font-weight: bold;font-size: 32rpx;"><u-icon style="margin-right: 20rpx;"
+						name="arrow-left" size="20" color="#fff" @click="navBack"></u-icon>供销综合云市场</view>
+				<view style="display: flex;position: relative;" @click="changeMap">
+					<view
+						style="width: 250rpx;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;text-align: right;">
+						{{street}}
+					</view>
+					<u-icon name="arrow-down" size="14" color="#fff"></u-icon>
+					<view class="position-address" v-if="isShowAddress" @click.stop="">
+						<u-icon class="icon" name="close" size="14" @click="closeShowAddress" color="#fff"></u-icon>
+						<view class="title">
+							<view>开启定位服务</view>
+							<view>查看附近商铺</view>
+						</view>
+						<view class="btn" @click.stop="getLocation">立即开启</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 分类区域 -->
+		<view class="wholeSale-section" :style="{height:wrapHeight + 'rpx'}">
+			<view class="wholeSale-nav">
+				<view
+					@click="navTo(`/pages/columnGoods/goods_search/index?back=true&searchVal=${where.keyword}&shop=true`)"
+					hover-class="none" class="search_content flex_a_c_j_sb">
+					<view class="flex_a_c search_content_wrap">
+						<view class="iconfont icon-sousuo" style="font-size: 39rpx;"></view>
+						<input type="text" placeholder="搜索店铺名称" :value="where.keyword"
+							placeholder-style="font-size: 30rpx;color:#999;" disabled style="pointer-events: none;">
+					</view>
+				</view>
+			</view>
+
+			<!-- 商品大分类 -->
+			<view class="category">
+				<scroll-view scroll-x="true">
+					<view class="category-wrap">
+						<block v-for="(item,index) in store_category" :key="index">
+							<view class="category-item" :class="{'category-item-active': index==cate_change}"
+								@click="changeCate(index)">
+								<u--image class="category-item-img" width="108rpx" :src="item.background"
+									height="108rpx" shape="circle">
+									<template v-slot:loading>
+										<u-loading-icon color="#999" size="15" />
+									</template>
+								</u--image>
+								<text class="category-item-text">{{item.category_name}}</text>
+							</view>
+						</block>
+					</view>
+				</scroll-view>
+
+				<view class="category-all" v-if="store_category.length > 0" @click="onAllCategory">
+					<view style="margin-bottom: 20rpx;">全部</view>
+					<u-icon name="list"></u-icon>
+				</view>
+			</view>
+		</view>
+
+		<!-- 列表 -->
+		<view class="goods_list" :style="{height:'calc(100vh - '+wrapHeight+'rpx - 142rpx)'}">
+			<scroll-view :scroll-y="true" @scrolltolower="onScrollBottom" @scroll="onScroll" style="height: 100%;"
+				@scrolltoupper="scrolltoupper" :refresher-threshold="0">
+				<view class="goods" v-for="(item, index) in goodsList" :key="index" @click="goStore(item.mer_id)">
+					<view class="avatar">
+						<u--image width="160rpx" height="160rpx" :src="item.mer_avatar" mode="aspectFill">
+							<template v-slot:loading>
+								<u-loading-icon color="#999" size="15" />
+							</template>
+						</u--image>
+					</view>
+					<view class="content">
+						<view class="content-head">
+							<view class="title">{{item.mer_name}}</view>
+							<text style="font-size: 21.03rpx;color: #aaa;"
+								v-if="item.sales>=100">月销{{item.sales}}</text>
+						</view>
+						<view class="content-two">
+							<view class="score">
+								<view class="star">
+									<view
+										:style="{width: `${(item.service_score / 5 * 100).toFixed(0)}%`, backgroundImage: `url(${domain}/static/diy/score1${keyColor}.png)`}">
+									</view>
+								</view>
+							</view>
+							<text
+								style="margin-left: 20rpx;color: #FF6D20;font-size: 22.78rpx; ">{{item.service_score}}</text>
+							<text v-if="item.distance"
+								style="margin-left: 20rpx;font-size: 21.03rpx;color: #aaa;">{{item.distance}}</text>
+							<text style="margin-left:20rpx;" class="line1">{{item.category_name}}</text>
+						</view>
+						<view class="content-two">
+							<u--image :showLoading="true" src="/static/images/GXSC/DH.png" width="33.85rpx"
+								height="33.85rpx"></u--image>
+							<text> {{item.service_phone}}</text>
+							<u--image style="margin-left: 28rpx;" v-if="item.mer_take_time" :showLoading="true"
+								src="/static/images/GXSC/SJ.png" width="33.85rpx" height="33.85rpx"></u--image>
+							<text v-if="item.mer_take_time">{{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}</text>
+						</view>
+						<view class="content-two">
+							<u--image :showLoading="true" src="/static/images/GXSC/DW.png" width="33.85rpx"
+								height="33.85rpx"></u--image>
+							<text class="address">{{item.mer_address}}</text>
+						</view>
+					</view>
+				</view>
+				<loadmore :type="isLoading"></loadmore>
+			</scroll-view>
+		</view>
+
+		<!-- 弹框大分类 -->
+		<uni-popup ref="popup" type="top" border-radius="10px 10px 0 0" z-index="1000">
+			<view class="popup-wrap">
+				<view style="height: var(--status-bar-height);"></view>
+				<view class="popup-wrap-title">分类</view>
+				<view class="popup-wrap-category">
+					<view class="popup-wrap-category-wrap">
+						<block v-for="(item,index) in store_category" :key="index">
+							<view class="popup-wrap-category-item"
+								:class="{'popup-wrap-category-item-active': index==cate_change}"
+								@click="changeCate(index)">
+								<u--image class="popup-wrap-category-item-img" width="108rpx" :src="item.background"
+									height="108rpx" shape="circle">
+									<template v-slot:loading>
+										<u-loading-icon color="#999" size="15" />
+									</template>
+								</u--image>
+								<text class="popup-wrap-category-item-text">{{item.category_name}}</text>
+							</view>
+						</block>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		goShopDetail
+	} from '@/libs/order.js'
+	import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlow.vue'
+	import {
+		getGeocoder
+	} from "@/api/store.js"
+	import {
+		merClassifly,
+		storeMerchantList
+	} from "@/api/store.js"
+	import {
+		configMap
+	} from '@/utils';
+	import {
+		mapGetters
+	} from "vuex";
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app';
+	import {
+		Toast
+	} from '../../../libs/uniApi';
+	export default {
+		components: {
+			WaterfallsFlow
+		},
+		data() {
+			return {
+				domain: HTTP_REQUEST_URL,
+				hostProduct: [],
+				store_category: [], //商品大分类
+				cate_change: 0,
+				goodsList: [],
+				isLoading: 0,
+				isShowAddress: false,
+				street: '定位中',
+				where: {
+					page: 1,
+					limit: 20,
+					keyword: '',
+					order: 'location',
+					type_id: '10,12,21,24',
+					merchant_category_id: '',
+					location: ''
+				},
+				wrapHeight: 300,
+				scrollTop: 0,
+			}
+		},
+		computed: {
+			...configMap({
+				margin_ico_switch: 0,
+				margin_ico: '',
+				mer_location: 0,
+				store_street_theme: 1,
+				hide_mer_status: '',
+			}, mapGetters(['viewColor', 'keyColor'])),
+		},
+		onLoad(option) {
+			let getAddress = uni.getStorageSync('getAddress');
+			let closeShow = uni.getStorageSync('closeShow');
+			if (!getAddress && !closeShow) this.isShowAddress = true;
+			this.street = this.$store.state.storage.address.townName;
+			if (this.$store.state.storage.location.lat) {
+				this.where.location =
+					`${this.$store.state.storage.location.lat},${this.$store.state.storage.location.long}`;
+			} else if (getAddress) {
+				this.street = '';
+				this.getLocation();
+			} else Toast('点击右上角开启定位后才可获取附近商家')
+			this.merClassifly();
+			this.storeMerchantList();
+		},
+		onReachBottom() {
+			// this.storeMerchantList();
+		},
+		onPageScroll() {
+			uni.$emit('scroll');
+		},
+		onPullDownRefresh() {
+			// this.storeMerchantList(true);
+		},
+		methods: {
+			onAllCategory() {
+				this.$refs.popup.open();
+			},
+
+			scrolltoupper() {
+				this.storeMerchantList(true);
+			},
+
+			onScrollBottom(e) {
+				this.storeMerchantList();
+			},
+
+			onScroll(e) {
+				if (this.scrollTop >= e.target.scrollTop) { //上拉
+					this.wrapHeight = 300;
+				} else {
+					this.wrapHeight = 0;
+				}
+				this.scrollTop = e.target.scrollTop;
+			},
+
+			navTo(url) {
+				uni.navigateTo({
+					url: url,
+					success: () => {
+						uni.$once('searchValue', (e) => {
+							this.$nextTick(() => {
+								this.where.keyword = e;
+								this.storeMerchantList(true);
+							})
+						})
+					}
+				})
+			},
+			navBack() {
+				uni.navigateBack();
+			},
+
+			changeCate(e) {
+				this.cate_change = e;
+				this.where.merchant_category_id = this.store_category[e].merchant_category_id;
+				this.storeMerchantList(true);
+
+				this.$refs.popup && this.$refs.popup.close();
+				this.$forceUpdate();
+			},
+			// 进店
+			goStore(id) {
+				uni.navigateTo({
+					url: `/pages/store/home/index?id=${id}`
+				})
+			},
+			merClassifly() {
+				merClassifly().then(res => {
+					this.store_category = [{
+						category_name: '全部',
+						merchant_category_id: '',
+						background: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/0bc7a202404021652194310.png'
+					}, ...res.data];
+				})
+			},
+			storeMerchantList(reLoad = false) {
+				if (reLoad) {
+					this.where.page = 1;
+					this.goodsList = [];
+					this.isLoading = 0;
+				}
+				if (this.isLoading == -1) return;
+				this.isLoading = 1;
+				storeMerchantList(this.where).then(res => {
+					uni.stopPullDownRefresh();
+					this.goodsList = [...this.goodsList, ...res.data.list];
+					this.isLoading = 0;
+					if (res.data.list.length < this.where.limit) this.isLoading = -1;
+					this.where.page++;
+				}).catch(() => {
+					uni.stopPullDownRefresh();
+				})
+			},
+			closeShowAddress() {
+				this.isShowAddress = false;
+				uni.setStorageSync('closeShow', true);
+			},
+			// 选择位置
+			changeMap() {
+				uni.navigateTo({
+					url: `/pages/select_address_n/select_address_n`,
+					success: () => {
+						uni.$once('changeAddress', (e) => {
+							this.isShowAddress = false;
+							uni.setStorageSync('closeShow', true);
+							this.street = e.street.name;
+							this.$store.commit('setAddress', {
+								street_id: e.street.code,
+								townName: e.street.name
+							});
+							if (e.longitude) {
+								let latitude = e.latitude;
+								let longitude = e.longitude;
+								this.where.location = `${latitude},${longitude}`;
+								this.$store.commit('setLocation', {
+									lat: e.latitude,
+									long: e.longitude,
+								});
+								this.$nextTick(() => {
+									setTimeout(() => {
+										this.storeMerchantList(true);
+									}, 200)
+								})
+							}
+						})
+					}
+				})
+			},
+			getLocation() {
+				uni.getLocation({
+					type: 'gcj02',
+					success: (res) => {
+						let latitude, longitude;
+						latitude = res.latitude.toString();
+						longitude = res.longitude.toString();
+						this.$store.commit('setLocation', {
+							lat: res.latitude.toFixed(6),
+							long: res.longitude.toFixed(6),
+						});
+						this.isShowAddress = false;
+						uni.setStorageSync('closeShow', true);
+						uni.setStorageSync('getAddress', true);
+						getGeocoder({
+							lat: latitude,
+							long: longitude
+						}).then(res => {
+							let town = res.data.address_reference.town.title
+							let street_id = res.data.address_reference.town.id
+							this.street = res.data.address_reference.town.title;
+							this.$store.commit('setAddress', {
+								street_id: street_id,
+								townName: town
+							});
+							uni.$emit('getLocation_succees', {
+								street_id,
+							});
+							uni.$emit('changeAddress', {
+								addr: {
+									address: res.data.address,
+									location: `${res.data.location.lat},${res.data.location.lng}`
+								},
+								area: res.data.ad_info.adcode,
+								latitude: res.data.location.lat,
+								longitude: res.data.location.lng,
+								street: {
+									code: street_id,
+									name: town
+								}
+							})
+							this.where.location = `${latitude},${longitude}`;
+							this.$nextTick(() => {
+								setTimeout(() => {
+									this.storeMerchantList(true);
+								}, 200)
+							})
+						}).catch(err => {
+							uni.showToast({
+								title: err,
+								icon: 'none'
+							})
+							this.street = '定位失败'
+						})
+					}
+				})
+			},
+		}
+	}
+</script>
+
 <style lang="scss" scoped>
 	page {
 		background-color: #f8fafb !important;
 	}
 
 	.wholeSale {
-		background-color: #f8fafb !important;
 
-		.wholeSale-header {
-			margin-bottom: 20rpx;
-			// background-color: #40AE36;
-
-			.scrollview {
-				display: flex;
-				align-items: center;
-				height: 98rpx;
-				padding-left: 32rpx;
-
-				.scrollview-item {
-					margin-right: 30rpx;
-					font-size: 28rpx;
-					color: #FFFFFF;
-				}
-
-				.scrollview-active {
-					position: relative;
-					font-weight: bold;
-					font-size: 36rpx;
-					color: #FFFFFF;
-
-					&::after {
-						content: "";
-						display: inline-block;
-						position: absolute;
-						bottom: -6rpx;
-						left: 50%;
-						transform: translateX(-50%);
-						width: 100%;
-						height: 6rpx;
-						background-color: #FFFFFF;
-					}
-				}
-			}
+		.wholeSale-header-search-wrap {
+			padding: 30rpx 20rpx 0;
+			background-color: #fff;
 		}
 
-		.wholeSale-con {
-			margin: 0 20rpx;
+		.wholeSale-header {
+			position: sticky;
+			top: 0;
+			z-index: 90;
+			margin-bottom: 20rpx;
+			background-color: #40AE36;
+		}
+
+		.wholeSale-section {
+			position: sticky;
+			top: calc(82rpx + var(--status-bar-height));
+			padding: 0rpx 20rpx;
+			background-color: #fff;
+			transition: height .5s;
+			overflow: hidden;
+			margin-bottom: 20rpx;
 
 			.wholeSale-nav {
 				display: flex;
@@ -54,48 +441,50 @@
 				.icon {
 					margin-right: 20rpx;
 				}
-			}
 
-			.search_content {
-				// margin-bottom: 40rpx;
-				flex: 1;
-				height: 70rpx;
-				padding: 2px 2px 2px 21.05rpx;
-				border-radius: 80rpx;
-				background: #EDEFF2;
-				position: relative;
-				box-sizing: border-box;
+				.search_content {
+					// margin-bottom: 40rpx;
+					flex: 1;
+					height: 70rpx;
+					padding: 2px 2px 2px 21.05rpx;
+					border-radius: 80rpx;
+					background: #EDEFF2;
+					position: relative;
+					box-sizing: border-box;
 
-				.search_content_wrap {
-					width: 100%;
+					.search_content_wrap {
+						width: 100%;
 
-					.icon-sousuo {
-						font-size: 26.32rpx;
-						font-weight: bold;
-						color: #c8c7c6;
-						margin-right: 17.54rpx;
+						.icon-sousuo {
+							font-size: 26.32rpx;
+							font-weight: bold;
+							color: #c8c7c6;
+							margin-right: 17.54rpx;
+						}
+
+						input {
+							width: 80%;
+						}
 					}
 
-					input {
-						width: 80%;
+					.search_btn {
+						width: 106rpx;
+						height: 60rpx;
+						line-height: 60rpx;
+						background: #40AE36;
+						border-radius: 100px;
+						font-size: 28rpx;
+						color: #fff;
 					}
 				}
-
-				.search_btn {
-					width: 106rpx;
-					height: 60rpx;
-					line-height: 60rpx;
-					background: #40AE36;
-					border-radius: 100px;
-					font-size: 28rpx;
-					color: #fff;
-				}
 			}
 
 			.category {
+				position: relative;
 				width: 100%;
 				overflow: auto;
 				margin-bottom: 20rpx;
+				padding-right: 70rpx;
 
 				.category-wrap {
 					display: flex;
@@ -140,67 +529,99 @@
 						}
 					}
 				}
-			}
 
-			.cate {
-				width: 100%;
-				overflow: auto;
-				margin-bottom: 30rpx;
-
-				.cate-wrap {
-					display: flex;
-					padding-bottom: 8rpx;
-
-					.cate-item {
-
-						text {
-							padding: 4rpx 16rpx;
-							white-space: nowrap;
-							font-size: 30rpx;
-							color: #333;
-						}
-					}
-
-					.cate-item-active {
-						text {
-							color: #40AE36;
-							font-weight: bold;
-						}
-					}
-				}
-			}
-
-			.comprehensive {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				padding: 0 50rpx;
-
-				[class^=comprehensive-] {
+				.category-all {
+					position: absolute;
+					right: 0;
+					top: 50%;
+					transform: translateY(-50%);
+					height: 100%;
+					background-color: #f3f3f3;
+					z-index: 10;
 					display: flex;
+					justify-content: center;
 					align-items: center;
+					flex-direction: column;
+					font-size: 24rpx;
+					border-radius: 4rpx;
+					width: 70rpx;
+					color: #919191;
+				}
+			}
+		}
 
-					text {
-						margin-right: 12rpx;
-						font-size: 26rpx;
-						color: #666666;
+		.popup-wrap {
+			background-color: #fff;
+			padding: 20rpx;
+
+			.popup-wrap-title {
+				font-size: 36rpx;
+				color: #333;
+				font-weight: bold;
+				margin-bottom: 20rpx;
+			}
+
+			.popup-wrap-category {
+				width: 100%;
+
+				.popup-wrap-category-wrap {
+					display: flex;
+					flex-wrap: wrap;
+
+					.popup-wrap-category-item {
+						display: flex;
+						flex-direction: column;
+						justify-content: center;
+						align-items: center;
+						margin: 0 20rpx 20rpx 0;
+
+						&:nth-child(5n) {
+							margin-right: 0;
+						}
+
+						text {
+							margin-top: 16rpx;
+							font-size: 24rpx;
+							color: #666666;
+							white-space: nowrap;
+						}
+
+						.popup-wrap-category-item-text {
+							width: 120rpx;
+							text-align: center;
+							overflow: hidden;
+							white-space: nowrap;
+							text-overflow: ellipsis;
+						}
 					}
 
-					image {
-						width: 28rpx;
-						height: 28rpx;
-					}
+					.popup-wrap-category-item-active {
+						position: relative;
 
-					.loudou {
-						width: 24rpx;
-						height: 24rpx;
+						.popup-wrap-category-item-img {
+							border: 2px solid #40AE36;
+							border-radius: 50%;
+						}
+
+						text {
+							background-color: #40AE36;
+							color: #fff;
+							padding: 2rpx 10rpx 6rpx 10rpx;
+							border-radius: 50rpx;
+						}
 					}
 				}
 			}
+		}
 
+		.wholeSale-con {
+			margin: 0 20rpx;
 		}
 
 		.goods_list {
+			padding-bottom: 30rpx;
+			background-color: #f8fafb;
+
 			.goods {
 				width: 710rpx;
 				height: 200rpx;
@@ -296,7 +717,7 @@
 		position: absolute;
 		top: 70rpx;
 		right: -10rpx;
-		// background-color: rgba(#000, 0.7);
+		z-index: 101;
 		width: 250rpx;
 		padding: 20rpx;
 		padding-top: 30rpx;
@@ -321,351 +742,4 @@
 			border-radius: 40rpx;
 		}
 	}
-</style>
-<template>
-	<view class="wholeSale">
-
-		<!-- 顶部 -->
-		<view class="wholeSale-header" style="position: fixed;top: 0;left: 0;width: 100%;z-index: 999;">
-			<!-- 适配不同机 -->
-			<view style="height: var(--status-bar-height);background-color: #40af37;"></view>
-			<view
-				style="display: flex;padding: 20rpx 28rpx;background-color: #40af37;color: #fff;justify-content: space-between;">
-				<view style="display: flex;font-weight: bold;font-size: 32rpx;"><u-icon style="margin-right: 20rpx;"
-						name="arrow-left" size="20" color="#fff" @click="navBack"></u-icon>供销综合云市场</view>
-				<view style="display: flex;position: relative;" @click="changeMap">
-					<view
-						style="width: 250rpx;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;text-align: right;">
-						{{street}}
-					</view>
-					<u-icon name="arrow-down" size="14" color="#fff"></u-icon>
-					<view class="position-address" v-if="isShowAddress" @click.stop="">
-						<u-icon class="icon" name="close" size="14" @click="closeShowAddress" color="#fff"></u-icon>
-						<view class="title">
-							<view>开启定位服务</view>
-							<view>查看附近商铺</view>
-						</view>
-						<view class="btn" @click.stop="getLocation">立即开启</view>
-					</view>
-				</view>
-			</view>
-		</view>
-
-		<!-- 内容 -->
-		<view class="wholeSale-con" style="padding-top: calc(var(--status-bar-height) + 100rpx);">
-			<view class="wholeSale-nav">
-				<!-- <u-icon class="icon" name="arrow-left" size="20" @click="navBack"></u-icon> -->
-				<!-- 搜索 -->
-				<view
-					@click="navTo(`/pages/columnGoods/goods_search/index?back=true&searchVal=${where.keyword}&shop=true`)"
-					hover-class="none" class="search_content flex_a_c_j_sb">
-					<view class="flex_a_c search_content_wrap">
-						<view class="iconfont icon-sousuo" style="font-size: 39rpx;"></view>
-						<input type="text" placeholder="搜索店铺名称" :value="where.keyword"
-							placeholder-style="font-size: 30rpx;color:#999;" disabled style="pointer-events: none;">
-					</view>
-					<!-- <button class="search_btn">搜索</button> -->
-				</view>
-			</view>
-
-			<!-- 商品大分类 -->
-			<view class="category">
-				<scroll-view scroll-x="true">
-					<view class="category-wrap">
-						<block v-for="(item,index) in store_category" :key="index">
-							<view class="category-item" :class="{'category-item-active': index==cate_change}"
-								@click="changeCate(index)">
-								<u--image class="category-item-img" width="108rpx" :src="item.background"
-									height="108rpx" shape="circle">
-									<template v-slot:loading>
-										<u-loading-icon color="#999" size="15" />
-									</template>
-								</u--image>
-								<text class="category-item-text">{{item.category_name}}</text>
-							</view>
-						</block>
-					</view>
-				</scroll-view>
-			</view>
-		</view>
-
-		<!-- 列表 -->
-		<view class="goods_list">
-			<view class="goods" v-for="(item, index) in goodsList" :key="index" @click="goStore(item.mer_id)">
-				<view class="avatar">
-					<!-- <image style="width: 100%;height: 100%;" :src="item.mer_avatar" mode="aspectFill" lazy-load>
-          </image> -->
-					<u--image width="160rpx" height="160rpx" :src="item.mer_avatar" mode="aspectFill">
-						<template v-slot:loading>
-							<u-loading-icon color="#999" size="15" />
-						</template>
-					</u--image>
-				</view>
-				<view class="content">
-					<view class="content-head">
-						<view class="title">{{item.mer_name}}</view>
-						<text style="font-size: 21.03rpx;color: #aaa;" v-if="item.sales>=100">月销{{item.sales}}</text>
-					</view>
-					<view class="content-two">
-						<view class="score">
-							<view class="star">
-								<view
-									:style="{width: `${(item.service_score / 5 * 100).toFixed(0)}%`, backgroundImage: `url(${domain}/static/diy/score1${keyColor}.png)`}">
-								</view>
-							</view>
-						</view>
-						<text
-							style="margin-left: 20rpx;color: #FF6D20;font-size: 22.78rpx; ">{{item.service_score}}</text>
-						<text v-if="item.distance"
-							style="margin-left: 20rpx;font-size: 21.03rpx;color: #aaa;">{{item.distance}}</text>
-						<text style="margin-left:20rpx;" class="line1">{{item.category_name}}</text>
-					</view>
-					<view class="content-two">
-						<u--image :showLoading="true" src="/static/images/GXSC/DH.png" width="33.85rpx"
-							height="33.85rpx"></u--image>
-						<text> {{item.service_phone}}</text>
-						<u--image style="margin-left: 28rpx;" v-if="item.mer_take_time" :showLoading="true"
-							src="/static/images/GXSC/SJ.png" width="33.85rpx" height="33.85rpx"></u--image>
-						<text v-if="item.mer_take_time">{{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}</text>
-					</view>
-					<view class="content-two">
-						<u--image :showLoading="true" src="/static/images/GXSC/DW.png" width="33.85rpx"
-							height="33.85rpx"></u--image>
-						<text class="address">{{item.mer_address}}</text>
-					</view>
-				</view>
-			</view>
-			<loadmore :type="isLoading"></loadmore>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		goShopDetail
-	} from '@/libs/order.js'
-	import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlow.vue'
-	import {
-		getGeocoder
-	} from "@/api/store.js"
-	import {
-		merClassifly,
-		storeMerchantList
-	} from "@/api/store.js"
-	import {
-		configMap
-	} from '@/utils';
-	import {
-		mapGetters
-	} from "vuex";
-	import {
-		HTTP_REQUEST_URL
-	} from '@/config/app';
-	import {
-		Toast
-	} from '../../../libs/uniApi';
-	export default {
-		components: {
-			WaterfallsFlow
-		},
-		data() {
-			return {
-				domain: HTTP_REQUEST_URL,
-				hostProduct: [],
-				store_category: [], //商品大分类
-				cate_change: 0,
-				goodsList: [],
-				isLoading: 0,
-				isShowAddress: false,
-				street: '定位中',
-				where: {
-					page: 1,
-					limit: 20,
-					keyword: '',
-					order: 'location',
-					type_id: '10,12,21,24',
-					merchant_category_id: '',
-					location: ''
-				}
-			}
-		},
-		computed: {
-			...configMap({
-				margin_ico_switch: 0,
-				margin_ico: '',
-				mer_location: 0,
-				store_street_theme: 1,
-				hide_mer_status: '',
-			}, mapGetters(['viewColor', 'keyColor'])),
-		},
-		onLoad(option) {
-			let getAddress = uni.getStorageSync('getAddress');
-			let closeShow = uni.getStorageSync('closeShow');
-			if (!getAddress && !closeShow) this.isShowAddress = true;
-			this.street = this.$store.state.storage.address.townName;
-			if (this.$store.state.storage.location.lat) {
-				this.where.location =
-					`${this.$store.state.storage.location.lat},${this.$store.state.storage.location.long}`;
-			} else if (getAddress) {
-				this.street = '';
-				this.getLocation();
-			} else Toast('点击右上角开启定位后才可获取附近商家')
-			this.merClassifly();
-			this.storeMerchantList();
-		},
-		onReachBottom() {
-			this.storeMerchantList();
-		},
-		onPageScroll() {
-			uni.$emit('scroll');
-		},
-		methods: {
-			navTo(url) {
-				uni.navigateTo({
-					url: url,
-					success: () => {
-						uni.$once('searchValue', (e) => {
-							this.$nextTick(() => {
-								this.where.keyword = e;
-								this.storeMerchantList(true);
-							})
-						})
-					}
-				})
-			},
-			navBack() {
-				uni.navigateBack();
-			},
-			tabsChange(e) {
-				this.tabsCurr = e;
-			},
-			changeCate(e) {
-				this.cate_change = e;
-				this.where.merchant_category_id = this.store_category[e].merchant_category_id;
-				this.storeMerchantList(true);
-			},
-			// 进店
-			goStore(id) {
-				uni.navigateTo({
-					url: `/pages/store/home/index?id=${id}`
-				})
-			},
-			merClassifly() {
-				merClassifly().then(res => {
-					this.store_category = [{
-						category_name: '全部',
-						merchant_category_id: '',
-						background: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/0bc7a202404021652194310.png'
-					}, ...res.data];
-				})
-			},
-			storeMerchantList(reLoad = false) {
-				if (reLoad) {
-					this.where.page = 1;
-					this.goodsList = [];
-					this.isLoading = 0;
-				}
-				if (this.isLoading == -1) return;
-				this.isLoading = 1;
-				storeMerchantList(this.where).then(res => {
-					this.goodsList = [...this.goodsList, ...res.data.list];
-					this.isLoading = 0;
-					if (res.data.list.length < this.where.limit) this.isLoading = -1;
-					this.where.page++;
-				})
-			},
-			closeShowAddress() {
-				this.isShowAddress = false;
-				uni.setStorageSync('closeShow', true);
-			},
-			// 选择位置
-			changeMap() {
-				uni.navigateTo({
-					url: `/pages/select_address_n/select_address_n`,
-					success: () => {
-						uni.$once('changeAddress', (e) => {
-							this.isShowAddress = false;
-							uni.setStorageSync('closeShow', true);
-							this.street = e.street.name;
-							this.$store.commit('setAddress', {
-								street_id: e.street.code,
-								townName: e.street.name
-							});
-							if (e.longitude) {
-								let latitude = e.latitude;
-								let longitude = e.longitude;
-								this.where.location = `${latitude},${longitude}`;
-								this.$store.commit('setLocation', {
-									lat: e.latitude,
-									long: e.longitude,
-								});
-								this.$nextTick(() => {
-									setTimeout(() => {
-										this.storeMerchantList(true);
-									}, 200)
-								})
-							}
-						})
-					}
-				})
-			},
-			getLocation() {
-				uni.getLocation({
-					type: 'gcj02',
-					success: (res) => {
-						let latitude, longitude;
-						latitude = res.latitude.toString();
-						longitude = res.longitude.toString();
-						this.$store.commit('setLocation', {
-							lat: res.latitude.toFixed(6),
-							long: res.longitude.toFixed(6),
-						});
-						this.isShowAddress = false;
-						uni.setStorageSync('closeShow', true);
-						uni.setStorageSync('getAddress', true);
-						getGeocoder({
-							lat: latitude,
-							long: longitude
-						}).then(res => {
-							let town = res.data.address_reference.town.title
-							let street_id = res.data.address_reference.town.id
-							this.street = res.data.address_reference.town.title;
-							this.$store.commit('setAddress', {
-								street_id: street_id,
-								townName: town
-							});
-							uni.$emit('getLocation_succees', {
-								street_id,
-							});
-              uni.$emit('changeAddress', {
-                addr:{
-                  address: res.data.address,
-                  location: `${res.data.location.lat},${res.data.location.lng}`
-                },
-                area: res.data.ad_info.adcode,
-                latitude: res.data.location.lat,
-                longitude: res.data.location.lng,
-                street:{
-                  code: street_id,
-                  name: town
-                }
-              })
-							this.where.location = `${latitude},${longitude}`;
-							this.$nextTick(() => {
-								setTimeout(() => {
-									this.storeMerchantList(true);
-								}, 200)
-							})
-						}).catch(err => {
-							uni.showToast({
-								title: err,
-								icon: 'none'
-							})
-							this.street = '定位失败'
-						})
-					}
-				})
-			},
-		}
-	}
-</script>
\ No newline at end of file
+</style>
\ No newline at end of file
diff --git a/pages/cloud_warehouse/specialty/specialty.vue b/pages/cloud_warehouse/specialty/specialty.vue
index 0ff6caa..385fe77 100644
--- a/pages/cloud_warehouse/specialty/specialty.vue
+++ b/pages/cloud_warehouse/specialty/specialty.vue
@@ -1,238 +1,36 @@
-<style lang="scss" scoped>
-	page {
-		background-color: #f8fafb !important;
-	}
-
-	.wholeSale {
-    background-color: #f8fafb !important;
-		.wholeSale-header {
-			margin-bottom: 20rpx;
-			// background-color: #40AE36;
-
-			.scrollview {
-				display: flex;
-				align-items: center;
-				height: 98rpx;
-				padding-left: 32rpx;
-
-				.scrollview-item {
-					margin-right: 30rpx;
-					font-size: 28rpx;
-					color: #FFFFFF;
-				}
-
-				.scrollview-active {
-					position: relative;
-					font-weight: bold;
-					font-size: 36rpx;
-					color: #FFFFFF;
-
-					&::after {
-						content: "";
-						display: inline-block;
-						position: absolute;
-						bottom: -6rpx;
-						left: 50%;
-						transform: translateX(-50%);
-						width: 100%;
-						height: 6rpx;
-						background-color: #FFFFFF;
-					}
-				}
-			}
-		}
-
-		.wholeSale-con {
-			margin: 0 20rpx;
-      
-      .wholeSale-nav{
-        display: flex;
-        align-items: center;
-				margin-bottom: 40rpx;
-        .icon{
-          margin-right: 20rpx;
-        }
-      }
-      
-			.search_content {
-				// margin-bottom: 40rpx;
-        flex: 1;
-				height: 70rpx;
-				padding: 2px 2px 2px 21.05rpx;
-				border-radius: 80rpx;
-				background: #EDEFF2;
-				position: relative;
-				box-sizing: border-box;
-
-				.search_content_wrap {
-					width: 100%;
-
-					.icon-sousuo {
-						font-size: 26.32rpx;
-						font-weight: bold;
-						color: #c8c7c6;
-						margin-right: 17.54rpx;
-					}
-
-					input {
-						width: 80%;
-					}
-				}
-
-				.search_btn {
-					width: 106rpx;
-					height: 60rpx;
-					line-height: 60rpx;
-					pic: #40AE36;
-					border-radius: 100px;
-					font-size: 28rpx;
-					color: #fff;
-				}
-			}
-
-			.category {
-				width: 100%;
-				overflow: auto;
-				margin-bottom: 20rpx;
-
-				.category-wrap {
-				  display: flex;
-				  padding-bottom: 20rpx;
-				
-				  .category-item {
-				    display: flex;
-				    flex-direction: column;
-				    justify-content: center;
-				    align-items: center;
-				    margin-right: 38rpx;
-				
-				    text {
-				      margin-top: 16rpx;
-				      font-size: 24rpx;
-				      color: #666666;
-				      white-space: nowrap;
-				    }
-				
-				    .category-item-text {
-				      width: 120rpx;
-				      text-align: center;
-				      overflow: hidden;
-				      white-space: nowrap;
-				      text-overflow: ellipsis;
-				    }
-				  }
-				
-				  .category-item-active {
-				    position: relative;
-				
-				    .category-item-img {
-				      border: 2px solid #40AE36;
-				      border-radius: 50%;
-				    }
-				
-				    text {
-				      background-color: #40AE36;
-				      color: #fff;
-				      padding: 2rpx 10rpx 6rpx 10rpx;
-				      border-radius: 50rpx;
-				    }
-				  }
-				}
-			}
-
-			.cate {
-				width: 100%;
-				overflow: auto;
-				margin-bottom: 30rpx;
-
-				.cate-wrap {
-					display: flex;
-					padding-bottom: 8rpx;
-
-					.cate-item {
-
-						text {
-							padding: 4rpx 16rpx;
-							white-space: nowrap;
-							font-size: 30rpx;
-							color: #333;
-						}
-					}
-
-					.cate-item-active {
-						text {
-							color: #40AE36;
-							font-weight: bold;
-						}
-					}
-				}
-			}
-
-			.comprehensive {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				padding: 0 50rpx;
-
-				[class^=comprehensive-] {
-					display: flex;
-					align-items: center;
-
-					text {
-						margin-right: 12rpx;
-						font-size: 26rpx;
-						color: #666666;
-					}
-
-					image {
-						width: 28rpx;
-						height: 28rpx;
-					}
-
-					.loudou {
-						width: 24rpx;
-						height: 24rpx;
-					}
-				}
-			}
-		}
-	}
-</style>
 <template>
-  <view class="wholeSale">
-
-		<!-- 顶部 -->
-		<view class="wholeSale-header" style="position: fixed;top: 0;left: 0;width: 100%;z-index: 999;">
-			<!-- 适配不同机 -->
+	<view class="wholeSale">
+		<!-- 适配不同机 -->
+		<view class="wholeSale-header">
 			<view style="height: var(--status-bar-height);background-color: #40af37;"></view>
-      <view style="display: flex;padding: 20rpx 28rpx;background-color: #40af37;color: #fff;">
-        <view style="display: flex;font-weight: bold;font-size: 32rpx;"><u-icon style="margin-right: 20rpx;" name="arrow-left" size="20" color="#fff" @click="navBack"></u-icon>名优特产</view>
-      </view>
+			<view style="display: flex;padding: 20rpx 28rpx;background-color: #40af37;color: #fff;">
+				<view style="display: flex;font-weight: bold;font-size: 32rpx;"><u-icon style="margin-right: 20rpx;"
+						name="arrow-left" size="20" color="#fff" @click="navBack"></u-icon>名优特产</view>
+			</view>
 		</view>
 
-		<!-- 内容 -->
-		<view class="wholeSale-con" style="padding-top: calc(var(--status-bar-height) + 100rpx);">
-      <view class="wholeSale-nav">
-        <!-- <u-icon class="icon" name="arrow-left" size="20" @click="navBack"></u-icon> -->
-        <!-- 搜索 -->
-        <view @click="navTo(`/pages/columnGoods/goods_search/index?back=true&searchVal=${where.keyword}`)" hover-class="none"
-        	class="search_content flex_a_c_j_sb">
-        	<view class="flex_a_c search_content_wrap">
-        		<view class="iconfont icon-sousuo" style="font-size: 39rpx;"></view>
-        		<input type="text" placeholder="搜索商品名称" :value="where.keyword" placeholder-style="font-size: 30rpx;color:#999;"
-        			disabled style="pointer-events: none;">
-        	</view>
-        	<!-- <button class="search_btn">搜索</button> -->
-        </view>
-      </view>
+		<view class="wholeSale-section" :style="{height:wrapHeight + 'rpx'}">
+			<view class="wholeSale-nav">
+				<!-- 搜索 -->
+				<view @click="navTo(`/pages/columnGoods/goods_search/index?back=true&searchVal=${where.keyword}`)"
+					hover-class="none" class="search_content flex_a_c_j_sb">
+					<view class="flex_a_c search_content_wrap">
+						<view class="iconfont icon-sousuo" style="font-size: 39rpx;"></view>
+						<input type="text" placeholder="搜索商品名称" :value="where.keyword"
+							placeholder-style="font-size: 30rpx;color:#999;" disabled style="pointer-events: none;">
+					</view>
+				</view>
+			</view>
 
 			<!-- 商品大分类 -->
 			<view class="category">
 				<scroll-view scroll-x="true">
 					<view class="category-wrap">
 						<block v-for="(item,index) in store_category" :key="index">
-							<view class="category-item" :class="{'category-item-active': index==cate_change}" @click="changeCate(index)">
-								<u--image class="category-item-img" width="108rpx" :src="item.pic" height="108rpx" shape="circle">
+							<view class="category-item" :class="{'category-item-active': index==cate_change}"
+								@click="changeCate(index)">
+								<u--image class="category-item-img" width="108rpx" :src="item.pic" height="108rpx"
+									shape="circle">
 									<template v-slot:loading>
 										<u-loading-icon color="#999" size="15" />
 									</template>
@@ -242,6 +40,11 @@
 						</block>
 					</view>
 				</scroll-view>
+
+				<view class="category-all" v-if="store_category.length > 0" @click="onAllCategory">
+					<view style="margin-bottom: 20rpx;">全部</view>
+					<u-icon name="list"></u-icon>
+				</view>
 			</view>
 
 			<!-- 商品小分类 -->
@@ -249,33 +52,52 @@
 				<scroll-view scroll-x="true">
 					<view class="cate-wrap">
 						<block v-for="(item,index) in store_category_children" :key="index">
-							<view class="cate-item" :class="{'cate-item-active':index == cate_change_children}" @click="changeChildrenCate(index)">
+							<view class="cate-item" :class="{'cate-item-active':index == cate_change_children}"
+								@click="changeChildrenCate(index)">
 								<text>{{item.cate_name}}</text>
 							</view>
 						</block>
 					</view>
 				</scroll-view>
 			</view>
-
-			<!-- 综合查询 -->
-			<!-- <view class="comprehensive">
-				<view class="comprehensive-price">
-					<text>价格</text>
-					<image src="@/static/new_define/priceChange.png"></image>
-				</view>
-				<view class="comprehensive-sales_num">
-					<text>销量</text>
-				</view>
-				<view class="comprehensive-discount">
-					<text>抵扣</text>
-					<image class="loudou" src="@/static/new_define/loudou.png"></image>
-				</view>
-			</view> -->
-
-			<!-- 流水瀑布 -->
-			<WaterfallsFlow :wfList='hostProduct' @itemTap="goDetail" :type="0" />
-      <loadmore :type="isLoading"></loadmore>
 		</view>
+
+		<!-- 内容 -->
+		<view class="wholeSale-con" :style="{height:'calc(100vh - '+wrapHeight+'rpx - 142rpx )'}">
+			<scroll-view :scroll-y="true" @scrolltolower="onScrollBottom" @scroll="onScroll" style="height: 100%;"
+				@scrolltoupper="scrolltoupper" :refresher-threshold="0">
+				<view>
+					<!-- 流水瀑布 -->
+					<WaterfallsFlow :wfList='hostProduct' @itemTap="goDetail" :type="0" />
+					<loadmore :type="isLoading"></loadmore>
+				</view>
+			</scroll-view>
+		</view>
+
+		<!-- 弹框大分类 -->
+		<uni-popup ref="popup" type="top" border-radius="10px 10px 0 0" z-index="1000">
+			<view class="popup-wrap">
+				<view style="height: var(--status-bar-height);"></view>
+				<view class="popup-wrap-title">分类</view>
+				<view class="popup-wrap-category">
+					<view class="popup-wrap-category-wrap">
+						<block v-for="(item,index) in store_category" :key="index">
+							<view class="popup-wrap-category-item"
+								:class="{'popup-wrap-category-item-active': index==cate_change}"
+								@click="changeCate(index)">
+								<u--image class="popup-wrap-category-item-img" width="108rpx" :src="item.pic"
+									height="108rpx" shape="circle">
+									<template v-slot:loading>
+										<u-loading-icon color="#999" size="15" />
+									</template>
+								</u--image>
+								<text class="popup-wrap-category-item-text">{{item.cate_name}}</text>
+							</view>
+						</block>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 
@@ -284,108 +106,145 @@
 		goShopDetail
 	} from '@/libs/order.js'
 	import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlow.vue'
-  import {
-    getCategoryIndexList,
-    getProductslist
-  } from "@/api/store.js"
+	import {
+		getCategoryIndexList,
+		getProductslist
+	} from "@/api/store.js"
 	export default {
 		components: {
 			WaterfallsFlow
 		},
 		data() {
 			return {
-        hostProduct: [],
-        store_category: [], //商品大分类
-        store_category_children: [], //商品小分类
-        cate_change: 0,
-        cate_change_children: 0,
-        isLoading: 0,
-        where: {
-          page: 1,
-          limit: 20,
-          cate_pid: '',
-          keyword: '',
-          mer_type: 3, //1-里海云仓, 2-云市场, 3-名优特产
-          sale_type: 1, //1-零售, 2-批发
-        }
+				hostProduct: [],
+				store_category: [], //商品大分类
+				store_category_children: [], //商品小分类
+				cate_change: 0,
+				cate_change_children: 0,
+				isLoading: 0,
+				where: {
+					page: 1,
+					limit: 20,
+					cate_pid: '',
+					keyword: '',
+					mer_type: 3, //1-里海云仓, 2-云市场, 3-名优特产
+					sale_type: 1, //1-零售, 2-批发
+				},
+				wrapHeight: 300,
+				scrollTop: 0,
 			}
 		},
-    onLoad(option){
-      this.getCategoryIndexList();
-      this.getProductslist(true);
-    },
-    onReachBottom() {
-      this.getProductslist();
-    },
-    onPageScroll() {
-      uni.$emit('scroll');
-    },
+		onLoad(option) {
+			this.getCategoryIndexList();
+			this.getProductslist(true);
+		},
+		onReachBottom() {
+			// this.getProductslist();
+		},
+		onPageScroll() {
+			uni.$emit('scroll');
+		},
+		onPullDownRefresh() {
+			// this.getProductslist(true);
+		},
 		methods: {
-      navTo(url){
-        uni.navigateTo({
-          url:url,
-          success: () => {
-            uni.$once('searchValue', (e)=>{
-              this.$nextTick(()=>{
-                this.where.keyword = e;
-                this.getProductslist(true);
-              })
-            })
-          }
-        })        
-      },
-      navBack(){ 
-        uni.navigateBack();
-      },
-			tabsChange(e) {
-				this.tabsCurr = e;
+			onAllCategory() {
+				this.$refs.popup.open();
+			},
+
+			scrolltoupper() {
+				this.getProductslist(true);
+			},
+
+			onScrollBottom(e) {
+				this.getProductslist();
+			},
+
+			onScroll(e) {
+				if (this.scrollTop >= e.target.scrollTop) { //上拉
+					this.wrapHeight = 300;
+				} else {
+					this.wrapHeight = 0;
+				}
+				this.scrollTop = e.target.scrollTop;
+			},
+
+			navTo(url) {
+				uni.navigateTo({
+					url: url,
+					success: () => {
+						uni.$once('searchValue', (e) => {
+							this.$nextTick(() => {
+								this.where.keyword = e;
+								this.getProductslist(true);
+							})
+						})
+					}
+				})
+			},
+			navBack() {
+				uni.navigateBack();
+			},
+
+			changeCate(e) {
+				this.cate_change = e;
+				this.store_category_children = [{
+					cate_name: '全部',
+					store_category_id: ''
+				}];
+				if (this.store_category[e].children) this.store_category_children = [...this.store_category_children, ...
+					this.store_category[e].children
+				];
+				this.cate_change_children = 0;
+				this.where.cate_pid = this.store_category[e].store_category_id;
+				this.getProductslist(true);
+
+				this.$refs.popup && this.$refs.popup.close();
+				this.$forceUpdate();
+			},
+			changeChildrenCate(e) {
+				this.cate_change_children = e;
+				this.where.cate_pid = this.store_category_children[e].store_category_id;
+				if (e == 0) this.where.cate_pid = this.store_category[this.cate_change]
+					.store_category_id; // 如若选中全部, 则取父级id
+				this.getProductslist(true);
+			},
+
+			getCategoryIndexList() {
+				getCategoryIndexList({
+					mer_type: this.where.mer_type,
+					sale_type: this.where.sale_type
+				}).then(res => {
+					this.store_category = [{
+						cate_name: '全部',
+						pic: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/0bc7a202404021652194310.png',
+						store_category_id: ''
+					}, ...res.data];
+					this.store_category_children = this.store_category[0].children || [];
+					this.store_category_children.unshift({
+						cate_name: '全部',
+						store_category_id: ''
+					})
+				})
+			},
+			getProductslist(reLoad = false) {
+				if (reLoad) {
+					this.where.page = 1;
+					this.hostProduct = [];
+					this.isLoading = 0;
+				}
+				if (this.isLoading == -1) return;
+				this.isLoading = 1;
+				getProductslist(this.where).then(res => {
+					uni.stopPullDownRefresh();
+					this.hostProduct = [...this.hostProduct, ...res.data.list];
+					this.where.page++;
+					this.isLoading = 0;
+					if (res.data.list.length < this.where.limit) this.isLoading = -1;
+				}).catch(() => {
+					uni.stopPullDownRefresh();
+				})
 			},
-      changeCate(e){
-        this.cate_change = e;
-        this.store_category_children = [{
-            cate_name: '全部',
-            store_category_id: ''
-          }];
-        if(this.store_category[e].children) this.store_category_children = [...this.store_category_children, ...this.store_category[e].children];
-        this.cate_change_children = 0;
-        this.where.cate_pid = this.store_category[e].store_category_id;
-        this.getProductslist(true);
-      },
-      changeChildrenCate(e){
-        this.cate_change_children = e;
-        this.where.cate_pid = this.store_category_children[e].store_category_id;
-        if(e==0) this.where.cate_pid = this.store_category[this.cate_change].store_category_id; // 如若选中全部, 则取父级id
-        this.getProductslist(true);
-      },
-      getCategoryIndexList(){
-        getCategoryIndexList({mer_type: this.where.mer_type, sale_type: this.where.sale_type}).then(res=>{
-          this.store_category = [{
-            cate_name: '全部',
-            pic: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/0bc7a202404021652194310.png',
-            store_category_id: ''
-          }, ...res.data];
-          this.store_category_children = this.store_category[0].children || [];
-          this.store_category_children.unshift({
-            cate_name: '全部',
-            store_category_id: ''
-          })
-        })
-      },
-      getProductslist(reLoad=false){
-        if(reLoad){
-          this.where.page = 1;
-          this.hostProduct = [];
-          this.isLoading = 0;
-        }
-        if(this.isLoading==-1)return;
-        this.isLoading = 1;
-        getProductslist(this.where).then(res=>{
-          this.hostProduct = [...this.hostProduct, ...res.data.list];
-          this.where.page++;
-          this.isLoading = 0;
-          if(res.data.list.length<this.where.limit) this.isLoading = -1;
-        })
-      },
 			goDetail(item) {
 				goShopDetail(item, this.uid).then(res => {
 					if (this.isLogin) {
@@ -408,4 +267,216 @@
 			}
 		}
 	}
-</script>
\ No newline at end of file
+</script>
+
+<style lang="scss" scoped>
+	page {
+		background-color: #f8fafb !important;
+	}
+
+	.wholeSale {
+
+		.wholeSale-header {
+			position: sticky;
+			top: 0;
+			z-index: 90;
+			background-color: #40AE36;
+		}
+
+		.wholeSale-section {
+			position: sticky;
+			top: calc(82rpx + var(--status-bar-height));
+			padding: 0rpx 20rpx;
+			background-color: #fff;
+			transition: height .5s;
+			overflow: hidden;
+			margin-bottom: 20rpx;
+			padding-top: 20rpx;
+			z-index: 20;
+
+			.wholeSale-nav {
+				display: flex;
+				align-items: center;
+				margin-bottom: 40rpx;
+
+				.icon {
+					margin-right: 20rpx;
+				}
+
+				.search_content {
+					flex: 1;
+					height: 70rpx;
+					padding: 2px 2px 2px 21.05rpx;
+					border-radius: 80rpx;
+					background: #EDEFF2;
+					position: relative;
+					box-sizing: border-box;
+
+					.search_content_wrap {
+						width: 100%;
+
+						.icon-sousuo {
+							font-size: 26.32rpx;
+							font-weight: bold;
+							color: #c8c7c6;
+							margin-right: 17.54rpx;
+						}
+
+						input {
+							width: 80%;
+						}
+					}
+
+					.search_btn {
+						width: 106rpx;
+						height: 60rpx;
+						line-height: 60rpx;
+						pic: #40AE36;
+						border-radius: 100px;
+						font-size: 28rpx;
+						color: #fff;
+					}
+				}
+			}
+
+			.category {
+				position: relative;
+				width: 100%;
+				overflow: auto;
+				margin-bottom: 20rpx;
+				padding-right: 70rpx;
+
+				.category-wrap {
+					display: flex;
+					padding-bottom: 20rpx;
+
+					.category-item {
+						display: flex;
+						flex-direction: column;
+						justify-content: center;
+						align-items: center;
+						margin-right: 38rpx;
+
+						text {
+							margin-top: 16rpx;
+							font-size: 24rpx;
+							color: #666666;
+							white-space: nowrap;
+						}
+
+						.category-item-text {
+							width: 120rpx;
+							text-align: center;
+							overflow: hidden;
+							white-space: nowrap;
+							text-overflow: ellipsis;
+						}
+					}
+
+					.category-item-active {
+						position: relative;
+
+						.category-item-img {
+							border: 2px solid #40AE36;
+							border-radius: 50%;
+						}
+
+						text {
+							background-color: #40AE36;
+							color: #fff;
+							padding: 2rpx 10rpx 6rpx 10rpx;
+							border-radius: 50rpx;
+						}
+					}
+				}
+
+				.category-all {
+					position: absolute;
+					right: 0;
+					top: 50%;
+					transform: translateY(-50%);
+					height: 100%;
+					background-color: #f3f3f3;
+					z-index: 10;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					flex-direction: column;
+					font-size: 24rpx;
+					border-radius: 4rpx;
+					width: 70rpx;
+					color: #919191;
+				}
+			}
+		}
+
+		.popup-wrap {
+			background-color: #fff;
+			padding: 20rpx;
+
+			.popup-wrap-title {
+				font-size: 36rpx;
+				color: #333;
+				font-weight: bold;
+				margin-bottom: 20rpx;
+			}
+
+			.popup-wrap-category {
+				width: 100%;
+
+				.popup-wrap-category-wrap {
+					display: flex;
+					flex-wrap: wrap;
+
+					.popup-wrap-category-item {
+						display: flex;
+						flex-direction: column;
+						justify-content: center;
+						align-items: center;
+						margin: 0 20rpx 20rpx 0;
+
+						&:nth-child(5n) {
+							margin-right: 0;
+						}
+
+						text {
+							margin-top: 16rpx;
+							font-size: 24rpx;
+							color: #666666;
+							white-space: nowrap;
+						}
+
+						.popup-wrap-category-item-text {
+							width: 120rpx;
+							text-align: center;
+							overflow: hidden;
+							white-space: nowrap;
+							text-overflow: ellipsis;
+						}
+					}
+
+					.popup-wrap-category-item-active {
+						position: relative;
+
+						.popup-wrap-category-item-img {
+							border: 2px solid #40AE36;
+							border-radius: 50%;
+						}
+
+						text {
+							background-color: #40AE36;
+							color: #fff;
+							padding: 2rpx 10rpx 6rpx 10rpx;
+							border-radius: 50rpx;
+						}
+					}
+				}
+			}
+		}
+
+		.wholeSale-con {
+			padding-bottom: 30rpx;
+			margin: 0 20rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index 073ca26..8dcaf02 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -1,792 +1,830 @@
 <style lang="scss" scoped>
-  .gather {
-    .gather-header {
-      background-color: #40AE36;
+	.gather {
+		.gather-header {
+			background-color: #40AE36;
 
-      .location {
-        height: 98rpx;
-        padding: 0 28rpx;
+			.location {
+				height: 98rpx;
+				padding: 0 28rpx;
 
-        .box {
-          height: 98rpx;
-        }
+				.box {
+					height: 98rpx;
+				}
 
-        .town_name {
-          color: #fff;
-          margin-left: 18rpx;
-          font-size: 30rpx;
-        }
-      }
-    }
+				.town_name {
+					color: #fff;
+					margin-left: 18rpx;
+					font-size: 30rpx;
+				}
+			}
+		}
 
-    .swiperBg {
-      z-index: 1;
+		.swiperBg {
+			z-index: 1;
 
-      .colorBg {
-        position: absolute;
-        left: 0;
-        top: 0;
-        height: 130rpx;
-        width: 100%;
-      }
+			.colorBg {
+				position: absolute;
+				left: 0;
+				top: 0;
+				height: 130rpx;
+				width: 100%;
+			}
 
-      .page_swiper {
-        position: relative;
-        width: 100%;
-        height: auto;
-        margin: 0 auto;
-        border-radius: 10rpx;
-        overflow-x: hidden;
-        z-index: 8;
-        padding: 0 10rpx;
+			.page_swiper {
+				position: relative;
+				width: 100%;
+				height: auto;
+				margin: 0 auto;
+				border-radius: 10rpx;
+				overflow-x: hidden;
+				z-index: 8;
+				padding: 0 10rpx;
 
-        swiper-item {
-          border-radius: 10rpx;
-        }
+				swiper-item {
+					border-radius: 10rpx;
+				}
 
-        .swiper-item,
-        image,
-        .acea-row.row-between-wrapper {
-          width: 100%;
-          margin: 0 auto;
-          border-radius: 10rpx;
-        }
+				.swiper-item,
+				image,
+				.acea-row.row-between-wrapper {
+					width: 100%;
+					margin: 0 auto;
+					border-radius: 10rpx;
+				}
 
-        swiper {
-          width: 100%;
-          display: block;
-          height: auto;
+				swiper {
+					width: 100%;
+					display: block;
+					height: auto;
 
-          &.scalex {
-            /deep/.uni-swiper-slide-frame {
-              transform: translate(0, 0) !important;
-            }
-          }
-        }
+					&.scalex {
+						/deep/.uni-swiper-slide-frame {
+							transform: translate(0, 0) !important;
+						}
+					}
+				}
 
-        image {
-          transform: scale(0.93);
-          transition: all 0.6s ease;
-        }
+				image {
+					transform: scale(0.93);
+					transition: all 0.6s ease;
+				}
 
-        swiper-item.active,
-        swiper-item.scalex {
-          image {
-            transform: scale(1);
-          }
-        }
+				swiper-item.active,
+				swiper-item.scalex {
+					image {
+						transform: scale(1);
+					}
+				}
 
-        /*用来包裹所有的小圆点  */
-        .dots {
-          width: 156rpx;
-          height: 36rpx;
-          display: flex;
-          flex-direction: row;
-          position: absolute;
-          left: 320rpx;
-          bottom: 0;
-        }
+				/*用来包裹所有的小圆点  */
+				.dots {
+					width: 156rpx;
+					height: 36rpx;
+					display: flex;
+					flex-direction: row;
+					position: absolute;
+					left: 320rpx;
+					bottom: 0;
+				}
 
-        /*未选中时的小圆点样式 */
-        .dot {
-          width: 16rpx;
-          height: 6rpx;
-          border-radius: 6rpx;
-          margin-right: 6rpx;
-          background-color: rgba(255, 255, 255, .4);
+				/*未选中时的小圆点样式 */
+				.dot {
+					width: 16rpx;
+					height: 6rpx;
+					border-radius: 6rpx;
+					margin-right: 6rpx;
+					background-color: rgba(255, 255, 255, .4);
 
-          /*选中以后的小圆点样式  */
-          &.active {
-            width: 32rpx;
-            height: 6rpx;
-            background-color: rgba(255, 255, 255, .4);
-          }
-        }
-      }
-    }
+					/*选中以后的小圆点样式  */
+					&.active {
+						width: 32rpx;
+						height: 6rpx;
+						background-color: rgba(255, 255, 255, .4);
+					}
+				}
+			}
+		}
 
-    .title-img {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      height: 90rpx;
+		.title-img {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			height: 90rpx;
 
-      image {
-        width: 340rpx;
-        height: 42rpx;
-      }
+			image {
+				width: 340rpx;
+				height: 42rpx;
+			}
 
-      .title {
-        height: 42rpx;
-        padding: 0 80rpx;
-        font-size: 34rpx;
-        color: $theme-color;
-        font-weight: bold;
-        background-repeat: no-repeat;
-        background-size: 100% auto;
-        background-position: left center;
-      }
-    }
-  }
+			.title {
+				height: 42rpx;
+				padding: 0 80rpx;
+				font-size: 34rpx;
+				color: $theme-color;
+				font-weight: bold;
+				background-repeat: no-repeat;
+				background-size: 100% auto;
+				background-position: left center;
+			}
+		}
+	}
 </style>
 <template>
-  <view class="gather" @click.stop="clickWhite">
-    <!--顶部定位-->
-    <view class="gather-header">
-      <view style="height: var(--status-bar-height);"></view>
-      <view class="location">
-        <view class="box flex_a_c_j_sb">
-          <view class="place_wrapper flex_a_c" @click="changeMap">
-            <view class="iconfont icon-weizhi" style="color:#fff;font-size:40rpx;"></view>
-            <view class="town_name">{{street||'定位中' }}</view>
-          </view>
-          <view class="flex_a_c_j_sb">
-            <view style="margin-right: 30rpx;" @click="scanQRcode" hover-class="none">
-              <view class="iconfont icon-saoma" style="color:#fff;font-size:40rpx;"> </view>
-            </view>
-            <navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
-              <view class="iconfont icon-xiaoxi" style="color:#fff;font-size:40rpx;"> </view>
-            </navigator>
-          </view>
-        </view>
-      </view>
-    </view>
+	<view class="gather" @click.stop="clickWhite">
+		<!--顶部定位-->
+		<view class="gather-header">
+			<view style="height: var(--status-bar-height);"></view>
+			<view class="location">
+				<view class="box flex_a_c_j_sb">
+					<view class="place_wrapper flex_a_c" @click="changeMap">
+						<view class="iconfont icon-weizhi" style="color:#fff;font-size:40rpx;"></view>
+						<view class="town_name">{{street||'定位中' }}</view>
+					</view>
+					<view class="flex_a_c_j_sb">
+						<view style="margin-right: 30rpx;" @click="scanQRcode" hover-class="none">
+							<view class="iconfont icon-saoma" style="color:#fff;font-size:40rpx;"> </view>
+						</view>
+						<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none"
+							style="position: relative;">
+							<view class="iconfont icon-xiaoxi" style="color:#fff;font-size:40rpx;"> </view>
+							<text class="iconnum" v-if="userInfoData.user_unread">{{userInfoData.user_unread}}</text>
+						</navigator>
+					</view>
+				</view>
+			</view>
+		</view>
 
-    <!--轮播图-->
-    <view class="swiperBg" style="margin-top: 12px;">
-      <view class="swiper page_swiper">
-        <swiper :autoplay="true" loop indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff"
-          :current="swiperCur" style="height:330rpx;margin: 0 auto;width:710rpx;" @change="swiperChange">
-          <block v-for="(item,index) in imgUrls" :key="index">
-            <swiper-item :class="{ active: index == swiperCur }" @click="changeSwiper(item.info)">
-              <view class='slide-navigator acea-row row-between-wrapper'>
-                <image :src="item.img" class="slide-image aa" style="height:330rpx;" mode="aspectFill">
-                </image>
-              </view>
-            </swiper-item>
-          </block>
-        </swiper>
-        <view class="dots">
-          <block v-for="(item,index) in imgUrls" :key="index">
-            <view class="dot" :class="index == swiperCur ? ' active' : ''"></view>
-          </block>
-        </view>
-      </view>
-    </view>
+		<!--轮播图-->
+		<view class="swiperBg" style="margin-top: 12px;">
+			<view class="swiper page_swiper">
+				<swiper :autoplay="true" loop indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff"
+					:current="swiperCur" style="height:330rpx;margin: 0 auto;width:710rpx;" @change="swiperChange">
+					<block v-for="(item,index) in imgUrls" :key="index">
+						<swiper-item :class="{ active: index == swiperCur }" @click="changeSwiper(item.info)">
+							<view class='slide-navigator acea-row row-between-wrapper'>
+								<image :src="item.img" class="slide-image aa" style="height:330rpx;" mode="aspectFill">
+								</image>
+							</view>
+						</swiper-item>
+					</block>
+				</swiper>
+				<view class="dots">
+					<block v-for="(item,index) in imgUrls" :key="index">
+						<view class="dot" :class="index == swiperCur ? ' active' : ''"></view>
+					</block>
+				</view>
+			</view>
+		</view>
 
-    <view class="title-img">
-      <image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/807b8202403111125379295.webp" mode=""></image>
-    </view>
+		<view class="title-img">
+			<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/807b8202403111125379295.webp" mode=""></image>
+		</view>
 
-    <view class="business com special_work" v-if="jurisdiction == false">
-      <view class="content">
-        <block v-if="nowMenuList.length > 0">
-          <u-transition v-for="(item, index) in nowMenuList" :key="item.name" show>
-            <view class="examine" @click.stop="editFlag ? removeMenu(item) : clickMenu(item)"  @longpress="editFlag = true">
-              <image class="icon_img" :src="item.pic" mode="aspectFit">
-              </image>
-              <!-- <u-icon v-if="editFlag" class="icon" name="minus-circle-fill" color="red"></u-icon> -->
-              <view v-if="editFlag" class="icon" style="background-color: red;">删除</view>
-              <text class="text">{{ item.name }}</text>
-            </view>
-          </u-transition>
-        </block>
-        <view class="add-box examine"
-          style="display: flex;justify-content: center;flex-direction: column;align-items: center;"
-          @click.stop="editFlag = true" @longpress="editFlag = true" v-if="!editFlag">
-          <view class="add-box-icon"
-            style="margin-bottom: 14rpx; width:84rpx;height:84rpx;border: 2rpx solid #40AE36;border-radius: 10rpx;display: flex;justify-content: center;align-items: center;">
-            <u-icon name="plus" size="25" :bold="true" color="#40AE36"></u-icon>
-          </view>
-          <text>添加应用</text>
-        </view>
-      </view>
-    </view>
-    <view v-if="editFlag" class="business com special_work edit_card">
-      <view class="title project" style="padding: 0 28rpx">
-        <view>编辑功能</view>
-        <view class="edit2" @click="editComfirm">完成</view>
-      </view>
-      <view class="content">
-        <u-transition v-for="(item, index) in AllMenuList" :key="item.name" show>
-          <view class="examine" @click.stop="pushMenu(item)">
-            <image class="icon_img" :src="item.pic" mode="aspectFit"> </image>
-            <!-- <u-icon class="icon" name="plus-circle-fill"></u-icon> -->
-            <view class="icon">添加</view>
-            <text class="text">{{ item.name }}</text>
-          </view>
-        </u-transition>
-      </view>
-    </view>
-    <Loading></Loading>
+		<view class="business com special_work" v-if="jurisdiction == false">
+			<view class="content">
+				<block v-if="nowMenuList.length > 0">
+					<u-transition v-for="(item, index) in nowMenuList" :key="item.name" show>
+						<view class="examine" @click.stop="editFlag ? removeMenu(item) : clickMenu(item)"
+							@longpress="editFlag = true">
+							<image class="icon_img" :src="item.pic" mode="aspectFit">
+							</image>
+							<view v-if="editFlag" class="icon" style="background-color: red;">删除</view>
+							<text class="text">{{ item.name }}</text>
+						</view>
+					</u-transition>
+				</block>
+				<view class="add-box examine"
+					style="display: flex;justify-content: center;flex-direction: column;align-items: center;"
+					@click.stop="editFlag = true" @longpress="editFlag = true" v-if="!editFlag">
+					<view class="add-box-icon"
+						style="margin-bottom: 14rpx; width:84rpx;height:84rpx;border: 2rpx solid #40AE36;border-radius: 10rpx;display: flex;justify-content: center;align-items: center;">
+						<u-icon name="plus" size="25" :bold="true" color="#40AE36"></u-icon>
+					</view>
+					<text>添加应用</text>
+				</view>
+			</view>
+		</view>
+		<view v-if="editFlag" class="business com special_work edit_card">
+			<view class="title project" style="padding: 0 28rpx">
+				<view>编辑功能</view>
+				<view class="edit2" @click="editComfirm">完成</view>
+			</view>
+			<view class="content">
+				<u-transition v-for="(item, index) in AllMenuList" :key="item.name" show>
+					<view class="examine" @click.stop="pushMenu(item)">
+						<image class="icon_img" :src="item.pic" mode="aspectFit"> </image>
+						<view class="icon">添加</view>
+						<text class="text">{{ item.name }}</text>
+					</view>
+				</u-transition>
+			</view>
+		</view>
+		<Loading></Loading>
 
-    <!--自定义底部tab栏-->
-    <customTab :newData="newData" :activeRouter="activeRouter"></customTab>
-  </view>
+		<!--自定义底部tab栏-->
+		<customTab :newData="newData" :activeRouter="activeRouter"></customTab>
+	</view>
 </template>
 
 <script>
-  import {
-    mapState,
-    mapGetters
-  } from 'vuex'
-  import {
-    getStoreList,
-    getUserInfo
-  } from '@/api/user.js'
-  import {
-    Toast
-  } from '@/libs/uniApi';
-  import {
-    applet
-  } from '@/api/public.js';
-  import customTab from '@/components/customTab';
-  import {
-    getVersion,
-    getNavigation
-  } from "@/api/public";
-  // #ifdef APP-PLUS
-  import uniMP from '@/utils/uniMP.js';
-  // #endif
+	import {
+		mapState,
+		mapGetters
+	} from 'vuex'
+	import {
+		getStoreList,
+		getUserInfo
+	} from '@/api/user.js'
+	import {
+		Toast
+	} from '@/libs/uniApi';
+	import {
+		applet
+	} from '@/api/public.js';
+	import customTab from '@/components/customTab';
+	import {
+		getVersion,
+		getNavigation
+	} from "@/api/public";
+	// #ifdef APP-PLUS
+	import uniMP from '@/utils/uniMP.js';
+	// #endif
 
-  export default {
-    components: {
-      customTab
-    },
-    data() {
-      return {
-        imgUrls: [{
-          img: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e2f0520240203154207556.png'
-        }],
-        swiperCur: 0,
-        locationArr: ({}),
-        isshow: false,
-        emptyText: '暂无可用应用',
-        jurisdiction: false, // 是否有权限
-        mer_id: '',
-        userInfoData: {
-          mer_info: {
-            type_id: 0
-          }
-        },
-        prefix: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/11/',
-        isShow: false,
-        isFshow: false,
-        // 编辑中标记
-        editFlag: false,
-        // 所有菜单的按钮
-        AllMenuList: [],
-        nowMenuList: [],
-        street: '',
-        showPicker: false,
-        columnData: [],
-        isFshow: false,
-        backColor: 'rgba(252, 252, 252, 0)',
-        newData: {},
-        activeRouter: '',
-      };
-    },
-    computed: {
-      ...mapGetters(['userInfo', 'location', 'isLogin'])
-    },
-    created() {},
-    onLoad() {},
-    onShow() {
-      this.street = this.$store.state.storage.address.townName;
-      this.getNav();
-      if (this.isLogin) {
-        this.emptyText = '暂无可用应用'
-        this.jurisdiction = false
-        this.initAllAppLet();
-      } else {
-        this.emptyText = '请登录'
-        this.jurisdiction = true
-      }
-      this.getUserInfo();
-      this.imgUrls = uni.getStorageSync('swiperImgList');
-    },
-    onPullDownRefresh() {
-      this.getUserInfo()
-      uni.stopPullDownRefresh()
-    },
-    beforeDestroy() {},
-    mounted() {},
-    // #ifdef APP-PLUS
-    onPageScroll(e) {
-      const scrollTop = e.scrollTop;
-      if (scrollTop <= 20) {
-        this.backColor = 'rgba(252, 252, 252, 0)'
-        this.isFshow = false
-      } else if (20 < scrollTop && scrollTop <= 100) {
-        this.backColor = 'rgba(252, 252, 252, .5)'
-        this.isFshow = true
-      } else if (scrollTop > 100) {
-        this.backColor = 'rgba(252, 252, 252, 1)'
-        this.isFshow = true
-      }
-    },
-    // #endif
-    onHide() {
-      uni.$emit('showLoading', false);
-    },
-    methods: {
-      changeSwiper(e){
-        if(e.length>0 && e[1].value){
-          uni.navigateTo({
-            url:e[1].value
-          })
-        }
-      },
-      swiperChange(e) {
-      	let {
-      		current,
-      		source
-      	} = e.detail;
-      	if (source === 'autoplay' || source === 'touch') {
-      		this.swiperCur = e.detail.current;
-      		this.bgColor = this.imgUrls[e.detail.current]['img']
-      	}
-      },
-      getNav() {
-        getNavigation().then(res => {
-          this.newData = res.data
-          if (this.newData.status && this.newData.status.status) {
-            uni.hideTabBar()
-          } else {
-            uni.showTabBar()
-          }
-        })
-      },
-      async scanQRcode() {
-        // #ifdef APP-PLUS
-        let result = await this.$store.dispatch("permission/requestPermissions",
-          'CAMERA')
-        if (result !== 1) return;
-        // #endif
-        uni.scanCode({
-          success: (res) => {
-            console.log(res);
-            if (res.result && res.result.includes('pages/payment/get_payment')) {
-              let url = res.result.replace(/.*lihaink.cn/g, '');
-              uni.navigateTo({
-                url: url,
-                fail: () => {
-                  Toast('跳转页面失败')
-                }
-              })
-            } else {
-              Toast('无效的二维码')
-            }
-          }
-        })
-      },
-      // 选择位置
-      changeMap() {
-        uni.navigateTo({
-          url: `/pages/select_address_n/select_address_n`,
-          success: () => {
-            uni.$once('changeAddress', (e) => {
-              this.street = e.street.name;
-              this.town = e.street.name;
-              this.$store.commit('setAddress', {
-                street_id: e.street.code,
-                townName: this.town
-              });
-              if (e.longitude) {
-                this.longitude = e.longitude;
-                this.latitude = e.latitude;
-                this.$store.commit('setLocation', {
-                  lat: e.latitude,
-                  long: e.longitude,
-                });
-              }
-            })
-          }
-        })
-      },
-      initAllAppLet() {
-        applet().then(res => {
-          this.AllMenuList = res.data;
-          this.initMenu();
-          this.showControllerAllLet();
-        }).catch(e => {
-          console.log(e);
-        })
-      },
-      // 根据类型来判断是否显示
-      showControllerAllLet() {
-        let user;
-        if (typeof this.$store.state.app.userInfo == 'string') {
-          user = JSON.parse(this.$store.state.app.userInfo)
-        } else user = JSON.parse(JSON.stringify(this.$store.state.app.userInfo))
-        if (!user?.show_controller_applet) {
-          this.AllMenuList = this.AllMenuList.filter(item => item.app_id != "__UNI__83ABA97"); //隐藏大屏控制
-        }
-      },
-      // 初始化菜单
-      initMenu() {
-        let nowMenu = uni.getStorageSync('gatherMenuList');
-        try {
-          let list = JSON.parse(nowMenu || '[]');
-          let now = [];
-          let all = [];
-          this.AllMenuList.forEach((item) => {
-            if (list.find(t => t.name == item.name)?.name != item.name) all.push(item);
-            else now.push(item)
-          })
-          this.AllMenuList = all;
-          this.nowMenuList = now;
-        } catch (e) {
-          this.nowMenuList = [];
-        }
-      },
-      clickMenu(data) {
-        this.getUniMp(data);
-      },
-      // 添加菜单
-      pushMenu(data) {
-        this.nowMenuList.push(data);
-        this.AllMenuList = this.AllMenuList.filter((item) => {
-          return item.name != data.name;
-        })
-      },
-      // 移除菜单
-      removeMenu(data) {
-        this.AllMenuList.push(data);
-        this.nowMenuList = this.nowMenuList.filter((item) => {
-          return item.name != data.name;
-        })
-      },
-      // 编辑完成
-      editComfirm() {
-        this.editFlag = false;
-        uni.setStorageSync('gatherMenuList', JSON.stringify(this.nowMenuList));
-      },
-      getUniMp(data) {
-        let that = this;
+	export default {
+		components: {
+			customTab
+		},
+		data() {
+			return {
+				imgUrls: [{
+					img: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e2f0520240203154207556.png'
+				}],
+				swiperCur: 0,
+				locationArr: ({}),
+				isshow: false,
+				emptyText: '暂无可用应用',
+				jurisdiction: false, // 是否有权限
+				mer_id: '',
+				userInfoData: {
+					mer_info: {
+						type_id: 0
+					}
+				},
+				prefix: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/11/',
+				isShow: false,
+				isFshow: false,
+				// 编辑中标记
+				editFlag: false,
+				// 所有菜单的按钮
+				AllMenuList: [],
+				nowMenuList: [],
+				street: '',
+				showPicker: false,
+				columnData: [],
+				isFshow: false,
+				backColor: 'rgba(252, 252, 252, 0)',
+				newData: {},
+				activeRouter: '',
+				// userInfo: {},
+			};
+		},
+		computed: {
+			...mapGetters(['userInfo', 'location', 'isLogin'])
+		},
+		onShow() {
+			this.street = this.$store.state.storage.address.townName;
+			this.getNav();
+			if (this.isLogin) {
+				this.emptyText = '暂无可用应用'
+				this.jurisdiction = false
+				this.initAllAppLet();
+			} else {
+				this.emptyText = '请登录'
+				this.jurisdiction = true
+			}
+			this.getUserInfo();
+			this.imgUrls = uni.getStorageSync('swiperImgList');
 
-        // #ifdef APP-PLUS
-        if (data.version) return uniMP.loadAppletMP(data);
-        else switch (data.type) {
-          case 1:
-            uniMP.loadMP(data.data);
-            break;
-          case 2:
-            uniMP.loadMPx(data.data);
-            break;
-          case 3:
-            uniMP.loadMPurl(data.data);
-            break;
-          case 4:
-            uniMP.loadMPdns(data.data);
-            break;
-        }
-        return;
-        // #endif
-        // #ifdef H5
-        // if (type == 2) {
-        // 	this.navigator(`/pages/moreProject/moreProject`);
-        // } else {
-        // 	uni.showToast({
-        // 		icon: 'none',
-        // 		title: 'H5不支持打开小程序'
-        // 	})
-        // }
-        uni.showToast({
-          icon: 'none',
-          title: 'H5不支持打开小程序'
-        })
-        // #endif
+			// 加载缓存中的菜单 2024/04/28
+			let menu = uni.getStorageSync('gatherMenuList');
+			if (menu) {
+				menu = JSON.parse(menu);
+			} else {
+				menu = [];
+			}
+			this.nowMenuList = menu;
+		},
+		onPullDownRefresh() {
+			this.getUserInfo()
+			uni.stopPullDownRefresh()
+		},
+		beforeDestroy() {},
+		mounted() {},
+		// #ifdef APP-PLUS
+		onPageScroll(e) {
+			const scrollTop = e.scrollTop;
+			if (scrollTop <= 20) {
+				this.backColor = 'rgba(252, 252, 252, 0)'
+				this.isFshow = false
+			} else if (20 < scrollTop && scrollTop <= 100) {
+				this.backColor = 'rgba(252, 252, 252, .5)'
+				this.isFshow = true
+			} else if (scrollTop > 100) {
+				this.backColor = 'rgba(252, 252, 252, 1)'
+				this.isFshow = true
+			}
+		},
+		// #endif
+		onHide() {
+			uni.$emit('showLoading', false);
+		},
+		watch: {
+			nowMenuList(newVal, oldVal) {
+				if (newVal) {
+					uni.setStorageSync('gatherMenuList', JSON.stringify(newVal));
+				}
+			}
+		},
+		methods: {
+			/**
+			 * 获取个人用户信息
+			 */
+			getUserInfo: function() {
+				let that = this;
+				getUserInfo().then(res => {
+					showTab(res.data);
+					this.userInfo = res.data;
+				});
+			},
+			changeSwiper(e) {
+				if (e.length > 0 && e[1].value) {
+					uni.navigateTo({
+						url: e[1].value
+					})
+				}
+			},
+			swiperChange(e) {
+				let {
+					current,
+					source
+				} = e.detail;
+				if (source === 'autoplay' || source === 'touch') {
+					this.swiperCur = e.detail.current;
+					this.bgColor = this.imgUrls[e.detail.current]['img']
+				}
+			},
+			getNav() {
+				getNavigation().then(res => {
+					this.newData = res.data
+					if (this.newData.status && this.newData.status.status) {
+						uni.hideTabBar()
+					} else {
+						uni.showTabBar()
+					}
+				})
+			},
+			async scanQRcode() {
+				// #ifdef APP-PLUS
+				let result = await this.$store.dispatch("permission/requestPermissions",
+					'CAMERA')
+				if (result !== 1) return;
+				// #endif
+				uni.scanCode({
+					success: (res) => {
+						console.log(res);
+						if (res.result && res.result.includes('pages/payment/get_payment')) {
+							let url = res.result.replace(/.*lihaink.cn/g, '');
+							uni.navigateTo({
+								url: url,
+								fail: () => {
+									Toast('跳转页面失败')
+								}
+							})
+						} else {
+							Toast('无效的二维码')
+						}
+					}
+				})
+			},
+			// 选择位置
+			changeMap() {
+				uni.navigateTo({
+					url: `/pages/select_address_n/select_address_n`,
+					success: () => {
+						uni.$once('changeAddress', (e) => {
+							this.street = e.street.name;
+							this.town = e.street.name;
+							this.$store.commit('setAddress', {
+								street_id: e.street.code,
+								townName: this.town
+							});
+							if (e.longitude) {
+								this.longitude = e.longitude;
+								this.latitude = e.latitude;
+								this.$store.commit('setLocation', {
+									lat: e.latitude,
+									long: e.longitude,
+								});
+							}
+						})
+					}
+				})
+			},
+			initAllAppLet() {
+				applet().then(res => {
+					this.AllMenuList = res.data;
+					this.initMenu();
+					this.showControllerAllLet();
+				}).catch(e => {
+					console.log(e);
+				})
+			},
+			// 根据类型来判断是否显示
+			showControllerAllLet() {
+				let user;
+				if (typeof this.$store.state.app.userInfo == 'string') {
+					user = JSON.parse(this.$store.state.app.userInfo)
+				} else user = JSON.parse(JSON.stringify(this.$store.state.app.userInfo))
+				if (!user?.show_controller_applet) {
+					this.AllMenuList = this.AllMenuList.filter(item => item.app_id != "__UNI__83ABA97"); //隐藏大屏控制
+				}
+			},
+			// 初始化菜单
+			initMenu() {
+				let nowMenu = uni.getStorageSync('gatherMenuList');
+				try {
+					let list = JSON.parse(nowMenu || '[]');
+					let now = [];
+					let all = [];
+					this.AllMenuList.forEach((item) => {
+						if (list.find(t => t.name == item.name)?.name != item.name) all.push(item);
+						else now.push(item)
+					})
+					this.AllMenuList = all;
+					this.nowMenuList = now;
+				} catch (e) {
+					this.nowMenuList = [];
+				}
+			},
+			clickMenu(data) {
+				this.getUniMp(data);
+			},
+			// 添加菜单
+			pushMenu(data) {
+				this.nowMenuList.push(data);
+				this.AllMenuList = this.AllMenuList.filter((item) => {
+					return item.name != data.name;
+				})
+			},
+			// 移除菜单
+			removeMenu(data) {
+				this.AllMenuList.push(data);
+				this.nowMenuList = this.nowMenuList.filter((item) => {
+					return item.name != data.name;
+				})
+			},
+			// 编辑完成
+			editComfirm() {
+				this.editFlag = false;
+				uni.setStorageSync('gatherMenuList', JSON.stringify(this.nowMenuList));
+			},
+			getUniMp(data) {
+				let that = this;
 
-      },
-      navigator(url, t) {
-        // if (this.userInfoData.is_wsxx === 0 && t != '商户设置') return Toast("请完善商户信息");
-        uni.navigateTo({
-          url: url
-        })
-      },
-      getUserInfo: function() {
-        let that = this;
-        getUserInfo().then(res => {
-          that.userInfoData = res.data;
-          that.$store.commit('SET_USERINFO', res.data);
-          // console.log(res.data.service);
-          if (res.data.service == null) {
-            // console.log('123');
-            this.isShow = false
-          } else {
-            this.isShow = true
-            this.mer_id = res.data.service.mer_id
-          }
+				// #ifdef APP-PLUS
+				if (data.version) return uniMP.loadAppletMP(data);
+				else switch (data.type) {
+					case 1:
+						uniMP.loadMP(data.data);
+						break;
+					case 2:
+						uniMP.loadMPx(data.data);
+						break;
+					case 3:
+						uniMP.loadMPurl(data.data);
+						break;
+					case 4:
+						uniMP.loadMPdns(data.data);
+						break;
+				}
+				return;
+				// #endif
+				// #ifdef H5
+				// if (type == 2) {
+				// 	this.navigator(`/pages/moreProject/moreProject`);
+				// } else {
+				// 	uni.showToast({
+				// 		icon: 'none',
+				// 		title: 'H5不支持打开小程序'
+				// 	})
+				// }
+				uni.showToast({
+					icon: 'none',
+					title: 'H5不支持打开小程序'
+				})
+				// #endif
 
-          if (!res.data.mer_info) {
-            that.$set(this, 'jurisdiction', false);
-          }
-        });
-      },
-      // 点击空白区域完成添加
-      clickWhite(){
-        if(this.editFlag) this.editFlag = false;
-      }
-    }
-  };
+			},
+			navigator(url, t) {
+				// if (this.userInfoData.is_wsxx === 0 && t != '商户设置') return Toast("请完善商户信息");
+				uni.navigateTo({
+					url: url
+				})
+			},
+			getUserInfo: function() {
+				let that = this;
+				getUserInfo().then(res => {
+					that.userInfoData = res.data;
+					that.$store.commit('SET_USERINFO', res.data);
+					// console.log(res.data.service);
+					if (res.data.service == null) {
+						// console.log('123');
+						this.isShow = false
+					} else {
+						this.isShow = true
+						this.mer_id = res.data.service.mer_id
+					}
+
+					if (!res.data.mer_info) {
+						that.$set(this, 'jurisdiction', false);
+					}
+				});
+			},
+			// 点击空白区域完成添加
+			clickWhite() {
+				if (this.editFlag) this.editFlag = false;
+			}
+		}
+	};
 </script>
 <style lang="scss" scoped>
-  .gather {
-    padding-bottom: 164.91rpx;
-    background: linear-gradient(180deg, #ffffff 0%, #f6f6f6 100%);
-    position: relative;
-  }
+	.gather {
+		padding-bottom: 164.91rpx;
+		background: linear-gradient(180deg, #ffffff 0%, #f6f6f6 100%);
+		position: relative;
+	}
 
-  .sitebox {
-    animation-name: fadeIn;
-    animation-duration: 3s;
-    animation-fill-mode: forwards;
-  }
+	.sitebox {
+		animation-name: fadeIn;
+		animation-duration: 3s;
+		animation-fill-mode: forwards;
+	}
 
-  @keyframes fadeIn {
-    from {
-      opacity: 0;
-    }
+	@keyframes fadeIn {
+		from {
+			opacity: 0;
+		}
 
-    to {
-      opacity: 1;
-    }
-  }
+		to {
+			opacity: 1;
+		}
+	}
 
-  .site-box1 {
-    width: 706rpx;
-    /* #ifdef MP || APP-PLUS */
-    height: 160rpx;
-    /* #endif */
-    /* #ifdef H5 */
-    height: 120rpx;
-    /* #endif */
-    margin-bottom: 26.32rpx;
-    position: absolute;
-    top: 45rpx;
-    left: 20rpx;
+	.site-box1 {
+		width: 706rpx;
+		/* #ifdef MP || APP-PLUS */
+		height: 160rpx;
+		/* #endif */
+		/* #ifdef H5 */
+		height: 120rpx;
+		/* #endif */
+		margin-bottom: 26.32rpx;
+		position: absolute;
+		top: 45rpx;
+		left: 20rpx;
 
-    z-index: 999;
+		z-index: 999;
 
-    // 位置
-    .place_wrapper {
-      color: #fff;
-      margin-right: 0rpx;
+		// 位置
+		.place_wrapper {
+			color: #fff;
+			margin-right: 0rpx;
 
-      font-size: 30rpx;
+			font-size: 30rpx;
 
-      .town_name {
-        margin-left: 21rpx;
-      }
-    }
+			.town_name {
+				margin-left: 21rpx;
+			}
+		}
 
-    .iconfont {
-      font-size: 35.09rpx;
-    }
-  }
+		.iconfont {
+			font-size: 35.09rpx;
+		}
+	}
 
-  .site-box {
-    width: 100%;
-    /* #ifdef MP || APP-PLUS */
-    height: 160rpx;
-    /* #endif */
-    /* #ifdef H5 */
-    height: 120rpx;
-    /* #endif */
-    margin-bottom: 26.32rpx;
-    position: absolute;
-    top: 0rpx;
-    position: fixed;
-    z-index: 999;
-    /* #ifdef MP || APP-PLUS */
-    padding-top: 75rpx;
-    /* #endif */
-    /* #ifdef H5 */
-    padding-top: 25rpx;
-    /* #endif */
-    // background-color: #e5e5e5;
-    // background: url("@/static/images/bg2.png") no-repeat;
-    background-size: 100% 100%;
-    padding-right: 20rpx;
+	.iconnum {
+		min-width: 14rpx;
+		color: #fff;
+		background: #E93323;
+		border-radius: 15rpx;
+		position: absolute;
+		left: 20rpx;
+		top: -10rpx;
+		font-size: 10px;
+		padding: 0 5px;
+	}
 
-    // 位置
-    .place_wrapper {
-      color: #fff;
-      margin-right: 24.56rpx;
-      font-size: 30rpx;
+	.site-box {
+		width: 100%;
+		/* #ifdef MP || APP-PLUS */
+		height: 160rpx;
+		/* #endif */
+		/* #ifdef H5 */
+		height: 120rpx;
+		/* #endif */
+		margin-bottom: 26.32rpx;
+		position: absolute;
+		top: 0rpx;
+		position: fixed;
+		z-index: 999;
+		/* #ifdef MP || APP-PLUS */
+		padding-top: 75rpx;
+		/* #endif */
+		/* #ifdef H5 */
+		padding-top: 25rpx;
+		/* #endif */
+		// background-color: #e5e5e5;
+		// background: url("@/static/images/bg2.png") no-repeat;
+		background-size: 100% 100%;
+		padding-right: 20rpx;
 
-      opacity: 0;
+		// 位置
+		.place_wrapper {
+			color: #fff;
+			margin-right: 24.56rpx;
+			font-size: 30rpx;
 
-      .town_name {
-        margin-left: 21rpx;
-      }
-    }
+			opacity: 0;
 
-    .iconfont {
-      opacity: 0;
-      font-size: 30rpx;
-      font-size: 35.09rpx;
-    }
-  }
+			.town_name {
+				margin-left: 21rpx;
+			}
+		}
 
-  .top_box {
-    // padding-top: 180rpx;
-    background: linear-gradient(#36a2ff, #fff);
-  }
+		.iconfont {
+			opacity: 0;
+			font-size: 30rpx;
+			font-size: 35.09rpx;
+		}
+	}
 
-  .com {
-    margin-left: 50%;
-    transform: translate(-50%);
-  }
+	.top_box {
+		// padding-top: 180rpx;
+		background: linear-gradient(#36a2ff, #fff);
+	}
 
-  .business {
-    width: 694.74rpx;
-    // margin-bottom: 175rpx;
-  }
+	.com {
+		margin-left: 50%;
+		transform: translate(-50%);
+	}
 
-  .special_work {
-    // padding: 17.54rpx;
-    width: 694.74rpx;
-    padding-top: 30rpx;
-    border-radius: 17.54rpx;
-    // box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.16);
+	.business {
+		width: 694.74rpx;
+		// margin-bottom: 175rpx;
+	}
 
-    .title {
-      font-size: 31.58rpx;
-      font-weight: 700;
-      margin-bottom: 38.6rpx;
-    }
+	.special_work {
+		// padding: 17.54rpx;
+		width: 694.74rpx;
+		padding-top: 30rpx;
+		border-radius: 17.54rpx;
+		// box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.16);
 
-    .project {
-      display: flex;
-      justify-content: space-between;
-      align-items: flex-end;
+		.title {
+			font-size: 31.58rpx;
+			font-weight: 700;
+			margin-bottom: 38.6rpx;
+		}
 
-      .edit {
-        font-size: 26rpx;
-        font-weight: 400;
+		.project {
+			display: flex;
+			justify-content: space-between;
+			align-items: flex-end;
 
-        &::after {
-          content: ">";
-          margin-left: 10rpx;
-        }
-      }
+			.edit {
+				font-size: 26rpx;
+				font-weight: 400;
 
-      .edit2 {
-        font-size: 26rpx;
-        font-weight: 400;
-      }
-    }
+				&::after {
+					content: ">";
+					margin-left: 10rpx;
+				}
+			}
 
-    .content {
-      display: flex;
-      align-content: center;
-      flex-wrap: wrap;
-      // justify-content: space-between;
+			.edit2 {
+				font-size: 26rpx;
+				font-weight: 400;
+			}
+		}
 
-      .examine {
-        margin-bottom: 35rpx;
-        width: 173.68rpx;
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        align-items: center;
-        position: relative;
-        // margin: 0 0 33.33rpx 33.33rpx !important;
+		.content {
+			display: flex;
+			align-content: center;
+			flex-wrap: wrap;
+			// justify-content: space-between;
 
-        .icon_img {
-          width: 83.16rpx;
-          height: 83.16rpx;
-        }
+			.examine {
+				margin-bottom: 35rpx;
+				width: 173.68rpx;
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				align-items: center;
+				position: relative;
+				// margin: 0 0 33.33rpx 33.33rpx !important;
 
-        .icon {
-          position: absolute;
-          top: -5rpx;
-          right: 25rpx;
-          background-color: green;
-          color: #fff;
-          border-radius: 50rpx;
-          font-size: 22rpx;
-          padding: 5rpx 10rpx;
-        }
+				.icon_img {
+					width: 83.16rpx;
+					height: 83.16rpx;
+				}
 
-        .text {
-          font-size: 26.32rpx;
-          margin-top: 21.05rpx;
-          color: #000;
-        }
-      }
+				.icon {
+					position: absolute;
+					top: -5rpx;
+					right: 25rpx;
+					background-color: green;
+					color: #fff;
+					border-radius: 50rpx;
+					font-size: 22rpx;
+					padding: 5rpx 10rpx;
+				}
 
-      .text {
-        font-size: 29.82rpx;
-        color: #a4a4a4;
-      }
-    }
+				.text {
+					font-size: 26.32rpx;
+					margin-top: 21.05rpx;
+					color: #000;
+				}
+			}
 
-    .cont_jus {
-      margin-top: 56.14rpx;
-      justify-content: flex-start;
+			.text {
+				font-size: 29.82rpx;
+				color: #a4a4a4;
+			}
+		}
 
-      &:first-child {
-        // margin-right: 33rpx;
-      }
+		.cont_jus {
+			margin-top: 56.14rpx;
+			justify-content: flex-start;
 
-      .examine {
-        margin-right: 48rpx;
+			&:first-child {
+				// margin-right: 33rpx;
+			}
 
-        &:first-child {
-          margin-right: 48rpx;
-        }
-      }
-    }
-  }
+			.examine {
+				margin-right: 48rpx;
 
-  .edit_card {
-    background-color: #fff;
-    padding-top: 28rpx;
-  }
+				&:first-child {
+					margin-right: 48rpx;
+				}
+			}
+		}
+	}
 
-  .rotate-box {
-    transform: rotate(0deg);
-    transition: transform .5s ease-out;
-  }
+	.edit_card {
+		background-color: #fff;
+		padding-top: 28rpx;
+	}
 
-  .rotate-box:active {
-    transform: rotate(360deg);
-  }
+	.rotate-box {
+		transform: rotate(0deg);
+		transition: transform .5s ease-out;
+	}
 
-  // .location {
-  // 	background-color: #f6f6f6;
-  // 	width: 680rpx;
-  // 	height: 150rpx;
-  // 	position: absolute;
-  // 	top: 0;
-  // 	z-index: 9999;
-  // 	border-radius: 20rpx;
-  // 	left: 50%;
-  // 	margin-left: -340rpx;
-  // 	margin-top: 80rpx;
-  // 	padding-left: 20rpx;
+	.rotate-box:active {
+		transform: rotate(360deg);
+	}
 
-  // 	.locationa {
-  // 		font-size: 28rpx;
-  // 		color: #000;
-  // 		font-weight: 500;
-  // 		margin-top: 30rpx;
-  // 		margin-bottom: 15rpx;
-  // 	}
+	// .location {
+	// 	background-color: #f6f6f6;
+	// 	width: 680rpx;
+	// 	height: 150rpx;
+	// 	position: absolute;
+	// 	top: 0;
+	// 	z-index: 9999;
+	// 	border-radius: 20rpx;
+	// 	left: 50%;
+	// 	margin-left: -340rpx;
+	// 	margin-top: 80rpx;
+	// 	padding-left: 20rpx;
 
-  // 	.locationb {
-  // 		font-size: 20rpx;
-  // 		color: #5a5a5a;
-  // 	}
+	// 	.locationa {
+	// 		font-size: 28rpx;
+	// 		color: #000;
+	// 		font-weight: 500;
+	// 		margin-top: 30rpx;
+	// 		margin-bottom: 15rpx;
+	// 	}
 
-  // 	.locationx {
-  // 		color: #000;
-  // 		position: absolute;
-  // 		top: 10rpx;
-  // 		right: 20rpx;
-  // 	}
-  // }
+	// 	.locationb {
+	// 		font-size: 20rpx;
+	// 		color: #5a5a5a;
+	// 	}
+
+	// 	.locationx {
+	// 		color: #000;
+	// 		position: absolute;
+	// 		top: 10rpx;
+	// 		right: 20rpx;
+	// 	}
+	// }
 </style>
\ No newline at end of file
diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue
index 0a9085c..1c8976a 100644
--- a/pages/goods_details/index.vue
+++ b/pages/goods_details/index.vue
@@ -1,2636 +1,2732 @@
 <template>
-  <view :style="viewColor">
-    <view class="product-con">
-      <view class="head-wrapper" id="home" :style="{ top: homeTop + 'rpx' }">
-        <view class="head-menu">
-          <view class='iconfont icon-fanhui2' @click="returns"></view>
-          <view class="iconfont icon-shouye4" @click="goHome"></view>
-          <!-- <view class="iconfont icon-gengduo5" @click="showNav"></view> -->
-        </view>
-      </view>
-      <!-- 导航小图标 -->
-      <view class="dialog_nav" v-show="currentPage" :style="{ top: navH + 'rpx' }">
-        <view class="dialog_nav_item" :class="item.after" v-for="(item,index) in selectNavList" :key="index"
-          @click="linkPage(item.url)">
-          <text class="iconfont" :class="item.icon"></text>
-          <text class="pl-20">{{item.name}}</text>
-        </view>
-      </view>
-      <view v-if="storeInfo && storeInfo.merchant">
-        <scroll-view :scroll-top="scrollTop" scroll-y='true' scroll-with-animation="true"
-          :style='"height:"+height+"px;"' @scroll="scroll">
-          <view id="past0">
-            <!-- #ifdef MP || APP-PLUS -->
-            <view class="" :style="'width:100%;' + 'height:'+sysHeight + 'px'"></view>
-            <!-- #endif -->
-            <productConSwiper :imgUrls="storeInfo.slider_image" :videoCoverImg="videoCoverImg"
-              :videoline="storeInfo.video_link"></productConSwiper>
-            <!--有氛围图-->
-            <view v-if="storeInfo.atmosphere_pic" :style="{ backgroundImage: `url(${storeInfo.atmosphere_pic})` }"
-              class='nav acea-row row-between-wrapper'>
-              <view class='money skeleton-rect'>￥<text class='num'>{{storeInfo.price}}</text>
-                <text v-if="!svipData" class='y-money'>￥{{storeInfo.ot_price}}</text>
-                <view class="atmosphere" v-if="svipData && svipData.show_svip_price && svipData.show_svip"
-                  style="display: inline-block;">
-                  <text class="vip-money">￥{{storeInfo.svip_price}}</text>
-                  <image class="vip-image" :src="`${domain}/static/images/svip.png`"></image>
-                </view>
-              </view>
-            </view>
-            <view class='wrapper'>
-              <view v-if="storeInfo.atmosphere_pic" class='introduce skeleton-rect acea-row atmosphere'>
-                <view class="title">
-                  <text v-if="(storeInfo.merchant && storeInfo.merchant.type_name)"
-                    class="font-bg-red bt-color">{{storeInfo.merchant.type_name}}</text>
-                  <text v-else-if="(storeInfo.merchant && storeInfo.merchant.is_trader)"
-                    class="font-bg-red bt-color">自营</text>
-                  {{storeInfo.store_name}}
-                </view>
-                <view class="fenxiang_btn">
-                  <view @click="setCollect"><text class="iconfont"
-                      :class="storeInfo.isRelation ? 'icon-yishoucang2' : 'icon-shoucang4'"></text><br />收藏</view>
-                  <view @click="listenerActionSheet"><text class="iconfont icon-fenxiang4"></text><br />分享</view>
-                </view>
-              </view>
-              <view v-if="storeInfo.atmosphere_pic" class='integral_count skeleton-rect'>
-                <text v-if="storeInfo.max_integral > 0" class='integral'>积分最高可抵扣{{storeInfo.max_integral}}元</text>
-                <text v-if="storeInfo.delivery_free == 1" class='integral'>包邮</text>
-              </view>
-              <!--无氛围图-->
-              <view v-else class='share acea-row row-between row-bottom'>
-                <view class='money p-color skeleton-rect' style="min-width: 70rpx;">
-                  ￥
-                  <text class='num'>{{storeInfo.price}}</text>
-                  <text style="color: #000;font-weight: 500;" v-if="storeInfo.attr&&storeInfo.attr.length==0&&storeInfo.unit_name!='无'">/{{ storeInfo.unit_name}}</text>
-                  <text style="color: #000;font-weight: 500;" v-else>{{" 起 "}}</text>
-                  <view v-if="svipData && svipData.show_svip_price && svipData.show_svip"
-                    style="display: inline-block;">
-                    <text class="vip-money">￥{{storeInfo.svip_price}}</text>
-                    <image class="vip-image" :src="`${domain}/static/images/svip.png`"></image>
-                  </view>
-                </view>
-                <view class="fenxiang_btn">
-                  <view @click="setCollect"
-                    style="display: flex;flex-direction: column;justify-content: center;align-items: center;">
-                    <!-- <text class="iconfont" :class="storeInfo.isRelation ? 'icon-yishoucang2' : 'icon-shoucang4'"></text><br/> -->
-                    <u-icon :name="storeInfo.isRelation?'star-fill':'star'" color="#F55726"></u-icon>
-                    收藏
-                  </view>
-                  <!-- <view @click="listenerActionSheet"><text class="iconfont icon-fenxiang4"></text><br/>分享</view> -->
-                </view>
-              </view>
-              
-              
-              <view v-if="!storeInfo.atmosphere_pic" class='integral_count skeleton-rect'
-                style="">
-                <text v-if="storeInfo.max_integral > 0" class='integral' style="margin-top: 0;">积分最高可抵扣{{storeInfo.max_integral}}元</text>
-                <text v-if="storeInfo.delivery_free == 1" class='integral' style="margin-top: 0;">包邮</text>
-              </view>
-              
-              <view v-if="showPriceTabs" class='share acea-row row-top' style="flex-wrap: wrap;padding-top: 0rpx;">
-                <view class='money p-color skeleton-rect price-tab'>规格: </view>
-                <view class='money p-color skeleton-rect price-tab' v-for="(item, index) in storeInfo.sku" @click="selecAttr">
-                  ￥
-                  <text class='num' style="font-size: 28rpx;">{{item.price}}</text>
-                  <text style="font-size: 26rpx;">{{"/"}}{{ item.sku || storeInfo.unit_name}}</text>
-                </view>
-              </view>
+	<view :style="viewColor">
+		<view class="product-con">
+			<view class="head-wrapper" id="home" :style="{ top: homeTop + 'rpx' }">
+				<view class="head-menu">
+					<view class='iconfont icon-fanhui2' @click="returns"></view>
+					<view class="iconfont icon-shouye4" @click="goHome"></view>
+					<!-- <view class="iconfont icon-gengduo5" @click="showNav"></view> -->
+				</view>
+			</view>
+			<!-- 导航小图标 -->
+			<view class="dialog_nav" v-show="currentPage" :style="{ top: navH + 'rpx' }">
+				<view class="dialog_nav_item" :class="item.after" v-for="(item,index) in selectNavList" :key="index"
+					@click="linkPage(item.url)">
+					<text class="iconfont" :class="item.icon"></text>
+					<text class="pl-20">{{item.name}}</text>
+				</view>
+			</view>
+			<view v-if="storeInfo && storeInfo.merchant">
+				<scroll-view :scroll-top="scrollTop" scroll-y='true' scroll-with-animation="true"
+					:style='"height:"+height+"px;"' @scroll="scroll">
+					<view id="past0">
+						<!-- #ifdef MP || APP-PLUS -->
+						<view class="" :style="'width:100%;' + 'height:'+sysHeight + 'px'"></view>
+						<!-- #endif -->
+						<productConSwiper :imgUrls="storeInfo.slider_image" :videoCoverImg="videoCoverImg"
+							:videoline="storeInfo.video_link"></productConSwiper>
+						<!--有氛围图-->
+						<view v-if="storeInfo.atmosphere_pic"
+							:style="{ backgroundImage: `url(${storeInfo.atmosphere_pic})` }"
+							class='nav acea-row row-between-wrapper'>
+							<view class='money skeleton-rect'>￥<text class='num'>{{storeInfo.price}}</text>
+								<text v-if="!svipData" class='y-money'>￥{{storeInfo.ot_price}}</text>
+								<view class="atmosphere"
+									v-if="svipData && svipData.show_svip_price && svipData.show_svip"
+									style="display: inline-block;">
+									<text class="vip-money">￥{{storeInfo.svip_price}}</text>
+									<image class="vip-image" :src="`${domain}/static/images/svip.png`"></image>
+								</view>
+							</view>
+						</view>
+						<view class='wrapper'>
+							<view v-if="storeInfo.atmosphere_pic" class='introduce skeleton-rect acea-row atmosphere'>
+								<view class="title">
+									<text v-if="(storeInfo.merchant && storeInfo.merchant.type_name)"
+										class="font-bg-red bt-color">{{storeInfo.merchant.type_name}}</text>
+									<text v-else-if="(storeInfo.merchant && storeInfo.merchant.is_trader)"
+										class="font-bg-red bt-color">自营</text>
+									{{storeInfo.store_name}}
+								</view>
+								<view class="fenxiang_btn">
+									<view @click="setCollect"><text class="iconfont"
+											:class="storeInfo.isRelation ? 'icon-yishoucang2' : 'icon-shoucang4'"></text><br />收藏
+									</view>
+									<view @click="listenerActionSheet"><text
+											class="iconfont icon-fenxiang4"></text><br />分享</view>
+								</view>
+							</view>
+							<view v-if="storeInfo.atmosphere_pic" class='integral_count skeleton-rect'>
+								<text v-if="storeInfo.max_integral > 0"
+									class='integral'>积分最高可抵扣{{storeInfo.max_integral}}元</text>
+								<text v-if="storeInfo.delivery_free == 1" class='integral'>包邮</text>
+							</view>
+							<!--无氛围图-->
+							<view v-else class='share acea-row row-between row-bottom'>
+								<view class='money p-color skeleton-rect' style="min-width: 70rpx;">
+									￥
+									<text class='num'>{{storeInfo.price}}</text>
+									<text style="color: #000;font-weight: 500;"
+										v-if="storeInfo.attr&&storeInfo.attr.length==0&&storeInfo.unit_name!='无'">/{{ storeInfo.unit_name}}</text>
+									<text style="color: #000;font-weight: 500;" v-else>{{" 起 "}}</text>
+									<view v-if="svipData && svipData.show_svip_price && svipData.show_svip"
+										style="display: inline-block;">
+										<text class="vip-money">￥{{storeInfo.svip_price}}</text>
+										<image class="vip-image" :src="`${domain}/static/images/svip.png`"></image>
+									</view>
+								</view>
+								<view class="fenxiang_btn">
+									<view @click="setCollect"
+										style="display: flex;flex-direction: column;justify-content: center;align-items: center;">
+										<!-- <text class="iconfont" :class="storeInfo.isRelation ? 'icon-yishoucang2' : 'icon-shoucang4'"></text><br/> -->
+										<u-icon :name="storeInfo.isRelation?'star-fill':'star'"
+											color="#F55726"></u-icon>
+										收藏
+									</view>
+									<!-- <view @click="listenerActionSheet"><text class="iconfont icon-fenxiang4"></text><br/>分享</view> -->
+								</view>
+							</view>
 
-              <view v-if="svipData && !svipData.is_svip && svipData.show_svip"
-                class="svipCon acea-row row-between-wrapper skeleton-rect" style="margin-top: 20rpx;">
-                <view class="acea-row row-between-wrapper">
-                  <image :src="`${domain}/static/images/svip_user.png`"></image>
-                  <view class="">开通 SVIP会员
-                    <block v-if="svipData.show_svip_price">立省<text>{{svipData.save_money}}元</text></block>
-                    <block v-else><text>省钱多多，权益多多</text></block>
-                  </view>
-                </view>
-                <navigator class="svipBtn" url="/pages/annex/vip_paid/index">
-                  立即开通
-                  <text class="iconfont icon-jiantou"></text>
-                </navigator>
-              </view>
-              <view v-if="!storeInfo.atmosphere_pic" class='introduce skeleton-rect' style="padding-bottom: 20rpx;margin-top: 10rpx;">
-                <!-- <text v-if="storeInfo.merchant.type_name" class="font-bg-red bt-color">{{storeInfo.merchant.type_name}}</text>
+							<view v-if="!storeInfo.atmosphere_pic" class='integral_count skeleton-rect' style="">
+								<text v-if="storeInfo.max_integral > 0" class='integral'
+									style="margin-top: 0;">积分最高可抵扣{{storeInfo.max_integral}}元</text>
+								<text v-if="storeInfo.delivery_free == 1" class='integral'
+									style="margin-top: 0;">包邮</text>
+							</view>
+
+							<view v-if="showPriceTabs" class='share acea-row row-top'
+								style="flex-wrap: wrap;padding-top: 0rpx;">
+								<view class='money p-color skeleton-rect price-tab'>规格: </view>
+								<view class='money p-color skeleton-rect price-tab'
+									v-for="(item, index) in storeInfo.sku" @click="selecAttr">
+									￥
+									<text class='num' style="font-size: 28rpx;">{{item.price}}</text>
+									<text style="font-size: 26rpx;">{{"/"}}{{ item.sku || storeInfo.unit_name}}</text>
+								</view>
+							</view>
+
+							<view v-if="svipData && !svipData.is_svip && svipData.show_svip"
+								class="svipCon acea-row row-between-wrapper skeleton-rect" style="margin-top: 20rpx;">
+								<view class="acea-row row-between-wrapper">
+									<image :src="`${domain}/static/images/svip_user.png`"></image>
+									<view class="">开通 SVIP会员
+										<block v-if="svipData.show_svip_price">立省<text>{{svipData.save_money}}元</text>
+										</block>
+										<block v-else><text>省钱多多，权益多多</text></block>
+									</view>
+								</view>
+								<navigator class="svipBtn" url="/pages/annex/vip_paid/index">
+									立即开通
+									<text class="iconfont icon-jiantou"></text>
+								</navigator>
+							</view>
+							<view v-if="!storeInfo.atmosphere_pic" class='introduce skeleton-rect'
+								style="padding-bottom: 20rpx;margin-top: 10rpx;">
+								<!-- <text v-if="storeInfo.merchant.type_name" class="font-bg-red bt-color">{{storeInfo.merchant.type_name}}</text>
 								<text v-else-if="storeInfo.merchant.is_trader" class="font-bg-red bt-color">自营</text> -->
-                {{storeInfo.store_name || ''}}
-              </view>
-              <!-- <view class='label acea-row row-between-wrapper' :style="{'padding-bottom':coupon.list.length || storeInfo.top_pid?0 :10+'px;'}">
+								{{storeInfo.store_name || ''}}
+							</view>
+							<!-- <view class='label acea-row row-between-wrapper' :style="{'padding-bottom':coupon.list.length || storeInfo.top_pid?0 :10+'px;'}">
 								<view class="skeleton-rect">市场价:￥{{storeInfo.ot_price || 0}}</view>
 								<view class="skeleton-rect">库存:{{storeInfo.stock ? storeInfo.stock : 0}}{{storeInfo.unit_name ? storeInfo.unit_name : ''}}</view>
 								<view class="skeleton-rect">销量:{{storeInfo.sales ? storeInfo.sales : 0}}{{storeInfo.unit_name ? storeInfo.unit_name : ''}}</view>
 							</view> -->
-              <navigator v-if="storeInfo.top_pid" hover-class='none'
-                :url="`/pages/activity/rank/index?cate_id=${storeInfo.top_pid}`" class='label'>
-                <view class="rank_list acea-row row-between-wrapper">
-                  <view class="acea-row row-between-wrapper">
-                    <text class="rank_title"></text>
-                    <view>{{ storeInfo.top_name }} · 第{{ storeInfo.top_num }}名</view>
-                  </view>
-                  <text class="iconfont icon-xiala1"></text>
-                </view>
-              </navigator>
-              <view class='coupon acea-row row-between-wrapper skeleton-rect' @click='couponTap'
-                style="margin-top: 20rpx;" v-if="coupon.list.length > 0">
-                <view class='hide line1 acea-row'>
-                  优惠券：
-                  <view class='activity' v-for="(item,index) in coupon.list" :key="index">
-                    满{{item.use_min_price}}减{{item.coupon_price}}</view>
-                </view>
-                <view class='iconfont icon-jiantou'></view>
-              </view>
-            </view>
-            <view class='wrapper' v-if="storeInfo.store_info" style="padding: 28rpx;">
-              <view style="padding-bottom: 20rpx;">基础信息</view>
-              <view
-                style="white-space: pre-wrap;color: #666666;font-size: 26rpx;border-radius: 14rpx;">
-                {{storeInfo.store_info}}</view>
-            </view>
-            <!-- <view class='attribute acea-row row-between-wrapper skeleton-rect'>
-              <view class="acea-row row-between-wrapper">{{attrTxt}}：
-                <text class='atterTxt'>{{attrValue}}</text>
-              </view>
-              <view class='iconfont icon-jiantou'></view>
-            </view> -->
-            <view v-if="specsInfo.params && specsInfo.params.length>0" class="attribute acea-row row-between-wrapper"
-              @click="seeSpecs">
-              <view class="acea-row row-middle">
-                参数：
-                <view class="list line1">
-                  <text class="item params" v-for="(item,index) in specsInfo.params" :key="index"
-                    v-if="index<2">{{item.name}}</text>
-                  <text>...</text>
-                </view>
-              </view>
-              <view class="iconfont icon-jiantou"></view>
-            </view>
-            <!--运费-->
-            <view v-if="shipping || shippingValue" class='attribute acea-row row-between-wrapper' @click="showShip">
-              <view class="acea-row row-between-wrapper">运费：
-                <text class='atterTxt'>{{shippingValue}}</text>
-              </view>
-              <view class='iconfont icon-jiantou'></view>
-            </view>
-            <!--保障-->
-            <view v-if="guarantee && guarantee.length" class='attribute acea-row row-between-wrapper'
-              @click="showGuaranee">
-              <view class="acea-row row-between-wrapper">保障：
-                <view class="guaranteeAttr">
-                  <text class='atterTxt1' :class="item.guarantee_name ? 'hasAttr' : ''"
-                    v-for="(item,index) in guarantee">
-                    {{item.guarantee_name ? item.guarantee_name : ''}}
-                  </text>
-                </view>
-              </view>
-              <view class='iconfont icon-jiantou'></view>
-            </view>
-          </view>
-          <!--优惠套餐-->
-          <view class='combo' v-if="comboList && comboList.length>0">
-            <view class='title acea-row row-between-wrapper'>
-              <view>优惠套餐({{comboTotal}}) </view>
-              <view class='praise' @click="openCombo">
-                查看全部
-                <text class='iconfont icon-jiantou'></text>
-              </view>
-            </view>
-            <scroll-view scroll-x="true" style="white-space: nowrap; display: flex;height: 180rpx;"
-              show-scrollbar="false">
-              <view class="img-box">
-                <view class="combo_item" v-for="(item,index) in comboList" :key="index">
-                  <view class="img-item" v-for="(itemn,indexn) in item.discountsProduct" :key="indexn">
-                    <image :src="itemn.image" mode="" @click="openCombo"></image>
-                    <text v-if="indexn != item.count-1" class="iconfont icon-jiahao2"></text>
-                  </view>
-                  <view class="list_total">
-                    <view class="list_num">共{{item.count}}件</view>
-                    <view class="list_price p-color">省 ¥{{item.max_price}}</view>
-                  </view>
-                </view>
-              </view>
-            </scroll-view>
-          </view>
-          <view class='userEvaluation' id="past1" v-if="replyCount && replyCount>0">
-            <view class='title acea-row row-between-wrapper skeleton-rect'>
-              <view>用户评价({{replyCount}})</view>
-              <navigator class='praise' hover-class='none'
-                :url='"/pages/users/goods_comment_list/index?product_id="+id'>
-                <text class='t-color'>{{replyChance}}</text>好评率
-                <text class='iconfont icon-jiantou'></text>
-              </navigator>
-            </view>
-            <block v-if="replyCount && replyCount>0">
-              <userEvaluation :reply="reply"></userEvaluation>
-            </block>
-          </view>
-          <!-- 种草秀 -->
-          <view class='userPlant' v-if="storeInfo.community && storeInfo.community.length>0">
-            <view class='title acea-row row-between-wrapper'>
-              <view>种草秀 </view>
-              <navigator class='praise' hover-class='none'
-                :url="'/pages/plantGrass/plant_show/index?spu_id='+storeInfo.spu_id">
-                查看全部
-                <text class='iconfont icon-jiantou'></text>
-              </navigator>
-            </view>
-            <view class="imgList acea-row">
-              <view class="pictrue" v-for="(item, index) in storeInfo.community" :key="index" v-if="index<=2"
-                @click="goPlant(item)">
-                <image :src="item.image[0]" class="image"></image>
-                <image v-if="item.is_type == 2" class="video_img" src="@/static/images/stop.png" mode=""></image>
-              </view>
-            </view>
-          </view>
-          <!-- 商铺信息 -->
-          <view class="store-wrapper" v-if="storeInfo.merchant && hide_mer_status !=1">
-            <view class="store-hd skeleton-rect">
-              <view v-if="storeInfo.merchant&&hide_mer_status != 1" class="store-info">
-                <navigator :url="`/pages/store/home/index?id=${storeInfo.mer_id}&sale_type=${sale_type||1}`"
-                  hover-class="none" class="logo">
-                  <image :src="storeInfo.merchant.mer_avatar" mode=""></image>
-                </navigator>
-                <navigator :url="`/pages/store/home/index?id=${storeInfo.mer_id}&sale_type=${sale_type||1}`"
-                  hover-class="none" class="info">
-                  <view class="name line1">
-                    <text>{{storeInfo.merchant.mer_name ? storeInfo.merchant.mer_name : ''}}</text>
-                    <image v-if="margin_ico_switch==1 && margin_ico && storeInfo.merchant.is_margin == 10"
-                      :src="margin_ico" class="store-margin"></image>
-                    <!-- <text v-if="storeInfo.merchant.type_name" class="font-bg-red ml8 bt-color">{{storeInfo.merchant.type_name}}</text>
-										<text v-else-if="storeInfo.merchant.is_trader" class="font-bg-red ml8 bt-color">自营</text> -->
-                  </view>
-                  <!-- <view v-if="storeInfo.merchant.care_count" class="txt">
-                    {{storeInfo.merchant.care_count < 10000 ? storeInfo.merchant.care_count : (storeInfo.merchant.care_count/10000).toFixed(2)+'万'}}人关注
-                  </view>
-                  <view v-else class="txt">0人关注</view> -->
-                </navigator>
-                <navigator v-if="hide_mer_status != 1"
-                  :url="`/pages/store/home/index?id=${storeInfo.mer_id}&sale_type=${sale_type||1}`" class="link"
-                  hover-class="none">进店</navigator>
-              </view>
-              <view class="score-wrapper">
-                <view class="item">
-                  商品描述<text>{{storeInfo.merchant.product_score}}</text>
-                </view>
-                <view class="item">
-                  卖家服务<text>{{storeInfo.merchant.service_score}}</text>
-                </view>
-                <view class="item">
-                  物流服务<text>{{storeInfo.merchant.postage_score}}</text>
-                </view>
-              </view>
-            </view>
-            <view v-if="recommend && recommend.length > 0 && false" class="con-box">
-              <view class="acea-row row-between">
-                <view class="title">店铺推荐</view>
-                <navigator v-if="hide_mer_status!=1" class="moer-btn"
-                  :url="`/pages/store/home/index?id=${storeInfo.mer_id}&sale_type=${sale_type||1}`" hover-class="none">
-                  查看更多<text class='iconfont icon-jiantou'></text></navigator>
-              </view>
-              <view class="swiper page_swiper">
-                <swiper indicator-dots="true" :autoplay="false" :circular="circular" :interval="interval"
-                  :duration="duration" :current="swiperCur" style="750rpx;">
-                  <block v-for="(item,index) in recommend" :key="index">
-                    <swiper-item class="swiper-item">
-                      <view class="img-box">
-                        <view class="img-item" v-for="(itm,idx) in item" :key="idx" @click="goProDetail(itm)">
-                          <easy-loadimage mode="widthFix" :image-src="itm.image"></easy-loadimage>
-                          <view class="txt">
-                            <view class="title line1">{{itm.store_name}}</view>
-                            <view class="price">
-                              <text>￥</text>{{itm.price}}
-                            </view>
-                          </view>
-                        </view>
-                      </view>
-                    </swiper-item>
-                  </block>
-                </swiper>
-              </view>
-            </view>
-          </view>
-          <view class='product-intro' id="past3" style="background-color: #fff;">
-            <view class='conter' v-if="description">
-              <!-- #ifndef APP-PLUS -->
-              <jyf-parser v-if="description.type == 0" :domain='domain'
-                :html="description.content.replace(/<br\/>/ig, '')" ref="article" :tag-style="tagStyle"></jyf-parser>
-              <!-- #endif -->
-              <!-- #ifdef APP-PLUS -->
-              <view v-if="description.type == 0" class="description"
-                v-html="description.content.replace(/<br\/>/ig, '')"></view>
-              <!-- #endif -->
-              <view v-else class="product_content">
-                <view v-if="description.content && description.content.title" class="title">
-                  {{description.content.title}}</view>
-                <view v-if="description.content && description.content.image" class="pictures">
-                  <image mode="widthFix" style="width: 100%;" v-for="(item,index) in description.content.image"
-                    :key="index" :src="item"></image>
-                </view>
-              </view>
-            </view>
-            <!-- 价格说明 -->
-            <view v-if="priceRule.content" class="price-info">
-              <view class="price-title">{{priceRule.rule_name}}</view>
-              <!-- #ifndef APP-PLUS -->
-              <jyf-parser :domain='domain' :html="priceRule.content.replace(/<br\/>/ig, '')" ref="article"
-                :tag-style="tagStyle"></jyf-parser>
-              <!-- #endif -->
-              <!-- #ifdef APP-PLUS -->
-              <view class="description" v-html="priceRule.content.replace(/<br\/>/ig, '')"></view>
-              <!-- #endif -->
-            </view>
-          </view>
-          <view style='height:120rpx;'></view>
-        </scroll-view>
-      </view>
-      <view class='footer acea-row row-between-wrapper' :class="{'footpl':hide_mer_status==1}">
-        <navigator v-if="hide_mer_status !=1"
-          :url="`/pages/store/home/index?id=${storeInfo.mer_id}&sale_type=${sale_type||1}`" class='item skeleton-rect'>
-          <view class='iconfont icon-dianpu'></view>
-          <view>店铺</view>
-        </navigator>
-        <block v-if="storeInfo.merchant">
-          <view v-if="storeInfo.merchant.services_type== 0" class="item skeleton-rect" @click="goCustomer">
-            <view class="iconfont icon-kefu"></view>
-            <view>客服</view>
-          </view>
-          <view v-else class="item skeleton-rect" @click="call">
-            <view class="iconfont icon-kefu"></view>
-            <view>客服</view>
-          </view>
-        </block>
+							<navigator v-if="storeInfo.top_pid" hover-class='none'
+								:url="`/pages/activity/rank/index?cate_id=${storeInfo.top_pid}`" class='label'>
+								<view class="rank_list acea-row row-between-wrapper">
+									<view class="acea-row row-between-wrapper">
+										<text class="rank_title"></text>
+										<view>{{ storeInfo.top_name }} · 第{{ storeInfo.top_num }}名</view>
+									</view>
+									<text class="iconfont icon-xiala1"></text>
+								</view>
+							</navigator>
+							<view class='coupon acea-row row-between-wrapper skeleton-rect' @click='couponTap'
+								style="margin-top: 20rpx;" v-if="coupon.list.length > 0">
+								<view class='hide line1 acea-row'>
+									优惠券：
+									<view class='activity' v-for="(item,index) in coupon.list" :key="index">
+										满{{item.use_min_price}}减{{item.coupon_price}}</view>
+								</view>
+								<view class='iconfont icon-jiantou'></view>
+							</view>
+						</view>
+						<view class='wrapper' v-if="storeInfo.store_info" style="padding: 28rpx;">
+							<view style="padding-bottom: 20rpx;">基础信息</view>
+							<view style="white-space: pre-wrap;color: #666666;font-size: 26rpx;border-radius: 14rpx;">
+								{{storeInfo.store_info}}
+							</view>
+						</view>
 
-        <navigator open-type='switchTab' class="animated item skeleton-rect" :class="animated==true?'bounceIn':''"
-          url='/pages/order_addcart/order_addcart' hover-class="none">
-          <view class='iconfont icon-gouwuche1'>
-            <text v-if="CartCount>0" class='num'>{{CartCount || 0}}</text>
-          </view>
-          <view>购物车</view>
-        </navigator>
-        <view v-if="attr.productSelect.stock != 0" class='bnt acea-row skeleton-rect'>
-          <form @submit="joinCart" report-submit='true'>
-            <button v-if="storeInfo.type != 1&&storeInfo.type != 2&&!storeInfo.mer_form_id" class='joinCart bnts'
-              form-type="submit">加入购物车</button>
-          </form>
-          <form @submit="goBuy" report-submit='true' v-if="attr.productSelect">
-            <button class='buy bnts'
-              :class="(storeInfo.type == 1 || storeInfo.type == 2 || storeInfo.mer_form_id) ? 'virtual_buy' : ''"
-              form-type="submit" :disabled="attr.productSelect.stock == 0">立即购买</button>
-          </form>
-        </view>
-        <view v-else class='bnt acea-row skeleton-rect'>
-          <form report-submit='true'>
-            <button v-if="procudt_increase_status == 1" class='buy bnts sold_out' form-type="submit"
-              @click="arrivalNotice">到货通知</button>
-            <button v-else class='buy bnts sold_out' form-type="submit" disabled>商品已售罄</button>
-          </form>
-        </view>
-      </view>
-      <block v-if="sharePacket.max&&sharePacket.max>0 && false">
-        <shareRedPackets :sharePacket="sharePacket" @listenerActionSheet="listenerActionSheet"
-          @closeChange="closeChange" :showAnimate="showAnimate" @boxStatus="boxStatus"></shareRedPackets>
-      </block>
-      <!-- 组件 -->
-      <productWindow :attr="attr" :isShow='1' :iSplus='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr"
-        @ChangeCartNum="ChangeCartNum" @attrVal="attrVal" @iptCartNum="iptCartNum" id='product-window'
-        :payLimit="pay_limit" :maxCount="max_count" :minCount="min_count" :svipPrice="svipPrice"
-        :image="storeInfo.image"></productWindow>
-      <block v-if="coupon.coupon">
-        <couponListWindow :coupon='coupon' @ChangCouponsClose="ChangCouponsClose" @ChangCoupons="ChangCoupons"
-          @ChangCouponsUseState="ChangCouponsUseState"></couponListWindow>
-      </block>
-      <specs :specsInfo="specsInfo" @myevent="mySpecs"></specs>
-      <!-- 分享按钮 -->
-      <view class="generate-posters acea-row row-middle" :class="posters ? 'on' : ''">
-        <!-- #ifndef MP -->
-        <button class="item" :class="weixinStatus ? 'item3' : ''" hover-class='none' v-if="weixinStatus === true"
-          @click="H5ShareBox = true">
-          <view class="iconfont icon-weixin3"></view>
-          <view class="">发送给朋友</view>
-        </button>
-        <!-- #endif -->
-        <!-- #ifdef MP -->
-        <button class="item" :class="weixinStatus ? 'item3' : ''" open-type="share" hover-class='none'
-          @click="goFriend">
-          <view class="iconfont icon-weixin3"></view>
-          <view class="">发送给朋友</view>
-        </button>
-        <!-- #endif -->
-        <!-- #ifdef APP-PLUS -->
-        <view class="item" @click="appShare('WXSceneSession')">
-          <view class="iconfont icon-weixin3"></view>
-          <view class="">分享给好友</view>
-        </view>
-        <!-- #endif -->
-        <button class="item" :class="weixinStatus ? 'item3' : ''" hover-class='none' @click="goPoster">
-          <view class="iconfont icon-haibao"></view>
-          <view class="">生成海报</view>
-        </button>
-        <button class="item" :class="weixinStatus ? 'item3' : ''" hover-class='none' @click="copyPwd">
-          <view class="iconfont icon-fuzhikouling1"></view>
-          <view>生成口令</view>
-        </button>
-      </view>
-      <view class="mask" v-if="posters" @click="listenerActionClose"></view>
-      <view class="mask_transparent" v-if="currentPage" @touchmove="hideNav" @click="hideNav()"></view>
-      <!--口令复制结果-->
-      <copyPassword :isCopy='isCopy' :copyUrl='copyUrl' @close="closeCopy"></copyPassword>
-      <!-- 海报展示 -->
-      <view class='poster-pop' v-if="posterImageStatus">
-        <image src='../../static/images/poster-close.png' class='close' @click="posterImageClose"></image>
-        <image :src='posterImage'></image>
-        <!-- #ifndef H5  -->
-        <view class='save-poster' @click="savePosterPath">保存到手机</view>
-        <!-- #endif -->
-        <!-- #ifdef H5 -->
-        <view class="keep">长按图片可以保存到手机</view>
-        <!-- #endif -->
-      </view>
-      <view class='mask' v-if="posterImageStatus"></view>
-      <canvas class="canvas" canvas-id='myCanvas' v-if="canvasStatus"></canvas>
-      <!-- 发送给朋友图片 -->
-      <view class="share-box" v-if="H5ShareBox">
-        <image :src="`${domain}/static/images/share-info.png`" @click="H5ShareBox = false"></image>
-      </view>
-      <guaranteeTemplate ref="guartemplate" :guarantee='guarantee' :shipping='shipping'></guaranteeTemplate>
-      <!-- #ifndef H5 -->
-      <passwordPopup></passwordPopup>
-      <!-- #endif -->
-      <!--套餐产品弹窗-->
-      <discounts-goods ref="discounts" :id="id" :uid="uid"></discounts-goods>
-      <Authorize :isShowAuth="isShowAuth" :isGoIndex="false" @authColse="isShowAuth=false"></Authorize>
-    </view>
-  </view>
+						<view v-if="specsInfo.params && specsInfo.params.length>0"
+							class="attribute acea-row row-between-wrapper" @click="seeSpecs">
+							<view class="acea-row row-middle">
+								参数：
+								<view class="list line1">
+									<text class="item params" v-for="(item,index) in specsInfo.params" :key="index"
+										v-if="index<2">{{item.name}}</text>
+									<text>...</text>
+								</view>
+							</view>
+							<view class="iconfont icon-jiantou"></view>
+						</view>
+						<!--运费-->
+						<view v-if="shipping || shippingValue" class='attribute acea-row row-between-wrapper'
+							@click="showShip">
+							<view class="acea-row row-between-wrapper">运费：
+								<text class='atterTxt'>{{shippingValue}}</text>
+							</view>
+							<view class='iconfont icon-jiantou'></view>
+						</view>
+						<!--保障-->
+						<view v-if="guarantee && guarantee.length" class='attribute acea-row row-between-wrapper'
+							@click="showGuaranee">
+							<view class="acea-row row-between-wrapper">保障：
+								<view class="guaranteeAttr">
+									<text class='atterTxt1' :class="item.guarantee_name ? 'hasAttr' : ''"
+										v-for="(item,index) in guarantee">
+										{{item.guarantee_name ? item.guarantee_name : ''}}
+									</text>
+								</view>
+							</view>
+							<view class='iconfont icon-jiantou'></view>
+						</view>
+					</view>
+					<!--优惠套餐-->
+					<view class='combo' v-if="comboList && comboList.length>0">
+						<view class='title acea-row row-between-wrapper'>
+							<view>优惠套餐({{comboTotal}}) </view>
+							<view class='praise' @click="openCombo">
+								查看全部
+								<text class='iconfont icon-jiantou'></text>
+							</view>
+						</view>
+						<scroll-view scroll-x="true" style="white-space: nowrap; display: flex;height: 180rpx;"
+							show-scrollbar="false">
+							<view class="img-box">
+								<view class="combo_item" v-for="(item,index) in comboList" :key="index">
+									<view class="img-item" v-for="(itemn,indexn) in item.discountsProduct"
+										:key="indexn">
+										<image :src="itemn.image" mode="" @click="openCombo"></image>
+										<text v-if="indexn != item.count-1" class="iconfont icon-jiahao2"></text>
+									</view>
+									<view class="list_total">
+										<view class="list_num">共{{item.count}}件</view>
+										<view class="list_price p-color">省 ¥{{item.max_price}}</view>
+									</view>
+								</view>
+							</view>
+						</scroll-view>
+					</view>
+					<view class='userEvaluation' id="past1" v-if="replyCount && replyCount>0">
+						<view class='title acea-row row-between-wrapper skeleton-rect'>
+							<view>用户评价({{replyCount}})</view>
+							<navigator class='praise' hover-class='none'
+								:url='"/pages/users/goods_comment_list/index?product_id="+id'>
+								<text class='t-color'>{{replyChance}}</text>好评率
+								<text class='iconfont icon-jiantou'></text>
+							</navigator>
+						</view>
+						<block v-if="replyCount && replyCount>0">
+							<userEvaluation :reply="reply"></userEvaluation>
+						</block>
+					</view>
+					<!-- 种草秀 -->
+					<view class='userPlant' v-if="storeInfo.community && storeInfo.community.length>0">
+						<view class='title acea-row row-between-wrapper'>
+							<view>种草秀 </view>
+							<navigator class='praise' hover-class='none'
+								:url="'/pages/plantGrass/plant_show/index?spu_id='+storeInfo.spu_id">
+								查看全部
+								<text class='iconfont icon-jiantou'></text>
+							</navigator>
+						</view>
+						<view class="imgList acea-row">
+							<view class="pictrue" v-for="(item, index) in storeInfo.community" :key="index"
+								v-if="index<=2" @click="goPlant(item)">
+								<image :src="item.image[0]" class="image"></image>
+								<image v-if="item.is_type == 2" class="video_img" src="@/static/images/stop.png"
+									mode=""></image>
+							</view>
+						</view>
+					</view>
+					<!-- 商铺信息 -->
+					<view class="store-wrapper" v-if="storeInfo.merchant && hide_mer_status !=1">
+						<view class="store-hd skeleton-rect">
+							<view v-if="storeInfo.merchant&&hide_mer_status != 1" class="store-info">
+								<navigator
+									:url="`/pages/store/home/index?id=${storeInfo.mer_id}&sale_type=${sale_type||1}`"
+									hover-class="none" class="logo">
+									<image :src="storeInfo.merchant.mer_avatar" mode=""></image>
+								</navigator>
+								<navigator
+									:url="`/pages/store/home/index?id=${storeInfo.mer_id}&sale_type=${sale_type||1}`"
+									hover-class="none" class="info">
+									<view class="name line1">
+										<text class="line1"
+											style="max-width:450rpx;">{{storeInfo.merchant.mer_name ? storeInfo.merchant.mer_name : ''}}</text>
+										<image
+											v-if="margin_ico_switch==1 && margin_ico && storeInfo.merchant.is_margin == 10"
+											:src="margin_ico" class="store-margin"></image>
+									</view>
+								</navigator>
+								<navigator v-if="hide_mer_status != 1"
+									:url="`/pages/store/home/index?id=${storeInfo.mer_id}&sale_type=${sale_type||1}`"
+									class="link" hover-class="none">进店</navigator>
+							</view>
+							<view class="score-wrapper">
+								<view class="item">
+									商品描述<text>{{storeInfo.merchant.product_score}}</text>
+								</view>
+								<view class="item">
+									卖家服务<text>{{storeInfo.merchant.service_score}}</text>
+								</view>
+								<view class="item">
+									物流服务<text>{{storeInfo.merchant.postage_score}}</text>
+								</view>
+							</view>
+						</view>
+						<view v-if="recommend && recommend.length > 0 && false" class="con-box">
+							<view class="acea-row row-between">
+								<view class="title">店铺推荐</view>
+								<navigator v-if="hide_mer_status!=1" class="moer-btn"
+									:url="`/pages/store/home/index?id=${storeInfo.mer_id}&sale_type=${sale_type||1}`"
+									hover-class="none">
+									查看更多<text class='iconfont icon-jiantou'></text></navigator>
+							</view>
+							<view class="swiper page_swiper">
+								<swiper indicator-dots="true" :autoplay="false" :circular="circular"
+									:interval="interval" :duration="duration" :current="swiperCur" style="750rpx;">
+									<block v-for="(item,index) in recommend" :key="index">
+										<swiper-item class="swiper-item">
+											<view class="img-box">
+												<view class="img-item" v-for="(itm,idx) in item" :key="idx"
+													@click="goProDetail(itm)">
+													<easy-loadimage mode="widthFix"
+														:image-src="itm.image"></easy-loadimage>
+													<view class="txt">
+														<view class="title line1">{{itm.store_name}}</view>
+														<view class="price">
+															<text>￥</text>{{itm.price}}
+														</view>
+													</view>
+												</view>
+											</view>
+										</swiper-item>
+									</block>
+								</swiper>
+							</view>
+						</view>
+					</view>
+					<view class='product-intro' id="past3" style="background-color: #fff;">
+
+						<view class='conter' v-if="description">
+							<!-- #ifndef APP-PLUS -->
+							<jyf-parser v-if="description.type == 0" :domain='domain'
+								:html="description.content.replace(/<br\/>/ig, '')" ref="article"
+								:tag-style="tagStyle"></jyf-parser>
+							<!-- #endif -->
+							<!-- #ifdef APP-PLUS -->
+							<view v-if="description.type == 0" class="description"
+								v-html="description.content.replace(/<br\/>/ig, '')"></view>
+							<!-- #endif -->
+							<view v-else class="product_content">
+								<view v-if="description.content && description.content.title" class="title">
+									{{description.content.title}}
+								</view>
+								<view v-if="description.content && description.content.image" class="pictures">
+									<view class="" v-for="(item,index) in description.content.image" :key="index">
+										<view style="position: relative;"
+											v-if='videoTypeList.includes(getSuffix(item))' @click="navGoPlay(item)">
+											<!-- #ifdef APP-PLUS -->
+											<image :src="item+coverUrl" mode="widthFix"
+												style="background-color: #fff;width: 100vw;" />
+											<!-- <image class="image-play-icon" src="/static/images/stop.png"> -->
+											<u--image class="image-play-icon" src="/static/images/stop.png" width="100rpx" height="100rpx" ></u--image>
+											</image>
+											<!-- #endif -->
+											<!-- #ifndef APP-PLUS -->
+											<video :src="item" objectFit="cover" controls style="width:750rpx;"
+												show-center-play-btn show-mute-btn="true" auto-pause-if-navigate
+												:enable-progress-gesture="false"></video>
+											<!-- #endif -->
+										</view>
+										<image v-else :src="item" mode="widthFix"
+											style="background-color: #fff;width: 100vw;">
+										</image>
+									</view>
+								</view>
+							</view>
+						</view>
+						<!-- 价格说明 -->
+						<view v-if="priceRule.content" class="price-info">
+							<view class="price-title">{{priceRule.rule_name}}</view>
+							<!-- #ifndef APP-PLUS -->
+							<jyf-parser :domain='domain' :html="priceRule.content.replace(/<br\/>/ig, '')" ref="article"
+								:tag-style="tagStyle"></jyf-parser>
+							<!-- #endif -->
+							<!-- #ifdef APP-PLUS -->
+							<view class="description" v-html="priceRule.content.replace(/<br\/>/ig, '')"></view>
+							<!-- #endif -->
+						</view>
+					</view>
+					<view style='height:120rpx;'></view>
+				</scroll-view>
+			</view>
+			<view class='footer acea-row row-between-wrapper' :class="{'footpl':hide_mer_status==1}">
+				<navigator v-if="hide_mer_status !=1"
+					:url="`/pages/store/home/index?id=${storeInfo.mer_id}&sale_type=${sale_type||1}`"
+					class='item skeleton-rect'>
+					<view class='iconfont icon-dianpu'></view>
+					<view>店铺</view>
+				</navigator>
+				<block v-if="storeInfo.merchant">
+					<view v-if="storeInfo.merchant.services_type== 0" class="item skeleton-rect" @click="goCustomer">
+						<view class="iconfont icon-kefu"></view>
+						<view>客服</view>
+					</view>
+					<view v-else class="item skeleton-rect" @click="call">
+						<view class="iconfont icon-kefu"></view>
+						<view>客服</view>
+					</view>
+				</block>
+
+				<navigator open-type='switchTab' class="animated item skeleton-rect"
+					:class="animated==true?'bounceIn':''" url='/pages/order_addcart/order_addcart' hover-class="none">
+					<view class='iconfont icon-gouwuche1'>
+						<text v-if="CartCount>0" class='num'>{{CartCount || 0}}</text>
+					</view>
+					<view>购物车</view>
+				</navigator>
+				<view v-if="attr.productSelect.stock != 0" class='bnt acea-row skeleton-rect'>
+					<form @submit="joinCart" report-submit='true'>
+						<button v-if="storeInfo.type != 1&&storeInfo.type != 2&&!storeInfo.mer_form_id"
+							class='joinCart bnts' form-type="submit">加入购物车</button>
+					</form>
+					<form @submit="goBuy" report-submit='true' v-if="attr.productSelect">
+						<button class='buy bnts'
+							:class="(storeInfo.type == 1 || storeInfo.type == 2 || storeInfo.mer_form_id) ? 'virtual_buy' : ''"
+							form-type="submit" :disabled="attr.productSelect.stock == 0">立即购买</button>
+					</form>
+				</view>
+				<view v-else class='bnt acea-row skeleton-rect'>
+					<form report-submit='true'>
+						<button v-if="procudt_increase_status == 1" class='buy bnts sold_out' form-type="submit"
+							@click="arrivalNotice">到货通知</button>
+						<button v-else class='buy bnts sold_out' form-type="submit" disabled>商品已售罄</button>
+					</form>
+				</view>
+			</view>
+			<block v-if="sharePacket.max&&sharePacket.max>0 && false">
+				<shareRedPackets :sharePacket="sharePacket" @listenerActionSheet="listenerActionSheet"
+					@closeChange="closeChange" :showAnimate="showAnimate" @boxStatus="boxStatus"></shareRedPackets>
+			</block>
+			<!-- 组件 -->
+			<productWindow :attr="attr" :isShow='1' :iSplus='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr"
+				@ChangeCartNum="ChangeCartNum" @attrVal="attrVal" @iptCartNum="iptCartNum" id='product-window'
+				:payLimit="pay_limit" :maxCount="max_count" :minCount="min_count" :svipPrice="svipPrice"
+				:image="storeInfo.image"></productWindow>
+			<block v-if="coupon.coupon">
+				<couponListWindow :coupon='coupon' @ChangCouponsClose="ChangCouponsClose" @ChangCoupons="ChangCoupons"
+					@ChangCouponsUseState="ChangCouponsUseState"></couponListWindow>
+			</block>
+			<specs :specsInfo="specsInfo" @myevent="mySpecs"></specs>
+			<!-- 分享按钮 -->
+			<view class="generate-posters acea-row row-middle" :class="posters ? 'on' : ''">
+				<!-- #ifndef MP -->
+				<button class="item" :class="weixinStatus ? 'item3' : ''" hover-class='none'
+					v-if="weixinStatus === true" @click="H5ShareBox = true">
+					<view class="iconfont icon-weixin3"></view>
+					<view class="">发送给朋友</view>
+				</button>
+				<!-- #endif -->
+				<!-- #ifdef MP -->
+				<button class="item" :class="weixinStatus ? 'item3' : ''" open-type="share" hover-class='none'
+					@click="goFriend">
+					<view class="iconfont icon-weixin3"></view>
+					<view class="">发送给朋友</view>
+				</button>
+				<!-- #endif -->
+				<!-- #ifdef APP-PLUS -->
+				<view class="item" @click="appShare('WXSceneSession')">
+					<view class="iconfont icon-weixin3"></view>
+					<view class="">分享给好友</view>
+				</view>
+				<!-- #endif -->
+				<button class="item" :class="weixinStatus ? 'item3' : ''" hover-class='none' @click="goPoster">
+					<view class="iconfont icon-haibao"></view>
+					<view class="">生成海报</view>
+				</button>
+				<button class="item" :class="weixinStatus ? 'item3' : ''" hover-class='none' @click="copyPwd">
+					<view class="iconfont icon-fuzhikouling1"></view>
+					<view>生成口令</view>
+				</button>
+			</view>
+			<view class="mask" v-if="posters" @click="listenerActionClose"></view>
+			<view class="mask_transparent" v-if="currentPage" @touchmove="hideNav" @click="hideNav()"></view>
+			<!--口令复制结果-->
+			<copyPassword :isCopy='isCopy' :copyUrl='copyUrl' @close="closeCopy"></copyPassword>
+			<!-- 海报展示 -->
+			<view class='poster-pop' v-if="posterImageStatus">
+				<image src='../../static/images/poster-close.png' class='close' @click="posterImageClose"></image>
+				<image :src='posterImage'></image>
+				<!-- #ifndef H5  -->
+				<view class='save-poster' @click="savePosterPath">保存到手机</view>
+				<!-- #endif -->
+				<!-- #ifdef H5 -->
+				<view class="keep">长按图片可以保存到手机</view>
+				<!-- #endif -->
+			</view>
+			<view class='mask' v-if="posterImageStatus"></view>
+			<canvas class="canvas" canvas-id='myCanvas' v-if="canvasStatus"></canvas>
+			<!-- 发送给朋友图片 -->
+			<view class="share-box" v-if="H5ShareBox">
+				<image :src="`${domain}/static/images/share-info.png`" @click="H5ShareBox = false"></image>
+			</view>
+			<guaranteeTemplate ref="guartemplate" :guarantee='guarantee' :shipping='shipping'></guaranteeTemplate>
+			<!-- #ifndef H5 -->
+			<passwordPopup></passwordPopup>
+			<!-- #endif -->
+			<!--套餐产品弹窗-->
+			<discounts-goods ref="discounts" :id="id" :uid="uid"></discounts-goods>
+			<Authorize :isShowAuth="isShowAuth" :isGoIndex="false" @authColse="isShowAuth=false"></Authorize>
+		</view>
+	</view>
 </template>
 
 <script>
-  // +----------------------------------------------------------------------
-  // | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
-  // +----------------------------------------------------------------------
-  // | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved.
-  // +----------------------------------------------------------------------
-  // | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
-  // +----------------------------------------------------------------------
-  // | Author: CRMEB Team <admin@crmeb.com>
-  // +----------------------------------------------------------------------
-  var sysHeight = uni.getSystemInfoSync().statusBarHeight;
-  import { arrivalSubscribe } from '@/utils/SubscribeMessage.js';
-  import {
-    getProductDetail,
-    getProductParmas,
-    getProductCode,
-    collectAdd,
-    collectDel,
-    postCartAdd,
-    arrivalNoticeApi,
-    copyPasswordApi,
-    getDiscountsLst,
-    priceRuleApi
-  } from '@/api/store.js';
-  import { getOrderConfirm } from '@/api/order.js';
-  import { getUserInfo, imgToBase } from '@/api/user.js';
-  import { getCoupons, getShopCoupons } from '@/api/api.js';
-  import { getCartCounts } from '@/api/order.js';
-  import { mapGetters } from "vuex";
-  import { configMap } from "@/utils";
-  import { imageBase64 } from "@/api/public";
-  import productConSwiper from '@/components/productConSwiper';
-  import couponListWindow from '@/components/couponListWindow';
-  import copyPassword from '@/components/copyPassword';
-  import productWindow from '@/components/productWindow';
-  import userEvaluation from '@/components/userEvaluation';
-  import shareRedPackets from '@/components/shareRedPackets';
-  import specs from '@/components/specs/index.vue';
-  import { toLogin } from '@/libs/login.js';
-  // #ifndef H5
-  import passwordPopup from '@/components/passwordPopup';
-  // #endif
-  import { HTTP_REQUEST_URL } from '@/config/app';
-  import home from '@/components/home';
-  import { silenceBindingSpread } from "@/utils";
-  import parser from "@/components/jyf-parser/jyf-parser";
-  import history from "@/mixins/history";
-  import shareScence from "@/libs/spread";
-  import guaranteeTemplate from '@/components/freightGuarantee';
-  import discountsGoods from './discountsGoods';
-  import ClipboardJS from "@/plugin/clipboard/clipboard.js";
-  import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue';
-  let app = getApp();
-  export default {
-    components: {
-      // #ifndef H5
-      passwordPopup,
-      // #endif
-      productConSwiper,
-      couponListWindow,
-      productWindow,
-      userEvaluation,
-      shareRedPackets,
-      home,
-      guaranteeTemplate,
-      copyPassword,
-      discountsGoods,
-      "jyf-parser": parser,
-      easyLoadimage,
-      specs,
-    },
-    mixins: [history],
-    data() {
-      let that = this;
-      return {
-        isNodes: 0, //控制什么时候开始抓取元素节点,只要数值改变就重新抓取
-        sysHeight: sysHeight, //系统导航条高度
-        //属性是否打开
-        coupon: {
-          'coupon': false,
-          list: [],
-        },
-        attrTxt: '选择', //属性页面提示
-        attrValue: '', //已选属性
-        animated: false, //购物车动画
-        id: 0, //商品id
-        replyCount: 0, //总评论数量
-        reply: [], //评论列表
-        storeInfo: {
-          merchant: {}
-        }, //商品详情
-        productValue: [], //系统属性
-        couponList: [], //优惠券
-        cart_num: 1, //购买数量
-        isOpen: false, //是否打开属性组件
-        actionSheetHidden: true,
-        posterImageStatus: false,
-        storeImage: '', //海报产品图
-        PromotionCode: '', //二维码图片
-        canvasStatus: false, //海报绘图标签
-        posterImage: '', //海报路径
-        posterbackgd: '/static/images/posterbackgd.png',
-        source: '',
-        sharePacket: {
-          isState: true, //默认不显示
-        }, //分销商详细
-        // uid: 0, //用户uid
-        circular: false,
-        autoplay: false,
-        interval: 3000,
-        duration: 500,
-        swiperCur: 0,
-        clientHeight: "",
-        systemStore: {}, //门店信息
-        replyChance: 0,
-        CartCount: 0,
-        isDown: true,
-        storeSelfMention: true,
-        posters: false,
-        weixinStatus: false,
-        attr: {
-          cartAttr: false,
-          productAttr: [],
-          productSelect: {}
-        },
-        description: '',
-        navActive: 0,
-        H5ShareBox: false, //公众号分享图片
-        activity: [],
-        retunTop: true, //顶部返回
-        navH: "",
-        navList: [],
-        opacity: 0,
-        scrollY: 0,
-        topArr: [],
-        toView: '',
-        height: 0,
-        heightArr: [],
-        lock: false,
-        scrollTop: 0,
-        tagStyle: {
-          img: 'width:100%;display:block;'
-        },
-        // 动画状态
-        showAnimate: true,
-        domain: HTTP_REQUEST_URL,
-        currSpid: '',
-        codeImg: "",
-        videoCoverImg: "",
-        shipping: "",
-        guarantee: [],
-        shippingValue: "",
-        uniqueValue: "",
-        priceRule: "",
-        isCopy: false,
-        copyUrl: '',
-        comboTotal: 0,
-        comboList: [],
-        max_count: 0,
-        min_count: 0,
-        pay_limit: 1,
-        svipData: {},
-        svipPrice: false,
-        specsInfo: {
-          show: false,
-          params: []
-        },
-        recommend: [],
-        serviceInfo: {},
-        currentPage: false,
-        homeTop: 59,
-        sale_type: 1, //1-普通商品, 2-批发商品
-        isShowAuth: false,
-        selectNavList: [{
-            name: '首页',
-            icon: 'icon-shouye8',
-            url: '/pages/index/index',
-            after: 'dialog_after'
-          },
-          {
-            name: '搜索',
-            icon: 'icon-sousuo6',
-            url: '/pages/columnGoods/goods_search_con/index',
-            after: 'dialog_after'
-          },
-          {
-            name: '购物车',
-            icon: 'icon-gouwuche7',
-            url: '/pages/order_addcart/order_addcart',
-            after: 'dialog_after'
-          },
-          {
-            name: '我的收藏',
-            icon: 'icon-shoucang3',
-            url: '/pages/users/user_goods_collection/index',
-            after: 'dialog_after'
-          },
-          {
-            name: '个人中心',
-            icon: 'icon-gerenzhongxin1',
-            url: '/pages/user/index'
-          },
-        ],
-      };
-    },
-    computed: {
-      ...configMap(['margin_ico_switch', 'margin_ico', 'hide_mer_status', 'procudt_increase_status', 'site_name',
-        'share_pic'
-      ], mapGetters(['isLogin', 'uid', 'viewColor'])),
-      showPriceTabs(){
-        if(this.storeInfo&&this.storeInfo.sku) return Object.keys(this.storeInfo.sku).length > 1;
-        else return false;
-      },
-    },
-    onLoad(options) {
-      let that = this
-      if (options.spid) {
-        app.globalData.spid = options.spid;
-        that.currSpid = options.spid
-      }
-      this.sale_type = options.sale_type || 1;
-      uni.setStorageSync('tabbar_sale_type', this.sale_type);
-      var pages = getCurrentPages();
-      let curPage = pages[pages.length - 1];
-      if (pages.length <= 1) {
-        that.retunTop = false
-      }
-      let curParam = curPage.options || curPage.$route.query;
-      that.source = curParam.source;
-      that.navH = app.globalData.navHeight + 10;
-      //页面中需要计算的一些值
-      // #ifdef APP-PLUS
-      that.homeTop = (that.sysHeight + 8) * 2;
-      // #endif
-      // #ifdef H5
-      that.homeTop = 10;
-      // #endif
-      that.id = options.id;
-      uni.getSystemInfo({
-        success: function(res) {
-          that.height = res.windowHeight
-          //res.windowHeight:获取整个窗口高度为px，*2为rpx；98为头部占据的高度；
-          that.navHeight = res.statusBarHeight * (750 / res.windowWidth) + 91;
-        },
-      });
-      //扫码携带参数处理
-      // #ifdef MP
-      if (options.scene) {
-        let value = this.$util.getUrlParams(decodeURIComponent(options.scene));
-        if (value.id) options.id = value.id;
-        //记录推广人uid
-        if (value.spid) {
-          app.globalData.spid = value.spid;
-          that.currSpid = value.spid
-        }
-      }
-      if (!options.id && !options.scene) {
-        return this.$util.Tips({
-          title: '缺少参数无法查看商品'
-        }, {
-          tab: 3,
-          url: 1
-        });
-      } else {
-        this.id = options.id
-      }
-      //记录推广人uid
-      if (options.spid) app.globalData.spid = options.spid;
-      // #endif
-      shareScence(that.currSpid, that.isLogin)
-      this.getGoodsDetails();
-      this.getDiscountsData();
-      //#ifdef H5
-      this.isLogin && silenceBindingSpread();
-      //#endif
-      if (this.isLogin) {
-        this.downloadFilePromotionCode();
-        this.getHistory()
-      }
-    },
-    onReady() {
-      this.isNodes++;
-      this.$nextTick(function() {
-        // #ifdef MP
-        const menuButton = uni.getMenuButtonBoundingClientRect();
-        const query = uni.createSelectorQuery().in(this);
-        query
-          .select('#home')
-          .boundingClientRect(data => {
-            this.homeTop = menuButton.top * 2 + menuButton.height - data.height;
-          })
-          .exec();
-        // #endif
-      });
-    },
-    onShow() {
-      let that = this
-      // that.getConfig();
-      uni.hideLoading();
-    },
-    /**
-     * 用户点击右上角分享
-     */
-    // #ifdef MP
-    onShareAppMessage: function() {
-      let that = this;
-      that.$set(that, 'actionSheetHidden', !that.actionSheetHidden);
-      return {
-        title: that.storeInfo.store_name || '',
-        imageUrl: that.storeInfo.image || '',
-        path: '/pages/goods_details/index?id=' + that.id + '&spid=' + that.uid,
-      }
-    },
-    onShareTimeline: function() {
-      let that = this;
-      that.$set(that, 'actionSheetHidden', !that.actionSheetHidden);
-      return {
-        title: that.storeInfo.store_name || '',
-        query: {
-          id: that.id,
-          spid: that.uid
-        },
-        imageUrl: that.storeInfo.image || ''
-      }
-    },
-    // #endif
-    methods: {
-      call: function() {
-        let that = this;
-        if (that.storeInfo.merchant.service_phone) {
-          uni.showModal({
-            title: '提示',
-            content: '暂无在线客服，确定拨打客服电话:' + that.storeInfo.merchant.service_phone + '吗？',
-            success: function(res) {
-              if (res.confirm) {
-                uni.makePhoneCall({
-                  // 手机号
-                  phoneNumber: that.storeInfo.merchant.service_phone,
-                  // 成功回调
-                  success: (res) => {},
-                  // 失败回调
-                  fail: (res) => {}
-                });
-              }
-            }
-          })
-        } else {
-          return that.$util.Tips({
-            title: '暂无可用客服'
-          })
-        }
-      },
-      getConfig() {
-        let self = this
-        // 获取配置
-        getconfig().then(res => {
+	// +----------------------------------------------------------------------
+	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+	// +----------------------------------------------------------------------
+	// | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved.
+	// +----------------------------------------------------------------------
+	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+	// +----------------------------------------------------------------------
+	// | Author: CRMEB Team <admin@crmeb.com>
+	// +----------------------------------------------------------------------
+	var sysHeight = uni.getSystemInfoSync().statusBarHeight;
+	import {
+		arrivalSubscribe
+	} from '@/utils/SubscribeMessage.js';
+	import {
+		getProductDetail,
+		getProductParmas,
+		getProductCode,
+		collectAdd,
+		collectDel,
+		postCartAdd,
+		arrivalNoticeApi,
+		copyPasswordApi,
+		getDiscountsLst,
+		priceRuleApi
+	} from '@/api/store.js';
+	import {
+		getOrderConfirm
+	} from '@/api/order.js';
+	import {
+		getUserInfo,
+		imgToBase
+	} from '@/api/user.js';
+	import {
+		getCoupons,
+		getShopCoupons
+	} from '@/api/api.js';
+	import {
+		getCartCounts
+	} from '@/api/order.js';
+	import {
+		mapGetters
+	} from "vuex";
+	import {
+		configMap
+	} from "@/utils";
+	import {
+		imageBase64
+	} from "@/api/public";
+	import productConSwiper from '@/components/productConSwiper';
+	import couponListWindow from '@/components/couponListWindow';
+	import copyPassword from '@/components/copyPassword';
+	import productWindow from '@/components/productWindow';
+	import userEvaluation from '@/components/userEvaluation';
+	import shareRedPackets from '@/components/shareRedPackets';
+	import specs from '@/components/specs/index.vue';
+	import {
+		toLogin
+	} from '@/libs/login.js';
+	// #ifndef H5
+	import passwordPopup from '@/components/passwordPopup';
+	// #endif
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app';
+	import home from '@/components/home';
+	import {
+		silenceBindingSpread
+	} from "@/utils";
+	import parser from "@/components/jyf-parser/jyf-parser";
+	import history from "@/mixins/history";
+	import shareScence from "@/libs/spread";
+	import guaranteeTemplate from '@/components/freightGuarantee';
+	import discountsGoods from './discountsGoods';
+	import ClipboardJS from "@/plugin/clipboard/clipboard.js";
+	import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue';
+	let app = getApp();
+	export default {
+		components: {
+			// #ifndef H5
+			passwordPopup,
+			// #endif
+			productConSwiper,
+			couponListWindow,
+			productWindow,
+			userEvaluation,
+			shareRedPackets,
+			home,
+			guaranteeTemplate,
+			copyPassword,
+			discountsGoods,
+			"jyf-parser": parser,
+			easyLoadimage,
+			specs,
+		},
+		mixins: [history],
+		data() {
+			let that = this;
+			return {
+				videoTypeList: ['mp4', 'avi', 'mov', 'wmv', 'mkv', 'flv', 'mpeg', '3gp', 'webm'],
+				coverUrl: '?spm=a2c4e.11153940.blogcont573781.6.c1032027sQ46VG&x-oss-process=video/snapshot,t_1000,m_fast',
+				isNodes: 0, //控制什么时候开始抓取元素节点,只要数值改变就重新抓取
+				sysHeight: sysHeight, //系统导航条高度
+				//属性是否打开
+				coupon: {
+					'coupon': false,
+					list: [],
+				},
+				attrTxt: '选择', //属性页面提示
+				attrValue: '', //已选属性
+				animated: false, //购物车动画
+				id: 0, //商品id
+				replyCount: 0, //总评论数量
+				reply: [], //评论列表
+				storeInfo: {
+					merchant: {}
+				}, //商品详情
+				productValue: [], //系统属性
+				couponList: [], //优惠券
+				cart_num: 1, //购买数量
+				isOpen: false, //是否打开属性组件
+				actionSheetHidden: true,
+				posterImageStatus: false,
+				storeImage: '', //海报产品图
+				PromotionCode: '', //二维码图片
+				canvasStatus: false, //海报绘图标签
+				posterImage: '', //海报路径
+				posterbackgd: '/static/images/posterbackgd.png',
+				source: '',
+				sharePacket: {
+					isState: true, //默认不显示
+				}, //分销商详细
+				// uid: 0, //用户uid
+				circular: false,
+				autoplay: false,
+				interval: 3000,
+				duration: 500,
+				swiperCur: 0,
+				clientHeight: "",
+				systemStore: {}, //门店信息
+				replyChance: 0,
+				CartCount: 0,
+				isDown: true,
+				storeSelfMention: true,
+				posters: false,
+				weixinStatus: false,
+				attr: {
+					cartAttr: false,
+					productAttr: [],
+					productSelect: {}
+				},
+				description: '',
+				navActive: 0,
+				H5ShareBox: false, //公众号分享图片
+				activity: [],
+				retunTop: true, //顶部返回
+				navH: "",
+				navList: [],
+				opacity: 0,
+				scrollY: 0,
+				topArr: [],
+				toView: '',
+				height: 0,
+				heightArr: [],
+				lock: false,
+				scrollTop: 0,
+				tagStyle: {
+					img: 'width:100%;display:block;'
+				},
+				// 动画状态
+				showAnimate: true,
+				domain: HTTP_REQUEST_URL,
+				currSpid: '',
+				codeImg: "",
+				videoCoverImg: "",
+				shipping: "",
+				guarantee: [],
+				shippingValue: "",
+				uniqueValue: "",
+				priceRule: "",
+				isCopy: false,
+				copyUrl: '',
+				comboTotal: 0,
+				comboList: [],
+				max_count: 0,
+				min_count: 0,
+				pay_limit: 1,
+				svipData: {},
+				svipPrice: false,
+				specsInfo: {
+					show: false,
+					params: []
+				},
+				recommend: [],
+				serviceInfo: {},
+				currentPage: false,
+				homeTop: 59,
+				sale_type: 1, //1-普通商品, 2-批发商品
+				isShowAuth: false,
+				selectNavList: [{
+						name: '首页',
+						icon: 'icon-shouye8',
+						url: '/pages/index/index',
+						after: 'dialog_after'
+					},
+					{
+						name: '搜索',
+						icon: 'icon-sousuo6',
+						url: '/pages/columnGoods/goods_search_con/index',
+						after: 'dialog_after'
+					},
+					{
+						name: '购物车',
+						icon: 'icon-gouwuche7',
+						url: '/pages/order_addcart/order_addcart',
+						after: 'dialog_after'
+					},
+					{
+						name: '我的收藏',
+						icon: 'icon-shoucang3',
+						url: '/pages/users/user_goods_collection/index',
+						after: 'dialog_after'
+					},
+					{
+						name: '个人中心',
+						icon: 'icon-gerenzhongxin1',
+						url: '/pages/user/index'
+					},
+				],
+			};
+		},
+		computed: {
+			...configMap(['margin_ico_switch', 'margin_ico', 'hide_mer_status', 'procudt_increase_status', 'site_name',
+				'share_pic'
+			], mapGetters(['isLogin', 'uid', 'viewColor'])),
+			showPriceTabs() {
+				if (this.storeInfo && this.storeInfo.sku) return Object.keys(this.storeInfo.sku).length > 1;
+				else return false;
+			},
+		},
+		onLoad(options) {
+			console.log(options)
+			let that = this
+			if (options.spid) {
+				app.globalData.spid = options.spid;
+				that.currSpid = options.spid
+			}
+			this.sale_type = options.sale_type || 1;
+			uni.setStorageSync('tabbar_sale_type', this.sale_type);
+			var pages = getCurrentPages();
+			let curPage = pages[pages.length - 1];
+			if (pages.length <= 1) {
+				that.retunTop = false
+			}
+			let curParam = curPage.options || curPage.$route.query;
+			that.source = curParam.source;
+			that.navH = app.globalData.navHeight + 10;
+			//页面中需要计算的一些值
+			// #ifdef APP-PLUS
+			that.homeTop = (that.sysHeight + 8) * 2;
+			// #endif
+			// #ifdef H5
+			that.homeTop = 10;
+			// #endif
+			that.id = options.id;
+			uni.getSystemInfo({
+				success: function(res) {
+					that.height = res.windowHeight
+					//res.windowHeight:获取整个窗口高度为px，*2为rpx；98为头部占据的高度；
+					that.navHeight = res.statusBarHeight * (750 / res.windowWidth) + 91;
+				},
+			});
+			//扫码携带参数处理
+			// #ifdef MP
+			if (options.scene) {
+				let value = this.$util.getUrlParams(decodeURIComponent(options.scene));
+				if (value.id) options.id = value.id;
+				//记录推广人uid
+				if (value.spid) {
+					app.globalData.spid = value.spid;
+					that.currSpid = value.spid
+				}
+			}
+			if (!options.id && !options.scene) {
+				return this.$util.Tips({
+					title: '缺少参数无法查看商品'
+				}, {
+					tab: 3,
+					url: 1
+				});
+			} else {
+				this.id = options.id
+			}
+			//记录推广人uid
+			if (options.spid) app.globalData.spid = options.spid;
+			// #endif
+			shareScence(that.currSpid, that.isLogin)
+			this.getGoodsDetails();
+			this.getDiscountsData();
+			//#ifdef H5
+			this.isLogin && silenceBindingSpread();
+			//#endif
+			if (this.isLogin) {
+				this.downloadFilePromotionCode();
+				this.getHistory()
+			}
+		},
+		onReady() {
+			this.isNodes++;
+			this.$nextTick(function() {
+				// #ifdef MP
+				const menuButton = uni.getMenuButtonBoundingClientRect();
+				const query = uni.createSelectorQuery().in(this);
+				query
+					.select('#home')
+					.boundingClientRect(data => {
+						this.homeTop = menuButton.top * 2 + menuButton.height - data.height;
+					})
+					.exec();
+				// #endif
+			});
+		},
+		onShow() {
+			let that = this
+			// that.getConfig();
+			uni.hideLoading();
+		},
+		/**
+		 * 用户点击右上角分享
+		 */
+		// #ifdef MP
+		onShareAppMessage: function() {
+			let that = this;
+			that.$set(that, 'actionSheetHidden', !that.actionSheetHidden);
+			return {
+				title: that.storeInfo.store_name || '',
+				imageUrl: that.storeInfo.image || '',
+				path: '/pages/goods_details/index?id=' + that.id + '&spid=' + that.uid,
+			}
+		},
+		onShareTimeline: function() {
+			let that = this;
+			that.$set(that, 'actionSheetHidden', !that.actionSheetHidden);
+			return {
+				title: that.storeInfo.store_name || '',
+				query: {
+					id: that.id,
+					spid: that.uid
+				},
+				imageUrl: that.storeInfo.image || ''
+			}
+		},
+		// #endif
+		methods: {
+			navGoPlay(url) {
+				uni.navigateTo({
+					url: `/pages/goods_details/videoPlay?url=${url}`
+				})
 
-        }).catch(err => {})
-      },
-      /**到货通知*/
-      arrivalNotice() {
-        let that = this;
-        // #ifdef MP
-        arrivalSubscribe().then((res) => {
-          that.arrivalNoticeFun();
-        }).catch(err => {
-          console.log(err)
-        });
-        // #endif
-        // #ifndef MP
-        that.arrivalNoticeFun();
-        // #endif
-      },
-      arrivalNoticeFun() {
-        let that = this;
-        let uniqueValue = that.uniqueValue;
-        let typeValue = 0;
-        // #ifdef MP
-        typeValue = 3
-        // #endif
-        // #ifdef H5
-        if (this.$wechat.isWeixin() === true) {
-          typeValue = 2
-        } else {
-          typeValue = 1
-        }
-        // #endif
-        arrivalNoticeApi({ unique: uniqueValue, type: typeValue, product_id: that.id }).then(res => {
-          return that.$util.Tips({
-            title: res.message
-          })
-        }).catch(err => {
-          //状态异常返回上级页面
-          return that.$util.Tips({
-            title: err
-          })
-        })
-      },
-      goProDetail(item) {
-        uni.redirectTo({
-          url: '/pages/goods_details/index?id=' + item.product_id
-        })
-      },
-      //下拉导航页面跳转
-      linkPage(url) {
-        if (['/pages/index/index', '/pages/order_addcart/order_addcart',
-            '/pages/user/index', '/pages/plant_grass/index'
-          ].indexOf(url) > -1) {
-          uni.switchTab({
-            url
-          })
-        } else {
-          uni.navigateTo({
-            url
-          })
-        }
-        this.currentPage = false
-      },
-      boxStatus(data) {
-        this.showAnimate = data
-      },
-      closeChange: function() {
-        this.$set(this.sharePacket, 'isState', true);
-      },
-      showNav() {
-        this.currentPage = !this.currentPage;
-      },
-      hideNav() {
-        this.currentPage = false;
-      },
-      /**查看运费说明*/
-      showShip: function() {
-        this.$refs.guartemplate.showShippingTel();
-      },
-      /**查看服务保障*/
-      showGuaranee: function() {
-        this.$refs.guartemplate.showGuaranteeTel();
-      },
-      /*查看套餐详情*/
-      openCombo() {
-        this.$refs.discounts.showPopup(this.id);
-      },
-      seeSpecs() {
-        this.specsInfo.show = true;
-      },
-      mySpecs() {
-        this.$set(this.specsInfo, 'show', false);
-      },
-      /*获取套餐列表数据*/
-      getDiscountsData() {
-        getDiscountsLst({ product_id: this.id }).then(res => {
-          this.comboTotal = res.data.count;
-          res.data.list.forEach((item, index) => {
-            item.save_price = 0;
-            item.discountsProduct.forEach((v, i) => {
-              item.save_price += parseFloat(v.product.ot_price) - parseFloat(v.product.price)
-            })
-          })
-          this.comboList = res.data.list;
-        }).catch(err => {
+			},
+			getSuffix(url) {
+				const str = url;
+				const lastIndex = str.lastIndexOf(".");
+				if (lastIndex !== -1) {
+					const extension = str.substring(lastIndex + 1);
+					return extension
+				} else {
+					console.log("字符串中没有找到点号。");
+				}
+			},
+			call: function() {
+				let that = this;
+				if (that.storeInfo.merchant.service_phone) {
+					uni.showModal({
+						title: '提示',
+						content: '暂无在线客服，确定拨打客服电话:' + that.storeInfo.merchant.service_phone + '吗？',
+						success: function(res) {
+							if (res.confirm) {
+								uni.makePhoneCall({
+									// 手机号
+									phoneNumber: that.storeInfo.merchant.service_phone,
+									// 成功回调
+									success: (res) => {},
+									// 失败回调
+									fail: (res) => {}
+								});
+							}
+						}
+					})
+				} else {
+					return that.$util.Tips({
+						title: '暂无可用客服'
+					})
+				}
+			},
+			getConfig() {
+				let self = this
+				// 获取配置
+				getconfig().then(res => {
 
-        });
-      },
-      /*获取价格说明*/
-      getPricrRule() {
-        priceRuleApi(this.storeInfo.cate_id).then(res => {
-          this.priceRule = res.data
-        }).catch(err => {
+				}).catch(err => {})
+			},
+			/**到货通知*/
+			arrivalNotice() {
+				let that = this;
+				// #ifdef MP
+				arrivalSubscribe().then((res) => {
+					that.arrivalNoticeFun();
+				}).catch(err => {
+					console.log(err)
+				});
+				// #endif
+				// #ifndef MP
+				that.arrivalNoticeFun();
+				// #endif
+			},
+			arrivalNoticeFun() {
+				let that = this;
+				let uniqueValue = that.uniqueValue;
+				let typeValue = 0;
+				// #ifdef MP
+				typeValue = 3
+				// #endif
+				// #ifdef H5
+				if (this.$wechat.isWeixin() === true) {
+					typeValue = 2
+				} else {
+					typeValue = 1
+				}
+				// #endif
+				arrivalNoticeApi({
+					unique: uniqueValue,
+					type: typeValue,
+					product_id: that.id
+				}).then(res => {
+					return that.$util.Tips({
+						title: res.message
+					})
+				}).catch(err => {
+					//状态异常返回上级页面
+					return that.$util.Tips({
+						title: err
+					})
+				})
+			},
+			goProDetail(item) {
+				uni.redirectTo({
+					url: '/pages/goods_details/index?id=' + item.product_id
+				})
+			},
+			//下拉导航页面跳转
+			linkPage(url) {
+				if (['/pages/index/index', '/pages/order_addcart/order_addcart',
+						'/pages/user/index', '/pages/plant_grass/index'
+					].indexOf(url) > -1) {
+					uni.switchTab({
+						url
+					})
+				} else {
+					uni.navigateTo({
+						url
+					})
+				}
+				this.currentPage = false
+			},
+			boxStatus(data) {
+				this.showAnimate = data
+			},
+			closeChange: function() {
+				this.$set(this.sharePacket, 'isState', true);
+			},
+			showNav() {
+				this.currentPage = !this.currentPage;
+			},
+			hideNav() {
+				this.currentPage = false;
+			},
+			/**查看运费说明*/
+			showShip: function() {
+				this.$refs.guartemplate.showShippingTel();
+			},
+			/**查看服务保障*/
+			showGuaranee: function() {
+				this.$refs.guartemplate.showGuaranteeTel();
+			},
+			/*查看套餐详情*/
+			openCombo() {
+				this.$refs.discounts.showPopup(this.id);
+			},
+			seeSpecs() {
+				this.specsInfo.show = true;
+			},
+			mySpecs() {
+				this.$set(this.specsInfo, 'show', false);
+			},
+			/*获取套餐列表数据*/
+			getDiscountsData() {
+				getDiscountsLst({
+					product_id: this.id
+				}).then(res => {
+					this.comboTotal = res.data.count;
+					res.data.list.forEach((item, index) => {
+						item.save_price = 0;
+						item.discountsProduct.forEach((v, i) => {
+							item.save_price += parseFloat(v.product.ot_price) - parseFloat(v
+								.product.price)
+						})
+					})
+					this.comboList = res.data.list;
+				}).catch(err => {
 
-        });
-      },
-      goActivity: function(e) {
-        let item = e;
-        if (item.type === "1") {
-          uni.navigateTo({
-            url: `/pages/activity/goods_seckill_details/index?id=${item.id}&time=${item.time}&status=1`
-          });
-        } else if (item.type === "2") {
-          uni.navigateTo({
-            url: `/pages/activity/goods_bargain_details/index?id=${item.id}&bargain=${this.uid}`
-          });
-        } else {
-          uni.navigateTo({
-            url: `/pages/activity/goods_combination_details/index?id=${item.id}`
-          });
-        }
-      },
-      /**
-       * 购物车手动填写
-       *
-       */
-      iptCartNum: function(e) {
-        this.$set(this.attr.productSelect, 'cart_num', e);
-      },
-      // 后退
-      returns: function() {
-        uni.navigateBack()
-      },
-      // 首页
-      goHome() {
-        uni.switchTab({
-          url: '/pages/index/index'
-        });
-      },
-      // 种草详情
-      goPlant(item) {
-        if (item.is_type == 1) {
-          uni.navigateTo({
-            url: '/pages/plantGrass/plant_detail/index?id=' + item.community_id
-          });
-        } else {
-          uni.navigateTo({
-            //#ifdef APP
-            url: '/pages/short_video/appSwiper/index?id=' + item.community_id + '&tab=1'
-            //#endif
-            //#ifndef APP
-            url: '/pages/short_video/nvueSwiper/index?id=' + item.community_id + '&tab=1'
-            //#endif
-          });
-        }
-      },
-      tap: function(index) {
-        var id = "past" + index;
-        var index = index;
-        var that = this;
-        this.$set(this, 'toView', id);
-        this.$set(this, 'navActive', index);
-        this.$set(this, 'lock', true);
-        this.$set(this, 'scrollTop', index > 0 ? that.topArr[index] - (app.globalData.navHeight / 2) : that.topArr[
-          index]);
-      },
-      scroll: function(e) {
-        var that = this,
-          scrollY = e.detail.scrollTop;
-        var opacity = scrollY / 200;
-        opacity = opacity > 1 ? 1 : opacity;
-        that.$set(that, 'showAnimate', false);
-        that.$set(that, 'opacity', opacity);
-        that.$set(that, 'scrollY', scrollY);
-        if (that.lock) {
-          that.$set(that, 'lock', false)
-          return;
-        }
-        for (var i = 0; i < that.topArr.length; i++) {
-          if (scrollY < that.topArr[i] - (app.globalData.navHeight / 2) + that.heightArr[i]) {
-            that.$set(that, 'navActive', i)
-            break
-          }
-        }
-        uni.$emit('scroll');
-      },
-      ChangCouponsClose: function() {
-        this.$set(this.coupon, 'coupon', false)
-      },
-      /**
-       * 购物车数量加和数量减
-       *
-       */
-      ChangeCartNum: function(changeValue) {
-        //changeValue:是否 加|减
-        //获取当前变动属性
-        let productSelect = this.productValue[this.attrValue];
-        //如果没有属性,赋值给商品默认库存
-        if (productSelect === undefined && !this.attr.productAttr.length)
-          productSelect = this.attr.productSelect;
-        //无属性值即库存为0；不存在加减；
-        if (productSelect === undefined) return;
-        let stock = productSelect.stock || 0;
-        let num = this.attr.productSelect;
-        if (changeValue) {
-          num.cart_num++;
-          if (num.cart_num > stock) {
-            this.$set(this.attr.productSelect, "cart_num", stock);
-            this.$set(this, "cart_num", stock);
-          }
-          if (num.cart_num > this.storeInfo.once_max_count && this.storeInfo.once_max_count != 0 && this.storeInfo
-            .pay_limit != 0) {
-            this.$set(this.attr.productSelect, "cart_num", this.storeInfo.once_max_count);
-            this.$set(this, "cart_num", this.storeInfo.once_max_count);
-            return this.$util.Tips({
-              title: "单次购买件数不能超过" + this.storeInfo.once_max_count + "件！"
-            });
-          }
-        } else {
-          num.cart_num--;
-          if (num.cart_num < 1) {
-            this.$set(this.attr.productSelect, "cart_num", 1);
-            this.$set(this, "cart_num", 1);
-          }
-          if (num.cart_num < this.storeInfo.once_min_count && this.storeInfo.once_min_count != 0) {
-            this.$set(this.attr.productSelect, "cart_num", this.storeInfo.once_min_count);
-            this.$set(this, "cart_num", this.storeInfo.once_min_count);
-            return this.$util.Tips({
-              title: "单次购买件数不能少于" + this.storeInfo.once_min_count + "件！"
-            });
-          }
-        }
-      },
-      attrVal(val) {
-        this.$set(this.attr.productAttr[val.indexw], 'index', this.attr.productAttr[val.indexw].attr_values[val
-        .indexn]);
-      },
-      /**
-       * 属性变动赋值
-       *
-       */
-      ChangeAttr: function(res) {
-        let productSelect = this.productValue[res];
-        if (productSelect) this.$set(this, "uniqueValue", productSelect.unique);
-        if (productSelect && productSelect.stock > 0) {
-          this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : this.storeInfo
-            .image);
-          this.$set(this.attr.productSelect, "price", productSelect.price);
-          this.$set(this.attr.productSelect, "svip_price", productSelect.svip_price);
-          this.$set(this.attr.productSelect, "stock", productSelect.stock);
-          this.$set(this.attr.productSelect, "unique", productSelect.unique);
-          this.$set(this, "uniqueValue", productSelect.unique);
-          if (productSelect.stock == 0) {
-            this.$set(this.attr.productSelect, "cart_num", 0);
-          } else {
-            this.$set(this.attr.productSelect, "cart_num", this.min_count || 1);
-          }
-          this.$set(this, "attrValue", res);
-          this.$set(this, "attrTxt", "选择");
-        } else {
-          this.$set(this.attr.productSelect, "image", productSelect.image);
-          this.$set(this.attr.productSelect, "price", productSelect.price);
-          this.$set(this.attr.productSelect, "svip_price", productSelect.svip_price);
-          this.$set(this.attr.productSelect, "stock", 0);
-          this.$set(this.attr.productSelect, "unique", "");
-          this.$set(this.attr.productSelect, "cart_num", 0);
-          this.$set(this, "attrValue", res);
-          this.$set(this, "attrTxt", "选择");
-        }
-      },
-      /**
-       * 领取完毕移除当前页面领取过的优惠券展示
-       */
-      ChangCoupons: function(e) {
-        let coupon = e;
-        let couponList = this.$util.ArrayRemove(this.couponList, 'id', coupon.id);
-        this.$set(this, 'couponList', couponList);
-        this.getCouponList();
-      },
-      setClientHeight: function() {
-        let that = this;
-        let view = uni.createSelectorQuery().in(this).select("#list0");
-        view.fields({
-          size: true,
-        }, data => {
-          that.$set(that, 'clientHeight', data.height + 20)
-        }).exec();
-      },
-      /**
-       * 获取产品详情
-       *
-       */
-      getGoodsDetails: function() {
-        uni.showLoading({
-          title: '加载中',
-          mask: true
-        });
-        let that = this;
-        getProductDetail(that.id, {
-          sale_type: this.sale_type
-        }).then(res => {
-          uni.hideLoading();
-          let storeInfo = res.data;
-          if (storeInfo.video_link && storeInfo.slider_image.length > 1) {
-            this.videoCoverImg = storeInfo.slider_image[0]
-            storeInfo.slider_image.splice(0, 1)
-          } else if (storeInfo.video_link && storeInfo.slider_image.length === 1) {
-            this.videoCoverImg = storeInfo.slider_image[0]
-          }
-          that.$set(that, 'storeInfo', storeInfo);
-          that.$set(that, 'reply', res.data.topReply ? [res.data.topReply] : []);
-          that.$set(that, 'replyCount', res.data.replayData && res.data.replayData.count);
-          that.$set(that, 'replyChance', res.data.replayData && res.data.replayData.rate);
-          that.$set(that.attr, 'productAttr', res.data.attr);
-          that.$set(that, 'productValue', res.data.sku);
-          that.$set(that.sharePacket, 'priceName', res.data.priceName);
-          that.$set(that.sharePacket, 'max', res.data.max_extension);
-          that.$set(that.sharePacket, 'min', res.data.min_extension);
-          that.$set(that, 'systemStore', res.data.system_store);
-          that.$set(that, 'storeSelfMention', res.data.store_self_mention);
-          that.$set(that, 'PromotionCode', storeInfo.code_base);
-          that.$set(that, 'activity', res.data.activity ? res.data.activity : []);
-          that.$set(that, 'max_count', res.data.once_max_count);
-          that.$set(that, 'pay_limit', res.data.pay_limit);
-          that.$set(that, 'min_count', res.data.once_min_count);
-          that.$set(that, 'svipData', res.data.show_svip_info || null);
-          that.$set(that, 'svipPrice', res.data.show_svip_info && res.data.show_svip_info.show_svip_price ||
-            false);
-          uni.setNavigationBarTitle({
-            title: storeInfo.store_name.substring(0, 7) + "..."
-          })
-          that.$set(that, 'storeImage', that.storeInfo.image);
-          getProductParmas(that.id).then((res) => {
-            that.$set(that, 'description', res.data.content);
-            if (that.description.type == 0) {
-              that.description.content = that.description.content.replace(
-                /<img/gi,
-                '<img style="max-width:100%;height:auto;float:left;display:block" '
-              );
-              that.description.content = that.description.content.replace(
-                /<video/gi,
-                '<video style="width:100%;height:300px;display:block" '
-              );
-            }
-            that.$set(that, 'guarantee', res.data.guarantee ? res.data.guarantee : []);
-            that.$set(that, 'shippingValue', res.data.temp ? res.data.temp.name : '');
-            that.$set(that, 'shipping', res.data.temp ? res.data.temp.info : '');
-            that.$set(that.specsInfo, 'params', res.data.params);
-            that.$set(that.storeInfo, 'merchant', res.data.merchant);
-            that.$set(that.storeInfo, 'spu_id', res.data.spu_id);
-            that.$set(that.storeInfo, 'community', res.data.community);
-            that.$set(that.storeInfo, 'atmosphere_pic', res.data.atmosphere_pic);
-            that.$set(that.storeInfo, 'top_pid', res.data.top_pid);
-            that.$set(that.storeInfo, 'top_num', res.data.top_num);
-            that.$set(that.storeInfo, 'top_name', res.data.top_name);
-            var recommendArr = [];
-            for (var i = 0, len = res.data.merchant.recommend.length; i < len; i += 6) {
-              recommendArr.push(res.data.merchant.recommend.slice(i, i + 6));
-            }
-            that.recommend = recommendArr
-            console.log(that.recommend)
-          })
-          if (that.isLogin) {
-            that.downloadFilePromotionCode();
-            that.getCartCount();
-          };
-          // #ifdef H5
-          that.ShareInfo();
-          // #endif
-          setTimeout(function() {
-            that.infoScroll();
-          }, 500);
-          that.DefaultSelect();
-          that.getPricrRule(that.storeInfo.cate_id)
-          that.$nextTick(function() {
-            that.getCouponList();
-          })
-        }).catch(err => {
-          //状态异常返回上级页面
-          return that.$util.Tips({
-            title: err
-          }, {
-            tab: 3,
-            url: 1
-          });
-        })
-      },
-      infoScroll: function() {
-        var that = this,
-          topArr = [],
-          heightArr = [];
-        for (var i = 0; i < that.navList.length; i++) { //productList
-          //获取元素所在位置
-          var query = uni.createSelectorQuery().in(this);
-          var idView = "#past" + i;
-          query.select(idView).boundingClientRect();
-          query.exec(function(res) {
-            var top = res[0].top;
-            var height = res[0].height;
-            topArr.push(top);
-            heightArr.push(height);
-            that.$set(that, 'topArr', topArr);
-            that.$set(that, 'heightArr', heightArr);
-          });
-        };
-      },
-      /**
-       * 默认选中属性
-       *
-       */
-      DefaultSelect: function() {
-        let productAttr = this.attr.productAttr;
-        let value = [];
-        let arr = []
-        let unSortArr = []
-        for (var key in this.productValue) {
-          if (this.productValue[key].stock > 0) {
-            value = this.attr.productAttr.length ? key.split(",") : [];
-            break;
-          }
-        }
-        for (let i = 0; i < productAttr.length; i++) {
-          this.$set(productAttr[i], "index", value[i]);
-        }
-        //sort();排序函数:数字-英文-汉字；
-        let productSelect = this.productValue[value.join(",")];
-        if (productSelect && productAttr.length) {
-          this.$set(
-            this.attr.productSelect,
-            "store_name",
-            this.storeInfo.store_name
-          );
-          this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : this.storeInfo
-            .image);
-          this.$set(this.attr.productSelect, "price", productSelect.price);
-          this.$set(this.attr.productSelect, "svip_price", productSelect.svip_price);
-          this.$set(this.attr.productSelect, "stock", productSelect.stock);
-          this.$set(this.attr.productSelect, "unique", productSelect.unique);
-          this.$set(this, "uniqueValue", productSelect.unique);
-          this.$set(this, "attrValue", value.join(","));
-          this.$set(this, "attrTxt", "选择");
-          if (productSelect.stock == 0) {
-            this.$set(this.attr.productSelect, "cart_num", 0);
-          } else {
-            this.$set(this.attr.productSelect, "cart_num", this.min_count || 1);
-          }
-        } else if (!productSelect && productAttr.length) {
-          this.$set(
-            this.attr.productSelect,
-            "store_name",
-            this.storeInfo.store_name
-          );
-          this.$set(this.attr.productSelect, "image", this.storeInfo.image);
-          this.$set(this.attr.productSelect, "price", this.storeInfo.price);
-          this.$set(this.attr.productSelect, "svip_price", this.storeInfo.svip_price);
-          this.$set(this.attr.productSelect, "stock", 0);
-          this.$set(this.attr.productSelect, "unique", "");
-          this.$set(this, "uniqueValue", "");
-          this.$set(this.attr.productSelect, "cart_num", 0);
-          this.$set(this, "attrValue", "");
-          this.$set(this, "attrTxt", "选择");
-        } else if (!productSelect && !productAttr.length) {
-          this.$set(
-            this.attr.productSelect,
-            "store_name",
-            this.storeInfo.store_name
-          );
-          this.$set(this.attr.productSelect, "image", this.storeInfo.image);
-          this.$set(this.attr.productSelect, "price", this.storeInfo.price);
-          this.$set(this.attr.productSelect, "svip_price", this.storeInfo.svip_price);
-          this.$set(this.attr.productSelect, "stock", this.storeInfo.stock);
-          this.$set(this.attr.productSelect, "unique", this.storeInfo.unique || "");
-          this.$set(this, "uniqueValue", this.storeInfo.unique || "");
-          this.$set(this.attr.productSelect, "cart_num", 1);
-          this.$set(this, "attrValue", "");
-          this.$set(this, "attrTxt", "选择");
-        } else if (productSelect && !productAttr.length) {
-          this.$set(this.attr.productSelect, "store_name", this.storeInfo.store_name);
-          this.$set(this.attr.productSelect, "image", productSelect.image);
-          this.$set(this.attr.productSelect, "price", productSelect.price);
-          this.$set(this.attr.productSelect, "svip_price", productSelect.svip_price);
-          this.$set(this.attr.productSelect, "stock", productSelect.stock);
-          this.$set(this.attr.productSelect, "unique", productSelect.unique);
-          this.$set(this, "uniqueValue", productSelect.unique);
-          this.$set(this, "attrValue", value.join(","));
-          this.$set(this, "attrTxt", "选择");
-          if (productSelect.stock == 0) {
-            this.$set(this.attr.productSelect, "cart_num", 0);
-          } else {
-            this.$set(this.attr.productSelect, "cart_num", this.min_count || 1);
-          }
-        }
-      },
-      /**
-       * 获取优惠券
-       *
-       */
-      getCouponList() {
-        let that = this;
-        let goodsArr = []
-        let couponList = [];
-        let activeList = []
-        getCoupons({
-          ids: that.id
-        }).then(res => {
-          goodsArr = res.data
-          getShopCoupons(that.storeInfo.mer_id).then(({
-            data
-          }) => {
-            couponList = goodsArr.concat(data)
-            that.$set(that.coupon, 'list', couponList);
-            for (let i = 0; i < couponList.length; i++) {
-              if (!couponList[i].issue && activeList.length < 2) {
-                activeList.push(couponList[i]);
-              }
-            }
-            that.$set(that, 'couponList', activeList);
-          })
-        });
-      },
-      ChangCouponsUseState(index) {
-        let that = this;
-        that.$set(that.coupon, 'coupon', false);
-      },
-      /**
-       *
-       *
-       * 收藏商品
-       */
-      setCollect: function() {
-        if (this.isLogin === false) {
-          toLogin()
-        } else {
-          let that = this;
-          if (this.storeInfo.isRelation) {
-            collectDel({
-              type: 0,
-              type_id: this.id
-            }).then(res => {
-              that.$util.Tips({
-                title: '已取消收藏'
-              });
-              that.$set(that.storeInfo, 'isRelation', !that.storeInfo.isRelation);
-            }).catch(err => {
-              that.$util.Tips({
-                title: err
-              });
-            })
-          } else {
-            collectAdd({
-              type_id: this.id,
-              type: 0
-            }).then(res => {
-              that.$util.Tips({
-                title: '收藏成功'
-              });
-              that.$set(that.storeInfo, 'isRelation', !that.storeInfo.isRelation);
-            }).catch(err => {
-              that.$util.Tips({
-                title: err
-              });
-            })
-          }
-        }
-      },
-      /**
-       * 打开属性插件
-       */
-      selecAttr: function() {
-        this.$set(this.attr, 'cartAttr', true);
-        this.$set(this, 'isOpen', true);
-      },
-      /**
-       * 打开优惠券插件
-       */
-      couponTap: function() {
-        let that = this;
-        if (that.isLogin === false) {
-          toLogin()
-        } else {
-          that.$set(that.coupon, 'coupon', true);
-        }
-      },
-      goCustomer: function() {
-        let that = this;
-        if (that.isLogin === false) {
-          toLogin()
-        } else {
-          uni.navigateTo({
-            url: `/pages/chat/customer_list/chat?mer_id=${that.storeInfo.mer_id}&uid=${that.uid}&productId=${that.id}`
-          });
-        }
-      },
-      onMyEvent: function() {
-        this.$set(this.attr, 'cartAttr', false);
-        this.$set(this, 'isOpen', false);
-      },
-      /**
-       * 打开属性加入购物车
-       *
-       */
-      joinCart: function(e) {
-        //是否登录
-        if (this.isLogin === false) {
-          toLogin()
-        } else {
-          this.goCat();
-        }
-      },
-      /*
-       * 加入购物车
-       */
-      goCat: function(news) {
-        let that = this,
-          productSelect = that.productValue[this.attrValue];
-        //打开属性
-        if (that.attrValue) {
-          //默认选中了属性，但是没有打开过属性弹窗还是自动打开让用户查看默认选中的属性
-          that.attr.cartAttr = !that.isOpen ? true : false;
-          // if(!that.isOpen)that.attr.cartAttr = true
-        } else {
-          if (that.isOpen) that.attr.cartAttr = true;
-          else
-            that.attr.cartAttr = !that.attr.cartAttr;
-        }
-        //只有关闭属性弹窗时进行加入购物车
-        if (that.attr.cartAttr === true && that.isOpen === false)
-          return (that.isOpen = true);
-        that.isOpen = that.attr.cartAttr = true;
-        //如果有属性,没有选择,提示用户选择
-        if (
-          that.attr.productAttr.length &&
-          that.isOpen === true &&
-          productSelect.stock == 0
-        )
-          return that.$util.Tips({
-            title: "产品库存不足，请选择其它"
-          });
-        if (that.attr.productSelect.cart_num == 0) {
-          return that.$util.Tips({
-            title: '购买个数不能为0！'
-          })
-        }
-        let q = {
-          is_new: news === undefined ? 0 : 1,
-          product_id: that.id,
-          cart_num: that.attr.productSelect.cart_num,
-          product_attr_unique: that.attr.productSelect !== undefined ? that.attr.productSelect.unique : "",
-          source: this.source,
-          product_type: 0,
-          spread_id: this.currSpid,
-          sale_type: this.sale_type
-        };
-        postCartAdd(q)
-          .then(function(res) {
-            that.isOpen = that.attr.cartAttr = false;
-            let cartId = res.data.cart_id
-            if (news) {
-              uni.navigateTo({
-                url: `/pages/users/order_confirm/index?cartId=${cartId}&sale_type=${that.sale_type}`
-              });
-            } else {
-              that.$util.Tips({
-                title: "添加购物车成功",
-                success: () => {
-                  that.getCartCount(true);
-                }
-              });
-            }
-          })
-          .catch(res => {
-            return that.$util.Tips({
-              title: res
-            });
-          });
-      },
-      /**
-       * 获取购物车数量
-       * @param boolean 是否展示购物车动画和重置属性
-       */
-      getCartCount: function(isAnima) {
-        let that = this;
-        const isLogin = that.isLogin;
-        if (isLogin) {
-          getCartCounts({
-            sale_type: this.sale_type
-          }).then(res => {
-            that.CartCount = res.data[0].count;
-            //加入购物车后重置属性
-            if (isAnima) {
-              that.animated = true;
-              setTimeout(function() {
-                that.animated = false;
-              }, 500);
-            }
-          });
-        }
-      },
-      /**
-       * 立即购买
-       */
-      goBuy: function(e) {
-        if (this.isLogin === false) {
-          // toLogin()
-          this.isShowAuth = true;
-        } else {
-          this.goCat(true);
-        }
-      },
-      /**
-       * 分享打开
-       *
-       */
-      listenerActionSheet: function() {
-        if (this.isLogin === false) {
-          toLogin()
-        } else {
-          // #ifdef H5
-          if (this.$wechat.isWeixin() === true) {
-            this.weixinStatus = true;
-          }
-          // #endif
-          this.posters = true;
-        }
-      },
-      // 分享关闭
-      listenerActionClose: function() {
-        this.posters = false;
-        this.currentPage = false;
-      },
-      //隐藏海报
-      posterImageClose: function() {
-        this.posterImageStatus = false
-      },
-      //替换安全域名
-      setDomain: function(url) {
-        url = url ? url.toString() : '';
-        //本地调试打开,生产请注销
-        if (url.indexOf("https://") > -1) return url;
-        else return url.replace('http://', 'https://');
-      },
-      /**
-       * 获取产品分销二维码
-       * @param function successFn 下载完成回调
-       *
-       */
-      downloadFilePromotionCode: function(successFn) {
-        let that = this;
-        let type;
-        // #ifndef MP
-        type = 'wechat'
-        // #endif
-        // #ifdef MP
-        type = 'routine'
-        // #endif
-        getProductCode(that.id, {
-          type: type,
-          product_type: 0
-        }).then(async res => {
-          that.codeImg = res.data.url
-          that.$set(that, 'isDown', false);
-        }).catch(err => {
-          that.$set(that, 'isDown', false);
-          that.$set(that, 'PromotionCode', '');
-        });
-      },
-      // 小程序关闭分享弹窗；
-      goFriend: function() {
-        this.posters = false;
-        this.currentPage = false;
-      },
-      /**
-       * 生成海报
-       */
-      async goPoster() {
-        if (this.posterImage) {
-          this.posterImageStatus = true
-          this.posters = false
-          return
-        }
-        let that = this;
-        let arr2
-        that.posters = false;
-        that.$set(that, 'canvasStatus', true);
-        uni.showLoading({
-          title: '海报生成中',
-          mask: true
-        });
-        // #ifdef MP || APP-PLUS
-        arr2 = [that.posterbackgd, await that.fileStoreImage(that.storeImage), await that.fileStoreImage(
-          that.codeImg), await that.fileStoreImage(that.share_pic)];
-        // #endif
-        // #ifdef H5
-        arr2 = [that.posterbackgd, await that.imgToBase(that.storeImage), await that.imgToBase(that.codeImg),
-          await that.imgToBase(that.share_pic)
-        ];
-        // #endif
-        //生成推广海报
-        that.$util.goodsPosterCanvas(arr2, that.storeInfo.store_name, that.storeInfo.price, that.site_name, that
-          .storeInfo.ot_price,
-          function(tempFilePath) {
-            that.$set(that, 'posterImage', tempFilePath);
-            that.$set(that, 'posterImageStatus', true);
-            that.$set(that, 'actionSheetHidden', !that.actionSheetHidden);
-            that.$set(that, 'canvasStatus', false);
-          }, (err) => {
-            that.$set(that, 'canvasStatus', false);
-          });
-      },
-      //图片转符合安全域名路径
-      fileStoreImage(url) {
-        // #ifdef MP  || APP-PLUS
-        let ishttps = url.split('//')[0] == 'https:'
-        if (!ishttps) {
-          url = 'https://' + url.split('//')[1]
-        }
-        // #endif
-        return new Promise((resolve, reject) => {
-          let that = this;
-          uni.downloadFile({
-            url: url,
-            success: function(res) {
-              resolve(res.tempFilePath);
-            },
-            fail: function() {
-              return that.$util.Tips({
-                title: ''
-              });
-            }
-          });
-        })
-      },
-      /*
-       * 保存到手机相册
-       */
-      // #ifdef MP
-      savePosterPath: function() {
-        let that = this;
-        uni.getSetting({
-          success(res) {
-            if (!res.authSetting['scope.writePhotosAlbum']) {
-              uni.authorize({
-                scope: 'scope.writePhotosAlbum',
-                success() {
-                  uni.saveImageToPhotosAlbum({
-                    filePath: that.posterImage,
-                    success: function(res) {
-                      that.posterImageClose();
-                      that.$util.Tips({
-                        title: '保存成功',
-                        icon: 'success'
-                      });
-                    },
-                    fail: function(res) {
-                      that.$util.Tips({
-                        title: '保存失败'
-                      });
-                    }
-                  })
-                }
-              })
-            } else {
-              uni.saveImageToPhotosAlbum({
-                filePath: that.posterImage,
-                success: function(res) {
-                  that.posterImageClose();
-                  that.$util.Tips({
-                    title: '保存成功',
-                    icon: 'success'
-                  });
-                },
-                fail: function(res) {
-                  that.$util.Tips({
-                    title: '保存失败'
-                  });
-                },
-              })
-            }
-          }
-        })
-      },
-      // #endif
-      // #ifdef APP-PLUS
-      savePosterPath() {
-        let that = this
-        uni.saveImageToPhotosAlbum({
-          filePath: that.posterImage,
-          success: function(res) {
-            that.posterImageClose();
-            that.$util.Tips({
-              title: '保存成功',
-              icon: 'success'
-            });
-          },
-          fail: function(res) {
-            that.$util.Tips({
-              title: '保存失败'
-            });
-          },
-        })
-      },
-      // #endif
-      //#ifdef H5
-      ShareInfo() {
-        let data = this.storeInfo;
-        let href = location.href;
-        if (this.$wechat.isWeixin()) {
-          getUserInfo().then(res => {
-            href =
-              href.indexOf("?") === -1 ?
-              href + "?spid=" + res.data.uid :
-              href + "&spid=" + res.data.uid;
+				});
+			},
+			/*获取价格说明*/
+			getPricrRule() {
+				priceRuleApi(this.storeInfo.cate_id).then(res => {
+					this.priceRule = res.data
+				}).catch(err => {
 
-            let configAppMessage = {
-              desc: data.store_info,
-              title: data.store_name,
-              link: href,
-              imgUrl: data.image
-            };
-            this.$wechat.wechatEvevt([
-              "updateAppMessageShareData",
-              "updateTimelineShareData",
-              "onMenuShareAppMessage",
-              "onMenuShareTimeline"
-            ], configAppMessage).then(res => {}).catch(err => {
-              console.log(err);
-            })
-          });
-        }
-      },
-      //#endif
-      async imgToBase(url) {
-        let res = await imgToBase({
-          image: url
-        })
-        return res.data.image
-      },
-      //复制口令
-      copyPwd() {
-        let that = this;
-        copyPasswordApi({
-          id: that.id,
-          product_type: 0
-        }).then(async res => {
-          that.copyUrl = res.data.str;
-          that.posters = false
-          that.isCopy = true;
-        })
-      },
-      closeCopy() {
-        this.isCopy = false
-      },
-      // APP分享
-      appShare(scene) {
-        let that = this
-        uni.showLoading({
-          title: '加载中',
-          mask: true
-        });
-        let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
-        let curRoute = routes[routes.length - 1].$page.fullPath // 获取当前页面路由，也就是最后一个打开的页面路由
-        uni.share({
-          provider: "weixin",
-          scene: scene,
-          type: 0,
-          href: `${HTTP_REQUEST_URL}${curRoute}&spid=${that.uid}`,
-          title: that.storeInfo.store_name,
-          summary: that.storeInfo.store_info,
-          imageUrl: that.storeInfo.image,
-          success: function(res) {
-            uni.showToast({
-              title: '分享成功',
-              icon: 'success'
-            })
-            that.posters = false;
-            uni.hideLoading();
-          },
-          fail: function(err) {
-            uni.showToast({
-              title: '分享失败',
-              icon: 'none',
-              duration: 2000
-            })
-            that.posters = false;
-            uni.hideLoading();
-          }
-        });
-      }
-    }
-  }
+				});
+			},
+			goActivity: function(e) {
+				let item = e;
+				if (item.type === "1") {
+					uni.navigateTo({
+						url: `/pages/activity/goods_seckill_details/index?id=${item.id}&time=${item.time}&status=1`
+					});
+				} else if (item.type === "2") {
+					uni.navigateTo({
+						url: `/pages/activity/goods_bargain_details/index?id=${item.id}&bargain=${this.uid}`
+					});
+				} else {
+					uni.navigateTo({
+						url: `/pages/activity/goods_combination_details/index?id=${item.id}`
+					});
+				}
+			},
+			/**
+			 * 购物车手动填写
+			 *
+			 */
+			iptCartNum: function(e) {
+				this.$set(this.attr.productSelect, 'cart_num', e);
+			},
+			// 后退
+			returns: function() {
+				uni.navigateBack()
+			},
+			// 首页
+			goHome() {
+				uni.switchTab({
+					url: '/pages/index/index'
+				});
+			},
+			// 种草详情
+			goPlant(item) {
+				if (item.is_type == 1) {
+					uni.navigateTo({
+						url: '/pages/plantGrass/plant_detail/index?id=' + item.community_id
+					});
+				} else {
+					uni.navigateTo({
+						//#ifdef APP
+						url: '/pages/short_video/appSwiper/index?id=' + item.community_id + '&tab=1'
+						//#endif
+						//#ifndef APP
+						url: '/pages/short_video/nvueSwiper/index?id=' + item.community_id + '&tab=1'
+						//#endif
+					});
+				}
+			},
+			tap: function(index) {
+				var id = "past" + index;
+				var index = index;
+				var that = this;
+				this.$set(this, 'toView', id);
+				this.$set(this, 'navActive', index);
+				this.$set(this, 'lock', true);
+				this.$set(this, 'scrollTop', index > 0 ? that.topArr[index] - (app.globalData.navHeight / 2) : that
+					.topArr[
+						index]);
+			},
+			scroll: function(e) {
+				var that = this,
+					scrollY = e.detail.scrollTop;
+				var opacity = scrollY / 200;
+				opacity = opacity > 1 ? 1 : opacity;
+				that.$set(that, 'showAnimate', false);
+				that.$set(that, 'opacity', opacity);
+				that.$set(that, 'scrollY', scrollY);
+				if (that.lock) {
+					that.$set(that, 'lock', false)
+					return;
+				}
+				for (var i = 0; i < that.topArr.length; i++) {
+					if (scrollY < that.topArr[i] - (app.globalData.navHeight / 2) + that.heightArr[i]) {
+						that.$set(that, 'navActive', i)
+						break
+					}
+				}
+				uni.$emit('scroll');
+			},
+			ChangCouponsClose: function() {
+				this.$set(this.coupon, 'coupon', false)
+			},
+			/**
+			 * 购物车数量加和数量减
+			 *
+			 */
+			ChangeCartNum: function(changeValue) {
+				//changeValue:是否 加|减
+				//获取当前变动属性
+				let productSelect = this.productValue[this.attrValue];
+				//如果没有属性,赋值给商品默认库存
+				if (productSelect === undefined && !this.attr.productAttr.length)
+					productSelect = this.attr.productSelect;
+				//无属性值即库存为0；不存在加减；
+				if (productSelect === undefined) return;
+				let stock = productSelect.stock || 0;
+				let num = this.attr.productSelect;
+				if (changeValue) {
+					num.cart_num++;
+					if (num.cart_num > stock) {
+						this.$set(this.attr.productSelect, "cart_num", stock);
+						this.$set(this, "cart_num", stock);
+					}
+					if (num.cart_num > this.storeInfo.once_max_count && this.storeInfo.once_max_count != 0 && this
+						.storeInfo
+						.pay_limit != 0) {
+						this.$set(this.attr.productSelect, "cart_num", this.storeInfo.once_max_count);
+						this.$set(this, "cart_num", this.storeInfo.once_max_count);
+						return this.$util.Tips({
+							title: "单次购买件数不能超过" + this.storeInfo.once_max_count + "件！"
+						});
+					}
+				} else {
+					num.cart_num--;
+					if (num.cart_num < 1) {
+						this.$set(this.attr.productSelect, "cart_num", 1);
+						this.$set(this, "cart_num", 1);
+					}
+					if (num.cart_num < this.storeInfo.once_min_count && this.storeInfo.once_min_count != 0) {
+						this.$set(this.attr.productSelect, "cart_num", this.storeInfo.once_min_count);
+						this.$set(this, "cart_num", this.storeInfo.once_min_count);
+						return this.$util.Tips({
+							title: "单次购买件数不能少于" + this.storeInfo.once_min_count + "件！"
+						});
+					}
+				}
+			},
+			attrVal(val) {
+				this.$set(this.attr.productAttr[val.indexw], 'index', this.attr.productAttr[val.indexw].attr_values[val
+					.indexn]);
+			},
+			/**
+			 * 属性变动赋值
+			 *
+			 */
+			ChangeAttr: function(res) {
+				let productSelect = this.productValue[res];
+				if (productSelect) this.$set(this, "uniqueValue", productSelect.unique);
+				if (productSelect && productSelect.stock > 0) {
+					this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : this
+						.storeInfo
+						.image);
+					this.$set(this.attr.productSelect, "price", productSelect.price);
+					this.$set(this.attr.productSelect, "svip_price", productSelect.svip_price);
+					this.$set(this.attr.productSelect, "stock", productSelect.stock);
+					this.$set(this.attr.productSelect, "unique", productSelect.unique);
+					this.$set(this, "uniqueValue", productSelect.unique);
+					if (productSelect.stock == 0) {
+						this.$set(this.attr.productSelect, "cart_num", 0);
+					} else {
+						this.$set(this.attr.productSelect, "cart_num", this.min_count || 1);
+					}
+					this.$set(this, "attrValue", res);
+					this.$set(this, "attrTxt", "选择");
+				} else {
+					this.$set(this.attr.productSelect, "image", productSelect.image);
+					this.$set(this.attr.productSelect, "price", productSelect.price);
+					this.$set(this.attr.productSelect, "svip_price", productSelect.svip_price);
+					this.$set(this.attr.productSelect, "stock", 0);
+					this.$set(this.attr.productSelect, "unique", "");
+					this.$set(this.attr.productSelect, "cart_num", 0);
+					this.$set(this, "attrValue", res);
+					this.$set(this, "attrTxt", "选择");
+				}
+			},
+			/**
+			 * 领取完毕移除当前页面领取过的优惠券展示
+			 */
+			ChangCoupons: function(e) {
+				let coupon = e;
+				let couponList = this.$util.ArrayRemove(this.couponList, 'id', coupon.id);
+				this.$set(this, 'couponList', couponList);
+				this.getCouponList();
+			},
+			setClientHeight: function() {
+				let that = this;
+				let view = uni.createSelectorQuery().in(this).select("#list0");
+				view.fields({
+					size: true,
+				}, data => {
+					that.$set(that, 'clientHeight', data.height + 20)
+				}).exec();
+			},
+			/**
+			 * 获取产品详情
+			 *
+			 */
+			getGoodsDetails: function() {
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				});
+				let that = this;
+				getProductDetail(that.id, {
+					sale_type: this.sale_type
+				}).then(res => {
+					uni.hideLoading();
+					let storeInfo = res.data;
+					if (storeInfo.video_link && storeInfo.slider_image.length > 1) {
+						this.videoCoverImg = storeInfo.slider_image[0]
+						storeInfo.slider_image.splice(0, 1)
+					} else if (storeInfo.video_link && storeInfo.slider_image.length === 1) {
+						this.videoCoverImg = storeInfo.slider_image[0]
+					}
+					that.$set(that, 'storeInfo', storeInfo);
+					that.$set(that, 'reply', res.data.topReply ? [res.data.topReply] : []);
+					that.$set(that, 'replyCount', res.data.replayData && res.data.replayData.count);
+					that.$set(that, 'replyChance', res.data.replayData && res.data.replayData.rate);
+					that.$set(that.attr, 'productAttr', res.data.attr);
+					that.$set(that, 'productValue', res.data.sku);
+					that.$set(that.sharePacket, 'priceName', res.data.priceName);
+					that.$set(that.sharePacket, 'max', res.data.max_extension);
+					that.$set(that.sharePacket, 'min', res.data.min_extension);
+					that.$set(that, 'systemStore', res.data.system_store);
+					that.$set(that, 'storeSelfMention', res.data.store_self_mention);
+					that.$set(that, 'PromotionCode', storeInfo.code_base);
+					that.$set(that, 'activity', res.data.activity ? res.data.activity : []);
+					that.$set(that, 'max_count', res.data.once_max_count);
+					that.$set(that, 'pay_limit', res.data.pay_limit);
+					that.$set(that, 'min_count', res.data.once_min_count);
+					that.$set(that, 'svipData', res.data.show_svip_info || null);
+					that.$set(that, 'svipPrice', res.data.show_svip_info && res.data.show_svip_info
+						.show_svip_price ||
+						false);
+					uni.setNavigationBarTitle({
+						title: storeInfo.store_name.substring(0, 7) + "..."
+					})
+					that.$set(that, 'storeImage', that.storeInfo.image);
+					getProductParmas(that.id).then((res) => {
+						that.$set(that, 'description', res.data.content);
+						if (that.description.type == 0) {
+							that.description.content = that.description.content.replace(
+								/<img/gi,
+								'<img style="max-width:100%;height:auto;float:left;display:block" '
+							);
+							that.description.content = that.description.content.replace(
+								/<video/gi,
+								'<video style="width:100%;height:300px;display:block" '
+							);
+						}
+						that.$set(that, 'guarantee', res.data.guarantee ? res.data.guarantee : []);
+						that.$set(that, 'shippingValue', res.data.temp ? res.data.temp.name : '');
+						that.$set(that, 'shipping', res.data.temp ? res.data.temp.info : '');
+						that.$set(that.specsInfo, 'params', res.data.params);
+						that.$set(that.storeInfo, 'merchant', res.data.merchant);
+						that.$set(that.storeInfo, 'spu_id', res.data.spu_id);
+						that.$set(that.storeInfo, 'community', res.data.community);
+						that.$set(that.storeInfo, 'atmosphere_pic', res.data.atmosphere_pic);
+						that.$set(that.storeInfo, 'top_pid', res.data.top_pid);
+						that.$set(that.storeInfo, 'top_num', res.data.top_num);
+						that.$set(that.storeInfo, 'top_name', res.data.top_name);
+						var recommendArr = [];
+						for (var i = 0, len = res.data.merchant.recommend.length; i < len; i += 6) {
+							recommendArr.push(res.data.merchant.recommend.slice(i, i + 6));
+						}
+						that.recommend = recommendArr
+						console.log(that.recommend)
+					})
+					if (that.isLogin) {
+						that.downloadFilePromotionCode();
+						that.getCartCount();
+					};
+					// #ifdef H5
+					that.ShareInfo();
+					// #endif
+					setTimeout(function() {
+						that.infoScroll();
+					}, 500);
+					that.DefaultSelect();
+					that.getPricrRule(that.storeInfo.cate_id)
+					that.$nextTick(function() {
+						that.getCouponList();
+					})
+				}).catch(err => {
+					//状态异常返回上级页面
+					return that.$util.Tips({
+						title: err
+					}, {
+						tab: 3,
+						url: 1
+					});
+				})
+			},
+			infoScroll: function() {
+				var that = this,
+					topArr = [],
+					heightArr = [];
+				for (var i = 0; i < that.navList.length; i++) { //productList
+					//获取元素所在位置
+					var query = uni.createSelectorQuery().in(this);
+					var idView = "#past" + i;
+					query.select(idView).boundingClientRect();
+					query.exec(function(res) {
+						var top = res[0].top;
+						var height = res[0].height;
+						topArr.push(top);
+						heightArr.push(height);
+						that.$set(that, 'topArr', topArr);
+						that.$set(that, 'heightArr', heightArr);
+					});
+				};
+			},
+			/**
+			 * 默认选中属性
+			 *
+			 */
+			DefaultSelect: function() {
+				let productAttr = this.attr.productAttr;
+				let value = [];
+				let arr = []
+				let unSortArr = []
+				for (var key in this.productValue) {
+					if (this.productValue[key].stock > 0) {
+						value = this.attr.productAttr.length ? key.split(",") : [];
+						break;
+					}
+				}
+				for (let i = 0; i < productAttr.length; i++) {
+					this.$set(productAttr[i], "index", value[i]);
+				}
+				//sort();排序函数:数字-英文-汉字；
+				let productSelect = this.productValue[value.join(",")];
+				if (productSelect && productAttr.length) {
+					this.$set(
+						this.attr.productSelect,
+						"store_name",
+						this.storeInfo.store_name
+					);
+					this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : this
+						.storeInfo
+						.image);
+					this.$set(this.attr.productSelect, "price", productSelect.price);
+					this.$set(this.attr.productSelect, "svip_price", productSelect.svip_price);
+					this.$set(this.attr.productSelect, "stock", productSelect.stock);
+					this.$set(this.attr.productSelect, "unique", productSelect.unique);
+					this.$set(this, "uniqueValue", productSelect.unique);
+					this.$set(this, "attrValue", value.join(","));
+					this.$set(this, "attrTxt", "选择");
+					if (productSelect.stock == 0) {
+						this.$set(this.attr.productSelect, "cart_num", 0);
+					} else {
+						this.$set(this.attr.productSelect, "cart_num", this.min_count || 1);
+					}
+				} else if (!productSelect && productAttr.length) {
+					this.$set(
+						this.attr.productSelect,
+						"store_name",
+						this.storeInfo.store_name
+					);
+					this.$set(this.attr.productSelect, "image", this.storeInfo.image);
+					this.$set(this.attr.productSelect, "price", this.storeInfo.price);
+					this.$set(this.attr.productSelect, "svip_price", this.storeInfo.svip_price);
+					this.$set(this.attr.productSelect, "stock", 0);
+					this.$set(this.attr.productSelect, "unique", "");
+					this.$set(this, "uniqueValue", "");
+					this.$set(this.attr.productSelect, "cart_num", 0);
+					this.$set(this, "attrValue", "");
+					this.$set(this, "attrTxt", "选择");
+				} else if (!productSelect && !productAttr.length) {
+					this.$set(
+						this.attr.productSelect,
+						"store_name",
+						this.storeInfo.store_name
+					);
+					this.$set(this.attr.productSelect, "image", this.storeInfo.image);
+					this.$set(this.attr.productSelect, "price", this.storeInfo.price);
+					this.$set(this.attr.productSelect, "svip_price", this.storeInfo.svip_price);
+					this.$set(this.attr.productSelect, "stock", this.storeInfo.stock);
+					this.$set(this.attr.productSelect, "unique", this.storeInfo.unique || "");
+					this.$set(this, "uniqueValue", this.storeInfo.unique || "");
+					this.$set(this.attr.productSelect, "cart_num", 1);
+					this.$set(this, "attrValue", "");
+					this.$set(this, "attrTxt", "选择");
+				} else if (productSelect && !productAttr.length) {
+					this.$set(this.attr.productSelect, "store_name", this.storeInfo.store_name);
+					this.$set(this.attr.productSelect, "image", productSelect.image);
+					this.$set(this.attr.productSelect, "price", productSelect.price);
+					this.$set(this.attr.productSelect, "svip_price", productSelect.svip_price);
+					this.$set(this.attr.productSelect, "stock", productSelect.stock);
+					this.$set(this.attr.productSelect, "unique", productSelect.unique);
+					this.$set(this, "uniqueValue", productSelect.unique);
+					this.$set(this, "attrValue", value.join(","));
+					this.$set(this, "attrTxt", "选择");
+					if (productSelect.stock == 0) {
+						this.$set(this.attr.productSelect, "cart_num", 0);
+					} else {
+						this.$set(this.attr.productSelect, "cart_num", this.min_count || 1);
+					}
+				}
+			},
+			/**
+			 * 获取优惠券
+			 *
+			 */
+			getCouponList() {
+				let that = this;
+				let goodsArr = []
+				let couponList = [];
+				let activeList = []
+				getCoupons({
+					ids: that.id
+				}).then(res => {
+					goodsArr = res.data
+					getShopCoupons(that.storeInfo.mer_id).then(({
+						data
+					}) => {
+						couponList = goodsArr.concat(data)
+						that.$set(that.coupon, 'list', couponList);
+						for (let i = 0; i < couponList.length; i++) {
+							if (!couponList[i].issue && activeList.length < 2) {
+								activeList.push(couponList[i]);
+							}
+						}
+						that.$set(that, 'couponList', activeList);
+					})
+				});
+			},
+			ChangCouponsUseState(index) {
+				let that = this;
+				that.$set(that.coupon, 'coupon', false);
+			},
+			/**
+			 *
+			 *
+			 * 收藏商品
+			 */
+			setCollect: function() {
+				if (this.isLogin === false) {
+					toLogin()
+				} else {
+					let that = this;
+					if (this.storeInfo.isRelation) {
+						collectDel({
+							type: 0,
+							type_id: this.id
+						}).then(res => {
+							that.$util.Tips({
+								title: '已取消收藏'
+							});
+							that.$set(that.storeInfo, 'isRelation', !that.storeInfo.isRelation);
+						}).catch(err => {
+							that.$util.Tips({
+								title: err
+							});
+						})
+					} else {
+						collectAdd({
+							type_id: this.id,
+							type: 0
+						}).then(res => {
+							that.$util.Tips({
+								title: '收藏成功'
+							});
+							that.$set(that.storeInfo, 'isRelation', !that.storeInfo.isRelation);
+						}).catch(err => {
+							that.$util.Tips({
+								title: err
+							});
+						})
+					}
+				}
+			},
+			/**
+			 * 打开属性插件
+			 */
+			selecAttr: function() {
+				this.$set(this.attr, 'cartAttr', true);
+				this.$set(this, 'isOpen', true);
+			},
+			/**
+			 * 打开优惠券插件
+			 */
+			couponTap: function() {
+				let that = this;
+				if (that.isLogin === false) {
+					toLogin()
+				} else {
+					that.$set(that.coupon, 'coupon', true);
+				}
+			},
+			goCustomer: function() {
+				let that = this;
+				if (that.isLogin === false) {
+					toLogin()
+				} else {
+					uni.navigateTo({
+						url: `/pages/chat/customer_list/chat?mer_id=${that.storeInfo.mer_id}&uid=${that.uid}&productId=${that.id}`
+					});
+				}
+			},
+			onMyEvent: function() {
+				this.$set(this.attr, 'cartAttr', false);
+				this.$set(this, 'isOpen', false);
+			},
+			/**
+			 * 打开属性加入购物车
+			 *
+			 */
+			joinCart: function(e) {
+				//是否登录
+				if (this.isLogin === false) {
+					toLogin()
+				} else {
+					this.goCat();
+				}
+			},
+			/*
+			 * 加入购物车
+			 */
+			goCat: function(news) {
+				let that = this,
+					productSelect = that.productValue[this.attrValue];
+				//打开属性
+				if (that.attrValue) {
+					//默认选中了属性，但是没有打开过属性弹窗还是自动打开让用户查看默认选中的属性
+					that.attr.cartAttr = !that.isOpen ? true : false;
+					// if(!that.isOpen)that.attr.cartAttr = true
+				} else {
+					if (that.isOpen) that.attr.cartAttr = true;
+					else
+						that.attr.cartAttr = !that.attr.cartAttr;
+				}
+				//只有关闭属性弹窗时进行加入购物车
+				if (that.attr.cartAttr === true && that.isOpen === false)
+					return (that.isOpen = true);
+				that.isOpen = that.attr.cartAttr = true;
+				//如果有属性,没有选择,提示用户选择
+				if (
+					that.attr.productAttr.length &&
+					that.isOpen === true &&
+					productSelect.stock == 0
+				)
+					return that.$util.Tips({
+						title: "产品库存不足，请选择其它"
+					});
+				if (that.attr.productSelect.cart_num == 0) {
+					return that.$util.Tips({
+						title: '购买个数不能为0！'
+					})
+				}
+				let q = {
+					is_new: news === undefined ? 0 : 1,
+					product_id: that.id,
+					cart_num: that.attr.productSelect.cart_num,
+					product_attr_unique: that.attr.productSelect !== undefined ? that.attr.productSelect.unique :
+						"",
+					source: this.source,
+					product_type: 0,
+					spread_id: this.currSpid,
+					sale_type: this.sale_type
+				};
+				postCartAdd(q)
+					.then(function(res) {
+						that.isOpen = that.attr.cartAttr = false;
+						let cartId = res.data.cart_id
+						if (news) {
+							uni.navigateTo({
+								url: `/pages/users/order_confirm/index?cartId=${cartId}&sale_type=${that.sale_type}`
+							});
+						} else {
+							that.$util.Tips({
+								title: "添加购物车成功",
+								success: () => {
+									that.getCartCount(true);
+								}
+							});
+						}
+					})
+					.catch(res => {
+						return that.$util.Tips({
+							title: res
+						});
+					});
+			},
+			/**
+			 * 获取购物车数量
+			 * @param boolean 是否展示购物车动画和重置属性
+			 */
+			getCartCount: function(isAnima) {
+				let that = this;
+				const isLogin = that.isLogin;
+				if (isLogin) {
+					getCartCounts({
+						sale_type: this.sale_type
+					}).then(res => {
+						that.CartCount = res.data[0].count;
+						//加入购物车后重置属性
+						if (isAnima) {
+							that.animated = true;
+							setTimeout(function() {
+								that.animated = false;
+							}, 500);
+						}
+					});
+				}
+			},
+			/**
+			 * 立即购买
+			 */
+			goBuy: function(e) {
+				if (this.isLogin === false) {
+					// toLogin()
+					this.isShowAuth = true;
+				} else {
+					this.goCat(true);
+				}
+			},
+			/**
+			 * 分享打开
+			 *
+			 */
+			listenerActionSheet: function() {
+				if (this.isLogin === false) {
+					toLogin()
+				} else {
+					// #ifdef H5
+					if (this.$wechat.isWeixin() === true) {
+						this.weixinStatus = true;
+					}
+					// #endif
+					this.posters = true;
+				}
+			},
+			// 分享关闭
+			listenerActionClose: function() {
+				this.posters = false;
+				this.currentPage = false;
+			},
+			//隐藏海报
+			posterImageClose: function() {
+				this.posterImageStatus = false
+			},
+			//替换安全域名
+			setDomain: function(url) {
+				url = url ? url.toString() : '';
+				//本地调试打开,生产请注销
+				if (url.indexOf("https://") > -1) return url;
+				else return url.replace('http://', 'https://');
+			},
+			/**
+			 * 获取产品分销二维码
+			 * @param function successFn 下载完成回调
+			 *
+			 */
+			downloadFilePromotionCode: function(successFn) {
+				let that = this;
+				let type;
+				// #ifndef MP
+				type = 'wechat'
+				// #endif
+				// #ifdef MP
+				type = 'routine'
+				// #endif
+				getProductCode(that.id, {
+					type: type,
+					product_type: 0
+				}).then(async res => {
+					that.codeImg = res.data.url
+					that.$set(that, 'isDown', false);
+				}).catch(err => {
+					that.$set(that, 'isDown', false);
+					that.$set(that, 'PromotionCode', '');
+				});
+			},
+			// 小程序关闭分享弹窗；
+			goFriend: function() {
+				this.posters = false;
+				this.currentPage = false;
+			},
+			/**
+			 * 生成海报
+			 */
+			async goPoster() {
+				if (this.posterImage) {
+					this.posterImageStatus = true
+					this.posters = false
+					return
+				}
+				let that = this;
+				let arr2
+				that.posters = false;
+				that.$set(that, 'canvasStatus', true);
+				uni.showLoading({
+					title: '海报生成中',
+					mask: true
+				});
+				// #ifdef MP || APP-PLUS
+				arr2 = [that.posterbackgd, await that.fileStoreImage(that.storeImage), await that.fileStoreImage(
+					that.codeImg), await that.fileStoreImage(that.share_pic)];
+				// #endif
+				// #ifdef H5
+				arr2 = [that.posterbackgd, await that.imgToBase(that.storeImage), await that.imgToBase(that.codeImg),
+					await that.imgToBase(that.share_pic)
+				];
+				// #endif
+				//生成推广海报
+				that.$util.goodsPosterCanvas(arr2, that.storeInfo.store_name, that.storeInfo.price, that.site_name,
+					that
+					.storeInfo.ot_price,
+					function(tempFilePath) {
+						that.$set(that, 'posterImage', tempFilePath);
+						that.$set(that, 'posterImageStatus', true);
+						that.$set(that, 'actionSheetHidden', !that.actionSheetHidden);
+						that.$set(that, 'canvasStatus', false);
+					}, (err) => {
+						that.$set(that, 'canvasStatus', false);
+					});
+			},
+			//图片转符合安全域名路径
+			fileStoreImage(url) {
+				// #ifdef MP  || APP-PLUS
+				let ishttps = url.split('//')[0] == 'https:'
+				if (!ishttps) {
+					url = 'https://' + url.split('//')[1]
+				}
+				// #endif
+				return new Promise((resolve, reject) => {
+					let that = this;
+					uni.downloadFile({
+						url: url,
+						success: function(res) {
+							resolve(res.tempFilePath);
+						},
+						fail: function() {
+							return that.$util.Tips({
+								title: ''
+							});
+						}
+					});
+				})
+			},
+			/*
+			 * 保存到手机相册
+			 */
+			// #ifdef MP
+			savePosterPath: function() {
+				let that = this;
+				uni.getSetting({
+					success(res) {
+						if (!res.authSetting['scope.writePhotosAlbum']) {
+							uni.authorize({
+								scope: 'scope.writePhotosAlbum',
+								success() {
+									uni.saveImageToPhotosAlbum({
+										filePath: that.posterImage,
+										success: function(res) {
+											that.posterImageClose();
+											that.$util.Tips({
+												title: '保存成功',
+												icon: 'success'
+											});
+										},
+										fail: function(res) {
+											that.$util.Tips({
+												title: '保存失败'
+											});
+										}
+									})
+								}
+							})
+						} else {
+							uni.saveImageToPhotosAlbum({
+								filePath: that.posterImage,
+								success: function(res) {
+									that.posterImageClose();
+									that.$util.Tips({
+										title: '保存成功',
+										icon: 'success'
+									});
+								},
+								fail: function(res) {
+									that.$util.Tips({
+										title: '保存失败'
+									});
+								},
+							})
+						}
+					}
+				})
+			},
+			// #endif
+			// #ifdef APP-PLUS
+			savePosterPath() {
+				let that = this
+				uni.saveImageToPhotosAlbum({
+					filePath: that.posterImage,
+					success: function(res) {
+						that.posterImageClose();
+						that.$util.Tips({
+							title: '保存成功',
+							icon: 'success'
+						});
+					},
+					fail: function(res) {
+						that.$util.Tips({
+							title: '保存失败'
+						});
+					},
+				})
+			},
+			// #endif
+			//#ifdef H5
+			ShareInfo() {
+				let data = this.storeInfo;
+				let href = location.href;
+				if (this.$wechat.isWeixin()) {
+					getUserInfo().then(res => {
+						href =
+							href.indexOf("?") === -1 ?
+							href + "?spid=" + res.data.uid :
+							href + "&spid=" + res.data.uid;
+
+						let configAppMessage = {
+							desc: data.store_info,
+							title: data.store_name,
+							link: href,
+							imgUrl: data.image
+						};
+						this.$wechat.wechatEvevt([
+							"updateAppMessageShareData",
+							"updateTimelineShareData",
+							"onMenuShareAppMessage",
+							"onMenuShareTimeline"
+						], configAppMessage).then(res => {}).catch(err => {
+							console.log(err);
+						})
+					});
+				}
+			},
+			//#endif
+			async imgToBase(url) {
+				let res = await imgToBase({
+					image: url
+				})
+				return res.data.image
+			},
+			//复制口令
+			copyPwd() {
+				let that = this;
+				copyPasswordApi({
+					id: that.id,
+					product_type: 0
+				}).then(async res => {
+					that.copyUrl = res.data.str;
+					that.posters = false
+					that.isCopy = true;
+				})
+			},
+			closeCopy() {
+				this.isCopy = false
+			},
+			// APP分享
+			appShare(scene) {
+				let that = this
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				});
+				let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
+				let curRoute = routes[routes.length - 1].$page.fullPath // 获取当前页面路由，也就是最后一个打开的页面路由
+				uni.share({
+					provider: "weixin",
+					scene: scene,
+					type: 0,
+					href: `${HTTP_REQUEST_URL}${curRoute}&spid=${that.uid}`,
+					title: that.storeInfo.store_name,
+					summary: that.storeInfo.store_info,
+					imageUrl: that.storeInfo.image,
+					success: function(res) {
+						uni.showToast({
+							title: '分享成功',
+							icon: 'success'
+						})
+						that.posters = false;
+						uni.hideLoading();
+					},
+					fail: function(err) {
+						uni.showToast({
+							title: '分享失败',
+							icon: 'none',
+							duration: 2000
+						})
+						that.posters = false;
+						uni.hideLoading();
+					}
+				});
+			}
+		}
+	}
 </script>
 <style lang="scss" scoped>
-  .ml8 {
-    top: 2rpx
-  }
-
-  .activity_pin {
-    width: auto;
-    height: 44rpx;
-    line-height: 44rpx;
-    background: linear-gradient(90deg, rgba(233, 51, 35, 1) 0%, rgba(250, 101, 20, 1) 100%);
-    opacity: 1;
-    border-radius: 22rpx;
-    padding: 0 15rpx;
-    margin-left: 19rpx;
-  }
-
-  .activity_miao {
-    width: auto;
-    height: 44rpx;
-    line-height: 44rpx;
-    padding: 0 15rpx;
-    background: linear-gradient(90deg, rgba(250, 102, 24, 1) 0%, rgba(254, 161, 15, 1) 100%);
-    opacity: 1;
-    border-radius: 22rpx;
-    margin-left: 19rpx;
-  }
-
-  .iconfonts {
-    color: #fff !important;
-    font-size: 28rpx;
-  }
-
-  .activity_title {
-    font-size: 24rpx;
-    color: #fff;
-  }
-
-  .activity_kan {
-    width: auto;
-    height: 44rpx;
-    line-height: 44rpx;
-    padding: 0 15rpx;
-    background: linear-gradient(90deg, rgba(254, 159, 15, 1) 0%, rgba(254, 178, 15, 1) 100%);
-    opacity: 1;
-    border-radius: 22rpx;
-    margin-left: 19rpx;
-  }
-
-  .t-color {
-    color: var(--view-theme);
-  }
-
-  .p-color {
-    color: var(--view-priceColor);
-  }
-
-  .bt-color {
-    background-color: var(--view-theme);
-    border: 1px solid var(--view-theme);
-  }
-
-  .head-bar {
-    background: #fff;
-  }
-
-  .generate-posters {
-    width: 100%;
-    height: 170rpx;
-    background-color: #fff;
-    position: fixed;
-    left: 0;
-    bottom: 0;
-    z-index: 388;
-    transform: translate3d(0, 100%, 0);
-    transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
-    border-top: 1px solid #eee;
-  }
-
-  .generate-posters.on {
-    transform: translate3d(0, 0, 0);
-  }
-
-  .generate-posters .item {
-    /* #ifdef H5 */
-    flex: 50%;
-    /* #endif */
-    /* #ifndef H5 */
-    flex: 33.33%;
-    /* #endif */
-    text-align: center;
-    font-size: 30rpx;
-
-    &.item3 {
-      flex: 33.33%;
-    }
-  }
-
-  .generate-posters .item .iconfont {
-    font-size: 80rpx;
-    color: #5eae72;
-  }
-
-  .generate-posters .item .iconfont.icon-haibao {
-    color: #5391f1;
-  }
-
-  .generate-posters .item .iconfont.icon-fuzhikouling1 {
-    color: #FBB324;
-  }
-
-  .product-con .footer {
-    padding: 0 20rpx 0 40rpx;
-    position: fixed;
-    left: 0;
-    bottom: 0;
-    width: 100%;
-    box-sizing: border-box;
-    height: 100rpx;
-    height: calc(100rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
-    height: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
-    background-color: #fff;
-    z-index: 277;
-    border-top: 1px solid #f0f0f0;
-
-    &.footpl {
-      padding-left: 80rpx;
-    }
-  }
-
-  .product-con .footer .item {
-    font-size: 18rpx;
-    color: #666;
-    text-align: center;
-  }
-
-  .product-con .attribute .atterTxt {
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    display: inline-block;
-    width: 400rpx;
-  }
-
-  .product-con .attribute .params {
-    margin-right: 20rpx;
-    font-size: 28rpx;
-    color: #282828;
-
-    &:nth-child(2) {
-      margin-right: 0;
-    }
-  }
-
-  .product-con .attribute .atterTxt1 {
-    color: #282828;
-
-    &.hasAttr {
-      &:after {
-        content: "";
-        display: inline-block;
-        position: relative;
-        top: -6rpx;
-        margin: 0 6rpx;
-        width: 5rpx;
-        height: 5rpx;
-        background-color: #282828;
-        border-radius: 100%;
-      }
-
-      &:last-child {
-        &:after {
-          display: none;
-        }
-      }
-    }
-  }
-
-  .product-con .wrapper .coupon .activity {
-    border: 1px solid var(--view-theme);
-    color: var(--view-theme);
-
-    &::before,
-    &::after {
-      border: 1px solid var(--view-theme);
-    }
-
-    &::before {
-      border-left-color: #ffffff;
-    }
-
-    &::after {
-      border-right-color: #ffffff;
-    }
-  }
-
-  .product-con .guaranteeAttr {
-    display: inline-block;
-    width: 560rpx;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-  }
-
-  .product-con .footer .item .iconfont {
-    text-align: center;
-    font-size: 40rpx;
-  }
-
-  .fenxiang_btn {
-    .icon-yishoucang2 {
-      color: var(--view-priceColor) !important;
-    }
-  }
-
-  .product-con .wrapper .introduce {
-    margin: 20rpx 30rpx 0;
-
-    &.atmosphere {
-      padding: 20rpx 30rpx;
-      margin: 0;
-      justify-content: space-between;
-      align-items: flex-start;
-
-      .title {
-        width: 540rpx;
-      }
-    }
-
-    .font-bg-red {
-      position: relative;
-      /* #ifdef H5 */
-      top: -2rpx;
-      /* #endif */
-      /* #ifndef H5 */
-      top: -4rpx;
-      /* #endif */
-    }
-  }
-
-  .product-con .footer .item .iconfont.icon-shoucang1 {
-    color: var(--view-priceColor);
-  }
-
-  .integral_count {
-    padding: 0 30rpx;
-  }
-
-  .product-con .integral {
-    display: inline-block;
-    margin: 20rpx 30rpx 0 0;
-    color: #FF9000;
-    background-color: #FFF4E6;
-    height: 40rpx;
-    line-height: 40rpx;
-    border-radius: 22rpx;
-    padding: 0 26rpx;
-    font-size: 24rpx;
-    font-weight: normal;
-
-    &:last-child {
-      margin-left: 0;
-    }
-  }
-
-  .product-con .footer .item .iconfont.icon-gouwuche1 {
-    font-size: 40rpx;
-    position: relative;
-  }
-
-  .product-con .footer .item .iconfont.icon-gouwuche1 .num {
-    color: #fff;
-    position: absolute;
-    font-size: 18rpx;
-    height: 30rpx;
-    border-radius: 200rpx;
-    padding: 0 8rpx;
-    box-sizing: border-box;
-    top: -10rpx;
-    right: -10rpx;
-    background-color: var(--view-theme);
-    min-width: 30rpx;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-
-  .product-con .footer .bnt {
-    width: 444rpx;
-    height: 76rpx;
-  }
-
-  .product-con .footer .bnt .bnts {
-    width: 222rpx;
-    text-align: center;
-    line-height: 76rpx;
-    color: #fff;
-    font-size: 28rpx;
-
-    &.sold_out {
-      width: 444rpx;
-      border-radius: 50rpx;
-    }
-
-    &.virtual_buy {
-      width: 444rpx;
-      border-radius: 50rpx;
-    }
-  }
-
-  .product-con .footer .bnt .joinCart {
-    border-radius: 50rpx 0 0 50rpx;
-    background-image: linear-gradient(90deg, var(--view-bntColor11) 0%, var(--view-bntColor12) 100%);
-
-    &.disabled {
-      background: #bbb;
-    }
-  }
-
-  .product-con .footer .bnt .buy {
-    border-radius: 0 50rpx 50rpx 0;
-    background-image: linear-gradient(90deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
-  }
-
-  .product-con .footer .bnt .buy[disabled] {
-    background: #bbb;
-  }
-
-  .product-con .superior {
-    background-color: #fff;
-    margin-top: 20rpx;
-    padding-bottom: 10rpx;
-  }
-
-  .product-con .superior .title {
-    height: 98rpx;
-  }
-
-  .product-con .superior .title image {
-    width: 30rpx;
-    height: 30rpx;
-  }
-
-  .product-con .superior .title .titleTxt {
-    margin: 0 20rpx;
-    font-size: 30rpx;
-    background-image: linear-gradient(to right, #f57a37 0%, #f21b07 100%);
-    -webkit-background-clip: text;
-    -webkit-text-fill-color: transparent;
-  }
-
-  .product-con .superior .slider-banner {
-    width: 690rpx;
-    margin: 0 auto;
-    position: relative;
-  }
-
-  .product-con .superior .slider-banner swiper {
-    height: 100%;
-    width: 100%;
-  }
-
-  .product-con .superior .slider-banner swiper-item {
-    height: 100%;
-  }
-
-  .product-con .superior .slider-banner .list {
-    width: 100%;
-  }
-
-  .product-con .superior .slider-banner .list .item {
-    width: 215rpx;
-    margin: 0 22rpx 30rpx 0;
-    font-size: 26rpx;
-  }
-
-  .product-con .superior .slider-banner .list .item:nth-of-type(3n) {
-    margin-right: 0;
-  }
-
-  .product-con .superior .slider-banner .list .item .pictrue {
-    position: relative;
-    width: 100%;
-    height: 215rpx;
-  }
-
-  .product-con .superior .slider-banner .list .item .pictrue image {
-    width: 100%;
-    height: 100%;
-    border-radius: 6rpx;
-  }
-
-  .product-con .superior .slider-banner .list .item .name {
-    color: #282828;
-    margin-top: 12rpx;
-  }
-
-  .product-con .superior .slider-banner .swiper-pagination-bullet {
-    background-color: #999;
-  }
-
-  .product-con .superior .slider-banner .swiper-pagination-bullet-active {
-    background-color: #e93323;
-  }
-
-  .svipCon {
-    height: 64rpx;
-    padding: 0 20rpx;
-    margin: 8rpx 20rpx 0;
-    background: #FAE3BB;
-    font-size: 24rpx;
-    color: #B37400;
-    border-radius: 10rpx;
-
-    image {
-      width: 38rpx;
-      height: 38rpx;
-      margin-right: 20rpx;
-    }
-  }
-
-  .svipCon .svipBtn {
-    font-size: 22rpx;
-
-    .iconfont {
-      font-size: 18rpx;
-      margin-left: 4rpx;
-    }
-  }
-
-  button {
-    padding: 0;
-    margin: 0;
-    line-height: normal;
-    background-color: #fff;
-  }
-
-  button::after {
-    border: 0;
-  }
-
-  action-sheet-item {
-    padding: 0;
-    height: 240rpx;
-    align-items: center;
-    display: flex;
-  }
-
-  .contact {
-    font-size: 16px;
-    width: 50%;
-    background-color: #fff;
-    padding: 8rpx 0;
-    border-radius: 0;
-    margin: 0;
-    line-height: 2;
-  }
-
-  .contact::after {
-    border: none;
-  }
-
-  .action-sheet {
-    font-size: 17px;
-    line-height: 1.8;
-    width: 50%;
-    position: absolute;
-    top: 0;
-    right: 0;
-    padding: 25rpx 0;
-  }
-
-  .canvas {
-    z-index: 300;
-    width: 750px;
-    height: 1190px;
-  }
-
-  .poster-pop {
-    width: 600rpx;
-    height: 897rpx;
-    position: fixed;
-    left: 50%;
-    transform: translateX(-50%);
-    z-index: 399;
-    top: 50%;
-    margin-top: -500rpx;
-  }
-
-  .poster-pop image {
-    width: 100%;
-    height: 100%;
-    display: block;
-  }
-
-  .poster-pop .close {
-    width: 46rpx;
-    height: 75rpx;
-    position: fixed;
-    right: 0;
-    top: -73rpx;
-    display: block;
-  }
-
-  .poster-pop .save-poster {
-    background-color: #df2d0a;
-    font-size: 22rpx;
-    color: #fff;
-    text-align: center;
-    height: 76rpx;
-    line-height: 76rpx;
-    width: 100%;
-    border-radius: 43rpx;
-    margin-top: 20rpx;
-  }
-
-  .poster-pop .keep {
-    color: #fff;
-    text-align: center;
-    font-size: 25rpx;
-    margin-top: 10rpx;
-  }
-
-  .mask {
-    position: fixed;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background-color: rgba(0, 0, 0, 0.6);
-    z-index: 9;
-  }
-
-  .pictrue_log {
-    width: 80upx;
-    height: 40upx;
-    border-radius: 6upx 0 12upx 0;
-    line-height: 40upx;
-    font-size: 24upx;
-  }
-
-  .pictrue_log_class {
-    z-index: 3;
-    background: -webkit-gradient(linear, left top, right top, from(rgba(246, 122, 56, 1)), to(rgba(241, 27, 9, 1)));
-    background: linear-gradient(90deg, rgba(246, 122, 56, 1) 0%, rgba(241, 27, 9, 1) 100%);
-    opacity: 1;
-    position: absolute;
-    top: 0;
-    left: 0;
-    color: #fff;
-    text-align: center;
-  }
-
-  .navbar .header {
-    height: 96rpx;
-    font-size: 30rpx;
-    color: #050505;
-    background-color: #fff;
-    /* #ifdef MP */
-    padding-right: 95rpx;
-    /* #endif */
-  }
-
-  .navbar .header .item {
-    position: relative;
-    margin: 0 25rpx;
-  }
-
-  .navbar .header .item.on:before {
-    position: absolute;
-    width: 60rpx;
-    height: 5rpx;
-    background-repeat: no-repeat;
-    content: "";
-    background-image: linear-gradient(to right, #ff3366 0%, #ff6533 100%);
-    bottom: -10rpx;
-    left: 50%;
-    margin-left: -28rpx;
-  }
-
-  .navbar {
-    position: fixed;
-    background-color: #fff;
-    top: 0;
-    left: 0;
-    z-index: 99;
-    width: 100%;
-  }
-
-  .navbar .navbarH {
-    position: relative;
-  }
-
-  .navbar .navbarH .navbarCon {
-    position: absolute;
-    bottom: 0;
-    height: 100rpx;
-    width: 100%;
-  }
-
-  .share-box {
-    z-index: 1000;
-    position: fixed;
-    left: 0;
-    top: 0;
-    width: 100%;
-    height: 100%;
-
-    image {
-      width: 100%;
-      height: 100%;
-    }
-  }
-
-  .store-wrapper {
-    margin-top: 20rpx;
-    background-color: #fff;
-
-    .store-hd {
-      padding: 30rpx;
-      border-bottom: 1px solid #F5F5F5;
-
-      .store-info {
-        position: relative;
-        display: flex;
-
-        .store-margin {
-          width: 24rpx;
-          height: 26rpx;
-          margin-left: 10rpx;
-        }
-
-        .logo {
-          width: 86rpx;
-          height: 86rpx;
-
-          image {
-            width: 86rpx;
-            height: 86rpx;
-            border-radius: 6rpx;
-          }
-        }
-
-        .info {
-          display: flex;
-          flex-direction: column;
-          justify-content: center;
-          margin-left: 20rpx;
-
-          .name {
-            font-size: 28rpx;
-            color: #282828;
-            font-weight: bold;
-            display: flex;
-            align-items: center;
-          }
-
-          .txt {
-            margin-top: 8rpx;
-            color: #666666;
-            font-size: 22rpx;
-          }
-        }
-
-        .link {
-          position: absolute;
-          right: 0;
-          top: 50%;
-          transform: translateY(-50%);
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          width: 114rpx;
-          height: 50rpx;
-          background-image: linear-gradient(-90deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
-          border-radius: 25rpx;
-          color: #fff;
-        }
-      }
-
-      .score-wrapper {
-        display: flex;
-        justify-content: space-between;
-        margin-top: 30rpx;
-
-        .item {
-          color: #948D8C;
-          font-size: 26rpx;
-
-          text {
-            margin-left: 10rpx;
-            color: var(--view-priceColor);
-          }
-        }
-      }
-    }
-
-    .con-box {
-      padding: 20rpx 30rpx 0;
-
-      .title {
-        font-size: 28rpx;
-        color: #282828;
-      }
-
-      .moer-btn {
-        font-size: 28rpx;
-        color: #999999;
-      }
-
-      .img-box {
-        .img-item {
-          width: 220rpx;
-          margin: 30rpx 15rpx 0 0;
-          display: inline-block;
-
-          &:nth-child(3n) {
-            margin-right: 0;
-          }
-
-          /deep/image,
-          /deep/uni-image,
-          /deep/.easy-loadimage {
-            width: 218rpx;
-            height: 220rpx;
-            border-radius: 16rpx;
-            display: inline-block;
-          }
-
-          .txt {
-            .title {
-              font-size: 28rpx;
-              color: #282828;
-              margin-top: 15rpx;
-            }
-
-            .price {
-              color: var(--view-priceColor);
-              font-size: 28rpx;
-
-              text {
-                font-size: 20rpx;
-              }
-            }
-          }
-        }
-      }
-
-      /deep/.uni-swiper-dot {
-        width: 8rpx;
-        height: 4rpx;
-        background: rgba(0, 0, 0, .15);
-      }
-
-      /deep/.uni-swiper-dot-active {
-        width: 16rpx;
-        background: var(--view-theme);
-      }
-
-      .page_swiper,
-      swiper {
-        height: 760rpx;
-      }
-    }
-  }
-
-  .sys-head {
-    background: transparent;
-  }
-
-  .swiper-item,
-  /deep/uni-swiper-wrapper,
-  /deep/uni-swiper {
-    height: 740rpx !important;
-  }
-
-  .head-wrapper {
-    z-index: 999;
-    display: flex;
-    align-items: center;
-    position: fixed;
-    left: 30rpx;
-    top: 0;
-  }
-
-  .head-menu {
-    display: flex;
-    align-items: center;
-    height: 58rpx;
-    width: 158rpx;
-    background: rgba(255, 255, 255, 0.302);
-    border: 2rpx solid rgba(0, 0, 0, 0.0588);
-    border-radius: 29rpx;
-
-    .iconfont {
-      flex: 1;
-      text-align: center;
-      color: #000000;
-      box-sizing: border-box;
-
-      &.icon-fanhui2 {
-        border-right: 1px solid rgba(0, 0, 0, 0.2);
-        ;
-      }
-    }
-  }
-
-  .price-tab {
-    margin-right: 10rpx;
-    font-weight: 400 !important;
-    padding: 3rpx 8rpx 5rpx 8rpx;
-    margin-top: 16rpx;
-    border-radius: 8rpx;
-    color: #000000;
-    // border: 1px solid #F55726;
-  }
+	.ml8 {
+		top: 2rpx
+	}
+
+	.activity_pin {
+		width: auto;
+		height: 44rpx;
+		line-height: 44rpx;
+		background: linear-gradient(90deg, rgba(233, 51, 35, 1) 0%, rgba(250, 101, 20, 1) 100%);
+		opacity: 1;
+		border-radius: 22rpx;
+		padding: 0 15rpx;
+		margin-left: 19rpx;
+	}
+
+	.activity_miao {
+		width: auto;
+		height: 44rpx;
+		line-height: 44rpx;
+		padding: 0 15rpx;
+		background: linear-gradient(90deg, rgba(250, 102, 24, 1) 0%, rgba(254, 161, 15, 1) 100%);
+		opacity: 1;
+		border-radius: 22rpx;
+		margin-left: 19rpx;
+	}
+
+	.iconfonts {
+		color: #fff !important;
+		font-size: 28rpx;
+	}
+
+	.activity_title {
+		font-size: 24rpx;
+		color: #fff;
+	}
+
+	.activity_kan {
+		width: auto;
+		height: 44rpx;
+		line-height: 44rpx;
+		padding: 0 15rpx;
+		background: linear-gradient(90deg, rgba(254, 159, 15, 1) 0%, rgba(254, 178, 15, 1) 100%);
+		opacity: 1;
+		border-radius: 22rpx;
+		margin-left: 19rpx;
+	}
+
+	.t-color {
+		color: var(--view-theme);
+	}
+
+	.p-color {
+		color: var(--view-priceColor);
+	}
+
+	.bt-color {
+		background-color: var(--view-theme);
+		border: 1px solid var(--view-theme);
+	}
+
+	.head-bar {
+		background: #fff;
+	}
+
+	.generate-posters {
+		width: 100%;
+		height: 170rpx;
+		background-color: #fff;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		z-index: 388;
+		transform: translate3d(0, 100%, 0);
+		transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
+		border-top: 1px solid #eee;
+	}
+
+	.generate-posters.on {
+		transform: translate3d(0, 0, 0);
+	}
+
+	.generate-posters .item {
+		/* #ifdef H5 */
+		flex: 50%;
+		/* #endif */
+		/* #ifndef H5 */
+		flex: 33.33%;
+		/* #endif */
+		text-align: center;
+		font-size: 30rpx;
+
+		&.item3 {
+			flex: 33.33%;
+		}
+	}
+
+	.generate-posters .item .iconfont {
+		font-size: 80rpx;
+		color: #5eae72;
+	}
+
+	.generate-posters .item .iconfont.icon-haibao {
+		color: #5391f1;
+	}
+
+	.generate-posters .item .iconfont.icon-fuzhikouling1 {
+		color: #FBB324;
+	}
+
+	.product-con .footer {
+		padding: 0 20rpx 0 40rpx;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		width: 100%;
+		box-sizing: border-box;
+		height: 100rpx;
+		height: calc(100rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
+		height: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
+		background-color: #fff;
+		z-index: 277;
+		border-top: 1px solid #f0f0f0;
+
+		&.footpl {
+			padding-left: 80rpx;
+		}
+	}
+
+	.product-con .footer .item {
+		font-size: 18rpx;
+		color: #666;
+		text-align: center;
+	}
+
+	.product-con .attribute .atterTxt {
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		display: inline-block;
+		width: 400rpx;
+	}
+
+	.product-con .attribute .params {
+		margin-right: 20rpx;
+		font-size: 28rpx;
+		color: #282828;
+
+		&:nth-child(2) {
+			margin-right: 0;
+		}
+	}
+
+	.product-con .attribute .atterTxt1 {
+		color: #282828;
+
+		&.hasAttr {
+			&:after {
+				content: "";
+				display: inline-block;
+				position: relative;
+				top: -6rpx;
+				margin: 0 6rpx;
+				width: 5rpx;
+				height: 5rpx;
+				background-color: #282828;
+				border-radius: 100%;
+			}
+
+			&:last-child {
+				&:after {
+					display: none;
+				}
+			}
+		}
+	}
+
+	.product-con .wrapper .coupon .activity {
+		border: 1px solid var(--view-theme);
+		color: var(--view-theme);
+
+		&::before,
+		&::after {
+			border: 1px solid var(--view-theme);
+		}
+
+		&::before {
+			border-left-color: #ffffff;
+		}
+
+		&::after {
+			border-right-color: #ffffff;
+		}
+	}
+
+	.product-con .guaranteeAttr {
+		display: inline-block;
+		width: 560rpx;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+
+	.product-con .footer .item .iconfont {
+		text-align: center;
+		font-size: 40rpx;
+	}
+
+	.fenxiang_btn {
+		.icon-yishoucang2 {
+			color: var(--view-priceColor) !important;
+		}
+	}
+
+	.product-con .wrapper .introduce {
+		margin: 20rpx 30rpx 0;
+
+		&.atmosphere {
+			padding: 20rpx 30rpx;
+			margin: 0;
+			justify-content: space-between;
+			align-items: flex-start;
+
+			.title {
+				width: 540rpx;
+			}
+		}
+
+		.font-bg-red {
+			position: relative;
+			/* #ifdef H5 */
+			top: -2rpx;
+			/* #endif */
+			/* #ifndef H5 */
+			top: -4rpx;
+			/* #endif */
+		}
+	}
+
+	.product-con .footer .item .iconfont.icon-shoucang1 {
+		color: var(--view-priceColor);
+	}
+
+	.integral_count {
+		padding: 0 30rpx;
+	}
+
+	.product-con .integral {
+		display: inline-block;
+		margin: 20rpx 30rpx 0 0;
+		color: #FF9000;
+		background-color: #FFF4E6;
+		height: 40rpx;
+		line-height: 40rpx;
+		border-radius: 22rpx;
+		padding: 0 26rpx;
+		font-size: 24rpx;
+		font-weight: normal;
+
+		&:last-child {
+			margin-left: 0;
+		}
+	}
+
+	.product-con .footer .item .iconfont.icon-gouwuche1 {
+		font-size: 40rpx;
+		position: relative;
+	}
+
+	.product-con .footer .item .iconfont.icon-gouwuche1 .num {
+		color: #fff;
+		position: absolute;
+		font-size: 18rpx;
+		height: 30rpx;
+		border-radius: 200rpx;
+		padding: 0 8rpx;
+		box-sizing: border-box;
+		top: -10rpx;
+		right: -10rpx;
+		background-color: var(--view-theme);
+		min-width: 30rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.product-con .footer .bnt {
+		width: 444rpx;
+		height: 76rpx;
+	}
+
+	.product-con .footer .bnt .bnts {
+		width: 222rpx;
+		text-align: center;
+		line-height: 76rpx;
+		color: #fff;
+		font-size: 28rpx;
+
+		&.sold_out {
+			width: 444rpx;
+			border-radius: 50rpx;
+		}
+
+		&.virtual_buy {
+			width: 444rpx;
+			border-radius: 50rpx;
+		}
+	}
+
+	.product-con .footer .bnt .joinCart {
+		border-radius: 50rpx 0 0 50rpx;
+		background-image: linear-gradient(90deg, var(--view-bntColor11) 0%, var(--view-bntColor12) 100%);
+
+		&.disabled {
+			background: #bbb;
+		}
+	}
+
+	.product-con .footer .bnt .buy {
+		border-radius: 0 50rpx 50rpx 0;
+		background-image: linear-gradient(90deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
+	}
+
+	.product-con .footer .bnt .buy[disabled] {
+		background: #bbb;
+	}
+
+	.product-con .superior {
+		background-color: #fff;
+		margin-top: 20rpx;
+		padding-bottom: 10rpx;
+	}
+
+	.product-con .superior .title {
+		height: 98rpx;
+	}
+
+	.product-con .superior .title image {
+		width: 30rpx;
+		height: 30rpx;
+	}
+
+	.product-con .superior .title .titleTxt {
+		margin: 0 20rpx;
+		font-size: 30rpx;
+		background-image: linear-gradient(to right, #f57a37 0%, #f21b07 100%);
+		-webkit-background-clip: text;
+		-webkit-text-fill-color: transparent;
+	}
+
+	.product-con .superior .slider-banner {
+		width: 690rpx;
+		margin: 0 auto;
+		position: relative;
+	}
+
+	.product-con .superior .slider-banner swiper {
+		height: 100%;
+		width: 100%;
+	}
+
+	.product-con .superior .slider-banner swiper-item {
+		height: 100%;
+	}
+
+	.product-con .superior .slider-banner .list {
+		width: 100%;
+	}
+
+	.product-con .superior .slider-banner .list .item {
+		width: 215rpx;
+		margin: 0 22rpx 30rpx 0;
+		font-size: 26rpx;
+	}
+
+	.product-con .superior .slider-banner .list .item:nth-of-type(3n) {
+		margin-right: 0;
+	}
+
+	.product-con .superior .slider-banner .list .item .pictrue {
+		position: relative;
+		width: 100%;
+		height: 215rpx;
+	}
+
+	.product-con .superior .slider-banner .list .item .pictrue image {
+		width: 100%;
+		height: 100%;
+		border-radius: 6rpx;
+	}
+
+	.product-con .superior .slider-banner .list .item .name {
+		color: #282828;
+		margin-top: 12rpx;
+	}
+
+	.product-con .superior .slider-banner .swiper-pagination-bullet {
+		background-color: #999;
+	}
+
+	.product-con .superior .slider-banner .swiper-pagination-bullet-active {
+		background-color: #e93323;
+	}
+
+	.svipCon {
+		height: 64rpx;
+		padding: 0 20rpx;
+		margin: 8rpx 20rpx 0;
+		background: #FAE3BB;
+		font-size: 24rpx;
+		color: #B37400;
+		border-radius: 10rpx;
+
+		image {
+			width: 38rpx;
+			height: 38rpx;
+			margin-right: 20rpx;
+		}
+	}
+
+	.svipCon .svipBtn {
+		font-size: 22rpx;
+
+		.iconfont {
+			font-size: 18rpx;
+			margin-left: 4rpx;
+		}
+	}
+
+	button {
+		padding: 0;
+		margin: 0;
+		line-height: normal;
+		background-color: #fff;
+	}
+
+	button::after {
+		border: 0;
+	}
+
+	action-sheet-item {
+		padding: 0;
+		height: 240rpx;
+		align-items: center;
+		display: flex;
+	}
+
+	.contact {
+		font-size: 16px;
+		width: 50%;
+		background-color: #fff;
+		padding: 8rpx 0;
+		border-radius: 0;
+		margin: 0;
+		line-height: 2;
+	}
+
+	.contact::after {
+		border: none;
+	}
+
+	.action-sheet {
+		font-size: 17px;
+		line-height: 1.8;
+		width: 50%;
+		position: absolute;
+		top: 0;
+		right: 0;
+		padding: 25rpx 0;
+	}
+
+	.canvas {
+		z-index: 300;
+		width: 750px;
+		height: 1190px;
+	}
+
+	.poster-pop {
+		width: 600rpx;
+		height: 897rpx;
+		position: fixed;
+		left: 50%;
+		transform: translateX(-50%);
+		z-index: 399;
+		top: 50%;
+		margin-top: -500rpx;
+	}
+
+	.poster-pop image {
+		width: 100%;
+		height: 100%;
+		display: block;
+	}
+
+	.poster-pop .close {
+		width: 46rpx;
+		height: 75rpx;
+		position: fixed;
+		right: 0;
+		top: -73rpx;
+		display: block;
+	}
+
+	.poster-pop .save-poster {
+		background-color: #df2d0a;
+		font-size: 22rpx;
+		color: #fff;
+		text-align: center;
+		height: 76rpx;
+		line-height: 76rpx;
+		width: 100%;
+		border-radius: 43rpx;
+		margin-top: 20rpx;
+	}
+
+	.poster-pop .keep {
+		color: #fff;
+		text-align: center;
+		font-size: 25rpx;
+		margin-top: 10rpx;
+	}
+
+	.mask {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background-color: rgba(0, 0, 0, 0.6);
+		z-index: 9;
+	}
+
+	.pictrue_log {
+		width: 80upx;
+		height: 40upx;
+		border-radius: 6upx 0 12upx 0;
+		line-height: 40upx;
+		font-size: 24upx;
+	}
+
+	.pictrue_log_class {
+		z-index: 3;
+		background: -webkit-gradient(linear, left top, right top, from(rgba(246, 122, 56, 1)), to(rgba(241, 27, 9, 1)));
+		background: linear-gradient(90deg, rgba(246, 122, 56, 1) 0%, rgba(241, 27, 9, 1) 100%);
+		opacity: 1;
+		position: absolute;
+		top: 0;
+		left: 0;
+		color: #fff;
+		text-align: center;
+	}
+
+	.navbar .header {
+		height: 96rpx;
+		font-size: 30rpx;
+		color: #050505;
+		background-color: #fff;
+		/* #ifdef MP */
+		padding-right: 95rpx;
+		/* #endif */
+	}
+
+	.navbar .header .item {
+		position: relative;
+		margin: 0 25rpx;
+	}
+
+	.navbar .header .item.on:before {
+		position: absolute;
+		width: 60rpx;
+		height: 5rpx;
+		background-repeat: no-repeat;
+		content: "";
+		background-image: linear-gradient(to right, #ff3366 0%, #ff6533 100%);
+		bottom: -10rpx;
+		left: 50%;
+		margin-left: -28rpx;
+	}
+
+	.navbar {
+		position: fixed;
+		background-color: #fff;
+		top: 0;
+		left: 0;
+		z-index: 99;
+		width: 100%;
+	}
+
+	.navbar .navbarH {
+		position: relative;
+	}
+
+	.navbar .navbarH .navbarCon {
+		position: absolute;
+		bottom: 0;
+		height: 100rpx;
+		width: 100%;
+	}
+
+	.share-box {
+		z-index: 1000;
+		position: fixed;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 100%;
+
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	.store-wrapper {
+		margin-top: 20rpx;
+		background-color: #fff;
+
+		.store-hd {
+			padding: 30rpx;
+			border-bottom: 1px solid #F5F5F5;
+
+			.store-info {
+				position: relative;
+				display: flex;
+
+				.store-margin {
+					width: 24rpx;
+					height: 26rpx;
+					margin-left: 10rpx;
+				}
+
+				.logo {
+					width: 86rpx;
+					height: 86rpx;
+
+					image {
+						width: 86rpx;
+						height: 86rpx;
+						border-radius: 6rpx;
+					}
+				}
+
+				.info {
+					display: flex;
+					flex-direction: column;
+					justify-content: center;
+					margin-left: 20rpx;
+
+					.name {
+						font-size: 28rpx;
+						color: #282828;
+						font-weight: bold;
+						display: flex;
+						align-items: center;
+					}
+
+					.txt {
+						margin-top: 8rpx;
+						color: #666666;
+						font-size: 22rpx;
+					}
+				}
+
+				.link {
+					position: absolute;
+					right: 0;
+					top: 50%;
+					transform: translateY(-50%);
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					width: 114rpx;
+					height: 50rpx;
+					background-image: linear-gradient(-90deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
+					border-radius: 25rpx;
+					color: #fff;
+				}
+			}
+
+			.score-wrapper {
+				display: flex;
+				justify-content: space-between;
+				margin-top: 30rpx;
+
+				.item {
+					color: #948D8C;
+					font-size: 26rpx;
+
+					text {
+						margin-left: 10rpx;
+						color: var(--view-priceColor);
+					}
+				}
+			}
+		}
+
+		.con-box {
+			padding: 20rpx 30rpx 0;
+
+			.title {
+				font-size: 28rpx;
+				color: #282828;
+			}
+
+			.moer-btn {
+				font-size: 28rpx;
+				color: #999999;
+			}
+
+			.img-box {
+				.img-item {
+					width: 220rpx;
+					margin: 30rpx 15rpx 0 0;
+					display: inline-block;
+
+					&:nth-child(3n) {
+						margin-right: 0;
+					}
+
+					/deep/image,
+					/deep/uni-image,
+					/deep/.easy-loadimage {
+						width: 218rpx;
+						height: 220rpx;
+						border-radius: 16rpx;
+						display: inline-block;
+					}
+
+					.txt {
+						.title {
+							font-size: 28rpx;
+							color: #282828;
+							margin-top: 15rpx;
+						}
+
+						.price {
+							color: var(--view-priceColor);
+							font-size: 28rpx;
+
+							text {
+								font-size: 20rpx;
+							}
+						}
+					}
+				}
+			}
+
+			/deep/.uni-swiper-dot {
+				width: 8rpx;
+				height: 4rpx;
+				background: rgba(0, 0, 0, .15);
+			}
+
+			/deep/.uni-swiper-dot-active {
+				width: 16rpx;
+				background: var(--view-theme);
+			}
+
+			.page_swiper,
+			swiper {
+				height: 760rpx;
+			}
+		}
+	}
+
+	.sys-head {
+		background: transparent;
+	}
+
+	.swiper-item,
+	/deep/uni-swiper-wrapper,
+	/deep/uni-swiper {
+		height: 740rpx !important;
+	}
+
+	.head-wrapper {
+		z-index: 999;
+		display: flex;
+		align-items: center;
+		position: fixed;
+		left: 30rpx;
+		top: 0;
+	}
+
+	.head-menu {
+		display: flex;
+		align-items: center;
+		height: 58rpx;
+		width: 158rpx;
+		background: rgba(255, 255, 255, 0.302);
+		border: 2rpx solid rgba(0, 0, 0, 0.0588);
+		border-radius: 29rpx;
+
+		.iconfont {
+			flex: 1;
+			text-align: center;
+			color: #000000;
+			box-sizing: border-box;
+
+			&.icon-fanhui2 {
+				border-right: 1px solid rgba(0, 0, 0, 0.2);
+				;
+			}
+		}
+	}
+
+	.price-tab {
+		margin-right: 10rpx;
+		font-weight: 400 !important;
+		padding: 3rpx 8rpx 5rpx 8rpx;
+		margin-top: 16rpx;
+		border-radius: 8rpx;
+		color: #000000;
+		// border: 1px solid #F55726;
+	}
+
+	.image-play-icon {
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+	}
 </style>
\ No newline at end of file
diff --git a/pages/goods_details/videoPlay.nvue b/pages/goods_details/videoPlay.nvue
new file mode 100644
index 0000000..57c7b68
--- /dev/null
+++ b/pages/goods_details/videoPlay.nvue
@@ -0,0 +1,45 @@
+<template>
+	<view class="">
+		<video :src="url" style="width: 750rpx;height: 1400rpx;" :autoplay='true' id="myvideo" controls></video>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				url: ""
+			}
+		},
+		methods: {
+			videoPlay() {
+				console.log("开始播放了")
+			},
+
+			videoShow() {
+				this.videoContext = uni.createVideoContext("myvideo", this); // this这个是实例对象 必传
+				this.videoUrl = this.url;
+				this.videoContext.requestFullScreen({
+					// direction: 90
+				});
+				this.videoContext.play();
+				this.videoPlay = true; // 显示播放盒子
+
+			}
+
+		},
+		onLoad(option) {
+			this.url = option.url
+			setTimeout(() => {
+				this.videoShow()
+			})
+
+		}
+
+
+	}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/pages/index/component/homeComb.vue b/pages/index/component/homeComb.vue
index f0b9e82..10535b7 100644
--- a/pages/index/component/homeComb.vue
+++ b/pages/index/component/homeComb.vue
@@ -1,773 +1,779 @@
 <template>
-  <view class="page_count">
-    <!--顶部定位-->
-    <view class="my-main header">
-      <view style="height: var(--status-bar-height);"></view>
-      <view class="location">
-        <view class="box flex_a_c_j_sb">
-          <view class="place_wrapper flex_a_c">
-            <view v-if="street&&street!='未开启定位'" @click="changeMap"  class="iconfont icon-weizhi" style="color:#fff;font-size:40rpx;"></view>
-            <view v-if="street&&street!='未开启定位'" @click="changeMap"  class="town_name">{{street}}</view>
-          </view>
-          <view class="flex_a_c_j_sb">
-            <view style="margin-right: 30rpx;" @click="scanQRcode" hover-class="none">
-              <view class="iconfont icon-saoma" style="color:#fff;font-size:40rpx;"> </view>
-            </view>
-            <navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
-              <view class="iconfont icon-xiaoxi" style="color:#fff;font-size:40rpx;"> </view>
-            </navigator>
-          </view>
-        </view>
-      </view>
-    </view>
+	<view class="page_count">
+		<!--顶部定位-->
+		<view class="my-main header">
+			<view style="height: var(--status-bar-height);"></view>
+			<view class="location">
+				<view class="box flex_a_c_j_sb">
+					<view class="place_wrapper flex_a_c">
+						<view v-if="street&&street!='未开启定位'" @click="changeMap" class="iconfont icon-weizhi"
+							style="color:#fff;font-size:40rpx;"></view>
+						<view v-if="street&&street!='未开启定位'" @click="changeMap" class="town_name">{{street}}</view>
+					</view>
+					<view class="flex_a_c_j_sb">
+						<view style="margin-right: 30rpx;" @click="scanQRcode" hover-class="none">
+							<view class="iconfont icon-saoma" style="color:#fff;font-size:40rpx;"> </view>
+						</view>
+						<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none"
+							style="position: relative;">
+							<view class="iconfont icon-xiaoxi" style="color:#fff;font-size:40rpx;"> </view>
+							<text class="iconnum" v-if="userInfo.user_unread">{{userInfo.user_unread}}</text>
+						</navigator>
+					</view>
+				</view>
+			</view>
+		</view>
 
-    <!--轮播图-->
-    <view class="swiperBg" :style="{ marginTop: (swiperTop + 13)+'px'}">
-      <view class="swiper page_swiper" v-if="imgUrls.length">
-        <swiper :autoplay="true" :circular="circular" :interval="intervals" :duration="duration"
-          indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff" :current="swiperCur"
-          style="height:330rpx;margin: 0 auto;width:710rpx;" @change="swiperChange" :class="{ scalex:isScale }">
-          <block v-for="(item,index) in imgUrls" :key="index">
-            <swiper-item :class="{ active: index == swiperCur,scalex:isScale }">
-              <view @click="goDetail(item)" class='slide-navigator acea-row row-between-wrapper'>
-                <image :src="item.img" class="slide-image aa" style="height:330rpx;" mode="aspectFill">
-                </image>
-              </view>
-            </swiper-item>
-          </block>
-        </swiper>
-        <view class="dots">
-          <block v-for="(item,index) in imgUrls" :key="index">
-            <view class="dot" :class="index == swiperCur ? ' active' : ''"></view>
-          </block>
-        </view>
-      </view>
-    </view>
-  </view>
+		<view :style="{ height: (swiperTop)+'px','background':'#40AE36','margin-bottom':'20rpx'}"></view>
+
+		<!--轮播图-->
+		<view class="swiperBg">
+			<view class="swiper page_swiper" v-if="imgUrls.length">
+				<swiper :autoplay="true" :circular="circular" :interval="intervals" :duration="duration"
+					indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff" :current="swiperCur"
+					style="height:330rpx;margin: 0 auto;width:710rpx;" @change="swiperChange"
+					:class="{ scalex:isScale }">
+					<block v-for="(item,index) in imgUrls" :key="index">
+						<swiper-item :class="{ active: index == swiperCur,scalex:isScale }">
+							<view @click="goDetail(item)" class='slide-navigator acea-row row-between-wrapper'>
+								<image :src="item.img" class="slide-image aa" style="height:330rpx;" mode="aspectFill">
+								</image>
+							</view>
+						</swiper-item>
+					</block>
+				</swiper>
+				<view class="dots">
+					<block v-for="(item,index) in imgUrls" :key="index">
+						<view class="dot" :class="index == swiperCur ? ' active' : ''"></view>
+					</block>
+				</view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
-  // +----------------------------------------------------------------------
-  // | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
-  // +----------------------------------------------------------------------
-  // | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved.
-  // +----------------------------------------------------------------------
-  // | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
-  // +----------------------------------------------------------------------
-  // | Author: CRMEB Team <admin@crmeb.com>
-  // +----------------------------------------------------------------------
+	// +----------------------------------------------------------------------
+	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+	// +----------------------------------------------------------------------
+	// | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved.
+	// +----------------------------------------------------------------------
+	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+	// +----------------------------------------------------------------------
+	// | Author: CRMEB Team <admin@crmeb.com>
+	// +----------------------------------------------------------------------
 
-  let statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
-  import {
-    configMap
-  } from '@/utils';
-  import {
-    getGeocoder
-  } from "@/api/store.js"
-  export default {
-    name: 'homeComb',
-    props: {
-      dataConfig: {
-        type: Object,
-        default: () => {}
-      },
-      isScrolled: {
-        type: Boolean,
-        default: false
-      },
-      isScale: {
-        type: Boolean,
-        default: false
-      },
-      isMenu: {
-        type: Boolean,
-        default: false
-      },
-      userInfo: {
-        type: Object,
-        default: () => {}
-      },
-    },
-    computed: configMap({
-      site_logo: ''
-    }),
-    data() {
-      return {
-        statusBarHeight: statusBarHeight,
-        scrollHeight: 0,
-        autoplay: true,
-        interval: this.dataConfig.titleConfig.value * 1000 || 2500,
-        duration: 500,
-        marTop: 50,
-        searchH: 0,
-        logoConfig: this.dataConfig.logoConfig.url,
-        hotWords: this.dataConfig.hotWords.list || [],
-        tabClick: 0, //导航栏被点击
-        isLeft: 0, //导航栏下划线位置
-        isWidth: 0, //每个导航栏占位
-        mainWidth: 0,
-        tabLeft: 0,
-        swiperIndex: 0,
-        childIndex: 0,
-        childID: 0,
-        tabTitle: this.dataConfig.listConfig.list || [],
-        fixedTop: 0,
-        isTop: 0,
-        navHeight: 38,
-        indicatorDots: false,
-        circular: true,
-        autoplay: true,
-        intervals: 3000,
-        duration: 500,
-        imgUrls: [], //图片轮播数据
-        imageH: 0,
-        swiperCur: 0,
-        swiperType: 1,
-        searchVal: this.dataConfig.hotWords && this.dataConfig.hotWords.list[0]['val'] || '',
-        bgColor: this.dataConfig.swiperConfig.list && this.dataConfig.swiperConfig.list[0]['img'],
-        tabId: false,
-        isCategory: false,
-        swiperTop: 0,
-        isFixed: true,
-        street: ''
-      };
-    },
-    watch: {
-      imageH(nVal, oVal) {
-        this.imageH = nVal
-      }
-    },
-    created() {
-      uni.$on('changeAddress', (e)=>{
-        this.street = e.street.name;
-      })
-      var that = this
-      // 获取设备宽度
-      uni.getSystemInfo({
-        success(e) {
-          that.mainWidth = e.windowWidth
-          that.isWidth = (e.windowWidth - 65) / 8
-        }
-      })
-      setTimeout((e) => {
-        const query = uni.createSelectorQuery().in(this);
-        if (that.tabTitle.length > 0) {
-          query.select('.navTabBox').boundingClientRect(data => {
-            that.navHeight = data.height > 42 ? data.height : 42
-          }).exec();
-        } else {
-          that.navHeight = 0
-        }
-        // #ifdef H5
-        query.select('.header').boundingClientRect(data => {
-          that.isTop = data.height
-          that.marTop = data.height
-        }).exec();
-        // #endif
-        // #ifdef MP || APP-PLUS
-        // #ifdef APP-PLUS
-        const menuButton = 0
-        //#endif
-        // #ifdef MP
-        const menuButton = uni.getMenuButtonBoundingClientRect();
-        //#endif
-        query
-          .select('.serch-box')
-          .boundingClientRect(data => {
-            this.marTop = data.height
-          }).exec();
-        //#endif
-      }, 500)
-      that.isTop = (uni.getSystemInfoSync().statusBarHeight + this.marTop)
-      that.imgUrls = that.dataConfig.swiperConfig.list
-      that.$nextTick(function() {
-        setTimeout((e) => {
-          // #ifdef H5
-          that.swiperTop = that.navHeight + that.marTop
-          //#endif
-          // #ifdef MP || APP-PLUS
-          that.swiperTop = that.navHeight + uni.getSystemInfoSync().statusBarHeight + that.marTop
-          //#endif
-        }, 500)
-      })
-    },
-    mounted() {
-      this.street = this.$store.state.storage.address.townName;
-      let that = this;
-      if (that.tabTitle.length > 0 && that.tabTitle[0]['value'] != '推荐') {
-        that.tabTitle.unshift({
-          img: '',
-          info: [{
-            value: "推荐"
-          }, {
-            value: false
-          }]
-        })
-      }
-      that.$nextTick(function() {
-        uni.getImageInfo({
-          src: that.setDomain(that.imgUrls[0].img),
-          success: function(res) {
-            if (res && res.height > 0) {
-              let height = res.height * ((750 - 20) / res.width)
-              that.$set(that, 'imageH', height);
-            } else {
-              that.$set(that, 'imageH', 375);
-            }
-          },
-          fail: function(error) {
-            that.$set(that, 'imageH', 375);
-          }
-        })
-      })
-    },
-    methods: {
-      async scanQRcode() {
-        // #ifdef APP-PLUS
-        let result = await this.$store.dispatch("permission/requestPermissions",
-          'CAMERA')
-        if (result !== 1) return;
-        // #endif
-        uni.scanCode({
-          success: (res) => {
-            console.log(res);
-            if (res.result && res.result.includes('pages/payment/get_payment')) {
-              let url = res.result.replace(/.*lihaink.cn/g, '');
-              uni.navigateTo({
-                url: url,
-                fail: () => {
-                  Toast('跳转页面失败')
-                }
-              })
-            } else {
-              Toast('无效的二维码')
-            }
-          }
-        })
-      },
-      // 选择位置
-      changeMap() {
-        uni.navigateTo({
-          url: `/pages/select_address_n/select_address_n`,
-          success: () => {
-            uni.$once('changeAddress', (e) => {
-              this.street = e.street.name;
-              this.town = e.street.name;
-              this.$store.commit('setAddress', {
-                street_id: e.street.code,
-                townName: this.town
-              });
-              if (e.longitude) {
-                this.longitude = e.longitude;
-                this.latitude = e.latitude;
-                this.$store.commit('setLocation', {
-                  lat: e.latitude,
-                  long: e.longitude,
-                });
-              }
-            })
-          }
-        })
-      },
-      getLocation() {
-        uni.getLocation({
-          type: 'gcj02',
-          success: (res) => {
-            let latitude, longitude;
-            latitude = res.latitude.toString();
-            longitude = res.longitude.toString();
-            this.$store.commit('setLocation', {
-              lat: res.latitude.toFixed(6),
-              long: res.longitude.toFixed(6),
-            });
-            getGeocoder({
-              lat: latitude,
-              long: longitude
-            }).then(res => {
-              let town = res.data.address_reference.town.title
-              let street_id = street_id = res.data.address_reference.town.id
-              this.street = res.data.address_reference.town.title;
-              this.$store.commit('setAddress', {
-                street_id: street_id,
-                townName: town
-              });
-              uni.$emit('getLocation_succees', {
-                street_id,
-              })
-            }).catch(err => {
-              uni.showToast({
-                title: err,
-                icon: 'none'
-              })
-              this.street = '定位失败'
-            })
-          }
-        })
-      },
-      goDetail(url) {
-        let urls = url.info[1].value
-        this.$util.JumpPath(urls);
-      },
-      //替换安全域名
-      setDomain: function(url) {
-        url = url ? url.toString() : '';
-        //本地调试打开,生产请注销
-        if (url.indexOf("https://") > -1) return url;
-        else return url.replace('http://', 'https://');
-      },
-      swiperChange(e) {
-        let {
-          current,
-          source
-        } = e.detail;
-        if (source === 'autoplay' || source === 'touch') {
-          this.swiperCur = e.detail.current;
-          this.bgColor = this.imgUrls[e.detail.current]['img']
-        }
-      },
-      textChange(e) {
-        let {
-          current,
-          source
-        } = e.detail;
-        if (source === 'autoplay' || source === 'touch') {
-          this.searchVal = this.hotWords[e.detail.current]['val']
-        }
-      },
-      /**显示全部分类*/
-      showCategory() {
-        this.isCategory = true;
-      },
-      /*跳转为页面*/
-      changeTab(item, index) {
-        if (this.tabClick == index) return
-        this.tabClick = index //设置导航点击了哪一个
-        this.isLeft = index * this.isWidth + 16 //设置下划线位置
-        this.tabId = item.info[1].value
-        this.bgColor = this.tabId ? item.img : this.dataConfig.swiperConfig.list[0]['img']
-        this.imgUrls = this.tabId ? [{
-          img: item.img
-        }] : this.dataConfig.swiperConfig.list
-        this.$emit('changeDiy', this.tabId);
-      }
-    },
-  }
+	let statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
+	import {
+		configMap
+	} from '@/utils';
+	import {
+		getGeocoder
+	} from "@/api/store.js"
+	export default {
+		name: 'homeComb',
+		props: {
+			dataConfig: {
+				type: Object,
+				default: () => {}
+			},
+			isScrolled: {
+				type: Boolean,
+				default: false
+			},
+			isScale: {
+				type: Boolean,
+				default: false
+			},
+			isMenu: {
+				type: Boolean,
+				default: false
+			},
+			userInfo: {
+				type: Object,
+				default: () => {}
+			},
+		},
+		computed: configMap({
+			site_logo: ''
+		}),
+		data() {
+			return {
+				statusBarHeight: statusBarHeight,
+				scrollHeight: 0,
+				autoplay: true,
+				interval: this.dataConfig.titleConfig.value * 1000 || 2500,
+				duration: 500,
+				marTop: 50,
+				searchH: 0,
+				logoConfig: this.dataConfig.logoConfig.url,
+				hotWords: this.dataConfig.hotWords.list || [],
+				tabClick: 0, //导航栏被点击
+				isLeft: 0, //导航栏下划线位置
+				isWidth: 0, //每个导航栏占位
+				mainWidth: 0,
+				tabLeft: 0,
+				swiperIndex: 0,
+				childIndex: 0,
+				childID: 0,
+				tabTitle: this.dataConfig.listConfig.list || [],
+				fixedTop: 0,
+				isTop: 0,
+				navHeight: 38,
+				indicatorDots: false,
+				circular: true,
+				autoplay: true,
+				intervals: 3000,
+				duration: 500,
+				imgUrls: [], //图片轮播数据
+				imageH: 0,
+				swiperCur: 0,
+				swiperType: 1,
+				searchVal: this.dataConfig.hotWords && this.dataConfig.hotWords.list[0]['val'] || '',
+				bgColor: this.dataConfig.swiperConfig.list && this.dataConfig.swiperConfig.list[0]['img'],
+				tabId: false,
+				isCategory: false,
+				swiperTop: 0,
+				isFixed: true,
+				street: ''
+			};
+		},
+		watch: {
+			imageH(nVal, oVal) {
+				this.imageH = nVal
+			}
+		},
+		created() {
+			uni.$on('changeAddress', (e) => {
+				this.street = e.street.name;
+			})
+			var that = this
+			// 获取设备宽度
+			uni.getSystemInfo({
+				success(e) {
+					that.mainWidth = e.windowWidth
+					that.isWidth = (e.windowWidth - 65) / 8
+				}
+			})
+			setTimeout((e) => {
+				const query = uni.createSelectorQuery().in(this);
+				if (that.tabTitle.length > 0) {
+					query.select('.navTabBox').boundingClientRect(data => {
+						that.navHeight = data.height > 42 ? data.height : 42
+					}).exec();
+				} else {
+					that.navHeight = 0
+				}
+				// #ifdef H5
+				query.select('.header').boundingClientRect(data => {
+					that.isTop = data.height
+					that.marTop = data.height
+				}).exec();
+				// #endif
+				// #ifdef MP || APP-PLUS
+				// #ifdef APP-PLUS
+				const menuButton = 0
+				//#endif
+				// #ifdef MP
+				const menuButton = uni.getMenuButtonBoundingClientRect();
+				//#endif
+				query
+					.select('.serch-box')
+					.boundingClientRect(data => {
+						this.marTop = data.height
+					}).exec();
+				//#endif
+			}, 500)
+			that.isTop = (uni.getSystemInfoSync().statusBarHeight + this.marTop)
+			that.imgUrls = that.dataConfig.swiperConfig.list
+			that.$nextTick(function() {
+				setTimeout((e) => {
+					// #ifdef H5
+					that.swiperTop = that.navHeight + that.marTop
+					//#endif
+					// #ifdef MP || APP-PLUS
+					that.swiperTop = that.navHeight + uni.getSystemInfoSync().statusBarHeight + that.marTop
+					//#endif
+				}, 500)
+			})
+		},
+		mounted() {
+			this.street = this.$store.state.storage.address.townName;
+			let that = this;
+			if (that.tabTitle.length > 0 && that.tabTitle[0]['value'] != '推荐') {
+				that.tabTitle.unshift({
+					img: '',
+					info: [{
+						value: "推荐"
+					}, {
+						value: false
+					}]
+				})
+			}
+			that.$nextTick(function() {
+				uni.getImageInfo({
+					src: that.setDomain(that.imgUrls[0].img),
+					success: function(res) {
+						if (res && res.height > 0) {
+							let height = res.height * ((750 - 20) / res.width)
+							that.$set(that, 'imageH', height);
+						} else {
+							that.$set(that, 'imageH', 375);
+						}
+					},
+					fail: function(error) {
+						that.$set(that, 'imageH', 375);
+					}
+				})
+			})
+		},
+		methods: {
+			async scanQRcode() {
+				// #ifdef APP-PLUS
+				let result = await this.$store.dispatch("permission/requestPermissions",
+					'CAMERA')
+				if (result !== 1) return;
+				// #endif
+				uni.scanCode({
+					success: (res) => {
+						console.log(res);
+						if (res.result && res.result.includes('pages/payment/get_payment')) {
+							let url = res.result.replace(/.*lihaink.cn/g, '');
+							uni.navigateTo({
+								url: url,
+								fail: () => {
+									Toast('跳转页面失败')
+								}
+							})
+						} else {
+							Toast('无效的二维码')
+						}
+					}
+				})
+			},
+			// 选择位置
+			changeMap() {
+				uni.navigateTo({
+					url: `/pages/select_address_n/select_address_n`,
+					success: () => {
+						uni.$once('changeAddress', (e) => {
+							this.street = e.street.name;
+							this.town = e.street.name;
+							this.$store.commit('setAddress', {
+								street_id: e.street.code,
+								townName: this.town
+							});
+							if (e.longitude) {
+								this.longitude = e.longitude;
+								this.latitude = e.latitude;
+								this.$store.commit('setLocation', {
+									lat: e.latitude,
+									long: e.longitude,
+								});
+							}
+						})
+					}
+				})
+			},
+			getLocation() {
+				uni.getLocation({
+					type: 'gcj02',
+					success: (res) => {
+						let latitude, longitude;
+						latitude = res.latitude.toString();
+						longitude = res.longitude.toString();
+						this.$store.commit('setLocation', {
+							lat: res.latitude.toFixed(6),
+							long: res.longitude.toFixed(6),
+						});
+						getGeocoder({
+							lat: latitude,
+							long: longitude
+						}).then(res => {
+							let town = res.data.address_reference.town.title
+							let street_id = street_id = res.data.address_reference.town.id
+							this.street = res.data.address_reference.town.title;
+							this.$store.commit('setAddress', {
+								street_id: street_id,
+								townName: town
+							});
+							uni.$emit('getLocation_succees', {
+								street_id,
+							})
+						}).catch(err => {
+							uni.showToast({
+								title: err,
+								icon: 'none'
+							})
+							this.street = '定位失败'
+						})
+					}
+				})
+			},
+			goDetail(url) {
+				let urls = url.info[1].value
+				this.$util.JumpPath(urls);
+			},
+			//替换安全域名
+			setDomain: function(url) {
+				url = url ? url.toString() : '';
+				//本地调试打开,生产请注销
+				if (url.indexOf("https://") > -1) return url;
+				else return url.replace('http://', 'https://');
+			},
+			swiperChange(e) {
+				let {
+					current,
+					source
+				} = e.detail;
+				if (source === 'autoplay' || source === 'touch') {
+					this.swiperCur = e.detail.current;
+					this.bgColor = this.imgUrls[e.detail.current]['img']
+				}
+			},
+			textChange(e) {
+				let {
+					current,
+					source
+				} = e.detail;
+				if (source === 'autoplay' || source === 'touch') {
+					this.searchVal = this.hotWords[e.detail.current]['val']
+				}
+			},
+			/**显示全部分类*/
+			showCategory() {
+				this.isCategory = true;
+			},
+			/*跳转为页面*/
+			changeTab(item, index) {
+				if (this.tabClick == index) return
+				this.tabClick = index //设置导航点击了哪一个
+				this.isLeft = index * this.isWidth + 16 //设置下划线位置
+				this.tabId = item.info[1].value
+				this.bgColor = this.tabId ? item.img : this.dataConfig.swiperConfig.list[0]['img']
+				this.imgUrls = this.tabId ? [{
+					img: item.img
+				}] : this.dataConfig.swiperConfig.list
+				this.$emit('changeDiy', this.tabId);
+			}
+		},
+	}
 </script>
 
 <style lang="scss" scoped>
-  .page_count {
-    position: relative;
-    overflow: hidden;
+	.page_count {
+		position: relative;
+		overflow: hidden;
 
-    .bg-img {
-      position: absolute;
-      width: 100%;
-      height: 100%;
-      top: 0;
-      /* #ifdef MP || APP-PLUS */
-      z-index: -1;
-      /* #endif */
-      /* #ifdef H5 */
-      z-index: 0;
-      /* #endif */
-      z-index: 0;
-      filter: blur(0);
-      overflow: hidden;
+		.bg-img {
+			position: absolute;
+			width: 100%;
+			height: 100%;
+			top: 0;
+			/* #ifdef MP || APP-PLUS */
+			z-index: -1;
+			/* #endif */
+			/* #ifdef H5 */
+			z-index: 0;
+			/* #endif */
+			z-index: 0;
+			filter: blur(0);
+			overflow: hidden;
 
-      img {
-        width: 100%;
-        height: 100%;
-        filter: blur(30rpx);
-        transform: scale(1.5);
-      }
-    }
-  }
+			img {
+				width: 100%;
+				height: 100%;
+				filter: blur(30rpx);
+				transform: scale(1.5);
+			}
+		}
+	}
 
-  .my-main {
-    background-color: #40AE36;
+	.my-main {
+		background-color: #40AE36;
 
-    .location {
-      padding: 0 28rpx;
+		.location {
+			padding: 0 28rpx;
 
-      .box {
-        height: 98rpx;
-      }
+			.box {
+				height: 98rpx;
+			}
 
-      .town_name {
-        color: #fff;
-        margin-left: 18rpx;
-        font-size: 30rpx;
-      }
-    }
-  }
+			.town_name {
+				color: #fff;
+				margin-left: 18rpx;
+				font-size: 30rpx;
+			}
+		}
+	}
 
-  .swiperTxt {
-    width: 300rpx;
-    line-height: 64rpx;
-    height: 64rpx;
-    overflow: hidden;
-  }
+	.swiperTxt {
+		width: 300rpx;
+		line-height: 64rpx;
+		height: 64rpx;
+		overflow: hidden;
+	}
 
-  .swiperTxt .text {
-    width: 480rpx;
-  }
+	.swiperTxt .text {
+		width: 480rpx;
+	}
 
-  .swiperTxt .text .newsTitle {
-    width: 300rpx;
-    font-size: 24rpx;
-    color: #ffffff;
-  }
+	.swiperTxt .text .newsTitle {
+		width: 300rpx;
+		font-size: 24rpx;
+		color: #ffffff;
+	}
 
-  .swiperTxt swiper {
-    height: 100%;
-  }
+	.swiperTxt swiper {
+		height: 100%;
+	}
 
-  .header {
-    z-index: 99;
-    position: fixed;
-    left: 0;
-    width: 100%;
+	.header {
+		z-index: 99;
+		position: fixed;
+		left: 0;
+		width: 100%;
 
-    .btn {
-      position: relative;
-      margin-left: 30rpx;
+		.btn {
+			position: relative;
+			margin-left: 30rpx;
 
-      .iconfont {
-        font-size: 45rpx;
-      }
-    }
+			.iconfont {
+				font-size: 45rpx;
+			}
+		}
 
-    .iconnum {
-      min-width: 14rpx;
-      color: #E93323;
-      background: #fff;
-      border-radius: 15rpx;
-      position: absolute;
-      right: -10rpx;
-      top: -10rpx;
-      font-size: 10px;
-      padding: 0 5px;
-    }
+		.iconnum {
+			min-width: 14rpx;
+			color: #fff;
+			background: #E93323;
+			border-radius: 15rpx;
+			position: absolute;
+			left: 20rpx;
+			top: -10rpx;
+			font-size: 10px;
+			padding: 0 5px;
+		}
 
-    .serch-wrapper {
-      align-items: center;
-      padding: 20rpx 30rpx 20rpx 30rpx;
+		.serch-wrapper {
+			align-items: center;
+			padding: 20rpx 30rpx 20rpx 30rpx;
 
-      .logo {
-        width: 133rpx;
-        margin-right: 20rpx;
-      }
+			.logo {
+				width: 133rpx;
+				margin-right: 20rpx;
+			}
 
-      image {
-        width: 133rpx;
-        height: 66rpx;
-      }
+			image {
+				width: 133rpx;
+				height: 66rpx;
+			}
 
-      .box {
-        flex: 1;
-      }
+			.box {
+				flex: 1;
+			}
 
-      .input,
-      .uninput {
-        line-height: 64rpx;
-        height: 64rpx;
-        padding: 0 0 0 30rpx;
-        background: rgba(0, 0, 0, .2);
-        color: #fff;
-        border-radius: 30rpx;
-        font-size: 28rpx;
-        z-index: 2;
-        position: relative;
-        box-sizing: border-box;
+			.input,
+			.uninput {
+				line-height: 64rpx;
+				height: 64rpx;
+				padding: 0 0 0 30rpx;
+				background: rgba(0, 0, 0, .2);
+				color: #fff;
+				border-radius: 30rpx;
+				font-size: 28rpx;
+				z-index: 2;
+				position: relative;
+				box-sizing: border-box;
 
-        .iconfont {
-          position: absolute;
-          right: 20rpx;
-          top: 0;
-          color: #eeeeee;
-        }
-      }
-    }
-  }
+				.iconfont {
+					position: absolute;
+					right: 20rpx;
+					top: 0;
+					color: #eeeeee;
+				}
+			}
+		}
+	}
 
-  .mp-header {
-    z-index: 99;
-    position: fixed;
-    left: 0;
-    width: 100%;
+	.mp-header {
+		z-index: 99;
+		position: fixed;
+		left: 0;
+		width: 100%;
 
-    .box {
-      flex: 1;
-    }
+		.box {
+			flex: 1;
+		}
 
-    .serch-box {
-      margin-top: 10rpx;
-    }
+		.serch-box {
+			margin-top: 10rpx;
+		}
 
-    .serch-wrapper {
-      display: flex;
-      align-items: center;
-      // padding: 0 50rpx 20rpx 30rpx;
-      padding: 0 28rpx;
-      height: 76rpx;
+		.serch-wrapper {
+			display: flex;
+			align-items: center;
+			// padding: 0 50rpx 20rpx 30rpx;
+			padding: 0 28rpx;
+			height: 76rpx;
 
-      .logo {
-        width: 133rpx;
-        margin-right: 20rpx;
-        line-height: 0;
-      }
+			.logo {
+				width: 133rpx;
+				margin-right: 20rpx;
+				line-height: 0;
+			}
 
-      image {
-        width: 118rpx;
-        height: 42rpx;
-      }
+			image {
+				width: 118rpx;
+				height: 42rpx;
+			}
 
-      .input,
-      .uninput {
-        display: flex;
-        /* #ifdef MP */
-        flex: 0;
-        /* #endif */
-        /* #ifdef APP-PLUS */
-        flex: 1;
-        /* #endif */
-        flex: 1;
-        align-items: center;
-        height: 64rpx;
-        line-height: 64rpx;
-        padding: 0 50rpx 0 30rpx;
-        background: rgba(0, 0, 0, .2);
-        border-radius: 100rpx;
-        color: #ffffff;
-        font-size: 28rpx;
-        position: relative;
-        box-sizing: border-box;
+			.input,
+			.uninput {
+				display: flex;
+				/* #ifdef MP */
+				flex: 0;
+				/* #endif */
+				/* #ifdef APP-PLUS */
+				flex: 1;
+				/* #endif */
+				flex: 1;
+				align-items: center;
+				height: 64rpx;
+				line-height: 64rpx;
+				padding: 0 50rpx 0 30rpx;
+				background: rgba(0, 0, 0, .2);
+				border-radius: 100rpx;
+				color: #ffffff;
+				font-size: 28rpx;
+				position: relative;
+				box-sizing: border-box;
 
-        .iconfont {
-          position: absolute;
-          right: 20rpx;
-          top: 0;
-          color: #eeeeee;
-        }
-      }
+				.iconfont {
+					position: absolute;
+					right: 20rpx;
+					top: 0;
+					color: #eeeeee;
+				}
+			}
 
-      /* #ifdef MP */
-      .uninput {
-        max-width: 500rpx;
-      }
+			/* #ifdef MP */
+			.uninput {
+				max-width: 500rpx;
+			}
 
-      .input {
-        max-width: 340rpx;
-      }
+			.input {
+				max-width: 340rpx;
+			}
 
-      /* #endif */
-    }
-  }
+			/* #endif */
+		}
+	}
 
-  .tabNav {
-    padding-top: 10rpx;
-  }
+	.tabNav {
+		padding-top: 10rpx;
+	}
 
-  .navTabBox {
-    color: rgba(255, 255, 255, 1);
-    padding: 0 30rpx;
-    z-index: 10;
-    left: 0;
-    width: 100%;
-    box-sizing: border-box;
-    position: fixed;
+	.navTabBox {
+		color: rgba(255, 255, 255, 1);
+		padding: 0 30rpx;
+		z-index: 10;
+		left: 0;
+		width: 100%;
+		box-sizing: border-box;
+		position: fixed;
 
-    scroll-view {
-      width: 100%;
-      padding-right: 30rpx;
-      height: 70rpx;
-    }
+		scroll-view {
+			width: 100%;
+			padding-right: 30rpx;
+			height: 70rpx;
+		}
 
-    .click {
-      color: white;
-    }
+		.click {
+			color: white;
+		}
 
-    .longTab {
-      .longItem {
-        height: 50upx;
-        display: inline-block;
-        line-height: 50upx;
-        text-align: center;
-        font-size: 28rpx;
-        color: #FFFFFF;
-        max-width: 160rpx;
-        margin-right: 30rpx;
-        position: relative;
+		.longTab {
+			.longItem {
+				height: 50upx;
+				display: inline-block;
+				line-height: 50upx;
+				text-align: center;
+				font-size: 28rpx;
+				color: #FFFFFF;
+				max-width: 160rpx;
+				margin-right: 30rpx;
+				position: relative;
 
-        &:last-child {
-          margin-right: 0;
-        }
+				&:last-child {
+					margin-right: 0;
+				}
 
-        &.click {
-          font-weight: bold;
-          font-size: 30rpx;
-          color: #FFFFFF;
+				&.click {
+					font-weight: bold;
+					font-size: 30rpx;
+					color: #FFFFFF;
 
-          &::after {
-            content: '';
-            transition: .5s;
-            width: 33rpx;
-            height: 4rpx;
-            background: #FFFFFF;
-            position: absolute;
-            bottom: -4rpx;
-            left: 50%;
-            margin-left: -16rpx;
-          }
-        }
-      }
-    }
-  }
+					&::after {
+						content: '';
+						transition: .5s;
+						width: 33rpx;
+						height: 4rpx;
+						background: #FFFFFF;
+						position: absolute;
+						bottom: -4rpx;
+						left: 50%;
+						margin-left: -16rpx;
+					}
+				}
+			}
+		}
+	}
 
-  .scrolled {
-    z-index: 5000;
-    position: fixed;
-    min-height: 90rpx;
-    left: 0;
-    top: 0;
-    width: 100%;
-    // background: #fff!important;
-    background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/def/23bd9202402271611232730.png');
-    background-color: #f1f1f1;
-    /* 设置背景色 */
-    background-size: 100% 100%;
-    /* 让背景图片铺满整个盒子 */
-    background-repeat: no-repeat;
-    /* 不重复 */
-    transition: background-color .5s ease;
+	.scrolled {
+		z-index: 5000;
+		position: fixed;
+		min-height: 90rpx;
+		left: 0;
+		top: 0;
+		width: 100%;
+		// background: #fff!important;
+		background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/def/23bd9202402271611232730.png');
+		background-color: #f1f1f1;
+		/* 设置背景色 */
+		background-size: 100% 100%;
+		/* 让背景图片铺满整个盒子 */
+		background-repeat: no-repeat;
+		/* 不重复 */
+		transition: background-color .5s ease;
 
-    .longItem,
-    .click,
-    .category text {
-      color: #000000 !important;
-    }
+		.longItem,
+		.click,
+		.category text {
+			color: #000000 !important;
+		}
 
-    .navTabBox,
-    .mp-header,
-    .header {
-      // transition: background-color .5s ease;
-      // background: #ffffff;
-    }
+		.navTabBox,
+		.mp-header,
+		.header {
+			// transition: background-color .5s ease;
+			// background: #ffffff;
+		}
 
-    .btn .iconfont {
-      color: #333333 !important;
-    }
+		.btn .iconfont {
+			color: #333333 !important;
+		}
 
-    .iconnum {
-      background: #333333 !important;
-    }
+		.iconnum {
+			background: #333333 !important;
+		}
 
-    .underline {
-      background: #000000 !important;
-    }
+		.underline {
+			background: #000000 !important;
+		}
 
-    .click {
-      &::after {
-        background-color: #fff !important;
-      }
-    }
-  }
+		.click {
+			&::after {
+				background-color: #fff !important;
+			}
+		}
+	}
 
-  .swiperBg {
-    z-index: 1;
+	.swiperBg {
+		z-index: 1;
 
-    .colorBg {
-      position: absolute;
-      left: 0;
-      top: 0;
-      height: 130rpx;
-      width: 100%;
-    }
+		.colorBg {
+			position: absolute;
+			left: 0;
+			top: 0;
+			height: 130rpx;
+			width: 100%;
+		}
 
-    .page_swiper {
-      position: relative;
-      width: 100%;
-      height: auto;
-      margin: 0 auto;
-      border-radius: 10rpx;
-      overflow-x: hidden;
-      z-index: 8;
-      padding: 0 10rpx;
+		.page_swiper {
+			position: relative;
+			width: 100%;
+			height: auto;
+			margin: 0 auto;
+			border-radius: 10rpx;
+			overflow-x: hidden;
+			z-index: 8;
+			padding: 0 10rpx;
 
-      swiper-item {
-        border-radius: 10rpx;
-      }
+			swiper-item {
+				border-radius: 10rpx;
+			}
 
-      .swiper-item,
-      image,
-      .acea-row.row-between-wrapper {
-        width: 100%;
-        margin: 0 auto;
-        border-radius: 10rpx;
-      }
+			.swiper-item,
+			image,
+			.acea-row.row-between-wrapper {
+				width: 100%;
+				margin: 0 auto;
+				border-radius: 10rpx;
+			}
 
-      swiper {
-        width: 100%;
-        display: block;
-        height: auto;
+			swiper {
+				width: 100%;
+				display: block;
+				height: auto;
 
-        &.scalex {
-          /deep/.uni-swiper-slide-frame {
-            transform: translate(0, 0) !important;
-          }
-        }
-      }
+				&.scalex {
+					/deep/.uni-swiper-slide-frame {
+						transform: translate(0, 0) !important;
+					}
+				}
+			}
 
-      image {
-        transform: scale(0.93);
-        transition: all 0.6s ease;
-      }
+			image {
+				transform: scale(0.93);
+				transition: all 0.6s ease;
+			}
 
-      swiper-item.active,
-      swiper-item.scalex {
-        image {
-          transform: scale(1);
-        }
-      }
+			swiper-item.active,
+			swiper-item.scalex {
+				image {
+					transform: scale(1);
+				}
+			}
 
-      /*用来包裹所有的小圆点  */
-      .dots {
-        width: 156rpx;
-        height: 36rpx;
-        display: flex;
-        flex-direction: row;
-        position: absolute;
-        left: 320rpx;
-        bottom: 0;
-      }
+			/*用来包裹所有的小圆点  */
+			.dots {
+				width: 156rpx;
+				height: 36rpx;
+				display: flex;
+				flex-direction: row;
+				position: absolute;
+				left: 320rpx;
+				bottom: 0;
+			}
 
-      /*未选中时的小圆点样式 */
-      .dot {
-        width: 16rpx;
-        height: 6rpx;
-        border-radius: 6rpx;
-        margin-right: 6rpx;
-        background-color: rgba(255, 255, 255, .4);
+			/*未选中时的小圆点样式 */
+			.dot {
+				width: 16rpx;
+				height: 6rpx;
+				border-radius: 6rpx;
+				margin-right: 6rpx;
+				background-color: rgba(255, 255, 255, .4);
 
-        /*选中以后的小圆点样式  */
-        &.active {
-          width: 32rpx;
-          height: 6rpx;
-          background-color: rgba(255, 255, 255, .4);
-        }
-      }
-    }
-  }
+				/*选中以后的小圆点样式  */
+				&.active {
+					width: 32rpx;
+					height: 6rpx;
+					background-color: rgba(255, 255, 255, .4);
+				}
+			}
+		}
+	}
 
-  /deep/.dot0 .uni-swiper-dots-horizontal {
-    left: 10%;
-  }
+	/deep/.dot0 .uni-swiper-dots-horizontal {
+		left: 10%;
+	}
 
-  /deep/.dot1 .uni-swiper-dots-horizontal {
-    left: 50%;
-  }
+	/deep/.dot1 .uni-swiper-dots-horizontal {
+		left: 50%;
+	}
 
-  /deep/.dot2 .uni-swiper-dots-horizontal {
-    left: 90%;
-  }
+	/deep/.dot2 .uni-swiper-dots-horizontal {
+		left: 90%;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/index/component/swiperBg.vue b/pages/index/component/swiperBg.vue
index cb048de..74abbea 100644
--- a/pages/index/component/swiperBg.vue
+++ b/pages/index/component/swiperBg.vue
@@ -29,11 +29,6 @@
 						</swiper-item>
 					</block>
 				</swiper>
-				<!-- <view class="dots" :class="'dot'+txtStyle">
-					<block v-for="(item,index) in imgUrls" :key="index">  
-						<view class="dot" :class="[docConfig == 1 ? 'square' : docConfig == 0 ? 'circular' : 'nodoc',index == swiperCur ? ' active' : '']"></view>  
-					</block>  
-				</view> -->
 			</view>
 		</block>
 	</view>
diff --git a/pages/index/component/tabNav.vue b/pages/index/component/tabNav.vue
index 0ee4370..d1e395f 100644
--- a/pages/index/component/tabNav.vue
+++ b/pages/index/component/tabNav.vue
@@ -3,22 +3,30 @@
 		<!-- #ifdef MP || APP-PLUS -->
 		<view style="visibility: hidden;" :style="{ height: navHeight + 'rpx' }" v-if="isFixed"></view>
 		<!-- #endif -->
-		<view class="navTabBox tabNav" :class="{isFixed:isFixed}" :style="'background:'+bgColor+';margin-top:'+mbConfig+'rpx;color:'+txtColor+';top:'+isTop">		
+		<view class="navTabBox tabNav" :class="{isFixed:isFixed}"
+			:style="'background:'+bgColor+';margin-top:'+mbConfig+'rpx;color:'+txtColor+';top:'+isTop">
 			<view class="longTab" :style='"width:"+mainWidth+"px"'>
-				<scroll-view scroll-x="true" style="white-space: nowrap; display: flex;" scroll-with-animation :scroll-left="tabLeft" show-scrollbar="true">
-					<view class="longItem" :style="'width:'+isWidth+'px;color:'+(index===tabClick ? activeColor : txtColor)" :data-index="index" :class="index===tabClick?'click':''" v-for="(item,index) in tabTitle" :key="index" :id="'id'+index" @click="longClick(index,item.store_category_id,item.pid)">{{item.cate_name}}</view>
+				<scroll-view scroll-x="true" style="white-space: nowrap; display: flex;" scroll-with-animation
+					:scroll-left="tabLeft" show-scrollbar="true">
+					<view class="longItem"
+						:style="'width:'+isWidth+'px;color:'+(index===tabClick ? activeColor : txtColor)"
+						:data-index="index" :class="index===tabClick?'click':''" v-for="(item,index) in tabTitle"
+						:key="index" :id="'id'+index" @click="longClick(index,item.store_category_id,item.pid)">
+						{{item.cate_name}}</view>
 					<view class="underlineBox" :style='"transform:translateX("+isLeft+"px);width:"+isWidth+"px"'>
 						<view class="underline" :style="'background-color:'+activeColor"></view>
 					</view>
 				</scroll-view>
 			</view>
-			<navigator v-if="merId" :url="'/pages/store/home/index?id='+merId+'&type=2'" class="category" hover-class="none" :style="'background-color:'+bgColor+';color:'+txtColor">
+			<navigator v-if="merId" :url="'/pages/store/home/index?id='+merId+'&type=2'" class="category"
+				hover-class="none" :style="'background-color:'+bgColor+';color:'+txtColor">
 				<text class="iconfont icon-fenlei3"></text>分类
 			</navigator>
-			<navigator v-else open-type='switchTab' url="/pages/goods_cate/goods_cate" class="category" hover-class="none" :style="'background-color:'+bgColor+';color:'+txtColor">
+			<navigator v-else open-type='switchTab' url="/pages/goods_cate/goods_cate" class="category"
+				hover-class="none" :style="'background-color:'+bgColor+';color:'+txtColor">
 				<text class="iconfont icon-fenlei3"></text>分类
 			</navigator>
-		</view>	
+		</view>
 	</view>
 </template>
 
@@ -32,7 +40,9 @@
 	// +----------------------------------------------------------------------
 	// | Author: CRMEB Team <admin@crmeb.com>
 	// +----------------------------------------------------------------------
-	import { getCateData } from '@/api/api.js';
+	import {
+		getCateData
+	} from '@/api/api.js';
 	let app = getApp();
 	export default {
 		name: 'navTab',
@@ -61,13 +71,13 @@
 				isLeft: 0, //导航栏下划线位置
 				isWidth: 0, //每个导航栏占位
 				mainWidth: 0,
-				tabLeft:0,
-				swiperIndex:0,
-				childIndex:0,
-				childID:0,
-				bgColor:this.dataConfig.bgColor.color[0].item,
-				mbConfig:this.dataConfig.mbConfig.val * 2,
-				txtColor:this.dataConfig.txtColor.color[0].item,
+				tabLeft: 0,
+				swiperIndex: 0,
+				childIndex: 0,
+				childID: 0,
+				bgColor: this.dataConfig.bgColor.color[0].item,
+				mbConfig: this.dataConfig.mbConfig.val * 2,
+				txtColor: this.dataConfig.txtColor.color[0].item,
 				activeColor: this.dataConfig.activeColor.color[0].item,
 				fixedTop: 0,
 				isTop: 0,
@@ -76,12 +86,12 @@
 				unique: this.dataConfig.timestamp,
 			};
 		},
-		watch:{
+		watch: {
 			// #ifdef MP || APP-PLUS
-			isFixed(nVal,oVal){
-				if(nVal){
+			isFixed(nVal, oVal) {
+				if (nVal) {
 					this.isTop = (uni.getSystemInfoSync().statusBarHeight + 43) + 'px'
-				}else{
+				} else {
 					this.isTop = 0
 				}
 			}
@@ -92,9 +102,9 @@
 			that.getCateData()
 			// 获取设备宽度
 			uni.getSystemInfo({
-				success(e) {					
+				success(e) {
 					that.mainWidth = e.windowWidth
-					that.isWidth = (e.windowWidth-65) / 4 
+					that.isWidth = (e.windowWidth - 65) / 4
 				}
 			})
 			setTimeout((e) => {
@@ -117,14 +127,14 @@
 			// #ifdef H5 
 			this.isTop = 0
 			// #endif
-			
+
 		},
 		methods: {
-			getCateData(){
+			getCateData() {
 				getCateData({
 					diy_id: this.diy_id,
 					unique: this.unique,
-				}).then(res => {	
+				}).then(res => {
 					res.data.unshift({
 						cate_name: '首页'
 					});
@@ -132,36 +142,36 @@
 				});
 			},
 			// 导航栏点击
-			longClick(index,id,fid){
+			longClick(index, id, fid) {
 				app.globalData.fid = fid;
 				this.childIndex = 0;
-				if(this.tabTitle.length>3){
+				if (this.tabTitle.length > 3) {
 					var tempIndex = index - 2;
-					tempIndex = tempIndex<=0 ? 0 : tempIndex;
-					this.tabLeft = (index-2) * this.isWidth //设置下划线位置
+					tempIndex = tempIndex <= 0 ? 0 : tempIndex;
+					this.tabLeft = (index - 2) * this.isWidth //设置下划线位置
 				}
 				this.tabClick = index //设置导航点击了哪一个
 				this.isLeft = index * this.isWidth //设置下划线位置	
 				let obj = {
-					index:index,
-					pid:id//自己的id
+					index: index,
+					pid: id //自己的id
 				}
-				if(!this.merId){
+				if (!this.merId) {
 					this.parentEmit(obj);
-				}else{
-					if(id){
+				} else {
+					if (id) {
 						uni.navigateTo({
-							url: '/pages/store/list/index?id='+id+'&mer_id='+this.merId
+							url: '/pages/store/list/index?id=' + id + '&mer_id=' + this.merId
 						});
-					}else{
+					} else {
 						uni.navigateTo({
-							url: '/pages/store/home/index?id='+this.merId
+							url: '/pages/store/home/index?id=' + this.merId
 						});
 					}
-					
-				}	
+
+				}
 			},
-			parentEmit(obj){
+			parentEmit(obj) {
 				this.$emit('changeTab', obj);
 			}
 		}
@@ -172,11 +182,13 @@
 	.tabNav {
 		padding-top: 10rpx;
 	}
+
 	.navTabBox {
 		width: 100%;
 		color: rgba(255, 255, 255, 1);
 		position: relative;
 		padding-bottom: 10rpx;
+
 		&.isFixed {
 			z-index: 10;
 			position: fixed;
@@ -186,18 +198,21 @@
 			top: 0;
 			/* #endif */
 		}
+
 		.click {
 			color: white;
 		}
+
 		.longTab {
 			/* #ifdef H5 */
 			padding-right: 106rpx;
 			/* #endif */
 			/* #ifdef MP || APP-PLUS */
 			padding-right: 116rpx;
+
 			/* #endif */
-			.longItem{ 
-				height: 50upx; 
+			.longItem {
+				height: 50upx;
 				display: inline-block;
 				line-height: 50upx;
 				text-align: center;
@@ -207,12 +222,14 @@
 				white-space: nowrap;
 				overflow: hidden;
 				text-overflow: ellipsis;
-				&.click{
+
+				&.click {
 					font-weight: bold;
 					font-size: 30rpx;
 					color: #E93323;
 				}
 			}
+
 			.underlineBox {
 				height: 3px;
 				width: 20%;
@@ -220,13 +237,20 @@
 				align-content: center;
 				justify-content: center;
 				transition: .5s;
+
 				.underline {
 					width: 33rpx;
 					height: 4rpx;
 				}
 			}
 		}
-		.category{
+
+		.category_wrap {
+			transition: height .4s;
+			overflow: hidden;
+		}
+
+		.category {
 			position: absolute;
 			right: 0;
 			top: 10rpx;
@@ -243,13 +267,15 @@
 			line-height: 50upx;
 			z-index: 3;
 			padding: 0 15rpx 0 25rpx;
-			.iconfont{
+
+			.iconfont {
 				font-size: 30rpx;
-				margin-right:6rpx;
+				margin-right: 6rpx;
 			}
 		}
 	}
-	.child-box{
+
+	.child-box {
 		width: 100%;
 		position: relative;
 		background-color: #fff;
@@ -258,40 +284,46 @@
 		/* #endif */
 		/* #ifdef MP */
 		box-shadow: 0 2rpx 3rpx 1rpx #f9f9f9;
+
 		/* #endif */
-		.wrapper{
+		.wrapper {
 			display: flex;
 			align-items: center;
 			padding: 20rpx 0;
 			background: #fff;
 		}
-		.child-item{
+
+		.child-item {
 			flex-shrink: 0;
-			width:140rpx;
+			width: 140rpx;
 			display: flex;
 			flex-direction: column;
 			align-items: center;
 			justify-content: center;
 			margin-left: 10rpx;
-			image{
+
+			image {
 				width: 90rpx;
 				height: 90rpx;
 				border-radius: 50%;
 			}
-			.txt{
+
+			.txt {
 				font-size: 24rpx;
 				color: #282828;
 				text-align: center;
 				margin-top: 10rpx;
 			}
-			&.on{
-				image{
+
+			&.on {
+				image {
 					border: 1px solid $theme-color-opacity;
 				}
-				.txt{
+
+				.txt {
 					color: $theme-color;
 				}
 			}
 		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d692330..b49b590 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -12,7 +12,6 @@
 					<homeComb v-if="smallPage" class="home-comb" :isScale="isScale" :isMenu="isMenu"
 						:dataConfig="homeCombData" :userInfo="userInfo" :isFixed="isFixed" :isScrolled="isScrolled"
 						@changeDiy="changeDiy"></homeComb>
-					<!-- <card></card> -->
 					<view v-for="(item, index) in styleConfig" :key="index">
 						<block
 							v-if="item.name != 'headerSerch' && item.name != 'tabNav' && item.name != 'shopList' && item.name != 'homeComb' && item.name != 'hotRanking' && item.name != 'pageFoot'">
@@ -39,12 +38,33 @@
 							<hotRanking :dataConfig="item"></hotRanking>
 						</block>
 					</view>
+					<view class="main" v-show="navIndex == 0">
+						<!-- 首页推荐 -->
+						<view v-if="recommend_switch == 1" class="index-product-wrapper">
+							<!-- 首发新品 -->
+							<recommend ref="recommendRef" :hostProduct="hostProduct[hostIndex]"
+								@changeRecommedTab="changeRecommedTab" showTab :indexP="true" :isLogin="isLogin"
+								:loading="loading">
+							</recommend>
+							<view class="loadingicon acea-row row-center-wrapper"
+								v-if="hostProduct[hostIndex].length > 0 || hotLoading[hostIndex]">
+								<text class="loading iconfont icon-jiazai"
+									:hidden="hotLoading[hostIndex] == false"></text>
+								{{ hotTitle }}
+							</view>
+						</view>
+					</view>
+					<view v-show="navIndex == 0" class="loadingicon acea-row row-center-wrapper"
+						v-if="tempArr.length && styleConfig[styleConfig.length - 1].name == 'promotionList'">
+						<text class="loading iconfont icon-jiazai" :hidden="loading == false"></text>
+						{{ loadTitle }}
+					</view>
 					<!-- #endif -->
+
 					<!-- #ifdef MP || APP-PLUS -->
 					<homeComb class="home-comb" v-if="smallPage" :isScale="isScale" :isMenu="isMenu"
 						:dataConfig="homeCombData" :isFixed="isFixed" :isScrolled="isScrolled" :userInfo="userInfo"
 						@changeDiy="changeDiy" @bindHeight="bindHeighta"></homeComb>
-					<!-- <card></card> -->
 					<block v-for="(item, index) in styleConfig" :key="index">
 						<view v-show="navIndex == 0">
 							<homeComb v-if="item.name == 'homeComb' && !smallPage" :isMenu="isMenu" :dataConfig="item"
@@ -82,11 +102,10 @@
 						<tabNav v-if="item.name == 'tabNav'" :dataConfig="item" class="tabNav" :tabTitle="navTop"
 							@bindHeight="bindHeighta" @changeTab="changeTab" :isFixed="isFixed"></tabNav>
 					</block>
-					<!-- #endif -->
 
-					<view class="main" v-show="navIndex == 0">
-						<!-- 首页推荐 -->
-						<view v-if="recommend_switch == 1" class="index-product-wrapper">
+					<!-- 首页推荐 -->
+					<view class="main">
+						<view class="index-product-wrapper">
 							<!-- 首发新品 -->
 							<recommend ref="recommendRef" :hostProduct="hostProduct[hostIndex]"
 								@changeRecommedTab="changeRecommedTab" showTab :indexP="true" :isLogin="isLogin"
@@ -100,11 +119,12 @@
 							</view>
 						</view>
 					</view>
-					<view v-show="navIndex == 0" class="loadingicon acea-row row-center-wrapper"
+					<view class="loadingicon acea-row row-center-wrapper"
 						v-if="tempArr.length && styleConfig[styleConfig.length - 1].name == 'promotionList'">
 						<text class="loading iconfont icon-jiazai" :hidden="loading == false"></text>
 						{{ loadTitle }}
 					</view>
+					<!-- #endif -->
 				</block>
 				<!-- 分类页 -->
 				<view class="productList" v-if="navIndex > 0">
@@ -654,13 +674,17 @@
 			},
 		},
 		onPullDownRefresh() {
-			this.overflow = true;
-			this.reconnect();
+			// this.overflow = true;
+			// this.reconnect();
+			// that.overflow = true;
 			// #ifdef APP-PLUS
 			setTimeout(() => {
-				uni.reLaunch({
-					url: "/pages/index/index"
-				});
+				this.hotPage = 1;
+				this.hotScroll = true;
+				let hostList = this.hostProduct;
+				hostList[this.hostIndex] = [];
+				this.$set(this, 'hostProduct', hostList);
+				this.loadGoods(this.hostIndex + 1);
 			}, 50)
 			// #endif
 		},
@@ -1043,21 +1067,19 @@
 				if (that.loading || that.loadend) return;
 				that.loading = true;
 				that.loadTitle = '';
-				getProductslist(that.where)
-					.then(res => {
-						let list = res.data.list;
-						let productList = that.$util.SplitArray(list, that.sortProduct);
-						let loadend = list.length < that.where.limit;
-						that.loadend = loadend;
-						that.loading = false;
-						that.loadTitle = loadend ? '已全部加载' : '加载更多';
-						that.$set(that, 'sortProduct', productList);
-						that.$set(that.where, 'page', that.where.page + 1);
-					})
-					.catch(err => {
-						that.loading = false;
-						that.loadTitle = '加载更多';
-					});
+				getProductslist(that.where).then(res => {
+					let list = res.data.list;
+					let productList = that.$util.SplitArray(list, that.sortProduct);
+					let loadend = list.length < that.where.limit;
+					that.loadend = loadend;
+					that.loading = false;
+					that.loadTitle = loadend ? '已全部加载' : '加载更多';
+					that.$set(that, 'sortProduct', productList);
+					that.$set(that.where, 'page', that.where.page + 1);
+				}).catch(err => {
+					that.loading = false;
+					that.loadTitle = '加载更多';
+				});
 			},
 			/**
 			 * 点击组件选项卡
@@ -1072,16 +1094,21 @@
 				this.loadGoods(e);
 			},
 			loadGoods(e = 1) {
-				if (e == 1) return this.get_host_product(0);
-				if (e == 2) return this.get_host_home({
-					mer_type: 1
-				}, 1);
-				if (e == 3) return this.get_host_home({
-					mer_type: 2
-				}, 2);
-				if (e == 4) return this.get_host_home({
-					mer_type: 3
-				}, 3);
+
+				console.log(e);
+
+				this.$nextTick(() => {
+					if (e == 1) return this.get_host_product(0);
+					if (e == 2) return this.get_host_home({
+						mer_type: 1
+					}, 1);
+					if (e == 3) return this.get_host_home({
+						mer_type: 2
+					}, 2);
+					if (e == 4) return this.get_host_home({
+						mer_type: 3
+					}, 3);
+				})
 			},
 			/**
 			 * 获取我的推荐
@@ -1091,9 +1118,11 @@
 				let num = that.hotLimit;
 				if (!that.hotScroll) return;
 				if (that.hotLoading[e]) return;
+
 				that.hotLoading[e] = true;
 				that.hotTitle = '加载中';
 				getProductHot(that.hotPage, that.hotLimit, 1, 1).then(res => {
+					uni.stopPullDownRefresh();
 					res.data.list = this.shuffleArray(res.data.list);
 					let list = res.data.list;
 					let productList = that.hostProduct;
@@ -1128,6 +1157,7 @@
 				getProductslist({
 					...query
 				}).then(res => {
+					uni.stopPullDownRefresh();
 					res.data.list = this.shuffleArray(res.data.list);
 					let list = res.data.list;
 					let productList = that.hostProduct;
diff --git a/pages/order_addcart/order_addcart.vue b/pages/order_addcart/order_addcart.vue
index 8fc058c..71d0740 100644
--- a/pages/order_addcart/order_addcart.vue
+++ b/pages/order_addcart/order_addcart.vue
@@ -44,7 +44,7 @@
 								<navigator
 									:url="hide_mer_status == 0 ? `/pages/store/home/index?id=${item.mer_id}&sale_type=${tabsCurr}` : '#'"
 									class="info">
-									<view class="name">{{item.mer_name}}</view>
+									<view class="name line1" style="max-width: 450rpx;">{{item.mer_name}}</view>
 									<text class="iconfont icon-xiangyou" style="font-weight: bold;"></text>
 								</navigator>
 							</view>
@@ -88,13 +88,11 @@
 									</view>
 
 									<view class='money acea-row row-middle'>
-										<view>
+										<view class="line1" style="max-width: 260rpx;">
 											<text class="money-price">￥{{goods.productAttr.price}}</text>
-											<text class="money-unit">/份</text>
+											<text
+												class="money-unit">/{{goods.productAttr.sku || goods.product.unit_name}}</text>
 										</view>
-										<!-- <view v-if="goods.productAttr.show_svip_price" class="vipImg">
-											<image :src="`${domain}/static/images/svip.png`"></image>
-										</view> -->
 									</view>
 								</view>
 								<view class='carnum acea-row row-center-wrapper'>
@@ -180,8 +178,8 @@
 				@ChangCouponsUseState="ChangCouponsUseState"></couponListWindow>
 		</block>
 		<!-- 组件 -->
-		<addcartWindow :key="addcartKey" :attr="attr" :isShow='1' :iSplus='1' :destri='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr"
-			@goCat="goCat" @attrVal="attrVal" id='product-window'></addcartWindow>
+		<addcartWindow :key="addcartKey" :attr="attr" :isShow='1' :iSplus='1' :destri='1' @myevent="onMyEvent"
+			@ChangeAttr="ChangeAttr" @goCat="goCat" @attrVal="attrVal" id='product-window'></addcartWindow>
 		<Authorize :isShowAuth="isShowAuth"></Authorize>
 		<!--自定义底部tab栏-->
 		<customTab :newData="newData" :activeRouter="activeRouter"></customTab>
@@ -260,7 +258,7 @@
 				}],
 				tabsCurr: 1,
 				subsecCurr: 0,
-        addcartKey: 0,
+				addcartKey: 0,
 				domain: HTTP_REQUEST_URL,
 				loading: false, //是否加载中
 				loadend: false, //是否加载完毕
@@ -306,7 +304,7 @@
 				currSku: '',
 				newData: {},
 				activeRouter: '',
-        attrTxt: '',
+				attrTxt: '',
 				userInfo: {},
 				mer_info: {
 					mer_settlement_agree_status: 0
@@ -512,12 +510,12 @@
 					// //打开属性
 					// that.DefaultSelect(goods)
 					cartProductAttr(id).then(res => {
-            if(res.data.attr.length==0)return Toast('此商品为单规格商品');
-            const sku = {};
-            res.data.attrValue.forEach((itemn) => {
-              if(this.tabsCurr==2) itemn.price = itemn.wholesale_price; //把价格设置为批发价
-            	sku[itemn.sku] = itemn;
-            })
+						if (res.data.attr.length == 0) return Toast('此商品为单规格商品');
+						const sku = {};
+						res.data.attrValue.forEach((itemn) => {
+							if (this.tabsCurr == 2) itemn.price = itemn.wholesale_price; //把价格设置为批发价
+							sku[itemn.sku] = itemn;
+						})
 						goods.attr = res.data.attr;
 						goods.attrValue = res.data.attrValue
 						that.attrValue = goods.productAttr.sku
@@ -528,7 +526,7 @@
 						that.$set(that, 'productValue', sku);
 						let productSelect = sku[that.attrValue];
 						that.isOpen = that.attr.cartAttr = true;
-            this.newVal = sku[goods.productAttr.sku] || Object.keys(sku)[0];
+						this.newVal = sku[goods.productAttr.sku] || Object.keys(sku)[0];
 						that.DefaultSelect(goods)
 					}).catch(err => {
 						return that.$util.Tips({
diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue
index 31addb3..61854e8 100644
--- a/pages/order_details/index.vue
+++ b/pages/order_details/index.vue
@@ -128,17 +128,19 @@
 				</view>
 				<view class="merchant" v-if="orderInfo.merchant && orderInfo.order_type != 1"
 					@click="goStore(orderInfo.mer_id)">
-					{{orderInfo.merchant.mer_name}}
+					<text class="merchant_name line1">{{orderInfo.merchant.mer_name}}</text>
 					<text class="iconfont icon-xiangyou"></text>
 				</view>
 				<block v-if="cartInfo.length>0">
-					<orderGoods :orderData='orderInfo' :pay_type="orderInfo.pay_type" :status="orderInfo.status"  :evaluate='orderInfo.status'
-						:activityType='orderInfo.activity_type' :sale_type="sale_type" :orderId="order_id" :cartInfo="cartInfo" :jump="true">
+					<orderGoods :orderData='orderInfo' :pay_type="orderInfo.pay_type" :status="orderInfo.status"
+						:evaluate='orderInfo.status' :activityType='orderInfo.activity_type' :sale_type="sale_type"
+						:orderId="order_id" :cartInfo="cartInfo" :jump="true">
 					</orderGoods>
 					<block
 						v-if="orderInfo.order_type == 1 && orderInfo.takeOrderList && orderInfo.takeOrderList.length > 0"
 						v-for="(item,index) in orderInfo.takeOrderList" :key="index">
-						<orderGoods :orderData='item' :pay_type="orderInfo.pay_type" :status="orderInfo.status" :evaluate='item.status' :activityType='item.activity_type' :sale_type="sale_type"
+						<orderGoods :orderData='item' :pay_type="orderInfo.pay_type" :status="orderInfo.status"
+							:evaluate='item.status' :activityType='item.activity_type' :sale_type="sale_type"
 							:orderId="item.order_id" :cartInfo="item.orderProduct" :jump="true"></orderGoods>
 					</block>
 				</block>
@@ -244,9 +246,9 @@
 						<view class='conter' v-if="orderInfo.pay_type==4 || orderInfo.pay_type==5">支付宝支付</view>
 						<view class='conter'
 							v-if="orderInfo.pay_type==1 || orderInfo.pay_type==2 || orderInfo.pay_type==3">微信支付</view>
-            <view class='conter' v-if="orderInfo.pay_type==11">微信收款</view>
-            <view class='conter' v-if="orderInfo.pay_type==12">现金收款</view>
-            <view class='conter' v-if="orderInfo.pay_type==13">支付宝收款</view>
+						<view class='conter' v-if="orderInfo.pay_type==11">微信收款</view>
+						<view class='conter' v-if="orderInfo.pay_type==12">现金收款</view>
+						<view class='conter' v-if="orderInfo.pay_type==13">支付宝收款</view>
 					</view>
 					<view class='item acea-row row-between' v-if="orderInfo.mark">
 						<view>买家留言：</view>
@@ -286,10 +288,11 @@
 					<view>优惠券抵扣：</view>
 					<view class='conter' style="color: #F55726;">-￥{{orderInfo.coupon_price}}</view>
 				</view>
-        <view class='item acea-row row-between' v-if='orderInfo.platform_coupon_price > 0'>
-        	<view>平台优惠抵扣：</view>
-        	<view class='conter' style="width: auto;color: #F55726;">-￥{{orderInfo.platform_coupon_price}}</view>
-        </view>
+				<view class='item acea-row row-between' v-if='orderInfo.platform_coupon_price > 0'>
+					<view>平台优惠抵扣：</view>
+					<view class='conter' style="width: auto;color: #F55726;">-￥{{orderInfo.platform_coupon_price}}
+					</view>
+				</view>
 				<view class='item acea-row row-between' v-if='orderInfo.integral'>
 					<view>积分抵扣：</view>
 					<view class='conter'>-￥{{orderInfo.integral_price}}</view>
@@ -511,7 +514,7 @@
 					invoice: false,
 					add: false,
 				},
-        sale_type: 1
+				sale_type: 1
 			};
 		},
 		computed: {
@@ -534,7 +537,7 @@
 		onLoad: function(options) {
 			if (options.order_id) {
 				this.$set(this, 'order_id', options.order_id);
-        options.sale_type ? this.sale_type = options.sale_type : null;
+				options.sale_type ? this.sale_type = options.sale_type : null;
 			}
 		},
 		onShow() {
@@ -613,7 +616,7 @@
 			goStore(mer_id) {
 				if (this.hide_mer_status != 1) {
 					uni.navigateTo({
-						url: '/pages/store/home/index?id=' + mer_id  + '&sale_type=' + this.sale_type
+						url: '/pages/store/home/index?id=' + mer_id + '&sale_type=' + this.sale_type
 					})
 				}
 			},
@@ -938,11 +941,12 @@
 				})
 				orderAgain({
 					data: data,
-          sale_type: this.sale_type
+					sale_type: this.sale_type
 				}).then(res => {
 					let cart_id = res.data.cart_id.join(',')
 					return uni.navigateTo({
-						url: '/pages/users/order_confirm/index?cartId=' + cart_id + '&sale_type=' + this.sale_type
+						url: '/pages/users/order_confirm/index?cartId=' + cart_id + '&sale_type=' +
+							this.sale_type
 					});
 				}).catch(err => {
 					that.$util.Tips({
@@ -1054,6 +1058,7 @@
 	}
 
 	.merchant {
+		display: flex;
 		width: 100%;
 		height: 86rpx;
 		padding: 0 30rpx;
@@ -1065,6 +1070,12 @@
 		box-sizing: border-box;
 		background-color: #fff;
 
+		.merchant_name {
+			display: inline-block;
+			overflow: hidden;
+			max-width: 700rpx;
+		}
+
 		.iconfont {
 			margin-top: 6rpx;
 			font-size: 22rpx;
diff --git a/pages/order_details/stay.vue b/pages/order_details/stay.vue
index 02e2711..7da8f0a 100644
--- a/pages/order_details/stay.vue
+++ b/pages/order_details/stay.vue
@@ -57,7 +57,7 @@
 			</view>
 			<!-- 店铺商品列表 -->
 			<view class="order-wrapper" v-for="(item,index) in orderInfo.orderList" :key="index">
-				<view class="title" @click="goStore(item)">{{item.merchant.mer_name}}<text
+				<view class="title line1" @click="goStore(item)">{{item.merchant.mer_name}}<text
 						class="iconfont icon-xiangyou"></text>
 				</view>
 				<view class="goods-box" v-if="item.orderProduct">
diff --git a/pages/user/index.vue b/pages/user/index.vue
index f88f3bf..5738025 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -100,19 +100,19 @@
 							</view>
 							<view>补贴余额 (元)</view>
 						</view> -->
-            <view class="p_d_item" @click="authTo('/pages/users/user_money/index')">
-            	<view class="p_d_count">
-            		<image
-            			src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e41f4202401201745498894.png">
-            		</image>
-            		<view style="font-size: 30rpx;">我的余额 (元)</view>
-            	</view>
-            </view>
-            <view class="p_d_item" @click="authTo('/pages/users/user_money/index')">
-            	<view class="p_d_count">
-            		<view>￥{{userInfo.now_money||"0.00"}}</view>
-            	</view>
-            </view>
+						<view class="p_d_item" @click="authTo('/pages/users/user_money/index')">
+							<view class="p_d_count">
+								<image
+									src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e41f4202401201745498894.png">
+								</image>
+								<view style="font-size: 30rpx;">我的余额 (元)</view>
+							</view>
+						</view>
+						<view class="p_d_item" @click="authTo('/pages/users/user_money/index')">
+							<view class="p_d_count">
+								<view>￥{{userInfo.now_money||"0.00"}}</view>
+							</view>
+						</view>
 					</view>
 
 					<view @click="goSvip" class="cardVipA acea-row row-between-wrapper" v-if="svip_switch_status == 1">
@@ -238,7 +238,7 @@
 				<view class="">备案号:蜀ICP备2022030133号-2A</view>
 				<view class="">增值电信营业许可证号:川B2-20221250</view>
 				<view class="">联系我们：08302669767</view>
-        <view style="padding-top: 50rpx;">{{appVersion}}</view>
+				<view style="padding-top: 50rpx;">{{appVersion}}</view>
 			</view>
 			<!-- <view v-else class="copy-right">
 				<view class="iconfont icon-crmeb"></view>
@@ -300,12 +300,14 @@
 	import Auth from '../../libs/wechat';
 	import {
 		HTTP_REQUEST_URL,
-    ENV 
+		ENV
 	} from '@/config/app';
 	import {
 		toLogin
 	} from '@/libs/login.js';
-  import {showTab} from "@/utils/showTab.js";
+	import {
+		showTab
+	} from "@/utils/showTab.js";
 	const app = getApp();
 	export default {
 		components: {
@@ -453,17 +455,17 @@
 				newData: {},
 				activeRouter: '',
 				sysHeight: sysHeight,
-        appVersion: ''
+				appVersion: ''
 			}
 		},
 		onLoad() {
-      // #ifdef APP-PLUS
-      this.appVersion = 'V ' + uni.getSystemInfoSync().appWgtVersion;
-      // #endif
-      // #ifdef H5
-      this.appVersion = 'V ' + uni.getSystemInfoSync().appVersion;
-      // #endif
-      if (ENV != 'prod') this.appVersion += " Beta"
+			// #ifdef APP-PLUS
+			this.appVersion = 'V ' + uni.getSystemInfoSync().appWgtVersion;
+			// #endif
+			// #ifdef H5
+			this.appVersion = 'V ' + uni.getSystemInfoSync().appVersion;
+			// #endif
+			if (ENV != 'prod') this.appVersion += " Beta"
 		},
 		onReady() {
 			this.isNodes++;
@@ -479,7 +481,7 @@
 			this.getNav();
 			if (that.isLogin) {
 				this.getUserInfo();
-				this.orderNum();
+
 			} else {
 				// this.userInfo = {
 				// 	is_svip: 0
@@ -524,7 +526,6 @@
 				} else {
 					this.openAuto()
 				}
-
 			},
 			goRouter(item) {
 				var pages = getCurrentPages();
@@ -636,31 +637,59 @@
 			getUserInfo: function() {
 				let that = this;
 				getUserInfo().then(res => {
-          showTab(res.data);
+					showTab(res.data);
 					that.userInfo = res.data;
 					that.is_promoter = res.data.is_promoter;
 					that.extension_status = res.data.extension_status;
 					that.getMyMenus();
+					this.orderNum();
 				});
 			},
 			// 订单数字
 			orderNum() {
+				let openType = '';
 				orderData().then(({
 					data
 				}) => {
 					this.orderMenu.forEach((item, index) => {
 						switch (item.title) {
 							case '待付款':
-								item.num = data.noPay
+								item.num = Number(data.noPay) + Number(data.mer_noPay);
+								if ((data.noPay >= data.mer_noPay) || data.noPay) {
+									openType = 1;
+								} else {
+									openType = 2;
+								}
+								item.url = '/pages/users/order_list/index?status=0&openType=' + openType
 								break
 							case '待发货':
-								item.num = data.noPostage
+								item.num = Number(data.noPostage) + Number(data.mer_noPostage);
+								if ((data.noPostage >= data.mer_noPostage) || data.noPostage) {
+									openType = 1;
+								} else {
+									openType = 2;
+								}
+								item.url = '/pages/users/order_list/index?status=1&openType=' + openType
 								break
 							case '待收货':
-								item.num = data.noDeliver
+								item.num = Number(data.noDeliver) + Number(data.mer_noDeliver);
+
+								if ((data.noDeliver >= data.mer_noDeliver) || data.noDeliver) {
+									openType = 1;
+								} else {
+									openType = 2;
+								}
+
+								item.url = '/pages/users/order_list/index?status=2&openType=' + openType
 								break
 							case '待评价':
-								item.num = data.noComment
+								item.num = Number(data.noComment) + Number(data.mer_noComment);
+								if ((data.noComment >= data.mer_noComment) || data.noComment) {
+									openType = 1;
+								} else {
+									openType = 2;
+								}
+								item.url = '/pages/users/order_list/index?status=3&openType=' + openType
 								break
 							case '售后/退款':
 								item.num = data.refund
@@ -1263,11 +1292,11 @@
 
 		.iconnum {
 			min-width: 6px;
-			background-color: #fff;
-			color: var(--view-theme);
+			background-color: red;
+			color: #fff;
 			border-radius: 15rpx;
 			position: absolute;
-			right: -10rpx;
+			left: 50rpx;
 			top: -10rpx;
 			font-size: 10px;
 			padding: 0 4px;
diff --git a/pages/users/login/login_copy.vue b/pages/users/login/login_copy.vue
index 7e74e0f..5518e44 100644
--- a/pages/users/login/login_copy.vue
+++ b/pages/users/login/login_copy.vue
@@ -1,27 +1,28 @@
 <template>
 	<div :style="viewColor">
-    
+
 		<div class="register absolute" v-if="!auth_token">
 			<div class="login" style="background-size: 100% 100%;background-repeat: no-repeat;">
-				<div class="shading" >
+				<div class="shading">
 					<div class="pictrue acea-row row-center-wrapper" style="background-color: transparent !important;">
-						<image src="@/static/images/logo1.png"  />
+						<image src="@/static/images/logo1.png" />
+					</div>
+				</div>
+				<div class="whiteBg" v-if="formItem == 0">
+					<div class="logon" style="display: flex;align-items: center;justify-content: center;"
+						@click="wxLogin">
+						<u-icon name="weixin-fill" color="#fff" size="30"></u-icon> 微信一键登录
+					</div>
+
+					<div class="protocol acea-row row-between-wrapper">
+						<checkbox-group class="checkgroup" @change='isAgree=!isAgree'>
+							<checkbox class="checkbox" :checked="isAgree ? true : false" />
+							<text class="protocol_text">我已同意<text @click="userAgree"
+									class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree"
+									class="font_pro">《隐私政策》</text></text>
+						</checkbox-group>
 					</div>
 				</div>
-        <div class="whiteBg" v-if="formItem == 0">
-          <div class="logon" style="display: flex;align-items: center;justify-content: center;" @click="wxLogin"> 
-            <u-icon name="weixin-fill" color="#fff" size="30"></u-icon> 微信一键登录
-          </div>
-          
-          <div class="protocol acea-row row-between-wrapper">
-          	<checkbox-group class="checkgroup" @change='isAgree=!isAgree'>
-          		<checkbox class="checkbox" :checked="isAgree ? true : false" />
-          		<text class="protocol_text">我已同意<text @click="userAgree"
-          				class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree"
-          				class="font_pro">《隐私政策》</text></text>
-          	</checkbox-group>
-          </div>
-        </div>
 				<div class="whiteBg" v-else-if="formItem === 1" style="po">
 					<div class="title acea-row row-center-wrapper">
 						<div class="item" :class="current === index ? 'on' : ''" v-for="(item, index) in navList"
@@ -48,7 +49,7 @@
 						</form>
 						<div class="tip">
 							<!-- <span @click="formItem = 2" class="font-color-red">立即注册</span> -->
-              <span> </span>
+							<span> </span>
 							<navigator class="forgetPwd" hover-class="none" url="/pages/users/retrievePassword/index">
 								忘记密码
 							</navigator>
@@ -63,13 +64,13 @@
 									v-model="account" />
 							</div>
 						</div>
-						
+
 						<div class="item">
 							<div class="acea-row row-middle">
 								<image src="/static/images/code_2.png"></image>
-							
-								<input type="number" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput"
-									v-model="captcha" maxlength="4" />
+
+								<input type="number" placeholder="填写验证码" placeholder-class="placeholder"
+									class="codeIput" v-model="captcha" maxlength="4" />
 								<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
 									@click="handleVerify">
 									{{ text }}
@@ -79,8 +80,8 @@
 						<div class="item" v-if="isShowCode">
 							<div class="acea-row row-middle">
 								<image src="/static/images/code_2.png"></image>
-								<input type="number" placeholder="填写验证码"  placeholder-class="placeholder" class="codeIput"
-									v-model="codeVal" maxlength="4" />
+								<input type="number" placeholder="填写验证码" placeholder-class="placeholder"
+									class="codeIput" v-model="codeVal" maxlength="4" />
 								<div class="code" @click="getcaptcha">
 									<image class="code-img" style="width: 100%;height: 100%;" :src="codeUrl" />
 								</div>
@@ -112,9 +113,9 @@
 						<div class="item">
 							<div class="acea-row row-middle">
 								<image src="/static/images/code_2.png"></image>
-								<input type="number" placeholder="填写验证码"   maxLength='4'  placeholder-class="placeholder" class="codeIput"
-									v-model="captcha" />
-									
+								<input type="number" placeholder="填写验证码" maxLength='4' placeholder-class="placeholder"
+									class="codeIput" v-model="captcha" />
+
 								<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
 									@click="handleVerify">
 									{{ text }}
@@ -128,12 +129,12 @@
 									v-model="password" />
 							</div>
 						</div>
-						
+
 						<div class="item" v-if="isShowCode">
 							<div class="acea-row row-middle">
 								<image src="/static/images/code_2.png"></image>
-								<input type="number" placeholder="填写验证码" maxlength="4" placeholder-class="placeholder" class="codeIput"
-									v-model="codeVal" />
+								<input type="number" placeholder="填写验证码" maxlength="4" placeholder-class="placeholder"
+									class="codeIput" v-model="codeVal" />
 								<div class="code" @click="getcaptcha">
 									<image class="code-img" style="width: 100%;height: 100%;" :src="codeUrl" />
 								</div>
@@ -167,37 +168,38 @@
 					</view>
 				</view>
 			</view>
-      
-      <!-- #ifdef APP-PLUS -->
-      <div class="protocol acea-row row-between-wrapper" style="position: fixed; bottom: 160rpx;left: 50%;transform: translate(-50%);">
-      	<text class="protocol_text" v-if="formItem==0" @click="formItem = 1 ">其他方式登录</text>
-        <text class="protocol_text" v-else @click="formItem = 0 ">微信快捷登录</text>
-      </div>
-      <!-- #endif -->
+
+			<!-- #ifdef APP-PLUS -->
+			<div class="protocol acea-row row-between-wrapper"
+				style="position: fixed; bottom: 160rpx;left: 50%;transform: translate(-50%);">
+				<text class="protocol_text" v-if="formItem==0" @click="formItem = 1 ">其他方式登录</text>
+				<text class="protocol_text" v-else @click="formItem = 0 ">微信快捷登录</text>
+			</div>
+			<!-- #endif -->
 		</div>
 		<form report-submit='true' v-if="auth_token">
 			<view class="ChangePassword">
-        <view class="title">
-          <view>首次登录</view>
-          <view style="font-size: 36rpx;">需要绑定手机号码</view>
-        </view>
+				<view class="title">
+					<view>首次登录</view>
+					<view style="font-size: 36rpx;">需要绑定手机号码</view>
+				</view>
 				<view class="list">
 					<view class="item">
 						<input type='number' placeholder='填写手机号码' placeholder-class='placeholder'
 							v-model="account"></input>
 					</view>
-					
+
 					<view class="item acea-row row-between-wrapper">
-						<input type='number' placeholder='填写验证码' maxlength="4" placeholder-class='placeholder' class="codeIput"
-							v-model="captcha"></input>
-							
+						<input type='number' placeholder='填写验证码' maxlength="4" placeholder-class='placeholder'
+							class="codeIput" v-model="captcha"></input>
+
 						<button class="code" :class="disabled === true ? 'on' : ''" :disabled='disabled'
 							@click="handleVerify">
 							{{ text }}
 						</button>
 					</view>
 					<view class="item">
-						<input type='password' placeholder='填写登录密码'  placeholder-class='placeholder'
+						<input type='password' placeholder='填写登录密码' placeholder-class='placeholder'
 							v-model="password"></input>
 					</view>
 					<view class="protocol acea-row row-between-wrapper">
@@ -219,7 +221,7 @@
 
 		<Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }"
 			ref="verify"></Verify>
-      
+
 	</div>
 </template>
 <script>
@@ -275,13 +277,15 @@
 	import parser from "@/components/jyf-parser/jyf-parser";
 	import {
 		commonAuth,
-    userMerge
+		userMerge
 	} from '../../../api/public';
 	import {
 		mapGetters
 	} from "vuex";
 	import Verify from '@/components/verify/verify.vue';
-  import { Toast } from "../../../libs/uniApi";
+	import {
+		Toast
+	} from "../../../libs/uniApi";
 	const BACK_URL = "login_back_url";
 	// #ifdef APP-PLUS
 	var jpushModule = uni.requireNativePlugin("JG-JPush");
@@ -295,7 +299,7 @@
 		},
 		data: function() {
 			return {
-				navList: ["快速登录","账号登录"],
+				navList: ["快速登录", "账号登录"],
 				current: 0,
 				account: "",
 				password: "",
@@ -303,9 +307,9 @@
 				// #ifdef APP-PLUS
 				formItem: 0,
 				// #endif
-        // #ifndef APP-PLUS
-        formItem: 1,
-        // #endif
+				// #ifndef APP-PLUS
+				formItem: 1,
+				// #endif
 				type: "login",
 				keyCode: "",
 				codeUrl: "",
@@ -350,7 +354,7 @@
 			this.getVersion();
 		},
 		mounted: function() {
-      
+
 		},
 		onReady() {
 			let that = this
@@ -379,7 +383,8 @@
 					}).then(({
 						data
 					}) => {
-						const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) || "/pages/index/index";
+						const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) ||
+							"/pages/index/index";
 						that.$Cache.clear(BACK_URL);
 						that.$Cache.clear('login_back_url_weixin');
 						that.$store.commit("LOGIN", {
@@ -498,7 +503,8 @@
 				}).then(res => {
 					const data = res.data;
 					if (res.data.status == 200) {
-						const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) || "/pages/index/index";
+						const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) ||
+							"/pages/index/index";
 						that.$Cache.clear(BACK_URL);
 						that.$Cache.clear('login_back_url_weixin');
 						that.$store.commit("LOGIN", {
@@ -555,13 +561,13 @@
 					provider: 'weixin',
 					onlyAuthorize: true,
 					success: function(loginRes) {
-            console.log(loginRes);
-            uni.hideLoading()
+						console.log(loginRes);
+						uni.hideLoading()
 						self.appUserInfo = loginRes;
 						self.weixinLoginApi()
 					},
 					fail(error) {
-            console.log(error);
+						console.log(error);
 						uni.showToast({
 							title: '登录失败',
 							icon: 'none',
@@ -582,16 +588,17 @@
 				commonAuth({
 					auth: {
 						type: 'app_wechat',
-            auth: {
-            	code: that.appUserInfo.authResult.access_token,
-            	openid: that.appUserInfo.authResult.openid,
-            	phone: this.account,
-            }
+						auth: {
+							code: that.appUserInfo.authResult.access_token,
+							openid: that.appUserInfo.authResult.openid,
+							phone: this.account,
+						}
 					}
 				}).then(res => {
 					const data = res.data;
 					if (res.data.status == 200) {
-						const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) || "/pages/index/index";
+						const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) ||
+							"/pages/index/index";
 						that.$Cache.clear(BACK_URL);
 						that.$Cache.clear('login_back_url_weixin');
 						that.$store.commit("LOGIN", {
@@ -620,13 +627,71 @@
 							url: backUrl
 						});
 					} else {
-            that.isAgree = false;
+						that.isAgree = false;
 						that.auth_token = res.data.result.key;
 						that.bindStatus = true;
 					}
 					uni.hideLoading();
 				}).catch(res => {
-          console.log(res);
+					console.log(res);
+					uni.hideLoading();
+					uni.showToast({
+						title: res.message || res,
+						icon: 'none',
+						duration: 2000
+					});
+				});
+			},
+			weixinLoginApi() {
+				const that = this
+				commonAuth({
+					auth: {
+						type: 'app_wechat',
+						auth: {
+							code: that.appUserInfo.code
+						}
+					}
+				}).then(res => {
+					console.log('--', res);
+					const data = res.data;
+					if (res.data.status == 200) {
+						const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) ||
+							"/pages/index/index";
+						that.$Cache.clear(BACK_URL);
+						that.$Cache.clear('login_back_url_weixin');
+						that.$store.commit("LOGIN", {
+							'token': data.result.token,
+							'time': data.result.exp
+						});
+						that.$store.commit("SETUID", data.result.user.uid);
+						that.$store.commit('UPDATE_USERINFO', data.result.user);
+						let method
+						let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
+							'/pages/goods_cate/goods_cate',
+							'/pages/user/index', '/pages/plant_grass/index'
+						]
+						if (indexPat.includes(this.getPath(backUrl))) {
+							method = 'switchTab'
+						} else {
+							method = 'navigateTo'
+						}
+						if (this.getPath(backUrl) === '/pages/users/login/index') {
+							uni.switchTab({
+								url: '/pages/index/index'
+							});
+							return
+						}
+						uni[method]({
+							url: backUrl
+						});
+					} else {
+						that.isAgree = false;
+						that.auth_token = res.data.result.key;
+						that.bindStatus = true;
+					}
+					uni.hideLoading();
+				}).catch(res => {
+					console.log('错误--', res);
 					uni.hideLoading();
 					uni.showToast({
 						title: res.message || res,
@@ -635,63 +700,6 @@
 					});
 				});
 			},
-      weixinLoginApi() {
-      	const that = this
-      	commonAuth({
-      		auth: {
-      			type: 'app_wechat',
-            auth: {
-            	code: that.appUserInfo.code
-            }
-      		}
-      	}).then(res => {
-          console.log('--', res);
-      		const data = res.data;
-      		if (res.data.status == 200) {
-      			const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) || "/pages/index/index";
-      			that.$Cache.clear(BACK_URL);
-      			that.$Cache.clear('login_back_url_weixin');
-      			that.$store.commit("LOGIN", {
-      				'token': data.result.token,
-      				'time': data.result.exp
-      			});
-      			that.$store.commit("SETUID", data.result.user.uid);
-      			that.$store.commit('UPDATE_USERINFO', data.result.user);
-      			let method
-      			let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
-      				'/pages/goods_cate/goods_cate',
-      				'/pages/user/index', '/pages/plant_grass/index'
-      			]
-      			if (indexPat.includes(this.getPath(backUrl))) {
-      				method = 'switchTab'
-      			} else {
-      				method = 'navigateTo'
-      			}
-      			if (this.getPath(backUrl) === '/pages/users/login/index') {
-      				uni.switchTab({
-      					url: '/pages/index/index'
-      				});
-      				return
-      			}
-      			uni[method]({
-      				url: backUrl
-      			});
-      		} else {
-            that.isAgree = false;
-      			that.auth_token = res.data.result.key;
-      			that.bindStatus = true;
-      		}
-      		uni.hideLoading();
-      	}).catch(res => {
-          console.log('错误--', res);
-      		uni.hideLoading();
-      		uni.showToast({
-      			title: res.message || res,
-      			icon: 'none',
-      			duration: 2000
-      		});
-      	});
-      },
 			getAgreement() {
 				let that = this
 				getAgreementApi('sys_user_agree').then(res => {
@@ -745,23 +753,24 @@
 						data
 					}) => {
 						this.checkOpenId(data.user)
-						const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) || "/pages/index/index";
+						const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) ||
+							"/pages/index/index";
 						that.$store.commit("LOGIN", {
 							'token': data.token,
 							'time': data.exp
 						});
 						that.$store.commit("SETUID", data.user.uid);
 						that.$store.commit('UPDATE_USERINFO', data.user);
-              
-            if(data.is_new_user && !that.$Cache.get('login_back_url_weixin')){
-              return uni.navigateTo({
-                url: '/pages/helpPeople/helpPeople'
-              })
-            }
-            
-            that.$Cache.clear(BACK_URL);
-            that.$Cache.clear('login_back_url_weixin');
-            
+
+						if (data.is_new_user && !that.$Cache.get('login_back_url_weixin')) {
+							return uni.navigateTo({
+								url: '/pages/helpPeople/helpPeople'
+							})
+						}
+
+						that.$Cache.clear(BACK_URL);
+						that.$Cache.clear('login_back_url_weixin');
+
 						let method
 						let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
 							'/pages/goods_cate/goods_cate',
@@ -831,25 +840,26 @@
 						});
 						that.$store.commit("SETUID", res.data.user.uid);
 						that.$store.commit('UPDATE_USERINFO', res.data.user);
-						const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) || "/pages/index/index";
+						const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) ||
+							"/pages/index/index";
 						that.$Cache.clear(BACK_URL);
 						that.$Cache.clear('login_back_url_weixin');
-            let method
-            let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
-            	'/pages/goods_cate/goods_cate',
-            	'/pages/user/index'
-            ]
-            if (indexPat.includes(this.getPath(backUrl))) {
-            	method = 'switchTab'
-            } else {
-            	method = 'navigateTo'
-            }
-            uni[method]({
-            	url: backUrl,
-              success:()=>{
-                this.auth_token = ''
-              }
-            });
+						let method
+						let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
+							'/pages/goods_cate/goods_cate',
+							'/pages/user/index'
+						]
+						if (indexPat.includes(this.getPath(backUrl))) {
+							method = 'switchTab'
+						} else {
+							method = 'navigateTo'
+						}
+						uni[method]({
+							url: backUrl,
+							success: () => {
+								this.auth_token = ''
+							}
+						});
 					})
 					.catch(res => {
 						that.$util.Tips({
@@ -857,90 +867,91 @@
 						});
 					});
 			},
-      async weixinMerge() {
-      	let that = this;
-      	if (!that.account) return that.$util.Tips({
-      		title: '请输入手机号码'
-      	});
-      	if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.account)) return that.$util.Tips({
-      		title: '请输入正确的手机号码'
-      	});
-      	if (!that.captcha) return that.$util.Tips({
-      		title: '请输入验证码'
-      	});
-      	if (!/^[\w\d]+$/i.test(that.captcha)) return that.$util.Tips({
-      		title: '请输入正确的验证码'
-      	});
-      	if (!that.password) return that.$util.Tips({
-      		title: '请输入密码'
-      	});
-      	if (!/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$/i.test(that.password)) return that.$util.Tips({
-      		title: '请输入6-16位字母加数字组合'
-      	});
-      	if (!that.isAgree) return that.$util.Tips({
-      		title: '请勾选用户协议与隐私政策'
-      	});
-        console.log('绑定前', {
-      			auth_token: this.auth_token || uni.getStorageSync('auth_token'),
-      			phone: that.account,
-      			sms_code: that.captcha,
-      			pwd: that.password,
-      			spread: that.$Cache.get("spread"),
-      			// #ifdef APP-PLUS
-      			user_type: 'app',
-      			// #endif
-      			// #ifdef H5
-      			user_type: 'h5',
-      			// #endif
-      		});
-      	userMerge({
-      			auth_token: this.auth_token || uni.getStorageSync('auth_token'),
-      			phone: that.account,
-      			sms_code: that.captcha,
-      			pwd: that.password,
-      			spread: that.$Cache.get("spread"),
-      			// #ifdef APP-PLUS
-      			user_type: 'app',
-      			// #endif
-      			// #ifdef H5
-      			user_type: 'h5',
-      			// #endif
-      		})
-      		.then(res => {
-            console.log(res);
-      			that.$store.commit("LOGIN", {
-      				'token': res.data.token,
-      				'time': res.data.exp
-      			});
-      			that.$store.commit("SETUID", res.data.user.uid);
-      			that.$store.commit('UPDATE_USERINFO', res.data.user);
-      			const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) || "/pages/index/index";
-      			that.$Cache.clear(BACK_URL);
-      			that.$Cache.clear('login_back_url_weixin');
-            let method
-            let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
-            	'/pages/goods_cate/goods_cate',
-            	'/pages/user/index'
-            ]
-            if (indexPat.includes(this.getPath(backUrl))) {
-            	method = 'switchTab'
-            } else {
-            	method = 'navigateTo'
-            }
-            uni[method]({
-            	url: backUrl,
-              success:()=>{
-                this.auth_token = ''
-              }
-            });
-      		})
-      		.catch(res => {
-            console.log('error', err);
-      			that.$util.Tips({
-      				title: res
-      			});
-      		});
-      },
+			async weixinMerge() {
+				let that = this;
+				if (!that.account) return that.$util.Tips({
+					title: '请输入手机号码'
+				});
+				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.account)) return that.$util.Tips({
+					title: '请输入正确的手机号码'
+				});
+				if (!that.captcha) return that.$util.Tips({
+					title: '请输入验证码'
+				});
+				if (!/^[\w\d]+$/i.test(that.captcha)) return that.$util.Tips({
+					title: '请输入正确的验证码'
+				});
+				if (!that.password) return that.$util.Tips({
+					title: '请输入密码'
+				});
+				if (!/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$/i.test(that.password)) return that.$util.Tips({
+					title: '请输入6-16位字母加数字组合'
+				});
+				if (!that.isAgree) return that.$util.Tips({
+					title: '请勾选用户协议与隐私政策'
+				});
+				console.log('绑定前', {
+					auth_token: this.auth_token || uni.getStorageSync('auth_token'),
+					phone: that.account,
+					sms_code: that.captcha,
+					pwd: that.password,
+					spread: that.$Cache.get("spread"),
+					// #ifdef APP-PLUS
+					user_type: 'app',
+					// #endif
+					// #ifdef H5
+					user_type: 'h5',
+					// #endif
+				});
+				userMerge({
+						auth_token: this.auth_token || uni.getStorageSync('auth_token'),
+						phone: that.account,
+						sms_code: that.captcha,
+						pwd: that.password,
+						spread: that.$Cache.get("spread"),
+						// #ifdef APP-PLUS
+						user_type: 'app',
+						// #endif
+						// #ifdef H5
+						user_type: 'h5',
+						// #endif
+					})
+					.then(res => {
+						console.log(res);
+						that.$store.commit("LOGIN", {
+							'token': res.data.token,
+							'time': res.data.exp
+						});
+						that.$store.commit("SETUID", res.data.user.uid);
+						that.$store.commit('UPDATE_USERINFO', res.data.user);
+						const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) ||
+							"/pages/index/index";
+						that.$Cache.clear(BACK_URL);
+						that.$Cache.clear('login_back_url_weixin');
+						let method
+						let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
+							'/pages/goods_cate/goods_cate',
+							'/pages/user/index'
+						]
+						if (indexPat.includes(this.getPath(backUrl))) {
+							method = 'switchTab'
+						} else {
+							method = 'navigateTo'
+						}
+						uni[method]({
+							url: backUrl,
+							success: () => {
+								this.auth_token = ''
+							}
+						});
+					})
+					.catch(res => {
+						console.log('error', err);
+						that.$util.Tips({
+							title: res
+						});
+					});
+			},
 			async code(data) {
 				let that = this;
 				if (!that.account) return that.$util.Tips({
@@ -1003,17 +1014,21 @@
 				if (!that.isAgree) return that.$util.Tips({
 					title: '请勾选用户协议与隐私政策'
 				});
+
+				console.log(11)
+
 				loginH5({
 						auth_token: uni.getStorageSync('auth_token'),
 						account: that.account,
 						password: that.password,
 						spread: that.$Cache.get("spread")
-					})
-					.then(({
+					}).then(({
 						data
 					}) => {
+						console.log(data)
 						this.checkOpenId(data.user)
-						const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) || "/pages/index/index";
+						const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) ||
+							"/pages/index/index";
 						that.$store.commit("LOGIN", {
 							'token': data.token,
 							'time': data.exp
@@ -1021,15 +1036,15 @@
 						that.$store.commit("SETUID", data.user.uid);
 						that.$store.commit('UPDATE_USERINFO', data.user);
 
-            if(data.is_new_user && !that.$Cache.get('login_back_url_weixin')){
-              return uni.navigateTo({
-                url: '/pages/helpPeople/helpPeople'
-              })
-            }
-            
-            that.$Cache.clear(BACK_URL);
-            that.$Cache.clear('login_back_url_weixin');
-            
+						if (data.is_new_user && !that.$Cache.get('login_back_url_weixin')) {
+							return uni.navigateTo({
+								url: '/pages/helpPeople/helpPeople'
+							})
+						}
+
+						that.$Cache.clear(BACK_URL);
+						that.$Cache.clear('login_back_url_weixin');
+
 						let method
 						let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
 							'/pages/goods_cate/goods_cate',
@@ -1040,7 +1055,7 @@
 						} else {
 							method = 'navigateTo'
 						}
-            
+
 						if (this.getPath(backUrl) === '/pages/users/login/index') {
 							uni.switchTab({
 								url: '/pages/index/index'
@@ -1052,6 +1067,7 @@
 						});
 					})
 					.catch(e => {
+						console.log(e)
 						that.$util.Tips({
 							title: e
 						});
@@ -1082,34 +1098,34 @@
 			checkOpenId(user) {
 				if (user.wechat_user_id === 0) {
 					let that = this
-					try{
-					  wx.getUserInfo({
-					  	success: function(res) {
-					  		const encryptedData = res.encryptedData
-					  		const iv = res.iv
-					  		wx.login({
-					  			success(res) {
-					  				if (res.code) {
-					  					bindMp({
-					  						code: res.code,
-					  						iv: iv,
-					  						encryptedData: encryptedData,
-					  						phone: that.account
-					  					}).then(res => {
-					  						// console.log(res);
-					  					})
-					  				} else {
-					  					// console.log('登录失败！' + res.errMsg)
-					  				}
-					  			}
-					  		})
-					  	},
-					  	fail(e) {
-					  		// console.log('登录失败！' + res.errMsg)
-					  	}
-					  })
-					}catch(e){
-					  console.log(e);
+					try {
+						wx.getUserInfo({
+							success: function(res) {
+								const encryptedData = res.encryptedData
+								const iv = res.iv
+								wx.login({
+									success(res) {
+										if (res.code) {
+											bindMp({
+												code: res.code,
+												iv: iv,
+												encryptedData: encryptedData,
+												phone: that.account
+											}).then(res => {
+												// console.log(res);
+											})
+										} else {
+											// console.log('登录失败！' + res.errMsg)
+										}
+									}
+								})
+							},
+							fail(e) {
+								// console.log('登录失败！' + res.errMsg)
+							}
+						})
+					} catch (e) {
+						console.log(e);
 					}
 				}
 				// #ifdef APP-PLUS
@@ -1119,11 +1135,11 @@
 						bindJG({
 							phone: this.account,
 							jg_register_id: result.registerID
-						}).then(res=>{
-              console.log("绑定成功", res);
-            }).catch(err=>{
-              console.log("绑定失败", err);
-            })
+						}).then(res => {
+							console.log("绑定成功", res);
+						}).catch(err => {
+							console.log("绑定失败", err);
+						})
 					}
 				})
 				// #endif
@@ -1140,15 +1156,15 @@
 	/deep/uni-checkbox .uni-checkbox-input {
 		border-radius: 100%;
 	}
-  
-  .ChangePassword{
-    .title{
-      width: 580rpx;
-      margin: 180rpx auto 0 auto;
-      font-size: 46rpx;
-      color: #7f7f7f;
-    }
-  }
+
+	.ChangePassword {
+		.title {
+			width: 580rpx;
+			margin: 180rpx auto 0 auto;
+			font-size: 46rpx;
+			color: #7f7f7f;
+		}
+	}
 
 	.ChangePassword .phone {
 		font-size: 32rpx;
@@ -1450,8 +1466,8 @@
 
 		.whiteBg {
 			margin-top: 100rpx;
-      transition: 300ms;
-      
+			transition: 300ms;
+
 			.list {
 				border-radius: 16rpx;
 				overflow: hidden;
diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue
index 4b3e9e4..5ba1eca 100644
--- a/pages/users/order_list/index.vue
+++ b/pages/users/order_list/index.vue
@@ -9,8 +9,9 @@
 					<view class="btn_tab">
 						<view class="tab_item" :class="{'tab_item_active': sale_type==1}" @click="changeSaleType(1)">
 							用户订单</view>
-						<view v-if="mer_info.mer_settlement_agree_status||sale_type==2" class="tab_item"
-							:class="{'tab_item_active': sale_type==2}" @click="changeSaleType(2)">商户订单</view>
+						<view v-if="(mer_info && mer_info.mer_settlement_agree_status==1)||sale_type==2"
+							class="tab_item" :class="{'tab_item_active': sale_type==2}" @click="changeSaleType(2)">商户订单
+						</view>
 					</view>
 					<view class="btn_car" @click="toGwc">
 						<text class="iconfont icon-gouwuche" style="font-size: 36rpx;"></text>
@@ -19,23 +20,28 @@
 				<view class='nav acea-row row-around new-nav-tab'>
 					<view class='item' :class='orderStatus==-1 ? "on": ""' @click="statusClick(-1)">
 						<view>全部</view>
-						<view class='num'>{{orderData.all || 0}}</view>
+						<view class='num'>{{(sale_type==1?orderData.all:orderData.mer_all) || 0}}</view>
 					</view>
 					<view class='item' :class='orderStatus==0 ? "on": ""' @click="statusClick(0)">
 						<view>待付款</view>
-						<view class='num'>{{orderData.noPay || 0}}</view>
+						<view class='num'>{{(sale_type==1?orderData.noPay:orderData.mer_noPay) || 0}}</view>
 					</view>
 					<view class='item' :class='orderStatus==1 ? "on": ""' @click="statusClick(1)">
 						<view>待发货</view>
-						<view class='num'>{{orderData.noPostage || 0}}</view>
+						<view class='num'>{{(sale_type==1?orderData.noPostage:orderData.mer_noPostage) || 0}}</view>
 					</view>
 					<view class='item' :class='orderStatus==2 ? "on": ""' @click="statusClick(2)">
 						<view>待收货</view>
-						<view class='num '>{{orderData.noDeliver || 0}}</view>
+						<view class='num' v-if="sale_type == 1">{{(Number(orderData.noDeliver)) || 0}} </view>
+						<view class='num' v-else>{{( Number(orderData.mer_noDeliver)) || 0}} </view>
 					</view>
 					<view class='item' :class='orderStatus==3 ? "on": ""' @click="statusClick(3)">
 						<view>待评价</view>
-						<view class='num'>{{orderData.noComment || 0}}</view>
+						<view class='num'>{{(sale_type==1?orderData.noComment:orderData.mer_noComment) || 0}}</view>
+					</view>
+					<view class='item' :class='orderStatus==4 ? "on": ""' @click="statusClick(4)">
+						<view>退款/售后</view>
+						<view class='num'>{{(sale_type==1?orderData.elseRefund:orderData.mer_elseRefund) || 0}}</view>
 					</view>
 				</view>
 			</view>
@@ -73,11 +79,12 @@
 					<view class='num'>{{orderData.noComment || 0}}</view>
 				</view>
 			</view> -->
-			<navigator class="search acea-row row-middle" :url="`/pages/users/order_list/search?sale_type=${sale_type}`"
-				hover-class="none">
+			<navigator class="search acea-row row-middle"
+				:url="`/pages/users/order_list/search?sale_type=${sale_type}&status=${orderStatus}`" hover-class="none">
 				<text class="iconfont icon-sousuo"></text>
 				搜索我的订单
 			</navigator>
+
 			<!--定金预售订单-->
 			<view v-if="presellProList.length > 0" class="event_container"
 				:style="{ 'background-image': `url(${domain}/static/images/presell_orderBg.png)`}">
@@ -103,19 +110,19 @@
 					<block v-if="orderStatus == 0">
 						<view class='item' v-for="(item,index) in orderList" :key="index">
 							<view @click='goOrderDetails(item.group_order_id)'>
-								<view class='title acea-row row-between-wrapper'>
-									<view class="acea-row row-middle left-wrapper">
-										<text class="iconfont icon-shangjiadingdan"></text>
-										<view class="store-name">
-											<view>{{item.orderList[0].merchant.mer_name}}</view>
-										</view>
-										<text class="iconfont icon-xiangyou"></text>
-									</view>
-									<view class='t-color'>
-										{{ item.orderList[0].activity_type === 2 && item.orderList[0].orderProduct[0].cart_info.productPresell.presell_type ==2 ? "待付定金" : "待付款" }}
-									</view>
-								</view>
+
 								<view v-for="(order,j) in item.orderList" :key="order.order_id+j">
+									<view class='title acea-row row-between-wrapper'>
+										<view class="acea-row row-middle left-wrapper">
+											<text class="iconfont icon-shangjiadingdan"></text>
+											<view class="store-name line1">{{order.merchant.mer_name}}
+											</view>
+											<text class="iconfont icon-xiangyou"></text>
+										</view>
+										<view class='t-color'>
+											{{ order.activity_type === 2 && order.orderProduct[0].cart_info.productPresell.presell_type ==2 ? "待付定金" : "待付款" }}
+										</view>
+									</view>
 									<!--预售-->
 									<view v-if="order.activity_type === 2">
 										<block v-for="(goods,g) in order.orderProduct">
@@ -208,6 +215,73 @@
 							</view>
 						</view>
 					</block>
+
+					<!-- 退款 -->
+					<block v-else-if="orderStatus == 4">
+						<view class="goods-wrapper">
+							<view>
+								<view class="info-box" v-for="(item,index) in orderList" :key="index">
+									<view class="title" @click="goMall(item)">
+										<text class="iconfont icon-shangjiadingdan"></text>
+										<text v-if="item.merchant" class="txt line1"
+											style="max-width: 500rpx;">{{item.merchant.mer_name}}</text>
+										<text class="iconfont icon-xiangyou"></text>
+									</view>
+									<view class="product-box">
+										<view class="product-item" v-for="goods in item.refundProduct"
+											:key="goods.order_product_id">
+											<image class="img-box" :src="goods.product.cart_info.product.image" mode="">
+											</image>
+											<view class="msg">
+												<view class="name line1"><text
+														v-if="goods.product.cart_info.product_type === 2"
+														class="event_name event_bg">预售</text>{{goods.product.cart_info.product.store_name}}
+												</view>
+												<view class="des">{{goods.product.cart_info.productAttr.sku}}</view>
+												<view class="price">退款：{{goods.refund_price}}</view>
+												<view class="num">x {{goods.refund_num}}</view>
+											</view>
+										</view>
+									</view>
+									<view class="btn-box" v-if="item.status == 1">
+										<view class="btn gray" @click="goDetail(item)">查看详情</view>
+										<view class="btn" @click="goPage(item.refund_order_id)">退回商品</view>
+									</view>
+									<view class="btn-box" v-else-if="item.status == -1">
+										<view class="btn" @click="goDetail(item)">查看详情</view>
+										<!-- <view class="btn" @click="applyAgain(item)">再次申请</view> -->
+									</view>
+									<view class="btn-box" v-else>
+										<view class="btn gray" v-if="item.status == 3" @click="bindDetele(item,index)">
+											删除订单</view>
+										<view class="btn" @click="goDetail(item)">查看详情</view>
+									</view>
+									<view class="status">
+										<!-- 0审核中 1待发货 2待收货 3已退款 -1已拒绝 -->
+										<block v-if="item.status == 0">
+											<text class="iconfont icon-shenhezhong1 p-color"></text>
+										</block>
+										<block v-if="item.status == 1">
+											<text class="iconfont icon-daituihuo"></text>
+										</block>
+										<block v-if="item.status == 2">
+											<text class="iconfont icon-tuihuozhong"></text>
+										</block>
+										<block v-if="item.status == 3">
+											<text class="iconfont icon-yituikuan"></text>
+										</block>
+										<block v-if="item.status == -1">
+											<text class="iconfont icon-yijujue1"></text>
+										</block>
+										<block v-if="item.status == -2">
+											<text class="iconfont icon-yiquxiao"></text>
+										</block>
+									</view>
+								</view>
+							</view>
+						</view>
+					</block>
+
 					<!-- 待发货 待收货 待评价 已完成 -->
 					<block v-else>
 						<view class='item' v-for="(item,index) in orderList" :key="index">
@@ -215,8 +289,8 @@
 								<view class='title acea-row row-between-wrapper'>
 									<view class="acea-row row-middle left-wrapper" @click.stop="goMall(item)">
 										<text class="iconfont icon-shangjiadingdan"></text>
-										<view class="store-name">
-											<view>{{item.merchant.mer_name}}</view>
+										<view class="store-name line1">
+											{{item.merchant.mer_name}}
 										</view>
 										<text class="iconfont icon-xiangyou"></text>
 									</view>
@@ -404,7 +478,9 @@
 		groupOrderList,
 		orderTake,
 		applyInvoiceApi,
-		uploadEnvidenceApi
+		uploadEnvidenceApi,
+		refundListNew,
+		refundDel
 	} from '@/api/order.js';
 	import {
 		getUserInfo
@@ -500,6 +576,12 @@
 					add: false,
 				},
 				mer_info: {},
+				refundParam: {
+					page: 1,
+					limit: 15,
+					type: 0,
+					identity: ''
+				}
 			};
 		},
 		computed: {
@@ -510,15 +592,13 @@
 		onLoad(options) {
 			if (options.sale_type) this.sale_type = options.sale_type;
 			if (options.status) this.orderStatus = options.status;
-			let user = this.$store.state.app.userInfo;
-			if (user.mer_info) this.initMerInfo(user);
 			if (this.isLogin) {
 				this.page = 1;
 				this.loadend = false;
 				this.loading = false;
 				this.getOrderData();
 				this.getOrderList();
-				this.getUserInfo();
+				this.getUserInfo(options);
 				this.getpreSellOrderList();
 			} else {
 				toLogin()
@@ -539,8 +619,25 @@
 			});
 			// #endif
 		},
+
+		// 下拉刷星
+		onPullDownRefresh() {
+			this.loadend = false;
+			this.loading = false;
+			this.$set(this, 'orderList', []);
+
+			if (this.orderStatus == 4) {
+				this.refundParam.page = 1;
+				this.getRefundList();
+			} else {
+				this.page = 1;
+				this.getOrderList();
+				this.getOrderData();
+			}
+		},
+
 		methods: {
-			// 赋值银行信息
+			// 复制银行信息
 			handleCopy() {
 				let that = this;
 				uni.setClipboardData({
@@ -568,29 +665,8 @@
 			navBack() {
 				uni.navigateBack();
 			},
-			initMerInfo(user) {
-				this.mer_info = user;
-				if (this.mer_info.mer_settlement_agree_status) {
-					this.payMode.forEach(item => {
-						if (item.value == 'merBalance') {
-							item.payStatus = 1;
-							item.number = this.mer_info.mer_money;
-						}
-					})
-				}
-			},
-			changeSaleType(type = 1) {
-				if (type != this.sale_type) {
-					this.sale_type = type;
-					this.page = 1;
-					this.loadend = false;
-					this.loading = false;
-					this.getOrderData();
-					this.getOrderList();
-					this.getUserInfo();
-					this.getpreSellOrderList();
-				}
-			},
+
+
 			// 去商铺
 			goMall(item) {
 				if (this.hide_mer_status == 0) {
@@ -613,24 +689,34 @@
 			 * 获取用户信息
 			 *
 			 */
-			getUserInfo: function() {
+			getUserInfo: function(options) {
 				let that = this;
 				getUserInfo().then(res => {
 					that.payMode[2].number = res.data.now_money;
-					if (res.data.mer_info) that.initMerInfo(res.data.mer_info);
+					if (res.data.mer_info) that.initMerInfo(res.data.mer_info, options);
 				});
 			},
-			/**
-			 * 关闭支付组件
-			 *
-			 */
+
+			initMerInfo(user, options) {
+				this.mer_info = user;
+				if (user && user.mer_settlement_agree_status) {
+					this.payMode.forEach(item => {
+						if (item.value == 'merBalance') {
+							item.payStatus = 1;
+							item.number = this.mer_info.mer_money;
+						}
+					});
+					//如果是opentype=2 优先展示商户订单
+					if (options && options.openType && options.openType == 2) this.changeSaleType(2);
+				}
+			},
+
+			// 关闭支付组件
 			payClose: function() {
 				this.pay_close = false;
 			},
-			/**
-			 * 获取订单统计数据
-			 *
-			 */
+
+			// 获取订单统计数据
 			getOrderData: function() {
 				let that = this;
 				orderData({
@@ -639,10 +725,8 @@
 					that.$set(that, 'orderData', res.data);
 				})
 			},
-			/**
-			 * 取消订单
-			 *
-			 */
+
+			// 取消订单
 			cancelOrder: function(index, order_id) {
 				let that = this;
 				if (!order_id) return that.$util.Tips({
@@ -664,10 +748,8 @@
 					});
 				});
 			},
-			/**
-			 * 打开支付组件
-			 *
-			 */
+
+			// 打开支付组件
 			goPay: function(pay_price, order_id) {
 				this.$set(this, 'pay_close', true);
 				this.order_id = order_id;
@@ -693,10 +775,7 @@
 				});
 			},
 
-			/**
-			 * 支付成功回调
-			 *
-			 */
+			// 支付成功回调
 			pay_complete: function() {
 				this.loadend = false;
 				this.page = 1;
@@ -706,17 +785,14 @@
 				this.getOrderData();
 				this.getOrderList();
 			},
-			/**
-			 * 支付失败回调
-			 *
-			 */
+
+			// 支付失败回调
 			pay_fail: function() {
 				this.pay_close = false;
 				this.pay_order_id = '';
 			},
-			/**
-			 * 去订单详情
-			 */
+
+			// 去订单详情
 			goOrderDetails: function(order_id) {
 				let self = this
 				if (!order_id) return that.$util.Tips({
@@ -755,9 +831,8 @@
 				}
 				// #endif
 			},
-			/**
-			 * 点击去评价
-			 */
+
+			// 点击去评价
 			goOrderDetails_Evaluation: function(order_id) {
 				let self = this
 				if (!order_id) return that.$util.Tips({
@@ -786,21 +861,105 @@
 				}
 				// #endif
 			},
-			/**
-			 * 切换类型
-			 */
+
+			// 切换类型
 			statusClick: function(status) {
-				if (status == this.orderStatus) return;
-				this.orderStatus = status;
 				this.loadend = false;
 				this.loading = false;
-				this.page = 1;
+
 				this.$set(this, 'orderList', []);
-				this.getOrderList();
+
+				if (status == 4) { //1是用户 2是商户
+					if (status == this.orderStatus) return;
+					this.orderStatus = status;
+					this.refundParam.identity = this.sale_type;
+					this.refundParam.page = 1;
+					this.getRefundList();
+				} else {
+					if (status == this.orderStatus) return;
+					this.orderStatus = status;
+					this.page = 1;
+					this.getOrderList();
+				}
 			},
-			/**
-			 * 获取订单列表
-			 */
+
+			changeSaleType(type = 1) {
+				if (this.sale_type == type) return;
+
+				this.loadend = false;
+				this.loading = false;
+				this.$set(this, 'orderList', []);
+
+				if (this.orderStatus == 4) {
+					this.refundParam.identity = type;
+					this.refundParam.page = 1;
+					this.getRefundList();
+				} else {
+					this.page = 1;
+					this.getOrderData();
+					this.getOrderList();
+					this.getUserInfo();
+					this.getpreSellOrderList();
+				}
+				this.sale_type = type;
+			},
+
+			// 获取退款列表
+			getRefundList() {
+				let that = this;
+				if (that.loadend) return;
+				if (that.loading) return;
+				that.loading = true;
+				that.loadTitle = "加载更多";
+				refundListNew(this.refundParam).then(res => {
+					let list = res.data.list || [];
+					let loadend = list.length < that.refundParam.limit;
+					that.orderList = that.refundParam.page == 1 ? list : that.$util.SplitArray(list, that
+						.orderList);
+					that.$set(that, 'orderList', that.orderList);
+					that.getProductCount();
+					that.loadend = loadend;
+					that.loading = false;
+					that.loadTitle = loadend ? "我也是有底线的" : '加载更多';
+					that.refundParam.page = that.refundParam.page + 1;
+					that.isReady = true;
+					uni.stopPullDownRefresh();
+				}).catch(err => {
+					that.loading = false;
+					that.loadTitle = "加载更多";
+				})
+			},
+
+			// 去详情页
+			goDetail(item) {
+				uni.navigateTo({
+					url: '/pages/users/refund/detail?id=' + item.refund_order_id
+				})
+			},
+
+			// 删除记录
+			bindDetele(item, index) {
+				let self = this
+				uni.showModal({
+					title: '提示',
+					content: '确定删除该记录吗？',
+					success: function(res) {
+						if (res.confirm) {
+							refundDel(item.refund_order_id).then(res => {
+								self.orderList.splice(index, 1)
+							})
+							uni.showToast({
+								title: '删除成功',
+								icon: 'none'
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+
+			// 获取订单列表
 			getOrderList: function() {
 				let that = this;
 				if (that.loadend) return;
@@ -826,7 +985,8 @@
 							that.loadend = loadend;
 							that.loading = false;
 							that.loadTitle = loadend ? "我也是有底线的" : '加载更多';
-							that.page = that.page + 1
+							that.page = that.page + 1;
+							uni.stopPullDownRefresh();
 						})
 					} else {
 						getOrderList({
@@ -846,6 +1006,7 @@
 							that.loadTitle = loadend ? "我也是有底线的" : '加载更多';
 							that.page = that.page + 1;
 							that.isReady = true;
+							uni.stopPullDownRefresh();
 						}).catch(err => {
 							that.loading = false;
 							that.loadTitle = "加载更多";
@@ -853,9 +1014,8 @@
 					}
 				}
 			},
-			/**
-			 * 获取定金预售订单列表
-			 */
+
+			// 获取定金预售订单列表
 			getpreSellOrderList: function() {
 				let that = this;
 				getOrderList({
@@ -869,9 +1029,8 @@
 					that.$set(that, 'presellProList', list);
 				})
 			},
-			/**
-			 * 获取单个订单商品数量
-			 */
+
+			// 获取单个订单商品数量
 			getProductCount: function() {
 				if (this.orderStatus !== 0) {
 					this.orderList.forEach((item, i) => {
@@ -885,9 +1044,8 @@
 					})
 				}
 			},
-			/**
-			 * 删除订单
-			 */
+
+			// 删除订单
 			delOrder: function(order_id, index) {
 				let that = this;
 				orderDel(order_id).then(res => {
@@ -905,6 +1063,7 @@
 					});
 				})
 			},
+
 			// 确认收货
 			confirmOrder: function(item, index) {
 				let that = this;
@@ -930,6 +1089,7 @@
 					}
 				})
 			},
+
 			/*申请开票*/
 			applyInvoice(order_id) {
 				let that = this;
@@ -939,11 +1099,13 @@
 				that.$refs.addInvoicing.getInvoiceDefault();
 				that.$refs.addInvoicing.getInvoiceList();
 			},
+
 			// 关闭发票弹窗
 			changeInvoiceClose: function(data) {
 				if (data) this.getInvoiceData(data);
 				this.$set(this.invoice, 'invoice', false);
 			},
+
 			// 开票回调
 			getInvoiceData(data) {
 				let that = this
@@ -959,12 +1121,138 @@
 			}
 		},
 		onReachBottom: function() {
-			this.getOrderList();
+			if (this.orderStatus == 4)
+				this.getRefundList()
+			else
+				this.getOrderList();
 		}
 	}
 </script>
 
 <style scoped lang="scss">
+	.info-box {
+		position: relative;
+		margin-top: 12rpx;
+		background-color: #fff;
+
+		.title {
+			display: flex;
+			align-items: center;
+			padding: 0 32rpx;
+			height: 86rpx;
+			border-bottom: 1px solid #F0F0F0;
+			color: #282828;
+
+			.icon-shangjiadingdan {
+				font-size: 32rpx;
+			}
+
+			.txt {
+				margin: 0 5rpx;
+			}
+
+			.icon-xiangyou {
+				color: #999;
+				font-size: 20rpx;
+				margin-top: 6rpx;
+			}
+		}
+
+		.product-box {
+			.product-item {
+				display: flex;
+				padding: 25rpx 30rpx;
+
+				.img-box {
+					width: 130rpx;
+					height: 130rpx;
+					border-radius: 16rpx;
+				}
+
+				.msg {
+					position: relative;
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+					width: 440rpx;
+					margin-left: 26rpx;
+
+					.name {
+						font-size: 28rpx;
+						color: #282828;
+					}
+
+					.des {
+						font-size: 20rpx;
+						color: #868686;
+					}
+
+					.price {
+						font-size: 26rpx;
+					}
+
+					.num {
+						position: absolute;
+						right: -50rpx;
+						top: 4rpx;
+						color: #868686;
+						font-size: 26rpx;
+					}
+				}
+			}
+
+			.event_name {
+				display: inline-block;
+				margin-right: 9rpx;
+				color: #fff;
+				font-size: 20rpx;
+				padding: 0 8rpx;
+				line-height: 30rpx;
+				text-align: center;
+				border-radius: 6rpx;
+			}
+		}
+
+		.btn-box {
+			display: flex;
+			justify-content: flex-end;
+			padding: 0 20rpx 20rpx;
+
+			.btn {
+				width: 176rpx;
+				height: 60rpx;
+				line-height: 60rpx;
+				margin-left: 18rpx;
+				text-align: center;
+				background: var(--view-theme);
+				border-radius: 30rpx;
+				color: #fff;
+				font-size: 27rpx;
+
+				&.gray {
+					border: 1px solid #ddd;
+					background: transparent;
+					color: #aaa;
+				}
+			}
+		}
+
+		.status {
+			position: absolute;
+			right: 30rpx;
+			top: 0;
+
+			.iconfont {
+				font-size: 120rpx;
+				opacity: .3;
+			}
+
+			.p-color {
+				color: var(--view-theme);
+			}
+		}
+	}
+
 	.popups {
 		width: 640rpx;
 		background-color: #fff;
@@ -1093,6 +1381,7 @@
 			}
 
 			.store-name {
+				max-width: 400rpx;
 				margin: 0 10rpx;
 			}
 
diff --git a/pages/users/order_list/search.vue b/pages/users/order_list/search.vue
index 7097bbe..9173325 100644
--- a/pages/users/order_list/search.vue
+++ b/pages/users/order_list/search.vue
@@ -4,7 +4,8 @@
 			<view class='header'>
 				<view class="search acea-row row-middle">
 					<text class="iconfont icon-sousuo"></text>
-					<input v-model="store_name" :focus="focus" confirm-type="search" placeholder="搜索我的订单" class="input" inputmode="search" @confirm="handleSearch" />
+					<input v-model="store_name" :focus="focus" confirm-type="search" placeholder="搜索我的订单" class="input"
+						inputmode="search" @confirm="handleSearch" />
 				</view>
 			</view>
 			<view class='list'>
@@ -17,74 +18,155 @@
 									<view class="acea-row row-middle left-wrapper">
 										{{item.group_order_sn}}
 									</view>
-									<view class='t-color'>{{ item.orderList[0].activity_type === 2 && item.orderList[0].orderProduct[0].cart_info.productPresell.presell_type ==2 ? "待付定金" : "待付款" }}</view>
+									<view class='t-color'>
+										{{ item.orderList[0].activity_type === 2 && item.orderList[0].orderProduct[0].cart_info.productPresell.presell_type ==2 ? "待付定金" : "待付款" }}
+									</view>
 								</view>
 								<view v-for="(order,j) in item.orderList" :key="order.order_id+j">
-										<!--预售-->
-										<view v-if="order.activity_type === 2">
-											<block v-for="(goods,g) in order.orderProduct">
-											<view  class='item-info acea-row row-between row-top'>
+									<!--预售-->
+									<view v-if="order.activity_type === 2">
+										<block v-for="(goods,g) in order.orderProduct">
+											<view class='item-info acea-row row-between row-top'>
 												<view class='pictrue'>
-													<image :src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'></image>
+													<image
+														:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
+													</image>
 												</view>
 												<view class='text acea-row row-between'>
 													<view class='name line1'>
-														<text class="event_name event_bg">预售</text><text>{{goods.cart_info.product.store_name}}</text>
+														<text
+															class="event_name event_bg">预售</text><text>{{goods.cart_info.product.store_name}}</text>
 														<view class="event_ship event_color">发货时间：
 															<!--全款预售-->
-															<text v-if="goods.cart_info.productPresell.presell_type === 1">
+															<text
+																v-if="goods.cart_info.productPresell.presell_type === 1">
 																{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内
 															</text>
 															<!--定金预售-->
-															 <text v-if="goods.cart_info.productPresell.presell_type === 2">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
+															<text
+																v-if="goods.cart_info.productPresell.presell_type === 2">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
 														</view>
 													</view>
 													<view class='money'>
-														<view>￥{{goods.cart_info.productPresellAttr.presell_price}}</view>
+														<view>￥{{goods.cart_info.productPresellAttr.presell_price}}
+														</view>
 														<view>x{{goods.product_num}}</view>
 													</view>
 												</view>
-												<view v-if="goods.cart_info.productPresell.presell_type === 2" class="event_price">
-													 定金待支付 <text class="t-color">￥{{ order.pay_price }}</text>
-													尾款待支付 <text class="t-color">￥{{ order.presellOrder.pay_price }}</text>
+												<view v-if="goods.cart_info.productPresell.presell_type === 2"
+													class="event_price">
+													定金待支付 <text class="t-color">￥{{ order.pay_price }}</text>
+													尾款待支付 <text
+														class="t-color">￥{{ order.presellOrder.pay_price }}</text>
 												</view>
 											</view>
-											</block>
-										</view>
+										</block>
+									</view>
 									<view v-else>
 										<block v-for="(goods,g) in order.orderProduct">
-										
-												<view class='item-info acea-row row-between row-top'>
-													<view class='pictrue'>
-														<image :src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'></image>
+
+											<view class='item-info acea-row row-between row-top'>
+												<view class='pictrue'>
+													<image
+														:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
+													</image>
+												</view>
+												<view class='text acea-row row-between'>
+
+													<view class='name line2'>{{goods.cart_info.product.store_name}}
 													</view>
-													<view class='text acea-row row-between'>
-												
-														<view class='name line2'>{{goods.cart_info.product.store_name}}</view>
-												
-														<view class='money' v-if="item.orderList[0].activity_type == 4">
-															<view v-if="goods.cart_info.activeSku">￥{{goods.cart_info.activeSku.active_price}}</view>
-															<view>x{{goods.product_num}}</view>
-														</view>
-														<view v-else class='money'>
-															<view>￥{{goods.cart_info.productAttr.price}}</view>
-															<view>x{{goods.product_num}}</view>
-														</view>
+
+													<view class='money' v-if="item.orderList[0].activity_type == 4">
+														<view v-if="goods.cart_info.activeSku">
+															￥{{goods.cart_info.activeSku.active_price}}</view>
+														<view>x{{goods.product_num}}</view>
 													</view>
-												</view>	
-											</block>
-										</view>
+													<view v-else class='money'>
+														<view>￥{{goods.cart_info.productAttr.price}}</view>
+														<view>x{{goods.product_num}}</view>
+													</view>
+												</view>
+											</view>
+										</block>
+									</view>
 								</view>
-								<view class='totalPrice' v-if="item.orderList[0].activity_type !== 2">共{{item.total_num || 0}}件商品，总金额
+								<view class='totalPrice' v-if="item.orderList[0].activity_type !== 2">
+									共{{item.total_num || 0}}件商品，总金额
 									<text class='money p-color'>￥{{item.pay_price}}</text>
 								</view>
 								<view class='bottom acea-row row-right row-middle'>
-								<!-- 	<view class='bnt cancelBnt' @click.stop='cancelOrder(index,item.group_order_id)'>取消订单</view> -->
-									<view class='bnt b-color' @click.stop='goPay(item.pay_price,item.group_order_id)'>立即付款</view>
+									<!-- 	<view class='bnt cancelBnt' @click.stop='cancelOrder(index,item.group_order_id)'>取消订单</view> -->
+									<view class='bnt b-color' @click.stop='goPay(item.pay_price,item.group_order_id)'>
+										立即付款</view>
 								</view>
 							</view>
 						</view>
 					</block>
+
+					<block v-else-if="orderStatus == 4">
+						<view class="goods-wrapper">
+							<view>
+								<view class="info-box" v-for="(item,index) in orderList" :key="index">
+									<view class="title" @click="goStore(item)">
+										<text class="iconfont icon-shangjiadingdan"></text>
+										<text v-if="item.merchant" class="txt">{{item.merchant.mer_name}}</text>
+										<text class="iconfont icon-xiangyou"></text>
+									</view>
+									<view class="product-box">
+										<view class="product-item" v-for="goods in item.refundProduct"
+											:key="goods.order_product_id">
+											<image class="img-box" :src="goods.product.cart_info.product.image" mode="">
+											</image>
+											<view class="msg">
+												<view class="name line1"><text
+														v-if="goods.product.cart_info.product_type === 2"
+														class="event_name event_bg">预售</text>{{goods.product.cart_info.product.store_name}}
+												</view>
+												<view class="des">{{goods.product.cart_info.productAttr.sku}}</view>
+												<view class="price">退款：{{goods.refund_price}}</view>
+												<view class="num">x {{goods.refund_num}}</view>
+											</view>
+										</view>
+									</view>
+									<view class="btn-box" v-if="item.status == 1">
+										<view class="btn gray" @click="goDetail(item)">查看详情</view>
+										<view class="btn" @click="goPage(item.refund_order_id)">退回商品</view>
+									</view>
+									<view class="btn-box" v-else-if="item.status == -1">
+										<view class="btn" @click="goDetail(item)">查看详情</view>
+										<!-- <view class="btn" @click="applyAgain(item)">再次申请</view> -->
+									</view>
+									<view class="btn-box" v-else>
+										<view class="btn gray" v-if="item.status == 3" @click="bindDetele(item,index)">
+											删除订单</view>
+										<view class="btn" @click="goDetail(item)">查看详情</view>
+									</view>
+									<view class="status">
+										<!-- 0审核中 1待发货 2待收货 3已退款 -1已拒绝 -->
+										<block v-if="item.status == 0">
+											<text class="iconfont icon-shenhezhong1 p-color"></text>
+										</block>
+										<block v-if="item.status == 1">
+											<text class="iconfont icon-daituihuo"></text>
+										</block>
+										<block v-if="item.status == 2">
+											<text class="iconfont icon-tuihuozhong"></text>
+										</block>
+										<block v-if="item.status == 3">
+											<text class="iconfont icon-yituikuan"></text>
+										</block>
+										<block v-if="item.status == -1">
+											<text class="iconfont icon-yijujue1"></text>
+										</block>
+										<block v-if="item.status == -2">
+											<text class="iconfont icon-yiquxiao"></text>
+										</block>
+									</view>
+								</view>
+							</view>
+						</view>
+					</block>
+
 					<!-- 待发货 待收货 待评价 已完成 -->
 					<block v-else>
 						<view class='item' v-for="(item,index) in orderList" :key="index">
@@ -92,7 +174,9 @@
 								<view class='title acea-row row-between-wrapper'>
 									<view class="acea-row row-middle left-wrapper" @click.stop="goMall(item)">
 										<text class="iconfont icon-shangjiadingdan"></text>
-										<view class="store-name">{{item.merchant.mer_name}}</view>
+										<view class="store-name line1" style="max-width: 500rpx;">
+											{{item.merchant.mer_name}}
+										</view>
 										<text class="iconfont icon-xiangyou"></text>
 									</view>
 									<view v-if="item.status == 0" class='t-color'>待发货</view>
@@ -102,22 +186,30 @@
 									<view v-if="item.status == -1" class='t-color'>已退款</view>
 								</view>
 								<view v-if="item.activity_type === 2">
-									<view class='item-info acea-row row-between row-top' v-for="(goods,index) in item.orderProduct" :key="index">
+									<view class='item-info acea-row row-between row-top'
+										v-for="(goods,index) in item.orderProduct" :key="index">
 										<view class='pictrue'>
-											<image :src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'></image>
+											<image
+												:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
+											</image>
 										</view>
 										<view class='text acea-row row-between'>
 											<view class='name '>
 												<view class='name' :class="item.status === 0 ? 'line1' : 'line2'">
-													<text class="event_name event_bg">预售</text><text>{{goods.cart_info.product.store_name}}</text>
+													<text
+														class="event_name event_bg">预售</text><text>{{goods.cart_info.product.store_name}}</text>
 													<view v-if="item.status == 0" class="event_ship event_color">发货时间：
 														<!--全款预售-->
-														<text v-if="goods.cart_info.productPresell.presell_type === 1">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
+														<text
+															v-if="goods.cart_info.productPresell.presell_type === 1">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
 														<!--定金预售-->
-														<text v-if="goods.cart_info.productPresell.presell_type === 2">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
+														<text
+															v-if="goods.cart_info.productPresell.presell_type === 2">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
 													</view>
 												</view>
-												<view style="margin-top: 10rpx;" class="t-color">{{goods.is_refund==1?'退款中':goods.is_refund==2?'部分退款':goods.is_refund==3?'全部退款':''}}</view>
+												<view style="margin-top: 10rpx;" class="t-color">
+													{{goods.is_refund==1?'退款中':goods.is_refund==2?'部分退款':goods.is_refund==3?'全部退款':''}}
+												</view>
 											</view>
 											<view class='money'>
 												<view>￥{{goods.cart_info.productPresellAttr.presell_price}}</view>
@@ -127,23 +219,30 @@
 									</view>
 								</view>
 								<view v-else>
-									<view class='item-info acea-row row-between row-top' v-for="(goods,index) in item.orderProduct" :key="index">
+									<view class='item-info acea-row row-between row-top'
+										v-for="(goods,index) in item.orderProduct" :key="index">
 										<view class='pictrue'>
-											<image :src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'></image>
+											<image
+												:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
+											</image>
 										</view>
 										<view class='text acea-row row-between'>
 											<view class='name '>
 												<view class='name line2'>
 													<text>{{goods.cart_info.product.store_name}}</text>
 												</view>
-												<view style="margin-top: 10rpx;" class="t-color">{{goods.is_refund==1?'退款中':goods.is_refund==2?'部分退款':goods.is_refund==3?'全部退款':''}}</view>
+												<view style="margin-top: 10rpx;" class="t-color">
+													{{goods.is_refund==1?'退款中':goods.is_refund==2?'部分退款':goods.is_refund==3?'全部退款':''}}
+												</view>
 											</view>
 											<view class='money' v-if="item.activity_type == 3">
-												<view v-if="goods.cart_info.productAssistAttr">￥{{goods.cart_info.productAssistAttr.assist_price}}</view>
+												<view v-if="goods.cart_info.productAssistAttr">
+													￥{{goods.cart_info.productAssistAttr.assist_price}}</view>
 												<view>x{{goods.product_num}}</view>
 											</view>
 											<view class='money' v-else-if="item.activity_type == 4">
-												<view v-if="goods.cart_info.activeSku">￥{{goods.cart_info.activeSku.active_price}}</view>
+												<view v-if="goods.cart_info.activeSku">
+													￥{{goods.cart_info.activeSku.active_price}}</view>
 												<view>x{{goods.product_num}}</view>
 											</view>
 											<view class='money' v-else>
@@ -162,23 +261,32 @@
 							</view>
 							<view class='bottom acea-row row-right row-middle'>
 								<block v-if="item.status == 0 || item.status == 9 || item.status == -1">
-								<!-- 	<view class='bnt cancelBnt' @click='goOrderDetails(item.order_id)'>申请退款</view> -->
+									<!-- 	<view class='bnt cancelBnt' @click='goOrderDetails(item.order_id)'>申请退款</view> -->
 									<view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view>
 								</block>
 								<block v-if="item.status == 1">
-									<view class='bnt cancelBnt' v-if="item.delivery_type == 1 || item.delivery_type == 2" @click='goOrderDetails(item.order_id)'>查看物流</view>
+									<view class='bnt cancelBnt'
+										v-if="item.delivery_type == 1 || item.delivery_type == 2"
+										@click='goOrderDetails(item.order_id)'>查看物流</view>
 									<view class='bnt b-color' @tap='confirmOrder(item,index)'>确认收货</view>
 								</block>
 								<block v-if="item.status == 2">
-									<navigator v-if="community_status == 1 && !item.community_id" :url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id" class='bnt colorBnt' hover-class="none">
+									<navigator v-if="community_status == 1 && !item.community_id"
+										:url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id"
+										class='bnt colorBnt' hover-class="none">
 										<text class="iconfont icon-fabu"></text>
 										发布种草
 									</navigator>
-									<view class='bnt b-color' @click='goOrderDetails_Evaluation(item.order_id)'>去评价</view>
+									<view class='bnt b-color' @click='goOrderDetails_Evaluation(item.order_id)'>去评价
+									</view>
 								</block>
 								<block v-if="item.status == 3">
-									<view class='bnt b-color' @click='goOrderDetails(item.order_id)' v-if="item.activity_type == 2 || item.activity_type == 3 || item.activity_type == 10">查看详情</view>
-									<navigator v-if="community_status == 1 && !item.community_id" :url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id" class='bnt colorBnt' hover-class="none">
+									<view class='bnt b-color' @click='goOrderDetails(item.order_id)'
+										v-if="item.activity_type == 2 || item.activity_type == 3 || item.activity_type == 10">
+										查看详情</view>
+									<navigator v-if="community_status == 1 && !item.community_id"
+										:url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id"
+										class='bnt colorBnt' hover-class="none">
 										<text class="iconfont icon-fabu"></text>
 										发布种草
 									</navigator>
@@ -197,7 +305,8 @@
 			</view>
 		</view>
 		<home></home>
-		<payment :payMode='payMode' :pay_close="pay_close" @onChangeFun='onChangeFun' :order_id="pay_order_id" :totalPrice='totalPrice'></payment>
+		<payment :payMode='payMode' :pay_close="pay_close" @onChangeFun='onChangeFun' :order_id="pay_order_id"
+			:totalPrice='totalPrice'></payment>
 	</view>
 </template>
 
@@ -219,16 +328,27 @@
 		orderDel,
 		orderPay,
 		groupOrderList,
-		orderTake
+		orderTake,
+		refundListNew
 	} from '@/api/order.js';
-	import { getUserInfo } from '@/api/user.js';
-	import { openOrderSubscribe } from '@/utils/SubscribeMessage.js';
+	import {
+		getUserInfo
+	} from '@/api/user.js';
+	import {
+		openOrderSubscribe
+	} from '@/utils/SubscribeMessage.js';
 	import payment from '@/components/payment';
 	import home from '@/components/home/index.vue';
-	import { mapGetters } from "vuex";
+	import {
+		mapGetters
+	} from "vuex";
 	import emptyPage from '@/components/emptyPage.vue'
-	import { configMap } from '@/utils'
-	import { toLogin } from '@/libs/login.js';
+	import {
+		configMap
+	} from '@/utils'
+	import {
+		toLogin
+	} from '@/libs/login.js';
 	export default {
 		components: {
 			payment,
@@ -240,7 +360,7 @@
 				loading: false, //是否加载中
 				loadend: false, //是否加载完毕
 				loadTitle: '加载更多', //提示语
-        sale_type: 1,
+				sale_type: 1,
 				orderList: [], //订单数组
 				presellProList: [], //定金预售订单
 				presellOrderCount: 0,
@@ -276,25 +396,34 @@
 				pay_order_id: '',
 				totalPrice: '0',
 				isReady: true,
-				store_name: ''
+				store_name: '',
+				orderStatus: '',
+				refundParams: {
+					page: 1,
+					limit: 15,
+					type: 0,
+					identity: '',
+					search_info: ''
+				}
 			};
 		},
 		computed: {
-			...mapGetters(['isLogin','viewColor']),
+			...mapGetters(['isLogin', 'viewColor']),
 			...configMap(['hide_mer_status', 'community_status', 'alipay_open', 'yue_pay_status']),
 		},
 		watch: {
-			alipay_open(n){
+			alipay_open(n) {
 				this.payMode[1].payStatus = n
 			},
-			yue_pay_status(n){
+			yue_pay_status(n) {
 				this.payMode[2].payStatus = n
 			}
 		},
-    onLoad(options) {
-      if (options.status) this.orderStatus = options.status;
-      if (options.sale_type) this.sale_type = options.sale_type;
-    },
+		onLoad(options) {
+			if (options.status) this.orderStatus = options.status;
+			if (options.sale_type) this.sale_type = options.sale_type;
+			this.refundParams.identity = options.sale_type;
+		},
 		onShow() {
 			if (this.isLogin) {
 				this.page = 1;
@@ -304,16 +433,12 @@
 				toLogin()
 			}
 		},
-		onReady(){
-		},
-		mounted: function() {
-		},
 		methods: {
 			// 去商铺
-			goMall(item){
-				if(this.hide_mer_status == 0){
+			goMall(item) {
+				if (this.hide_mer_status == 0) {
 					uni.navigateTo({
-						url:'/pages/store/home/index?id='+item.mer_id
+						url: '/pages/store/home/index?id=' + item.mer_id
 					})
 				}
 			},
@@ -462,15 +587,15 @@
 					title: '缺少订单号无法查看订单详情和评价'
 				});
 				// #ifdef MP
-					if (self.orderStatus == 0) {
-						uni.navigateTo({
-							url: '/pages/order_details/stay?order_id=' + order_id
-						})
-					} else {
-						uni.navigateTo({
-							url: '/pages/order_details/index?order_id=' + order_id
-						})
-					}
+				if (self.orderStatus == 0) {
+					uni.navigateTo({
+						url: '/pages/order_details/stay?order_id=' + order_id
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pages/order_details/index?order_id=' + order_id
+					})
+				}
 				// #endif
 				// #ifndef MP
 				if (self.orderStatus == 0) {
@@ -484,18 +609,62 @@
 				}
 				// #endif
 			},
-			/**
-			 * 切换类型
-			 */
-			statusClick: function(status) {
-				if (status == this.orderStatus) return;
-				this.orderStatus = status;
-				this.loadend = false;
-				this.loading = false;
-				this.page = 1;
-				this.$set(this, 'orderList', []);
-				this.getOrderList();
+
+			// 获取退款列表
+			getRefundList() {
+				let that = this;
+				if (that.loadend) return;
+				if (that.loading) return;
+				that.loading = true;
+				that.loadTitle = "加载更多";
+				refundListNew(this.refundParams).then(res => {
+					let list = res.data.list || [];
+					let loadend = list.length < that.limit;
+					that.orderList = that.page == 1 ? list : that.$util.SplitArray(list, that
+						.orderList);
+					that.$set(that, 'orderList', that.orderList);
+					that.getProductCount();
+					that.loadend = loadend;
+					that.loading = false;
+					that.loadTitle = loadend ? "我也是有底线的" : '加载更多';
+					that.page = that.page + 1;
+					that.isReady = true;
+					uni.stopPullDownRefresh();
+				}).catch(err => {
+					that.loading = false;
+					that.loadTitle = "加载更多";
+				})
 			},
+
+			// 去详情页
+			goDetail(item) {
+				uni.navigateTo({
+					url: '/pages/users/refund/detail?id=' + item.refund_order_id
+				})
+			},
+
+			// 删除记录
+			bindDetele(item, index) {
+				let self = this
+				uni.showModal({
+					title: '提示',
+					content: '确定删除该记录吗？',
+					success: function(res) {
+						if (res.confirm) {
+							refundDel(item.refund_order_id).then(res => {
+								self.goodsList.splice(index, 1)
+							})
+							uni.showToast({
+								title: '删除成功',
+								icon: 'none'
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+
 			/**
 			 * 获取订单列表
 			 */
@@ -510,7 +679,7 @@
 					page: that.page,
 					limit: that.limit,
 					store_name: that.store_name,
-          sale_type: that.sale_type
+					sale_type: that.sale_type
 				}).then(res => {
 					let list = res.data.list || [];
 					let loadend = list.length < that.limit;
@@ -527,58 +696,24 @@
 					that.loadTitle = "加载更多";
 				})
 			},
-			/**
-			 * 获取定金预售订单列表
-			 */
-			getpreSellOrderList: function() {
-				let that = this;
-				getOrderList({
-					status: 10,
-					page: 1,
-					limit: 1,
-				}).then(res => {
-					let list = res.data.list || [];
-					that.presellOrderCount = res.data.count;
-					that.$set(that, 'presellProList', list);
-				})
 
-			},
 			/**
 			 * 获取单个订单商品数量
 			 */
-			getProductCount: function(){
-				if(this.orderStatus !== 0){
-					this.orderList.forEach((item,i) => {
+			getProductCount: function() {
+				if (this.orderStatus !== 0) {
+					this.orderList.forEach((item, i) => {
 						let orderNum = 0
-						if(item.orderProduct){
+						if (item.orderProduct) {
 							item.orderProduct.forEach((val) => {
-							  orderNum += val.product_num
-						 })
-						 this.orderList[i]['orderNum']=orderNum;
+								orderNum += val.product_num
+							})
+							this.orderList[i]['orderNum'] = orderNum;
 						}
 					})
 				}
 			},
-			/**
-			 * 删除订单
-			 */
-			delOrder: function(order_id, index) {
-				let that = this;
-				orderDel(order_id).then(res => {
-					that.orderList.splice(index, 1);
-					that.$set(that, 'orderList', that.orderList);
-					that.$set(that.orderData, 'unpaid_count', that.orderData.unpaid_count - 1);
-					that.getOrderData();
-					return that.$util.Tips({
-						title: '删除成功',
-						icon: 'success'
-					});
-				}).catch(err => {
-					return that.$util.Tips({
-						title: err
-					});
-				})
-			},
+
 			// 确认收货
 			confirmOrder: function(item, index) {
 				let that = this;
@@ -606,7 +741,7 @@
 			},
 			handleSearch() {
 				this.loadend = false;
-				this.page = 1;
+				this.loading = false;
 				this.orderList = [];
 				if (!this.store_name) {
 					return this.$util.Tips({
@@ -614,45 +749,196 @@
 					});
 					return;
 				}
-				this.getOrderList();
+
+				if (this.orderStatus == 4) {
+					this.refundParams.search_info = this.store_name;
+					this.refundParams.page = 1;
+					this.refundParams.search_info = this.store_name;
+					this.getRefundList();
+
+				} else {
+					this.page = 1;
+					this.getOrderList();
+				}
 			}
 		},
 		onReachBottom: function() {
-			this.getOrderList();
+			if (this.orderStatus == 4)
+				this.getRefundList()
+			else
+				this.getOrderList();
 		},
-		
+
 	}
 </script>
 
 <style scoped lang="scss">
+	.info-box {
+		position: relative;
+		margin-top: 12rpx;
+		background-color: #fff;
+
+		.title {
+			display: flex;
+			align-items: center;
+			padding: 0 32rpx;
+			height: 86rpx;
+			border-bottom: 1px solid #F0F0F0;
+			color: #282828;
+
+			.icon-shangjiadingdan {
+				font-size: 32rpx;
+			}
+
+			.txt {
+				margin: 0 5rpx;
+			}
+
+			.icon-xiangyou {
+				color: #999;
+				font-size: 20rpx;
+				margin-top: 6rpx;
+			}
+		}
+
+		.product-box {
+			.product-item {
+				display: flex;
+				padding: 25rpx 30rpx;
+
+				.img-box {
+					width: 130rpx;
+					height: 130rpx;
+					border-radius: 16rpx;
+				}
+
+				.msg {
+					position: relative;
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+					width: 440rpx;
+					margin-left: 26rpx;
+
+					.name {
+						font-size: 28rpx;
+						color: #282828;
+					}
+
+					.des {
+						font-size: 20rpx;
+						color: #868686;
+					}
+
+					.price {
+						font-size: 26rpx;
+					}
+
+					.num {
+						position: absolute;
+						right: -50rpx;
+						top: 4rpx;
+						color: #868686;
+						font-size: 26rpx;
+					}
+				}
+			}
+
+			.event_name {
+				display: inline-block;
+				margin-right: 9rpx;
+				color: #fff;
+				font-size: 20rpx;
+				padding: 0 8rpx;
+				line-height: 30rpx;
+				text-align: center;
+				border-radius: 6rpx;
+			}
+		}
+
+		.btn-box {
+			display: flex;
+			justify-content: flex-end;
+			padding: 0 20rpx 20rpx;
+
+			.btn {
+				width: 176rpx;
+				height: 60rpx;
+				line-height: 60rpx;
+				margin-left: 18rpx;
+				text-align: center;
+				background: var(--view-theme);
+				border-radius: 30rpx;
+				color: #fff;
+				font-size: 27rpx;
+
+				&.gray {
+					border: 1px solid #ddd;
+					background: transparent;
+					color: #aaa;
+				}
+			}
+		}
+
+		.status {
+			position: absolute;
+			right: 30rpx;
+			top: 0;
+
+			.iconfont {
+				font-size: 120rpx;
+				opacity: .3;
+			}
+
+			.p-color {
+				color: var(--view-theme);
+			}
+		}
+	}
+
 	.my-order .header {
 		padding: 17rpx 30rpx;
 		background-color: var(--view-theme);
 	}
-	.t-color{color: var(--view-theme);}
-	.p-color{color: var(--view-priceColor);}
-	.b-color{background-color:var(--view-theme);}
+
+	.t-color {
+		color: var(--view-theme);
+	}
+
+	.p-color {
+		color: var(--view-priceColor);
+	}
+
+	.b-color {
+		background-color: var(--view-theme);
+	}
+
 	.my-order .header .picTxt {
 		height: 190rpx;
 	}
+
 	.my-order .header .picTxt .text {
 		color: rgba(255, 255, 255, 0.8);
 		font-size: 26rpx;
 	}
+
 	.my-order .header .picTxt .text .name {
 		font-size: 34rpx;
 		font-weight: bold;
 		color: #fff;
 		margin-bottom: 20rpx;
 	}
+
 	.my-order .header .picTxt .pictrue {
 		width: 122rpx;
 		height: 109rpx;
 	}
+
 	.my-order .header .picTxt .pictrue image {
 		width: 100%;
 		height: 100%;
 	}
+
 	.my-order .nav {
 		background-color: #fff;
 		width: 690rpx;
@@ -660,28 +946,34 @@
 		border-radius: 16rpx;
 		margin: -73rpx auto 0 auto;
 	}
+
 	.my-order .nav .item {
 		text-align: center;
 		font-size: 26rpx;
 		color: #282828;
 		padding: 29rpx 0;
 	}
+
 	.my-order .nav .item.on {
 		font-weight: bold;
 		border-bottom: 5rpx solid var(--view-theme);
 	}
+
 	.my-order .nav .item .num {
 		margin-top: 18rpx;
 	}
+
 	.my-order .list {
 		width: 690rpx;
 		margin: 14rpx auto 0 auto;
 	}
+
 	.my-order .list .item {
 		background-color: #fff;
 		border-radius: 16rpx;
 		margin-bottom: 14rpx;
 	}
+
 	.my-order .list .item .title {
 		height: 84rpx;
 		padding: 0 30rpx;
@@ -693,50 +985,61 @@
 			.iconfont {
 				margin-top: 5rpx;
 			}
+
 			.store-name {
 				margin: 0 10rpx;
 			}
+
 			.icon-xiangyou {
 				font-size: 20rpx;
 			}
 		}
 	}
+
 	.my-order .list .item .title .sign {
 		font-size: 24rpx;
 		padding: 0 7rpx;
 		height: 36rpx;
 		margin-right: 15rpx;
 	}
+
 	.my-order .list .item .item-info {
 		padding: 0 30rpx;
 		margin-top: 22rpx;
 	}
+
 	.my-order .list .item .item-info .pictrue {
 		width: 120rpx;
 		height: 120rpx;
 	}
+
 	.my-order .list .item .item-info .pictrue image {
 		width: 100%;
 		height: 100%;
 		border-radius: 6rpx;
 	}
+
 	.my-order .list .item .item-info .text {
 		width: 486rpx;
 		font-size: 28rpx;
 		color: #999;
 		margin-top: 6rpx;
 	}
+
 	.my-order .list .item .item-info .text .name {
 		width: 320rpx;
 		color: #282828;
 	}
-	.event_bg{
+
+	.event_bg {
 		background: #FF7F00;
 	}
-	.event_color{
+
+	.event_color {
 		color: #FF7F00;
 	}
-	.my-order .list .item .event_name{
+
+	.my-order .list .item .event_name {
 		display: inline-block;
 		margin-right: 9rpx;
 		color: #fff;
@@ -746,16 +1049,20 @@
 		text-align: center;
 		border-radius: 6rpx;
 	}
-	.my-order .list .item .event_ship{
+
+	.my-order .list .item .event_ship {
 		font-size: 20rpx;
 		margin-top: 10rpx;
 	}
-	.my-order .list  .event_price{
+
+	.my-order .list .event_price {
 		margin: 0 0 50rpx 120rpx;
 	}
+
 	.my-order .list .item .item-info .text .money {
 		text-align: right;
 	}
+
 	.my-order .list .item .totalPrice {
 		font-size: 26rpx;
 		color: #282828;
@@ -763,10 +1070,12 @@
 		margin: 27rpx 0 0 30rpx;
 		padding: 0 30rpx 30rpx 0;
 	}
+
 	.my-order .list .item .totalPrice .money {
 		font-size: 28rpx;
 		font-weight: bold;
 	}
+
 	.my-order .list .item .bottom {
 		height: 107rpx;
 		padding: 0 30rpx;
@@ -787,34 +1096,41 @@
 		border: 1px solid #ddd;
 		color: #aaa;
 	}
+
 	.my-order .list .item .bottom .bnt.colorBnt {
 		border: 1px solid var(--view-theme);
 		color: var(--view-theme);
 	}
-	.my-order .list .item .bottom .bnt .icon-fabu{
+
+	.my-order .list .item .bottom .bnt .icon-fabu {
 		font-size: 26rpx;
 		margin-right: 10rpx;
 	}
+
 	.my-order .list .item .bottom .bnt~.bnt {
 		margin-left: 17rpx;
 	}
+
 	.search {
 		height: 60rpx;
 		padding: 0 30rpx;
 		border-radius: 30rpx;
 		background-color: #FFFFFF;
-		font-size: 26rpx;	
+		font-size: 26rpx;
+
 		.iconfont {
 			margin-right: 10rpx;
 			font-size: 26rpx;
 			color: #999999;
 		}
+
 		.input-placeholder {
 			font-size: 26rpx;
 			color: #999999;
-		}	
+		}
+
 		.input {
 			flex: 1;
 		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/users/refund/confirm.vue b/pages/users/refund/confirm.vue
index 49080c8..71772cf 100644
--- a/pages/users/refund/confirm.vue
+++ b/pages/users/refund/confirm.vue
@@ -61,7 +61,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="btn-box" @click="bindComfirm">申请退款</view>
+		<view class="btn-box" @click="$u.throttle(bindComfirm, 1000)">申请退款</view>
 		<alertBox :msg="msg" v-if="isShowBox" @bindClose="bindClose"></alertBox>
 	</view>
 </template>
diff --git a/pages/users/user_address/index.vue b/pages/users/user_address/index.vue
index c9f44f9..6c889d7 100644
--- a/pages/users/user_address/index.vue
+++ b/pages/users/user_address/index.vue
@@ -1,536 +1,647 @@
+<style lang="scss">
+	.sel_addr_wrap {
+		height: 120rpx;
+		padding: 30rpx 0;
+
+		.sel_addr {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			margin: 0 30rpx;
+			border: 2rpx solid #40ae36;
+			height: 60rpx;
+			line-height: 60rpx;
+			text-align: center;
+			color: #40ae36;
+			border-radius: 10rpx;
+			font-weight: bold;
+
+			&:active {
+				background: rgba(64, 174, 54, .1);
+			}
+
+			text {
+				margin-right: 10rpx;
+			}
+		}
+	}
+
+	.sel_addr_update-wrap {
+		padding: 30rpx 0;
+
+
+		.sel_addr_update {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			border: 2rpx solid #40ae36;
+			box-shadow: 0 0 2rpx 2rpx #40ae3650;
+			padding: 10rpx 20rpx;
+			margin: 0rpx 30rpx;
+			border-radius: 10rpx;
+
+			.sel_addr_wrap-l {
+				.sel_addr_wrap-l-addr {
+					margin-bottom: 8rpx;
+					font-size: 28rpx;
+					font-weight: bold;
+					color: #333;
+					max-width: 480rpx;
+				}
+
+				.sel_addr_wrap-l-detail {
+					font-size: 26rpx;
+					color: #999;
+					max-width: 480rpx;
+				}
+			}
+
+			.sel_addr_wrap-r {
+				padding: 8rpx 8rpx;
+				border: 2rpx solid #40ae36;
+				border-radius: 10rpx;
+				color: #40ae36;
+			}
+		}
+	}
+</style>
 <template>
-  <view :style="viewColor">
-    <form @submit="formSubmit" report-submit='true'>
-      <view class='addAddress'>
-        <view class='list'>
-          <view class='item acea-row row-between-wrapper'>
-            <view class='name'>姓名</view>
-            <input type='text' placeholder='请输入姓名' name='real_name' :value="userAddress.real_name"
-                   placeholder-class='placeholder'></input>
-          </view>
-          <view class='item acea-row row-between-wrapper'>
-            <view class='name'>联系电话</view>
-            <input type='text' placeholder='请输入联系电话' name="phone" :value='userAddress.phone'
-                   placeholder-class='placeholder'></input>
-          </view>
-          <view class='item acea-row row-between-wrapper'>
+	<view :style="viewColor">
+		<form @submit="formSubmit" report-submit='true'>
+			<view class='addAddress'>
+				<view class='list'>
+
+					<view v-if="userAddress.detail != ''" class="sel_addr_update-wrap">
+						<view class="sel_addr_update">
+							<view class="sel_addr_wrap-l">
+								<view class="sel_addr_wrap-l-addr line1">{{userAddress.detail}}</view>
+								<view class="sel_addr_wrap-l-detail line1">{{userAddress.address_detail}}</view>
+							</view>
+							<view class="sel_addr_wrap-r" @click="handleToChoose">修改地址</view>
+						</view>
+					</view>
+					<view v-else class="sel_addr_wrap">
+						<view class="sel_addr" @click="handleToChoose">
+							<text>选择收货地址</text>
+							<u-icon name="arrow-right" size="16" color="#40ae36"></u-icon>
+						</view>
+					</view>
+
+					<view class='item acea-row row-between-wrapper'>
+						<view class='name'>门牌号</view>
+						<input type='text' class="location-input" placeholder='详细地址,例:1栋101号' name='house_number'
+							placeholder-class='placeholder' v-model="userAddress.house_number"></input>
+					</view>
+					<view class='item acea-row row-between-wrapper'>
+						<view class='name'>姓名</view>
+						<input type='text' placeholder='请输入姓名' name='real_name' :value="userAddress.real_name"
+							placeholder-class='placeholder'></input>
+					</view>
+					<view class='item acea-row row-between-wrapper'>
+						<view class='name'>联系电话</view>
+						<input type='text' placeholder='请输入联系电话' name="phone" :value='userAddress.phone'
+							placeholder-class='placeholder'></input>
+					</view>
+					<!-- <view class='item acea-row row-between-wrapper'>
             <view class='name'>所在地区</view>
             <view class="region">
-              <view class="region_count" @click="changeRegion">
-                <text v-if="!addressInfo.length" style="color:#cdcdcd;">请选择地区</text>
-                <text v-else>{{addressText}}</text>
-                <text class="iconfont icon-xiangyou"></text>
-              </view>
-            </view>
-
-          </view>
-          <!-- <view class='item acea-row row-between-wrapper'>
-            <view class='name'>所在村队</view>
-            <view class="region">
-              <view class="region_count" @click="changevillage">
-                <text v-if="!villageInfo.length" style="color:#cdcdcd;">请选择村队</text>
-                <text v-else>{{villageText}}</text>
+              <view class="region_count" @click="handleToChoose">
+                <text v-if="!detail.length" style="color:#cdcdcd;">请选择地区</text>
+                <text v-else>{{detail}}</text>
                 <text class="iconfont icon-xiangyou"></text>
               </view>
             </view>
 
           </view> -->
-          <view class='item acea-row row-between-wrapper'>
-            <view class='name'>详细地址</view>
-            <input type='text' class="location-input" placeholder='请填写具体地址' name='detail'
-                   placeholder-class='placeholder' v-model="userAddress.detail"></input>
-            <!--<view class="location" @click="selfLocation">
-              <text class="iconfont icon-chakanditu"></text>
-              <br>
-              定位
-            </view> -->
 
-          </view>
-        </view>
-        <view class='default acea-row row-middle'>
-          <checkbox-group @change='ChangeIsDefault'>
-            <checkbox :checked="userAddress.is_default ? true : false" />设置为默认地址
-          </checkbox-group>
-        </view>
+				</view>
+				<view class='default acea-row row-middle'>
+					<checkbox-group @change='ChangeIsDefault'>
+						<checkbox :checked="userAddress.is_default ? true : false" />设置为默认地址
+					</checkbox-group>
+				</view>
 
-        <button class='keepBnt' form-type="submit">立即保存</button>
-        <!-- #ifdef MP -->
-        <view class="wechatAddress" v-if="!address_id" @click="getWxAddress">导入微信地址</view>
-        <!-- #endif -->
-        <!-- #ifdef H5 -->
-        <view class="wechatAddress" v-if="this.$wechat.isWeixin() && !address_id" @click="getAddress">导入微信地址
-        </view>
-        <!-- #endif -->
-      </view>
-    </form>
-    <areaWindow ref="areaWindow" :display="display" :address="addressInfo" @submit="OnChangeAddress"
-                @changeClose="changeClose"></areaWindow>
-    <!-- <villageTeam ref="villageTeam" :display="display_one" :address="villageInfo" :villageaddress="list"
+				<button class='keepBnt' form-type="submit">立即保存</button>
+				<!-- #ifdef MP -->
+				<view class="wechatAddress" v-if="!address_id" @click="getWxAddress">导入微信地址</view>
+				<!-- #endif -->
+				<!-- #ifdef H5 -->
+				<view class="wechatAddress" v-if="this.$wechat.isWeixin() && !address_id" @click="getAddress">导入微信地址
+				</view>
+				<!-- #endif -->
+			</view>
+		</form>
+		<areaWindow ref="areaWindow" :display="display" :address="addressInfo" @submit="OnChangeAddress"
+			@changeClose="changeClose"></areaWindow>
+		<!-- <villageTeam ref="villageTeam" :display="display_one" :address="villageInfo" :villageaddress="list"
       @submit="OnChangevAddress" @changeClose="changevClose"></villageTeam> -->
 
-    <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
-  </view>
+		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+	</view>
 </template>
 
 <script>
-// +----------------------------------------------------------------------
-// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
-// +----------------------------------------------------------------------
-// | Author: CRMEB Team <admin@crmeb.com>
-// +----------------------------------------------------------------------
-import {
-  editAddress,
-  getAddressDetail
-} from '@/api/user.js';
-import { wgsToGcj } from "@/utils/wgs.js";
-import {
-  getCityV2,
-  getCityList
-} from '@/api/api.js';
-import {
-  mapGetters
-} from "vuex";
-import areaWindow from '@/components/areaWindow';
-import villageTeam from '@/components/villageTeam/villageTeam.vue';
-import {
-  getGeocoder
-} from '@/api/store.js';
-import authorize from '@/components/Authorize';
-export default {
-  components: {
-    areaWindow,
-    authorize,
-    villageTeam
-  },
-  data() {
-    return {
-      cartId: '', //购物车id
-      pinkId: 0, //拼团id
-      couponId: 0, //优惠券id
-      address_id: 0, //地址id
-      userAddress: {
-        is_default: false
-      }, //地址详情
-      region: ['省', '市', '区'],
-      valueRegion: [0, 0, 0],
-      isAuto: false, //没有授权的不会自动授权
-      isShowAuth: false, //是否隐藏授权
-      district: [],
-      multiArray: [],
-      multiIndex: [0, 0, 0],
-      cityId: 0,
-      display: false,
-      display_one: false,
-      addressInfo: [],
-      villageInfo: [],
-      list: [],
-      latitude: '',
-      longitude: ''
-    };
-  },
-  computed: {
-    ...mapGetters(['isLogin', 'viewColor']),
-    addressText() {
-      return this.addressInfo.map(v => v.name).join('/');
-    },
-    villageText() {
-      return this.villageInfo.map(v => v.name).join('/');
-    }
-  },
-  onLoad(options) {
-    if (this.isLogin) {
-      this.cartId = options.cartId || '';
-      this.pinkId = options.pinkId || 0;
-      this.couponId = options.couponId || 0;
-      this.address_id = options.id || 0;
-      uni.setNavigationBarTitle({
-        title: options.id ? '修改地址' : '添加地址'
-      })
-      this.getUserAddress();
-      this.getCityList();
-    } else {
-      this.isAuto = true;
-      this.isShowAuth = true
-    }
-  },
-  methods: {
-    OnChangeAddress(address) {
-      this.addressInfo = address;
-      this.list = address
-    },
-    OnChangevAddress(address) {
-      this.villageInfo = address;
-      console.log(this.villageInfo)
-    },
-    // 地址数据
-    getCityList: function() {
-      let that = this;
-      getCityV2(0).then(res => {
-        this.district = res.data
-      })
-    },
-    changeRegion() {
-      this.display = true;
-    },
-    changevillage() {
-      this.display_one = true;
-    },
-    // 关闭地址弹窗；
-    changeClose: function() {
-      this.display = false;
-    },
-    changevClose: function() {
-      this.display_one = false;
-    },
-    // 授权回调
-    onLoadFun: function() {
-      this.isShowAuth = false;
-      this.getUserAddress();
-    },
-    // 授权关闭
-    authColse: function(e) {
-      this.isShowAuth = e
-    },
-    toggleTab(str) {
-      this.$refs[str].show();
-    },
-    onConfirm(val) {
-      this.region = val.checkArr[0] + '-' + val.checkArr[1] + '-' + val.checkArr[2];
-    },
-    getUserAddress: function() {
-      if (!this.address_id) return false;
-      let that = this;
-      getAddressDetail(this.address_id).then(res => {
-        let region = [res.data.province, res.data.city, res.data.district, res.data.street, res
-            .data.village
-        ];
-        console.log({...res.data});
-        that.$set(that, 'userAddress', res.data);
-        that.$set(that, 'region', region);
-        that.city_id = res.data.city_id
-        if(res.data.areas) that.addressInfo = res.data.areas;
-        else {
+	// +----------------------------------------------------------------------
+	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+	// +----------------------------------------------------------------------
+	// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
+	// +----------------------------------------------------------------------
+	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+	// +----------------------------------------------------------------------
+	// | Author: CRMEB Team <admin@crmeb.com>
+	// +----------------------------------------------------------------------
+	import {
+		editAddress,
+		getAddressDetail
+	} from '@/api/user.js';
+	import {
+		wgsToGcj
+	} from "@/utils/wgs.js";
+	import {
+		getCityV2,
+		getCityList
+	} from '@/api/api.js';
+	import {
+		mapGetters
+	} from "vuex";
+	import areaWindow from '@/components/areaWindow';
+	import villageTeam from '@/components/villageTeam/villageTeam.vue';
+	import {
+		getGeocoder
+	} from '@/api/store.js';
+	import authorize from '@/components/Authorize';
+	export default {
+		components: {
+			areaWindow,
+			authorize,
+			villageTeam
+		},
+		data() {
+			return {
+				cartId: '', //购物车id
+				pinkId: 0, //拼团id
+				couponId: 0, //优惠券id
+				address_id: 0, //地址id
+				userAddress: {
+					is_default: false,
+					detail: ''
+				}, //地址详情
+				region: ['省', '市', '区'],
+				valueRegion: [0, 0, 0],
+				isAuto: false, //没有授权的不会自动授权
+				isShowAuth: false, //是否隐藏授权
+				district: [],
+				multiArray: [],
+				multiIndex: [0, 0, 0],
+				cityId: 0,
+				display: false,
+				display_one: false,
+				addressInfo: [],
+				newAddrInfo: '',
+				newPCAS: '',
+				villageInfo: [],
+				list: [],
+				latitude: '',
+				longitude: '',
+				detail: '', //四川省泸州市龙马潭区龙门大道15号
+				location: '', // 经纬度
 
-        }
-        that.villageInfo = [res.data.brigade]
-      });
-    },
-    // 导入共享地址（小程序）
-    getWxAddress: function() {
-      let that = this;
-      uni.authorize({
-        scope: 'scope.address',
-        success: function(res) {
-          uni.chooseAddress({
-            success: function(res) {
-              getCityList(res.provinceName + '/' + res.cityName + '/' + res
-                  .countyName).then(res => {
-                that.addressInfo = res.data;
-              })
-              that.userAddress.real_name = res.userName;
-              that.userAddress.phone = res.telNumber;
-              that.userAddress.detail = res.detailInfo;
-            },
-            fail: function(res) {
-              uni.showToast({
-                title: res.errMsg,
-                icon: 'none',
-                duration: 1000
-              });
-              if (res.errMsg == 'chooseAddress:cancel') return that.$util
-                  .Tips({
-                    title: '取消选择'
-                  });
-            },
-          })
-        },
-        fail: function(res) {
-          uni.showModal({
-            title: '您已拒绝导入微信地址权限',
-            content: '是否进入权限管理，调整授权？',
-            success(res) {
-              if (res.confirm) {
-                uni.openSetting({
-                  success: function(res) {}
-                });
-              } else if (res.cancel) {
-                return that.$util.Tips({
-                  title: '已取消！'
-                });
-              }
-            }
-          })
-        },
-      })
-    },
-    // 导入共享地址（微信）；
-    getAddress() {
-      let that = this;
-      that.$wechat.openAddress().then(res => {
-        getCityList(res.provinceName + '/' + res.cityName + '/' + res.countryName).then(res => {
-          that.addressInfo = res.data;
-        })
-        that.userAddress.real_name = res.userName;
-        that.userAddress.phone = res.telNumber;
-        that.userAddress.detail = res.detailInfo;
-      }).catch(err => {
-        // console.log(err);
-      });
-    },
-    selfLocation() {
-      let self = this
-      uni.showLoading({
-        title: '定位中',
-        mask: true,
-      });
-      if (uni.getStorageSync('RejectTarget')) return
-      uni.getLocation({
-        type: 'gcj02',
-        success: (res) => {
-          res = wgsToGcj(res);
-          let latitude, longitude;
-          latitude = res.latitude.toString();
-          longitude = res.longitude.toString();
-          self.latitude = res.latitude
-          self.longitude = res.longitude
-          getGeocoder({
-            lat: latitude,
-            long: longitude
-          }).then(res => {
-            const data = res.data;
-            getCityList(data.address_component.province + '/' + data.address_component
-                .city + '/' + data.address_component.district + '/' + (!data
-                .address_reference.town ? '' : data.address_reference.town
-                .title)).then(res => {
-              self.addressInfo = res.data;
-              self.$set(self.userAddress, 'detail', data.formatted_addresses
-                  .recommend);
-              uni.hideLoading();
-            }).catch(e => {
-              uni.hideLoading();
-              uni.showToast({
-                title: '定位失败，请手动输入地址',
-                icon: 'none',
-                duration: 1000
-              });
-            })
-          }).catch(e => {
-            uni.hideLoading();
-            uni.showToast({
-              title: '定位失败，请手动输入地址',
-              icon: 'none',
-              duration: 1000
-            });
-          })
-        },
-        fail: (res) => {
-          uni.hideLoading();
-          uni.showToast({
-            title: res.errMsg,
-            icon: 'none',
-            duration: 1000
-          });
-        }
-      });
-    },
-    /**
-     * 提交用户添加地址
-     *
-     */
-    formSubmit: function(e) {
-      let that = this,
-          value = e.detail.value;
-      if (!value.real_name) return that.$util.Tips({
-        title: '请填写收货人姓名'
-      });
-      if (!value.phone) return that.$util.Tips({
-        title: '请填写联系电话'
-      });
-      if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(value.phone)) return that.$util.Tips({
-        title: '请输入正确的手机号码'
-      });
-      if (!that.addressInfo.length) return that.$util.Tips({
-        title: '请选择所在地区'
-      });
-      // if (!that.villageInfo.length) return that.$util.Tips({
-      // 	title: '请选择所在村队'
-      // });
-      if (!value.detail) return that.$util.Tips({
-        title: '请填写详细地址'
-      });
-      value.address_id = that.address_id;
-      value.is_default = that.userAddress.is_default ? 1 : 0;
-      value.area = that.addressInfo;
-      value.brigade = that.villageInfo[0]
+			};
+		},
+		computed: {
+			...mapGetters(['isLogin', 'viewColor']),
+			addressText() {
+				return this.addressInfo.map(v => v.name).join('/');
+			},
+			villageText() {
+				return this.villageInfo.map(v => v.name).join('/');
+			}
+		},
+		onLoad(options) {
+			if (this.isLogin) {
+				this.cartId = options.cartId || '';
+				this.pinkId = options.pinkId || 0;
+				this.couponId = options.couponId || 0;
+				this.address_id = options.id || 0;
+				uni.setNavigationBarTitle({
+					title: options.id ? '修改地址' : '添加地址'
+				})
+				this.getUserAddress();
+				this.getCityList();
+			} else {
+				this.isAuto = true;
+				this.isShowAuth = true
+			}
+		},
+		methods: {
 
-      uni.showLoading({
-        title: '保存中',
-        mask: true
-      })
-      editAddress(value).then(res => {
-        if (that.id)
-          that.$util.Tips({
-            title: '修改成功',
-            icon: 'success'
-          });
-        else
-          that.$util.Tips({
-            title: '添加成功',
-            icon: 'success'
-          });
-        setTimeout(function() {
-          if (that.cartId) {
-            let cartId = that.cartId;
-            let pinkId = that.pinkId;
-            let couponId = that.couponId;
-            that.cartId = '';
-            that.pinkId = '';
-            that.couponId = '';
-            uni.$emit('updataAddress')
-            uni.navigateTo({
-              url: '/pages/users/order_confirm/index?cartId=' + cartId +
-                  '&addressId=' + (that.id ? that.id : res.data
-                      .address_id) + '&pinkId=' + pinkId + '&couponId=' +
-                  couponId
-            });
-          } else {
-            // #ifdef H5
-            return history.back();
-            // #endif
-            // #ifndef H5
-            return uni.navigateBack({
-              delta: 1,
-            })
-            // #endif
-          }
-        }, 1000);
-      }).catch(err => {
-        return that.$util.Tips({
-          title: err
-        });
-      })
-    },
-    ChangeIsDefault: function(e) {
-      this.$set(this.userAddress, 'is_default', !this.userAddress.is_default);
-    }
-  }
-}
+			// 选择地址
+			handleToChoose() {
+				let that = this;
+				// #ifdef H5
+				uni.navigateTo({
+					url: "/pages/select_address_n/select_address_n",
+					success: (res) => {
+						uni.$once('changeAddress', res => {
+							console.log(res)
+							// this.newAddrInfo = res.addr; "name": "中国,四川省,泸州市,龙马潭区",
+							that.detail = res.addr.address;
+							that.location = res.addr.location;
+						})
+					}
+				})
+				// #endif
+				// #ifndef H5
+				uni.chooseLocation({
+					success: function(res) {
+						that.userAddress.detail = res.name
+						that.userAddress.address_detail = res.address;
+						that.location = `${res.latitude},${res.longitude}`;;
+					}
+				});
+				// #endif
+			},
+
+			OnChangeAddress(address) {
+				this.addressInfo = address;
+				this.list = address
+			},
+
+			// 地址数据
+			getCityList: function() {
+				let that = this;
+				getCityV2(0).then(res => {
+					this.district = res.data
+				})
+			},
+			changeRegion() {
+				this.display = true;
+			},
+			changevillage() {
+				this.display_one = true;
+			},
+			// 关闭地址弹窗；
+			changeClose: function() {
+				this.display = false;
+			},
+			changevClose: function() {
+				this.display_one = false;
+			},
+			// 授权回调
+			onLoadFun: function() {
+				this.isShowAuth = false;
+				this.getUserAddress();
+			},
+			// 授权关闭
+			authColse: function(e) {
+				this.isShowAuth = e
+			},
+			toggleTab(str) {
+				this.$refs[str].show();
+			},
+			onConfirm(val) {
+				this.region = val.checkArr[0] + '-' + val.checkArr[1] + '-' + val.checkArr[2];
+			},
+			getUserAddress: function() {
+				if (!this.address_id) return false;
+				let that = this;
+				getAddressDetail(this.address_id).then(res => {
+					let region = [res.data.province, res.data.city, res.data.district, res.data.street, res
+						.data.village
+					];
+					that.$set(that, 'userAddress', res.data);
+					that.$set(that, 'region', region);
+					that.$set(that, 'location', res.data.location);
+					that.city_id = res.data.city_id
+					if (res.data.areas) that.addressInfo = res.data.areas;
+					else {
+
+					}
+					that.villageInfo = [res.data.brigade]
+				});
+			},
+			// 导入共享地址（小程序）
+			getWxAddress: function() {
+				let that = this;
+				uni.authorize({
+					scope: 'scope.address',
+					success: function(res) {
+						uni.chooseAddress({
+							success: function(res) {
+								getCityList(res.provinceName + '/' + res.cityName + '/' + res
+									.countyName).then(res => {
+									that.addressInfo = res.data;
+								})
+								that.userAddress.real_name = res.userName;
+								that.userAddress.phone = res.telNumber;
+								that.userAddress.detail = res.detailInfo;
+							},
+							fail: function(res) {
+								uni.showToast({
+									title: res.errMsg,
+									icon: 'none',
+									duration: 1000
+								});
+								if (res.errMsg == 'chooseAddress:cancel') return that.$util
+									.Tips({
+										title: '取消选择'
+									});
+							},
+						})
+					},
+					fail: function(res) {
+						uni.showModal({
+							title: '您已拒绝导入微信地址权限',
+							content: '是否进入权限管理，调整授权？',
+							success(res) {
+								if (res.confirm) {
+									uni.openSetting({
+										success: function(res) {}
+									});
+								} else if (res.cancel) {
+									return that.$util.Tips({
+										title: '已取消！'
+									});
+								}
+							}
+						})
+					},
+				})
+			},
+			// 导入共享地址（微信）；
+			getAddress() {
+				let that = this;
+				that.$wechat.openAddress().then(res => {
+					getCityList(res.provinceName + '/' + res.cityName + '/' + res.countryName).then(res => {
+						that.addressInfo = res.data;
+					})
+					that.userAddress.real_name = res.userName;
+					that.userAddress.phone = res.telNumber;
+					that.userAddress.detail = res.detailInfo;
+				}).catch(err => {
+					// console.log(err);
+				});
+			},
+			selfLocation() {
+				let self = this
+				uni.showLoading({
+					title: '定位中',
+					mask: true,
+				});
+				if (uni.getStorageSync('RejectTarget')) return
+				uni.getLocation({
+					type: 'gcj02',
+					success: (res) => {
+						res = wgsToGcj(res);
+						let latitude, longitude;
+						latitude = res.latitude.toString();
+						longitude = res.longitude.toString();
+						self.latitude = res.latitude
+						self.longitude = res.longitude
+						getGeocoder({
+							lat: latitude,
+							long: longitude
+						}).then(res => {
+							const data = res.data;
+							getCityList(data.address_component.province + '/' + data.address_component
+								.city + '/' + data.address_component.district + '/' + (!data
+									.address_reference.town ? '' : data.address_reference.town
+									.title)).then(res => {
+								self.addressInfo = res.data;
+								self.$set(self.userAddress, 'detail', data.formatted_addresses
+									.recommend);
+								uni.hideLoading();
+							}).catch(e => {
+								uni.hideLoading();
+								uni.showToast({
+									title: '定位失败，请手动输入地址',
+									icon: 'none',
+									duration: 1000
+								});
+							})
+						}).catch(e => {
+							uni.hideLoading();
+							uni.showToast({
+								title: '定位失败，请手动输入地址',
+								icon: 'none',
+								duration: 1000
+							});
+						})
+					},
+					fail: (res) => {
+						uni.hideLoading();
+						uni.showToast({
+							title: res.errMsg,
+							icon: 'none',
+							duration: 1000
+						});
+					}
+				});
+			},
+			/**
+			 * 提交用户添加地址
+			 *
+			 */
+			formSubmit: function(e) {
+				let that = this,
+					value = e.detail.value;
+				value.location = that.location
+				value.detail = that.userAddress.detail
+				value.address_detail = that.userAddress.address_detail
+
+				if (!value.real_name) return that.$util.Tips({
+					title: '请填写收货人姓名'
+				});
+				if (!value.phone) return that.$util.Tips({
+					title: '请填写联系电话'
+				});
+				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(value.phone)) return that.$util.Tips({
+					title: '请输入正确的手机号码'
+				});
+				// if (!that.detail.length) return that.$util.Tips({
+				//   title: '请选择所在地区'
+				// });
+				// if (!that.villageInfo.length) return that.$util.Tips({
+				// 	title: '请选择所在村队'
+				// });
+				if (!value.detail) return that.$util.Tips({
+					title: '请填写详细地址'
+				});
+				if (!value.location) return that.$util.Tips({
+					title: '请选择地址'
+				});
+				value.address_id = that.address_id;
+				value.is_default = that.userAddress.is_default ? 1 : 0;
+				value.area = that.detail;
+				// value.brigade = that.villageInfo[0]
+
+				uni.showLoading({
+					title: '保存中',
+					mask: true
+				})
+				editAddress(value).then(res => {
+					if (that.id)
+						that.$util.Tips({
+							title: '修改成功',
+							icon: 'success'
+						});
+					else
+						that.$util.Tips({
+							title: '添加成功',
+							icon: 'success'
+						});
+					setTimeout(function() {
+						if (that.cartId) {
+							let cartId = that.cartId;
+							let pinkId = that.pinkId;
+							let couponId = that.couponId;
+							that.cartId = '';
+							that.pinkId = '';
+							that.couponId = '';
+							uni.$emit('updataAddress')
+							uni.navigateTo({
+								url: '/pages/users/order_confirm/index?cartId=' + cartId +
+									'&addressId=' + (that.id ? that.id : res.data
+										.address_id) + '&pinkId=' + pinkId + '&couponId=' +
+									couponId
+							});
+						} else {
+							// #ifdef H5
+							return history.back();
+							// #endif
+							// #ifndef H5
+							return uni.navigateBack({
+								delta: 1,
+							})
+							// #endif
+						}
+					}, 1000);
+				}).catch(err => {
+					return that.$util.Tips({
+						title: err
+					});
+				})
+			},
+			ChangeIsDefault: function(e) {
+				this.$set(this.userAddress, 'is_default', !this.userAddress.is_default);
+			}
+		}
+	}
 </script>
 
 <style scoped lang="scss">
-/deep/checkbox .uni-checkbox-input.uni-checkbox-input-checked,
-/deep/checkbox .wx-checkbox-input.wx-checkbox-input-checked {
-  border: 1px solid var(--view-theme) !important;
-  background-color: var(--view-theme) !important;
-  color: #fff !important;
-}
+	/deep/checkbox .uni-checkbox-input.uni-checkbox-input-checked,
+	/deep/checkbox .wx-checkbox-input.wx-checkbox-input-checked {
+		border: 1px solid var(--view-theme) !important;
+		background-color: var(--view-theme) !important;
+		color: #fff !important;
+	}
 
-.addAddress .list {
-  background-color: #fff;
-}
+	.addAddress .list {
+		background-color: #fff;
+	}
 
-.addAddress .list .item {
-  padding: 30rpx;
-  border-top: 1px solid #eee;
-  position: relative;
-}
+	.addAddress .list .item {
+		padding: 30rpx;
+		border-top: 1px solid #eee;
+		position: relative;
+	}
 
-.addAddress .list .item .location {
-  position: absolute;
-  right: 30rpx;
-  top: 15rpx;
-  text-align: center;
-  font-size: 20rpx;
+	.addAddress .list .item .location {
+		position: absolute;
+		right: 30rpx;
+		top: 15rpx;
+		text-align: center;
+		font-size: 20rpx;
 
-  .iconfont {
-    color: var(--view-theme);
-  }
-}
+		.iconfont {
+			color: var(--view-theme);
+		}
+	}
 
-.addAddress .list .item .name {
-  width: 195rpx;
-  font-size: 30rpx;
-  color: #333;
-}
+	.addAddress .list .item .name {
+		width: 195rpx;
+		font-size: 30rpx;
+		color: #333;
+	}
 
-.addAddress .list .item .address {
-  flex: 1;
-  margin-left: 20rpx;
-}
+	.addAddress .list .item .address {
+		flex: 1;
+		margin-left: 20rpx;
+	}
 
-.addAddress .list .item input,
-.region .region_count {
-  width: 475rpx;
-  font-size: 30rpx;
-  box-sizing: border-box;
-}
+	.addAddress .list .item input,
+	.region .region_count {
+		width: 475rpx;
+		font-size: 30rpx;
+		box-sizing: border-box;
+	}
 
-.region .region_count {
-  height: 42rpx;
-  line-height: 42rpx;
+	.region .region_count {
+		// height: 42rpx;
+		// line-height: 42rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
 
-  .icon-xiangyou {
-    float: right;
-  }
-}
+		.icon-xiangyou {
+			float: right;
+		}
+	}
 
-.addAddress .list .location-input {
-  padding-right: 70rpx;
-}
+	.addAddress .list .location-input {
+		padding-right: 70rpx;
+	}
 
-.addAddress .list .item .placeholder {
-  color: #ccc;
-}
+	.addAddress .list .item .placeholder {
+		color: #ccc;
+	}
 
-.addAddress .list .item picker {
-  width: 475rpx;
-}
+	.addAddress .list .item picker {
+		width: 475rpx;
+	}
 
-.addAddress .list .item picker .picker {
-  width: 410rpx;
-  font-size: 30rpx;
-}
+	.addAddress .list .item picker .picker {
+		width: 410rpx;
+		font-size: 30rpx;
+	}
 
-.addAddress .list .item picker .iconfont {
-  font-size: 43rpx;
-}
+	.addAddress .list .item picker .iconfont {
+		font-size: 43rpx;
+	}
 
-.addAddress .default {
-  padding: 0 30rpx;
-  height: 90rpx;
-  background-color: #fff;
-  margin-top: 23rpx;
-}
+	.addAddress .default {
+		padding: 0 30rpx;
+		height: 90rpx;
+		background-color: #fff;
+		margin-top: 23rpx;
+	}
 
-.addAddress .default checkbox {
-  margin-right: 15rpx;
-}
+	.addAddress .default checkbox {
+		margin-right: 15rpx;
+	}
 
-.addAddress .keepBnt {
-  width: 690rpx;
-  height: 86rpx;
-  border-radius: 50rpx;
-  text-align: center;
-  line-height: 86rpx;
-  margin: 50rpx auto;
-  font-size: 32rpx;
-  color: #fff;
-  background-color: var(--view-theme);
-}
+	.addAddress .keepBnt {
+		width: 690rpx;
+		height: 86rpx;
+		border-radius: 50rpx;
+		text-align: center;
+		line-height: 86rpx;
+		margin: 50rpx auto;
+		font-size: 32rpx;
+		color: #fff;
+		background-color: var(--view-theme);
+	}
 
-.addAddress .wechatAddress {
-  width: 690rpx;
-  height: 86rpx;
-  border-radius: 50rpx;
-  text-align: center;
-  line-height: 86rpx;
-  margin: 0 auto;
-  font-size: 32rpx;
-  color: var(--view-theme);
-  border: 1px solid var(--view-theme);
-}
-</style>
+	.addAddress .wechatAddress {
+		width: 690rpx;
+		height: 86rpx;
+		border-radius: 50rpx;
+		text-align: center;
+		line-height: 86rpx;
+		margin: 0 auto;
+		font-size: 32rpx;
+		color: var(--view-theme);
+		border: 1px solid var(--view-theme);
+	}
+</style>
\ No newline at end of file
diff --git a/pages/whole_sale/index.vue b/pages/whole_sale/index.vue
index 389fdc6..6abd3ff 100644
--- a/pages/whole_sale/index.vue
+++ b/pages/whole_sale/index.vue
@@ -1,487 +1,244 @@
-<style lang="scss" scoped>
-	page {
-		background-color: #F8F9FA;
-	}
-
-	.wholeSale {
-		.wholeSale-header {
-			margin-bottom: 20rpx;
-			background-color: #40AE36;
-
-			.scrollview {
-				display: flex;
-				align-items: center;
-				height: 98rpx;
-				padding-left: 32rpx;
-
-				.scrollview-item {
-					margin-right: 30rpx;
-					font-size: 28rpx;
-					color: #FFFFFF;
-				}
-
-				.scrollview-active {
-					position: relative;
-					font-weight: bold;
-					font-size: 36rpx;
-					color: #FFFFFF;
-
-					&::after {
-						content: "";
-						display: inline-block;
-						position: absolute;
-						bottom: -6rpx;
-						left: 50%;
-						transform: translateX(-50%);
-						width: 100%;
-						height: 6rpx;
-						background-color: #FFFFFF;
-					}
-				}
-			}
-		}
-
-		.wholeSale-con {
-			margin: 0 10px;
-
-			.search_content {
-				margin-bottom: 40rpx;
-				height: 70rpx;
-				padding: 2px 2px 2px 21.05rpx;
-				border-radius: 80rpx;
-				background: #EDEFF2;
-				position: relative;
-				box-sizing: border-box;
-
-				.search_content_wrap {
-					width: 100%;
-
-					.icon-sousuo {
-						font-size: 26.32rpx;
-						font-weight: bold;
-						color: #c8c7c6;
-						margin-right: 17.54rpx;
-					}
-
-					input {
-						width: 80%;
-					}
-				}
-
-				.search_btn {
-					width: 106rpx;
-					height: 60rpx;
-					line-height: 60rpx;
-					background: #40AE36;
-					border-radius: 100px;
-					font-size: 28rpx;
-					color: #fff;
-				}
-			}
-
-			.category {
-				width: 100%;
-				overflow: auto;
-				margin-bottom: 20rpx;
-
-				.category-wrap {
-					display: flex;
-					padding-bottom: 20rpx;
-
-					.category-item {
-						display: flex;
-						flex-direction: column;
-						justify-content: center;
-						align-items: center;
-						margin-right: 38rpx;
-
-						text {
-							margin-top: 16rpx;
-							font-size: 24rpx;
-							color: #666666;
-							white-space: nowrap;
-						}
-
-						.category-item-text {
-							width: 120rpx;
-							text-align: center;
-							overflow: hidden;
-							white-space: nowrap;
-							text-overflow: ellipsis;
-						}
-					}
-
-					.category-item-active {
-						position: relative;
-
-						.category-item-img {
-							border: 2px solid #40AE36;
-							border-radius: 50%;
-						}
-
-						text {
-							background-color: #40AE36;
-							color: #fff;
-							padding: 2rpx 10rpx 6rpx 10rpx;
-							border-radius: 50rpx;
-						}
-					}
-				}
-			}
-
-			.cate {
-				width: 100%;
-				overflow: auto;
-				margin-bottom: 30rpx;
-
-				.cate-wrap {
-					display: flex;
-					padding-bottom: 8rpx;
-
-					.cate-item {
-
-						text {
-							padding: 4rpx 16rpx;
-							white-space: nowrap;
-							font-size: 30rpx;
-							color: #333;
-						}
-					}
-
-					.cate-item-active {
-						text {
-							color: #40AE36;
-							font-weight: bold;
-						}
-					}
-				}
-			}
-
-			.comprehensive {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				padding: 20rpx 50rpx;
-
-				[class^=comprehensive-] {
-					display: flex;
-					align-items: center;
-
-					text {
-						margin-right: 12rpx;
-						font-size: 26rpx;
-						color: #666666;
-					}
-
-					image {
-						width: 28rpx;
-						height: 28rpx;
-					}
-
-					.loudou {
-						width: 24rpx;
-						height: 24rpx;
-					}
-				}
-
-
-				.comp-color {
-
-					text {
-						margin-right: 12rpx;
-						font-size: 26rpx;
-						color: #40ae36 !important;
-					}
-
-				}
-			}
-		}
-	}
-
-	.pictrue {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		color: #999;
-
-		image {
-			width: 414rpx;
-			height: 305rpx;
-		}
-	}
-
-	.goods_list {
-		.goods {
-			// width: 690rpx;
-			height: 200rpx;
-			margin: 20rpx auto;
-			margin-top: 0;
-			background-color: #fff;
-			border-radius: 24rpx;
-			display: flex;
-
-			.avatar {
-				height: 160rpx;
-				width: 160rpx;
-				margin: 20rpx;
-				border-radius: 12rpx;
-				overflow: hidden;
-				position: relative;
-			}
-
-			.content {
-				margin: 20rpx 0;
-				width: 520rpx;
-				display: flex;
-				flex-direction: column;
-				justify-content: space-between;
-
-				.content-head {
-					width: 500rpx;
-					display: flex;
-					justify-content: space-between;
-					align-items: flex-end;
-					font-size: 28rpx;
-					color: #333;
-
-					.title {
-						width: 360rpx;
-						white-space: nowrap;
-						overflow: hidden;
-						text-overflow: ellipsis;
-					}
-				}
-
-				.content-two {
-					display: flex;
-					font-size: 24rpx;
-					color: #666;
-					align-items: center;
-
-					.star {
-						position: relative;
-						width: 111rpx;
-						height: 19rpx;
-						margin-right: 10rpx;
-						background: url(../columnGoods/images/star.png) left top/100% 100% no-repeat;
-						overflow: hidden;
-
-						view {
-							position: absolute;
-							top: 0;
-							left: 0;
-							width: 100%;
-							height: 100%;
-							background: url(../columnGoods/images/star_active.png) left top/111rpx 19rpx no-repeat;
-
-							&.star_purple {
-								background: url(../columnGoods/images/star_active_purple.png) left top/111rpx 19rpx no-repeat;
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-</style>
 <template>
 	<view class="wholeSale">
-
 		<!-- 顶部 -->
-		<view class="wholeSale-header" style="position: fixed;top: 0;left: 0;width: 100%;z-index: 999;">
-			<!-- 适配不同机 -->
-			<view style="height: var(--status-bar-height);"></view>
+		<view class="wholeSale-header">
+			<view class="wholeSale-header-wrap">
+				<!-- 适配不同机 -->
+				<view style="height: var(--status-bar-height);"></view>
 
-			<!-- 滚动tab -->
-			<scroll-view scroll-x="true" :scroll-top="100" :show-scrollbar="false" scroll-into-view="a1">
-				<view class="scrollview">
-					<block v-for="(item,indx) in tabsArr" :key="indx">
-						<view class="scrollview-item" :id="'a' + indx"
-							:class="{'scrollview-active':tabsCurr == item.val}" @click="tabsChange(item.val)">
-							{{item.name}}
+				<!-- 滚动tab -->
+				<scroll-view scroll-x="true" :scroll-top="100" :show-scrollbar="false" scroll-into-view="a1">
+					<view class="scrollview">
+						<block v-for="(item,indx) in tabsArr" :key="indx">
+							<view class="scrollview-item" :id="'a' + indx"
+								:class="{'scrollview-active':tabsCurr == item.val}" @click="tabsChange(item.val)">
+								{{item.name}}
+							</view>
+						</block>
+					</view>
+				</scroll-view>
+			</view>
+
+			<view class="wholeSale-header-search-wrap" :style="{height:wrapHeight + 'rpx'}">
+				<u-subsection v-if="tabsCurr==2" :list="subList" @change="changeSub" :current="subCurr"
+					mode="subsection" activeColor="#40ae36" fontSize="14" style="margin-bottom: 24rpx;"></u-subsection>
+
+				<view class="wholeSale-nav">
+					<view
+						@click="navTo(`/pages/columnGoods/goods_search/index?back=true&searchVal=${where.keyword}&shop=${subCurr!=1 || (subCurr==1 && tabsCurr!=2) ? false : true}`)"
+						hover-class="none" class="search_content flex_a_c_j_sb">
+						<view class="flex_a_c search_content_wrap">
+							<view class="iconfont icon-sousuo" style="font-size: 39rpx;"></view>
+							<input type="text"
+								:placeholder="subCurr!=1 || (subCurr==1 && tabsCurr!=2) ? '搜索您需要批发进货的产品名称': '搜索店铺名称'"
+								:value="where.keyword" placeholder-style="font-size: 30rpx;color:#999;" disabled
+								style="pointer-events: none;">
 						</view>
-					</block>
+					</view>
+				</view>
+
+				<!-- 商品大分类 -->
+				<view class="category">
+					<scroll-view scroll-x="true">
+						<view class="category-wrap">
+							<block v-for="(item,index) in store_category" :key="index">
+								<view class="category-item" :class="{'category-item-active': index==cate_change}"
+									@click="changeCate(index)">
+									<block v-if="subCurr!=1 || (subCurr==1 && tabsCurr!=2)">
+										<u--image class="category-item-img" width="108rpx" :src="item.pic"
+											height="108rpx" shape="circle">
+											<template v-slot:loading>
+												<u-loading-icon color="#999" size="15" />
+											</template>
+										</u--image>
+										<text class="category-item-text">{{item.cate_name}}</text>
+									</block>
+									<block v-else>
+										<u--image class="category-item-img" width="108rpx" :src="item.background"
+											height="108rpx" shape="circle">
+											<template v-slot:loading>
+												<u-loading-icon color="#999" size="15" />
+											</template>
+										</u--image>
+										<text class="category-item-text">{{item.category_name}}</text>
+									</block>
+								</view>
+							</block>
+						</view>
+					</scroll-view>
+					<view class="category-all" v-if="store_category.length > 0" @click="onAllCategory">
+						<view style="margin-bottom: 20rpx;">全部</view>
+						<u-icon name="list"></u-icon>
+					</view>
+				</view>
+
+				<!-- 商品小分类 -->
+				<view class="cate" v-if="store_category_children.length>1">
+					<scroll-view scroll-x="true">
+						<view class="cate-wrap">
+							<block v-for="(item,index) in store_category_children" :key="index">
+								<view class="cate-item" :class="{'cate-item-active':index == cate_change_children}"
+									@click="changeChildrenCate(index)">
+									<text>{{item.cate_name}}</text>
+								</view>
+							</block>
+						</view>
+					</scroll-view>
+				</view>
+
+				<!-- 综合查询 -->
+				<view class="comprehensive" v-if="subCurr!=1 || (subCurr==1 && tabsCurr!=2)">
+					<view class="comprehensive-price" :class="{'comp-color': orderCurr==1}"
+						@click="toOrder('price', 1)">
+						<text>价格</text>
+						<image v-if="orderCurr==1" style="width: 15rpx;height: 21rpx;"
+							:src="where.order == 'price_asc' ? domain+'/static/diy/up'+keyColor+'.png' : domain+'/static/diy/down'+keyColor+'.png'">
+						</image>
+						<view v-else style="width: 15rpx;height: 21rpx;"></view>
+					</view>
+					<view class="comprehensive-sales_num" :class="{'comp-color': orderCurr==2}"
+						@click="toOrder('sales', 2)">
+						<text>销量</text>
+					</view>
+					<view class="comprehensive-discount" :class="{'comp-color': orderCurr==3}" v-if="tabsCurr!=1"
+						@click="toOrder('', 3)">
+						<text>综合</text>
+					</view>
+					<view class="comprehensive-discount" v-else @click="deduction_rate=!deduction_rate;">
+						<text>抵扣</text>
+						<image class="loudou" src="@/static/new_define/loudou.png"></image>
+					</view>
+				</view>
+
+				<!-- 综合查询 -->
+				<view class="comprehensive" v-if="deduction_rate && tabsCurr==1">
+					<view class="comprehensive-sales_num" :class="{'comp-color': where.deduction_rate==''}"
+						@click="changeDeduction('')">
+						<text>全部</text>
+					</view>
+					<view class="comprehensive-sales_num" :class="{'comp-color': where.deduction_rate=='10'}"
+						@click="changeDeduction('10')">
+						<text>1:9</text>
+					</view>
+					<view class="comprehensive-sales_num" :class="{'comp-color': where.deduction_rate=='15'}"
+						@click="changeDeduction('15')">
+						<text>2:8</text>
+					</view>
+					<view class="comprehensive-sales_num" :class="{'comp-color': where.deduction_rate=='20'}"
+						@click="changeDeduction('20')">
+						<text>3:7</text>
+					</view>
+					<view class="comprehensive-sales_num" :class="{'comp-color': where.deduction_rate=='25'}"
+						@click="changeDeduction('25')">
+						<text>4:6</text>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 内容 -->
+		<view class="wholeSale-con"
+			:style="{height:'calc(100vh - '+wrapHeight+'rpx - 142rpx '+(isShowSmall?' - 48rpx':'')+')'}">
+			<scroll-view :scroll-y="true" @scrolltolower="onScrollBottom" @scroll="onScroll" style="height: 100%;"
+				@scrolltoupper="scrolltoupper" :refresher-threshold="0">
+				<!-- 流水瀑布 -->
+				<WaterfallsFlow v-if="subCurr!=1 || (subCurr==1 && tabsCurr!=2)" :wfList='hostProduct'
+					@itemTap="goDetail" :type="0" :sale_type="2" />
+
+				<!-- 列表 -->
+				<view class="goods_list" v-else>
+					<view class="goods" v-for="(item, index) in shopList" :key="index" @click="goStore(item.mer_id)">
+						<view class="avatar">
+							<u--image width="160rpx" height="160rpx" :src="item.mer_avatar" mode="aspectFill">
+								<template v-slot:loading>
+									<u-loading-icon color="#999" size="15" />
+								</template>
+							</u--image>
+						</view>
+						<view class="content">
+							<view class="content-head">
+								<view class="title">{{item.mer_name}}</view>
+								<text style="font-size: 21.03rpx;color: #aaa;"
+									v-if="item.sales>=100">月销{{item.sales}}</text>
+							</view>
+							<view class="content-two">
+								<view class="score">
+									<view class="star">
+										<view
+											:style="{width: `${(item.service_score / 5 * 100).toFixed(0)}%`, backgroundImage: `url(${domain}/static/diy/score1${keyColor}.png)`}">
+										</view>
+									</view>
+								</view>
+								<text
+									style="margin-left: 20rpx;color: #FF6D20;font-size: 22.78rpx; ">{{item.service_score}}</text>
+								<text v-if="item.distance"
+									style="margin-left: 20rpx;font-size: 21.03rpx;color: #aaa;">{{item.distance}}</text>
+
+								<text style="margin-left: 20rpx;" class="line1">{{item.category_name}}</text>
+							</view>
+							<view class="content-two">
+								<u--image :showLoading="true" src="/static/images/GXSC/DH.png" width="33.85rpx"
+									height="33.85rpx"></u--image>
+								<text> {{item.service_phone}}</text>
+								<u--image style="margin-left: 28rpx;" v-if="item.mer_take_time" :showLoading="true"
+									src="/static/images/GXSC/SJ.png" width="33.85rpx" height="33.85rpx"></u--image>
+								<text
+									v-if="item.mer_take_time">{{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}</text>
+							</view>
+							<view class="content-two">
+								<u--image :showLoading="true" src="/static/images/GXSC/DW.png" width="33.85rpx"
+									height="33.85rpx"></u--image>
+								<text class="address">{{item.mer_address}}</text>
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<loadmore :type="isLoading" v-if="isLoading || hostProduct.length > 0"
+					style="padding: 40rpx 0 150rpx; 0">
+				</loadmore>
+				<view class='pictrue' v-if="!isLoading && hostProduct.length == 0">
+					<image :src="`${domain}/static/images/noCart.png`"></image>
+					<view>暂无商品，看点别的吧</view>
 				</view>
 			</scroll-view>
 		</view>
 
-		<!-- 内容 -->
-		<view class="wholeSale-con" style="padding-top: calc(var(--status-bar-height) + 120rpx);">
-			<u-subsection v-if="tabsCurr==2" :list="subList" @change="changeSub" :current="subCurr" mode="subsection"
-				activeColor="#40ae36" fontSize="14" style="margin-bottom: 24rpx;"></u-subsection>
-
-			<view class="wholeSale-nav">
-				<!-- <u-icon class="icon" name="arrow-left" size="20" @click="navBack"></u-icon> -->
-				<!-- 搜索 -->
-				<view
-					@click="navTo(`/pages/columnGoods/goods_search/index?back=true&searchVal=${where.keyword}&shop=${subCurr!=1 || (subCurr==1 && tabsCurr!=2) ? false : true}`)"
-					hover-class="none" class="search_content flex_a_c_j_sb">
-					<view class="flex_a_c search_content_wrap">
-						<view class="iconfont icon-sousuo" style="font-size: 39rpx;"></view>
-						<input type="text"
-							:placeholder="subCurr!=1 || (subCurr==1 && tabsCurr!=2) ? '搜索您需要批发进货的产品名称': '搜索店铺名称'"
-							:value="where.keyword" placeholder-style="font-size: 30rpx;color:#999;" disabled
-							style="pointer-events: none;">
-					</view>
-					<!-- <button class="search_btn">搜索</button> -->
-				</view>
-			</view>
-
-			<!-- 商品大分类 -->
-			<view class="category">
-				<scroll-view scroll-x="true">
-					<view class="category-wrap">
+		<!-- 弹框大分类 -->
+		<uni-popup ref="popup" type="top" border-radius="10px 10px 0 0" z-index="1000">
+			<view class="popup-wrap">
+				<view style="height: var(--status-bar-height);"></view>
+				<view class="popup-wrap-title">分类</view>
+				<view class="popup-wrap-category">
+					<view class="popup-wrap-category-wrap">
 						<block v-for="(item,index) in store_category" :key="index">
-							<view class="category-item" :class="{'category-item-active': index==cate_change}"
+							<view class="popup-wrap-category-item"
+								:class="{'popup-wrap-category-item-active': index==cate_change}"
 								@click="changeCate(index)">
 								<block v-if="subCurr!=1 || (subCurr==1 && tabsCurr!=2)">
-									<u--image class="category-item-img" width="108rpx" :src="item.pic" height="108rpx"
-										shape="circle">
-										<template v-slot:loading>
-											<u-loading-icon color="#999" size="15" />
-										</template>
-									</u--image>
-									<text class="category-item-text">{{item.cate_name}}</text>
-								</block>
-								<block v-else>
-									<u--image class="category-item-img" width="108rpx" :src="item.background"
+									<u--image class="popup-wrap-category-item-img" width="108rpx" :src="item.pic"
 										height="108rpx" shape="circle">
 										<template v-slot:loading>
 											<u-loading-icon color="#999" size="15" />
 										</template>
 									</u--image>
-									<text class="category-item-text">{{item.category_name}}</text>
+									<text class="popup-wrap-category-item-text">{{item.cate_name}}</text>
+								</block>
+								<block v-else>
+									<u--image class="popup-wrap-category-item-img" width="108rpx" :src="item.background"
+										height="108rpx" shape="circle">
+										<template v-slot:loading>
+											<u-loading-icon color="#999" size="15" />
+										</template>
+									</u--image>
+									<text class="popup-wrap-category-item-text">{{item.category_name}}</text>
 								</block>
 							</view>
 						</block>
 					</view>
-				</scroll-view>
-			</view>
-
-
-			<!-- 商品小分类 -->
-			<view class="cate" v-if="store_category_children.length>1">
-				<scroll-view scroll-x="true">
-					<view class="cate-wrap">
-						<block v-for="(item,index) in store_category_children" :key="index">
-							<view class="cate-item" :class="{'cate-item-active':index == cate_change_children}"
-								@click="changeChildrenCate(index)">
-								<text>{{item.cate_name}}</text>
-							</view>
-						</block>
-					</view>
-				</scroll-view>
-			</view>
-
-			<!-- 综合查询 -->
-			<view class="comprehensive" v-if="subCurr!=1 || (subCurr==1 && tabsCurr!=2)">
-				<view class="comprehensive-price" :class="{'comp-color': orderCurr==1}" @click="toOrder('price', 1)">
-					<text>价格</text>
-					<image v-if="orderCurr==1" style="width: 15rpx;height: 21rpx;"
-						:src="where.order == 'price_asc' ? domain+'/static/diy/up'+keyColor+'.png' : domain+'/static/diy/down'+keyColor+'.png'">
-					</image>
-					<view v-else style="width: 15rpx;height: 21rpx;"></view>
-				</view>
-				<view class="comprehensive-sales_num" :class="{'comp-color': orderCurr==2}"
-					@click="toOrder('sales', 2)">
-					<text>销量</text>
-				</view>
-				<view class="comprehensive-discount" :class="{'comp-color': orderCurr==3}" v-if="tabsCurr!=1"
-					@click="toOrder('', 3)">
-					<text>综合</text>
-				</view>
-				<view class="comprehensive-discount" v-else @click="deduction_rate=!deduction_rate;">
-					<text>抵扣</text>
-					<image class="loudou" src="@/static/new_define/loudou.png"></image>
 				</view>
 			</view>
-			<!-- 综合查询 -->
-			<view class="comprehensive" v-if="deduction_rate && tabsCurr==1">
-				<view class="comprehensive-sales_num" :class="{'comp-color': where.deduction_rate==''}"
-					@click="changeDeduction('')">
-					<text>全部</text>
-				</view>
-				<view class="comprehensive-sales_num" :class="{'comp-color': where.deduction_rate=='10'}"
-					@click="changeDeduction('10')">
-					<text>1:9</text>
-				</view>
-				<view class="comprehensive-sales_num" :class="{'comp-color': where.deduction_rate=='15'}"
-					@click="changeDeduction('15')">
-					<text>2:8</text>
-				</view>
-				<view class="comprehensive-sales_num" :class="{'comp-color': where.deduction_rate=='20'}"
-					@click="changeDeduction('20')">
-					<text>3:7</text>
-				</view>
-				<view class="comprehensive-sales_num" :class="{'comp-color': where.deduction_rate=='25'}"
-					@click="changeDeduction('25')">
-					<text>4:6</text>
-				</view>
-			</view>
-
-			<!-- 流水瀑布 -->
-			<WaterfallsFlow v-if="subCurr!=1 || (subCurr==1 && tabsCurr!=2)" :wfList='hostProduct' @itemTap="goDetail"
-				:type="0" :sale_type="2" />
-
-
-			<!-- 列表 -->
-			<view class="goods_list" v-else>
-				<view class="goods" v-for="(item, index) in shopList" :key="index" @click="goStore(item.mer_id)">
-					<view class="avatar">
-						<!-- <image style="width: 100%;height: 100%;" :src="item.mer_avatar" mode="aspectFill" lazy-load>
-            </image> -->
-						<u--image width="160rpx" height="160rpx" :src="item.mer_avatar" mode="aspectFill">
-							<template v-slot:loading>
-								<u-loading-icon color="#999" size="15" />
-							</template>
-						</u--image>
-					</view>
-					<view class="content">
-						<view class="content-head">
-							<view class="title">{{item.mer_name}}</view>
-							<text style="font-size: 21.03rpx;color: #aaa;"
-								v-if="item.sales>=100">月销{{item.sales}}</text>
-						</view>
-						<view class="content-two">
-							<view class="score">
-								<view class="star">
-									<view
-										:style="{width: `${(item.service_score / 5 * 100).toFixed(0)}%`, backgroundImage: `url(${domain}/static/diy/score1${keyColor}.png)`}">
-									</view>
-								</view>
-							</view>
-							<text
-								style="margin-left: 20rpx;color: #FF6D20;font-size: 22.78rpx; ">{{item.service_score}}</text>
-							<text v-if="item.distance"
-								style="margin-left: 20rpx;font-size: 21.03rpx;color: #aaa;">{{item.distance}}</text>
-
-							<text style="margin-left: 20rpx;" class="line1">{{item.category_name}}</text>
-						</view>
-						<view class="content-two">
-							<u--image :showLoading="true" src="/static/images/GXSC/DH.png" width="33.85rpx"
-								height="33.85rpx"></u--image>
-							<text> {{item.service_phone}}</text>
-							<u--image style="margin-left: 28rpx;" v-if="item.mer_take_time" :showLoading="true"
-								src="/static/images/GXSC/SJ.png" width="33.85rpx" height="33.85rpx"></u--image>
-							<text v-if="item.mer_take_time">{{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}</text>
-						</view>
-						<view class="content-two">
-							<u--image :showLoading="true" src="/static/images/GXSC/DW.png" width="33.85rpx"
-								height="33.85rpx"></u--image>
-							<text class="address">{{item.mer_address}}</text>
-						</view>
-					</view>
-				</view>
-			</view>
-
-
-			<loadmore :type="isLoading" v-if="isLoading || hostProduct.length > 0" style="padding: 40rpx 0 150rpx; 0">
-			</loadmore>
-			<view class='pictrue' v-if="!isLoading && hostProduct.length == 0">
-				<image :src="`${domain}/static/images/noCart.png`"></image>
-				<view>暂无商品，看点别的吧</view>
-			</view>
-		</view>
+		</uni-popup>
 
 		<!--自定义底部tab栏-->
 		<customTab :newData="newData" :activeRouter="activeRouter"></customTab>
@@ -552,14 +309,20 @@
 					limit: 20,
 					sale_type: 2, //1为零售, 2为批发   
 					mer_type: 1,
-					mer_cate_id: '', //
+					cate_pid: '', //
 					cate_id: '',
 					keyword: '',
 					deduction_rate: '', //抵扣比例
 					order: '', // 销量sales, 价格低到高price_asc, 价格高到低price_desc
 					rand: 1,
 				},
-				isIndexClick: true
+				isIndexClick: true,
+				bigTypeDomInfo: null,
+				smallTypeDomInfo: null,
+				categoryWrapHeight: 0,
+				wrapHeight: 332,
+				isShowSmall: false,
+				scrollTop: 0,
 			}
 		},
 		computed: {
@@ -585,7 +348,6 @@
 		},
 
 		onShow() {
-			console.log(this.isIndexClick)
 			this.isIndexClick = false;
 		},
 
@@ -606,13 +368,49 @@
 				})
 			}
 		},
-		onPullDownRefresh() {
-			this.initData(true, true);
-		},
-		onReachBottom() {
-			this.initData();
+		// onPullDownRefresh() {
+		// 	this.initData(true, true);
+		// },
+		// onReachBottom() {
+		// 	this.initData(false, true);
+		// },
+
+		watch: {
+			'where.cate_pid'(newVal, oldVal) {
+				if (newVal && !oldVal) {
+					this.wrapHeight = this.tabsCurr == 2 ? 400 : (332 + 48);
+					this.isShowSmall = true;
+				}
+				if (!newVal && oldVal) {
+					this.wrapHeight = this.tabsCurr == 2 ? 400 : 332;
+					this.isShowSmall = false;
+				}
+			}
 		},
+
 		methods: {
+			onAllCategory() {
+				this.$refs.popup.open();
+			},
+
+			scrolltoupper() {
+				this.initData(true, true);
+			},
+
+			onScrollBottom(e) {
+				this.initData(false, true);
+			},
+
+			onScroll(e) {
+				if (this.scrollTop >= e.target.scrollTop) { //上拉
+					this.wrapHeight = this.tabsCurr == 2 ? 400 : 332;
+					if (this.where.cate_pid) this.wrapHeight = this.wrapHeight + 48;
+				} else {
+					this.wrapHeight = 0;
+				}
+				this.scrollTop = e.target.scrollTop;
+			},
+
 			initData(re = false, stop = false) {
 				if (!stop) this.getStoreCategory();
 				if (this.tabsCurr == 2 && this.subCurr == 1) this.storeMerchantList(re, stop);
@@ -683,6 +481,7 @@
 				this.cate_change = 0;
 				this.cate_change_children = 0;
 				if (this.tabsCurr != 2 || (this.tabsCurr == 2 && this.subCurr != 1)) this.where.mer_type = e;
+				this.wrapHeight = this.tabsCurr == 2 ? 400 : this.where.cate_pid ? (332 + 48) : 332;
 				this.initData(true);
 			},
 			changeCate(e) {
@@ -692,22 +491,27 @@
 					this.where.merchant_category_id = this.store_category[e].merchant_category_id;
 					return this.storeMerchantList(true);
 				}
-				if (this.store_category[e].children) this.store_category_children = [...this.store_category[e].children];
+				if (this.store_category[e].children) this.store_category_children = [...this.store_category[e]
+					.children
+				];
 				this.store_category_children.unshift({
 					cate_name: '全部',
 					store_category_id: ''
 				})
 				this.cate_change_children = 0;
-				if (this.tabsCurr == 1) this.where.mer_cate_id = this.store_category[e].store_category_id;
+				if (this.tabsCurr == 1) this.where.cate_pid = this.store_category[e].store_category_id;
 				else {
 					this.where.cate_pid = this.store_category[e].store_category_id;
 					this.where.cate_id = "";
 				}
 				this.getProductslist(true);
+
+				// 关闭popup
+				this.$refs.popup && this.$refs.popup.close();
 			},
 			changeChildrenCate(e) {
 				this.cate_change_children = e;
-				let key = 'mer_cate_id';
+				let key = 'cate_pid';
 				if (this.tabsCurr != 1) key = 'cate_id';
 				this.where[key] = this.store_category_children[e].store_category_id;
 				if (e == 0) this.where[key] = this.store_category[this.cate_change].store_category_id; // 如若选中全部, 则取父级id
@@ -715,7 +519,9 @@
 			},
 			getStoreCategory() {
 				this.store_category = [];
-				if (this.tabsCurr == 1) getStoreCategory(259).then(res => {
+				if (this.tabsCurr == 1) getStoreCategory(259, {
+					sale_type: 2
+				}).then(res => {
 					this.initStoreCate(res);
 				})
 				else if (this.tabsCurr == 2 && this.subCurr == 1) merClassifly().then(res => {
@@ -809,4 +615,388 @@
 			},
 		}
 	}
-</script>
\ No newline at end of file
+</script>
+
+<style lang="scss" scoped>
+	page {
+		background-color: #F8F9FA;
+	}
+
+	.wholeSale {
+		.wholeSale-header {
+			position: sticky;
+			top: 0;
+			z-index: 90;
+			margin-bottom: 20rpx;
+
+			.wholeSale-header-wrap {
+				background-color: #40AE36;
+			}
+
+			.wholeSale-header-search-wrap {
+				position: sticky;
+				top: calc(82rpx + var(--status-bar-height));
+				transition: height .5s;
+				overflow: hidden;
+				padding: 30rpx 20rpx 0;
+				background-color: #fff;
+			}
+
+			.scrollview {
+				display: flex;
+				align-items: center;
+				height: 98rpx;
+				padding-left: 32rpx;
+
+				.scrollview-item {
+					margin-right: 30rpx;
+					font-size: 28rpx;
+					color: #FFFFFF;
+				}
+
+				.scrollview-active {
+					position: relative;
+					font-weight: bold;
+					font-size: 36rpx;
+					color: #FFFFFF;
+
+					&::after {
+						content: "";
+						display: inline-block;
+						position: absolute;
+						bottom: -6rpx;
+						left: 50%;
+						transform: translateX(-50%);
+						width: 100%;
+						height: 6rpx;
+						background-color: #FFFFFF;
+					}
+				}
+			}
+		}
+
+		.wholeSale-con {
+			margin: 0 10px;
+		}
+
+		.search_content {
+			margin-bottom: 40rpx;
+			height: 70rpx;
+			padding: 2px 2px 2px 21.05rpx;
+			border-radius: 80rpx;
+			background: #EDEFF2;
+			position: relative;
+			box-sizing: border-box;
+
+			.search_content_wrap {
+				width: 100%;
+
+				.icon-sousuo {
+					font-size: 26.32rpx;
+					font-weight: bold;
+					color: #c8c7c6;
+					margin-right: 17.54rpx;
+				}
+
+				input {
+					width: 80%;
+				}
+			}
+
+			.search_btn {
+				width: 106rpx;
+				height: 60rpx;
+				line-height: 60rpx;
+				background: #40AE36;
+				border-radius: 100px;
+				font-size: 28rpx;
+				color: #fff;
+			}
+		}
+
+		.category {
+			width: 100%;
+			overflow: auto;
+			position: relative;
+			padding-right: 70rpx;
+
+			.category-wrap {
+				display: flex;
+				padding-bottom: 20rpx;
+				height: 192rpx;
+
+				.category-item {
+					display: flex;
+					flex-direction: column;
+					justify-content: center;
+					align-items: center;
+					margin-right: 38rpx;
+
+					text {
+						margin-top: 16rpx;
+						font-size: 24rpx;
+						color: #666666;
+						white-space: nowrap;
+					}
+
+					.category-item-text {
+						width: 120rpx;
+						text-align: center;
+						overflow: hidden;
+						white-space: nowrap;
+						text-overflow: ellipsis;
+					}
+				}
+
+				.category-item-active {
+					position: relative;
+
+					.category-item-img {
+						border: 2px solid #40AE36;
+						border-radius: 50%;
+					}
+
+					text {
+						background-color: #40AE36;
+						color: #fff;
+						padding: 2rpx 10rpx 6rpx 10rpx;
+						border-radius: 50rpx;
+					}
+				}
+			}
+
+			.category-all {
+				position: absolute;
+				right: 0;
+				top: 50%;
+				transform: translateY(-50%);
+				height: 100%;
+				background-color: #f3f3f3;
+				z-index: 10;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				flex-direction: column;
+				font-size: 24rpx;
+				border-radius: 4rpx;
+				width: 70rpx;
+				color: #919191;
+			}
+		}
+
+		.cate {
+			width: 100%;
+			overflow: auto;
+			margin-bottom: 30rpx;
+
+			.cate-wrap {
+				display: flex;
+				padding-bottom: 8rpx;
+
+				.cate-item {
+
+					text {
+						padding: 4rpx 16rpx;
+						white-space: nowrap;
+						font-size: 30rpx;
+						color: #333;
+					}
+				}
+
+				.cate-item-active {
+					text {
+						color: #40AE36;
+						font-weight: bold;
+					}
+				}
+			}
+		}
+
+		.popup-wrap {
+			background-color: #fff;
+			padding: 20rpx;
+
+			.popup-wrap-title {
+				font-size: 36rpx;
+				color: #333;
+				font-weight: bold;
+				margin-bottom: 20rpx;
+			}
+
+			.popup-wrap-category {
+				width: 100%;
+
+				.popup-wrap-category-wrap {
+					display: flex;
+					flex-wrap: wrap;
+
+					.popup-wrap-category-item {
+						display: flex;
+						flex-direction: column;
+						justify-content: center;
+						align-items: center;
+						margin: 0 20rpx 20rpx 0;
+
+						&:nth-child(5n) {
+							margin-right: 0;
+						}
+
+						text {
+							margin-top: 16rpx;
+							font-size: 24rpx;
+							color: #666666;
+							white-space: nowrap;
+						}
+
+						.popup-wrap-category-item-text {
+							width: 120rpx;
+							text-align: center;
+							overflow: hidden;
+							white-space: nowrap;
+							text-overflow: ellipsis;
+						}
+					}
+
+					.popup-wrap-category-item-active {
+						position: relative;
+
+						.popup-wrap-category-item-img {
+							border: 2px solid #40AE36;
+							border-radius: 50%;
+						}
+
+						text {
+							background-color: #40AE36;
+							color: #fff;
+							padding: 2rpx 10rpx 6rpx 10rpx;
+							border-radius: 50rpx;
+						}
+					}
+				}
+			}
+		}
+
+		.comprehensive {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 20rpx 50rpx;
+
+			[class^=comprehensive-] {
+				display: flex;
+				align-items: center;
+
+				text {
+					margin-right: 12rpx;
+					font-size: 26rpx;
+					color: #666666;
+				}
+
+				image {
+					width: 28rpx;
+					height: 28rpx;
+				}
+
+				.loudou {
+					width: 24rpx;
+					height: 24rpx;
+				}
+			}
+
+			.comp-color {
+
+				text {
+					margin-right: 12rpx;
+					font-size: 26rpx;
+					color: #40ae36 !important;
+				}
+
+			}
+		}
+	}
+
+	.pictrue {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		color: #999;
+
+		image {
+			width: 414rpx;
+			height: 305rpx;
+		}
+	}
+
+	.goods_list {
+		.goods {
+			height: 200rpx;
+			margin: 20rpx auto;
+			margin-top: 0;
+			background-color: #fff;
+			border-radius: 24rpx;
+			display: flex;
+
+			.avatar {
+				height: 160rpx;
+				width: 160rpx;
+				margin: 20rpx;
+				border-radius: 12rpx;
+				overflow: hidden;
+				position: relative;
+			}
+
+			.content {
+				margin: 20rpx 0;
+				width: 520rpx;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+
+				.content-head {
+					width: 500rpx;
+					display: flex;
+					justify-content: space-between;
+					align-items: flex-end;
+					font-size: 28rpx;
+					color: #333;
+
+					.title {
+						width: 360rpx;
+						white-space: nowrap;
+						overflow: hidden;
+						text-overflow: ellipsis;
+					}
+				}
+
+				.content-two {
+					display: flex;
+					font-size: 24rpx;
+					color: #666;
+					align-items: center;
+
+					.star {
+						position: relative;
+						width: 111rpx;
+						height: 19rpx;
+						margin-right: 10rpx;
+						background: url(../columnGoods/images/star.png) left top/100% 100% no-repeat;
+						overflow: hidden;
+
+						view {
+							position: absolute;
+							top: 0;
+							left: 0;
+							width: 100%;
+							height: 100%;
+							background: url(../columnGoods/images/star_active.png) left top/111rpx 19rpx no-repeat;
+
+							&.star_purple {
+								background: url(../columnGoods/images/star_active_purple.png) left top/111rpx 19rpx no-repeat;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/static/images/loading.gif b/static/images/loading.gif
new file mode 100644
index 0000000..5e1f8fa
Binary files /dev/null and b/static/images/loading.gif differ
diff --git a/utils/mixin.js b/utils/mixin.js
new file mode 100644
index 0000000..949c22e
--- /dev/null
+++ b/utils/mixin.js
@@ -0,0 +1,29 @@
+const mixins = {
+	data() {
+		return {
+			wrapHeight: 'auto',
+			clientY: 0,
+			maxHeight: 0,
+		}
+	},
+
+
+	methods: {
+		// 移动
+		onTouchMove(e) {
+			console.log(e);
+			const moveDistance = e.changedTouches[0].clientY - this.clientY;
+			if (moveDistance > 5) {
+				this.wrapHeight = '352rpx';
+			} else {
+				this.wrapHeight = 0;
+			}
+		},
+
+		// 开始触摸屏幕
+		onTouchStart(e) {
+			this.clientY = e.changedTouches[0].clientY;
+		},
+	}
+}
+export default mixins;
\ No newline at end of file
diff --git a/utils/util.js b/utils/util.js
index ccb5068..816ad4b 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -24,6 +24,15 @@ import permision from "./permission.js"
 // #endif
 export default {
 
+	getDom: (that, selector, fn) => {
+		that.$nextTick(() => {
+			const query = uni.createSelectorQuery().in(that);
+			query.select(selector).boundingClientRect((data) => {
+				fn && fn(data);
+			}).exec();
+		})
+	},
+
 	//复制
 	uniCopy: ({
 		content,
diff --git a/vue.config.js b/vue.config.js
index d74d24e..9b302ca 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -8,6 +8,7 @@
 // | Author: CRMEB Team <admin@crmeb.com>
 // +----------------------------------------------------------------------
 module.exports = {
+	publicPath: '/h5',
 	productionSourceMap: false, // 生产打包时不输出map文件，增加打包速度
 	configureWebpack: config => {
 		if (process.env.NODE_ENV === 'production') {