diff --git a/components/orderGoods/index.vue b/components/orderGoods/index.vue
index f1c4653..4483d6e 100644
--- a/components/orderGoods/index.vue
+++ b/components/orderGoods/index.vue
@@ -2,7 +2,7 @@
 	<view class="orderGoods" :style="viewColor">
 		<view class='goodWrapper' :class="'item'+orderData.order_type">
 			<view v-if="orderData.order_type == 1" class="title acea-row row-between-wrapper">
-				<view class="item-status" :class="'status'+evaluate">{{evaluate == 0 ? '待核销' : '已核销'}}</view>
+				<view class="item-status" :class="'status'+evaluate">{{evaluate == 7 ? '待核销' : '已核销'}}</view>
 				<view v-if="evaluate != 0 && orderData.verify_time" class="item-date">{{orderData.verify_time}}</view>
 			</view>
 			<view v-for="(item,index) in cartInfo" :key="index">
diff --git a/pages/admin/orderDetail/index.vue b/pages/admin/orderDetail/index.vue
index 4d4d325..1517bb5 100644
--- a/pages/admin/orderDetail/index.vue
+++ b/pages/admin/orderDetail/index.vue
@@ -376,8 +376,11 @@
 			/*核销订单*/
 			goCancellation() {
 				let that = this;
+				// uni.navigateTo({
+				// 	url: '/pages/admin/cancellate_result/index?mer_id='+that.mer_id+'&code='+that.orderInfo.verify_code,
+				// })
 				uni.navigateTo({
-					url: '/pages/admin/cancellate_result/index?mer_id='+that.mer_id+'&code='+that.orderInfo.verify_code,
+					url: `/pages/admin/order_cancellation/index?mer_id=${that.mer_id}`
 				})
 				// uni.showModal({
 				// 	title: '订单核销',
diff --git a/pages/admin/orderList/index.vue b/pages/admin/orderList/index.vue
index e01fdf4..399c417 100644
--- a/pages/admin/orderList/index.vue
+++ b/pages/admin/orderList/index.vue
@@ -553,6 +553,7 @@
 				uni.navigateTo({
 					url: `/pages/admin/orderDetail/index?id=${item.order_id}&mer_id=${item.mer_id}`
 				})
+				
 			},
 			toRefundDetail(item) {
 				uni.navigateTo({
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index f189638..e4bf29d 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -1,755 +1,660 @@
 <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">
 
-    <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="
+
+		<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="
                 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: [],
-      isFshow: false,
-      backColor: 'rgba(252, 252, 252, 0)'
-    };
-  },
-  computed: {
-    ...mapGetters(['userInfo', 'location', 'isLogin'])
-  },
-  created () { },
-  onLoad () {
-    this.Area()
-    this.initMenu();
-  },
+		},
+		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: '/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: '/static/wgt/__UNI__9620511.wgt',
+						},
+						type: 1,
+					}
+				],
+				nowMenuList: [],
+				street: '',
+				showPicker: false,
+				columnData: [],
 
-  onShow () {
-    if (this.isLogin) {
-      this.emptyText = '暂无可用应用'
-      this.jurisdiction = false
-    } else {
-      this.emptyText = '请登录'
-      this.jurisdiction = true
-    }
-    this.getUserInfo()
+				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()
 
-  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]
-    });
+		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
 
-  },
-  // #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
+			this.$bus.$on('value-updated', (newValue) => {
+				// 更新父组件的值 
+				this.street = newValue.split(',')[0]
+			});
 
-  methods: {
-    scrolling () {
-      // 滚动条距文档顶部的距离
-      let scrollTop =
-        window.pageYOffset ||
-        document.documentElement.scrollTop ||
-        document.body.scrollTop;
-      // 滚动条滚动的距离
-      let scrollStep = scrollTop - this.oldScrollTop;
-      // console.log("header 滚动距离 ", scrollTop);
-      // 更新——滚动前，滚动条距文档顶部的距离
-      this.oldScrollTop = scrollTop;
+		},
+		// #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
 
-      //变量windowHeight是可视区的高度
-      let windowHeight =
-        document.documentElement.clientHeight || document.body.clientHeight;
-      //变量scrollHeight是滚动条的总高度
-      let scrollHeight =
-        document.documentElement.scrollHeight || document.body.scrollHeight;
+		methods: {
+			scrolling() {
+				// 滚动条距文档顶部的距离
+				let scrollTop =
+					window.pageYOffset ||
+					document.documentElement.scrollTop ||
+					document.body.scrollTop;
+				// 滚动条滚动的距离
+				let scrollStep = scrollTop - this.oldScrollTop;
+				// console.log("header 滚动距离 ", scrollTop);
+				// 更新——滚动前，滚动条距文档顶部的距离
+				this.oldScrollTop = scrollTop;
 
-      //滚动条到底部的条件
-      if (scrollTop + windowHeight == scrollHeight) {
-        //你想做的事情
-        // console.log("header  你已经到底部了");
-      }
+				//变量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 <= 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 {
-        let arr = JSON.parse(now);
-        this.nowMenuList = this.AllMenuList.filter((item) => {
-          return arr.find(t => t.name == item.name)?.name == item.name;
-        })
-        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);
-        });
-      }
-    },
-    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
-
-      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);
-
-            })
-
-          }).catch(err => {
-            this.isshow = false
-            uni.showToast({
-              title: err,
-              icon: 'none'
-            })
-          })
-        },
-        fail: (err) => {
-          this.isshow = false
-
-        }
-      });
-    },
+				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
 
 
-    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);
-      });
-    }
-  }
-};
+
+			},
+			// 初始化菜单
+			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) {
+				switch (e) {
+					case 1:
+						this.getUniMp(data);
+						break;
+					case 2:
+						this.navigator(data);
+						break;
+				}
+			},
+			// 添加菜单
+			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(data) {
+				// #ifdef APP-PLUS
+				console.log(data, typeof data == 'string');
+				if (typeof data == 'string') uniMP.loadMP(data);
+				else uniMP.loadMPurl(data);
+				// uniMP.loadMPurl(data);
+				// uniMP.open(data.id);
+				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
+
+				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);
+
+							})
+
+						}).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;
+					// 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);
+				});
+			}
+		}
+	};
 </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;
-  }
-}
-.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;
+		to {
+			opacity: 1;
+		}
+	}
 
-  z-index: 999;
-  // 位置
-  .place_wrapper {
-    color: #fff;
-    margin-right: 0rpx;
+	.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;
 
-    font-size: 30rpx;
+		z-index: 999;
 
-    .town_name {
-      margin-left: 21rpx;
-    }
-  }
+		// 位置
+		.place_wrapper {
+			color: #fff;
+			margin-right: 0rpx;
 
-  .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;
+			font-size: 30rpx;
 
-  // 位置
-  .place_wrapper {
-    color: #fff;
-    margin-right: 24.56rpx;
-    font-size: 30rpx;
+			.town_name {
+				margin-left: 21rpx;
+			}
+		}
 
-    opacity: 0;
+		.iconfont {
+			font-size: 35.09rpx;
+		}
 
-    .town_name {
-      margin-left: 21rpx;
-    }
-  }
+	}
 
-  .iconfont {
-    opacity: 0;
-    font-size: 30rpx;
-    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;
 
-.top_box {
-  // padding-top: 180rpx;
-  background: linear-gradient(#36a2ff, #fff);
-}
+		// 位置
+		.place_wrapper {
+			color: #fff;
+			margin-right: 24.56rpx;
+			font-size: 30rpx;
 
-.com {
-  margin-left: 50%;
-  transform: translate(-50%);
-}
+			opacity: 0;
 
-.business {
-  width: 694.74rpx;
-  // margin-bottom: 175rpx;
-}
+			.town_name {
+				margin-left: 21rpx;
+			}
+		}
 
-.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);
+		.iconfont {
+			opacity: 0;
+			font-size: 30rpx;
+			font-size: 35.09rpx;
+		}
+	}
 
-  .title {
-    font-size: 31.58rpx;
-    font-weight: 700;
-    margin-bottom: 38.6rpx;
-  }
+	.top_box {
+		// padding-top: 180rpx;
+		background: linear-gradient(#36a2ff, #fff);
+	}
 
-  .project {
-    display: flex;
-    justify-content: space-between;
-    align-items: flex-end;
+	.com {
+		margin-left: 50%;
+		transform: translate(-50%);
+	}
 
-    .edit {
-      font-size: 26rpx;
-      font-weight: 400;
+	.business {
+		width: 694.74rpx;
+		// margin-bottom: 175rpx;
+	}
 
-      &::after {
-        content: ">";
-        margin-left: 10rpx;
-      }
-    }
+	.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);
 
-    .edit2 {
-      font-size: 26rpx;
-      font-weight: 400;
-    }
-  }
+		.title {
+			font-size: 31.58rpx;
+			font-weight: 700;
+			margin-bottom: 38.6rpx;
+		}
 
-  .content {
-    display: flex;
-    align-content: center;
-    flex-wrap: wrap;
-    // justify-content: space-between;
+		.project {
+			display: flex;
+			justify-content: space-between;
+			align-items: flex-end;
 
-    .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;
+			.edit {
+				font-size: 26rpx;
+				font-weight: 400;
 
-      .icon_img {
-        width: 83.16rpx;
-        height: 83.16rpx;
-      }
+				&::after {
+					content: ">";
+					margin-left: 10rpx;
+				}
+			}
 
-      .icon {
-        position: absolute;
-        top: -5rpx;
-        right: 25rpx;
-      }
+			.edit2 {
+				font-size: 26rpx;
+				font-weight: 400;
+			}
+		}
 
-      .text {
-        font-size: 26.32rpx;
-        margin-top: 21.05rpx;
-        color: #000;
-      }
-    }
+		.content {
+			display: flex;
+			align-content: center;
+			flex-wrap: wrap;
+			// justify-content: space-between;
 
-    .text {
-      font-size: 29.82rpx;
-      color: #a4a4a4;
-    }
-  }
+			.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;
 
-  .cont_jus {
-    margin-top: 56.14rpx;
-    justify-content: flex-start;
+				.icon_img {
+					width: 83.16rpx;
+					height: 83.16rpx;
+				}
 
-    &:first-child {
-      // margin-right: 33rpx;
-    }
+				.icon {
+					position: absolute;
+					top: -5rpx;
+					right: 25rpx;
+				}
 
-    .examine {
-      margin-right: 48rpx;
+				.text {
+					font-size: 26.32rpx;
+					margin-top: 21.05rpx;
+					color: #000;
+				}
+			}
 
-      &:first-child {
-        margin-right: 48rpx;
-      }
-    }
-  }
-}
+			.text {
+				font-size: 29.82rpx;
+				color: #a4a4a4;
+			}
+		}
 
-.edit_card {
-  background-color: #fff;
-  padding-top: 28rpx;
-}
+		.cont_jus {
+			margin-top: 56.14rpx;
+			justify-content: flex-start;
+
+			&:first-child {
+				// margin-right: 33rpx;
+			}
+
+			.examine {
+				margin-right: 48rpx;
+
+				&:first-child {
+					margin-right: 48rpx;
+				}
+			}
+		}
+	}
+
+	.edit_card {
+		background-color: #fff;
+		padding-top: 28rpx;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6d5d98e..6474185 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -129,6 +129,7 @@
 		getIndexData,
 		getDiy,
 		getArticleList,
+		cloudWarehouse,
 		getArticleCategoryLists
 	} from '@/api/api.js'
 	import {
diff --git a/pages/margin/margin.vue b/pages/margin/margin.vue
index 65a8231..f135458 100644
--- a/pages/margin/margin.vue
+++ b/pages/margin/margin.vue
@@ -1,64 +1,64 @@
 <template>
-  <view class="">
-	<view class="info">
-		<view class="bg"></view>
-	  <view class="card">
-	    <view class="title">店铺保证金信息</view>
-		<view class="item">
-		  <text>已缴纳保证金</text>
-		  <text>{{merchant_Data.paid_margin}}</text>
+	<view class="">
+		<view class="info">
+			<view class="bg"></view>
+			<view class="card">
+				<view class="title">店铺保证金信息</view>
+				<view class="item">
+					<text>已缴纳保证金</text>
+					<text>{{merchant_Data.paid_margin}}</text>
+				</view>
+				<view class="item">
+					<text>未缴纳保证金</text>
+					<text>{{merchant_Data.unpaid_margin}}</text>
+				</view>
+				<view class="item">
+					<text>缴纳店铺账户</text>
+					<text>{{merchant_Data.mer_name}}</text>
+				</view>
+			</view>
 		</view>
-		<view class="item">
-		  <text>未缴纳保证金</text>
-		  <text>{{merchant_Data.unpaid_margin}}</text>
+		<view class="price">
+			<view class="title">缴纳金额</view>
+			<view class="tab">
+				<view class="item active" style="margin: 0;">{{merchant_Data.margin}}元</view>
+			</view>
+			<button class="btn" @click="paydecimal">缴纳</button>
 		</view>
-	    <view class="item">
-	      <text>缴纳店铺账户</text>
-	      <text>{{merchant_Data.mer_name}}</text>
-	    </view>
-	  </view>
-	</view>
-    <view class="price">
-      <view class="title">缴纳金额</view>
-      <view class="tab">
-        <view class="item active" style="margin: 0;">{{merchant_Data.margin}}元</view>
-      </view>
-      <button class="btn" @click="paydecimal">缴纳</button>
-    </view>
-<!--    <view class="tip">
+		<!--    <view class="tip">
       <view class="title">注意事项</view>
       <view class="text">充值后帐户的金额不能提现，可用于商城消费使用佣金导入账户之后不能再次导出、不可提现账户充值出现问题可联系商城客服，也可拨打商城客服热线<text @click="copyPhone('4008888888')">4008888888</text>
       </view>
     </view> -->
-	
-	<view class="content-order" v-for="(item,i ) in productList">
-		<view class="">订单编号：{{item.order_sn}}</view>
-		<view class="">支付金额：{{item.total_price}}</view>
-		<view class="">支付状态：{{item.pay_type==1?'已支付':'待支付'}}</view>
-		<view class="">支付时间：{{item.pay_time}}</view>
+
+		<view class="content-order" v-for="(item,i ) in productList">
+			<view class="">订单编号：{{item.order_sn}}</view>
+			<view class="">支付金额：{{item.total_price}}</view>
+			<view class="">支付状态：{{item.pay_type==1?'已支付':'待支付'}}</view>
+			<view class="">支付时间：{{item.pay_time}}</view>
+		</view>
+		<view class='loadingicon acea-row row-center-wrapper' v-if='productList.length > 0'>
+			<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
+		</view>
 	</view>
-	<view class='loadingicon acea-row row-center-wrapper' v-if='productList.length > 0'>
-		<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
-	</view>
-  </view>
 </template>
 
 <script>
 	import {
 		merchant,
 		paymerchant,
-		 marginlist
+		marginlist
 	} from '@/api/api.js'
 	export default {
 		data() {
 			return {
-				mer_id:0,
+				mer_id: 0,
 				merchant_Data: {},
-				where:{
-					page:1,
-					limit:10
+				where: {
+					page: 1,
+					limit: 10
 				},
-				productList:[],
+				productList: [],
 				loadend: false,
 				loading: false,
 				loadTitle: '加载更多',
@@ -67,26 +67,26 @@
 		onLoad(e) {
 			this.mer_id = e.mer_id
 			this.decimal()
-			this.list(false)
+			this.list(true)
 
 		},
 		onReachBottom() {
-		if (this.productList.length > 0) {
-			setTimeout(() => {
-				this.list(false);
-			}, 1000)
-		}
+			if (this.productList.length > 0) {
+				setTimeout(() => {
+					this.list(false);
+				}, 1000)
+			}
 		},
 		methods: {
-			list(isPage){
+			list(isPage) {
 				let that = this;
 				if (that.loadend) return;
 				if (that.loading) return;
 				if (isPage === true) that.$set(that, 'productList', []);
-				
+
 				that.loading = true;
 				that.loadTitle = '';
-				 marginlist(that.where).then(res => {
+				marginlist(that.where).then(res => {
 					let list = res.data.list;
 					let productList = that.$util.SplitArray(list, that.productList);
 					let loadend = list.length < that.where.limit;
@@ -96,7 +96,7 @@
 					setTimeout(() => {
 						that.$set(that, 'productList', productList);
 					}, 500)
-				
+
 					// console.log(that.productList)
 					that.$set(that.where, 'page', that.where.page + 1);
 					if (that.where.page == 1 && res.data.list.length <= 0) that.emptyShow = true
@@ -104,7 +104,7 @@
 					that.loading = false;
 					that.loadTitle = '加载更多';
 				});
-				
+
 			},
 			//获取保证金信息
 			decimal() {
@@ -121,7 +121,7 @@
 						title: '暂时无需缴纳保证金'
 					});
 				} else {
-			
+
 					uni.showModal({
 						title: '提示',
 						content: '商户' + this.merchant_Data.mer_name + '是否同意缴纳保证金',
@@ -135,9 +135,19 @@
 										orderInfo: res.data
 											.config, //微信、支付宝订单数据 【注意微信的订单信息，键值应该全部是小写，不能采用驼峰命名】
 										success: function(res) {
+											this.$util.Tips({
+												title: '支付成功'
+											});
 											console.log('success:' + JSON.stringify(res));
+											setTimeout(()=>{
+												this.decimal()
+												this.list(true)
+											},1000)
 										},
 										fail: function(err) {
+											this.$util.Tips({
+												title: '支付失败'
+											});
 											console.log('fail:' + JSON.stringify(err));
 										}
 									});
@@ -149,9 +159,9 @@
 							}
 						}
 					});
-			
+
 				}
-			
+
 			},
 		}
 	}
@@ -161,172 +171,176 @@
 
 </style>
 <style lang="scss">
-  page {
-    background-color: #fff;
-  }
-.content-order{
-	
-
-	background: #F4F4F4;
-	border-radius: 21rpx 21rpx ;
-	margin-top: 30rpx;
-	padding: 10rpx;
-	margin-left: 10rpx;
-	margin-right:  10rpx;
-	view{
-		font-size: 30rpx;
-		font-family: PingFang SC-Regular, PingFang SC;
-		font-weight: 400;
-		color: #333333;
-		margin: 20rpx;
-		
+	page {
+		background-color: #fff;
 	}
-}
-  .info {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    position: relative;
-    height: 250rpx;
 
-    .bg {
-      background-color: #FF5C2D;
-      height: 170rpx;
-      width: 100vw;
-      border-radius: 0rpx 0rpx 28rpx 28rpx;
-      position: absolute;
-      top: 0;
-      left: 0;
-    }
+	.content-order {
 
-    .card {
-      width: 694rpx;
-      min-height: 180rpx;
-      background: #FFFFFF;
-      margin-top: 38.55rpx;
-      box-shadow: 0rpx 0rpx 18rpx 2rpx rgba(50, 116, 249, 0.1);
-      border-radius: 14rpx 14rpx 14rpx 14rpx;
-      opacity: 1;
-      padding: 31.5rpx 28rpx;
-      display: flex;
-      flex-direction: column;
-      justify-content: space-around;
-      position: absolute;
-      top: 0;
 
-      .title {
-        font-size: 32rpx;
-        font-weight: 600;
-        color: #333333;
-        padding-bottom: 10rpx;
-      }
+		background: #F4F4F4;
+		border-radius: 21rpx 21rpx;
+		margin-top: 30rpx;
+		padding: 10rpx;
+		margin-left: 10rpx;
+		margin-right: 10rpx;
 
-      .item {
-        display: flex;
-        justify-content: space-between;
-        font-size: 32rpx;
-        font-weight: 400;
-        color: #333333;
-		margin-bottom: 10rpx;
-        text:nth-child(1){
-          flex-shrink: 0;
-          margin-right: 18rpx;
-        }
-      }
-    }
-  }
+		view {
+			font-size: 30rpx;
+			font-family: PingFang SC-Regular, PingFang SC;
+			font-weight: 400;
+			color: #333333;
+			margin: 20rpx;
 
-  .price {
-    display: flex;
-    flex-direction: column;
-    padding: 0 28rpx;
-    margin-top: 85rpx;
+		}
+	}
 
-    .title {
-      font-size: 32rpx;
-      font-weight: 600;
-      color: #333333;
-      line-height: 39rpx;
-      margin-bottom: 42rpx;
-    }
+	.info {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		position: relative;
+		height: 250rpx;
 
-    .tab {
-      display: flex;
-      flex-wrap: wrap;
-      justify-content: left;
-      width: 694rpx;
+		.bg {
+			background-color: #FF5C2D;
+			height: 170rpx;
+			width: 100vw;
+			border-radius: 0rpx 0rpx 28rpx 28rpx;
+			position: absolute;
+			top: 0;
+			left: 0;
+		}
 
-      .item {
-        width: 217rpx;
-        height: 131rpx;
-        margin: 0 auto;
-        margin-bottom: 20rpx;
-        border-radius: 7rpx 7rpx 7rpx 7rpx;
-        border: 2rpx solid #F5F5F5;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        font-size: 32rpx;
-        font-weight: 500;
-        line-height: 32rpx;
-      }
+		.card {
+			width: 694rpx;
+			min-height: 180rpx;
+			background: #FFFFFF;
+			margin-top: 38.55rpx;
+			box-shadow: 0rpx 0rpx 18rpx 2rpx rgba(50, 116, 249, 0.1);
+			border-radius: 14rpx 14rpx 14rpx 14rpx;
+			opacity: 1;
+			padding: 31.5rpx 28rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-around;
+			position: absolute;
+			top: 0;
 
-      .active {
-        border: 2rpx solid #FF5C2D;
-        color: #FF5C2D;
-      }
-    }
+			.title {
+				font-size: 32rpx;
+				font-weight: 600;
+				color: #333333;
+				padding-bottom: 10rpx;
+			}
 
-    .input {
-      width: 100%;
-      height: 112rpx;
-      background: #F5F5F5;
-      border-radius: 56rpx 56rpx 56rpx 56rpx;
-      opacity: 1;
-      padding: 0 45.56rpx;
-      box-sizing: border-box;
-      font-size: 28rpx;
-      font-weight: 400;
-      color: #333;
-      line-height: 35rpx;
-    }
+			.item {
+				display: flex;
+				justify-content: space-between;
+				font-size: 32rpx;
+				font-weight: 400;
+				color: #333333;
+				margin-bottom: 10rpx;
 
-    .btn {
-      width: 694rpx;
-      height: 84rpx;
-      margin-top: 73.6rpx;
-      background: #FF5C2D;
-      box-shadow: 0rpx 14rpx 44rpx 2rpx #E9EFF5;
-      border-radius: 42rpx 42rpx 42rpx 42rpx;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      font-size: 32rpx;
-      font-weight: 400;
-      color: #FFFFFF;
-    }
-  }
+				text:nth-child(1) {
+					flex-shrink: 0;
+					margin-right: 18rpx;
+				}
+			}
+		}
+	}
 
-  .tip {
-    display: flex;
-    flex-direction: column;
-    padding: 0 28rpx;
-    margin-top: 84rpx;
+	.price {
+		display: flex;
+		flex-direction: column;
+		padding: 0 28rpx;
+		margin-top: 85rpx;
 
-    .title {
-      font-size: 32rpx;
-      font-weight: 500;
-      color: #FF5C2D;
-      line-height: 32rpx;
-      margin-bottom: 21rpx;
-    }
+		.title {
+			font-size: 32rpx;
+			font-weight: 600;
+			color: #333333;
+			line-height: 39rpx;
+			margin-bottom: 42rpx;
+		}
 
-    .text {
-      font-size: 28rpx;
-      font-weight: 400;
-      color: rgba(0, 0, 0, 0.6);
-      line-height: 42rpx;
-      -webkit-background-clip: text;
-    }
-  }
+		.tab {
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: left;
+			width: 694rpx;
+
+			.item {
+				width: 217rpx;
+				height: 131rpx;
+				margin: 0 auto;
+				margin-bottom: 20rpx;
+				border-radius: 7rpx 7rpx 7rpx 7rpx;
+				border: 2rpx solid #F5F5F5;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				font-size: 32rpx;
+				font-weight: 500;
+				line-height: 32rpx;
+			}
+
+			.active {
+				border: 2rpx solid #FF5C2D;
+				color: #FF5C2D;
+			}
+		}
+
+		.input {
+			width: 100%;
+			height: 112rpx;
+			background: #F5F5F5;
+			border-radius: 56rpx 56rpx 56rpx 56rpx;
+			opacity: 1;
+			padding: 0 45.56rpx;
+			box-sizing: border-box;
+			font-size: 28rpx;
+			font-weight: 400;
+			color: #333;
+			line-height: 35rpx;
+		}
+
+		.btn {
+			width: 694rpx;
+			height: 84rpx;
+			margin-top: 73.6rpx;
+			background: #FF5C2D;
+			box-shadow: 0rpx 14rpx 44rpx 2rpx #E9EFF5;
+			border-radius: 42rpx 42rpx 42rpx 42rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			font-size: 32rpx;
+			font-weight: 400;
+			color: #FFFFFF;
+		}
+	}
+
+	.tip {
+		display: flex;
+		flex-direction: column;
+		padding: 0 28rpx;
+		margin-top: 84rpx;
+
+		.title {
+			font-size: 32rpx;
+			font-weight: 500;
+			color: #FF5C2D;
+			line-height: 32rpx;
+			margin-bottom: 21rpx;
+		}
+
+		.text {
+			font-size: 28rpx;
+			font-weight: 400;
+			color: rgba(0, 0, 0, 0.6);
+			line-height: 42rpx;
+			-webkit-background-clip: text;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue
index 62ede90..d4a8f51 100644
--- a/pages/moreProject/moreProject.vue
+++ b/pages/moreProject/moreProject.vue
@@ -83,7 +83,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>
@@ -94,7 +94,7 @@
 								<image class="icon_img" src="@/static/images/weituo.png" mode="aspectFill">
 								</image>
 								<text class="text">委托订单</text>
-							</view>
+							</view> -->
 
 							<!-- <view class="examine" @click="navigator(`/pages/nongKe/teach_video/teach_video`)">
 							<image class="icon_img"
@@ -200,7 +200,7 @@
 									<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>
@@ -223,7 +223,7 @@
 									<image class="icon_img" src="@/static/images/fabu.png" mode="aspectFill">
 									</image>
 									<text class="text">发布管理</text>
-								</view>
+								</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">
diff --git a/pages/product/basicSet.vue b/pages/product/basicSet.vue
index 85a5bc9..df3097b 100644
--- a/pages/product/basicSet.vue
+++ b/pages/product/basicSet.vue
@@ -135,7 +135,7 @@
 				<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>
@@ -149,7 +149,7 @@
 				<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>先货后款结算利率：</view>
 				<input type="number" maxlength="5" v-model="interest_rate" placeholder="请输入 /利率单位为: %">
 			</view>
-			<view class="remarks">*利率结算范围为:0.01 ~ 0.1 利率单位为:%</view>
+			<view class="remarks">*利率结算范围为:0.01 ~ 0.1 利率单位为:%</view> -->
 			<!-- <view class="item_cell">
         <view class="if_btn flex_a_c_j_sb">
           <text class="sub_title">是否开启商户：</text>
diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue
index 2b7b7be..c837b64 100644
--- a/pages/product/list/index.vue
+++ b/pages/product/list/index.vue
@@ -47,13 +47,13 @@
 							<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">
 										</image>
 										<text class="text">运费模板</text>
-									</navigator>
+									</navigator> -->
 									<navigator class="item"
 										:url="`/pages/product/addGoods/mulSpecification?mer_id=${mer_id}`"
 										hover-class='none'>
@@ -61,12 +61,12 @@
 											src="../static/images/product_specification.png"></image>
 										<text class="text">规格模板</text>
 									</navigator>
-									<navigator class="item"
+								<!-- 	<navigator class="item"
 										:url="`/pages/users/online_warehousing/index?mer_id=${mer_id}&product_id=${data.product_id}&unique=${data.unique}`"
 										hover-class='none'>
 										<image mode='widthFix' class="image" src="@/static/images/daoru.png"></image>
 										<text class="text">商品导入</text>
-									</navigator>
+									</navigator> -->
 								</view>
 							</swiper-item>
 						</block>
@@ -125,9 +125,9 @@
 						</view>
 						<view class="operation acea-row row-between-wrapper">
 							<view class="acea-row row-middle">
-								<view class="" class="bnt" @click="Fonline(item)" style="width:150rpx">
+							<!-- 	<view class="" class="bnt" @click="Fonline(item)" style="width:150rpx">
 									线上入库
-								</view>
+								</view> -->
 								<view class="" class="bnt" @click="Fline(item)" style="width:150rpx">
 									线下入库
 								</view>
diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue
index 042c24b..6d8471d 100644
--- a/pages/supply_chains/supply_chains.vue
+++ b/pages/supply_chains/supply_chains.vue
@@ -175,7 +175,7 @@
 	import {
 		getIndexData,
 		getDiy,
-
+	cloudWarehouse
 	} from '@/api/api.js'
 
 	import {
@@ -183,8 +183,7 @@
 	} from '@/api/product.js';
 	import {
 		getGeocoder,
-		merClassifly,
-		getProductHot
+		merClassifly
 	} from '@/api/store.js';
 	import {
 		getArea,
@@ -345,7 +344,12 @@
 
 				that.loading = true;
 				that.loadTitle = '';
-				getProductHot(that.where.page, that.where.limit).then(res => {
+				cloudWarehouse({
+					page:that.where.page, 
+					limit:that.where.limit,
+					street_code:id,
+					category_id:0
+				}).then(res => {
 					let list = res.data.list;
 					let productList = that.$util.SplitArray(list, that.productList);
 					let loadend = list.length < that.where.limit;