diff --git a/components/activityHome.vue b/components/activityHome.vue
new file mode 100644
index 0000000..db74992
--- /dev/null
+++ b/components/activityHome.vue
@@ -0,0 +1,54 @@
+<template>
+  <view class="a_h_home">
+    <view class="a_h_body" v-if="show">
+      <image @click="open()" class="a_h_bg" src="../static/images/f7.png"></image>
+      <image @click="close()" class="a_h_close" src="../static/images/guanbi.png"></image>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    data(){
+      return {
+        show: true
+      }
+    },
+    methods:{
+      open(){
+        this.show
+      },
+      close(){
+        this.show = false;
+      }
+    }
+  }
+</script>
+
+<style lang="scss">
+.a_h_home{
+  position: fixed;
+  bottom: 150rpx;
+  right: 30rpx;
+  z-index: 9999999;
+  width: 150rpx;
+  height: 150rpx;
+  .a_h_bg{
+    height: 100%;
+    width: 100%;
+  }
+  .a_h_body{
+    width: 100%;
+    height: 100%;
+    // background-color: #eee;
+    position: relative;
+    .a_h_close{
+      position: absolute;
+      right: 5rpx;
+      top: 5rpx;
+      width: 30rpx;
+      height: 30rpx;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/main.js b/main.js
index 88585cf..64c5923 100644
--- a/main.js
+++ b/main.js
@@ -18,11 +18,13 @@ import {
 import skeleton from './components/skeleton/index.vue'
 import BaseMoney from './components/BaseMoney.vue';
 import Loading from './components/Loading.vue';
+import activityHome from './components/activityHome.vue';
 import uView from '@/uni_modules/uview-ui'
 Vue.use(uView)
 Vue.component('skeleton', skeleton)
 Vue.component('BaseMoney', BaseMoney)
 Vue.component('Loading', Loading)
+Vue.component('activityHome', activityHome)
 Vue.prototype.$util = util;
 Vue.prototype.$Cache = Cache;
 Vue.prototype.$eventHub = new Vue();
diff --git a/pages.json b/pages.json
index 92abdf0..01bb9ef 100644
--- a/pages.json
+++ b/pages.json
@@ -2,6 +2,15 @@
 	"pages": [
 		//pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
+			"path": "pages/supply_chains/supply_chains",
+			"style": {
+				"navigationBarTitleText": "供应",
+				"enablePullDownRefresh": true,
+				"navigationStyle": "custom",
+		    "onReachBottomDistance": 300
+			}
+		
+		},{
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "首页",
@@ -135,16 +144,8 @@
 			"style": {
 				"navigationBarTitleText": "支付提示"
 			}
-		}, {
-			"path": "pages/supply_chains/supply_chains",
-			"style": {
-				"navigationBarTitleText": "供应",
-				"enablePullDownRefresh": true,
-				"navigationStyle": "custom",
-        "onReachBottomDistance": 300
-			}
-
-		}, {
+		}, 
+     {
 			"path": "pages/moreProject/moreProject",
 			"style": {
 				"navigationBarTitleText": "商户平台",
@@ -1715,33 +1716,34 @@
 		"borderStyle": "white",
 		"backgroundColor": "#ffffff",
 
-		"list": [{
-				"pagePath": "pages/index/index",
-				"iconPath": "static/tabbar_icon/a.png",
-				"selectedIconPath": "static/tabbar_icon/a-a.png",
-				"text": "泸州"
+		"list": [
+      
+      {
+      	"pagePath": "pages/supply_chains/supply_chains",
+      	"iconPath": "static/tabbar_icon/d.png",
+      	"selectedIconPath": "static/tabbar_icon/d-a.png",
+      	"text": "供销"
+      },
+   //    {
+			// 	"pagePath": "pages/index/index",
+			// 	"iconPath": "static/tabbar_icon/a.png",
+			// 	"selectedIconPath": "static/tabbar_icon/a-a.png",
+			// 	"text": "泸州"
 
-			},
+			// },
 			{
 				"pagePath": "pages/gather/gather",
 				"iconPath": "static/tabbar_icon/b.png",
 				"selectedIconPath": "static/tabbar_icon/b-a.png",
 				"text": "生产"
 			},
-			{
-				"pagePath": "pages/plant_release/index",
-				"iconPath": "static/tabbar_icon/c.png",
-				"selectedIconPath": "static/tabbar_icon/c-a.png",
-				"text": "发布"
+			// {
+			// 	"pagePath": "pages/plant_release/index",
+			// 	"iconPath": "static/tabbar_icon/c.png",
+			// 	"selectedIconPath": "static/tabbar_icon/c-a.png",
+			// 	"text": "发布"
 
-			},
-			{
-				"pagePath": "pages/supply_chains/supply_chains",
-
-				"iconPath": "static/tabbar_icon/d.png",
-				"selectedIconPath": "static/tabbar_icon/d-a.png",
-				"text": "供销"
-			},
+			// },
 			{
 				"pagePath": "pages/user/index",
 				"iconPath": "static/tabbar_icon/e.png",
diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index 99fa040..cb0f1d1 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -215,7 +215,7 @@
 					</view> -->
 						<view class="item no-border">
 							<view class='acea-row row-middle'>
-								<text class="item-title">请上传营业执照及行业相关资质证明图片</text>
+								<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"
diff --git a/pages/store/settled/unit.vue b/pages/store/settled/unit.vue
index 624e7a0..b4cf061 100644
--- a/pages/store/settled/unit.vue
+++ b/pages/store/settled/unit.vue
@@ -7,7 +7,7 @@
 					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:'+statusBarHeight+'px'"></view>
@@ -17,7 +17,7 @@
 			<form report-submit='true'>
 				<view class='merchantsSettled'>
 					<view class="merchantBgCount">
-						<image mode="widthFix" class="merchantBg" :src="domain+'/static/diy/merchantBg'+keyColor+'.jpg'"
+						<image mode="widthFix" class="merchantBg" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/d8208202401171727545921.png"
 							alt="">
 					</view>
 					<view class="application-record" @click="jumpToList" v-if="!mer_i_id">
diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue
index 0197e3f..df531a8 100644
--- a/pages/supply_chains/supply_chains.vue
+++ b/pages/supply_chains/supply_chains.vue
@@ -160,6 +160,8 @@
       <view class="locationb"> 用于向你推荐最近门店 </view>
       <view class="locationx" @click.stop="isshow=false">x</view>
     </view>
+    
+    <!-- <activityHome></activityHome> -->
     <!-- <m-tabbar native>
 		      <template v-slot:tabbar_index_2>
 		        <view class="custom_style">
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 970d9af..c6958f4 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -75,10 +75,14 @@
 							<text class="num">{{userInfo.total_visit_product || 0}}</text>
 							<view class="txt">浏览记录</view>
 						</view>
-						<view class="num-item" @click="goMenuPage('/pages/users/user_coupon/index')">
+						<!-- <view class="num-item" @click="goMenuPage('/pages/users/user_coupon/index')">
 							<text class="num">{{userInfo.total_coupon || 0}}</text>
 							<view class="txt">优惠券</view>
-						</view>
+						</view> -->
+            <view class="num-item" @click="goMenuPage('/pages/users/user_coupon/index')">
+            	<text class="num">{{userInfo.total_coupon || 0}}</text>
+            	<view class="txt">购物券</view>
+            </view>
 					</view>
 					<navigator hover-class="none"
 						:url="userInfo.is_svip > 0 ? '/pages/annex/vip_center/index' : '/pages/annex/vip_paid/index'"
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index f3e38e2..0bddb33 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -414,7 +414,7 @@
 		<addInvoicing ref="addInvoicing" @changeInvoiceClose="changeInvoiceClose" :invoice='invoice'></addInvoicing>
 		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
 		<block v-if="isShowBox">
-			<checkDelivery :deliveryName="deliveryName" :isShowBox="isShowBox" :activeObj="activeObj"
+			<checkDelivery ref="checkRef" :deliveryName="deliveryName" :isShowBox="isShowBox" :activeObj="activeObj"
 				:radioList="radioList" @close="boxClose" @confirmBtn="getData">
 			</checkDelivery>
 		</block>
@@ -478,6 +478,7 @@
 	import {
 		HTTP_REQUEST_URL
 	} from '@/config/app';
+import { Toast } from '../../../libs/uniApi';
 	export default {
 		components: {
 			couponListWindow,
@@ -504,6 +505,8 @@
 				msgObj: {},
 				textareaStatus: true,
 				deliveryName: '快递配送',
+        reLoad: 0, //重新加载
+        is_self_pickup: false, //是否只支持到店核销
 				//支付方式
 				cartArr: [{
 						"name": "微信支付",
@@ -753,6 +756,9 @@
 		// onHide: function() {
 		// },
 		methods: {
+      testLog(item){
+        console.log('详情', {...item});
+      },
 			/*预售协议*/
 			getPresellAgree: function() {
 				this.showProtocol = true
@@ -1107,6 +1113,18 @@
 						}
 					})
 					uni.hideLoading();
+          
+          if(res.data.is_self_pickup&&this.reLoad==0){  // 只支持到店核销
+            this.is_self_pickup = res.data.is_self_pickup;
+            this.reLoad = 1;
+            this.activeObj = res.data.order[0];
+            this.activeIndex = 0;
+            res.data.order.forEach(item=>{
+              this.getDeliveryType(item);
+              this.getData(item);
+            })
+          }
+          
 				}).catch(err => {
 					return this.$util.Tips({
 						title: err
@@ -1651,6 +1669,7 @@
 			},
 			// 打开配送方式弹窗
 			openShowBox(item, index) {
+        if(this.is_self_pickup) return Toast('暂不支持其他配送方式')
 				if (item.delivery_way.length == 2) {
 					this.activeObj = item
 					this.activeIndex = index
@@ -1686,9 +1705,12 @@
 				this.isShowBox = false
 			},
 			getData(data) {
-				this.cartInfo[this.activeIndex] = data
-				if (data.order.isTake) {
-					this.take.push(data.mer_id)
+				this.cartInfo[this.activeIndex] = data;
+				if (data.order.isTake || (this.reLoad==1&&!data.order.isTake)) { //this.reLoad只支持到店核销时使用
+					// this.take.push(data.mer_id);
+          if (!this.take.includes(data.mer_id)) {
+            this.take.push(data.mer_id)
+          }
 				} else {
 					this.take.forEach((item, i) => {
 						if (data.mer_id == item) {
diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue
index a404a4b..00f2fdf 100644
--- a/pages/users/order_list/index.vue
+++ b/pages/users/order_list/index.vue
@@ -253,7 +253,7 @@
 									<view v-if="!item.receipt && item.status != -1 && (item.status != 0)" 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, item )'>查看详情</view>
+										<view class='bnt b-color' @click='goOrderDetails(item.order_id, item)'>查看详情</view>
 									</block>
 									<block v-if="item.status == 1">
 										<view class='bnt cancelBnt'