From a87694f02c9eac5d1c143876f6d1f862ce25e871 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Wed, 27 Sep 2023 14:17:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E5=85=A5=E9=A9=BB=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E7=94=9F=E4=BA=A7=E7=BC=B4=E7=BA=B3=E4=BF=9D=E8=AF=81?=
 =?UTF-8?q?=E9=87=91=20=20=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                        |    2 +-
 pages/gather/gather.vue           | 1286 ++++++++++++++---------------
 pages/moreProject/moreProject.vue |   38 +-
 pages/store/settled/index.vue     |  455 +++++-----
 4 files changed, 870 insertions(+), 911 deletions(-)

diff --git a/pages.json b/pages.json
index b957f87..f8048ae 100644
--- a/pages.json
+++ b/pages.json
@@ -151,7 +151,7 @@
             "path" : "pages/margin/margin",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                "navigationBarTitleText":"缴纳保证金",
                 "enablePullDownRefresh": false
             }
             
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index 4059884..e8d6b6d 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -1,743 +1,697 @@
 <template>
-  <view class="gather">
-    <view v-if="isFshow">
-      <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>
-          <view class="town_name">{{ street }}</view>
-        </view>
-        <navigator
-          url="/pages/chat/customer_list/index?type=0"
-          hover-class="none"
-        >
-          <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>
-        <navigator
-          url="/pages/chat/customer_list/index?type=0"
-          hover-class="none"
-        >
-          <view class="iconfont icon-xiaoxi" style="color: #fff"> </view>
-        </navigator>
-      </view>
-    </view>
+	<view class="gather">
+		<view v-if="isFshow">
+			<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>
+					<view class="town_name">{{ street }}</view>
+				</view>
+				<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
+					<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>
+				<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
+					<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>
-    <view class="business com special_work" v-if="jurisdiction == false">
-      <view class="title project">
-        <view>更多功能</view>
-        <view v-if="!editFlag" class="edit" @click="editFlag = true">编辑</view>
-        <view v-else class="edit" @click="editComfirm">完成</view>
-      </view>
-      <view class="content">
-        <block v-if="nowMenuList.length > 0">
-          <u-transition
-            v-for="(item, index) in nowMenuList"
-            :key="item.name"
-            show
-          >
-            <view
-              class="examine"
-              @click="
+		<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>
+		<view class="business com special_work" v-if="jurisdiction == false">
+			<view class="title project">
+				<view>更多功能</view>
+				<view v-if="!editFlag" class="edit" @click="editFlag = true">编辑</view>
+				<view v-else class="edit" @click="editComfirm">完成</view>
+			</view>
+			<view class="content">
+				<block v-if="nowMenuList.length > 0">
+					<u-transition v-for="(item, index) in nowMenuList" :key="item.name" show>
+						<view class="examine" @click="
                 editFlag ? removeMenu(item) : clickMenu(item.type, item.data)
-              "
-            >
-              <image class="icon_img" :src="item.icon" mode="aspectFit">
-              </image>
-              <u-icon
-                v-if="editFlag"
-                class="icon"
-                name="minus-circle-fill"
-                color="red"
-              ></u-icon>
-              <text class="text">{{ item.name }}</text>
-            </view>
-          </u-transition>
-        </block>
-        <view
-          v-else-if="!editFlag"
-          @click="editFlag = true"
-          style="text-align: center; width: 100%; color: #aaa"
-          >还没有应用,点我添加应用</view
-        >
-      </view>
-    </view>
-    <view v-if="editFlag" class="business com special_work edit_card">
-      <view class="title project" style="padding: 0 28rpx">
-        <view>编辑功能</view>
-        <view class="edit2" @click="editComfirm">完成</view>
-      </view>
-      <view class="content">
-        <u-transition
-          v-for="(item, index) in AllMenuList"
-          :key="item.name"
-          show
-        >
-          <view class="examine" @click="pushMenu(item)">
-            <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>
-        </u-transition>
-      </view>
-    </view>
+              ">
+							<image class="icon_img" :src="item.icon" mode="aspectFit">
+							</image>
+							<u-icon v-if="editFlag" class="icon" name="minus-circle-fill" color="red"></u-icon>
+							<text class="text">{{ item.name }}</text>
+						</view>
+					</u-transition>
+				</block>
+				<view v-else-if="!editFlag" @click="editFlag = true"
+					style="text-align: center; width: 100%; color: #aaa">还没有应用,点我添加应用</view>
+			</view>
+		</view>
+		<view v-if="editFlag" class="business com special_work edit_card">
+			<view class="title project" style="padding: 0 28rpx">
+				<view>编辑功能</view>
+				<view class="edit2" @click="editComfirm">完成</view>
+			</view>
+			<view class="content">
+				<u-transition v-for="(item, index) in AllMenuList" :key="item.name" show>
+					<view class="examine" @click="pushMenu(item)">
+						<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>
+				</u-transition>
+			</view>
+		</view>
 
-    <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>
+		<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>
 		        <view class="custom_style">
 		          <view class="custom_style_icon"></view>
 		        </view>
 		      </template>
 		    </m-tabbar> -->
-  </view>
+	</view>
 </template>
 
 <script>
-import Cache from '@/utils/cache';
-import mTabbar from '@/components/m-tabbar/m-tabbar.vue'
+	import Cache from '@/utils/cache';
+	import mTabbar from '@/components/m-tabbar/m-tabbar.vue'
 
-import zbpSwiper from '@/components/zbpSwiper'
-import {
-  getArea,
-  getStreet
-} from '@/api/article.js';
-import {
-  mapState,
-  mapGetters
-} from 'vuex'
-import {
-  getWorkArticleCount,
-  getSlideAPI
-} from '@/api/article.js'
-import {
-  getStoreList,
-  getUserInfo
-} from '@/api/user.js'
-import {
-  getGeocoder,
-  microSeachBarCode,
-  microEadtProduct
-} from '@/api/store.js'
-import {
-  Toast
-} from '@/libs/uniApi';
-import {
-  getDiy
-} from '@/api/api.js';
-// #ifdef APP-PLUS
-import uniMP from '@/utils/uniMP.js';
-// #endif
+	import zbpSwiper from '@/components/zbpSwiper'
+	import {
+		getArea,
+		getStreet
+	} from '@/api/article.js';
+	import {
+		mapState,
+		mapGetters
+	} from 'vuex'
+	import {
+		getWorkArticleCount,
+		getSlideAPI
+	} from '@/api/article.js'
+	import {
+		getStoreList,
+		getUserInfo
+	} from '@/api/user.js'
+	import {
+		getGeocoder,
+		microSeachBarCode,
+		microEadtProduct
+	} from '@/api/store.js'
+	import {
+		Toast
+	} from '@/libs/uniApi';
+	import {
+		getDiy
+	} from '@/api/api.js';
+	// #ifdef APP-PLUS
+	import uniMP from '@/utils/uniMP.js';
+	// #endif
 
-export default {
-  components: {
-    mTabbar,
-    zbpSwiper
+	export default {
+		components: {
+			mTabbar,
+			zbpSwiper
 
-  },
-  data () {
-    return {
-      locationArr: ({}),
-      emptyText: '暂无可用应用',
-      jurisdiction: false, // 是否有权限
-      mer_id: '',
-      userInfoData: {
-        mer_info: {
-          type_id: 0
-        }
-      },
-      prefix: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/11/',
-      isShow: false,
-      isFshow: false,
-      street: '',
-      // 编辑中标记
-      editFlag: false,
-      // 所有菜单的按钮
-      AllMenuList: [{
-        name: '商户平台',
-        icon: '/static/applet/shop_app.png',
-        data: "__UNI__1EE148C",
-        type: 2,
-      },
-      {
-        name: '供销平台',
-        icon: '/static/applet/gx_app.png',
-        data: '__UNI__B5B1EDD',
-        type: 1,
-      },
-      {
-        name: '农业咨询',
-        icon: '/static/applet/ny.png',
-        data: {
-          id: '__UNI__9620511',
-          url: 'https://ceshi-worker-task.lihaink.cn/api/common/getMiniProgramInfo?name=nongye',
-        },
-        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,
-      }
-      ],
-      nowMenuList: [],
-      street: '',
-      showPicker: false,
-      columnData: [],
+		},
+		data() {
+			return {
+				locationArr: ({}),
+				emptyText: '暂无可用应用',
+				jurisdiction: false, // 是否有权限
+				mer_id: '',
+				userInfoData: {
+					mer_info: {
+						type_id: 0
+					}
+				},
+				prefix: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/11/',
+				isShow: false,
+				isFshow: false,
+				street: '',
+				// 编辑中标记
+				editFlag: false,
+				// 所有菜单的按钮
+				AllMenuList: [{
+						name: '商户平台',
+						icon: '/static/applet/shop_app.png',
+						// data: "__UNI__1EE148C",
+						data: '/pages/moreProject/moreProject',
+						type: 2,
+					},
+					{
+						name: '供销平台',
+						icon: '/static/applet/gx_app.png',
+						data: '__UNI__B5B1EDD',
+						type: 1,
+					},
+					{
+						name: '农业咨询',
+						icon: '/static/applet/ny.png',
+						data: {
+							id: '__UNI__9620511',
+							url: 'https://ceshi-worker-task.lihaink.cn/api/common/getMiniProgramInfo?name=nongye',
+						},
+						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,
+					}
+				],
+				nowMenuList: [],
+				street: '',
+				showPicker: false,
+				columnData: [],
 
-      isFshow: false,
-      backColor: 'rgba(252, 252, 252, 0)'
-    };
-  },
-  computed: {
-    ...mapGetters(['userInfo', 'location', 'isLogin'])
-  },
-  created () { },
-  onLoad () {
-    this.Area()
-    this.initMenu();
-  },
+				isFshow: false,
+				backColor: 'rgba(252, 252, 252, 0)'
+			};
+		},
+		computed: {
+			...mapGetters(['userInfo', 'location', 'isLogin'])
+		},
+		created() {},
+		onLoad() {
+			this.Area()
+			this.initMenu();
+		},
 
-  onShow () {
-    if (this.isLogin) {
-      this.emptyText = '暂无可用应用'
-      this.jurisdiction = false
-    } else {
-      this.emptyText = '请登录'
-      this.jurisdiction = true
-    }
-    this.getUserInfo()
+		onShow() {
+			if (this.isLogin) {
+				this.emptyText = '暂无可用应用'
+				this.jurisdiction = false
+			} else {
+				this.emptyText = '请登录'
+				this.jurisdiction = true
+			}
+			this.getUserInfo()
 
-  },
+		},
 
-  onPullDownRefresh () {
-    this.getUserInfo()
-    uni.stopPullDownRefresh()
-  },
-  beforeDestroy () {
-    // 销毁监听事件
-    this.$bus.$off('value-updated')
-  },
-  mounted () {
-    if (this.street.length <= 0) {
-      this.appLocation()
-    }
-    // #ifdef  H5
-    // 监听页面滚动事件
-    window.addEventListener("scroll", this.scrolling);
-    // #endif
+		onPullDownRefresh() {
+			this.getUserInfo()
+			uni.stopPullDownRefresh()
+		},
+		beforeDestroy() {
+			// 销毁监听事件
+			this.$bus.$off('value-updated')
+		},
+		mounted() {
+			if (this.street.length <= 0) {
+				this.appLocation()
+			}
+			// #ifdef  H5
+			// 监听页面滚动事件
+			window.addEventListener("scroll", this.scrolling);
+			// #endif
 
-    this.$bus.$on('value-updated', (newValue) => {
-      // 更新父组件的值 
-      this.street = newValue.split(',')[0]
-    });
+			this.$bus.$on('value-updated', (newValue) => {
+				// 更新父组件的值 
+				this.street = newValue.split(',')[0]
+			});
 
-  },
-  // #ifdef APP-PLUS
-  onPageScroll (e) {
-    const scrollTop = e.scrollTop;
-    if (scrollTop <= 20) {
-      this.backColor = 'rgba(252, 252, 252, 0)'
-      this.isFshow = false
-    } else if (20 < scrollTop && scrollTop <= 100) {
-      this.backColor = 'rgba(252, 252, 252, .5)'
-      this.isFshow = true
-    } else if (scrollTop > 100) {
-      this.backColor = 'rgba(252, 252, 252, 1)'
-      this.isFshow = true
-    }
-  },
-  // #endif
+		},
+		// #ifdef APP-PLUS
+		onPageScroll(e) {
+			const scrollTop = e.scrollTop;
+			if (scrollTop <= 20) {
+				this.backColor = 'rgba(252, 252, 252, 0)'
+				this.isFshow = false
+			} else if (20 < scrollTop && scrollTop <= 100) {
+				this.backColor = 'rgba(252, 252, 252, .5)'
+				this.isFshow = true
+			} else if (scrollTop > 100) {
+				this.backColor = 'rgba(252, 252, 252, 1)'
+				this.isFshow = true
+			}
+		},
+		// #endif
 
-  methods: {
-    scrolling () {
-      // 滚动条距文档顶部的距离
-      let scrollTop =
-        window.pageYOffset ||
-        document.documentElement.scrollTop ||
-        document.body.scrollTop;
-      // 滚动条滚动的距离
-      let scrollStep = scrollTop - this.oldScrollTop;
-      // console.log("header 滚动距离 ", scrollTop);
-      // 更新——滚动前，滚动条距文档顶部的距离
-      this.oldScrollTop = scrollTop;
+		methods: {
+			scrolling() {
+				// 滚动条距文档顶部的距离
+				let scrollTop =
+					window.pageYOffset ||
+					document.documentElement.scrollTop ||
+					document.body.scrollTop;
+				// 滚动条滚动的距离
+				let scrollStep = scrollTop - this.oldScrollTop;
+				// console.log("header 滚动距离 ", scrollTop);
+				// 更新——滚动前，滚动条距文档顶部的距离
+				this.oldScrollTop = scrollTop;
 
-      //变量windowHeight是可视区的高度
-      let windowHeight =
-        document.documentElement.clientHeight || document.body.clientHeight;
-      //变量scrollHeight是滚动条的总高度
-      let scrollHeight =
-        document.documentElement.scrollHeight || document.body.scrollHeight;
+				//变量windowHeight是可视区的高度
+				let windowHeight =
+					document.documentElement.clientHeight || document.body.clientHeight;
+				//变量scrollHeight是滚动条的总高度
+				let scrollHeight =
+					document.documentElement.scrollHeight || document.body.scrollHeight;
 
-      //滚动条到底部的条件
-      if (scrollTop + windowHeight == scrollHeight) {
-        //你想做的事情
-        // console.log("header  你已经到底部了");
-      }
+				//滚动条到底部的条件
+				if (scrollTop + windowHeight == scrollHeight) {
+					//你想做的事情
+					// console.log("header  你已经到底部了");
+				}
 
 
-      if (scrollTop <= 20) {
-        this.backColor = 'rgba(252, 252, 252, 0)'
-        this.isFshow = false
-      } else if (20 < scrollTop && scrollTop <= 100) {
-        this.backColor = 'rgba(252, 252, 252, .5)'
-        this.isFshow = true
-      } else if (scrollTop > 100) {
-        this.backColor = 'rgba(252, 252, 252, 1)'
-        this.isFshow = true
+				if (scrollTop <= 20) {
+					this.backColor = 'rgba(252, 252, 252, 0)'
+					this.isFshow = false
+				} else if (20 < scrollTop && scrollTop <= 100) {
+					this.backColor = 'rgba(252, 252, 252, .5)'
+					this.isFshow = true
+				} else if (scrollTop > 100) {
+					this.backColor = 'rgba(252, 252, 252, 1)'
+					this.isFshow = true
 
 
-      }
+				}
 
 
-    },
-    // 初始化菜单
-    initMenu () {
-      let now = uni.getStorageSync('gatherNowMenuList');
-      try {
-        this.nowMenuList = JSON.parse(now);
-        this.AllMenuList = this.AllMenuList.filter((item) => {
-          return this.nowMenuList.find(t => t.name == item.name)?.name != item.name;
-        })
-      } catch (e) {
-        this.nowMenuList = [];
-      }
-    },
-    clickMenu (e, data) {
-      this.getUniMp(e, data);
-    },
-    // 添加菜单
-    pushMenu (data) {
-      this.nowMenuList.push(data);
-      this.AllMenuList = this.AllMenuList.filter((item) => {
-        return item.name != data.name;
-      })
-    },
-    // 移除菜单
-    removeMenu (data) {
-      this.AllMenuList.push(data);
-      this.nowMenuList = this.nowMenuList.filter((item) => {
-        return item.name != data.name;
-      })
-    },
-    // 编辑完成
-    editComfirm () {
-      this.editFlag = false;
-      uni.setStorageSync('gatherNowMenuList', JSON.stringify(this.nowMenuList));
-    },
-    getUniMp (type, data) {
-      // #ifdef APP-PLUS
-      switch (type) {
-        case 1: uniMP.loadMP(data); break;
-        case 2: uniMP.loadMPx(data); break;
-        case 3: uniMP.loadMPurl(data); break;
-      }
-      return;
-      // #endif
-      uni.showToast({
-        icon: 'none',
-        title: 'H5不支持打开小程序'
-      })
-    },
-    changeHandler (e) {
-      const {
-        columnIndex,
-        value,
-        values,
-        index,
-        picker = this.$refs.uPicker
-      } = e;
-      if (columnIndex === 0) {
-        getStreet({
-          area_code: value[0]['code']
-        }).then(res => {
-          this.$refs.uPicker.setColumnValues(1, res.data);
-        });
-      }
-    },
+			},
+			// 初始化菜单
+			initMenu() {
+				let now = uni.getStorageSync('gatherNowMenuList');
+				try {
+					this.nowMenuList = JSON.parse(now);
+					this.AllMenuList = this.AllMenuList.filter((item) => {
+						return this.nowMenuList.find(t => t.name == item.name)?.name != item.name;
+					})
+				} catch (e) {
+					this.nowMenuList = [];
+				}
+			},
+			clickMenu(e, data) {
+				this.getUniMp(e, data);
+			},
+			// 添加菜单
+			pushMenu(data) {
+				this.nowMenuList.push(data);
+				this.AllMenuList = this.AllMenuList.filter((item) => {
+					return item.name != data.name;
+				})
+			},
+			// 移除菜单
+			removeMenu(data) {
+				this.AllMenuList.push(data);
+				this.nowMenuList = this.nowMenuList.filter((item) => {
+					return item.name != data.name;
+				})
+			},
+			// 编辑完成
+			editComfirm() {
+				this.editFlag = false;
+				uni.setStorageSync('gatherNowMenuList', JSON.stringify(this.nowMenuList));
+			},
+			getUniMp(type, data) {
+				// #ifdef APP-PLUS
+				switch (type) {
+					case 1:
+						uniMP.loadMP(data);
+						break;
+						// case 2: uniMP.loadMPx(data); break;
+					case 2:
+						this.navigator(data); break;
+						
+					case 3:
+						uniMP.loadMPurl(data);
+						break;
+				}
+				return;
+				// #endif
+				uni.showToast({
+					icon: 'none',
+					title: 'H5不支持打开小程序'
+				})
+			},
+			changeHandler(e) {
+				const {
+					columnIndex,
+					value,
+					values,
+					index,
+					picker = this.$refs.uPicker
+				} = e;
+				if (columnIndex === 0) {
+					getStreet({
+						area_code: value[0]['code']
+					}).then(res => {
+						this.$refs.uPicker.setColumnValues(1, res.data);
+					});
+				}
+			},
 
-    Area () {
-      getArea({
-        city_code: 510500
-      }).then(res => {
-        this.$refs.uPicker.setColumnValues(0, res.data);
-        this.Street(res.data[0]['code']);
-      });
-    },
-    Street (code) {
-      getStreet({
-        area_code: code
-      }).then(res => {
-        this.$refs.uPicker.setColumnValues(1, res.data);
-      });
-    },
-    selectLocation () {
-      this.showPicker = true
-    },
-    confirm (e) {
-      this.street = e.value[1].name
+			Area() {
+				getArea({
+					city_code: 510500
+				}).then(res => {
+					this.$refs.uPicker.setColumnValues(0, res.data);
+					this.Street(res.data[0]['code']);
+				});
+			},
+			Street(code) {
+				getStreet({
+					area_code: code
+				}).then(res => {
+					this.$refs.uPicker.setColumnValues(1, res.data);
+				});
+			},
+			selectLocation() {
+				this.showPicker = true
+			},
+			confirm(e) {
+				this.street = e.value[1].name
 
-      this.$nextTick(() => {
-        this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
+				this.$nextTick(() => {
+					this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
 
-      })
-      this.showPicker = false
-    },
-    appLocation () {
-      uni.getLocation({
-        type: 'wgs84',
-        timeout: '10',
-        success: (res) => {
-          // console.log(res)
-          this.isshow = false
-          let latitude, longitude;
-          latitude = res.latitude.toString();
-          longitude = res.longitude.toString();
-          getGeocoder({
-            lat: latitude,
-            long: longitude
-          }).then(res => {
-            let town = res.data.address_reference.town.title
-            let street_id = res.data.address_reference.town.id
-            this.street = res.data.address_component.street
-            this.$nextTick(() => {
-              this.$bus.$emit('value-updated', this.street + ',' +
-                street_id);
+				})
+				this.showPicker = false
+			},
+			appLocation() {
+				uni.getLocation({
+					type: 'wgs84',
+					timeout: '10',
+					success: (res) => {
+						// console.log(res)
+						this.isshow = false
+						let latitude, longitude;
+						latitude = res.latitude.toString();
+						longitude = res.longitude.toString();
+						getGeocoder({
+							lat: latitude,
+							long: longitude
+						}).then(res => {
+							let town = res.data.address_reference.town.title
+							let street_id = res.data.address_reference.town.id
+							this.street = res.data.address_component.street
+							this.$nextTick(() => {
+								this.$bus.$emit('value-updated', this.street + ',' +
+									street_id);
 
-            })
+							})
 
-          }).catch(err => {
-            this.isshow = false
-            uni.showToast({
-              title: err,
-              icon: 'none'
-            })
-          })
-        },
-        fail: (err) => {
-          this.isshow = false
+						}).catch(err => {
+							this.isshow = false
+							uni.showToast({
+								title: err,
+								icon: 'none'
+							})
+						})
+					},
+					fail: (err) => {
+						this.isshow = false
 
-        }
-      });
-    },
+					}
+				});
+			},
 
 
-    navigator (url, t) {
-      // if (this.userInfoData.is_wsxx === 0 && t != '商户设置') return Toast("请完善商户信息");
-      uni.navigateTo({
-        url: url
-      })
-    },
-    getUserInfo: function () {
-      let that = this;
-      getUserInfo().then(res => {
-        that.userInfoData = res.data;
-        that.$store.commit('SET_USERINFO', res.data);
-        // console.log(res.data.service);
-        if (res.data.service == null) {
-          // console.log('123');
-          this.isShow = false
-        } else {
-          this.isShow = true
-          this.mer_id = res.data.service.mer_id
-        }
+			navigator(url, t) {
+				// if (this.userInfoData.is_wsxx === 0 && t != '商户设置') return Toast("请完善商户信息");
+				uni.navigateTo({
+					url: url
+				})
+			},
+			getUserInfo: function() {
+				let that = this;
+				getUserInfo().then(res => {
+					that.userInfoData = res.data;
+					that.$store.commit('SET_USERINFO', res.data);
+					// console.log(res.data.service);
+					if (res.data.service == null) {
+						// console.log('123');
+						this.isShow = false
+					} else {
+						this.isShow = true
+						this.mer_id = res.data.service.mer_id
+					}
 
-        if (!res.data.mer_info) {
-          that.$set(this, 'jurisdiction', false);
-        }
-        // console.log(that.userInfoData);
-      });
-    }
-  }
-};
+					if (!res.data.mer_info) {
+						that.$set(this, 'jurisdiction', false);
+					}
+					// console.log(that.userInfoData);
+				});
+			}
+		}
+	};
 </script>
 <style lang="scss" scoped>
-.gather {
-  padding-bottom: 164.91rpx;
-  background: linear-gradient(180deg, #ffffff 0%, #f6f6f6 100%);
-  position: relative;
-}
+	.gather {
+		padding-bottom: 164.91rpx;
+		background: linear-gradient(180deg, #ffffff 0%, #f6f6f6 100%);
+		position: relative;
+	}
 
-.sitebox {
-  animation-name: fadeIn;
-  animation-duration: 3s;
-  animation-fill-mode: forwards;
-}
+	.sitebox {
+		animation-name: fadeIn;
+		animation-duration: 3s;
+		animation-fill-mode: forwards;
+	}
 
-@keyframes fadeIn {
-  from {
-    opacity: 0;
-  }
+	@keyframes fadeIn {
+		from {
+			opacity: 0;
+		}
 
-  to {
-    opacity: 1;
-  }
-}
+		to {
+			opacity: 1;
+		}
+	}
 
-.site-box1 {
-  width: 706rpx;
-  /* #ifdef MP || APP-PLUS */
-  height: 160rpx;
-  /* #endif */
-  /* #ifdef H5 */
-  height: 120rpx;
-  /* #endif */
-  margin-bottom: 26.32rpx;
-  position: absolute;
-  top: 45rpx;
-  left: 20rpx;
+	.site-box1 {
+		width: 706rpx;
+		/* #ifdef MP || APP-PLUS */
+		height: 160rpx;
+		/* #endif */
+		/* #ifdef H5 */
+		height: 120rpx;
+		/* #endif */
+		margin-bottom: 26.32rpx;
+		position: absolute;
+		top: 45rpx;
+		left: 20rpx;
 
-  z-index: 999;
+		z-index: 999;
 
-  // 位置
-  .place_wrapper {
-    color: #fff;
-    margin-right: 0rpx;
+		// 位置
+		.place_wrapper {
+			color: #fff;
+			margin-right: 0rpx;
 
-    font-size: 30rpx;
+			font-size: 30rpx;
 
-    .town_name {
-      margin-left: 21rpx;
-    }
-  }
+			.town_name {
+				margin-left: 21rpx;
+			}
+		}
 
-  .iconfont {
-    font-size: 35.09rpx;
-  }
-}
+		.iconfont {
+			font-size: 35.09rpx;
+		}
+	}
 
-.site-box {
-  width: 100%;
-  /* #ifdef MP || APP-PLUS */
-  height: 160rpx;
-  /* #endif */
-  /* #ifdef H5 */
-  height: 120rpx;
-  /* #endif */
-  margin-bottom: 26.32rpx;
-  position: absolute;
-  top: 0rpx;
-  position: fixed;
-  z-index: 999;
-  /* #ifdef MP || APP-PLUS */
-  padding-top: 75rpx;
-  /* #endif */
-  /* #ifdef H5 */
-  padding-top: 25rpx;
-  /* #endif */
-  // background-color: #e5e5e5;
-  background: url("@/static/images/bg2.png") no-repeat;
-  background-size: 100% 100%;
-  padding-right: 20rpx;
+	.site-box {
+		width: 100%;
+		/* #ifdef MP || APP-PLUS */
+		height: 160rpx;
+		/* #endif */
+		/* #ifdef H5 */
+		height: 120rpx;
+		/* #endif */
+		margin-bottom: 26.32rpx;
+		position: absolute;
+		top: 0rpx;
+		position: fixed;
+		z-index: 999;
+		/* #ifdef MP || APP-PLUS */
+		padding-top: 75rpx;
+		/* #endif */
+		/* #ifdef H5 */
+		padding-top: 25rpx;
+		/* #endif */
+		// background-color: #e5e5e5;
+		background: url("@/static/images/bg2.png") no-repeat;
+		background-size: 100% 100%;
+		padding-right: 20rpx;
 
-  // 位置
-  .place_wrapper {
-    color: #fff;
-    margin-right: 24.56rpx;
-    font-size: 30rpx;
+		// 位置
+		.place_wrapper {
+			color: #fff;
+			margin-right: 24.56rpx;
+			font-size: 30rpx;
 
-    opacity: 0;
+			opacity: 0;
 
-    .town_name {
-      margin-left: 21rpx;
-    }
-  }
+			.town_name {
+				margin-left: 21rpx;
+			}
+		}
 
-  .iconfont {
-    opacity: 0;
-    font-size: 30rpx;
-    font-size: 35.09rpx;
-  }
-}
+		.iconfont {
+			opacity: 0;
+			font-size: 30rpx;
+			font-size: 35.09rpx;
+		}
+	}
 
-.top_box {
-  // padding-top: 180rpx;
-  background: linear-gradient(#36a2ff, #fff);
-}
+	.top_box {
+		// padding-top: 180rpx;
+		background: linear-gradient(#36a2ff, #fff);
+	}
 
-.com {
-  margin-left: 50%;
-  transform: translate(-50%);
-}
+	.com {
+		margin-left: 50%;
+		transform: translate(-50%);
+	}
 
-.business {
-  width: 694.74rpx;
-  // margin-bottom: 175rpx;
-}
+	.business {
+		width: 694.74rpx;
+		// margin-bottom: 175rpx;
+	}
 
-.special_work {
-  // padding: 17.54rpx;
-  width: 694.74rpx;
-  margin-top: 52.63rpx;
-  border-radius: 17.54rpx;
-  // box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.16);
+	.special_work {
+		// padding: 17.54rpx;
+		width: 694.74rpx;
+		margin-top: 52.63rpx;
+		border-radius: 17.54rpx;
+		// box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.16);
 
-  .title {
-    font-size: 31.58rpx;
-    font-weight: 700;
-    margin-bottom: 38.6rpx;
-  }
+		.title {
+			font-size: 31.58rpx;
+			font-weight: 700;
+			margin-bottom: 38.6rpx;
+		}
 
-  .project {
-    display: flex;
-    justify-content: space-between;
-    align-items: flex-end;
+		.project {
+			display: flex;
+			justify-content: space-between;
+			align-items: flex-end;
 
-    .edit {
-      font-size: 26rpx;
-      font-weight: 400;
+			.edit {
+				font-size: 26rpx;
+				font-weight: 400;
 
-      &::after {
-        content: ">";
-        margin-left: 10rpx;
-      }
-    }
+				&::after {
+					content: ">";
+					margin-left: 10rpx;
+				}
+			}
 
-    .edit2 {
-      font-size: 26rpx;
-      font-weight: 400;
-    }
-  }
+			.edit2 {
+				font-size: 26rpx;
+				font-weight: 400;
+			}
+		}
 
-  .content {
-    display: flex;
-    align-content: center;
-    flex-wrap: wrap;
-    // justify-content: space-between;
+		.content {
+			display: flex;
+			align-content: center;
+			flex-wrap: wrap;
+			// justify-content: space-between;
 
-    .examine {
-      margin-bottom: 35rpx;
-      width: 173.68rpx;
-      display: flex;
-      flex-direction: column;
-      justify-content: center;
-      align-items: center;
-      position: relative;
-      // margin: 0 0 33.33rpx 33.33rpx !important;
+			.examine {
+				margin-bottom: 35rpx;
+				width: 173.68rpx;
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				align-items: center;
+				position: relative;
+				// margin: 0 0 33.33rpx 33.33rpx !important;
 
-      .icon_img {
-        width: 83.16rpx;
-        height: 83.16rpx;
-      }
+				.icon_img {
+					width: 83.16rpx;
+					height: 83.16rpx;
+				}
 
-      .icon {
-        position: absolute;
-        top: -5rpx;
-        right: 25rpx;
-      }
+				.icon {
+					position: absolute;
+					top: -5rpx;
+					right: 25rpx;
+				}
 
-      .text {
-        font-size: 26.32rpx;
-        margin-top: 21.05rpx;
-        color: #000;
-      }
-    }
+				.text {
+					font-size: 26.32rpx;
+					margin-top: 21.05rpx;
+					color: #000;
+				}
+			}
 
-    .text {
-      font-size: 29.82rpx;
-      color: #a4a4a4;
-    }
-  }
+			.text {
+				font-size: 29.82rpx;
+				color: #a4a4a4;
+			}
+		}
 
-  .cont_jus {
-    margin-top: 56.14rpx;
-    justify-content: flex-start;
+		.cont_jus {
+			margin-top: 56.14rpx;
+			justify-content: flex-start;
 
-    &:first-child {
-      // margin-right: 33rpx;
-    }
+			&:first-child {
+				// margin-right: 33rpx;
+			}
 
-    .examine {
-      margin-right: 48rpx;
+			.examine {
+				margin-right: 48rpx;
 
-      &:first-child {
-        margin-right: 48rpx;
-      }
-    }
-  }
-}
+				&:first-child {
+					margin-right: 48rpx;
+				}
+			}
+		}
+	}
 
-.edit_card {
-  background-color: #fff;
-  padding-top: 28rpx;
-}
+	.edit_card {
+		background-color: #fff;
+		padding-top: 28rpx;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue
index d4a8f51..e681ae3 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'">
@@ -81,7 +85,7 @@
 							<view class="examine" @click="navigator(`/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/commissionedSales/index/index?mer_id=${mer_id}`)">
@@ -197,7 +201,7 @@
 								<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"
@@ -317,7 +321,7 @@
 								<view class="examine" @click="navigator(`/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">
@@ -388,7 +392,7 @@
 								<view class="examine" @click="navigator(`/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 +425,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 +457,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 +622,7 @@
 					cardno_back: ''
 				},
 				Fheight: 0,
-
+				statusBarHeight: 0
 			};
 		},
 		computed: {
@@ -627,7 +631,7 @@
 		created() {},
 		onLoad() {
 			this.Fheight = uni.getSystemInfoSync().windowHeight + 'px';
-
+this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight+45;
 		},
 		onShow() {
 			if (this.isLogin) {
@@ -865,9 +869,9 @@
 
 			},
 			//
-			logout(){
+			logout() {
 				uni.switchTab({
-					url:'/pages/gather/gather'
+					url: '/pages/gather/gather'
 				})
 			},
 			//商户设置
@@ -954,8 +958,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/store/settled/index.vue b/pages/store/settled/index.vue
index 6419081..85ccc8d 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -1,256 +1,258 @@
 <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">
+						<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>
-		</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>
@@ -368,7 +370,8 @@
 				mer_i_id: null, // 商户申请id
 				isType: false,
 				num: 10,
-				detail: {}
+				detail: {},
+				statusBarHeight:0
 			};
 		},
 		beforeDestroy() {
@@ -397,16 +400,17 @@
 			}
 			this.getArea()
 			this.shoplist()
+			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight+45;
 		},
 		onShow() {
-			
+
 		},
 		onReady() {},
 		methods: {
 			//退出
-			logout(){
+			logout() {
 				uni.switchTab({
-					url:'/pages/user/index'
+					url: '/pages/user/index'
 				})
 			},
 			//关闭弹窗
@@ -596,18 +600,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)
 				})
@@ -954,20 +958,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 +999,9 @@
 
 	.merchantsSettled {
 		background-image: linear-gradient(var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
+		
 		height: 140vh;
+		position: relative;
 	}
 
 	.merchantsSettled .merchantBg {