diff --git a/pages/chat/customer_list/chat.vue b/pages/chat/customer_list/chat.vue
index 007d711..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>
@@ -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,7 +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">
@@ -244,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>
@@ -268,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>
@@ -289,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>
@@ -310,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>
@@ -359,7 +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">
@@ -390,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>
@@ -427,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>
@@ -452,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>
@@ -473,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>
@@ -494,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>
@@ -536,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 }}
@@ -573,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>
@@ -598,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>
@@ -619,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>
@@ -640,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>
@@ -686,7 +706,7 @@
 						</block>
 					</block>
 					<view class="footer_box" v-if="productId || orderId || refund_order_id"></view>
-					<div class="broadcast-details_order footer_count" >
+					<div class="broadcast-details_order footer_count">
 						<!-- 商品信息 -->
 						<div class="broadcast-details_box" v-if="productId && productInfo.product_id">
 							<text class="iconfont icon-guanbi" @click.stop="productId = ''"></text>
@@ -780,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">
@@ -788,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" />
@@ -1214,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)
 					}
 				});
 			},
@@ -1792,7 +1813,7 @@
 
 	.broadcast-details .chat .item .text {
 		margin-left: 20rpx;
-	
+
 	}
 
 	.broadcast-details .chat .item .text.textR {
@@ -1946,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;
-		padding-bottom:  var(--status-bar-height);
+	
+		
+
 	}
 
 	.broadcast-details .footerCon.on {
 		position: relative;
-		top: -250rpx;
+		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 {
@@ -1974,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 {
@@ -1983,8 +2008,10 @@
 
 	.broadcast-details .footerCon .slider-banner .swiper-pagination-bullet-active {
 		background-color: #999;
-		
-		
+
+
+
+
 	}
 
 	.broadcast-details .recording {
@@ -2041,6 +2068,8 @@
 		padding: 0 80rpx 0 30rpx;
 		height: 76rpx;
 		position: relative;
+
+
 	}
 
 	.broadcast-details .footer .placeholder {
@@ -2069,6 +2098,8 @@
 		display: inline-block;
 		width: 50rpx;
 		height: 50rpx;
+
+
 		margin: 20rpx 0 0 40rpx;
 	}
 
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index d7a9b0c..9be2728 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -141,8 +141,8 @@
 				AllMenuList: [{
 						name: '商户平台',
 						icon: '/static/applet/shop_app.png',
-						// data: "__UNI__1EE148C",
-						data: '/pages/moreProject/moreProject',
+						data: "__UNI__1EE148C",
+						
 						type: 2,
 					},
 					{
@@ -359,7 +359,9 @@
 						break;
 						// case 2: uniMP.loadMPx(data); break;
 					case 2:
-						this.navigator(data);
+						// this.navigator(data);
+						uniMP.loadMPx(data);
+						
 						break;
 
 					case 3:
@@ -370,14 +372,14 @@
 				// #endif
 				// #ifdef H5
 
-				if (type == 2) {
-					this.navigator(data);
-				} else {
+				// if (type == 2) {
+				// 	this.navigator(`/pages/moreProject/moreProject`);
+				// } else {
 					uni.showToast({
 						icon: 'none',
 						title: 'H5不支持打开小程序'
 					})
-				}
+				// }
 				// #endif
 
 			},
diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue
index 2f8d435..6243428 100644
--- a/pages/moreProject/moreProject.vue
+++ b/pages/moreProject/moreProject.vue
@@ -39,11 +39,11 @@
 								<image class="icon_img" :src="`${prefix}zsgl.png`" mode="aspectFill"></image>
 								<text class="text">在售管理</text>
 							</view>
-							<!-- <view class="examine"
+							<view class="examine"
 								@click="navigator(`/pages/admin/order/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>
 							<!-- 	<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>
@@ -89,7 +89,7 @@
 								</image>
 								<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>
@@ -142,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>
@@ -210,7 +210,7 @@
 									<image class="icon_img" :src="`${prefix}cwgl.png`" mode="aspectFill"></image>
 									<text class="text">财务管理</text>
 								</view>
-								<!-- 	<view class="examine"
+							<!-- 		<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>
@@ -874,7 +874,7 @@
 				}
 
 			},
-			//
+			
 			logout() {
 				uni.switchTab({
 					url: '/pages/gather/gather'
diff --git a/pages/plantGrass/plant_detail/index.vue b/pages/plantGrass/plant_detail/index.vue
index cdee605..9702245 100644
--- a/pages/plantGrass/plant_detail/index.vue
+++ b/pages/plantGrass/plant_detail/index.vue
@@ -533,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/product/basicSet.vue b/pages/product/basicSet.vue
index 1ee001b..3edbf20 100644
--- a/pages/product/basicSet.vue
+++ b/pages/product/basicSet.vue
@@ -7,8 +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(0)"></u--image>
+						@click="delImg(2)"></u--image>
 				</block>
 				<view v-else class="upload" @click="seleckImage(0)">
 					<view class="iconfont icon-tupian1"></view>
@@ -72,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>
@@ -108,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>
@@ -132,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>
@@ -219,7 +225,7 @@
 				},
 				isZiti: false,
 				isKuaidi: false,
-				delivery_way: [1,2],
+				delivery_way: [1, 2],
 				takeName: '',
 				takePhone: '',
 				servicePhone: '',
@@ -269,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: {
@@ -286,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
@@ -303,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
@@ -372,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,
@@ -406,9 +412,9 @@
 						// 	url:'/pages/moreProject/moreProject'
 						// })
 						uni.redirectTo({
-							url:'/pages/moreProject/moreProject'
+							url: '/pages/moreProject/moreProject'
 						})
-						
+
 					}, 1000)
 				}).catch(err => {
 					Toast(err)
@@ -441,7 +447,7 @@
 				// 	sizeType: ['original', 'compressed'],
 				// 	sourceType: ['album', 'camera'],
 				// 	success: function(res) {
-					
+
 				// 		uni.showLoading({
 				// 			title: '上传中...'
 				// 		})
@@ -459,7 +465,7 @@
 				// 		Toast('添加失败')
 				// 	}
 				// });
-				
+
 			},
 			delImg(i) {
 				let that = this
diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue
index 882ce83..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;
 
 					},
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/utils/uniMPevent.js b/utils/uniMPevent.js
index 19262b2..d5eb984 100644
--- a/utils/uniMPevent.js
+++ b/utils/uniMPevent.js
@@ -50,5 +50,10 @@ export const initEvent = () => {
           console.log('Host sendEvent: ' + JSON.stringify(ret));
         });
     }
+  if (ret.event == 'log') {
+     // console.log('2222222')
+	 
+  	console.log('收到小程序事件: ' + JSON.stringify(ret));
+  }
   });
 }
\ No newline at end of file