diff --git a/App.vue b/App.vue
index d56d2d7..e2d92bf 100644
--- a/App.vue
+++ b/App.vue
@@ -222,7 +222,8 @@
 
 		},
 		onShow() {
-
+	 
+			
 			let that = this
 			// 记录H5和公众号
 			if (this.$store.state.app.token) {
@@ -349,9 +350,9 @@
 				});
 
 			},
-
 			// 微信分享；
 			setOpenShare: function(data) {
+				// #ifdef H5
 				let that = this;
 				let href = location.href;
 				href = href.indexOf("?") === -1 ? href + "?spid=" + this.globalData.uid : href + "&spid=" + this
@@ -367,6 +368,7 @@
 					that.$wechat.wechatEvevt(["updateAppMessageShareData", "updateTimelineShareData"],
 						configAppMessage);
 				}
+				// #endif
 			},
 			// 获取配置
 			getConfigData() {
@@ -426,12 +428,14 @@
 		watch: {
 			// 记录H5和公众号
 			$route(n) {
+				// #ifdef H5
 				if (this.$store.state.app.token) {
 					// 浏览记录
 					history({
 						page: location.pathname + location.search,
 					}).then(() => {});
 				}
+				// #endif
 			},
 		}
 	}
@@ -443,6 +447,7 @@
 	@import 'static/iconfont/iconfont.css';
 	@import 'static/iconfont/iconlihai.css';
 	@import 'static/iconfont/icontan.css';
+	@import 'static/iconfont/demo.css';
 	@import 'static/css/style.scss';
 
 
diff --git a/api/api.js b/api/api.js
index c382e10..acb74a7 100644
--- a/api/api.js
+++ b/api/api.js
@@ -5,7 +5,7 @@ import request from "@/utils/request.js";
  * 
  */
 export function cloudWarehouse(data) {
-  return request.get("store/product/cloudWarehouse", data);
+  return request.get("store/product/cloudWarehouse", data, { noAuth: true });
 }
 /**
  * 获取云仓分类
@@ -293,20 +293,20 @@ export function brigade(data) {
 }
 
 /*
-	生产 -- 获取商户保证金信息支付接口
+	生产 -- 获取商户押金信息支付接口
 */
 export function paymerchant() {
   return request.post(`user/margin`,{});
 }
 
 /*
-	生产 -- 获取商户保证金信息接口
+	生产 -- 获取商户押金信息接口
 */
 export function merchant(data) {
   return request.get(`store/merchant/margin`, data);
 }
 
-//获取保证金缴纳列表
+//获取押金缴纳列表
 export function marginlist(data) {
 	return request.get(`user/margin/list`,data);
 }
diff --git a/api/community.js b/api/community.js
index fe9ec77..23d5d09 100644
--- a/api/community.js
+++ b/api/community.js
@@ -7,7 +7,7 @@
 // +----------------------------------------------------------------------
 // | Author: CRMEB Team <admin@crmeb.com>
 // +----------------------------------------------------------------------
-import request from "@/utils/request.js";
+import request from "@/utils/requesta.js";
 
 /** 获取话题分类*/
 export function getTopicList() {
@@ -83,7 +83,9 @@ export function videoList(data) {
 }
 /**自己的视频列表*/
 export function deoList(id) {
-	return request.get(`community/show/${id}`);
+	return request.get(`community/show/${id}`, {
+		noAuth: true
+	});
 }
 
 export function myVideoList(id,data) {
diff --git a/api/live.js b/api/live.js
new file mode 100644
index 0000000..3c1edf0
--- /dev/null
+++ b/api/live.js
@@ -0,0 +1,151 @@
+import request from "@/utils/requestc.js";
+import requesta from "@/utils/request.js";
+/**
+ * 直播列表
+ */
+export function live(data) {
+	return request.get("zhibo/live" ,data);
+}
+
+/**
+ * 直播详情
+ */
+export function liveDetail(data) {
+	return request.get("zhibo/liveDetail" ,data);
+}
+
+
+/**
+ * 获取直播详情接口
+ */
+
+
+/**
+ * 创建直播间
+ */
+export function createPushLive(data) {
+	return request.post("zhibo/createPushLive", data);
+}
+
+
+/**
+ * 关闭直播间
+ */
+export function stopPushLive(data) {
+	return request.post("zhibo/stopPushLive", data);
+}
+
+
+/**
+ *  绑定用户client客户
+ */
+export function bindUser(data) {
+	return request.post("zhibo/bindUser", data);
+}
+
+
+
+/**
+ * 加入直播间聊天室
+ */
+export function joinChatRoom(data) {
+	return request.post("zhibo/joinChatRoom", data);
+}
+
+
+/**
+ * 直播间聊天室发言
+ */
+export function sendGroupMessage(data) {
+	return request.post("zhibo/sendGroupMessage", data);
+}
+
+
+
+//商品列表
+export function good(data) {
+	return requesta.get("product/spu/lst", data);
+}
+
+/**
+ * 获取用户信息
+ * 
+ */
+export function getUserInfo() {
+  return request.get('user');
+}
+
+
+//关注
+export function getfans(id,data) {
+  return requesta.post('community/fans/'+id,data);
+}
+
+//我关注的人
+export function getfocuslst(data) {
+  return requesta.post('community/focus/lst',data);
+}
+
+//关注我的人
+export function getfanslst(data) {
+  return requesta.get('community/fans/lst',data);
+}
+
+//用户送礼
+export function reward(data) {
+  return request.post('zhibo/reward',data);
+}
+//获取礼物
+export function rewardList(data) {
+  return requesta.get('zhibo/rewardList',data);
+}
+
+//获取礼物
+export function giftList(data) {
+  return request.get('zhibo/giftList',data);
+}
+
+//获取房间人数
+export function liveAudience(data) {
+  return request.get('zhibo/liveAudience',data);
+}
+
+//获取用户余额
+export function getuser(data) {
+  return requesta.get('user',data);
+}
+
+
+//送礼
+export function sendGift(data) {
+  return request.post('zhibo/sendGift',data);
+}
+
+
+//获取主播关注人数
+export function fansNum(data) {
+  return requesta.get('zhibo/fansNum',data);
+}
+
+
+/**
+ * 充值金额选择
+ */
+export function getRechargeApi() {
+  return requesta.get("common/recharge_quota");
+}
+
+//历史直播记录
+
+export function playbackList(data) {
+  return request.get("zhibo/playbackList",data);
+}
+
+//获取直播回放详情
+export function playbackDetail(data) {
+  return request.get("zhibo/playbackDetail",data);
+}
+//获取观众关注主播状态
+export function getAjuser(id) {
+  return requesta.get(`community/user/info/${id}`);
+}
\ No newline at end of file
diff --git a/api/store.js b/api/store.js
index 3659801..ed9b774 100644
--- a/api/store.js
+++ b/api/store.js
@@ -1,4 +1,5 @@
 import request from "@/utils/request.js";
+import requestb from "@/utils/requestb.js";
 
 /**
  * 扫码查询商品
@@ -578,8 +579,7 @@ export function vicinityStoreApi(data) {
 	商家入驻 -- 获取商户入驻申请协议内容
 */
 export function agreeiness(data) {
-  return request.get(`business/agree`, data, { noAuth: true });
-}
-
-
-
+	return request.get(`business/agree`, data, {
+		noAuth: true
+	});
+}
\ No newline at end of file
diff --git a/components/gb-popup/gb-popup.vue b/components/gb-popup/gb-popup.vue
new file mode 100644
index 0000000..fe710e0
--- /dev/null
+++ b/components/gb-popup/gb-popup.vue
@@ -0,0 +1,169 @@
+<template>
+	<view class="men-ban box " v-if ='isShow' @touchmove.stop.prevent="">
+		<view class="box_next">
+			<view class="box_next_title">
+				<text class="box_next_title_z">{{title}}</text>
+			</view>
+			<slot></slot>
+			<view class="box_next_but_d" v-if="isBut">
+				<view @click='show' class="box_next_but_d_but">
+					<text class="box_next_but_d_but_text">{{nName}}</text>
+				</view>
+			</view>
+			<view class="box_next_but_s" v-else>
+				<view class="box_next_but_s_lbut" @click="lEvent">
+					<text class="box_next_but_d_but_text">{{lName}}</text>
+				</view>
+				<view @click="rEvent" class="box_next_but_s_rbut" hover-class="zcolor-while1">
+					<text class="box_next_but_d_but_text">{{rName}}</text>
+				</view>
+			</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			title: {
+				type: String,
+				default: "温馨提示"
+			},
+			isShow: {
+				type: Boolean,
+				default: true
+			},
+			nName: String,
+			lName: String,
+			rName: String,
+			isBut: {
+				type: Boolean,
+				default: true
+			}
+		},
+		
+		methods: {
+			show() {
+				
+				this.$emit('show');
+			},
+			lEvent() {
+				this.$emit('lEvent');
+			},
+			rEvent() {
+				this.$emit('rEvent');
+			},
+		}
+	}
+</script>
+
+<style scoped>
+	.men-ban {
+		position: fixed;
+		bottom: 0;
+		right: 0;
+		left: 0;
+		top: 0;
+		z-index: 999999;
+	   background-color: rgba(0, 0, 0, 0);
+	}
+
+	.box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		
+	}
+
+	.box_next {
+		background-color: #ffffff;
+		width: 550rpx;
+		border-radius: 30rpx;
+	}
+
+	.box_next_title {
+		padding: 30rpx 30rpx 0 30rpx;
+	}
+
+	.box_next_title_z {
+		font-size: 31rpx;
+		font-weight: bold;
+	}
+
+	.box_next_but_d {
+		width: 550rpx;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 130rpx;
+	}
+
+	.box_next_but_d_but {
+		width: 500rpx;
+
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 80rpx;
+		border-radius: 50rpx;
+		background-color: #fee610;
+	}
+
+	.box_next_but_d_but_text {
+		font-size: 30rpx;
+		font-weight: bold;
+	}
+
+	.box_next_but_s {
+		width: 550rpx;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+
+		flex-direction: row;
+		justify-content: space-around;
+		align-items: center;
+		height: 130rpx;
+	}
+
+	.box_next_but_s_lbut {
+		width: 200rpx;
+		background-color: #f1f1f1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 80rpx;
+		border-radius: 50rpx;
+	}
+
+	.box_next_but_s_rbut {
+		width: 200rpx;
+		background-color: #fee610;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 80rpx;
+		border-radius: 50rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/components/mh-msgList/mh-msgList.vue b/components/mh-msgList/mh-msgList.vue
new file mode 100644
index 0000000..859ef21
--- /dev/null
+++ b/components/mh-msgList/mh-msgList.vue
@@ -0,0 +1,183 @@
+<template>
+	<view class="msg-view">
+		<scroll-view class="msg-view-p" scroll-y="true" :scroll-top="msgPanelScrollTop">
+			<view id="chatArea">
+				<view class="chat-area-line" v-for="(item,index) in msgList">
+
+					<view class="system-msg"
+						:style="{'flex-direction':((item.userName.length + item.content.length)<15?'row':'')}"
+						v-if="item.msg_type == 'system'">
+						<view class="system-msg-detail ">
+							<text class="system-msg-detail-username " v-for="i in item.userName">{{i}}</text>
+							<text class="system-msg-detail-content " v-for="i in ':'">{{i}}</text>
+							<text class="system-msg-detail-content " v-for="i in item.content">{{i}}</text>
+						</view>
+					</view>
+
+					<view class="user-msg"
+						:style="{'flex-direction':((item.userName.length + item.content.length)<15?'row':'')}" v-else>
+						
+						<view class="user-msg-detail">
+							<view class="user-msg-detail-tag">
+								<!-- <text style="text-align: center;font-size: 20px;color: #DD524D;">★1</text> -->
+								<!-- 这里可以根据用户等级显示图片 -->
+								<image :src="item.avatar" class="user-msg-detail-tag"></image>
+							</view>
+							<text class="user-msg-detail-username" v-for="i in item.userName"
+								@click="test(item.userName)">{{i}}</text>
+							<text class="user-msg-detail-content" v-for="i in ':'">{{i}}</text>
+							<text class="user-msg-detail-content" v-for="i in item.content">{{i}}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+<script>
+	export default {
+		name: 'MhMsgList',
+		props: {
+			msgList: {
+				type: [Object, Array],
+				default: [{
+					userName: "系统通知",
+					content: "直播倡导绿色直播，严禁发布涉黄涉毒涉赌，严禁发布涉政、违法及低俗违规内容。健康直播，文明互动",
+					cmd: "say",
+
+					msg_type: "system"
+				}, ]
+			},
+			msgPanelScrollTop: {
+				type: [Number, String],
+				default: 0
+			}
+		},
+		mounted() {
+
+
+		},
+
+		methods: {
+			test(e) {
+				uni.showToast({
+					title: e,
+					icon: 'none'
+				})
+			},
+
+			setMsgPanelScroll() {
+				var that = this;
+				setTimeout(function() {
+					const query = uni.createSelectorQuery().in(that);
+					query.select('#chatArea').boundingClientRect(data => {
+						that.msgPanelScrollTop = data.height - 200;
+					}).exec();
+				}, 50)
+
+
+			},
+		}
+
+	}
+</script>
+<style lang="scss" scoped>
+	.msg-view-p {
+		display: flex;
+		width: 550rpx;
+		height: 550rpx;
+
+
+	}
+
+
+	.chat-area-line {
+		width: 550upx;
+
+		flex-direction: row;
+		margin-bottom: 5upx;
+	}
+
+	.system-msg {
+		width: 550upx;
+		margin-bottom: 5upx;
+	}
+
+	.system-msg-detail {
+		// max-width: 550upx;
+
+		padding: 10upx;
+		border-radius: 30upx;
+		background-color: rgba($color: #000000, $alpha: 0.4);
+		flex-direction: row;
+		flex-wrap: wrap;
+		margin-right: 14upx;
+
+		>.system-msg-detail-username {
+			color: red;
+			font-size: 32upx;
+			font-weight: 400;
+			line-height: 40upx;
+
+		}
+
+		>.system-msg-detail-content {
+			font-size: 32upx;
+			font-weight: 400;
+			line-height: 40upx;
+			color: #A0CFFF;
+		}
+	}
+
+	.user-line {
+		// max-width: 530upx;
+		padding: 10upx;
+		color: #FFFFFF;
+		flex-direction: row;
+		border-radius: 30upx;
+		background-color: rgba($color: #000000, $alpha: 0.4);
+		margin-right: 14upx;
+		font-size: 28upx;
+		font-weight: 400;
+		line-height: 40upx;
+	}
+
+	.user-msg {
+		width: 530upx;
+
+
+		margin-bottom: 5upx;
+	}
+
+	.user-msg-detail-tag {
+		width: 40upx;
+		height: 40upx;
+		border-radius: 50%;
+
+	}
+
+	.user-msg-detail {
+		padding: 10upx;
+		border-radius: 30upx;
+		background-color: rgba($color: #000000, $alpha: 0.4);
+		flex-direction: row;
+		flex-wrap: wrap;
+		margin-right: 14upx;
+
+
+
+		>.user-msg-detail-username {
+			color: #A0CFFF;
+			font-size: 32upx;
+			font-weight: 400;
+			line-height: 40upx;
+		}
+
+		>.user-msg-detail-content {
+			font-size: 32upx;
+			font-weight: 400;
+			line-height: 40upx;
+			color: #fff;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/sd-live-page/histroy.nvue b/components/sd-live-page/histroy.nvue
new file mode 100644
index 0000000..4e8b92a
--- /dev/null
+++ b/components/sd-live-page/histroy.nvue
@@ -0,0 +1,2085 @@
+<template>
+	<view class="container">
+		<view class="top-do-box">
+			<view class="room-info">
+				<view class="room-logo-box">
+					<image :src="room.cover" class="room-logo-box"></image>
+				</view>
+				<view class="room-info-message">
+					<view class="room-user-name">
+						<text
+							style="color: #fff;font-size: 25rpx;">{{room.live_name.length>6?room.live_name.substring(0, 6)+'...': room.live_name}}</text>
+					</view>
+					<view class="room-user-money">
+						<text style="color: #fff;font-size: 25rpx;">4000</text>
+					</view>
+				</view>
+				<!-- 	<view class="room-guanzhu" @click="interest">
+					<text class="guanzhu" v-if="!follow">关注</text>
+					<text class="guanzhu" v-else>已关注</text>
+				</view> -->
+			</view>
+			<!-- <view class="room-users-box">
+				<scroll-view class="right_top_scroll" scroll-x="true" scroll-left="0">
+					<view class="top-scroll-users-header" v-for="(bitem,bindex) in users" :key="bindex">
+						<image :src="bitem.app_user_avatar" class="top-scroll-users-header"
+							v-if="bitem.app_user_avatar"></image>
+						<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/default_avtar.png"
+							class="top-scroll-users-header" mode="aspectFill"></image>
+					</view>
+				</scroll-view>
+			</view> -->
+
+			<view class="users-count web-font">
+				<!-- <view class="users-count web-font">
+					<text class="users-count-text"> {{users.length}}</text>
+				</view> -->
+				<view class="users-count " @click="outroom">
+					<image src="@/static/img/close.png" class="users-count-img" mode="aspectFit"></image>
+				</view>
+			</view>
+		</view>
+
+
+		<!-- 	<view class="top-left" v-if="isshow">
+			<view class="top-left-a" @click="switchCamera">
+				<image class="left-img" src="/static/img/qiehuan.png" mode=""></image>
+			</view>
+		</view>
+		<view class="msgview">
+			<mh-msgList ref="msgList" :msgList="msgList"></mh-msgList>
+		</view> -->
+		<!-- 底部操作 -->
+
+
+		<!-- 	<view class="inpit-box-bg" v-if="focus">
+			<view class="inpit-box-body">
+				<input class="uni-input" @input="onKeyInput" maxlength="20" cursor-spacing="10" hold-keyboard
+					placeholder="说点什么吧..." :value="inputValue" :focus="focus" />
+				<view v-if="inputValue!=''" @click="send_message">
+					<text class="send-but">发送</text>
+				</view>
+			</view>
+		</view>
+		<view class="dobox" v-else>
+			<view class="inpit-box">
+				<view class="input-tpl" @click="set_focus">
+					<text class="input-tpls">说点什么..</text>
+				</view>
+				<view class="functionbox">
+					<view class="function-box">
+
+						<view class="ico-box" @click="send_liwu">
+							<image class="ico-box-img" src="@/static/img/li.png" mode="aspectFit"></image>
+						</view>
+						<view class="ico-box" @click="send_shop">
+							<image class="ico-box-img" src="@/static/img/shanpin.png" mode="aspectFit"></image>
+						</view>
+						<view class="ico-box" @click="send_lick">
+							<image class="ico-box-img" src="@/static/img/gn.png"></image>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view> -->
+
+		<!-- 底部分享弹窗 -->
+		<uni-popup ref="share" :type="type" :custom="true" @change="change">
+			<template v-if="popup==1">
+				<view class="uni-share" style="background-color: #333333;">
+
+					<view class="send-boj" id="tes">
+						<view class="send-boj-txt">
+							<text class="send-boj-txta">礼物</text>
+							<view class="gift-jb-con">
+								<image class="gift-jb-img" src="@/static/img/jb.png" mode=""></image>
+								<text class="gift-web-je">
+									{{now_money}}
+								</text>
+
+							</view>
+
+						</view>
+						<view class="send-boj-close" @tap="close">
+							<image class="send-boj-close-img" src="/static/img/close.png" mode=""></image>
+						</view>
+					</view>
+					<scroll-view scroll-y style="height: 480rpx;overflow: hidden;">
+
+						<view class="uni-share-content">
+							<view class="lw-box" v-for="(litem,lindex) in liwu" :key="lindex"
+								@click="send_liwu_obj(litem)" @touchstart="handleTouchStart(lindex)"
+								@touchend="handleTouchEnd(lindex)" :class="{ 'hovered': lindex== hoveredIndex }">
+								<image class="lw-ico" :src="litem.gift_img"></image>
+								<view class="lw-name">
+									<text class="lw-name">{{litem.gift_name}}</text>
+								</view>
+								<view class="lw-money">
+									<image class="lw-money-img" src="@/static/img/jb.png" mode=""></image>
+
+									<text class="lw-moneya">{{litem.gift_price}}
+									</text>
+								</view>
+								<text class="send-m" v-if="lindex== hoveredIndex">赠送</text>
+							</view>
+						</view>
+
+					</scroll-view>
+					<!-- <view class="gift-botton-view" @click="rechargejb">
+						<text class="gift-web-cz">充值</text>
+					</view> -->
+				</view>
+			</template>
+			<template v-if="popup==2">
+				<view class="uni-shop">
+
+					<view class="shop">
+						<view class="shop-top">
+							<image class="shop-top-img" :src="room.cover" mode=""></image>
+							<text class="shop-top-txt">{{roomDetail.live_name}}</text>
+						</view>
+						<view class="shop-close" @tap="close">
+							<image class="shop-close-img" src="/static/img/colse1.png" mode=""></image>
+						</view>
+					</view>
+					<scroll-view scroll-y style="height: 680rpx;overflow: hidden;">
+						<view class="uni-shop-content">
+
+							<view class="shop-content" v-for="(litem,lindex) in roomDetail.goods" :key="lindex">
+								<image class="shop-content-img" :src="litem.app_goods_pic"></image>
+								<view class="shop-content-txt">
+									<view class="sp-txta">{{litem.app_goods_name}}</view>
+									<view class="sp-txtb">
+										<view class="txtba">
+											<text class="txtba-a">￥</text>
+											<text class="txtba-b">{{litem.app_goods_price.split('.')[0]}}.</text>
+											<text class="txtba-c">{{litem.app_goods_price.split('.')[1]}}</text>
+										</view>
+										<text class="txtbb" @click="shopp(litem)">去抢购</text>
+									</view>
+								</view>
+							</view>
+						</view>
+
+					</scroll-view>
+
+				</view>
+			</template>
+		</uni-popup>
+		<uni-popup ref="recharge" :type="type" :custom="true" @change="change">
+			<view class="uni-recharge">
+				<view class="recharge">
+					<view class="recharge_title">
+						<text class="recharge_title">我的金币</text>
+					</view>
+					<view class="recharge-one">
+						<image class="recharge-one-img" src="../../static/img/jb.png" mode="aspectFit"></image>
+						<view class="recharge-one-txt"><text class="recharge-one-txt" {{now_money}}</text></view>
+					</view>
+					<view class="recharge-con">
+						<view class="recharge-con-title">
+							<text class="recharge-con-title">金币充值</text>
+						</view>
+						<view class="recharge-con-detail">
+
+							<view class="con-detail" v-for="(item,ik) in Recharglist" :key='ik'
+								@click="RechargClick(ik)" :class="{ 'carecharge': ik== regIndex }">
+								<view class="" v-if='item.id=="AA"'>
+									<!-- <text class="con-detaila">输入金额</text> -->
+									<input type="text" class="con-detaila" value="" placeholder="输入金额" />
+									<text class="con-detailb">最低可充值1元</text>
+								</view>
+								<view class="" v-else>
+									<text class="con-detaila">{{item.data.give}}金币</text>
+									<text class="con-detailb">{{item.data.price}}元</text>
+								</view>
+							</view>
+						</view>
+
+						<text class="recharge-conbottom">
+							立即充值
+						</text>
+					</view>
+				</view>
+			</view>
+
+		</uni-popup>
+		<!-- 礼物弹窗 -->
+		<view class="gift-alert" v-for="(gift,gindex) in giftobj" :key="gindex"
+			:style="{ top: gift.top + 'px', left: gift.left + 'px' }">
+
+			<view class="gift-alerta">
+				<view class="send-boj-user-header">
+					<image :src="gift.app_user_avatar" class="send-boj-user-header-img" mode="aspectFill"
+						v-if="gift.app_user_avatar"></image>
+					<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/default_avtar.png"
+						class="send-boj-user-header-img" mode="aspectFill"></image>
+				</view>
+				<view class="gift-detail">
+					<text class="gifta">{{gift.app_user_name}}</text>
+					<text class="giftb">送{{room.app_user_name}}{{gift.gift_name}}</text>
+				</view>
+				<view class="gift-ico">
+					<image :src="gift.gift_img" class="gift-ico-img" mode="aspectFill"></image>
+				</view>
+			</view>
+			<view class="gift-alertb">
+				<image class="gift-alertb-img" src="@/static/img/X.png" mode=""></image>
+				<view class="gift-alertb-txt"> <text class="gift-alertb-txt">{{gift.gift_num}}</text> </view>
+			</view>
+		</view>
+		<!-- 用户进入弹窗 -->
+		<view class="join-box" v-for="(join,jindex) in join_arr" :key="jindex" :animation="join.animationData">
+			<view class="user-lever" style="margin-right: 10upx;">
+				<view class="user-lever-ico-box">
+					<image class="user-lever-ico" src="/static/img/room-user-lever.png"></image>
+				</view>
+				<view class="web-font user-lever-text">2</view>
+			</view>
+			<text class="join-box-text web-font">
+				{{join.message}}
+			</text>
+		</view>
+
+		<gb-popup :isShow="isShow1" rName="确定" :isBut="false" lName="取消" @lEvent="show1" @rEvent="copyData"
+			title="请输入礼物数量">
+			<view style="padding: 30rpx;">
+				<input type="value" v-model="gift_num" placeholder="请输入" />
+			</view>
+		</gb-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		joinChatRoom,
+		sendGroupMessage,
+		bindUser,
+		stopPushLive,
+		liveDetail,
+		getfans,
+		rewardList,
+		giftList,
+		liveAudience,
+		getuser,
+		getRechargeApi,
+		sendGift,
+		getAjuser
+	} from '@/api/live.js'
+	import {
+		VUE_APP_WS_URL
+	} from '@/config/app.js';
+
+	import uniPopup from '@/components/unipopup/live-uni-popup.vue';
+	import msgList from '@/components/mh-msgList/mh-msgList.vue';
+	import gbpopup from '@/components/gb-popup/gb-popup.vue';
+	export default {
+		name: "sd-float-page",
+		props: {
+			role_val: {
+				type: String,
+				default: '0'
+			},
+			roomid_val: {
+				type: String,
+				default: '0'
+			},
+			room: {
+				type: Object,
+			}
+		},
+		components: {
+			uniPopup,
+			'mh-msgList': msgList,
+			'gb-popup': gbpopup,
+		},
+		data() {
+			return {
+				windowWidth: '',
+				// room: [], //房间信息
+				roomobj: [],
+				users: [{
+						url: require('@/static/images/bg1.png'),
+					},
+					{
+						url: require('@/static/images/bg1.png'),
+					},
+					{
+						url: require('@/static/images/bg1.png'),
+					}, {
+						url: require('@/static/images/bg1.png'),
+					}
+				],
+				rid: 0, //房间id
+				role: '', //角色
+				focus: false,
+				inputValue: '',
+				isshow: false,
+				message_arr: [
+
+				],
+				msgList: [{
+					userName: "系统通知",
+					content: "倡导绿色直播，严禁发布涉黄涉毒涉赌，严禁发布涉政、违法及低俗违规内容。健康直播，文明互动",
+					cmd: "say",
+					msg_type: "system"
+				}, ],
+				view_id: '',
+				liwu: [],
+				liwu2: [],
+				liwu3: [],
+				type: 'bottom',
+				follow: false, //关注
+				popup: 3, //1礼物操作 2其他操作 3.商品
+				user: '',
+				giftobj: [], //礼物
+				join_arr: [],
+				userName: '',
+				now_money: 0,
+				roomDetail: '',
+				userinfo: null,
+				hoveredIndex: -1,
+				regIndex: -1,
+				gifts: [],
+				gifsobj: {},
+				gift_num: '',
+				isShow1: false,
+			}
+			/*定义IM消息类型
+			1：进群通知
+			2：发送自定义消息
+			3：收到礼物
+			*/
+		},
+
+		mounted() {
+			// this.userinfo = JSON.parse(uni.getStorageSync('USER_INFO'))
+			// console.log(this.userinfo, '房间id 以及当前用户id')
+			// this.get_live_room(); //调用直播间信息
+			// this.rewardList()
+			// this.giftList()
+			// this.liveAudience()
+			// this.getuser()
+			// this.getRecharg()
+			// this.getjuser()
+		},
+		onReady() {
+			this.windowWidth = uni.getSystemInfoSync().screenWidth //获取屏幕宽度
+			const t = this;
+			t.role = this.$props.role_val;
+			t.rid = this.$props.roomid_val;
+			t.user = uni.getStorageSync('user');
+			console.log('浮动模板被加载的事件')
+			console.log(this.$props)
+			// 保持屏幕常亮
+			uni.setKeepScreenOn({
+				keepScreenOn: true,
+				success: (res) => {
+					console.log('手机长亮时间')
+					console.log(res)
+				},
+				fail: (e) => {
+					console.log(e)
+					console.log('手机长亮时间')
+				}
+			});
+			uni.onKeyboardHeightChange(res => {
+				if (res.height == 0) {
+					this.focus = false;
+				}
+			})
+
+
+		},
+		methods: {
+			//关注
+			getjuser() {
+				getAjuser(this.userinfo.app_user_id).then((res) => {
+					console.log(res, 'AAAAAA')
+					if (res.code == 1) {
+
+
+						this.follow = res.data.is_start
+					}
+				})
+			},
+			//获取充值数据
+			getRecharg() {
+				getRechargeApi().then((res) => {
+					console.log(res.data.recharge_quota, '11111111')
+					this.Recharglist = res.data.recharge_quota
+					this.Recharglist.push({
+						data: {},
+						id: 'AA'
+					})
+					// this.now_money = res.data.now_money
+				})
+			},
+			//获取余额
+			getuser() {
+				getuser().then((res) => {
+
+					this.now_money = res.data.now_money
+				})
+			},
+			//获取房间人数列表
+			liveAudience() {
+				let data = {
+					app_name: 'shop',
+					live_stream_id: this.room.live_stream_id
+				}
+				liveAudience(data).then((res) => {
+					this.users = res.data.lists
+				})
+			},
+			//礼物列表
+			rewardList() {
+				rewardList().then((res) => {
+					console.log(res, '11111111')
+				})
+			},
+			//送礼
+			//送礼
+
+			bosendGift(gif) {
+				// 执行关闭模态对话框的操作
+				let data = {
+					app_name: 'shop',
+					gift_id: gif.gift_id,
+					live_stream_id: this.room.live_stream_id,
+					gift_num: gif.gift_num,
+				}
+				console.log(data)
+				sendGift(data).then((res) => {
+
+					if (res.code == 1) {
+						this.$refs.share.close()
+						uni.hideModal()
+					} else {
+						uni.showModal({
+							title: '提示',
+							content: res.msg,
+							confirmColor: '#ee6666', //确定字体颜色
+							showCancel: false, //没有取消按钮的弹框
+							buttonText: '确定',
+							success: function(res) {
+								if (res.confirm) {
+
+								} else if (res.cancel) {
+									console.log('用户点击取消');
+								}
+							},
+						})
+					}
+				})
+
+			},
+			//礼物列表
+			giftList() {
+				giftList().then((res) => {
+					this.liwu = res.data
+				})
+			},
+			//关注
+			interest() {
+				this.follow = !this.follow
+				if (this.follow) {
+					getfans(this.room.app_user_id, {
+						status: 1
+					}).then((res) => {
+						console.log(res, '11111111')
+						if (res.status == 200) {
+
+							console.log('关注成功')
+						}
+
+					}).catch((err) => {
+						console.log(err)
+					})
+				} else {
+					getfans(this.room.app_user_id, {
+						status: 0
+					}).then((res) => {
+						if (res.status == 200) {
+
+							console.log('已取消关注')
+						}
+					}).catch((err) => {
+						console.log(err)
+					})
+				}
+
+			},
+
+			//充值
+			RechargClick(index) {
+				this.regIndex = index
+			},
+			//hover效果设置
+			handleTouchStart(index) {
+				this.hoveredIndex = index;
+			},
+			handleTouchEnd(index) {
+				this.hoveredIndex = -1;
+			},
+			//加入直播间
+			joinChatRoom() {
+				let data = {
+					live_stream_id: this.room.live_stream_id,
+					app_name: 'shop',
+					app_user_id: uni.getStorageSync('UID'),
+					app_user_name: '用户' + uni.getStorageSync('UID'),
+					app_user_avatar: "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/1b716202302251108516996.png",
+				}
+				joinChatRoom(data).then((res) => {
+					if (res.code == 1) {
+						console.log('加入房间成功')
+					} else {
+						uni.showModal({
+							title: '提示',
+							content: res.msg,
+							confirmColor: '#ee6666', //确定字体颜色
+							showCancel: false, //没有取消按钮的弹框
+							buttonText: '确定',
+							success: function(res) {
+								if (res.confirm) {
+									uni.redirectTo({
+										url: '/pages/room/room_list'
+									})
+								} else if (res.cancel) {
+									console.log('用户点击取消');
+								}
+							}
+						});
+					}
+				})
+			},
+
+			//购买商品
+
+			shopp(item) {
+				uni.sendHostEvent('live_shop', item, (ret) => {
+					//发送消息成功回调
+					console.log('购买商品' + JSON.stringify(item));
+				});
+			},
+			//绑定用户id
+			bindUser(client_id) {
+				let data = {
+					app_name: 'shop',
+					app_user_id: uni.getStorageSync('UID'),
+					client_id: client_id
+				}
+				bindUser(data).then((res) => {
+					if (res.code == 1) {
+						console.log('绑定成功')
+						this.joinChatRoom()
+					}
+
+				}).catch((err) => {
+					console.log(err)
+				})
+			},
+
+			// 进入这个页面的时候创建websocket连接【整个页面随时使用】
+			connectSocketInit() {
+				console.log(VUE_APP_WS_URL)
+				// 创建一个this.socketTask对象【发送、接收、关闭socket都由这个对象操作】
+				this.socketTask = uni.connectSocket({
+					// 【非常重要】必须确保你的服务器是成功的,如果是手机测试千万别使用ws://127.0.0.1:9099【特别容易犯的错误】
+					url: VUE_APP_WS_URL,
+					success(data) {
+						console.log("websocket连接成功", data);
+					},
+					fail() {
+						console.log("websocket连接失败", data);
+					},
+					complete(data) {
+						console.log("websocket连接完成", data);
+					}
+				});
+				this.socketTask.onError((res) => {
+					console.log("连接发生错误", res)
+				})
+				// 消息的发送和接收必须在正常连接打开中,才能发送或接收【否则会失败】
+				this.socketTask.onOpen(res => {
+					console.log(res, '连接打开');
+				})
+
+				this.socketTask.onMessage((res) => {
+					console.log("收到服务器内容：" + res.data);
+					let str = res.data
+					let obj = JSON.parse(str);
+					if (obj.type == 'init') {
+						this.bindUser(obj.client_id)
+					} else if (obj.type == 'message') {
+
+						// console.log(this.msgList.length, '11111111111')
+
+
+						let data1 = {
+							userName: obj.name,
+							content: obj.text,
+							avatar: obj.avatar,
+							cmd: "say",
+							msg_type: "user"
+						}
+						this.msgList.push(data1)
+						this.$refs.msgList.setMsgPanelScroll()
+					} else if (obj.type == 'sys_message') {
+						let data1 = {
+							userName: obj.name,
+							content: obj.text,
+							avatar: obj.avatar,
+							cmd: "say",
+							msg_type: "system"
+						}
+						this.msgList.push(data1)
+						this.$refs.msgList.setMsgPanelScroll()
+					} else if (obj.type == 'stream') {
+						if (obj.status == -1) {
+							uni.showModal({
+
+								title: '提示',
+								content: '直播间已关闭',
+								confirmColor: '#ee6666', //确定字体颜色
+								showCancel: false, //没有取消按钮的弹框
+								buttonText: '确定',
+								success: function(res) {
+									if (res.confirm) {
+										uni.redirectTo({
+											url: '/pages/room/room_list'
+										})
+									} else if (res.cancel) {
+										console.log('用户点击取消');
+									}
+								}
+							})
+
+						}
+					} else if (obj.type == 'gift_message') {
+						console.log(obj, '33333')
+						this.sendGift(obj)
+
+					}
+
+
+
+
+
+				});
+				// 这里仅是事件监听【如果socket关闭了会执行】
+				this.socketTask.onClose(() => {
+					console.log("已经被关闭了")
+				})
+			},
+			sendGift(gift) {
+				// userName: "11111111",
+				// number: 33330,
+				// gift_name: "333333333",
+				// userAvatar: "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/1b716202302251108516996.png",
+				// gift_ico: "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/1b716202302251108516996.png",
+
+				this.giftobj.push(gift);
+				setTimeout(() => {
+					this.giftobj.splice(this.gifts.indexOf(gift), 1); // 礼物消失
+				}, 3000);
+			},
+			start() {
+				this.timeoutObj = setTimeout(() => {
+					//这里发送一个心跳，后端收到后，返回一个心跳消息，
+					//onmessage拿到返回的心跳就说明连接正常
+					console.log('ping');
+					this.socketTask.send({
+						data: "ping"
+					});
+
+				}, this.timeout)
+			},
+			// 关闭websocket【离开这个页面的时候执行关闭】
+			closeSocket() {
+				this.socketTask.close({
+					success(res) {
+						this.is_open_socket = false;
+						console.log("关闭成功", res)
+					},
+					fail(err) {
+						console.log("关闭失败", err)
+					}
+				})
+			},
+
+
+			//关闭弹窗
+			close() {
+				this.$refs.share.close()
+
+			},
+			//切换摄像头
+			switchCamera() {
+				console.log('切换摄像头')
+				this.$emit('switchCamera', '')
+			},
+			onRoomFunc: function(e) {
+				const t = this;
+				var self = this;
+
+				var message = {
+					userName: '11111111',
+					number: 33330,
+					gift_name: '333333333',
+					userAvatar: "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/1b716202302251108516996.png",
+					gift_ico: "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/1b716202302251108516996.png"
+				};
+				var nowTime = new Date();
+				var animation = uni.createAnimation({
+					duration: 200,
+					timingFunction: 'linear'
+				});
+				animation.left(20).step({
+					duration: 200
+				});
+				message.animationData = animation;
+				message.tapTime = nowTime; //加入计时器
+				t.giftobj.push(message);
+				console.log('t.giftobj', t.giftobj)
+				var animation_del = uni.createAnimation({
+					duration: 200,
+					timingFunction: 'linear'
+				});
+				animation_del.left(-300).step({
+					duration: 200
+				});
+				setTimeout(function() {
+					for (var i = 0; i < t.giftobj.length; i++) {
+						if (new Date() - t.giftobj[i].tapTime > 3000) {
+							t.giftobj[i].animationData = animation_del;
+							// if (new Date() - t.giftobj[i].tapTime > 5000){
+							// 	t.giftobj.splice(i,1);//释放内存
+							// }
+						}
+					}
+					console.log('t.giftobj', t.giftobj)
+				}, 3000)
+				message.message = message.userName + '送了' + message.number + '个' + message.gift_name;
+				t.message_arr.push(message);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+				// switch (args.tag) {
+				// 	case 'recvTextMsg': {
+				// 		console.log('收到用户发送消息:', e.detail.detail);
+				// 		if (e.detail.detail.nature == 1) {
+				// 			var index = t.users.findIndex(i => i.userid == e.detail.detail.userid);
+				// 			if (index == -1) {
+				// 				t.users.push(e.detail.detail);
+				// 			}
+				// 			var str = e.detail.detail;
+				// 			str.tapTime = new Date();
+				// 			str.message = e.detail.detail.userName + " " + " 进入房间";
+				// 			var animation = uni.createAnimation({
+				// 				duration: 200,
+				// 				timingFunction: 'linear'
+				// 			});
+				// 			animation.left(20).step({
+				// 				duration: 200
+				// 			});
+				// 			str.animationData = animation;
+				// 			t.join_arr.push(str);
+				// 			console.log('t.join_arr', t.join_arr)
+				// 			var animation_del = uni.createAnimation({
+				// 				duration: 200,
+				// 				timingFunction: 'linear'
+				// 			});
+				// 			animation_del.left(-300).step({
+				// 				duration: 200
+				// 			});
+				// 			setTimeout(function() {
+				// 				for (var i = 0; i < t.join_arr.length; i++) {
+				// 					if (new Date() - t.join_arr[i].tapTime > 3000) {
+				// 						t.join_arr[i].animationData = animation_del;
+				// 						// if (new Date() - t.join_arr[i].tapTime > 5000){
+				// 						// 	t.join_arr.splice(i,1);//释放内存
+				// 						// }
+				// 					}
+				// 				}
+				// 				console.log('t.join_arr', t.join_arr)
+				// 				console.log('t.users', t.users)
+				// 			}, 3000)
+				// 		} else if (e.detail.detail.nature == 2) {
+				// 			t.message_arr.push(e.detail.detail);
+				// 		} else if (e.detail.detail.nature == 3) {
+				// 			var message = e.detail.detail;
+				// 			var nowTime = new Date();
+				// 			var animation = uni.createAnimation({
+				// 				duration: 200,
+				// 				timingFunction: 'linear'
+				// 			});
+				// 			animation.left(20).step({
+				// 				duration: 200
+				// 			});
+				// 			message.animationData = animation;
+				// 			message.tapTime = nowTime; //加入计时器
+				// 			t.giftobj.push(message);
+				// 			console.log('t.giftobj', t.giftobj)
+				// 			var animation_del = uni.createAnimation({
+				// 				duration: 200,
+				// 				timingFunction: 'linear'
+				// 			});
+				// 			animation_del.left(-300).step({
+				// 				duration: 200
+				// 			});
+				// 			setTimeout(function() {
+				// 				for (var i = 0; i < t.giftobj.length; i++) {
+				// 					if (new Date() - t.giftobj[i].tapTime > 3000) {
+				// 						t.giftobj[i].animationData = animation_del;
+				// 						// if (new Date() - t.giftobj[i].tapTime > 5000){
+				// 						// 	t.giftobj.splice(i,1);//释放内存
+				// 						// }
+				// 					}
+				// 				}
+				// 				console.log('t.giftobj', t.giftobj)
+				// 			}, 3000)
+				// 			message.message = message.userName + '送了' + message.number + '个' + message.gift_name;
+				// 			t.message_arr.push(message);
+				// 		} else if (e.detail.detail.nature == 4) {
+				// 			e.detail.detail.message = e.detail.detail.userName + '关注了主播';
+				// 			t.message_arr.push(e.detail.detail);
+				// 		} else {
+				// 			return;
+				// 		}
+				// 		console.log('t.message_arr', t.message_arr)
+				// 		t.view_id = 'demo' + t.message_arr.length;
+				// 		break;
+				// 	}
+				// 	default: {
+				// 		console.log('onRoomEvent default: ', e)
+				// 		break;
+				// 	}
+				// }
+			},
+			//关闭直播间
+			outroom: function() {
+				uni.redirectTo({
+					url: '/pages/room/index'
+				})
+			},
+
+			get_live_room() {
+
+				liveDetail({
+					app_name: 'shop',
+					live_stream_id: this.room.live_stream_id,
+				}).then(res => {
+
+					if (res.code == 1) {
+						this.roomDetail = res.data
+						// console.log(res.data, '房间id 以及当前用户id')
+						// console.log(this.room.app_user_id, uni.getStorageSync('user_id'), '房间id 以及当前用户id')
+						if (res.data.app_user_id == uni.getStorageSync('Uid')) {
+							this.isshow = true
+						}
+					}
+					this.connectSocketInit()
+				}).catch((err) => {})
+			},
+			togglePopup(type, open) {
+				this.type = type
+				if (open === 'tip') {
+					this.show = true
+				} else {
+					this.$refs[open].open()
+				}
+			},
+			cancel(type) {
+				if (type === 'tip') {
+					this.show = false
+					return
+				}
+				// this.$refs[type].close()
+			},
+			change(e) {
+				console.log('是否打开:' + e.show)
+			},
+			//充值
+			rechargejb: function() {
+				this.$refs['share'].close()
+				const t = this;
+				this.type = 'bottom'
+				this.$refs['recharge'].open()
+
+			},
+			send_liwu: function() {
+				const t = this;
+				t.popup = 1;
+				this.type = 'bottom'
+				t.togglePopup('bottom', 'share');
+
+				// this.$refs['recharge'].open()
+			},
+			send_shop: function() {
+				const t = this;
+				t.popup = 2;
+
+				this.type = 'bottom'
+				t.togglePopup('bottom', 'share');
+			},
+			send_lick: function() {
+				this.sendGift()
+
+
+			},
+
+			//礼物弹窗
+			show1() {
+				this.isShow1 = !this.isShow1
+				this.gift_num = ''
+			},
+			//礼物弹窗0
+			copyData() {
+				this.gifsobj.gift_num = this.gift_num
+				this.bosendGift(this.gifsobj)
+				this.show1()
+			},
+			//礼物弹窗1
+			send_liwu_obj: function(gt) {
+				console.log(this.gift_num)
+				let gift = {
+					'gift_id': gt.id,
+
+				}
+				this.isShow1 = true
+				this.gifsobj = gift
+
+			},
+			//对话监听
+			set_focus: function() {
+				this.focus = !this.focus
+			},
+
+			//对话输入监听
+			onKeyInput: function(event) {
+				this.inputValue = event.detail.value
+
+			},
+
+			send_message: function() {
+				const t = this;
+				t.focus = false;
+
+				if (t.to_userid == '') {
+					uni.showToast({
+						title: '内容不能为空',
+						duration: 2000,
+						icon: 'none'
+					});
+					return false;
+				}
+
+				let data = {
+					live_stream_id: this.room.live_stream_id,
+					app_name: 'shop',
+					app_user_id: uni.getStorageSync('UID'),
+					message: this.inputValue
+				}
+
+				sendGroupMessage(data).then(res => {
+					console.log('发送的消息' + JSON.stringify(res))
+					this.inputValue = ''
+					if (res.code == 1) {
+						console.log('发送的消息成功')
+					}
+				})
+				// let message = {
+				// 	userName: '大黄',
+				// 	content: this.inputValue,
+				// 	cmd: "say",
+				// 	msg_type: "user"
+				// };
+
+				// /** 实际应用应发送到服务端，通过监听服务端传回的消息加入的msgList **/
+				// if (this.msgList.length > 100) {
+				// 	this.msgList.splice(0, 1);
+				// 	this.msgList.push(message)
+				// 	this.$refs.msgList.setMsgPanelScroll()
+				// 	this.inputValue = ''
+				// } else {
+				// 	this.msgList.push(message)
+				// 	this.$refs.msgList.setMsgPanelScroll()
+				// 	this.inputValue = ''
+				// }
+				// console.log(this.msgList)
+
+			},
+		},
+		// onBackPress() {
+		// 	this.$refs['showpopup'].close()
+		// 	this.$refs['showtip'].close()
+		// 	this.$refs['showimage'].close()
+		// 	this.$refs['showshare'].close()
+		// }
+	}
+</script>
+
+<style lang="scss" scoped>
+	page {
+		position: relative;
+
+
+	}
+
+	.container {
+		width: 100%;
+		/* 设置容器的宽度 */
+	}
+
+	.dobox {
+		position: absolute;
+
+		bottom: 0rpx;
+		width: 750rpx;
+		background-color: #F8F8F8;
+	}
+
+	.inpit-box {
+		padding: 20upx 20rpx;
+		width: 700rpx;
+		flex-direction: row;
+		justify-content: space-between;
+		/* padding-top: 40upx; */
+	}
+
+	.inpit-box-bg {
+		position: absolute;
+
+		bottom: 0;
+		height: 80rpx;
+		width: 750rpx;
+		background-color: #F8F8F8;
+		z-index: 9999;
+	}
+
+	.inpit-box-body {
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+
+	}
+
+	.uni-input {
+		font-size: 32upx;
+		height: 60upx;
+		margin-top: 10upx;
+		padding-left: 20rpx;
+		color: #333333;
+		background-color: #f8f8f8;
+		flex: 1;
+	}
+
+	.send-but {
+		width: 120upx;
+		background-color: #0081FF;
+		color: #FFFFFF;
+		text-align: center;
+		font-size: 28upx;
+		height: 60upx;
+		line-height: 60upx;
+		border-radius: 60upx;
+		margin-top: 10upx;
+	}
+
+
+
+	.function-box {
+		width: 380rpx;
+		flex-direction: row;
+		justify-content: space-around;
+		padding-left: 20upx;
+	}
+
+	.ico-box {
+		width: 77rpx;
+		height: 77rpx;
+		border-radius: 50%;
+		background-color: rgba(0, 0, 0, .1);
+		line-height: 77rpx;
+
+	}
+
+	.ico-box-img {
+		width: 77rpx;
+		height: 77rpx;
+		border-radius: 50%;
+		background-color: rgba(0, 0, 0, .1);
+		line-height: 77rpx;
+	}
+
+	.ico {
+
+		font-size: 48upx;
+	}
+
+	.input-tpl {
+		height: 70upx;
+		width: 300upx;
+		line-height: 70upx;
+		text-align: left;
+		background: rgba(0, 0, 0, 0.25);
+		opacity: 1;
+		border-radius: 39upx;
+	}
+
+	.input-tpls {
+		height: 70upx;
+		width: 300upx;
+		line-height: 70upx;
+		text-align: left;
+		padding-left: 20rpx;
+		font-size: 25upx;
+		color: #FFFFFF;
+		border-radius: 70upx;
+	}
+
+	.top-left {
+		// height: auto;
+		position: absolute;
+		width: 40rpx;
+		right: 20rpx;
+		top: 230rpx;
+		z-index: 99999;
+	}
+
+	.left-img {
+		width: 40rpx;
+		height: 40rpx;
+	}
+
+
+
+	.gifta {
+		font-size: 23rpx;
+		font-family: PingFang SC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #FFFFFF;
+		margin-bottom: 5rpx;
+		text-align: center;
+	}
+
+	.giftb {
+
+		font-size: 19rpx;
+		font-family: PingFang SC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #FFFFFF;
+		text-align: center;
+	}
+
+	.nickname {
+		font-size: 28upx;
+		color: #22c8ef;
+		/* font-weight: 800; */
+		padding: 0 10upx;
+		line-height: 40upx;
+		padding-left: 4upx;
+		font-weight: 800;
+	}
+
+	.message-scroll-box {
+		line-height: 40upx;
+		color: #f9f9f9;
+		font-size: 28upx;
+		white-space: pre-wrap;
+		font-weight: 800;
+	}
+
+	.message-scroll-box-xi {
+		line-height: 40upx;
+		color: #f9f9f9;
+		font-size: 28upx;
+		white-space: pre-wrap;
+	}
+
+	.message-scroll-box-gift {
+		color: #22c8ef;
+		line-height: 40upx;
+		font-size: 28upx;
+		white-space: pre-wrap;
+	}
+
+	.user-lever {
+		background-color: #ebc602;
+		padding: 4upx 10upx;
+		border-radius: 20upx;
+		height: 20upx;
+		line-height: 20upx;
+		float: left;
+		display: flex;
+		overflow: hidden;
+		margin-top: 10upx;
+	}
+
+	.msgview {
+		position: fixed;
+		width: 540rpx;
+		height: 540rpx;
+		left: 20rpx;
+		bottom: 180rpx;
+		overflow: hidden;
+		border: none;
+
+		z-index: 9;
+
+	}
+
+	.chat-area-line {
+		width: 550upx;
+		flex-direction: row;
+		margin-bottom: 5upx;
+	}
+
+	.system-msg {
+		width: 550upx;
+		margin-bottom: 5upx;
+	}
+
+	.system-msg-detail {
+		// max-width: 550upx;
+
+		padding: 10upx;
+		border-radius: 30upx;
+		background-color: rgba($color: #000000, $alpha: 0.4);
+		flex-direction: row;
+		flex-wrap: wrap;
+		margin-right: 14upx;
+
+		>.system-msg-detail-username {
+			color: red;
+			font-size: 32upx;
+			font-weight: 400;
+			line-height: 40upx;
+
+		}
+
+		>.system-msg-detail-content {
+			font-size: 32upx;
+			font-weight: 400;
+			line-height: 40upx;
+			color: #A0CFFF;
+		}
+	}
+
+	.user-line {
+		// max-width: 530upx;
+		padding: 10upx;
+		color: #FFFFFF;
+		flex-direction: row;
+		border-radius: 30upx;
+		background-color: rgba($color: #000000, $alpha: 0.4);
+		margin-right: 14upx;
+		font-size: 28upx;
+		font-weight: 400;
+		line-height: 40upx;
+	}
+
+	.user-msg {
+		width: 530upx;
+
+
+		margin-bottom: 5upx;
+	}
+
+	.user-msg-detail {
+		padding: 10upx;
+		border-radius: 30upx;
+		background-color: rgba($color: #000000, $alpha: 0.4);
+		flex-direction: row;
+		flex-wrap: wrap;
+		margin-right: 14upx;
+
+		>.user-msg-detail-tag {
+			color: #A0CFFF;
+			background-color: #53C21D;
+			width: 80upx;
+			height: 40upx;
+			border-radius: 20upx;
+			font-size: 32upx;
+			font-weight: 400;
+			line-height: 40upx;
+		}
+
+		>.user-msg-detail-username {
+			color: #A0CFFF;
+			font-size: 32upx;
+			font-weight: 400;
+			line-height: 40upx;
+		}
+
+		>.user-msg-detail-content {
+			font-size: 32upx;
+			font-weight: 400;
+			line-height: 40upx;
+			color: #fff;
+		}
+	}
+
+	.user-lever-ico-box {
+		width: 100rpx;
+		width: 15upx;
+		height: 15upx;
+		border-radius: 100%;
+		background-color: #e0ad07;
+		padding: 2upx;
+		margin-right: 5upx;
+	}
+
+	.user-lever-ico {
+		width: 15upx;
+		height: 15upx;
+
+		// margin: auto;
+	}
+
+	.user-lever-text {
+		color: #FFFFFF;
+		font-size: 22upx;
+		height: 20upx;
+		line-height: 20upx;
+	}
+
+	.uni-recharge {
+		background-color: #fff;
+		position: fixed;
+		bottom: 0;
+		flex: 1;
+		width: 750rpx;
+		background: #FFFFFF;
+		border-top-left-radius: 30upx;
+		border-top-right-radius: 30upx;
+
+
+	}
+
+	.recharge-one {
+		display: flex;
+		justify-content: center; //弹性盒子对象在主轴上的对齐方式
+		align-items: center;
+
+	}
+
+	.recharge_title {
+		font-size: 33rpx;
+		font-family: PingFang SC-Medium, PingFang SC;
+		font-weight: 500;
+		text-align: center;
+		margin-top: 32rpx;
+		margin-bottom: 42rpx;
+	}
+
+	.recharge-one-img {
+		width: 72rpx;
+		height: 72rpx;
+
+
+		vertical-align: middle;
+
+
+	}
+
+	.recharge-one-txt {
+		font-size: 33rpx;
+		font-family: PingFang SC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #333333;
+		text-align: center;
+		margin-top: 18rpx;
+	}
+
+	.recharge-con {
+		padding: 0 32rpx;
+	}
+
+	.recharge-con-title {
+		font-size: 33rpx;
+		font-family: PingFang SC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #333333;
+	}
+
+	.recharge-con-detail {
+		flex-direction: row;
+
+		margin-top: 32rpx;
+		margin-bottom: 200rpx;
+	}
+
+	.recharge-conbottom {
+
+		width: 589rpx;
+		height: 84rpx;
+		line-height: 84rpx;
+		text-align: center;
+		position: absolute;
+		bottom: 30rpx;
+		left: 50%;
+		margin-left: -299.5rpx;
+		background: #F84221;
+		border-radius: 42rpx 42rpx;
+		font-size: 33rpx;
+		font-family: PingFang SC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #FFFFFF;
+	}
+
+	.con-detail {
+		width: 217rpx;
+		height: 159rpx;
+		margin-right: 18rpx;
+
+		border-radius: 21rpx 21rpx;
+		background: #F4F4F4;
+		text-align: center;
+	}
+
+	.carecharge {
+		border-width: 1px;
+		border-style: solid;
+		border-color: #F84221;
+	}
+
+	.con-detaila {
+		margin-top: 32rpx;
+		margin-bottom: 17rpx;
+		font-size: 37rpx;
+		font-family: PingFang SC-Semibold, PingFang SC;
+		font-weight: 600;
+		color: #333333;
+	}
+
+	.con-detailb {
+
+		font-size: 26rpx;
+		font-family: PingFang SC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #333333;
+	}
+
+	/* 底部分享 */
+	.uni-share {
+
+		background-color: #fff;
+		position: fixed;
+		bottom: 0;
+		width: 750rpx;
+		border-top-left-radius: 30upx;
+		border-top-right-radius: 30upx;
+	}
+
+	.uni-shop {
+
+		background-color: #fff;
+		position: fixed;
+		bottom: 0;
+		width: 750rpx;
+		border-top-left-radius: 30upx;
+		border-top-right-radius: 30upx;
+
+	}
+
+	.shop {
+		flex-direction: row;
+		justify-content: space-between;
+	}
+
+	.shop-top {
+		flex-direction: row;
+		margin-top: 20rpx;
+		margin-bottom: 20rpx;
+		margin-left: 20rpx;
+	}
+
+	.shop-top-img {
+		width: 80rpx;
+		height: 80rpx;
+		border-radius: 50%;
+	}
+
+	.shop-close {
+		margin: 20rpx 20rpx;
+	}
+
+	.shop-close-img {
+		width: 60rpx;
+		height: 60rpx;
+
+	}
+
+	.shop-top-txt {
+		line-height: 80rpx;
+		margin-left: 30rpx;
+	}
+
+	.uni-share-title {
+		line-height: 60rpx;
+		font-size: 24rpx;
+		padding: 15rpx 0;
+		text-align: center;
+	}
+
+
+	.uni-shop-content {
+		/* #ifndef APP-NVUE */
+		/* display: flex; */
+		/* #endif */
+		// width: 750rpx;
+
+		// display: flex;
+
+		flex-wrap: wrap;
+		// justify-content: center;
+
+
+		padding-left: 20rpx;
+		padding-bottom: 20rpx;
+		margin-top: 20rpx;
+
+
+
+		/* padding-bottom: 0; */
+	}
+
+	.shop-content {
+		width: 700rpx;
+		// border-width: 1px;
+		// border-style: solid;
+		// border-color: red;
+		flex-direction: row;
+		margin-bottom: 20rpx;
+	}
+
+	.shop-content-img {
+		width: 160rpx;
+		height: 160rpx;
+		// border-width: 1px;
+		// border-style: solid;
+		// border-color: red;
+	}
+
+	.shop-content-txt {
+		margin-left: 20rpx;
+		width: 500rpx;
+		position: relative;
+	}
+
+	.sp-txta {
+		font-size: 30rpx;
+		font-family: PingFang SC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #333333;
+	}
+
+	.sp-txtb {
+		position: absolute;
+		bottom: 20rpx;
+		width: 500rpx;
+
+		flex-direction: row;
+		justify-content: space-between;
+
+		.txtba {
+			color: red;
+			flex-direction: row;
+			height: 60rpx;
+			line-height: 60rpx;
+			font-size: 26rpx;
+			font-family: PingFang SC-Medium, PingFang SC;
+			font-weight: 400;
+			color: #F84221;
+		}
+
+		.txtba-a {
+			font-size: 26rpx;
+			font-family: PingFang SC-Medium, PingFang SC;
+			font-weight: 400;
+			color: #F84221;
+			line-height: 60rpx;
+		}
+
+		.txtba-b {
+			font-size: 33rpx;
+			font-family: PingFang SC-Medium, PingFang SC;
+			font-weight: 500;
+			color: #F84221;
+			line-height: 60rpx;
+		}
+
+		.txtba-c {
+			font-size: 26rpx;
+			font-family: PingFang SC-Medium, PingFang SC;
+			font-weight: 400;
+			line-height: 60rpx;
+			color: #F84221;
+		}
+
+		.txtbb {
+			width: 120rpx;
+			height: 60rpx;
+			line-height: 60rpx;
+			background-color: red;
+			border-radius: 0px 11rpx 11rpx 0px;
+			text-align: center;
+			font-size: 30rpx;
+			font-family: PingFang SC-Medium, PingFang SC;
+			font-weight: 500;
+			color: #FFFFFF;
+		}
+	}
+
+	.uni-share-content {
+		/* #ifndef APP-NVUE */
+		/* display: flex; */
+		/* #endif */
+		// width: 750rpx;
+
+		// display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		flex-wrap: wrap;
+		// justify-content: center;
+		padding: 15px 28rpx;
+
+
+		/* padding-bottom: 0; */
+	}
+
+	.content-image {
+		width: 60rpx;
+		height: 60rpx;
+	}
+
+	.uni-share-content-text {
+		font-size: 26rpx;
+		color: #333;
+		padding-top: 5px;
+		padding-bottom: 10px;
+	}
+
+	.uni-share-btn {
+		height: 90rpx;
+		line-height: 90rpx;
+		font-size: 14px;
+		border-top-color: #f5f5f5;
+		border-top-width: 1px;
+		border-top-style: solid;
+		text-align: center;
+		color: #666;
+	}
+
+	.gift-botton-view {
+		line-height: 90rpx;
+		height: 90rpx;
+		font-size: 14px;
+		border-top-color: #5c1398;
+		border-top-width: 1px;
+		border-top-style: solid;
+		text-align: center;
+
+
+	}
+
+	.gift-jb-con {
+		width: 221rpx;
+		height: 43rpx;
+		background: rgba(0, 0, 0, 0.25);
+		border-radius: 39rpx 39rpx;
+		flex-direction: row;
+	}
+
+	.gift-web-je {
+		font-size: 23rpx;
+		line-height: 43rpx;
+		font-weight: normal;
+		color: #FFFFFF;
+	}
+
+	.gift-jb-img {
+		width: 33rpx;
+		height: 33rpx;
+		margin-top: 3rpx;
+		margin-left: 10rpx;
+		margin-right: 10rpx;
+	}
+
+	.gift-web-cz {
+		font-size: 25rpx;
+		color: #fff;
+		text-align: center;
+	}
+
+	/* 礼物 */
+	.lw-box {
+		width: 168rpx;
+		height: 224rpx;
+		background: rgba(0, 0, 0, 0.2);
+		border-radius: 21rpx 21rpx;
+		margin-bottom: 30upx;
+		position: relative;
+	}
+
+	.hovered {
+		border: 2rpx solid #707070;
+	}
+
+	.send-m {
+		width: 168rpx;
+		height: 49rpx;
+		line-height: 49rpx;
+		text-align: center;
+		position: absolute;
+		background: #F84221;
+		bottom: 0;
+		border-radius: 0 0 21rpx 21rpx;
+		font-size: 23rpx;
+		font-family: PingFang SC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #FFFFFF;
+	}
+
+	.lw-ico {
+		width: 100rpx;
+		height: 100rpx;
+		margin-left: 35rpx;
+		margin-top: 20rpx;
+		margin-bottom: 10rpx;
+
+
+
+	}
+
+	.lw-name {
+		font-size: 23rpx;
+		font-family: PingFang SC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #FFFFFF;
+		text-align: center;
+		margin-bottom: 10rpx;
+	}
+
+	.lw-money {
+		flex-direction: row;
+
+	}
+
+	.lw-moneya {
+		font-size: 23rpx;
+		font-family: PingFang SC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #FFFFFF;
+		text-align: center;
+		margin-top: 5rpx;
+	}
+
+	.lw-money-img {
+		width: 28rpx;
+		height: 28rpx;
+		margin-left: 38rpx;
+		margin-right: 5rpx;
+	}
+
+	.send-boj {
+		// display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		padding: 20upx 30upx;
+		// border-bottom: 2upx solid #5c1398;
+	}
+
+	.send-boj-txt {
+		flex: 1;
+
+		padding-right: 40rpx;
+
+		flex-direction: row;
+		justify-content: space-between;
+	}
+
+	.send-boj-txta {
+		font-size: 30rpx;
+		font-family: PingFang SC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #FFFFFF;
+	}
+
+	.send-boj-close {
+		width: 30rpx;
+		height: 30rpx;
+	}
+
+	.send-boj-close-img {
+		width: 30rpx;
+		height: 30rpx;
+	}
+
+	.gift-alert {
+		width: 430rpx;
+		flex-direction: row;
+		justify-content: space-between;
+		// background-color: green;
+		// animation: slideRight 1s linear forwards;
+	}
+
+	.gift-alerta {
+		width: 359rpx;
+		height: 70rpx;
+		background: rgba(0, 0, 0, 0.25);
+		border-radius: 39rpx 39rpx;
+		flex-direction: row;
+		justify-content: space-between;
+
+	}
+
+	.gift-alertb {
+		flex-direction: row;
+		height: 72rpx;
+		line-height: 72rpx;
+	}
+
+	.gift-alertb-img {
+		width: 44rpx;
+		height: 72rpx;
+	}
+
+	.gift-alertb-txt {
+		font-size: 45rpx;
+		font-family: PingFang SC-Medium, PingFang SC;
+		font-weight: 700;
+		color: #FFFFFF;
+
+	}
+
+	@keyframes slideRight {
+		0% {
+			transform: translateX(0);
+		}
+
+		100% {
+			transform: translateX(100%);
+		}
+	}
+
+	.join-box {
+		position: fixed;
+		left: -500upx;
+		bottom: 350upx;
+		border-radius: 70upx;
+		display: flex;
+		padding: 10upx 30upx;
+		z-index: 9999;
+		background-color: #ef7526;
+	}
+
+	.join-box-text {
+		color: #F9F9F9;
+		line-height: 40upx;
+		font-size: 32upx;
+		white-space: pre-wrap;
+	}
+
+	.gift-ico {
+		width: 60upx;
+		height: 60upx;
+		margin-top: 10rpx;
+
+	}
+
+	.gift-ico-img {
+		width: 60upx;
+		height: 60upx;
+
+	}
+
+	.send-boj-user-header {
+		width: 63upx;
+		height: 63upx;
+		border-radius: 50%;
+		margin-top: 0rpx;
+		margin-left: -7rpx;
+
+	}
+
+	.send-boj-user-header-img {
+		width: 63upx;
+		height: 63upx;
+		border-radius: 50%;
+
+
+	}
+
+	.top-do-box {
+		width: 750rpx;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+
+		margin-top: 60rpx;
+	}
+
+	.room-info {
+		width: 350rpx;
+		display: flex;
+		flex-direction: row;
+		height: 80upx;
+		background-color: rgba(0, 0, 0, .2);
+
+		border-radius: 90upx;
+
+	}
+
+	.room-logo-box {
+		width: 80upx;
+		height: 80upx;
+		border-radius: 50%;
+
+	}
+
+
+	.room-info-message {
+		margin-left: 10rpx;
+	}
+
+	.room-user-name {
+		width: 150rpx;
+
+		font-size: 25upx;
+		color: #fff;
+		margin-top: 10rpx;
+
+	}
+
+	.room-user-money {
+		font-size: 28upx;
+		font-size: 25upx;
+		color: #fff;
+		margin-top: 5rpx;
+	}
+
+
+	.room-xin-box {
+		height: 30upx;
+		line-height: 30upx;
+		font-size: 20upx;
+		color: #FFFFFF;
+		border-radius: 30upx;
+		background-color: #f4305e;
+		margin-top: 10upx;
+		padding: 0 10upx;
+		margin-right: 4upx;
+	}
+
+	.room-money {
+		height: 30upx;
+		line-height: 30upx;
+		font-size: 20upx;
+		color: #FFFFFF;
+		border-radius: 30upx;
+		white-space: nowrap;
+		overflow: hidden;
+		margin-top: 10upx;
+	}
+
+	.room-guanzhu {
+		width: 105upx;
+		height: 60upx;
+		line-height: 60upx;
+		text-align: center;
+		color: #f4305e;
+		background-color: #FFFFFF;
+		border-radius: 50upx;
+		margin-top: 10rpx;
+
+	}
+
+	.guanzhu {
+		width: 105upx;
+		height: 60upx;
+		line-height: 60upx;
+		text-align: center;
+		font-size: 25rpx;
+		color: #f4305e;
+		background-color: #FFFFFF;
+		border-radius: 50upx;
+
+	}
+
+	.room-users-box {
+		width: 200rpx;
+		height: 65upx;
+
+		display: flex;
+
+	}
+
+	.right_top_scroll {
+		overflow: hidden;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		width: 200rpx;
+		height: 80upx;
+		margin-top: 10rpx;
+
+	}
+
+
+
+	.top-scroll-users-header {
+		width: 60upx;
+		height: 60upx;
+		border-radius: 50%;
+		margin-right: 10upx;
+		overflow: hidden;
+
+
+	}
+
+	// .top-scroll-users-header image {
+	// 	width: 100%;
+	// 	height: 100%;
+	// }
+
+	.users-count {
+		display: flex;
+		flex-direction: row;
+		color: #FFFFFF;
+		font-size: 28upx;
+	}
+
+	.users-count-text {
+		margin-top: 10rpx;
+		width: 70upx;
+		height: 60upx;
+		line-height: 60upx;
+		text-align: center;
+		border-radius: 60upx;
+		background-color: rgba(0, 0, 0, .2);
+		margin-right: 30rpx;
+	}
+
+	.users-count-img {
+		width: 40rpx;
+		height: 40rpx;
+		margin-top: 20rpx;
+		margin-right: 20rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/components/sd-live-page/livepage.nvue b/components/sd-live-page/livepage.nvue
new file mode 100644
index 0000000..c0eea3f
--- /dev/null
+++ b/components/sd-live-page/livepage.nvue
@@ -0,0 +1,2303 @@
+<template>
+	<view class="container">
+		<view class="" :style="{'height':heightG+'px'}" @click="quanju">
+			<view class="top-do-box">
+				<view class="room-info">
+					<view class="room-logo-box">
+						<image :src="room.cover" class="room-logo-box"></image>
+					</view>
+					<view class="room-info-message">
+						<view class="room-user-name">
+							<text
+								style="color: #fff;font-size: 25rpx;">{{room.live_name.length>6?room.live_name.substring(0, 6)+'...': room.live_name}}</text>
+						</view>
+						<view class="room-user-money">
+							<text style="color: #fff;font-size: 25rpx;">{{count}}</text>
+						</view>
+						
+					</view>
+					<view class="room-guanzhu" @click="interest">
+						<text class="guanzhu" v-if="!follow">关注</text>
+						<text class="guanzhu" v-else>已关注</text>
+					</view>
+				</view>
+				<view class="room-users-box">
+					<scroll-view class="right_top_scroll" scroll-x="true" scroll-left="0">
+						<view class="top-scroll-users-header" v-for="(bitem,bindex) in users" :key="bindex">
+							<image :src="bitem.app_user_avatar" class="top-scroll-users-header"
+								v-if="bitem.app_user_avatar"></image>
+							<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/default_avtar.png"
+								class="top-scroll-users-header" mode="aspectFill"></image>
+						</view>
+					</scroll-view>
+				</view>
+
+				<view class="users-count web-font">
+					<view class="users-count web-font">
+						<text class="users-count-text"> {{users.length}}</text>
+					</view>
+					<view class="users-count " @click="outroom">
+						<image src="@/static/img/close.png" class="users-count-img" mode="aspectFit"></image>
+					</view>
+				</view>
+			</view>
+
+		</view>
+		<view class="top-left" v-if="isshow">
+			<view class="top-left-a" @click="switchCamera">
+				<image class="left-img" src="/static/img/qiehuan.png" mode=""></image>
+			</view>
+		</view>
+		<view class="msgview">
+			<mh-msgList ref="msgList" :msgList="msgList"></mh-msgList>
+		</view>
+		<!-- 底部操作 -->
+
+
+		<view class="inpit-box-bg" v-if="focus">
+			<view class="inpit-box-body">
+				<input class="uni-input" @input="onKeyInput" maxlength="20" cursor-spacing="10" hold-keyboard
+					placeholder="说点什么吧..." :value="inputValue" :focus="focus" />
+				<view v-if="inputValue!=''" @click="send_message">
+					<text class="send-but">发送</text>
+				</view>
+			</view>
+		</view>
+		<view class="dobox" v-else>
+			<view class="inpit-box">
+				<view class="input-tpl" @click="set_focus">
+					<text class="input-tpls">说点什么..</text>
+				</view>
+				<view class="functionbox">
+					<view class="function-box">
+
+						<view class="ico-box" @click="send_liwu">
+							<image class="ico-box-img" src="@/static/img/li.png" mode="aspectFit"></image>
+						</view>
+						<view class="ico-box" @click="send_shop">
+							<image class="ico-box-img" src="@/static/img/shanpin.png" mode="aspectFit"></image>
+						</view>
+						<view class="ico-box" @click="send_lick">
+							<image class="ico-box-img" src="@/static/img/jl.png"></image>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 底部分享弹窗 -->
+		<uni-popup ref="share" :type="type" :custom="true" @change="change">
+			<template v-if="popup==1">
+				<view class="uni-share" style="background-color: #333333;">
+
+					<view class="send-boj" id="tes">
+						<view class="send-boj-txt">
+							<text class="send-boj-txta">礼物</text>
+							<view class="gift-jb-con">
+								<image class="gift-jb-img" src="@/static/img/jb.png" mode=""></image>
+								<text class="gift-web-je">
+									{{now_money}}
+								</text>
+
+							</view>
+
+						</view>
+						<view class="send-boj-close" @tap="close">
+							<image class="send-boj-close-img" src="/static/img/close.png" mode=""></image>
+						</view>
+					</view>
+					<scroll-view scroll-y style="height: 480rpx;overflow: hidden;">
+
+						<view class="uni-share-content">
+							<view class="lw-box" v-for="(litem,lindex) in liwu" :key="lindex"
+								@click="send_liwu_obj(litem)" @touchstart="handleTouchStart(lindex)"
+								@touchend="handleTouchEnd(lindex)" :class="{ 'hovered': lindex== hoveredIndex }">
+								<image class="lw-ico" :src="litem.gift_img"></image>
+								<view class="lw-name">
+									<text class="lw-name">{{litem.gift_name}}</text>
+								</view>
+								<view class="lw-money">
+									<image class="lw-money-img" src="@/static/img/jb.png" mode=""></image>
+
+									<text class="lw-moneya">{{litem.gift_price}}
+									</text>
+								</view>
+								<text class="send-m" v-if="lindex== hoveredIndex">赠送</text>
+							</view>
+						</view>
+
+					</scroll-view>
+					<!-- <view class="gift-botton-view" @click="rechargejb">
+						<text class="gift-web-cz">充值</text>
+					</view> -->
+				</view>
+			</template>
+			<template v-if="popup==2">
+				<view class="uni-shop">
+
+					<view class="shop">
+						<view class="shop-top">
+							<image class="shop-top-img" :src="room.cover" mode=""></image>
+							<text class="shop-top-txt">{{roomDetail.live_name}}</text>
+						</view>
+						<view class="shop-close" @tap="close">
+							<image class="shop-close-img" src="/static/img/colse1.png" mode=""></image>
+						</view>
+					</view>
+					<scroll-view scroll-y style="height: 680rpx;overflow: hidden;">
+						<view class="uni-shop-content">
+
+							<view class="shop-content" v-for="(litem,lindex) in roomDetail.goods" :key="lindex">
+								<image class="shop-content-img" :src="litem.app_goods_pic"></image>
+								<view class="shop-content-txt">
+									<view class="sp-txta">{{litem.app_goods_name}}</view>
+									<view class="sp-txtb">
+										<view class="txtba">
+											<text class="txtba-a">￥</text>
+											<text class="txtba-b">{{litem.app_goods_price.split('.')[0]}}.</text>
+											<text class="txtba-c">{{litem.app_goods_price.split('.')[1]}}</text>
+										</view>
+										<text class="txtbb" @click="shopp(litem)">去抢购</text>
+									</view>
+								</view>
+							</view>
+						</view>
+
+					</scroll-view>
+
+				</view>
+			</template>
+		</uni-popup>
+		<uni-popup ref="recharge" :type="type" :custom="true" @change="change">
+			<view class="uni-recharge">
+				<view class="recharge">
+					<view class="recharge_title">
+						<text class="recharge_title">我的金币</text>
+					</view>
+					<view class="recharge-one">
+						<image class="recharge-one-img" src="../../static/img/jb.png" mode="aspectFit"></image>
+						<view class="recharge-one-txt"><text class="recharge-one-txt" {{now_money}}</text></view>
+					</view>
+					<view class="recharge-con">
+						<view class="recharge-con-title">
+							<text class="recharge-con-title">金币充值</text>
+						</view>
+						<view class="recharge-con-detail">
+
+							<view class="con-detail" v-for="(item,ik) in Recharglist" :key='ik'
+								@click="RechargClick(ik)" :class="{ 'carecharge': ik== regIndex }">
+								<view class="" v-if='item.id=="AA"'>
+									<!-- <text class="con-detaila">输入金额</text> -->
+									<input type="text" class="con-detaila" value="" placeholder="输入金额" />
+									<text class="con-detailb">最低可充值1元</text>
+								</view>
+								<view class="" v-else>
+									<text class="con-detaila">{{item.data.give}}金币</text>
+									<text class="con-detailb">{{item.data.price}}元</text>
+								</view>
+							</view>
+						</view>
+
+						<text class="recharge-conbottom">
+							立即充值
+						</text>
+					</view>
+				</view>
+			</view>
+
+		</uni-popup>
+		<!-- 礼物弹窗 -->
+		<view class="gift-alert" v-for="(gift,gindex) in giftobj" :key="gindex"
+			:style="{ top: gift.top + 'px', left: gift.left + 'px' }">
+
+			<view class="gift-alerta">
+				<view class="send-boj-user-header">
+					<image :src="gift.app_user_avatar" class="send-boj-user-header-img" mode="aspectFill"
+						v-if="gift.app_user_avatar"></image>
+					<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/default_avtar.png"
+						class="send-boj-user-header-img" mode="aspectFill"></image>
+				</view>
+				<view class="gift-detail">
+					<text class="gifta">{{gift.app_user_name}}</text>
+					<text class="giftb">送{{room.app_user_name}}{{gift.gift_name}}</text>
+				</view>
+				<view class="gift-ico">
+					<image :src="gift.gift_img" class="gift-ico-img" mode="aspectFill"></image>
+				</view>
+			</view>
+			<view class="gift-alertb">
+				<image class="gift-alertb-img" src="@/static/img/X.png" mode=""></image>
+				<view class="gift-alertb-txt"> <text class="gift-alertb-txt">{{gift.gift_num}}</text> </view>
+			</view>
+		</view>
+		<!-- 用户进入弹窗 -->
+		<view class="join-box" v-for="(join,jindex) in join_arr" :key="jindex" :animation="join.animationData">
+			<view class="user-lever" style="margin-right: 10upx;">
+				<view class="user-lever-ico-box">
+					<image class="user-lever-ico" src="/static/img/room-user-lever.png"></image>
+				</view>
+				<view class="web-font user-lever-text">2</view>
+			</view>
+			<text class="join-box-text web-font">
+				{{join.message}}
+			</text>
+		</view>
+	<uni-popup ref="giftrecord" :type="type" :custom="true" @change="change">
+			<view class="uni-record" >
+				<view class="uni-record-top">
+					<view class="uni-record-top-img" @click="closezb">
+						<image class="uni-record-top-img" src="@/static/img/you.png" mode=""></image>
+					</view>
+					<view class="uni-record-top-text">
+						<text class="uni-record-top-text">礼物记录</text>
+					</view>
+				</view>
+				<scroll-view scroll-y :style="{'height':380+'px','overflow':'hidden'}">
+					<view class="uni-record-content" v-for="(item,m) in recordlist" :key="m">
+						<view class="record-content-one">
+							<view class="content-onea">
+								<text class="content-onea">{{item.create_time}}</text>
+							</view>
+
+							<view class="content-oneb">
+								<image src="@/static/img/jb.png" class="content-oneb-img" mode="aspectFit">
+								</image>
+								<text class="content-oneb-txt" v-if='!isshow'>-{{item.amount}}</text>
+								<text class="content-oneb-txt" v-else>+{{item.amount}}</text>
+							</view>
+						</view>
+						<view class="record-content-two">
+							<view class="content-twoa">
+								<image class="content-twoa-img" src="@/static/missing-face.png" mode="aspectFit">
+								</image>
+								<text class="content-twoa-txt">{{item.nickname}}</text>
+							</view>
+							<view class="content-twob">
+								<text class="content-twob-txt"
+									v-if='!isshow'>给主播赠送{{item.gift_id}}个{{item.gift_name}}</text>
+								<text class="content-twob-txt" v-else>主播收到{{item.gift_id}}个{{item.gift_name}}</text>
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+		</uni-popup>
+		<gb-popup :isShow="isShow1" rName="确定" :isBut="false" lName="取消" @lEvent="show1" @rEvent="copyData"
+			title="请输入礼物数量">
+			<view style="padding: 30rpx;">
+				<input type="value" v-model="gift_num" placeholder="请输入" />
+			</view>
+		</gb-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		joinChatRoom,
+		sendGroupMessage,
+		bindUser,
+		stopPushLive,
+		liveDetail,
+		getfans,
+		rewardList,
+		giftList,
+		liveAudience,
+		getuser,
+		getRechargeApi,
+		sendGift,
+		getAjuser,
+		getfanslst,
+		fansNum
+	} from '@/api/live.js'
+	import {
+		VUE_APP_WS_URL_ONE
+	} from '@/config/app.js';
+
+	import uniPopup from '@/components/unipopup/live-uni-popup.vue';
+	import msgList from '@/components/mh-msgList/mh-msgList.vue';
+	import gbpopup from '@/components/gb-popup/gb-popup.vue';
+	export default {
+		name: "sd-float-page",
+		props: {
+			role_val: {
+				type: String,
+				default: '0'
+			},
+			roomid_val: {
+				type: String,
+				default: '0'
+			},
+			room: {
+				type: Object,
+			},
+			heightG: {
+				type: String,
+				default: '750'
+			},
+		},
+		components: {
+			uniPopup,
+			'mh-msgList': msgList,
+			'gb-popup': gbpopup,
+		},
+		data() {
+			return {
+				windowWidth: '',
+				// room: [], //房间信息
+				roomobj: [],
+				users: [{
+						url: require('@/static/images/bg1.png'),
+					},
+					{
+						url: require('@/static/images/bg1.png'),
+					},
+					{
+						url: require('@/static/images/bg1.png'),
+					}, {
+						url: require('@/static/images/bg1.png'),
+					}
+				],
+				rid: 0, //房间id
+				role: '', //角色
+				focus: false,
+				inputValue: '',
+				isshow: false,
+				message_arr: [
+
+				],
+				recordlist:[],
+				msgList: [{
+					userName: "系统通知",
+					content: "倡导绿色直播，严禁发布涉黄涉毒涉赌，严禁发布涉政、违法及低俗违规内容。健康直播，文明互动",
+					cmd: "say",
+					msg_type: "system"
+				}, ],
+				view_id: '',
+				liwu: [],
+				liwu2: [],
+				liwu3: [],
+				type: 'bottom',
+				follow: false, //关注
+				popup: 3, //1礼物操作 2其他操作 3.商品
+				user: '',
+				giftobj: [], //礼物
+				join_arr: [],
+				userName: '',
+				now_money: 0,
+				roomDetail: '',
+				userinfo: null,
+				hoveredIndex: -1,
+				regIndex: -1,
+				gifts: [],
+				gifsobj: {},
+				gift_num: '',
+				isShow1: false,
+				count:0
+			}
+			/*定义IM消息类型
+			1：进群通知
+			2：发送自定义消息
+			3：收到礼物
+			*/
+		},
+
+		mounted() {
+
+
+			this.userinfo = JSON.parse(uni.getStorageSync('USER_INFO'))
+			this.getjuser()
+			this.get_live_room(); //调用直播间信息
+			this.rewardList()
+			this.giftList()
+			this.liveAudience()
+			this.getuser()
+			this.getRecharg()
+			
+			
+			// console.log(this.room)
+
+		},
+		onReady() {
+			this.windowWidth = uni.getSystemInfoSync().screenWidth //获取屏幕宽度
+			const t = this;
+			t.role = this.$props.role_val;
+			t.rid = this.$props.roomid_val;
+			t.user = uni.getStorageSync('user');
+			console.log('浮动模板被加载的事件')
+			console.log(this.$props)
+			// 保持屏幕常亮
+			uni.setKeepScreenOn({
+				keepScreenOn: true,
+				success: (res) => {
+					console.log('手机长亮时间')
+					console.log(res)
+				},
+				fail: (e) => {
+					console.log(e)
+					console.log('手机长亮时间')
+				}
+			});
+			uni.onKeyboardHeightChange(res => {
+				if (res.height == 0) {
+					this.focus = false;
+				}
+			})
+
+
+		},
+		beforeDestroy() {
+			uni.closeSocket({
+				success: function() {
+					console.log('WebSocket连接已关闭')
+				},
+				fail: function(err) {
+					console.log('关闭WebSocket连接失败:', err)
+				}
+			})
+		},
+		methods: {
+			//全局
+			quanju() {
+				this.focus = false;
+			},
+			//关注我的人
+			getfanslst() {
+				getfanslst().then((res) => {
+					if (res.status = 200) {
+						// console.log(res,'aaaaaaaaaa')
+						this.count = res.data.count
+					}
+				})
+			},
+			//获取主播关注人数
+			fansNum(id){
+				fansNum({master_id:id}).then((res=>{
+					// console.log(res,'SSSSSSS')
+					this.count=res.data.fan_num
+				}))
+			},
+			//关注
+			getjuser() {
+				getAjuser(this.room.app_user_id).then((res) => {
+					if (res.status == 200) {
+						this.follow = res.data.is_start
+					}
+				}).catch((err) => {
+
+				})
+			},
+			//获取充值数据
+			getRecharg() {
+				getRechargeApi().then((res) => {
+					
+					this.Recharglist = res.data.recharge_quota
+					this.Recharglist.push({
+						data: {},
+						id: 'AA'
+					})
+					// this.now_money = res.data.now_money
+				})
+			},
+			//获取余额
+			getuser() {
+				getuser().then((res) => {
+console.log(res.data.now_money)
+					this.now_money = res.data.now_money
+				})
+			},
+			//获取房间人数列表
+			liveAudience() {
+				let data = {
+					app_name: 'shop',
+					live_stream_id: this.room.live_stream_id
+				}
+				liveAudience(data).then((res) => {
+					this.users = res.data.lists
+				})
+			},
+			//礼物列表
+			rewardList() {
+				rewardList().then((res) => {
+					this.recordlist = res.data.list
+				})
+			},
+			//送礼
+			//送礼
+
+			bosendGift(gif) {
+				// 执行关闭模态对话框的操作
+				let data = {
+					app_name: 'shop',
+					gift_id: gif.gift_id,
+					live_stream_id: this.room.live_stream_id,
+					gift_num: gif.gift_num,
+				}
+				
+				sendGift(data).then((res) => {
+
+					if (res.code == 1) {
+						this.getuser()
+						this.rewardList()
+						this.$refs.share.close()
+						uni.hideModal()
+					
+					} else {
+						uni.showModal({
+							title: '提示',
+							content: res.msg,
+							confirmColor: '#ee6666', //确定字体颜色
+							showCancel: false, //没有取消按钮的弹框
+							buttonText: '确定',
+							success: function(res) {
+								if (res.confirm) {
+
+								} else if (res.cancel) {
+									console.log('用户点击取消');
+								}
+							},
+						})
+					}
+				})
+
+			},
+			//礼物列表
+			giftList() {
+				giftList().then((res) => {
+					this.liwu = res.data
+				})
+			},
+			//关注
+			interest() {
+				this.follow = !this.follow
+				if (this.follow) {
+					getfans(this.room.app_user_id, {
+						status: 1
+					}).then((res) => {
+						console.log(res, '11111111')
+						if (res.status == 200) {
+
+							console.log('关注成功')
+						}
+
+					}).catch((err) => {
+						console.log(err)
+					})
+				} else {
+					getfans(this.room.app_user_id, {
+						status: 0
+					}).then((res) => {
+						if (res.status == 200) {
+
+							console.log('已取消关注')
+						}
+					}).catch((err) => {
+						console.log(err)
+					})
+				}
+
+			},
+
+			//充值
+			RechargClick(index) {
+				this.regIndex = index
+			},
+			//hover效果设置
+			handleTouchStart(index) {
+				this.hoveredIndex = index;
+			},
+			handleTouchEnd(index) {
+				this.hoveredIndex = -1;
+			},
+			//加入直播间
+			joinChatRoom() {
+				let data = {
+					live_stream_id: this.room.live_stream_id,
+					app_name: 'shop',
+					app_user_id: uni.getStorageSync('UID'),
+					app_user_name: '用户' + uni.getStorageSync('UID'),
+					app_user_avatar: "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/1b716202302251108516996.png",
+				}
+				joinChatRoom(data).then((res) => {
+					if (res.code == 1) {
+						console.log('加入房间成功')
+					} else {
+						uni.showModal({
+							title: '提示',
+							content: res.msg,
+							confirmColor: '#ee6666', //确定字体颜色
+							showCancel: false, //没有取消按钮的弹框
+							buttonText: '确定',
+							success: function(res) {
+								if (res.confirm) {
+									uni.redirectTo({
+										url: '/pages/room/index'
+									})
+								} else if (res.cancel) {
+									console.log('用户点击取消');
+								}
+							}
+						});
+					}
+				})
+			},
+
+			//购买商品
+
+			shopp(item) {
+				// console.log(item)
+				uni.navigateTo({
+					url: '/pages/goods_details/index?id=' + item.app_goods_id
+				})
+			},
+			//绑定用户id
+			bindUser(client_id) {
+				let data = {
+					app_name: 'shop',
+					app_user_id: uni.getStorageSync('UID'),
+					client_id: client_id
+				}
+				bindUser(data).then((res) => {
+					if (res.code == 1) {
+						console.log('绑定成功')
+						this.joinChatRoom()
+					}
+
+				}).catch((err) => {
+					console.log(err)
+				})
+			},
+
+			// 进入这个页面的时候创建websocket连接【整个页面随时使用】
+			connectSocketInit() {
+				console.log(VUE_APP_WS_URL_ONE)
+				// 创建一个this.socketTask对象【发送、接收、关闭socket都由这个对象操作】
+				this.socketTask = uni.connectSocket({
+					// 【非常重要】必须确保你的服务器是成功的,如果是手机测试千万别使用ws://127.0.0.1:9099【特别容易犯的错误】
+					url: VUE_APP_WS_URL_ONE,
+					success(data) {
+						console.log("websocket连接成功", data);
+					},
+					fail() {
+						console.log("websocket连接失败", data);
+					},
+					complete(data) {
+						console.log("websocket连接完成", data);
+					}
+				});
+				this.socketTask.onError((res) => {
+					console.log("连接发生错误", res)
+				})
+				// 消息的发送和接收必须在正常连接打开中,才能发送或接收【否则会失败】
+				this.socketTask.onOpen(res => {
+					console.log(res, '连接打开');
+				})
+
+				this.socketTask.onMessage((res) => {
+					console.log("收到服务器内容：" + res.data);
+					let str = res.data
+					let obj = JSON.parse(str);
+					if (obj.type == 'init') {
+						this.bindUser(obj.client_id)
+					} else if (obj.type == 'message') {
+
+						// console.log(this.msgList.length, '11111111111')
+
+
+						let data1 = {
+							userName: obj.name,
+							content: obj.text,
+							avatar: obj.avatar,
+							cmd: "say",
+							msg_type: "user"
+						}
+						this.msgList.push(data1)
+						this.$refs.msgList.setMsgPanelScroll()
+					} else if (obj.type == 'sys_message') {
+						let data1 = {
+							userName: obj.name,
+							content: obj.text,
+							avatar: obj.avatar,
+							cmd: "say",
+							msg_type: "system"
+						}
+						this.msgList.push(data1)
+						this.$refs.msgList.setMsgPanelScroll()
+					} else if (obj.type == 'stream') {
+						if (obj.status == -1) {
+							uni.showModal({
+
+								title: '提示',
+								content: '直播间已关闭',
+								confirmColor: '#ee6666', //确定字体颜色
+								showCancel: false, //没有取消按钮的弹框
+								buttonText: '确定',
+								success: function(res) {
+									if (res.confirm) {
+										uni.redirectTo({
+											url: '/pages/room/index'
+										})
+									} else if (res.cancel) {
+										console.log('用户点击取消');
+									}
+								}
+							})
+
+						}
+					} else if (obj.type == 'gift_message') {
+						let data1 = {
+							userName: '',
+							content: obj.text + 'X' + obj.gift_num,
+							avatar: obj.app_user_avatar,
+							cmd: "say",
+							msg_type: "user"
+						}
+						this.msgList.push(data1)
+						this.$refs.msgList.setMsgPanelScroll()
+						this.sendGift(obj)
+
+					} else if (obj.type == 'audience') {
+						this.liveAudience()
+					}
+
+
+
+
+
+
+				});
+				// 这里仅是事件监听【如果socket关闭了会执行】
+				this.socketTask.onClose(() => {
+					console.log("已经被关闭了")
+				})
+			},
+			sendGift(gift) {
+				// userName: "11111111",
+				// number: 33330,
+				// gift_name: "333333333",
+				// userAvatar: "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/1b716202302251108516996.png",
+				// gift_ico: "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/1b716202302251108516996.png",
+
+				gift.top = Math.random() * 200 // 随机生成礼物的位置
+				gift.left = Math.random() * 200 // 随机生成礼物的位置
+				this.giftobj.push(gift);
+				setTimeout(() => {
+					this.giftobj.splice(this.gifts.indexOf(gift), 1); // 礼物消失
+				}, 3000);
+			},
+			start() {
+				this.timeoutObj = setTimeout(() => {
+					//这里发送一个心跳，后端收到后，返回一个心跳消息，
+					//onmessage拿到返回的心跳就说明连接正常
+					console.log('ping');
+					this.socketTask.send({
+						data: "ping"
+					});
+
+				}, this.timeout)
+			},
+			// 关闭websocket【离开这个页面的时候执行关闭】
+			closeSocket() {
+				this.socketTask.close({
+					success(res) {
+						this.is_open_socket = false;
+						console.log("关闭成功", res)
+					},
+					fail(err) {
+						console.log("关闭失败", err)
+					}
+				})
+			},
+
+
+			//关闭弹窗
+			close() {
+				this.$refs.share.close()
+
+			},
+			//切换摄像头
+			switchCamera() {
+				console.log('切换摄像头')
+				this.$emit('switchCamera', '')
+			},
+			onRoomFunc: function(e) {
+				const t = this;
+				var self = this;
+
+				var message = {
+					userName: '11111111',
+					number: 33330,
+					gift_name: '333333333',
+					userAvatar: "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/1b716202302251108516996.png",
+					gift_ico: "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/1b716202302251108516996.png"
+				};
+				var nowTime = new Date();
+				var animation = uni.createAnimation({
+					duration: 200,
+					timingFunction: 'linear'
+				});
+				animation.left(20).step({
+					duration: 200
+				});
+				message.animationData = animation;
+				message.tapTime = nowTime; //加入计时器
+				t.giftobj.push(message);
+				console.log('t.giftobj', t.giftobj)
+				var animation_del = uni.createAnimation({
+					duration: 200,
+					timingFunction: 'linear'
+				});
+				animation_del.left(-300).step({
+					duration: 200
+				});
+				setTimeout(function() {
+					for (var i = 0; i < t.giftobj.length; i++) {
+						if (new Date() - t.giftobj[i].tapTime > 3000) {
+							t.giftobj[i].animationData = animation_del;
+							// if (new Date() - t.giftobj[i].tapTime > 5000){
+							// 	t.giftobj.splice(i,1);//释放内存
+							// }
+						}
+					}
+					console.log('t.giftobj', t.giftobj)
+				}, 3000)
+				message.message = message.userName + '送了' + message.number + '个' + message.gift_name;
+				t.message_arr.push(message);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+				// switch (args.tag) {
+				// 	case 'recvTextMsg': {
+				// 		console.log('收到用户发送消息:', e.detail.detail);
+				// 		if (e.detail.detail.nature == 1) {
+				// 			var index = t.users.findIndex(i => i.userid == e.detail.detail.userid);
+				// 			if (index == -1) {
+				// 				t.users.push(e.detail.detail);
+				// 			}
+				// 			var str = e.detail.detail;
+				// 			str.tapTime = new Date();
+				// 			str.message = e.detail.detail.userName + " " + " 进入房间";
+				// 			var animation = uni.createAnimation({
+				// 				duration: 200,
+				// 				timingFunction: 'linear'
+				// 			});
+				// 			animation.left(20).step({
+				// 				duration: 200
+				// 			});
+				// 			str.animationData = animation;
+				// 			t.join_arr.push(str);
+				// 			console.log('t.join_arr', t.join_arr)
+				// 			var animation_del = uni.createAnimation({
+				// 				duration: 200,
+				// 				timingFunction: 'linear'
+				// 			});
+				// 			animation_del.left(-300).step({
+				// 				duration: 200
+				// 			});
+				// 			setTimeout(function() {
+				// 				for (var i = 0; i < t.join_arr.length; i++) {
+				// 					if (new Date() - t.join_arr[i].tapTime > 3000) {
+				// 						t.join_arr[i].animationData = animation_del;
+				// 						// if (new Date() - t.join_arr[i].tapTime > 5000){
+				// 						// 	t.join_arr.splice(i,1);//释放内存
+				// 						// }
+				// 					}
+				// 				}
+				// 				console.log('t.join_arr', t.join_arr)
+				// 				console.log('t.users', t.users)
+				// 			}, 3000)
+				// 		} else if (e.detail.detail.nature == 2) {
+				// 			t.message_arr.push(e.detail.detail);
+				// 		} else if (e.detail.detail.nature == 3) {
+				// 			var message = e.detail.detail;
+				// 			var nowTime = new Date();
+				// 			var animation = uni.createAnimation({
+				// 				duration: 200,
+				// 				timingFunction: 'linear'
+				// 			});
+				// 			animation.left(20).step({
+				// 				duration: 200
+				// 			});
+				// 			message.animationData = animation;
+				// 			message.tapTime = nowTime; //加入计时器
+				// 			t.giftobj.push(message);
+				// 			console.log('t.giftobj', t.giftobj)
+				// 			var animation_del = uni.createAnimation({
+				// 				duration: 200,
+				// 				timingFunction: 'linear'
+				// 			});
+				// 			animation_del.left(-300).step({
+				// 				duration: 200
+				// 			});
+				// 			setTimeout(function() {
+				// 				for (var i = 0; i < t.giftobj.length; i++) {
+				// 					if (new Date() - t.giftobj[i].tapTime > 3000) {
+				// 						t.giftobj[i].animationData = animation_del;
+				// 						// if (new Date() - t.giftobj[i].tapTime > 5000){
+				// 						// 	t.giftobj.splice(i,1);//释放内存
+				// 						// }
+				// 					}
+				// 				}
+				// 				console.log('t.giftobj', t.giftobj)
+				// 			}, 3000)
+				// 			message.message = message.userName + '送了' + message.number + '个' + message.gift_name;
+				// 			t.message_arr.push(message);
+				// 		} else if (e.detail.detail.nature == 4) {
+				// 			e.detail.detail.message = e.detail.detail.userName + '关注了主播';
+				// 			t.message_arr.push(e.detail.detail);
+				// 		} else {
+				// 			return;
+				// 		}
+				// 		console.log('t.message_arr', t.message_arr)
+				// 		t.view_id = 'demo' + t.message_arr.length;
+				// 		break;
+				// 	}
+				// 	default: {
+				// 		console.log('onRoomEvent default: ', e)
+				// 		break;
+				// 	}
+				// }
+			},
+			//关闭直播间
+			outroom: function() {
+				uni.showModal({
+					title: '提示', // 对话框标题
+					content: '是否确定退出直播间', // 对话框内容
+					showCancel: true, // 是否显示取消按钮，默认为 true
+					cancelText: '取消', // 取消按钮的文字，默认为 "取消"
+					cancelColor: '#000000', // 取消按钮的文本颜色，默认为 "#000000"
+					confirmText: '确定', // 确定按钮的文字，默认为 "确定"
+					confirmColor: '#3CC51F', // 确定按钮的文本颜色，默认为 "#3CC51F"
+					success(res) {
+						if (res.confirm) {
+							uni.redirectTo({
+								url: '/pages/room/index'
+							})
+						} else if (res.cancel) {
+							console.log('用户点击了取消按钮')
+						}
+					}
+				})
+
+			},
+
+			get_live_room() {
+
+				liveDetail({
+					app_name: 'shop',
+					live_stream_id: this.room.live_stream_id,
+				}).then(res => {
+
+					if (res.code == 1) {
+						this.roomDetail = res.data
+						// console.log(res.data, '房间id 以及当前用户id')
+						// console.log(this.room.app_user_id, uni.getStorageSync('user_id'), '房间id 以及当前用户id')
+						if (res.data.app_user_id == uni.getStorageSync('Uid')) {
+							this.isshow = true
+						}else{
+							this.fansNum(res.data.app_user_id)
+						}
+					}
+					this.connectSocketInit()
+				}).catch((err) => {})
+			},
+			togglePopup(type, open) {
+				this.type = type
+				if (open === 'tip') {
+					this.show = true
+				} else {
+					this.$refs[open].open()
+				}
+			},
+			cancel(type) {
+				if (type === 'tip') {
+					this.show = false
+					return
+				}
+				// this.$refs[type].close()
+			},
+			change(e) {
+				console.log('是否打开:' + e.show)
+			},
+			//充值
+			rechargejb: function() {
+				this.$refs['share'].close()
+				const t = this;
+				this.type = 'bottom'
+				this.$refs['recharge'].open()
+
+			},
+			send_liwu: function() {
+				const t = this;
+				t.popup = 1;
+				this.type = 'bottom'
+				t.togglePopup('bottom', 'share');
+
+				// this.$refs['recharge'].open()
+			},
+			send_shop: function() {
+				const t = this;
+				t.popup = 2;
+
+				this.type = 'bottom'
+				t.togglePopup('bottom', 'share');
+			},
+			//关闭
+			closezb() {
+				this.$refs['giftrecord'].close()
+			},
+			send_lick: function() {
+				// this.sendGift()
+
+	        this.$refs['giftrecord'].open()
+			},
+
+			//礼物弹窗
+			show1() {
+				this.isShow1 = !this.isShow1
+				this.gift_num = ''
+			},
+			//礼物弹窗0
+			copyData() {
+				this.gifsobj.gift_num = this.gift_num
+				this.bosendGift(this.gifsobj)
+				this.show1()
+			},
+			//礼物弹窗1
+			send_liwu_obj: function(gt) {
+				console.log(this.gift_num)
+				let gift = {
+					'gift_id': gt.id,
+
+				}
+				this.isShow1 = true
+				this.gifsobj = gift
+
+			},
+			//对话监听
+			set_focus: function() {
+				this.focus = !this.focus
+			},
+
+			//对话输入监听
+			onKeyInput: function(event) {
+				this.inputValue = event.detail.value
+
+			},
+
+			send_message: function() {
+				const t = this;
+				t.focus = false;
+
+				if (t.to_userid == '') {
+					uni.showToast({
+						title: '内容不能为空',
+						duration: 2000,
+						icon: 'none'
+					});
+					return false;
+				}
+
+				let data = {
+					live_stream_id: this.room.live_stream_id,
+					app_name: 'shop',
+					app_user_id: uni.getStorageSync('UID'),
+					message: this.inputValue
+				}
+
+				sendGroupMessage(data).then(res => {
+					console.log('发送的消息' + JSON.stringify(res))
+					this.inputValue = ''
+					if (res.code == 1) {
+						console.log('发送的消息成功')
+					}
+				})
+				// let message = {
+				// 	userName: '大黄',
+				// 	content: this.inputValue,
+				// 	cmd: "say",
+				// 	msg_type: "user"
+				// };
+
+				// /** 实际应用应发送到服务端，通过监听服务端传回的消息加入的msgList **/
+				// if (this.msgList.length > 100) {
+				// 	this.msgList.splice(0, 1);
+				// 	this.msgList.push(message)
+				// 	this.$refs.msgList.setMsgPanelScroll()
+				// 	this.inputValue = ''
+				// } else {
+				// 	this.msgList.push(message)
+				// 	this.$refs.msgList.setMsgPanelScroll()
+				// 	this.inputValue = ''
+				// }
+				// console.log(this.msgList)
+
+			},
+		},
+		// onBackPress() {
+		// 	this.$refs['showpopup'].close()
+		// 	this.$refs['showtip'].close()
+		// 	this.$refs['showimage'].close()
+		// 	this.$refs['showshare'].close()
+		// }
+	}
+</script>
+
+<style lang="scss" scoped>
+	page {
+		position: relative;
+
+
+	}
+
+	.container {
+		width: 100%;
+		/* 设置容器的宽度 */
+	}
+	.uni-record {
+		border-radius: 0;
+		flex: 1;
+		background-color: #F4F4F4 !important;
+	}
+
+	.uni-record-content {
+		height: 177rpx;
+		background: #FFFFFF;
+		padding: 0rpx 28rpx;
+		border-radius: 21rpx 21rpx;
+		margin-bottom: 21rpx;
+	}
+
+	.uni-record {
+		
+	}
+
+	.uni-record-top {
+		margin-top: 60rpx;
+		flex-direction: row;
+		margin-bottom: 30rpx;
+
+	}
+
+	.uni-record-top-img {
+		width: 59rpx;
+		height: 58rpx;
+	}
+
+	.uni-record-top-text {
+		font-size: 33rpx;
+		color: #000000;
+		margin-top: 5rpx;
+	}
+
+	.record-content-one {
+		flex-direction: row;
+		justify-content: space-between;
+		margin-top: 30rpx;
+		padding-bottom: 14rpx;
+		border-bottom: 1rpx solid #333333;
+	}
+
+	.content-onea {
+		font-size: 26rpx;
+		font-family: PingFang SC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #333333;
+	}
+
+	.content-oneb {
+		flex-direction: row;
+	}
+
+	.content-oneb-img {
+		width: 32rpx;
+		height: 32rpx;
+		margin-right: 10rpx;
+	}
+
+	.content-oneb-txt {
+		font-size: 30rpx;
+		font-family: PingFang SC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #333333;
+
+	}
+
+	.record-content-two {
+		flex-direction: row;
+		justify-content: space-between;
+		padding-top: 25rpx;
+	}
+
+	.content-twoa {
+		flex-direction: row;
+	}
+
+	.content-twob-txt {
+		font-size: 30rpx;
+		font-family: PingFang SC-Regular, PingFang SC;
+		font-weight: 400;
+		margin-top: 20rpx;
+	}
+
+	.content-twoa-txt {
+		font-size: 26rpx;
+		font-family: PingFang SC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #333333;
+		margin-top: 20rpx;
+		margin-left: 20rpx;
+	}
+
+	.content-twoa-img {
+		width: 56rpx;
+		height: 56rpx;
+	}
+	.dobox {
+		position: absolute;
+		bottom: 0rpx;
+		width: 750rpx;
+	}
+
+	.inpit-box {
+		padding: 20upx 20rpx;
+		width: 700rpx;
+		flex-direction: row;
+		justify-content: space-between;
+		/* padding-top: 40upx; */
+	}
+
+	.inpit-box-bg {
+		position: absolute;
+
+		bottom: 0;
+		height: 80rpx;
+		width: 750rpx;
+		background-color: #F8F8F8;
+		z-index: 9999;
+	}
+
+	.inpit-box-body {
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+
+	}
+
+	.uni-input {
+		font-size: 32upx;
+		height: 60upx;
+		margin-top: 10upx;
+		padding-left: 20rpx;
+		color: #333333;
+		background-color: #f8f8f8;
+		flex: 1;
+	}
+
+	.send-but {
+		width: 120upx;
+		background-color: #0081FF;
+		color: #FFFFFF;
+		text-align: center;
+		font-size: 28upx;
+		height: 60upx;
+		line-height: 60upx;
+		border-radius: 60upx;
+		margin-top: 10upx;
+	}
+
+
+
+	.function-box {
+		width: 380rpx;
+		flex-direction: row;
+		justify-content: space-around;
+		padding-left: 20upx;
+	}
+
+	.ico-box {
+		width: 77rpx;
+		height: 77rpx;
+		border-radius: 50%;
+		background-color: rgba(0, 0, 0, .1);
+		line-height: 77rpx;
+
+	}
+
+	.ico-box-img {
+		width: 77rpx;
+		height: 77rpx;
+		border-radius: 50%;
+		background-color: rgba(0, 0, 0, .1);
+		line-height: 77rpx;
+	}
+
+	.ico {
+
+		font-size: 48upx;
+	}
+
+	.input-tpl {
+		height: 70upx;
+		width: 300upx;
+		line-height: 70upx;
+		text-align: left;
+		background: rgba(0, 0, 0, 0.25);
+		opacity: 1;
+		border-radius: 39upx;
+	}
+
+	.input-tpls {
+		height: 70upx;
+		width: 300upx;
+		line-height: 70upx;
+		text-align: left;
+		padding-left: 20rpx;
+		font-size: 25upx;
+		color: #FFFFFF;
+		border-radius: 70upx;
+	}
+
+	.top-left {
+		// height: auto;
+		position: absolute;
+		width: 40rpx;
+		right: 20rpx;
+		top: 230rpx;
+		z-index: 99999;
+	}
+
+	.left-img {
+		width: 40rpx;
+		height: 40rpx;
+	}
+
+
+
+	.gifta {
+		font-size: 23rpx;
+		font-family: PingFang SC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #FFFFFF;
+		margin-bottom: 5rpx;
+		text-align: center;
+	}
+
+	.giftb {
+
+		font-size: 19rpx;
+		font-family: PingFang SC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #FFFFFF;
+		text-align: center;
+	}
+
+	.nickname {
+		font-size: 28upx;
+		color: #22c8ef;
+		/* font-weight: 800; */
+		padding: 0 10upx;
+		line-height: 40upx;
+		padding-left: 4upx;
+		font-weight: 800;
+	}
+
+	.message-scroll-box {
+		line-height: 40upx;
+		color: #f9f9f9;
+		font-size: 28upx;
+		white-space: pre-wrap;
+		font-weight: 800;
+	}
+
+	.message-scroll-box-xi {
+		line-height: 40upx;
+		color: #f9f9f9;
+		font-size: 28upx;
+		white-space: pre-wrap;
+	}
+
+	.message-scroll-box-gift {
+		color: #22c8ef;
+		line-height: 40upx;
+		font-size: 28upx;
+		white-space: pre-wrap;
+	}
+
+	.user-lever {
+		background-color: #ebc602;
+		padding: 4upx 10upx;
+		border-radius: 20upx;
+		height: 20upx;
+		line-height: 20upx;
+		float: left;
+		display: flex;
+		overflow: hidden;
+		margin-top: 10upx;
+	}
+
+	.msgview {
+		position: fixed;
+		width: 540rpx;
+		height: 540rpx;
+		left: 20rpx;
+		bottom: 180rpx;
+		overflow: hidden;
+		border: none;
+
+		z-index: 9;
+
+	}
+
+	.chat-area-line {
+		width: 550upx;
+		flex-direction: row;
+		margin-bottom: 5upx;
+	}
+
+	.system-msg {
+		width: 550upx;
+		margin-bottom: 5upx;
+	}
+
+	.system-msg-detail {
+		// max-width: 550upx;
+
+		padding: 10upx;
+		border-radius: 30upx;
+		background-color: rgba($color: #000000, $alpha: 0.4);
+		flex-direction: row;
+		flex-wrap: wrap;
+		margin-right: 14upx;
+
+		>.system-msg-detail-username {
+			color: red;
+			font-size: 32upx;
+			font-weight: 400;
+			line-height: 40upx;
+
+		}
+
+		>.system-msg-detail-content {
+			font-size: 32upx;
+			font-weight: 400;
+			line-height: 40upx;
+			color: #A0CFFF;
+		}
+	}
+
+	.user-line {
+		// max-width: 530upx;
+		padding: 10upx;
+		color: #FFFFFF;
+		flex-direction: row;
+		border-radius: 30upx;
+		background-color: rgba($color: #000000, $alpha: 0.4);
+		margin-right: 14upx;
+		font-size: 28upx;
+		font-weight: 400;
+		line-height: 40upx;
+	}
+
+	.user-msg {
+		width: 530upx;
+
+
+		margin-bottom: 5upx;
+	}
+
+	.user-msg-detail {
+		padding: 10upx;
+		border-radius: 30upx;
+		background-color: rgba($color: #000000, $alpha: 0.4);
+		flex-direction: row;
+		flex-wrap: wrap;
+		margin-right: 14upx;
+
+		>.user-msg-detail-tag {
+			color: #A0CFFF;
+			background-color: #53C21D;
+			width: 80upx;
+			height: 40upx;
+			border-radius: 20upx;
+			font-size: 32upx;
+			font-weight: 400;
+			line-height: 40upx;
+		}
+
+		>.user-msg-detail-username {
+			color: #A0CFFF;
+			font-size: 32upx;
+			font-weight: 400;
+			line-height: 40upx;
+		}
+
+		>.user-msg-detail-content {
+			font-size: 32upx;
+			font-weight: 400;
+			line-height: 40upx;
+			color: #fff;
+		}
+	}
+
+	.user-lever-ico-box {
+		width: 100rpx;
+		width: 15upx;
+		height: 15upx;
+		border-radius: 100%;
+		background-color: #e0ad07;
+		padding: 2upx;
+		margin-right: 5upx;
+	}
+
+	.user-lever-ico {
+		width: 15upx;
+		height: 15upx;
+
+		// margin: auto;
+	}
+
+	.user-lever-text {
+		color: #FFFFFF;
+		font-size: 22upx;
+		height: 20upx;
+		line-height: 20upx;
+	}
+
+	.uni-recharge {
+		background-color: #fff;
+		position: fixed;
+		bottom: 0;
+		flex: 1;
+		width: 750rpx;
+		background: #FFFFFF;
+		border-top-left-radius: 30upx;
+		border-top-right-radius: 30upx;
+
+
+	}
+
+	.recharge-one {
+		display: flex;
+		justify-content: center; //弹性盒子对象在主轴上的对齐方式
+		align-items: center;
+
+	}
+
+	.recharge_title {
+		font-size: 33rpx;
+		font-family: PingFang SC-Medium, PingFang SC;
+		font-weight: 500;
+		text-align: center;
+		margin-top: 32rpx;
+		margin-bottom: 42rpx;
+	}
+
+	.recharge-one-img {
+		width: 72rpx;
+		height: 72rpx;
+
+
+		vertical-align: middle;
+
+
+	}
+
+	.recharge-one-txt {
+		font-size: 33rpx;
+		font-family: PingFang SC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #333333;
+		text-align: center;
+		margin-top: 18rpx;
+	}
+
+	.recharge-con {
+		padding: 0 32rpx;
+	}
+
+	.recharge-con-title {
+		font-size: 33rpx;
+		font-family: PingFang SC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #333333;
+	}
+
+	.recharge-con-detail {
+		flex-direction: row;
+
+		margin-top: 32rpx;
+		margin-bottom: 200rpx;
+	}
+
+	.recharge-conbottom {
+
+		width: 589rpx;
+		height: 84rpx;
+		line-height: 84rpx;
+		text-align: center;
+		position: absolute;
+		bottom: 30rpx;
+		left: 50%;
+		margin-left: -299.5rpx;
+		background: #F84221;
+		border-radius: 42rpx 42rpx;
+		font-size: 33rpx;
+		font-family: PingFang SC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #FFFFFF;
+	}
+
+	.con-detail {
+		width: 217rpx;
+		height: 159rpx;
+		margin-right: 18rpx;
+
+		border-radius: 21rpx 21rpx;
+		background: #F4F4F4;
+		text-align: center;
+	}
+
+	.carecharge {
+		border-width: 1px;
+		border-style: solid;
+		border-color: #F84221;
+	}
+
+	.con-detaila {
+		margin-top: 32rpx;
+		margin-bottom: 17rpx;
+		font-size: 37rpx;
+		font-family: PingFang SC-Semibold, PingFang SC;
+		font-weight: 600;
+		color: #333333;
+	}
+
+	.con-detailb {
+
+		font-size: 26rpx;
+		font-family: PingFang SC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #333333;
+	}
+
+	/* 底部分享 */
+	.uni-share {
+
+		background-color: #fff;
+		position: fixed;
+		bottom: 0;
+		width: 750rpx;
+		border-top-left-radius: 30upx;
+		border-top-right-radius: 30upx;
+	}
+
+	.uni-shop {
+
+		background-color: #fff;
+		position: fixed;
+		bottom: 0;
+		width: 750rpx;
+		border-top-left-radius: 30upx;
+		border-top-right-radius: 30upx;
+
+	}
+
+	.shop {
+		flex-direction: row;
+		justify-content: space-between;
+	}
+
+	.shop-top {
+		flex-direction: row;
+		margin-top: 20rpx;
+		margin-bottom: 20rpx;
+		margin-left: 20rpx;
+	}
+
+	.shop-top-img {
+		width: 80rpx;
+		height: 80rpx;
+		border-radius: 50%;
+	}
+
+	.shop-close {
+		margin: 20rpx 20rpx;
+	}
+
+	.shop-close-img {
+		width: 60rpx;
+		height: 60rpx;
+
+	}
+
+	.shop-top-txt {
+		line-height: 80rpx;
+		margin-left: 30rpx;
+	}
+
+	.uni-share-title {
+		line-height: 60rpx;
+		font-size: 24rpx;
+		padding: 15rpx 0;
+		text-align: center;
+	}
+
+
+	.uni-shop-content {
+		/* #ifndef APP-NVUE */
+		/* display: flex; */
+		/* #endif */
+		// width: 750rpx;
+
+		// display: flex;
+
+		flex-wrap: wrap;
+		// justify-content: center;
+
+
+		padding-left: 20rpx;
+		padding-bottom: 20rpx;
+		margin-top: 20rpx;
+
+
+
+		/* padding-bottom: 0; */
+	}
+
+	.shop-content {
+		width: 700rpx;
+		// border-width: 1px;
+		// border-style: solid;
+		// border-color: red;
+		flex-direction: row;
+		margin-bottom: 20rpx;
+	}
+
+	.shop-content-img {
+		width: 160rpx;
+		height: 160rpx;
+		// border-width: 1px;
+		// border-style: solid;
+		// border-color: red;
+	}
+
+	.shop-content-txt {
+		margin-left: 20rpx;
+		width: 500rpx;
+		position: relative;
+	}
+
+	.sp-txta {
+		font-size: 30rpx;
+		font-family: PingFang SC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #333333;
+	}
+
+	.sp-txtb {
+		position: absolute;
+		bottom: 20rpx;
+		width: 500rpx;
+
+		flex-direction: row;
+		justify-content: space-between;
+
+		.txtba {
+			color: red;
+			flex-direction: row;
+			height: 60rpx;
+			line-height: 60rpx;
+			font-size: 26rpx;
+			font-family: PingFang SC-Medium, PingFang SC;
+			font-weight: 400;
+			color: #F84221;
+		}
+
+		.txtba-a {
+			font-size: 26rpx;
+			font-family: PingFang SC-Medium, PingFang SC;
+			font-weight: 400;
+			color: #F84221;
+			line-height: 60rpx;
+		}
+
+		.txtba-b {
+			font-size: 33rpx;
+			font-family: PingFang SC-Medium, PingFang SC;
+			font-weight: 500;
+			color: #F84221;
+			line-height: 60rpx;
+		}
+
+		.txtba-c {
+			font-size: 26rpx;
+			font-family: PingFang SC-Medium, PingFang SC;
+			font-weight: 400;
+			line-height: 60rpx;
+			color: #F84221;
+		}
+
+		.txtbb {
+			width: 120rpx;
+			height: 60rpx;
+			line-height: 60rpx;
+			background-color: red;
+			border-radius: 0px 11rpx 11rpx 0px;
+			text-align: center;
+			font-size: 30rpx;
+			font-family: PingFang SC-Medium, PingFang SC;
+			font-weight: 500;
+			color: #FFFFFF;
+		}
+	}
+
+	.uni-share-content {
+		/* #ifndef APP-NVUE */
+		/* display: flex; */
+		/* #endif */
+		// width: 750rpx;
+
+		// display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		flex-wrap: wrap;
+		// justify-content: center;
+		padding: 15px 28rpx;
+
+
+		/* padding-bottom: 0; */
+	}
+
+	.content-image {
+		width: 60rpx;
+		height: 60rpx;
+	}
+
+	.uni-share-content-text {
+		font-size: 26rpx;
+		color: #333;
+		padding-top: 5px;
+		padding-bottom: 10px;
+	}
+
+	.uni-share-btn {
+		height: 90rpx;
+		line-height: 90rpx;
+		font-size: 14px;
+		border-top-color: #f5f5f5;
+		border-top-width: 1px;
+		border-top-style: solid;
+		text-align: center;
+		color: #666;
+	}
+
+	.gift-botton-view {
+		line-height: 90rpx;
+		height: 90rpx;
+		font-size: 14px;
+		border-top-color: #5c1398;
+		border-top-width: 1px;
+		border-top-style: solid;
+		text-align: center;
+
+
+	}
+
+	.gift-jb-con {
+		width: 221rpx;
+		height: 43rpx;
+		background: rgba(0, 0, 0, 0.25);
+		border-radius: 39rpx 39rpx;
+		flex-direction: row;
+	}
+
+	.gift-web-je {
+		font-size: 23rpx;
+		line-height: 43rpx;
+		font-weight: normal;
+		color: #FFFFFF;
+	}
+
+	.gift-jb-img {
+		width: 33rpx;
+		height: 33rpx;
+		margin-top: 3rpx;
+		margin-left: 10rpx;
+		margin-right: 10rpx;
+	}
+
+	.gift-web-cz {
+		font-size: 25rpx;
+		color: #fff;
+		text-align: center;
+	}
+
+	/* 礼物 */
+	.lw-box {
+		width: 168rpx;
+		height: 224rpx;
+		background: rgba(0, 0, 0, 0.2);
+		border-radius: 21rpx 21rpx;
+		margin-bottom: 30upx;
+		position: relative;
+	}
+
+	.hovered {
+		border: 2rpx solid #707070;
+	}
+
+	.send-m {
+		width: 168rpx;
+		height: 49rpx;
+		line-height: 49rpx;
+		text-align: center;
+		position: absolute;
+		background: #F84221;
+		bottom: 0;
+		border-radius: 0 0 21rpx 21rpx;
+		font-size: 23rpx;
+		font-family: PingFang SC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #FFFFFF;
+	}
+
+	.lw-ico {
+		width: 100rpx;
+		height: 100rpx;
+		margin-left: 35rpx;
+		margin-top: 20rpx;
+		margin-bottom: 10rpx;
+
+
+
+	}
+
+	.lw-name {
+		font-size: 23rpx;
+		font-family: PingFang SC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #FFFFFF;
+		text-align: center;
+		margin-bottom: 10rpx;
+	}
+
+	.lw-money {
+		flex-direction: row;
+
+	}
+
+	.lw-moneya {
+		font-size: 23rpx;
+		font-family: PingFang SC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #FFFFFF;
+		text-align: center;
+		margin-top: 5rpx;
+	}
+
+	.lw-money-img {
+		width: 28rpx;
+		height: 28rpx;
+		margin-left: 38rpx;
+		margin-right: 5rpx;
+	}
+
+	.send-boj {
+		// display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		padding: 20upx 30upx;
+		// border-bottom: 2upx solid #5c1398;
+	}
+
+	.send-boj-txt {
+		flex: 1;
+
+		padding-right: 40rpx;
+
+		flex-direction: row;
+		justify-content: space-between;
+	}
+
+	.send-boj-txta {
+		font-size: 30rpx;
+		font-family: PingFang SC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #FFFFFF;
+	}
+
+	.send-boj-close {
+		width: 30rpx;
+		height: 30rpx;
+	}
+
+	.send-boj-close-img {
+		width: 30rpx;
+		height: 30rpx;
+	}
+
+	
+	.gift-alert {
+		// width: 480rpx;
+		flex-direction: row;
+		justify-content: space-around;
+		// background-color: green;
+		animation: slideRight 1s linear forwards;
+		z-index: 9999;
+		position: absolute;
+	}
+
+	.gift-alerta {
+		width: 359rpx;
+		height: 70rpx;
+		background: rgba(0, 0, 0, 0.25);
+		border-radius: 39rpx 39rpx;
+		flex-direction: row;
+		justify-content: space-between;
+
+	}
+
+	.gift-alertb {
+		flex-direction: row;
+		height: 72rpx;
+		line-height: 72rpx;
+	}
+
+	.gift-alertb-img {
+		width: 44rpx;
+		height: 72rpx;
+	}
+
+	.gift-alertb-txt {
+		font-size: 45rpx;
+		font-family: PingFang SC-Medium, PingFang SC;
+		font-weight: 700;
+		color: #FFFFFF;
+
+	}
+
+	@keyframes slideRight {
+		0% {
+			transform: translateX(0);
+		}
+
+		100% {
+			transform: translateX(100%);
+		}
+	}
+
+	.join-box {
+		position: fixed;
+		left: -500upx;
+		bottom: 350upx;
+		border-radius: 70upx;
+		display: flex;
+		padding: 10upx 30upx;
+		z-index: 9999;
+		background-color: #ef7526;
+	}
+
+	.join-box-text {
+		color: #F9F9F9;
+		line-height: 40upx;
+		font-size: 32upx;
+		white-space: pre-wrap;
+	}
+
+	.gift-ico {
+		width: 60upx;
+		height: 60upx;
+		margin-top: 10rpx;
+
+	}
+
+	.gift-ico-img {
+		width: 60upx;
+		height: 60upx;
+
+	}
+	.send-boj-user-header {
+		width: 63upx;
+		height: 63upx;
+		border-radius: 50%;
+		margin-top: 3rpx;
+
+
+	}
+
+	.send-boj-user-header-img {
+		width: 63upx;
+		height: 63upx;
+		border-radius: 50%;
+
+
+	}
+
+	.top-do-box {
+		width: 750rpx;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+
+		margin-top: 60rpx;
+	}
+
+	.room-info {
+		width: 350rpx;
+		display: flex;
+		flex-direction: row;
+		height: 80upx;
+		background-color: rgba(0, 0, 0, .2);
+
+		border-radius: 90upx;
+
+	}
+
+	.room-logo-box {
+		width: 80upx;
+		height: 80upx;
+		border-radius: 50%;
+
+	}
+
+
+	.room-info-message {
+		margin-left: 10rpx;
+	}
+
+	.room-user-name {
+		width: 150rpx;
+
+		font-size: 25upx;
+		color: #fff;
+		margin-top: 10rpx;
+
+	}
+
+	.room-user-money {
+		font-size: 28upx;
+		font-size: 25upx;
+		color: #fff;
+		margin-top: 5rpx;
+	}
+
+
+	.room-xin-box {
+		height: 30upx;
+		line-height: 30upx;
+		font-size: 20upx;
+		color: #FFFFFF;
+		border-radius: 30upx;
+		background-color: #f4305e;
+		margin-top: 10upx;
+		padding: 0 10upx;
+		margin-right: 4upx;
+	}
+
+	.room-money {
+		height: 30upx;
+		line-height: 30upx;
+		font-size: 20upx;
+		color: #FFFFFF;
+		border-radius: 30upx;
+		white-space: nowrap;
+		overflow: hidden;
+		margin-top: 10upx;
+	}
+
+	.room-guanzhu {
+		width: 105upx;
+		height: 60upx;
+		line-height: 60upx;
+		text-align: center;
+		color: #f4305e;
+		background-color: #FFFFFF;
+		border-radius: 50upx;
+		margin-top: 10rpx;
+
+	}
+
+	.guanzhu {
+		width: 105upx;
+		height: 60upx;
+		line-height: 60upx;
+		text-align: center;
+		font-size: 25rpx;
+		color: #f4305e;
+		background-color: #FFFFFF;
+		border-radius: 50upx;
+
+	}
+
+	.room-users-box {
+		width: 200rpx;
+		height: 70upx;
+
+		display: flex;
+		margin-top: 10rpx;
+
+	}
+
+	.right_top_scroll {
+		overflow: hidden;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		width: 200rpx;
+		height: 75upx;
+
+	}
+
+
+
+	.top-scroll-users-header {
+		width: 63upx;
+		height: 63upx;
+		border-radius: 50%;
+		margin-right: 10upx;
+		overflow: hidden;
+
+	}
+
+	// .top-scroll-users-header image {
+	// 	width: 100%;
+	// 	height: 100%;
+	// }
+
+	.users-count {
+		display: flex;
+		flex-direction: row;
+		color: #FFFFFF;
+		font-size: 28upx;
+	}
+
+	.users-count-text {
+		margin-top: 10rpx;
+		width: 70upx;
+		height: 60upx;
+		line-height: 60upx;
+		text-align: center;
+		border-radius: 60upx;
+		background-color: rgba(0, 0, 0, .2);
+		margin-right: 30rpx;
+	}
+
+	.users-count-img {
+		width: 40rpx;
+		height: 40rpx;
+		margin-top: 20rpx;
+		margin-right: 20rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/components/unipopup/live-uni-popup.vue b/components/unipopup/live-uni-popup.vue
new file mode 100644
index 0000000..134c831
--- /dev/null
+++ b/components/unipopup/live-uni-popup.vue
@@ -0,0 +1,241 @@
+<template>
+	<view v-if="showPopup" class="uni-popup" @touchmove.stop.prevent="clear">
+		<uni-transition :mode-class="['fade']" :styles="maskClass" :show="showTrans" @click="onTap" />
+		<uni-transition :mode-class="ani" :styles="transClass" :show="showTrans" @click="onTap">
+			<view class="uni-popup__wrapper-box" @click.stop="clear">
+				<slot />
+			</view>
+		</uni-transition>
+	</view>
+</template>
+
+<script>
+
+	export default {
+		
+	
+		props: {
+			// 开启动画
+			animation: {
+				type: Boolean,
+				default: true
+			},
+			// 弹出层类型，可选值，top: 顶部弹出层；bottom：底部弹出层；center：全屏弹出层
+			type: {
+				type: String,
+				default: 'center'
+			},
+			// maskClick
+			maskClick: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {
+				ani: [],
+				showPopup: false,
+				showTrans: false,
+				maskClass: {
+					'position': 'fixed',
+					'bottom': 0,
+					'top': 0,
+					'left': 0,
+					'right': 0,
+					'backgroundColor': 'rgba(0, 0, 0, 0)'
+				},
+				transClass: {
+					'position': 'fixed',
+					'left': 0,
+					'right': 0,
+				}
+			}
+		},
+		watch: {
+			type: {
+				handler: function(newVal) {
+					switch (this.type) {
+						case 'top':
+							this.ani = ['slide-top']
+							this.transClass = {
+								'position': 'fixed',
+								'left': 0,
+								'right': 0,
+							}
+							break
+						case 'bottom':
+							this.ani = ['slide-bottom']
+							this.transClass = {
+								'position': 'fixed',
+								'left': 0,
+								'right': 0,
+								'bottom': 0
+							}
+							console.log('直播调用弹窗')
+							break
+						case 'center':
+							this.ani = ['zoom-out', 'fade']
+							this.transClass = {
+								'position': 'fixed',
+								/* #ifndef APP-NVUE */
+								'display': 'flex',
+								'flexDirection': 'column',
+								/* #endif */
+								'bottom': 0,
+								'left': 0,
+								'right': 0,
+								'top': 0,
+								'justifyContent': 'center',
+								'alignItems': 'center'
+							}
+
+							break
+					}
+				},
+				immediate: true
+			}
+		},
+		created() {},
+		methods: {
+			clear(e) {
+				// TODO nvue 取消冒泡
+				e.stopPropagation()
+			},
+			open() {
+				this.showPopup = true
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.showTrans = true
+					}, 0);
+				})
+				this.$emit('change', {
+					show: true
+				})
+			},
+			close(type) {
+				this.showTrans = false
+				this.$nextTick(() => {
+					clearTimeout(this.timer)
+					this.timer = setTimeout(() => {
+						this.$emit('change', {
+							show: false
+						})
+						this.showPopup = false
+					}, 0)
+				})
+			},
+			onTap() {
+				if (!this.maskClick) return
+				this.close()
+			}
+		}
+	}
+</script>
+<style scoped>
+	.uni-popup {
+		position: fixed;
+		/* #ifdef H5 */
+		top: var(--window-top);
+		/* #endif */
+		/* #ifndef H5 */
+		top: 0;
+		/* #endif */
+		bottom: 0;
+		left: 0;
+		right: 0;
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+		/* #endif */
+	}
+
+	.uni-popup__mask {
+		position: absolute;
+		top: 0;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		background-color: rgba(0, 0, 0, 0.4);
+		opacity: 0;
+	}
+
+	.mask-ani {
+		transition-property: opacity;
+		transition-duration: 0.2s;
+	}
+
+	.uni-top-mask {
+		opacity: 1;
+	}
+
+	.uni-bottom-mask {
+		opacity: 1;
+	}
+
+	.uni-center-mask {
+		opacity: 1;
+	}
+
+	.uni-popup__wrapper {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		position: absolute;
+	}
+
+	.top {
+		top: 0;
+		left: 0;
+		right: 0;
+		transform: translateY(-500px);
+	}
+
+	.bottom {
+		bottom: 0;
+		left: 0;
+		right: 0;
+		transform: translateY(500px);
+	}
+
+	.center {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		flex-direction: column;
+		/* #endif */
+		bottom: 0;
+		left: 0;
+		right: 0;
+		top: 0;
+		justify-content: center;
+		align-items: center;
+		transform: scale(1.2);
+		opacity: 0;
+	}
+
+	.uni-popup__wrapper-box {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		position: relative;
+	}
+
+	.content-ani {
+		/* transition: transform 0.3s;
+ */
+		transition-property: transform, opacity;
+		transition-duration: 0.2s;
+	}
+
+
+	.uni-top-content {
+		transform: translateY(0);
+	}
+
+	.uni-bottom-content {
+		transform: translateY(0);
+	}
+
+	.uni-center-content {
+		transform: scale(1);
+		opacity: 1;
+	}
+</style>
\ No newline at end of file
diff --git a/components/unipopup/uni-popup.vue b/components/unipopup/uni-popup.vue
new file mode 100644
index 0000000..7408094
--- /dev/null
+++ b/components/unipopup/uni-popup.vue
@@ -0,0 +1,241 @@
+<template>
+	<view v-if="showPopup" class="uni-popup" @touchmove.stop.prevent="clear">
+		<uni-transition :mode-class="['fade']" :styles="maskClass" :show="showTrans" @click="onTap" />
+		<uni-transition :mode-class="ani" :styles="transClass" :show="showTrans" @click="onTap">
+			<view class="uni-popup__wrapper-box" @click.stop="clear">
+				<slot />
+			</view>
+		</uni-transition>
+	</view>
+</template>
+
+<script>
+
+	export default {
+	
+		props: {
+			// 开启动画
+			animation: {
+				type: Boolean,
+				default: true
+			},
+			// 弹出层类型，可选值，top: 顶部弹出层；bottom：底部弹出层；center：全屏弹出层
+			type: {
+				type: String,
+				default: 'center'
+			},
+			// maskClick
+			maskClick: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {
+				ani: [],
+				showPopup: false,
+				showTrans: false,
+				maskClass: {
+					'position': 'fixed',
+					'bottom': 0,
+					'top': 0,
+					'left': 0,
+					'right': 0,
+					'backgroundColor': 'rgba(0, 0, 0, 0.4)'
+				},
+				transClass: {
+					'position': 'fixed',
+					'left': 0,
+					'right': 0,
+				}
+			}
+		},
+		watch: {
+			type: {
+				handler: function(newVal) {
+					switch (this.type) {
+						case 'top':
+							this.ani = ['slide-top']
+							this.transClass = {
+								'position': 'fixed',
+								'left': 0,
+								'right': 0,
+							}
+							break
+						case 'bottom':
+							this.ani = ['slide-bottom']
+							this.transClass = {
+								'position': 'fixed',
+								'left': 0,
+								'right': 0,
+								'bottom': 0
+							}
+							console.log('底部条用')
+							console.log(this.type)
+							break
+						case 'center':
+							this.ani = ['zoom-out', 'fade']
+							this.transClass = {
+								'position': 'fixed',
+								/* #ifndef APP-NVUE */
+								'display': 'flex',
+								'flexDirection': 'column',
+								/* #endif */
+								'bottom': 0,
+								'left': 0,
+								'right': 0,
+								'top': 0,
+								'justifyContent': 'center',
+								'alignItems': 'center'
+							}
+
+							break
+					}
+				},
+				immediate: true
+			}
+		},
+		created() {},
+		methods: {
+			clear(e) {
+				// TODO nvue 取消冒泡
+				e.stopPropagation()
+			},
+			open() {
+				this.showPopup = true
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.showTrans = true
+					}, 50);
+				})
+				this.$emit('change', {
+					show: true
+				})
+			},
+			close(type) {
+				this.showTrans = false
+				this.$nextTick(() => {
+					clearTimeout(this.timer)
+					this.timer = setTimeout(() => {
+						this.$emit('change', {
+							show: false
+						})
+						this.showPopup = false
+					}, 300)
+				})
+			},
+			onTap() {
+				if (!this.maskClick) return
+				this.close()
+			}
+		}
+	}
+</script>
+<style scoped>
+	.uni-popup {
+		position: fixed;
+		/* #ifdef H5 */
+		top: var(--window-top);
+		/* #endif */
+		/* #ifndef H5 */
+		top: 0;
+		/* #endif */
+		bottom: 0;
+		left: 0;
+		right: 0;
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+		/* #endif */
+	}
+
+	.uni-popup__mask {
+		position: absolute;
+		top: 0;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		background-color: rgba(0, 0, 0, 0.4);
+		opacity: 0;
+	}
+
+	.mask-ani {
+		transition-property: opacity;
+		transition-duration: 0.2s;
+	}
+
+	.uni-top-mask {
+		opacity: 1;
+	}
+
+	.uni-bottom-mask {
+		opacity: 1;
+	}
+
+	.uni-center-mask {
+		opacity: 1;
+	}
+
+	.uni-popup__wrapper {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		position: absolute;
+	}
+
+	.top {
+		top: 0;
+		left: 0;
+		right: 0;
+		transform: translateY(-500px);
+	}
+
+	.bottom {
+		bottom: 0;
+		left: 0;
+		right: 0;
+		transform: translateY(500px);
+	}
+
+	.center {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		flex-direction: column;
+		/* #endif */
+		bottom: 0;
+		left: 0;
+		right: 0;
+		top: 0;
+		justify-content: center;
+		align-items: center;
+		transform: scale(1.2);
+		opacity: 0;
+	}
+
+	.uni-popup__wrapper-box {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		position: relative;
+	}
+
+	.content-ani {
+		/* transition: transform 0.3s;
+ */
+		transition-property: transform, opacity;
+		transition-duration: 0.2s;
+	}
+
+
+	.uni-top-content {
+		transform: translateY(0);
+	}
+
+	.uni-bottom-content {
+		transform: translateY(0);
+	}
+
+	.uni-center-content {
+		transform: scale(1);
+		opacity: 1;
+	}
+</style>
\ No newline at end of file
diff --git a/components/zbpSwiper.vue b/components/zbpSwiper.vue
index 341bacb..b5151aa 100644
--- a/components/zbpSwiper.vue
+++ b/components/zbpSwiper.vue
@@ -294,7 +294,7 @@
 		.search_content {
 			margin: 0 auto;
 			width: 724rpx;
-			height: 74rpx;
+			height: 64rpx;
 			padding: 2px 2px 2px 21.05rpx;
 			border-radius: 175rpx;
 			background: #fff;
@@ -312,8 +312,8 @@
 			.search_btn {
 				color: #fff;
 				width: 105.26rpx;
-				height: 52.63rpx;
-				line-height: 52.63rpx;
+				height: 56rpx;
+				line-height: 56rpx;
 				background: #f84221;
 				border-radius: 100px;
 				font-size: 28.07rpx;
diff --git a/config/app.js b/config/app.js
index 346d3c5..9bfd4f2 100644
--- a/config/app.js
+++ b/config/app.js
@@ -7,10 +7,11 @@ let httpApi
 let httpApiTwo
 let httpApiThree
 let httpApiFour
+let httpApiFive
 
 // 在打包之前请检查当前环境是否正确
-// const env = 'dev'; // 开发
-const env = 'prod'; // 生产
+const env = 'dev'; // 开发
+// const env = 'prod'; // 生产
 // const env = 'prew'; // 预上线
 
 switch (env) {
@@ -31,6 +32,7 @@ switch (env) {
 		httpApiTwo = "https://nk.lihaink.cn"
 		httpApiThree = 'http://ceshi-oa.lihaink.cn'
 		httpApiFour = 'https://ceshi-worker-task.lihaink.cn'
+		httpApiFive = 'https://ceshi-zhibo.lihaink.cn'
 }
 
 
@@ -39,7 +41,7 @@ switch (env) {
 // 聊天接口修改此字符 小程序聊天要求wss 例如：wss://mer.crmeb.net
 // let wsApi = 'ws://192.168.3.20:8324'
 let wsApi = 'wss://shop.lihaink.cn'
-
+let wsApi_one = 'wss://ceshi-zhibo.lihaink.cn/chat_room'
 module.exports = {
 	// 请求域名 格式： https://您的域名
 	// #ifdef MP || APP-PLUS
@@ -48,18 +50,23 @@ module.exports = {
 	HTTP_REQUEST_URL_TWO: httpApiTwo,
 	HTTP_REQUEST_URL_THREE: httpApiThree,
 	HTTP_REQUEST_URL_FOUR: httpApiFour,
+	HTTP_REQUEST_URL_FIVE: httpApiFive,
 	VUE_APP_WS_URL: `${wsApi}?type=user`,
+	VUE_APP_WS_URL_ONE:wsApi_one,
 	// #endif
-	
+
 	// #ifdef H5
 	//H5接口是浏览器地址
-	HTTP_REQUEST_URL_FOUR: httpApiFour|| window.location.protocol + "//" + window.location.host,
-	HTTP_REQUEST_URL: httpApi || window.location.protocol + "//" + window.location.host,
-	HTTP_REQUEST_URL_TWO: httpApiTwo || window.location.protocol + "//" + window.location.host,
+	HTTP_REQUEST_URL: process.env.NODE_ENV == 'development'? httpApi : window.location.protocol + "//" + window.location.host,
+	HTTP_REQUEST_URL_TWO: httpApiTwo,
+	HTTP_REQUEST_URL_FIVE: httpApiFive,
+    HTTP_REQUEST_URL_FOUR: window.location.host == 'shop.lihaink.cn' ?'https://worker-task.lihaink.cn':window.location.host == 'test.shop.lihaink.cn'?'https://preview-worker-task.lihaink.cn':'https://ceshi-worker-task.lihaink.cn',
+
 	// 聊天长连接地址
 	VUE_APP_WS_URL: wsApi ? `${wsApi}?type=user` : VUE_APP_WS_URL,
 	// #endif
 	openPlantGrass: openPlantGrass,
+	
 	HEADER: {
 		'content-type': 'application/json',
 		//#ifdef H5
diff --git a/libs/uniApi.js b/libs/uniApi.js
index 612c4c8..ae80c51 100644
--- a/libs/uniApi.js
+++ b/libs/uniApi.js
@@ -130,6 +130,7 @@ export function Modal(title = '提示', content = '这是一个模态弹窗!', o
 }) {
 	return new Promise((reslove, reject) => {
 		uni.showModal({
+      ...obj,
 			title: title,
 			content: content,
 			success: (res) => {
diff --git a/manifest.json b/manifest.json
index f637671..e88dc21 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "惠农生活",
     "appid" : "__UNI__3A527D1",
     "description" : "",
-    "versionName" : "1.4.5",
-    "versionCode" : 145,
+    "versionName" : "1.5.3",
+    "versionCode" : 153,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -31,7 +31,10 @@
             "UniMP" : {
                 "description" : "uni小程序"
             },
-            "Maps" : {}
+            "Maps" : {},
+            "Push" : {},
+            "Record" : {},
+            "LivePusher" : {}
         },
         "safearea" : {
             "bottom" : {
@@ -44,6 +47,8 @@
             "android" : {
                 "resizeableActivity" : true,
                 "permissions" : [
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
                     "<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\"/>",
@@ -57,17 +62,17 @@
                     "<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.FLASHLIGHT\"/>",
                     "<uses-permission android:name=\"android.permission.INTERNET\"/>",
                     "<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.RECORD_AUDIO\"/>",
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
-                    "<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
-                    "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ],
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
                 "permissionExternalStorage" : {
@@ -103,13 +108,13 @@
                     "weixin" : {
                         "__platform__" : [ "ios", "android" ],
                         "appid" : "wx9d68c92b550ddd1e",
-                        "UniversalLinks" : "https://mer.crmeb.net/"
+                        "UniversalLinks" : "https://shop.lihaink.cn/"
                     }
                 },
                 "share" : {
                     "weixin" : {
                         "appid" : "wx9d68c92b550ddd1e",
-                        "UniversalLinks" : "https://mer.crmeb.net/"
+                        "UniversalLinks" : "https://shop.lihaink.cn/"
                     }
                 },
                 "geolocation" : {
@@ -120,7 +125,8 @@
                     }
                 },
                 "oauth" : {},
-                "ad" : {}
+                "ad" : {},
+                "push" : {}
             },
             "icons" : {
                 "android" : {
@@ -160,8 +166,8 @@
         },
         "nativePlugins" : {
             "JG-JCore" : {
-                "JPUSH_APPKEY_IOS" : "b5f679f4357018605ea6fd2e",
-                "JPUSH_CHANNEL_IOS" : "",
+                "JPUSH_APPKEY_IOS" : "8a5efd65cda14fafa6e64ad3",
+                "JPUSH_CHANNEL_IOS" : "8a5efd65cda14fafa6e64ad3",
                 "JPUSH_APPKEY_ANDROID" : "b5f679f4357018605ea6fd2e",
                 "JPUSH_CHANNEL_ANDROID" : "",
                 "__plugin_info__" : {
@@ -178,7 +184,7 @@
                         "JPUSH_APPKEY_IOS" : {
                             "des" : "[iOS]极光portal配置应用信息时分配的AppKey",
                             "key" : "JCore:APP_KEY",
-                            "value" : "7869a2f94b120cfb4431b96f"
+                            "value" : "daebe19b547c43128796a078"
                         },
                         "JPUSH_CHANNEL_IOS" : {
                             "des" : "[iOS]用于统计分发渠道，不需要可填默认值developer-default",
@@ -199,9 +205,9 @@
                 }
             },
             "JG-JPush" : {
-                "JPUSH_ISPRODUCTION_IOS" : "",
+                "JPUSH_ISPRODUCTION_IOS" : "true",
                 "JPUSH_ADVERTISINGID_IOS" : "",
-                "JPUSH_DEFAULTINITJPUSH_IOS" : "",
+                "JPUSH_DEFAULTINITJPUSH_IOS" : "true",
                 "JPUSH_OPPO_APPKEY" : "",
                 "JPUSH_OPPO_APPID" : "",
                 "JPUSH_OPPO_APPSECRET" : "",
diff --git a/pages.json b/pages.json
index b957f87..c4e8e9f 100644
--- a/pages.json
+++ b/pages.json
@@ -64,6 +64,27 @@
 				"navigationBarTitleText": "购物车"
 			}
 		},
+		{
+			"path": "pages/room/index",
+			"style": {
+				"navigationBarTitleText": "直播列表",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/room/spectator",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "直播间"
+			}
+		}
+		,{
+			"path": "pages/room/histroyroom",
+			"style": {
+				"navigationBarTitleText": "历史直播间",
+				"navigationStyle": "custom"
+			}
+		},
 		{
 			"path": "pages/plant_grass/index",
 			"style": {
@@ -151,7 +172,7 @@
             "path" : "pages/margin/margin",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                "navigationBarTitleText":"缴纳押金",
                 "enablePullDownRefresh": false
             }
             
@@ -839,7 +860,7 @@
 				}, {
 					"path": "payment/payment",
 					"style": {
-						"navigationBarTitleText": "",
+						"navigationBarTitleText": "支付",
 						"enablePullDownRefresh": false
 					}
 
diff --git a/pages/admin/cancellate_result/index.vue b/pages/admin/cancellate_result/index.vue
index 2614b9e..62c966e 100644
--- a/pages/admin/cancellate_result/index.vue
+++ b/pages/admin/cancellate_result/index.vue
@@ -91,6 +91,7 @@
 	import authorize from '@/components/Authorize';
 	import emptyPage from '@/components/emptyPage.vue'
 	import { configMap } from '@/utils';
+import { navigateBack } from '../../../libs/uniApi';
 	const app = getApp();
 	export default {
 		components: {
@@ -198,6 +199,14 @@
 						that.$util.Tips({
 							title: res.message
 						});
+						if(res.status==200){
+							// uni.redirectTo({
+							// 	url:'/admin/orderList/index?types=4&merId='+that.mer_id
+							// })
+							uni.navigateBack({
+								      delta:2
+								})
+						}
 						that.getOrderData();
 					})
 					.catch(res => {
diff --git a/pages/admin/financial_management/index.vue b/pages/admin/financial_management/index.vue
index 751c9a5..7fb54bb 100644
--- a/pages/admin/financial_management/index.vue
+++ b/pages/admin/financial_management/index.vue
@@ -54,7 +54,7 @@
       </view>
       <view class="bottom" @click="navTo('/subpkg/orderDetail/orderDetail')">
         <view class="item">
-          <view>履约保证金额(元)</view>
+          <view>履约押金额(元)</view>
           <view class="num" v-show="eyeType">{{
             userInfo.deposit || 0.0
           }}</view>
diff --git a/pages/admin/goods_details/index.vue b/pages/admin/goods_details/index.vue
index 9fc4b31..6b6624d 100644
--- a/pages/admin/goods_details/index.vue
+++ b/pages/admin/goods_details/index.vue
@@ -264,14 +264,22 @@
         </view>
         <view class='product-intro' id="past3">
           <view class='title'>产品介绍</view>
-          <jyf-parser v-if="description.type == 0" :domain='domain' :html="description.content.replace(/<br\/>/ig, '')"
-            ref="article" :tag-style="tagStyle"></jyf-parser>
+          <!-- #ifndef APP-PLUS -->
+          <jyf-parser v-if="description.type == 0 && typeof description.content == 'string'" :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 && typeof description.content == 'string'" 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 v-for="(item,index) in description.content.image" :key="index" :src="item"></image>
+            <view v-if="description.content && description.content.title" class="product_content_title">{{description.content.title}}
             </view>
+            <block v-if="description.content && description.content.image">
+            	<image v-for="(item,index) in description.content.image" :key="index" :src="item"  mode="widthFix" style="background-color: #fff;width: 100vw;">
+            	</image>
+            </block>
           </view>
         </view>
         <view style='height:120rpx;'></view>
@@ -558,6 +566,23 @@
           }
           that.$set(that, 'storeInfo', storeInfo);
           that.$set(that, 'description', storeInfo.content);
+          if(typeof that.description.content == 'string'){
+            try{
+              that.description.content = JSON.parse(that.description.content);
+            }catch(e){
+              console.log(e);
+            }
+          }
+          if (that.description.type == 0 && typeof that.description.content == 'string') {
+          	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, 'reply', res.data.topReply ? [res.data.topReply] : []);
           that.$set(that.attr, 'productAttr', res.data.attr);
           that.$set(that, 'productValue', res.data.sku);
@@ -608,6 +633,23 @@
           }
           that.$set(that, 'storeInfo', storeInfo);
           that.$set(that, 'description', storeInfo.content);
+          if(typeof that.description.content == 'string'){
+            try{
+              that.description.content = JSON.parse(that.description.content);
+            }catch(e){
+              console.log(e);
+            }
+          }
+          if (that.description.type == 0 && typeof that.description.content == 'string') {
+          	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.description, 'type', storeInfo.content.type || 0);
           that.$set(that, 'reply', res.data.topReply ? [res.data.topReply] : []);
           that.$set(that.attr, 'productAttr', res.data.attr);
@@ -1592,4 +1634,19 @@
       }
     }
   }
+  .product_content{
+    background-color: #fff;
+    &_title{
+      width: 100%;
+      height: auto;
+      line-height: 50rpx;
+      padding: 28rpx;
+      word-wrap: break-word;
+      text-align: center;
+    }
+    image{
+      width: 750rpx;
+      // height: 750rpx;
+    }
+  }
 </style>
\ No newline at end of file
diff --git a/pages/admin/orderDetail/index.vue b/pages/admin/orderDetail/index.vue
index 1517bb5..d7fc7a7 100644
--- a/pages/admin/orderDetail/index.vue
+++ b/pages/admin/orderDetail/index.vue
@@ -146,7 +146,7 @@
 			</view>
 		</view>
 		<view style="height:120upx;"></view>
-		<view class="footer acea-row row-right row-middle" v-if="goname != 'looks'" style="margin-bottom: var(--status-bar-height);">
+		<view class="footer acea-row row-right row-middle" v-if="goname != 'looks'" style="padding-bottom: var(--status-bar-height);">
 			<view class="more"></view>
       <view class="bnt cancel" v-if="orderInfo.pay_type == 8 && orderInfo.status == 12"  @click="tongyi(order_id,1)">
       	同意
diff --git a/pages/admin/orderList/index.vue b/pages/admin/orderList/index.vue
index 399c417..4879d0d 100644
--- a/pages/admin/orderList/index.vue
+++ b/pages/admin/orderList/index.vue
@@ -293,6 +293,9 @@
 			this.merId = option.merId;
 			this.getIndex();
 		},
+		onShow(){
+			this.getIndex();
+		},
 		methods: {
 			// 关闭二维码弹窗
 			popUpClose() {
diff --git a/pages/admin/orderRefund/index.vue b/pages/admin/orderRefund/index.vue
index 4374450..ac4815c 100644
--- a/pages/admin/orderRefund/index.vue
+++ b/pages/admin/orderRefund/index.vue
@@ -134,11 +134,15 @@
 						})
 					}
 				}
+					
+				
 				let params = {
 					status: that.status,
 					fail_message: that.fail_message
 				}
-				if(that.orderInfo.refund_type == 2){
+				
+				
+				if(that.orderInfo.refund_type == 2 && that.status != -1){
 					if (!that.refundInfo.mer_delivery_user) {
 						return that.$util.Tips({
 							title: '请填写收货人姓名'
diff --git a/pages/admin/order_cancellation/index.vue b/pages/admin/order_cancellation/index.vue
index 2f54607..7aec653 100644
--- a/pages/admin/order_cancellation/index.vue
+++ b/pages/admin/order_cancellation/index.vue
@@ -122,6 +122,7 @@
 			},
 			// 扫码核销			
 			scanCode() {
+			
 				var self = this;
 				// #ifdef MP || APP-PLUS
 				wx.scanCode({
@@ -129,11 +130,14 @@
 					success(res) {
 						self.verify_code = res.result
 						// console.log(self.verify_code);
+						console.log('111',self.mer_id,self.verify_code)
 						verifierOrder(self.mer_id,self.verify_code)
 							.then(res => {
+							
 								uni.navigateTo({
 									url: '/pages/admin/cancellate_result/index?code='+self.verify_code+'&mer_id='+self.mer_id
 								});
+								
 							})
 							.catch(res => {
 								self.verify_code = ''
@@ -161,9 +165,11 @@
 						scanType: ["qrCode", "barCode"]
 					}).then(res=>{
 						this.verify_code = res.resultStr
+						
 						uni.navigateTo({
 							url: '/pages/admin/cancellate_result/index?code='+self.verify_code+'&mer_id='+self.mer_id
 						});
+						
 						// this.codeChange();
 					}).catch(res => {
 						this.$util.Tips({
diff --git a/pages/chat/customer_list/chat.vue b/pages/chat/customer_list/chat.vue
index 40a218e..9b7d49f 100644
--- a/pages/chat/customer_list/chat.vue
+++ b/pages/chat/customer_list/chat.vue
@@ -53,7 +53,8 @@
 														</div>
 														<div class="broadcast_details_picBox noPad">
 															<div class="broadcast_details_tit">
-																{{val.product.cart_info.product.store_name}}</div>
+																{{val.product.cart_info.product.store_name}}
+															</div>
 															<div class="broadcast_details_pic">
 																￥{{ item.refundOrder.refund_price }}
 															</div>
@@ -89,7 +90,8 @@
 														</div>
 														<div class="broadcast_details_picBox noPad">
 															<div class="broadcast_details_tit">
-																{{val.cart_info.product.store_name}}</div>
+																{{val.cart_info.product.store_name}}
+															</div>
 															<div class="broadcast_details_pic">
 																￥{{ item.orderInfo.pay_price }}
 															</div>
@@ -114,7 +116,8 @@
 															￥{{ item.product.price }}
 														</div>
 														<div class="broadcast_details_tit_no line1">
-															{{item.product.store_name}}</div>
+															{{item.product.store_name}}
+														</div>
 													</div>
 												</navigator>
 											</div>
@@ -135,7 +138,8 @@
 															￥{{ item.presell.price }}
 														</div>
 														<div class="broadcast_details_tit_no line1">
-															{{item.presell.store_name}}</div>
+															{{item.presell.store_name}}
+														</div>
 													</div>
 												</navigator>
 											</div>
@@ -143,7 +147,7 @@
 										<!--拼团商品链接-->
 										<div class="conter acea-row row-middle"
 											v-if="item.msn_type === 8 && item.productGroup && item.productGroup.product">
-											<div class=" noPad">
+											<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}`"
@@ -156,7 +160,8 @@
 															￥{{ item.productGroup.product.price }}
 														</div>
 														<div class="broadcast_details_tit_no line1">
-															{{item.productGroup.product.store_name}}</div>
+															{{item.productGroup.product.store_name}}
+														</div>
 													</div>
 												</navigator>
 											</div>
@@ -207,7 +212,8 @@
 														</div>
 														<div class="broadcast_details_picBox noPad">
 															<div class="broadcast_details_tit">
-																{{val.product.cart_info.product.store_name}}</div>
+																{{val.product.cart_info.product.store_name}}
+															</div>
 															<div class="broadcast_details_pic">
 																￥{{ item.refundOrder.refund_price }}
 															</div>
@@ -216,6 +222,7 @@
 												</div>
 											</div>
 										</navigator>
+
 										<!--订单链接-->
 										<div v-if="item.msn_type === 5 && item.orderInfo.order_id">
 											<div class="broadcast-details_num acea-row row-middle">
@@ -243,7 +250,8 @@
 														</div>
 														<div class="broadcast_details_picBox noPad">
 															<div class="broadcast_details_tit">
-																{{val.cart_info.product.store_name}}</div>
+																{{val.cart_info.product.store_name}}
+															</div>
 															<div class="broadcast_details_pic">
 																￥{{ item.orderInfo.pay_price }}
 															</div>
@@ -267,7 +275,8 @@
 															￥{{ item.product.price }}
 														</div>
 														<div class="broadcast_details_tit_no line1">
-															{{item.product.store_name}}</div>
+															{{item.product.store_name}}
+														</div>
 													</div>
 												</navigator>
 											</div>
@@ -288,7 +297,8 @@
 															￥{{ item.presell.price }}
 														</div>
 														<div class="broadcast_details_tit_no line1">
-															{{item.presell.store_name}}</div>
+															{{item.presell.store_name}}
+														</div>
 													</div>
 												</navigator>
 											</div>
@@ -309,7 +319,8 @@
 															￥{{ item.productGroup.product.price }}
 														</div>
 														<div class="broadcast_details_tit_no line1">
-															{{item.productGroup.product.store_name}}</div>
+															{{item.productGroup.product.store_name}}
+														</div>
 													</div>
 												</navigator>
 											</div>
@@ -358,6 +369,7 @@
 					<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">
@@ -388,7 +400,8 @@
 														</div>
 														<div class="broadcast_details_picBox noPad">
 															<div class="broadcast_details_tit">
-																{{val.product.cart_info.product.store_name}}</div>
+																{{val.product.cart_info.product.store_name}}
+															</div>
 															<div class="broadcast_details_pic">
 																￥{{ val.product.cart_info.productAttr.price }}
 															</div>
@@ -425,7 +438,8 @@
 														</div>
 														<div class="broadcast_details_picBox noPad">
 															<div class="broadcast_details_tit">
-																{{val.cart_info.product.store_name}}</div>
+																{{val.cart_info.product.store_name}}
+															</div>
 															<div class="broadcast_details_pic">
 																￥{{ item.orderInfo.pay_price }}
 															</div>
@@ -450,7 +464,8 @@
 															￥{{ item.product.price }}
 														</div>
 														<div class="broadcast_details_tit_no line1">
-															{{item.product.store_name}}</div>
+															{{item.product.store_name}}
+														</div>
 													</div>
 												</navigator>
 											</div>
@@ -471,7 +486,8 @@
 															￥{{ item.presell.price }}
 														</div>
 														<div class="broadcast_details_tit_no line1">
-															{{item.presell.store_name}}</div>
+															{{item.presell.store_name}}
+														</div>
 													</div>
 												</navigator>
 											</div>
@@ -492,7 +508,8 @@
 															￥{{ item.productGroup.product.price }}
 														</div>
 														<div class="broadcast_details_tit_no line1">
-															{{item.productGroup.product.store_name}}</div>
+															{{item.productGroup.product.store_name}}
+														</div>
 													</div>
 												</navigator>
 											</div>
@@ -534,7 +551,8 @@
 														</div>
 														<div class="broadcast_details_picBox noPad">
 															<div class="broadcast_details_tit">
-																{{val.product.cart_info.product.store_name}}</div>
+																{{val.product.cart_info.product.store_name}}
+															</div>
 															<div class="broadcast_details_pic">
 																共{{item.refundOrder.refund_num}}件商品，
 																合计 ￥{{ item.refundOrder.refund_price }}
@@ -571,7 +589,8 @@
 														</div>
 														<div class="broadcast_details_picBox noPad">
 															<div class="broadcast_details_tit">
-																{{val.cart_info.product.store_name}}</div>
+																{{val.cart_info.product.store_name}}
+															</div>
 															<div class="broadcast_details_pic">
 																￥{{ item.orderInfo.pay_price }}
 															</div>
@@ -596,7 +615,8 @@
 															￥{{ item.product.price }}
 														</div>
 														<div class="broadcast_details_tit_no line1">
-															{{item.product.store_name}}</div>
+															{{item.product.store_name}}
+														</div>
 													</div>
 												</navigator>
 											</div>
@@ -617,7 +637,8 @@
 															￥{{ item.presell.price }}
 														</div>
 														<div class="broadcast_details_tit_no line1">
-															{{item.presell.store_name}}</div>
+															{{item.presell.store_name}}
+														</div>
 													</div>
 												</navigator>
 											</div>
@@ -638,7 +659,8 @@
 															￥{{ item.productGroup.product.price }}
 														</div>
 														<div class="broadcast_details_tit_no line1">
-															{{item.productGroup.product.store_name}}</div>
+															{{item.productGroup.product.store_name}}
+														</div>
 													</div>
 												</navigator>
 											</div>
@@ -778,7 +800,7 @@
 					</view>
 				</div>
 			</form>
-			<div class="banner slider-banner">
+			<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">
@@ -786,10 +808,12 @@
 							<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" />
@@ -1212,8 +1236,7 @@
 				let self = this
 				self.$util.uploadImageOne('upload/image', function(res) {
 					if (res.status == 200) {
-						self.sendMsg(res.data.path, 3
-						)
+						self.sendMsg(res.data.path, 3)
 					}
 				});
 			},
@@ -1603,7 +1626,7 @@
 		margin-top: 20rpx;
 		width: 710rpx;
 		position: fixed;
-		bottom: 120rpx;
+		bottom: 160rpx;
 		left: 20rpx;
 
 		.broadcast-details_box,
@@ -1790,6 +1813,7 @@
 
 	.broadcast-details .chat .item .text {
 		margin-left: 20rpx;
+
 	}
 
 	.broadcast-details .chat .item .text.textR {
@@ -1943,19 +1967,23 @@
 		transition: all 0.005s cubic-bezier(0.25, 0.5, 0.5, 0.9);
 		background-color: #fff;
 		position: fixed;
-		bottom: 0;
+		bottom:var(--status-bar-height);
 		left: 0;
-		margin-bottom:  var(--status-bar-height);;
+	
+		
+
 	}
 
 	.broadcast-details .footerCon.on {
 		position: relative;
-		top: -300rpx;
+		top: -360rpx;
+	
 		transform: translate3d(0, 0, 0) !important;
 	}
 
 	.broadcast-details .footerCon .banner {
 		background: #fff;
+		padding-top: var(--status-bar-height);
 	}
 
 	.broadcast-details .footerCon .banner .swiper-slide {
@@ -1971,7 +1999,7 @@
 		display: block;
 		width: 50rpx;
 		height: 50rpx;
-		margin: 40rpx 0 0 50rpx;
+		margin: 20rpx 0 0 40rpx;
 	}
 
 	.broadcast-details .footerCon .banner .swiper-container-horizontal>.swiper-pagination-bullets {
@@ -1980,6 +2008,10 @@
 
 	.broadcast-details .footerCon .slider-banner .swiper-pagination-bullet-active {
 		background-color: #999;
+
+
+
+
 	}
 
 	.broadcast-details .recording {
@@ -2036,6 +2068,8 @@
 		padding: 0 80rpx 0 30rpx;
 		height: 76rpx;
 		position: relative;
+
+
 	}
 
 	.broadcast-details .footer .placeholder {
@@ -2064,7 +2098,9 @@
 		display: inline-block;
 		width: 50rpx;
 		height: 50rpx;
-		margin: 40rpx 0 0 50rpx;
+
+
+		margin: 20rpx 0 0 40rpx;
 	}
 
 	.emoji-outer {
diff --git a/pages/chat/customer_list/index.vue b/pages/chat/customer_list/index.vue
index da48440..517c85c 100644
--- a/pages/chat/customer_list/index.vue
+++ b/pages/chat/customer_list/index.vue
@@ -62,6 +62,9 @@
 		serviceList,
 		serviceUserList
 	} from "@/api/user";
+	import {
+		getUserInfo
+	} from '@/api/user.js';
 	import { mapGetters } from "vuex";
 	export default {
 		name: "CustomerList",
@@ -88,13 +91,9 @@
 		computed: mapGetters(['isLogin','viewColor']),
 		onLoad(optios) {
 			this.type = optios.type;
-			this.mer_id = optios.mer_id;
-			if(this.isLogin){
-				this.getList(this.mer_id)
-			} else {
-				this.isAuto = true;
-				this.isShowAuth = true
-			}
+			
+			
+			this.getindex()
 		},
 		onShow(option) {
 			if(this.isLogin){
@@ -119,6 +118,21 @@
 			this.clear = true;
 		},
 		methods: {
+			//获取商户信息
+			getindex(){
+				getUserInfo().then(res => {
+					
+					this.mer_id = res.data.service.mer_id;
+					if(this.isLogin){
+						this.getList(this.mer_id)
+					} else {
+						this.isAuto = true;
+						this.isShowAuth = true
+					}
+						// this.getList(this.mer_id)
+					// this.getList(res.data.service.mer_id, true);
+				});
+			},
 			onLoadFun() {
 				this.isShowAuth = false;
 				this.getList(this.mer_id);
@@ -217,7 +231,7 @@
 		},
 	};
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 	.CustomerList {
 		.spin {
 			display: block;
diff --git a/pages/columnGoods/goods_search_con/index.vue b/pages/columnGoods/goods_search_con/index.vue
index 27e017d..1a81af1 100644
--- a/pages/columnGoods/goods_search_con/index.vue
+++ b/pages/columnGoods/goods_search_con/index.vue
@@ -5,9 +5,10 @@
 				<view class="back" @click='set_where(1)'>
 					<view class="iconfont icon-xiangzuo"></view>
 				</view>
-				<view class='input acea-row row-between-wrapper'><text class='iconfont icon-sousuo'></text>
-					<input placeholder='搜索商品名称' placeholder-class='placeholder' confirm-type='search' name="search"
-						:value='where.keyword' @confirm="searchSubmit" @input="inputChange"></input>
+				<view class='input acea-row row-between-wrapper'>
+				<text class='iconfont icon-sousuo'></text>
+									<input placeholder='搜索商品名称' placeholder-class='placeholder' confirm-type='search' name="search"
+										:value='where.keyword' @confirm="searchSubmit" @input="inputChange">
 				</view>
 				<view style="text-align: right;" v-if="tabIndex==1" class='iconfont'
 					:class='is_switch==true?"icon-pailie":"icon-tupianpailie"' @click='Changswitch'></view>
diff --git a/pages/commissionedSales/delegation_details/index.vue b/pages/commissionedSales/delegation_details/index.vue
index 3cf0d27..dc3c98c 100644
--- a/pages/commissionedSales/delegation_details/index.vue
+++ b/pages/commissionedSales/delegation_details/index.vue
@@ -109,8 +109,8 @@
 
 		</view>
 		<view class="content_bootm">
-			<view class="content_bootm_txt">
-				查看TA提到的宝贝(2)
+			<view class="content_bootm_txt" v-if="objinfo.product_list.length>0">
+				查看TA提到的宝贝({{objinfo.product_list.length}})
 			</view>
 
 
@@ -124,7 +124,7 @@
 			</view>
 
 		</view>
-		<button class="release_btn button" v-if="objinfo.mer_status==1&&type==1" @click="submit(objinfo)">发布</button>
+		<!-- <button class="release_btn button" v-if="objinfo.mer_status==1&&type==1" @click="submit(objinfo)">发布</button> -->
 	</view>
 </template>
 
diff --git a/pages/commissionedSales/receivedCommission/index.vue b/pages/commissionedSales/receivedCommission/index.vue
index 729a4b2..f3443be 100644
--- a/pages/commissionedSales/receivedCommission/index.vue
+++ b/pages/commissionedSales/receivedCommission/index.vue
@@ -227,6 +227,7 @@
 	import emptyPage from '@/components/emptyPage.vue';
 	import {
 		entrustlist,
+			addEntrustCart,
 		finishchain,
 		checkchain
 	} from '@/api/sale.js'
@@ -365,9 +366,25 @@
 			},
 			//下单
 			order(item) {
-				uni.navigateTo({
-					url: '/pages/commissionedSales/delegation_details/index?id=' + item.community_id + '&type=1'
-				})
+				// uni.navigateTo({
+				// 	url: '/pages/commissionedSales/delegation_details/index?id=' + item.community_id + '&type=1'
+				// })
+				addEntrustCart({
+						community_id: item.community_id
+					}).then(res => {
+				
+						if (res.status == 200) {
+							this.$util.Tips({
+								title: res.message,
+								icon: 'success'
+							})
+							uni.navigateTo({
+								url: '/pages/users/order_confirm/index?cartId=' + res.data.cart_id.toString()
+							})
+						}
+				
+					})
+				
 			},
 			//申请结束委托申请
 			deteragrss(item) {
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index e4bf29d..913bc68 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -1,11 +1,9 @@
 <template>
 	<view class="gather">
-
-
 		<view v-if="isFshow">
-			<view class="site-box flex_a_c_j_sb" :style="{ 'opacity': backColor,}" @click="selectLocation">
+			<view class="site-box flex_a_c_j_sb" :style="{ opacity: backColor }" @click="selectLocation">
 				<view :class="['place_wrapper', 'flex_a_c', isFshow ? 'sitebox' : '']" @click="selectLocation">
-					<view :class="['iconfont', 'icon-weizhi', isFshow ? 'sitebox' : '']" style=" margin-left: 20rpx">
+					<view :class="['iconfont', 'icon-weizhi', isFshow ? 'sitebox' : '']" style="margin-left: 20rpx">
 					</view>
 					<view class="town_name">{{ street }}</view>
 				</view>
@@ -13,23 +11,19 @@
 					<view :class="['iconfont', 'icon-xiaoxi', isFshow ? 'sitebox' : '']"></view>
 				</navigator>
 			</view>
-
 		</view>
 		<view class="" v-if="!isFshow">
 			<view class="site-box1 flex_a_c_j_sb">
-
 				<view class="place_wrapper flex_a_c" @click="selectLocation">
 					<view class="iconfont icon-weizhi"></view>
-					<view class="town_name">{{street}}</view>
+					<view class="town_name">{{ street }}</view>
 				</view>
 				<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
-					<view class="iconfont icon-xiaoxi" style="color:#fff;"> </view>
+					<view class="iconfont icon-xiaoxi" style="color: #fff"> </view>
 				</navigator>
 			</view>
 		</view>
 
-
-
 		<zbpSwiper :isSelectPlace="true" :location_Arr="locationArr" :town="street"></zbpSwiper>
 		<u-empty :show="jurisdiction" mode="permission" :text="emptyText"
 			icon="http://cdn.uviewui.com/uview/empty/permission.png"></u-empty>
@@ -64,8 +58,7 @@
 			<view class="content">
 				<u-transition v-for="(item, index) in AllMenuList" :key="item.name" show>
 					<view class="examine" @click="pushMenu(item)">
-						<image class="icon_img" :src="item.icon" mode="aspectFit">
-						</image>
+						<image class="icon_img" :src="item.icon" mode="aspectFit"> </image>
 						<u-icon class="icon" name="plus-circle-fill"></u-icon>
 						<text class="text">{{ item.name }}</text>
 					</view>
@@ -73,8 +66,7 @@
 			</view>
 		</view>
 
-
-		<u-picker :defaultIndex="[0,0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
+		<u-picker :defaultIndex="[0, 0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
 			@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
 		<!-- <m-tabbar native>
 		      <template v-slot:tabbar_index_2>
@@ -89,7 +81,6 @@
 <script>
 	import Cache from '@/utils/cache';
 	import mTabbar from '@/components/m-tabbar/m-tabbar.vue'
-
 	import zbpSwiper from '@/components/zbpSwiper'
 	import {
 		getArea,
@@ -126,7 +117,6 @@
 		components: {
 			mTabbar,
 			zbpSwiper
-
 		},
 		data() {
 			return {
@@ -146,11 +136,10 @@
 				// 编辑中标记
 				editFlag: false,
 				// 所有菜单的按钮
-				
 				AllMenuList: [{
 						name: '商户平台',
 						icon: '/static/applet/shop_app.png',
-						data: '/pages/moreProject/moreProject',
+						data: "__UNI__1EE148C",
 						type: 2,
 					},
 					{
@@ -164,10 +153,85 @@
 						icon: '/static/applet/ny.png',
 						data: {
 							id: '__UNI__9620511',
-							url: '/static/wgt/__UNI__9620511.wgt',
+							url: 'https://ceshi-worker-task.lihaink.cn/api/common/getMiniProgramInfo?name=nongye',
 						},
-						type: 1,
+						type: 3,
+					},
+					{
+						name: '教育咨询',
+						icon: '/static/applet/jy.png',
+						data: {
+							id: '__UNI__7AA205C',
+							url: 'https://ceshi-worker-task.lihaink.cn/api/common/getMiniProgramInfo?name=jiaoyu',
+						},
+						type: 3,
+					},
+					{
+						name: '法律咨询',
+						icon: '/static/applet/fl.png',
+						data: {
+							id: '__UNI__358D505',
+							url: 'https://ceshi-worker-task.lihaink.cn/api/common/getMiniProgramInfo?name=falv',
+						},
+						type: 3,
+					},
+					{
+						name: '情感咨询',
+						icon: '/static/applet/qg.png',
+						data: {
+							id: '__UNI__8080F14',
+							url: 'https://ceshi-worker-task.lihaink.cn/api/common/getMiniProgramInfo?name=qinggan',
+						},
+						type: 3,
+					},
+					{
+						name: '种植分析',
+						icon: '/static/applet/zz.png',
+						data: {
+							id: '__UNI__9EDFE40',
+							url: 'https://ceshi-worker-task.lihaink.cn/api/common/getMiniProgramInfo?name=zhongzhi',
+						},
+						type: 3,
+					},
+					{
+						name: '养殖分析',
+						icon: '/static/applet/yz.png',
+						data: {
+							id: '__UNI__EEA7DC9',
+							url: 'https://ceshi-worker-task.lihaink.cn/api/common/getMiniProgramInfo?name=yangzhi',
+						},
+						type: 3,
+					},
+					{
+						name: '农业智能感知平台',
+						icon: '/static/applet/icons.png',
+						data: {
+							id: '__UNI__3A527D1',
+							url: 'https://ceshi-worker-task.lihaink.cn/uploads/files/20231019/20231019151519e8f484737.wgt',
+						},
+						type: 4,
+					},
+					
+					{
+						name: '里海直播',
+						icon: '/static/applet/live.png',
+						data: {
+							id:  "__UNI__0E46DAD",
+							url:'https://lihai001.oss-cn-chengdu.aliyuncs.com/app/__UNI__0E46DAD.wgt',
+							
+						},
+						type: 4,
+						
 					}
+					// {
+					// 	name: '大屏控制',
+					// 	icon: '/static/applet/dp.png',
+					// 	data: {
+					// 		id: '__UNI__83ABA97',
+					// 		url: 'https://ceshi-worker-task.lihaink.cn/uploads/files/20231016/20231016112144fac6d9128.wgt',
+					// 	},
+					// 	type: 4,
+					// }
 				],
 				nowMenuList: [],
 				street: '',
@@ -183,10 +247,10 @@
 		},
 		created() {},
 		onLoad() {
-			this.Area()
+			this.showControllerAllLet();
+			this.Area();
 			this.initMenu();
 		},
-
 		onShow() {
 			if (this.isLogin) {
 				this.emptyText = '暂无可用应用'
@@ -279,6 +343,24 @@
 				}
 
 
+			},
+			// 根据类型来判断是否显示
+			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.push({
+						name: '大屏控制',
+						icon: '/static/applet/dp.png',
+						data: {
+							id: '__UNI__83ABA97',
+							url: 'https://ceshi-worker-task.lihaink.cn/uploads/files/20231016/20231016112144fac6d9128.wgt',
+						},
+						type: 4,
+					})
+				}
 			},
 			// 初始化菜单
 			initMenu() {
@@ -293,14 +375,7 @@
 				}
 			},
 			clickMenu(e, data) {
-				switch (e) {
-					case 1:
-						this.getUniMp(data);
-						break;
-					case 2:
-						this.navigator(data);
-						break;
-				}
+				this.getUniMp(e, data);
 			},
 			// 添加菜单
 			pushMenu(data) {
@@ -321,19 +396,40 @@
 				this.editFlag = false;
 				uni.setStorageSync('gatherNowMenuList', JSON.stringify(this.nowMenuList));
 			},
-			getUniMp(data) {
+			getUniMp(type, data) {
+				let that = this;
 				// #ifdef APP-PLUS
-				console.log(data, typeof data == 'string');
-				if (typeof data == 'string') uniMP.loadMP(data);
-				else uniMP.loadMPurl(data);
-				// uniMP.loadMPurl(data);
-				// uniMP.open(data.id);
+				switch (type) {
+					case 1:
+						uniMP.loadMP(data);
+						break;
+						// case 2: uniMP.loadMPx(data); break;
+					case 2:
+						// this.navigator(data);
+						// uniMP.loadMPx(data);
+						that.navigator(`/pages/moreProject/moreProject`);
+						break;
+
+					case 3:
+						uniMP.loadMPurl(data);
+						break;
+					case 4:
+						uniMP.loadMPdns(data);
+						break;
+				}
 				return;
 				// #endif
-				uni.showToast({
-					icon: 'none',
-					title: 'H5不支持打开小程序'
-				})
+				// #ifdef H5
+				if (type == 2) {
+					this.navigator(`/pages/moreProject/moreProject`);
+				} else {
+					uni.showToast({
+						icon: 'none',
+						title: 'H5不支持打开小程序'
+					})
+				}
+				// #endif
+
 			},
 			changeHandler(e) {
 				const {
@@ -428,6 +524,7 @@
 				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');
@@ -499,7 +596,6 @@
 		.iconfont {
 			font-size: 35.09rpx;
 		}
-
 	}
 
 	.site-box {
@@ -522,7 +618,7 @@
 		padding-top: 25rpx;
 		/* #endif */
 		// background-color: #e5e5e5;
-		background: url('@/static/images/bg2.png') no-repeat;
+		background: url("@/static/images/bg2.png") no-repeat;
 		background-size: 100% 100%;
 		padding-right: 20rpx;
 
diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue
index 153c189..943d57c 100644
--- a/pages/goods_details/index.vue
+++ b/pages/goods_details/index.vue
@@ -278,22 +278,22 @@
 						<view class='title'>产品介绍</view>
 						<view class='conter' v-if="description" style="min-height:50rpx;">
 							<!-- #ifndef APP-PLUS -->
-							<jyf-parser v-if="description.type == 0" :domain='domain'
+							<jyf-parser v-if="description.type == 0 && typeof description.content == 'string'" :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"
+							<view v-if="description.type == 0 && typeof description.content == 'string'" 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 v-if="description.content && description.content.title" class="product_content_title">
+						      {{description.content.title}}
 								</view>
-								<view v-if="description.content && description.content.image" class="pictures">
-									<image v-for="(item,index) in description.content.image" :key="index" :src="item">
+								<block v-if="description.content && description.content.image">
+									<image v-for="(item,index) in description.content.image" :key="index" :src="item"  mode="widthFix" style="background-color: #fff;width: 100vw;">
 									</image>
-								</view>
+								</block>
 							</view>
 						</view>
 						<!-- 价格说明 -->
@@ -704,11 +704,6 @@
 			that.getConfig();
 			uni.hideLoading();
 		},
-
-		onHide() {
-
-			this.CartCount = 0
-		},
 		/**
 		 * 用户点击右上角分享
 		 */
@@ -1064,7 +1059,14 @@
 					}
 					that.$set(that, 'storeInfo', storeInfo);
 					that.$set(that, 'description', storeInfo.content);
-					if (that.description.type == 0) {
+          if(typeof that.description.content == 'string'){
+            try{
+              that.description.content = JSON.parse(that.description.content);
+            }catch(e){
+              console.log(e);
+            }
+          }
+					if (that.description.type == 0 && typeof that.description.content == 'string') {
 						that.description.content = that.description.content.replace(
 							/<img/gi,
 							'<img style="max-width:100%;height:auto;float:left;display:block" '
@@ -2525,4 +2527,21 @@
 			}
 		}
 	}
+  
+  .product_content{
+    background-color: #fff;
+    &_title{
+      width: 100%;
+      height: auto;
+      line-height: 50rpx;
+      padding: 28rpx;
+      word-wrap: break-word;
+      text-align: center;
+    }
+    image{
+      width: 750rpx;
+      // height: auto;
+      // height: 750rpx;
+    }
+  }
 </style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6474185..15d39e5 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -38,6 +38,9 @@
 			</zbpSwiper>
 
 
+			<view class="zhibo" @click="zhibo">
+				<image src="@/static/img/zhi.png" mode="aspectFit"></image>
+			</view>
 
 			<view class="tabs_wrapper">
 				<!-- 	<u-tabs :list="tabsData.list" @click="tabsChange" lineColor="#F84221" keyName="cate_name"
@@ -204,6 +207,7 @@
 		},
 
 		onPullDownRefresh() {
+			this.where.page=1
 			this.getCateList()
 			this.getGoods(true)
 			this.Area()
@@ -309,6 +313,13 @@
 			this.$bus.$off('value-updated')
 		},
 		methods: {
+			//直播
+			
+			zhibo(){
+				uni.navigateTo({
+					url:'/pages/room/index'
+				})
+			},
 			//弹出
 			open() {
 				this.$refs.popup.open()
@@ -333,7 +344,7 @@
 			//分栏视频 图文查看
 			itemTap(item) {
 
-				if (this.userid) {
+		
 					if (item.video_link.length > 0) {
 						uni.navigateTo({
 							// #ifdef MP || H5
@@ -348,11 +359,7 @@
 							url: `/pages/plantGrass/plant_detail/index?id=${item.community_id}`
 						})
 					}
-				} else {
-					this.isAuto = true;
-					this.isShowAuth = true
-				}
-
+			
 			},
 			// 授权关闭
 			authColse: function(e) {
@@ -745,6 +752,15 @@
 
 		// background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
 	}
+	.zhibo{
+		height: 130rpx;
+		image {
+			width: 100%;
+			height:  100%;
+	
+		
+		}
+	}
 
 	.location {
 		background-color: #f6f6f6;
diff --git a/pages/margin/margin.vue b/pages/margin/margin.vue
index 7b16f86..42c22a3 100644
--- a/pages/margin/margin.vue
+++ b/pages/margin/margin.vue
@@ -3,13 +3,13 @@
 		<view class="info">
 			<view class="bg"></view>
 			<view class="card">
-				<view class="title">店铺保证金信息</view>
+				<view class="title">店铺押金信息</view>
 				<view class="item">
-					<text>已缴纳保证金</text>
+					<text>已缴纳押金</text>
 					<text>{{merchant_Data.paid_margin}}</text>
 				</view>
 				<view class="item">
-					<text>未缴纳保证金</text>
+					<text>剩余缴纳押金</text>
 					<text>{{merchant_Data.unpaid_margin}}</text>
 				</view>
 				<view class="item">
@@ -34,12 +34,13 @@
 		<view class="content-order" v-for="(item,i ) in productList">
 			<view class="">订单编号：{{item.order_sn}}</view>
 			<view class="">支付金额：{{item.total_price}}</view>
-			<view class="">支付状态：{{item.pay_type==1?'已支付':'待支付'}}</view>
+			<view class="">支付状态：{{item.paid==1?'已支付':'待支付'}}</view>
 			<view class="">支付时间：{{item.pay_time}}</view>
 		</view>
 		<view class='loadingicon acea-row row-center-wrapper' v-if='productList.length > 0'>
 			<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
 		</view>
+
 	</view>
 </template>
 
@@ -97,7 +98,7 @@
 						that.$set(that, 'productList', productList);
 					}, 500)
 
-					// console.log(that.productList)
+
 					that.$set(that.where, 'page', that.where.page + 1);
 					if (that.where.page == 1 && res.data.list.length <= 0) that.emptyShow = true
 				}).catch(err => {
@@ -106,7 +107,7 @@
 				});
 
 			},
-			//获取保证金信息
+			//获取押金信息
 			decimal() {
 				merchant({
 					id: this.mer_id
@@ -114,58 +115,47 @@
 					this.merchant_Data = res.data
 				});
 			},
-			//缴纳保证金
+			//缴纳押金
 			paydecimal() {
-				if (this.merchant_Data.is_margin != 1) {
-					this.$util.Tips({
-						title: '暂时无需缴纳保证金'
-					});
-				} else {
-					let that = this
-					uni.showModal({
-						title: '提示',
-						content: '商户' + this.merchant_Data.mer_name + '是否同意缴纳保证金',
-						success: function(res) {
-							if (res.confirm) {
-								
-								// console.log('用户点击确定');
-								paymerchant().then((res) => {
-									
-									uni.requestPayment({
-										provider: 'wxpay',
-										orderInfo: res.data
-											.config, //微信、支付宝订单数据 【注意微信的订单信息，键值应该全部是小写，不能采用驼峰命名】
-										success: function(res) {
-											that.$util.Tips({
-												title: '支付成功'
-											});
-										
-											setTimeout(() => {
-												that.decimal()
-												that.list(true)
-											}, 1000)
-											
-										},
-										fail: function(err) {
-											
-											that.$util.Tips({
-												title: '支付失败'
-											});
-											console.log('fail:' + JSON.stringify(err));
-										}
-									});
-								}).catch((err) => {
-									console.log(err)
+				let that = this
+				uni.showModal({
+					title: '提示',
+					content: '商户' + this.merchant_Data.mer_name + '是否同意缴纳押金',
+					success: (res) => {
+						if (res.confirm) {
+							paymerchant().then((res) => {
+								uni.requestPayment({
+									provider: 'wxpay',
+									orderInfo: res.data
+										.config, //微信、支付宝订单数据 【注意微信的订单信息，键值应该全部是小写，不能采用驼峰命名】
+									success: (res) => {
+										that.$util.Tips({
+											title: '支付成功'
+										});
+										that.decimal()
+										that.list(true)
+									},
+									fail: (err) => {
+										that.$util.Tips({
+											title: '支付失败'
+										});
+										console.log('fail:' + JSON.stringify(err));
+									}
+								});
+							}).catch((err) => {
+								console.log(err)
+								that.$util.Tips({
+									title: err
 								})
-							} else if (res.cancel) {
-								console.log('用户点击取消');
-							}
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
 						}
-					});
+					}
+				});
 
-				}
+			}
 
-			},
 		}
 	}
 </script>
@@ -179,8 +169,6 @@
 	}
 
 	.content-order {
-
-
 		background: #F4F4F4;
 		border-radius: 21rpx 21rpx;
 		margin-top: 30rpx;
diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue
index d4a8f51..563839c 100644
--- a/pages/moreProject/moreProject.vue
+++ b/pages/moreProject/moreProject.vue
@@ -1,16 +1,20 @@
 <template>
 	<view class="gather">
+
+
 		<!-- #ifdef MP || APP-PLUS -->
 
-		<view class="conten-top">
-			<view class="" style="position: absolute;left: 30rpx;" @click="logout"><i class="iconfont icon-xiangzuo"
-					style="font-size: 40rpx;text-align: left;"></i></view>
-			<view class="" style="font-size: 30rpx;">
+		<view class="conten-top" :style="'height:'+statusBarHeight+'px'">
+			<view class="" style="position: absolute;left: 30rpx;bottom: 15rpx;" @click="logout"><i
+					class="iconfont icon-xiangzuo" style="font-size: 40rpx;text-align: left;"></i></view>
+			<view class=""
+				style="position: absolute;left: 30rpx;bottom: 15rpx;width: 120rpx; left:50%;margin-left:-60rpx;">
 				商家平台
 			</view>
 		</view>
-		<view style="padding-top:var(--status-bar-height);padding-bottom: 30rpx; margin-bottom: 30rpx;"></view>
+		<view :style="'height:'+statusBarHeight+'px'"></view>
 		<!-- #endif -->
+
 		<block v-if="isShow&&userInfoData.mer_info.mer_name">
 			<view class="" v-if="userInfoData.mer_info.setting_status==1">
 				<view class="special_work com" v-if="userInfoData.mer_info.type_code === 'TypeSupplyChain'">
@@ -50,14 +54,16 @@
 							<image class="icon_img" :src="`${prefix}ddgl.png`" mode="aspectFill"></image>
 							<text class="text">订单管理</text>
 						</view> -->
+						
 							<view class="examine"
 								@click="navigator(`/pages/nongKe/gather/select_warehouse?mer_id=${mer_id}&stype=1`)">
 								<image class="icon_img" :src="`${prefix}rkgl.png`" mode="aspectFill">
 								</image>
 								<text class="text">入库管理</text>
 							</view>
+							
 							<view class="examine"
-								@click="navigator(`/pages/product/basicSet?mer_id=${mer_id}&product_type=98`, '商户设置')">
+								@click="buyserset">
 								<image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill"></image>
 								<text class="text">商户设置</text>
 							</view>
@@ -78,12 +84,12 @@
 								</image>
 								<text class="text">订单核销</text>
 							</view>
-							<view class="examine" @click="navigator(`/pages/margin/margin`)">
+							<view class="examine" @click="margin(`/pages/margin/margin`)">
 								<image class="icon_img" src="@/static/images/jy.png">
 								</image>
-								<text class="text">保证缴纳金</text>
+								<text class="text">缴纳押金</text>
 							</view>
-							<!-- <view class="examine"
+						<!-- 	<view class="examine"
 								@click="navigator(`/pages/commissionedSales/index/index?mer_id=${mer_id}`)">
 								<image class="icon_img" src="@/static/images/weituo.png" mode="aspectFill">
 								</image>
@@ -136,7 +142,7 @@
 								<view class="special_work-titleb" v-if='codenote[0].status==0'>交易申请状态：待审核</view>
 							</view>
 							<view class="content ">
-								<!-- <view class="examine"
+							<!-- 	<view class="examine"
 									@click="navigator(`/pages/users/supply_procurement/index?type_id=12&isDetail=1&product_type=98&cate_id=${userInfoData.mer_info.category_id}`)">
 
 									<image class="icon_img" :src="`${prefix}ghcg.png`" mode="aspectFill"></image>
@@ -189,7 +195,7 @@
 									<text class="text">商品管理</text>
 								</view>
 								<view class="examine"
-									@click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')">
+									@click="buyserset">
 									<image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill">
 									</image>
 									<text class="text">商户设置</text>
@@ -197,10 +203,14 @@
 								<view class="examine" @click="margin(`/pages/margin/margin`)">
 									<image class="icon_img" src="@/static/images/jy.png">
 									</image>
-									<text class="text">保证缴纳金</text>
+									<text class="text">缴纳押金</text>
 								</view>
-
 								<!-- <view class="examine"
+									@click="navigator(`/pages/admin/financial_management/index?mer_id=${mer_id}&product_type=98&type_id=${userInfoData.mer_info.type_id}`)">
+									<image class="icon_img" :src="`${prefix}cwgl.png`" mode="aspectFill"></image>
+									<text class="text">财务管理</text>
+								</view> -->
+							<!-- 		<view class="examine"
 									@click="navigator(`/pages/users/trading_hall/index?mer_id=${mer_id}`)">
 									<image class="icon_img" src="@/static/images/diaohuo.png" mode="aspectFill">
 									</image>
@@ -308,16 +318,16 @@
 									<text class="text">商品管理</text>
 								</view>
 								<view class="examine"
-									@click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')">
+								@click="buyserset">
 									<image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill">
 									</image>
 									<text class="text">商户设置</text>
 								</view>
 
-								<view class="examine" @click="navigator(`/pages/margin/margin`)">
+								<view class="examine" @click="margin(`/pages/margin/margin`)">
 									<image class="icon_img" src="@/static/images/jy.png">
 									</image>
-									<text class="text">保证缴纳金</text>
+									<text class="text">缴纳押金</text>
 								</view>
 								<!-- <view class="examine" @click="navigator(`/pages/users/user_invoice_Finance/index?mer_id=${mer_id}`)">
 							<image class="icon_img" src="@/static/images/cwgk.png" mode="aspectFill">
@@ -380,15 +390,15 @@
 									<text class="text">商品管理</text>
 								</view>
 								<view class="examine"
-									@click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')">
+									@click="buyserset">
 									<image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill">
 									</image>
 									<text class="text">商户设置</text>
 								</view>
-								<view class="examine" @click="navigator(`/pages/margin/margin`)">
+								<view class="examine" @click="margin(`/pages/margin/margin`)">
 									<image class="icon_img" src="@/static/images/jy.png">
 									</image>
-									<text class="text">保证缴纳金</text>
+									<text class="text">缴纳押金</text>
 								</view>
 							</view>
 						</view>
@@ -421,8 +431,8 @@
 			<emptyPage title="暂无信息"></emptyPage>
 		</view>
 		<view class="settlementAgreement" v-if="isFshow">
-			<view class="setAgCount" style="width: 100%;height: 100%; padding-top:120rpx ;" >
-		
+			<view class="setAgCount" style="width: 100%;height: 100%; padding-top:120rpx ;">
+
 				<view class="" style="width: 60rpx;height: 60rpx; position: absolute;left: 30rpx; top:80rpx"
 					@click="recuo">
 					<i class="iconfont icon-xiangzuo" style="width: 60rpx;height: 60rpx;font-size: 40rpx;"></i>
@@ -453,7 +463,7 @@
 			<view class="userpage">
 				<view class="userpage-icon" @click="close">
 					<!-- <image src="@/static/images/close.png" mode=""></image> -->
-						<i class="iconfont icon-xiangzuo" style="width: 60rpx;height: 60rpx;font-size: 40rpx;"></i>
+					<i class="iconfont icon-xiangzuo" style="width: 60rpx;height: 60rpx;font-size: 40rpx;"></i>
 				</view>
 				<form report-submit='true' style="height: 90%;">
 					<view class='merchantsSettled' :style="{'height':Fheight}">
@@ -618,7 +628,7 @@
 					cardno_back: ''
 				},
 				Fheight: 0,
-
+				statusBarHeight: 0
 			};
 		},
 		computed: {
@@ -627,7 +637,7 @@
 		created() {},
 		onLoad() {
 			this.Fheight = uni.getSystemInfoSync().windowHeight + 'px';
-
+			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 45;
 		},
 		onShow() {
 			if (this.isLogin) {
@@ -838,7 +848,7 @@
 				}
 
 			},
-			//保证金缴纳
+			//押金缴纳
 			margin(url) {
 				if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) {
 
@@ -864,12 +874,13 @@
 				}
 
 			},
-			//
-			logout(){
+			
+			logout() {
 				uni.switchTab({
-					url:'/pages/gather/gather'
+					url: '/pages/gather/gather'
 				})
 			},
+			
 			//商户设置
 			buyserset() {
 				uni.navigateTo({
@@ -877,10 +888,7 @@
 				})
 			},
 			navigator(url, t) {
-
 				if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) {
-
-
 					if (this.codenote.length == 0) {
 						this.isFshow = true
 						this.countDown()
@@ -895,7 +903,6 @@
 						}
 					}
 				} else {
-
 					uni.navigateTo({
 						url: url
 					})
@@ -954,8 +961,6 @@
 
 	.conten-top {
 		width: 100%;
-		padding-top: var(--status-bar-height);
-		padding-bottom: 30rpx;
 		text-align: center;
 		background-color: #fff;
 		position: absolute;
diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue
index f0527f2..91a7775 100644
--- a/pages/nongKe/cloud_entrepot/index.vue
+++ b/pages/nongKe/cloud_entrepot/index.vue
@@ -1,1568 +1,1514 @@
 <template>
-	<view class="">
-
-		<view class="">
-			<view class="">
-				<view v-if="showtit">
-					<view :class="{'head':true,'show':showtit}" style="padding-top:  var(--status-bar-height);">
-						<view style="display: flex;align-items: center;">
-							<!-- 	<u--image :showLoading="true" v-if="cloudList.length>0" src="/static/images/LHYC/FH.png"
+  <view class="">
+    <view class="">
+      <view class="">
+        <view v-if="showtit">
+          <view :class="{ head: true, show: showtit }" style="padding-top: var(--status-bar-height)">
+            <view style="display: flex; align-items: center">
+              <!-- 	<u--image :showLoading="true" v-if="cloudList.length>0" src="/static/images/LHYC/FH.png"
 								width="50.82rpx" height="50.82rpx" @click='goBack'></u--image>
 								
 							<u--image v-else :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx"
 								height="50.82rpx" @click='goBack'></u--image> -->
 
-							<i class="iconfont icon-xiangzuo" v-if="cloudList.length>0"
-								style="font-size: 40rpx;text-align: left;" @click='goBack'></i>
-							<i class="iconfont icon-xiangzuo" v-else style="font-size: 40rpx;text-align: left;"
-								@click='goBack'></i>
+              <i class="iconfont icon-xiangzuo" v-if="cloudList.length > 0" style="font-size: 40rpx; text-align: left"
+                @click="goBack"></i>
+              <i class="iconfont icon-xiangzuo" v-else style="font-size: 40rpx; text-align: left" @click="goBack"></i>
 
+              <view class="head_tit" v-if="cloudList.length" style="
+                  font-size: 40rpx;
+                  transform: skewX(-10deg);
+                  font-weight: bold;
+                " :style="{ color: cloudList.length > 0 ? '' : 'black' }">
+                {{ town }}里海云仓
+              </view>
+            </view>
+            <view class="" style="display: flex; align-items: center">
+              <view class="head_r" @click="showPop = true" v-if="cloudList.length > 0">
+                <u--image v-if="cloudList.length > 0" :showLoading="true" src="/static/images/LHYC/QB.png"
+                  width="50.82rpx" height="50.82rpx"></u--image>
+                <u--image v-else :showLoading="true" src="/static/images/LHYC/QB1.png" width="50.82rpx"
+                  height="50.82rpx"></u--image>
+              </view>
+            </view>
+          </view>
+        </view>
 
-							<view class="head_tit" v-if="cloudList.length"
-								style="font-size: 40rpx;transform: skewX(-10deg);font-weight: bold;"
-								:style="{color:cloudList.length>0?'':'black'}">
-								{{town}}里海云仓
-							</view>
-						</view>
-						<view class="" style="display: flex;align-items: center;">
-							<view class="head_r" @click="showPop=true" v-if="cloudList.length>0">
-								<u--image v-if="cloudList.length>0" :showLoading="true" src="/static/images/LHYC/QB.png"
-									width="50.82rpx" height="50.82rpx"></u--image>
-								<u--image v-else :showLoading="true" src="/static/images/LHYC/QB1.png" width="50.82rpx"
-									height="50.82rpx"></u--image>
-							</view>
-
-						</view>
-					</view>
-
-
-				</view>
-
-
-
-
-
-				<!-- 滚动 -->
-				<view :class="{'heads':true,'show':!showtit}" style="padding-top: var(--status-bar-height);">
-					<view style="align-items: center;display: flex;justify-content: space-between;">
-						<view class="" style="display: flex;align-items: center;">
-							<view class="back" style="margin-right: 17rpx;">
-								<!-- <u--image :showLoading="true" src="/static/images/LHYC/FH.png" width="50.82rpx"
+        <!-- 滚动 -->
+        <view :class="{ heads: true, show: !showtit }" style="padding-top: var(--status-bar-height)">
+          <view style="
+              align-items: center;
+              display: flex;
+              justify-content: space-between;
+            ">
+            <view class="" style="display: flex; align-items: center">
+              <view class="back" style="margin-right: 17rpx">
+                <!-- <u--image :showLoading="true" src="/static/images/LHYC/FH.png" width="50.82rpx"
 									height="50.82rpx" @click='goBack'></u--image> -->
-									<i class="iconfont icon-xiangzuo"  style="font-size: 40rpx;text-align: left;"
-										@click='goBack'></i>
-							</view>
-							<view class="" style="font-size: 40rpx;transform: skewX(-10deg);font-weight: 700;">
-								供销综合云市场
-							</view>
-						</view>
+                <i class="iconfont icon-xiangzuo" style="font-size: 40rpx; text-align: left" @click="goBack"></i>
+              </view>
+              <!-- <view class="" style="font-size: 40rpx;transform: skewX(-10deg);font-weight: 700;">
+						    {town}}
+							</view> -->
+              <view class="head_tit" v-if="cloudList.length" style="
+                  font-size: 40rpx;
+                  transform: skewX(-10deg);
+                  font-weight: bold;
+                " :style="{ color: cloudList.length > 0 ? '' : 'black' }">
+                {{ town }}里海云仓
+              </view>
+            </view>
 
-						<view style="position: relative;width: 289.14rpx;">
-							<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="请输入..."
-								v-model="keyword" class="serch_cls"></u-search>
-							<u--image class="img_cls" :showLoading="true" src="/static/images/GXSC/SSBT.png"
-								width="115.65rpx" height="56.82rpx" @click="serch"></u--image>
-						</view>
-						<view class='head_r' @click="showPop=true">
-							<u--image :showLoading="true" src="/static/images/LHYC/QB.png" width="50.82rpx"
-								height="50.82rpx"></u--image>
-							<text class="" style="height: 5px;"></text>
-							<view class="flags">
+            <view style="position: relative; width: 289.14rpx">
+              <u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="请输入..." v-model="keyword"
+                class="serch_cls"></u-search>
+              <!-- <u--image class="img_cls" :showLoading="true" src="/static/images/GXSC/SSBT.png"
+								width="115.65rpx" height="56.82rpx" @click="serch"></u--image> -->
 
-							</view>
-						</view>
-					</view>
-				</view>
+              <view class="serchbtn img_cls" @click="serch">搜索</view>
+            </view>
+            <view class="head_r" @click="showPop = true">
+              <u--image :showLoading="true" src="/static/images/LHYC/QB.png" width="50.82rpx"
+                height="50.82rpx"></u--image>
+              <text class="" style="height: 5px"></text>
+              <view class="flags"> </view>
+            </view>
+          </view>
+        </view>
 
-				<view class="box" v-if="cloudList.length>0">
-					<view :class="act_swiper">
-						<swiper :autoplay="false" :active-class="activeClass" :interval="3000" class="swipers"
-							:circular="true" previous-margin='0rpx' next-margin='0rpx' :current="current"
-							:disable-touch="true">
-							<swiper-item v-for="(item,index) in cloudList">
-								<u--image :showLoading="true" :src="item.cover" :class="act_img" width="750rpx"
-									height="998.83rpx"></u--image>
-							</swiper-item>
-						</swiper>
-					</view>
-					<view class="" style="height:998.83rpx;" v-if="act_swiper">
+        <view class="box" v-if="cloudList.length > 0">
+          <view :class="act_swiper">
+            <swiper :autoplay="false" :active-class="activeClass" :interval="3000" class="swipers" :circular="true"
+              previous-margin="0rpx" next-margin="0rpx" :current="current" :disable-touch="true">
+              <swiper-item v-for="(item, index) in cloudList">
+                <u--image :showLoading="true" :src="item.cover" :class="act_img" width="750rpx"
+                  height="718.46rpx"></u--image>
+              </swiper-item>
+            </swiper>
+          </view>
+          <view class="" style="height: 718.46rpx" v-if="act_swiper"> </view>
 
-					</view>
+          <view class="menu" v-if="showtit" style="transition: 1s">
+            <swiper :autoplay="false" :active-class="activeClass" :interval="3000" class="swiper" :circular="true"
+              previous-margin="280rpx" next-margin="280rpx" :current="current" @change="test">
+              <swiper-item v-for="(item, index) in cloudList" :key="index" @click="clickSwiperFn(index)">
+                <view class="swiper_item" :class="{
+                    swiper_item_act: index == current,
+                    swiper_item_act2:
+                      index == current - 1 || index == current + 1,
+                  }">
+                  <u--image :showLoading="true" :src="item.background" class="swiper_b" width="140.19rpx"
+                    height="140.19rpx"></u--image>
+                </view>
+              </swiper-item>
+            </swiper>
+          </view>
 
+          <!-- 商品列表 -->
+          <view class="content">
+            <view class="content_sift" :style="{ position: pocls, top: headtop + 'px' }" v-if="!showtit">
+              <view :class="{ act: item.act, price_sift: true }" v-for="(item, index) in actList" :key="index"
+                @click="screenGoods(item.screen, index)">
+                {{ item.tit }}
+                <view class="" v-if="index == 2" style="margin-left: 10rpx">
+                  <u-icon name="arrow-up" :color="item.price && item.act ? '#FF6D20' : 'black'" size="10"></u-icon>
+                  <u-icon name="arrow-down" :color="!item.price && item.act ? '#FF6D20' : 'black'" size="10"></u-icon>
+                </view>
+              </view>
+            </view>
+            <view class="goods_list" v-if="goodsList.length > 0">
+              <view class="empty" v-if="showLoading">
+                <u-loading-icon v-if="showLoading" text="加载中" textSize="18"></u-loading-icon>
+              </view>
+              <view class="goods" @click="goodDetail(item)" v-else v-for="(item, index) in goodsList">
+                <view class="left">
+                  <!-- <u--image :showLoading="true" :src="item.image" width="192.76rpx" height="192.76rpx"></u--image> -->
+                  <image lazy-load style="height: 192.76rpx;width: 192.76rpx;" :src="item.image"></image>
+                </view>
+                <view class="right">
+                  <view class="tit">
+                    <!-- 亿福馒头粉纯天然无添加小麦粉加工 1000g/袋 -->
+                    {{ item.store_name || item.store_info }}
+                  </view>
+                  <view class="">
+                    <view class="good_score">
+                      <text style="margin-right: 10rpx; color: #f84221">{{
+                        item.rate
+                      }}</text>
+                      <text>{{ item.reply_count }}评论</text>
+                    </view>
+                    <view class="good_price">
+                      <view class="good_price_l">
+                        <view class="" style="
+                            color: #f84221;
+                            font-size: 22.78rpx;
+                            font-weight: bold;
+                          ">
+                          ￥<text style="font-size: 30rpx">{{
+                            item.price
+                          }}</text>
+                        </view>
+                        <view class="old_price"> ￥30.00 </view>
+                      </view>
+                      <view class="good_price_r">
+                        <view :class="{ x_tra: trnList[index]?trnList[index].bottom:0 }" :style="`transform:translateY(${
+                            trnList[index]?trnList[index].bottom:0
+                          }px);transition:${
+                            trnList[index]?trnList[index].bottom:0 ? 1 : 0
+                          }s  cubic-bezier(0.4, -0.9, 0.75, 1);`" @click.stop="addcart(item, index)">
+                          <u--image :class="'act_class' + index" :style="`transform:translateX(${
+                              trnList[index]?trnList[index].left:0
+                            }px);transition:${trnList[index]?trnList[index].bottom:0 ? 1 : 0}s `"
+                            src="/static/images/LHYC/J.png" width="49.07rpx" height="49.07rpx"></u--image>
+                        </view>
+                      </view>
+                    </view>
+                  </view>
+                </view>
+              </view>
+              <view style="height: 180rpx">
+                <u-loadmore :status="status" />
+              </view>
+            </view>
+            <!-- 空 -->
+            <view v-else>
+              <view class="empty">
+                <view class="info">
+                  <u--image :showLoading="true" src="/static/images/noCart.png" width="400.09rpx"
+                    height="400.09rpx"></u--image>
+                  <view class="" style="text-align: center; color: #999">
+                    暂无商品
+                  </view>
+                </view>
+              </view>
+            </view>
+            <!-- 购物车 -->
+            <view class="card" :style="`bottom:${appInfo.bottom}px`"
+              @click="navgo('/pages/order_addcart/order_addcart')">
+              <view class="left">
+                <view class="cart" :class="{ act_cart: act_cart }" style="position: relative; z-index: 9999999">
+                  <u--image :showLoading="true" src="/static/images/LHYC/GWC.png" width="63.09rpx"
+                    height="63.09rpx"></u--image>
 
-					<view class="menu" v-if="showtit" style="transition: 1s;">
-						<swiper :autoplay="false" :active-class="activeClass" :interval="3000" class="swiper"
-							:circular="true" previous-margin='270rpx' next-margin='270rpx' :current="current"
-							@change="test">
-							<swiper-item v-for="(item,index) in cloudList" :key="index" @click="clickSwiperFn(index)">
-								<view class="swiper_item" :class="{swiper_item_act:index==current}">
-									<u--image :showLoading="true" :src="item.background" class="swiper_b"
-										width="175.23rpx" height="175.23rpx"></u--image>
-								</view>
+                  <view class="badge" v-show="goodsNum">
+                    {{ goodsNum }}
+                  </view>
+                </view>
+                <view class="tot_price">
+                  <view class=""> ￥{{ totalMoney }} </view>
+                  <view class=""> 支持配送 售后无忧 </view>
+                </view>
+              </view>
+              <view class="right"> 去结算 </view>
+            </view>
+          </view>
+        </view>
+      </view>
+      <!-- 组件 -->
+      <view class="" v-if="showPop">
+        <u-popup mode="right" :show="showPop" @close="showPop = false" @open="showPop = true">
+          <view class="pop">
+            <view style="height: var(--status-bar-height)"></view>
+            <view class="pop_head" style="display: flex">
+              <u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx" height="50.82rpx"
+                @click="showPop = false"></u--image>
+              <view class="head_tit"> 里海云仓 </view>
+            </view>
+            <view class="pop_content" v-if="cloudList.length">
+              <view class="pop_li" @click="all(index)" v-for="(item, index) in cloudList" :key="index">
+                <u--image :showLoading="true" :src="item.background" width="84.11rpx" height="84.11rpx"></u--image>
+                <view class="" style="margin-left: 20rpx">
+                  <view style="font-size: 33.29rpx; color: black">
+                    {{ item.category_name }}云仓服务
+                  </view>
+                  <view class="" style="font-size: 22.78rpx">
+                    {{ item.description }}
+                  </view>
+                </view>
+              </view>
+            </view>
 
-							</swiper-item>
-						</swiper>
-					</view>
-					<!-- 商品列表 -->
-					<view class="content">
-						<view class="content_sift" :style="{position:pocls,top:(headtop)+'px'}" v-if="!showtit">
-							<view :class="{act:item.act,price_sift:true}" v-for="item,index in actList" :key="index"
-								@click="screenGoods(item.screen,index)">
-								{{item.tit}}
-								<view class="" v-if="index==2" style="margin-left: 10rpx;">
-									<u-icon name="arrow-up" :color="item.price&&item.act?'#FF6D20':'black'"
-										size="10"></u-icon>
-									<u-icon name="arrow-down" :color="!item.price&&item.act?'#FF6D20':'black'"
-										size="10"></u-icon>
-								</view>
-							</view>
-						</view>
-						<view class="goods_list" v-if="goodsList.length>0">
-							<view class="empty" v-if='showLoading'>
-								<u-loading-icon v-if='showLoading' text="加载中" textSize="18"></u-loading-icon>
-							</view>
-							<view class="goods" @click="goodDetail(item)" v-else v-for="item,index in goodsList">
-								<view class="left">
-									<u--image :showLoading="true" :src="item.image" width="192.76rpx"
-										height="192.76rpx"></u--image>
-								</view>
-								<view class="right">
-									<view class="tit">
-										<!-- 亿福馒头粉纯天然无添加小麦粉加工 1000g/袋 -->
-										{{item.store_info}}
-									</view>
-									<view class="">
-										<view class="good_score">
-											<text style="margin-right: 10rpx;color: #F84221;">{{item.rate}}</text>
-											<text>{{item.reply_count}}评论</text>
-										</view>
-										<view class="good_price">
-											<view class="good_price_l">
-												<view class=""
-													style="color: #F84221;font-size: 22.78rpx;font-weight: bold;">
-													￥<text style="font-size: 30rpx;">{{item.price}}</text>
-												</view>
-												<view class="old_price">
-													￥30.00
-												</view>
-											</view>
-											<view class="good_price_r">
-												<view :class="{x_tra:trnList[index].bottom }"
-													:style="`transform:translateY(${trnList[index].bottom}px);transition:${trnList[index].bottom?1:0}s  cubic-bezier(0.4, -0.9, 0.75, 1);`"
-													@click.stop="addcart(item,index)">
-													<u--image :class="'act_class'+index"
-														:style="`transform:translateX(${trnList[index].left}px);transition:${trnList[index].bottom?1:0}s `"
-														src="/static/images/LHYC/J.png" width="49.07rpx"
-														height="49.07rpx"></u--image>
-												</view>
-
-											</view>
-
-										</view>
-									</view>
-								</view>
-							</view>
-							<view style="height: 100rpx;">
-								<u-loadmore :status="status" />
-							</view>
-						</view>
-						<!-- 空 -->
-						<view v-else>
-							<view class="empty">
-								<view class="info">
-									<u--image :showLoading="true" src="/static/images/noCart.png" width="400.09rpx"
-										height="400.09rpx"></u--image>
-									<view class="" style="text-align: center;color:#999">
-										暂无商品
-									</view>
-								</view>
-							</view>
-						</view>
-						<!-- 购物车 -->
-						<view class="card" :style="`bottom:${appInfo.bottom}px`"
-							@click="navgo('/pages/order_addcart/order_addcart')">
-							<view class="left">
-								<view class="cart" :class="{act_cart:act_cart}"
-									style="position: relative;z-index: 9999999;">
-									<u--image :showLoading="true" src="/static/images/LHYC/GWC.png" width="63.09rpx"
-										height="63.09rpx"></u--image>
-
-									<view class="badge" v-show="goodsNum">
-										{{goodsNum}}
-									</view>
-								</view>
-								<view class="tot_price">
-									<view class="">
-										￥{{totalMoney}}
-									</view>
-									<view class="">
-										支持配送 售后无忧
-									</view>
-								</view>
-							</view>
-							<view class="right">
-								去结算
-							</view>
-						</view>
-					</view>
-
-
-				</view>
-			</view>
-			<!-- 组件 -->
-			<view class="" v-if="showPop">
-				<u-popup mode="right" :show="showPop" @close="showPop=false" @open="showPop=true">
-					<view class="pop">
-						<view style="height: var(--status-bar-height);"></view>
-						<view class="pop_head" style="display: flex;">
-							<u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx"
-								height="50.82rpx" @click='showPop=false'></u--image>
-							<view class="head_tit">
-								里海云仓
-							</view>
-						</view>
-						<view class="pop_content" v-if="cloudList.length">
-							<view class="pop_li" @click="all(index)" v-for="item,index in cloudList" :key="index">
-								<u--image :showLoading="true" :src="item.background" width="84.11rpx"
-									height="84.11rpx"></u--image>
-								<view class="" style="margin-left: 20rpx;">
-									<view style="font-size: 33.29rpx;color: black;">
-										{{item.category_name}}云仓服务
-									</view>
-									<view class="" style="font-size: 22.78rpx;">
-										{{item.description}}
-									</view>
-								</view>
-							</view>
-						</view>
-
-
-						<view v-else>
-							<!-- <u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx" height="50.82rpx"
+            <view v-else>
+              <!-- <u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx" height="50.82rpx"
 							@click='goBack'></u--image>
 					</view> -->
-							<view class="yuncangempty">
+              <view class="yuncangempty">
+                <u--image :showLoading="true" src="/static/images/noCart.png" width="400.09rpx"
+                  height="400.09rpx"></u--image>
+                <view class="" style="text-align: center; color: #999">
+                  当前区域暂无云仓
+                </view>
+              </view>
+            </view>
+          </view>
+        </u-popup>
+      </view>
+    </view>
 
-								<u--image :showLoading="true" src="/static/images/noCart.png" width="400.09rpx"
-									height="400.09rpx"></u--image>
-								<view class="" style="text-align: center;color:#999">
-									当前区域暂无云仓
-								</view>
-							</view>
-						</view>
+    <view class="empty" style="" v-if="cloudList.length <= 0">
+      <view style="height: var(--status-bar-height)"></view>
 
-					</view>
-				</u-popup>
+      <view style="padding: 10rpx">
+        <view class="info">
+          <u--image :showLoading="true" src="/static/images/noCart.png" width="400.09rpx" height="400.09rpx"></u--image>
+          <view class="" style="text-align: center; color: #999">
+            当前区域暂无云仓
+          </view>
+        </view>
+      </view>
 
-			</view>
+      <!-- 多规格购物车 -->
 
-		</view>
-
-
-
-
-
-
-		<view class="empty" style="" v-if="cloudList.length<=0">
-
-			<view style="height: var(--status-bar-height);"></view>
-
-
-			<view style="padding: 10rpx;">
-
-				<view class="info">
-					<u--image :showLoading="true" src="/static/images/noCart.png" width="400.09rpx"
-						height="400.09rpx"></u--image>
-					<view class="" style="text-align: center;color:#999">
-						当前区域暂无云仓
-					</view>
-				</view>
-			</view>
-
-			<!-- 多规格购物车 -->
-
-
-
-			<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse">
-			</authorize>
-			<view class="" :style="`height:${appInfo.bottom}px;`">
-			</view>
-		</view>
-
-
-
-
-
-
-		<view class="">
-			<u-picker :defaultIndex="defaInd" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
-				@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
-		</view>
-		<view class="" v-if="showcartpop">
-			<u-popup :show="showcartpop" @close="closecartpop" @open="opencartpop">
-				<view class="sku">
-					<view class="sku_head">
-						<view class="sku_head_l">
-							<u--image :showLoading="true" :src="skuform.image" width="200.09rpx"
-								height="200.09rpx"></u--image>
-						</view>
-						<view class="sku_head_r">
-							<view class="sku_goods_tit">
-								{{skuform.store_info}}
-							</view>
-							<view class="">
-								<view class="sku_goods_price">
-									￥ {{skuform.price}}
-								</view>
-								<view class="sku_goods_num" v-if="this.skusize">
-									库存:{{skuform.sku[this.skusize].stock}}
-								</view>
-							</view>
-						</view>
-					</view>
-					<view class="sku_size">
-						<view class="" style="margin-bottom: 10rpx;">
-							尺码
-						</view>
-						<view class="">
-							<text class="size_li" :class="{act_size_li:item.sku==skusize}"
-								v-for="(item,index) in skuform.sku" @click="skusizechange(item.sku)">{{item.sku}}</text>
-
-						</view>
-					</view>
-					<view class="sku_num">
-						<view class="">
-							数量
-						</view>
-						<view class="">
-							<u-number-box v-model="skuNumber" @change="valChange"></u-number-box>
-						</view>
-					</view>
-					<view class="skuaddcart" @click="skuaddcart">
-						确定
-					</view>
-
-				</view>
-			</u-popup>
-		</view>
-
-
-	</view>
+      <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse">
+      </authorize>
+      <view class="" :style="`height:${appInfo.bottom}px;`"> </view>
+    </view>
 
+    <view class="">
+      <u-picker :defaultIndex="defaInd" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
+        @cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
+    </view>
+    <view class="" v-if="showcartpop">
+      <u-popup :show="showcartpop" @close="closecartpop" @open="opencartpop">
+        <view class="sku">
+          <view class="sku_head">
+            <view class="sku_head_l">
+              <u--image :showLoading="true" :src="skuform.image" width="200.09rpx" height="200.09rpx"></u--image>
+            </view>
+            <view class="sku_head_r">
+              <view class="sku_goods_tit">
+                {{ skuform.store_info }}
+              </view>
+              <view class="">
+                <view class="sku_goods_price"> ￥ {{ skuform.price }} </view>
+                <view class="sku_goods_num" v-if="this.skusize">
+                  库存:{{ skuform.sku[this.skusize].stock }}
+                </view>
+              </view>
+            </view>
+          </view>
+          <view class="sku_size">
+            <view class="" style="margin-bottom: 10rpx"> 尺码 </view>
+            <view class="">
+              <text class="size_li" :class="{ act_size_li: item.sku == skusize }" v-for="(item, index) in skuform.sku"
+                @click="skusizechange(item.sku)">{{ item.sku }}</text>
+            </view>
+          </view>
+          <view class="sku_num">
+            <view class=""> 数量 </view>
+            <view class="">
+              <u-number-box v-model="skuNumber" @change="valChange"></u-number-box>
+            </view>
+          </view>
+          <view class="skuaddcart" @click="skuaddcart"> 确定 </view>
+        </view>
+      </u-popup>
+    </view>
+  </view>
 </template>
 
 <script>
-	import {
-		cloudWarehouse,
-		getCityCloundShop
-	} from '@/api/requesta.js'
-	import {
-		Toast
-	} from '@/libs/uniApi';
-	import {
-		initiateAssistApi
-	} from '@/api/activity.js';
-	import {
-		getCartCounts,
-		getCartList,
+  import {
+    cloudWarehouse,
+    getCityCloundShop
+  } from '@/api/requesta.js'
+  import {
+    Toast
+  } from '@/libs/uniApi';
+  import {
+    initiateAssistApi
+  } from '@/api/activity.js';
+  import {
+    getCartCounts,
+    getCartList,
 
-	} from '@/api/requesta.js';
-	import {
-		goShopDetail
-	} from '@/libs/order.js'
-	// 7200 = 8 = 80000 8616
-	import {
-		postCartAdd,
-	} from '@/api/store.js';
-	import authorize from '@/components/Authorize';
+  } from '@/api/requesta.js';
+  import {
+    goShopDetail
+  } from '@/libs/order.js'
+  // 7200 = 8 = 80000 8616
+  import {
+    postCartAdd,
+  } from '@/api/store.js';
+  import authorize from '@/components/Authorize';
 
-	import {
-		getArea,
-		getStreet
-	} from '@/api/article.js';
-	import {
-		getIndexData,
-		getDiy
-	} from '@/api/api.js'
-	import {
-		getGeocoder
-	} from '@/api/store.js';
-	import {
-		mapGetters
-	} from 'vuex'
-	import Cache from '@/utils/cache';
-	export default {
-		components: {
-			authorize,
-		},
-		data() {
-			let src = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13';
-			return {
-				skuform: {},
-				defaInd: [0, 0],
-				showPicker: false,
-				columnData: [],
-				skusize: 0,
-				skuNumber: 1,
-				showcartpop: false,
-				trnList: [],
-				act_cart: false,
-				appInfo: {},
-				pocls: "",
-				type: "",
-				act_swiper: "",
-				current: 3,
-				goodsNum: 0,
-				goodsList: [],
-				isEmpty: false,
-				winHeight: 0,
-				cloudList: [],
-				street: '',
-				street_code: '',
-				totalMoney: 0,
-				town: '',
-				list: [1, 1, 1, 1, 1],
-				showSelect: false,
-				showPop: false,
-				keyword: "",
-				showLoading: false,
-				tot_price: 1,
-				showtit: true,
-				cartList: [],
-				activeClass: 'activeClass',
-				headtop: 0,
-				page_num: 1,
-				act_img: "",
-				cartTagInfo: {},
-				isAuto: false,
-				actList: [{
-					tit: '综合',
-					act: "",
-					screen: ""
-				}, {
-					tit: '销量',
-					act: "",
-					screen: "sales"
-				}, {
-					tit: '价格',
-					act: "",
-					screen: "price_asc",
-					price: true,
-				}],
-				status: "loadmore",
-				flag: false,
-				isShowAuth: false, //是否隐藏授权
+  import {
+    getArea,
+    getStreet
+  } from '@/api/article.js';
+  import {
+    getIndexData,
+    getDiy
+  } from '@/api/api.js'
+  import {
+    getGeocoder
+  } from '@/api/store.js';
+  import {
+    mapGetters
+  } from 'vuex'
+  import Cache from '@/utils/cache';
+  export default {
+    components: {
+      authorize,
+    },
+    data() {
+      let src = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13';
+      return {
+        skuform: {},
+        defaInd: [0, 0],
+        showPicker: false,
+        columnData: [],
+        skusize: 0,
+        skuNumber: 1,
+        showcartpop: false,
+        trnList: [],
+        act_cart: false,
+        appInfo: {},
+        pocls: "",
+        type: "",
+        act_swiper: "",
+        current: 3,
+        goodsNum: 0,
+        goodsList: [],
+        isEmpty: false,
+        winHeight: 0,
+        cloudList: [],
+        street: '',
+        street_code: '',
+        totalMoney: 0,
+        town: '',
+        list: [1, 1, 1, 1, 1],
+        showSelect: false,
+        showPop: false,
+        keyword: "",
+        showLoading: false,
+        tot_price: 1,
+        showtit: true,
+        cartList: [],
+        activeClass: 'activeClass',
+        headtop: 0,
+        page_num: 1,
+        act_img: "",
+        cartTagInfo: {},
+        isAuto: false,
+        actList: [{
+          tit: '综合',
+          act: "",
+          screen: ""
+        }, {
+          tit: '销量',
+          act: "",
+          screen: "sales"
+        }, {
+          tit: '价格',
+          act: "",
+          screen: "price_asc",
+          price: true,
+        }],
+        status: "loadmore",
+        flag: false,
+        isShowAuth: false, //是否隐藏授权
 
-			}
-		},
-		computed: {
-			...mapGetters(['isLogin', 'viewColor', 'uid']),
-		},
-		// ...mapGetters(['isLogin', 'viewColor', 'uid']),
-		onLoad(e) {
-			// this.cartFn()
-			this.appInfo = this.$appInfo.safeAreaInsets
-			this.winHeight = this.$appInfo.windowHeight
-			this.street_code = e.street
-			this.town = e.town
-			this.getCloundShop()
-			this.street = e.town
-			this.Area()
-			let that = this
-			setTimeout(() => {
+      }
+    },
+    computed: {
+      ...mapGetters(['isLogin', 'viewColor', 'uid']),
+    },
+    // ...mapGetters(['isLogin', 'viewColor', 'uid']),
+    onLoad(e) {
+      // this.cartFn()
+      this.appInfo = this.$appInfo.safeAreaInsets
+      this.winHeight = this.$appInfo.windowHeight
+      this.street_code = e.street
+      this.town = e.town
+      this.getCloundShop()
+      this.street = e.town
+      this.Area()
+      let that = this
+      setTimeout(() => {
 
-				uni.createSelectorQuery()
-					.in(this)
-					.select('.flags')
-					.boundingClientRect(rect => {
-						this.headtop = rect.top
-					})
-					.exec();
-				uni.createSelectorQuery()
-					.in(this)
-					.select('.cart')
-					.boundingClientRect(rect => {
-						// console.log(this.cartTagInfo, 6666)
-						that.cartTagInfo = rect
-						console.log(rect)
-					})
-					.exec();
-				// console.log(that.headtop)
-			}, 500)
+        uni.createSelectorQuery()
+          .in(this)
+          .select('.flags')
+          .boundingClientRect(rect => {
+            this.headtop = rect.top
+          })
+          .exec();
+        uni.createSelectorQuery()
+          .in(this)
+          .select('.cart')
+          .boundingClientRect(rect => {
+            // console.log(this.cartTagInfo, 6666)
+            that.cartTagInfo = rect
 
-			// console.log(this.appInfo, "手机信息")
-		},
-		onShow() {
-			this.cartFn()
-			this.showSelect = false
-		},
-		// 分页
-		onReachBottom() {
-			if (this.flag || !this.goodsList.length) return
-			this.status = "loading"
-			this.page_num += 1
-			this.flag = true
-			cloudWarehouse({
-				street_code: this.street_code,
-				category_id: this.cloudList[this.current]?.category_id || "",
-				order: this.type,
-				keyword: this.keyword,
-				page_num: this.page_num
+          })
+          .exec();
+      }, 500)
 
-			}).then(res => {
-				// console.log(res.data.list[0].product_id, this.goodsList[0].product_id)
-				if (res.data.list[0].product_id == this.goodsList[0].product_id) {
-					this.status = "nomore"
-					this.flag = false
-				} else {
-					if (res.data.list.length == 0) {
-						this.status = "nomore"
-						return
-					}
-					this.goodsList = this.goodsList.concat(res.data.list)
-				}
-			})
-			// this.getList().then(res => {
-			// 	// console.log(res)
-			// 	return
-			// 	this.goodsList = this.goodsList.concat(res.data.data)
-			// 	this.flag = false
-			// 	if (!res.data.data.length) {
-			// 		this.status = "nomore"
-			// 		this.flag = true
-			// 	}
-			// })
-		},
-		onPageScroll(e) {
-			let that = this
-			// if (e.scrollTop > 0) {
-			this.showtit = !Boolean(e.scrollTop)
-			// }
-			// console.log(e)
+      // console.log(this.appInfo, "手机信息")
+    },
+    onShow() {
+      this.cartFn()
+      this.showSelect = false
+    },
+    // 分页
+    onReachBottom() {
+      if (this.flag || !this.goodsList.length) return
+      this.status = "loading"
+      this.page_num += 1
+      // this.flag = true
+      cloudWarehouse({
+        street_code: this.street_code,
+        category_id: this.cloudList[this.current]?.category_id || "",
+        order: this.type,
+        keyword: this.keyword,
+        page_num: this.page_num
 
-			uni.createSelectorQuery()
-				.in(this)
-				.select('.content')
-				.boundingClientRect(rect => {
-					if (rect.top <= (this.headtop)) {
-						this.pocls = 'fixed'
-						this.act_swiper = 'act_swiper'
-						this.act_img = 'act_img'
+      }).then(res => {
+        if (res.data.list.length == 0) {
+          this.status = "nomore"
+          this.flag = true
+          return
+        }
+        if (res.data.list[0].product_id == this.goodsList[0].product_id) {
+          this.status = "nomore"
+          this.flag = true
+        } else {
+          this.goodsList = this.goodsList.concat(res.data.list);
+        }
+      })
+      // this.getList().then(res => {
+      // 	// console.log(res)
+      // 	return
+      // 	this.goodsList = this.goodsList.concat(res.data.data)
+      // 	this.flag = false
+      // 	if (!res.data.data.length) {
+      // 		this.status = "nomore"
+      // 		this.flag = true
+      // 	}
+      // })
+    },
+    onPageScroll(e) {
+      let that = this
+      // if (e.scrollTop > 0) {
+      this.showtit = !Boolean(e.scrollTop)
+      // }
+      // console.log(e)
 
-					} else {
-						this.pocls = ''
-						this.act_swiper = ''
-						this.act_img = ''
+      uni.createSelectorQuery()
+        .in(this)
+        .select('.content')
+        .boundingClientRect(rect => {
+          if (rect.top <= (this.headtop)) {
+            this.pocls = 'fixed'
+            this.act_swiper = 'act_swiper'
+            this.act_img = 'act_img'
 
-					}
-				})
-				.exec();
-			uni.createSelectorQuery()
-				.in(this)
-				.select('.cart')
-				.boundingClientRect(rect => {
-					// console.log(this.cartTagInfo, 6666)
-					that.cartTagInfo = rect
-					// console.log(rect)
-				})
-				.exec();
-		},
-		onPullDownRefresh() {
-			this.getCloundShop()
-			this.getList()
-			this.cartFn()
-			uni.stopPullDownRefresh()
-		},
-		methods: {
-			showpick() {
-				this.showPicker = !this.showPicker
+          } else {
+            this.pocls = ''
+            this.act_swiper = ''
+            this.act_img = ''
+
+          }
+        })
+        .exec();
+      uni.createSelectorQuery()
+        .in(this)
+        .select('.cart')
+        .boundingClientRect(rect => {
+          // console.log(this.cartTagInfo, 6666)
+          that.cartTagInfo = rect
+          // console.log(rect)
+        })
+        .exec();
+    },
+    onPullDownRefresh() {
+      this.getCloundShop()
+      this.getList()
+      this.cartFn()
+      uni.stopPullDownRefresh()
+    },
+    methods: {
+      showpick() {
+        this.showPicker = !this.showPicker
 
 
-			},
-			swiperClick(item) {
-				const url = item.info[1].value
-				uni.navigateTo({
-					url: url
-				})
-			},
-			selectLocation() {
-				this.isSelectPlace ? this.showPicker = true : ''
+      },
+      swiperClick(item) {
+        const url = item.info[1].value
+        uni.navigateTo({
+          url: url
+        })
+      },
+      selectLocation() {
+        this.isSelectPlace ? this.showPicker = true : ''
 
-			},
+      },
 
-			confirm(e) {
-				this.showPicker = false
-				this.$emit('selectPlce', e)
-				this.$emit('change', e)
-				this.street = e.value[1].name
-				this.$nextTick(() => {
-					this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
+      confirm(e) {
+        this.showPicker = false
+        this.$emit('selectPlce', e)
+        this.$emit('change', e)
+        this.street = e.value[1].name
+        this.$nextTick(() => {
+          this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
 
-				})
+        })
 
-				// this.sotreParam.street_id = e.value[1].code
-				this.street_code = e.value[1].code
-				this.getCloundShop()
-				this.town = e.value[1].name
-				// this.storeMerchantList()
+        // this.sotreParam.street_id = e.value[1].code
+        this.street_code = e.value[1].code
+        this.getCloundShop()
+        this.town = e.value[1].name
+        // this.storeMerchantList()
 
-			},
-			changeHandler(e) {
-				const {
-					columnIndex,
-					value,
-					values,
-					index,
-					picker = this.$refs.uPicker
-				} = e;
-				if (columnIndex === 0) {
-					getStreet({
-						area_code: value[0]['code']
-					}).then(res => {
-						picker.setColumnValues(1, res.data);
-					});
-				}
-			},
-			Area() {
-				let that = this
-				getArea({
-					city_code: 510500
-				}).then(res => {
+      },
+      changeHandler(e) {
+        const {
+          columnIndex,
+          value,
+          values,
+          index,
+          picker = this.$refs.uPicker
+        } = e;
+        if (columnIndex === 0) {
+          getStreet({
+            area_code: value[0]['code']
+          }).then(res => {
+            picker.setColumnValues(1, res.data);
+          });
+        }
+      },
+      Area() {
+        let that = this
+        getArea({
+          city_code: 510500
+        }).then(res => {
 
-					this.$refs.uPicker.setColumnValues(0, res.data);
-					this.Street(res.data[0]['code']);
-					// console.log(res.data, 66666)
-				});
-			},
-			Street(code) {
-				getStreet({
-					area_code: code
-				}).then(res => {
-					this.$refs.uPicker.setColumnValues(1, res.data);
+          this.$refs.uPicker.setColumnValues(0, res.data);
+          this.Street(res.data[0]['code']);
+          // console.log(res.data, 66666)
+        });
+      },
+      Street(code) {
+        getStreet({
+          area_code: code
+        }).then(res => {
+          this.$refs.uPicker.setColumnValues(1, res.data);
 
-				});
-			},
+        });
+      },
 
-			swiperChange(e) {
-				let {
-					current,
-					source
-				} = e.detail;
-				if (source === 'autoplay' || source === 'touch') {
-					this.bgColor = this.swiper.url[e.detail.current]['img']
-					this.$emit('kkchange', this.bgColor)
-				}
-			},
+      swiperChange(e) {
+        let {
+          current,
+          source
+        } = e.detail;
+        if (source === 'autoplay' || source === 'touch') {
+          this.bgColor = this.swiper.url[e.detail.current]['img']
+          this.$emit('kkchange', this.bgColor)
+        }
+      },
 
 
-			// 对象转数组
-			objToArr(data) {
-				let obj = Object.keys(data).sort();
-				let m = obj.map(key => data[key]);
-				return m;
-			},
-			skusizechange(i) {
+      // 对象转数组
+      objToArr(data) {
+        let obj = Object.keys(data).sort();
+        let m = obj.map(key => data[key]);
+        return m;
+      },
+      skusizechange(i) {
 
-				this.skusize = i
-			},
-			skuaddcart() {
-				this.showcartpop = false
-				// this.skuform = {}
-				let res = postCartAdd({
-					cart_num: this.skuNumber,
-					is_new: 0,
-					product_attr_unique: this.skuform.sku[this.skusize].unique,
-					product_id: this.skuform.product_id,
-					product_type: this.skuform.product_type,
-					spread_id: "",
-				}).then((res, err) => {
-					this.cartFn()
-					uni.showToast({
-						title: "加入成功",
-						duration: 1000,
+        this.skusize = i
+      },
+      skuaddcart() {
+        this.showcartpop = false
+        // this.skuform = {}
+        let res = postCartAdd({
+          cart_num: this.skuNumber,
+          is_new: 0,
+          product_attr_unique: this.skuform.sku[this.skusize].unique,
+          product_id: this.skuform.product_id,
+          product_type: this.skuform.product_type,
+          spread_id: "",
+        }).then((res, err) => {
+          this.cartFn()
+          uni.showToast({
+            title: "加入成功",
+            duration: 1000,
 
-					})
-				}).catch(err => {
-					// this.act_cart = false
-					uni.showToast({
-						title: err,
-						icon: "none",
-						duration: 1000,
-					})
-				})
+          })
+        }).catch(err => {
+          // this.act_cart = false
+          uni.showToast({
+            title: err,
+            icon: "none",
+            duration: 1000,
+          })
+        })
 
-			},
-			valChange(e) {
-				this.skuNumber = e.value
+      },
+      valChange(e) {
+        this.skuNumber = e.value
 
-			},
-			closecartpop() {
-				this.showcartpop = false
-			},
-			opencartpop() {
-				this.showcartpop = true
-			},
-			// 授权关闭
-			authColse: function(e) {
-				this.isShowAuth = e;
-			},
+      },
+      closecartpop() {
+        this.showcartpop = false
+      },
+      opencartpop() {
+        this.showcartpop = true
+      },
+      // 授权关闭
+      authColse: function(e) {
+        this.isShowAuth = e;
+      },
 
-			onLoadFun() {
-				this.isShowAuth = false;
-			},
-			clickSwiperFn(i) {
-				// console.log(i)
-				this.current = i
-			},
-			cartFn() {
-				getCartList().then(res => {
-					// console.log(res)
-					this.totalMoney = 0
-					this.cartList = res.data.list
-					this.cartList.forEach(e => {
+      onLoadFun() {
+        this.isShowAuth = false;
+      },
+      clickSwiperFn(i) {
+        // console.log(i)
+        this.current = i
+      },
+      cartFn() {
+        getCartList().then(res => {
+          // console.log(res)
+          this.totalMoney = 0
+          this.cartList = res.data.list
+          this.cartList.forEach(e => {
 
-						e.list.forEach(item => {
-							this.totalMoney += item.cart_num * item.productAttr.price
-						})
+            e.list.forEach(item => {
+              this.totalMoney += item.cart_num * item.productAttr.price
+            })
 
-					})
-					this.totalMoney = this.totalMoney.toFixed(2)
-				})
-				getCartCounts().then(res => {
-					this.goodsNum = res.data[0].count
-				})
-			},
-			goodDetail(item) {
-				goShopDetail(item, this.uid).then(res => {
-					if (this.isLogin) {
-						initiateAssistApi(item.activity_id).then(res => {
-							let id = res.data.product_assist_set_id;
-							uni.hideLoading();
-							uni.navigateTo({
-								url: '/pages/activity/assist_detail/index?id=' + id
-							});
-						}).catch((err) => {
-							uni.showToast({
-								title: err,
-								icon: 'none'
-							})
-						});
-					} else {
-						this.isAuto = true;
-						this.isShowAuth = true
-					}
+          })
+          this.totalMoney = this.totalMoney.toFixed(2)
+        })
+        getCartCounts().then(res => {
+          this.goodsNum = res.data[0].count
+        })
+      },
+      goodDetail(item) {
+        goShopDetail(item, this.uid).then(res => {
+          if (this.isLogin) {
+            initiateAssistApi(item.activity_id).then(res => {
+              let id = res.data.product_assist_set_id;
+              uni.hideLoading();
+              uni.navigateTo({
+                url: '/pages/activity/assist_detail/index?id=' + id
+              });
+            }).catch((err) => {
+              uni.showToast({
+                title: err,
+                icon: 'none'
+              })
+            });
+          } else {
+            this.isAuto = true;
+            this.isShowAuth = true
+          }
 
-				})
-			},
-			serch() {
-				this.getList()
-			},
-			goBack() {
-				uni.navigateBack()
-			},
-			screenGoods(type, i) {
-				this.actList.forEach(item => {
-					item.act = ""
-				})
-				this.actList[i].act = true
-				this.type = type
-				if (i == 2) {
-					this.actList[i].price = !this.actList[i].price
-					this.type = this.actList[i].price ? 'price_asc' : ''
-				}
-				this.getList()
+        })
+      },
+      serch() {
+        this.getList()
+      },
+      goBack() {
+        uni.navigateBack()
+      },
+      screenGoods(type, i) {
+        this.actList.forEach(item => {
+          item.act = ""
+        })
+        this.actList[i].act = true
+        this.type = type
+        if (i == 2) {
+          this.actList[i].price = !this.actList[i].price
+          this.type = this.actList[i].price ? 'price_asc' : ''
+        }
+        this.getList()
 
-				// console.log(this.type)
+        // console.log(this.type)
 
-			},
-			navgo(url) {
-				uni.redirectTo({
-					url
-				})
-			},
-			getList() {
-				this.showLoading = true
-				this.status = "loading"
-				cloudWarehouse({
-					street_code: this.street_code,
-					category_id: this.cloudList[this.current]?.category_id || "",
-					order: this.type,
-					keyword: this.keyword,
-					page_num: this.page_num
+      },
+      navgo(url) {
+        uni.redirectTo({
+          url
+        })
+      },
+      getList() {
+        this.showLoading = true
+        this.status = "loading"
+        this.page_num = 1;
+        cloudWarehouse({
+          street_code: this.street_code,
+          category_id: this.cloudList[this.current]?.category_id || "",
+          order: this.type,
+          keyword: this.keyword,
+          page_num: this.page_num
+        }).then(res => {
+          this.goodsList = res.data.list;
+          this.showLoading = false;
+          if (res.data.list.length < 10) this.status = 'nomore';
+          else this.status = 'loadmore';
+          this.goodsList.forEach(item => {
+            this.trnList.push({
+              left: 0,
+              bottom: 0
+            })
+          })
+        })
 
-				}).then(res => {
-					this.goodsList = res.data.list
-					this.showLoading = false
-					this.goodsList.forEach(item => {
-						this.trnList.push({
-							left: 0,
-							bottom: 0
-						})
-					})
-				})
+      },
+      addcart(item, i) {
+        if (!this.isLogin) {
+          this.isAuto = true;
+          this.isShowAuth = true
+          return
+        }
 
-			},
-			addcart(item, i) {
-				if (!this.isLogin) {
-					this.isAuto = true;
-					this.isShowAuth = true
-					return
-				}
+        if (item.sku['']) {
+          let data = {
+            cart_num: 1,
+            is_new: 0,
+            product_attr_unique: item.sku[''].unique,
+            product_id: item.product_id,
+            product_type: item.product_type,
+            spread_id: "",
+          }
+          let that = this
 
-				if (item.sku['']) {
-					let data = {
-						cart_num: 1,
-						is_new: 0,
-						product_attr_unique: item.sku[''].unique,
-						product_id: item.product_id,
-						product_type: item.product_type,
-						spread_id: "",
-					}
-					let that = this
+          uni.createSelectorQuery().in(this).select(`.act_class${i}`).boundingClientRect(data1 => {
+            that.trnList[i].left = that.cartTagInfo?.left - data1.left;
+            that.trnList[i].bottom = that.cartTagInfo?.top - data1.top;
 
-					uni.createSelectorQuery().in(this).select(`.act_class${i}`).boundingClientRect(data1 => {
-						that.trnList[i].left = that.cartTagInfo.left - data1.left;
-						that.trnList[i].bottom = that.cartTagInfo.top - data1.top;
+            let timer = setTimeout(() => {
+              that.trnList[i].left = 0
+              that.trnList[i].bottom = 0
+              that.act_cart = true
+              setTimeout(() => {
+                that.act_cart = false
+              }, 500)
+            }, 1000)
+          }).exec();
+          let res = postCartAdd({
+            ...data
+          }).then((res, err) => {
+            this.cartFn()
+            uni.showToast({
+              title: "加入成功",
+              duration: 1000,
 
-						let timer = setTimeout(() => {
-							that.trnList[i].left = 0
-							that.trnList[i].bottom = 0
-							that.act_cart = true
-							setTimeout(() => {
-								that.act_cart = false
-							}, 500)
-						}, 1000)
-					}).exec();
-					let res = postCartAdd({
-						...data
-					}).then((res, err) => {
-						this.cartFn()
-						uni.showToast({
-							title: "加入成功",
-							duration: 1000,
+            })
+          }).catch(err => {
+            uni.showToast({
+              title: err,
+              icon: "none",
+              duration: 1000,
+            })
+          })
+          setTimeout(() => {
+            that.act_cart = false
+          }, 500)
+        } else {
+          this.skuform = item
+          this.showcartpop = true
+          const keys = Object.keys(item.sku);
+          const firstKey = keys[0];
+          this.skusize = keys[0]
 
-						})
-					}).catch(err => {
-						uni.showToast({
-							title: err,
-							icon: "none",
-							duration: 1000,
-						})
-					})
-					setTimeout(() => {
-						that.act_cart = false
-					}, 500)
-				} else {
-					this.skuform = item
-					this.showcartpop = true
-					const keys = Object.keys(item.sku);
-					const firstKey = keys[0];
-					this.skusize = keys[0]
-
-				}
-				return
+        }
+        return
 
 
-			},
-			all(index) {
-				this.showPop = false
-				this.current = index
-				this.getList()
-			},
-			test(e) {
-				// console.log(e.target.current)
-				this.current = e.target.current
-				// console.log(e)
-				this.getList()
-			},
+      },
+      all(index) {
+        this.showPop = false
+        this.current = index
+        this.getList()
+      },
+      test(e) {
+        // console.log(e.target.current)
+        this.current = e.target.current
+        // console.log(e)
+        this.getList()
+      },
 
-			async getCloundShop() {
-				const {
-					data
-				} = await getCityCloundShop({
-					street_code: this.street_code
-				})
-				this.cloudList = data
-				cloudWarehouse({
-					street_code: this.street_code,
-					category_id: this.cloudList[this.current].category_id
-				}).then(res => {
-					this.trnList = []
-					this.goodsList = res.data.list
-					this.goodsList.forEach(item => {
-						this.trnList.push({
-							left: 0,
-							bottom: 0
-						})
-					})
-				})
-			}
-		}
-	}
+      async getCloundShop() {
+        const {
+          data
+        } = await getCityCloundShop({
+          street_code: this.street_code
+        })
+        this.cloudList = data
+        cloudWarehouse({
+          street_code: this.street_code,
+          category_id: this.cloudList[this.current].category_id
+        }).then(res => {
+          this.trnList = []
+          this.goodsList = res.data.list
+          this.goodsList.forEach(item => {
+            this.trnList.push({
+              left: 0,
+              bottom: 0
+            })
+          })
+        })
+      }
+    }
+  }
 </script>
 
 <style lang="scss" scoped>
-	@keyframes addcart {
-		from {
-			// background-color: red;
-			opacity: 1,
-		}
-
-		to {
-			// background-color: yellow;
-			opacity: 0,
-		}
-	}
-
-	.selected-list {
-		padding: 24rpx 14rpx;
-		border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx;
-		background-color: #fff;
-		position: absolute;
-		left: 100rpx;
-		font-size: 29.79rpx;
-		z-index: 9999;
-		// top: 100rpx;
-		opacity: 0;
-		transition: 0.5s;
-
-
-
-		.triangle-up {
-			width: 0;
-			height: 0;
-			border-left: 10rpx solid transparent;
-			border-right: 10rpx solid transparent;
-			border-bottom: 10rpx solid white;
-			position: absolute;
-			top: -10rpx;
-		}
-
-		.selected-li {
-			margin-top: 35rpx;
-			color: #F84221;
-			display: flex;
-			align-items: center;
-		}
-	}
-
-
-	.sku {
-		padding: 20rpx;
-
-		.sku_head {
-			display: flex;
-
-			.sku_head_r {
-				margin-left: 20rpx;
-				display: flex;
-				justify-content: space-between;
-				flex-direction: column;
-
-				.sku_goods_tit {
-					font-size: 30rpx;
-					width: 60vw;
-					/* 容器的宽度 */
-					overflow: hidden;
-					text-overflow: ellipsis;
-					white-space: nowrap;
-				}
-
-				.sku_goods_price {
-					color: red;
-					font-size: 30rpx;
-					font-weight: bold;
-				}
-			}
-
-			// justify-content;
-		}
-
-		.sku_size {
-			margin: 40rpx 0;
-
-			.size_li {
-				display: inline-block;
-				// width: 100rpx;
-				padding: 5rpx 20rpx;
-				margin-right: 20rpx;
-				text-align: center;
-				color: black;
-				border: 1px solid #EBECEE;
-
-				// height: 2;
-			}
-
-			.act_size_li {
-				background-color: #FF5C2D;
-				color: white;
-				border: #FF5C2D 1px solid;
-
-			}
-		}
-
-		.sku_num {
-			display: flex;
-			justify-content: space-between;
-		}
-
-		.skuaddcart {
-			width: 50vw;
-			background-color: #FEAB00;
-			margin: 20rpx auto;
-			height: 80rpx;
-			line-height: 80rpx;
-			text-align: center;
-			color: white;
-			border-radius: 80rpx;
-			// margin-top: 20rpx;
-		}
-	}
-
-	.flags {
-		background-color: red;
-		z-index: 99999999;
-	}
-
-	.swiper_item {
-		display: flex;
-		justify-content: space-around;
-		transition: .5s;
-		padding: 40rpx;
-		// transform: scale(1.2);
-	}
-
-	.swiper_item_act {
-		transform: scale(1.2);
-	}
-
-	// .swiper_item:hover {}
-
-
-	// .swiper_item {
-	// 	transform: scale(1.2);
-	// }
-
-	.swiper_b {
-		transition: 1s;
-	}
-
-	// .swiper_b:active {
-	// 	transform: scale(1.5);
-	// }
-
-	.act_cart {
-		transition: 0.5s;
-		transform: scale(1.1);
-	}
-
-	.box {
-		position: relative;
-
-		.content {
-			width: 100vw;
-			// transform: translateY(-100px);
-			border-radius: 50rpx 50rpx 0 0;
-			// position: absolute;
-			// top: 965rpx;
-			// border-top: 5px solid red;
-			z-index: 9999;
-			background-color: white;
-			// padding: 0 10rpx;
-
-		}
-
-
-
-		.active_swiper {
-			transform: scale(1.3);
-			// transform: translateX() translateY();
-
-		}
-
-		.pictrue {
-			position: relative;
-			width: 100%;
-			height: 345rpx;
-
-		}
-
-		.act {
-			color: #FF6D20;
-		}
-
-		.act_content {
-			width: 100vw;
-			// position: absolute;
-			// top: 965rpx;
-			z-index: 99;
-			background-color: #F4F4F4;
-			padding: 0 10rpx;
-
-			// transition: opt\ linear;
-			padding-top: 200rpx;
-		}
-
-		.act_class {
-			transition: 0.5s;
-		}
-
-		.act_class:active {
-			transform: scale(2);
-		}
-
-
-
-		.content_act {
-			width: 100vw;
-			position: absolute;
-			top: 165rpx;
-			z-index: 99;
-			background-color: #F4F4F4;
-			padding: 0 10rpx;
-		}
-	}
-
-	.fade-enter-active,
-	.fade-leave-active {
-		transition: opacity 0.5s;
-
-	}
-
-	.fade-enter,
-	.fade-leave-to {
-		opacity: 0;
-	}
-
-	.head_tits {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		box-sizing: border-box;
-		padding: 0 20rpx;
-		color: white;
-	}
-
-	.img_cls {
-		position: absolute;
-		top: 50%;
-		right: 7rpx;
-		transform: translateY(-50%);
-
-	}
-
-	.pop {
-		width: 615.07rpx;
-		padding: 30rpx 28rpx;
-
-		.pop_content {
-			width: 559rpx;
-			height: 80vh;
-			background-color: #F4F4F4;
-			padding: 28rpx;
-			border-radius: 21.03rpx 21.03rpx 0rpx 0rpx;
-			margin-top: 47rpx;
-
-			.pop_head {
-				// display: flex;
-			}
-
-			.pop_li {
-				display: flex;
-				margin-bottom: 52rpx;
-			}
-		}
-
-
-	}
-
-	.head_tit {
-		margin-left: 20rpx;
-		font-size: 40rpx;
-		// background-color: red;
-		width: 40vw;
-		white-space: nowrap;
-		overflow: hidden;
-
-		text-overflow: ellipsis;
-
-		// font-weight: 700;
-		// transform: skewX(-10deg);
-	}
-
-
-	.act {
-		color: red;
-	}
-
-	.head {
-		position: fixed;
-		z-index: 999;
-		color: white;
-		display: flex;
-		justify-content: space-between;
-		width: 100%;
-		padding: 0 20rpx;
-		align-items: center;
-		transition: .5s;
-
-
-
-	}
-
-	.heads {
-		position: fixed;
-		z-index: 100;
-		color: white;
-		width: 100%;
-		padding: 0 20rpx;
-		transition: 1s;
-		opacity: 0;
-	}
-
-	.show {
-		opacity: 1;
-	}
-
-	.menu {
-		position: absolute;
-		top: 748rpx;
-		width: 750rpx;
-		// background-color: rgba(255, 255, 255, 0.7);
-		height: 250rpx;
-		// height: 175.23rpx;
-		// box-shadow: 0 0 100px 100px rgba(255, 255, 255, 0.5);
-		// box-shadow: 0 0 100rpx 30rpx rgba(255, 255, 255, 0.9);
-
-	}
-
-	.town_name {
-		margin-right: 50rpx;
-		// background-color: red;
-		max-width: 15vw;
-		white-space: nowrap;
-
-		overflow: hidden;
-
-		text-overflow: ellipsis;
-	}
-
-	.goods_list {
-		min-height: 95vh;
-		padding: 0 10rpx;
-		// background-color: red;
-
-		.goods {
-			display: flex;
-			padding: 21rpx;
-			background-color: white;
-			border-radius: 21.03rpx 21.03rpx 21.03rpx 21.03rpx;
-			margin-bottom: 20rpx;
-
-			.left {
-				width: 192.76rpx;
-				height: 192.76rpx;
-				border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx;
-				margin-right: 21rpx;
-			}
-
-			.right {
-				display: flex;
-				justify-content: space-between;
-				flex-direction: column;
-
-				.tit {
-					font-size: 29.79rpx;
-					color: black;
-					font-weight: bold;
-
-				}
-
-				.good_score {
-					font-size: 26rpx;
-					color: #B3B3B3;
-					margin-bottom: 15rpx;
-				}
-
-				.good_price {
-					display: flex;
-					justify-content: space-between;
-					align-items: center;
-					width: 60vw;
-
-					.good_price_r {
-						z-index: 9;
-					}
-
-					.good_price_l {
-						display: flex;
-
-						.old_price {
-							color: #B3B3B3;
-							text-decoration: line-through;
-							font-size: 26.29rpx;
-							margin-left: 15rpx;
-						}
-					}
-				}
-
-			}
-
-			// color: greenyellow;
-		}
-	}
-
-	.activeClass {
-		width: 400rpx;
-		height: 400rpx;
-	}
-
-	.act_swiper {
-		height: 200rpx;
-		position: fixed;
-		z-index: 99;
-		overflow: hidden;
-	}
-
-	.act_img {
-		// transition:t;
-		transform: translateY(-840rpx);
-		/* #ifdef APP-PLUS */
-		transform: translateY(-800rpx);
-		/* #endif */
-
-	}
-
-	// .act_swiper2 {
-	// 	height: 998rpx;
-	// }
-
-	.content_sift {
-		width: 750rpx;
-		padding: 22rpx 0;
-		// padding-top: 80rpx;
-		background-color: white;
-		display: flex;
-		justify-content: space-around;
-		// background-color: white;
-		// background-color: green;
-		z-index: 99;
-		box-sizing: border-box;
-		margin-bottom: 20rpx;
-
-
-	}
-
-	.swipers {
-		width: 750rpx;
-		height: 998.83rpx;
-	}
-
-	.card {
-		width: 720rpx;
-		z-index: 99;
-		// margin:auto;
-		left: 50%;
-		transform: translateX(-50%);
-		position: fixed;
-		// bottom: 0;
-		background-color: #333333;
-		height: 101.64rpx;
-		border-radius: 50.82rpx;
-		overflow: hidden;
-		color: white;
-		display: flex;
-		justify-content: space-between;
-		box-sizing: border-box;
-
-		.left {
-			display: flex;
-			align-items: center;
-			padding: 10rpx 35rpx;
-
-			.tot_price {
-				display: flex;
-				margin-left: 42rpx;
-				flex-direction: column;
-				justify-content: space-between;
-			}
-		}
-
-		.right {
-			font-size: 33.29rpx;
-			line-height: 50px;
-			background: linear-gradient(to right, #F84221, #FF6D20);
-			width: 175.23rpx;
-			text-align: center;
-		}
-	}
-
-	.badge {
-		position: absolute;
-		top: 0;
-		right: 0;
-		background-color: #F84221;
-		transform: translate(50%, -50%);
-		// padding: 10rpx 10rpx;
-		border-radius: 35rpx;
-		text-align: center;
-		width: 35rpx;
-		line-height: 35rpx;
-		height: 35rpx;
-	}
-
-	// .cloud_entrepot {
-	// 	background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/ycbg.png") no-repeat;
-	// 	background-size: cover;
-	// 	padding-bottom: 92.98rpx;
-	// }
-
-	// .head-wrapper {
-	// 	height: 485.96rpx;
-	// 	width: 100%;
-	// 	background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/top.png") no-repeat;
-	// 	background-size: cover;
-	// 	margin-bottom: 49.12rpx;
-	// }
-
-	// .town-title {
-	// 	margin: 0 auto;
-	// 	width: 100%;
-	// 	text-align: center;
-	// 	font-size: 50.88rpx;
-	// 	color: #fff;
-	// 	margin-bottom: 28.07rpx;
-
-	// 	&::after {
-	// 		content: '';
-	// 		display: inline-block;
-	// 		width: 66.67rpx;
-	// 		height: 31.58rpx;
-	// 		background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/you.png") no-repeat;
-	// 		background-size: cover;
-	// 		margin-left: 24.56rpx;
-	// 	}
-
-	// 	&::before {
-	// 		content: '';
-	// 		display: inline-block;
-	// 		width: 66.67rpx;
-	// 		height: 31.58rpx;
-	// 		background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/zuo.png") no-repeat;
-	// 		background-size: cover;
-	// 		margin-right: 24.56rpx;
-	// 	}
-	// }
-
-
-	// .body-wrapper {
-	// 	width: 694.74rpx;
-	// 	display: flex;
-	// 	justify-content: space-between;
-	// 	flex-wrap: wrap;
-	// 	margin: 0 auto;
-
-	// 	.item {
-	// 		width: 336.84rpx;
-	// 		height: 100%;
-	// 		padding: 24.56rpx 28.07rpx;
-	// 		margin-bottom: 21.05rpx;
-	// 		background-repeat: no-repeat;
-	// 		background-size: 100% 100%;
-	// 		box-sizing: border-box;
-
-	// 		text {
-	// 			display: block;
-	// 			font-size: 24.56rpx;
-	// 			color: #999;
-	// 			margin-bottom: 14.04rpx;
-	// 		}
-
-	// 		.item-title {
-	// 			font-size: 31.58rpx;
-	// 			color: #333;
-	// 		}
-
-	// 		.chakan-btn {
-	// 			width: 114.04rpx;
-	// 			height: 49.12rpx;
-	// 			font-size: 28.07rpx;
-	// 			text-align: center;
-	// 			line-height: 49.12rpx;
-	// 			color: #fff;
-	// 			margin-top: auto;
-	// 			background: linear-gradient(90deg, #FE5300 0%, #F84221 100%);
-	// 			border-radius: 50px;
-	// 		}
-	// 	}
-	// }
-
-	.empty {
-		// display: flex;
-		// justify-content: space-between;
-		// flex-direction: column;
-		// align-items: center;
-		// padding: 20vh 0;
-		position: relative;
-		height: 100vh;
-
-		.info {
-			position: absolute;
-			top: 50%;
-			left: 50%;
-			transform: translate(-50%, -50%);
-		}
-
-		// padding-top: 100px;
-	}
-
-	.head_r {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-	}
-
-	.cart {
-		z-index: 999;
-	}
-
-	.x_tra {
-		// position: relative;
-		z-index: 999999;
-		animation-name: addcatr;
-		animation-duration: 1s;
-		animation-timing-function: ease-in-out;
-		animation-iteration-count: 1;
-		animation-fill-mode: forwards; // animation-iteration-count: 1;
-		/* 设置为1 */
-		// transition: 1s cubic-bezier(0.5, -0.5, 1, 1);
-	}
-
-	.price_sift {
-		display: flex;
-		align-items: center;
-	}
-
-	.sl {
-		margin-left: 20rpx;
-		transform: rotate(180deg);
-		transition: 0.5s;
-	}
-
-	.actsl {
-		transform: rotate(0deg);
-	}
-
-	.actSel {
-		opacity: 1;
-		// transform: translateX(100rpx);
-
-	}
-
-	.yuncangempty {
-		margin: 20vh 0;
-		display: flex;
-		flex-direction: column;
-		align-items: center
-	}
+  @keyframes addcart {
+    from {
+      // background-color: red;
+      opacity: 1;
+    }
+
+    to {
+      // background-color: yellow;
+      opacity: 0;
+    }
+  }
+
+  .serchbtn {
+    // position: absolute;
+    // right: 5rpx;
+    // top: 5rpx;
+    width: 100rpx;
+    height: 50rpx;
+    border-radius: 30rpx;
+    text-align: center;
+    line-height: 50rpx;
+    // background-color: #FEAB00;
+    background: linear-gradient(to right, #f84221, #ff6d20);
+  }
+
+  .selected-list {
+    padding: 24rpx 14rpx;
+    border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx;
+    background-color: #fff;
+    position: absolute;
+    left: 100rpx;
+    font-size: 29.79rpx;
+    z-index: 9999;
+    // top: 100rpx;
+    opacity: 0;
+    transition: 0.5s;
+
+    .triangle-up {
+      width: 0;
+      height: 0;
+      border-left: 10rpx solid transparent;
+      border-right: 10rpx solid transparent;
+      border-bottom: 10rpx solid white;
+      position: absolute;
+      top: -10rpx;
+    }
+
+    .selected-li {
+      margin-top: 35rpx;
+      color: #f84221;
+      display: flex;
+      align-items: center;
+    }
+  }
+
+  .sku {
+    padding: 20rpx;
+
+    .sku_head {
+      display: flex;
+
+      .sku_head_r {
+        margin-left: 20rpx;
+        display: flex;
+        justify-content: space-between;
+        flex-direction: column;
+
+        .sku_goods_tit {
+          font-size: 30rpx;
+          width: 60vw;
+          /* 容器的宽度 */
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
+
+        .sku_goods_price {
+          color: red;
+          font-size: 30rpx;
+          font-weight: bold;
+        }
+      }
+
+      // justify-content;
+    }
+
+    .sku_size {
+      margin: 40rpx 0;
+
+      .size_li {
+        display: inline-block;
+        // width: 100rpx;
+        padding: 5rpx 20rpx;
+        margin-right: 20rpx;
+        text-align: center;
+        color: black;
+        border: 1px solid #ebecee;
+
+        // height: 2;
+      }
+
+      .act_size_li {
+        background-color: #ff5c2d;
+        color: white;
+        border: #ff5c2d 1px solid;
+      }
+    }
+
+    .sku_num {
+      display: flex;
+      justify-content: space-between;
+    }
+
+    .skuaddcart {
+      width: 50vw;
+      background-color: #feab00;
+      margin: 20rpx auto;
+      height: 80rpx;
+      line-height: 80rpx;
+      text-align: center;
+      color: white;
+      border-radius: 80rpx;
+      // margin-top: 20rpx;
+    }
+  }
+
+  .flags {
+    background-color: red;
+    z-index: 99999999;
+  }
+
+  .swiper_item {
+    display: flex;
+    justify-content: space-around;
+    transition: 0.5s;
+    padding: 40rpx;
+    // transform: scale(1.2);
+  }
+
+  .swiper_item_act {
+    transform: scale(1.2);
+  }
+
+  .swiper_item_act2 {
+    transform: scale(1.1);
+  }
+
+  // .swiper_item:hover {}
+
+  // .swiper_item {
+  // 	transform: scale(1.2);
+  // }
+
+  .swiper_b {
+    transition: 1s;
+  }
+
+  // .swiper_b:active {
+  // 	transform: scale(1.5);
+  // }
+
+  .act_cart {
+    transition: 0.5s;
+    transform: scale(1.1);
+  }
+
+  .box {
+    position: relative;
+
+    .content {
+      width: 100vw;
+      // transform: translateY(-100px);
+      border-radius: 50rpx 50rpx 0 0;
+      // position: absolute;
+      // top: 965rpx;
+      // border-top: 5px solid red;
+      z-index: 9999;
+      background-color: white;
+      // padding: 0 10rpx;
+    }
+
+    .active_swiper {
+      transform: scale(1.3);
+      // transform: translateX() translateY();
+    }
+
+    .pictrue {
+      position: relative;
+      width: 100%;
+      height: 345rpx;
+    }
+
+    .act {
+      color: #ff6d20;
+    }
+
+    .act_content {
+      width: 100vw;
+      // position: absolute;
+      // top: 965rpx;
+      z-index: 99;
+      background-color: #f4f4f4;
+      padding: 0 10rpx;
+
+      // transition: opt\ linear;
+      padding-top: 200rpx;
+    }
+
+    .act_class {
+      transition: 0.5s;
+    }
+
+    .act_class:active {
+      transform: scale(2);
+    }
+
+    .content_act {
+      width: 100vw;
+      position: absolute;
+      top: 165rpx;
+      z-index: 99;
+      background-color: #f4f4f4;
+      padding: 0 10rpx;
+    }
+  }
+
+  .fade-enter-active,
+  .fade-leave-active {
+    transition: opacity 0.5s;
+  }
+
+  .fade-enter,
+  .fade-leave-to {
+    opacity: 0;
+  }
+
+  .head_tits {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    box-sizing: border-box;
+    padding: 0 20rpx;
+    color: white;
+  }
+
+  .img_cls {
+    position: absolute;
+    top: 50%;
+    right: 5rpx;
+    transform: translateY(-50%);
+  }
+
+  .pop {
+    width: 615.07rpx;
+    padding: 30rpx 28rpx;
+
+    .pop_content {
+      width: 559rpx;
+      height: 80vh;
+      background-color: #f4f4f4;
+      padding: 28rpx;
+      border-radius: 21.03rpx 21.03rpx 0rpx 0rpx;
+      margin-top: 47rpx;
+
+      .pop_head {
+        // display: flex;
+      }
+
+      .pop_li {
+        display: flex;
+        margin-bottom: 52rpx;
+      }
+    }
+  }
+
+  .head_tit {
+    margin-left: 20rpx;
+    font-size: 40rpx;
+    // background-color: red;
+    width: 40vw;
+    white-space: nowrap;
+    overflow: hidden;
+
+    text-overflow: ellipsis;
+
+    // font-weight: 700;
+    // transform: skewX(-10deg);
+  }
+
+  .act {
+    color: red;
+  }
+
+  .head {
+    position: fixed;
+    z-index: 999;
+    color: white;
+    display: flex;
+    justify-content: space-between;
+    width: 100%;
+    padding: 0 20rpx;
+    align-items: center;
+    transition: 0.5s;
+  }
+
+  .heads {
+    position: fixed;
+    z-index: 100;
+    color: white;
+    width: 100%;
+    padding: 0 20rpx;
+    transition: 1s;
+    opacity: 0;
+  }
+
+  .show {
+    opacity: 1;
+  }
+
+  .menu {
+    position: absolute;
+    top: 490rpx;
+    width: 750rpx;
+    // background-color: rgba(255, 255, 255, 0.7);
+    height: 250rpx;
+    // height: 140.19rpx;
+    // box-shadow: 0 0 100px 100px rgba(255, 255, 255, 0.5);
+    // box-shadow: 0 0 100rpx 30rpx rgba(255, 255, 255, 0.9);
+  }
+
+  .town_name {
+    margin-right: 50rpx;
+    // background-color: red;
+    max-width: 15vw;
+    white-space: nowrap;
+
+    overflow: hidden;
+
+    text-overflow: ellipsis;
+  }
+
+  .goods_list {
+    min-height: 95vh;
+    padding: 0 10rpx;
+    // background-color: red;
+
+    .goods {
+      display: flex;
+      padding: 21rpx;
+      background-color: white;
+      border-radius: 21.03rpx 21.03rpx 21.03rpx 21.03rpx;
+      margin-bottom: 20rpx;
+
+      .left {
+        width: 192.76rpx;
+        height: 192.76rpx;
+        border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx;
+        margin-right: 21rpx;
+      }
+
+      .right {
+        display: flex;
+        justify-content: space-between;
+        flex-direction: column;
+
+        .tit {
+          font-size: 29.79rpx;
+          color: black;
+          font-weight: bold;
+        }
+
+        .good_score {
+          font-size: 26rpx;
+          color: #b3b3b3;
+          margin-bottom: 15rpx;
+        }
+
+        .good_price {
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          width: 60vw;
+
+          .good_price_r {
+            z-index: 9;
+          }
+
+          .good_price_l {
+            display: flex;
+
+            .old_price {
+              color: #b3b3b3;
+              text-decoration: line-through;
+              font-size: 26.29rpx;
+              margin-left: 15rpx;
+            }
+          }
+        }
+      }
+
+      // color: greenyellow;
+    }
+  }
+
+  .activeClass {
+    width: 400rpx;
+    height: 400rpx;
+  }
+
+  .act_swiper {
+    height: 200rpx;
+    position: fixed;
+    z-index: 99;
+    overflow: hidden;
+  }
+
+  .act_img {
+    // transition:t;
+    transform: translateY(-580rpx);
+    /* #ifdef APP-PLUS */
+    transform: translateY(-540rpx);
+    /* #endif */
+  }
+
+  // .act_swiper2 {
+  // 	height: 998rpx;
+  // }
+
+  .content_sift {
+    width: 750rpx;
+    padding: 22rpx 0;
+    // padding-top: 80rpx;
+    background-color: white;
+    display: flex;
+    justify-content: space-around;
+    // background-color: white;
+    // background-color: green;
+    z-index: 99;
+    box-sizing: border-box;
+    margin-bottom: 20rpx;
+  }
+
+  .swipers {
+    width: 750rpx;
+    height: 718.46rpx;
+  }
+
+  .card {
+    width: 720rpx;
+    z-index: 99;
+    // margin:auto;
+    left: 50%;
+    transform: translateX(-50%);
+    position: fixed;
+    // bottom: 0;
+    background-color: #333333;
+    height: 101.64rpx;
+    border-radius: 50.82rpx;
+    overflow: hidden;
+    color: white;
+    display: flex;
+    justify-content: space-between;
+    box-sizing: border-box;
+
+    .left {
+      display: flex;
+      align-items: center;
+      padding: 10rpx 35rpx;
+
+      .tot_price {
+        display: flex;
+        margin-left: 42rpx;
+        flex-direction: column;
+        justify-content: space-between;
+      }
+    }
+
+    .right {
+      font-size: 33.29rpx;
+      line-height: 50px;
+      background: linear-gradient(to right, #f84221, #ff6d20);
+      width: 140.19rpx;
+      text-align: center;
+    }
+  }
+
+  .badge {
+    position: absolute;
+    top: 0;
+    right: 0;
+    background-color: #f84221;
+    transform: translate(50%, -50%);
+    // padding: 10rpx 10rpx;
+    border-radius: 35rpx;
+    text-align: center;
+    width: 35rpx;
+    line-height: 35rpx;
+    height: 35rpx;
+  }
+
+  // .cloud_entrepot {
+  // 	background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/ycbg.png") no-repeat;
+  // 	background-size: cover;
+  // 	padding-bottom: 92.98rpx;
+  // }
+
+  // .head-wrapper {
+  // 	height: 485.96rpx;
+  // 	width: 100%;
+  // 	background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/top.png") no-repeat;
+  // 	background-size: cover;
+  // 	margin-bottom: 49.12rpx;
+  // }
+
+  // .town-title {
+  // 	margin: 0 auto;
+  // 	width: 100%;
+  // 	text-align: center;
+  // 	font-size: 50.88rpx;
+  // 	color: #fff;
+  // 	margin-bottom: 28.07rpx;
+
+  // 	&::after {
+  // 		content: '';
+  // 		display: inline-block;
+  // 		width: 66.67rpx;
+  // 		height: 31.58rpx;
+  // 		background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/you.png") no-repeat;
+  // 		background-size: cover;
+  // 		margin-left: 24.56rpx;
+  // 	}
+
+  // 	&::before {
+  // 		content: '';
+  // 		display: inline-block;
+  // 		width: 66.67rpx;
+  // 		height: 31.58rpx;
+  // 		background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/zuo.png") no-repeat;
+  // 		background-size: cover;
+  // 		margin-right: 24.56rpx;
+  // 	}
+  // }
+
+  // .body-wrapper {
+  // 	width: 694.74rpx;
+  // 	display: flex;
+  // 	justify-content: space-between;
+  // 	flex-wrap: wrap;
+  // 	margin: 0 auto;
+
+  // 	.item {
+  // 		width: 336.84rpx;
+  // 		height: 100%;
+  // 		padding: 24.56rpx 28.07rpx;
+  // 		margin-bottom: 21.05rpx;
+  // 		background-repeat: no-repeat;
+  // 		background-size: 100% 100%;
+  // 		box-sizing: border-box;
+
+  // 		text {
+  // 			display: block;
+  // 			font-size: 24.56rpx;
+  // 			color: #999;
+  // 			margin-bottom: 14.04rpx;
+  // 		}
+
+  // 		.item-title {
+  // 			font-size: 31.58rpx;
+  // 			color: #333;
+  // 		}
+
+  // 		.chakan-btn {
+  // 			width: 114.04rpx;
+  // 			height: 49.12rpx;
+  // 			font-size: 28.07rpx;
+  // 			text-align: center;
+  // 			line-height: 49.12rpx;
+  // 			color: #fff;
+  // 			margin-top: auto;
+  // 			background: linear-gradient(90deg, #FE5300 0%, #F84221 100%);
+  // 			border-radius: 50px;
+  // 		}
+  // 	}
+  // }
+
+  .empty {
+    // display: flex;
+    // justify-content: space-between;
+    // flex-direction: column;
+    // align-items: center;
+    // padding: 20vh 0;
+    position: relative;
+    height: 100vh;
+
+    .info {
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%, -50%);
+    }
+
+    // padding-top: 100px;
+  }
+
+  .head_r {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+  }
+
+  .cart {
+    z-index: 999;
+  }
+
+  .x_tra {
+    // position: relative;
+    z-index: 999999;
+    animation-name: addcatr;
+    animation-duration: 1s;
+    animation-timing-function: ease-in-out;
+    animation-iteration-count: 1;
+    animation-fill-mode: forwards; // animation-iteration-count: 1;
+    /* 设置为1 */
+    // transition: 1s cubic-bezier(0.5, -0.5, 1, 1);
+  }
+
+  .price_sift {
+    display: flex;
+    align-items: center;
+  }
+
+  .sl {
+    margin-left: 20rpx;
+    transform: rotate(180deg);
+    transition: 0.5s;
+  }
+
+  .actsl {
+    transform: rotate(0deg);
+  }
+
+  .actSel {
+    opacity: 1;
+    // transform: translateX(100rpx);
+  }
+
+  .yuncangempty {
+    margin: 20vh 0;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+  }
 </style>
\ No newline at end of file
diff --git a/pages/nongKe/cloud_entrepot/indexa.vue b/pages/nongKe/cloud_entrepot/indexa.vue
index 778e746..83aa4c7 100644
--- a/pages/nongKe/cloud_entrepot/indexa.vue
+++ b/pages/nongKe/cloud_entrepot/indexa.vue
@@ -1,6 +1,6 @@
 <template>
-	<view class="">
-		<!-- <view class="cloud_entrepot" :style="{'min-height': winHeight + 'px'}">
+  <view class="">
+    <!-- <view class="cloud_entrepot" :style="{'min-height': winHeight + 'px'}">
 			<view class="head-wrapper"></view>
 			<view class="town-title">{{town}}里海云仓</view>
 			<view class="body-wrapper">
@@ -16,47 +16,45 @@
 			</view>
 		</view> -->
 
-		<view class="">
-			<view class="">
-				<view v-if="showtit">
-					<view :class="{'head':true,'show':showtit}"
-						style="padding-top:  var(--status-bar-height);display: block;">
-						<view style="display: flex;align-items: center;">
-							<!-- <u--image :showLoading="true" v-if="cloudList.length>0" src="/static/images/LHYC/FH.png"
+    <view class="">
+      <view class="">
+        <view v-if="showtit">
+          <view :class="{'head':true,'show':showtit}" style="padding-top:  var(--status-bar-height);display: block;">
+            <view style="display: flex;align-items: center;">
+              <!-- <u--image :showLoading="true" v-if="cloudList.length>0" src="/static/images/LHYC/FH.png"
 								width="50.82rpx" height="50.82rpx" @click='goBack'></u--image>
 							<u--image v-else :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx"
 								height="50.82rpx" @click='goBack'></u--image> -->
-							<i class="iconfont icon-xiangzuo" v-if="cloudList.length>0"
-								style="font-size: 40rpx;text-align: left;" @click='goBack'></i>
-							<i class="iconfont icon-xiangzuo" v-else style="font-size: 40rpx;text-align: left;"
-								@click='goBack'></i>
+              <i class="iconfont icon-xiangzuo" v-if="cloudList.length>0" style="font-size: 40rpx;text-align: left;"
+                @click='goBack'></i>
+              <i class="iconfont icon-xiangzuo" v-else style="font-size: 40rpx;text-align: left;" @click='goBack'></i>
 
-							<view class="head_tit" style="font-size: 36.8rpx;font-weight: 700;transform: skewX(-10deg);"
-								:style="{color:cloudList.length>0?'':'black'}"
-								@click="navgo(`/pages/nongKe/supply_chain/supplier?type_id=10&street_id=${street_code}&townName=${street}`)">
-								供销综合云市场
-							</view>
-							<view class="head_tit"
-								style="font-size: 36.8rpx;font-weight: 700;transform: skewX(-10deg);color: #F84221;">
-								供销综合云商品
-							</view>
-							<view class="" @click="showPop=true">
-								<u--image v-if="cloudList.length>0" :showLoading="true" src="/static/images/LHYC/QB.png"
-									width="50.82rpx" height="50.82rpx"></u--image>
-								<u--image v-else :showLoading="true" src="/static/images/LHYC/QB1.png" width="50.82rpx"
-									height="50.82rpx"></u--image>
-							</view>
-							<!-- <view class="sl" :class="{actsl:showSelect}" @click="showSelect=!showSelect">
+              <view class="head_tit" style="font-size: 36.8rpx;font-weight: 700;transform: skewX(-10deg);"
+                :style="{color:cloudList.length>0?'':'black'}"
+                @click="navgo(`/pages/nongKe/supply_chain/supplier?type_id=10&street_id=${street_code}&townName=${street}`)">
+                供销综合云市场
+              </view>
+              <view class="head_tit"
+                style="font-size: 36.8rpx;font-weight: 700;transform: skewX(-10deg);color: #F84221;">
+                供销综合云商品
+              </view>
+              <view class="" @click="showPop=true">
+                <u--image v-if="cloudList.length>0" :showLoading="true" src="/static/images/LHYC/QB.png"
+                  width="50.82rpx" height="50.82rpx"></u--image>
+                <u--image v-else :showLoading="true" src="/static/images/LHYC/QB1.png" width="50.82rpx"
+                  height="50.82rpx"></u--image>
+              </view>
+              <!-- <view class="sl" :class="{actsl:showSelect}" @click="showSelect=!showSelect">
 								<u--image :showLoading="true" v-if="cloudList.length>0"
 									src="/static/images/GXSC/BSL.png" width="33.29rpx" height="33.29rpx"></u--image>
 								<u--image v-else :showLoading="true" style="transform: rotate(180deg);"
 									src="/static/images/GXSC/XL.png" width="33.29rpx" height="33.29rpx"></u--image>
 
 							</view> -->
-						</view>
+            </view>
 
 
-						<!-- <view class="" style="display: flex;align-items: center;">
+            <!-- <view class="" style="display: flex;align-items: center;">
 							<view style="display: flex;align-items: center;z-index: 999999;">
 								<u--image :showLoading="true" v-if="cloudList.length>0"
 									src="/static/images/LHYC/DWB.png" width="50.82rpx" height="50.82rpx"></u--image>
@@ -74,26 +72,26 @@
 
 						</view>
 					 -->
-						<view class="flags1">
-						</view>
-					</view>
+            <view class="flags1">
+            </view>
+          </view>
 
-					<view class="dw_cls" @click="showFn" :style="`top:${headTop1+5}px`">
-						<view class="dw_text">
-							<u--image :showLoading="true" v-if="cloudList.length>0" src="/static/images/LHYC/DWB.png"
-								width="50.82rpx" height="50.82rpx"></u--image>
-							<u--image :showLoading="true" v-else src="/static/images/LHYC/DWB1.png" width="50.82rpx"
-								height="50.82rpx"></u--image>
-							<view class="town_name" :style="{color:cloudList.length>0?'':'black'}" @click="showpick">
-								{{street}}
-							</view>
-							<view class="sl" :class="{actsl:showSelect}">
-								<u--image :showLoading="true" style="transform: rotate(180deg);"
-									src="/static/images/GXSC/XL.png" width="31.54rpx" height="31.54rpx"></u--image>
-							</view>
-						</view>
-					</view>
-					<!-- <view class="selected-list" :style="`top:${headtop}px`" :class="{actSel:showSelect}">
+          <view class="dw_cls" @click="showFn" :style="`top:${headTop1+5}px`">
+            <view class="dw_text">
+              <u--image :showLoading="true" v-if="cloudList.length>0" src="/static/images/LHYC/DWB.png" width="50.82rpx"
+                height="50.82rpx"></u--image>
+              <u--image :showLoading="true" v-else src="/static/images/LHYC/DWB1.png" width="50.82rpx"
+                height="50.82rpx"></u--image>
+              <view class="town_name" :style="{color:cloudList.length>0?'':'black'}" @click="showpick">
+                {{street}}
+              </view>
+              <view class="sl" :class="{actsl:showSelect}">
+                <u--image :showLoading="true" style="transform: rotate(180deg);" src="/static/images/GXSC/XL.png"
+                  width="31.54rpx" height="31.54rpx"></u--image>
+              </view>
+            </view>
+          </view>
+          <!-- <view class="selected-list" :style="`top:${headtop}px`" :class="{actSel:showSelect}">
 						<div class="triangle-up"></div>
 						<view
 							@click="navgo(`/pages/nongKe/supply_chain/supplier?type_id=10&street_id=${street_code}&townName=${street}`)">
@@ -105,1544 +103,1551 @@
 							</text>
 						</view>
 					</view> -->
-				</view>
+        </view>
 
 
 
-				<!-- 滚动 -->
-				<view :class="{'heads':true,'show':!showtit}" style="padding-top: var(--status-bar-height);">
-					<view style="align-items: center;display: flex;justify-content: space-between;">
-						<view class="" style="display: flex;align-items: center;">
-							<view class="back" style="margin-right: 17rpx;">
-								<!-- 	<u--image :showLoading="true" src="/static/images/LHYC/FH.png" width="50.82rpx"
+        <!-- 滚动 -->
+        <view :class="{'heads':true,'show':!showtit}" style="padding-top: var(--status-bar-height);">
+          <view style="align-items: center;display: flex;justify-content: space-between;">
+            <view class="" style="display: flex;align-items: center;">
+              <view class="back" style="margin-right: 17rpx;">
+                <!-- 	<u--image :showLoading="true" src="/static/images/LHYC/FH.png" width="50.82rpx"
 									height="50.82rpx" @click='goBack'></u--image> -->
 
-								<i class="iconfont icon-xiangzuo" style="font-size: 40rpx;text-align: left;"
-									@click='goBack'></i>
-							</view>
-							<view class="" style="font-size: 40rpx;transform: skewX(-10deg);">
-								供销综合云市场
-							</view>
-						</view>
+                <i class="iconfont icon-xiangzuo" style="font-size: 40rpx;text-align: left;" @click='goBack'></i>
+              </view>
+              <view class="" style="font-size: 40rpx;transform: skewX(-10deg);">
+                供销综合云商品
+              </view>
+            </view>
 
-						<view style="position: relative;width: 289.14rpx;">
-							<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="请输入..."
-								v-model="keyword" class="serch_cls"></u-search>
-							<u--image class="img_cls" :showLoading="true" src="/static/images/GXSC/SSBT.png"
-								width="115.65rpx" height="56.82rpx" @click="serch"></u--image>
-						</view>
-						<view class='head_r' @click="showPop=true">
-							<u--image :showLoading="true" src="/static/images/LHYC/QB.png" width="50.82rpx"
-								height="50.82rpx"></u--image>
-							<text class="" style="height: 10px;"></text>
-							<view class="flags">
+            <view style="position: relative;width: 289.14rpx;">
+              <u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="请输入..." v-model="keyword"
+                class="serch_cls" style="height: 56.82rpx;"></u-search>
+              <!-- <u--image class="img_cls" :showLoading="true" src="/static/images/GXSC/SSBT.png"
+								width="115.65rpx" height="56.82rpx" @click="serch"></u--image> -->
+              <view class="serchbtn img_cls" @click="serch">搜索</view>
+            </view>
+            <view class='head_r' @click="showPop=true">
+              <u--image :showLoading="true" src="/static/images/LHYC/QB.png" width="50.82rpx"
+                height="50.82rpx"></u--image>
+              <text class="" style="height: 10px;"></text>
+              <view class="flags">
 
-							</view>
-						</view>
-					</view>
-				</view>
+              </view>
+            </view>
+          </view>
+        </view>
 
 
-				<view class="box" v-if="cloudList.length>0">
-					<view :class="act_swiper">
-						<swiper :autoplay="false" :active-class="activeClass" :interval="3000" class="swipers"
-							:circular="true" previous-margin='0rpx' next-margin='0rpx' :current="current"
-							:disable-touch="true">
-							<swiper-item v-for="(item,index) in cloudList">
-								<u--image :showLoading="true" :src="item.cover" :class="act_img" width="750rpx"
-									height="998.83rpx"></u--image>
-							</swiper-item>
-						</swiper>
-					</view>
-					<view class="" style="height:998.83rpx;" v-if="act_swiper">
+        <view class="box" v-if="cloudList.length>0">
+          <view :class="act_swiper">
+            <swiper :autoplay="false" :active-class="activeClass" :interval="3000" class="swipers" :circular="true"
+              previous-margin='0rpx' next-margin='0rpx' :current="current" :disable-touch="true">
+              <swiper-item v-for="(item,index) in cloudList">
+                <u--image :showLoading="true" :src="item.cover" :class="act_img" width="750rpx"
+                  height="718.46rpx"></u--image>
+              </swiper-item>
+            </swiper>
+          </view>
+          <view class="" style="height:718.46rpx;" v-if="act_swiper">
 
-					</view>
+          </view>
 
 
-					<view class="menu" v-if="showtit" style="transition: 1s;">
-						<swiper :autoplay="false" :active-class="activeClass" :interval="3000" class="swiper"
-							:circular="true" previous-margin='270rpx' next-margin='270rpx' :current="current"
-							@change="test">
-							<swiper-item v-for="(item,index) in cloudList" :key="index" @click="clickSwiperFn(index)">
-								<view class="swiper_item" :class="{swiper_item_act:index==current}">
-									<u--image :showLoading="true" :src="item.background" class="swiper_b"
-										width="175.23rpx" height="175.23rpx"></u--image>
-								</view>
+          <view class="menu" v-if="showtit" style="transition: 1s;">
+            <swiper :autoplay="false" :active-class="activeClass" :interval="3000" class="swiper" :circular="true"
+              previous-margin='280rpx' next-margin='280rpx' :current="current" @change="test">
+              <swiper-item v-for="(item,index) in cloudList" :key="index" @click="clickSwiperFn(index)">
+                <view class="swiper_item" :class="{swiper_item_act:index==current}">
+                  <u--image :showLoading="true" :src="item.background" class="swiper_b" width="140.19rpx"
+                    height="140.19rpx"></u--image>
+                </view>
 
-							</swiper-item>
-						</swiper>
-					</view>
-					<!-- 商品列表 -->
-					<view class="content">
-						<view class="content_sift" :style="{position:pocls,top:(headtop)+'px'}" v-if="!showtit">
-							<view :class="{act:item.act,price_sift:true}" v-for="item,index in actList" :key="index"
-								@click="screenGoods(item.screen,index)">
-								{{item.tit}}
-								<view class="" v-if="index==2" style="margin-left: 10rpx;">
-									<u-icon name="arrow-up" :color="item.price&&item.act?'#FF6D20':'black'"
-										size="10"></u-icon>
-									<u-icon name="arrow-down" :color="!item.price&&item.act?'#FF6D20':'black'"
-										size="10"></u-icon>
-								</view>
-							</view>
-						</view>
-						<view class="goods_list" v-if="goodsList.length>0">
-							<view class="empty" v-if='showLoading'>
-								<u-loading-icon v-if='showLoading' text="加载中" textSize="18"></u-loading-icon>
-							</view>
-							<view class="goods" @click="goodDetail(item)" v-else v-for="item,index in goodsList">
-								<view class="left">
-									<u--image :showLoading="true" :src="item.image" width="192.76rpx"
-										height="192.76rpx"></u--image>
-								</view>
-								<view class="right">
-									<view class="tit">
-										<!-- 亿福馒头粉纯天然无添加小麦粉加工 1000g/袋 -->
-										{{item.store_info}}
-									</view>
-									<view class="">
-										<view class="good_score">
-											<text style="margin-right: 10rpx;color: #F84221;">{{item.rate}}</text>
-											<text>{{item.reply_count}}评论</text>
-										</view>
-										<view class="good_price">
-											<view class="good_price_l">
-												<view class=""
-													style="color: #F84221;font-size: 22.78rpx;font-weight: bold;">
-													￥<text style="font-size: 30rpx;">{{item.price}}</text>
-												</view>
-												<view class="old_price">
-													￥30.00
-												</view>
-											</view>
-											<view class="good_price_r">
-												<view :class="{x_tra:trnList[index].bottom }"
-													:style="`transform:translateY(${trnList[index].bottom}px);transition:${trnList[index].bottom?1:0}s  cubic-bezier(0.4, -0.9, 0.75, 1);`"
-													@click.stop="addcart(item,index)">
-													<u--image :class="'act_class'+index"
-														:style="`transform:translateX(${trnList[index].left}px);transition:${trnList[index].bottom?1:0}s `"
-														src="/static/images/LHYC/J.png" width="49.07rpx"
-														height="49.07rpx"></u--image>
-												</view>
+              </swiper-item>
+            </swiper>
+          </view>
+          <!-- 商品列表 -->
+          <view class="content">
+            <view class="content_sift" :style="{position:pocls,top:(headtop)+'px'}" v-if="!showtit">
+              <view :class="{act:item.act,price_sift:true}" v-for="item,index in actList" :key="index"
+                @click="screenGoods(item.screen,index)">
+                {{item.tit}}
+                <view class="" v-if="index==2" style="margin-left: 10rpx;">
+                  <u-icon name="arrow-up" :color="item.price&&item.act?'#FF6D20':'black'" size="10"></u-icon>
+                  <u-icon name="arrow-down" :color="!item.price&&item.act?'#FF6D20':'black'" size="10"></u-icon>
+                </view>
+              </view>
+            </view>
+            <view class="goods_list" v-if="goodsList.length>0">
+              <view class="empty" v-if='showLoading'>
+                <u-loading-icon v-if='showLoading' text="加载中" textSize="18"></u-loading-icon>
+              </view>
+              <view class="goods" @click="goodDetail(item)" v-else v-for="item,index in goodsList">
+                <view class="left">
+                  <!-- <u--image :showLoading="true" :src="item.image" width="192.76rpx"
+										height="192.76rpx"></u--image> -->
 
-											</view>
+                  <image lazy-load style="height: 192.76rpx;width: 192.76rpx;" :src="item.image"></image>
+                </view>
+                <view class="right">
+                  <view class="tit">
+                    <!-- 亿福馒头粉纯天然无添加小麦粉加工 1000g/袋 -->
+                    {{ item.store_name || item.store_info }}
+                  </view>
+                  <view class="">
+                    <view class="good_score">
+                      <text style="margin-right: 10rpx;color: #F84221;">{{item.rate}}</text>
+                      <text>{{item.reply_count}}评论</text>
+                    </view>
+                    <view class="good_price">
+                      <view class="good_price_l">
+                        <view class="" style="color: #F84221;font-size: 22.78rpx;font-weight: bold;">
+                          ￥<text style="font-size: 30rpx;">{{item.price}}</text>
+                        </view>
+                        <view class="old_price">
+                          ￥30.00
+                        </view>
+                      </view>
+                      <view class="good_price_r">
+                        <view :class="{x_tra:trnList[index]?trnList[index].bottom:0 }"
+                          :style="`transform:translateY(${trnList[index]?trnList[index].bottom:0}px);transition:${trnList[index]?trnList[index].bottom:0?1:0}s  cubic-bezier(0.4, -0.9, 0.75, 1);`"
+                          @click.stop="addcart(item,index)">
+                          <u--image :class="'act_class'+index"
+                            :style="`transform:translateX(${trnList[index]?trnList[index].left:0}px);transition:${trnList[index]?trnList[index].bottom:0?1:0}s `"
+                            src="/static/images/LHYC/J.png" width="49.07rpx" height="49.07rpx"></u--image>
+                        </view>
 
-										</view>
-									</view>
-								</view>
-							</view>
-							<view style="height: 100rpx;">
-								<!-- <u-loadmore :status="status" /> -->
-							</view>
-						</view>
-						<!-- 空 -->
-						<view v-else>
-							<view class="empty">
-								<view class="info">
-									<u--image :showLoading="true" src="/static/images/noCart.png" width="400.09rpx"
-										height="400.09rpx"></u--image>
-									<view class="" style="text-align: center;color:#999">
-										暂无商品
-									</view>
-								</view>
-							</view>
-						</view>
-						<!-- 购物车 -->
-						<view class="card" :style="`bottom:${appInfo.bottom}px`"
-							@click="navgo('/pages/order_addcart/order_addcart')">
-							<view class="left">
-								<view class="cart" :class="{act_cart:act_cart}"
-									style="position: relative;z-index: 9999999;">
-									<u--image :showLoading="true" src="/static/images/LHYC/GWC.png" width="63.09rpx"
-										height="63.09rpx"></u--image>
+                      </view>
 
-									<view class="badge" v-show="goodsNum">
-										{{goodsNum}}
-									</view>
-								</view>
-								<view class="tot_price">
-									<view class="">
-										￥{{totalMoney}}
-									</view>
-									<view class="">
-										支持配送 售后无忧
-									</view>
-								</view>
-							</view>
-							<view class="right">
-								去结算
-							</view>
-						</view>
-					</view>
+                    </view>
+                  </view>
+                </view>
+              </view>
+              <view style="height: 180rpx;">
+                <!-- <u-loadmore :status="status" /> -->
+              </view>
+            </view>
+            <!-- 空 -->
+            <view v-else>
+              <view class="empty">
+                <view class="info">
+                  <u--image :showLoading="true" src="/static/images/noCart.png" width="400.09rpx"
+                    height="400.09rpx"></u--image>
+                  <view class="" style="text-align: center;color:#999">
+                    暂无商品
+                  </view>
+                </view>
+              </view>
+            </view>
+            <!-- 购物车 -->
+            <view class="card" :style="`bottom:${appInfo.bottom}px`"
+              @click="navgo('/pages/order_addcart/order_addcart')">
+              <view class="left">
+                <view class="cart" :class="{act_cart:act_cart}" style="position: relative;z-index: 9999999;">
+                  <u--image :showLoading="true" src="/static/images/LHYC/GWC.png" width="63.09rpx"
+                    height="63.09rpx"></u--image>
+
+                  <view class="badge" v-show="goodsNum">
+                    {{goodsNum}}
+                  </view>
+                </view>
+                <view class="tot_price">
+                  <view class="">
+                    ￥{{totalMoney}}
+                  </view>
+                  <view class="">
+                    支持配送 售后无忧
+                  </view>
+                </view>
+              </view>
+              <view class="right">
+                去结算
+              </view>
+            </view>
+          </view>
 
 
-				</view>
-			</view>
-			<!-- 组件 -->
-			<view class="" v-if="showPop">
-				<u-popup mode="right" :show="showPop" @close="showPop=false" @open="showPop=true">
-					<view class="pop">
-						<view style="height: var(--status-bar-height);"></view>
-						<view class="pop_head" style="display: flex;">
-							<u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx"
-								height="50.82rpx" @click='showPop=false'></u--image>
-							<view class="head_tit">
-								里海云仓
-							</view>
-						</view>
-						<view class="pop_content" v-if="cloudList.length">
-							<view class="pop_li" @click="all(index)" v-for="item,index in cloudList" :key="index">
-								<u--image :showLoading="true" :src="item.background" width="84.11rpx"
-									height="84.11rpx"></u--image>
-								<view class="" style="margin-left: 20rpx;">
-									<view style="font-size: 33.29rpx;color: black;">
-										{{item.category_name}}云仓服务
-									</view>
-									<view class="" style="font-size: 22.78rpx;">
-										{{item.description}}
-									</view>
-								</view>
-							</view>
-						</view>
+        </view>
+      </view>
+      <!-- 组件 -->
+      <view class="" v-if="showPop">
+        <u-popup mode="right" :show="showPop" @close="showPop=false" @open="showPop=true">
+          <view class="pop">
+            <view style="height: var(--status-bar-height);"></view>
+            <view class="pop_head" style="display: flex;">
+              <u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx" height="50.82rpx"
+                @click='showPop=false'></u--image>
+              <view class="head_tit">
+                里海云仓
+              </view>
+            </view>
+            <view class="pop_content" v-if="cloudList.length">
+              <view class="pop_li" @click="all(index)" v-for="item,index in cloudList" :key="index">
+                <u--image :showLoading="true" :src="item.background" width="84.11rpx" height="84.11rpx"></u--image>
+                <view class="" style="margin-left: 20rpx;">
+                  <view style="font-size: 33.29rpx;color: black;">
+                    {{item.category_name}}云仓服务
+                  </view>
+                  <view class="" style="font-size: 22.78rpx;">
+                    {{item.description}}
+                  </view>
+                </view>
+              </view>
+            </view>
 
 
-						<view v-else>
-							<!-- <u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx" height="50.82rpx"
+            <view v-else>
+              <!-- <u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx" height="50.82rpx"
 							@click='goBack'></u--image>
 					</view> -->
-							<view class="yuncangempty">
+              <view class="yuncangempty">
 
-								<u--image :showLoading="true" src="/static/images/noCart.png" width="400.09rpx"
-									height="400.09rpx"></u--image>
-								<view class="" style="text-align: center;color:#999">
-									当前区域暂无云仓
-								</view>
-							</view>
-						</view>
+                <u--image :showLoading="true" src="/static/images/noCart.png" width="400.09rpx"
+                  height="400.09rpx"></u--image>
+                <view class="" style="text-align: center;color:#999">
+                  当前区域暂无云仓
+                </view>
+              </view>
+            </view>
 
-					</view>
-				</u-popup>
+          </view>
+        </u-popup>
 
-			</view>
+      </view>
 
-		</view>
+    </view>
 
-		<view class="empty" style="" v-if="cloudList.length<=0">
-			<view style="height: var(--status-bar-height);"></view>
-			<view style="padding: 10rpx;">
+    <view class="empty" style="" v-if="cloudList.length<=0">
+      <view style="height: var(--status-bar-height);"></view>
+      <view style="padding: 10rpx;">
 
-				<view class="info">
-					<u--image :showLoading="true" src="/static/images/noCart.png" width="400.09rpx"
-						height="400.09rpx"></u--image>
-					<view class="" style="text-align: center;color:#999">
-						当前区域暂无云仓
-					</view>
-				</view>
-			</view>
+        <view class="info">
+          <u--image :showLoading="true" src="/static/images/noCart.png" width="400.09rpx" height="400.09rpx"></u--image>
+          <view class="" style="text-align: center;color:#999">
+            当前区域暂无云仓
+          </view>
+        </view>
+      </view>
 
 
 
-			<!-- 多规格购物车 -->
+      <!-- 多规格购物车 -->
 
 
-			<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse">
-			</authorize>
-			<view class="" :style="`height:${appInfo.bottom}px;`">
-			</view>
-		</view>
 
-		<view class="">
-			<u-picker :defaultIndex="defaInd" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
-				@cancel="showPicker = false,showSelect = false" @change="changeHandler" keyName="name"></u-picker>
-		</view>
+      <view class="" :style="`height:${appInfo.bottom}px;`">
+      </view>
+    </view>
 
-		<view class="" v-if="showcartpop">
-			<u-popup :show="showcartpop" @close="closecartpop" @open="opencartpop">
-				<view class="sku">
-					<view class="sku_head">
-						<view class="sku_head_l">
-							<u--image :showLoading="true" :src="skuform.image" width="200.09rpx"
-								height="200.09rpx"></u--image>
-						</view>
-						<view class="sku_head_r">
-							<view class="sku_goods_tit">
-								{{skuform.store_info}}
-							</view>
-							<view class="">
-								<view class="sku_goods_price">
-									￥ {{skuform.price}}
-								</view>
-								<view class="sku_goods_num" v-if="this.skusize">
-									库存:{{skuform.sku[this.skusize].stock}}
-								</view>
-							</view>
-						</view>
-					</view>
-					<view class="sku_size">
-						<view class="" style="margin-bottom: 10rpx;">
-							尺码
-						</view>
-						<view class="">
-							<text class="size_li" :class="{act_size_li:item.sku==skusize}"
-								v-for="(item,index) in skuform.sku" @click="skusizechange(item.sku)">{{item.sku}}</text>
+    <view class="">
+      <u-picker :defaultIndex="defaInd" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
+        @cancel="showPicker = false,showSelect = false" @change="changeHandler" keyName="name"></u-picker>
+    </view>
 
-						</view>
-					</view>
-					<view class="sku_num">
-						<view class="">
-							数量
-						</view>
-						<view class="">
-							<u-number-box v-model="skuNumber" @change="valChange"></u-number-box>
-						</view>
-					</view>
-					<view class="skuaddcart" @click="skuaddcart">
-						确定
-					</view>
+    <view class="" v-if="showcartpop">
+      <u-popup :show="showcartpop" @close="closecartpop" @open="opencartpop">
+        <view class="sku">
+          <view class="sku_head">
+            <view class="sku_head_l">
+              <u--image :showLoading="true" :src="skuform.image" width="200.09rpx" height="200.09rpx"></u--image>
+            </view>
+            <view class="sku_head_r">
+              <view class="sku_goods_tit">
+                {{skuform.store_info}}
+              </view>
+              <view class="">
+                <view class="sku_goods_price">
+                  ￥ {{skuform.price}}
+                </view>
+                <view class="sku_goods_num" v-if="this.skusize">
+                  库存:{{skuform.sku[this.skusize].stock}}
+                </view>
+              </view>
+            </view>
+          </view>
+          <view class="sku_size">
+            <view class="" style="margin-bottom: 10rpx;">
+              尺码
+            </view>
+            <view class="">
+              <text class="size_li" :class="{act_size_li:item.sku==skusize}" v-for="(item,index) in skuform.sku"
+                @click="skusizechange(item.sku)">{{item.sku}}</text>
 
-				</view>
-			</u-popup>
-		</view>
+            </view>
+          </view>
+          <view class="sku_num">
+            <view class="">
+              数量
+            </view>
+            <view class="">
+              <u-number-box v-model="skuNumber" @change="valChange"></u-number-box>
+            </view>
+          </view>
+          <view class="skuaddcart" @click="skuaddcart">
+            确定
+          </view>
 
+        </view>
+      </u-popup>
+    </view>
 
-	</view>
+    <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse">
+    </authorize>
+  </view>
 
 </template>
 
 <script>
-	import {
-		cloudWarehouse,
-		getCityCloundShop
-	} from '@/api/requesta.js'
-	import {
-		Toast
-	} from '@/libs/uniApi';
-	import {
-		initiateAssistApi
-	} from '@/api/activity.js';
-	import {
-		getCartCounts,
-		getCartList,
+  import {
+    cloudWarehouse,
+    getCityCloundShop
+  } from '@/api/requesta.js'
+  import {
+    Toast
+  } from '@/libs/uniApi';
+  import {
+    initiateAssistApi
+  } from '@/api/activity.js';
+  import {
+    getCartCounts,
+    getCartList,
 
-	} from '@/api/requesta.js';
-	import {
-		goShopDetail
-	} from '@/libs/order.js'
-	// 7200 = 8 = 80000 8616
-	import {
-		postCartAdd,
-	} from '@/api/store.js';
-	import authorize from '@/components/Authorize';
+  } from '@/api/requesta.js';
+  import {
+    goShopDetail
+  } from '@/libs/order.js'
+  // 7200 = 8 = 80000 8616
+  import {
+    postCartAdd,
+  } from '@/api/store.js';
+  import authorize from '@/components/Authorize';
 
-	import {
-		getArea,
-		getStreet
-	} from '@/api/article.js';
-	import {
-		getIndexData,
-		getDiy
-	} from '@/api/api.js'
-	import {
-		getGeocoder
-	} from '@/api/store.js';
-	import {
-		mapGetters
-	} from 'vuex'
-	import Cache from '@/utils/cache';
-	export default {
-		components: {
-			authorize,
-		},
-		data() {
-			let src = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13';
-			return {
-				skuform: {},
-				defaInd: [0, 0],
-				showPicker: false,
-				columnData: [],
-				skusize: 0,
-				skuNumber: 1,
-				showcartpop: false,
-				trnList: [],
-				act_cart: false,
-				appInfo: {},
-				pocls: "",
-				type: "",
-				act_swiper: "",
-				current: 3,
-				goodsNum: 0,
-				goodsList: [],
-				isEmpty: false,
-				winHeight: 0,
-				cloudList: [],
-				street: '',
-				street_code: '',
-				totalMoney: 0,
-				town: '',
-				list: [1, 1, 1, 1, 1],
-				showSelect: false,
-				showPop: false,
-				keyword: "",
-				showLoading: false,
-				tot_price: 1,
-				showtit: true,
-				cartList: [],
-				activeClass: 'activeClass',
-				headtop: 0,
-				page_num: 1,
-				act_img: "",
-				cartTagInfo: {},
-				isAuto: false,
-				headTop1: "",
-				actList: [{
-					tit: '综合',
-					act: "",
-					screen: ""
-				}, {
-					tit: '销量',
-					act: "",
-					screen: "sales"
-				}, {
-					tit: '价格',
-					act: "",
-					screen: "price_asc",
-					price: true,
-				}],
-				status: "loadmore",
-				flag: false,
-				isShowAuth: false, //是否隐藏授权
+  import {
+    getArea,
+    getStreet
+  } from '@/api/article.js';
+  import {
+    getIndexData,
+    getDiy
+  } from '@/api/api.js'
+  import {
+    getGeocoder
+  } from '@/api/store.js';
+  import {
+    mapGetters
+  } from 'vuex'
+  import Cache from '@/utils/cache';
+  export default {
+    components: {
+      authorize,
+    },
+    data() {
+      let src = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13';
+      return {
+        skuform: {},
+        defaInd: [0, 0],
+        showPicker: false,
+        columnData: [],
+        skusize: 0,
+        skuNumber: 1,
+        showcartpop: false,
+        trnList: [],
+        act_cart: false,
+        appInfo: {},
+        pocls: "",
+        type: "",
+        act_swiper: "",
+        current: 3,
+        goodsNum: 0,
+        goodsList: [],
+        isEmpty: false,
+        winHeight: 0,
+        cloudList: [],
+        street: '',
+        street_code: '',
+        totalMoney: 0,
+        town: '',
+        list: [1, 1, 1, 1, 1],
+        showSelect: false,
+        showPop: false,
+        keyword: "",
+        showLoading: false,
+        tot_price: 1,
+        showtit: true,
+        cartList: [],
+        activeClass: 'activeClass',
+        headtop: 0,
+        page_num: 1,
+        act_img: "",
+        cartTagInfo: {},
 
-			}
-		},
-		computed: {
-			...mapGetters(['isLogin', 'viewColor', 'uid']),
-		},
-		// ...mapGetters(['isLogin', 'viewColor', 'uid']),
-		onLoad(e) {
-			// this.cartFn()
-			this.appInfo = this.$appInfo.safeAreaInsets
-			this.winHeight = this.$appInfo.windowHeight
-			this.street_code = e.street
-			this.town = e.town
-			this.getCloundShop()
-			this.street = e.town
-			this.Area()
-			let that = this
-			setTimeout(() => {
+        headTop1: "",
+        actList: [{
+          tit: '综合',
+          act: "",
+          screen: ""
+        }, {
+          tit: '销量',
+          act: "",
+          screen: "sales"
+        }, {
+          tit: '价格',
+          act: "",
+          screen: "price_asc",
+          price: true,
+        }],
+        status: "loadmore",
+        flag: false,
+        isAuto: false,
+        isShowAuth: false, //是否隐藏授权
+
+      }
+    },
+    computed: {
+      ...mapGetters(['isLogin', 'viewColor', 'uid']),
+    },
+    // ...mapGetters(['isLogin', 'viewColor', 'uid']),
+    onLoad(e) {
+      // this.cartFn()
+      this.appInfo = this.$appInfo.safeAreaInsets
+      this.winHeight = this.$appInfo.windowHeight
+      this.street_code = e.street
+      this.town = e.town
+      this.getCloundShop()
+      this.street = e.town
+      this.Area()
+      let that = this
+      setTimeout(() => {
+        uni.createSelectorQuery()
+          .in(this)
+          .select('.flags1')
+          .boundingClientRect(rect => {
+            that.headTop1 = rect.top
+          })
+          .exec();
+        uni.createSelectorQuery()
+          .in(this)
+          .select('.cart')
+          .boundingClientRect(rect => {
+            that.cartTagInfo = rect
+          })
+          .exec();
+      }, 1)
+
+    },
+    onShow() {
+      this.cartFn()
+      this.showSelect = false
+    },
+    // 分页
+    onReachBottom() {
+      if (this.flag || !this.goodsList.length) return;
+      this.status = "loading"
+      this.page_num += 1
+      // this.flag = true
+      cloudWarehouse({
+        street_code: this.street_code,
+        category_id: this.cloudList[this.current]?.category_id || "",
+        order: this.type,
+        keyword: this.keyword,
+        page_num: this.page_num
+
+      }).then(res => {
+        if (res.data.list.length == 0) {
+          this.status = "nomore"
+          this.flag = true
+          return
+        }
+        if (res.data.list[0].product_id == this.goodsList[0].product_id) {
+          this.status = "nomore"
+          this.flag = true
+        } else {
+          this.goodsList = this.goodsList.concat(res.data.list);
+        }
+      })
+
+    },
+    onPageScroll(e) {
+      let that = this
+      this.showtit = !Boolean(e.scrollTop)
+      uni.createSelectorQuery()
+        .in(this)
+        .select('.flags')
+        .boundingClientRect(rect => {
+          this.headtop = rect.top
+          // console.log(rect.top)
+        })
+        .exec();
+      uni.createSelectorQuery()
+        .in(this)
+        .select('.content')
+        .boundingClientRect(rect => {
+          if (rect.top <= (this.headtop)) {
+            this.pocls = 'fixed'
+            this.act_swiper = 'act_swiper'
+            this.act_img = 'act_img'
+
+          } else {
+            this.pocls = ''
+            this.act_swiper = ''
+            this.act_img = ''
+
+          }
+        })
+        .exec();
+      uni.createSelectorQuery()
+        .in(this)
+        .select('.cart')
+        .boundingClientRect(rect => {
+          that.cartTagInfo = rect
+        })
+        .exec();
+    },
+    onPullDownRefresh() {
+      this.getCloundShop()
+      this.getList()
+      this.cartFn()
+      uni.stopPullDownRefresh()
+    },
+    methods: {
+      showpick() {
+        this.showPicker = !this.showPicker
 
 
-				uni.createSelectorQuery()
-					.in(this)
-					.select('.flags1')
-					.boundingClientRect(rect => {
-						that.headTop1 = rect.top
-					})
-					.exec();
-				uni.createSelectorQuery()
-					.in(this)
-					.select('.cart')
-					.boundingClientRect(rect => {
-						that.cartTagInfo = rect
-					})
-					.exec();
-			}, 1)
+      },
+      swiperClick(item) {
+        const url = item.info[1].value
+        uni.navigateTo({
+          url: url
+        })
+      },
+      selectLocation() {
+        this.isSelectPlace ? this.showPicker = true : ''
 
-		},
-		onShow() {
-			this.cartFn()
-			this.showSelect = false
-		},
-		// 分页
-		onReachBottom() {
-			if (this.flag || !this.goodsList.length) return
-			this.status = "loading"
-			this.page_num += 1
-			this.flag = true
-			cloudWarehouse({
-				street_code: this.street_code,
-				category_id: this.cloudList[this.current]?.category_id || "",
-				order: this.type,
-				keyword: this.keyword,
-				page_num: this.page_num
+      },
 
-			}).then(res => {
-				if (res.data.list[0].product_id == this.goodsList[0].product_id) {
-					this.status = "nomore"
-					this.flag = false
-				} else {
-					if (res.data.list.length == 0) {
-						this.status = "nomore"
-						return
-					}
-					this.goodsList = this.goodsList.concat(res.data.list)
-				}
-			})
+      confirm(e) {
+        this.showPicker = false
+        this.showSelect = false
+        this.$emit('selectPlce', e)
+        this.$emit('change', e)
+        this.street = e.value[1].name
+        this.$nextTick(() => {
+          this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
 
-		},
-		onPageScroll(e) {
-			let that = this
-			this.showtit = !Boolean(e.scrollTop)
-			uni.createSelectorQuery()
-				.in(this)
-				.select('.flags')
-				.boundingClientRect(rect => {
-					this.headtop = rect.top
-					console.log(rect.top)
-				})
-				.exec();
-			uni.createSelectorQuery()
-				.in(this)
-				.select('.content')
-				.boundingClientRect(rect => {
-					if (rect.top <= (this.headtop)) {
-						this.pocls = 'fixed'
-						this.act_swiper = 'act_swiper'
-						this.act_img = 'act_img'
+        })
 
-					} else {
-						this.pocls = ''
-						this.act_swiper = ''
-						this.act_img = ''
+        // this.sotreParam.street_id = e.value[1].code
+        this.street_code = e.value[1].code
+        this.getCloundShop()
+        this.town = e.value[1].name
+        // this.storeMerchantList()
 
-					}
-				})
-				.exec();
-			uni.createSelectorQuery()
-				.in(this)
-				.select('.cart')
-				.boundingClientRect(rect => {
-					that.cartTagInfo = rect
-				})
-				.exec();
-		},
-		onPullDownRefresh() {
-			this.getCloundShop()
-			this.getList()
-			this.cartFn()
-			uni.stopPullDownRefresh()
-		},
-		methods: {
-			showpick() {
-				this.showPicker = !this.showPicker
+      },
+      showFn() {
+        this.showSelect = true
+        this.showPicker = true
+        console.log(this.showSelect)
+        // console.log(545)
+      },
+      changeHandler(e) {
+        const {
+          columnIndex,
+          value,
+          values,
+          index,
+          picker = this.$refs.uPicker
+        } = e;
+        if (columnIndex === 0) {
+          getStreet({
+            area_code: value[0]['code']
+          }).then(res => {
+            picker.setColumnValues(1, res.data);
+          });
+        }
+      },
+      Area() {
+        let that = this
+        getArea({
+          city_code: 510500
+        }).then(res => {
+          this.$refs.uPicker.setColumnValues(0, res.data);
+          this.Street(res.data[0]['code']);
+
+          //  (res.data, 66666)
+        });
+      },
+      Street(code) {
+        getStreet({
+          area_code: code
+        }).then(res => {
+          this.$refs.uPicker.setColumnValues(1, res.data);
+
+        });
+      },
+
+      swiperChange(e) {
+        let {
+          current,
+          source
+        } = e.detail;
+        if (source === 'autoplay' || source === 'touch') {
+          this.bgColor = this.swiper.url[e.detail.current]['img']
+          this.$emit('kkchange', this.bgColor)
+        }
+      },
 
 
-			},
-			swiperClick(item) {
-				const url = item.info[1].value
-				uni.navigateTo({
-					url: url
-				})
-			},
-			selectLocation() {
-				this.isSelectPlace ? this.showPicker = true : ''
+      // 对象转数组
+      objToArr(data) {
+        let obj = Object.keys(data).sort();
+        let m = obj.map(key => data[key]);
+        return m;
+      },
+      skusizechange(i) {
 
-			},
+        this.skusize = i
+      },
+      skuaddcart() {
+        this.showcartpop = false
+        // this.skuform = {}
+        let res = postCartAdd({
+          cart_num: this.skuNumber,
+          is_new: 0,
+          product_attr_unique: this.skuform.sku[this.skusize].unique,
+          product_id: this.skuform.product_id,
+          product_type: this.skuform.product_type,
+          spread_id: "",
+        }).then((res, err) => {
+          this.cartFn()
+          uni.showToast({
+            title: "加入成功",
+            duration: 1000,
 
-			confirm(e) {
-				this.showPicker = false
-				this.showSelect = false
-				this.$emit('selectPlce', e)
-				this.$emit('change', e)
-				this.street = e.value[1].name
-				this.$nextTick(() => {
-					this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
+          })
+        }).catch(err => {
+          // this.act_cart = false
+          uni.showToast({
+            title: err,
+            icon: "none",
+            duration: 1000,
+          })
+        })
 
-				})
+      },
+      valChange(e) {
+        this.skuNumber = e.value
 
-				// this.sotreParam.street_id = e.value[1].code
-				this.street_code = e.value[1].code
-				this.getCloundShop()
-				this.town = e.value[1].name
-				// this.storeMerchantList()
+      },
+      closecartpop() {
+        this.showcartpop = false
+      },
+      opencartpop() {
+        this.showcartpop = true
+      },
+      // 授权关闭
+      authColse: function(e) {
+        this.isShowAuth = e;
+      },
 
-			},
-			showFn() {
-				this.showSelect = true
-				this.showPicker = true
-				console.log(this.showSelect)
-				// console.log(545)
-			},
-			changeHandler(e) {
-				const {
-					columnIndex,
-					value,
-					values,
-					index,
-					picker = this.$refs.uPicker
-				} = e;
-				if (columnIndex === 0) {
-					getStreet({
-						area_code: value[0]['code']
-					}).then(res => {
-						picker.setColumnValues(1, res.data);
-					});
-				}
-			},
-			Area() {
-				let that = this
-				getArea({
-					city_code: 510500
-				}).then(res => {
-					this.$refs.uPicker.setColumnValues(0, res.data);
-					this.Street(res.data[0]['code']);
+      onLoadFun() {
+        this.isShowAuth = false;
+      },
+      clickSwiperFn(i) {
+        //  (i)
+        this.current = i
+      },
+      cartFn() {
+        getCartList().then(res => {
+          //  (res)
+          this.totalMoney = 0
+          this.cartList = res.data.list
+          this.cartList.forEach(e => {
 
-					//  (res.data, 66666)
-				});
-			},
-			Street(code) {
-				getStreet({
-					area_code: code
-				}).then(res => {
-					this.$refs.uPicker.setColumnValues(1, res.data);
+            e.list.forEach(item => {
+              this.totalMoney += item.cart_num * item.productAttr.price
+            })
 
-				});
-			},
+          })
+          this.totalMoney = this.totalMoney.toFixed(2)
+        })
+        getCartCounts().then(res => {
+          this.goodsNum = res.data[0].count
+        })
+      },
+      goodDetail(item) {
+        goShopDetail(item, this.uid).then(res => {
+          if (this.isLogin) {
+            initiateAssistApi(item.activity_id).then(res => {
+              let id = res.data.product_assist_set_id;
+              uni.hideLoading();
+              uni.navigateTo({
+                url: '/pages/activity/assist_detail/index?id=' + id
+              });
+            }).catch((err) => {
+              uni.showToast({
+                title: err,
+                icon: 'none'
+              })
+            });
+          } else {
+            this.isAuto = true;
+            this.isShowAuth = true
+          }
 
-			swiperChange(e) {
-				let {
-					current,
-					source
-				} = e.detail;
-				if (source === 'autoplay' || source === 'touch') {
-					this.bgColor = this.swiper.url[e.detail.current]['img']
-					this.$emit('kkchange', this.bgColor)
-				}
-			},
+        })
+      },
+      serch() {
+        this.getList()
+      },
+      goBack() {
+        uni.navigateBack()
+      },
+      screenGoods(type, i) {
+        this.actList.forEach(item => {
+          item.act = ""
+        })
+        this.actList[i].act = true
+        this.type = type
+        if (i == 2) {
+          this.actList[i].price = !this.actList[i].price
+          this.type = this.actList[i].price ? 'price_asc' : ''
+        }
+        this.getList()
+
+        //  (this.type)
+
+      },
+      navgo(url) {
+        uni.redirectTo({
+          url
+        })
+      },
+      getList() {
+        this.showLoading = true
+        this.status = "loading"
+        this.page_num = 1;
+        cloudWarehouse({
+          street_code: this.street_code,
+          category_id: this.cloudList[this.current]?.category_id || "",
+          order: this.type,
+          keyword: this.keyword,
+          page_num: this.page_num
+
+        }).then(res => {
+          this.goodsList = res.data.list
+          this.showLoading = false
+          this.goodsList.forEach(item => {
+            this.trnList.push({
+              left: 0,
+              bottom: 0
+            })
+          })
+        })
+
+      },
+      addcart(item, i) {
+        if (!this.isLogin) {
+          console.log('2222')
+          this.isAuto = true
+          this.isShowAuth = true;
+          return
+        }
+
+        if (item.sku['']) {
+          let data = {
+            cart_num: 1,
+            is_new: 0,
+            product_attr_unique: item.sku[''].unique,
+            product_id: item.product_id,
+            product_type: item.product_type,
+            spread_id: "",
+          }
+          let that = this
+
+          uni.createSelectorQuery().in(this).select(`.act_class${i}`).boundingClientRect(data1 => {
+            that.trnList[i].left = that.cartTagInfo.left - data1.left;
+            that.trnList[i].bottom = that.cartTagInfo.top - data1.top;
+
+            let timer = setTimeout(() => {
+              that.trnList[i].left = 0
+              that.trnList[i].bottom = 0
+              that.act_cart = true
+              setTimeout(() => {
+                that.act_cart = false
+              }, 500)
+            }, 1000)
+          }).exec();
+          let res = postCartAdd({
+            ...data
+          }).then((res, err) => {
+            this.cartFn()
+            uni.showToast({
+              title: "加入成功",
+              duration: 1000,
+
+            })
+          }).catch(err => {
+            uni.showToast({
+              title: err,
+              icon: "none",
+              duration: 1000,
+            })
+          })
+          setTimeout(() => {
+            that.act_cart = false
+          }, 500)
+        } else {
+          this.skuform = item
+          this.showcartpop = true
+          const keys = Object.keys(item.sku);
+          const firstKey = keys[0];
+          this.skusize = keys[0]
+
+        }
+        return
 
 
-			// 对象转数组
-			objToArr(data) {
-				let obj = Object.keys(data).sort();
-				let m = obj.map(key => data[key]);
-				return m;
-			},
-			skusizechange(i) {
+      },
+      all(index) {
+        this.showPop = false
+        this.current = index
+        this.getList()
+      },
+      test(e) {
+        //  (e.target.current)
+        this.current = e.target.current
 
-				this.skusize = i
-			},
-			skuaddcart() {
-				this.showcartpop = false
-				// this.skuform = {}
-				let res = postCartAdd({
-					cart_num: this.skuNumber,
-					is_new: 0,
-					product_attr_unique: this.skuform.sku[this.skusize].unique,
-					product_id: this.skuform.product_id,
-					product_type: this.skuform.product_type,
-					spread_id: "",
-				}).then((res, err) => {
-					this.cartFn()
-					uni.showToast({
-						title: "加入成功",
-						duration: 1000,
+        this.getList()
+      },
 
-					})
-				}).catch(err => {
-					// this.act_cart = false
-					uni.showToast({
-						title: err,
-						icon: "none",
-						duration: 1000,
-					})
-				})
-
-			},
-			valChange(e) {
-				this.skuNumber = e.value
-
-			},
-			closecartpop() {
-				this.showcartpop = false
-			},
-			opencartpop() {
-				this.showcartpop = true
-			},
-			// 授权关闭
-			authColse: function(e) {
-				this.isShowAuth = e;
-			},
-
-			onLoadFun() {
-				this.isShowAuth = false;
-			},
-			clickSwiperFn(i) {
-				//  (i)
-				this.current = i
-			},
-			cartFn() {
-				getCartList().then(res => {
-					//  (res)
-					this.totalMoney = 0
-					this.cartList = res.data.list
-					this.cartList.forEach(e => {
-
-						e.list.forEach(item => {
-							this.totalMoney += item.cart_num * item.productAttr.price
-						})
-
-					})
-					this.totalMoney = this.totalMoney.toFixed(2)
-				})
-				getCartCounts().then(res => {
-					this.goodsNum = res.data[0].count
-				})
-			},
-			goodDetail(item) {
-				goShopDetail(item, this.uid).then(res => {
-					if (this.isLogin) {
-						initiateAssistApi(item.activity_id).then(res => {
-							let id = res.data.product_assist_set_id;
-							uni.hideLoading();
-							uni.navigateTo({
-								url: '/pages/activity/assist_detail/index?id=' + id
-							});
-						}).catch((err) => {
-							uni.showToast({
-								title: err,
-								icon: 'none'
-							})
-						});
-					} else {
-						this.isAuto = true;
-						this.isShowAuth = true
-					}
-
-				})
-			},
-			serch() {
-				this.getList()
-			},
-			goBack() {
-				uni.navigateBack()
-			},
-			screenGoods(type, i) {
-				this.actList.forEach(item => {
-					item.act = ""
-				})
-				this.actList[i].act = true
-				this.type = type
-				if (i == 2) {
-					this.actList[i].price = !this.actList[i].price
-					this.type = this.actList[i].price ? 'price_asc' : ''
-				}
-				this.getList()
-
-				//  (this.type)
-
-			},
-			navgo(url) {
-				uni.redirectTo({
-					url
-				})
-			},
-			getList() {
-				this.showLoading = true
-				this.status = "loading"
-				cloudWarehouse({
-					street_code: this.street_code,
-					category_id: this.cloudList[this.current]?.category_id || "",
-					order: this.type,
-					keyword: this.keyword,
-					page_num: this.page_num
-
-				}).then(res => {
-					this.goodsList = res.data.list
-					this.showLoading = false
-					this.goodsList.forEach(item => {
-						this.trnList.push({
-							left: 0,
-							bottom: 0
-						})
-					})
-				})
-
-			},
-			addcart(item, i) {
-				if (!this.isLogin) {
-					this.isAuto = true;
-					this.isShowAuth = true
-					return
-				}
-
-				if (item.sku['']) {
-					let data = {
-						cart_num: 1,
-						is_new: 0,
-						product_attr_unique: item.sku[''].unique,
-						product_id: item.product_id,
-						product_type: item.product_type,
-						spread_id: "",
-					}
-					let that = this
-
-					uni.createSelectorQuery().in(this).select(`.act_class${i}`).boundingClientRect(data1 => {
-						that.trnList[i].left = that.cartTagInfo.left - data1.left;
-						that.trnList[i].bottom = that.cartTagInfo.top - data1.top;
-
-						let timer = setTimeout(() => {
-							that.trnList[i].left = 0
-							that.trnList[i].bottom = 0
-							that.act_cart = true
-							setTimeout(() => {
-								that.act_cart = false
-							}, 500)
-						}, 1000)
-					}).exec();
-					let res = postCartAdd({
-						...data
-					}).then((res, err) => {
-						this.cartFn()
-						uni.showToast({
-							title: "加入成功",
-							duration: 1000,
-
-						})
-					}).catch(err => {
-						uni.showToast({
-							title: err,
-							icon: "none",
-							duration: 1000,
-						})
-					})
-					setTimeout(() => {
-						that.act_cart = false
-					}, 500)
-				} else {
-					this.skuform = item
-					this.showcartpop = true
-					const keys = Object.keys(item.sku);
-					const firstKey = keys[0];
-					this.skusize = keys[0]
-
-				}
-				return
-
-
-			},
-			all(index) {
-				this.showPop = false
-				this.current = index
-				this.getList()
-			},
-			test(e) {
-				//  (e.target.current)
-				this.current = e.target.current
-				//  (e)
-				this.getList()
-			},
-
-			async getCloundShop() {
-				const {
-					data
-				} = await getCityCloundShop({
-					street_code: this.street_code
-				})
-				this.cloudList = data
-				cloudWarehouse({
-					street_code: this.street_code,
-					category_id: this.cloudList[this.current].category_id
-				}).then(res => {
-					this.trnList = []
-					this.goodsList = res.data.list
-					this.goodsList.forEach(item => {
-						this.trnList.push({
-							left: 0,
-							bottom: 0
-						})
-					})
-				})
-			}
-		}
-	}
+      async getCloundShop() {
+        const {
+          data
+        } = await getCityCloundShop({
+          street_code: this.street_code
+        })
+        this.cloudList = data
+        cloudWarehouse({
+          street_code: this.street_code,
+          category_id: this.cloudList[this.current].category_id
+        }).then(res => {
+          this.trnList = []
+          this.goodsList = res.data.list
+          this.goodsList.forEach(item => {
+            this.trnList.push({
+              left: 0,
+              bottom: 0
+            })
+          })
+        })
+      }
+    }
+  }
 </script>
 
 <style lang="scss" scoped>
-	@keyframes addcart {
-		from {
-			// background-color: red;
-			opacity: 1,
-		}
-
-		to {
-			// background-color: yellow;
-			opacity: 0,
-		}
-	}
-
-	.selected-list {
-		padding: 24rpx 14rpx;
-		border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx;
-		background-color: #fff;
-		position: absolute;
-		left: 100rpx;
-		font-size: 29.79rpx;
-		z-index: 9999;
-		// top: 100rpx;
-		opacity: 0;
-		transition: 0.5s;
-
-
-
-		.triangle-up {
-			width: 0;
-			height: 0;
-			border-left: 10rpx solid transparent;
-			border-right: 10rpx solid transparent;
-			border-bottom: 10rpx solid white;
-			position: absolute;
-			top: -10rpx;
-		}
-
-		.selected-li {
-			margin-top: 35rpx;
-			color: #F84221;
-			display: flex;
-			align-items: center;
-		}
-	}
-
-
-	.sku {
-		padding: 20rpx;
-
-		.sku_head {
-			display: flex;
-
-			.sku_head_r {
-				margin-left: 20rpx;
-				display: flex;
-				justify-content: space-between;
-				flex-direction: column;
-
-				.sku_goods_tit {
-					font-size: 30rpx;
-					width: 60vw;
-					/* 容器的宽度 */
-					overflow: hidden;
-					text-overflow: ellipsis;
-					white-space: nowrap;
-				}
-
-				.sku_goods_price {
-					color: red;
-					font-size: 30rpx;
-					font-weight: bold;
-				}
-			}
-
-			// justify-content;
-		}
-
-		.sku_size {
-			margin: 40rpx 0;
-
-			.size_li {
-				display: inline-block;
-				// width: 100rpx;
-				padding: 5rpx 20rpx;
-				margin-right: 20rpx;
-				text-align: center;
-				color: black;
-				border: 1px solid #EBECEE;
-
-				// height: 2;
-			}
-
-			.act_size_li {
-				background-color: #FF5C2D;
-				color: white;
-				border: #FF5C2D 1px solid;
-
-			}
-		}
-
-		.sku_num {
-			display: flex;
-			justify-content: space-between;
-		}
-
-		.skuaddcart {
-			width: 50vw;
-			background-color: #FEAB00;
-			margin: 20rpx auto;
-			height: 80rpx;
-			line-height: 80rpx;
-			text-align: center;
-			color: white;
-			border-radius: 80rpx;
-			// margin-top: 20rpx;
-		}
-	}
-
-	.flags {
-		background-color: red;
-		z-index: 99999999;
-	}
-
-	.swiper_item {
-		display: flex;
-		justify-content: space-around;
-		transition: .5s;
-		padding: 40rpx;
-		// transform: scale(1.2);
-	}
-
-	.swiper_item_act {
-		transform: scale(1.2);
-	}
-
-	// .swiper_item:hover {}
-
-
-	// .swiper_item {
-	// 	transform: scale(1.2);
-	// }
-
-	.swiper_b {
-		transition: 1s;
-	}
-
-	// .swiper_b:active {
-	// 	transform: scale(1.5);
-	// }
-
-	.act_cart {
-		transition: 0.5s;
-		transform: scale(1.1);
-	}
-
-	.box {
-		position: relative;
-
-		.content {
-			width: 100vw;
-			// transform: translateY(-100px);
-			border-radius: 50rpx 50rpx 0 0;
-			// position: absolute;
-			// top: 965rpx;
-			// border-top: 5px solid red;
-			z-index: 9999;
-			background-color: white;
-			// padding: 0 10rpx;
-
-		}
-
-
-
-		.active_swiper {
-			transform: scale(1.3);
-			// transform: translateX() translateY();
-
-		}
-
-		.pictrue {
-			position: relative;
-			width: 100%;
-			height: 345rpx;
-
-		}
-
-		.act {
-			color: #FF6D20;
-		}
-
-		.act_content {
-			width: 100vw;
-			// position: absolute;
-			// top: 965rpx;
-			z-index: 99;
-			background-color: #F4F4F4;
-			padding: 0 10rpx;
-
-			// transition: opt\ linear;
-			padding-top: 200rpx;
-		}
-
-		.act_class {
-			transition: 0.5s;
-		}
-
-		.act_class:active {
-			transform: scale(2);
-		}
-
-
-
-		.content_act {
-			width: 100vw;
-			position: absolute;
-			top: 165rpx;
-			z-index: 99;
-			background-color: #F4F4F4;
-			padding: 0 10rpx;
-		}
-	}
-
-	.fade-enter-active,
-	.fade-leave-active {
-		transition: opacity 0.5s;
-
-	}
+  @keyframes addcart {
+    from {
+      // background-color: red;
+      opacity: 1,
+    }
+
+    to {
+      // background-color: yellow;
+      opacity: 0,
+    }
+  }
+
+  .serchbtn {
+    // position: absolute;
+    // right: 5rpx;
+    // top: 5rpx;
+    width: 100rpx;
+    height: 50rpx;
+    border-radius: 30rpx;
+    text-align: center;
+    line-height: 50rpx;
+    // background-color: #FEAB00;
+    background: linear-gradient(to right, #F84221, #FF6D20);
+  }
+
+  .selected-list {
+    padding: 24rpx 14rpx;
+    border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx;
+    background-color: #fff;
+    position: absolute;
+    left: 100rpx;
+    font-size: 29.79rpx;
+    z-index: 9999;
+    // top: 100rpx;
+    opacity: 0;
+    transition: 0.5s;
+
+
+
+    .triangle-up {
+      width: 0;
+      height: 0;
+      border-left: 10rpx solid transparent;
+      border-right: 10rpx solid transparent;
+      border-bottom: 10rpx solid white;
+      position: absolute;
+      top: -10rpx;
+    }
+
+    .selected-li {
+      margin-top: 35rpx;
+      color: #F84221;
+      display: flex;
+      align-items: center;
+    }
+  }
+
+
+  .sku {
+    padding: 20rpx;
+
+    .sku_head {
+      display: flex;
+
+      .sku_head_r {
+        margin-left: 20rpx;
+        display: flex;
+        justify-content: space-between;
+        flex-direction: column;
+
+        .sku_goods_tit {
+          font-size: 30rpx;
+          width: 60vw;
+          /* 容器的宽度 */
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
+
+        .sku_goods_price {
+          color: red;
+          font-size: 30rpx;
+          font-weight: bold;
+        }
+      }
+
+      // justify-content;
+    }
+
+    .sku_size {
+      margin: 40rpx 0;
+
+      .size_li {
+        display: inline-block;
+        // width: 100rpx;
+        padding: 5rpx 20rpx;
+        margin-right: 20rpx;
+        text-align: center;
+        color: black;
+        border: 1px solid #EBECEE;
+
+        // height: 2;
+      }
+
+      .act_size_li {
+        background-color: #FF5C2D;
+        color: white;
+        border: #FF5C2D 1px solid;
+
+      }
+    }
+
+    .sku_num {
+      display: flex;
+      justify-content: space-between;
+    }
+
+    .skuaddcart {
+      width: 50vw;
+      background-color: #FEAB00;
+      margin: 20rpx auto;
+      height: 80rpx;
+      line-height: 80rpx;
+      text-align: center;
+      color: white;
+      border-radius: 80rpx;
+      // margin-top: 20rpx;
+    }
+  }
+
+  .flags {
+    background-color: red;
+    z-index: 99999999;
+  }
+
+  .swiper_item {
+    display: flex;
+    justify-content: space-around;
+    transition: .5s;
+    padding: 40rpx;
+    // transform: scale(1.2);
+  }
+
+  .swiper_item_act {
+    transform: scale(1.2);
+  }
+
+  // .swiper_item:hover {}
+
+
+  // .swiper_item {
+  // 	transform: scale(1.2);
+  // }
+
+  .swiper_b {
+    transition: 1s;
+  }
+
+  // .swiper_b:active {
+  // 	transform: scale(1.5);
+  // }
+
+  .act_cart {
+    transition: 0.5s;
+    transform: scale(1.1);
+  }
+
+  .box {
+    position: relative;
+
+    .content {
+      width: 100vw;
+      // transform: translateY(-100px);
+      border-radius: 50rpx 50rpx 0 0;
+      // position: absolute;
+      // top: 965rpx;
+      // border-top: 5px solid red;
+      z-index: 9999;
+      background-color: white;
+      // padding: 0 10rpx;
+
+    }
+
+
+
+    .active_swiper {
+      transform: scale(1.3);
+      // transform: translateX() translateY();
+
+    }
+
+    .pictrue {
+      position: relative;
+      width: 100%;
+      height: 345rpx;
+
+    }
+
+    .act {
+      color: #FF6D20;
+    }
+
+    .act_content {
+      width: 100vw;
+      // position: absolute;
+      // top: 965rpx;
+      z-index: 99;
+      background-color: #F4F4F4;
+      padding: 0 10rpx;
+
+      // transition: opt\ linear;
+      padding-top: 200rpx;
+    }
+
+    .act_class {
+      transition: 0.5s;
+    }
+
+    .act_class:active {
+      transform: scale(2);
+    }
+
+
+
+    .content_act {
+      width: 100vw;
+      position: absolute;
+      top: 165rpx;
+      z-index: 99;
+      background-color: #F4F4F4;
+      padding: 0 10rpx;
+    }
+  }
+
+  .fade-enter-active,
+  .fade-leave-active {
+    transition: opacity 0.5s;
+
+  }
 
-	.fade-enter,
-	.fade-leave-to {
-		opacity: 0;
-	}
-
-	.head_tits {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		box-sizing: border-box;
-		padding: 0 20rpx;
-		color: white;
-	}
-
-	.img_cls {
-		position: absolute;
-		top: 50%;
-		right: 7rpx;
-		transform: translateY(-50%);
-
-	}
-
-	.pop {
-		width: 615.07rpx;
-		padding: 30rpx 28rpx;
-
-		.pop_content {
-			width: 559rpx;
-			height: 80vh;
-			background-color: #F4F4F4;
-			padding: 28rpx;
-			border-radius: 21.03rpx 21.03rpx 0rpx 0rpx;
-			margin-top: 47rpx;
-
-			.pop_head {
-				// display: flex;
-			}
-
-			.pop_li {
-				display: flex;
-				margin-bottom: 52rpx;
-			}
-		}
-
-
-	}
-
-	.head_tit {
-		margin-left: 20rpx;
-		font-size: 40rpx;
-		// background-color: red;
-		width: 40vw;
-		white-space: nowrap;
-		overflow: hidden;
-
-		text-overflow: ellipsis;
-
-		// font-weight: 700;
-		// transform: skewX(-10deg);
-	}
-
-
-	.act {
-		color: red;
-	}
-
-	.head {
-		position: fixed;
-		z-index: 999;
-		color: white;
-		display: flex;
-		justify-content: space-between;
-		width: 100vw;
-
-		// background-color: red;
-		// padding: 0 20rpx;
-
-		align-items: center;
-		transition: .5s;
-		// padding-right: 10px;
-
-
-
-	}
-
-	.heads {
-		position: fixed;
-		z-index: 100;
-		color: white;
-		width: 100%;
-		padding: 0 20rpx;
-		transition: 1s;
-		opacity: 0;
-	}
-
-	.show {
-		opacity: 1;
-	}
-
-	.menu {
-		position: absolute;
-		top: 748rpx;
-		width: 750rpx;
-		// background-color: rgba(255, 255, 255, 0.7);
-		height: 250rpx;
-		// height: 175.23rpx;
-		// box-shadow: 0 0 100px 100px rgba(255, 255, 255, 0.5);
-		// box-shadow: 0 0 100rpx 30rpx rgba(255, 255, 255, 0.9);
-
-	}
-
-	.town_name {
-		// margin-right: 50rpx;
-		// background-color: red;
-		max-width: 15vw;
-		white-space: nowrap;
-		overflow: hidden;
-		font-size: 26rpx;
-		text-overflow: ellipsis;
-	}
-
-	.goods_list {
-		min-height: 95vh;
-		padding: 0 10rpx;
-		// background-color: red;
-
-		.goods {
-			display: flex;
-			padding: 21rpx;
-			background-color: white;
-			border-radius: 21.03rpx 21.03rpx 21.03rpx 21.03rpx;
-			margin-bottom: 20rpx;
-
-			.left {
-				width: 192.76rpx;
-				height: 192.76rpx;
-				border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx;
-				margin-right: 21rpx;
-			}
-
-			.right {
-				display: flex;
-				justify-content: space-between;
-				flex-direction: column;
-
-				.tit {
-					font-size: 29.79rpx;
-					color: black;
-					font-weight: bold;
-
-				}
-
-				.good_score {
-					font-size: 26rpx;
-					color: #B3B3B3;
-					margin-bottom: 15rpx;
-				}
-
-				.good_price {
-					display: flex;
-					justify-content: space-between;
-					align-items: center;
-					width: 60vw;
-
-					.good_price_r {
-						z-index: 9;
-					}
-
-					.good_price_l {
-						display: flex;
-
-						.old_price {
-							color: #B3B3B3;
-							text-decoration: line-through;
-							font-size: 26.29rpx;
-							margin-left: 15rpx;
-						}
-					}
-				}
-
-			}
-
-			// color: greenyellow;
-		}
-	}
-
-	.activeClass {
-		width: 400rpx;
-		height: 400rpx;
-	}
-
-	.act_swiper {
-		height: 200rpx;
-		position: fixed;
-		z-index: 99;
-		overflow: hidden;
-	}
-
-	.act_img {
-		// transition:t;
-		transform: translateY(-840rpx);
-		/* #ifdef APP-PLUS */
-		transform: translateY(-800rpx);
-		/* #endif */
-
-	}
-
-	// .act_swiper2 {
-	// 	height: 998rpx;
-	// }
-
-	.content_sift {
-		width: 750rpx;
-		padding: 22rpx 0;
-		// padding-top: 80rpx;
-		background-color: white;
-		display: flex;
-		justify-content: space-around;
-		// background-color: white;
-		// background-color: green;
-		z-index: 99;
-		box-sizing: border-box;
-		margin-bottom: 20rpx;
-
-
-	}
-
-	.swipers {
-		width: 750rpx;
-		height: 998.83rpx;
-	}
-
-	.card {
-		width: 720rpx;
-		z-index: 99;
-		// margin:auto;
-		left: 50%;
-		transform: translateX(-50%);
-		position: fixed;
-		// bottom: 0;
-		background-color: #333333;
-		height: 101.64rpx;
-		border-radius: 50.82rpx;
-		overflow: hidden;
-		color: white;
-		display: flex;
-		justify-content: space-between;
-		box-sizing: border-box;
-
-		.left {
-			display: flex;
-			align-items: center;
-			padding: 10rpx 35rpx;
-
-			.tot_price {
-				display: flex;
-				margin-left: 42rpx;
-				flex-direction: column;
-				justify-content: space-between;
-			}
-		}
-
-		.right {
-			font-size: 33.29rpx;
-			line-height: 50px;
-			background: linear-gradient(to right, #F84221, #FF6D20);
-			width: 175.23rpx;
-			text-align: center;
-		}
-	}
-
-	.badge {
-		position: absolute;
-		top: 0;
-		right: 0;
-		background-color: #F84221;
-		transform: translate(50%, -50%);
-		// padding: 10rpx 10rpx;
-		border-radius: 35rpx;
-		text-align: center;
-		width: 35rpx;
-		line-height: 35rpx;
-		height: 35rpx;
-	}
-
-	// .cloud_entrepot {
-	// 	background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/ycbg.png") no-repeat;
-	// 	background-size: cover;
-	// 	padding-bottom: 92.98rpx;
-	// }
-
-	// .head-wrapper {
-	// 	height: 485.96rpx;
-	// 	width: 100%;
-	// 	background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/top.png") no-repeat;
-	// 	background-size: cover;
-	// 	margin-bottom: 49.12rpx;
-	// }
-
-	// .town-title {
-	// 	margin: 0 auto;
-	// 	width: 100%;
-	// 	text-align: center;
-	// 	font-size: 50.88rpx;
-	// 	color: #fff;
-	// 	margin-bottom: 28.07rpx;
-
-	// 	&::after {
-	// 		content: '';
-	// 		display: inline-block;
-	// 		width: 66.67rpx;
-	// 		height: 31.58rpx;
-	// 		background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/you.png") no-repeat;
-	// 		background-size: cover;
-	// 		margin-left: 24.56rpx;
-	// 	}
-
-	// 	&::before {
-	// 		content: '';
-	// 		display: inline-block;
-	// 		width: 66.67rpx;
-	// 		height: 31.58rpx;
-	// 		background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/zuo.png") no-repeat;
-	// 		background-size: cover;
-	// 		margin-right: 24.56rpx;
-	// 	}
-	// }
-
-
-	// .body-wrapper {
-	// 	width: 694.74rpx;
-	// 	display: flex;
-	// 	justify-content: space-between;
-	// 	flex-wrap: wrap;
-	// 	margin: 0 auto;
-
-	// 	.item {
-	// 		width: 336.84rpx;
-	// 		height: 100%;
-	// 		padding: 24.56rpx 28.07rpx;
-	// 		margin-bottom: 21.05rpx;
-	// 		background-repeat: no-repeat;
-	// 		background-size: 100% 100%;
-	// 		box-sizing: border-box;
-
-	// 		text {
-	// 			display: block;
-	// 			font-size: 24.56rpx;
-	// 			color: #999;
-	// 			margin-bottom: 14.04rpx;
-	// 		}
-
-	// 		.item-title {
-	// 			font-size: 31.58rpx;
-	// 			color: #333;
-	// 		}
-
-	// 		.chakan-btn {
-	// 			width: 114.04rpx;
-	// 			height: 49.12rpx;
-	// 			font-size: 28.07rpx;
-	// 			text-align: center;
-	// 			line-height: 49.12rpx;
-	// 			color: #fff;
-	// 			margin-top: auto;
-	// 			background: linear-gradient(90deg, #FE5300 0%, #F84221 100%);
-	// 			border-radius: 50px;
-	// 		}
-	// 	}
-	// }
-
-	.empty {
-		// display: flex;
-		// justify-content: space-between;
-		// flex-direction: column;
-		// align-items: center;
-		// padding: 20vh 0;
-		position: relative;
-		height: 100vh;
-
-		.info {
-			position: absolute;
-			top: 50%;
-			left: 50%;
-			transform: translate(-50%, -50%);
-		}
-
-		// padding-top: 100px;
-	}
-
-	.head_r {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-	}
-
-	.cart {
-		z-index: 999;
-	}
-
-	.x_tra {
-		// position: relative;
-		z-index: 999999;
-		animation-name: addcatr;
-		animation-duration: 1s;
-		animation-timing-function: ease-in-out;
-		animation-iteration-count: 1;
-		animation-fill-mode: forwards; // animation-iteration-count: 1;
-		/* 设置为1 */
-		// transition: 1s cubic-bezier(0.5, -0.5, 1, 1);
-	}
-
-	.price_sift {
-		display: flex;
-		align-items: center;
-	}
-
-	.sl {
-
-		transform: rotate(180deg);
-		transition: 0.5s;
-	}
-
-	.actsl {
-		transform: rotate(0deg);
-	}
-
-	.actSel {
-		opacity: 1;
-		// transform: translateX(100rpx);
-
-	}
-
-	.yuncangempty {
-		margin: 20vh 0;
-		display: flex;
-		flex-direction: column;
-		align-items: center
-	}
-
-	.dw_cls {
-		position: fixed;
-		z-index: 99;
-		width: 212.03rpx;
-		// width: 100vw;
-		height: 78.86rpx;
-		background-image: url(/static/images/LHYC/DWBG.png);
-		background-size: cover;
-		right: 0;
-		// top: 130rpx;
-
-
-		.dw_text {
-			display: flex;
-			align-items: center;
-			// background-color: red;
-			height: 78.86rpx;
-			justify-content: space-around;
-
-		}
-	}
+  .fade-enter,
+  .fade-leave-to {
+    opacity: 0;
+  }
+
+  .head_tits {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    box-sizing: border-box;
+    padding: 0 20rpx;
+    color: white;
+  }
+
+  .img_cls {
+    position: absolute;
+    top: 50%;
+    right: 5rpx;
+    transform: translateY(-50%);
+
+  }
+
+  .pop {
+    width: 615.07rpx;
+    padding: 30rpx 28rpx;
+
+    .pop_content {
+      width: 559rpx;
+      height: 80vh;
+      background-color: #F4F4F4;
+      padding: 28rpx;
+      border-radius: 21.03rpx 21.03rpx 0rpx 0rpx;
+      margin-top: 47rpx;
+
+      .pop_head {
+        // display: flex;
+      }
+
+      .pop_li {
+        display: flex;
+        margin-bottom: 52rpx;
+      }
+    }
+
+
+  }
+
+  .head_tit {
+    margin-left: 20rpx;
+    font-size: 40rpx;
+    // background-color: red;
+    width: 40vw;
+    white-space: nowrap;
+    overflow: hidden;
+
+    text-overflow: ellipsis;
+
+    // font-weight: 700;
+    // transform: skewX(-10deg);
+  }
+
+
+  .act {
+    color: red;
+  }
+
+  .head {
+    position: fixed;
+    z-index: 999;
+    color: white;
+    display: flex;
+    justify-content: space-between;
+    width: 100vw;
+
+    // background-color: red;
+    // padding: 0 20rpx;
+
+    align-items: center;
+    transition: .5s;
+    // padding-right: 10px;
+
+
+
+  }
+
+  .heads {
+    position: fixed;
+    z-index: 100;
+    color: white;
+    width: 100%;
+    padding: 0 20rpx;
+    transition: 1s;
+    opacity: 0;
+  }
+
+  .show {
+    opacity: 1;
+  }
+
+  .menu {
+    position: absolute;
+    top: 490rpx;
+    width: 750rpx;
+    // background-color: rgba(255, 255, 255, 0.7);
+    height: 250rpx;
+    // height: 140.19rpx;
+    // box-shadow: 0 0 100px 100px rgba(255, 255, 255, 0.5);
+    // box-shadow: 0 0 100rpx 30rpx rgba(255, 255, 255, 0.9);
+
+  }
+
+  .town_name {
+    // margin-right: 50rpx;
+    // background-color: red;
+    max-width: 15vw;
+    white-space: nowrap;
+    overflow: hidden;
+    font-size: 26rpx;
+    text-overflow: ellipsis;
+  }
+
+  .goods_list {
+    min-height: 95vh;
+    padding: 0 10rpx;
+    // background-color: red;
+
+    .goods {
+      display: flex;
+      padding: 21rpx;
+      background-color: white;
+      border-radius: 21.03rpx 21.03rpx 21.03rpx 21.03rpx;
+      margin-bottom: 20rpx;
+
+      .left {
+        width: 192.76rpx;
+        height: 192.76rpx;
+        border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx;
+        margin-right: 21rpx;
+      }
+
+      .right {
+        display: flex;
+        justify-content: space-between;
+        flex-direction: column;
+
+        .tit {
+          font-size: 29.79rpx;
+          color: black;
+          font-weight: bold;
+
+        }
+
+        .good_score {
+          font-size: 26rpx;
+          color: #B3B3B3;
+          margin-bottom: 15rpx;
+        }
+
+        .good_price {
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          width: 60vw;
+
+          .good_price_r {
+            z-index: 9;
+          }
+
+          .good_price_l {
+            display: flex;
+
+            .old_price {
+              color: #B3B3B3;
+              text-decoration: line-through;
+              font-size: 26.29rpx;
+              margin-left: 15rpx;
+            }
+          }
+        }
+
+      }
+
+      // color: greenyellow;
+    }
+  }
+
+  .activeClass {
+    width: 400rpx;
+    height: 400rpx;
+  }
+
+  .act_swiper {
+    height: 200rpx;
+    position: fixed;
+    z-index: 99;
+    overflow: hidden;
+  }
+
+  .act_img {
+    // transition:t;
+    transform: translateY(-580rpx);
+    /* #ifdef APP-PLUS */
+    transform: translateY(-540rpx);
+    /* #endif */
+
+  }
+
+  // .act_swiper2 {
+  // 	height: 998rpx;
+  // }
+
+  .content_sift {
+    width: 750rpx;
+    padding: 22rpx 0;
+    // padding-top: 80rpx;
+    background-color: white;
+    display: flex;
+    justify-content: space-around;
+    // background-color: white;
+    // background-color: green;
+    z-index: 99;
+    box-sizing: border-box;
+    margin-bottom: 20rpx;
+
+
+  }
+
+  .swipers {
+    width: 750rpx;
+    height: 718.46rpx;
+  }
+
+  .card {
+    width: 720rpx;
+    z-index: 99;
+    // margin:auto;
+    left: 50%;
+    transform: translateX(-50%);
+    position: fixed;
+    // bottom: 0;
+    background-color: #333333;
+    height: 101.64rpx;
+    border-radius: 50.82rpx;
+    overflow: hidden;
+    color: white;
+    display: flex;
+    justify-content: space-between;
+    box-sizing: border-box;
+
+    .left {
+      display: flex;
+      align-items: center;
+      padding: 10rpx 35rpx;
+
+      .tot_price {
+        display: flex;
+        margin-left: 42rpx;
+        flex-direction: column;
+        justify-content: space-between;
+      }
+    }
+
+    .right {
+      font-size: 33.29rpx;
+      line-height: 50px;
+      background: linear-gradient(to right, #F84221, #FF6D20);
+      width: 140.19rpx;
+      text-align: center;
+    }
+  }
+
+  .badge {
+    position: absolute;
+    top: 0;
+    right: 0;
+    background-color: #F84221;
+    transform: translate(50%, -50%);
+    // padding: 10rpx 10rpx;
+    border-radius: 35rpx;
+    text-align: center;
+    width: 35rpx;
+    line-height: 35rpx;
+    height: 35rpx;
+  }
+
+  // .cloud_entrepot {
+  // 	background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/ycbg.png") no-repeat;
+  // 	background-size: cover;
+  // 	padding-bottom: 92.98rpx;
+  // }
+
+  // .head-wrapper {
+  // 	height: 485.96rpx;
+  // 	width: 100%;
+  // 	background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/top.png") no-repeat;
+  // 	background-size: cover;
+  // 	margin-bottom: 49.12rpx;
+  // }
+
+  // .town-title {
+  // 	margin: 0 auto;
+  // 	width: 100%;
+  // 	text-align: center;
+  // 	font-size: 50.88rpx;
+  // 	color: #fff;
+  // 	margin-bottom: 28.07rpx;
+
+  // 	&::after {
+  // 		content: '';
+  // 		display: inline-block;
+  // 		width: 66.67rpx;
+  // 		height: 31.58rpx;
+  // 		background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/you.png") no-repeat;
+  // 		background-size: cover;
+  // 		margin-left: 24.56rpx;
+  // 	}
+
+  // 	&::before {
+  // 		content: '';
+  // 		display: inline-block;
+  // 		width: 66.67rpx;
+  // 		height: 31.58rpx;
+  // 		background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/zuo.png") no-repeat;
+  // 		background-size: cover;
+  // 		margin-right: 24.56rpx;
+  // 	}
+  // }
+
+
+  // .body-wrapper {
+  // 	width: 694.74rpx;
+  // 	display: flex;
+  // 	justify-content: space-between;
+  // 	flex-wrap: wrap;
+  // 	margin: 0 auto;
+
+  // 	.item {
+  // 		width: 336.84rpx;
+  // 		height: 100%;
+  // 		padding: 24.56rpx 28.07rpx;
+  // 		margin-bottom: 21.05rpx;
+  // 		background-repeat: no-repeat;
+  // 		background-size: 100% 100%;
+  // 		box-sizing: border-box;
+
+  // 		text {
+  // 			display: block;
+  // 			font-size: 24.56rpx;
+  // 			color: #999;
+  // 			margin-bottom: 14.04rpx;
+  // 		}
+
+  // 		.item-title {
+  // 			font-size: 31.58rpx;
+  // 			color: #333;
+  // 		}
+
+  // 		.chakan-btn {
+  // 			width: 114.04rpx;
+  // 			height: 49.12rpx;
+  // 			font-size: 28.07rpx;
+  // 			text-align: center;
+  // 			line-height: 49.12rpx;
+  // 			color: #fff;
+  // 			margin-top: auto;
+  // 			background: linear-gradient(90deg, #FE5300 0%, #F84221 100%);
+  // 			border-radius: 50px;
+  // 		}
+  // 	}
+  // }
+
+  .empty {
+    // display: flex;
+    // justify-content: space-between;
+    // flex-direction: column;
+    // align-items: center;
+    // padding: 20vh 0;
+    position: relative;
+    height: 100vh;
+
+    .info {
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%, -50%);
+    }
+
+    // padding-top: 100px;
+  }
+
+  .head_r {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+  }
+
+  .cart {
+    z-index: 999;
+  }
+
+  .x_tra {
+    // position: relative;
+    z-index: 999999;
+    animation-name: addcatr;
+    animation-duration: 1s;
+    animation-timing-function: ease-in-out;
+    animation-iteration-count: 1;
+    animation-fill-mode: forwards; // animation-iteration-count: 1;
+    /* 设置为1 */
+    // transition: 1s cubic-bezier(0.5, -0.5, 1, 1);
+  }
+
+  .price_sift {
+    display: flex;
+    align-items: center;
+  }
+
+  .sl {
+
+    transform: rotate(180deg);
+    transition: 0.5s;
+  }
+
+  .actsl {
+    transform: rotate(0deg);
+  }
+
+  .actSel {
+    opacity: 1;
+    // transform: translateX(100rpx);
+
+  }
+
+  .yuncangempty {
+    margin: 20vh 0;
+    display: flex;
+    flex-direction: column;
+    align-items: center
+  }
+
+  .dw_cls {
+    position: fixed;
+    z-index: 99;
+    width: 212.03rpx;
+    // width: 100vw;
+    height: 78.86rpx;
+    background-image: url(/static/images/LHYC/DWBG.png);
+    background-size: cover;
+    right: 0;
+    // top: 130rpx;
+
+
+    .dw_text {
+      display: flex;
+      align-items: center;
+      // background-color: red;
+      height: 78.86rpx;
+      justify-content: space-around;
+
+    }
+  }
 </style>
\ No newline at end of file
diff --git a/pages/nongKe/food/index.vue b/pages/nongKe/food/index.vue
index d84703e..386ad5e 100644
--- a/pages/nongKe/food/index.vue
+++ b/pages/nongKe/food/index.vue
@@ -26,8 +26,9 @@
 				:value='sotreParam.keyword' @confirm="searchSubmit"></input> -->
 						<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称"
 							v-model="sotreParam.keyword" class="serch_cls"></u-search>
-						<u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
-							src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx"></u--image>
+							<view class="serchbtn img_cls" @tap="searchSubmit">搜索</view>
+						<!-- <u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
+							src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx"></u--image> -->
 					</view>
 
 				</view>
@@ -703,7 +704,19 @@
 		margin: 0;
 		padding: 0;
 	}
-
+.serchbtn {
+		// position: absolute;
+		// right: 5rpx;
+		// top: 5rpx;
+		width: 100rpx;
+		height: 50rpx;
+		border-radius: 30rpx;
+		text-align: center;
+		line-height: 50rpx;
+		// background-color: #FEAB00;
+		color: #fff;
+		background: linear-gradient(to right, #F84221, #FF6D20);
+	}
 	.com_name {
 		font-size: 32rpx;
 		// background-color: red;
@@ -1304,7 +1317,7 @@
 	.img_cls {
 		position: absolute;
 		top: 50%;
-		right: 7rpx;
+		right: 5rpx;
 		transform: translateY(-50%);
 
 	}
diff --git a/pages/nongKe/gather/select_warehouse.vue b/pages/nongKe/gather/select_warehouse.vue
index 7a03a32..87ad74a 100644
--- a/pages/nongKe/gather/select_warehouse.vue
+++ b/pages/nongKe/gather/select_warehouse.vue
@@ -12,7 +12,8 @@
 		<view class="list-box listA" :class="goods.length > 0 ? 'fadeIn on' : ''">
 			<view class="item" v-for="(item, index) in goods" :key="index">
 				<view class="pictrue">
-					<easy-loadimage mode="widthFix" :image-src="item.image"></easy-loadimage>
+					<!-- <easy-loadimage mode="widthFix" :image-src="item.image"></easy-loadimage> -->
+          <image :src="item.image" :lazy-load="true"></image>
 				</view>
 				<view class="text-info">
 					<view class="title">{{ item.store_name }}</view>
@@ -24,7 +25,7 @@
 		<u-popup :show="editGoodsShow" @close="editGoodsClose" :round="18" mode="center">
 			<view class="edit_goods_box">
 				<view class="edit_name flex_a_c edit_name_no">
-					<text>商品编号：</text><input type="text" disabled placeholder="请输入商品名称" v-model="editGoodsCode">
+					<text>商品条码：</text><input type="text" disabled placeholder="请输入商品条码" v-model="editGoodsCode">
 				</view>
 				<view class="edit_name flex_a_c edit_name_no">
 					<text>商品名称：</text> <input type="text" disabled placeholder="请输入商品名称" v-model="editGoodsName">
@@ -43,8 +44,25 @@
 				</view>
 			</view>
 		</u-popup>
-		<u-modal :show="addGoodsShow" content='是否添加到你的仓库中?' @cancel="addGoodsclose()" @close="addGoodsclose()"
-			@confirm="addGoodsopen()" :closeOnClickOverlay="true" :showCancelButton="true"></u-modal>
+		<!-- <u-modal :show="addGoodsShow" content='是否添加到你的仓库中?' @cancel="addGoodsclose()" @close="addGoodsclose()"
+			@confirm="addGoodsopen()" :closeOnClickOverlay="true" :showCancelButton="true"></u-modal> -->
+    <u-popup :show="addGoodsShow" @close="searchGoodsClose" :round="18" mode="center">
+    	<view class="search_goods_box">
+        <view style="text-align: center;font-weight: bold;">是否添加到你的仓库中?</view>
+    		<view style="display: flex;align-items: center;margin-top: 16rpx;">
+          <view style="margin-right: 20rpx;">价格:</view>
+          <input style="flex: 1;" type="text" v-model="putGoods.price" class="putGoods" :placeholder="`请设置商品价格`">
+        </view>
+        <view style="display: flex;align-items: center;margin-top: 16rpx;">
+          <view style="margin-right: 20rpx;">库存:</view>
+          <input style="flex: 1;" type="text" v-model="putGoods.stock" class="putGoods" placeholder="请输入商品库存">
+        </view>
+    		<view class="search_goods_btn">
+    			<view class="cancel edit_btn" @click="addGoodsclose()">取消</view>
+    			<view class="search edit_btn" @click="addGoodsopen()">确定</view>
+    		</view>
+    	</view>
+    </u-popup>
 		<u-popup :show="searchGoodsShow" @close="searchGoodsClose" :round="18" mode="center">
 			<view class="search_goods_box">
 				<input type="text" v-model="searchGoodsName" class="searchGoods" placeholder="请输入商品名称">
@@ -68,7 +86,7 @@
 	} from '@/api/store.js'
 	import {
 		seachBarCodeAPI,
-		post_product_import
+		micro_product_import
 	} from '@/api/api.js'
 	import {
 		Toast
@@ -77,7 +95,7 @@
 		data() {
 			return {
 				goodsData: [{
-						name: '',
+						name: '商品名称添加',
 						type: 1,
 						src: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/mingcheng.png'
 					},
@@ -96,7 +114,24 @@
 				mer_id: 0,
 				searchGoodsShow: false,
 				searchGoodsName: '',
-				goods: [],
+				goods: [
+            // {
+            //     "id": 5,
+            //     "store_name": "雨森电商纯木生活260张面巾纸 170X118X260张（5层）",
+            //     "bar_code": "6940074914381",
+            //     "unit_name": "",
+            //     "price": "0.00",
+            //     "cost": "0.00",
+            //     "ot_price": "0.00",
+            //     "stock": 9999999,
+            //     "image": "127.0.0.1:8324/uploads/img/2023-11-01/1698809432.jpg"
+            // }
+        ],
+        putGoods: {
+          id: '',
+          price: '',
+          stock: '',
+        },
 				item: [],
 				addGoodsShow: false,
 				stype: '',
@@ -104,28 +139,32 @@
 		},
 		onLoad(e) {
 			this.mer_id = e.mer_id
-			this.stype = e.stype
-			if (this.stype == 1) {
-				return this.goodsData[0].name = '商品添加'
-			}
-			if (this.stype == 2) {
-				return this.goodsData[0].name = '商品名称添加'
-			}
+			// this.stype = e.stype
+      this.stype = 2
+			// if (this.stype == 1) {
+			// 	return this.goodsData[0].name = '商品添加'
+			// }
+			// if (this.stype == 2) {
+			// 	return this.goodsData[0].name = '商品名称添加'
+			// }
 		},
 		onShow() {
 
 		},
 		methods: {
 			addGoods(item) {
+        this.putGoods.id = item.id;
 				this.addGoodsShow = true
 				this.item = item
 			},
 			addGoodsopen() {
-				if (this.item) {
-					post_product_import(this.item.product_id).then(e => {
+				if (this.putGoods.id) {
+          console.log('开始');
+					micro_product_import(this.putGoods).then(e => {
 						if (e.status == 200) {
 							Toast(e.data.msg)
 							this.addGoodsShow = false
+              this.putGoods = {};
 						} else {
 							// console.log(e);
 							Toast(e.message)
@@ -149,6 +188,8 @@
 			},
 			openSearch() {},
 			async searchGoodsClose() {
+        console.log('搜索', this.searchGoodsName);
+        if(this.searchGoodsName=='') return Toast('请输入商品名称');
 				const rq = {
 					mer_id: this.mer_id,
 					name: this.searchGoodsName
@@ -221,6 +262,7 @@
 					code: code,
 					mer_id: this.mer_id
 				}).then(res => {
+          console.log(res);
 					if (!res.data) {
 						uni.showToast({
 							title: res.message,
@@ -311,6 +353,13 @@
 			padding: 12px;
 			margin: 21.05rpx 0;
 		}
+    
+    .putGoods {
+    	height: 87.72rpx;
+    	border: 1px solid #f5f5f5;
+    	border-radius: 8px;
+    	padding: 12px;
+    }
 
 		.search_goods_btn {
 			margin-top: 28.07rpx;
diff --git a/pages/nongKe/specialty/index.vue b/pages/nongKe/specialty/index.vue
index 9a5ab18..a2df3ba 100644
--- a/pages/nongKe/specialty/index.vue
+++ b/pages/nongKe/specialty/index.vue
@@ -9,8 +9,11 @@
 				<view class="head_tit">
 					<view class="" style="display: flex;align-items: center;">
 						<view class="back" @click='backjJump()' style="margin-right: 17rpx;">
-							<u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx"
-								height="50.82rpx"></u--image>
+						<!-- 	<u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx"
+								height="50.82rpx"></u--image> -->
+								<i class="iconfont icon-xiangzuo"  style="font-size: 40rpx;text-align: left;"
+									></i>
+								
 						</view>
 						<view style="font-size: 40rpx;">
 							<!-- {{titName}} -->
@@ -27,8 +30,9 @@
 				:value='sotreParam.keyword' @confirm="searchSubmit"></input> -->
 						<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称"
 							v-model="sotreParam.keyword" class="serch_cls"></u-search>
-						<u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
-							src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx"></u--image>
+							<view class="serchbtn img_cls" @tap="searchSubmit">搜索</view>
+					<!-- 	<u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
+							src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx"></u--image> -->
 					</view>
 
 				</view>
@@ -700,6 +704,19 @@
 </script>
 
 <style lang="scss" scoped>
+	.serchbtn {
+		// position: absolute;
+		// right: 5rpx;
+		// top: 5rpx;
+		width: 100rpx;
+		height: 50rpx;
+		border-radius: 30rpx;
+		text-align: center;
+		line-height: 50rpx;
+		// background-color: #FEAB00;
+		color: #fff;
+		background: linear-gradient(to right, #F84221, #FF6D20);
+	}
 	* {
 		margin: 0;
 		padding: 0;
@@ -1305,7 +1322,7 @@
 	.img_cls {
 		position: absolute;
 		top: 50%;
-		right: 7rpx;
+		right: 5rpx;
 		transform: translateY(-50%);
 
 	}
diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue
index 395eebe..53f0a58 100644
--- a/pages/nongKe/supply_chain/supplier.vue
+++ b/pages/nongKe/supply_chain/supplier.vue
@@ -112,7 +112,7 @@
 						<view class="right">
 							<view class="li head">
 								<text class="com_name">{{item.mer_name}}</text>
-								<text
+								<text v-if="item.type_id==17"
 									style="font-weight: normal;font-size: 19.28rpx;color: red;padding:0 10rpx; border-radius: 10rpx; border: 1px solid red;">{{item.type_name}}</text>
 							</view>
 							<view class="li">
@@ -643,7 +643,7 @@
 			},
 			navGo(id) {
 				uni.navigateTo({
-					url: `/pages/nongKe/supply_chain/supplierA?type_id=10&merchant_category_id=${id}&street_id=${this.street_id}`
+					url: `/pages/nongKe/supply_chain/supplierA?type_id=10,17&merchant_category_id=${id}&street_id=${this.street_id}`
 				})
 			},
 			go_details: function(product_type, product_id) {
diff --git a/pages/nongKe/supply_chain/supplierA.vue b/pages/nongKe/supply_chain/supplierA.vue
index 86d913c..028538e 100644
--- a/pages/nongKe/supply_chain/supplierA.vue
+++ b/pages/nongKe/supply_chain/supplierA.vue
@@ -59,7 +59,7 @@
 							<view class="right">
 								<view class="li head" style="display: flex;">
 									<text class="com_name">{{item.mer_name}}</text>
-									<text
+									<text v-if="item.type_id==17"
 										style="font-weight: normal;font-size: 19.28rpx;color: red;padding:0 10rpx; border-radius: 10rpx; border: 1px solid red;">{{item.type_name}}</text>
 								</view>
 								<view class="li">
diff --git a/pages/nongKe/tourism/index.vue b/pages/nongKe/tourism/index.vue
index bd9df7a..a62daee 100644
--- a/pages/nongKe/tourism/index.vue
+++ b/pages/nongKe/tourism/index.vue
@@ -29,8 +29,9 @@
 				:value='sotreParam.keyword' @confirm="searchSubmit"></input> -->
 						<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称"
 							v-model="sotreParam.keyword" class="serch_cls"></u-search>
-						<u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
-							src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx"></u--image>
+							<view class="serchbtn img_cls" @tap="searchSubmit">搜索</view>
+					<!-- 	<u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
+							src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx"></u--image> -->
 					</view>
 
 				</view>
@@ -704,7 +705,19 @@
 		margin: 0;
 		padding: 0;
 	}
-
+.serchbtn {
+		// position: absolute;
+		// right: 5rpx;
+		// top: 5rpx;
+		width: 100rpx;
+		height: 50rpx;
+		border-radius: 30rpx;
+		text-align: center;
+		line-height: 50rpx;
+		// background-color: #FEAB00;
+		color: #fff;
+		background: linear-gradient(to right, #F84221, #FF6D20);
+	}
 	.com_name {
 		font-size: 32rpx;
 		// background-color: red;
@@ -1305,7 +1318,7 @@
 	.img_cls {
 		position: absolute;
 		top: 50%;
-		right: 7rpx;
+		right: 5rpx;
 		transform: translateY(-50%);
 
 	}
diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue
index fd8c56e..69e7b32 100644
--- a/pages/order_details/index.vue
+++ b/pages/order_details/index.vue
@@ -306,7 +306,7 @@
 			<view class="content-clip"></view>
 			<view class='footer acea-row row-right row-middle' v-if="isGoodsReturn==false">
 				<!-- <view class='bnt cancel' @click="cancelSales">取消售后</view> -->
-				<!-- <view v-if="!orderInfo.receipt && !isGoodsReturn" class='bnt cancel' @click="applyInvoice">申请开票</view> -->
+				<view v-if="!orderInfo.receipt && !isGoodsReturn" class='bnt cancel' @click="applyInvoice">申请开票</view>
 				<view v-if="orderInfo.activity_type == 2 && (orderInfo.status == 10 || orderInfo.status == 11)"
 					class=" acea-row row-right row-middle">
 					<view v-if="orderInfo.presellOrder.activeStatus == 0" class='bnt b-color btn_auto'>
diff --git a/pages/order_details/stay.vue b/pages/order_details/stay.vue
index 2e7bb70..663e932 100644
--- a/pages/order_details/stay.vue
+++ b/pages/order_details/stay.vue
@@ -363,7 +363,7 @@
 			},
 			mapGetters(['isLogin', 'uid', 'viewColor', 'keyColor', ])),
 		onLoad: function(options) {
-			console.log('11111111')
+			
 			this.credit_buy = options.credit_buy
 			// console.log(options.product_type)
 			if (options.product_type) {
diff --git a/pages/order_pay_status/index.vue b/pages/order_pay_status/index.vue
index a28f466..a18793a 100644
--- a/pages/order_pay_status/index.vue
+++ b/pages/order_pay_status/index.vue
@@ -224,7 +224,7 @@
 				if (this.product_type == 98) {
 					if(val==1){
 						uni.navigateTo({
-							url: `/pages/users/order_list/indexCopy?status=1&product_type=${this.product_type}`
+							url: `/pages/users/order_list/indexCopy?status=2&product_type=${this.product_type}`
 						})
 						}else{
 							uni.navigateTo({
@@ -235,7 +235,7 @@
 				} else if (this.product_type == 99) {
 					if(val==1){
 						uni.navigateTo({
-							url: `/pages/users/order_list/relase?status=1&product_type=${this.product_type}`
+							url: `/pages/users/order_list/relase?status=2&product_type=${this.product_type}`
 						})
 						}else{
 							uni.navigateTo({
@@ -246,7 +246,7 @@
 				} else {
 					if(val==1){
 						uni.navigateTo({
-							url: '/pages/users/order_list/index?status=1&product_type=0'
+							url: '/pages/users/order_list/index?status=2&product_type=0'
 						})
 						}else{
 							uni.navigateTo({
diff --git a/pages/plantGrass/plant_detail/index.vue b/pages/plantGrass/plant_detail/index.vue
index 8c0dd9e..9702245 100644
--- a/pages/plantGrass/plant_detail/index.vue
+++ b/pages/plantGrass/plant_detail/index.vue
@@ -264,7 +264,8 @@
 				<image src="../static/images/no_content.png"></image>
 				<text>内容不存在，可能被删除了哦~</text>
 				<navigator class="btn" :open-type="open_grass ? 'switchTab' : 'navigate'"
-					url="/pages/plant_grass/index">返回首页</navigator>
+					url="/pages/index/index">返回首页</navigator>
+					
 			</view>
 		</view>
 		<!-- 他提到的宝贝弹窗 -->
@@ -532,9 +533,9 @@
 					that.followDetail = null
 					that.loadData = false
 					uni.hideLoading()
-					return that.$util.Tips({
-						title: err
-					});
+					// return that.$util.Tips({
+					// 	title: err
+					// });
 				})
 			},
 			/*获取评论*/
diff --git a/pages/plant_release/index.vue b/pages/plant_release/index.vue
index bad9ae3..8c1208b 100644
--- a/pages/plant_release/index.vue
+++ b/pages/plant_release/index.vue
@@ -130,7 +130,7 @@
 				selHeight="250upx">
 			</avatar>
 			<!-- 提到的宝贝弹窗 -->
-			<uni-popup ref="associated" type="bottom">
+			<uni-popup ref="associated" type="bottom" style="z-index: 9999;">
 				<associated @close="close" @getProduct="getProduct" :checkedObj="productList"></associated>
 			</uni-popup>
 			<!-- 话题弹窗 -->
diff --git a/pages/product/addGoods/addGoodDetils.vue b/pages/product/addGoods/addGoodDetils.vue
index 1aae373..2c9f40d 100644
--- a/pages/product/addGoods/addGoodDetils.vue
+++ b/pages/product/addGoods/addGoodDetils.vue
@@ -32,7 +32,7 @@
 			getProductContent(obj) {
 				// console.log(obj);
 				this.goodsDis = obj;
-				this.a=obj.store_name
+				this.a=obj.store_name;
 			},
 			save() {
 				setStorage('goodsDis', this.goodsDis);
diff --git a/pages/product/addGoods/commodity.vue b/pages/product/addGoods/commodity.vue
new file mode 100644
index 0000000..50ac6cd
--- /dev/null
+++ b/pages/product/addGoods/commodity.vue
@@ -0,0 +1,690 @@
+<template>
+  <view class=" writeBg  ">
+    
+    <view class="content_list">
+      <view class="content_list_item">
+        <view>商品详情</view>
+      </view>
+      <input-goods-detils class="input-goods-detils" @getProductContent="getProductContent" :title="store_name" :prodectContent="goodsDis" :maxLength="200"></input-goods-detils>
+      <block v-if="!moreThanFlag">
+        <view class="content_list_video input-goods-detils">
+          <view class="content_list_video_title">商品视频</view>
+          <view class="video_list">
+            <view class="video_list_item photo" v-if="addGoodsSecoundData.video_link">
+              <view class="jiao" @click="deleteImage()">
+                <!-- video标签在app端层级过高 -->
+                <!--#ifndef APP-PLUS-->
+                <video :src="addGoodsSecoundData.video_link"></video>
+                <!--#endif-->
+                <!--#ifdef APP-PLUS-->
+                <img src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/3/video_bg.png"
+                  style=" width:150rpx"></img>
+                <!--#endif-->
+                <image src="../static/images/close.png" mode="widthFix"></image>
+              </view>
+        
+              <!--#ifndef APP-PLUS-->
+              <view style="position: absolute;">
+                <view class="videoHover" @click="videoshow">
+                </view>
+                <text class="video-text">点击可预览视频</text>
+              </view>
+              <!--#endif-->
+        
+              <!--#ifdef APP-PLUS-->
+              <view class='preview_video'>
+                <view class="videoHover" @click="videoshow">
+                </view>
+                <text class="video-text">点击可预览视频</text>
+              </view>
+              <!--#endif-->
+            </view>
+            <view class="photo" @click="uploadVideo" v-else>
+              <view>
+                <image src="../static/images/creamer.png" mode="widthFix"></image>
+              </view>
+              <view>添加视频</view>
+            </view>
+          </view>
+        </view>
+        <view class="container_input marginTop_none input-goods-detils">
+          <view class="container_input_item">
+            <view class="container_input_item_label"><span>是否推荐</span></view>
+            <view class="container_input_item_value">
+              <switch :checked="addGoodsSecoundData.is_good == 1" color="#E93323" style="transform:scale(0.8)"
+                @change="isGood" />
+            </view>
+          </view>
+          <!-- <view class="container_input_item">
+            <view class="container_input_item_label"><span>是否开启礼包</span></view>
+            <view class="container_input_item_value">
+              <switch :checked="addGoodsSecoundData.is_gift_bag == 1" color="#E93323" style="transform:scale(0.8)"
+                @change="isGiftBag" />
+            </view>
+          </view> -->
+        </view>
+       <!-- <view class="tip input-goods-detils">
+          <span class="iconfont">&#xe688;</span>
+          <span>开启后此商品只能在分销礼包中展示并销售</span>
+        </view> -->
+        <view class="container_input marginTop_none input-goods-detils">
+          <!-- <view class="container_input_item">
+            <view class="container_input_item_label"><span>限购数量</span></view>
+            <view class="container_input_item_value">
+              <input v-model="addGoodsSecoundData.once_count" type="number" value="" placeholder="请输入限购数量"
+                placeholder-class="inputPlaceHolder" />
+            </view>
+          </view> -->
+          <view class="container_input_item">
+            <view class="container_input_item_label"><span>商品排序</span></view>
+            <view class="container_input_item_value">
+              <input v-model="addGoodsSecoundData.sort" type="number" value="" placeholder="请输入商品排序"
+                placeholder-class="inputPlaceHolder" />
+            </view>
+          </view>
+        </view>
+      </block>
+      <view class="more_than" @click="moreThanFlag=!moreThanFlag" >
+      	<view v-if="moreThanFlag">更多</view>
+        <view v-else>收起</view>
+      </view>	
+    </view>
+    <view v-if="showVideo" class="video-count">
+      <!--#ifndef APP-PLUS-->
+      <video id="myVideo" class="videoLink" autoplay loop muted :src="addGoodsSecoundData.video_link"></video>
+      <!--#endif-->
+      <!--#ifdef APP-PLUS-->
+
+      <video id="myVideo" class="videoLink" autoplay loop
+        :src='addGoodsSecoundData.video_link && (addGoodsSecoundData.video_link.substring(0,4) == "http" || addGoodsSecoundData.video_link.substring(0,5) == "https") ?addGoodsSecoundData.video_link : "http:" + addGoodsSecoundData.video_link'></video>
+      <!--#endif-->
+    </view>
+    <view class='mask' catchtouchmove="true" :hidden='showVideo==false' @tap="showVideo=false"></view>
+    <view class="handle dobuButton">
+      <view class="handle_button margin_right" @click="lastStep">上一步</view>
+      <view class="handle_button" @click="submitCreatedGoods">提交</view>
+    </view>
+  </view>
+</template>
+<script>
+  import { TOKENNAME, HTTP_REQUEST_URL } from '@/config/app.js';
+  import store from 'store';
+  import {
+    navigateTo,
+    setStorage,
+    getStorage,
+    removeStorage,
+    navigateBack,
+    Toast,
+    Loading,
+    hideLoading,
+    Modal
+  } from '../../../libs/uniApi.js';
+  import { productCreate, productUpdate } from 'api/product.js';
+  import inputGoodsDetils from '../components/inputGoodsDetils.vue';
+  export default {
+    components: {
+      inputGoodsDetils
+    },
+    props: {
+      merId: {
+        type: [String, Number],
+        default: ''
+      },
+      product_id: {
+        type: [String, Number],
+        default: ''
+      },
+      showCommodity: {
+        type: Boolean,
+        default: false
+      },
+      resetKey: {
+        type: Boolean,
+        default: false
+      },
+      code: {
+        type: [String, Number],
+        default: 0
+      }
+    },
+    data() {
+      return {
+        showVideo: false,
+        disModel: false,
+        upload_max: 10,
+        uploadUrl: `${HTTP_REQUEST_URL}/api/upload/video`,
+        addGoodsSecoundData: {
+          is_good: 0, // 是否推荐
+          is_gift_bag: 0,
+          sort: '',
+          once_count: '', // 限购数量
+          video_link: ''
+        },
+        goodsDis: {imageList: [],store_name:""},
+        store_name:'',
+        moreThanFlag: true,
+      };
+    },
+
+    mounted() {
+      this.initData();
+      // this.$nextTick(()=>{
+      //   this.initData();
+      // })
+    },
+    updated() {
+       // this.initData();
+    },
+    watch: {
+      addGoodsSecoundData: {
+        handler(val) {
+          setTimeout(() => {
+            setStorage('editCommodity', val)
+          });
+        },
+        deep: true
+      },
+      resetKey: {
+        handler(val) {
+          // console.log(1);
+          this.initData();
+        }
+      },
+      goodsDis: {
+        handler(val) {
+          setTimeout(() => {
+            setStorage('goodsDis', this.goodsDis);
+          });
+        },
+        deep: true
+      },
+    },
+    methods: {
+      videoshow() {
+        this.showVideo = true
+        this.videoContext = uni.createVideoContext('myVideo', this);
+        this.$nextTick(() => {
+          this.videoContext.play();
+        })
+        // this.video_link = this.formData.video_link;
+        // this.videoContext.requestFullScreen({ direction: 90 });
+        // this.videoContext.play(); this.videoplay = true; 
+      },
+      initData() {
+        let editGoodsDetils = {};
+        if (getStorage('goodsDis')) {
+          this.disModel = true;
+        }
+        if (this.product_id) {
+          // editGoodsDetils = getStorage('editGoodsDetils');
+          editGoodsDetils = this.$store.state.storage.storage;
+          //   console.log('ss',editGoodsDetils.content);
+          // editGoodsDetils = getStorage('editGoodsDetils');
+          // console.log('初始化商品详情',editGoodsDetils);
+          Object.keys(this.addGoodsSecoundData).forEach(item => {
+            // console.log(item, editGoodsDetils[item]);
+            this.addGoodsSecoundData[item] = editGoodsDetils[item];
+          });
+
+          if (editGoodsDetils.content) {
+            this.goodsDis.imageList = editGoodsDetils.content.image;
+            this.goodsDis.store_name = editGoodsDetils.content.title;
+            this.store_name = editGoodsDetils.content.title;
+            // console.log(this.goodsDis, editGoodsDetils.content);
+            setStorage('goodsDis', {
+              store_name: editGoodsDetils.content.title,
+              imageList: editGoodsDetils.content.image
+            });
+            this.disModel = true;
+          }
+          setStorage('canChangeSecound', true);
+          return;
+        }else {
+          setStorage('goodsDis', {
+            store_name: '',
+            imageList: []
+          });
+        }
+
+        if (getStorage('addGoodsSecoundData')) {
+          Object.keys(this.addGoodsSecoundData).forEach(item => {
+            if (getStorage('addGoodsSecoundData')[item] || getStorage('addGoodsSecoundData')[item] == 0) {
+              this.addGoodsSecoundData[item] = getStorage('addGoodsSecoundData')[item];
+            }
+          });
+        }
+      },
+      lastStep() {
+        this.$emit('lastStep');
+      },
+      // 创建商品
+      submitCreatedGoods() {
+        Loading();
+        let waitDeleteData = ['addGoodsFormData', 'singleSpecification', 'attrValue', 'modifyPriceData',
+          'addGoodsSecoundData', 'goodsDis', 'editGoodsDetils', 'canChange', 'canChangeSecound'
+        ];
+        let attrValue = getStorage('addGoodsFormData').spec_type == 0 ? [getStorage('singleSpecification')] :
+          getStorage('attrValue');
+        let postData = {
+          ...this.addGoodsSecoundData,
+          ...getStorage('addGoodsFormData'),
+          content: {
+            title: getStorage('goodsDis') ? getStorage('goodsDis').store_name : '',
+            image: getStorage('goodsDis') ? getStorage('goodsDis').imageList : []
+          },
+          video_link: this.addGoodsSecoundData.video_link
+        };
+
+        if (attrValue) {
+          postData.attrValue = attrValue.filter(item => item != '');
+          postData.attrValue[0].bar_code
+        }
+        // console.log(postData);
+        if (getStorage('addGoodsFormData').spec_type == 0) {
+          // postData.attr = [getStorage('singleSpecification')];
+        }
+        if (this.product_id) {
+          productUpdate(this.merId, this.product_id, postData)
+            .then(res => {
+              waitDeleteData.forEach(item => {
+                if (getStorage(item)) {
+                  removeStorage(item);
+                }
+              });
+              hideLoading()
+              Modal('提交成功', '点击确定，返回商品管理', {
+                showCancel: false
+              }).then(() => {
+                uni.removeStorageSync('singleSpecification')
+                uni.redirectTo({
+                  url: '/pages/product/goodsOnSale/index?mer_id=' + this.merId
+                })
+              })
+            })
+            .catch(rej => {
+              Toast(rej);
+            });
+
+        } else {
+          productCreate(this.merId, postData)
+            .then(res => {
+              waitDeleteData.forEach(item => {
+                if (getStorage(item)) {
+                  removeStorage(item);
+                }
+              });
+              hideLoading();
+              Modal('提交成功', '点击确定，返回商品管理', {
+                showCancel: false,
+              }).then(() => {
+                uni.redirectTo({
+                  url: '/pages/product/goodsOnSale/index?mer_id=' + this.merId
+                })
+              })
+            })
+            .catch(rej => {
+              Toast(rej);
+            });
+        }
+      },
+      // 是否推荐
+      isGood(e) {
+        this.addGoodsSecoundData.is_good = e.detail.value ? 1 : 0;
+      },
+      // 是否开启礼包
+      isGiftBag(e) {
+        this.addGoodsSecoundData.is_gift_bag = e.detail.value ? 1 : 0;
+      },
+
+      switchChange(value, item) {
+        this.addGoodsSecoundData[item.model] = value ? 1 : 0;
+      },
+      // 跳转商品详情
+      inputGoodsDetils() {
+        navigateTo(1, '/pages/product/addGoods/addGoodDetils', { mer_id: this.merId });
+      },
+      // 上传视频
+      uploadVideo() {
+        uni.chooseVideo({
+          sourceType: ['camera', 'album'],
+          success: res => {
+            console.log(res)
+
+            if (Math.ceil(res.size / 1024) < this.upload_max * 1024) {
+              uni.uploadFile({
+                url: this.uploadUrl, //仅为示例，非真实的接口地址
+                filePath: res.tempFilePath,
+                name: 'file',
+                //请求参数
+                formData: {
+                  user: 'test'
+                },
+                header: {
+                  // #ifdef MP
+                  'Content-Type': 'multipart/form-data',
+                  // #endif
+                  [TOKENNAME]: 'Bearer ' + store.state.app.token
+                },
+                success: uploadFileRes => {
+                  let data = JSON.parse(uploadFileRes.data);
+                  this.addGoodsSecoundData.video_link = (data.data.src);
+                },
+                complete: a => {
+                  // console.log(a);
+                }
+              });
+            } else {
+              uni.showModal({
+                title: '提示',
+                content: `视频超出限制${this.upload_max}MB,已过滤`
+              });
+            }
+          },
+          fail: err => {
+            // 取消上传也会出现弹框
+            // uni.showModal({
+            //   content: JSON.stringify(err)
+            // });
+            console.log(err)
+          }
+        });
+      },
+      deleteImage(index) {
+        this.addGoodsSecoundData.video_link = '';
+      },
+      getProductContent(obj) {
+      	// console.log(obj);
+      	this.goodsDis = obj;
+      	this.a=obj.store_name
+      },
+    }
+  };
+</script>
+
+<style lang="scss" scoped>
+  @import './scss/index.scss';
+
+  .content_list {
+    width: 710rpx;
+    margin: auto;
+    padding: 0 20rpx;
+    box-sizing: border-box;
+    background: #fff;
+    margin-top: 31rpx;
+    border-radius: 10rpx;
+    
+    .input-goods-detils{
+      width: 100%;
+      padding: 20rpx 10rpx !important;
+    }
+    
+    .more_than{
+      background: #FFFFFF;
+      border-radius: 0 0 10rpx 10rpx;
+      margin: auto;
+      // margin-top: 30rpx;
+      border-top: 1px solid #f5f5f5;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 100%;
+      height: 84rpx;
+      color: #333333;
+      font-size: 30rpx;
+    }
+
+    .content_list_item {
+      padding: 32rpx 10rpx;
+      display: flex;
+      justify-content: space-between;
+      border-bottom: 1px solid #eee;
+
+      .content_list_item_han {
+        color: #bbbbbb;
+        display: flex;
+        align-items: center;
+      }
+    }
+
+    .content_list_video {
+      min-height: 154rpx;
+      padding: 23rpx 10rpx;
+      display: flex;
+      justify-content: space-between;
+
+      .content_list_video_title {
+        padding-top: 10rpx;
+      }
+
+      .video_list {
+        flex: 1;
+        display: flex;
+        justify-content: flex-end;
+        flex-wrap: wrap;
+      }
+    }
+  }
+
+  .videoHover {
+    width: 180rpx;
+    height: 180rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position: absolute;
+    top: 0;
+    left: 0;
+    z-index: 10;
+
+    view {
+      width: 50rpx;
+      height: 50rpx;
+      background: #000000;
+      border-radius: 50rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+
+      .iconfont {
+        color: #ffffff;
+        font-size: 21rpx;
+      }
+    }
+  }
+
+  .photo {
+    border: 1px solid #dddddd;
+    opacity: 1;
+    border-radius: 8rpx;
+    font-size: 28rpx;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    text-align: center;
+    // padding: 27rpx 21rpx 24rpx 21rpx;
+    width: 150rpx;
+    height: 150rpx;
+    box-sizing: border-box;
+    color: #bbbbbb;
+    margin-left: 16rpx;
+    position: relative;
+    margin-bottom: 12rpx;
+
+    image {
+      width: 62rpx;
+      margin-bottom: 10rpx;
+    }
+  }
+
+  .jiao {
+    image {
+      position: absolute;
+      top: -14rpx;
+      right: -14rpx;
+      width: 40rpx;
+      height: 40rpx;
+      border-radius: 50%;
+      padding: 8rpx;
+      background: #e93323;
+      z-index: 2;
+    }
+
+    video {
+      width: 150rpx;
+      height: 150rpx;
+    }
+  }
+
+  .preview_video {
+    position: absolute;
+
+  }
+
+  .container_input {
+    background: #fff;
+    padding: 0 20rpx;
+    width: 710rpx;
+
+    margin: auto;
+    margin-top: 31rpx;
+    border-radius: 10rpx;
+
+    &_item {
+      display: flex;
+      height: 106rpx;
+      align-items: center;
+
+      .select_and_input {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+
+        .greyColor {
+          color: #bbbbbb;
+        }
+      }
+
+      .radio {
+        padding: 30rpx 0;
+      }
+
+      &_label {
+        padding-left: 10rpx;
+        color: #333333;
+        font-size: 30rpx;
+        display: flex;
+        align-items: center;
+
+        .select_check {
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          width: 40rpx;
+          height: 40rpx;
+          border: 1px solid #cccccc;
+          border-radius: 50%;
+          margin-right: 20rpx;
+
+          .iconfont {
+            font-size: 24rpx;
+          }
+        }
+
+        .select {
+          background: #e93323;
+          border: none;
+
+          .iconfont {
+            color: #fff;
+          }
+        }
+      }
+
+      &_value {
+        padding-right: 10rpx;
+        flex: 1;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+
+        >span:nth-child(1) {
+          display: inline-block;
+          margin-right: 15rpx;
+        }
+
+        .text {
+          color: #000;
+          display: inline-block;
+          max-width: 400rpx;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+        }
+
+        input {
+          text-align: right;
+        }
+
+        .select_group {
+          display: flex;
+        }
+
+        &_select {
+          display: flex;
+          margin-right: 110rpx;
+        }
+      }
+
+      .flex_start {
+        padding: 0 10rpx;
+        margin-top: 40rpx;
+        justify-content: flex-start;
+      }
+    }
+
+    >view:not(:last-child) {
+      border-bottom: 1px solid #eeeeee;
+    }
+  }
+
+  .inputPlaceHolder {
+    color: #bbbbbb;
+  }
+
+  .paddingTop_none {
+    padding-top: 0 !important;
+  }
+
+  .marginTop_none {
+    margin-top: 0;
+  }
+
+  .video-count {
+    position: fixed;
+    width: 600rpx;
+    height: 500rpx;
+    top: 50%;
+    left: 50%;
+    margin-left: -300rpx;
+    margin-top: -250rpx;
+    z-index: 100;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    .videoLink {
+      width: 600rpx;
+      height: 500rpx;
+    }
+  }
+
+  // .writeBg {
+  // 	background: #fff;
+  // }
+  
+  .tip{
+    padding: 0 !important;
+    margin: 0 !important;
+  }
+</style>
\ No newline at end of file
diff --git a/pages/product/addGoods/index.vue b/pages/product/addGoods/index.vue
index 8d18d8e..d05d363 100644
--- a/pages/product/addGoods/index.vue
+++ b/pages/product/addGoods/index.vue
@@ -1,81 +1,61 @@
 <template>
-	<view class="container">
-		<view class="step_one" v-if="step == 1">
-			<view class="input_content">
-				<view class="bar-code" v-if="bar_code_dis">
-					<view>商品编码</view>
-					<!-- <view>{{ singleSpecification.bar_code }}</view> -->
-					<input type="number" placeholder="请手动添加条码" v-model="code" :disabled="bar_code_dis"
-						placeholder-class="inputPlaceHolder" />
-				</view>
-				<view class="input_content_textarea">
-					<textarea v-model="setFormData.store_name" placeholder="请输入商品名称"
-						placeholder-class="placeholderStyle" maxlength="60" />
-					<view>
-						<text v-if="setFormData.store_name">{{ setFormData.store_name.length }}</text>
-						<text v-else>0</text>
-						/60
-					</view>
-				</view>
-				<view class="photo_count">
-					<text class="photo_size">建议：图片尺寸为750*750px</text>
-					<view class="input_content_photo">
-						<view class="input_content_photo_adPh" v-for="(item, index) in setFormData.imageList"
-							:key="index">
-							<image :src="item" class="myimg2 photos" @click="pop(item)"></image>
-							<view class="input_content_photo_adPh_jiao" @click="deleteImage(index)">
-								<image src="../static/images/close.png" mode=""></image>
-							</view>
-						</view>
-						<view v-if="setFormData.imageList.length < 9" class="input_content_photo_adPh addBtn"
-							@click="clk">
-							<view>
-								<image src="../static/images/creamer.png" mode="widthFix"></image>
-							</view>
-							<view>添加图片</view>
-						</view>
-					</view>
-				</view>
-				<u-popup class="pop" :show="show" @close="close" mode="center" bgColor='transparent'>
-					<image :src="image"></image>
-					<image src="@/static/images/guanbi.png" class="guanbi" @click="close"></image>
-				</u-popup>
-				<view class="input_content_describe">
-					<view class="input_content_describe_title">
-						<view class="input_content_describe_title_msg">商品简介</view>
-						<view class="input_content_describe_title_num">
-							<text v-if="setFormData.store_info">{{ setFormData.store_info.length }}</text>
-							<text v-else>0</text>
-							/200
-						</view>
-					</view>
-					<view class="input_content_describe_textarea">
-						<textarea v-model="setFormData.store_info" value="" placeholder="请填写商品简介"
-							placeholderClass="placeholderClass" maxlength="200" />
-					</view>
-				</view>
+  <view class="container">
+    <view class="step_one" v-if="step == 1">
+      <view class="input_content">
+        <view class="bar-code" v-if="bar_code_dis">
+          <view>商品条码</view>
+          <!-- <view>{{ singleSpecification.bar_code }}</view> -->
+          <input type="number" placeholder="请手动添加条码" v-model="code" :disabled="bar_code_dis"
+            placeholder-class="inputPlaceHolder" />
+        </view>
+        <view class="input_content_textarea">
+          <textarea v-model="setFormData.store_name" placeholder="请输入商品名称" placeholder-class="placeholderStyle"
+            maxlength="60" />
+          <view class="flex" style="justify-content: space-between;color: #999999;">
+            <view>(品牌,名称,规格,口味)</view>
+            <view>
+              <text v-if="setFormData.store_name">{{ setFormData.store_name.length }}</text>
+              <text v-else>0</text>/60
+            </view>
+          </view>
+        </view>
+        <view class="photo_count">
+          <text class="photo_size" style="color: #e93323;">建议：图片尺寸为750*750px, 上传2张以上</text>
+          <view class="input_content_photo">
+            <view class="input_content_photo_adPh" v-for="(item, index) in setFormData.imageList" :key="index">
+              <image :src="item" class="myimg2 photos" @click="pop(item)"></image>
+              <view class="input_content_photo_adPh_jiao" @click="deleteImage(index)">
+                <image src="../static/images/close.png" mode=""></image>
+              </view>
+            </view>
+            <view v-if="setFormData.imageList.length < 9" class="input_content_photo_adPh addBtn" @click="clk">
+              <view>
+                <image src="../static/images/creamer.png" mode="widthFix"></image>
+              </view>
+              <view>添加图片</view>
+            </view>
+          </view>
+        </view>
+        <u-popup class="pop" :show="show" @close="close" mode="center" bgColor='transparent'>
+          <image :src="image"></image>
+          <image src="@/static/images/guanbi.png" class="guanbi" @click="close"></image>
+        </u-popup>
+      </view>
 
-				<view class="input_content_keyword">
-					<view class="input_content_keyword_label">关键字</view>
-					<view class="input_content_keyword_value"><input v-model="setFormData.keyword" type="text" value=""
-							placeholder="填写关键字" /></view>
-				</view>
-			</view>
+      <view class="popup_group">
+        <view class="popup_group_item" @click="selectPlatform">
+          <view class="popup_group_item_label">平台分类</view>
+          <view class="popup_group_item_value">
+            <view class="popup_group_item_message">
+              <span v-if="setFormData.cate_name"
+                class="popup_group_item_message_value">{{ setFormData.cate_name }}</span>
+              <span v-else>请选择平台分类</span>
+            </view>
+            <view><span class="iconfont">&#xe6bd;</span></view>
+          </view>
+        </view>
 
-			<view class="popup_group">
-				<view class="popup_group_item" @click="selectPlatform">
-					<view class="popup_group_item_label">平台分类</view>
-					<view class="popup_group_item_value">
-						<view class="popup_group_item_message">
-							<span v-if="setFormData.cate_name"
-								class="popup_group_item_message_value">{{ setFormData.cate_name }}</span>
-							<span v-else>请选择平台分类</span>
-						</view>
-						<view><span class="iconfont">&#xe6bd;</span></view>
-					</view>
-				</view>
-
-				<view class="popup_group_item" @click="selectStoreClass">
+        <!-- <view class="popup_group_item" @click="selectStoreClass">
 					<view class="popup_group_item_label">店铺分类</view>
 					<view class="popup_group_item_value">
 						<view class="popup_group_item_message">
@@ -85,9 +65,9 @@
 						</view>
 						<view><span class="iconfont">&#xe6bd;</span></view>
 					</view>
-				</view>
+				</view> -->
 
-				<!-- 		<view class="popup_group_item" @click="selectBrand">
+        <!-- 		<view class="popup_group_item" @click="selectBrand">
 					<view class="popup_group_item_label">商品品牌</view>
 					<view class="popup_group_item_value">
 						<view class="popup_group_item_message">
@@ -99,14 +79,16 @@
 					</view>
 				</view> -->
 
-				<view class="popup_group_item">
-					<view class="popup_group_item_label">商品单位</view>
-					<view class="popup_group_item_value"><input v-model="setFormData.unit_name" type="text"
-							placeholder="请填写商品单位" /></view>
-				</view>
-			</view>
+        <view class="popup_group_item">
+          <view class="popup_group_item_label">商品单位</view>
+          <view class="popup_group_item_value"><input v-model="setFormData.unit_name" type="text"
+              placeholder="请填写商品单位" /></view>
+        </view>
+      </view>
 
-			<view class="popup_group">
+      <priceComponent :product_id="product_id" :bar_code="code" @updateCode = "updateCode" v-if="showCommodity"></priceComponent>
+
+      <!-- <view class="popup_group">
 				<view class="radio">
 					<view class="radio_label ">规格选择</view>
 					<radio-group class="select_group flex_start" @change="specificationsRadioChange($event)">
@@ -154,22 +136,11 @@
 						<view><span class="iconfont">&#xe6bd;</span></view>
 					</view>
 				</view>
-			</view>
+			</view> -->
 
-			<view class="popup_group">
-				<view class="radio">
-					<view class="radio_label ">送货方式</view>
-					<checkbox-group class="select_group flex_start" @change="deliveryWayChange">
-						<label class="radio_select" v-for="(val, i) in deliveryFreeList" :key="val.value">
-							<view>
-								<checkbox :value="val.value" disabled :checked="val.value" />
-							</view>
-							<view>{{ val.name }}</view>
-						</label>
-					</checkbox-group>
-				</view>
+      <view class="popup_group">
 
-				<!-- <view v-if="setFormData.delivery_way.includes('2')" class="popup_group_item">
+        <!-- <view v-if="setFormData.delivery_way.includes('2')" class="popup_group_item">
 					<view class="popup_group_item_label">是否包邮</view>
 					<view class="popup_group_item_value">
 						<view class="popup_group_item_message">
@@ -179,7 +150,7 @@
 					</view>
 				</view> -->
 
-				<view class="popup_group_item"
+        <!-- <view class="popup_group_item"
 					v-if="setFormData.delivery_way.includes('2') && setFormData.delivery_free == 0"
 					@click="tempIdSelect">
 					<view class="popup_group_item_label">运费模板</view>
@@ -191,705 +162,785 @@
 						</view>
 						<view><span class="iconfont">&#xe6bd;</span></view>
 					</view>
-				</view>
-			</view>
-			<view class="handle">
-				<view class="handle_button" @click="handleNextStep">下一步</view>
-			</view>
-		</view>
+				</view> -->
+      </view>
 
-		<view class="step_two" v-if="step == 2">
-			<secound :resetKey="secoundModel" :product_id="product_id" :merId="merId" :code="code" @lastStep="lastStep">
-			</secound>
-		</view>
+      <commodityComponent v-if="showCommodity" :key="showCommodity"  :showCommodity="showCommodity" :resetKey="secoundModel" :product_id="product_id" :merId="merId"
+        :code="code" @lastStep="lastStep">
+      </commodityComponent>
 
-		<!-- 选择平台分类弹框 -->
-		<uni-popup ref="select_platform" type="bottom">
-			<platfrom @close="closePlatfrom" :classifiedData="platformClassificationData" @getPlatData="getPlatData">
-			</platfrom>
-		</uni-popup>
+      <view class="popup_group">
+       <!-- <view class="popup_group_item" @click="showMoreInfo=!showMoreInfo">
+          <view class="popup_group_item_label">更多信息</view>
+          <view class="popup_group_item_value" :class="showMoreInfo?'icon_bottom':'icon_top'">
+            <view><span class="iconfont">&#xe6bd;</span></view>
+          </view>
+        </view> -->
+        <block >
+          <view class="input_content">
+            <!-- <view class="input_content_describe" style="border-top: none">
+              <view class="input_content_describe_title">
+                <view class="input_content_describe_title_msg">商品简介</view>
+                <view class="input_content_describe_title_num">
+                  <text v-if="setFormData.store_info">{{ setFormData.store_info.length }}</text>
+                  <text v-else>0</text>
+                  /200
+                </view>
+              </view>
+              <view class="input_content_describe_textarea">
+                <textarea v-model="setFormData.store_info" value="" placeholder="请填写商品简介"
+                  placeholderClass="placeholderClass" maxlength="200" />
+              </view>
+            </view> -->
 
-		<!-- 选择店铺分类弹框 -->
-		<uni-popup ref="select_store" type="bottom">
-			<store-classification :classifiedData="merchantClassification" :mer_id="merId"
-				@handleGetSelectArea="handleGetSelectStore" @close="merchantClose"></store-classification>
-		</uni-popup>
+            <view class="input_content_keyword">
+              <view class="input_content_keyword_label">关键字</view>
+              <view class="input_content_keyword_value"><input v-model="setFormData.keyword" type="text" value=""
+                  placeholder="填写关键字" /></view>
+            </view>
+          </view>
+          <view class="radio">
+            <view class="radio_label ">送货方式</view>
+            <checkbox-group class="select_group flex_start" @change="deliveryWayChange">
+              <label class="radio_select" v-for="(val, i) in deliveryFreeList" :key="val.value">
+                <view>
+                  <checkbox :value="val.value" disabled :checked="val.value" />
+                </view>
+                <view>{{ val.name }}</view>
+              </label>
+            </checkbox-group>
+          </view>
+        </block>
 
-		<uni-popup ref="select_popup" type="bottom">
-			<linkage-assembly selectProductTitle="选择品牌" :form="setFormData" :classifiedData="brand"
-				:selectProductItem="productItem" @getLinkageData="getLinkageData" @multipleList="multipleList"
-				@close="handleClose"></linkage-assembly>
-		</uni-popup>
+      </view>
 
-		<uni-popup ref="tempId" type="bottom">
-			<linkage-assembly selectProductTitle="选择运费模板" :form="setFormData" :classifiedData="classified['temp_id']"
-				:selectProductItem="productItem" :mer_id="merId" @getLinkageData="getTempIdData"
-				@multipleList="multipleList" @close="$refs.tempId.close()"
-				@scrolltolower="scrolltolower"></linkage-assembly>
-		</uni-popup>
-		<uni-popup ref="attr" type="bottom">
-			<attr @close="$refs.attr.close()" :mer_id="merId" :attrList="classified['attr']" @selectAttr="selectAttr">
-			</attr>
-		</uni-popup>
-		<avatar @upload="doUpload" @getName="getImgName" quality="1" ref="avatar" selWidth="250upx" selHeight="250upx">
-		</avatar>
-	</view>
+      <view class="handle">
+        <!-- <view class="handle_button" @click="handleNextStep">下一步</view> -->
+        <secound :resetKey="secoundModel" :product_id="product_id" :merId="merId" :code="code" @lastStep="lastStep">
+        </secound>
+      </view>
+    </view>
+
+    <view class="step_two" v-if="step == 2">
+      <secound :resetKey="secoundModel" :product_id="product_id" :merId="merId" :code="code" @lastStep="lastStep">
+      </secound>
+    </view>
+
+    <!-- 选择平台分类弹框 -->
+    <uni-popup ref="select_platform" type="bottom">
+      <platfrom @close="closePlatfrom" :classifiedData="platformClassificationData" @getPlatData="getPlatData">
+      </platfrom>
+    </uni-popup>
+
+    <!-- 选择店铺分类弹框 -->
+    <uni-popup ref="select_store" type="bottom">
+      <store-classification :classifiedData="merchantClassification" :mer_id="merId"
+        @handleGetSelectArea="handleGetSelectStore" @close="merchantClose"></store-classification>
+    </uni-popup>
+
+    <uni-popup ref="select_popup" type="bottom">
+      <linkage-assembly selectProductTitle="选择品牌" :form="setFormData" :classifiedData="brand"
+        :selectProductItem="productItem" @getLinkageData="getLinkageData" @multipleList="multipleList"
+        @close="handleClose"></linkage-assembly>
+    </uni-popup>
+
+    <uni-popup ref="tempId" type="bottom">
+      <linkage-assembly selectProductTitle="选择运费模板" :form="setFormData" :classifiedData="classified['temp_id']"
+        :selectProductItem="productItem" :mer_id="merId" @getLinkageData="getTempIdData" @multipleList="multipleList"
+        @close="$refs.tempId.close()" @scrolltolower="scrolltolower"></linkage-assembly>
+    </uni-popup>
+    <uni-popup ref="attr" type="bottom">
+      <attr @close="$refs.attr.close()" :mer_id="merId" :attrList="classified['attr']" @selectAttr="selectAttr">
+      </attr>
+    </uni-popup>
+    <avatar @upload="doUpload" @getName="getImgName" quality="1" ref="avatar" selWidth="250upx" selHeight="250upx">
+    </avatar>
+  </view>
 </template>
 
 <script>
-	import inputGoodsDetils from '../components/inputGoodsDetils.vue';
-	import linkageAssembly from '../components/linkageAssembly.vue';
-	import {
-		navigateTo,
-		serialize,
-		setStorage,
-		getStorage,
-		Toast,
-		removeStorage,
-		Loading,
-		hideLoading
-	} from '../../../libs/uniApi.js';
-	import {
-		categoryBrandlist,
-		categorySelect,
-		storeClassifyLst,
-		categoryList,
-		attrList,
-		templateList,
-		productDetail,
-		getDeliveryType
-	} from '@/api/product.js';
-	import attr from '../components/attr.vue';
-	import platfrom from '../components/platform.vue';
-	import storeClassification from '../components/store_classification.vue';
-	import secound from './secound.vue';
-	import avatar from "@/components/yq-avatar/yq-avatar.vue";
-	import {
-		TOKENNAME,
-		HTTP_REQUEST_URL
-	} from '@/config/app.js';
-	import store from '@/store';
-	export default {
-		components: {
-			inputGoodsDetils,
-			linkageAssembly,
-			attr,
-			platfrom, // 选择平台分类组件
-			storeClassification,
-			secound,
-			avatar
-		},
-		data() {
-			return {
-				step: 1,
-				bar_code: '',
-				bar_code_dis: false,
-				setFormData: {
-					imageList: [],
-					specification: '',
-					image: '', //主图
-					slider_image: '', // 轮播图
-					store_name: '', // 商品名
-					store_info: '', // 简介
-					keyword: '', // 关键字
-					brand_id: '', // 品牌id
-					brand_name: '', // 品牌名称
-					cate_id: '', // 平台分类
-					cate_name: '', // 平台名称
-					mer_cate_id: '', // 店铺分类
-					mer_cate_name: '', // 店铺分类名称
-					unit_name: '', // 商品单位
-					spec_type: '0', // 0.单规格 1：多规格
-					attr: [], // 商品规格
-					specifica: '', // 商品规格名称
-					setSpecificaValue: '', // 价格设置提示
-					setSpecificaValue2: '',
-					delivery_way: [1,2], // 配送方式 1 到店核销 2 快递配送
-					delivery_free: '1', // 是否包邮 0不包邮 1包邮
-					temp_id: '', // 运费模板ID
-					tempName: '' // 运费模板名称
-				},
-				popupContainerKey: false,
-				productItem: {} || [],
-				selectProductTitle: '选择平台分类',
-				specificationsRadioList: [{
-						value: '0',
-						name: '单规格'
-					},
-					{
-						value: '1',
-						name: '多规格'
-					}
-				],
-				specifications: [{
-						id: 5,
-						label: '规格选择',
-						type: 'radio',
-						model: 'spec_type',
-						inforValue: '0',
-						radioList: [{
-								value: '0',
-								name: '单规格'
-							},
-							{
-								value: '1',
-								name: '多规格'
-							}
-						]
-					},
-					{
-						id: 7,
-						label: '选择规格',
-						type: 'select',
-						model: 'attr',
-						singleColumn: true,
-						value: '',
-						DoNotShow: true,
-						holder: '去选择',
-						jumpLogic: true // 是否为需要特数处理，执行跳转逻辑
-					},
-					{
-						id: 6,
-						label: '商品规格',
-						type: 'select',
-						value: '',
-						holder: '去设置',
-						jumpLogic: true, // 是否为需要特数处理，执行跳转逻辑
-						DoNotShow: true
-					}
-				],
-				deliveryType: [],
-				deliveryFreeList: [{
-						value: '1',
-						name: '到店核销'
-					},
-					{
-						value: '2',
-						name: '快递配送'
-					}
-				],
-				merId: '',
-				product_id: '', // 商品Id
-				isUpload: true,
-				templateListPage: {
-					page: 1,
-					limit: 10000
-				},
-				// 分类数据容器
-				classified: {
-					cate_id: [],
-					mer_cate_id: [],
-					brand_id: [],
-					attr: [],
-					temp_id: []
-				},
-				platformClassificationData: [], // 平台分类数据
-				merchantClassification: [], // 店铺分类
-				brand: [], // 品牌分类
-				specificationClassification: [], // 规格分类
-				selectEdAttr: [], // 当前选择的多规格选项规格
-				canChange: true,
-				secoundModel: false,
-				resetKey: false,
-				imgName: "",
-				code: '',
-				show: false, //质资弹出层
-				image: '' //图片
-			};
-		},
-		onLoad(opt) {
-			// console.log(this.deliveryFreeList);
-			// console.log(opt);
-			this.merId = Number(opt.mer_id);
-			this.product_id = opt.product_id;
-			if (opt.code) {
-				this.code = opt.code;
-				this.bar_code_dis = true
-			}
-			this.initData();
-			// this.getDeliveryType();
-			if (this.product_id) {
-				this.initDataEditData();
-			}
-		},
-		onShow() {
-			this.setFormData.setSpecificaValue = '';
-			this.setFormData.setSpecificaValue2 = '';
-			if (getStorage('singleSpecification')) {
-				this.setFormData.setSpecificaValue = '点击修改价格';
-			} else {
-				this.setFormData.setSpecificaValue = '';
-			}
-			if (getStorage('attrValue')) {
-				this.setFormData.setSpecificaValue2 = '点击修改价格';
-			} else {
-				this.setFormData.setSpecificaValue2 = '';
-			}
-			if (this.step == 2) {
-				this.secoundModel = !this.secoundModel;
-			}
-			this.initClasiffy();
-		},
-		beforeDestroy() {
-			// console.log('123');
-			uni.removeStorage({
-				key: 'addGoodsFormData'
-			});
-		},
-		watch: {
-			setFormData: {
-				handler(val) {
-					// console.log(val);
-					setTimeout(() => {
-						setStorage('addGoodsFormData', this.setFormData);
-					});
+  import inputGoodsDetils from '../components/inputGoodsDetils.vue';
+  import linkageAssembly from '../components/linkageAssembly.vue';
+  import {
+    navigateTo,
+    serialize,
+    setStorage,
+    getStorage,
+    Toast,
+    removeStorage,
+    Loading,
+    hideLoading
+  } from '../../../libs/uniApi.js';
+  import {
+    categoryBrandlist,
+    categorySelect,
+    storeClassifyLst,
+    categoryList,
+    attrList,
+    templateList,
+    productDetail,
+    getDeliveryType
+  } from '@/api/product.js';
+  import attr from '../components/attr.vue';
+  import platfrom from '../components/platform.vue';
+  import storeClassification from '../components/store_classification.vue';
+  import secound from './secound.vue';
+  import avatar from "@/components/yq-avatar/yq-avatar.vue";
+  import {
+    TOKENNAME,
+    HTTP_REQUEST_URL
+  } from '@/config/app.js';
+  import store from '@/store';
+  import priceComponent from "./price.vue";
+  import commodityComponent from "./commodity.vue";
+  export default {
+    components: {
+      inputGoodsDetils,
+      linkageAssembly,
+      attr,
+      platfrom, // 选择平台分类组件
+      storeClassification,
+      secound,
+      avatar,
+      priceComponent,
+      commodityComponent
+    },
+    data() {
+      return {
+        showCommodity: false, // 是否显示商品,售价
+        step: 1,
+        bar_code: '',
+        bar_code_dis: false,
+        setFormData: {
+          imageList: [],
+          specification: '',
+          image: '', //主图
+          slider_image: '', // 轮播图
+          store_name: '', // 商品名
+          store_info: '', // 简介
+          keyword: '', // 关键字
+          brand_id: '', // 品牌id
+          brand_name: '', // 品牌名称
+          cate_id: '', // 平台分类
+          cate_name: '', // 平台名称
+          mer_cate_id: '', // 店铺分类
+          mer_cate_name: '', // 店铺分类名称
+          unit_name: '', // 商品单位
+          spec_type: '0', // 0.单规格 1：多规格
+          attr: [], // 商品规格
+          specifica: '', // 商品规格名称
+          setSpecificaValue: '', // 价格设置提示
+          setSpecificaValue2: '',
+          delivery_way: [1, 2], // 配送方式 1 到店核销 2 快递配送
+          delivery_free: '1', // 是否包邮 0不包邮 1包邮
+          temp_id: '', // 运费模板ID
+          tempName: '' // 运费模板名称
+        },
+        popupContainerKey: false,
+        showMoreInfo: false,
+        productItem: {} || [],
+        selectProductTitle: '选择平台分类',
+        specificationsRadioList: [{
+            value: '0',
+            name: '单规格'
+          },
+          {
+            value: '1',
+            name: '多规格'
+          }
+        ],
+        specifications: [{
+            id: 5,
+            label: '规格选择',
+            type: 'radio',
+            model: 'spec_type',
+            inforValue: '0',
+            radioList: [{
+                value: '0',
+                name: '单规格'
+              },
+              {
+                value: '1',
+                name: '多规格'
+              }
+            ]
+          },
+          {
+            id: 7,
+            label: '选择规格',
+            type: 'select',
+            model: 'attr',
+            singleColumn: true,
+            value: '',
+            DoNotShow: true,
+            holder: '去选择',
+            jumpLogic: true // 是否为需要特数处理，执行跳转逻辑
+          },
+          {
+            id: 6,
+            label: '商品规格',
+            type: 'select',
+            value: '',
+            holder: '去设置',
+            jumpLogic: true, // 是否为需要特数处理，执行跳转逻辑
+            DoNotShow: true
+          }
+        ],
+        deliveryType: [],
+        deliveryFreeList: [{
+            value: '1',
+            name: '到店核销'
+          },
+          {
+            value: '2',
+            name: '快递配送'
+          }
+        ],
+        merId: '',
+        product_id: '', // 商品Id
+        isUpload: true,
+        templateListPage: {
+          page: 1,
+          limit: 10000
+        },
+        // 分类数据容器
+        classified: {
+          cate_id: [],
+          mer_cate_id: [],
+          brand_id: [],
+          attr: [],
+          temp_id: []
+        },
+        platformClassificationData: [], // 平台分类数据
+        merchantClassification: [], // 店铺分类
+        brand: [], // 品牌分类
+        specificationClassification: [], // 规格分类
+        selectEdAttr: [], // 当前选择的多规格选项规格
+        canChange: true,
+        secoundModel: false,
+        resetKey: false,
+        imgName: "",
+        code: '',
+        show: false, //质资弹出层
+        image: '' //图片
+      };
+    },
+    onLoad(opt) {
+      // console.log(this.deliveryFreeList);
+      // console.log(opt);
+      this.merId = Number(opt.mer_id);
+      this.product_id = opt.product_id;
+      if(!opt.product_id)this.showCommodity=true;
+      if (opt.code) {
+        this.code = opt.code;
+        this.bar_code_dis = true
+      }
+      this.initData();
+      // this.getDeliveryType();
+      if (this.product_id) {
+        this.initDataEditData();
+      }else {
+        setStorage('editCommodity',{});
+      }
+    },
+    onBackPress() {
+      let waitDeleteData = ['addGoodsFormData', 'singleSpecification', 'attrValue', 'modifyPriceData',
+        'addGoodsSecoundData', 'goodsDis', 'editGoodsDetils', 'canChange', 'canChangeSecound', 'editCommodity'
+      ];
+      waitDeleteData.forEach(item => {
+        if (getStorage(item)) {
+          removeStorage(item);
+        }
+      });
+    },
+    onShow() {
+      this.setFormData.setSpecificaValue = '';
+      this.setFormData.setSpecificaValue2 = '';
+      if (getStorage('singleSpecification')) {
+        this.setFormData.setSpecificaValue = '点击修改价格';
+      } else {
+        this.setFormData.setSpecificaValue = '';
+      }
+      if (getStorage('attrValue')) {
+        this.setFormData.setSpecificaValue2 = '点击修改价格';
+      } else {
+        this.setFormData.setSpecificaValue2 = '';
+      }
+      if (this.step == 2) {
+        this.secoundModel = !this.secoundModel;
+      }
+      this.initClasiffy();
+    },
+    beforeDestroy() {
+      // console.log('123');
+      uni.removeStorage({
+        key: 'addGoodsFormData'
+      });
+    },
+    watch: {
+      setFormData: {
+        handler(val) {
+          // console.log(val);
+          setTimeout(() => {
+            setStorage('addGoodsFormData', this.setFormData);
+          });
 
-				},
-				deep: true
-			},
-			'setFormData.imageList'(val) {
-				this.setFormData.image = val.length ? val[0] : '';
-				this.setFormData.slider_image = val.length ? serialize(val).splice(1) : [];
-			}
-		},
-		methods: {
-			//图片预览
-			pop(e) {
-				this.show = true
-				this.image = e
-			},
-			// 获取数据
-			async initClasiffy() {
-				//获取商户分类
-				this.merchantClassification = (await storeClassifyLst(this.merId)).data;
-			},
-			async initData() {
-				if (getStorage('addGoodsFormData')) {
-					this.setFormData = getStorage('addGoodsFormData');
-					this.selectEdAttr = getStorage('modifyPriceData');
-				}
-				// 获取品牌
-				this.brand = (await categoryBrandlist(this.merId)).data;
-				// 获取平台分类
-				this.platformClassificationData = (await categoryList(this.merId)).data;
-				// 数据回显
-			},
-			//获取送货方式信息
-			getDeliveryType() {
-				let that = this
-				getDeliveryType(that.merId).then(
-					res => {
-						that.deliveryType = res.data.delivery_way.map(String);
-						if (!that.product_id) that.setFormData.delivery_way = that.deliveryType;
-						if (that.deliveryType.length == 2) {
-							that.deliveryFreeList = [{
-									value: '1',
-									name: '到店核销'
-								},
-								{
-									value: '2',
-									name: '快递配送'
-								}
-							]
-						} else {
-							if (that.deliveryType.length == 1 && that.deliveryType[0] == '1') {
-								that.deliveryFreeList = [{
-									value: '1',
-									name: '到店核销'
-								}]
-							} else {
-								that.deliveryFreeList = [{
-									value: '2',
-									name: '快递配送'
-								}]
-							}
-						}
-					},
-					error => {
-						that.$util.Tips({
-							title: error.msg
-						})
-					}
-				);
-			},
+        },
+        deep: true
+      },
+      'setFormData.imageList'(val) {
+        this.setFormData.image = val.length ? val[0] : '';
+        this.setFormData.slider_image = val.length ? serialize(val).splice(1) : [];
+      }
+    },
+    methods: {
+      
+      //图片预览
+      pop(e) {
+        this.show = true
+        this.image = e
+      },
+      // 获取数据
+      async initClasiffy() {
+        //获取商户分类
+        this.merchantClassification = (await storeClassifyLst(this.merId)).data;
+      },
+      async initData() {
+        if (getStorage('addGoodsFormData')) {
+          this.setFormData = getStorage('addGoodsFormData');
+          this.selectEdAttr = getStorage('modifyPriceData');
+        }
+        // 获取品牌
+        this.brand = (await categoryBrandlist(this.merId)).data;
+        // 获取平台分类
+        this.platformClassificationData = (await categoryList(this.merId)).data;
+        // 数据回显
+      },
+      //获取送货方式信息
+      getDeliveryType() {
+        let that = this
+        getDeliveryType(that.merId).then(
+          res => {
+            that.deliveryType = res.data.delivery_way.map(String);
+            if (!that.product_id) that.setFormData.delivery_way = that.deliveryType;
+            if (that.deliveryType.length == 2) {
+              that.deliveryFreeList = [{
+                  value: '1',
+                  name: '到店核销'
+                },
+                {
+                  value: '2',
+                  name: '快递配送'
+                }
+              ]
+            } else {
+              if (that.deliveryType.length == 1 && that.deliveryType[0] == '1') {
+                that.deliveryFreeList = [{
+                  value: '1',
+                  name: '到店核销'
+                }]
+              } else {
+                that.deliveryFreeList = [{
+                  value: '2',
+                  name: '快递配送'
+                }]
+              }
+            }
+          },
+          error => {
+            that.$util.Tips({
+              title: error.msg
+            })
+          }
+        );
+      },
 
-			// 查询详情数据
-			initDataEditData() {
-				Loading();
-				this.setFormData = {
-					imageList: [],
-					specification: '',
-					image: '', //主图
-					slider_image: '', // 轮播图
-					store_name: '', // 商品名
-					store_info: '', // 简介
-					keyword: '', // 关键字
-					brand_id: '', // 品牌id
-					brand_name: '', // 品牌名称
-					cate_id: '', // 平台分类
-					cate_name: '', // 平台名称
-					mer_cate_id: '', // 店铺分类
-					mer_cate_name: '', // 店铺分类名称
-					unit_name: '', // 商品单位
-					spec_type: '0', // 0.单规格 1：多规格
-					attr: [], // 商品规格
-					specifica: '', // 商品规格名称
-					setSpecificaValue: '', // 价格设置提示
-					setSpecificaValue2: '', // 价格设置提示
-					delivery_way: [], // 配送方式 1 到店核销 2 快递配送
-					delivery_free: '0', // 是否包邮 0不包邮 1包邮
-					temp_id: '', // 运费模板ID
-					tempName: '' // 运费模板名称
-				};
-				if (getStorage('editGoodsDetils')) {
-					removeStorage('editGoodsDetils');
-				}
-				productDetail(this.merId, this.product_id).then(res => {
-					setStorage('editGoodsDetils', res.data);
-					let editGoodsDetils = res.data;
-					Object.keys(this.setFormData).forEach(item => {
-						this.setFormData[item] = editGoodsDetils[item];
-					});
-					this.setFormData.product_id = this.product_id;
-					this.setFormData.imageList = [...(this.setFormData.image ? [this.setFormData.image] : []), ...
-						this
-						.setFormData.slider_image
-					];
-					this.setFormData.cate_name = editGoodsDetils.storeCategory.cate_name; // 平台分类回显
-					this.setFormData.mer_cate_name = editGoodsDetils.merCateId ? editGoodsDetils.merCateId.map(
-						item => item
-						.category && item.category.cate_name).join(',') : '';
-					this.setFormData.brand_name = editGoodsDetils.brand ? editGoodsDetils.brand.brand_name : '';
-					// 多规格
-					if (this.setFormData.spec_type == 1) {
-						if (editGoodsDetils.attr.length) {
-							this.setFormData.specifica = '点击修改规格'
-						}
-						if (editGoodsDetils.attrValue.length) {
-							this.setFormData.setSpecificaValue2 = '点击修改价格'
-						}
-					}
-					if (editGoodsDetils.spec_type == 0) {
-						setStorage('singleSpecification', editGoodsDetils.attrValue[0]);
-						if (editGoodsDetils.attrValue.length) {
-							this.setFormData.setSpecificaValue = '点击修改价格'
-						}
-					}
-					setStorage('attrValue', editGoodsDetils.attrValue);
-					editGoodsDetils.temp && (this.setFormData.tempName = editGoodsDetils.temp.name);
-					setStorage('canChange', true);
-					hideLoading();
-				});
-			},
-			// 选择图片
-			handleChooseImage() {
-				let that = this;
-				that.$util.uploadImageOne('upload/image', function(res) {
-					that.setFormData.imageList.push(res.data.path);
+      // 查询详情数据
+      initDataEditData() {
+        Loading();
+        this.setFormData = {
+          imageList: [],
+          specification: '',
+          image: '', //主图
+          slider_image: '', // 轮播图
+          store_name: '', // 商品名
+          store_info: '', // 简介
+          keyword: '', // 关键字
+          brand_id: '', // 品牌id
+          brand_name: '', // 品牌名称
+          cate_id: '', // 平台分类
+          cate_name: '', // 平台名称
+          mer_cate_id: '', // 店铺分类
+          mer_cate_name: '', // 店铺分类名称
+          unit_name: '', // 商品单位
+          spec_type: '0', // 0.单规格 1：多规格
+          attr: [], // 商品规格
+          specifica: '', // 商品规格名称
+          setSpecificaValue: '', // 价格设置提示
+          setSpecificaValue2: '', // 价格设置提示
+          delivery_way: [], // 配送方式 1 到店核销 2 快递配送
+          delivery_free: '0', // 是否包邮 0不包邮 1包邮
+          temp_id: '', // 运费模板ID
+          tempName: '' // 运费模板名称
+        };
+        if (getStorage('editGoodsDetils')) {
+          removeStorage('editGoodsDetils');
+        }
+        productDetail(this.merId, this.product_id).then(res => {
+          setStorage('editGoodsDetils', res.data);
+          if(res.data.content_arr.length>0) res.data.content = res.data.content_arr;
+          this.$store.commit('setStorage', res.data);
+          let editGoodsDetils = res.data;
+          Object.keys(this.setFormData).forEach(item => {
+            this.setFormData[item] = editGoodsDetils[item];
+          });
+          this.setFormData.product_id = this.product_id;
+          this.setFormData.imageList = [...(this.setFormData.image ? [this.setFormData.image] : []), ...
+            this
+            .setFormData.slider_image
+          ];
+          this.setFormData.cate_name = editGoodsDetils.storeCategory.cate_name; // 平台分类回显
+          this.setFormData.mer_cate_name = editGoodsDetils.merCateId ? editGoodsDetils.merCateId.map(
+            item => item
+            .category && item.category.cate_name).join(',') : '';
+          this.setFormData.brand_name = editGoodsDetils.brand ? editGoodsDetils.brand.brand_name : '';
+          // 多规格
+          if (this.setFormData.spec_type == 1) {
+            if (editGoodsDetils.attr.length) {
+              this.setFormData.specifica = '点击修改规格'
+            }
+            if (editGoodsDetils.attrValue.length) {
+              this.setFormData.setSpecificaValue2 = '点击修改价格'
+            }
+          }
+          if (editGoodsDetils.spec_type == 0) {
+            setStorage('singleSpecification', editGoodsDetils.attrValue[0]);
+            if (editGoodsDetils.attrValue.length) {
+              this.setFormData.setSpecificaValue = '点击修改价格'
+            }
+          }
+          setStorage('attrValue', editGoodsDetils.attrValue);
+          editGoodsDetils.temp && (this.setFormData.tempName = editGoodsDetils.temp.name);
+          setStorage('canChange', true);
+          hideLoading();
+            this.showCommodity = true;
+      
+        });
+      },
+      // 选择图片
+      handleChooseImage() {
+        let that = this;
+        that.$util.uploadImageOne('upload/image', function(res) {
+          that.setFormData.imageList.push(res.data.path);
+        });
+      },
+      clk() {
+        let avatar = this.$refs.avatar;
+        avatar.fChooseImg(1, {
+          selWidth: '350upx',
+          selHeight: '350upx',
+          inner: true
+        });
+      },
+      doUpload(rsp) {
+        let that = this
+        // console.log(rsp);
+        uni.uploadFile({
+          url: HTTP_REQUEST_URL + '/api/upload/image/field',
+          filePath: rsp.path,
+          name: 'field',
+          formData: {
+            'filename': rsp.path,
+            'name': that.imgName
+          },
+          header: {
+            // #ifdef MP
+            "Content-Type": "multipart/form-data",
+            // #endif
+            [TOKENNAME]: 'Bearer ' + store.state.app.token
+          },
+          success: (uploadFileRes) => {
+            // console.log(uploadFileRes.data);
+            let imgData = JSON.parse(uploadFileRes.data)
+            that.setFormData.imageList.push(imgData.data.path)
+          },
+          complete(res) {
+            // console.log(res)
+          }
+        });
+      },
+      getImgName(name) {
+        this.imgName = name
+      },
+      // 删除图片
+      deleteImage(index) {
+        this.setFormData.imageList.splice(index, 1);
+      },
+      // 选择平台分类
+      selectPlatform() {
+        this.$refs.select_platform.open();
+      },
+      // 关闭频台分类
+      closePlatfrom() {
+        this.$refs.select_platform.close();
+      },
+      // 获取平台类数据
+      getPlatData(item, taplist) {
+        this.setFormData.cate_id = item.value;
+        this.setFormData.cate_name = item.label;
+        this.$refs.select_platform.close();
+      },
+      // 选择店铺分类
+      selectStoreClass() {
+        this.$refs.select_store.open();
+      },
+      // 关闭店铺分类
+      merchantClose() {
+        this.$refs.select_store.close();
+      },
 
-				});
-			},
-			clk() {
-				let avatar = this.$refs.avatar;
-				avatar.fChooseImg(1, {
-					selWidth: '350upx',
-					selHeight: '350upx',
-					inner: true
-				});
-			},
-			doUpload(rsp) {
-				let that = this
-				// console.log(rsp);
-				uni.uploadFile({
-					url: HTTP_REQUEST_URL + '/api/upload/image/field',
-					filePath: rsp.path,
-					name: 'field',
-					formData: {
-						'filename': rsp.path,
-						'name': that.imgName
-					},
-					header: {
-						// #ifdef MP
-						"Content-Type": "multipart/form-data",
-						// #endif
-						[TOKENNAME]: 'Bearer ' + store.state.app.token
-					},
-					success: (uploadFileRes) => {
-						// console.log(uploadFileRes.data);
-						let imgData = JSON.parse(uploadFileRes.data)
-						that.setFormData.imageList.push(imgData.data.path)
-					},
-					complete(res) {
-						// console.log(res)
-					}
-				});
-			},
-			getImgName(name) {
-				this.imgName = name
-			},
-			// 删除图片
-			deleteImage(index) {
-				this.setFormData.imageList.splice(index, 1);
-			},
-			// 选择平台分类
-			selectPlatform() {
-				this.$refs.select_platform.open();
-			},
-			// 关闭频台分类
-			closePlatfrom() {
-				this.$refs.select_platform.close();
-			},
-			// 获取平台类数据
-			getPlatData(item, taplist) {
-				this.setFormData.cate_id = item.value;
-				this.setFormData.cate_name = item.label;
-				this.$refs.select_platform.close();
-			},
-			// 选择店铺分类
-			selectStoreClass() {
-				this.$refs.select_store.open();
-			},
-			// 关闭店铺分类
-			merchantClose() {
-				this.$refs.select_store.close();
-			},
+      // 获取已选择得店铺数据
+      handleGetSelectStore(item) {
+        this.setFormData.mer_cate_id = item.map(val => val.store_category_id);
+        this.setFormData.mer_cate_name = item.map(val => val.cate_name).join(',');
+        this.$refs.select_store.close();
+      },
 
-			// 获取已选择得店铺数据
-			handleGetSelectStore(item) {
-				this.setFormData.mer_cate_id = item.map(val => val.store_category_id);
-				this.setFormData.mer_cate_name = item.map(val => val.cate_name).join(',');
-				this.$refs.select_store.close();
-			},
+      // 获取品牌分类弹框
+      selectBrand() {
+        this.$refs.select_popup.open();
+      },
+      // 获取品牌分类数据
+      getLinkageData(item) {
+        this.setFormData.brand_id = item[0].value;
+        this.setFormData.brand_name = item[0].cate_name;
+        this.$refs.select_popup.close();
+      },
+      // 获取多选数据
+      multipleList(data, model) {
+        if (model == 'mer_cate_id') {
+          this.platformClassification[1].value = data.map(item => item.label).join('，');
+          this.platformClassification[1].allreadySelect = data;
+          this.setFormData.mer_cate_id = data.map(item => item.value);
+        }
+      },
+      // popup弹框中返回数据结束
+      // 关闭弹框
+      close() {
+        this.$refs.select_popup.close();
+        this.show = false
+      },
+      // 拼接字符串
+      getLinkDataOfRecursion(arr, child = 'children', key = 'value') {
+        let str = '';
+        let id = '';
+        arr.forEach(item => {
+          str = item.label;
+          id = item.value;
+        });
+        // str = str.slice(0, str.length - 1);
+        return {
+          str,
+          id
+        };
+      },
 
-			// 获取品牌分类弹框
-			selectBrand() {
-				this.$refs.select_popup.open();
-			},
-			// 获取品牌分类数据
-			getLinkageData(item) {
-				this.setFormData.brand_id = item[0].value;
-				this.setFormData.brand_name = item[0].cate_name;
-				this.$refs.select_popup.close();
-			},
-			// 获取多选数据
-			multipleList(data, model) {
-				if (model == 'mer_cate_id') {
-					this.platformClassification[1].value = data.map(item => item.label).join('，');
-					this.platformClassification[1].allreadySelect = data;
-					this.setFormData.mer_cate_id = data.map(item => item.value);
-				}
-			},
-			// popup弹框中返回数据结束
-			// 关闭弹框
-			close() {
-				this.$refs.select_popup.close();
-				this.show = false
-			},
-			// 拼接字符串
-			getLinkDataOfRecursion(arr, child = 'children', key = 'value') {
-				let str = '';
-				let id = '';
-				arr.forEach(item => {
-					str = item.label;
-					id = item.value;
-				});
-				// str = str.slice(0, str.length - 1);
-				return {
-					str,
-					id
-				};
-			},
+      // 获取默认值，给表单对象赋值
+      formInitData(value, model) {
+        this.setFormData[model] = value;
+      },
+      // 选项的单选框change事件触发
+      // model 为表单数据
+      handleRadioChange(value, item) {
+        this.setFormData[item.model] = value;
+      },
+      // 选择规格部分（新）
+      // 选择规格radio
+      specificationsRadioChange(e) {
+        this.setFormData.spec_type = e.detail.value;
+      },
+      // 选择规格弹窗
+      selectSpecification() {
+        attrList(this.merId, {
+          page: 1,
+          limit: 10000
+        }).then(res => {
+          if (res.data.list.length < 1) return Toast('暂无规格可选');
+          this.specificationClassification = res.data.list;
+          this.classified['attr'] = this.specificationClassification;
+          this.specificationClassification.forEach(item => {
+            this.$set(item, 'value', item.attr_template_id);
+            this.$set(item, 'label', item.template_name);
+            this.$refs.attr.open();
+          });
+        });
+      },
+      // 多规格时，选择属性
+      selectAttr(item) {
+        if (getStorage('attrValue')) {
+          removeStorage('attrValue');
+        }
+        console.log(item);
+        this.setFormData.specifica = item.template_name;
+        this.setFormData.attr = [];
+        this.setFormData.attr = this.setFormData.attr.concat(item.template_value);
+        this.selectEdAttr = item; // 存储选择的数据，跳转时使用
+        this.$refs.attr.close();
+      },
+      // 前往设置多规格界面
+      setSpecifica() {
+        // specification 为规格 0为单规格 1为多规格
+        if (this.setFormData.spec_type == 0) {
+          navigateTo(1, `/pages/product/addGoods/singleSpecification?code=${this.code}`);
+          return;
+        }
+        if (this.setFormData.spec_type == 1) {
+          let queryData = serialize(this.selectEdAttr);
+          setStorage('modifyPriceData', queryData);
+          navigateTo(1, `/pages/product/addGoods/modifyPrice?code=${this.code}`);
+          return;
+        }
+      },
+      // 更新商品条码
+      updateCode(e){
+        this.code = e + '';
+      },
+      // 选择规格部分（新）结束
+      // switch切换
+      switchChange(value, item) {
+        if (item.model == 'delivery_free') {
+          if (value) {
+            this.setFormData[item.model] = '1';
+          } else {
+            this.setFormData[item.model] = '0';
+          }
+        }
+      },
+      // 多选切换
+      checkChange(value, item) {
+        this.setFormData[item.model] = value;
+        if (item.model == 'delivery_way') {
+          if (value.includes('2')) {
+            this.transport[1].DoNotShow = false;
+          } else {
+            this.transport[1].DoNotShow = true;
+          }
+          // console.log(this.transport[1]);
+        }
+      },
 
-			// 获取默认值，给表单对象赋值
-			formInitData(value, model) {
-				this.setFormData[model] = value;
-			},
-			// 选项的单选框change事件触发
-			// model 为表单数据
-			handleRadioChange(value, item) {
-				this.setFormData[item.model] = value;
-			},
-			// 选择规格部分（新）
-			// 选择规格radio
-			specificationsRadioChange(e) {
-				this.setFormData.spec_type = e.detail.value;
-			},
-			// 选择规格弹窗
-			selectSpecification() {
-				attrList(this.merId, {
-					page: 1,
-					limit: 10000
-				}).then(res => {
-					if (res.data.list.length < 1) return Toast('暂无规格可选');
-					this.specificationClassification = res.data.list;
-					this.classified['attr'] = this.specificationClassification;
-					this.specificationClassification.forEach(item => {
-						this.$set(item, 'value', item.attr_template_id);
-						this.$set(item, 'label', item.template_name);
-						this.$refs.attr.open();
-					});
-				});
-			},
-			// 多规格时，选择属性
-			selectAttr(item) {
-				if (getStorage('attrValue')) {
-					removeStorage('attrValue');
-				}
-				console.log(item);
-				this.setFormData.specifica = item.template_name;
-				this.setFormData.attr = [];
-				this.setFormData.attr = this.setFormData.attr.concat(item.template_value);
-				this.selectEdAttr = item; // 存储选择的数据，跳转时使用
-				this.$refs.attr.close();
-			},
-			// 前往设置多规格界面
-			setSpecifica() {
-				// specification 为规格 0为单规格 1为多规格
-				if (this.setFormData.spec_type == 0) {
-					navigateTo(1, `/pages/product/addGoods/singleSpecification?code=${this.code}`);
-					return;
-				}
-				if (this.setFormData.spec_type == 1) {
-					let queryData = serialize(this.selectEdAttr);
-					setStorage('modifyPriceData', queryData);
-					navigateTo(1, `/pages/product/addGoods/modifyPrice?code=${this.code}`);
-					return;
-				}
-			},
-			// 选择规格部分（新）结束
-			// switch切换
-			switchChange(value, item) {
-				if (item.model == 'delivery_free') {
-					if (value) {
-						this.setFormData[item.model] = '1';
-					} else {
-						this.setFormData[item.model] = '0';
-					}
-				}
-			},
-			// 多选切换
-			checkChange(value, item) {
-				this.setFormData[item.model] = value;
-				if (item.model == 'delivery_way') {
-					if (value.includes('2')) {
-						this.transport[1].DoNotShow = false;
-					} else {
-						this.transport[1].DoNotShow = true;
-					}
-					// console.log(this.transport[1]);
-				}
-			},
+      handleClose() {
+        this.$refs.select_popup.close();
+      },
+      // 送货方式选择
+      deliveryWayChange(obj) {
+        this.setFormData.delivery_way = obj.detail.value;
+      },
+      // 是否包邮选择
+      deliveryFreeChange(val) {
+        if (val.detail.value) {
+          this.setFormData.delivery_free = '1';
+        } else {
+          this.setFormData.delivery_free = '0';
+        }
+      },
+      // 选择运费模板
+      tempIdSelect() {
+        this.getTemplateList();
+      },
+      // 请求运费模板列表
+      getTemplateList() {
+        templateList(this.merId, this.templateListPage).then(res => {
+          res.data.list.forEach(item => {
+            this.$set(item, 'value', item.shipping_template_id);
+            this.$set(item, 'label', item.name);
+          });
+          this.classified['temp_id'] = res.data.list;
+          this.$refs.tempId.open();
+        });
+      },
+      // 内部scroll-view滑动到最底部
+      scrolltolower() {},
+      // 获取运费模板数据
+      getTempIdData(obj) {
+        // console.log(obj);
+        this.setFormData.temp_id = obj[0].value;
+        this.setFormData.tempName = obj[0].label;
+        this.$refs.tempId.close();
+      },
+      // 设置运费模板
+      setGoodsTemp() {
+        navigateTo(1, '/pages/product/addGoods/freightTemplate', {
+          mer_id: this.merId
+        });
+      },
+      // 开始下一步
 
-			handleClose() {
-				this.$refs.select_popup.close();
-			},
-			// 送货方式选择
-			deliveryWayChange(obj) {
-				this.setFormData.delivery_way = obj.detail.value;
-			},
-			// 是否包邮选择
-			deliveryFreeChange(val) {
-				if (val.detail.value) {
-					this.setFormData.delivery_free = '1';
-				} else {
-					this.setFormData.delivery_free = '0';
-				}
-			},
-			// 选择运费模板
-			tempIdSelect() {
-				this.getTemplateList();
-			},
-			// 请求运费模板列表
-			getTemplateList() {
-				templateList(this.merId, this.templateListPage).then(res => {
-					res.data.list.forEach(item => {
-						this.$set(item, 'value', item.shipping_template_id);
-						this.$set(item, 'label', item.name);
-					});
-					this.classified['temp_id'] = res.data.list;
-					this.$refs.tempId.open();
-				});
-			},
-			// 内部scroll-view滑动到最底部
-			scrolltolower() {},
-			// 获取运费模板数据
-			getTempIdData(obj) {
-				// console.log(obj);
-				this.setFormData.temp_id = obj[0].value;
-				this.setFormData.tempName = obj[0].label;
-				this.$refs.tempId.close();
-			},
-			// 设置运费模板
-			setGoodsTemp() {
-				navigateTo(1, '/pages/product/addGoods/freightTemplate', {
-					mer_id: this.merId
-				});
-			},
-			// 开始下一步
+      handleNextStep() {
+        this.step = 2;
+        return;
+        // console.log(this.setFormData.setSpecificaValue)
+        let canJumpFlag = true;
+        let requireData = {
+          image: '请选择主图',
+          store_name: '请输入商品名', // 商品名
+          cate_id: '请选择平台分类', // 平台分类
+          mer_cate_id: '请选择店铺分类', // 店铺分类
+          unit_name: '请输入商品单位', // 商品单位
+        };
+        // console.log({
+        // 	...this.setFormData
+        // })
+        Object.keys(requireData).some(item => {
+          if (!this.setFormData[item]) {
+            Toast(requireData[item]);
+            canJumpFlag = false;
+            return;
+          }
+        });
+        if (this.setFormData.spec_type == '0' && !this.setFormData.setSpecificaValue) {
+          Toast('商品价格不能为空');
+          return;
+        } else if (this.setFormData.spec_type == '1' && !this.setFormData.setSpecificaValue2) {
+          Toast('商品价格不能为空');
+          return;
+        }
+        if (!this.setFormData.delivery_way.length) {
+          Toast('请选择送货方式');
+          return;
+        }
+        if (!this.setFormData.mer_cate_id.length) {
+          Toast('请选择店铺分类');
+          return;
+        }
+        if (this.setFormData.imageList.length < 2) {
+          Toast('请添加最少两张图片用于展示');
+          return;
+        }
 
-			handleNextStep() {
-				// console.log(this.setFormData.setSpecificaValue)
-				let canJumpFlag = true;
-				let requireData = {
-					image: '请选择主图',
-					store_name: '请输入商品名', // 商品名
-					cate_id: '请选择平台分类', // 平台分类
-					mer_cate_id: '请选择店铺分类', // 店铺分类
-					unit_name: '请输入商品单位', // 商品单位
-				};
-				// console.log({
-				// 	...this.setFormData
-				// })
-				Object.keys(requireData).some(item => {
-					if (!this.setFormData[item]) {
-						Toast(requireData[item]);
-						canJumpFlag = false;
-						return;
-					}
-				});
-				if (this.setFormData.spec_type == '0' && !this.setFormData.setSpecificaValue) {
-					Toast('商品价格不能为空');
-					return;
-				} else if (this.setFormData.spec_type == '1' && !this.setFormData.setSpecificaValue2) {
-					Toast('商品价格不能为空');
-					return;
-				}
-				if (!this.setFormData.delivery_way.length) {
-					Toast('请选择送货方式');
-					return;
-				}
-				if (!this.setFormData.mer_cate_id.length) {
-					Toast('请选择店铺分类');
-					return;
-				}
-				if (this.setFormData.imageList.length < 2) {
-					Toast('请添加最少两张图片用于展示');
-					return;
-				}
-
-				if (canJumpFlag) {
-					// navigateTo(1, '/pages/product/addGoods/secound', { mer_id: this.merId, type: this.type });
-					// this.$refs.secound.open();
-					this.step = 2;
-				}
-			},
-			lastStep() {
-				this.step = 1;
-			}
-		}
-	};
+        if (canJumpFlag) {
+          // navigateTo(1, '/pages/product/addGoods/secound', { mer_id: this.merId, type: this.type });
+          // this.$refs.secound.open();
+          this.step = 2;
+        }
+      },
+      lastStep() {
+        this.step = 1;
+      }
+    }
+  };
 </script>
 
 <style lang="scss" scoped>
-	@import './scss/index.scss';
+  @import './scss/index.scss';
 
-	.pop {
-		z-index: 1;
-	}
-	.guanbi {
-		width: 20px;
-		height: 20px;
-		margin: 30px auto;
-	}
-	
+  .pop {
+    z-index: 1;
+  }
+
+  .guanbi {
+    width: 20px;
+    height: 20px;
+    margin: 30px auto;
+  }
 </style>
\ No newline at end of file
diff --git a/pages/product/addGoods/modifyPrice.vue b/pages/product/addGoods/modifyPrice.vue
index b85d292..fc47b41 100644
--- a/pages/product/addGoods/modifyPrice.vue
+++ b/pages/product/addGoods/modifyPrice.vue
@@ -40,8 +40,8 @@
 
 				<view v-if="item.more_thanFlag">
 					<view class="multiSpecifica_container_item">
-						<view class="multiSpecifica_container_item_label flex-start">商品编号</view>
-						<view class="multiSpecifica_container_item_value"><input v-model="item.bar_code" type="text" placeholder="请填写商品编号" /></view>
+						<view class="multiSpecifica_container_item_label flex-start">商品条码</view>
+						<view class="multiSpecifica_container_item_value"><input v-model="item.bar_code" type="text" placeholder="请填写商品条码" /></view>
 					</view>
 
 					<view class="multiSpecifica_container_item">
@@ -114,7 +114,7 @@
 
 						<view v-if="popupOpenModel">
 							<view class="changePopup_container_content_item">
-								<view class="changePopup_container_content_item_label">商品编号</view>
+								<view class="changePopup_container_content_item_label">商品条码</view>
 								<view class="changePopup_container_content_item_value"><input v-model="batchData.bar_code" type="text" placeholder="0.00" /></view>
 							</view>
 
@@ -171,7 +171,7 @@ export default {
 				price: '', //售价
 				cost: '', // 成本价
 				ot_price: '', // 原价
-				bar_code: '', // 商品编号
+				bar_code: '', // 商品条码
 				weight: '', // 重量
 				volume: '', // 体积
 				extension_one: '', // 一级佣金
diff --git a/pages/product/addGoods/price.vue b/pages/product/addGoods/price.vue
new file mode 100644
index 0000000..ebd5b93
--- /dev/null
+++ b/pages/product/addGoods/price.vue
@@ -0,0 +1,239 @@
+<template>
+  <view class="container">
+    <select-form style="border-radius: 10rpx 10rpx 0 0;" :platformClassification="formList" :form="singleSpecification"
+      @input="input"></select-form>
+    <view class="more_than" @click="moreThanFlag?selectMoreThan():spliceMoreThan()">
+      <view v-if="moreThanFlag">更多</view>
+      <view v-else>收起</view>
+    </view>
+    <!-- <view class="handle">
+			<view class="button" @click="saveSingleSpecification">
+				保存
+			</view>
+		</view> -->
+  </view>
+</template>
+
+<script>
+  import selectForm from '../components/selectForm.vue';
+  import { navigateTo, navigateBack, serialize, setStorage, getStorage } from '../../../libs/uniApi.js';
+  // 单规格商品 attrValue
+  export default {
+    components: {
+      selectForm
+    },
+    props: ['product_id', 'bar_code'],
+    data() {
+      return {
+        singleSpecification: {
+          price: '', // 售价
+          cost: '', // 成本价
+          stock: '', // 库存
+          ot_price: '', // 批发价
+          bar_code: '', // 商品条码
+          weight: '', // 重量
+          volume: '', // 体积
+          image: '',
+          extension_one: '',
+          extension_two: ''
+        },
+        moreThanFlag: true,
+        formList: [{
+            id: 1,
+            label: '售价',
+            type: 'digit',
+            model: 'price',
+            holder: '请填写售价',
+            require: true,
+          }, {
+            id: 10,
+            label: '库存',
+            type: 'digit',
+            model: 'stock',
+            holder: '请填写库存',
+            disable: true,
+            require: true,
+          }, {
+            id: 2,
+            label: '成本价',
+            type: 'digit',
+            holder: '请填写成本价',
+            model: 'cost',
+            require: true,
+          },
+          {
+            id: 3,
+            label: '批发价',
+            type: 'digit',
+            holder: '请填写批发价',
+            model: 'ot_price',
+            require: true,
+          }
+        ],
+        moreThanList: [{
+            id: 6,
+            label: '重量',
+            type: 'digit',
+            holder: '请输入重量',
+            model: 'weight',
+            require: false,
+          },
+          {
+            id: 7,
+            label: '体积',
+            type: 'digit',
+            holder: '请输入体积',
+            model: 'volume',
+            require: false,
+          },
+          {
+            id: 5,
+            label: '商品条码',
+            type: 'input',
+            holder: '请填写商品条码',
+            model: 'bar_code',
+            require: false,
+          },
+          // {
+          // 	id: 8,
+          // 	label: '佣金（一级）',
+          // 	type: 'digit',
+          // 	holder: '请输入一级佣金',
+          // 	model: 'extension_one'
+          // },
+          // {
+          // 	id: 9,
+          // 	label: '佣金（二级）',
+          // 	type: 'digit',
+          // 	holder: '请输入二级佣金',
+          // 	model: 'extension_two'
+          // }
+        ],
+
+      }
+    },
+
+    watch: {
+      singleSpecification: {
+        handler(val, old) {
+          this.singleSpecification = val;
+          this.saveSingleSpecification();
+          this.$emit('updateCode', val.bar_code);
+        },
+        deep: true
+      },
+    },
+    // onLoad(option) {
+    // 	console.log(option);
+    // 	this.singleSpecification.bar_code=option.code
+    // },
+    // onShow() {
+    // 	if(getStorage('addGoodsFormData').image) {
+    // 		this.singleSpecification.image = getStorage('addGoodsFormData').image;
+    // 	}
+    // 	if(getStorage('singleSpecification')) {
+    // 		Object.keys(this.singleSpecification).forEach(item => {
+    // 			if(getStorage('singleSpecification')[item]) {
+    // 				this.singleSpecification[item] = getStorage('singleSpecification')[item]
+    // 			}
+    // 		})
+    // 	}
+    // },
+    // beforeDestroy() {
+    // 	console.log('123');
+    // 	uni.removeStorage({
+    // 		key: 'singleSpecification'
+    // 	});
+    // },
+    mounted() {
+      if (getStorage('addGoodsFormData').image) {
+        this.singleSpecification.image = getStorage('addGoodsFormData').image;
+      }
+      if (getStorage('singleSpecification')) {
+        Object.keys(this.singleSpecification).forEach(item => {
+          if (getStorage('singleSpecification')[item]) {
+            this.singleSpecification[item] = getStorage('singleSpecification')[item]
+          }
+        })
+      }
+      this.singleSpecification.bar_code = this.$props.bar_code + '';
+      // if (!this.$props.product_id) {
+      //   this.formList.push({
+      //     id: 10,
+      //     label: '库存',
+      //     type: 'digit',
+      //     model: 'stock',
+      //     holder: '请填写库存',
+      //     disable: true
+      //   })
+      // }
+    },
+    destroyed() {
+      setStorage('singleSpecification', {});
+    },
+    methods: {
+      selectMoreThan() {
+        this.formList = this.formList.concat(this.moreThanList);
+        this.moreThanFlag = false;
+      },
+      spliceMoreThan() {
+        this.moreThanFlag = true;
+        // this.formList.splice(!this.$props.product_id ? 2 : 1, this.formList.length);
+        this.formList.splice(4, this.formList.length);
+      },
+      input(val) {
+        this.singleSpecification = val
+      },
+      // 保存
+      saveSingleSpecification() {
+        setStorage('singleSpecification', this.singleSpecification);
+        // navigateBack(1);
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .container {
+    padding: 0 !important;
+  }
+
+  .more_than {
+    background: #FFFFFF;
+    border-radius: 0 0 10rpx 10rpx;
+    margin: auto;
+    // margin-top: 30rpx;
+    margin-top: 1px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 710rpx;
+    height: 84rpx;
+    color: #333333;
+    font-size: 30rpx;
+  }
+
+  .handle {
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    width: 100%;
+    height: 126rpx;
+    background: #FFFFFF;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    .button {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      color: #FFFFFF;
+      font-size: 32rpx;
+      width: 690rpx;
+      height: 86rpx;
+      background: #E93323;
+      border-radius: 43rpx;
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/pages/product/addGoods/scss/index.scss b/pages/product/addGoods/scss/index.scss
index 5b634ca..2a7dabc 100644
--- a/pages/product/addGoods/scss/index.scss
+++ b/pages/product/addGoods/scss/index.scss
@@ -18,7 +18,7 @@
     }
   }
 .tip {
-	padding: 16rpx 0 0 40rpx;
+	padding: 16rpx 0 0 20rpx;
 	font-size: 22rpx;
 	color: #e93323;
 	display: flex;
@@ -36,6 +36,14 @@
 	width: 710rpx;
 	font-size: 30rpx;
 	border-radius: 10rpx;
+  
+  .icon_top{
+    transform: rotate(-90deg);
+  }
+  
+  .icon_bottom{
+    transform: rotate(90deg);
+  }
 	.popup_group_item {
 		padding: 32rpx 30rpx;
 		display: flex;
diff --git a/pages/product/addGoods/secound.vue b/pages/product/addGoods/secound.vue
index a33116d..659e7f8 100644
--- a/pages/product/addGoods/secound.vue
+++ b/pages/product/addGoods/secound.vue
@@ -1,112 +1,118 @@
 <template>
-  <view class=" writeBg  ">
-    <view class="container_input marginTop_none">
-      <view class="container_input_item">
-        <view class="container_input_item_label"><span>是否推荐</span></view>
-        <view class="container_input_item_value">
-          <switch :checked="addGoodsSecoundData.is_good == 1" color="#E93323" style="transform:scale(0.8)"
-            @change="isGood" />
-        </view>
-      </view>
-      <view class="container_input_item">
-        <view class="container_input_item_label"><span>是否开启礼包</span></view>
-        <view class="container_input_item_value">
-          <switch :checked="addGoodsSecoundData.is_gift_bag == 1" color="#E93323" style="transform:scale(0.8)"
-            @change="isGiftBag" />
-        </view>
-      </view>
-    </view>
-    <view class="tip">
-      <span class="iconfont">&#xe688;</span>
-      <span>开启后此商品只能在分销礼包中展示并销售</span>
-    </view>
-    <view class="container_input marginTop_none">
-      <view class="container_input_item">
-        <view class="container_input_item_label"><span>限购数量</span></view>
-        <view class="container_input_item_value">
-          <input v-model="addGoodsSecoundData.once_count" type="number" value="" placeholder="请输入限购数量"
-            placeholder-class="inputPlaceHolder" />
-        </view>
-      </view>
-      <view class="container_input_item">
-        <view class="container_input_item_label"><span>商品排序</span></view>
-        <view class="container_input_item_value">
-          <input v-model="addGoodsSecoundData.sort" type="number" value="" placeholder="请输入商品排序"
-            placeholder-class="inputPlaceHolder" />
-        </view>
-      </view>
-    </view>
-    <view class="content_list">
-      <view class="content_list_item" @click="inputGoodsDetils">
-        <view>商品详情</view>
-        <view class="content_list_item_han">
-          <span v-if="disModel" style="color: #000000">去修改</span>
-          <span v-else>设置详情</span>
-          <span class="iconfont">&#xe6bd;</span>
-        </view>
-      </view>
-      <view class="content_list_video">
-        <view class="content_list_video_title">商品视频</view>
-        <view class="video_list">
-         <view class="video_list_item photo" v-if="addGoodsSecoundData.video_link">
-            <view class="jiao" @click="deleteImage()">
-				<!-- video标签在app端层级过高 -->
-				 <!--#ifndef APP-PLUS-->
-              <video  :src="addGoodsSecoundData.video_link"></video>
-			    <!--#endif-->
-				 <!--#ifdef APP-PLUS-->
-			  <img src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/3/video_bg.png" style=" width:150rpx" ></img>
-			   <!--#endif-->
-              <image src="../static/images/close.png" mode="widthFix"></image>
+  <view>
+    <block v-if="showComponent">
+      <view class=" writeBg  ">
+        <view class="container_input marginTop_none">
+          <view class="container_input_item">
+            <view class="container_input_item_label"><span>是否推荐</span></view>
+            <view class="container_input_item_value">
+              <switch :checked="addGoodsSecoundData.is_good == 1" color="#E93323" style="transform:scale(0.8)"
+                @change="isGood" />
             </view>
-			
-			  <!--#ifndef APP-PLUS-->
-			<view style="position: absolute;">
-				<view class="videoHover" @click="videoshow">
-				</view>
-				<text class="video-text">点击可预览视频</text>
-			</view>
-			       <!--#endif-->
-		
-  <!--#ifdef APP-PLUS-->
-		<view class='preview_video'>
-			<view class="videoHover" @click="videoshow">
-			</view>
-			<text class="video-text">点击可预览视频</text>
-		</view>
-		 <!--#endif-->
           </view>
-		  
-		  
-		  
-		  
-		  
-		  
-		  
-          <view class="photo" @click="uploadVideo" v-else>
-            <view>
-              <image src="../static/images/creamer.png" mode="widthFix"></image>
+          <view class="container_input_item">
+            <view class="container_input_item_label"><span>是否开启礼包</span></view>
+            <view class="container_input_item_value">
+              <switch :checked="addGoodsSecoundData.is_gift_bag == 1" color="#E93323" style="transform:scale(0.8)"
+                @change="isGiftBag" />
             </view>
-            <view>添加视频</view>
           </view>
         </view>
-      </view>
-    </view>
-  <view v-if="showVideo" class="video-count">
-        <!--#ifndef APP-PLUS-->
-        <video id="myVideo" class="videoLink" autoplay loop muted :src="addGoodsSecoundData.video_link"></video>
-        <!--#endif-->
-        <!--#ifdef APP-PLUS-->
+        <view class="tip">
+          <span class="iconfont">&#xe688;</span>
+          <span>开启后此商品只能在分销礼包中展示并销售</span>
+        </view>
+        <view class="container_input marginTop_none">
+          <view class="container_input_item">
+            <view class="container_input_item_label"><span>限购数量</span></view>
+            <view class="container_input_item_value">
+              <input v-model="addGoodsSecoundData.once_count" type="number" value="" placeholder="请输入限购数量"
+                placeholder-class="inputPlaceHolder" />
+            </view>
+          </view>
+          <view class="container_input_item">
+            <view class="container_input_item_label"><span>商品排序</span></view>
+            <view class="container_input_item_value">
+              <input v-model="addGoodsSecoundData.sort" type="number" value="" placeholder="请输入商品排序"
+                placeholder-class="inputPlaceHolder" />
+            </view>
+          </view>
+        </view>
+        <view class="content_list">
+          <view class="content_list_item" @click="inputGoodsDetils">
+            <view>商品详情</view>
+            <view class="content_list_item_han">
+              <span v-if="disModel" style="color: #000000">去修改</span>
+              <span v-else>设置详情</span>
+              <span class="iconfont">&#xe6bd;</span>
+            </view>
+          </view>
+          <view class="content_list_video">
+            <view class="content_list_video_title">商品视频</view>
+            <view class="video_list">
+              <view class="video_list_item photo" v-if="addGoodsSecoundData.video_link">
+                <view class="jiao" @click="deleteImage()">
+                  <!-- video标签在app端层级过高 -->
+                  <!--#ifndef APP-PLUS-->
+                  <video :src="addGoodsSecoundData.video_link"></video>
+                  <!--#endif-->
+                  <!--#ifdef APP-PLUS-->
+                  <img src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/3/video_bg.png"
+                    style=" width:150rpx"></img>
+                  <!--#endif-->
+                  <image src="../static/images/close.png" mode="widthFix"></image>
+                </view>
 
-        <video id="myVideo" class="videoLink" autoplay loop
-          :src='addGoodsSecoundData.video_link && (addGoodsSecoundData.video_link.substring(0,4) == "http" || addGoodsSecoundData.video_link.substring(0,5) == "https") ?addGoodsSecoundData.video_link : "http:" + addGoodsSecoundData.video_link'></video>
-        <!--#endif-->
+                <!--#ifndef APP-PLUS-->
+                <view style="position: absolute;">
+                  <view class="videoHover" @click="videoshow">
+                  </view>
+                  <text class="video-text">点击可预览视频</text>
+                </view>
+                <!--#endif-->
+
+                <!--#ifdef APP-PLUS-->
+                <view class='preview_video'>
+                  <view class="videoHover" @click="videoshow">
+                  </view>
+                  <text class="video-text">点击可预览视频</text>
+                </view>
+                <!--#endif-->
+              </view>
+
+
+
+
+
+
+
+              <view class="photo" @click="uploadVideo" v-else>
+                <view>
+                  <image src="../static/images/creamer.png" mode="widthFix"></image>
+                </view>
+                <view>添加视频</view>
+              </view>
+            </view>
+          </view>
+        </view>
+        <view v-if="showVideo" class="video-count">
+          <!--#ifndef APP-PLUS-->
+          <video id="myVideo" class="videoLink" autoplay loop muted :src="addGoodsSecoundData.video_link"></video>
+          <!--#endif-->
+          <!--#ifdef APP-PLUS-->
+
+          <video id="myVideo" class="videoLink" autoplay loop
+            :src='addGoodsSecoundData.video_link && (addGoodsSecoundData.video_link.substring(0,4) == "http" || addGoodsSecoundData.video_link.substring(0,5) == "https") ?addGoodsSecoundData.video_link : "http:" + addGoodsSecoundData.video_link'></video>
+          <!--#endif-->
+        </view>
+        <view class='mask' catchtouchmove="true" :hidden='showVideo==false' @tap="showVideo=false"></view>
+        <view class="handle dobuButton">
+          <view class="handle_button margin_right" @click="lastStep">上一步</view>
+          <view class="handle_button" @click="submitCreatedGoods">提交</view>
+        </view>
       </view>
-      <view class='mask' catchtouchmove="true" :hidden='showVideo==false' @tap="showVideo=false"></view>
-    <view class="handle dobuButton">
-      <view class="handle_button margin_right" @click="lastStep">上一步</view>
-      <view class="handle_button" @click="submitCreatedGoods">提交</view>
-    </view>
+    </block>
+    <view class="handle_button" @click="submitCreatedGoods">提交</view>
   </view>
 </template>
 <script>
@@ -148,7 +154,8 @@
     },
     data() {
       return {
-		  showVideo:false,
+        showComponent: false,
+        showVideo: false,
         disModel: false,
         upload_max: 10,
         uploadUrl: `${HTTP_REQUEST_URL}/api/upload/video`,
@@ -166,7 +173,7 @@
       // console.log('123');
       this.initData();
     },
-
+    
     watch: {
       addGoodsSecoundData: {
         handler(val) {
@@ -184,16 +191,16 @@
       }
     },
     methods: {
-		videoshow() {
-		  this.showVideo = true
-		  this.videoContext = uni.createVideoContext('myVideo', this);
-		  this.$nextTick(() => {
-		    this.videoContext.play();
-		  })
-		  // this.video_link = this.formData.video_link;
-		  // this.videoContext.requestFullScreen({ direction: 90 });
-		  // this.videoContext.play(); this.videoplay = true; 
-		},
+      videoshow() {
+        this.showVideo = true
+        this.videoContext = uni.createVideoContext('myVideo', this);
+        this.$nextTick(() => {
+          this.videoContext.play();
+        })
+        // this.video_link = this.formData.video_link;
+        // this.videoContext.requestFullScreen({ direction: 90 });
+        // this.videoContext.play(); this.videoplay = true; 
+      },
       initData() {
         let editGoodsDetils = {};
         if (getStorage('goodsDis')) {
@@ -235,7 +242,7 @@
       submitCreatedGoods() {
         Loading();
         let waitDeleteData = ['addGoodsFormData', 'singleSpecification', 'attrValue', 'modifyPriceData',
-          'addGoodsSecoundData', 'goodsDis', 'editGoodsDetils', 'canChange', 'canChangeSecound'
+          'addGoodsSecoundData', 'goodsDis', 'editGoodsDetils', 'canChange', 'canChangeSecound', 'editCommodity'
         ];
         let attrValue = getStorage('addGoodsFormData').spec_type == 0 ? [getStorage('singleSpecification')] :
           getStorage('attrValue');
@@ -248,12 +255,27 @@
           },
           video_link: this.addGoodsSecoundData.video_link
         };
-
-       if(attrValue){
-       postData.attrValue = attrValue.filter(item => item != '');
-       postData.attrValue[0].bar_code 
-       }
-		// console.log(postData);
+        if (attrValue) {
+          postData.attrValue = attrValue.filter(item => item != '');
+          postData.attrValue[0].bar_code
+        }
+        let info = getStorage('editCommodity');
+        Object.keys(info).forEach(key=>{
+          postData[key]=info[key];
+        })
+        postData.stock = postData.attrValue[0]?.stock;
+        // console.log(postData);
+        if(!postData.store_name||postData.store_name?.trim().length<=0)return Toast('请输入商品名称');
+        if(!postData.imageList||postData.imageList?.length<2)return Toast('请上传2张以上商品图片');
+        if(!postData.cate_name||postData.cate_name?.trim().length<=0)return Toast('请选择平台分类');
+        if(!postData.unit_name||postData.unit_name?.trim().length<=0)return Toast('请输入商品单位');
+        if(!postData.attrValue[0]?.price||postData.attrValue[0]?.price<0)return Toast('价格不能小于0');
+        if(!postData.stock||postData.stock<0)return Toast('库存不能小于0');
+        if(!postData.attrValue[0]?.cost||postData.attrValue[0]?.cost<0)return Toast('成本价不能小于0');
+        if(!postData.attrValue[0]?.ot_price||postData.attrValue[0]?.ot_price<0)return Toast('批发价不能小于0');
+        // if(!postData.content.title||postData.content.title?.trim().length<=0)return Toast('请输入商品详情');
+        // if(!postData.content.image||postData.content.image?.length<=0)return Toast('请上传商品图片');
+        // return Toast('通过');
         if (getStorage('addGoodsFormData').spec_type == 0) {
           // postData.attr = [getStorage('singleSpecification')];
         }
@@ -269,7 +291,7 @@
               Modal('提交成功', '点击确定，返回商品管理', {
                 showCancel: false
               }).then(() => {
-				  uni.removeStorageSync('singleSpecification')
+                uni.removeStorageSync('singleSpecification')
                 uni.redirectTo({
                   url: '/pages/product/goodsOnSale/index?mer_id=' + this.merId
                 })
@@ -322,8 +344,8 @@
         uni.chooseVideo({
           sourceType: ['camera', 'album'],
           success: res => {
-			  console.log(res)
-			  
+            console.log(res)
+
             if (Math.ceil(res.size / 1024) < this.upload_max * 1024) {
               uni.uploadFile({
                 url: this.uploadUrl, //仅为示例，非真实的接口地址
@@ -355,11 +377,11 @@
             }
           },
           fail: err => {
-			  // 取消上传也会出现弹框
+            // 取消上传也会出现弹框
             // uni.showModal({
             //   content: JSON.stringify(err)
             // });
-			console.log(err)
+            console.log(err)
           }
         });
       },
@@ -413,32 +435,34 @@
       }
     }
   }
- .videoHover {
-      width: 180rpx;
-      height: 180rpx;
+
+  .videoHover {
+    width: 180rpx;
+    height: 180rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position: absolute;
+    top: 0;
+    left: 0;
+    z-index: 10;
+
+    view {
+      width: 50rpx;
+      height: 50rpx;
+      background: #000000;
+      border-radius: 50rpx;
       display: flex;
       align-items: center;
       justify-content: center;
-      position: absolute;
-      top: 0;
-      left: 0;
-      z-index: 10;
 
-      view {
-        width: 50rpx;
-        height: 50rpx;
-        background: #000000;
-        border-radius: 50rpx;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-
-        .iconfont {
-          color: #ffffff;
-          font-size: 21rpx;
-        }
+      .iconfont {
+        color: #ffffff;
+        font-size: 21rpx;
       }
     }
+  }
+
   .photo {
     border: 1px solid #dddddd;
     opacity: 1;
@@ -481,10 +505,12 @@
       height: 150rpx;
     }
   }
-.preview_video{
-	position: absolute;
-		
-}
+
+  .preview_video {
+    position: absolute;
+
+  }
+
   .container_input {
     background: #fff;
     padding: 0 20rpx;
@@ -603,6 +629,7 @@
   .marginTop_none {
     margin-top: 0;
   }
+
   .video-count {
     position: fixed;
     width: 600rpx;
@@ -621,6 +648,7 @@
       height: 500rpx;
     }
   }
+
   // .writeBg {
   // 	background: #fff;
   // }
diff --git a/pages/product/addGoods/singleSpecification.vue b/pages/product/addGoods/singleSpecification.vue
index 5e2ed0f..672a913 100644
--- a/pages/product/addGoods/singleSpecification.vue
+++ b/pages/product/addGoods/singleSpecification.vue
@@ -14,7 +14,7 @@
 
 <script>
 	import selectForm from '../components/selectForm.vue';
-	import { navigateTo, navigateBack, serialize, setStorage, getStorage} from '../../../libs/uniApi.js';
+	import { navigateTo, navigateBack, serialize, setStorage, getStorage } from '../../../libs/uniApi.js';
 	// 单规格商品 attrValue
 	export default {
 		components:{
@@ -26,7 +26,7 @@
 					price: '', // 售价
 					cost: '', // 成本价
 					ot_price: '', // 原价
-					bar_code: '', // 商品编号
+					bar_code: '', // 商品条码
 					weight: '', // 重量
 					volume: '', // 体积
 					image: '',
@@ -60,9 +60,9 @@
 				moreThanList: [
 					{
 						id: 5,
-						label: '商品编号',
+						label: '商品条码',
 						type: 'input',
-						holder: '请填写商品编号',
+						holder: '请填写商品条码',
 						model: 'bar_code'
 					},
 					{
diff --git a/pages/product/basicSet.vue b/pages/product/basicSet.vue
index df3097b..16665d9 100644
--- a/pages/product/basicSet.vue
+++ b/pages/product/basicSet.vue
@@ -7,10 +7,10 @@
 			<view class="store_bg">
 				<view class="text flex_a_c"><i class="iconfont icon-xinghao"></i>上传店铺背景图</view>
 				<block v-if="images[0].img">
-	<!-- 				<u--image :showLoading="true" :src="images[0].img" width="388px" height="210.53rpx" radius="4px"
-						@click="delImg(0)" mode="aspectFit"></u--image> -->
-					<u--image :showLoading="true" :src="images[0].img" width="360px" height="210.53rpx" radius="4px"
-						@click="delImg(2)"></u--image>
+					<!-- 				<u--image :showLoading="true" :src="images[0].img" width="388px" height="210.53rpx" radius="4px"
+											@click="delImg(0)" mode="aspectFit"></u--image> -->
+					<u--image :showLoading="true" :src="images[0].img" width="680rpx" height="210.53rpx" radius="4px"
+						@click="delImg(0)"></u--image>
 				</block>
 				<view v-else class="upload" @click="seleckImage(0)">
 					<view class="iconfont icon-tupian1"></view>
@@ -56,7 +56,7 @@
 			<view class="street_bg">
 				<view class="text flex_a_c"> <i class="iconfont icon-xinghao"></i> 店铺街背景图</view>
 				<block v-if="images[2].img">
-					<u--image :showLoading="true" :src="images[2].img" width="360px" height="210.53rpx" radius="4px"
+					<u--image :showLoading="true" :src="images[2].img" width="680rpx" height="210.53rpx" radius="4px"
 						@click="delImg(2)"></u--image>
 				</block>
 				<view v-else class="street_img flex_a_c" @click="seleckImage(2)">
@@ -74,9 +74,11 @@
 				<view class="flex_a_c">
 					<text class="sub_title">配送方式：</text>
 					<view class="flex">
-						<checkbox-group name="" @change="checkboxChange"  >
-							<checkbox  disabled='true' :checked="isZiti" :value="check.ziti" /><text class="text ziti">到店自提(加入供应链)</text>
-							<checkbox  disabled='true' :checked="isKuaidi" :value="check.kuaidi" /><text class="text">快递配送</text>
+						<checkbox-group name="" @change="checkboxChange">
+							<checkbox disabled='true' :checked="isZiti" :value="check.ziti" /><text
+								class="text ziti">到店自提(加入供应链)</text>
+							<checkbox disabled='true' :checked="isKuaidi" :value="check.kuaidi" /><text
+								class="text">快递配送</text>
 						</checkbox-group>
 					</view>
 				</view>
@@ -110,10 +112,12 @@
 				<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>店铺营业时间:</view>
 				<view class="bus_time flex_a_c">
 					<view class="select" @click="beginTimeShow = true">
-						{{ mer_take_time[0] ? mer_take_time[0] : '选择开始时间' }}</view>
+						{{ mer_take_time[0] ? mer_take_time[0] : '选择开始时间' }}
+					</view>
 					至
 					<view class="select" @click="overTimeShow = true">
-						{{ mer_take_time[1] ? mer_take_time[1] : '选择结束时间' }}</view>
+						{{ mer_take_time[1] ? mer_take_time[1] : '选择结束时间' }}
+					</view>
 				</view>
 			</block>
 		</view>
@@ -134,8 +138,8 @@
 				<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>客服电话：</view>
 				<input class="com_input" type="number" v-model="servicePhone" placeholder="输入客服电话">
 			</view>
-			
-		<!-- 	<view class="item_cell flex_a_c" v-if="type_code!='TypeFamousSpecialties'||type_code!='TypeLocalCuisine'||type_code!='TypeFeaturedCultural'" >
+
+	<!-- 			<view class="item_cell flex_a_c" v-if="type_code!='TypeFamousSpecialties'||type_code!='TypeLocalCuisine'||type_code!='TypeFeaturedCultural'" >
 				<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao" v-if="credit_buy"></i>开启先货后款：</view>
 				<u-switch v-model="credit_buy" @change="change"></u-switch>
 			</view>
@@ -221,7 +225,7 @@
 				},
 				isZiti: false,
 				isKuaidi: false,
-				delivery_way: [1,2],
+				delivery_way: [1, 2],
 				takeName: '',
 				takePhone: '',
 				servicePhone: '',
@@ -271,16 +275,16 @@
 				credit_buy: false, //开启信用购
 				interest_rate: '', //利率
 				settle_cycle: '', //周期
-				mer_name:'',
-				type_code:''
+				mer_name: '',
+				type_code: ''
 			}
 		},
 		onLoad(e) {
 			this.id = e.mer_id
 			this.getMerchantInfo(e.mer_id)
-			
-		    this.isZiti = true
-		    this.isKuaidi = true
+
+			this.isZiti = true
+			this.isKuaidi = true
 		},
 		onShow() {},
 		methods: {
@@ -288,7 +292,7 @@
 				merchantInfoAPI({
 					id
 				}).then(res => {
-					this.mer_name= res.data.mer_name
+					this.mer_name = res.data.mer_name
 					this.images[0].img = res.data.mer_banner
 					this.images[1].img = res.data.mer_avatar
 					this.images[2].img = res.data.mini_banner
@@ -305,11 +309,11 @@
 					res.data.mer_take_day.forEach((item, i) => {
 						this.dateWeek[Number(item) - 1].isCheck = true
 					})
-					this.type_code= res.data.type_code
+					this.type_code = res.data.type_code
 					this.mer_take_time = res.data.mer_take_time
 					this.intro = res.data.mer_info
 					this.cruxText = res.data.mer_keyword
-					
+
 					this.servicePhone = res.data.service_phone
 					this.mer_address = res.data.mer_address
 					this.merState = res.data.mer_state === 1 ? true : false
@@ -374,7 +378,7 @@
 					mer_avatar: this.images[1].img,
 					mini_banner: this.images[2].img,
 					mer_certificate: this.images[3].img,
-					delivery_way: [1,2],
+					delivery_way: [1, 2],
 					mer_take_name: this.takeName,
 					mer_take_phone: this.takePhone,
 					mer_take_address: this.detailSite,
@@ -408,9 +412,9 @@
 						// 	url:'/pages/moreProject/moreProject'
 						// })
 						uni.redirectTo({
-							url:'/pages/moreProject/moreProject'
+							url: '/pages/moreProject/moreProject'
 						})
-						
+
 					}, 1000)
 				}).catch(err => {
 					Toast(err)
@@ -443,7 +447,7 @@
 				// 	sizeType: ['original', 'compressed'],
 				// 	sourceType: ['album', 'camera'],
 				// 	success: function(res) {
-					
+
 				// 		uni.showLoading({
 				// 			title: '上传中...'
 				// 		})
@@ -461,7 +465,7 @@
 				// 		Toast('添加失败')
 				// 	}
 				// });
-				
+
 			},
 			delImg(i) {
 				let that = this
diff --git a/pages/product/components/inputGoodsDetils.vue b/pages/product/components/inputGoodsDetils.vue
index 5f5368f..c43097a 100644
--- a/pages/product/components/inputGoodsDetils.vue
+++ b/pages/product/components/inputGoodsDetils.vue
@@ -1,7 +1,7 @@
 <template>
   <view class="input_content">
     <view class="input_content_textarea">
-      <textarea v-model="prodectContent.store_name" placeholder="请输入简介" placeholder-class="placeholderStyle"
+      <textarea v-model="prodectContent.store_name" placeholder="请输入商品详情" placeholder-class="placeholderStyle"
         :maxlength="maxLength" />
       <view><text v-if="prodectContent.store_name">{{prodectContent.store_name.length}}</text><text
           v-else>0</text>/{{maxLength}}</view>
@@ -31,7 +31,8 @@
           <text v-else>0</text>/200
         </view>
       </view>
-      <view class="input_content_describe_textarea"><textarea v-model="prodectContent.store_info" value=""
+      <view class="input_content_describe_textarea">
+        <textarea v-model="prodectContent.store_info" value=""
           placeholder="请填写商品简介" placeholderClass="placeholderClass" maxlength="200" /></view>
     </view>
 
@@ -40,7 +41,7 @@
       <view class="input_content_keyword_value"><input v-model="prodectContent.keyword" type="text" value=""
           placeholder="填写关键字" /></view>
     </view>
-    <avatar @upload="doUpload" @getName="getImgName" quality="1" ref="avatar" selWidth="250upx" selHeight="250upx">
+    <avatar style="height: 1px;" @upload="doUpload" @getName="getImgName" quality="1" ref="avatar" selWidth="250upx" selHeight="250upx">
     </avatar>
   </view>
 </template>
@@ -90,7 +91,7 @@
       prodectContent: {
         handler(val) {
 			// console.log(val.store_name);
-			this.upstore=val.store_name
+          this.upstore=val.store_name
           this.$emit('getProductContent', val);
 		  
         },
@@ -110,7 +111,7 @@
       }
     },
     mounted() {
-
+      // console.log(this.$props.prodectContent);
     },
     methods: {
       handleChooseImage() {
@@ -142,10 +143,11 @@
             [TOKENNAME]: 'Bearer ' + store.state.app.token
           },
           success: (uploadFileRes) => {
-            // console.log(uploadFileRes.data);
+            // console.log(JSON.parse(uploadFileRes.data));
             let imgData = JSON.parse(uploadFileRes.data)
             // that.prodectContent.imageList.push(imgData.data.path)
-            that.prodectContent = { imageList: [...that.prodectContent.imageList, imgData.data.path] ,store_name:this.upstore}
+            if(!that.prodectContent.imageList)that.prodectContent.imageList=[];
+            that.prodectContent = { imageList: [...that.prodectContent.imageList, imgData.data.path] ,store_name:this.upstore};
           },
           complete(res) {
             // console.log(res)
diff --git a/pages/product/goodsOnSale/index.vue b/pages/product/goodsOnSale/index.vue
index 2004e71..c2f98d5 100644
--- a/pages/product/goodsOnSale/index.vue
+++ b/pages/product/goodsOnSale/index.vue
@@ -5,7 +5,7 @@
 				<view class="title_search">
 					<span class="iconfont">&#xe67d;</span>
 					<form @submit="search" report-submit="true">
-						<input type="text" :name="where.keyword" v-model="where.keyword" placeholder="搜索商品" confirm-type='search'/>
+						<input type="text"  v-model="where.keyword" placeholder="搜索商品" confirm-type='search'/>
 					</form>		
 				</view>
 			</view>
diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue
index c837b64..4ca07d8 100644
--- a/pages/product/list/index.vue
+++ b/pages/product/list/index.vue
@@ -47,7 +47,7 @@
 							<swiper-item :class="{ active: 1 == swiperCur }">
 								<view class="slide-navigator">
 									<!-- 隐藏暂时不需要 -->
-								<!-- 	<navigator class="item"
+									<!-- <navigator class="item"
 										:url="`/pages/product/addGoods/freightTemplate?mer_id=${mer_id}`"
 										hover-class='none'>
 										<image mode='widthFix' class="image" src="../static/images/product_freight.png">
@@ -490,7 +490,6 @@
 						that.loading = false;
 						that.loaded = res.data.list.length < that.where.limit;
 						that.productList.push.apply(that.productList, res.data.list);
-
 						that.where.page = that.where.page + 1;
 
 					},
@@ -556,6 +555,7 @@
 									title: '下架成功',
 									icon: 'none'
 								})
+								that.getList(this.mer_id,false)
 							} else if (res.cancel) {
 								// console.log('用户点击取消');
 							}
@@ -576,6 +576,7 @@
 						icon: 'success'
 					}, () => {
 						that.$set(item, 'is_show', item.is_show == 0 ? 1 : 0);
+						that.getList(this.mer_id,false)
 					});
 				}).catch(err => {
 					return that.$util.Tips({
diff --git a/pages/room/histroyroom.nvue b/pages/room/histroyroom.nvue
new file mode 100644
index 0000000..5bb7588
--- /dev/null
+++ b/pages/room/histroyroom.nvue
@@ -0,0 +1,104 @@
+<template>
+	<view class="container">
+		<view :style="'width: '+ windowWidth +'px; height: '+ boxStyle.height +'px;z-inde:-1;'">
+			<!-- 
+			 1.这里的 swiper 不是用来控制视频滑动的，而是用来控制左右滑动的，如果不需要的可以改成 view
+			 2.为了 视频无限加载，已经把 21 行的 appear 去掉了，加上了 loadmore 方法（第10行）
+			 3.由于方法比较多，可以采取下面的方式查看代码：
+			 （1）Mac：按住 option 键，然后点击方法名，即可跳转到方法
+			 （2）windows：按住 Alt 键，然后鼠标左击，即可跳转到方法
+			 -->
+			<view class="root">
+				<video ref="videoPlayer" :src="currentSrc" controls @ended="playNext" :object-fit="object_fit" :style="'width: '+ windowWidth +'px; height: '+ boxStyle.height +'px;z-inde:-1;'"></video>
+			</view>
+			<sd-float-page :room='room' :msgList='msgList'
+				:style="'width: '+ windowWidth +'px; height: '+ boxStyle.height +'px;position: absolute;' "></sd-float-page>
+		</view>
+
+
+
+
+	</view>
+</template>
+<script>
+	import sdFloatPage from '@/components/sd-live-page/histroy.nvue';
+
+	import {
+		playbackDetail
+	} from '@/api/live.js'
+	export default {
+		components: {
+			sdFloatPage
+		},
+		data() {
+			return {
+				rtmpSources: [],
+				currentIndex: 0,
+				room: {},
+				wHeight: 0, //获取的屏幕高度🌟💗
+				boxStyle: { //视频，图片封面样式🌟💗
+					'height': 0,
+					'width': 0,
+				},
+				object_fit: 'cover', //视频样式默认包含🌟💗
+			}
+		},
+
+		computed: {
+			currentSrc() {
+				return this.rtmpSources[this.currentIndex];
+			}
+		},
+		onLoad(options) {
+			this.room = JSON.parse(decodeURIComponent(options.data));
+			this.platform = uni.getSystemInfoSync().platform
+			this.windowWidth = uni.getSystemInfoSync().screenWidth //获取屏幕宽度
+			this.boxStyle.width = this.windowWidth + 'px' //给宽度加px
+			this.wHeight = uni.getSystemInfoSync().screenHeight; //获取屏幕高度
+			this.boxStyle.height = this.wHeight; //改变视频高度
+			this.get()
+	
+		},
+		mounted() {
+		
+			// 初始化时播放第一个源
+			this.playCurrent();
+		},
+
+		methods: {
+			playCurrent() {
+				this.$refs.videoPlayer.load();
+				this.$refs.videoPlayer.play();
+			},
+			playNext() {
+				this.currentIndex++;
+				if (this.currentIndex >= this.rtmpSources.length) {
+					this.currentIndex = 0; // 回到第一个源
+				}
+				this.playCurrent();
+			},
+
+
+			get() {
+				let that = this
+				// console.log(this.room)
+				playbackDetail({
+					app_name: 'shop',
+					live_stream_id: this.room.live_stream_id
+				}).then((res) => {
+					console.log(res.data, '1111')
+
+					this.rtmpSources = res.data.playback_url;
+
+
+				})
+
+			},
+
+		},
+
+	}
+</script>
+<style lang="scss" scoped>
+
+</style>
\ No newline at end of file
diff --git a/pages/room/index.vue b/pages/room/index.vue
new file mode 100644
index 0000000..5b1aae5
--- /dev/null
+++ b/pages/room/index.vue
@@ -0,0 +1,508 @@
+<template>
+	<view class="view_body">
+		<view>
+			<view class="search_content flex_a_c_j_sb">
+				<view class="flex_a_c">
+					<view class="iconfont icon-sousuo" style="font-size: 39rpx;"></view>
+					<input type="text" v-model="keyword" placeholder="搜索主播或关键字" placeholder-style="font-size: 30rpx;"
+						@input="change">
+				</view>
+				<button class="search_btn" @click="search">搜索</button>
+			</view>
+
+			<view class="banner">
+				<view class="banner-detail" v-for="(item,i) in list" :key='i' @click="zhisort(i)">
+					<view class="banner-name">
+						{{item.name}}
+					</view>
+					<view class="banner-t" v-if="isindex==i">
+
+					</view>
+				</view>
+			</view>
+
+			<scroll-view scroll-top="0" scroll-y="true" class="goods_body_scroll" v-if="isindex==0">
+				<view class="roomsbox">
+					<view class="roomblock" v-for="(room,index) in roomList" :key="index" @click="jump(room)"
+						style="border: 1px solid #e1d9d4;">
+						<image :src="room.cover" mode="aspectFill" v-if="room.cover"></image>
+						<image src="/static/lw/6.gif" mode="aspectFill" v-else></image>
+						<view class="livetitle">{{room.live_name}}</view>
+						<view class="roomstatus-d" v-if="room.status==1" style="background-color: #09BB07;">
+						</view>
+						<view class="roomstatus-d" v-else style="background-color:  #fa2306;">
+						</view>
+			
+						<view class="roomstatus" style="color: #00B26A;" v-if="room.status==1">直播中
+						</view>
+						<view class="roomstatus" style="color: #fa2306;" v-else>已停播
+						</view>
+			
+					</view>
+				</view>
+			
+			</scroll-view>
+			<scroll-view scroll-top="0" scroll-y="true" class="goods_body_scroll" v-if="isindex==1">
+				<view v-for="(pp,index) in dataList" :key="index">
+						<view class="roomsbox-a">
+							<view class="roomsbox-title">
+								{{pp.date}}
+							</view>
+							<view class="roomsbox">
+								<view class="roomblock" style="border: 1px solid #e1d9d4;" v-for="(room,j) in pp.records"
+									:key="j" @click="hsitroyjump(room)">
+									<image :src="room.cover" mode="aspectFill" v-if="room.cover"></image>
+									<image src="/static/lw/6.gif" mode="aspectFill" v-else></image>
+									<view class="livetitle">{{room.live_name}}</view>
+									<view class="roomstatus-d" v-if="room.status==1" style="background-color: #09BB07;">
+									</view>
+									<view class="roomstatus-d" v-else style="background-color:  #fa2306;">
+									</view>
+									<view class="roomstatus-d" v-if="room.status==3" style="background-color: #e1d9d4;">
+									</view>
+									<view class="roomstatus" style="color: #00B26A;" v-if="room.status==1">直播中
+									</view>
+									<view class="roomstatus" style="color: #fa2306;" v-else>已停播
+									</view>
+				
+								</view>
+							</view>
+						</view>
+				
+					</view>
+				
+				</scroll-view>
+				<view class="noshuju" v-if="roomList.length==0&&isindex==0">
+					<emptyPage title="暂无房间信息"></emptyPage>
+				</view>
+				<view class="noshuju" v-if="dataList.length==0&&isindex==1">
+					<emptyPage title="暂无房间信息"></emptyPage>
+				</view>
+		</view>
+
+
+	</view>
+</template>
+
+<script>
+	import emptyPage from '@/components/emptyPage.vue';
+	import {
+		live,
+		playbackList
+	} from '@/api/live.js'
+
+
+	export default {
+		components: {
+			emptyPage
+		},
+		data() {
+			return {
+				keyword: '',
+				device_height: 380,
+				page: 1,
+				dataindex: 1,
+				page_data: true,
+				list: [{
+						name: '直播精选'
+					},
+					{
+						name: '历史直播'
+					},
+
+				],
+				roomList: [],
+				dataList:[],
+				user: [],
+				index: 0,
+				isGetLoginInfo: true,
+				isindex: 0,
+
+			};
+		},
+		onLoad() {
+
+
+		},
+		mounted() {
+			this.getRoomList()
+			this.getbackList()
+		},
+		onShow() {},
+		onReachBottom() {
+			this.getRoomList()
+		},
+
+		onPullDownRefresh: function() {
+			console.log('下拉刷新')
+			this.getRoomList()
+			this.getbackList()
+		},
+		methods: {
+
+			//输入
+			change(e) {
+				// console.log(e)
+				if (e.detail.value.length <= 0) {
+					this.page = 1
+					this.getRoomList()
+				}
+			},
+			//查询
+			search() {
+				this.page = 1
+				this.roomList=[]
+				this.dataList=[]
+				if (this.isindex == 0) {
+					this.getRoomList()
+				} else {
+					this.getbackList()
+				}
+			},
+			//分类
+			zhisort(i) {
+				this.isindex = i
+				this.page = 1
+				this.keyword=''
+				this.roomList=[]
+				this.dataList=[]
+				if (i == 0) {
+					this.getRoomList()
+				} else {
+					this.getbackList()
+				}
+			},
+			getbackList: function() {
+				playbackList({
+					page_size: 100,
+					page: this.page,
+					app_name: 'shop',
+				   keyword: this.keyword
+				}).then(res => {
+				
+				if (res.data.lists.length > 0) {
+				
+					// 初始化一个空数组来存储结果
+					let result = [];
+				
+					// 遍历每一条直播记录
+					for (let i = 0; i < res.data.lists.length; i++) {
+						let record = res.data.lists[i];
+						let date = record.date;
+				
+						// 检查结果数组中是否已存在该日期的分组
+						let group = result.find((item) => item.date === date);
+				
+						// 如果不存在，则创建一个新的分组
+						if (!group) {
+							group = {
+								date: date,
+								records: []
+							};
+							result.push(group);
+						}
+				
+						// 将当前记录添加到对应的分组中
+						group.records.push(record);
+					}
+				
+					this.dataList = result
+					
+					// 输出结果
+				
+				}
+				})
+			},
+			/**
+			 * 拉取房间列表
+			 * @return {[type]}            
+			 * [description]
+			 */
+			getRoomList() {
+				live({
+					page_size: 10,
+					page: this.page,
+					app_name: 'shop',
+					keyword: this.keyword
+				}).then(res => {
+				
+					if (res.data.code = 1) {
+						uni.hideLoading()
+						if (res.data.lists.length > 0) {
+							let list = res.data.lists;
+							let productList = this.$util.SplitArray(list, this.roomList);
+							setTimeout(() => {
+								this.$set(this, 'roomList', productList);
+							}, 500)
+							this.page = this.page + 1
+						}
+			
+					}else{
+						uni.showModal({
+							title:res.msg
+						})
+					}
+				})
+			},
+			//历史直播间
+			hsitroyjump: function(e) {
+				
+				uni.navigateTo({
+					url: '/pages/room/histroyroom'+'?data=' + encodeURIComponent(JSON.stringify(e))
+				})
+			
+			
+			},
+			
+			jump: function(e) {
+				uni.navigateTo({
+					url: '/pages/room/spectator' + '?data=' + encodeURIComponent(JSON.stringify(e))
+				});
+
+			},
+
+		}
+	}
+</script>
+<style lang="scss">
+	page {
+		background-color: #FFFFFF;
+	}
+
+	.goods_body_scroll {
+		margin-top: 50rpx;
+	}
+
+	.search_content {
+		margin: 0 auto;
+		width: 724rpx;
+		height: 64rpx;
+		padding: 2px 2px 2px 21.05rpx;
+		border-radius: 175rpx;
+		background: #fff;
+		margin-bottom: 21rpx;
+		position: relative;
+		box-sizing: border-box;
+		border: 2rpx solid #FCB9AD;
+		margin-top: 30rpx;
+
+		.icon-sousuo {
+			font-size: 26.32rpx;
+			font-weight: bold;
+			color: #c8c7c6;
+			margin-right: 17.54rpx;
+		}
+
+		.search_btn {
+			color: #fff;
+			width: 105.26rpx;
+			height: 56rpx;
+			line-height: 56rpx;
+			background: #f84221;
+			border-radius: 100px;
+			font-size: 28.07rpx;
+		}
+	}
+
+	.banner {
+		display: flex;
+		padding-left: 28rpx;
+
+	}
+
+	.banner-detail {
+		width: 133rpx;
+		margin-right: 30rpx;
+	}
+
+	.banner-name {
+		font-size: 33rpx;
+		font-family: PingFang SC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #333333;
+		margin-bottom: 10rpx;
+	}
+
+	.banner-t {
+		width: 46px;
+		height: 0rpx;
+		opacity: 1;
+		border: 2rpx solid #F84221;
+		margin: 0 auto;
+	}
+
+	.noshuju {
+		height: 760upx;
+	}
+
+	.mico-18 {
+		margin-top: 10upx;
+		color: #666666;
+	}
+
+	.view_body {
+		width: 100%;
+		height: 100%;
+		background-color: #FFFFFF;
+	}
+
+	.roomsbox-title {
+		font-size: 30rpx;
+		font-family: PingFang SC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #333333;
+
+		margin-bottom: 30rpx;
+		margin-left: 20rpx;
+	}
+	.roomstatus-d {
+		width: 20upx;
+		height: 20upx;
+		border-radius: 20upx;
+		position: absolute;
+		left: 20upx;
+		top: 20upx;
+	}
+
+	.roomstatus {
+		position: absolute;
+		left: 40upx;
+		top: 10upx;
+		font-size: 28upx;
+	}
+
+	.livetitle {
+		position: absolute;
+		bottom: 20upx;
+		width: 100%;
+		text-align: center;
+		height: 70upx;
+		line-height: 70upx;
+		color: #FFFFFF;
+	}
+
+	.top {
+		display: flex;
+		padding: 20upx;
+		top: 0;
+		position: fixed;
+		left: 0;
+		width: 95%;
+		background-color: #FFFFFF;
+		z-index: 9999;
+	}
+
+	.top_li {
+		font-size: 32upx;
+		padding: 0 20upx;
+		display: table-cell;
+		/* vertical-align:bottom; */
+		padding-top: 10upx;
+		color: #666666;
+	}
+
+	.top-lable-box {
+		/* #ifdef APP-PLUS */
+		/* flex: 1; */
+
+		/* #endif */
+		width: 80%;
+	}
+
+	.active {
+		font-size: 40upx;
+		font-weight: 800;
+		color: #333333;
+		padding-top: 0;
+	}
+
+	image {
+		width: 100%;
+	}
+
+	.roomsbox {
+		display: flex;
+		flex-wrap: wrap;
+	}
+
+	.roomblock {
+		width: 45%;
+		height: 300upx;
+		border-radius: 10upx;
+		overflow: hidden;
+		margin-bottom: 20upx;
+		position: relative;
+		margin-left: 2.5%;
+		background-color: #fff;
+	}
+
+	.right_top_scroll {
+		white-space: nowrap;
+		overflow: hidden;
+		width: 100%;
+	}
+
+	::-webkit-scrollbar {
+		width: 0;
+		height: 0;
+		color: transparent;
+	}
+
+	.scroll-view {
+		display: inline-block;
+		margin-right: 30rpx;
+		text-align: center;
+		font-size: 32rpx;
+		height: 60rpx;
+		line-height: 60rpx;
+		box-sizing: border-box;
+		padding: 0 10rpx;
+
+	}
+
+	.view_body {
+		background: #FFFFFF;
+		width: 100%;
+		overflow: hidden;
+	}
+
+	.mico-14 {
+		margin-right: 4upx;
+	}
+
+	.noshuju {
+		height: 750upx;
+	}
+
+	.noshuju_ico {
+		width: 120upx;
+		height: 80upx;
+		margin: 0 auto;
+		margin-top: 300rpx;
+
+	}
+
+	.noshuju_ico image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.mico-18 {
+		margin-top: 10upx;
+		color: #666666;
+	}
+
+	.create-but {
+		background-color: #1ce0c5;
+		width: 120upx;
+		height: 60upx;
+		line-height: 60upx;
+		color: #FFFFFF;
+		text-align: center;
+		border-radius: 10upx;
+		/* #ifdef MP-WEIXIN */
+		margin-left: 40upx;
+		/* #endif */
+		margin-top: 4upx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/room/spectator.nvue b/pages/room/spectator.nvue
new file mode 100644
index 0000000..01cc644
--- /dev/null
+++ b/pages/room/spectator.nvue
@@ -0,0 +1,358 @@
+<template>
+	<view class="container">
+		<view :style="'width: '+ windowWidth +'px; height: '+ boxStyle.height +'px;z-inde:-1;'">
+			<!-- 
+			 1.这里的 swiper 不是用来控制视频滑动的，而是用来控制左右滑动的，如果不需要的可以改成 view
+			 2.为了 视频无限加载，已经把 21 行的 appear 去掉了，加上了 loadmore 方法（第10行）
+			 3.由于方法比较多，可以采取下面的方式查看代码：
+			 （1）Mac：按住 option 键，然后点击方法名，即可跳转到方法
+			 （2）windows：按住 Alt 键，然后鼠标左击，即可跳转到方法
+			 -->
+			<list @loadmore="getData" @scroll="scrolls" :loadmoreoffset="wHeight*1" :show-scrollbar="false"
+				ref="listBox" :pagingEnabled="true" :scrollable="true">
+				<!-- 循环数据 -->
+				<cell v-for="(item,i) in dataList" :key="i">
+					<!-- 用div把视频模组套起来 -->
+					<div :style="'width: '+ windowWidth +'px; height: '+ boxStyle.height +'px;'">
+						<!-- <view v-if="Math.abs(k-i)<=1"> -->
+						<view v-if="Math.abs(k-i)<=1">
+							<view class="root">
+								<video :ref="'item'+i" :id="item.id" :loop="true" :autoplay="i == k"
+									:src="item.pull_url" :muted="item.isplay" :enable-progress-gesture="false"
+									:page-gesture="false" :controls="false" :show-loading="true" :is-live='true'
+									@error='vedioerr' :show-fullscreen-btn="false" :show-center-play-btn="false"
+									:style="boxStyle" :object-fit="object_fit" @timeupdate="timeupdate($event,i)">
+
+								</video>
+								<!-- {{item}} {{i}} -->
+
+							</view>
+							<sd-float-page :room='room' :msgList='msgList' :heightG='boxStyle.height'
+								:style="'width: '+ windowWidth +'px; height: '+ boxStyle.height +'px;position: absolute;' "></sd-float-page>
+						</view>
+
+					</div>
+				</cell>
+			</list>
+		</view>
+
+
+	</view>
+</template>
+<script>
+	import list from '@/uni_modules/uview-ui/libs/config/props/list';
+	import sdFloatPage from '@/components/sd-live-page/livepage.nvue';
+	import {
+		VUE_APP_WS_URL
+	} from '@/config/app';
+
+	export default {
+		components: {
+			sdFloatPage
+		},
+		data() {
+			return {
+				imgHost: '',
+				//下面打🌟号的是必须要的基础字段
+				//下面打💗号的是拥有滑动条的必须字段
+				dataList: [
+					'rtmp://live.lihaink.cn/ceshi/ceshi?auth_key=1697453509-0-0-c086ad0c4d8c581e26438a7a99a9f40f',
+					'rtmp://live.lihaink.cn/ceshi/ceshi?auth_key=1697453509-0-0-c086ad0c4d8c581e26438a7a99a9f40f'
+				], //用于数据循环的列表🌟💗
+				wHeight: 0, //获取的屏幕高度🌟💗
+				boxStyle: { //视频，图片封面样式🌟💗
+					'height': 0,
+					'width': 0,
+				},
+				k: 0, //默认为0🌟💗
+				max: 2,
+				playIngIds: [], //正在播放的视频id列队，列队用于处理滑动过快导致的跳频问题🌟💗
+				ready: false, //可忽略
+				isDragging: false, //false代表停止滑动🌟💗
+				refreshing: true, //用于下拉刷新🌟💗
+				windowWidth: 0, //获取屏幕宽度🌟💗
+				windowHeight: 0,
+				dex: [0, 0], //用于判断是上滑还是下滑，第一个存旧值，第二个存新值【目前在1.0.7已经废弃】
+				currents: 0, //用于左右滑动，0代表视频界面，1代表右滑界面🌟💗
+				platform: '', //用于获取操作系统：ios、android🌟💗
+				playIng: false, //用于视频初始化时是否播放，默认不播放🌟💗
+				videoTime: '', //视频总时长，这个主要用来截取时间数值💗
+				videoTimes: '', //视频时长，用这个来获取时间值，例如：00:30这个时间值💗
+				changeTime: '', //显示滑动进度条时变化的时间💗
+				isShowimage: false, //是否显示封面【1.0.4已废弃，但是意思需要记住】
+				currenttimes: 0, //当前时间💗
+				isShowProgressBarTime: false, //是否拖动进度条，如果拖动（true）则显示进度条时间，否则不显示（false）【1.0.4已废弃，但是意思需要记住】
+				ProgressBarOpacity: 0.7, //进度条不拖动时的默认值，就是透明的💗
+				dotWidth: 0, //播放的小圆点，默认没有💗
+				deleteHeight: 0, //测试高度🌟💗
+				percent: 0, //百分小数💗
+				currentPosition: 0, //滑块当前位置💗//2.0已弃用，现已用于后端参数
+				currentPositions: 0, //滑块当前位置的副本💗//2.0已弃用，现已用于后端参数
+				newTime: 0, //跟手滑动后的最新时间💗
+				timeNumber: 0, //🌟💗
+				ProgressBarBottom: 20, //进度条离底部的距离💗
+				object_fit: 'cover', //视频样式默认包含🌟💗
+				mode: 'aspectFit', //图片封面样式🌟💗
+				timeout: "", //🌟用来阻止 setTimeout()方法
+				voice: "", //🌟用来阻止 setTimeout()方法
+				oldVideo: "",
+				isAutoplay: false, //是否开启自动播放(默认不开启)
+				autoplayText: "开启自动播放",
+				msgList: [],
+				room: {},
+				socketTask: null,
+				userName: '',
+
+
+			}
+		},
+
+		watch: {
+			async k(new_k, old_k) { //监听 k 值的变化，可以控制视频的播放与暂停
+				const max = new_k + 2;
+				if (this.max < max) {
+					this.max = max;
+				}
+				// if (this.oldCurrent != this.currentNav) {
+				// 	this.oldCurrent = this.currentNav
+				// 	return false
+				// }
+				this.dataList[old_k].playIng = false //如果视频暂停，就加载封面
+				this.dataList[old_k].isplay = true
+				this.dataList[old_k].state = 'pause'
+				// console.log('预留第' + (old_k) + '个视频：' + this.dataList[old_k].community_id)
+				// 2.0版本已经去掉了下面这一句，视频不用暂停，只需要把声音禁止就行
+				uni.createVideoContext(this.dataList[old_k].community_id, this)
+					.pause() //如果视频暂停，那么旧视频停止，这里的this.dataList[old_k].id + '' + old_k，后面加 old_k 是为了每一个视频的 id 值不同，这样就可以大程度的避免串音问题
+				// console.log('已经暂停 --> 第' + (old_k) + '个视频～') //提示
+				this.dataList[new_k].state = 'play'
+				this.dataList[new_k].isplay = false
+				this.dataList[new_k].playIng = true
+				uni.createVideoContext(this.dataList[new_k].community_id, this).play()
+			}
+		},
+		onShow() {
+			uni.hideLoading();
+			// console.log('回到前台' + this.dataList.length);
+			if (this.dataList.length !== 0) {
+				this.dataList[this.k].state = 'play';
+				setTimeout(() => {
+					uni.createVideoContext(this.dataList[this.k].id, this).play()
+				}, 250)
+			}
+		},
+		onHide() {
+			this.dataList[this.k].state = 'pause'; //界面隐藏也要停止播放视频
+			setTimeout(() => {
+				uni.createVideoContext(this.dataList[this.k].community_id, this).pause(); //暂停以后继续播放
+			}, 250)
+			// console.log('到后台');
+		},
+		onLoad(options) {
+			this.platform = uni.getSystemInfoSync().platform
+			this.windowWidth = uni.getSystemInfoSync().screenWidth //获取屏幕宽度
+			this.boxStyle.width = this.windowWidth + 'px' //给宽度加px
+			this.wHeight = uni.getSystemInfoSync().screenHeight; //获取屏幕高度
+			this.boxStyle.height = this.wHeight; //改变视频高度
+			console.log(this.boxStyle.height)
+			this.room = JSON.parse(decodeURIComponent(options.data));
+			this.get()
+
+		},
+		mounted() {
+
+		},
+		Ready() {},
+		methods: {
+
+
+
+			autoPlay() {
+				this.isAutoplay = !this.isAutoplay;
+				if (!this.isAutoplay) {
+					this.autoplayText = "开启自动播放"
+					uni.showToast({
+						title: "关闭自动播放",
+						icon: 'none',
+						duration: 3000
+					})
+				} else {
+					this.autoplayText = "关闭自动播放"
+					uni.showToast({
+						title: "开启自动播放",
+						icon: 'none',
+						duration: 3000
+					})
+				}
+			},
+			getData() {
+				// 这里就是数据加载完以后再向后端发送数据的地方,
+
+
+			},
+			vedioerr(e) {
+				let timer = null
+				if (e.tye = 'error') {
+					timer = setInterval((res) => {
+						uni.createVideoContext('myVideo', this).play()
+						console.log('重新连接', '1111111111')
+					}, 600000)
+				} else {
+					timer = null
+				}
+
+			},
+
+			touchstart(event) {
+				this.dataList[this.k].isShowimage = true //刚触摸的时候就要显示预览视频图片了
+				this.dataList[this.k].isShowProgressBarTime = true //显示时间线
+				this.ProgressBarOpacity = 1 //让滑块显示起来更明显一点
+				this.dotWidth = 10 //让点显示起来更明显一点
+			},
+			touchend() { //当手松开后，跳到最新时间
+				uni.createVideoContext(this.dataList[this.k].community_id, this).seek(this.newTime)
+				if (this.dataList[this.k].state == 'pause') {
+					this.dataList[this.k].state = 'play'
+					uni.createVideoContext(this.dataList[this.k].community_id, this).play()
+				}
+				this.dataList[this.k].isShowProgressBarTime = false //触摸结束后，隐藏时间线
+				this.dataList[this.k].isShowimage = false //触摸结束后，隐藏时间预览
+				this.ProgressBarOpacity = 0.5 //隐藏起来进度条，不那么明显了
+				this.dotWidth = 0 //隐藏起来进度条，不那么明显了
+			},
+			touchmove(event) { //当手移动滑块时，计算位置、百分小数、新的时间
+				var msg = []
+				if (this.videoTime !== '') {
+					msg = this.videoTime.split(':')
+				}
+				var timeNumber = Number(msg[0]) * 60 + Number(msg[1])
+				this.currentPositions = event.changedTouches[0].screenX
+				this.percent = this.currentPositions / this.windowWidth
+				this.newTime = this.percent * timeNumber
+				this.currenttimes = parseInt(this.newTime)
+				let theTime = this.newTime
+				let middle = 0; // 分
+				if (theTime > 60) {
+					middle = parseInt(theTime / 60);
+					theTime = parseInt(theTime % 60);
+				}
+				this.changeTime =
+					`${Math.round(middle)>9?Math.round(middle):'0'+Math.round(middle)}:${Math.round(theTime)>9?Math.round(theTime):'0'+Math.round(theTime)}`
+			},
+			timeupdate(event, index) { //计算滑块当前位置，计算当前百分小数
+				if (index == this.k) {
+					var currenttime = event.detail.currentTime
+					this.timeNumber = Math.round(event.detail.duration)
+					this.getTime()
+					this.percent = currenttime / this.timeNumber
+					this.currentPosition = this.windowWidth * this.percent
+					let theTime = currenttime
+					let middle = 0; // 分
+					if (theTime > 60) {
+						middle = parseInt(theTime / 60);
+						theTime = parseInt(theTime % 60);
+					}
+					this.changeTime =
+						`${Math.round(middle)>9?Math.round(middle):'0'+Math.round(middle)}:${Math.round(theTime)>9?Math.round(theTime):'0'+Math.round(theTime)}`
+					//自动切换视频
+					if (this.isAutoplay) { //true,代表自动播放
+						if (Math.round(currenttime) == this.timeNumber - 1) {
+							const dom = uni.requireNativePlugin('dom')
+							let doms = 'item' + (this.k + 1)
+							setTimeout(() => {
+								let el = this.$refs[doms][0]
+								dom.scrollToElement(el, {
+									offset: 0,
+									animated: true
+								})
+							}, 500)
+						}
+					}
+				}
+			},
+			getTime() { //得到时间函数
+				this.videoTime = this.formatSeconds(this.timeNumber);
+				var msg = []
+				if (this.videoTime !== '') {
+					msg = this.videoTime.split(':')
+				}
+				this.videoTimes = `${msg[0]>9?msg[0]:'0'+msg[0]}:${msg[1]>9?msg[1]:'0'+msg[1]}`;
+			},
+			formatSeconds(value) { //获取时间函数
+				let theTime = parseInt(value); // 秒
+				let middle = 0; // 分
+				if (theTime > 60) {
+					middle = parseInt(theTime / 60);
+					theTime = parseInt(theTime % 60);
+				}
+				return `${middle>9?middle:middle}:${theTime>9?theTime:theTime}`;
+			},
+			moreVideo(index) {
+
+			},
+			toVideo(index) {
+
+			},
+			scrolls(event) {
+
+				this.showManage = false;
+				this.isDragging = event.isDragging;
+				if (!event.isDragging) { //isDragging：判断用户是不是在滑动，滑动：true，停止滑动：false。我们要用户停止滑动时才给 k 赋值，这样就可以避免很多麻烦
+					var i = Math.round(Math.abs(event.contentOffset.y) / (this.wHeight - this.deleteHeight +
+						1)) //先用绝对值取出滑动的距离，然后除以屏幕高度，取一个整，就知道你现在滑动到哪一个视频了
+					if (i !== this.k) { //这里加判断是因为这个方法会执行很多次，会造成重复请求，所以这里写一个限制
+						if (uni.getSystemInfoSync().platform == 'ios') {
+							this.k = i //判断了用户没有滑动，确认了用户的确是在看这个视频，然后就赋值啦
+							this.dataList[this.k].state = 'play'
+							// console.log('正在播放 --> 第' + (this.k + 1) + '个视频～')
+						} else {
+							clearTimeout(this.timers);
+							this.timers = setTimeout(() => {
+								this.k = i //判断了用户没有滑动，确认了用户的确是在看这个视频，然后就赋值啦
+								this.dataList[this.k].state = 'play'
+								// console.log('正在播放 --> 第' + (this.k + 1) + '个视频～')
+							}, 80)
+						}
+					}
+				}
+			},
+			get() {
+				let that = this
+				var msg = [this.room];
+				// console.log(this.room)
+				for (let i = 0; i < msg.length; i++) {
+					msg[i]['isMore'] = false
+					msg[i]['playIng'] = false
+					msg[i]['state'] = false
+					msg[i]['isplay'] = false
+					msg[i]['loading'] = false
+					msg[i]['id'] = msg[i]['live_stream_id'].toString()
+				}
+				this.dataList = msg;
+
+				if (this.dataList.length !== 0) {
+
+					this.dataList[this.k].state = 'play';
+					uni.createVideoContext(this.dataList[this.k].id, this).play()
+					this.page = that.page + 1
+				}
+
+			},
+			onpullingdown() {
+				this.refreshing = true
+			},
+			onrefresh() {
+				setTimeout(() => {
+					this.refreshing = false
+				}, 1000)
+			},
+
+		},
+		onReachBottom() {
+			uni.$emit('onReachBottom');
+		},
+	}
+</script>
+<style lang="scss" scoped>
+
+</style>
\ No newline at end of file
diff --git a/pages/short_video/appSwiper/index.nvue b/pages/short_video/appSwiper/index.nvue
index 6a82f59..a4c5c17 100644
--- a/pages/short_video/appSwiper/index.nvue
+++ b/pages/short_video/appSwiper/index.nvue
@@ -226,7 +226,8 @@
 									<text class="count">{{item.relevance.length}}</text>
 								</view>
 							</view>
-							<view v-if="showManage == item.author.uid || showManage " class="manage"  :style="{'margin-top':item.relevance.length>0?'-115rpx':'0px'}">
+							<view v-if="showManage == item.author.uid || showManage " class="manage"
+								:style="{'margin-top':item.relevance.length>0?'-115rpx':'0px'}">
 								<view class="manage-gou"></view>
 								<navigator hover-class="none"
 									:url="'/pages/plantGrass/plant_release/index?id='+item.community_id+'&type=2'"
@@ -304,16 +305,16 @@
 				 deleteAndroidHeight
 				 这两个参数用于控制评论等的高度
 				 -->
-				<douyin-scrollview ref="comments" :deleteIOSHeight="36" :deleteAndroidHeight="15"   :userInfo="userInfo" 
+				<douyin-scrollview ref="comments" :deleteIOSHeight="36" :deleteAndroidHeight="15" :userInfo="userInfo"
 					@closeScrollview="closeScrollview" @successFul="pinlunFun"></douyin-scrollview>
 			</view>
 		</uni-popup>
 		<!-- 他提到的宝贝弹窗 -->
-		<uni-popup type="bottom" ref="pinglunMentioned"  style="background-color: rebeccapurple;">
-		
-		
-				<mentioned ref="mentioned" @close="closePopup" :list="moreList" :uid="authorUid" ></mentioned>
-		
+		<uni-popup type="bottom" ref="pinglunMentioned">
+
+
+			<mentioned ref="mentioned" @close="closePopup" :list="moreList" :uid="authorUid"></mentioned>
+
 		</uni-popup>
 		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
 		<view class="fixed-head">
@@ -361,6 +362,7 @@
 	import {
 		navigateBack
 	} from '../../../libs/uniApi';
+import list from '../../../uni_modules/uview-ui/libs/config/props/list';
 	export default {
 		computed: configMap({
 			statusBarHeight: 0,
@@ -718,6 +720,7 @@
 				// 					});
 				// 				})'
 				// that.isUser ?
+
 				videoList({
 					page: that.page,
 					limit: that.limit,
@@ -896,11 +899,43 @@
 				// if(!this.loadVideo) return
 				this.loadVideo = true
 				// 这个方法主要就是用来第一次进入视频播放时用来处理
-				deoList(this.videoID).then(async (res) => {
+				// deoList(this.videoID).then(async (res) => {
+				// 	this.loadVideo = false
+				// 	this.userUid = res.data.uid
+				// 	this.page = 1;
+				// 	var msg = [res.data];
+				// 	for (let i = 0; i < msg.length; i++) {
+				// 		msg[i]['isMore'] = false
+				// 		msg[i]['playIng'] = false
+				// 		msg[i]['state'] = false
+				// 		msg[i]['isplay'] = false
+				// 		msg[i]['loading'] = false
+				// 		msg[i]['community_id'] = msg[i]['community_id'].toString()
+				// 	}
+				// 	this.dataList = msg;
+
+				// 	if (this.dataList.length !== 0) {
+				// 		this.dataList[this.k].state = 'play';
+				// 		uni.createVideoContext(this.dataList[this.k].community_id, this).play()
+				// 	}
+				// }).catch(err => {
+				// 	return uni.showToast({
+				// 		title: err,
+				// 		icon: 'none',
+				// 		duration: 2000
+				// 	});
+				// })
+
+				videoList({
+					page: this.page,
+					limit: this.limit,
+					id: this.videoID
+				}).then(async (res) => {
+			     	
 					this.loadVideo = false
 					this.userUid = res.data.uid
-					this.page = this.page + 1;
-					var msg = [res.data];
+					
+					var msg =res.data.list;
 					for (let i = 0; i < msg.length; i++) {
 						msg[i]['isMore'] = false
 						msg[i]['playIng'] = false
@@ -914,6 +949,7 @@
 					if (this.dataList.length !== 0) {
 						this.dataList[this.k].state = 'play';
 						uni.createVideoContext(this.dataList[this.k].community_id, this).play()
+						this.page = that.page + 1
 					}
 				}).catch(err => {
 					return uni.showToast({
@@ -924,7 +960,6 @@
 				})
 
 
-
 				// this.isUser ?
 				//   myVideoList(this.userUid, {
 				//     page: this.page,
@@ -1113,7 +1148,6 @@
 	}
 </script>
 <style lang="scss" scoped>
-
 	// .video-list{
 	//   padding: 200rpx 28.07rpx 0 28.07rpx;
 	//   display: flex;
@@ -1133,7 +1167,7 @@
 		/* #ifdef MP */
 		padding-top: 200rpx;
 		/* #endif */
-	
+
 		// background-color: #000000;
 		background-color: #F5F5F5;
 
@@ -1256,18 +1290,19 @@
 		left: 0;
 		top: 70rpx;
 		height: 86rpx;
-		
+
 
 
 
 		.icon-xiangzuo {
-			
+
 			margin-left: 10px;
 			width: 20px;
 			height: 20px;
 			color: #ffffff;
-			
+
 		}
+
 		padding-right: 30rpx;
 	}
 
diff --git a/pages/short_video/components/douyin-scrollview/douyin-scrollview.nvue b/pages/short_video/components/douyin-scrollview/douyin-scrollview.nvue
index b918f45..4811d9b 100644
--- a/pages/short_video/components/douyin-scrollview/douyin-scrollview.nvue
+++ b/pages/short_video/components/douyin-scrollview/douyin-scrollview.nvue
@@ -190,6 +190,9 @@
 					uni.hideKeyboard();
 				}else{
 					that.getUserInfo();
+				
+			
+					
 				}	
 			},
 			/**
@@ -227,7 +230,8 @@
 				let reply_id = that.reply_id ? that.reply_id : 0
 				replyCreateApi(that.id,{content: that.content,reply_id: reply_id}).then(res => {
 					// console.log(res.message)
-					if(res.status == 1){
+					// console.log(res)
+					if(res.status == 200){
 						if(that.isChild){
 							if(that.list[that.index]['children']){
 								that.list[that.index]['children'].push(res.data)
@@ -472,7 +476,7 @@
 	.send{
 		font-size: 26rpx;
 		color: #ffffff;
-		padding: 12rpx 30rpx;
+		padding: 15rpx 30rpx;
 		background: #E93323;
 		border-radius: 30rpx;
 		text-align: center;
diff --git a/pages/short_video/nvueSwiper/index.nvue b/pages/short_video/nvueSwiper/index.nvue
index f9b28e3..8e0f6c2 100644
--- a/pages/short_video/nvueSwiper/index.nvue
+++ b/pages/short_video/nvueSwiper/index.nvue
@@ -435,7 +435,9 @@
 		},
 		watch: {
 			k(new_k, old_k) {
+
 				const max = new_k + 2;
+
 				if (this.max < max) {
 					this.max = max;
 				}
@@ -451,7 +453,7 @@
 				uni.createVideoContext(this.dataList[old_k].community_id + '' + old_k, this)
 					.pause() //如果视频暂停，那么旧视频停止，这里的this.dataList[old_k].id + '' + old_k，后面加 old_k 是为了每一个视频的 id 值不同，这样就可以大程度的避免串音问题
 				// console.log('已经暂停 --> 第' + (old_k + 1) + '个视频～') //提示
-				// #ifdef MP
+
 				this.dataList[new_k].state = 'play'
 				this.dataList[new_k].isplay = false
 				this.dataList[new_k].playIng = true
@@ -461,7 +463,7 @@
 					}, 250)
 				}
 				this.videoShare(this.dataList[new_k])
-				// #endif
+
 			}
 		},
 		onLoad(options) {
@@ -504,7 +506,7 @@
 					}
 				})
 			},
-			//#ifdef MP
+			
 			videoShare(item) {
 				if (item && item.status == 1) {
 					let uid = this.uid ? this.uid : 0;
@@ -520,7 +522,7 @@
 					uni.hideShareMenu()
 				}
 			},
-			// #endif
+			
 			goBack: function() {
 				uni.navigateBack();
 			},
@@ -752,43 +754,43 @@
 				let that = this
 
 				// 1.这里引入后端请求数据
-				if (that.videoshow) {
-					deoList(this.videoID).then(res => {
-						that.videoData([res.data])
-						if (res.data.list.length < that.limit) {
-							this.loadMore = false;
-						}
-					}).catch(err => {
-						return uni.showToast({
-							title: err,
-							icon: 'none',
-							duration: 2000
-						});
-					})
-					this.videoshow = false
-				} else {
-					// videoList().then(res=>{
-					//   that.videoData(res.data.list);
-					// })
-					// console.log(that.userUid,that.videoID)
-					videoList({
-						page: that.page,
-						limit: that.limit,
-						id: this.videoID
-					
-					}).then(res => {
-						that.videoData(res.data.list)
-						if (res.data.list.length < that.limit) {
-							this.loadMore = false;
-						}
-					}).catch(err => {
-						return uni.showToast({
-							title: err,
-							icon: 'none',
-							duration: 2000
-						});
-					})
-				}
+				// if (that.videoshow) {
+				// 	deoList(this.videoID).then(res => {
+				// 		that.videoData([res.data])
+				// 		if (res.data.list.length < that.limit) {
+				// 			this.loadMore = false;
+				// 		}
+				// 	}).catch(err => {
+				// 		return uni.showToast({
+				// 			title: err,
+				// 			icon: 'none',
+				// 			duration: 2000
+				// 		});
+				// 	})
+				// 	this.videoshow = false
+				// } else {
+				// videoList().then(res=>{
+				//   that.videoData(res.data.list);
+				// })
+				// console.log(that.userUid,that.videoID)
+				videoList({
+					page: that.page,
+					limit: that.limit,
+					id: this.videoID
+
+				}).then(res => {
+					that.videoData(res.data.list)
+					if (res.data.list.length < that.limit) {
+						this.loadMore = false;
+					}
+				}).catch(err => {
+					return uni.showToast({
+						title: err,
+						icon: 'none',
+						duration: 2000
+					});
+				})
+				// }
 
 				// that.isUser ?
 				// 	myVideoList(that.userUid, {
@@ -851,7 +853,9 @@
 				this.communityId = list[0]['community_id']
 				if (list.length == 0) return
 				let that = this;
+
 				that.page = that.page + 1;
+
 				var msg = list
 				// 2.这里把视频添加到视频列表
 				for (let i = 0; i < msg.length; i++) {
@@ -861,15 +865,21 @@
 					msg[i]['isplay'] = true
 					msg[i]['loading'] = false
 					that.dataList.push(msg[i])
-					//#ifndef H5
+
+					
+					console.log(i, that.k)
 					if (i == 0 && that.k == 0) {
 						this.dataList[0].isplay = false
 						this.dataList[0].playIng = true
 						this.dataList[0].state = 'play'
 						this.dataList[0].loading = false
-						uni.createVideoContext(that.dataList[0].community_id + '' + 0, that).play()
+						setTimeout(() => {
+								uni.createVideoContext(that.dataList[0].community_id + '' + 0, that).play()
+							// uni.createVideoContext(this.dataList[new_k].community_id + '' + new_k, this).play()
+						}, 250)
+					
 					}
-					//#endif
+					
 				}
 				//#ifdef MP
 				if (this.k == 0) {
@@ -1767,7 +1777,7 @@
 		margin-top: 27rpx;
 
 		.product-item {
-			   display: inline-block;
+			display: inline-block;
 			width: 444rpx;
 			height: 136rpx;
 			background: rgba(0, 0, 0, .55);
diff --git a/pages/short_video/components/index/zan01.png b/pages/short_video/static/img/index/zan01.png
similarity index 100%
rename from pages/short_video/components/index/zan01.png
rename to pages/short_video/static/img/index/zan01.png
diff --git a/pages/short_video/components/index/zan02.png b/pages/short_video/static/img/index/zan02.png
similarity index 100%
rename from pages/short_video/components/index/zan02.png
rename to pages/short_video/static/img/index/zan02.png
diff --git a/pages/store/entryProcess/entryProcess.vue b/pages/store/entryProcess/entryProcess.vue
index 517cd73..ceb1686 100644
--- a/pages/store/entryProcess/entryProcess.vue
+++ b/pages/store/entryProcess/entryProcess.vue
@@ -39,14 +39,14 @@
       <view class="record flex">
         <view class="circle"></view>
         <view class="cont-box">
-          <view class="title">签署里海云《履约保证金协议》</view>
+          <view class="title">签署里海云《履约押金协议》</view>
           <view class="text-box">
             <view class="have-filled" v-if="false">
-              <text>1.完成签署履约保证金协议2023-05-08 13:15完成</text>
+              <text>1.完成签署履约押金协议2023-05-08 13:15完成</text>
             </view>
             <view class="get-through" v-else>
-              <text class="through-title">1、签署里海云《履约保证金协议》</text>
-              <text>请详细阅读里海云履约保证金协议，并充分理解内容后进行电子签名。</text>
+              <text class="through-title">1、签署里海云《履约押金协议》</text>
+              <text>请详细阅读里海云履约押金协议，并充分理解内容后进行电子签名。</text>
               <view class="flex_a_c" style="margin-top: auto;">
                 <view class="through-btn">签署协议</view>
                 <view class="tiaoguo">跳过</view>
@@ -58,16 +58,16 @@
       <view class="record flex">
         <view class="circle"></view>
         <view class="cont-box">
-          <view class="title">缴纳履约保证金</view>
+          <view class="title">缴纳履约押金</view>
           <view class="text-box">
             <view class="have-filled" v-if="!true">
-              <text>1.完成履约保证金缴纳 2023-05-08 13:15完成</text>
+              <text>1.完成履约押金缴纳 2023-05-08 13:15完成</text>
             </view>
             <view class="get-through" v-else>
-              <text class="through-title">1、缴纳履约保证金</text>
-              <text>线上缴纳履约保证金，完成保证金审核后签约完成。</text>
+              <text class="through-title">1、缴纳履约押金</text>
+              <text>线上缴纳履约押金，完成押金审核后签约完成。</text>
               <view class="flex_a_c" style="margin-top: auto;">
-                <view class="through-btn">缴纳履约保证金</view>
+                <view class="through-btn">缴纳履约押金</view>
                 <view class="tiaoguo">跳过</view>
               </view>
             </view>
diff --git a/pages/store/home/index.vue b/pages/store/home/index.vue
index f3207d2..d985481 100644
--- a/pages/store/home/index.vue
+++ b/pages/store/home/index.vue
@@ -670,7 +670,7 @@
 				type: 3,
 				statusBarHeight: 0,
 				isLihaiYun: '',
-				business_status: 0
+				
 			}
 		},
 		computed: {
@@ -760,8 +760,8 @@
 				}
 			}
 			// #endif
-			this.userinfo()
-		
+			
+		    this.getStore();
 				
 		
 			this.diyData();
@@ -818,13 +818,7 @@
 
 		},
 		methods: {
-			userinfo() {
-				getUserInfo().then(res => {
-
-					this.business_status = res.data.mer_info.setting_status
-                    this.getStore();
-				})
-			},
+		
 			getProductSpu() {
 				let that = this;
 				if (that.loadend) return;
@@ -873,11 +867,12 @@
 				const query = uni.createSelectorQuery().in(this);
 				query.select('#goods').boundingClientRect(data => {
 					if (data.bottom < 1500 && data.top < 0) {
-						if (this.loadend == false) {
-							this.getProductSpu()
-						} else {
-							this.getGoods();
-						}
+            this.getGoods();
+						// if (this.loadend == false) {
+						// 	this.getProductSpu()
+						// } else {;
+						// 	this.getGoods();
+						// }
 					}
 				}).exec();
 				// 模拟触底刷新
@@ -1012,10 +1007,12 @@
 					//   this.service_open = false
 					// }
 
-					if (this.business_status == 1) {
+					if (res.data.business_status == 2) {
 						this.isLihaiYun === 'Lihai' ? this.tabs = this.tabs4 : this.tabs = this.tabs3
+            this.type=7
 					} else {
 						this.tabs = this.tabs5
+						this.type=7						
 					}
 
 					this.tab(this.type)
diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index 6419081..4c09a5b 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -1,256 +1,264 @@
 <template>
 	<view class="">
 		<!-- #ifdef MP || APP-PLUS -->
-		
-		<view class="conten-top">
-			<view class="" style="position: absolute;left: 30rpx;" @click="logout"><i class="iconfont icon-xiangzuo" style="font-size: 40rpx;text-align: left;"></i></view>
-			<view class="" style="font-size: 30rpx;">
+
+		<view class="conten-top" :style="'height:'+statusBarHeight+'px'">
+			<view class="" style="position: absolute;left: 30rpx;bottom: 15rpx;" @click="logout"><i
+					class="iconfont icon-xiangzuo" style="font-size: 40rpx;text-align: left;"></i></view>
+			<view class=""
+				style="position: absolute;left: 30rpx;bottom: 15rpx;width: 120rpx; left:50%;margin-left:-60rpx;">
 				商家入驻
 			</view>
 		</view>
-		<view style="height:var(--status-bar-height);margin-bottom: 30rpx;"></view>
+		<view :style="'height:'+statusBarHeight+'px'"></view>
 		<!-- #endif -->
-		
-	<view v-if="!successful" :style="viewColor" >
-		<form report-submit='true'>
-			<view class='merchantsSettled' >
-				<view class="merchantBgCount">
-					<image mode="widthFix" class="merchantBg" :src="domain+'/static/diy/merchantBg'+keyColor+'.jpg'"
-						alt="">
-				</view>
-				<view class="application-record" @click="jumpToList">
-					申请记录
-					<text class="iconfont icon-xiangyou"></text>
-				</view>
-				<view class='list'   style="padding-top: var(--status-bar-height);">
-					<view class="item">
-						<view class="acea-row row-middle">
-							<text class="item-name">商户名称</text>
-							<input type="text" maxlength="30" placeholder="请输入商户名称"
-								v-model="merchantData.enterprise_name" @input="validateBtn"
-								placeholder-class='placeholder' />
-						</view>
-					</view>
 
-
-					<view class="item">
-						<view class="acea-row row-middle">
-							<text class="item-name">联系电话</text>
-							<input type="text" placeholder="请输入手机号" v-model="merchantData.phone" @input="validateBtn"
-								placeholder-class='placeholder' />
-						</view>
+		<view v-if="!successful" :style="viewColor">
+			<form report-submit='true'>
+				<view class='merchantsSettled'>
+					<view class="merchantBgCount">
+						<image mode="widthFix" class="merchantBg" :src="domain+'/static/diy/merchantBg'+keyColor+'.jpg'"
+							alt="">
 					</view>
-					<view class="item rel">
-						<view class="acea-row row-middle">
-							<text class="item-name">验证码</text>
-							<input type="text" placeholder="填写验证码" v-model="merchantData.yanzhengma"
-								@input="validateBtn" class="codeIput" placeholder-class='placeholder' />
-							<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
-								@click="handleVerify">
-								{{ text }}
-							</button>
-						</view>
+					<view class="application-record" @click="jumpToList">
+						申请记录
+						<text class="iconfont icon-xiangyou"></text>
 					</view>
-					<view class="item" v-if="isShowCode">
-						<view class="acea-row row-middle">
-							<text class="item-name">验证码</text>
-							<input type="text" placeholder="请输入验证码" class="codeIput" v-model="codeVal"
-								@input="validateBtn" placeholder-class='placeholder' />
-							<view class="imageCode" @click="again">
-								<image :src="codeUrl" />
+					<view class='list'>
+						<view class="item">
+							<view class="acea-row row-middle">
+								<text class="item-name">商户名称</text>
+								<input type="text" maxlength="30" placeholder="请输入商户名称"
+									v-model="merchantData.enterprise_name" @input="validateBtn"
+									placeholder-class='placeholder' />
 							</view>
 						</view>
-					</view>
-					<view class="item">
-						<view class="uni-list">
-							<view class="uni-list-cell">
-								<view class="uni-list-cell-db acea-row row-middle">
-									<text class="item-name">商户分类</text>
-									<picker @change="bindPickerChange" :value="index" :range="array"
-										range-key="category_name">
-										<input placeholder="请选择商户分类" type="text" readonly disabled
-											v-model="mer_classification">
-										<view class='iconfont icon-jiantou'></view>
-									</picker>
+
+
+						<view class="item">
+							<view class="acea-row row-middle">
+								<text class="item-name">联系电话</text>
+								<input type="text" placeholder="请输入手机号" v-model="merchantData.phone"
+									@input="validateBtn" placeholder-class='placeholder' />
+							</view>
+						</view>
+						<view class="item rel">
+							<view class="acea-row row-middle">
+								<text class="item-name">验证码</text>
+								<input type="text" placeholder="填写验证码" v-model="merchantData.yanzhengma"
+									@input="validateBtn" class="codeIput" placeholder-class='placeholder' />
+								<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
+									@click="handleVerify">
+									{{ text }}
+								</button>
+							</view>
+						</view>
+						<view class="item" v-if="isShowCode">
+							<view class="acea-row row-middle">
+								<text class="item-name">验证码</text>
+								<input type="text" placeholder="请输入验证码" class="codeIput" v-model="codeVal"
+									@input="validateBtn" placeholder-class='placeholder' />
+								<view class="imageCode" @click="again">
+									<image :src="codeUrl" />
 								</view>
 							</view>
 						</view>
-					</view>
-					<view class="item">
-						<view class="uni-list">
-							<view class="uni-list-cell">
-								<view class="uni-list-cell-db acea-row row-middle">
-									<text class="item-name">店铺类型</text>
-									<text class="iconfont wenhao" @click="getAgreement">?</text>
-									<picker @change="bindPickerChange1" :value="index1" :range="storeTypeArr"
-										range-key="type_name">
-										<input placeholder="请选择店铺类型" type="text" disabled readonly
-											v-model="mer_storeType">
-										<view v-if="mer_storeType" @tap.stop="mer_storeType=''"
-											class="iconfont icon-guanbi2"></view>
-										<view class='iconfont icon-jiantou'></view>
-									</picker>
+						<view class="item">
+							<view class="uni-list">
+								<view class="uni-list-cell">
+									<view class="uni-list-cell-db acea-row row-middle">
+										<text class="item-name">商户分类</text>
+										<picker @change="bindPickerChange" :value="index" :range="array"
+											range-key="category_name">
+											<input placeholder="请选择商户分类" type="text" readonly disabled
+												v-model="mer_classification">
+											<view class='iconfont icon-jiantou'></view>
+										</picker>
+									</view>
 								</view>
 							</view>
 						</view>
-					</view>
-					<view class="item">
-						<view class="uni-list">
-							<view class="uni-list-cell">
-								<view class="uni-list-cell-db acea-row row-middle">
-									<text class="item-name businessBox">店铺所在地</text>
-									<picker mode=multiSelector @change="bindPickerChange2" :value="index2"
-										:range="business" range-key="name" @columnchange="pickerColumnchange">
-										<input class="businessBox" placeholder="请选择商圈" type="text" readonly disabled
-											v-model="business_name">
-										<view class='iconfont icon-jiantou'></view>
-									</picker>
+						<view class="item">
+							<view class="uni-list">
+								<view class="uni-list-cell">
+									<view class="uni-list-cell-db acea-row row-middle">
+										<text class="item-name">店铺类型</text>
+										<text class="iconfont wenhao" @click="getAgreement">?</text>
+										<picker @change="bindPickerChange1" :value="index1" :range="storeTypeArr"
+											range-key="type_name">
+											<input placeholder="请选择店铺类型" type="text" disabled readonly
+												v-model="mer_storeType">
+											<view v-if="mer_storeType" @tap.stop="mer_storeType=''"
+												class="iconfont icon-guanbi2"></view>
+											<view class='iconfont icon-jiantou'></view>
+										</picker>
+									</view>
 								</view>
 							</view>
 						</view>
-					</view>
-					<view class="item">
-						<view class="uni-list">
-							<view class="uni-list-cell">
-								<view class="uni-list-cell-db acea-row row-middle">
-									<text class="item-name businessBox">详细地址</text>
-									<input type="text" maxlength="30" placeholder="请输入详细地址"
-										v-model="merchantData.address" @input="validateBtn"
-										placeholder-class='placeholder' />
+						<view class="item">
+							<view class="uni-list">
+								<view class="uni-list-cell">
+									<view class="uni-list-cell-db acea-row row-middle">
+										<text class="item-name businessBox">店铺所在地</text>
+										<picker mode=multiSelector @change="bindPickerChange2" :value="index2"
+											:range="business" range-key="name" @columnchange="pickerColumnchange">
+											<input class="businessBox" placeholder="请选择商圈" type="text" readonly disabled
+												v-model="business_name">
+											<view class='iconfont icon-jiantou'></view>
+										</picker>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="item">
+							<view class="uni-list">
+								<view class="uni-list-cell">
+									<view class="uni-list-cell-db acea-row row-middle">
+										<text class="item-name businessBox">详细地址</text>
+										<input type="text" maxlength="30" placeholder="请输入详细地址"
+											v-model="merchantData.address" @input="validateBtn"
+											placeholder-class='placeholder' />
 
+									</view>
 								</view>
 							</view>
 						</view>
-					</view>
-					<view class="item">
-						<view class="uni-list">
-							<view class="uni-list-cell">
-								<view class="uni-list-cell-db acea-row row-middle">
-									<text class="item-name businessBox">公司名称</text>
-									<input type="text" maxlength="30" placeholder="请输入公司名称"
-										v-model="merchantData.company_name" @input="validateBtn"
-										placeholder-class='placeholder' />
+						<view class="item">
+							<view class="uni-list">
+								<view class="uni-list-cell">
+									<view class="uni-list-cell-db acea-row row-middle">
+										<text class="item-name businessBox">公司名称</text>
+										<input type="text" maxlength="30" placeholder="请输入公司名称"
+											v-model="merchantData.company_name" @input="validateBtn"
+											placeholder-class='placeholder' />
 
+									</view>
 								</view>
 							</view>
 						</view>
-					</view>
-					<view class="item">
-						<view class="acea-row row-middle">
-							<text class="item-name">法人名称</text>
-							<input type="text" placeholder="请输入法人名称" v-model="merchantData.user_name"
-								@input="validateBtn" placeholder-class='placeholder' />
+						<view class="item">
+							<view class="acea-row row-middle">
+								<text class="item-name">法人名称</text>
+								<input type="text" placeholder="请输入法人名称" v-model="merchantData.user_name"
+									@input="validateBtn" placeholder-class='placeholder' />
+							</view>
 						</view>
-					</view>
-					<view class="item">
-						<view class="uni-list">
-							<view class="uni-list-cell">
-								<view class="uni-list-cell-db acea-row row-middle">
-									<text class="item-name businessBox">社会信用代码</text>
-									<input type="text" maxlength="30" placeholder="请输入社会信用代码"
-										v-model="merchantData.social_credit_code" @input="validateBtn"
-										placeholder-class='placeholder' />
+						<view class="item">
+							<view class="uni-list">
+								<view class="uni-list-cell">
+									<view class="uni-list-cell-db acea-row row-middle">
+										<text class="item-name businessBox">社会信用代码</text>
+										<input type="text" maxlength="30" placeholder="请输入社会信用代码"
+											v-model="merchantData.social_credit_code" @input="validateBtn"
+											placeholder-class='placeholder' />
 
+									</view>
 								</view>
 							</view>
 						</view>
-					</view>
 
-					<!-- <view class="item">
+						<!-- <view class="item">
 						<view class="acea-row row-middle">
 							<text class="item-name">是否农贸市场</text>
 							<u-switch v-model="isnm" @change="change" activeColor="#42CA4C"></u-switch>
 						</view>
 					</view> -->
-					<view class="item no-border">
-						<view class='acea-row row-middle'>
-							<text class="item-title">请上传营业执照及行业相关资质证明图片</text>
-							<text class="item-desc">(图片最多可上传10张,图片格式支持JPG、PNG、JPEG)</text>
-							<view class="upload">
-								<view class='pictrue' v-for="(item,index) in pics" :key="index" :data-index="index"
-									@click="getPhotoClickIdx">
-									<image :src='item'></image>
-									<text class='iconfont icon-guanbi1' @click.stop='DelPic(index)'></text>
-								</view>
-								<view class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic'
-									v-if="pics.length < 10">
-									<text class='iconfont icon-icon25201'></text>
-									<view>上传图片</view>
+						<view class="item no-border">
+							<view class='acea-row row-middle'>
+								<text class="item-title">请上传营业执照及行业相关资质证明图片</text>
+								<text class="item-desc">(图片最多可上传10张,图片格式支持JPG、PNG、JPEG)</text>
+								<view class="upload">
+									<view class='pictrue' v-for="(item,index) in pics" :key="index" :data-index="index"
+										@click="getPhotoClickIdx">
+										<image :src='item'></image>
+										<text class='iconfont icon-guanbi1' @click.stop='DelPic(index)'></text>
+									</view>
+									<view class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic'
+										v-if="pics.length < 10">
+										<text class='iconfont icon-icon25201'></text>
+										<view>上传图片</view>
+									</view>
 								</view>
 							</view>
 						</view>
+						<view class="item no-border">
+							<checkbox-group @change='ChangeIsAgree'>
+								<checkbox class="checkbox" :checked="isAgree ? true : false" />已阅读并同意
+							</checkbox-group>
+							<button class="settleAgree" @click="getConfig">《入驻协议》</button>
+						</view>
+
+						<button class='submitBtn' :class="validate === true? 'on':''" @click="formSubmit">
+							提交申请
+						</button>
 					</view>
-					<view class="item no-border">
-						<checkbox-group @change='ChangeIsAgree'>
-							<checkbox class="checkbox" :checked="isAgree ? true : false" />已阅读并同意
-						</checkbox-group>
-						<button class="settleAgree" @click="getConfig">《入驻协议》</button>
+				</view>
+			</form>
+			<view class="settlementAgreement" v-if="showProtocol">
+				<view class="setAgCount" style="width: 656rpx;height: 458px;">
+					<i class="icon iconfont icon-cha" @click="showProtocol = false"></i>
+					<div class="title">{{isType ? '店铺类型说明' : '商户入驻协议'}}</div>
+					<view class="content">
+						<jyf-parser :html="protocol" ref="article" :tag-style="tagStyle"></jyf-parser>
+						<!-- <view v-html="protocol"></view> -->
+					</view>
+				</view>
+			</view>
+			<view class="settlementAgreement" v-if="isshow">
+				<view class="setAgCount" style="width: 100%;height: 100%;padding-top: 180rpx;">
+					<!-- <i class="icon iconfont icon-cha" @click="recuo"></i> -->
+					<view class="" style="width: 60rpx;height: 60rpx; position: absolute;left: 30rpx; top:90rpx"
+						@click="recuo">
+						<i class="iconfont icon-xiangzuo" style="width: 60rpx;height: 60rpx;font-size: 40rpx;"></i>
+						<!-- <image src="@/static/images/close.png" mode="aspectFit" style="width: 60rpx;height: 60rpx;"></image> -->
 					</view>
 
-					<button class='submitBtn' :class="validate === true? 'on':''" @click="formSubmit">
-						提交申请
-					</button>
+					<div class="title">{{detail.title}}</div>
+					<view style="margin: 20rpx 0;">甲方公司:{{company?company:"暂无公司信息"}}</view>
+					<view style="margin: 20rpx 0;">机构代码:{{organization_code?organization_code:"暂无公司信息"}}</view>
+
+					<view class="contenta" v-if="detail.mer_services_agree">
+						<jyf-parser :html="detail.mer_services_agree" ref="article" :tag-style="tagStyle"></jyf-parser>
+
+					</view>
+					<view class="contenta" v-else>
+						<jyf-parser :html="detail.mer_supply_agree" ref="article" :tag-style="tagStyle"></jyf-parser>
+					
+					</view>
+					
+					<view class="setAgCountbtn">
+						<button class="setAgCountbtna" @click="refuse">
+							拒绝
+						</button>
+
+						<button :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" :disabled="num!=0" @click="agree">
+							<text v-if="num>0">请仔细阅读协议{{num}}S</text>
+							<text v-else>同意</text>
+
+						</button>
+					</view>
 				</view>
 			</view>
-		</form>
-		<view class="settlementAgreement" v-if="showProtocol">
-			<view class="setAgCount" style="width: 656rpx;height: 458px;">
-				<i class="icon iconfont icon-cha" @click="showProtocol = false"></i>
-				<div class="title">{{isType ? '店铺类型说明' : '商户入驻协议'}}</div>
-				<view class="content">
-					<jyf-parser :html="protocol" ref="article" :tag-style="tagStyle"></jyf-parser>
-					<!-- <view v-html="protocol"></view> -->
-				</view>
+			<view class='loadingicon acea-row row-center-wrapper' v-if="loading">
+				<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>
+			</view>
+			<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse">
+			</authorize>
+			<Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }"
+				ref="verify">
+			</Verify>
+		</view>
+		<view class="settledSuccessMain " v-else :style="viewColor">
+			<view class="settledSuccessful">
+				<image class="image" src="../static/images/settledSuccessful.svg" alt="">
+					<view class="title">恭喜，您的资料提交成功！</view>
+					<view class="info">预计15个工作日内审核完毕，平台客服会及时与您联系！</view>
+					<view class="goHome" hover-class="none" @click="goHome">
+						返回首页
+					</view>
 			</view>
 		</view>
-		<view class="settlementAgreement" v-if="isshow">
-			<view class="setAgCount" style="width: 100%;height: 100%;padding-top: 180rpx;">
-				<!-- <i class="icon iconfont icon-cha" @click="recuo"></i> -->
-				<view class="" style="width: 60rpx;height: 60rpx; position: absolute;left: 30rpx; top:90rpx"
-					@click="recuo">
-					<i class="iconfont icon-xiangzuo" style="width: 60rpx;height: 60rpx;font-size: 40rpx;"></i>
-					<!-- <image src="@/static/images/close.png" mode="aspectFit" style="width: 60rpx;height: 60rpx;"></image> -->
-				</view>
-
-				<div class="title">{{detail.title}}</div>
-				<view style="margin: 20rpx 0;">甲方公司:{{company?company:"暂无公司信息"}}</view>
-				<view style="margin: 20rpx 0;">机构代码:{{organization_code?organization_code:"暂无公司信息"}}</view>
-
-				<view class="contenta">
-					<jyf-parser :html="detail.mer_services_agree" ref="article" :tag-style="tagStyle"></jyf-parser>
-
-				</view>
-				<view class="setAgCountbtn">
-					<button class="setAgCountbtna" @click="refuse">
-						拒绝
-					</button>
-
-					<button :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" :disabled="num!=0" @click="formSubmit">
-						<text v-if="num>0">请仔细阅读协议{{num}}S</text>
-						<text v-else>同意</text>
-
-					</button>
-				</view>
-			</view>
-		</view>
-		<view class='loadingicon acea-row row-center-wrapper' v-if="loading">
-			<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>
-		</view>
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
-		<Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }"
-			ref="verify">
-		</Verify>
-	</view>
-	<view class="settledSuccessMain " v-else :style="viewColor" >
-		<view class="settledSuccessful">
-			<image class="image" src="../static/images/settledSuccessful.svg" alt="">
-				<view class="title">恭喜，您的资料提交成功！</view>
-				<view class="info">预计15个工作日内审核完毕，平台客服会及时与您联系！</view>
-				<view class="goHome" hover-class="none" @click="goHome">
-					返回首页
-				</view>
-		</view>
-	</view>
 	</view>
 </template>
 <script>
@@ -288,6 +296,9 @@
 	import {
 		configMap
 	} from "@/utils";
+	import {
+		intention,
+	} from "@/api/product"
 	import parser from "@/components/jyf-parser/jyf-parser";
 	import authorize from '@/components/Authorize';
 	import Verify from '@/components/verify/verify.vue';
@@ -368,7 +379,14 @@
 				mer_i_id: null, // 商户申请id
 				isType: false,
 				num: 10,
-				detail: {}
+				detail: {},
+				statusBarHeight: 0,
+				where: {
+					type: 1,
+					page: 1,
+					limit: 10
+				},
+				codenote: []
 			};
 		},
 		beforeDestroy() {
@@ -396,17 +414,24 @@
 				})
 			}
 			this.getArea()
-			this.shoplist()
+			
+			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 45;
 		},
 		onShow() {
-			
+
 		},
 		onReady() {},
 		methods: {
+			//获取交易信息
+			codelist() {
+				intention(this.where).then(res => {
+					this.codenote = res.data.list
+				})
+			},
 			//退出
-			logout(){
+			logout() {
 				uni.switchTab({
-					url:'/pages/user/index'
+					url: '/pages/user/index'
 				})
 			},
 			//关闭弹窗
@@ -451,9 +476,10 @@
 			},
 
 			//获取商户入驻申请协议
-			shoplist() {
+			shoplist(val) {
+				
 				agreeiness({
-					type: 'mer_services_agree'
+					type: val
 				}).then(res => {
 					this.detail = res.data
 				})
@@ -581,6 +607,13 @@
 				let idx = e.target.value
 				this.merchantData.mer_type = this.storeTypeArr[idx]['mer_type_id']
 				this.mer_storeType = this.storeTypeArr[idx]['type_name']
+				console.log(this.storeTypeArr[idx]['type_code'] == "TypeStore")
+				if(this.storeTypeArr[idx]['type_code']== 'TypeStore'&&this.merchantData.mer_type){
+					this.shoplist('mer_services_agree')
+				}else{
+					this.shoplist('mer_supply_agree')
+					
+				}
 				this.validateBtn()
 			},
 
@@ -596,18 +629,18 @@
 					street_code: this.street_id
 				}).then((res) => {
 					if (res.code == 0) {
-						this.company =''
-						this.organization_code =''
+						this.company = ''
+						this.organization_code = ''
 						this.$util.Tips({
 							title: res.msg
 						});
 						return false;
-					}else{
+					} else {
 						this.company = res.data.title
 						this.organization_code = res.data.organization_code
 					}
-					
-				
+
+
 				}).catch(res => {
 					console.log(res)
 				})
@@ -778,75 +811,144 @@
 			showxy() {
 				this.isshow = true
 			},
-
-			formSubmit: function(e) {
-
-
-
-
+			//提交
+			agree() {
 				let that = this;
-				if (that.validateForm() && that.validate) {
-					if (this.num == 0) {
-						let requestData = {
-							phone: that.merchantData.phone,
-							mer_name: that.merchantData.enterprise_name,
-							name: that.merchantData.user_name,
-							code: that.merchantData.yanzhengma,
-							company_name: that.merchantData.company_name,
-							address: that.merchantData.address,
-							social_credit_code: that.merchantData.social_credit_code,
-							merchant_category_id: that.merchantData.classification,
-							mer_type_id: that.merchantData.mer_type,
-							mer_storeType: this.mer_storeType,
-							area_id: this.area_id,
-							street_id: this.street_id,
-							village_id: this.village_id,
-							is_nmsc: this.isnum,
-							images: that.pics
-						}
-						that.validate = false;
-						if (that.mer_i_id) {
-							updateGoodsRecord(that.mer_i_id, requestData).then(res => {
-								if (res.status == 200) {
-									title: '提交成功',
-									that.loading = true;
-									that.timer = setTimeout(() => {
-										that.successful = true;
-										that.validate = true;
-									}, 1000)
-								}
-							}).catch(res => {
-								this.isshow = false
+				let requestData = {
+					phone: that.merchantData.phone,
+					mer_name: that.merchantData.enterprise_name,
+					name: that.merchantData.user_name,
+					code: that.merchantData.yanzhengma,
+					company_name: that.merchantData.company_name,
+					address: that.merchantData.address,
+					social_credit_code: that.merchantData.social_credit_code,
+					merchant_category_id: that.merchantData.classification,
+					mer_type_id: that.merchantData.mer_type,
+					mer_storeType: this.mer_storeType,
+					area_id: this.area_id,
+					street_id: this.street_id,
+					village_id: this.village_id,
+					is_nmsc: this.isnum,
+					images: that.pics
+				}
+				that.validate = false;
+				if (that.mer_i_id) {
+					updateGoodsRecord(that.mer_i_id, requestData).then(res => {
+						if (res.status == 200) {
+							title: '提交成功',
+							that.loading = true;
+							that.timer = setTimeout(() => {
+								that.successful = true;
 								that.validate = true;
-								that.$util.Tips({
-									title: res
-								});
-							})
-						} else {
-							create(requestData).then(data => {
-								if (data.status == 200) {
-									title: '提交成功',
-									that.loading = true;
-									this.timer = setTimeout(() => {
-										that.successful = true;
-										that.validate = true;
-									}, 1000)
-								}
+							}, 1000)
+						}
+					}).catch(res => {
+						this.isshow = false
+						that.validate = true;
+						that.$util.Tips({
+							title: res
+						});
+					})
+				} else {
+					create(requestData).then(data => {
+						if (data.status == 200) {
+							title: '提交成功',
+							that.loading = true;
+							this.timer = setTimeout(() => {
+								that.successful = true;
+								that.validate = true;
+							}, 1000)
+						}
 
-							}).catch(res => {
-								that.validate = true;
-								that.$util.Tips({
-									title: res
-								});
-							})
-						}
-					} else {
+					}).catch(res => {
+						this.isshow = false
+						that.validate = true;
+						that.$util.Tips({
+							title: res
+						});
+					})
+				}
+			},
+			formSubmit() {
+				if (this.validateForm() && this.validate) {
+					if (this.codenote.length == 0) {
 						this.isshow = true
 						this.countDown()
+					} else {
+						if (this.codenote[0].status == 0) {
+							uni.showModal({
+								title: '申请正在审核中，请勿重复提交'
+							})
+						} else {
+							this.isshow = true
+							this.countDown()
+						}
 					}
-
 				}
 
+				// let that = this;
+				// if (that.validateForm() && that.validate) {
+				// 	if (this.num == 0) {
+				// 		let requestData = {
+				// 			phone: that.merchantData.phone,
+				// 			mer_name: that.merchantData.enterprise_name,
+				// 			name: that.merchantData.user_name,
+				// 			code: that.merchantData.yanzhengma,
+				// 			company_name: that.merchantData.company_name,
+				// 			address: that.merchantData.address,
+				// 			social_credit_code: that.merchantData.social_credit_code,
+				// 			merchant_category_id: that.merchantData.classification,
+				// 			mer_type_id: that.merchantData.mer_type,
+				// 			mer_storeType: this.mer_storeType,
+				// 			area_id: this.area_id,
+				// 			street_id: this.street_id,
+				// 			village_id: this.village_id,
+				// 			is_nmsc: this.isnum,
+				// 			images: that.pics
+				// 		}
+				// 		that.validate = false;
+				// 		if (that.mer_i_id) {
+				// 			updateGoodsRecord(that.mer_i_id, requestData).then(res => {
+				// 				if (res.status == 200) {
+				// 					title: '提交成功',
+				// 					that.loading = true;
+				// 					that.timer = setTimeout(() => {
+				// 						that.successful = true;
+				// 						that.validate = true;
+				// 					}, 1000)
+				// 				}
+				// 			}).catch(res => {
+				// 				this.isshow = false
+				// 				that.validate = true;
+				// 				that.$util.Tips({
+				// 					title: res
+				// 				});
+				// 			})
+				// 		} else {
+				// 			create(requestData).then(data => {
+				// 				if (data.status == 200) {
+				// 					title: '提交成功',
+				// 					that.loading = true;
+				// 					this.timer = setTimeout(() => {
+				// 						that.successful = true;
+				// 						that.validate = true;
+				// 					}, 1000)
+				// 				}
+
+				// 			}).catch(res => {
+				// 				that.validate = true;
+				// 				that.$util.Tips({
+				// 					title: res
+				// 				});
+				// 			})
+				// 		}
+				// 	} else {
+				// 		this.isshow = true
+				// 		this.countDown()
+				// 	}
+
+				// }
+
 
 
 			},
@@ -954,20 +1056,17 @@
 		background-color: var(--view-theme) !important;
 		color: #fff !important;
 	}
-	
- .conten-top{
-	 width: 100%;
-	 // height: 120rpx;
-	padding-top:var(--status-bar-height);
-	 // line-height:230rpx;
-	 padding-bottom: 30rpx;
-	 text-align: center;
-	 background-color: #fff;
-	 position: absolute;
-	 top:0;
-	 position: fixed;
-	 z-index: 10;
- }
+
+	.conten-top {
+		width: 100%;
+		text-align: center;
+		background-color: #fff;
+		position: absolute;
+		top: 0;
+		position: fixed;
+		z-index: 10;
+	}
+
 	.uni-input-placeholder {
 		color: #B2B2B2;
 	}
@@ -998,7 +1097,9 @@
 
 	.merchantsSettled {
 		background-image: linear-gradient(var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
+
 		height: 140vh;
+		position: relative;
 	}
 
 	.merchantsSettled .merchantBg {
diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue
index 42bc922..6109390 100644
--- a/pages/supply_chains/supply_chains.vue
+++ b/pages/supply_chains/supply_chains.vue
@@ -36,7 +36,7 @@
 
 			<view class="list">
 				<navigator hover-class="none"
-					:url="`/pages/nongKe/supply_chain/supplier?type_id=10&street_id=${street_id}&townName=${town}`">
+					:url="`/pages/nongKe/supply_chain/supplier?type_id=10,17&street_id=${street_id}&townName=${town}`">
 					<view class="list-m">
 						<image src="@/static/images/f6.png" mode="aspectFit"></image>
 						<view class="list-title">
@@ -128,11 +128,21 @@
 				<image src="@/static/images/f4.png" mode="aspectFit"></image>
 			</view>
 			<view class="goodslist">
-				<WaterfallsFlow :wfList="productList" :type="1" />
+				<WaterfallsFlow v-if="productList.length>0" :wfList="productList" :type="1" />
+				<block v-else>
+          <view class="no-more">- 此区域没有更多商品了 -</view>
+          <view class="common-hd">
+          	<view class="title">为你推荐</view>
+          </view>
+          <WaterfallsFlow :wfList="productList2" :type="1" />
+        </block>
 			</view>
 			<view class='loadingicon acea-row row-center-wrapper' v-if='productList.length > 0'>
 				<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
 			</view>
+      <view class='loadingicon acea-row row-center-wrapper' v-if='productList2.length > 0||loading2'>
+      	<text class='loading iconfont icon-jiazai' :hidden='loading2==false'></text>{{loadTitle2}}
+      </view>
 			<view class="empty_wrapper" v-if="emptyShow">
 				<u-empty :show="emptyShow" mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png"></u-empty>
 			</view>
@@ -227,13 +237,19 @@
 					page: 1,
 					limit: 6
 				},
+        where2: {
+        	category_id: 0,
+        	page: 1,
+        	limit: 6
+        },
 
 				currentItemId: 69, // 默认获取 社区的数据 0 表示推荐 || 69 社区
 				keyword: '',
 				location: '',
 				emptyShow: false,
 				town: '',
-				productList: [],
+				productList: [], // 当前区域列表
+        productList2: [], // 当前推荐列表
 				recoList: [],
 				articleList: [],
 				street_id: '',
@@ -244,14 +260,19 @@
 				loadend: false,
 				loading: false,
 				loadTitle: '加载更多',
+        loadend2: false,
+        loading2: false,
+        loadTitle2: '加载更多',
 			}
 		},
-
 		onPullDownRefresh() {
 			this.list(true, this.street_id);
 			this.Area()
 			uni.stopPullDownRefresh()
 		},
+		onShow() {
+			this.selfLocation()
+		},
 		onLoad() {
 			this.Area()
 			this.selfLocation()
@@ -268,16 +289,19 @@
 			})
 
 		},
+		
 		onReachBottom() {
 			if (this.productList.length > 0) {
 				setTimeout(() => {
 					this.list(false, this.street_id);
+          this.productList2 = [];
 				}, 500)
-			} else {
-				this.list(true, this.street_id)
 			}
-
-
+      else if (this.productList2.length > 0) {
+        setTimeout(() => {
+        	this.list2(false, '');
+        }, 500)
+      }
 		},
 		beforeDestroy() {
 			// 销毁监听事件
@@ -316,8 +340,6 @@
 			} else if (scrollTop > 100) {
 				this.backColor = 1
 				this.isFshow = true
-
-
 			}
 		},
 		// #endif
@@ -330,11 +352,20 @@
 			},
 			//获取商品列表
 			list(isPage, id) {
+        // if(!id) return that.list2(true, ''); // 定位没有获取到时,直接推荐
 				let that = this;
 				if (that.loadend) return;
 				if (that.loading) return;
 
-				if (isPage === true) that.$set(that, 'productList', []);
+				if (isPage === true) {
+				  that.$set(that, 'productList', []);
+				  that.$set(that, 'where', {
+				    category_id: 0,
+				    page: 1,
+				    limit: 6
+				  })
+				}
+        that.$set(that, 'productList2', []);
 
 				that.loading = true;
 				that.loadTitle = '';
@@ -346,6 +377,9 @@
 				}).then(res => {
 					// console.log(222)
 					let list = res.data.list;
+          if(list.length==0){
+            that.list2(true, '');
+          }
 					let productList = that.$util.SplitArray(list, that.productList);
 					let loadend = list.length < that.where.limit;
 					that.loadend = loadend;
@@ -360,10 +394,47 @@
 					that.loadTitle = '加载更多';
 				});
 
-
-
-
 			},
+      list2(isPage, id) {
+      	let that = this;
+      	if (that.loadend2) return;
+      	if (that.loading2) return;
+      
+      	if (isPage === true) {
+          that.$set(that, 'productList2', []);
+          that.$set(that, 'where2', {
+            category_id: 0,
+            page: 1,
+            limit: 6
+          })
+        }
+        that.$set(that, 'productList', []);
+      
+      	that.loading2 = true;
+      	that.loadTitle2 = '';
+      	cloudWarehouse({
+      		page: that.where2.page,
+      		limit: that.where2.limit,
+      		street_code: id,
+      		category_id: 0
+      	}).then(res => {
+      		// console.log(222)
+      		let list = res.data.list;
+      		let productList = that.$util.SplitArray(list, that.productList2);
+      		let loadend = list.length < that.where2.limit;
+      		that.loadend2 = loadend;
+      		that.loading2 = false;
+      		that.loadTitle2 = loadend ? '已全部加载' : '加载更多';
+      		that.$set(that, 'productList2', productList);
+      		// console.log(that.productList)
+      		that.$set(that.where2, 'page', that.where2.page + 1);
+      		if (that.where.page2 == 1 && res.data.list.length <= 0) that.emptyShow2 = true
+      	}).catch(err => {
+      		that.loading2 = false;
+      		that.loadTitle2 = '加载更多';
+      	});
+      
+      },
 			scrolling() {
 				// 滚动条距文档顶部的距离
 				let scrollTop =
@@ -417,7 +488,9 @@
 				this.street_id = e.value[1].code
 				this.town = e.value[1].name
 				this.loadend = false;
+				this.loadend2 = false;
 				this.$set(this.where, 'page', 1)
+				this.$set(this.where2, 'page', 1)
 				this.list(true, this.street_id)
 				this.$nextTick(() => {
 					this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
@@ -515,6 +588,7 @@
 			selfLocation() {
 				if (uni.getStorageSync('loction') == true) {
 					this.isshow = false
+          this.list2(true,'')
 				} else {
 					this.isshow = true
 					uni.setStorageSync('loction', true);
@@ -545,6 +619,7 @@
 
 						}).catch(err => {
 							this.isshow = false
+              this.list2(true,'')
 							uni.showToast({
 								title: err,
 								icon: 'none'
@@ -552,6 +627,7 @@
 						})
 					},
 					fail: (err) => {
+            console.log('定位失败');
 						this.isshow = false
 						// uni.showToast({
 						// 	title: "获取定位超时",
@@ -1014,5 +1090,25 @@
 	.goodslist {
 		margin: 0 auto;
 		width: 725rpx;
+    .no-more{
+      text-align: center;
+      padding-top: 18rpx;
+    }
+    .common-hd {
+    	display: flex;
+    	align-items: center;
+    	justify-content: center;
+    	height: 118rpx;
+    	.title {
+    		padding: 0 80rpx;
+    		font-size: 34rpx;
+    		color: $theme-color;
+    		font-weight: bold;
+    		background-image: url("~@/static/images/index-title.png");
+    		background-repeat: no-repeat;
+    		background-size: 100% auto;
+    		background-position: left center;
+    	}
+    }
 	}
 </style>
\ No newline at end of file
diff --git a/pages/users/login/login_copy.vue b/pages/users/login/login_copy.vue
index 6603d0e..00d363e 100644
--- a/pages/users/login/login_copy.vue
+++ b/pages/users/login/login_copy.vue
@@ -47,11 +47,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="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput"
-									v-model="captcha" />
+							
+								<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 }}
@@ -61,8 +63,8 @@
 						<div class="item" v-if="isShowCode">
 							<div class="acea-row row-middle">
 								<image src="/static/images/code_2.png"></image>
-								<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput"
-									v-model="codeVal" />
+								<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>
@@ -95,8 +97,9 @@
 						<div class="item">
 							<div class="acea-row row-middle">
 								<image src="/static/images/code_2.png"></image>
-								<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput"
+								<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 }}
@@ -110,10 +113,11 @@
 									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="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput"
+								<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" />
@@ -156,16 +160,18 @@
 						<input type='number' placeholder='填写手机号码' placeholder-class='placeholder'
 							v-model="account"></input>
 					</view>
+					
 					<view class="item acea-row row-between-wrapper">
-						<input type='number' placeholder='填写验证码' placeholder-class='placeholder' class="codeIput"
+						<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">
@@ -892,7 +898,9 @@
 				// #ifdef APP-PLUS
 				jpushModule.initJPushService()
 				jpushModule.getRegistrationID(result => {
+					
 					if (result.registerID) {
+					
 						bindJG({
 							phone: this.account,
 							jg_register_id: result.registerID
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index 48848b7..f5a8ecc 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -164,13 +164,14 @@
 								<view class='discount'>暂无优惠券</view>
 							</block>
 						</view> -->
-						<!-- <view v-if="item.openReceipt == 1" class='item acea-row row-between-wrapper'>
+						<view class='item acea-row row-between-wrapper'>
 							<view>开具发票 <text @tap="showInvoice" class="iconfont icon-wenhao1"></text></view>
 							<view class='discount discount_voice' @tap="goInvoice(item.mer_id)">
 								{{(item.invoiceData && item.invoiceData.receipt_title) ? item.invoiceData.receipt_title : '不开发票'}}
 								<text class='iconfont icon-jiantou'></text>
 							</view>
-						</view> -->
+						</view>
+						
 						<view v-if="order_type === 2 && item.list[0].productPresell.presell_type ==2"
 							class="item acea-row row-between-wrapper"
 							style="border-top: 1px solid #f5f5f5; border-bottom: 1px solid #f5f5f5;">
@@ -382,6 +383,7 @@
 				</view>
 			</view>
 			<view style='height:140rpx;'></view>
+			
 			<view class='footer acea-row row-between-wrapper'>
 				<view class="footer_count">
 					<view>
diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue
index 813fd98..f540c1a 100644
--- a/pages/users/order_list/index.vue
+++ b/pages/users/order_list/index.vue
@@ -250,8 +250,8 @@
 									</view>
 								</view>
 								<view class='bottom acea-row row-right row-middle'>
-								<!-- 	<view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
-										@click.stop='applyInvoice(item.order_id)'>申请开票</view> -->
+									<view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
+										@click.stop='applyInvoice(item.order_id)'>申请开票</view>
 									<block v-if="item.status == 0 || item.status == 9 || item.status == -1">
 										<view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view>
 									</block>
diff --git a/pages/users/order_list/indexCopy.vue b/pages/users/order_list/indexCopy.vue
index 55fe401..0ea1728 100644
--- a/pages/users/order_list/indexCopy.vue
+++ b/pages/users/order_list/indexCopy.vue
@@ -259,8 +259,8 @@
 									</view>
 								</view>
 								<view class='bottom acea-row row-right row-middle'>
-									<!-- <view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
-										@click.stop='applyInvoice(item.order_id)'>申请开票</view> -->
+									<view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
+										@click.stop='applyInvoice(item.order_id)'>申请开票</view>
 									<block v-if="item.status == 0 || item.status == 9 || item.status == -1">
 										<view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view>
 									</block>
diff --git a/pages/users/order_list/order.vue b/pages/users/order_list/order.vue
index d8df1e0..59c3119 100644
--- a/pages/users/order_list/order.vue
+++ b/pages/users/order_list/order.vue
@@ -247,8 +247,8 @@
 								</view>
 							</view>
 							<view class='bottom acea-row row-right row-middle'>
-								<!-- <view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
-									@click.stop='applyInvoice(item.order_id)'>申请开票</view> -->
+								<view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
+									@click.stop='applyInvoice(item.order_id)'>申请开票</view>
 								<block v-if="item.status == 0 || item.status == 9 || item.status == -1">
 									<view v-if="!item.receipt && item.status != -1" class="bnt cancelBnt">一键转卖</view>
 									<view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view>
diff --git a/pages/users/order_list/relase.vue b/pages/users/order_list/relase.vue
index 1dcd9a1..495fcae 100644
--- a/pages/users/order_list/relase.vue
+++ b/pages/users/order_list/relase.vue
@@ -257,8 +257,8 @@
 									</view>
 								</view>
 								<view class='bottom acea-row row-right row-middle'>
-									<!-- <view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
-										@click.stop='applyInvoice(item.order_id)'>申请开票</view> -->
+									<view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
+										@click.stop='applyInvoice(item.order_id)'>申请开票</view>
 									<block v-if="item.status == 0 || item.status == 9 || item.status == -1">
 										<view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view>
 									</block>
@@ -283,6 +283,12 @@
 											去付款
 										</view>
 									</block>
+									<block v-if="item.order_status == 2 ">
+									
+										<view class='bnt b-color'  @click.stop='goOrderDetails(item.order_id)'>
+											去发货
+										</view>
+									</block>
 									<block v-if="item.order_status == 9 ">
 
 										<view class='bnt b-color' v-if="item.status==12" @click.stop='dePay'>
diff --git a/pages/users/payment/payment.vue b/pages/users/payment/payment.vue
index c395e4d..4ebec4d 100644
--- a/pages/users/payment/payment.vue
+++ b/pages/users/payment/payment.vue
@@ -172,7 +172,7 @@
 			},
 			getOrderInfo() {
 				groupOrderDetail(this.order_id, this.product_type).then(res => {
-					console.log(res)
+
 					this.couponData = res.data
 					this.$nextTick(() => {
 						if (this.couponData.interest !== null) {
@@ -189,6 +189,7 @@
 							pay_type: this.payType
 						}
 					).then(res => {
+
 						if (res.data.paid === false) {
 							//拉起微信支付
 
@@ -204,7 +205,7 @@
 							}, 1000)
 						}
 					}).catch(err => {
-						
+
 						uni.showToast({
 							title: err.message
 						})
@@ -213,7 +214,10 @@
 					orderPay(this.order_id, {
 						type: this.payType
 					}).then(res => {
+
+
 						let jsConfig = res.data.result.config
+
 						if (res.data.status === 'weixinApp') {
 							//拉起微信支付
 							// #ifdef APP-PLUS
@@ -257,15 +261,40 @@
 							});
 							// #endif
 
+						} else {
+							if (res.status == 200) {
+							
+								// uni.navigateBack({
+								// 	delta: 1
+								// })
+								
+								uni.showToast({
+									icon: 'none',
+									title: res.message
+								})
+								if(res.data.status='error'){
+									
+								}else{
+									setTimeout(() => {
+									uni.navigateBack({
+										delta: 2
+									})
+									}, 1000)
+								}
+					
+							}
+
 						}
+
 						// setTimeout(() => {
 						// 	uni.navigateBack({
 						// 		delta: 1
 						// 	})
 						// }, 1000)
-						uni.showToast({
-							title: res.message
-						})
+						// uni.showToast({
+						// 	icon:'none' ,
+						// 	title: res.message
+						// })
 					})
 				}
 
diff --git a/pages/users/supply_procurement/index.vue b/pages/users/supply_procurement/index.vue
index c23819d..c53284e 100644
--- a/pages/users/supply_procurement/index.vue
+++ b/pages/users/supply_procurement/index.vue
@@ -10,8 +10,9 @@
 			</view>
 		</view>
 		<view class="con_kuo"
+		
 			@click="navigator(`/pages/nongKe/supply_chain/supplierA?tit=2&type_id=12&isDetail=1&credit_buy=1&product_type=98&cate_id=${id}`)">
-			<image class="con_img" src="@/static/images/bg2.png" mode=""></image>
+			<image class="con_img" src="@/static/images/bg3.png" mode=""></image>
 			<image class="con_ico" src="@/static/images/bgic2.png" mode=""></image>
 			<view class="con_text">
 				<h3>先货后款</h3>
diff --git a/pages/users/user_payment/index.vue b/pages/users/user_payment/index.vue
index 7b35af6..08e96b8 100644
--- a/pages/users/user_payment/index.vue
+++ b/pages/users/user_payment/index.vue
@@ -118,19 +118,19 @@
 					payStatus: true
 					}
 					// #ifdef H5 ||APP-PLUS
-					,
-					{
-					name: '支付宝支付',
-					icon: 'icon-zhifubao',
-					// #ifdef H5 || APP-PLUS
-					value: 'alipay',
-					// #endif
-					// #ifdef MP
-					value: 'alipayQr',
-					// #endif
-					title: '支付宝支付',
-					payStatus: true
-					}
+					// ,
+					// {
+					// name: '支付宝支付',
+					// icon: 'icon-zhifubao',
+					// // #ifdef H5 || APP-PLUS
+					// value: 'alipay',
+					// // #endif
+					// // #ifdef MP
+					// value: 'alipayQr',
+					// // #endif
+					// title: '支付宝支付',
+					// payStatus: true
+					// }
 					// #endif
 				],
 			};
diff --git a/static/applet/dp.png b/static/applet/dp.png
new file mode 100644
index 0000000..00494f3
Binary files /dev/null and b/static/applet/dp.png differ
diff --git a/static/applet/icons.png b/static/applet/icons.png
new file mode 100644
index 0000000..b191596
Binary files /dev/null and b/static/applet/icons.png differ
diff --git a/static/applet/live.png b/static/applet/live.png
new file mode 100644
index 0000000..c49bea1
Binary files /dev/null and b/static/applet/live.png differ
diff --git a/static/iconfont/demo.css b/static/iconfont/demo.css
new file mode 100644
index 0000000..a969681
--- /dev/null
+++ b/static/iconfont/demo.css
@@ -0,0 +1,26 @@
+/* Logo 字体 */
+@font-face {
+  font-family: "iconfont";
+  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834');
+  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-dianzan2:before {
+  content: "\e61f";
+}
+
+.icon-dianzan3:before {
+  content: "\e601";
+}
+
diff --git a/static/images/bg3.png b/static/images/bg3.png
new file mode 100644
index 0000000..feb62ae
Binary files /dev/null and b/static/images/bg3.png differ
diff --git a/static/img/X.png b/static/img/X.png
new file mode 100644
index 0000000..74f2523
Binary files /dev/null and b/static/img/X.png differ
diff --git a/static/img/close.png b/static/img/close.png
new file mode 100644
index 0000000..74ea90c
Binary files /dev/null and b/static/img/close.png differ
diff --git a/static/img/colse1.png b/static/img/colse1.png
new file mode 100644
index 0000000..4c0e6c1
Binary files /dev/null and b/static/img/colse1.png differ
diff --git a/static/img/gn.png b/static/img/gn.png
new file mode 100644
index 0000000..ec67ad1
Binary files /dev/null and b/static/img/gn.png differ
diff --git a/static/img/jb.png b/static/img/jb.png
new file mode 100644
index 0000000..2edce60
Binary files /dev/null and b/static/img/jb.png differ
diff --git a/static/img/jl.png b/static/img/jl.png
new file mode 100644
index 0000000..9a74156
Binary files /dev/null and b/static/img/jl.png differ
diff --git a/static/img/li.png b/static/img/li.png
new file mode 100644
index 0000000..173c913
Binary files /dev/null and b/static/img/li.png differ
diff --git a/static/img/shanpin.png b/static/img/shanpin.png
new file mode 100644
index 0000000..0662da4
Binary files /dev/null and b/static/img/shanpin.png differ
diff --git a/static/img/you.png b/static/img/you.png
new file mode 100644
index 0000000..30feef6
Binary files /dev/null and b/static/img/you.png differ
diff --git a/static/img/zhi.png b/static/img/zhi.png
new file mode 100644
index 0000000..c9e7420
Binary files /dev/null and b/static/img/zhi.png differ
diff --git a/static/missing-face.png b/static/missing-face.png
new file mode 100644
index 0000000..c9be652
Binary files /dev/null and b/static/missing-face.png differ
diff --git a/store/modules/index.js b/store/modules/index.js
index 1c3a43a..c9cccdb 100644
--- a/store/modules/index.js
+++ b/store/modules/index.js
@@ -8,6 +8,8 @@
 // | Author: CRMEB Team <admin@crmeb.com>
 // +----------------------------------------------------------------------
 import app from "./app";
+import storage from "./storage.js";
 export default {
-  app
+  app,
+  storage
 };
diff --git a/store/modules/storage.js b/store/modules/storage.js
new file mode 100644
index 0000000..7338e70
--- /dev/null
+++ b/store/modules/storage.js
@@ -0,0 +1,29 @@
+import {
+	getUserInfo,
+	Appversion
+} from "../../api/user.js";
+import {
+	LOGIN_STATUS,
+	UID,
+  USER_INFO
+} from '../../config/cache';
+import Cache from '../../utils/cache';
+
+const state = {
+	storage: {},
+};
+
+const mutations = {
+	setStorage(state, data) {
+		state.storage = data;
+	},
+};
+
+const actions = {
+};
+
+export default {
+	state,
+	mutations,
+	actions
+};
\ No newline at end of file
diff --git a/utils/requestc.js b/utils/requestc.js
new file mode 100644
index 0000000..20f5b52
--- /dev/null
+++ b/utils/requestc.js
@@ -0,0 +1,71 @@
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+import {
+	HTTP_REQUEST_URL_FIVE,
+	HEADER,
+	TOKENNAME
+} from '@/config/app.js';
+
+import store from '../store';
+/**
+ * 发送请求
+ */
+function baseRequest(url, method, data, {
+	noAuth = false,
+	noVerify = false
+}) {
+	let Url = HTTP_REQUEST_URL_FIVE,
+		header = HEADER;
+	if (store.state.app.token) header[TOKENNAME] = 'Bearer ' + store.state.app.token;
+
+	return new Promise((reslove, reject) => {
+		uni.request({
+			url: Url + '/api/' + url,
+			method: method || 'GET',
+			header: header,
+			data: data || {},
+			success: (res) => {
+				// #ifdef APP-PLUS
+			
+				// #endif
+				if (noVerify)
+					reslove(res.data, res);
+				else if (res.data.status == 200)
+					reslove(res.data, res);
+				else if ([410000, 410001, 410002, 40000].indexOf(res.data.status) !== -1) {
+
+					reject(res.data);
+				} else if (res.data.code==0||res.data.code==1) {
+					reslove(res.data, res);
+				}else if (res.data.status == 501) {
+					uni.reLaunch({
+						url: '/pages/error/index'
+					})
+					reject(res.data);
+				} else
+					reject(res.data.message || '系统错误');
+			},
+			fail: (message) => {
+				console.log(url, method, data)
+				reject('请求失败',message);
+			}
+		})
+	});
+}
+
+const request = {};
+
+['options', 'get', 'post', 'put', 'head', 'delete', 'trace', 'connect'].forEach((method) => {
+	request[method] = (api, data, opt) => baseRequest(api, method, data, opt || {})
+});
+
+
+
+export default request;
\ No newline at end of file
diff --git a/utils/uniMP.js b/utils/uniMP.js
index ed86f2a..ef1c3c7 100644
--- a/utils/uniMP.js
+++ b/utils/uniMP.js
@@ -28,7 +28,7 @@ function compareVersions(version1, version2) {
 	return 0;
 }
 
-// 加载小程序
+// 加载供销小程序
 const loadMP = async (id) => {
 	appid = id;
 	let info = await getGXconfig();
@@ -149,7 +149,7 @@ const loadMPx = async (id) => {
 	});
 };
 
-// 按URL加载小程序
+// 按信息接口加载小程序
 const loadMPurl = async (e) => {
 	appid = e.id;
   let FURL = e.url;
@@ -216,6 +216,49 @@ const loadMPurl = async (e) => {
 	
 };
 
+// 按远程文件地址加载小程序
+const loadMPdns = async (e) => {
+	appid = e.id;
+  let FURL = e.url;
+	uni.showLoading({
+		title: '初始化中...',
+		mask: true
+	})
+  let count = 0;
+  timer = setInterval(() => {
+  	if (count < 100) uni.showLoading({
+  		title: `初始化中... ${count}%`,
+  		mask: true
+  	})
+  	else uni.showLoading({
+  		title: '初始化中...100%',
+  		mask: true
+  	})
+  }, 600)
+  let downloadTask = uni.downloadFile({
+  	url: FURL,
+  	success(res) {
+  		wgtFile = res.tempFilePath;
+  		console.log('初始化完成', wgtFile);
+  		installMP();
+  	},
+    fail(res) {
+      clearInterval(timer);
+      timer = null;
+      uni.hideLoading();
+    }
+  });
+  downloadTask.onProgressUpdate((res) => {
+  	// console.log('初始化进度' + res.progress);
+  	if (res.progress > count) count += 10;
+  	if (count >= 90) {
+  		clearInterval(timer);
+  		timer = null;
+  	}
+  });
+	
+};
+
 // 小程序版本信息
 const getVersion = (id) => {
 	appid = id;
@@ -284,6 +327,7 @@ export default {
 	loadMP,
 	loadMPurl,
 	loadMPx,
+  loadMPdns,
 	installMP,
 	doInstallMP,
 	getVersion,
diff --git a/utils/uniMPevent.js b/utils/uniMPevent.js
index 19262b2..f051aec 100644
--- a/utils/uniMPevent.js
+++ b/utils/uniMPevent.js
@@ -50,5 +50,25 @@ export const initEvent = () => {
           console.log('Host sendEvent: ' + JSON.stringify(ret));
         });
     }
+  if (ret.event == 'log') {
+     // console.log('2222222')
+	 
+  	console.log('收到小程序事件: ' + JSON.stringify(ret));
+  }
+  
+  //直播小程序跳转商城购买商品
+  if (ret.event == 'live_shop') {
+     console.log(JSON.stringify(ret))
+	 let arr1=ret.data
+  	 mp.closeUniMP(ret.fromAppid, (ret) => {
+  	   // console.log('closeUniMP: ' + JSON.stringify(ret));
+	   setTimeout(()=>{
+		   uni.navigateTo({
+		   	url:'/pages/goods_details/index?id='+arr1.app_goods_id
+		   },1000)
+	   })
+  	 });
+  	// console.log('收到小程序事件: ' + JSON.stringify(ret));
+  }
   });
 }
\ No newline at end of file