diff --git a/api/release.js b/api/release.js
new file mode 100644
index 0000000..3b53a12
--- /dev/null
+++ b/api/release.js
@@ -0,0 +1,43 @@
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+import request from "@/utils/request.js";
+
+/**
+ * 获取发布管理转售商品列表
+ * @param numType boolean true 购物车数量,false=购物车产品数量
+ */
+export function getResale(data) {
+  return request.get("community/resale/lst", data);
+}
+
+/**
+ * 清除发布管理转售商品
+ * @param object ids
+ */
+export function getResaledelete(id) {
+  return request.post('community/resale/delete/'+ id);
+}
+
+
+/**
+ * 用户是否同意转售商品折扣价
+ * @param object ids
+ */
+export function getResalecheck(id,data) {
+  return request.post('community/resale/check/'+ id,data);
+}
+
+/**
+ * 获取转售商品详情
+ * @param object ids
+ */
+export function getResaleid(id) {
+  return request.get('community/resale/' + id);
+}
diff --git a/api/sale.js b/api/sale.js
new file mode 100644
index 0000000..7fc62dc
--- /dev/null
+++ b/api/sale.js
@@ -0,0 +1,10 @@
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+import request from "@/utils/request.js";
\ No newline at end of file
diff --git a/api/trading-floor.js b/api/trading-floor.js
new file mode 100644
index 0000000..3ab9887
--- /dev/null
+++ b/api/trading-floor.js
@@ -0,0 +1,88 @@
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+import request from "@/utils/request.js";
+
+
+/**
+ * 调货列表
+ * 
+ */
+export function getCommunityList(data) {
+	return request.get('community/lst', data, {
+		noAuth: true
+	});
+}
+/**
+ * 商品详情
+ * 
+ */
+export function getCommunityshow(data) {
+
+	return request.get('community/show/' + data, {}, {
+		noAuth: true
+	});
+}
+
+/**
+ * 可转售的订单列表
+ * 
+ */
+export function getCommunitygetOrderList(data) {
+	return request.get('community/product/lst', data, {
+		noAuth: true
+	});
+}
+
+/**
+ * 发起转售
+ * 
+ */
+export function getCommunitycreate(data) {
+	return request.post(`community/create`, data, {
+		login: true
+	});
+}
+
+/**
+ * 修改转售
+ * 
+ */
+export function getCommunityUpdate(data) {
+	return request.post(`community/update`, data, {
+		login: true
+	});
+}
+/**
+ * 加入购物车
+ * 
+ */
+export function getCommunityaddCart(data) {
+	return request.post('community/addCart', data, {
+		noAuth: true
+	});
+}
+
+//商品宝贝详情
+
+export function getProductDetail(id) {
+	return request.get('store/product/detail/' + id,
+  );
+}
+//获取转售商品详情
+export function getresaleDetail(id) {
+	return request.get('community/resale/' + id,
+  );
+}
+
+//编辑转售商品
+export function getresaleEdit(id,data) {
+	return request.post('community/resale/edit/' + id,data
+  );
+}
\ No newline at end of file
diff --git a/components/cx-navTitle.vue b/components/cx-navTitle.vue
new file mode 100644
index 0000000..6382788
--- /dev/null
+++ b/components/cx-navTitle.vue
@@ -0,0 +1,129 @@
+<template>
+	<!-- tab选项卡滑动切换 -->
+	<view class="my-tab" ref="myTabRef">
+		<view class="my-tab-item" v-for="(item, index) in tabs" :ref="`tab${item.name}Ref`"
+			:class="{ active: item.name === activeItem }" :key="index">
+			<view class="my-tab-text" ref="tabName" @click="tabClick(item,index)">
+				<view class="name">{{ item.label }}</view>
+				<view class="xian" v-if='isshow'></view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+	/*
+		tabs -- 传入标签名 array类型 : tabs: [{name: "tabOne",label: "全部"},{...}]
+		activeItem -- 默认第一个class名 string
+		@tabClick -- 自定义点击事件 回传用到 做逻辑判断
+	  标签大小、默认颜色、选中颜色，下边框线等样式，已在css中注释，请根据注释修改即可
+	*/
+	export default {
+		name: "cx-navTitle",
+		props: {
+			tabs: { //所有标签名
+				type: Array,
+				default: []
+			},
+			activeItem: { //默认第一个 选中的class类名
+				type: String,
+				default: ''
+			},
+			show: {
+				type: Boolean,
+				default: ''
+			},
+		},
+		data() {
+			return {
+				isshow: true,
+			};
+		},
+		mounted() {
+			this.isshow = this.show
+		},
+		methods: {
+			// tab点击
+			tabClick(item, index) {
+				this.$emit('tabClick', item) //回传数据
+				// 触发滑动方法
+				this.scrollLeftTo(item.name);
+			},
+			// 滑动
+			scrollLeftTo(name) {
+				const ref = `tab${name}Ref`;
+				// 获取myTabRef的DOM元素，即类名为my-tab的标签
+				const nav = this.$refs.myTabRef.$el;
+				// 获取当前点击的某一个tab的的DOM元素，即类名为my-tab-item的标签
+				const title = this.$refs[ref][0].$el;
+				// 计算位移偏差
+				// #ifdef  H5
+				const to = title.offsetLeft - (nav.offsetWidth - title.offsetWidth) / 2;
+				nav.scrollLeft = to;
+				// #endif
+			},
+		},
+	};
+</script>
+
+<style lang="scss">
+	.my-tab {
+		width: 720rpx;
+		margin: 0 auto;
+		// height:80rpx;
+		// background: #ffffff;
+		// line-height:80rpx;
+		// border:1px solid red;
+		display: flex;
+		overflow-x: scroll;
+		padding-right: 0rpx;
+		scroll-behavior: smooth; //平稳的滑动效果
+		font-size: 32rpx;
+		font-family: PingFang-SC-Heavy;
+
+		.my-tab-item {
+			padding: 20rpx 35rpx; //标签上下左右距离 -- 在这里改
+			color: #707070; //标签默认颜色 -- 在这里改
+			// height: 0rpx;
+			text-align: center;
+			flex: 1 0 auto;
+
+			&.active {
+				color: #333333; //标签选中颜色 -- 在这里改
+				font-family: PingFang-SC-Heavy;
+				font-weight: 600;
+				position: relative;
+
+				.my-tab-text {
+					.xian {
+						position: relative;
+						top: 0rpx; //下边框线和标签距离 -- 在这里改
+						z-index: 8;
+						width: 26px;
+						margin: 0 auto;
+						border: 1rpx solid #F84221; //标签底部下边框线 -- 在这里改
+						border-radius: 50rpx;
+						padding: 0rpx 30rpx;
+						opacity: 0.6; //下边框线透明度 -- 在这里改
+					}
+
+					.name {
+						position: relative;
+						z-index: 9;
+						font-size: 32rpx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #F84221;
+						color: #F84221;
+					}
+				}
+			}
+		}
+	}
+
+	// 隐藏滚动条
+	::-webkit-scrollbar {
+		height: 0;
+		width: 0;
+		color: transparent;
+	}
+</style>
\ No newline at end of file
diff --git a/components/e-select/e-select.vue b/components/e-select/e-select.vue
new file mode 100644
index 0000000..6c865ca
--- /dev/null
+++ b/components/e-select/e-select.vue
@@ -0,0 +1,448 @@
+<template>
+  <view
+    class="e-stat__select"
+    :style="{ width: width, minWidth: minWidth }">
+    <!-- 主体区域 -->
+    <view class="e-select-main">
+      <view
+        class="e-select"
+        :class="{ 'e-select-disabled': disabled }">
+        <view
+          class="e-select__input-box"
+          @click="toggleSelector">
+          <!-- 微信小程序input组件在部分安卓机型上会出现文字重影，placeholder抖动问题，2019年时微信小程序就有这个问题，一直没修复，估计短时间内也别指望修复了 -->
+          <input
+            class="e-select__input-text"
+            :placeholder="placeholder"
+            v-model="currentData"
+            @input="filter"
+            v-if="search && !disabled" />
+          <view
+            class="e-select__input-text"
+            v-else>
+            {{ currentData || currentData === 0 ? currentData : placeholder }}
+          </view>
+          <!-- 用一个更大的盒子包裹图标,便于点击 -->
+          <view
+            class="e-select-icon"
+            @click.stop="clearVal"
+            v-if="currentData && clear && !disabled">
+            <uni-icons
+              type="clear"
+              color="#e1e1e1"
+              size="18"></uni-icons>
+          </view>
+          <view
+            class="e-select-icon"
+            @click.stop="toggleSelector"
+            v-else>
+            <uni-icons
+              size="14"
+              color="#999"
+              type="top"
+              class="arrowAnimation"
+              :class="showSelector ? 'top' : 'bottom'"></uni-icons>
+          </view>
+        </view>
+        <!-- 全屏遮罩-->
+        <view
+          class="e-select--mask"
+          v-if="showSelector"
+          @click="toggleSelector" />
+        <!-- 选项列表 这里用v-show是因为微信小程序会报警告 [Component] slot "" is not found，v-if会导致开发工具不能正确识别到slot -->
+        <!-- https://developers.weixin.qq.com/community/minihome/doc/000c8295730700d1cd7c81b9656c00 -->
+        <view
+          class="e-select__selector"
+          v-show="showSelector">
+          <!-- 三角小箭头 -->
+          <view class="e-popper__arrow"></view>
+          <scroll-view
+            scroll-y="true"
+            :scroll-top="scrollTop"
+            class="e-select__selector-scroll"
+            :scroll-into-view="scrollToId"
+            :scroll-with-animation="scrollWithAnimation"
+            v-if="showSelector">
+            <view
+              class="e-select__selector-empty"
+              v-if="currentOptions.length === 0">
+              <text>{{ emptyTips }}</text>
+            </view>
+            <!-- 非空,渲染选项列表 -->
+            <view
+              v-else
+              class="e-select__selector-item"
+              :class="[
+                { highlight: currentData == item[props.text] },
+                {
+                  'e-select__selector-item-disabled': item[props.disabled],
+                },
+              ]"
+              v-for="(item, index) in currentOptions"
+              :key="index"
+              @click="change(item, index)">
+              <text>{{ item[props.text] }}</text>
+              <view
+                id="scrollToId"
+                v-if="currentData == item[props.text]"></view>
+            </view>
+          </scroll-view>
+          <slot />
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: 'e-select',
+  data() {
+    return {
+      // 是否显示下拉选择列表
+      showSelector: false,
+      // 当前选项
+      currentOptions: [],
+      // 当前值
+      currentData: '',
+      // 旧的滚动高度
+      oldScrollTop: 0,
+      // 最新的滚动高度
+      scrollTop: 0,
+      // 滚动至的id
+      scrollToId: '',
+      // 滚动动画
+      scrollWithAnimation: false,
+    };
+  },
+  props: {
+    // 选项列表
+    options: {
+      type: Array,
+      default() {
+        return [];
+      },
+    },
+    // 配置选项
+    props: {
+      type: Object,
+      default: function () {
+        return {
+          text: 'text',
+          value: 'value',
+          disabled: 'disabled',
+        };
+      },
+    },
+    // vue2 v-model传值方式
+    value: {
+      type: [String, Number],
+      default: '',
+    },
+    // vue3 v-model传值方式
+    modelValue: {
+      type: [String, Number],
+      default: '',
+    },
+    // 占位
+    placeholder: {
+      type: String,
+      default: '请选择',
+    },
+    // 宽度
+    width: {
+      type: String,
+      default: '100%',
+    },
+    // 最小宽度
+    minWidth: {
+      type: String,
+      default: '120rpx',
+    },
+    // 空值占位
+    emptyTips: {
+      type: String,
+      default: '暂无选项',
+    },
+    // 是否可清除
+    clear: {
+      type: Boolean,
+      default: false,
+    },
+    // 是否禁用
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+    // 开启搜索
+    search: {
+      type: Boolean,
+      default: true,
+    },
+    // 搜索开启滚动动画
+    animation: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  watch: {
+    options: {
+      handler() {
+        this.currentOptions = this.options;
+        this.initData();
+      },
+      immediate: true,
+      deep: true,
+    },
+    modelValue: {
+      handler() {
+        this.initData();
+      },
+      immediate: true,
+    },
+    value: {
+      handler() {
+        this.initData();
+      },
+      immediate: true,
+    },
+  },
+  methods: {
+    /** 处理数据，此函数用于兼容vue2 vue3 */
+    initData() {
+      this.currentData = '';
+      // vue2
+      if (this.value || this.value === 0) {
+        for (let item of this.options) {
+          if (item[this.props.value] === this.value) {
+            this.currentData = item[this.props.text];
+            this.$emit('getText', this.currentData);
+            return;
+          }
+        }
+      }
+      // vue3
+      if (this.modelValue || this.modelValue === 0) {
+        for (let item of this.options) {
+          if (item[this.props.value] === this.modelValue) {
+            this.currentData = item[this.props.text];
+            this.$emit('getText', this.currentData);
+            return;
+          }
+        }
+      }
+    },
+    /** 过滤选项列表，会自动回到顶部 */
+    filter() {
+      this.$emit('getText', this.currentData);
+      if (this.currentData) {
+        this.currentOptions = this.options.filter((item) => {
+          return item[this.props.text].indexOf(this.currentData) > -1;
+        });
+      } else {
+        this.currentOptions = this.options;
+      }
+      // scrollTop变化，才能触发滚动顶部
+      this.scrollTop = 1;
+      this.$nextTick(() => {
+        this.scrollTop = 0;
+      });
+    },
+    /** 改变值 */
+    change(item, index) {
+      if (item[this.props.disabled]) return;
+      const data = {
+        ...item,
+        index,
+      };
+      this.$emit('change', data);
+      this.emit(data);
+      this.toggleSelector();
+    },
+    /** 传递父组件值 */
+    emit(item) {
+      this.$emit('input', item[this.props.value]);
+      this.$emit('update:modelValue', item[this.props.value]);
+    },
+    /** 清空值 */
+    clearVal() {
+      this.$emit('change', 'clear');
+      this.$emit('input', '');
+      this.$emit('update:modelValue', '');
+    },
+    /** 切换下拉显示 */
+    toggleSelector() {
+      if (this.disabled) return;
+      this.showSelector = !this.showSelector;
+      if (this.showSelector) {
+        this.currentOptions = this.options;
+        // scrollToId变化，才能触发scroll-to-view的滚动
+        this.scrollToId = '';
+        this.$nextTick(() => {
+          this.scrollToId = 'scrollToId';
+          // 设计理念：只在filter时触发滚动动画，因为每次打开就触发，用户体验不好
+          if (this.animation) {
+            setTimeout(() => {
+              // 开启滚动动画
+              this.scrollWithAnimation = true;
+            }, 100);
+          }
+        });
+      } else {
+        // 关闭时关闭动画
+        this.scrollWithAnimation = false;
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.e-stat__select {
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+  box-sizing: border-box;
+  width: 100%;
+  
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+}
+.e-select-main {
+  width: 100%;
+}
+.e-select-disabled {
+  background-color: #f5f7fa;
+  cursor: not-allowed;
+}
+.e-select {
+  font-size: 14px;
+  box-sizing: border-box;
+  border-radius: 4px;
+  padding: 0 5px;
+  position: relative;
+  display: flex;
+  user-select: none;
+  flex-direction: row;
+  align-items: center;
+  border: 1px solid #dcdfe6;
+  border-bottom: solid 1px #dddddd;
+  .e-select__input-box {
+    width: 100%;
+    min-height: 34px;
+    position: relative;
+    display: flex;
+    flex: 1;
+    flex-direction: row;
+    align-items: center;
+    .e-select-icon {
+      width: 50px;
+      height: 100%;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+    .arrowAnimation {
+      transition: transform 0.3s;
+    }
+    .top {
+      transform: rotateZ(0deg);
+    }
+    .bottom {
+      transform: rotateZ(180deg);
+    }
+    .e-select__input-text {
+      color: #303030;
+      padding-left: 7px;
+      width: 100%;
+      color: #333;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      -o-text-overflow: ellipsis;
+      overflow: hidden;
+    }
+    .e-select__input-placeholder {
+      padding-left: 7px;
+      color: #666;
+    }
+  }
+  .e-select--mask {
+    position: fixed;
+    top: 0;
+    bottom: 0;
+    right: 0;
+    left: 0;
+    z-index: 999;
+  }
+  .e-select__selector {
+    box-sizing: border-box;
+    position: absolute;
+    top: calc(100% + 12px);
+    left: 0;
+    width: 100%;
+    background-color: #ffffff;
+    border: 1px solid #ebeef5;
+    border-radius: 6px;
+    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+    z-index: 999;
+    padding: 4px 4px;
+    transition: all 2s;
+    .e-popper__arrow,
+    .e-popper__arrow::after {
+      position: absolute;
+      display: block;
+      width: 0;
+      height: 0;
+      left: 50%;
+      border-color: transparent;
+      border-style: solid;
+      border-width: 6px;
+    }
+    .e-popper__arrow {
+      filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
+      top: -6px;
+      left: 50%;
+      transform: translateX(-50%);
+      margin-right: 3px;
+      border-top-width: 0;
+      border-bottom-color: #ebeef5;
+    }
+    .e-popper__arrow::after {
+      content: ' ';
+      top: 1px;
+      margin-left: -6px;
+      border-top-width: 0;
+      border-bottom-color: #fff;
+    }
+    .e-select__selector-scroll {
+      max-height: 200px;
+      box-sizing: border-box;
+      .e-select__selector-empty,
+      .e-select__selector-item {
+        display: flex;
+        cursor: pointer;
+        line-height: 34px;
+        font-size: 14px;
+        text-align: center;
+        padding: 0px 10px;
+      }
+      .e-select__selector-item:hover {
+        background-color: #f9f9f9;
+      }
+      .e-select__selector-empty:last-child,
+      .e-select__selector-item:last-child {
+        border-bottom: none;
+      }
+      .e-select__selector-item-disabled {
+        color: #b1b1b1;
+        cursor: not-allowed;
+      }
+      .highlight {
+        color: #409eff;
+        font-weight: bold;
+        background-color: #f5f7fa;
+        border-radius: 3px;
+      }
+    }
+  }
+}
+</style>
diff --git a/components/goodsCard.vue b/components/goodsCard.vue
new file mode 100644
index 0000000..dfec1e6
--- /dev/null
+++ b/components/goodsCard.vue
@@ -0,0 +1,213 @@
+<template>
+	<view>
+		<block>
+			<view class='lists'>
+				<view v-for="(item,index) in productList" class="card" :key="index" @click="godDetail(item)">
+					<view class='pictrue on'>
+						<u-image :src='item.image' width="336.45rpx" height="336.45rpx"> </u-image>
+					</view>
+					<view class="goods_content">
+						<view class='name line1'>
+							<text class="text-ellipsis">{{item.store_name}}</text>
+						</view>
+						<view class="item_tags">
+							<text v-if="item.merchant.type_name && item.product_type == 0"
+								class="store_type">{{item.merchant.type_name}}</text>
+							<text v-else-if="item.merchant.is_trader && item.product_type == 0"
+								class="store_type">自营</text>
+							<text v-if="item.product_type != 0"
+								:class="'font_bg-red bt-color type'+item.product_type">{{item.product_type == 1 ? "秒杀" : item.product_type == 2 ? "预售" : item.product_type == 3 ? "助力" : item.product_type == 4 ? "拼团" : ""}}</text>
+							<text class="tags_item ticket" v-if="item.issetCoupon">领券</text>
+							<text class="tags_item delivery" v-if="item.delivery_free == 1">包邮</text>
+						</view>
+						<view class="score"><text
+								style="font-style: italic;color: #FF6D20;margin-right: 20rpx;font-size: 30rpx;">{{item.rate}}</text>
+							{{item.reply_count}}评论
+						</view>
+						<view class='money'>￥
+							<text
+								class='num'>{{item.price.substring(0, item.price.length - 2)}}</text><text>{{item.price.slice(-2)}}</text>
+						</view>
+						<view class="company" v-if="item.merchant" @click.stop="goShop(item.mer_id)">
+							<text class="line1">{{item.merchant.mer_name}}</text>
+							<view class="flex">
+								<text class="iconfont icon-xiangyou"></text>
+							</view>
+						</view>
+					</view>
+					<!-- 返佣 -->
+					<!-- <block v-if="item.max_extension>0 && (item.product_type == 0 || item.product_type == 2)">
+						<view class="foot-bar on">
+							最高赚 ¥{{item.max_extension}}
+						</view>
+					</block> -->
+				</view>
+			</view>
+
+			<!-- 	<view class='noCommodity' v-if="productList.length==0">
+				<view class='pictrue' style=" margin: 60rpx auto;">
+					<image src='/static/images/noCart.png'></image>
+					<view>暂无商品</view>
+				</view>
+				<recommend v-if="recommend_switch == 1" :hostProduct="hostProduct" :isLogin="isLogin"></recommend>
+			</view> -->
+		</block>
+
+
+
+	</view>
+</template>
+
+<script>
+	import {
+		cloudWarehouse
+	} from '@/api/api.js'
+	import {
+		goShopDetail
+	} from '@/libs/order.js'
+	export default {
+		name: "goodsCard",
+		props: {
+			where: {
+				type: Object,
+				required: true
+			}
+		},
+		data() {
+			return {
+				is_switch: false,
+				productList: "",
+			};
+		},
+		mounted() {
+			this.$watch('where', (newValue, oldValue) => {
+				newValue.category_id ? this.get_product_list() : this.productList = []
+
+			}, {
+				deep: true
+			});
+		},
+		methods: {
+
+			test() {
+				// this.get_product_list()
+				// console.log(this.where)
+			},
+			godDetail(item) {
+				goShopDetail(item, this.uid).then(res => {
+					if (this.isLogin) {
+						initiateAssistApi(item.activity_id).then(res => {
+							let id = res.data.product_assist_set_id;
+							uni.hideLoading();
+							uni.navigateTo({
+								url: '/pages/activity/assist_detail/index?id=' + id
+							});
+						}).catch((err) => {
+							uni.showToast({
+								title: err,
+								icon: 'none'
+							})
+						});
+					} else {
+						this.isAuto = true;
+						this.isShowAuth = true
+					}
+
+				})
+			},
+			// 去店铺
+			goShop(id) {
+				if (this.hide_mer_status != 1) {
+					uni.navigateTo({
+						url: `/pages/store/home/index?id=${id}`
+					})
+				}
+			},
+			get_product_list: function() {
+				let that = this;
+				cloudWarehouse(that.where).then(res => {
+					that.productList = res.data.list
+				}).catch(err => {
+					that.loading = false;
+					that.loadTitle = '加载更多';
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.lists {
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-between;
+		background-color: #F4F7FE;
+
+		.card {
+			border-radius: 21.03rpx 21.03rpx 21.03rpx 21.03rpx;
+			overflow: hidden;
+			margin-top: 20rpx;
+			background-color: white;
+
+			// width: 336.45rpx;
+			.store_type {
+				background: linear-gradient(to bottom, #6DD5FA, #3274F9);
+				color: white;
+				border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx;
+				padding: 2rpx 8rpx;
+				font-size: 22rpx;
+			}
+
+			.goods_content {
+				background-color: white;
+				padding: 25rpx 15rpx;
+			}
+
+			.name {
+				font-weight: bold;
+
+				.textellipsis {
+					display: -webkit-box;
+					-webkit-line-clamp: 2;
+					-webkit-box-orient: vertical;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					// font-weight: bold;
+				}
+			}
+
+			.item_tags {
+				margin: 5rpx 0;
+			}
+
+			.score {
+				color: #B3B3B3;
+				font-size: 22.78rpx;
+
+			}
+
+			.money {
+				color: red;
+				margin: 5rpx 0;
+
+				.num {
+					font-size: 36rpx;
+					font-weight: bold;
+				}
+			}
+
+			.company {
+				background-color: #F4F7FE;
+				display: flex;
+				justify-content: space-between;
+				padding: 5rpx 14rpx;
+				border-radius: 19.28rpx 19.28rpx 19.28rpx 19.28rpx;
+
+
+			}
+
+			// width: 40vw;
+
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/realselist/realselist.vue b/components/realselist/realselist.vue
new file mode 100644
index 0000000..e1b31f6
--- /dev/null
+++ b/components/realselist/realselist.vue
@@ -0,0 +1,621 @@
+<template>
+	<view class="containers" :style="viewColor">
+		<view class="header">
+
+			<view class="search">
+				<text class="iconfont icon-xiazai5"></text>
+				<input type="text" placeholder="请输入商品名称" v-model="searchVal" @input="setValue" confirm-type="search"
+					@confirm="searchBut()" placeholder-class='placeholder'>
+			</view>
+
+			<view class="iconclose" @click="close">
+				X
+			</view>
+		</view>
+		<view class="main">
+			<scroll-view scroll-y="true" @touchmove.stop>
+				<block>
+					<view v-if="bought.length" @touchmove="onTouchmove" id="goods" class="goods">
+						<view class="picTxt acea-row" v-for="(item, i) in bought" :key="i">
+							<view class="checkbox">
+								<text @click.stop="goodsCheck(item)" v-if="item.check"
+									class="iconfont icon-xuanzhong1"></text>
+								<text @click.stop="goodsCheck(item)" v-else
+									:class="checkedArr.length >=5 ? 'disabled': ''"
+									class="iconfont icon-weixuanzhong"></text>
+							</view>
+							<view class='pictrue'>
+								<image :src='item.image'></image>
+							</view>
+
+							<view class='text'>
+								<view class='line2 name'>{{item.store_name}}</view>
+
+
+								<view class="picTxt_one" v-if="item.attrValue.length>0">
+									<picker class="slecte" v-if="item.attrValue.length>1"
+										@change="bindPickerChange($event,item.attrValue,i)" :value="index"
+										:range="item.attrValue" :range-key="'sku'">
+										<view class="uni-input">{{item.attrValue[index].sku}}</view>
+									</picker>
+
+									<view class="" style="margin-top: 10rpx;">
+										库存:{{item.attrValue[index].stock}}
+									</view>
+								</view>
+
+
+
+
+
+							</view>
+
+
+							<view class="picTxt_price">
+								<view class="price">
+									<span>委托价格</span>
+									<input type="text" :value="item.price" placeholder="输入出售价格"
+										@input="producrprice($event,i,item)" adjust-position=""
+										placeholder-style="color: #CCCCCC;" />
+								</view>
+								<view class="price_num">
+									<span>委托数量</span>
+									<subtractive v-if='item.number==0' style="margin-top: 10rpx;margin-left: 20rpx;"
+										class="step" :min="1" :max="item.attrValue[index].stock" :value="peicenumber"
+										:isMax="true" :isMin="true" index="11" @eventChange="numberChange($event,i)">
+									</subtractive>
+
+									<subtractive v-else style="margin-top: 10rpx;margin-left: 20rpx;" class="step"
+										:min="1" :max="item.attrValue[index].stock" :value="item.number" :isMax="true"
+										:isMin="true" index="11" @increment="incrementTotal($event,i,item)"
+										@eventChange="numberChange($event,i)"></subtractive>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view v-else class="empty">
+						<image src="/static/images/no_thing.png"></image>
+						<text>暂无内容哦~</text>
+					</view>
+				</block>
+			</scroll-view>
+			<view class="foot_bar">
+				<button class="confirm_btn" @click="submit">确定({{checkedArr.length}})</button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import Loading from '@/components/Loading/index.vue';
+	import subtractive from '@/components/subtractive/subtractive.vue';
+
+	import {
+		getCommunitygetOrderList
+	} from "@/api/trading-floor";
+	import {
+		mapGetters
+	} from "vuex";
+	export default {
+		props: {
+			checkedObj: {
+				type: Array,
+				default: []
+			}
+		},
+		computed: mapGetters(['viewColor']),
+		components: {
+			Loading,
+			subtractive
+		},
+		data() {
+			return {
+				isActive: 0,
+				loadedb: false,
+				loadingb: false,
+				loadedc: false,
+				loadingc: false,
+				loadeds: false,
+				loadings: false,
+				whereb: {
+					page: 1,
+					limit: 10,
+					keyword: '',
+				},
+				peicenumber: 0,
+
+				searchVal: "",
+				checked: [],
+				list: [],
+
+				bought: [],
+
+				checkedArr: [],
+				aryys: [],
+				// picker下拉数据源
+				storageCustomList: [{
+					CustGoodsCode: "TEST001",
+					CustGoodsName: "测试货主001",
+					IfBoxId: 0,
+					IfProductId: 0,
+				}, {
+					CustGoodsCode: "TEST002",
+					CustGoodsName: "测试货主002",
+					IfBoxId: 0,
+					IfProductId: 0,
+				}, {
+					CustGoodsCode: "TEST003",
+					CustGoodsName: "测试货主003",
+					IfBoxId: 0,
+					IfProductId: 0,
+				}],
+				index: 0,
+				pickerData: '请选择',
+				itstock: '',
+
+			};
+		},
+		watch: {
+			checkedObj: {
+				handler(n) {
+
+					this.checkedArr = n
+				},
+				deep: true
+			}
+		},
+		mounted() {
+			this.checkedArr = this.checkedObj
+			this.aryys = this.checkedObj
+			this.getBounht();
+		},
+		methods: {
+			//价格
+			producrprice(e, i, item) {
+				this.bought[i].price = e.detail.value
+				this.$set(item, 'check', false);
+				for (let i in this.checkedArr) {
+					if (this.checkedArr[i].product_id == item.product_id) {
+						this.checkedArr.splice(i, 1)
+					}
+				}
+
+
+
+			},
+			incrementTotal(e, i, item) {
+				this.$set(item, 'check', false);
+				for (let i in this.checkedArr) {
+					if (this.checkedArr[i].product_id == item.product_id) {
+						this.checkedArr.splice(i, 1)
+					}
+				}
+
+
+
+
+
+			},
+			// picker修改事件
+			bindPickerChange: function(e, storage, num) {
+				this.bought[num].attrValue[this.index].sku = storage[e.detail.value].sku
+				this.bought[num].attrValue[this.index].stock = storage[e.detail.value].stock
+				this.bought[num].product_attr_unique = storage[e.detail.value].unique
+				this.pickerData = storage[this.index] // 这里就是选中的对象
+
+				if (this.bought[num].attrValue[this.index].stock == 0) {
+					this.$util.Tips({
+						title: '库存不足'
+					});
+				}
+			},
+
+			// 点击关闭按钮
+			close() {
+				this.$emit('close');
+			},
+			numberChange(data, i) {
+				this.peicenumber = data.number;
+				this.bought[i].number = data.number
+
+			},
+
+			tabs(index) {
+				this.isActive = index
+				this.$set(this.whereb, 'keyword', '');
+				this.searchVal = ''
+				this.searchBut()
+			},
+			onTouchmove(e) {
+				if (this.loadendb) return;
+				if (this.loadingb) return;
+				const query = uni.createSelectorQuery().in(this);
+				query.select('#goods').boundingClientRect(data => {
+					if (data.bottom < 1500 && data.top < 0) {
+						this.getBounht();
+					}
+				}).exec();
+
+				// 模拟触底刷新
+			},
+
+
+			setValue: function(event) {
+				this.$set(this.whereb, 'keyword', event.detail.value);
+				if (!event.detail.value) {
+					this.whereb.page = 1
+					this.loadedb = false
+					this.getBounht()
+				}
+
+			},
+			searchBut() {
+				this.bought = []
+				this.whereb.page = 1
+				this.loadedb = false
+				this.getBounht()
+			},
+			getBounht() {
+				var that = this;
+				// console.log('1111111', that.loadingb, that.loadedb)
+				if (that.loadingb || that.loadedb) return;
+				that.loadingb = true;
+
+				getCommunitygetOrderList(that.whereb).then(
+					res => {
+						that.loadingb = false;
+						that.loadedb = res.data.list.length < that.whereb.limit;
+						that.bought.push.apply(that.bought, res.data.list);
+						that.whereb.page = that.whereb.page + 1;
+						that.getInitchecked(that.bought);
+					},
+					error => {
+						that.$util.Tips({
+							title: error.msg
+						})
+					}
+				);
+			},
+
+
+			/*获取初始化选中的数据*/
+			getInitchecked(arr) {
+				let that = this;
+				arr.forEach((item, index) => {
+					that.$set(item, 'check', false);
+					that.checkedArr.forEach((val, i) => {
+						if (item.product_id == val.product_id) {
+							that.$set(item, 'check', true);
+							that.$set(item, 'number', val.number);
+							that.$set(item, 'price', val.price);
+						}
+					})
+				})
+
+			},
+			/*已选中的商品打钩*/
+			getCheckedGoods() {
+				this.checked = []
+				this.checkedArr.forEach((item, index) => {
+					this.checkedArr.push(item)
+
+
+				})
+			},
+			/*点击选中与否*/
+			goodsCheck(item) {
+				this.$set(item, 'check', !item.check);
+				if (item.check) {
+					if (this.peicenumber == 0) {
+						item.number = 1
+					}
+					if (!item.product_attr_unique) {
+						item.product_attr_unique = item.attrValue[0].unique
+					}
+					this.checkedArr.push(item)
+					this.arrayUnique(this.checkedArr, 'product_id')
+				} else {
+					this.checkedArr.splice(this.checkedArr.findIndex(itemn => ((itemn.product_id == item.product_id))), 1)
+
+				}
+			},
+			//去重
+			arrayUnique(arr, name) {
+				let hash = {}
+				const result = arr.reduce((acc, cru, index) => {
+					if (!hash[cru[name]]) {
+						hash[cru[name]] = {
+							index: acc.length
+						}
+						acc.push(cru)
+					} else {
+						console.log(acc, hash[cru[name]])
+						acc.splice(hash[cru[name]]['index'], 1, cru)
+					}
+
+
+					return acc;
+
+				}, [])
+				this.checkedArr = result
+
+
+			},
+			/*确定提交*/
+			submit() {
+
+				this.$emit('getProduct', this.checkedArr);
+
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.containers {
+		background: #ffffff;
+		border-radius: 16rpx 16rpx 0 0;
+		padding: 40rpx 0;
+		position: relative;
+
+		.header {
+			position: relative;
+			padding: 0 30rpx;
+
+			.title {
+				width: 100%;
+				text-align: center;
+
+				text {
+					position: relative;
+					margin: 0 50rpx;
+					color: #999999;
+					font-size: 30rpx;
+
+					&.on {
+						color: #333333;
+						font-weight: bold;
+						font-size: 34rpx;
+
+						&::after {
+							content: "";
+							display: inline-block;
+							width: 40rpx;
+							height: 5rpx;
+							background: var(--view-theme);
+							position: absolute;
+							bottom: -10rpx;
+							left: 10rpx;
+						}
+					}
+				}
+			}
+
+			.iconclose {
+				width: 44rpx;
+				height: 44rpx;
+				line-height: 44rpx;
+				border: 2rpx solid #fff;
+				border-radius: 50%;
+				text-align: center;
+				color: #fff;
+				position: absolute;
+				top: -150rpx;
+				right: 30rpx;
+			}
+
+			.search {
+				margin-top: 44rpx;
+				background: #F5F5F5;
+				border-radius: 30rpx;
+				padding: 12rpx 30rpx 12rpx 66rpx;
+				position: relative;
+
+				.iconfont {
+					font-size: 24rpx;
+					color: #939393;
+					position: absolute;
+					top: 20rpx;
+					left: 30rpx;
+				}
+
+				.placeholder {
+					color: #999999;
+					font-size: 26rpx;
+				}
+			}
+
+			.sub_title {
+				color: #282828;
+				font-size: 26rpx;
+				margin-top: 30rpx;
+			}
+
+			.iconfont {
+				color: #8A8A8A;
+				font-size: 28rpx;
+				position: absolute;
+				top: 0;
+				right: 30rpx;
+			}
+		}
+
+		scroll-view {
+			height: 650rpx;
+		}
+
+		.main {
+			height: 650rpx;
+			margin: 40rpx 0 80rpx;
+			padding: 0 30rpx;
+		}
+	}
+
+	.picTxt {
+		width: 100%;
+		padding: 25rpx 0;
+		position: relative;
+		align-items: center;
+		justify-content: space-between;
+
+		border-top: 2rpx solid #E7E6E4;
+
+		.picTxt_one {
+			white-space: nowrap;
+			overflow: hidden;
+		}
+
+		.picTxt_one {
+			display: flex;
+			margin-top: 20rpx;
+
+
+			.slecte {
+				margin-right: 30rpx;
+				width: 280rpx;
+				height: 60rpx;
+				line-height: 60rpx;
+				text-align: center;
+				font-size: 28rpx;
+				font-family: PingFang SC-Regular, PingFang SC;
+				font-weight: 400;
+				color: #959595;
+				background-color: #E7E6E4;
+				border-radius: 10rpx 10rpx 10rpx 10rpx;
+				white-space: nowrap;
+				overflow: hidden;
+
+			}
+		}
+
+
+		.picTxt_price {
+			display: flex;
+			margin-top: 37rpx;
+			height: 70rpx;
+			line-height: 70rpx;
+
+			.price {
+				display: flex;
+				margin-right: 15rpx;
+
+				input {
+					width: 210rpx;
+					text-align: center;
+					height: 70rpx;
+					background: #F5F5F5;
+					border-radius: 7rpx 7rpx 7rpx 7rpx;
+					font-size: 28rpx;
+					font-family: PingFang SC-Regular, PingFang SC;
+					font-weight: 400;
+
+					margin-left: 20rpx;
+
+
+				}
+			}
+
+			.price_num {
+				display: flex;
+
+
+			}
+		}
+
+		.checkbox {
+			margin-right: 30rpx;
+
+			.iconfont {
+				font-size: 38rpx;
+				color: #CCCCCC;
+			}
+
+			.icon-xuanzhong1 {
+				color: var(--view-theme);
+			}
+
+			.disabled {
+				pointer-events: none;
+				cursor: default;
+				opacity: 0.3;
+			}
+		}
+
+		.pictrue {
+			width: 160rpx;
+			height: 160rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
+				border-radius: 8rpx;
+			}
+		}
+
+		.text {
+			width: 430rpx;
+			margin-left: 30rpx;
+			font-size: 28rpx;
+			color: #282828;
+			position: relative;
+			height: 160rpx;
+
+			.name {
+				color: #282828;
+				font-size: 28rpx;
+			}
+
+			.money {
+				position: absolute;
+				bottom: 0;
+				left: 0;
+				color: var(--view-priceColor);
+				font-size: 22rpx;
+				font-weight: bold;
+
+				text {
+					font-size: 26rpx;
+				}
+			}
+		}
+	}
+
+	.foot_bar {
+		width: 100%;
+		position: fixed;
+		// bottom: 54px;
+		left: 0;
+		padding: 20rpx 0;
+		z-index: 5;
+
+		.confirm_btn {
+			width: 710rpx;
+			height: 86rpx;
+			line-height: 86rpx;
+			color: #ffffff;
+			text-align: center;
+			font-size: 32rpx;
+			background: var(--view-theme);
+			border-radius: 43rpx;
+			margin: 0 auto;
+		}
+	}
+
+	.empty {
+		margin: 130rpx 0 150rpx;
+		text-align: center;
+
+		image,
+		uni-image {
+			display: inline-block;
+			width: 414rpx;
+			height: 305rpx;
+		}
+
+		text {
+			display: block;
+			color: #999999;
+			font-size: 26rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/release/release.vue b/components/release/release.vue
new file mode 100644
index 0000000..bacdf9e
--- /dev/null
+++ b/components/release/release.vue
@@ -0,0 +1,190 @@
+<template>
+	<view class="mark" v-if="isShow" @click="close">
+
+		<view class="release">
+			<view class="release_content" v-for="(item,i) in list" :key="i" @click="navigtion(item)">
+				<view class="release_content_left">
+					<view :class="i==1?'release_imga':'release_img'">
+						<image :src="item.img" mode="aspectFit"></image>
+					</view>
+
+					<view class="title">
+						<view class="title1">
+							{{item.title1}}
+						</view>
+						<view class="title2">
+							{{item.title2}}
+						</view>
+					</view>
+				</view>
+				<view class="release_content_right  ">
+					<text class="iconfont icon-xiangyou"></text>
+				</view>
+			</view>
+
+			<view class="release_close" @click="close">
+				<image src="@/static/images/trad-close.png" mode="aspectFit"></image>
+			</view>
+		</view>
+	</view>
+	</view>
+</template>
+
+<script>
+	import {
+		navigateTo
+	} from '../../libs/uniApi'
+	export default {
+		props: {
+			isShow: {
+				type: Boolean,
+				default: false
+			},
+			// 子组件接收一个布尔类型的bottom，如果为true则弹窗则在页面的底部，false为默认居中显示
+			bottom: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				list: [{
+						img: require('@/static/images/season.png'),
+						title1: '发布调货商品',
+						title2: '镇街店铺快捷调货',
+					},
+					{
+						img: require('@/static/images/discounts.png'),
+						title1: '发布打折商品',
+						title2: '发布店铺打折商品',
+					}
+				]
+			}
+		},
+		methods: {
+			navigtion(item) {
+			
+				if (item.title1 =='发布调货商品') {
+					uni.navigateTo({
+						url: '/pages/trading_hall/transfer_goods/index'
+					})
+				} else {
+					
+					uni.navigateTo({
+						url: '/pages/trading_hall/adddiscounts/index'
+					})
+				}
+			},
+			close() {
+				this.$emit('close')
+			},
+			cancel() {
+				this.$emit('cancel')
+			},
+			confirm() {
+				this.$emit('confirm')
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.mark {
+		position: fixed;
+		width: 100%;
+		height: 100%;
+		background-color: rgba(0, 0, 0, 0.3);
+		left: 0;
+		bottom: 0;
+		top: 0;
+		right: 0;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.release {
+		position: absolute;
+		bottom: 0px;
+	}
+
+	.release_content {
+		width: 694rpx;
+		height: 137rpx;
+		background: #FCF3EE;
+		border-radius: 14rpx 14rpx 14rpx 14rpx;
+		opacity: 1;
+		margin-bottom: 21rpx;
+		display: flex;
+		justify-content: space-between;
+		padding: 0 26rpx;
+
+		.release_content_left {
+			display: flex;
+       
+		}
+
+		.release_content_right {
+			height: 137rpx;
+			line-height: 137rpx;
+
+		}
+
+		.release_img {
+			width: 111rpx;
+			height: 96rpx;
+			margin-top: 21rpx;
+			margin-right: 19rpx;
+			
+
+			image {
+				width: 111rpx;
+				height: 96rpx;
+			}
+		}
+
+		.release_imga {
+			
+			width: 76rpx;
+			height: 113rpx;
+			
+			margin-top: 5rpx;
+			margin-right: 50rpx;
+
+			image {
+				width: 76rpx;
+				height: 113rpx;
+			}
+		}
+
+		.title {
+			margin-top: 23rpx;
+		}
+
+		.title1 {
+			font-size: 32rpx;
+			font-family: PingFang SC-Medium, PingFang SC;
+			font-weight: 500;
+			color: #333333;
+		}
+
+		.title2 {
+			font-size: 28rpx;
+			font-family: PingFang SC-Regular, PingFang SC;
+			font-weight: 400;
+			color: #666666;
+			margin-top: 11rpx;
+		}
+	}
+
+	.release_close {
+		width: 248rpx;
+		height: 248rpx;
+		margin: 0 auto;
+
+		image {
+			width: 248rpx;
+			height: 248rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/shoppinglist/shoppinglist.vue b/components/shoppinglist/shoppinglist.vue
new file mode 100644
index 0000000..3b921a9
--- /dev/null
+++ b/components/shoppinglist/shoppinglist.vue
@@ -0,0 +1,571 @@
+<template>
+	<view class="containers" :style="viewColor">
+		<view class="header">
+
+			<view class="search">
+				<text class="iconfont icon-xiazai5"></text>
+				<input type="text" placeholder="请输入商品名称" v-model="searchVal" @input="setValue" confirm-type="search"
+					@confirm="searchBut()" placeholder-class='placeholder'>
+			</view>
+
+			<view class="iconclose" @click="close">
+				X
+			</view>
+		</view>
+		<view class="main">
+			<scroll-view scroll-y="true" @touchmove.stop>
+				<block>
+					<view v-if="bought.length" @touchmove="onTouchmove" id="goods" class="goods">
+						<view class="picTxt acea-row" v-for="(item, i) in bought" :key="i">
+							<view class="checkbox">
+								<text @click.stop="goodsCheck(item)" v-if="item.check"
+									class="iconfont icon-xuanzhong1"></text>
+								<text @click.stop="goodsCheck(item)" v-else
+									:class="checkedArr.length >=5 ? 'disabled': ''"
+									class="iconfont icon-weixuanzhong"></text>
+							</view>
+							<view class='pictrue'>
+								<image :src='item.image'></image>
+							</view>
+
+							<view class='text'>
+								<view class='line2 name'>{{item.store_name}}</view>
+
+
+								<view class="picTxt_one" v-if="item.attrValue.length>0">
+									<picker class="slecte" v-if="item.attrValue.length>1"
+										@change="bindPickerChange($event,item.attrValue,i)" :value="index"
+										:range="item.attrValue" :range-key="'sku'">
+										<view class="uni-input">{{item.attrValue[index].sku}}</view>
+									</picker>
+
+									<view class="" style="margin-top: 10rpx;">
+										库存:{{item.attrValue[index].stock}}
+									</view>
+								</view>
+
+
+
+
+
+							</view>
+
+
+							<view class="picTxt_price">
+								<view class="price">
+									<span>出售价格</span>
+									<input type="text" :value="item.price" placeholder="输入出售价格"
+										@input="producrprice($event,i,item)" adjust-position=""
+										placeholder-style="color: #CCCCCC;" />
+								</view>
+								<view class="price_num">
+									<span>出售数量</span>
+									<subtractive v-if='item.number==0' style="margin-top: 10rpx;margin-left: 20rpx;"
+										class="step" :min="1" :max="item.attrValue[index].stock" :value="peicenumber"
+										:isMax="true" :isMin="true" index="11" @eventChange="numberChange($event,i)"  >
+									</subtractive>
+
+									<subtractive v-else style="margin-top: 10rpx;margin-left: 20rpx;" class="step"
+										:min="1" :max="item.attrValue[index].stock" :value="item.number" :isMax="true"
+										:isMin="true" index="11" @eventChange="numberChange($event,i)"  ></subtractive>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view v-else class="empty">
+						<image src="/static/images/no_thing.png"></image>
+						<text>暂无内容哦~</text>
+					</view>
+				</block>
+			</scroll-view>
+			<view class="foot_bar">
+				<button class="confirm_btn" @click="submit">确定({{checkedArr.length}})</button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import Loading from '@/components/Loading/index.vue';
+	import subtractive from '@/components/subtractive/subtractive.vue';
+
+	import {
+		getCommunitygetOrderList
+	} from "@/api/trading-floor";
+	import {
+		mapGetters
+	} from "vuex";
+	export default {
+		props: {
+			checkedObj: {
+				type: Array,
+				default: []
+			}
+		},
+		computed: mapGetters(['viewColor']),
+		components: {
+			Loading,
+			subtractive
+		},
+		data() {
+			return {
+				isActive: 0,
+				loadedb: false,
+				loadingb: false,
+				loadedc: false,
+				loadingc: false,
+				loadeds: false,
+				loadings: false,
+				whereb: {
+					page: 1,
+					limit: 10,
+					keyword: '',
+				},
+				peicenumber: 0,
+
+				searchVal: "",
+				checked: [],
+				list: [],
+
+				bought: [],
+
+				checkedArr: [],
+
+				// picker下拉数据源
+				storageCustomList: [{
+					CustGoodsCode: "TEST001",
+					CustGoodsName: "测试货主001",
+					IfBoxId: 0,
+					IfProductId: 0,
+				}, {
+					CustGoodsCode: "TEST002",
+					CustGoodsName: "测试货主002",
+					IfBoxId: 0,
+					IfProductId: 0,
+				}, {
+					CustGoodsCode: "TEST003",
+					CustGoodsName: "测试货主003",
+					IfBoxId: 0,
+					IfProductId: 0,
+				}],
+				index: 0,
+				pickerData: '请选择',
+				itstock: '',
+
+			};
+		},
+		watch: {
+			checkedObj: {
+				handler(n) {
+
+					this.checkedArr = n
+				},
+				deep: true
+			}
+		},
+		mounted() {
+			this.checkedArr = this.checkedObj
+			this.getBounht();
+		},
+		methods: {
+			//价格
+			producrprice(e, i,item) {
+				
+				this.bought[i].price = e.detail.value
+                this.$set(item, 'check',false);
+			},
+			// picker修改事件
+			bindPickerChange: function(e, storage, num) {
+				this.bought[num].attrValue[this.index].sku = storage[e.detail.value].sku
+				this.bought[num].attrValue[this.index].stock = storage[e.detail.value].stock
+				this.bought[num].product_attr_unique = storage[e.detail.value].unique
+				this.pickerData = storage[this.index] // 这里就是选中的对象
+
+				if (this.bought[num].attrValue[this.index].stock == 0) {
+					this.$util.Tips({
+						title: '库存不足'
+					});
+				}
+			},
+
+			// 点击关闭按钮
+			close() {
+				this.$emit('close');
+			},
+			numberChange(data, i) {
+				this.peicenumber = data.number;
+				this.bought[i].number = data.number
+
+			},
+
+			tabs(index) {
+				this.isActive = index
+				this.$set(this.whereb, 'keyword', '');
+				this.searchVal = ''
+				this.searchBut()
+			},
+			onTouchmove(e) {
+				if (this.loadendb) return;
+				if (this.loadingb) return;
+				const query = uni.createSelectorQuery().in(this);
+				query.select('#goods').boundingClientRect(data => {
+					if (data.bottom < 1500 && data.top < 0) {
+						this.getBounht();
+					}
+				}).exec();
+
+				// 模拟触底刷新
+			},
+
+
+			setValue: function(event) {
+				this.$set(this.whereb, 'keyword', event.detail.value);
+
+			},
+			searchBut() {
+				this.whereb.page = this.wherec.page = this.wheres.page =
+					this.bought = []
+				this.isActive == 0 ? this.getBounht() : ''
+			},
+			getBounht() {
+				var that = this;
+				if (that.loadingb || that.loadedb) return;
+				that.loadingb = true;
+
+				getCommunitygetOrderList(that.whereb).then(
+					res => {
+						that.loadingb = false;
+						that.loadedb = res.data.list.length < that.whereb.limit;
+						that.bought.push.apply(that.bought, res.data.list);
+						that.whereb.page = that.whereb.page + 1;
+						that.getInitchecked(that.bought);
+					},
+					error => {
+						that.$util.Tips({
+							title: error.msg
+						})
+					}
+				);
+			},
+
+
+			/*获取初始化选中的数据*/
+			getInitchecked(arr) {
+				let that = this;
+				arr.forEach((item, index) => {
+					that.$set(item, 'check', false);
+					that.checkedArr.forEach((val, i) => {
+						if (item.product_id == val.product_id) {
+							that.$set(item, 'check', true);
+							that.$set(item, 'number', val.number);
+							that.$set(item, 'price', val.price);
+						}
+					})
+				})
+
+			},
+			/*已选中的商品打钩*/
+			getCheckedGoods() {
+				this.checked = []
+				this.checkedArr.forEach((item, index) => {
+					this.check.push(item)
+				})
+			},
+			/*点击选中与否*/
+			goodsCheck(item) {
+				this.$set(item, 'check', !item.check);
+				if (item.check) {
+					if (this.peicenumber == 0) {
+						item.number = 1
+					}
+
+					if (!item.product_attr_unique) {
+						item.product_attr_unique = item.attrValue[0].unique
+					}
+					this.checkedArr.push(item)
+
+				} else {
+					this.checkedArr.splice(this.checkedArr.findIndex(itemn => ((itemn.spu_id == item.spu_id) || (item
+						.spu_id == (
+							itemn.spu && itemn.spu.spu_id)))), 1)
+
+				}
+			},
+			/*确定提交*/
+			submit() {
+			
+				this.$emit('getProduct', this.checkedArr);
+
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.containers {
+		background: #ffffff;
+		border-radius: 16rpx 16rpx 0 0;
+		padding: 40rpx 0;
+		position: relative;
+
+		.header {
+			position: relative;
+			padding: 0 30rpx;
+
+			.title {
+				width: 100%;
+				text-align: center;
+
+				text {
+					position: relative;
+					margin: 0 50rpx;
+					color: #999999;
+					font-size: 30rpx;
+
+					&.on {
+						color: #333333;
+						font-weight: bold;
+						font-size: 34rpx;
+
+						&::after {
+							content: "";
+							display: inline-block;
+							width: 40rpx;
+							height: 5rpx;
+							background: var(--view-theme);
+							position: absolute;
+							bottom: -10rpx;
+							left: 10rpx;
+						}
+					}
+				}
+			}
+
+			.iconclose {
+				width: 44rpx;
+				height: 44rpx;
+				line-height: 44rpx;
+				border: 2rpx solid #fff;
+				border-radius: 50%;
+				text-align: center;
+				color: #fff;
+				position: absolute;
+				top: -150rpx;
+				right: 30rpx;
+			}
+
+			.search {
+				margin-top: 44rpx;
+				background: #F5F5F5;
+				border-radius: 30rpx;
+				padding: 12rpx 30rpx 12rpx 66rpx;
+				position: relative;
+
+				.iconfont {
+					font-size: 24rpx;
+					color: #939393;
+					position: absolute;
+					top: 20rpx;
+					left: 30rpx;
+				}
+
+				.placeholder {
+					color: #999999;
+					font-size: 26rpx;
+				}
+			}
+
+			.sub_title {
+				color: #282828;
+				font-size: 26rpx;
+				margin-top: 30rpx;
+			}
+
+			.iconfont {
+				color: #8A8A8A;
+				font-size: 28rpx;
+				position: absolute;
+				top: 0;
+				right: 30rpx;
+			}
+		}
+
+		scroll-view {
+			height: 650rpx;
+		}
+
+		.main {
+			height: 650rpx;
+			margin: 40rpx 0 80rpx;
+			padding: 0 30rpx;
+		}
+	}
+
+	.picTxt {
+		width: 100%;
+		padding: 25rpx 0;
+		position: relative;
+		align-items: center;
+		justify-content: space-between;
+
+		border-top: 2rpx solid #E7E6E4;
+
+		.picTxt_one {
+			white-space: nowrap;
+			overflow: hidden;
+		}
+
+		.picTxt_one {
+			display: flex;
+			margin-top: 20rpx;
+
+
+			.slecte {
+				margin-right: 30rpx;
+				width: 280rpx;
+				height: 60rpx;
+				line-height: 60rpx;
+				text-align: center;
+				font-size: 28rpx;
+				font-family: PingFang SC-Regular, PingFang SC;
+				font-weight: 400;
+				color: #959595;
+				background-color: #E7E6E4;
+				border-radius: 10rpx 10rpx 10rpx 10rpx;
+				white-space: nowrap;
+				overflow: hidden;
+
+			}
+		}
+
+
+		.picTxt_price {
+			display: flex;
+			margin-top: 37rpx;
+			height: 70rpx;
+			line-height: 70rpx;
+
+			.price {
+				display: flex;
+				margin-right: 15rpx;
+
+				input {
+					width: 210rpx;
+					text-align: center;
+					height: 70rpx;
+					background: #F5F5F5;
+					border-radius: 7rpx 7rpx 7rpx 7rpx;
+					font-size: 28rpx;
+					font-family: PingFang SC-Regular, PingFang SC;
+					font-weight: 400;
+
+					margin-left: 20rpx;
+
+
+				}
+			}
+
+			.price_num {
+				display: flex;
+
+
+			}
+		}
+
+		.checkbox {
+			margin-right: 30rpx;
+
+			.iconfont {
+				font-size: 38rpx;
+				color: #CCCCCC;
+			}
+
+			.icon-xuanzhong1 {
+				color: var(--view-theme);
+			}
+
+			.disabled {
+				pointer-events: none;
+				cursor: default;
+				opacity: 0.3;
+			}
+		}
+
+		.pictrue {
+			width: 160rpx;
+			height: 160rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
+				border-radius: 8rpx;
+			}
+		}
+
+		.text {
+			width: 430rpx;
+			margin-left: 30rpx;
+			font-size: 28rpx;
+			color: #282828;
+			position: relative;
+			height: 160rpx;
+
+			.name {
+				color: #282828;
+				font-size: 28rpx;
+			}
+
+			.money {
+				position: absolute;
+				bottom: 0;
+				left: 0;
+				color: var(--view-priceColor);
+				font-size: 22rpx;
+				font-weight: bold;
+
+				text {
+					font-size: 26rpx;
+				}
+			}
+		}
+	}
+
+	.foot_bar {
+		width: 100%;
+		position: fixed;
+		// bottom: 54px;
+		left: 0;
+		padding: 20rpx 0;
+		z-index: 5;
+
+		.confirm_btn {
+			width: 710rpx;
+			height: 86rpx;
+			line-height: 86rpx;
+			color: #ffffff;
+			text-align: center;
+			font-size: 32rpx;
+			background: var(--view-theme);
+			border-radius: 43rpx;
+			margin: 0 auto;
+		}
+	}
+
+	.empty {
+		margin: 130rpx 0 150rpx;
+		text-align: center;
+
+		image,
+		uni-image {
+			display: inline-block;
+			width: 414rpx;
+			height: 305rpx;
+		}
+
+		text {
+			display: block;
+			color: #999999;
+			font-size: 26rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/subtractive/subtractive.vue b/components/subtractive/subtractive.vue
new file mode 100644
index 0000000..8ee625e
--- /dev/null
+++ b/components/subtractive/subtractive.vue
@@ -0,0 +1,208 @@
+<template>
+	<view class="uni-numbox">
+		<!-- -部分 -->
+		<view class="uni-numbox-minus" @click="_calcValue('subtract')">
+			<text :class="minDisabled?'uni-numbox-disabled': ''">-</text>
+		</view>
+		<!-- 中间输入数值部分 -->
+		<input class="uni-numbox-value" type="number" :disabled="disabled" :value="inputValue" @blur="_onBlur">
+		<!-- + 部分 -->
+		<view class="uni-numbox-plus" @click="_calcValue('add')">
+			<text :class="maxDisabled?'uni-numbox-disabled': ''">+</text>
+		</view>
+	</view>
+</template>
+<script>
+	export default {
+		name: 'uni-number-box',
+		props: {
+			// isMax  是否有上限设置
+			isMax: {
+				type: Boolean,
+				default: false
+			},
+			// isMin  是否有下限设置
+			isMin: {
+				type: Boolean,
+				default: false
+			},
+			// index 唯一值，如果一个页面有多个数量增减组件时，起到唯一的作用
+			index: {
+				type: String,
+				default: 0
+			},
+			// value 是数值
+			value: {
+				type: Number,
+				default: 0
+			},
+			// min 最小值
+			min: {
+				type: Number,
+				default: -Infinity
+			},
+			// max 最大值
+			max: {
+				type: Number,
+				default: Infinity
+			},
+			// step  步长
+			step: {
+				type: Number,
+				default: 1
+			},
+			// disabled 是否禁用
+			disabled: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				inputValue: this.value,
+				minDisabled: false,
+				maxDisabled: false
+			}
+		},
+		created() {
+			this.maxDisabled = this.isMax;
+			this.minDisabled = this.isMin;
+		},
+		computed: {
+
+		},
+		watch: {
+			inputValue(number) {
+				const data = {
+					number: number,
+					index: this.index
+				}
+				this.$emit('eventChange', data);
+			}
+		},
+		methods: {
+			_calcValue(type) {
+				const scale = this._getDecimalScale();
+				let value = this.inputValue * scale;
+				let newValue = 0;
+				let step = this.step * scale;
+
+				if (type === 'subtract') {
+					newValue = value - step;
+					if (newValue <= this.min) {
+						this.minDisabled = true;
+					}
+					if (newValue < this.min) {
+						newValue = this.min
+					}
+					if (newValue < this.max && this.maxDisabled === true) {
+						this.maxDisabled = false;
+					}
+				} else if (type === 'add') {
+					newValue = value + step;
+					if (newValue >= this.max) {
+						this.maxDisabled = true;
+					}
+					if (newValue > this.max) {
+						newValue = this.max
+					}
+					if (newValue > this.min && this.minDisabled === true) {
+						this.minDisabled = false;
+					}
+				}
+				if (newValue === value) {
+					return;
+				}
+				this.inputValue = newValue / scale;
+			},
+			_getDecimalScale() {
+				let scale = 1;
+				// 浮点型
+				if (~~this.step !== this.step) {
+					scale = Math.pow(10, (this.step + '').split('.')[1].length);
+				}
+				return scale;
+			},
+			_onBlur(event) {
+				let value = event.detail.value;
+				if (!value) {
+					this.inputValue = 0;
+					return
+				}
+				value = +value;
+				if (value > this.max) {
+					value = this.max;
+				} else if (value < this.min) {
+					value = this.min
+				}
+
+				this.inputValue = value
+			}
+		}
+	}
+</script>
+<style>
+	.uni-numbox {
+		/* position:absolute; */
+		/* left: 30upx;
+		bottom: 0; */
+		display: flex;
+		justify-content: flex-start;
+		align-items: center;
+		width: 200upx;
+		height: 50upx;
+		/* background:#f5f5f5; */
+	}
+
+	.uni-numbox-minus {
+		background: #EEEEEE !important;
+
+		color: #909399 !important;
+	}
+
+	.uni-numbox-minus,
+	.uni-numbox-plus {
+		margin: 0;
+		width: 53rpx;
+		height: 53rpx;
+		background-color: #F84221;
+		opacity: 1;
+		line-height: 53rpx;
+		text-align: center;
+		position: relative;
+		color: #fff;
+		font-size: 40upx;
+	}
+
+	.uni-numbox-minus .yticon,
+	.uni-numbox-plus .yticon {
+		font-size: 36upx;
+		color: #555;
+	}
+
+	.uni-numbox-minus {
+		/* 	border-right: none;
+		border-top-left-radius: 6upx;
+		border-bottom-left-radius: 6upx; */
+	}
+
+	.uni-numbox-plus {
+		/* border-left: none;
+		border-top-right-radius: 6upx;
+		border-bottom-right-radius: 6upx; */
+	}
+
+	.uni-numbox-value {
+		position: relative;
+		/* background-color: #f5f5f5; */
+		width: 90upx;
+		height: 50upx;
+		text-align: center;
+		padding: 0;
+		font-size: 30upx;
+	}
+
+	.uni-numbox-disabled.yticon {
+		color: #d6d6d6;
+	}
+</style>
\ No newline at end of file
diff --git a/components/villageTeam/villageTeam.vue b/components/villageTeam/villageTeam.vue
new file mode 100644
index 0000000..97c6ed4
--- /dev/null
+++ b/components/villageTeam/villageTeam.vue
@@ -0,0 +1,396 @@
+<template>
+	<uni-popup type="bottom" ref="areaChoose">
+		<view class="mian getHeight" id="main">
+			<view class="top getHeight" id="top">
+				<text>请选择所在地区</text>
+				<!-- <text class="iconfont close" @click.stop="close">&#xe7fa;</text> -->
+				<view class="top_img">
+					<image src="@/static/images/close.png" mode="aspectFill" @click.stop="close"></image>
+				</view>
+			</view>
+			<scroll-view scroll-x="true" @scroll="scroll" :show-scrollbar="false" class="nav getHeight" id="nav"
+				:scroll-into-view="scrollIntoView">
+				<view @click="areaSelect(index)" :class="areaIndex == index ? 'nav-item nav-item-a' : 'nav-item'"
+					v-for="(item, index) in list" :key="index" :id="'area' + index">
+					<text>{{ item }}</text>
+				</view>
+				<view class="bottomBorder" :style="'left:' + navBottomLeft + 'px'"></view>
+			</scroll-view>
+			<swiper class="swiper getHeight" :disable-touch="true" :current="current"
+				:style="'height:' + swiperH + 'px'">
+				<swiper-item v-for="(type, idx) in [1,2,3,4,5]" :key="idx" :id="'sw'+type">
+					<scroll-view scroll-y="true" scroll-with-animation scroll-anchoring :scroll-into-view='id2'
+						@scroll="scroll" :show-scrollbar="false" class="swiper-list">
+						<view class="area-item" v-for="(item, index) in getList" :key="index" :id="'area' + index">
+
+
+							<view class="" style="line-height: 80rpx;margin-left: 40rpx;"
+								@click="itemSelect(item, index)">
+								{{ item.name }}
+							</view>
+						</view>
+					</scroll-view>
+
+				</swiper-item>
+			</swiper>
+
+		</view>
+	</uni-popup>
+</template>
+
+<script>
+	import {
+		brigade
+	} from '@/api/api.js';
+	export default {
+		name: 'area-choose',
+		props: {
+
+			address: Array,
+		},
+		data() {
+			return {
+				list: ['请选择', ],
+				areaIndex: 0,
+				navBottomLeft: 0,
+				scrollIntoView: 'area0',
+				code: '440100',
+				provinceList: [], //省
+				proCode: -1,
+				cityList: [],
+				cityCode: -1,
+				disList: [],
+				disCode: -1,
+				townList: [],
+				townCode: -1,
+				streeCode: -1,
+				streeList: [],
+				areaCode: -1,
+				areaList: [],
+				swiperH: 300, //列表高
+				current: 0, //当前滑块
+				id: '', //地址编号A、B、C、...
+				id2: '',
+				scrollTopList: [{
+					id: 'A',
+					top: 0
+				}],
+				scrollTopListAll: {}
+
+			};
+		},
+		onLoad() {
+
+
+		},
+		mounted() {
+
+			this.getData();
+		},
+		computed: {
+			getList() {
+
+				return this.areaIndex == 0 ? this.provinceList : this.areaIndex == 1 ? this.cityList : this.areaIndex ==
+					2 ? this.disList : this.areaIndex ==
+					3 ? this.townList : this.areaIndex ==
+					4 ? this.streeList : this.areaList
+			},
+		},
+		methods: {
+			close() {
+				this.$refs.areaChoose.close()
+			},
+			show() {
+
+
+				this.$refs.areaChoose.open();
+				// console.log(this.address[0].name)
+				if (this.address.length > 0) {
+					this.list = [this.address[0].name]
+				}
+
+
+				if (!this.provinceList) {
+					this.getData();
+				} else {
+					this.getScrollT(0, this.provinceList.length)
+					this.current = 0;
+
+					this.$nextTick(() => {
+						setTimeout(() => {
+							this.areaSelect(0);
+						}, 300)
+
+					})
+
+				}
+
+
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.getSwiperH();
+					}, 300)
+
+				})
+
+
+			},
+			onchange(e) {
+				const value = e.detail.value;
+			},
+			scroll(e) {
+				this.scrollTopList.some((item, index) => {
+					if (e.detail.scrollTop > item.top) {
+						this.id = item.id
+					}
+				})
+			},
+			areaSelect(index) {
+				// 选中头部地址项
+				this.areaIndex = index;
+				this.current = index;
+				//自动滚动
+				this.scrollIntoView = 'area' + index;
+				let widthAll = 0;
+				for (let i = 0; i < index + 1; i++) {
+					var query = uni.createSelectorQuery().in(this);
+					var idView = '#area' + i;
+					query.select(idView).boundingClientRect();
+					query.exec(res => {
+						if(res[0]!=null){
+										
+							if (i < index) {
+								widthAll += res[0].width;
+							}
+							if (i == index ) {
+								this.navBottomLeft = widthAll + (res[0].width - uni.upx2px(60)) / 2;
+							}
+						}
+					});
+				}
+				this.scrollTopList = this.scrollTopListAll[index]
+			},
+			sliderSelect(id) {
+				this.id2 = id
+			},
+			getSwiperH() {
+				var query = uni.createSelectorQuery().in(this);
+				query
+					.selectAll('.getHeight')
+					.boundingClientRect()
+					.exec(res => {
+						if (res[0].length > 0) {
+							this.swiperH = res[0][0].height - res[0][1].height - res[0][2].height - uni.upx2px(20);
+						} else {
+							setTimeout(() => {
+								this.getSwiperH();
+							}, 200);
+						}
+					});
+			},
+			getScrollT(type, length) {
+				var query = uni.createSelectorQuery().in(this);
+				query
+					.selectAll('#sw' + (type + 1) + ' .area-item-id')
+					.boundingClientRect()
+					.exec(res => {
+						if (res[0].length == length) {
+							this.scrollTopList = []
+							let firstTop = res[0][0].top
+							res[0].forEach((item, index) => {
+								let obj = {
+									id: item.id,
+									top: item.top - firstTop
+								}
+								this.scrollTopList.push(obj)
+							})
+							this.scrollTopListAll[type] = this.scrollTopList
+						} else {
+							setTimeout(() => {
+								this.getScrollT(type, length)
+							}, 200)
+						}
+
+					});
+
+			},
+			itemSelect(item, type) {
+
+				this.$set(this.list, type, item.name)
+				this.$refs.areaChoose.close()
+				this.$emit('villageComplete', [item])
+
+
+			},
+
+			getData(code = '', type = 0) {
+
+				brigade().then(res => {
+					// console.log(res.data)
+					this.provinceList = res.data
+
+					if (res.data.length > 0) {
+						this.getScrollT(type, res.data.length)
+					}
+					this.current = type;
+					this.areaSelect(type);
+				})
+
+			},
+
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	.mian {
+		height: 85vh;
+		width: 100%;
+		background-color: #ffffff;
+		border-radius: 20rpx 20rpx 0 0;
+		position: relative;
+
+		.top {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			padding-left: 30rpx;
+			font-size: 32rpx;
+			font-weight: bold;
+			padding: 40rpx 30rpx 30rpx;
+
+			.top_img {
+				width: 58rpx;
+				height: 58rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+
+		}
+
+		.nav {
+			white-space: nowrap;
+			width: 100%;
+			position: relative;
+			padding: 0rpx 20rpx;
+
+			.bottomBorder {
+				position: absolute;
+				width: 60rpx;
+				height: 6rpx;
+				// background-image: linear-gradient(to right, red, white);
+				bottom: 0rpx;
+				left: 0rpx;
+				transition: left 0.5s ease;
+			}
+
+			.nav-item {
+				padding: 10rpx 20rpx;
+				display: inline-block;
+				text-align: center;
+				font-size: 28rpx;
+			}
+
+			.nav-item-a {
+				// color: rgb(201, 22, 35);
+				font-size: 30rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 500;
+				color: #3274F9;
+			}
+		}
+
+		.swiper {
+			height: 1000rpx;
+			margin-top: 20rpx;
+
+			.swiper-list {
+				height: 100%;
+				display: flex;
+				flex-direction: column;
+				position: relative;
+
+				.area-item {
+					font-size: 28rpx;
+
+					.area-item-id {
+						padding: 20rpx 44rpx;
+						border-bottom: 1rpx solid #f0ecf2;
+						font-weight: bold;
+						display: block;
+					}
+
+					.area-item-id-sticky {
+						position: sticky;
+						top: 0;
+						background-color: #FFFFFF;
+						transition: all 0.1s;
+
+					}
+
+					.swiper-list2 {
+						display: flex;
+						flex-direction: column;
+
+
+						.area-item-name {
+							padding: 20rpx 40rpx 0;
+							font-weight: 400;
+
+							.iconfont {
+								color: rgb(201, 22, 35);
+								margin-right: 10rpx;
+							}
+						}
+
+						.area-item-name-a {
+							color: rgb(201, 22, 35);
+						}
+					}
+				}
+
+			}
+		}
+
+		.slider-right {
+
+			position: absolute;
+			right: 0rpx;
+			top: 80rpx;
+			bottom: 0;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			padding: 20rpx;
+
+			.slider-list {
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				background-color: #F4F7FE;
+				border-radius: 20rpx;
+				font-size: 23rpx;
+				font-weight: 400;
+			}
+
+			.slider-item {
+				padding: 10rpx 10rpx;
+				font-size: 18rpx;
+				color: #24292E;
+
+				&:first-child {
+					padding-top: 20rpx;
+				}
+
+				&:last-child {
+					padding-bottom: 20rpx;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..fd9711a
--- /dev/null
+++ b/package.json
@@ -0,0 +1,16 @@
+{
+    "id": "e-select",
+    "name": "e-select下拉选择器",
+    "displayName": "e-select下拉选择器",
+    "version": "1.0.7",
+    "description": "select下拉选择器，支持vue2、vue3，支持搜索过滤，支持滚动动画，内置插槽可用于搭配分页组件",
+    "keywords": [
+        "下拉选择框"
+    ],
+    "dcloudext": {
+        "category": [
+            "前端组件",
+            "通用组件"
+        ]
+    }
+}
\ No newline at end of file
diff --git a/pages/admin/order/monitor.vue b/pages/admin/order/monitor.vue
new file mode 100644
index 0000000..8b37c4d
--- /dev/null
+++ b/pages/admin/order/monitor.vue
@@ -0,0 +1,663 @@
+<template>
+  <view class="pos-order-list" ref="container">
+    <view class="top-header">
+      <view class="search">
+        <view class="search-content acea-row row-middle">
+          <text class="iconfont icon-sousuo"></text>
+          <input v-model="where.keyword" confirm-type="search" placeholder="请输收货人手机号或订单号搜索" class="input"
+            @confirm="handleSearch" />
+        </view>
+      </view>
+    </view>
+    <view class="pubilc_footer">
+      <view class="footer_bon" v-for="(item,index) in list" :key="index">
+        <view class=""  v-for="(val, key) in item.orderProduct">
+          <view class="bon_top" :key="key" @click="toDetail(item)">
+            <view class="public_img">
+              <image class="public_img" :src="val.cart_info.product.image" mode=""></image>
+            </view>
+            <view>
+              <view class="text_top">
+                <view class="text">
+                  {{ val.cart_info.product.store_name }}
+                </view>
+                <view class="monry">
+                  ￥{{ val.total_price }}
+                </view>
+              </view>
+              <view class="text_order">
+                订单号: {{ item.order_sn }}
+              </view>
+            </view>
+          </view>
+          <view class="bon_bon" :key="key" @click="toDetail(item)">
+            <view class="order">
+              采购数量
+              <view class="txt">
+                {{ val.product_num }}
+              </view>
+            </view>
+            <view class="order" style="border-left: 1px solid #999999;border-right: 1px solid #999999;">
+              已售数量
+              <view class="txt">
+                {{ val.sales_volume }}
+              </view>
+            </view>
+            <view class="order">
+              库存数量
+              <view class="txt">
+                {{ val.product_num - val.sales_volume }}
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <Loading :loaded="loaded" :loading="loading"></Loading>
+    <view v-if="!loading && list.length <= 0" class="nothing">
+      <image src="/static/images/no_thing.png" mode="widthFix"></image>
+      <view class="nothing_text">暂无订单~</view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import {
+    purchaseOrder
+  } from "@/api/admin";
+  import Loading from '@/components/Loading/index'
+  export default {
+    name: "AdminOrderList",
+    components: {
+      Loading
+    },
+    data() {
+      return {
+        current: "",
+        change: false,
+        refundMark: false,
+        types: 1,
+        where: {
+          page: 1,
+          limit: 10,
+          status: 1,
+          keyword: '',
+          product_type: ''
+        },
+        list: [],
+        loaded: false,
+        loading: false,
+        refundInfo: {},
+        orderInfo: {},
+        status: "",
+        merId: ''
+      };
+    },
+    watch: {
+      "$route.params.types": function(newVal) {
+        let that = this;
+        if (newVal != undefined) {
+          that.where.status = newVal;
+          that.init();
+        }
+      },
+      types: function() {
+        this.getIndex();
+      }
+    },
+    onLoad(option) {
+      this.where.product_type = uni.getStorageSync("PRODUCT_TYPE") ?? ""
+      this.current = "";
+      this.merId = option.merId;
+      this.getIndex();
+    },
+    methods: {
+      handleSearch() {
+        this.loaded = false;
+        this.where.page = 1;
+        this.list = [];
+        this.getIndex();
+      },
+      // 获取数据
+      getIndex() {
+        let that = this;
+        if (that.loading || that.loaded) return;
+        that.loading = true;
+        purchaseOrder(that.where, that.merId).then(
+          res => {
+            that.loading = false;
+            that.loaded = res.data.length < that.where.limit;
+            that.list.push.apply(that.list, res.data);
+            that.where.page = that.where.page + 1;
+          },
+          err => {
+            that.$util.Tips({
+              title: err
+            });
+          }
+        );
+      },
+      // 初始化
+      init: function() {
+        this.list = [];
+        this.where.page = 1;
+        this.loaded = false;
+        this.loading = false;
+        this.getIndex();
+        this.current = "";
+      },
+      toDetail(item) {
+        uni.navigateTo({
+          url: `/pages/admin/orderDetail/index?id=${item.order_id}&mer_id=${item.mer_id}`
+        })
+      }
+    },
+    onReachBottom() {
+      this.getIndex()
+    }
+  }
+</script>
+
+<style lang="scss">
+  .pos-order-list .top-header {
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 9999;
+    width: 100%;
+    background-color: #fff;
+  }
+
+  .pos-order-list .nav {
+    // width: 100%;
+    height: 96upx;
+    font-size: 30upx;
+    color: #282828;
+    width: 690rpx;
+    margin: 0 auto;
+  }
+
+  .pos-order-list .nav .item {
+    display: inline-block;
+    text-align: center;
+    color: #333333;
+    max-width: 160rpx;
+    margin-right: 50rpx;
+    line-height: 96upx;
+
+    &:last-child {
+      margin-right: 0;
+    }
+  }
+
+  .pos-order-list .nav .item.on {
+    color: #2291f8;
+  }
+
+  .pos-order-list .list {
+    margin-top: 100upx;
+  }
+
+  .pos-order-list .list .item {
+    background-color: #fff;
+    width: 100%;
+    position: relative;
+  }
+
+  .pos-order-list .list .item .item-status {
+    position: absolute;
+    top: 14rpx;
+    right: 20rpx;
+
+    .iconfont {
+      font-size: 98rpx;
+      color: #CCCCCC;
+
+      &.on {
+        color: #FFE3BC;
+      }
+    }
+  }
+
+  .pos-order-list .list .item~.item {
+    margin-top: 24upx;
+  }
+
+  .pos-order-list .list .activity_type {
+    display: inline-block;
+    color: #E93323;
+    font-size: 20rpx;
+    text-align: center;
+    border-radius: 5rpx;
+    padding: 0 4rpx;
+    line-height: 28rpx;
+    margin-right: 8rpx;
+    border: 1rpx solid #E93323;
+  }
+
+  .pos-order-list .list .item .order-num {
+    height: 124upx;
+    border-bottom: 1px solid #eee;
+    font-size: 30upx;
+    font-weight: bold;
+    color: #282828;
+    padding: 0 30upx;
+    position: relative;
+  }
+
+  .pos-order-list .list .item .order-status {
+    color: #ff9600;
+    position: absolute;
+    top: 24rpx;
+    right: 20rpx;
+    text-align: right;
+    width: 160rpx;
+    font-weight: normal;
+    font-size: 26rpx;
+  }
+
+  .pos-order-list .list .item .order-num .time {
+    font-size: 26upx;
+    font-weight: normal;
+    color: #999;
+    margin-top: -40upx;
+  }
+
+  .pos-order-list .list .item .operation {
+    padding: 20upx 30upx 20upx 0;
+    margin: 30upx 0 0 30upx;
+    border-top: 1rpx solid #EEEEEE;
+  }
+
+  .pos-order-list .list .item .operation .more {
+    position: relative;
+  }
+
+  .pos-order-list .list .item .operation .icon-gengduo {
+    font-size: 50upx;
+    color: #aaa;
+  }
+
+  .pos-order-list .list .item .operation .order .arrow {
+    width: 0;
+    height: 0;
+    border-left: 11upx solid transparent;
+    border-right: 11upx solid transparent;
+    border-top: 20upx solid #e5e5e5;
+    position: absolute;
+    left: 15upx;
+    bottom: -18upx;
+  }
+
+  .pos-order-list .list .item .operation .order .arrow:before {
+    content: '';
+    width: 0;
+    height: 0;
+    border-left: 7upx solid transparent;
+    border-right: 7upx solid transparent;
+    border-top: 20upx solid #fff;
+    position: absolute;
+    left: -7upx;
+    bottom: 0;
+  }
+
+  .pos-order-list .list .item .operation .order {
+    width: 200upx;
+    background-color: #fff;
+    border: 1px solid #eee;
+    border-radius: 10upx;
+    position: absolute;
+    top: -100upx;
+    z-index: 9;
+  }
+
+  .pos-order-list .list .item .operation .order .items {
+    height: 77upx;
+    line-height: 77upx;
+    text-align: center;
+  }
+
+  .pos-order-list .list .item .operation .order .items~.items {
+    border-top: 1px solid #f5f5f5;
+  }
+
+  .pos-order-list .list .item .operation .bnt {
+    font-size: 28upx;
+    color: #5c5c5c;
+    width: 170upx;
+    height: 60upx;
+    border-radius: 30upx;
+    border: 1px solid #bbb;
+    text-align: center;
+    line-height: 60upx;
+  }
+
+  .pos-order-list .list .item .operation .bnt_color {
+    border: none;
+    color: #fff;
+    background: linear-gradient(90deg, #2291F8 0%, #1CD1DC 100%);
+  }
+
+  .pos-order-list .list .item .operation .bnt~.bnt {
+    margin-left: 14upx;
+  }
+
+  .pos-order-goods {
+    padding: 0 30upx;
+    background-color: #fff;
+  }
+
+  .pos-order-goods .goods {
+    padding-top: 20rpx;
+    overflow: hidden;
+  }
+
+  .pos-order-goods .goods~.goods {
+    border-top: 1px dashed #e5e5e5;
+  }
+
+  .pos-order-goods .cancellate {
+    font-size: 24rpx;
+    float: right;
+    margin-top: 10rpx;
+
+    text {
+      margin-left: 26rpx;
+    }
+  }
+
+  .pos-order-goods .cancelled {
+    color: #FF9600;
+  }
+
+  .pos-order-goods .goods .uncancell {
+    color: #999999;
+  }
+
+  .pos-order-goods .goods .picTxt {
+    width: 515upx;
+  }
+
+  .pos-order-goods .goods .picTxt .pictrue {
+    width: 130upx;
+    height: 130upx;
+  }
+
+  .pos-order-goods .goods .picTxt .pictrue image {
+    width: 100%;
+    height: 100%;
+    border-radius: 6upx;
+  }
+
+  .pos-order-goods .goods .picTxt .text {
+    flex-direction: column;
+    width: 365upx;
+  }
+
+  .pos-order-goods .goods .picTxt .text .info {
+    font-size: 28upx;
+    color: #282828;
+
+    &.refund-info {
+      width: 460upx;
+    }
+  }
+
+  .refund-y-money {
+    margin-top: 16rpx;
+    font-size: 26rpx;
+  }
+
+  .pos-order-goods .goods .picTxt .text .attr {
+    margin-top: 5rpx;
+    font-size: 24upx;
+    color: #999;
+  }
+
+  .pos-order-goods .goods .money {
+    width: 164upx;
+    text-align: right;
+    font-size: 28upx;
+
+    &.refund-money {
+      width: auto;
+      position: relative;
+      top: -50rpx;
+
+      .num {
+        color: #999999;
+      }
+
+    }
+
+    .refund-num {
+      font-size: 24rpx;
+      color: #282828;
+    }
+  }
+
+  .pos-order-goods .goods .money .x-money {
+    color: #282828;
+  }
+
+  .pos-order-goods .goods .money .num {
+    color: #ff9600;
+    margin: 5upx 0;
+  }
+
+  .pos-order-goods .goods .money .y-money {
+    color: #999;
+    text-decoration: line-through;
+  }
+
+  .pos-order-goods .goods .refund_num {
+    display: inline-block;
+    margin-left: 10rpx;
+  }
+
+  .public-total {
+    font-size: 28upx;
+    color: #282828;
+    height: 92upx;
+    line-height: 92upx;
+    text-align: right;
+    padding: 0 30upx;
+    background-color: #fff;
+  }
+
+  .public-total .money {
+    color: #ff4c3c;
+  }
+
+  .nothing {
+    margin-top: 200rpx;
+    text-align: center;
+  }
+
+  .nothing_text {
+    margin-top: 20rpx;
+    color: #999999;
+  }
+
+  .priceChange {
+    position: fixed;
+    width: 580upx;
+    background-color: #fff;
+    border-radius: 10upx;
+    top: 50%;
+    left: 50%;
+    margin-left: -290upx;
+    margin-top: -335upx;
+    z-index: 666;
+    transition: all 0.3s ease-in-out 0s;
+    transform: scale(0);
+    opacity: 0;
+  }
+
+  .priceChange.on {
+    opacity: 1;
+    transform: scale(1);
+  }
+
+  .priceChange .priceTitle {
+    background: url("~@/static/images/pricetitle.jpg") no-repeat;
+    background-size: 100% 100%;
+    width: 100%;
+    height: 160upx;
+    border-radius: 10upx 10upx 0 0;
+    text-align: center;
+    font-size: 40upx;
+    color: #fff;
+    line-height: 160upx;
+    position: relative;
+  }
+
+  .priceChange .priceTitle .iconfont {
+    position: absolute;
+    font-size: 40upx;
+    right: 26upx;
+    top: 23upx;
+    width: 40upx;
+    height: 40upx;
+    line-height: 40upx;
+  }
+
+  .priceChange .listChange {
+    padding: 0 40upx;
+  }
+
+  .priceChange .listChange textarea {
+    box-sizing: border-box;
+  }
+
+  .priceChange .listChange .item {
+    height: 103upx;
+    border-bottom: 1px solid #e3e3e3;
+    font-size: 32upx;
+    color: #333;
+  }
+
+  .priceChange .modify {
+    font-size: 32upx;
+    color: #fff;
+    width: 490upx;
+    height: 90upx;
+    text-align: center;
+    line-height: 90upx;
+    border-radius: 45upx;
+    background-color: #2291f8;
+    margin: 53upx auto;
+  }
+
+  .priceChange .listChange textarea {
+    border: 1px solid #eee;
+    width: 100%;
+    height: 200upx;
+    margin-top: 50upx;
+    border-radius: 10upx;
+    color: #333;
+    padding: 20upx;
+  }
+
+  .search {
+    padding: 17rpx 30rpx;
+
+    .search-content {
+      width: 100%;
+      height: 60rpx;
+      padding: 0 30rpx;
+      border-radius: 30rpx;
+      background-color: #F5F5F5;
+      font-size: 26rpx;
+    }
+
+    .iconfont {
+      margin-right: 10rpx;
+      font-size: 26rpx;
+      color: #999999;
+    }
+
+    .input-placeholder {
+      font-size: 26rpx;
+      color: #999999;
+    }
+
+    .input {
+      flex: 1;
+    }
+  }
+
+  .pubilc_footer {
+    margin-top: 50px;
+
+    .footer_bon {
+      width: 100%;
+      border-radius: 8px;
+      background-color: #fff;
+      padding-bottom: 10px;
+      margin-bottom: 10px;
+
+      .bon_top {
+        display: flex;
+        justify-content: flex-start;
+        align-items: center;
+
+        .public_img {
+          width: 60px;
+          height: 60px;
+          margin: 12px;
+        }
+
+        .text_top {
+          display: flex;
+          justify-content: flex-start;
+          align-items: center;
+          margin: 3px 0 3px 3px;
+
+          .text {
+            width: 180px;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+          }
+
+          .monry {
+            margin-left: 20px;
+            color: #F84221;
+          }
+        }
+
+        .text_order {
+          width: 200px;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+          margin-left: 3px;
+        }
+      }
+
+      .bon_bon {
+        width: 90%;
+        height: 66px;
+        background: #F5F5F5;
+        border-radius: 4px 4px 4px 4px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        text-align: center;
+        margin: auto;
+        margin-bottom: 10px;
+        margin-top: 5px;
+
+        .order {
+          width: 120px;
+
+          .txt {
+            margin-top: 5px;
+          }
+        }
+      }
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/pages/commissionedSales/addDelegation/index.vue b/pages/commissionedSales/addDelegation/index.vue
new file mode 100644
index 0000000..5b800aa
--- /dev/null
+++ b/pages/commissionedSales/addDelegation/index.vue
@@ -0,0 +1,423 @@
+<template>
+
+	<!-- #ifdef APP || H5 -->
+	<view>
+		<!-- #endif -->
+		<form @submit="formSubmit" report-submit='true'>
+			<view class="release_content">
+
+
+				<view class="release_item">
+					<view class="release_item-one">
+						<view class="item-one">
+							被委托商家
+						</view>
+						<e-select v-model="value1" :options="options1" placeholder="选择选项"></e-select>
+					</view>
+					<view class="release_item-one">
+						<view class="item-one">
+							委托周期
+						</view>
+						<view class="" @click="calendar">
+
+							<input type="number" v-model="date" />
+						</view>
+						<!-- <e-select v-model="value1" :options="options1" placeholder="选择选项"></e-select> -->
+					</view>
+					<view class='item acea-row row-between-wrapper'>
+						<view class='name'><text class="iconfont icon-baobeilianjie"></text>添加产品({{productList.length}})
+						</view>
+						<view class="select">
+							<view class="select_count" @click.stop="addProduct">
+								<text v-if="productList.length == 0" class="text">选择产品</text>
+								<view v-else class="text">
+									<image class="image" v-for="(item,index) in productList" :key="index"
+										:src="item.image || (item.spu && item.spu.image)"></image>
+								</view>
+								<text class="iconfont icon-xiangyou"></text>
+							</view>
+						</view>
+					</view>
+					<view class="content_center-one" v-for="(item,i) in productList" :key="i">
+						<view class="center-one">
+							<view class="center-one-img">
+								<image :src="item.image" mode=""></image>
+							</view>
+							<view class="center-one-txt">
+								<view class="one-txta">
+									{{item.store_name}}
+								</view>
+								<view class="one-txtb">
+									<view class="">
+										委托价:¥<span>{{item.price}}</span>
+									</view>
+									<view class="">
+										数量:{{item.number}}
+									</view>
+								</view>
+							</view>
+						</view>
+
+					</view>
+				</view>
+				<button class="release_btn button" form-type="submit">发布</button>
+			</view>
+		</form>
+
+		<uni-calendar ref="calendar" :date="info.date" :insert="info.insert" :lunar="info.lunar"
+			:startDate="info.startDate" :endDate="info.endDate" :range="info.range" @confirm="confirm"
+			:showMonth="info.showMonth" @close="close" />
+
+
+		<!-- 提到的宝贝弹窗 -->
+		<uni-popup ref="associated" type="bottom">
+			<associated @close="close" @getProduct="getProduct" :checkedObj="productList"></associated>
+		</uni-popup>
+
+
+
+	</view>
+</template>
+
+<script>
+	import associated from '@/components/realselist/realselist.vue';
+	import eselect from '@/components/e-select/e-select.vue';
+	// import {} from '@/api/sale.js'
+	export default {
+		components: {
+			associated,
+			eselect
+		},
+		data() {
+			return {
+				value1: 1,
+				value2: "",
+				options1: [{
+					text: "Shenzhen1",
+					value: 1
+				}, {
+
+					text: "Shenzhen2",
+					value: 2
+				}, {
+
+
+					text: "Shenzhen3",
+					value: 3
+				}],
+				date: 1,
+				productList: [],
+				info: {
+					startDate: '',
+					endDate: '',
+					lunar: false,
+					range: true,
+					insert: false,
+					selected: [],
+					showMonth: false
+				},
+			};
+		},
+		computed: {
+
+
+		},
+
+
+		onLoad(options) {
+
+		},
+
+		methods: {
+
+			// 日历确定
+			confirm(e) {
+
+				let self = this
+				if (e.range.after && e.range.before) {
+					let star = new Date(e.range.after).getTime()
+					let stop = new Date(e.range.before).getTime()
+					let arr = stop - star
+					this.date = Math.floor(arr / (24 * 3600 * 1000));
+					// console.log(days)
+					if (this.date < 0) {
+						this.date = this.date * -1
+					}
+				}
+			},
+			calendar() {
+				this.$refs.calendar.open()
+			},
+			//关闭商品弹窗
+			close() {
+				this.$refs.associated.close()
+			},
+			//打开商品弹窗
+			addProduct() {
+				this.$refs.associated.open()
+			},
+			//获取商品信息
+			getProduct(data) {
+				console.log(data)
+				this.$refs.associated.close()
+			},
+			//提交
+			formSubmit(e) {
+				console.log(e)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page {
+		background: #F5F5F5;
+	}
+
+
+	.release_content {
+
+		padding: 0 28rpx;
+		margin-top: 28rpx;
+
+		.content_center-one {
+			display: flex;
+
+
+			.center-one {
+				margin-top: 32rpx;
+				margin-bottom: 32rpx;
+				display: flex;
+
+				.center-one-img {
+					width: 154rpx;
+					height: 154rpx;
+					margin-right: 21rpx;
+
+					image {
+						width: 154rpx;
+						height: 154rpx;
+					}
+				}
+
+				.center-one-txt {
+					.one-txta {
+						font-size: 32rpx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #333333;
+					}
+
+					.one-txtb {
+						display: flex;
+						margin-top: 28rpx;
+						font-size: 32rpx;
+						font-family: PingFang SC;
+						font-weight: 400;
+						color: #999999;
+
+						span {
+							color: #F84221;
+							margin-right: 30rpx;
+
+						}
+					}
+				}
+			}
+
+		}
+
+		.release_item {
+			background: #ffffff;
+			padding: 0 30rpx;
+			border-radius: 10rpx;
+			padding-top: 20rpx;
+
+			.release_item-one {
+				.item-one {
+					margin-top: 32rpx;
+					margin-bottom: 20rpx;
+					font-size: 32rpx;
+					font-family: PingFang SC-Regular, PingFang SC;
+					font-weight: 400;
+					color: #333333;
+				}
+			}
+
+		}
+
+		.photo_count {
+			padding: 30rpx 0;
+		}
+	}
+
+
+
+	/deep/.loading-img {
+		width: 180rpx;
+		height: 180rpx;
+		border-radius: 12rpx;
+	}
+
+	.input_photo .pictrue {
+		margin-bottom: 20rpx;
+
+		.videoHover {
+			width: 180rpx;
+			height: 180rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			position: absolute;
+			top: 0;
+			left: 0;
+			z-index: 10;
+
+			>view {
+				width: 50rpx;
+				height: 50rpx;
+				background: #000000;
+				border-radius: 50rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+
+				.iconfont {
+					color: #ffffff;
+					font-size: 21rpx;
+				}
+			}
+		}
+
+		.video-text {
+			display: block;
+			width: 180rpx;
+			text-align: center;
+			color: #ffffff;
+			font-size: 18rpx;
+			z-index: 13;
+			position: absolute;
+			bottom: 20rpx;
+		}
+
+		video {
+			width: 180rpx;
+			height: 180rpx;
+			border-radius: 12rpx;
+		}
+	}
+
+	.input_photo .add {
+		background: #f6f6f6;
+		color: #666666;
+
+		.iconfont {
+			font-size: 50rpx;
+		}
+
+		.text {
+			margin-top: 20rpx;
+			font-size: 27rpx;
+		}
+	}
+
+	.textarea textarea {
+		font-size: 28rpx;
+		padding-bottom: 38rpx;
+		width: 100%;
+		box-sizing: border-box;
+		height: 400rpx;
+		overflow: hidden;
+	}
+
+	.textarea .placeholder {
+		color: #BBBBBB;
+	}
+
+	.release_item .item {
+		height: 106rpx;
+		border-bottom: 1rpx solid #eee;
+		position: relative;
+		font-size: 30rpx;
+
+		&:last-child {
+			border-bottom: none;
+		}
+
+		.name {
+			color: #333333;
+
+			.iconfont {
+				margin-right: 10rpx;
+				font-size: 28rpx;
+			}
+		}
+
+		.select {
+			color: #bbbbbb;
+
+			.select_count {
+				display: flex;
+				align-items: center;
+			}
+
+			.text {
+				margin-right: 15rpx;
+				display: flex;
+				align-items: center;
+
+				.image,
+				image,
+				uni-image {
+					width: 60rpx;
+					height: 60rpx;
+					margin-right: 5rpx;
+				}
+			}
+
+			.iconfont {
+				font-size: 24rpx;
+			}
+
+			.text_name {
+				color: var(--view-theme);
+				padding: 5rpx 12rpx;
+				background: var(--view-minorColor);
+				border-radius: 23rpx;
+				font-size: 24rpx;
+				margin-right: 10rpx;
+
+				.icon {
+					color: var(--view-theme);
+					font-weight: bold;
+					font-size: 24rpx;
+				}
+
+				.title {
+					margin: 0 10rpx;
+				}
+
+				.iconfont {
+					font-size: 16rpx;
+				}
+			}
+		}
+	}
+
+	.button {
+		width: 694rpx;
+		height: 84rpx;
+		line-height: 84rpx;
+		text-align: center;
+		background: linear-gradient(84deg, #F98649 0%, #F34E45 100%);
+		border-radius: 42px 42px 42px 42px;
+		font-size: 32rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #FFFFFF;
+	}
+
+	.release_btn {
+		margin-top: 100rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/commissionedSales/delegation_details/index.vue b/pages/commissionedSales/delegation_details/index.vue
new file mode 100644
index 0000000..df12537
--- /dev/null
+++ b/pages/commissionedSales/delegation_details/index.vue
@@ -0,0 +1,282 @@
+<template>
+	<view class="content">
+		<view class="content_top">
+		</view>
+		<view class="content_center">
+			<view class="content_center-one">
+				<view class="center-one">
+					<view class="center-one-img">
+						<image src="../../annex/static/left.png" mode=""></image>
+					</view>
+					<view class="center-one-txt">
+						<view class="one-txta">
+							良品铺子肉松饼1000g/箱 面...
+						</view>
+						<view class="one-txtb">
+							<view class="">
+								委托价:¥<span>34.90</span>
+							</view>
+							<view class="">
+								数量:100个
+							</view>
+						</view>
+					</view>
+				</view>
+
+			</view>
+			<view class="content_center-one">
+				<view class="center-one">
+					<view class="center-one-img">
+						<image src="../../annex/static/left.png" mode=""></image>
+					</view>
+					<view class="center-one-txt">
+						<view class="one-txta">
+							良品铺子肉松饼1000g/箱 面...
+						</view>
+						<view class="one-txtb">
+							<view class="">
+								委托价:¥<span>34.90</span>
+							</view>
+							<view class="">
+								数量:100个
+							</view>
+						</view>
+					</view>
+				</view>
+
+			</view>
+			<view class="content_center-two">
+				<view class="center-two">
+					<view class="center-twoa">
+						委托方:
+					</view>
+					<view class="center-twob">
+						通滩镇镇街店铺
+					</view>
+				</view>
+				<view class="center-two">
+					<view class="center-twoa">
+						被委托方:
+					</view>
+					<view class="center-twob">
+						通滩镇镇街店铺
+					</view>
+				</view>
+				<view class="center-two">
+					<view class="center-twoa">
+						委托周期:
+					</view>
+					<view class="center-twob">
+						通滩镇镇街店铺
+					</view>
+				</view>
+				<view class="center-two">
+					<view class="center-twoa">
+						结算周期:
+					</view>
+					<view class="center-twob">
+						通滩镇镇街店铺
+					</view>
+				</view>
+				<view class="center-two">
+					<view class="center-twoa">
+						状态:
+					</view>
+					<view class="center-twob">
+						通滩镇镇街店铺
+					</view>
+				</view>
+				<view class="center-two">
+					<view class="center-twoa">
+						是否结束委托:
+					</view>
+					<view class="center-twob">
+						通滩镇镇街店铺
+					</view>
+				</view>
+				<view class="center-two">
+					<view class="center-twoa">
+						拒绝原因:
+					</view>
+					<view class="center-twob">
+						通滩镇镇街店铺
+					</view>
+				</view>
+			</view>
+
+		</view>
+		<view class="content_bootm">
+			<view class="content_bootm_txt">
+				查看TA提到的宝贝(2)
+			</view>
+
+
+			<view class="content_bootm_one">
+				<view class="bootm_oneimg">
+					<image src="@/static/images/bg2.png" mode=""></image>
+				</view>
+				<view class="">
+					良品铺子肉松饼1000g/箱 面包糕...
+				</view>
+			</view>
+			<view class="content_bootm_one">
+				<view class="bootm_oneimg">
+					<image src="@/static/images/bg2.png" mode=""></image>
+				</view>
+				<view class="">
+					良品铺子肉松饼1000g/箱 面包糕...
+				</view>
+			</view>
+		</view>
+		<button class="release_btn button" form-type="submit">发布</button>
+	</view>
+</template>
+
+<script>
+</script>
+
+<style lang="scss">
+	.content{
+		position: relative;
+	}
+	.content_top {
+		height: 151rpx;
+		background: linear-gradient(84deg, #2352FA 0%, #6497FF 100%);
+		
+
+	}
+
+	.content_center {
+
+		background: #FFFFFF;
+		border-radius: 14px 14px 14px 14px;
+		margin: 28rpx 28rpx;
+
+		.content_center-one {
+			display: flex;
+			padding: 0 28rpx;
+
+			.center-one {
+				margin-top: 32rpx;
+				margin-bottom: 32rpx;
+				display: flex;
+
+				.center-one-img {
+					width: 154rpx;
+					height: 154rpx;
+					margin-right: 21rpx;
+
+					image {
+						width: 154rpx;
+						height: 154rpx;
+					}
+				}
+
+				.center-one-txt {
+					.one-txta {
+						font-size: 32rpx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #333333;
+					}
+
+					.one-txtb {
+						display: flex;
+						margin-top: 28rpx;
+						font-size: 32rpx;
+						font-family: PingFang SC;
+						font-weight: 400;
+						color: #999999;
+
+						span {
+							color: #F84221;
+							margin-right: 30rpx;
+
+						}
+					}
+				}
+			}
+
+		}
+
+		.content_center-two {
+			padding: 0 28rpx;
+			padding-bottom: 2rpx;
+
+			.center-two {
+				display: flex;
+				justify-content: space-between;
+				margin-top: 32rpx;
+				margin-bottom: 32rpx;
+
+				.center-twoa {
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: 400;
+					color: #333333;
+				}
+
+				.center-twob {
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: 400;
+					color: #999999;
+				}
+			}
+		}
+
+
+	}
+
+	.content_bootm {
+
+		margin-bottom: 150rpx;
+
+		.content_bootm_txt {
+			margin-top: 42rpx;
+			padding-left: 28rpx;
+		}
+
+		.content_bootm_one {
+			height: 112rpx;
+			line-height: 112rpx;
+			background: #FFFFFF;
+			display: flex;
+			margin-top: 21rpx;
+
+			.bootm_oneimg {
+				width: 80rpx;
+				height: 80rpx;
+				margin: auto 0;
+				margin-left: 28rpx;
+				margin-right: 21rpx;
+
+				image {
+					width: 80rpx;
+					height: 80rpx;
+				}
+			}
+
+		}
+	}
+
+	.button {
+		width: 694rpx;
+		height: 84rpx;
+		line-height: 84rpx;
+		text-align: center;
+		background: linear-gradient(84deg, #F98649 0%, #F34E45 100%);
+		border-radius: 42px 42px 42px 42px;
+		font-size: 32rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #FFFFFF;
+		position: absolute;
+		left: 50%;
+		margin-left:-347rpx;
+		position: fixed;
+		bottom: 100rpx;
+	}
+
+
+</style>
\ No newline at end of file
diff --git a/pages/commissionedSales/index/index.vue b/pages/commissionedSales/index/index.vue
new file mode 100644
index 0000000..1cd1dbf
--- /dev/null
+++ b/pages/commissionedSales/index/index.vue
@@ -0,0 +1,164 @@
+<template>
+	<view class="select_warehouse">
+		<view class="wrapper flex_a_c_j_sb">
+			<block v-for="item in goodsData" :key="item.name">
+				<view class="select_item" @click="navigato(item.type)"
+					:style="{'background-image': `url(${item.src})`}">
+					<view class="select_itemimga" v-if='item.type==1'>
+						<image :src="item.img" mode=""></image>
+					</view>
+					<view class="select_itemimgb" v-else>
+						<image :src="item.img" mode=""></image>
+					</view>
+					<view class="title">
+						<view class="titlea">
+							{{ item.name }}
+						</view>
+						<view class="titleb">
+							{{ item.name1 }}
+						</view>
+					</view>
+
+				</view>
+			</block>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				goodsData: [{
+						name: '我发起的',
+						name1: '委托销售商品',
+						type: 1,
+						src: require('@/static/images/wtbg1.png'),
+						img: require('@/static/images/wtt1.png')
+					},
+					{
+						name: '我收到的',
+						name1: '帮助销售商品',
+						type: 2,
+						src: require('@/static/images/wtbg2.png'),
+						img: require('@/static/images/wtt2.png')
+					}
+				],
+
+			}
+		},
+		onLoad() {
+
+		},
+		onShow() {
+
+		},
+		methods: {
+
+			navigato(type) {
+				if (type === 1) {
+					uni.navigateTo({
+						url: `/pages/commissionedSales/initiateDelegation/index`
+					});
+				} else {
+					uni.navigateTo({
+						url: `/pages/commissionedSales/receivedCommission/index`
+					});
+				}
+			},
+		},
+
+	}
+</script>
+
+<style lang="scss">
+	.select_warehouse {
+		padding-top: 20px;
+	}
+
+	.wrapper {
+		width: 694.74rpx;
+		margin: 0 auto;
+	}
+
+	.goods-wrapper {
+		.item {
+			display: flex;
+			height: 175.44rpx;
+			width: 100%;
+			background-color: #fff;
+			margin-top: 21.05rpx;
+			border-radius: 8px;
+			padding: 12px;
+
+			.l_cont {
+				image {
+					width: 133.33rpx;
+					height: 133.33rpx;
+					border-radius: 8px;
+				}
+			}
+
+			.r_cont {
+				margin-left: 17.54rpx;
+			}
+		}
+	}
+
+	.select_item {
+		width: 336rpx;
+		height: 161rpx;
+		border-radius: 8px;
+		background-color: #eee;
+
+		display: flex;
+		color: #fff;
+		background-size: 100% 100%;
+		background-repeat: no-repeat;
+
+		.select_itemimga {
+			width: 59rpx;
+			height: 63rpx;
+			margin-top: 49rpx;
+			margin-left: 42rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.select_itemimgb {
+			width: 75rpx;
+			height: 65rpx;
+			margin-top: 49rpx;
+			margin-left: 42rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.title {
+			margin-left: 23rpx;
+			margin-top: 37rpx;
+
+			.titlea {
+				font-size: 32rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #FFFFFF;
+			}
+
+			.titleb {
+				margin-top: 5rpx;
+				font-size: 25rpx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: rgba(255, 255, 255, 0.8);
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/commissionedSales/initiateDelegation/index.vue b/pages/commissionedSales/initiateDelegation/index.vue
new file mode 100644
index 0000000..ce2d100
--- /dev/null
+++ b/pages/commissionedSales/initiateDelegation/index.vue
@@ -0,0 +1,824 @@
+<template>
+	<view class="content">
+
+		<view class="content_top">
+			<!--选项卡滑动切换-->
+			<cxNavTitle :tabs="tabs" :activeItem="activeItem" @tabClick="tabClick" :show='false'></cxNavTitle>
+		</view>
+		<!-- 审核通过 打折的拒绝、同意功能 ，调货不需要功能 -->
+		<view class="content-content" v-for="(item,i) in list" :key="i" >
+
+			<view class="content-one">
+				<view class="content-one-img">
+					<image src="@/static/images/bg2.png" mode="aspectFit"></image>
+				</view>
+				<view class="content-one-txt">
+					<view class="one-txt-a">
+						{{item.content}}
+					</view>
+					<view class="one-txt-b">
+						委托周期:{{item.day}}
+					</view>
+				</view>
+			</view>
+
+
+
+			<view class="content-two_one" v-if="item.type==1">
+
+				<view class="content-two-edita" @click="soldEdit">
+					待处理
+				</view>
+
+				<view class="contentgn">
+					<view class="contentgn_a">
+						处理
+					</view>
+					<span></span>
+					<view class="contentgn_b">
+						详情
+					</view>
+				</view>
+			</view>
+			<view class="content-two_oneq" v-if="item.type==2">
+
+
+				<view class="content-two-editb" @click="accepted">
+					已接受
+				</view>
+
+				<view class="contentgn">
+					<view class="contentgn_a" @click="closingorder">
+						结束委托
+					</view>
+					<span></span>
+					<view class="contentgn_b">
+						详情
+					</view>
+				</view>
+			</view>
+			<view class="content-two_one" v-if="item.type==3">
+
+
+				<view class="content-two-editc" @click="declined">
+					已拒绝
+				</view>
+				<view class="contentgn">
+					<view class="contentgn_a">
+						删除
+					</view>
+					<span></span>
+					<view class="contentgn_b">
+						详情
+					</view>
+				</view>
+			</view>
+			<view class="content-two_one" v-if="item.type==4">
+
+
+				<view class="content-two-editd" @click="soldEdit">
+					已完成
+				</view>
+				<view class="contentgn">
+					<view class="contentgn_a">
+						删除
+					</view>
+					<span></span>
+					<view class="contentgn_b">
+						详情
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view v-if="orderList.length == 0 && this.where.page > 1">
+			<emptyPage title="暂无订单~"></emptyPage>
+		</view>
+		<uni-popup ref="bindmobile" type="center" @click="close">
+
+			<view class="" style="position: relative;">
+				<view class="entrust">
+					<view class="entrust_close" @click="close">
+						<image src="@/static/images/wt_close.png" mode=""></image>
+					</view>
+					<view class="entrust_bg">
+						<view class="entrust_bg-content">
+							<view class="bg-content-a">
+								委托申请处理
+							</view>
+							<view class="bg-content-b">
+								结算周期: <span>30天</span>
+
+
+							</view>
+							<view class="bg-content-c">
+								利息比例: <span>0.05%</span>
+							</view>
+
+							<view class="entrust_bga_btn">
+								<view class="cancellation">
+									拒绝
+								</view>
+								<view class="determine">
+									接受
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<uni-popup ref="bindmobile1" type="center" @click="close">
+
+			<view class="" style="position: relative;">
+				<view class="entrust">
+					<view class="entrust_close" @click="close">
+						<image src="@/static/images/wt_close.png" mode=""></image>
+					</view>
+					<view class="entrust_bga">
+						<view class="entrust_bg-content">
+							<view class="bg-content-a">
+								确定结束委托?
+							</view>
+							<view class="entrust_bga_btn">
+								<view class="cancellation">
+									取消
+								</view>
+								<view class="determine">
+									确定
+								</view>
+							</view>
+						</view>
+
+					</view>
+
+				</view>
+
+			</view>
+		</uni-popup>
+		<uni-popup ref="bindmobile2" type="center" @click="close">
+
+			<view class="" style="position: relative;">
+				<view class="entrust">
+					<view class="entrust_close" @click="close">
+						<image src="@/static/images/wt_close.png" mode=""></image>
+					</view>
+					<view class="entrust_bg">
+						<view class="entrust_bg-content">
+							<view class="bg-content-a" style="margin-left: 207rpx;">
+								结束委托申请处理
+							</view>
+							<view class="bg-content-b">
+								结算周期: <span>30天</span>
+
+
+							</view>
+							<view class="bg-content-c">
+								利息比例: <span>0.05%</span>
+							</view>
+
+							<view class="entrust_bga_btn">
+								<view class="cancellation">
+									拒绝
+								</view>
+								<view class="determine">
+									接受
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<uni-popup ref="bindmobile3" type="center" @click="close">
+
+			<view class="" style="position: relative;">
+				<view class="entrust">
+					<view class="entrust_close" @click="close">
+						<image src="@/static/images/wt_close.png" mode=""></image>
+					</view>
+					<view class="entrust_bgb">
+						<view class="entrust_bg-content">
+							<view class="bg-content-a" style="margin-left: 207rpx;">
+								结束委托申请处理
+							</view>
+							<view class="bg-content-b">
+								结算周期: <span>30天</span>
+
+
+							</view>
+							<view class="bg-content-c">
+								利息比例: <span>0.05%</span>
+							</view>
+							<view class="bg-content-c">
+
+								拒绝原因：
+								<view class="" style="margin-top: 21rpx;">
+
+									<textarea value="" placeholder="输入拒绝原因" class="bg-content_textarea" />
+								</view>
+
+							</view>
+							<view class="entrust_bga_btn">
+								<view class="determine">
+									接受
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import cxNavTitle from '@/components/cx-navTitle.vue'
+	import emptyPage from '@/components/emptyPage.vue';
+	export default {
+		components: {
+			cxNavTitle,
+			emptyPage
+		},
+		data() {
+			return {
+				activeItem: "tabOne",
+				tabTitle: "",
+				orderList: [],
+				where: {
+					page: 1,
+					limit: 10
+				},
+				tabs: [{
+						name: "tabOne",
+						label: '待处理',
+						type: '1'
+					},
+					{
+						name: "tabTwo",
+						label: '已接受',
+						type: '2'
+					},
+					{
+						name: "tabThree",
+						label: '已拒绝',
+						type: '3'
+					},
+
+				],
+				list: [{
+						content: '张三生产资料供销供应链',
+						day: 10,
+						type: 1
+
+					},
+					{
+						content: '张三生产资料供销供应链',
+						day: 10,
+						type: 2
+
+					},
+					{
+						content: '张三生产资料供销供应链',
+						day: 10,
+						type: 3
+
+					},
+					{
+						content: '张三生产资料供销供应链',
+						day: 10,
+						type: 4
+
+					}
+				]
+			}
+		},
+		onLoad() {
+			this.tabTitle = this.tabs[0].name
+			//有时进入页面需要获取默认的第一个标签做逻辑判断 -- 如下:
+			console.log(this.tabs[0])
+
+		},
+		mounted() {
+
+		},
+		methods: {
+			nav(item) {
+				// uni.navigateTo({
+				// 	url: '/pages/commissionedSales/delegation_details/index'
+				// })
+			},
+			tabClick(e) { //点击获取当前标签数据 
+				this.activeItem = e.name; //当前class类名 
+				this.tabTitle = e.name; //当前选的标签名
+			},
+			//管理弹窗
+			close() {
+				console.log('1111111')
+				this.$refs.bindmobile.close()
+				this.$refs.bindmobile1.close()
+				this.$refs.bindmobile2.close()
+				this.$refs.bindmobile3.close()
+			},
+			// 待处理
+			soldEdit() {
+
+				this.$refs.bindmobile.open()
+
+
+
+
+			},
+			//已接受
+			accepted() {
+				this.$refs.bindmobile1.open()
+			},
+			//结束委托
+			closingorder() {
+				this.$refs.bindmobile3.open()
+			},
+			// 已拒绝
+			declined() {
+				this.$refs.bindmobile2.open()
+			},
+
+			// 审核未通过 编辑
+			auditEdit() {
+
+			},
+			//审核通过 拒绝
+			passDelete() {
+
+			},
+			//审核通过 同意
+			passagree() {
+
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content_top {
+		background-color: #FFFFFF;
+	}
+
+
+	.content_top {
+
+		width: 100%;
+	}
+
+	.content-content {
+
+		margin-top: 21rpx;
+		background: #FFFFFF;
+		padding: 0 28rpx;
+		padding-top: 28rpx;
+		background: #FFFFFF;
+		position: relative;
+		display: flex;
+		justify-content: space-between;
+
+
+		.content-one {
+			display: flex;
+
+			padding-bottom: 23rpx;
+
+			.content-one-img {
+				width: 148rpx;
+				height: 148rpx;
+				margin-right: 28rpx;
+				border: 1px solid;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.content-one-txt {
+
+
+				.txt-b-a {
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+				}
+
+				.one-txt-b {
+					display: flex;
+					margin-top: 30rpx;
+
+					.txt-b-a {
+						font-size: 32rpx;
+						font-family: SF Pro Display-Medium, SF Pro Display;
+						font-weight: 500;
+						color: #F84221;
+						margin-right: 74rpx;
+					}
+
+					.txt-b-b {
+						font-size: 28rpx;
+						font-family: PingFang SC;
+						font-weight: 400;
+						color: #333333
+					}
+				}
+
+			}
+
+		}
+
+		.content-two_oneq {
+			position: absolute;
+			right: 20rpx;
+			text-align: right;
+
+			.content-two-edita {
+
+				font-size: 32rpx;
+				font-weight: 500;
+				color: #F84221;
+
+			}
+
+			.content-two-editb {
+
+				font-size: 32rpx;
+				font-weight: 500;
+				color: #FE9A10;
+
+			}
+
+			.content-two-editc {
+
+				font-size: 32rpx;
+				font-weight: 500;
+				color: #20A162;
+
+			}
+
+			.content-two-editd {
+
+				font-size: 32rpx;
+				font-weight: 500;
+				color: #999999;
+
+			}
+
+			.contentgn {
+
+				display: flex;
+				justify-content: space-between;
+				margin-top: 47rpx;
+
+				.contentgn_a {
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: 400;
+					color: #F84221;
+					margin-right: 10rpx;
+				}
+
+				span {
+					width: 0px;
+					height: 30rpx;
+					opacity: 1;
+
+					margin-top: 10rpx;
+					border: 2rpx solid #CCCCCC;
+
+				}
+
+				.contentgn_b {
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: 400;
+					color: #999999;
+					margin-left: 10rpx;
+				}
+			}
+
+
+		}
+
+		.content-two_one {
+
+
+
+			text-align: right;
+
+			.content-two-edita {
+
+				font-size: 32rpx;
+				font-weight: 500;
+				color: #F84221;
+
+			}
+
+			.content-two-editb {
+
+				font-size: 32rpx;
+				font-weight: 500;
+				color: #FE9A10;
+
+			}
+
+			.content-two-editc {
+
+				font-size: 32rpx;
+				font-weight: 500;
+				color: #20A162;
+
+			}
+
+			.content-two-editd {
+
+				font-size: 32rpx;
+				font-weight: 500;
+				color: #999999;
+
+			}
+
+			.contentgn {
+
+				display: flex;
+				justify-content: space-between;
+				margin-top: 47rpx;
+
+				.contentgn_a {
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: 400;
+					color: #F84221;
+					margin-right: 10rpx;
+				}
+
+				span {
+					width: 0px;
+					height: 30rpx;
+					opacity: 1;
+
+					margin-top: 10rpx;
+					border: 2rpx solid #CCCCCC;
+
+				}
+
+				.contentgn_b {
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: 400;
+					color: #999999;
+					margin-left: 10rpx;
+				}
+			}
+		}
+
+
+	}
+
+	.entrust {
+
+
+		.entrust_close {
+			width: 44rpx;
+			height: 44rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+
+			z-index: 99999;
+			position: absolute;
+			right: 0;
+		}
+
+		.entrust_bg {
+			width: 694rpx;
+			height: 676rpx;
+			background: url('@/static/images/wtbg3.png') no-repeat;
+			background-size: 100% 100%;
+			position: relative;
+
+			.entrust_bg-content {
+				position: absolute;
+				top: 284rpx;
+
+				.bg-content-a {
+					margin-left: 242rpx;
+					font-size: 35rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+				}
+
+				.bg-content-b {
+					margin-left: 35rpx;
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+					margin-top: 32rpx;
+
+					span {
+						font-size: 32rpx;
+						font-family: PingFang SC-Medium, PingFang SC;
+						font-weight: 500;
+						color: #F84221;
+						margin-left: 18rpx;
+					}
+				}
+
+				.bg-content-c {
+					margin-left: 35rpx;
+					font-size: 35rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+					margin-top: 32rpx;
+
+					span {
+						font-size: 32rpx;
+						font-family: PingFang SC-Medium, PingFang SC;
+						font-weight: 500;
+						color: #F84221;
+						margin-left: 18rpx;
+					}
+				}
+			}
+
+			.entrust_bga_btn {
+				display: flex;
+				margin-top: 53rpx;
+
+				.cancellation {
+					height: 95rpx;
+					line-height: 95rpx;
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: 400;
+					color: #999999;
+					margin-left: 121rpx;
+					margin-right: 49rpx;
+				}
+
+				.determine {
+					width: 249rpx;
+					height: 95rpx;
+					line-height: 95rpx;
+					text-align: center;
+					font-size: 32rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 500;
+					color: #FFFFFF;
+					background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
+					border-radius: 47rpx 47rpx 47rpx 47rpx;
+				}
+			}
+
+		}
+
+		.entrust_bga {
+			width: 694rpx;
+			height: 520rpx;
+			background: url('@/static/images/wtbg4.png') no-repeat;
+			background-size: 100% 100%;
+			position: relative;
+
+			.entrust_bg-content {
+				position: absolute;
+				top: 284rpx;
+
+				.bg-content-a {
+					margin-left: 242rpx;
+					font-size: 35rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+				}
+
+				.entrust_bga_btn {
+					display: flex;
+					margin-top: 53rpx;
+
+					.cancellation {
+						height: 95rpx;
+						line-height: 95rpx;
+						font-size: 32rpx;
+						font-family: PingFang SC;
+						font-weight: 400;
+						color: #999999;
+						margin-left: 121rpx;
+						margin-right: 49rpx;
+					}
+
+					.determine {
+						width: 249rpx;
+						height: 95rpx;
+						line-height: 95rpx;
+						text-align: center;
+						font-size: 32rpx;
+						font-family: PingFang SC-Medium, PingFang SC;
+						font-weight: 500;
+						color: #FFFFFF;
+						background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
+						border-radius: 47rpx 47rpx 47rpx 47rpx;
+					}
+				}
+
+			}
+
+		}
+
+		.entrust_bgb {
+			width: 694rpx;
+			height: 994rpx;
+			background: url('@/static/images/wtbg5.png') no-repeat;
+			background-size: 100% 100%;
+			position: relative;
+
+
+			.entrust_bg-content {
+				position: absolute;
+				top: 404rpx;
+
+				.bg-content-a {
+					margin-left: 242rpx;
+					font-size: 35rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+				}
+
+				.bg-content-b {
+					margin-left: 35rpx;
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+					margin-top: 32rpx;
+
+					span {
+						font-size: 32rpx;
+						font-family: PingFang SC-Medium, PingFang SC;
+						font-weight: 500;
+						color: #F84221;
+						margin-left: 18rpx;
+					}
+				}
+
+				.bg-content-c {
+					margin-left: 35rpx;
+					font-size: 35rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+					margin-top: 22rpx;
+
+					span {
+						font-size: 32rpx;
+						font-family: PingFang SC-Medium, PingFang SC;
+						font-weight: 500;
+						color: #F84221;
+						margin-left: 18rpx;
+					}
+				}
+
+				.bg-content_textarea {
+					width: 624rpx;
+					height: 152rpx;
+					padding: 25rpx 18rpx;
+
+					background: #F5F5F5;
+				}
+			}
+
+			.entrust_bga_btn {
+				display: flex;
+				margin-top: 33rpx;
+
+
+				.determine {
+					margin-left: 188rpx;
+					width: 249rpx;
+					height: 95rpx;
+					line-height: 95rpx;
+					text-align: center;
+					font-size: 32rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 500;
+					color: #FFFFFF;
+					background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
+					border-radius: 47rpx 47rpx 47rpx 47rpx;
+				}
+			}
+
+		}
+
+
+	}
+</style>
\ No newline at end of file
diff --git a/pages/commissionedSales/receivedCommission/index.vue b/pages/commissionedSales/receivedCommission/index.vue
new file mode 100644
index 0000000..4df6855
--- /dev/null
+++ b/pages/commissionedSales/receivedCommission/index.vue
@@ -0,0 +1,816 @@
+<template>
+	<view class="content">
+
+		<view class="content_top">
+			<!--选项卡滑动切换-->
+			<cxNavTitle :tabs="tabs" :activeItem="activeItem" @tabClick="tabClick" :show='false'></cxNavTitle>
+		</view>
+	
+		<view class="content-content" v-for="(item,i) in list" :key="i" @click="nav(item)">
+
+			<view class="content-one">
+				<view class="content-one-img">
+					<image src="@/static/images/bg2.png" mode="aspectFit"></image>
+				</view>
+				<view class="content-one-txt">
+					<view class="one-txt-a">
+						{{item.content}}
+					</view>
+					<view class="one-txt-b">
+						委托周期:{{item.day}}
+					</view>
+				</view>
+			</view>
+
+			<view class="content-two_one" v-if="item.type==1">
+				<view class="content-two-edita" @click="soldEdit">
+					待处理
+				</view>
+				<view class="contentgn">
+					<view class="contentgn_a">
+						处理
+					</view>
+					<span></span>
+					<view class="contentgn_b">
+						详情
+					</view>
+				</view>
+			</view>
+			<view class="content-two_oneq" v-if="item.type==2">
+
+
+				<view class="content-two-editb" @click="accepted">
+					已接受
+				</view>
+
+				<view class="contentgn">
+					<view class="contentgn_a" @click="closingorder">
+						结束委托
+					</view>
+					<span></span>
+					<view class="contentgn_b">
+						详情
+					</view>
+				</view>
+			</view>
+			<view class="content-two_one" v-if="item.type==3">
+
+
+				<view class="content-two-editc" @click="declined">
+					已拒绝
+				</view>
+				<view class="contentgn">
+					<view class="contentgn_a">
+						删除
+					</view>
+					<span></span>
+					<view class="contentgn_b">
+						详情
+					</view>
+				</view>
+			</view>
+			<view class="content-two_one" v-if="item.type==4">
+
+
+				<view class="content-two-editd" @click="soldEdit">
+					已完成
+				</view>
+				<view class="contentgn">
+					<view class="contentgn_a">
+						删除
+					</view>
+					<span></span>
+					<view class="contentgn_b">
+						详情
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view v-if="orderList.length == 0 && this.where.page > 1">
+			<emptyPage title="暂无订单~"></emptyPage>
+		</view>
+		<uni-popup ref="bindmobile" type="center" @click="close">
+
+			<view class="" style="position: relative;">
+				<view class="entrust">
+					<view class="entrust_close" @click="close">
+						<image src="@/static/images/wt_close.png" mode=""></image>
+					</view>
+					<view class="entrust_bg">
+						<view class="entrust_bg-content">
+							<view class="bg-content-a">
+								委托申请处理
+							</view>
+							<view class="bg-content-b">
+								结算周期: <span>30天</span>
+
+
+							</view>
+							<view class="bg-content-c">
+								利息比例: <span>0.05%</span>
+							</view>
+
+							<view class="entrust_bga_btn">
+								<view class="cancellation">
+									拒绝
+								</view>
+								<view class="determine">
+									接受
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<uni-popup ref="bindmobile1" type="center" @click="close">
+
+			<view class="" style="position: relative;">
+				<view class="entrust">
+					<view class="entrust_close" @click="close">
+						<image src="@/static/images/wt_close.png" mode=""></image>
+					</view>
+					<view class="entrust_bga">
+						<view class="entrust_bg-content">
+							<view class="bg-content-a">
+								确定结束委托?
+							</view>
+							<view class="entrust_bga_btn">
+								<view class="cancellation">
+									取消
+								</view>
+								<view class="determine">
+									确定
+								</view>
+							</view>
+						</view>
+
+					</view>
+
+				</view>
+
+			</view>
+		</uni-popup>
+		<uni-popup ref="bindmobile2" type="center" @click="close">
+
+			<view class="" style="position: relative;">
+				<view class="entrust">
+					<view class="entrust_close" @click="close">
+						<image src="@/static/images/wt_close.png" mode=""></image>
+					</view>
+					<view class="entrust_bg">
+						<view class="entrust_bg-content">
+							<view class="bg-content-a" style="margin-left: 207rpx;">
+								结束委托申请处理
+							</view>
+							<view class="bg-content-b">
+								结算周期: <span>30天</span>
+
+
+							</view>
+							<view class="bg-content-c">
+								利息比例: <span>0.05%</span>
+							</view>
+
+							<view class="entrust_bga_btn">
+								<view class="cancellation">
+									拒绝
+								</view>
+								<view class="determine">
+									接受
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<uni-popup ref="bindmobile3" type="center" @click="close">
+
+			<view class="" style="position: relative;">
+				<view class="entrust">
+					<view class="entrust_close" @click="close">
+						<image src="@/static/images/wt_close.png" mode=""></image>
+					</view>
+					<view class="entrust_bgb">
+						<view class="entrust_bg-content">
+							<view class="bg-content-a" style="margin-left: 207rpx;">
+								结束委托申请处理
+							</view>
+							<view class="bg-content-b">
+								结算周期: <span>30天</span>
+
+
+							</view>
+							<view class="bg-content-c">
+								利息比例: <span>0.05%</span>
+							</view>
+							<view class="bg-content-c">
+
+								拒绝原因：
+								<view class="" style="margin-top: 21rpx;">
+
+									<textarea value="" placeholder="输入拒绝原因" class="bg-content_textarea" />
+								</view>
+
+							</view>
+							<view class="entrust_bga_btn">
+								<view class="determine">
+									接受
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import cxNavTitle from '@/components/cx-navTitle.vue'
+	import emptyPage from '@/components/emptyPage.vue';
+	import {} from '@/api/sale.js'
+	export default {
+		components: {
+			cxNavTitle,
+			emptyPage
+		},
+		data() {
+			return {
+				activeItem: "tabOne",
+				tabTitle: "",
+				orderList: [],
+				where: {
+					page: 1,
+					limit: 10
+				},
+				tabs: [{
+						name: "tabOne",
+						label: '待处理',
+						type: '1'
+					},
+					{
+						name: "tabTwo",
+						label: '已接受',
+						type: '2'
+					},
+					{
+						name: "tabThree",
+						label: '已拒绝',
+						type: '3'
+					},
+
+				],
+				list: [{
+						content: '张三生产资料供销供应链',
+						day: 10,
+						type: 1
+
+					},
+					{
+						content: '张三生产资料供销供应链',
+						day: 10,
+						type: 2
+
+					},
+					{
+						content: '张三生产资料供销供应链',
+						day: 10,
+						type: 3
+
+					},
+					{
+						content: '张三生产资料供销供应链',
+						day: 10,
+						type: 4
+
+					}
+				]
+			}
+		},
+		onLoad() {
+			this.tabTitle = this.tabs[0].name
+			//有时进入页面需要获取默认的第一个标签做逻辑判断 -- 如下:
+			console.log(this.tabs[0])
+
+		},
+		mounted() {
+
+		},
+		methods: {
+			nav(item) {
+				uni.navigateTo({
+					url: '/pages/commissionedSales/delegation_details/index'
+				})
+			},
+			tabClick(e) { //点击获取当前标签数据 
+				this.activeItem = e.name; //当前class类名 
+				this.tabTitle = e.name; //当前选的标签名
+			},
+			//管理弹窗
+			close() {
+				console.log('1111111')
+				this.$refs.bindmobile.close()
+				this.$refs.bindmobile1.close()
+				this.$refs.bindmobile2.close()
+				this.$refs.bindmobile3.close()
+			},
+			// 待处理
+			soldEdit() {
+
+				this.$refs.bindmobile.open()
+
+
+
+
+			},
+			//已接受
+			accepted() {
+				this.$refs.bindmobile1.open()
+			},
+			//结束委托
+			closingorder() {
+				this.$refs.bindmobile3.open()
+			},
+			// 已拒绝
+			declined() {
+				this.$refs.bindmobile2.open()
+			},
+
+			// 审核未通过 编辑
+			auditEdit() {
+
+			},
+			//审核通过 拒绝
+			passDelete() {
+
+			},
+			//审核通过 同意
+			passagree() {
+
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content_top {
+		background-color: #FFFFFF;
+	}
+
+	.content_top {
+		width: 100%;
+	}
+
+	.content-content {
+
+		margin-top: 21rpx;
+		background: #FFFFFF;
+		padding: 0 28rpx;
+		padding-top: 28rpx;
+		background: #FFFFFF;
+		position: relative;
+		display: flex;
+		justify-content: space-between;
+
+
+		.content-one {
+			display: flex;
+
+			padding-bottom: 23rpx;
+
+			.content-one-img {
+				width: 148rpx;
+				height: 148rpx;
+				margin-right: 28rpx;
+				border: 1px solid;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.content-one-txt {
+
+
+				.txt-b-a {
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+				}
+
+				.one-txt-b {
+					display: flex;
+					margin-top: 30rpx;
+
+					.txt-b-a {
+						font-size: 32rpx;
+						font-family: SF Pro Display-Medium, SF Pro Display;
+						font-weight: 500;
+						color: #F84221;
+						margin-right: 74rpx;
+					}
+
+					.txt-b-b {
+						font-size: 28rpx;
+						font-family: PingFang SC;
+						font-weight: 400;
+						color: #333333
+					}
+				}
+
+			}
+
+		}
+
+		.content-two_oneq {
+			position: absolute;
+			right: 20rpx;
+			text-align: right;
+
+			.content-two-edita {
+
+				font-size: 32rpx;
+				font-weight: 500;
+				color: #F84221;
+
+			}
+
+			.content-two-editb {
+
+				font-size: 32rpx;
+				font-weight: 500;
+				color: #FE9A10;
+
+			}
+
+			.content-two-editc {
+
+				font-size: 32rpx;
+				font-weight: 500;
+				color: #20A162;
+
+			}
+
+			.content-two-editd {
+
+				font-size: 32rpx;
+				font-weight: 500;
+				color: #999999;
+
+			}
+
+			.contentgn {
+
+				display: flex;
+				justify-content: space-between;
+				margin-top: 47rpx;
+
+				.contentgn_a {
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: 400;
+					color: #F84221;
+					margin-right: 10rpx;
+				}
+
+				span {
+					width: 0px;
+					height: 30rpx;
+					opacity: 1;
+
+					margin-top: 10rpx;
+					border: 2rpx solid #CCCCCC;
+
+				}
+
+				.contentgn_b {
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: 400;
+					color: #999999;
+					margin-left: 10rpx;
+				}
+			}
+
+
+		}
+
+		.content-two_one {
+
+
+
+			text-align: right;
+
+			.content-two-edita {
+
+				font-size: 32rpx;
+				font-weight: 500;
+				color: #F84221;
+
+			}
+
+			.content-two-editb {
+
+				font-size: 32rpx;
+				font-weight: 500;
+				color: #FE9A10;
+
+			}
+
+			.content-two-editc {
+
+				font-size: 32rpx;
+				font-weight: 500;
+				color: #20A162;
+
+			}
+
+			.content-two-editd {
+
+				font-size: 32rpx;
+				font-weight: 500;
+				color: #999999;
+
+			}
+
+			.contentgn {
+
+				display: flex;
+				justify-content: space-between;
+				margin-top: 47rpx;
+
+				.contentgn_a {
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: 400;
+					color: #F84221;
+					margin-right: 10rpx;
+				}
+
+				span {
+					width: 0px;
+					height: 30rpx;
+					opacity: 1;
+
+					margin-top: 10rpx;
+					border: 2rpx solid #CCCCCC;
+
+				}
+
+				.contentgn_b {
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: 400;
+					color: #999999;
+					margin-left: 10rpx;
+				}
+			}
+		}
+
+
+	}
+
+	.entrust {
+
+		.entrust_close {
+			width: 44rpx;
+			height: 44rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+
+			z-index: 99999;
+			position: absolute;
+			right: 0;
+		}
+
+		.entrust_bg {
+			width: 694rpx;
+			height: 676rpx;
+			background: url('@/static/images/wtbg3.png') no-repeat;
+			background-size: 100% 100%;
+			position: relative;
+
+			.entrust_bg-content {
+				position: absolute;
+				top: 284rpx;
+
+				.bg-content-a {
+					margin-left: 242rpx;
+					font-size: 35rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+				}
+
+				.bg-content-b {
+					margin-left: 35rpx;
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+					margin-top: 32rpx;
+
+					span {
+						font-size: 32rpx;
+						font-family: PingFang SC-Medium, PingFang SC;
+						font-weight: 500;
+						color: #F84221;
+						margin-left: 18rpx;
+					}
+				}
+
+				.bg-content-c {
+					margin-left: 35rpx;
+					font-size: 35rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+					margin-top: 32rpx;
+
+					span {
+						font-size: 32rpx;
+						font-family: PingFang SC-Medium, PingFang SC;
+						font-weight: 500;
+						color: #F84221;
+						margin-left: 18rpx;
+					}
+				}
+			}
+
+			.entrust_bga_btn {
+				display: flex;
+				margin-top: 53rpx;
+
+				.cancellation {
+					height: 95rpx;
+					line-height: 95rpx;
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: 400;
+					color: #999999;
+					margin-left: 121rpx;
+					margin-right: 49rpx;
+				}
+
+				.determine {
+					width: 249rpx;
+					height: 95rpx;
+					line-height: 95rpx;
+					text-align: center;
+					font-size: 32rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 500;
+					color: #FFFFFF;
+					background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
+					border-radius: 47rpx 47rpx 47rpx 47rpx;
+				}
+			}
+
+		}
+
+		.entrust_bga {
+			width: 694rpx;
+			height: 520rpx;
+			background: url('@/static/images/wtbg4.png') no-repeat;
+			background-size: 100% 100%;
+			position: relative;
+
+			.entrust_bg-content {
+				position: absolute;
+				top: 284rpx;
+
+				.bg-content-a {
+					margin-left: 242rpx;
+					font-size: 35rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+				}
+
+				.entrust_bga_btn {
+					display: flex;
+					margin-top: 53rpx;
+
+					.cancellation {
+						height: 95rpx;
+						line-height: 95rpx;
+						font-size: 32rpx;
+						font-family: PingFang SC;
+						font-weight: 400;
+						color: #999999;
+						margin-left: 121rpx;
+						margin-right: 49rpx;
+					}
+
+					.determine {
+						width: 249rpx;
+						height: 95rpx;
+						line-height: 95rpx;
+						text-align: center;
+						font-size: 32rpx;
+						font-family: PingFang SC-Medium, PingFang SC;
+						font-weight: 500;
+						color: #FFFFFF;
+						background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
+						border-radius: 47rpx 47rpx 47rpx 47rpx;
+					}
+				}
+
+			}
+
+		}
+
+		.entrust_bgb {
+			width: 694rpx;
+			height: 994rpx;
+			background: url('@/static/images/wtbg5.png') no-repeat;
+			background-size: 100% 100%;
+			position: relative;
+
+
+			.entrust_bg-content {
+				position: absolute;
+				top: 404rpx;
+
+				.bg-content-a {
+					margin-left: 242rpx;
+					font-size: 35rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+				}
+
+				.bg-content-b {
+					margin-left: 35rpx;
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+					margin-top: 32rpx;
+
+					span {
+						font-size: 32rpx;
+						font-family: PingFang SC-Medium, PingFang SC;
+						font-weight: 500;
+						color: #F84221;
+						margin-left: 18rpx;
+					}
+				}
+
+				.bg-content-c {
+					margin-left: 35rpx;
+					font-size: 35rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+					margin-top: 22rpx;
+
+					span {
+						font-size: 32rpx;
+						font-family: PingFang SC-Medium, PingFang SC;
+						font-weight: 500;
+						color: #F84221;
+						margin-left: 18rpx;
+					}
+				}
+
+				.bg-content_textarea {
+					width: 624rpx;
+					height: 152rpx;
+					padding: 25rpx 18rpx;
+
+					background: #F5F5F5;
+				}
+			}
+
+			.entrust_bga_btn {
+				display: flex;
+				margin-top: 33rpx;
+
+
+				.determine {
+					margin-left: 188rpx;
+					width: 249rpx;
+					height: 95rpx;
+					line-height: 95rpx;
+					text-align: center;
+					font-size: 32rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 500;
+					color: #FFFFFF;
+					background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
+					border-radius: 47rpx 47rpx 47rpx 47rpx;
+				}
+			}
+
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/releaseManagement/details/index.vue b/pages/releaseManagement/details/index.vue
new file mode 100644
index 0000000..e3180ad
--- /dev/null
+++ b/pages/releaseManagement/details/index.vue
@@ -0,0 +1,456 @@
+<template>
+	<view class="content">
+		<view class="content_top">
+			<view class="content_top-one">
+				<view class="content_symbol">
+					<image :src="listobj.mer_avatar" mode="aspectFit"></image>
+				</view>
+				<view class="content_title" >
+					<view class="title_one">
+						{{listobj.mer_name}}
+
+					</view>
+					<view class="title_two">
+						{{listobj.care_count>0?listobj.care_count:0}}人关注 {{listobj.sales>0?listobj.sales:0}}销量
+					</view>
+				</view>
+				<view class="content_titimg">
+					<image src="@/static/images/sym.png" mode="aspectFit"></image>
+				</view>
+			</view>
+			<view view class="content_top-two">
+				<view class="price">
+					￥{{listobj.total_price}}
+					<!-- <input type="text" :value="listobj.total_price" v-model="listobj.total_price" /> -->
+				</view>
+
+				<view class="top-two_content">
+					<textarea :value="listobj.content" placeholder="" style="height: auto;" />
+				</view>
+				<view class="top-two_img">
+
+					<view class="" v-for="(item,index) in listobj.image">
+						<image :src="item" mode=""></image>
+					</view>
+
+				</view>
+			</view>
+		</view>
+
+		<view class="content_middle">
+			<view class="middle-one" v-for="(item,b) in listobj.resale" :key='b'>
+				<view class="midding-img">
+					<image :src="item.image" mode=""></image>
+				</view>
+				<view class="middle-one_text">
+					<view class="one_text_a">
+						{{item.store_name}}
+					</view>
+					<view class="one_text_b">
+						￥{{item.price}}
+					</view>
+					<view class="one_text_c">
+
+						<!-- <view class="">
+							采购价:{{item.price}}
+						</view> -->
+						<view class="">
+							数量: {{item.number}}
+						</view>
+
+					</view>
+				</view>
+			</view>
+
+
+		</view>
+		<view class="content_enter">
+			<view class="content_enter-one">
+				类型
+			</view>
+			<view class="content_enter-two" v-if="listobj.resale_type==1">
+				调货
+			</view>
+			<view class="content_enter-two" v-else>
+				打折
+			</view>
+
+
+		</view>
+
+		<view class="content_bootm" v-if='listobj.resale'>
+			<view class="content_bootm_txt" v-if='listobj.resale.length>0'>
+				查看TA提到的宝贝({{listobj.resale.length}})
+			</view>
+
+			<view class="content_bootm_one" v-for="(items,i) in listobj.resale" :key='i' @click="Merchbaby(items)">
+				<view class="bootm_oneimg">
+					<image :src="items.image" mode=""></image>
+				</view>
+				<view class="" >
+					{{items.store_name}}
+				</view>
+			</view>
+
+		</view>
+
+	
+	</view>
+</template>
+
+<script>
+	import {
+		getResaleid
+	} from '@/api/release.js'
+	export default {
+
+
+		data() {
+			return {
+				detail: {},
+				listobj: {},
+			}
+		},
+		onLoad(e) {
+			if (e) {
+				this.detail = e.key;
+				this.shopdetil(this.detail)
+			}
+
+
+		},
+		methods: {
+			//商品详情
+			shopdetil(id) {
+
+				getResaleid(id).then(res => {
+					if (res.data.status = 200) {
+						this.listobj = res.data
+					}
+				})
+			},
+
+			//商品宝贝详情
+			Merchbaby(item) {
+				uni.navigateTo({
+					url: `/pages/goods_details/index?id=${item.product_id}`
+				})
+
+			},
+			prouctOrder() {
+				getCommunityaddCart(this.listobj).then(res => {
+					if (res.status == 200) {
+						uni.navigateTo({
+							url: '/pages/users/order_confirm/index?cartId=' + res.data.cart_id.toString()
+						})
+					}
+				}).catch((err) => {
+					console.log(err)
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content {}
+
+	.content_top {
+		padding: 21rpx 28rpx;
+		background: #FFFFFF;
+
+		.content_top-one {
+			display: flex;
+			border-bottom: 1rpx solid #CCCCCC;
+
+			.content_symbol {
+				width: 81rpx;
+				height: 81rpx;
+
+				image {
+					width: 81rpx;
+					height: 81rpx;
+				}
+
+				margin-bottom: 21rpx;
+			}
+
+			.content_title {
+				margin-left: 21rpx;
+
+				.title_one {
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+				}
+
+				.title_two {
+					font-size: 25rpx;
+					font-family: PingFang SC;
+					font-weight: 400;
+					color: #999999;
+				}
+			}
+
+			.content_titimg {
+				width: 116rpx;
+				height: 64rpx;
+				margin-top: -10rpx;
+				margin-left: 10rpx;
+
+				image {
+					width: 136rpx;
+					height: 64rpx;
+				}
+			}
+		}
+
+		.content_top-two {
+			.price {
+				display: flex;
+				margin-top: 21rpx;
+				font-size: 46rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #F84221;
+
+				input {
+					font-size: 46rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #F84221
+				}
+			}
+
+			.top-two_content {
+				font-size: 32rpx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				margin-top: 21rpx;
+				margin-bottom: 21rpx;
+			}
+
+			.top-two_img {
+				display: flex;
+				
+
+				view {
+					width: 217rpx;
+					height: 217rpx;
+					border-radius: 14rpx 14rpx 14rpx 14rpx;
+					margin-right: 15rpx;
+				}
+
+				image {
+					width: 217rpx;
+					height: 217rpx;
+					border-radius: 14rpx 14rpx 14rpx 14rpx;
+				}
+			}
+		}
+	}
+
+	.content_middle {
+
+		.middle-one {
+			background-color: #FFFFFF;
+			display: flex;
+			margin-top: 28rpx;
+			padding: 21rpx 0;
+
+			.midding-img {
+				width: 176rpx;
+				height: 176rpx;
+				margin-left: 24rpx;
+				margin-right: 21rpx;
+
+				image {
+					width: 176rpx;
+					height: 176rpx;
+				}
+			}
+
+			.middle-one_text {
+				.one_text_a {
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+				}
+
+				.one_text_b {
+					font-size: 35rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #F84221;
+					margin-top: 11rpx;
+				}
+
+				.one_text_c {
+					font-size: 28rpx;
+					font-family: PingFang SC;
+					font-weight: 400;
+					color: #999999;
+					margin-top: 12rpx;
+					display: flex;
+					justify-content: space-between;
+					margin-right: 50rpx;
+				}
+			}
+
+		}
+	}
+
+	.content_enter {
+		height: 89rpx;
+		line-height: 89rpx;
+		background: #FFFFFF;
+		opacity: 1;
+		margin-top: 28rpx;
+		display: flex;
+		justify-content: space-between;
+		padding: 0 20rpx;
+
+		.content_enter-one {
+			font-size: 32rpx;
+			font-family: PingFang SC;
+			font-weight: 400;
+			color: #333333;
+		}
+
+		.content_enter-two {
+			font-size: 32rpx;
+			font-family: PingFang SC;
+			font-weight: 400;
+			color: #F84221;
+		}
+	}
+
+	.content_bootm {
+
+		margin-bottom: 150rpx;
+
+		.content_bootm_txt {
+			margin-top: 42rpx;
+			padding-left: 28rpx;
+
+		}
+
+		.content_bootm_one {
+			height: 112rpx;
+			line-height: 112rpx;
+			padding-right: 28rpx;
+			background: #FFFFFF;
+			display: flex;
+			margin-top: 21rpx;
+
+			.bootm_oneimg {
+				width: 80rpx;
+				height: 80rpx;
+				margin: auto 0;
+				margin-left: 28rpx;
+				margin-right: 21rpx;
+
+				image {
+					width: 80rpx;
+					height: 80rpx;
+				}
+			}
+
+		}
+	}
+
+	.pay {
+		width: 100%;
+		height: 121rpx;
+		line-height: 121rpx;
+		background: #FFFFFF;
+		position: absolute;
+		bottom: 0;
+		position: fixed;
+		display: flex;
+		justify-content: space-between;
+		padding: 0 28rpx;
+
+		.pay_tilte-a {
+			font-size: 32rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #333333;
+
+			span {
+				font-size: 42rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #F84221;
+			}
+		}
+
+		.pay_tilte-b {
+			width: 238rpx;
+			height: 74rpx;
+			line-height: 74rpx;
+			text-align: center;
+			background: linear-gradient(90deg, #F98649 0%, #F34E45 100%);
+			border-radius: 37rpx 37rpx 37rpx 37rpx;
+			opacity: 1;
+			font-size: 32rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #FFFFFF;
+			margin: auto 0;
+		}
+	}
+
+	.domain {
+		width: 100%;
+		height: 121rpx;
+		line-height: 121rpx;
+		background: #FFFFFF;
+		position: absolute;
+		bottom: 0;
+		position: fixed;
+		display: flex;
+		justify-content: space-between;
+		padding: 0 28rpx;
+
+		.domain_tilte-a {
+			font-size: 32rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #333333;
+
+			span {
+				font-size: 42rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #F84221;
+			}
+		}
+
+		.domain_tilte-b {
+			font-size: 32rpx;
+			font-family: PingFang SC-Regular, PingFang SC;
+			font-weight: 400;
+			color: #666666;
+		}
+
+		.domain_tilte-c {
+			width: 238rpx;
+			height: 74rpx;
+			line-height: 74rpx;
+			text-align: center;
+			background: linear-gradient(90deg, #F98649 0%, #F34E45 100%);
+			border-radius: 37rpx 37rpx 37rpx 37rpx;
+			opacity: 1;
+
+			font-size: 32rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #FFFFFF;
+			margin: auto 0;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/releaseManagement/index.vue b/pages/releaseManagement/index.vue
new file mode 100644
index 0000000..eb3e655
--- /dev/null
+++ b/pages/releaseManagement/index.vue
@@ -0,0 +1,531 @@
+<template>
+	<view class="content">
+
+		<view class="content_top">
+			<!--选项卡滑动切换-->
+			<cxNavTitle :tabs="tabs" :activeItem="activeItem" :show="false" @tabClick="tabClick"></cxNavTitle>
+		</view>
+		<!-- 审核通过 打折的拒绝、同意功能 ，调货不需要功能 -->
+		<view class="content-content">
+			<view class="" v-for="(item,i) in orderList" :key='i'
+				style="	border-radius: 14rpx 14rpx 14rpx 14rpx;margin-bottom:  23rpx;background-color: #FFFFFF; padding: 28rpx 46rpx;">
+				<view :class="tabTitle=='tabTwo'?'content-onea':'content-one'">
+					<view class="content-one-img">
+						<image :src="item.image" mode="aspectFit"></image>
+					</view>
+					<view class="content-one-txt">
+						<view class="one-txt-a">
+							{{item.title}}
+						</view>
+						<view class="one-txt-b">
+							<view class="txt-b-a">
+								￥ {{item.discount_price}}
+							</view>
+							<view class="txt-b-b" v-if="item.resale_type==1">
+								类型:调货
+							</view>
+							<view class="txt-b-b" v-else>
+								类型:打折
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="content-two_one" v-if='tabTitle=="tabOne"'>
+					<view class="content-two-edit" @click="soldEdit(item) ">
+						编辑
+					</view>
+
+				</view>
+				<view class="content-two-two" v-if='tabTitle=="tabTwo"'>
+					<!-- <view class="content-two-delete">
+						删除
+					</view>
+					<view class="content-two-edit">
+						编辑
+					</view>
+				   -->
+				</view>
+				<view class="content-two-three" v-if='tabTitle=="tabThree"'>
+					<view class="content-two-delete" @click="pendingDeletion(item)">
+						删除
+					</view>
+					<view class="content-two-edit" @click="editReviewe(item)">
+						编辑
+					</view>
+
+				</view>
+				<view class="content-two-four" v-if='tabTitle=="tabFour"'>
+					<view class="content-two-delete" @click="auditDelete(item)">
+						删除
+					</view>
+					<view class="content-two-edit" @click="auditEdit(item)">
+						编辑
+					</view>
+
+				</view>
+				<view class="content-two-five" v-if='tabTitle=="tabFive"'>
+					<view class="content-two-delete" @click="passDelete(item)">
+						拒绝
+					</view>
+
+					<view class="content-two-agree" @click="passagree(item)">
+						同意
+					</view>
+				</view>
+
+			</view>
+
+
+
+		</view>
+
+		<view v-if="orderList.length == 0 ">
+			<emptyPage title="暂无订单~"></emptyPage>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import cxNavTitle from '@/components/cx-navTitle.vue'
+	import emptyPage from '@/components/emptyPage.vue';
+	import {
+		from
+	} from 'form-data';
+	import {
+		getResaleid,
+		getResalecheck,
+		getResaledelete,
+		getResale
+	} from '@/api/release.js'
+	export default {
+		components: {
+			cxNavTitle,
+			emptyPage
+		},
+		data() {
+			return {
+				activeItem: "tabOne",
+				tabTitle: "",
+				orderList: [],
+
+				where: {
+					page: 1,
+					limit: 10,
+					status: 1
+				},
+				tabs: [{
+						name: "tabOne",
+						label: '在售',
+						value: 1,
+					},
+					{
+						name: "tabTwo",
+						label: '已售出',
+						value: 2,
+					},
+					{
+						name: "tabThree",
+						label: '待审核',
+						value: 3,
+					},
+					{
+						name: "tabFour",
+						label: '审核未通过',
+						value: 4,
+					},
+					{
+						name: "tabFive",
+						label: '审核通过',
+						value: 5,
+					},
+				],
+			}
+		},
+		onLoad(num) {
+			this.tabTitle = this.tabs[0].name
+			if (num.key == '2') {
+				this.activeItem = 'tabThree'
+			}
+			this.list()
+		},
+		methods: {
+			tabClick(e) { //点击获取当前标签数据 
+
+				this.activeItem = e.name; //当前class类名 
+				this.tabTitle = e.name; //当前选的标签名
+				this.where.status = e.value
+				this.orderList = []
+				this.list()
+
+			},
+			list() {
+				getResale(this.where).then(res => {
+					if (res.status = 200) {
+						this.orderList.push(...res.data.list)
+					}
+				})
+			},
+			//售出 编辑
+			soldEdit(item) {
+				if (item.resale_type == 1) {
+					uni.navigateTo({
+						url: '/pages/trading_hall/transfer_goods/index?id=' + item.community_id +
+							'&gtype=' + 'edit'
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pages/trading_hall/adddiscounts/index?id=' + item.community_id +
+							'&gtype=' + 'edit'
+					})
+				}
+
+			},
+			//审核未通过 删除
+			pendingDeletion(item) {
+
+				getResaledelete(item.community_id).then(res => {
+					this.$util.Tips({
+						title: res.message,
+						icon: 'success'
+					})
+					this.list()
+					this.tabTitle = 'tabThree'
+				})
+			},
+			//待审核 编辑
+			editReviewe(item) {
+				if (item.resale_type == 1) {
+					uni.navigateTo({
+						url: '/pages/trading_hall/transfer_goods/index?id=' + item.community_id +
+							'&gtype=' + 'edit'
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pages/trading_hall/adddiscounts/index?id=' + item.community_id +
+							'&gtype=' + 'edit'
+					})
+				}
+			},
+			// 审核未通过 删除
+			auditDelete(item) {
+
+				getResaledelete(item.community_id).then(res => {
+					this.$util.Tips({
+						title: res.message,
+						icon: 'success'
+					})
+					this.list()
+					this.tabTitle = 'tabFour'
+				})
+			},
+
+			// 审核未通过 编辑
+			auditEdit(item) {
+				if (item.resale_type == 1) {
+					uni.navigateTo({
+						url: '/pages/trading_hall/transfer_goods/index?id=' + item.community_id +
+							'&gtype=' + 'edit'
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pages/trading_hall/adddiscounts/index?id=' + item.community_id +
+							'&gtype=' + 'edit'
+					})
+				}
+			},
+			//审核通过 拒绝
+			passDelete(item) {
+				getResalecheck(item.community_id, {
+					"status": 2
+				}).then(res => {
+					this.$util.Tips({
+						title: res.message,
+						icon: 'success'
+					})
+					this.list()
+					this.tabTitle = 'tabFive'
+				})
+			},
+			//审核通过 同意
+			passagree(item) {
+				getResalecheck(item.community_id, {
+					"status": 1
+				}).then(res => {
+					this.$util.Tips({
+						title: res.message,
+						icon: 'success'
+					})
+					this.list()
+					this.tabTitle = 'tabFive'
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content_top {
+		background-color: #FFFFFF;
+	}
+
+
+	.content_top {
+
+		width: 100%;
+	}
+
+	.content-content {
+
+		margin-top: 21rpx;
+
+		margin-left: 28rpx;
+		margin-right: 28rpx;
+
+		padding-top: 28rpx;
+
+
+		opacity: 1;
+		position: relative;
+
+		.content-onea {
+			display: flex;
+			padding-bottom: 23rpx;
+
+
+			background-color: #FFFFFF;
+
+			.content-one-img {
+				width: 148rpx;
+				height: 148rpx;
+				margin-right: 28rpx;
+
+
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.content-one-txt {
+				margin-bottom: 23rpx;
+
+				.txt-b-a {
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+				}
+
+				.one-txt-b {
+					display: flex;
+					margin-top: 30rpx;
+
+					.txt-b-a {
+						font-size: 32rpx;
+						font-family: SF Pro Display-Medium, SF Pro Display;
+						font-weight: 500;
+						color: #F84221;
+						margin-right: 74rpx;
+					}
+
+					.txt-b-b {
+						font-size: 28rpx;
+						font-family: PingFang SC;
+						font-weight: 400;
+						color: #333333
+					}
+				}
+
+			}
+
+		}
+
+		.content-one {
+			display: flex;
+			border-bottom: 1px solid #CCCCCC;
+			padding-bottom: 23rpx;
+
+
+			.content-one-img {
+				width: 148rpx;
+				height: 148rpx;
+				margin-right: 28rpx;
+
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.content-one-txt {
+
+
+				.txt-b-a {
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+				}
+
+				.one-txt-b {
+					display: flex;
+					margin-top: 30rpx;
+
+					.txt-b-a {
+						font-size: 32rpx;
+						font-family: SF Pro Display-Medium, SF Pro Display;
+						font-weight: 500;
+						color: #F84221;
+						margin-right: 74rpx;
+					}
+
+					.txt-b-b {
+						font-size: 28rpx;
+						font-family: PingFang SC;
+						font-weight: 400;
+						color: #333333
+					}
+				}
+
+			}
+
+		}
+
+		.content-two_one {
+			height: 110rpx;
+			position: relative;
+
+			.content-two-edit {
+				width: 168rpx;
+				height: 60rpx;
+				line-height: 60rpx;
+				text-align: center;
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #FFFFFF;
+				background: linear-gradient(90deg, #F98649 0%, #F34E45 100%);
+				border-radius: 32rpx 32rpx 32rpx 32rpx;
+				position: absolute;
+				right: 28rpx;
+				bottom: 20rpx;
+			}
+		}
+
+		.content-two-three {
+			height: 110rpx;
+			position: relative;
+
+			.content-two-edit {
+				width: 168rpx;
+				height: 60rpx;
+				line-height: 60rpx;
+				text-align: center;
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #FFFFFF;
+				background: linear-gradient(90deg, #F98649 0%, #F34E45 100%);
+				border-radius: 32rpx 32rpx 32rpx 32rpx;
+				position: absolute;
+				right: 28rpx;
+				bottom: 23rpx;
+			}
+
+			.content-two-delete {
+				width: 168rpx;
+				height: 60rpx;
+				line-height: 60rpx;
+				text-align: center;
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #999999;
+				border: 2rpx solid #999999;
+				position: absolute;
+				right: 228rpx;
+				bottom: 23rpx;
+				border-radius: 32rpx 32rpx 32rpx 32rpx;
+			}
+		}
+
+		.content-two-four {
+			height: 110rpx;
+			position: relative;
+
+			.content-two-edit {
+				width: 168rpx;
+				height: 60rpx;
+				line-height: 60rpx;
+				text-align: center;
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #FFFFFF;
+				background: linear-gradient(90deg, #F98649 0%, #F34E45 100%);
+				border-radius: 32rpx 32rpx 32rpx 32rpx;
+				position: absolute;
+				right: 28rpx;
+				bottom: 23rpx;
+			}
+
+			.content-two-delete {
+				width: 168rpx;
+				height: 60rpx;
+				line-height: 60rpx;
+				text-align: center;
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #999999;
+				border: 2rpx solid #999999;
+				position: absolute;
+				right: 228rpx;
+				bottom: 23rpx;
+				border-radius: 32rpx 32rpx 32rpx 32rpx;
+			}
+		}
+
+
+		.content-two-five {
+			height: 110rpx;
+			position: relative;
+
+			.content-two-agree {
+				width: 168rpx;
+				height: 60rpx;
+				line-height: 60rpx;
+				text-align: center;
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #FFFFFF;
+				background: linear-gradient(90deg, #F98649 0%, #F34E45 100%);
+				border-radius: 32rpx 32rpx 32rpx 32rpx;
+				position: absolute;
+				right: 28rpx;
+				bottom: 23rpx;
+			}
+
+			.content-two-delete {
+				width: 168rpx;
+				height: 60rpx;
+				line-height: 60rpx;
+				text-align: center;
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #999999;
+				border: 2rpx solid #999999;
+				position: absolute;
+				right: 228rpx;
+				bottom: 23rpx;
+				border-radius: 32rpx 32rpx 32rpx 32rpx;
+			}
+		}
+
+	}
+</style>
\ No newline at end of file
diff --git a/pages/store/merchantDetails/fali.vue b/pages/store/merchantDetails/fali.vue
new file mode 100644
index 0000000..ab7a73d
--- /dev/null
+++ b/pages/store/merchantDetails/fali.vue
@@ -0,0 +1,285 @@
+<template>
+	<view class="merchant-details">
+		<view class="tit">
+			<u--image style="margin: 0 auto;" :showLoading="true" src="../../../static/images/SJRZ/SB.png"
+				width="348.83rpx" height="271.77rpx" @click="goBack"></u--image>
+			抱歉,你的入驻申请审核未通过!
+		</view>
+		<view class="content">
+			<view class="steps">
+				<u-steps current="3" direction="column">
+					<u-steps-item title="待审核" desc="10:35">
+						<text class="slot-icon" slot="icon"><u--image style="margin: 0 auto;" :showLoading="true"
+								src="../../../static/images/SJRZ/SBBZ.png" width="31.54rpx"
+								height="31.54rpx"></u--image></text>
+					</u-steps-item>
+					<u-steps-item title="待审核" desc="10:35">
+						<text class="slot-icon" slot="icon"><u--image style="margin: 0 auto;" :showLoading="true"
+								src="../../../static/images/SJRZ/SBBZ.png" width="31.54rpx"
+								height="31.54rpx"></u--image></text>
+					</u-steps-item>
+					<u-steps-item title="待审核" desc="10:35">
+						<text class="slot-icon" slot="icon"><u--image style="margin: 0 auto;" :showLoading="true"
+								src="../../../static/images/SJRZ/SBBZ.png" width="31.54rpx"
+								height="31.54rpx"></u--image></text>
+					</u-steps-item>
+				</u-steps>
+			</view>
+			<view class="msg">
+				<view style="margin-bottom: 20rpx;">
+					<text style="font-weight: bold;">驳回原因：</text>
+					<text class="">{{resData.fail_msg}}</text>
+				</view>
+
+				<!-- 	<view class=" phone">
+					<view class="">
+						<text class="head">商户账号：</text>
+						<text class="content">{{resData.phone}}</text>
+					</view>
+					<text class="cope" @click="copyTBL()">复制</text>
+				</view> -->
+			</view>
+
+		</view>
+
+		<view class="btn_bottom" @click="navgo( `/pages/store/settled/index?mer_i_id=${mer_i_id}`)">
+			<u-button type="primary" style="background-color: #3274F9;border-radius: 30rpx;border: none;"
+				text="重新提交"></u-button>
+		</view>
+		<!-- <view class="top">
+			<image class="img" src="../static/images/successTop.png" mode=""></image>
+			<view class="title">
+				恭喜，您的申请已通过！
+			</view>
+		</view>
+		<view class="msg" v-if="mer_id > 0 && resData.login_url">
+			<view class="url">
+				<text class="head">登录地址：</text>
+				<text class="content">{{resData.login_url}}</text>
+			</view>
+			<view class="phone">
+				<view class="">
+					<text class="head">商户账号：</text>
+					<text class="content">{{resData.phone}}</text>
+				</view>
+				<text class="cope" @click="copyTBL()">复制</text>
+			</view>
+		</view> -->
+
+	</view>
+</template>
+
+<script>
+	// +----------------------------------------------------------------------
+	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+	// +----------------------------------------------------------------------
+	// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
+	// +----------------------------------------------------------------------
+	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+	// +----------------------------------------------------------------------
+	// | Author: CRMEB Team <admin@crmeb.com>
+	// +----------------------------------------------------------------------
+	import {
+		getGoodsDetails
+	} from '@/api/store.js'
+	export default {
+		data() {
+			return {
+				mer_id: 0,
+				resData: {},
+				mer_i_id: "",
+				// res: ","
+			}
+		},
+		onLoad(e) {
+			this.mer_id = e.mer_id
+			this.mer_i_id = e.mer_i_id
+			this.getGoodsDetails(e.mer_i_id)
+
+
+		},
+		methods: {
+			navgo(url) {
+				uni.navigateTo({
+					url
+				})
+			},
+			getGoodsDetails(id) {
+				getGoodsDetails(id).then(res => {
+					this.resData = res.data
+				})
+			},
+			copyTBL(url) {
+				let copeData = `登录地址:${this.resData.login_url} 商户账号:${this.resData.phone}`
+				// #ifdef MP || APP-PLUS
+				uni.setClipboardData({
+					data: copeData,
+					success: function() {
+						uni.showToast({
+							title: '复制成功',
+							duration: 1000
+						});
+					}
+				});
+				// #endif
+				// #ifdef H5
+				this.copyText(copeData)
+				// #endif
+			},
+			//H5复制方法
+			webCopy(e) {
+				let transfer = document.createElement('input');
+				document.body.appendChild(transfer);
+				transfer.value = e; // 这里表示想要复制的内容
+				transfer.focus();
+				transfer.select();
+				if (document.execCommand('copy')) {
+					document.execCommand('copy');
+				}
+				transfer.blur();
+				this.$util.Tips({
+					title: '复制成功'
+				});
+				transfer.style.display = 'none'
+				document.body.removeChild(transfer);
+			},
+			// 兼容版一键复制
+			copyText(text) {
+				// 需要转化成字符串
+				const textString = text.toString();
+				let input = document.querySelector('#copy-input');
+				if (!input) {
+					input = document.createElement('input');
+					input.id = "copy-input";
+					input.readOnly = "readOnly"; // 防止ios聚焦触发键盘事件
+					input.style.position = "absolute";
+					input.style.left = "-1000px";
+					input.style.zIndex = "-1000";
+					document.body.appendChild(input)
+				}
+				input.value = textString;
+				// ios必须先选中文字且不支持 input.select();
+				selectText(input, 0, textString.length);
+				if (document.execCommand('copy')) {
+					document.execCommand('copy');
+					this.$util.Tips({
+						title: '复制成功'
+					});
+				}
+				input.blur();
+				// input自带的select()方法在苹果端无法进行选择
+				// 选择文本。createTextRange(setSelectionRange)是input方法
+				function selectText(textbox, startIndex, stopIndex) {
+					if (textbox.createTextRange) { //ie
+						const range = textbox.createTextRange();
+						range.collapse(true);
+						range.moveStart('character', startIndex); //起始光标
+						range.moveEnd('character', stopIndex - startIndex); //结束光标
+						range.select(); //不兼容苹果
+					} else { //firefox/chrome
+						textbox.setSelectionRange(startIndex, stopIndex);
+						textbox.focus();
+					}
+				}
+			}
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.merchant-details {
+		padding: 0 4vw;
+		// padding: ;
+		height: 100vh;
+		position: relative;
+		// background-color: #C5D9FD;
+		background-image: url("../../../static/images/SJRZ/bg.png");
+		position: relative;
+
+		.tit {
+			color: white;
+			font-size: 33.29rpx;
+			text-align: center;
+			// padding: 50vh 0;
+			transform: translateY(5vh);
+			display: flex;
+			// justify-content: space-around;
+			flex-direction: column;
+			align-items: center;
+
+		}
+
+		.content {
+			background-color: white;
+			border-radius: 21.03rpx 21.03rpx 21.03rpx 21.03rpx;
+			// transform: translateY(20vh);
+			margin-top: 100rpx;
+			box-sizing: border-box;
+			padding: 2vw;
+
+			// .steps {}
+			.msg {
+				width: 85%;
+				padding: 30rpx;
+				// height: 150rpx;
+				margin: 30rpx auto;
+				background-color: #F4F7FE;
+				border-radius: 8rpx;
+
+				.li {
+					// margin-: ;
+					// display: flex;
+					// justify-content: left;
+					// display: flex;
+					// flex-shrink: 1;
+
+
+
+				}
+
+			}
+
+
+
+		}
+
+		.top {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+
+			.img {
+				width: 340rpx;
+				height: 280rpx;
+				margin: 140rpx 0 30rpx 0;
+			}
+
+			.title {
+				font-size: 32rpx;
+				font-weight: bold;
+				color: #333;
+			}
+		}
+
+
+		.btn {
+			// width: 70%;
+			// position: absolute;
+			// text-align: center;
+			// color: #999999;
+			// font-size: 24rpx;
+			// bottom: 80rpx
+			// background-color: red;
+			// height: 100vw;
+			margin-top: 5vw;
+
+		}
+
+		.btn_bottom {
+			position: fixed;
+			width: 92vw;
+			bottom: 20rpx;
+
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/trading_hall/adddiscounts/index.vue b/pages/trading_hall/adddiscounts/index.vue
new file mode 100644
index 0000000..9104136
--- /dev/null
+++ b/pages/trading_hall/adddiscounts/index.vue
@@ -0,0 +1,1164 @@
+<template>
+	<!-- #ifdef MP -->
+	<view :style="viewColor">
+		<!-- #endif -->
+		<!-- #ifdef APP || H5 -->
+		<view :style="viewColor">
+			<!-- #endif -->
+			<form @submit="formSubmit" report-submit='true'>
+				<view class="release_content">
+					<view class="release_tab acea-row">
+						<view class="tab_item" v-for="(item, index) in tabList" :key="item.value"
+							:class="{on:tabActive == item.value}" @click="changeTab(item)">
+							<text class="iconfont" :class="item.icon"></text>{{item.name}}
+						</view>
+					</view>
+					<view>
+						<view class="release_item">
+							<view class="photo_count">
+								<view class="input_photo acea-row row-middle">
+									<block v-if="tabActive == 2">
+										<view class="pictrue" v-if="formData.video_link">
+											<view v-if="videoplay">
+												<video controls id="myvideo" :src="video_link"
+													@fullscreenchange="screenChange"></video>
+											</view>
+											<!--#ifndef APP-PLUS-->
+											<video class="pictrue" :src="formData.video_link"></video>
+											<!--#endif-->
+											<image class="video-bg" mode="widthFix"
+												src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/3/video_bg.png">
+											</image>
+											<view class="videoHover" @click="videoshow">
+												<view>
+													<text class="iconfont icon-24gf-play"></text>
+												</view>
+											</view>
+											<text class="video-text">点击可预览视频</text>
+
+											<view class="close_btn" @click="delVideo"><text
+													class="iconfont icon-guanbi4"></text></view>
+										</view>
+										<view v-else class="pictrue acea-row row-center-wrapper row-column add"
+											@click="uploadVideo">
+											<view><text class='iconfont icon-tianjiashipin'></text></view>
+											<view class="text">添加视频</view>
+										</view>
+										<view v-if="formData.image.length < 1"
+											class="pictrue acea-row row-center-wrapper row-column add"
+											@click.stop="clk">
+											<view><text class='iconfont icon-fengmian'></text></view>
+											<view class="text">添加封面</view>
+										</view>
+									</block>
+									<view class="pictrue" v-for="(item, index) in formData.image" :key="index">
+										<easy-loadimage mode="widthFix" :image-src="item"></easy-loadimage>
+										<text class="cover_text" v-if="tabActive == 2">封面</text>
+										<view class="close_btn" @click="DelPic(index)"><text
+												class="iconfont icon-guanbi4"></text></view>
+									</view>
+									<block v-if="tabActive == 1">
+										<view v-if="formData.image.length < 6"
+											class="pictrue acea-row row-center-wrapper row-column add"
+											@click.stop="clk">
+											<view><text class='iconfont icon-icon25201'></text></view>
+											<view class="text">添加图片</view>
+										</view>
+									</block>
+									<view v-if="showCd" :ratio="16/9" class="container">
+										<bt-cropper ref="cropper" :imageSrc="imageSrc" @cropEnd="loadImage"
+											:dWidth="800" :compress="true">
+											<!-- 你想插入的内容 -->
+											<button class="crop_btn" @click="crop">裁切</button>
+										</bt-cropper>
+									</view>
+								</view>
+							</view>
+							<view class="textarea">
+								<textarea placeholder='请输入商品描述' name="comment" placeholder-class='placeholder'
+									v-model="formData.content" maxlength="600"></textarea>
+							</view>
+						</view>
+						<view class="release_item">
+							<view class='item acea-row row-between-wrapper'>
+								<view class='name'><text
+										class="iconfont icon-baobeilianjie"></text>添加产品({{productList.length}})</view>
+								<view class="select">
+									<view class="select_count" @click.stop="addProduct">
+										<text v-if="productList.length == 0" class="text">选择产品</text>
+										<view v-else class="text">
+											<image class="image" v-for="(item,index) in productList" :key="index"
+												:src="item.image || (item.spu && item.spu.image)"></image>
+										</view>
+										<text class="iconfont icon-xiangyou"></text>
+									</view>
+								</view>
+							</view>
+							<view class='item acea-row row-between-wrapper'>
+								<view class='name'
+									style="font-size: 28rpx;rfont-family: PingFang SC;font-weight: 400;color: #F84221;">
+									价格：￥{{price}}</view>
+								<!-- <view class="select">
+									<view class="select_count" @click="addprice">
+										<text v-if="!isshow" class="text1">点击输入价格</text>
+										<view v-else >
+											<input type="number" value="" v-model="price" placeholder="请输入价格"
+												style="text-align: right;font-size: 28rpx;" />
+										</view>
+
+									</view>
+								</view> -->
+							</view>
+							<view class="popup_group">
+								<view class="radio" v-if="this.formData.product_info.length>0">
+									<view class="radio_label ">送货方式</view>
+									<checkbox-group class="select_group flex_start" @change="deliveryWayChange">
+										<label class="radio_select" v-for="(val, i) in deliveryFreeList"
+											:key="val.value">
+											<view>
+												<checkbox :value="val.value"
+													:checked="delivery_way.includes(val.value)" />
+											</view>
+											<view>{{ val.name }}</view>
+										</label>
+									</checkbox-group>
+								</view>
+
+								<!-- 	<view class="popup_group_item" v-if="delivery_way.includes('2')">
+									<view class="popup_group_item_label">是否包邮</view>
+									<view class="popup_group_item_value">
+										<view class="popup_group_item_message">
+											<switch :checked="delivery_free == '1'" color="#E93323"
+												style="transform:scale(0.8)" @change="deliveryFreeChange" />
+										</view>
+									</view>
+								</view> -->
+
+								<!-- 		<view class="popup_group_item" v-if="delivery_way.includes('2') && delivery_free == 0"
+									@click="tempIdSelect">
+									<view class="popup_group_item_label">运费模板</view>
+									<view class="popup_group_item_value">
+										<view class="popup_group_item_message">
+											<span v-if="setFormData.tempName"
+												class="popup_group_item_message_value">{{ setFormData.tempName }}</span>
+											<span v-else>请选择运费模板</span>
+										</view>
+										<view><span class="iconfont">&#xe6bd;</span></view>
+									</view>
+								</view> -->
+							</view>
+
+
+						</view>
+					</view>
+					<button class="release_btn button" form-type="submit">发布</button>
+				</view>
+			</form>
+			<!--视频预览弹窗-->
+			<view v-if="showVideo" class="video-count">
+				<!--#ifndef APP-PLUS-->
+				<video id="myVideo" class="videoLink" autoplay loop muted :src="formData.video_link"></video>
+				<!--#endif-->
+				<!--#ifdef APP-PLUS-->
+
+				<video id="myVideo" class="videoLink" autoplay loop
+					:src='formData.video_link && (formData.video_link.substring(0,4) == "http" || formData.video_link.substring(0,5) == "https") ? formData.video_link : "http:" + formData.video_link'></video>
+				<!--#endif-->
+			</view>
+			<view class='mask' catchtouchmove="true" :hidden='showVideo==false' @tap="showVideo=false"></view>
+			<avatar @upload="doUpload" @getName="getImgName" quality="1" ref="avatar" selWidth="250upx"
+				selHeight="250upx">
+			</avatar>
+			<!-- 提到的宝贝弹窗 -->
+			<uni-popup ref="associated" type="bottom">
+				<associated @close="close" @getProduct="getProduct" :checkedObj="productList"></associated>
+			</uni-popup>
+
+			<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse">
+			</authorize>
+
+
+		</view>
+</template>
+
+<script>
+	import mTabbar from '@/components/m-tabbar/m-tabbar.vue'
+
+	import {
+		mapGetters
+	} from "vuex";
+	import authorize from '@/components/Authorize';
+	import avatar from "@/components/yq-avatar/yq-avatar.vue";
+	import associated from '@/components/shoppinglist/shoppinglist.vue';
+
+	import {
+		TOKENNAME,
+		HTTP_REQUEST_URL
+	} from '@/config/app.js';
+	import {
+		createPlantApi,
+		updatePlantApi,
+		plantDetailApi,
+		orderAssociatePlantApi
+	} from "@/api/community";
+	import {
+		setStorage,
+		getStorage
+	} from '@/libs/uniApi.js';
+	import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue';
+	import {
+		configMap
+	} from '@/utils';
+	import {
+		getresaleEdit,
+		getCommunitycreate,
+		getresaleDetail
+	} from '@/api/trading-floor.js'
+
+	import {
+		getUserInfo
+	} from '@/api/user.js'
+	import store from '@/store';
+	export default {
+		components: {
+			avatar,
+			associated,
+			authorize,
+			easyLoadimage,
+			mTabbar,
+
+		},
+		data() {
+			return {
+				formData: {
+					image: [],
+					content: "",
+					topic_id: 0,
+					category_id: 0,
+					video_link: '',
+					is_type: 3,
+					resale_type: 2,
+					product_info: []
+				},
+				price: 0,
+				deliveryFreeList: [{
+						value: '1',
+						name: '到店核销'
+					},
+					{
+						value: '2',
+						name: '快递配送'
+					}
+				],
+				imageSrc: '',
+				productList: [],
+				topicName: {},
+				isUpload: true,
+				isAuto: false, //没有授权的不会自动授权
+				isShowAuth: false, //是否隐藏授权
+				showCd: false,
+				isshow: false,
+				id: "",
+				order_id: "",
+				imgName: "",
+				upload_max: 50,
+				uploadUrl: `${HTTP_REQUEST_URL}/api/upload/video`,
+				tabList: [{
+						name: '图文',
+						value: 1,
+						icon: 'icon-tuwen'
+					},
+					{
+						name: '视频',
+						value: 2,
+						icon: 'icon-shipin'
+					},
+				],
+				tabActive: 1,
+				isPlay: false,
+				videoContext: "",
+				video_link: "",
+				showVideo: false,
+				videoplay: false,
+				videoContext: '',
+				delivery_free: 1,
+				templateListPage: {
+					page: 1,
+					limit: 10000
+				},
+				merId: '',
+				delivery_way: [], // 配送方式 1 到店核销 2 快递配送
+
+				type: ''
+			};
+		},
+		computed: {
+			...mapGetters(['isLogin', 'viewColor', 'uid']),
+			...configMap({
+				community_app_switch: []
+			})
+		},
+		watch: {
+			// formData:{
+			// 	handler(n){
+			// 		if(!this.id){
+			// 			setTimeout(()=>{
+			// 				setStorage('addPlant', n);
+			// 			});
+			// 		}
+			// 	},
+			// 	deep: true
+			// }
+		},
+		mounted() {
+			// #ifndef APP-PLUS
+			this.videoContext = uni.createVideoContext('myVideo', this);
+			// #endif
+			this.getUserInfo()
+		},
+		onLoad(options) {
+			// uni.hideTabBar()
+			this.id = options.id;
+			this.type = options.gtype
+			if (this.type) {
+				this.list()
+				uni.setNavigationBarTitle({
+					title: '编辑打折'
+				})
+			}
+			this.tabActive = options.type || 1;
+			if (this.community_app_switch.length == 1) {
+				this.tabActive = this.community_app_switch[0]
+			}
+			if (!this.isLogin) {
+				this.isAuto = true;
+				this.isShowAuth = true
+			} else {
+
+
+			}
+			this.videoContext = uni.createVideoContext("myvideo", this);
+		},
+		onTabItemTap() {
+			this.$refs.associated.close();
+			this.formData.content = ''
+			this.formData.image = []
+			this.formData.topic_id = ''
+
+
+			this.formData.video_link = ''
+			this.productList = []
+			this.topicName = {}
+		},
+
+		methods: {
+			list() {
+				getresaleDetail(this.id).then(res => {
+					if (res.data.status = 200) {
+						this.formData = res.data
+						this.productList = res.data.resale
+						this.formData.product_info = []
+						for (let i in res.data.resale) {
+							this.price = Number(this.price) + (Number(res.data.resale[i].number) * Number(res.data
+								.resale[i].price))
+							this.delivery_way = res.data.resale[i].deliver_method.split('')
+						}
+
+						this.getProduct(res.data.resale)
+						if(res.data.video_link){
+							this.tabActive=2
+						}
+					}
+				})
+			},
+			getUserInfo: function() {
+				let that = this;
+				getUserInfo().then(res => {
+
+
+
+					this.merId = res.data.service.mer_id
+
+				})
+
+
+			},
+			// 是否包邮选择
+			deliveryFreeChange(val) {
+				if (val.detail.value) {
+					this.delivery_free = '1';
+				} else {
+					this.delivery_free = '0';
+				}
+			},
+			// 送货方式选择
+			deliveryWayChange(obj) {
+				this.delivery_way = obj.detail.value;
+				if (this.formData.product_info.length > 0) {
+					for (let i in this.formData.product_info) {
+						this.formData.product_info[i].deliver_method = obj.detail.value.toString();
+					}
+				} else {
+					this.$util.Tips({
+						title: '请选择产品,再选择送货方式'
+					});
+				}
+
+
+			},
+
+			onLoadFun() {
+				this.isShowAuth = false;
+			},
+			// 授权关闭
+			authColse: function(e) {
+				this.isShowAuth = e;
+			},
+
+			/*点击输入价格*/
+			addprice() {
+				this.isshow = true
+			},
+			/*切换tab*/
+			changeTab(item) {
+				if (this.tabActive == item.value) return
+				this.tabActive = item.value
+				this.productList = []
+				this.price = 0
+				this.formData = {
+					image: [],
+					content: "",
+					topic_id: 0,
+					category_id: 0,
+					video_link: '',
+					is_type: 3,
+					product_info: []
+				}
+			},
+
+			clk() {
+				let that = this
+				uni.chooseImage({
+					count: 1,
+					sizeType: ['original'],
+					success: (res) => {
+						// console.log(res)
+						let tempFilePaths = res.tempFilePaths[0]
+						//#ifdef APP-PLUS
+						if (uni.getSystemInfoSync().platform == 'ios') {
+							that.doUpload(tempFilePaths)
+						} else {
+							let size = res.tempFiles[0].size / 1024
+							if (size >= 1) {
+								uni.compressImage({
+									src: tempFilePaths,
+									quality: 80, // 仅对jpg有效
+									success: res => {
+										that.imageSrc = res.tempFilePath;
+										that.showCd = true;
+									},
+									fail: err => {
+										// console.log('失败了compressImage', tempFilePaths);
+										that.imageSrc = tempFilePaths
+										that.showCd = true
+									}
+								})
+							} else {
+								that.imageSrc = tempFilePaths
+								that.showCd = true
+							}
+						}
+						//#endif
+						//#ifndef APP-PLUS
+						that.imageSrc = tempFilePaths
+						that.showCd = true
+						//#endif
+					}
+				})
+			},
+			crop() {
+				uni.showLoading({
+					title: '',
+					mask: true
+				})
+				// 通过组件定义的ref调用cropper方法，返回一个promise对象
+				this.$refs.cropper.crop().then(([err, res]) => {
+					if (!err) {
+						uni.hideLoading()
+						this.doUpload(res.tempFilePath)
+					} else {
+						uni.hideLoading()
+						// console.log(err)
+					}
+				})
+			},
+			loadImage() {
+				this.showCd = false
+			},
+			doUpload(rsp) {
+				let that = this
+				uni.showLoading({
+					title: '上传中',
+					mask: true
+				})
+				uni.uploadFile({
+					url: HTTP_REQUEST_URL + '/api/upload/image/field',
+					filePath: rsp,
+					name: 'field',
+					formData: {
+						'filename': rsp,
+						'name': that.imgName
+					},
+					header: {
+						// #ifdef MP
+						"Content-Type": "multipart/form-data",
+						// #endif
+						[TOKENNAME]: 'Bearer ' + store.state.app.token
+					},
+					success: (uploadFileRes) => {
+						let imgData = JSON.parse(uploadFileRes.data)
+						if (imgData.data.path) {
+							that.formData.image.push(imgData.data.path)
+							uni.hideLoading()
+						}
+					},
+					complete(res) {
+						let data = JSON.parse(res.data)
+						// that.$util.Tips({
+						// 	title: data.message
+						// });
+					}
+				});
+			},
+			// 上传视频
+			uploadVideo() {
+				let that = this
+				uni.chooseVideo({
+					sourceType: ['camera', 'album'],
+					success: res => {
+						if (Math.ceil(res.size / 1024) < that.upload_max * 1024) {
+							uni.uploadFile({
+								url: that.uploadUrl, //仅为示例，非真实的接口地址
+								filePath: res.tempFilePath,
+								name: 'file',
+								//请求参数
+								formData: {
+									user: 'test'
+								},
+								header: {
+									// #ifdef MP
+									'Content-Type': 'multipart/form-data',
+									// #endif
+									[TOKENNAME]: 'Bearer ' + store.state.app.token
+								},
+								success: uploadFileRes => {
+									let data = JSON.parse(uploadFileRes.data);
+									that.formData.video_link = (data.data.src);
+								},
+								complete: a => {
+
+								}
+							});
+						} else {
+							uni.showModal({
+								title: '提示',
+								content: `视频超出限制${that.upload_max}MB,已过滤`
+							});
+						}
+					},
+					fail: err => {
+						that.$util.Tips({
+							title: err
+						});
+					}
+				});
+			},
+			getImgName(name) {
+				this.imgName = name
+			},
+			/**删除图片*/
+			DelPic: function(index) {
+				let that = this
+				that.formData.image.splice(index, 1);
+			},
+			/*删除视频*/
+			delVideo() {
+				this.formData.video_link = '';
+			},
+			/*添加宝贝*/
+			addProduct() {
+
+				this.$refs.associated.open();
+			},
+
+			close() {
+				this.$refs.associated.close();
+
+			},
+			/*查看视频*/
+			videoshow() {
+				this.showVideo = true
+				this.videoContext = uni.createVideoContext('myVideo', this);
+				this.$nextTick(() => {
+					this.videoContext.play();
+				})
+				// this.video_link = this.formData.video_link;
+				// this.videoContext.requestFullScreen({ direction: 90 });
+				// this.videoContext.play(); this.videoplay = true; 
+			},
+			screenChange(e) {
+				let fullScreen = e.detail.fullScreen; //值true为进入全屏，false为退出全屏 
+				// console.log(e, "qweeee========================================");
+				if (!fullScreen) {
+					this.videoplay = false
+					//退出全屏 this.videoplay = false; // 隐藏播放盒子 
+				}
+			},
+			/*获取选中的宝贝*/
+			getProduct(data) {
+				this.productList = []
+				this.price = 0;
+				if (data.length > 0) {
+					this.productList = data;
+					for (let i in data) {
+						this.price = Number(this.price) + (Number(data[i].number) * Number(data[i].price))
+						this.formData.product_info.push({
+							product_attr_unique: data[i].product_attr_unique,
+							number: Number(data[i].number),
+							price: data[i].price
+						})
+					}
+				} else {
+					this.price = 0
+				}
+
+
+
+				this.$refs.associated.close();
+			},
+
+			/**
+			 * 提交数据
+			 */
+			formSubmit: function(e) {
+				// console.log(this.id)
+
+				let that = this,
+
+					value = that.formData;
+				if (value.image.length == 0) return that.$util.Tips({
+					title: '请添加图文图片'
+				});
+				if (value.product_info.length == 0) return that.$util.Tips({
+					title: '请选择产品'
+				});
+				if (!value.content) return that.$util.Tips({
+					title: '请添加商品描述'
+				});
+				if (that.tabActive == 2 && !value.video_link) {
+					return that.$util.Tips({
+						title: '请添加话题视频'
+					});
+				}
+
+				uni.showLoading({
+					title: '保存中',
+					mask: true
+				})
+				that.type == 'edit' ? getresaleEdit(that.id, value).then(res => {
+					if (res.status == '200') {
+						uni.hideLoading()
+						that.$util.Tips({
+							title: '编辑成功',
+							icon: 'success'
+						});
+						that.formData = {
+							image: [],
+							content: "",
+							topic_id: 0,
+							category_id: 0,
+							video_link: '',
+							is_type: 3,
+							product_info: []
+						}
+						uni.navigateTo({
+							url: '/pages/releaseManagement/index?key=' + 2
+						})
+
+					} else {
+						that.$util.Tips({
+							title: res.messge,
+							icon: 'success'
+						});
+					}
+				}).catch(err => {
+
+					return that.$util.Tips({
+						title: err
+					});
+				}) : getCommunitycreate(value).then(res => {
+					if (res.status == '200') {
+						uni.hideLoading()
+						that.$util.Tips({
+							title: '发布成功',
+							icon: 'success'
+						});
+						that.formData = {
+							image: [],
+							content: "",
+							topic_id: 0,
+							category_id: 0,
+							video_link: '',
+							is_type: 3,
+							product_info: []
+						}
+						uni.navigateTo({
+							url: '/pages/releaseManagement/index?key=' + 2
+						})
+
+					} else {
+						that.$util.Tips({
+							title: res.messge,
+							icon: 'success'
+						});
+					}
+				}).catch(err => {
+
+					return that.$util.Tips({
+						title: err
+					});
+				})
+
+
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page {
+		background: #F5F5F5;
+	}
+
+	.crop_btn {
+		line-height: 90rpx;
+		height: 90rpx;
+		height: calc(90rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
+		height: calc(200rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
+	}
+
+	.container {
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 20;
+		width: 750rpx;
+		height: 100vh;
+	}
+
+	.release_content {
+		margin-top: 30rpx;
+
+		.release_tab {
+			border-radius: 16rpx 16rpx 0 0;
+			border-bottom: 1rpx solid #E4E4E4;
+			background: #fff;
+			align-items: center;
+			justify-content: center;
+			height: 86rpx;
+
+			.tab_item {
+				margin: 0 40rpx;
+				font-size: 32rpx;
+				color: #999;
+				position: relative;
+				line-height: 86rpx;
+				cursor: pointer;
+
+				&.on {
+					color: #E93323;
+
+					&::after {
+						content: "";
+						display: inline-block;
+						width: 100%;
+						height: 3rpx;
+						background: #E93323;
+						position: absolute;
+						bottom: 2rpx;
+						left: 0;
+					}
+				}
+
+				.iconfont {
+					margin-right: 10rpx;
+					font-size: 32rpx;
+				}
+			}
+		}
+
+		padding: 0 20rpx;
+
+		.release_item {
+			background: #ffffff;
+			padding: 0 30rpx;
+			border-radius: 10rpx;
+
+		}
+
+		.photo_count {
+			padding: 30rpx 0;
+		}
+	}
+
+	/deep/.input_photo .easy-loadimage,
+	/deep/.input_photo uni-image,
+	/deep/.input_photo image {
+		width: 180rpx;
+		height: 180rpx;
+		border-radius: 12rpx !important;
+	}
+
+	.input_photo .pictrue {
+		width: 180rpx;
+		height: 180rpx;
+		border-radius: 12rpx !important;
+		margin-right: 11rpx;
+		position: relative;
+		overflow: hidden;
+
+		&:nth-child(3n) {
+			margin-right: 0;
+		}
+
+		.close_btn {
+			width: 30rpx;
+			height: 30rpx;
+			background: rgba(0, 0, 0, .6);
+			border-radius: 0 12rpx 0 12rpx;
+			position: absolute;
+			top: 0;
+			right: 0;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			z-index: 999;
+
+			.iconfont {
+				color: #ffffff;
+				font-size: 12rpx;
+			}
+		}
+
+		.cover_text {
+			display: flex;
+			width: 58rpx;
+			height: 29rpx;
+			background: #E93323;
+			border-radius: 0px 12rpx 0px 12rpx;
+			position: absolute;
+			left: 0;
+			bottom: 0;
+			z-index: 10;
+			align-items: center;
+			justify-content: center;
+			font-size: 18rpx;
+			color: #fff;
+		}
+	}
+
+	/deep/.loading-img {
+		width: 180rpx;
+		height: 180rpx;
+		border-radius: 12rpx;
+	}
+
+	.input_photo .pictrue {
+		margin-bottom: 20rpx;
+
+		.videoHover {
+			width: 180rpx;
+			height: 180rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			position: absolute;
+			top: 0;
+			left: 0;
+			z-index: 10;
+
+			>view {
+				width: 50rpx;
+				height: 50rpx;
+				background: #000000;
+				border-radius: 50rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+
+				.iconfont {
+					color: #ffffff;
+					font-size: 21rpx;
+				}
+			}
+		}
+
+		.video-text {
+			display: block;
+			width: 180rpx;
+			text-align: center;
+			color: #ffffff;
+			font-size: 18rpx;
+			z-index: 13;
+			position: absolute;
+			bottom: 20rpx;
+		}
+
+		video {
+			width: 180rpx;
+			height: 180rpx;
+			border-radius: 12rpx;
+		}
+	}
+
+	.input_photo .add {
+		background: #f6f6f6;
+		color: #666666;
+
+		.iconfont {
+			font-size: 50rpx;
+		}
+
+		.text {
+			margin-top: 20rpx;
+			font-size: 27rpx;
+		}
+	}
+
+	.textarea textarea {
+		font-size: 28rpx;
+		padding-bottom: 38rpx;
+		width: 100%;
+		box-sizing: border-box;
+		height: 400rpx;
+		overflow: hidden;
+	}
+
+	.textarea .placeholder {
+		color: #BBBBBB;
+	}
+
+	.release_item .item {
+		height: 106rpx;
+		border-bottom: 1rpx solid #eee;
+		position: relative;
+		font-size: 30rpx;
+
+		&:last-child {
+			border-bottom: none;
+		}
+
+		.name {
+			color: #333333;
+
+			.iconfont {
+				margin-right: 10rpx;
+				font-size: 28rpx;
+			}
+		}
+
+		.select {
+			color: #bbbbbb;
+
+			.select_count {
+				display: flex;
+				align-items: center;
+			}
+
+			.text {
+				margin-right: 15rpx;
+				display: flex;
+				align-items: center;
+
+				.image,
+				image,
+				uni-image {
+					width: 60rpx;
+					height: 60rpx;
+					margin-right: 5rpx;
+				}
+			}
+
+			.text1 {
+				width: 308rpx;
+				height: 70rpx;
+				line-height: 70rpx;
+				background: #FFFFFF;
+				border-radius: 7px 7px 7px 7px;
+				text-align: center;
+				opacity: 1;
+				border: 2rpx solid #999999;
+				font-size: 28rpx;
+				font-family: PingFang SC-Regular, PingFang SC;
+				font-weight: 400;
+				color: #CCCCCC;
+			}
+
+			.iconfont {
+				font-size: 24rpx;
+			}
+
+			.text_name {
+				color: var(--view-theme);
+				padding: 5rpx 12rpx;
+				background: var(--view-minorColor);
+				border-radius: 23rpx;
+				font-size: 24rpx;
+				margin-right: 10rpx;
+
+				.icon {
+					color: var(--view-theme);
+					font-weight: bold;
+					font-size: 24rpx;
+				}
+
+				.title {
+					margin: 0 10rpx;
+				}
+
+				.iconfont {
+					font-size: 16rpx;
+				}
+			}
+		}
+	}
+
+	.button {
+		width: 710rpx;
+		height: 86rpx;
+		line-height: 86rpx;
+		color: #ffffff;
+		text-align: center;
+		font-size: 32rpx;
+		background: var(--view-theme);
+		border-radius: 43rpx;
+	}
+
+	.release_btn {
+		margin-top: 100rpx;
+	}
+
+	.video-count {
+		position: fixed;
+		width: 600rpx;
+		height: 500rpx;
+		top: 50%;
+		left: 50%;
+		margin-left: -300rpx;
+		margin-top: -250rpx;
+		z-index: 100;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+
+		.videoLink {
+			width: 600rpx;
+			height: 500rpx;
+		}
+	}
+
+	.popup_group {
+		background: #fff;
+		margin: 31rpx auto;
+		width: 710rpx;
+		font-size: 30rpx;
+		border-radius: 10rpx;
+
+		.popup_group_item {
+			padding: 32rpx 30rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+
+			.popup_group_item_value {
+				display: flex;
+				align-items: center;
+
+				.popup_group_item_message {
+					margin-right: 15rpx;
+					color: #bbbbbb;
+					max-width: 400rpx;
+
+					&_value {
+						display: inline-block;
+						max-width: 400rpx;
+						color: #000;
+					}
+				}
+
+				.iconfont {
+					color: #bbbbbb;
+				}
+
+				input {
+					text-align: right;
+				}
+			}
+		}
+
+		>view:not(:last-child) {
+			border-bottom: 1px solid #eeeeee;
+		}
+	}
+
+	.radio {
+		padding: 30rpx;
+
+		&_label {
+			padding-left: 10rpx;
+			color: #333333;
+			font-size: 30rpx;
+			display: flex;
+			align-items: center;
+
+			.select_check {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 40rpx;
+				height: 40rpx;
+				border: 1px solid #cccccc;
+				border-radius: 50%;
+				margin-right: 20rpx;
+
+				.iconfont {
+					font-size: 24rpx;
+				}
+			}
+
+			.select {
+				background: #e93323;
+				border: none;
+
+				.iconfont {
+					color: #fff;
+				}
+			}
+		}
+
+		.select_group {
+			display: flex;
+		}
+
+		.flex_start {
+			padding: 0 10rpx;
+			margin-top: 40rpx;
+			justify-content: flex-start;
+		}
+
+		&_select {
+			display: flex;
+			margin-right: 110rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/trading_hall/product_details/index.vue b/pages/trading_hall/product_details/index.vue
new file mode 100644
index 0000000..cb5bc2c
--- /dev/null
+++ b/pages/trading_hall/product_details/index.vue
@@ -0,0 +1,475 @@
+<template>
+	<view class="content">
+		<view class="content_top">
+			<view class="content_top-one">
+				<view class="content_symbol">
+					<image :src="listobj.mer_avatar" mode="aspectFit"></image>
+				</view>
+				<view class="content_title" v-if="listobj.author">
+					<view class="title_one">
+						{{listobj.mer_name}}
+
+					</view>
+					<view class="title_two">
+						{{listobj.care_count>0?listobj.care_count:0}}人关注 {{listobj.sales>0?listobj.sales:0}}销量
+					</view>
+				</view>
+				<view class="content_titimg">
+					<image src="@/static/images/sym.png" mode="aspectFit"></image>
+				</view>
+			</view>
+			<view view class="content_top-two">
+				<view class="price">
+					￥{{listobj.total_price}}
+					<!-- <input type="text" :value="listobj.total_price" v-model="listobj.total_price" /> -->
+				</view>
+
+				<view class="top-two_content">
+					<textarea :value="listobj.content" placeholder="" style="height: auto;" />
+				</view>
+				<view class="top-two_img">
+
+					<view class="" v-for="(item,index) in listobj.image">
+						<image :src="item" mode=""></image>
+					</view>
+
+				</view>
+			</view>
+		</view>
+
+		<view class="content_middle">
+			<view class="middle-one" v-for="(item,b) in listobj.resale" :key='b'>
+				<view class="midding-img">
+					<image :src="item.image" mode=""></image>
+				</view>
+				<view class="middle-one_text">
+					<view class="one_text_a">
+						{{item.store_name}}
+					</view>
+					<view class="one_text_b">
+						￥{{item.price}}
+					</view>
+					<view class="one_text_c">
+
+						<!-- <view class="">
+							采购价:{{item.price}}
+						</view> -->
+						<view class="">
+							数量: {{item.number}}
+						</view>
+
+					</view>
+				</view>
+			</view>
+
+
+		</view>
+		<view class="content_enter">
+			<view class="content_enter-one">
+				类型
+			</view>
+			<view class="content_enter-two" v-if="listobj.resale_type==1">
+				调货
+			</view>
+			<view class="content_enter-two" v-else>
+				打折
+			</view>
+
+
+		</view>
+
+		<view class="content_bootm" v-if='listobj.resale'>
+			<view class="content_bootm_txt" v-if='listobj.resale.length>0'>
+				查看TA提到的宝贝({{listobj.resale.length}})
+			</view>
+
+			<view class="content_bootm_one" v-for="(items,i) in listobj.resale" :key='i' @click="Merchbaby(items)">
+				<view class="bootm_oneimg">
+					<image :src="items.image" mode=""></image>
+				</view>
+				<view class="" >
+					{{items.store_name}}
+				</view>
+			</view>
+
+		</view>
+
+		<view class="pay" v-if="this.detail.type==1||this.detail.type==2">
+			<view class="pay_tilte-a">
+				合计: <span>￥{{listobj.total_price}}</span>
+			</view>
+			<view class="pay_tilte-b" @click="prouctOrder">提交订单</view>
+		</view>
+
+		<view class="domain" v-else>
+			<view class="domain_tilte-a">
+				合计: <span>￥200.00</span>
+			</view>
+			<view class="domain_tilte-b">
+				删除
+			</view>
+			<view class="domain_tilte-c">编辑</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getCommunityshow,
+		getCommunityaddCart
+	} from '@/api/trading-floor.js'
+	export default {
+
+
+		data() {
+			return {
+				detail: {},
+				listobj: {},
+			}
+		},
+		onLoad(e) {
+			if (e) {
+				this.detail = JSON.parse(decodeURIComponent(e.key));
+				this.shopdetil(this.detail.id)
+			}
+
+
+		},
+		methods: {
+			//商品详情
+			shopdetil(id) {
+
+				getCommunityshow(id).then(res => {
+					if (res.data.status = 200) {
+						this.listobj = res.data
+					}
+				})
+			},
+
+			//商品宝贝详情
+			Merchbaby(item) {
+				uni.navigateTo({
+					url: `/pages/goods_details/index?id=${item.product_id}`
+				})
+
+			},
+			prouctOrder() {
+				getCommunityaddCart(this.listobj).then(res => {
+					if (res.status == 200) {
+						uni.navigateTo({
+							url: '/pages/users/order_confirm/index?cartId=' + res.data.cart_id.toString()
+						})
+					}
+				}).catch((err) => {
+					console.log(err)
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content {}
+
+	.content_top {
+		padding: 21rpx 28rpx;
+		background: #FFFFFF;
+
+		.content_top-one {
+			display: flex;
+			border-bottom: 1rpx solid #CCCCCC;
+
+			.content_symbol {
+				width: 81rpx;
+				height: 81rpx;
+
+				image {
+					width: 81rpx;
+					height: 81rpx;
+				}
+
+				margin-bottom: 21rpx;
+			}
+
+			.content_title {
+				margin-left: 21rpx;
+
+				.title_one {
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+				}
+
+				.title_two {
+					font-size: 25rpx;
+					font-family: PingFang SC;
+					font-weight: 400;
+					color: #999999;
+				}
+			}
+
+			.content_titimg {
+				width: 116rpx;
+				height: 64rpx;
+				margin-top: -10rpx;
+				margin-left: 10rpx;
+
+				image {
+					width: 136rpx;
+					height: 64rpx;
+				}
+			}
+		}
+
+		.content_top-two {
+			.price {
+				display: flex;
+				margin-top: 21rpx;
+				font-size: 46rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #F84221;
+
+				input {
+					font-size: 46rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #F84221
+				}
+			}
+
+			.top-two_content {
+				font-size: 32rpx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				margin-top: 21rpx;
+				margin-bottom: 21rpx;
+			}
+
+			.top-two_img {
+				display: flex;
+
+				view {
+
+					width: 217rpx;
+					height: 217rpx;
+					border-radius: 14rpx 14rpx 14rpx 14rpx;
+					margin-right: 15rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
+						border-radius: 14rpx 14rpx 14rpx 14rpx;
+
+					}
+				}
+
+
+			}
+		}
+	}
+
+	.content_middle {
+
+		.middle-one {
+			background-color: #FFFFFF;
+			display: flex;
+			margin-top: 28rpx;
+			padding: 21rpx 0;
+
+			.midding-img {
+				width: 176rpx;
+				height: 176rpx;
+				margin-left: 24rpx;
+				margin-right: 21rpx;
+
+				image {
+					width: 176rpx;
+					height: 176rpx;
+				}
+			}
+
+			.middle-one_text {
+				.one_text_a {
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+				}
+
+				.one_text_b {
+					font-size: 35rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #F84221;
+					margin-top: 11rpx;
+				}
+
+				.one_text_c {
+					font-size: 28rpx;
+					font-family: PingFang SC;
+					font-weight: 400;
+					color: #999999;
+					margin-top: 12rpx;
+					display: flex;
+					justify-content: space-between;
+					margin-right: 50rpx;
+				}
+			}
+
+		}
+	}
+
+	.content_enter {
+		height: 89rpx;
+		line-height: 89rpx;
+		background: #FFFFFF;
+		opacity: 1;
+		margin-top: 28rpx;
+		display: flex;
+		justify-content: space-between;
+		padding: 0 20rpx;
+
+		.content_enter-one {
+			font-size: 32rpx;
+			font-family: PingFang SC;
+			font-weight: 400;
+			color: #333333;
+		}
+
+		.content_enter-two {
+			font-size: 32rpx;
+			font-family: PingFang SC;
+			font-weight: 400;
+			color: #F84221;
+		}
+	}
+
+	.content_bootm {
+
+		margin-bottom: 150rpx;
+
+		.content_bootm_txt {
+			margin-top: 42rpx;
+			padding-left: 28rpx;
+
+		}
+
+		.content_bootm_one {
+			height: 112rpx;
+			line-height: 112rpx;
+			padding-right: 28rpx;
+			background: #FFFFFF;
+			display: flex;
+			margin-top: 21rpx;
+
+			.bootm_oneimg {
+				width: 80rpx;
+				height: 80rpx;
+				margin: auto 0;
+				margin-left: 28rpx;
+				margin-right: 21rpx;
+
+				image {
+					width: 80rpx;
+					height: 80rpx;
+				}
+			}
+
+		}
+	}
+
+	.pay {
+		width: 100%;
+		height: 121rpx;
+		line-height: 121rpx;
+		background: #FFFFFF;
+		position: absolute;
+		bottom: 0;
+		position: fixed;
+		display: flex;
+		justify-content: space-between;
+		padding: 0 28rpx;
+
+		.pay_tilte-a {
+			font-size: 32rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #333333;
+
+			span {
+				font-size: 42rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #F84221;
+			}
+		}
+
+		.pay_tilte-b {
+			width: 238rpx;
+			height: 74rpx;
+			line-height: 74rpx;
+			text-align: center;
+			background: linear-gradient(90deg, #F98649 0%, #F34E45 100%);
+			border-radius: 37rpx 37rpx 37rpx 37rpx;
+			opacity: 1;
+			font-size: 32rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #FFFFFF;
+			margin: auto 0;
+		}
+	}
+
+	.domain {
+		width: 100%;
+		height: 121rpx;
+		line-height: 121rpx;
+		background: #FFFFFF;
+		position: absolute;
+		bottom: 0;
+		position: fixed;
+		display: flex;
+		justify-content: space-between;
+		padding: 0 28rpx;
+
+		.domain_tilte-a {
+			font-size: 32rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #333333;
+
+			span {
+				font-size: 42rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #F84221;
+			}
+		}
+
+		.domain_tilte-b {
+			font-size: 32rpx;
+			font-family: PingFang SC-Regular, PingFang SC;
+			font-weight: 400;
+			color: #666666;
+		}
+
+		.domain_tilte-c {
+			width: 238rpx;
+			height: 74rpx;
+			line-height: 74rpx;
+			text-align: center;
+			background: linear-gradient(90deg, #F98649 0%, #F34E45 100%);
+			border-radius: 37rpx 37rpx 37rpx 37rpx;
+			opacity: 1;
+
+			font-size: 32rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #FFFFFF;
+			margin: auto 0;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/trading_hall/transfer_goods/index.vue b/pages/trading_hall/transfer_goods/index.vue
new file mode 100644
index 0000000..0bd4f99
--- /dev/null
+++ b/pages/trading_hall/transfer_goods/index.vue
@@ -0,0 +1,1173 @@
+<template>
+	<!-- #ifdef MP -->
+	<view :style="viewColor">
+		<!-- #endif -->
+		<!-- #ifdef APP || H5 -->
+		<view :style="viewColor">
+			<!-- #endif -->
+			<form @submit="formSubmit" report-submit='true'>
+				<view class="release_content">
+					<view class="release_tab acea-row">
+						<view class="tab_item" v-for="(item, index) in tabList" :key="item.value"
+							:class="{on:tabActive == item.value}" @click="changeTab(item)">
+							<text class="iconfont" :class="item.icon"></text>{{item.name}}
+						</view>
+					</view>
+					<view>
+						<view class="release_item">
+							<view class="photo_count">
+								<view class="input_photo acea-row row-middle">
+									<block v-if="tabActive == 2">
+										<view class="pictrue" v-if="formData.video_link">
+											<view v-if="videoplay">
+												<video controls id="myvideo" :src="video_link"
+													@fullscreenchange="screenChange"></video>
+											</view>
+											<!--#ifndef APP-PLUS-->
+											<video class="pictrue" :src="formData.video_link"></video>
+											<!--#endif-->
+											<image class="video-bg" mode="widthFix"
+												src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/3/video_bg.png">
+											</image>
+											<view class="videoHover" @click="videoshow">
+												<view>
+													<text class="iconfont icon-24gf-play"></text>
+												</view>
+											</view>
+											<text class="video-text">点击可预览视频</text>
+
+											<view class="close_btn" @click="delVideo"><text
+													class="iconfont icon-guanbi4"></text></view>
+										</view>
+										<view v-else class="pictrue acea-row row-center-wrapper row-column add"
+											@click="uploadVideo">
+											<view><text class='iconfont icon-tianjiashipin'></text></view>
+											<view class="text">添加视频</view>
+										</view>
+										<view v-if="formData.image.length < 1"
+											class="pictrue acea-row row-center-wrapper row-column add"
+											@click.stop="clk">
+											<view><text class='iconfont icon-fengmian'></text></view>
+											<view class="text">添加封面</view>
+										</view>
+									</block>
+									<view class="pictrue" v-for="(item, index) in formData.image" :key="index">
+										<easy-loadimage mode="widthFix" :image-src="item"></easy-loadimage>
+										<text class="cover_text" v-if="tabActive == 2">封面</text>
+										<view class="close_btn" @click="DelPic(index)"><text
+												class="iconfont icon-guanbi4"></text></view>
+									</view>
+									<block v-if="tabActive == 1">
+										<view v-if="formData.image.length < 6"
+											class="pictrue acea-row row-center-wrapper row-column add"
+											@click.stop="clk">
+											<view><text class='iconfont icon-icon25201'></text></view>
+											<view class="text">添加图片</view>
+										</view>
+									</block>
+									<view v-if="showCd" :ratio="16/9" class="container">
+										<bt-cropper ref="cropper" :imageSrc="imageSrc" @cropEnd="loadImage"
+											:dWidth="800" :compress="true">
+											<!-- 你想插入的内容 -->
+											<button class="crop_btn" @click="crop">裁切</button>
+										</bt-cropper>
+									</view>
+								</view>
+							</view>
+							<view class="textarea">
+								<textarea placeholder='请输入商品描述' name="comment" placeholder-class='placeholder'
+									v-model="formData.content" maxlength="600"></textarea>
+							</view>
+						</view>
+						<view class="release_item">
+							<view class='item acea-row row-between-wrapper'>
+								<view class='name'><text
+										class="iconfont icon-baobeilianjie"></text>添加产品({{productList.length}})</view>
+								<view class="select">
+									<view class="select_count" @click.stop="addProduct">
+										<text v-if="productList.length == 0" class="text">选择产品</text>
+										<view v-else class="text">
+											<image class="image" v-for="(item,index) in productList" :key="index"
+												:src="item.image || (item.spu && item.spu.image)"></image>
+										</view>
+										<text class="iconfont icon-xiangyou"></text>
+									</view>
+								</view>
+							</view>
+							<view class='item acea-row row-between-wrapper'>
+								<view class='name'
+									style="font-size: 28rpx;rfont-family: PingFang SC;font-weight: 400;color: #F84221;">
+									价格：￥{{price.toFixed(2)}}</view>
+								<!-- <view class="select">
+									<view class="select_count" @click="addprice">
+										<text v-if="!isshow" class="text1">点击输入价格</text>
+										<view v-else >
+											<input type="number" value="" v-model="price" placeholder="请输入价格"
+												style="text-align: right;font-size: 28rpx;" />
+										</view>
+
+									</view>
+								</view> -->
+							</view>
+							<view class="popup_group" v-if='this.formData.product_info'>
+								<view class="radio" v-if="this.formData.product_info.length>0">
+									<view class="radio_label ">送货方式</view>
+									<checkbox-group class="select_group flex_start" @change="deliveryWayChange">
+										<label class="radio_select" v-for="(val, i) in deliveryFreeList"
+											:key="val.value">
+											<view>
+												<checkbox :value="val.value"
+													:checked="delivery_way.includes(val.value)" />
+											</view>
+											<view>{{ val.name }}</view>
+										</label>
+									</checkbox-group>
+								</view>
+
+								<!-- 	<view class="popup_group_item" v-if="delivery_way.includes('2')">
+									<view class="popup_group_item_label">是否包邮</view>
+									<view class="popup_group_item_value">
+										<view class="popup_group_item_message">
+											<switch :checked="delivery_free == '1'" color="#E93323"
+												style="transform:scale(0.8)" @change="deliveryFreeChange" />
+										</view>
+									</view>
+								</view> -->
+
+								<!-- 		<view class="popup_group_item" v-if="delivery_way.includes('2') && delivery_free == 0"
+									@click="tempIdSelect">
+									<view class="popup_group_item_label">运费模板</view>
+									<view class="popup_group_item_value">
+										<view class="popup_group_item_message">
+											<span v-if="setFormData.tempName"
+												class="popup_group_item_message_value">{{ setFormData.tempName }}</span>
+											<span v-else>请选择运费模板</span>
+										</view>
+										<view><span class="iconfont">&#xe6bd;</span></view>
+									</view>
+								</view> -->
+							</view>
+
+
+						</view>
+					</view>
+					<button class="release_btn button" form-type="submit">发布</button>
+				</view>
+			</form>
+			<!--视频预览弹窗-->
+			<view v-if="showVideo" class="video-count">
+				<!--#ifndef APP-PLUS-->
+				<video id="myVideo" class="videoLink" autoplay loop muted :src="formData.video_link"></video>
+				<!--#endif-->
+				<!--#ifdef APP-PLUS-->
+
+				<video id="myVideo" class="videoLink" autoplay loop
+					:src='formData.video_link && (formData.video_link.substring(0,4) == "http" || formData.video_link.substring(0,5) == "https") ? formData.video_link : "http:" + formData.video_link'></video>
+				<!--#endif-->
+			</view>
+			<view class='mask' catchtouchmove="true" :hidden='showVideo==false' @tap="showVideo=false"></view>
+			<avatar @upload="doUpload" @getName="getImgName" quality="1" ref="avatar" selWidth="250upx"
+				selHeight="250upx">
+			</avatar>
+			<!-- 提到的宝贝弹窗 -->
+			<uni-popup ref="associated" type="bottom">
+				<associated @close="close" @getProduct="getProduct" :checkedObj="productList"></associated>
+			</uni-popup>
+
+			<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse">
+			</authorize>
+
+
+		</view>
+</template>
+
+<script>
+	import mTabbar from '@/components/m-tabbar/m-tabbar.vue'
+
+	import {
+		mapGetters
+	} from "vuex";
+	import authorize from '@/components/Authorize';
+	import avatar from "@/components/yq-avatar/yq-avatar.vue";
+	import associated from '@/components/shoppinglist/shoppinglist.vue';
+
+	import {
+		TOKENNAME,
+		HTTP_REQUEST_URL
+	} from '@/config/app.js';
+	import {
+		createPlantApi,
+		updatePlantApi,
+		plantDetailApi,
+		orderAssociatePlantApi
+	} from "@/api/community";
+	import {
+		setStorage,
+		getStorage
+	} from '@/libs/uniApi.js';
+	import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue';
+	import {
+		configMap
+	} from '@/utils';
+	import {
+		getCommunitycreate,
+		getresaleDetail,
+		getresaleEdit
+	} from '@/api/trading-floor.js'
+
+	import {
+
+		getUserInfo
+	} from '@/api/user.js'
+	import store from '@/store';
+	export default {
+		components: {
+			avatar,
+			associated,
+			authorize,
+			easyLoadimage,
+			mTabbar,
+
+		},
+		data() {
+			return {
+				formData: {
+					image: [],
+					content: "",
+					topic_id: 0,
+					category_id: 0,
+					video_link: '',
+					is_type: 3,
+					resale_type: 1,
+					product_info: []
+				},
+				price: 0,
+				deliveryFreeList: [{
+						value: '1',
+						name: '到店核销'
+					},
+					{
+						value: '2',
+						name: '快递配送'
+					}
+				],
+				imageSrc: '',
+				productList: [],
+				topicName: {},
+				isUpload: true,
+				isAuto: false, //没有授权的不会自动授权
+				isShowAuth: false, //是否隐藏授权
+				showCd: false,
+				isshow: false,
+				id: "",
+				order_id: "",
+				imgName: "",
+				upload_max: 50,
+				uploadUrl: `${HTTP_REQUEST_URL}/api/upload/video`,
+				tabList: [{
+						name: '图文',
+						value: 1,
+						icon: 'icon-tuwen'
+					},
+					{
+						name: '视频',
+						value: 2,
+						icon: 'icon-shipin'
+					},
+				],
+				tabActive: 1,
+				isPlay: false,
+				videoContext: "",
+				video_link: "",
+				showVideo: false,
+				videoplay: false,
+				videoContext: '',
+				delivery_free: 1,
+				templateListPage: {
+					page: 1,
+					limit: 10000
+				},
+				merId: '',
+				delivery_way: [], // 配送方式 1 到店核销 2 快递配送
+				type: ''
+
+			};
+		},
+		computed: {
+			...mapGetters(['isLogin', 'viewColor', 'uid']),
+			...configMap({
+				community_app_switch: []
+			})
+		},
+		watch: {
+			// formData:{
+			// 	handler(n){
+			// 		if(!this.id){
+			// 			setTimeout(()=>{
+			// 				setStorage('addPlant', n);
+			// 			});
+			// 		}
+			// 	},
+			// 	deep: true
+			// }
+		},
+		mounted() {
+			// #ifndef APP-PLUS
+			this.videoContext = uni.createVideoContext('myVideo', this);
+			// #endif
+			this.getUserInfo()
+		},
+		onLoad(options) {
+			// uni.hideTabBar()
+			this.id = options.id;
+			this.type = options.gtype
+
+			this.tabActive = options.type || 1;
+			if (this.community_app_switch.length == 1) {
+				this.tabActive = this.community_app_switch[0]
+			}
+			if (!this.isLogin) {
+				this.isAuto = true;
+				this.isShowAuth = true
+			} else {
+
+
+			}
+			if (this.type) {
+				this.list()
+				uni.setNavigationBarTitle({
+					title: '编辑调货'
+				})
+			}
+			this.videoContext = uni.createVideoContext("myvideo", this);
+		},
+		onTabItemTap() {
+			this.$refs.associated.close();
+			this.formData.content = ''
+			this.formData.image = []
+			this.formData.topic_id = ''
+			this.formData.video_link = ''
+			this.productList = []
+			this.topicName = {}
+		},
+
+		methods: {
+			list() {
+				getresaleDetail(this.id).then(res => {
+					if (res.data.status = 200) {
+						this.formData = res.data
+						this.productList = res.data.resale
+						this.formData.product_info = []
+						for (let i in res.data.resale) {
+							this.price = Number(this.price) + (Number(res.data.resale[i].number) * Number(res.data
+								.resale[i].price))
+							this.delivery_way = res.data.resale[i].deliver_method.split('')
+						}
+
+						this.getProduct(res.data.resale)
+						if (res.data.video_link) {
+							this.tabActive = 2
+						}
+					}
+				})
+			},
+			getUserInfo: function() {
+				let that = this;
+				getUserInfo().then(res => {
+					this.merId = res.data.service.mer_id
+
+				})
+
+
+			},
+			// 是否包邮选择
+			deliveryFreeChange(val) {
+				if (val.detail.value) {
+					this.delivery_free = '1';
+				} else {
+					this.delivery_free = '0';
+				}
+			},
+			// 送货方式选择
+			deliveryWayChange(obj) {
+				this.delivery_way = obj.detail.value;
+				if (this.formData.product_info.length > 0) {
+					for (let i in this.formData.product_info) {
+						this.formData.product_info[i].deliver_method = obj.detail.value.toString();
+					}
+				} else {
+					this.$util.Tips({
+						title: '请选择产品,再选择送货方式'
+					});
+				}
+
+
+			},
+
+			onLoadFun() {
+				this.isShowAuth = false;
+			},
+			// 授权关闭
+			authColse: function(e) {
+				this.isShowAuth = e;
+			},
+
+			/*点击输入价格*/
+			addprice() {
+				this.isshow = true
+			},
+			/*切换tab*/
+			changeTab(item) {
+				if (this.tabActive == item.value) return
+				this.tabActive = item.value
+				this.productList = []
+				this.price = 0
+				this.formData = {
+					image: [],
+					content: "",
+					topic_id: 0,
+					category_id: 0,
+					video_link: '',
+					is_type: 3,
+					product_info: []
+				}
+			},
+
+			clk() {
+				let that = this
+				uni.chooseImage({
+					count: 1,
+					sizeType: ['original'],
+					success: (res) => {
+						// console.log(res)
+						let tempFilePaths = res.tempFilePaths[0]
+						//#ifdef APP-PLUS
+						if (uni.getSystemInfoSync().platform == 'ios') {
+							that.doUpload(tempFilePaths)
+						} else {
+							let size = res.tempFiles[0].size / 1024
+							if (size >= 1) {
+								uni.compressImage({
+									src: tempFilePaths,
+									quality: 80, // 仅对jpg有效
+									success: res => {
+										that.imageSrc = res.tempFilePath;
+										that.showCd = true;
+									},
+									fail: err => {
+										// console.log('失败了compressImage', tempFilePaths);
+										that.imageSrc = tempFilePaths
+										that.showCd = true
+									}
+								})
+							} else {
+								that.imageSrc = tempFilePaths
+								that.showCd = true
+							}
+						}
+						//#endif
+						//#ifndef APP-PLUS
+						that.imageSrc = tempFilePaths
+						that.showCd = true
+						//#endif
+					}
+				})
+			},
+			crop() {
+				uni.showLoading({
+					title: '',
+					mask: true
+				})
+				// 通过组件定义的ref调用cropper方法，返回一个promise对象
+				this.$refs.cropper.crop().then(([err, res]) => {
+					if (!err) {
+						uni.hideLoading()
+						this.doUpload(res.tempFilePath)
+					} else {
+						uni.hideLoading()
+						// console.log(err)
+					}
+				})
+			},
+			loadImage() {
+				this.showCd = false
+			},
+			doUpload(rsp) {
+				let that = this
+				uni.showLoading({
+					title: '上传中',
+					mask: true
+				})
+				uni.uploadFile({
+					url: HTTP_REQUEST_URL + '/api/upload/image/field',
+					filePath: rsp,
+					name: 'field',
+					formData: {
+						'filename': rsp,
+						'name': that.imgName
+					},
+					header: {
+						// #ifdef MP
+						"Content-Type": "multipart/form-data",
+						// #endif
+						[TOKENNAME]: 'Bearer ' + store.state.app.token
+					},
+					success: (uploadFileRes) => {
+						let imgData = JSON.parse(uploadFileRes.data)
+						if (imgData.data.path) {
+							that.formData.image.push(imgData.data.path)
+							uni.hideLoading()
+						}
+					},
+					complete(res) {
+						let data = JSON.parse(res.data)
+						// that.$util.Tips({
+						// 	title: data.message
+						// });
+					}
+				});
+			},
+			// 上传视频
+			uploadVideo() {
+				let that = this
+				uni.chooseVideo({
+					sourceType: ['camera', 'album'],
+					success: res => {
+						if (Math.ceil(res.size / 1024) < that.upload_max * 1024) {
+							uni.uploadFile({
+								url: that.uploadUrl, //仅为示例，非真实的接口地址
+								filePath: res.tempFilePath,
+								name: 'file',
+								//请求参数
+								formData: {
+									user: 'test'
+								},
+								header: {
+									// #ifdef MP
+									'Content-Type': 'multipart/form-data',
+									// #endif
+									[TOKENNAME]: 'Bearer ' + store.state.app.token
+								},
+								success: uploadFileRes => {
+									let data = JSON.parse(uploadFileRes.data);
+									that.formData.video_link = (data.data.src);
+								},
+								complete: a => {
+
+								}
+							});
+						} else {
+							uni.showModal({
+								title: '提示',
+								content: `视频超出限制${that.upload_max}MB,已过滤`
+							});
+						}
+					},
+					fail: err => {
+						that.$util.Tips({
+							title: err
+						});
+					}
+				});
+			},
+			getImgName(name) {
+				this.imgName = name
+			},
+			/**删除图片*/
+			DelPic: function(index) {
+				let that = this
+				that.formData.image.splice(index, 1);
+			},
+			/*删除视频*/
+			delVideo() {
+				this.formData.video_link = '';
+			},
+			/*添加宝贝*/
+			addProduct() {
+
+				this.$refs.associated.open();
+			},
+
+			close() {
+				this.$refs.associated.close();
+
+			},
+			/*查看视频*/
+			videoshow() {
+				this.showVideo = true
+				this.videoContext = uni.createVideoContext('myVideo', this);
+				this.$nextTick(() => {
+					this.videoContext.play();
+				})
+				// this.video_link = this.formData.video_link;
+				// this.videoContext.requestFullScreen({ direction: 90 });
+				// this.videoContext.play(); this.videoplay = true; 
+			},
+			screenChange(e) {
+				let fullScreen = e.detail.fullScreen; //值true为进入全屏，false为退出全屏 
+				// console.log(e, "qweeee========================================");
+				if (!fullScreen) {
+					this.videoplay = false
+					//退出全屏 this.videoplay = false; // 隐藏播放盒子 
+				}
+			},
+			/*获取选中的宝贝*/
+			getProduct(data) {
+				if (this.type == 'edit') {
+					this.formData.product_info = []
+				}
+
+				this.productList = []
+				this.price = 0;
+				console.log(data)
+				if (data.length > 0) {
+					this.productList = data;
+					for (let i in data) {
+						this.price = Number(this.price) + (Number(data[i].number) * Number(data[i].price))
+						this.formData.product_info.push({
+							product_attr_unique: data[i].product_attr_unique,
+							number: Number(data[i].number),
+							price: data[i].price
+						})
+					}
+				} else {
+					this.price = 0
+				}
+
+
+
+
+				this.$refs.associated.close();
+			},
+
+			/**
+			 * 提交数据
+			 */
+			formSubmit: function(e) {
+
+
+				let that = this,
+
+					value = that.formData;
+				if (value.image.length == 0) return that.$util.Tips({
+					title: '请添加图文图片'
+				});
+				if (value.product_info.length == 0) return that.$util.Tips({
+					title: '请选择产品'
+				});
+				if (!value.content) return that.$util.Tips({
+					title: '请添加商品描述'
+				});
+				// console.log( this.delivery_way.length>0 )
+				if (!value.product_info[0].deliver_method && this.delivery_way.length == 0) return that.$util.Tips({
+					title: '请选择配送方式'
+				});
+
+				if (that.tabActive == 2 && !value.video_link) {
+					return that.$util.Tips({
+						title: '请添加话题视频'
+					});
+				}
+				uni.showLoading({
+					title: '保存中',
+					mask: true
+				})
+
+
+				that.type == 'edit' ? getresaleEdit(that.id, value).then(res => {
+					if (res.status == '200') {
+						uni.hideLoading()
+						that.$util.Tips({
+							title: '编辑成功',
+							icon: 'success'
+						});
+						that.formData = {
+							image: [],
+							content: "",
+							topic_id: 0,
+							category_id: 0,
+							video_link: '',
+							is_type: 3,
+							product_info: []
+						}
+						uni.redirectTo({
+							url: '/pages/releaseManagement/index?key=' + 2
+						})
+
+					} else {
+						that.$util.Tips({
+							title: res.messge,
+							icon: 'success'
+						});
+					}
+				}).catch(err => {
+
+					return that.$util.Tips({
+						title: err
+					});
+				}) : getCommunitycreate(value).then(res => {
+					if (res.status == '200') {
+						uni.hideLoading()
+						that.$util.Tips({
+							title: '发布成功',
+							icon: 'success'
+						});
+						that.formData = {
+							image: [],
+							content: "",
+							topic_id: 0,
+							category_id: 0,
+							video_link: '',
+							is_type: 3,
+							product_info: []
+						}
+						uni.redirectTo({
+							url: '/pages/releaseManagement/index?key=' + 2
+						})
+
+					} else {
+						that.$util.Tips({
+							title: res.messge,
+							icon: 'success'
+						});
+					}
+				}).catch(err => {
+
+					return that.$util.Tips({
+						title: err
+					});
+				})
+
+
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page {
+		background: #F5F5F5;
+	}
+
+	.crop_btn {
+		line-height: 90rpx;
+		height: 90rpx;
+		height: calc(90rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
+		height: calc(200rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
+	}
+
+	.container {
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 20;
+		width: 750rpx;
+		height: 100vh;
+	}
+
+	.release_content {
+		margin-top: 30rpx;
+
+		.release_tab {
+			border-radius: 16rpx 16rpx 0 0;
+			border-bottom: 1rpx solid #E4E4E4;
+			background: #fff;
+			align-items: center;
+			justify-content: center;
+			height: 86rpx;
+
+			.tab_item {
+				margin: 0 40rpx;
+				font-size: 32rpx;
+				color: #999;
+				position: relative;
+				line-height: 86rpx;
+				cursor: pointer;
+
+				&.on {
+					color: #E93323;
+
+					&::after {
+						content: "";
+						display: inline-block;
+						width: 100%;
+						height: 3rpx;
+						background: #E93323;
+						position: absolute;
+						bottom: 2rpx;
+						left: 0;
+					}
+				}
+
+				.iconfont {
+					margin-right: 10rpx;
+					font-size: 32rpx;
+				}
+			}
+		}
+
+		padding: 0 20rpx;
+
+		.release_item {
+			background: #ffffff;
+			padding: 0 30rpx;
+			border-radius: 10rpx;
+
+		}
+
+		.photo_count {
+			padding: 30rpx 0;
+		}
+	}
+
+	/deep/.input_photo .easy-loadimage,
+	/deep/.input_photo uni-image,
+	/deep/.input_photo image {
+		width: 180rpx;
+		height: 180rpx;
+		border-radius: 12rpx !important;
+	}
+
+	.input_photo .pictrue {
+		width: 180rpx;
+		height: 180rpx;
+		border-radius: 12rpx !important;
+		margin-right: 11rpx;
+		position: relative;
+		overflow: hidden;
+
+		&:nth-child(3n) {
+			margin-right: 0;
+		}
+
+		.close_btn {
+			width: 30rpx;
+			height: 30rpx;
+			background: rgba(0, 0, 0, .6);
+			border-radius: 0 12rpx 0 12rpx;
+			position: absolute;
+			top: 0;
+			right: 0;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			z-index: 999;
+
+			.iconfont {
+				color: #ffffff;
+				font-size: 12rpx;
+			}
+		}
+
+		.cover_text {
+			display: flex;
+			width: 58rpx;
+			height: 29rpx;
+			background: #E93323;
+			border-radius: 0px 12rpx 0px 12rpx;
+			position: absolute;
+			left: 0;
+			bottom: 0;
+			z-index: 10;
+			align-items: center;
+			justify-content: center;
+			font-size: 18rpx;
+			color: #fff;
+		}
+	}
+
+	/deep/.loading-img {
+		width: 180rpx;
+		height: 180rpx;
+		border-radius: 12rpx;
+	}
+
+	.input_photo .pictrue {
+		margin-bottom: 20rpx;
+
+		.videoHover {
+			width: 180rpx;
+			height: 180rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			position: absolute;
+			top: 0;
+			left: 0;
+			z-index: 10;
+
+			>view {
+				width: 50rpx;
+				height: 50rpx;
+				background: #000000;
+				border-radius: 50rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+
+				.iconfont {
+					color: #ffffff;
+					font-size: 21rpx;
+				}
+			}
+		}
+
+		.video-text {
+			display: block;
+			width: 180rpx;
+			text-align: center;
+			color: #ffffff;
+			font-size: 18rpx;
+			z-index: 13;
+			position: absolute;
+			bottom: 20rpx;
+		}
+
+		video {
+			width: 180rpx;
+			height: 180rpx;
+			border-radius: 12rpx;
+		}
+	}
+
+	.input_photo .add {
+		background: #f6f6f6;
+		color: #666666;
+
+		.iconfont {
+			font-size: 50rpx;
+		}
+
+		.text {
+			margin-top: 20rpx;
+			font-size: 27rpx;
+		}
+	}
+
+	.textarea textarea {
+		font-size: 28rpx;
+		padding-bottom: 38rpx;
+		width: 100%;
+		box-sizing: border-box;
+		height: 400rpx;
+		overflow: hidden;
+	}
+
+	.textarea .placeholder {
+		color: #BBBBBB;
+	}
+
+	.release_item .item {
+		height: 106rpx;
+		border-bottom: 1rpx solid #eee;
+		position: relative;
+		font-size: 30rpx;
+
+		&:last-child {
+			border-bottom: none;
+		}
+
+		.name {
+			color: #333333;
+
+			.iconfont {
+				margin-right: 10rpx;
+				font-size: 28rpx;
+			}
+		}
+
+		.select {
+			color: #bbbbbb;
+
+			.select_count {
+				display: flex;
+				align-items: center;
+			}
+
+			.text {
+				margin-right: 15rpx;
+				display: flex;
+				align-items: center;
+
+				.image,
+				image,
+				uni-image {
+					width: 60rpx;
+					height: 60rpx;
+					margin-right: 5rpx;
+				}
+			}
+
+			.text1 {
+				width: 308rpx;
+				height: 70rpx;
+				line-height: 70rpx;
+				background: #FFFFFF;
+				border-radius: 7px 7px 7px 7px;
+				text-align: center;
+				opacity: 1;
+				border: 2rpx solid #999999;
+				font-size: 28rpx;
+				font-family: PingFang SC-Regular, PingFang SC;
+				font-weight: 400;
+				color: #CCCCCC;
+			}
+
+			.iconfont {
+				font-size: 24rpx;
+			}
+
+			.text_name {
+				color: var(--view-theme);
+				padding: 5rpx 12rpx;
+				background: var(--view-minorColor);
+				border-radius: 23rpx;
+				font-size: 24rpx;
+				margin-right: 10rpx;
+
+				.icon {
+					color: var(--view-theme);
+					font-weight: bold;
+					font-size: 24rpx;
+				}
+
+				.title {
+					margin: 0 10rpx;
+				}
+
+				.iconfont {
+					font-size: 16rpx;
+				}
+			}
+		}
+	}
+
+	.button {
+		width: 710rpx;
+		height: 86rpx;
+		line-height: 86rpx;
+		color: #ffffff;
+		text-align: center;
+		font-size: 32rpx;
+		background: var(--view-theme);
+		border-radius: 43rpx;
+	}
+
+	.release_btn {
+		margin-top: 100rpx;
+	}
+
+	.video-count {
+		position: fixed;
+		width: 600rpx;
+		height: 500rpx;
+		top: 50%;
+		left: 50%;
+		margin-left: -300rpx;
+		margin-top: -250rpx;
+		z-index: 100;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+
+		.videoLink {
+			width: 600rpx;
+			height: 500rpx;
+		}
+	}
+
+	.popup_group {
+		background: #fff;
+		margin: 31rpx auto;
+		width: 710rpx;
+		font-size: 30rpx;
+		border-radius: 10rpx;
+
+		.popup_group_item {
+			padding: 32rpx 30rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+
+			.popup_group_item_value {
+				display: flex;
+				align-items: center;
+
+				.popup_group_item_message {
+					margin-right: 15rpx;
+					color: #bbbbbb;
+					max-width: 400rpx;
+
+					&_value {
+						display: inline-block;
+						max-width: 400rpx;
+						color: #000;
+					}
+				}
+
+				.iconfont {
+					color: #bbbbbb;
+				}
+
+				input {
+					text-align: right;
+				}
+			}
+		}
+
+		>view:not(:last-child) {
+			border-bottom: 1px solid #eeeeee;
+		}
+	}
+
+	.radio {
+		padding: 30rpx;
+
+		&_label {
+			padding-left: 10rpx;
+			color: #333333;
+			font-size: 30rpx;
+			display: flex;
+			align-items: center;
+
+			.select_check {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 40rpx;
+				height: 40rpx;
+				border: 1px solid #cccccc;
+				border-radius: 50%;
+				margin-right: 20rpx;
+
+				.iconfont {
+					font-size: 24rpx;
+				}
+			}
+
+			.select {
+				background: #e93323;
+				border: none;
+
+				.iconfont {
+					color: #fff;
+				}
+			}
+		}
+
+		.select_group {
+			display: flex;
+		}
+
+		.flex_start {
+			padding: 0 10rpx;
+			margin-top: 40rpx;
+			justify-content: flex-start;
+		}
+
+		&_select {
+			display: flex;
+			margin-right: 110rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/users/online_warehousing/index.vue b/pages/users/online_warehousing/index.vue
new file mode 100644
index 0000000..b6a02bc
--- /dev/null
+++ b/pages/users/online_warehousing/index.vue
@@ -0,0 +1,461 @@
+<template>
+	<view class="center">
+		<view class="top">
+			<view class="top-header">
+				<view class="search">
+					<view class="search-content acea-row row-middle">
+						<text class="iconfont icon-sousuo"></text>
+						<input v-model="where.store_name" confirm-type="search" placeholder="请输收货人手机号或订单号搜索"
+							class="input" @confirm="handleSearch" />
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="bgc_img" v-if="this.shopList == ![]">
+			<image src="@/static/images/empty-box.png" mode="widthFix"></image>
+			<view class="txt">
+				暂无商品订单~
+			</view>
+		</view>
+		<view class='list' v-else>
+			<block>
+				<view class='item' v-for="(item,index) in shopList" :key="index">
+					<view>
+						<view class='title acea-row row-between-wrapper'>
+							<view class="acea-row row-middle left-wrapper">
+								{{item.merchant.mer_name}}
+							</view>
+						</view>
+						<view>
+							<view>
+								<block>
+									<view class="_order">
+										订单号: {{item.order_sn}}
+									</view>
+									<view class='item-info acea-row row-between row-top'
+										v-for="(items,indexs) in item.orderProduct" :key="indexs">
+										<view class='pictrue'>
+											<image :src="items.cart_info.product.image">
+											</image>
+										</view>
+										<view class='text'>
+											<view class='_left'>
+												{{items.cart_info.product.store_name}}
+												<view class="">
+													{{items.cart_info.productAttr.sku}}
+												</view>
+											</view>
+											<view class="_right">
+												<view class='name'>￥{{items.cart_info.productAttr.price}}</view>
+												<view class='name'>x {{items.product_num}}</view>
+											</view>
+											<!-- <view class="totalfooter">
+                        <view class='bnt b-color' v-if="items.is_imported == 0 && item.orderProduct.length > 1"
+                          @click="importshop(items.order_id,items.product_id,items.product_sku)">
+                          立即导入</view>
+                      </view> -->
+										</view>
+										<view class="totalfooter">
+											<view class='bnt b-color' v-if="!item.orderProduct[indexs]"
+												@click="importshop(item.order_id,item.orderProduct[indexs].product_id,item.orderProduct[indexs].product_sku)">
+												立即导入</view>
+										</view>
+									</view>
+								</block>
+							</view>
+						</view>
+						<view class='totalPrice'>
+							共{{item.orderProduct.length}}件商品，总金额
+							<text class='money'>￥{{item.pay_price}}</text>
+						</view>
+						<!-- <view class="totalfooter">
+              <view class='bnt b-color' v-if="item.orderProduct[index]"
+                @click="importshop(item.order_id,item.orderProduct[index].product_id,item.orderProduct[index].cart_info.productAttr.product_sku)">
+                立即导入</view>
+            </view> -->
+					</view>
+				</view>
+			</block>
+		</view>
+		<u-popup :show="show" @close="close" mode="center" bgColor='transparent'>
+			<image src="@/static/images/xianshang.png" mode="widthFix"></image>
+			<view class="popen">
+				<h4>{{title}}</h4>
+				<view class="shuru">
+					点击确定，返回商品管理
+				</view>
+				<view class="btn">
+					<button class="btn_l" @click="closeasd()">取消</button>
+					<button class="btn_r" @click="getback()">确定</button>
+				</view>
+			</view>
+		</u-popup>
+		<!-- <Loading :loaded="loaded" :loading="loading"></Loading> -->
+	</view>
+</template>
+
+<script>
+	import {
+		getPreviewProDetail,
+	} from '@/api/store.js'
+	import {
+		postImport
+	} from '@/api/product.js'
+	import {
+		getOrderList
+	} from '@/api/order.js'
+	import Loading from '@/components/Loading/index'
+	export default {
+		data() {
+			return {
+				shopList: [],
+				shopinfo: {},
+				mer_id: '',
+				keyword: '',
+				where: {
+					page: 1,
+					limit: 10,
+					status: 20,
+					product_type: 98,
+					store_name: '',
+				},
+				data: {
+					product_id: '',
+					unique: "",
+					order_id: '',
+					order_product_id: '',
+					order_unique: ''
+				},
+				show: false,
+				title: '',
+				loaded: false,
+			}
+		},
+		onLoad(option) {
+			// console.log(option);
+			this.mer_id = option.mer_id
+			this.getList();
+			this.data.product_id = option.product_id
+			this.data.unique = option.unique
+		},
+		methods: {
+			handleSearch() {
+				let that = this
+				that.loaded = false;
+				that.where.page = 1;
+				that.shopList = [];
+				getOrderList(that.where, that.mer_id).then(res => {
+					console.log(res);
+					that.shopList = res.data.list
+					console.log(that.shopList);
+				})
+			},
+			getList: function() {
+				if (this.loading || this.loaded) return;
+				this.loading = true;
+				getOrderList(this.where, this.mer_id).then(res => {
+					console.log(res);
+					this.shopList = res.data.list
+					console.log(this.shopList);
+				})
+			},
+			importshop(order_id, product_id, unique) {
+				this.data.order_id = order_id
+				this.data.order_product_id = product_id
+				this.data.order_unique = unique
+				console.log(this.data)
+				this.show = true
+				postImport(this.mer_id, this.data).then(res => {
+					console.log(res);
+					this.title = res.message
+					this.$util.Tips({
+						title: res.message
+					})
+				})
+			},
+			close() {
+				this.show = false
+
+			},
+			closeasd: function() {
+				this.show = false
+				getOrderList(this.where, this.mer_id).then(res => {
+					console.log(res);
+					this.shopList = res.data.list
+					console.log(this.shopList);
+				})
+			},
+			getback() {
+				uni.navigateBack({
+					delta: 1
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.top {
+		background-color: red;
+
+		.top-header {
+			position: fixed;
+			top: 0;
+			left: 0;
+			z-index: 9999;
+			width: 100%;
+			background-color: #fff;
+
+			.search {
+				padding: 17rpx 30rpx;
+
+				.search-content {
+					width: 100%;
+					height: 60rpx;
+					padding: 0 30rpx;
+					border-radius: 30rpx;
+					background-color: #F5F5F5;
+					font-size: 26rpx;
+				}
+
+				.iconfont {
+					margin-right: 10rpx;
+					font-size: 26rpx;
+					color: #999999;
+				}
+
+				.input-placeholder {
+					font-size: 26rpx;
+					color: #999999;
+				}
+
+				.input {
+					flex: 1;
+				}
+			}
+		}
+	}
+
+	.bgc_img {
+		position: absolute;
+		top: 30vh;
+		left: 10vw;
+
+		image {
+			width: 300px;
+		}
+
+		.txt {
+			text-align: center;
+		}
+	}
+
+	.list {
+		width: 690rpx;
+		margin: 50px auto 0 auto;
+
+		.title {
+			height: 84rpx;
+			padding: 0 30rpx;
+			border-bottom: 1px solid #CCCCCC;
+			font-size: 32rpx;
+			font-weight: 700;
+			color: #282828;
+
+			.left-wrapper {
+				.iconfont {
+					margin-top: 5rpx;
+				}
+
+				.store-name {
+					margin: 0 10rpx;
+				}
+
+				.icon-xiangyou {
+					font-size: 20rpx;
+				}
+			}
+
+			.sign {
+				font-size: 24rpx;
+				padding: 0 7rpx;
+				height: 36rpx;
+				margin-right: 15rpx;
+			}
+		}
+
+		.item {
+			background-color: #fff;
+			margin: 5px 0 5px 0;
+
+			.item-info {
+				padding: 0 30rpx;
+				margin-top: 22rpx;
+
+				.pictrue {
+					width: 120rpx;
+					height: 120rpx;
+margin-bottom: 20rpx;
+					image {
+						width: 100%;
+						height: 100%;
+						border-radius: 6rpx;
+					}
+				}
+
+				.text {
+					width: 486rpx;
+					font-size: 28rpx;
+					color: #999;
+					margin-top: 6rpx;
+					display: flex;
+					justify-content: space-between;
+
+					._left {
+						width: 300rpx;
+						color: #282828;
+						white-space: nowrap;
+						overflow: hidden;
+						text-overflow: ellipsis;
+					}
+
+					.name {
+						width: 100rpx;
+						color: #282828;
+
+					}
+
+					.money {
+						text-align: right;
+						float: right;
+
+					}
+				}
+
+			}
+
+			.event_name {
+				display: inline-block;
+				margin-right: 9rpx;
+				color: #fff;
+				font-size: 20rpx;
+				padding: 0 8rpx;
+				line-height: 30rpx;
+				text-align: center;
+				border-radius: 6rpx;
+			}
+
+			.event_ship {
+				font-size: 20rpx;
+				margin-top: 10rpx;
+			}
+
+			._order {
+				font-size: 28rpx;
+				margin: 5px 0 0 15px;
+			}
+
+			.totalPrice {
+				font-size: 26rpx;
+				color: #282828;
+				text-align: right;
+				margin: 27rpx 0 0 30rpx;
+				padding: 0 30rpx 30rpx 0;
+
+
+				.money {
+					font-size: 34rpx;
+					font-weight: bold;
+					color: rgb(233, 51, 35);
+				}
+
+			}
+
+			.totalfooter {
+				width: 100%;
+				height: 50px;
+				position: relative;
+				border-top: 1px solid #CCCCCC;
+
+				.bnt {
+					position: absolute;
+					right: 10px;
+					width: 176rpx;
+					height: 60rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					border-radius: 50rpx;
+					font-size: 27rpx;
+					background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
+					color: white;
+					margin-left: 70%;
+					margin-top: 5px;
+
+				}
+			}
+
+			.bottom {
+				height: 107rpx;
+				padding: 0 30rpx;
+				border-top: 1px solid #f0f0f0;
+
+
+			}
+		}
+
+		.event_price {
+			margin: 0 0 50rpx 120rpx;
+		}
+	}
+
+	.popen {
+		position: absolute;
+		top: 110px;
+		width: 100%;
+		margin: auto;
+		padding: 10px;
+
+		h4 {
+			font-weight: 400;
+			font-size: 20px;
+			padding: 5px;
+			text-align: center;
+		}
+
+		.guige {
+			margin: 10px 0 10px 20px;
+		}
+
+		.shuru {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			font-size: 18px;
+			padding: 5px;
+
+		}
+
+		.btn {
+			display: flex;
+			justify-content: flex-start;
+			align-items: center;
+			margin: 10px;
+
+			.btn_l {
+				padding: 5px;
+				width: 100px;
+				border-radius: 4px;
+			}
+
+			.btn_r {
+				width: 100px;
+				padding: 5px;
+				border-radius: 4px;
+				background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
+				border-radius: 27px 27px 27px 27px;
+				color: white;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/users/order_list/indexCopy.vue b/pages/users/order_list/indexCopy.vue
new file mode 100644
index 0000000..677cdfa
--- /dev/null
+++ b/pages/users/order_list/indexCopy.vue
@@ -0,0 +1,1132 @@
+	<template>
+		<view :style="viewColor">
+
+			<view class='my-order'>
+				<view class='header'>
+
+					<view class='picTxt acea-row row-between-wrapper'>
+						<view class='text'>
+							<view class='name'>采购订单信息</view>
+							<view>消费订单：{{orderData.orderCount || 0}} 总消费：￥{{orderData.orderPrice || 0}}</view>
+						</view>
+						<view class='pictrue'>
+							<image :src="`${domain}/static/images/orderTime.png`"></image>
+						</view>
+					</view>
+				</view>
+				<navigator class="search acea-row row-middle" url="/pages/users/order_list/search" hover-class="none">
+					<text class="iconfont icon-sousuo"></text>
+					搜索我的订单
+				</navigator>
+				<view class='nav acea-row row-around'>
+					<view class='item' :class='orderStatus==-1 ? "on": ""' @click="statusClick(-1)">
+						<view>全部</view>
+						<view class='num'>{{orderData.orderCount || 0}}</view>
+					</view>
+					<view class='item' :class='orderStatus==1? "on": ""' @click="statusClick(1)">
+						<view>待付款</view>
+						<view class='num'>{{orderData.noPay || 0}}</view>
+					</view>
+					<view class='item' :class='orderStatus==2 ? "on": ""' @click="statusClick(2)">
+						<view>待发货</view>
+						<view class='num'>{{orderData.noPostage || 0}}</view>
+					</view>
+					<view class='item' :class='orderStatus==3? "on": ""' @click="statusClick(3)">
+						<view>待收货</view>
+						<view class='num '>{{orderData.noDeliver || 0}}</view>
+					</view>
+					<view class='item' :class='orderStatus==4 ? "on": ""' @click="statusClick(4)">
+						<view>待评价</view>
+						<view class='num'>{{orderData.noComment || 0}}</view>
+					</view>
+				</view>
+				<!--定金预售订单-->
+				<view v-if="presellProList.length > 0" class="event_container">
+					<navigator class="acea-row row-between" url="/pages/users/presell_order_list/index" hover-class='none'>
+						<view class="info">
+							<view class="title">预售尾款订单转到这里了！</view>
+							<view class="desc">有 <text class="t-color">{{ presellOrderCount }}</text> 笔预售尾款订单待付款，请点击查看
+							</view>
+						</view>
+						<view class="photo acea-row row-between">
+							<view class='picture'>
+								<image
+									:src='(presellProList[0].orderProduct[0].cart_info.productAttr && presellProList[0].orderProduct[0].cart_info.productAttr.image) || presellProList[0].orderProduct[0].cart_info.product.image'>
+								</image>
+							</view>
+							<view class="more_btn"><text class="iconfont icon-gengduo3"></text></view>
+						</view>
+					</navigator>
+				</view>
+				<view class='list'>
+					<!-- 代付款 -->
+					<view v-if="orderList.length > 0">
+						<block v-if="orderStatus == 0">
+							<view class='item' v-for="(item,index) in orderList" :key="index">
+								<view @click='goOrderDetails(item.group_order_id)'>
+									<view class='title acea-row row-between-wrapper'>
+										<view class="acea-row row-middle left-wrapper">
+											{{item.group_order_sn}}
+										</view>
+										<view class='t-color'>
+											{{ item.orderList[0].activity_type === 2 && item.orderList[0].orderProduct[0].cart_info.productPresell.presell_type ==2 ? "待付定金" : "待付款" }}
+										</view>
+									</view>
+									<view v-for="(order,j) in item.orderList" :key="order.order_id+j">
+										<!--预售-->
+										<view v-if="order.activity_type === 2">
+											<block v-for="(goods,g) in order.orderProduct">
+												<view class='item-info acea-row row-between row-top'>
+													<view class='pictrue'>
+														<image
+															:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
+														</image>
+													</view>
+													<view class='text acea-row row-between'>
+														<view class='name line1'>
+															<text
+																class="event_name event_bg">预售</text><text>{{goods.cart_info.product.store_name}}</text>
+															<view class="event_ship event_color">发货时间：
+																<!--全款预售-->
+																<text
+																	v-if="goods.cart_info.productPresell.presell_type === 1">
+																	{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内
+																</text>
+																<!--定金预售-->
+																<text
+																	v-if="goods.cart_info.productPresell.presell_type === 2">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
+															</view>
+														</view>
+														<view class='money'>
+															<view>￥{{goods.cart_info.productPresellAttr.presell_price}}
+															</view>
+															<view>x{{goods.product_num}}</view>
+														</view>
+													</view>
+													<view v-if="goods.cart_info.productPresell.presell_type === 2"
+														class="event_price">
+														定金待支付 <text class="t-color">￥{{ order.pay_price }}</text>
+														尾款待支付 <text
+															class="t-color">￥{{ order.presellOrder.pay_price }}</text>
+													</view>
+												</view>
+											</block>
+										</view>
+										<view v-else>
+											<block v-for="(goods,g) in order.orderProduct">
+												<view class='item-info acea-row row-between row-top'>
+													<view class='pictrue'>
+														<image
+															:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
+														</image>
+													</view>
+													<view class='text acea-row row-between'>
+
+														<view class='name line2'>{{goods.cart_info.product.store_name}}
+														</view>
+
+														<view class='money' v-if="item.orderList[0].activity_type == 4">
+															<view v-if="goods.cart_info.activeSku">
+																￥{{goods.cart_info.activeSku.active_price}}</view>
+															<view>x{{goods.product_num}}</view>
+														</view>
+														<view v-else class='money'>
+															<view>￥{{goods.cart_info.productAttr.price}}</view>
+															<view>x{{goods.product_num}}</view>
+														</view>
+													</view>
+												</view>
+											</block>
+										</view>
+									</view>
+									<view class='totalPrice' v-if="item.orderList[0].activity_type !== 2">
+										共{{item.total_num || 0}}件商品，总金额
+										<text class='money p-color'>￥{{item.pay_price}}</text>
+									</view>
+									<view class='bottom acea-row row-right row-middle'>
+										<view class='bnt b-color' @click.stop='goPay(item.pay_price,item.group_order_id)'>
+											立即付款</view>
+									</view>
+								</view>
+							</view>
+						</block>
+						<!-- 待发货 待收货 待评价 已完成 -->
+						<block v-else>
+							<view class='item' v-for="(item,index) in orderList" :key="index">
+								<view @click='goOrderDetails(item.order_id)'>
+									<view class='title acea-row row-between-wrapper'>
+										<view class="acea-row row-middle left-wrapper" @click.stop="goMall(item)">
+											<text class="iconfont icon-shangjiadingdan"></text>
+											<view class="store-name">{{item.merchant.mer_name}}</view>
+											<text class="iconfont icon-xiangyou"></text>
+										</view>
+										<view v-if="item.order_status ==7" class='t-color'>
+											<text
+												v-if="item.order_type==1">{{item.takeOrderCount > 0 ? '部分核销' : '待核销'}}</text>
+											<!-- <text v-else>待发货</text> -->
+										</view>
+									
+										<view v-if="item.order_status == 2 && item.pay_type !=3" class='t-color'>待发货</view>
+										<view v-if="item.order_status == 1 && item.pay_type==3" class='t-color'>待付款</view>
+										<view v-if="item.order_status == 3" class='t-color'>待收货</view>
+										<view v-if="item.order_status == 4 && item.pay_type !== 8" class='t-color'>待评价
+										</view>
+										<view v-if="item.order_status == 5" class='t-color'>已完成</view>
+										<view v-if="item.order_status == 6" class='t-color'>已退款</view>
+										<view v-if="item.order_status == 8 && item.pay_type == 8" class='t-color'>待结算
+										</view>
+									</view>
+									<view v-if="item.activity_type === 2">
+										<view class='item-info acea-row row-between row-top'
+											v-for="(goods,index) in item.orderProduct" :key="index">
+											<view class='pictrue'>
+												<image
+													:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
+												</image>
+											</view>
+											<view class='text acea-row row-between'>
+												<view class='name '>
+													<view class='name' :class="item.status === 0 ? 'line1' : 'line2'">
+														<text
+															class="event_name event_bg">预售</text><text>{{goods.cart_info.product.store_name}}</text>
+														<view v-if="item.status == 0" class="event_ship event_color">发货时间：
+															<!--全款预售-->
+															<text
+																v-if="goods.cart_info.productPresell.presell_type === 1">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
+															<!--定金预售-->
+															<text
+																v-if="goods.cart_info.productPresell.presell_type === 2">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
+														</view>
+													</view>
+													<view style="margin-top: 10rpx;" class="t-color">
+														{{goods.is_refund==1?'退款中':goods.is_refund==2?'部分退款':goods.is_refund==3?'全部退款':''}}
+													</view>
+												</view>
+												<view class='money'>
+													<view>￥{{goods.cart_info.productPresellAttr.presell_price}}</view>
+													<view>x{{goods.product_num}}</view>
+												</view>
+											</view>
+										</view>
+									</view>
+									<view v-else>
+										<view class='item-info acea-row row-between row-top'
+											v-for="(goods,index) in item.orderProduct" :key="index">
+											<view class='pictrue'>
+												<image
+													:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
+												</image>
+											</view>
+											<view class='text acea-row row-between'>
+												<view class='name '>
+													<view class='name line2'>
+														<text>{{goods.cart_info.product.store_name}}</text>
+													</view>
+													<view style="margin-top: 10rpx;" class="t-color">
+														{{goods.is_refund==1?'退款中':goods.is_refund==2?'部分退款':goods.is_refund==3?'全部退款':''}}
+													</view>
+												</view>
+												<view class='money' v-if="item.activity_type == 3">
+													<view v-if="goods.cart_info.productAssistAttr">
+														￥{{goods.cart_info.productAssistAttr.assist_price}}</view>
+													<view>x{{goods.product_num}}</view>
+												</view>
+												<view class='money' v-else-if="item.activity_type == 4">
+													<view v-if="goods.cart_info.activeSku">
+														￥{{goods.cart_info.activeSku.active_price}}</view>
+													<view>x{{goods.product_num}}</view>
+												</view>
+												<view class='money' v-else>
+													<view>￥{{goods.cart_info.productAttr.price}}</view>
+													<view>x{{goods.product_num}}</view>
+												</view>
+											</view>
+										</view>
+									</view>
+									<view class='totalPrice' v-if="item.activity_type == 2">共{{item.orderNum || 0}}件商品，总金额
+										<text class='money p-color'>￥{{item.presell_price}}</text>
+									</view>
+									<view class='totalPrice' v-else>共{{item.orderNum || 0}}件商品，总金额
+										<text class='money p-color'>￥{{item.pay_price}}</text>
+									</view>
+								</view>
+								<view class='bottom acea-row row-right row-middle'>
+									<!-- <view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
+										@click.stop='applyInvoice(item.order_id)'>申请开票</view> -->
+									<block v-if="item.status == 0 || item.status == 9 || item.status == -1">
+										<view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view>
+									</block>
+									<block v-if="item.status == 1">
+										<view class='bnt cancelBnt'
+											v-if="item.delivery_type == 1 || item.delivery_type == 2"
+											@click='goOrderDetails(item.order_id)'>查看物流</view>
+											<view class='bnt b-color'  @tap='confirmOrder(item,index)'v-if='item.activity_type=98'>
+												确认收货
+											</view>
+										<view class='bnt b-color' v-else  @tap='confirmOrder(item,index)'>取件码</view>
+									</block>
+									<block v-if="item.status == 2">
+										<!-- 	<navigator v-if="community_status == 1 && !item.community_id" :url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id" class='bnt colorBnt' hover-class="none">
+										<text class="iconfont icon-fabu"></text>
+										发布种草
+									</navigator> -->
+										<view class='bnt b-color' @click='goOrderDetails_Evaluation(item.order_id)'>去评价
+										</view>
+									</block>
+									<block v-if="item.status == 3">
+										<view class='bnt b-color' @click='goOrderDetails(item.order_id)'
+											v-if="item.activity_type == 2 || item.activity_type == 3 || item.activity_type == 10">
+											查看详情</view>
+										<!-- <navigator v-if="community_status == 1 && !item.community_id" :url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id" class='bnt colorBnt' hover-class="none">
+										<text class="iconfont icon-fabu"></text>
+										发布种草
+									</navigator> -->
+										<view class='bnt b-color' @click='goOrderDetails(item.order_id)' v-else>再次购买</view>
+									</block>
+								</view>
+							</view>
+						</block>
+					</view>
+				</view>
+				<view class='loadingicon acea-row row-center-wrapper' v-if="orderList.length>5">
+					<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
+				</view>
+				<view v-if="orderList.length == 0 && page > 1">
+					<emptyPage title="暂无订单~"></emptyPage>
+				</view>
+			</view>
+			<home></home>
+			<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+			<payment :payMode='payMode' :pay_close="pay_close" @onChangeFun='onChangeFun' :order_id="pay_order_id"
+				:totalPrice='totalPrice'></payment>
+			<addInvoicing ref="addInvoicing" @changeInvoiceClose="changeInvoiceClose" :invoice='invoice'></addInvoicing>
+		</view>
+	</template>
+
+	<script>
+		// +----------------------------------------------------------------------
+		// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+		// +----------------------------------------------------------------------
+		// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
+		// +----------------------------------------------------------------------
+		// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+		// +----------------------------------------------------------------------
+		// | Author: CRMEB Team <admin@crmeb.com>
+		// +----------------------------------------------------------------------
+		let app = getApp();
+		import {
+			getOrderList,
+			orderData,
+			unOrderCancel,
+			orderDel,
+			orderPay,
+			groupOrderList,
+			orderTake,
+			applyInvoiceApi
+		} from '@/api/order.js';
+		import {
+			getUserInfo
+		} from '@/api/user.js';
+		import {
+			openOrderSubscribe
+		} from '@/utils/SubscribeMessage.js';
+		import payment from '@/components/payment';
+		import home from '@/components/home/index.vue';
+		import addInvoicing from '@/components/addInvoicing';
+		import {
+			mapGetters
+		} from "vuex";
+		import authorize from '@/components/Authorize';
+		import emptyPage from '@/components/emptyPage.vue';
+		import {
+			configMap
+		} from '@/utils'
+		import {
+			HTTP_REQUEST_URL
+		} from '@/config/app';
+		export default {
+			components: {
+				payment,
+				emptyPage,
+				home,
+				authorize,
+				addInvoicing
+			},
+			data() {
+				return {
+					loading: false, //是否加载中
+					loadend: false, //是否加载完毕
+					loadTitle: '加载更多', //提示语
+					orderList: [], //订单数组
+					presellProList: [], //定金预售订单
+					presellOrderCount: 0,
+					orderData: {}, //订单详细统计
+					orderStatus: 0, //订单状态
+					page: 1,
+					limit: 20,
+					domain: HTTP_REQUEST_URL,
+					payMode: [{
+							name: "微信支付",
+							icon: "icon-weixinzhifu",
+							value: 'wechat',
+							title: '微信快捷支付',
+							payStatus: 1
+						},
+						{
+							name: "支付宝支付",
+							icon: "icon-zhifubao",
+							value: 'alipay',
+							title: '支付宝支付',
+							payStatus: this.$store.getters.globalData.alipay_open
+						},
+						{
+							name: "余额支付",
+							icon: "icon-yuezhifu",
+							value: 'balance',
+							title: '可用余额:',
+							number: 0,
+							payStatus: this.$store.getters.globalData.yue_pay_status
+						}
+					],
+					pay_close: false,
+					pay_order_id: '',
+					invoice_order_id: '',
+					totalPrice: '0',
+					isAuto: false, //没有授权的不会自动授权
+					isShowAuth: false, //是否隐藏授权
+					isReady: true,
+					invoice: {
+						invoice: false,
+						add: false,
+					}
+				};
+			},
+			computed: {
+				...mapGetters(['isLogin', 'viewColor']),
+				...configMap(['hide_mer_status', 'community_status', 'alipay_open', 'yue_pay_status']),
+			},
+			watch: {
+				alipay_open(n) {
+					this.payMode[1].payStatus = n
+				},
+				yue_pay_status(n) {
+					this.payMode[2].payStatus = n
+				}
+			},
+			onShow() {
+				if (this.isLogin) {
+					this.page = 1;
+					this.loadend = false;
+					this.loading = false;
+					this.getOrderData();
+					this.getOrderList();
+					this.getUserInfo();
+					// this.getpreSellOrderList();
+				} else {
+					this.isAuto = true;
+					this.isShowAuth = true
+				}
+			},
+			onReady() {},
+			mounted: function() {},
+			methods: {
+				// 后退
+				returns() {
+					uni.navigateBack()
+				},
+				// 首页
+				goHome() {
+					uni.switchTab({
+						url: '/pages/index/index'
+					});
+				},
+				// 去商铺
+				goMall(item) {
+					if (this.hide_mer_status == 0) {
+						uni.navigateTo({
+							url: '/pages/store/home/index?id=' + item.mer_id
+						})
+					}
+				},
+				onLoadFun() {
+					this.isShowAuth = false;
+					this.getOrderData();
+					this.getOrderList();
+					this.getUserInfo();
+				},
+				// 授权关闭
+				authColse: function(e) {
+					this.isShowAuth = e
+				},
+				/**
+				 * 事件回调
+				 *
+				 */
+				onChangeFun: function(e) {
+					let opt = e;
+					let action = opt.action || null;
+					let value = opt.value != undefined ? opt.value : null;
+					(action && this[action]) && this[action](value);
+				},
+				/**
+				 * 获取用户信息
+				 *
+				 */
+				getUserInfo: function() {
+					let that = this;
+					getUserInfo().then(res => {
+						that.payMode[2].number = res.data.now_money;
+						// that.$set(that, 'payMode', that.payMode);
+					});
+				},
+				/**
+				 * 关闭支付组件
+				 *
+				 */
+				payClose: function() {
+					this.pay_close = false;
+				},
+				/**
+				 * 生命周期函数--监听页面加载
+				 */
+				onLoad: function(options) {
+					if (options.status) this.orderStatus = options.status;
+				},
+				/**
+				 * 获取订单统计数据
+				 *
+				 */
+				getOrderData: function() {
+					let that = this;
+					orderData({
+						product_type: 98
+					}).then(res => {
+						// console.log(res.data)
+						that.$set(that, 'orderData', res.data);
+					})
+				},
+				/**
+				 * 取消订单
+				 *
+				 */
+				cancelOrder: function(index, order_id) {
+					let that = this;
+					if (!order_id) return that.$util.Tips({
+						title: '缺少订单号无法取消订单'
+					});
+					unOrderCancel(order_id).then(res => {
+						return that.$util.Tips({
+							title: res.message,
+							icon: 'success'
+						}, function() {
+							that.orderList.splice(index, 1);
+							that.$set(that, 'orderList', that.orderList);
+							that.$set(that.orderData, 'unpaid_count', that.orderData.unpaid_count - 1);
+							that.getOrderData();
+						});
+					}).catch(err => {
+						return that.$util.Tips({
+							title: err
+						});
+					});
+				},
+				/**
+				 * 打开支付组件
+				 *
+				 */
+				goPay: function(pay_price, order_id) {
+					this.$set(this, 'pay_close', true);
+					this.order_id = order_id;
+					this.pay_order_id = order_id.toString()
+					this.$set(this, 'totalPrice', pay_price);
+				},
+				/**
+				 * 支付成功回调
+				 *
+				 */
+				pay_complete: function() {
+					this.loadend = false;
+					this.page = 1;
+					this.$set(this, 'orderList', []);
+					this.pay_close = false;
+					this.pay_order_id = '';
+					this.getOrderData();
+					this.getOrderList();
+				},
+				/**
+				 * 支付失败回调
+				 *
+				 */
+				pay_fail: function() {
+					this.pay_close = false;
+					this.pay_order_id = '';
+				},
+				/**
+				 * 去订单详情
+				 */
+				goOrderDetails: function(order_id) {
+			
+					
+					let self = this
+					if (!order_id) return that.$util.Tips({
+						title: '缺少订单号无法查看订单详情'
+					});
+					// #ifdef MP
+					uni.showLoading({
+						title: '正在加载',
+					})
+					console.log(self.orderStatus)
+					openOrderSubscribe().then(() => {
+						uni.hideLoading();
+						if (self.orderStatus == 0) {
+							uni.navigateTo({
+								url: '/pages/order_details/stay?order_id=' + order_id
+							})
+						} else {
+							uni.navigateTo({
+								url: '/pages/order_details/index?order_id=' + order_id
+							})
+						}
+					}).catch(() => {
+						uni.hideLoading();
+					})
+					// #endif
+					// #ifndef MP
+					if (self.orderStatus == 0) {
+						uni.navigateTo({
+							url: '/pages/order_details/stay?order_id=' + order_id
+						})
+					} else {
+						uni.navigateTo({
+							url: '/pages/order_details/index?order_id=' + order_id
+						})
+					}
+					// #endif
+				},
+				/**
+				 * 点击去评价
+				 */
+				goOrderDetails_Evaluation: function(order_id) {
+					let self = this
+					if (!order_id) return that.$util.Tips({
+						title: '缺少订单号无法查看订单详情和评价'
+					});
+					// #ifdef MP
+					if (self.orderStatus == 0) {
+						uni.navigateTo({
+							url: '/pages/order_details/stay?order_id=' + order_id
+						})
+					} else {
+						uni.navigateTo({
+							url: '/pages/order_details/index?order_id=' + order_id
+						})
+					}
+					// #endif
+					// #ifndef MP
+					if (self.orderStatus == 0) {
+						uni.navigateTo({
+							url: '/pages/order_details/stay?order_id=' + order_id
+						})
+					} else {
+						uni.navigateTo({
+							url: '/pages/order_details/index?order_id=' + order_id
+						})
+					}
+					// #endif
+				},
+				/**
+				 * 切换类型
+				 */
+				statusClick: function(status) {
+					if (status == this.orderStatus) return;
+					this.orderStatus = status;
+					this.loadend = false;
+					this.loading = false;
+					this.page = 1;
+					this.$set(this, 'orderList', []);
+					this.getOrderList();
+				},
+				/**
+				 * 获取订单列表
+				 */
+				getOrderList: function() {
+					let that = this;
+					if (that.loadend) return;
+					if (that.loading) return;
+					that.loading = true;
+					that.loadTitle = "加载更多";
+					if (that.isReady) {
+						that.isReady = false
+						if (that.orderStatus == 0) {
+							groupOrderList({
+								page: that.page,
+								limit: that.limit,
+								product_type: 98
+							}).then(res => {
+								that.isReady = true;
+								let list = res.data.list || [];
+								let loadend = list.length < that.limit;
+								// console.log(that.orderList)
+								that.orderList = that.page == 1 ? list : that.$util.SplitArray(list, that
+									.orderList);
+								that.$set(that, 'orderList', that.orderList);
+								// console.log(that.orderList)
+								that.getProductCount();
+								that.loadend = loadend;
+								that.loading = false;
+								that.loadTitle = loadend ? "我也是有底线的" : '加载更多';
+								that.page = that.page + 1
+							})
+						} else {
+							let arr;
+							if (that.orderStatus > -1) {
+								arr = that.orderStatus
+							} else {
+								arr = ''
+							}
+							getOrderList({
+								status: arr,
+								page: that.page,
+								limit: that.limit,
+								product_type: 98
+							}).then(res => {
+								let list = res.data.list || [];
+								let loadend = list.length < that.limit;
+								that.orderList = that.page == 1 ? list : that.$util.SplitArray(list, that
+									.orderList);
+								that.$set(that, 'orderList', that.orderList);
+								that.getProductCount();
+								that.loadend = loadend;
+								that.loading = false;
+								that.loadTitle = loadend ? "我也是有底线的" : '加载更多';
+								that.page = that.page + 1;
+								that.isReady = true;
+							}).catch(err => {
+								that.loading = false;
+								that.loadTitle = "加载更多";
+							})
+						}
+					}
+				},
+				/**
+				 * 获取定金预售订单列表
+				 */
+				getpreSellOrderList: function() {
+					let that = this;
+					getOrderList({
+						status: 10,
+						page: 1,
+						limit: 1,
+					}).then(res => {
+						let list = res.data.list || [];
+						that.presellOrderCount = res.data.count;
+						that.$set(that, 'presellProList', list);
+					})
+				},
+				/**
+				 * 获取单个订单商品数量
+				 */
+				getProductCount: function() {
+					if (this.orderStatus !== 0) {
+						this.orderList.forEach((item, i) => {
+							let orderNum = 0
+							if (item.orderProduct) {
+								item.orderProduct.forEach((val) => {
+									orderNum += val.product_num
+								})
+								this.orderList[i]['orderNum'] = orderNum;
+							}
+						})
+					}
+				},
+				/**
+				 * 删除订单
+				 */
+				delOrder: function(order_id, index) {
+					let that = this;
+					orderDel(order_id).then(res => {
+						that.orderList.splice(index, 1);
+						that.$set(that, 'orderList', that.orderList);
+						that.$set(that.orderData, 'unpaid_count', that.orderData.unpaid_count - 1);
+						that.getOrderData();
+						return that.$util.Tips({
+							title: '删除成功',
+							icon: 'success'
+						});
+					}).catch(err => {
+						return that.$util.Tips({
+							title: err
+						});
+					})
+				},
+				// 确认收货
+				confirmOrder: function(item, index) {
+					let that = this;
+					uni.showModal({
+						title: '确认收货',
+						content: '为保障权益，请收到货确认无误后，再确认收货',
+						success: function(res) {
+							if (res.confirm) {
+								orderTake(item.order_id).then(res => {
+									return that.$util.Tips({
+										title: '操作成功',
+										icon: 'success'
+									}, function() {
+										that.orderList.splice(index, 1);
+										that.getOrderData();
+									});
+								}).catch(err => {
+									return that.$util.Tips({
+										title: err
+									});
+								})
+							}
+						}
+					})
+				},
+				/*申请开票*/
+				applyInvoice(order_id) {
+					let that = this;
+					that.invoice_order_id = order_id
+					that.invoice.invoice = true;
+					that.$refs.addInvoicing.getInvoiceDefault();
+					that.$refs.addInvoicing.getInvoiceList();
+				},
+				// 关闭发票弹窗
+				changeInvoiceClose: function(data) {
+					if (data) this.getInvoiceData(data);
+					this.$set(this.invoice, 'invoice', false);
+				},
+				// 开票回调
+				getInvoiceData(data) {
+					let that = this
+					applyInvoiceApi(that.invoice_order_id, data).then(res => {
+						return that.$util.Tips({
+							title: res.message,
+						});
+					}).catch(err => {
+						return that.$util.Tips({
+							title: err
+						});
+					})
+				}
+			},
+			onReachBottom: function() {
+				this.getOrderList();
+			}
+		}
+	</script>
+
+	<style scoped lang="scss">
+		.head-menu {
+			height: 50rpx;
+			padding-left: 20rpx;
+			line-height: 50rpx;
+			font-weight: bold;
+		}
+
+		.my-order .header {
+			height: 260rpx;
+			padding: 0 30rpx;
+			background-color: var(--view-theme);
+		}
+
+		.t-color {
+			color: var(--view-theme);
+		}
+
+		.p-color {
+			color: var(--view-priceColor);
+		}
+
+		.b-color {
+			background-color: var(--view-theme);
+		}
+
+		.my-order .header .picTxt {
+			height: 190rpx;
+		}
+
+		.my-order .header .picTxt .text {
+			color: rgba(255, 255, 255, 0.8);
+			font-size: 26rpx;
+			// font-family: 'Guildford Pro';
+		}
+
+		.my-order .header .picTxt .text .name {
+			font-size: 34rpx;
+			font-weight: bold;
+			color: #fff;
+			margin-bottom: 20rpx;
+		}
+
+		.my-order .header .picTxt .pictrue {
+			width: 122rpx;
+			height: 109rpx;
+		}
+
+		.my-order .header .picTxt .pictrue image {
+			width: 100%;
+			height: 100%;
+		}
+
+		.my-order .nav {
+			background-color: #fff;
+			width: 690rpx;
+			height: 140rpx;
+			border-radius: 16rpx;
+			margin: 20rpx auto 0 auto;
+		}
+
+		.my-order .nav .item {
+			text-align: center;
+			font-size: 26rpx;
+			color: #282828;
+			padding: 29rpx 0;
+		}
+
+		.my-order .nav .item.on {
+			font-weight: bold;
+			border-bottom: 5rpx solid var(--view-theme);
+		}
+
+		.my-order .nav .item .num {
+			margin-top: 18rpx;
+		}
+
+		.my-order .list {
+			width: 690rpx;
+			margin: 14rpx auto 0 auto;
+		}
+
+		.my-order .list .item {
+			background-color: #fff;
+			border-radius: 16rpx;
+			margin-bottom: 14rpx;
+		}
+
+		.my-order .list .item .title {
+			height: 84rpx;
+			padding: 0 30rpx;
+			border-bottom: 1px solid #eee;
+			font-size: 28rpx;
+			color: #282828;
+
+			.left-wrapper {
+				.iconfont {
+					margin-top: 5rpx;
+				}
+
+				.store-name {
+					margin: 0 10rpx;
+				}
+
+				.icon-xiangyou {
+					font-size: 20rpx;
+				}
+			}
+		}
+
+		.my-order .list .item .title .sign {
+			font-size: 24rpx;
+			padding: 0 7rpx;
+			height: 36rpx;
+			margin-right: 15rpx;
+		}
+
+		.my-order .list .item .item-info {
+			padding: 0 30rpx;
+			margin-top: 22rpx;
+		}
+
+		.my-order .list .item .item-info .pictrue {
+			width: 120rpx;
+			height: 120rpx;
+		}
+
+		.my-order .list .item .item-info .pictrue image {
+			width: 100%;
+			height: 100%;
+			border-radius: 6rpx;
+		}
+
+		.my-order .list .item .item-info .text {
+			width: 486rpx;
+			font-size: 28rpx;
+			color: #999;
+			margin-top: 6rpx;
+		}
+
+		.my-order .list .item .item-info .text .name {
+			width: 320rpx;
+			color: #282828;
+		}
+
+		.event_bg {
+			background: #FF7F00;
+		}
+
+		.event_color {
+			color: #FF7F00;
+		}
+
+		.my-order .list .item .event_name {
+			display: inline-block;
+			margin-right: 9rpx;
+			color: #fff;
+			font-size: 20rpx;
+			padding: 0 8rpx;
+			line-height: 30rpx;
+			text-align: center;
+			border-radius: 6rpx;
+		}
+
+		.my-order .list .item .event_ship {
+			font-size: 20rpx;
+			margin-top: 10rpx;
+		}
+
+		.my-order .list .event_price {
+			margin: 0 0 50rpx 120rpx;
+		}
+
+		.my-order .list .item .item-info .text .money {
+			text-align: right;
+		}
+
+		.my-order .list .item .totalPrice {
+			font-size: 26rpx;
+			color: #282828;
+			text-align: right;
+			margin: 27rpx 0 0 30rpx;
+			padding: 0 30rpx 30rpx 0;
+		}
+
+		.my-order .list .item .totalPrice .money {
+			font-size: 28rpx;
+			font-weight: bold;
+		}
+
+		.my-order .list .item .bottom {
+			height: 107rpx;
+			padding: 0 30rpx;
+			border-top: 1px solid #f0f0f0;
+		}
+
+		.my-order .list .item .bottom .bnt {
+			width: 176rpx;
+			height: 60rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			color: #fff;
+			border-radius: 50rpx;
+			font-size: 27rpx;
+		}
+
+		.my-order .list .item .bottom .bnt.cancelBnt {
+			border: 1px solid #ddd;
+			color: #aaa;
+		}
+
+		.my-order .list .item .bottom .bnt.colorBnt {
+			border: 1px solid var(--view-theme);
+			color: var(--view-theme);
+		}
+
+		.my-order .list .item .bottom .bnt .icon-fabu {
+			font-size: 26rpx;
+			margin-right: 10rpx;
+		}
+
+		.my-order .list .item .bottom .bnt~.bnt {
+			margin-left: 17rpx;
+		}
+
+		.noCart {
+			margin-top: 171rpx;
+			padding-top: 0.1rpx;
+		}
+
+		.noCart .pictrue {
+			width: 414rpx;
+			height: 336rpx;
+			margin: 78rpx auto 56rpx auto;
+		}
+
+		.noCart .pictrue image {
+			width: 100%;
+			height: 100%;
+		}
+
+		.event_container {
+			width: 690rpx;
+			background-image: url(../static/images/presell_orderBg.png);
+			background-size: cover;
+			background-repeat: no-repeat;
+			margin: 20rpx auto;
+			padding: 26rpx 30rpx;
+			border-radius: 16rpx;
+
+			.info {
+				width: 420rpx;
+
+				.title {
+					color: #282828;
+					font-size: 26rpx;
+				}
+
+				.desc {
+					color: #999;
+					font-size: 24rpx;
+					margin-top: 30rpx;
+				}
+			}
+
+			.photo {
+				width: 180rpx;
+
+				.picture {
+					width: 120rpx;
+					height: 120rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
+						border-radius: 8rpx;
+					}
+				}
+
+				.more_btn {
+					color: #fff;
+					background: #F97E3B;
+					width: 40rpx;
+					height: 40rpx;
+					border-radius: 40rpx;
+					text-align: center;
+					line-height: 40rpx;
+					position: relative;
+					top: 40rpx;
+
+					text {
+						font-size: 20rpx;
+					}
+				}
+			}
+		}
+
+		.search {
+			height: 70rpx;
+			padding: 0 30rpx;
+			border-radius: 35rpx;
+			margin: -35rpx 30rpx 0;
+			background-color: #FFFFFF;
+			font-size: 26rpx;
+			color: #999999;
+
+			.iconfont {
+				margin-right: 10rpx;
+				font-size: 23rpx;
+			}
+		}
+	</style>
\ No newline at end of file
diff --git a/pages/users/order_list/order.vue b/pages/users/order_list/order.vue
new file mode 100644
index 0000000..febd088
--- /dev/null
+++ b/pages/users/order_list/order.vue
@@ -0,0 +1,1182 @@
+<template>
+	<view :style="viewColor">
+		<view class='my-order'>
+			<view class='header'>
+				<view class='picTxt acea-row row-between-wrapper'>
+					<view class='text'>
+						<view class='name'>订单信息</view>
+						<view>消费订单：{{orderData.orderCount || 0}} 总消费：￥{{orderData.orderPrice || 0}}</view>
+					</view>
+					<view class='pictrue'>
+						<image :src="`${domain}/static/images/orderTime.png`"></image>
+					</view>
+				</view>
+			</view>
+			<navigator class="search acea-row row-middle" url="/pages/users/order_list/search" hover-class="none">
+				<text class="iconfont icon-sousuo"></text>
+				搜索我的订单
+			</navigator>
+			<view class='nav acea-row row-around'>
+				<view class='item' :class='orderStatus==-1 ? "on": ""' @click="statusClick(-1)">
+					<view>全部</view>
+					<view class='num'>{{orderData.all || 0}}</view>
+				</view>
+				<view class='item' :class='orderStatus==0 ? "on": ""' @click="statusClick(20)">
+					<view>待付款</view>
+					<view class='num'>{{orderData.noPay || 0}}</view>
+				</view>
+				<view class='item' :class='orderStatus==1 ? "on": ""' @click="statusClick(1)">
+					<view>待发货</view>
+					<view class='num'>{{orderData.noPostage || 0}}</view>
+				</view>
+				<view class='item' :class='orderStatus==2 ? "on": ""' @click="statusClick(2)">
+					<view>待收货</view>
+					<view class='num '>{{orderData.noDeliver || 0}}</view>
+				</view>
+				<view class='item' :class='orderStatus==3 ? "on": ""' @click="statusClick(3)">
+					<view>待评价</view>
+					<view class='num'>{{orderData.noComment || 0}}</view>
+				</view>
+			</view>
+			<!--定金预售订单-->
+			<view v-if="presellProList.length > 0" class="event_container">
+				<navigator class="acea-row row-between" url="/pages/users/presell_order_list/index" hover-class='none'>
+					<view class="info">
+						<view class="title">预售尾款订单转到这里了！</view>
+						<view class="desc">有 <text class="t-color">{{ presellOrderCount }}</text> 笔预售尾款订单待付款，请点击查看
+						</view>
+					</view>
+					<view class="photo acea-row row-between">
+						<view class='picture'>
+							<image
+								:src='(presellProList[0].orderProduct[0].cart_info.productAttr && presellProList[0].orderProduct[0].cart_info.productAttr.image) || presellProList[0].orderProduct[0].cart_info.product.image'>
+							</image>
+						</view>
+						<view class="more_btn"><text class="iconfont icon-gengduo3"></text></view>
+					</view>
+				</navigator>
+			</view>
+			<view class='list'>
+				<!-- 代付款 -->
+				<view v-if="orderList.length > 0">
+					<block v-if="orderStatus == 0">
+						<view class='item' v-for="(item,index) in orderList" :key="index">
+							<view @click='goOrderDetails(item.group_order_id)'>
+								<view class='title acea-row row-between-wrapper'>
+									<view class="acea-row row-middle left-wrapper">
+										{{item.group_order_sn}}
+									</view>
+									<view class='t-color'>
+										{{ item.orderList[0].activity_type === 2 && item.orderList[0].orderProduct[0].cart_info.productPresell.presell_type ==2 ? "待付定金" : "待付款" }}
+									</view>
+								</view>
+								<view v-for="(order,j) in item.orderList" :key="order.order_id+j">
+									<!--预售-->
+									<view v-if="order.activity_type === 2">
+										<block v-for="(goods,g) in order.orderProduct">
+											<view class='item-info acea-row row-between row-top'>
+												<view class='pictrue'>
+													<image
+														:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
+													</image>
+												</view>
+												<view class='text acea-row row-between'>
+													<view class='name line1'>
+														<text
+															class="event_name event_bg">预售</text><text>{{goods.cart_info.product.store_name}}</text>
+														<view class="event_ship event_color">发货时间：
+															<!--全款预售-->
+															<text
+																v-if="goods.cart_info.productPresell.presell_type === 1">
+																{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内
+															</text>
+															<!--定金预售-->
+															<text
+																v-if="goods.cart_info.productPresell.presell_type === 2">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
+														</view>
+													</view>
+													<view class='money'>
+														<view>￥{{goods.cart_info.productPresellAttr.presell_price}}
+														</view>
+														<view>x{{goods.product_num}}</view>
+													</view>
+												</view>
+												<view v-if="goods.cart_info.productPresell.presell_type === 2"
+													class="event_price">
+													定金待支付 <text class="t-color">￥{{ order.pay_price }}</text>
+													尾款待支付 <text
+														class="t-color">￥{{ order.presellOrder.pay_price }}</text>
+												</view>
+											</view>
+										</block>
+									</view>
+									<view v-else>
+										<block v-for="(goods,g) in order.orderProduct">
+											<view class='item-info acea-row row-between row-top'>
+												<view class='pictrue'>
+													<image
+														:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
+													</image>
+												</view>
+												<view class='text acea-row row-between'>
+
+													<view class='name line2'>{{goods.cart_info.product.store_name}}
+													</view>
+
+													<view class='money' v-if="item.orderList[0].activity_type == 4">
+														<view v-if="goods.cart_info.activeSku">
+															￥{{goods.cart_info.activeSku.active_price}}</view>
+														<view>x{{goods.product_num}}</view>
+													</view>
+													<view v-else class='money'>
+														<view>￥{{goods.cart_info.productAttr.price}}</view>
+														<view>x{{goods.product_num}}</view>
+													</view>
+												</view>
+											</view>
+										</block>
+									</view>
+								</view>
+								<view class='totalPrice' v-if="item.orderList[0].activity_type !== 2">
+									共{{item.total_num || 0}}件商品，总金额
+									<text class='money p-color'>￥{{item.pay_price}}</text>
+								</view>
+								<view class='bottom acea-row row-right row-middle'>
+									<view class='bnt b-color' @click.stop='goPay(item.pay_price,item.group_order_id)'>
+										立即付款</view>
+								</view>
+							</view>
+						</view>
+					</block>
+					<!-- 待发货 待收货 待评价 已完成 -->
+					<block v-else>
+						<view class='item' v-for="(item,index) in orderList" :key="index">
+							<view @click='goOrderDetails(item.order_id)'>
+								<view class='title acea-row row-between-wrapper'>
+									<view class="acea-row row-middle left-wrapper" @click.stop="goMall(item)">
+										<text class="iconfont icon-shangjiadingdan"></text>
+										<view class="store-name">{{item.merchant.mer_name}}</view>
+										<text class="iconfont icon-xiangyou"></text>
+									</view>
+									<view v-if="item.status == 0" class='t-color'>
+										<text
+											v-if="item.order_type==1">{{item.takeOrderCount > 0 ? '部分核销' : '待核销'}}</text>
+										<text v-else>待发货</text>
+									</view>
+									<view v-if="item.status == 1" class='t-color'>待收货</view>
+									<view v-if="item.status == 2" class='t-color'>待评价</view>
+									<view v-if="item.status == 3" class='t-color'>已完成</view>
+									<view v-if="item.status == -1" class='t-color'>已退款</view>
+								</view>
+								<view v-if="item.activity_type === 2">
+									<view class='item-info acea-row row-between row-top'
+										v-for="(goods,index) in item.orderProduct" :key="index">
+										<view class='pictrue'>
+											<image
+												:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
+											</image>
+										</view>
+										<view class='text acea-row row-between'>
+											<view class='name '>
+												<view class='name' :class="item.status === 0 ? 'line1' : 'line2'">
+													<text
+														class="event_name event_bg">预售</text><text>{{goods.cart_info.product.store_name}}</text>
+													<view v-if="item.status == 0" class="event_ship event_color">发货时间：
+														<!--全款预售-->
+														<text
+															v-if="goods.cart_info.productPresell.presell_type === 1">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
+														<!--定金预售-->
+														<text
+															v-if="goods.cart_info.productPresell.presell_type === 2">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
+													</view>
+												</view>
+												<view style="margin-top: 10rpx;" class="t-color">
+													{{goods.is_refund==1?'退款中':goods.is_refund==2?'部分退款':goods.is_refund==3?'全部退款':''}}
+												</view>
+											</view>
+											<view class='money'>
+												<view>￥{{goods.cart_info.productPresellAttr.presell_price}}</view>
+												<view>x{{goods.product_num}}</view>
+											</view>
+										</view>
+									</view>
+								</view>
+								<view v-else>
+									<view class='item-info acea-row row-between row-top'
+										v-for="(goods,index) in item.orderProduct" :key="index">
+										<view class='pictrue'>
+											<image
+												:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
+											</image>
+										</view>
+										<view class='text acea-row row-between'>
+											<view class='name '>
+												<view class='name line2'>
+													<text>{{goods.cart_info.product.store_name}}</text>
+												</view>
+												<view style="margin-top: 10rpx;" class="t-color">
+													{{goods.is_refund==1?'退款中':goods.is_refund==2?'部分退款':goods.is_refund==3?'全部退款':''}}
+												</view>
+											</view>
+											<view class='money' v-if="item.activity_type == 3">
+												<view v-if="goods.cart_info.productAssistAttr">
+													￥{{goods.cart_info.productAssistAttr.assist_price}}</view>
+												<view>x{{goods.product_num}}</view>
+											</view>
+											<view class='money' v-else-if="item.activity_type == 4">
+												<view v-if="goods.cart_info.activeSku">
+													￥{{goods.cart_info.activeSku.active_price}}</view>
+												<view>x{{goods.product_num}}</view>
+											</view>
+											<view class='money' v-else>
+												<view>￥{{goods.cart_info.productAttr.price}}</view>
+												<view>x{{goods.product_num}}</view>
+											</view>
+										</view>
+									</view>
+								</view>
+								<view class='totalPrice' v-if="item.activity_type == 2">共{{item.orderNum || 0}}件商品，总金额
+									<text class='money p-color'>￥{{item.presell_price}}</text>
+								</view>
+								<view class='totalPrice' v-else>共{{item.orderNum || 0}}件商品，总金额
+									<text class='money p-color'>￥{{item.pay_price}}</text>
+								</view>
+								<view class="totalPrice" v-if="item.pay_type == 8 && item.status == 12">
+
+									共1件商品，结算周期到期后付款￥100
+								</view>
+							</view>
+							<view class='bottom acea-row row-right row-middle'>
+								<!-- <view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
+									@click.stop='applyInvoice(item.order_id)'>申请开票</view> -->
+								<block v-if="item.status == 0 || item.status == 9 || item.status == -1">
+									<view v-if="!item.receipt && item.status != -1" class="bnt cancelBnt">一键转卖</view>
+									<view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view>
+								</block>
+								<block v-if="item.status == 1">
+									<view class='bnt cancelBnt'
+										v-if="item.delivery_type == 1 || item.delivery_type == 2"
+										@click='goOrderDetails(item.order_id)'>查看物流</view>
+									<view class='bnt b-color' @tap='confirmOrder(item,index)'>确认收货</view>
+								</block>
+								<block v-if="item.status == 2">
+									<navigator v-if="community_status == 1 && !item.community_id"
+										:url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id"
+										class='bnt colorBnt' hover-class="none">
+										<text class="iconfont icon-fabu"></text>
+										发布种草
+									</navigator>
+									<view class='bnt b-color' @click='goOrderDetails_Evaluation(item.order_id)'>去评价	
+									</view>
+								</block>
+								<block v-if="item.status == 3">
+									<view class='bnt b-color' @click='goOrderDetails(item.order_id)'
+										v-if="item.activity_type == 2 || item.activity_type == 3 || item.activity_type == 10">
+										查看详情</view>
+									<navigator v-if="community_status == 1 && !item.community_id"
+										:url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id"
+										class='bnt colorBnt' hover-class="none">
+										<text class="iconfont icon-fabu"></text>
+										发布种草
+									</navigator>
+									<view class='bnt b-color' @click='goOrderDetails(item.order_id)' v-else>再次购买</view>
+								</block>
+							</view>
+						</view>
+					</block>
+				</view>
+			</view>
+			<view class='loadingicon acea-row row-center-wrapper' v-if="orderList.length>5">
+				<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
+			</view>
+			<view v-if="orderList.length == 0 && page > 1">
+				<emptyPage title="暂无订单~"></emptyPage>
+			</view>
+		</view>
+		<home></home>
+		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<payment :payMode='payMode' :pay_close="pay_close" @onChangeFun='onChangeFun' :order_id="pay_order_id"
+			:totalPrice='totalPrice'></payment>
+		<addInvoicing ref="addInvoicing" @changeInvoiceClose="changeInvoiceClose" :invoice='invoice'></addInvoicing>
+		<u-popup :show="show" bgColor='transparent' mode='center'>
+			<view class="warp">
+				<image @click="close" class="guanbi" src="@/static/images/guanbi.png"></image>
+				<image src="@/static/images/shouhuo.png" mode="widthFix"></image>
+			</view>
+			<view class="textp">
+				<h3>确认收到货了吗?</h3>
+				<span>此订单为先货后款订单，确认收货后将开始计算结算周期。为保障售后权益，请检查后再确认收货。</span>
+				<button class="shouhuobtn" @click="queding()">确认收货</button>
+				<view class="cle" @click="close">取消</view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	// +----------------------------------------------------------------------
+	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+	// +----------------------------------------------------------------------
+	// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
+	// +----------------------------------------------------------------------
+	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+	// +----------------------------------------------------------------------
+	// | Author: CRMEB Team <admin@crmeb.com>
+	// +----------------------------------------------------------------------
+	let app = getApp();
+	import {
+		getOrderList,
+		orderData,
+		unOrderCancel,
+		orderDel,
+		orderPay,
+		groupOrderList,
+		orderTake,
+		applyInvoiceApi
+	} from '@/api/order.js';
+	import {
+		getUserInfo
+	} from '@/api/user.js';
+	import {
+		postsettle
+	} from '@/api/admin.js';
+	import {
+		openOrderSubscribe
+	} from '@/utils/SubscribeMessage.js';
+	import payment from '@/components/payment';
+	import home from '@/components/home/index.vue';
+	import addInvoicing from '@/components/addInvoicing';
+	import {
+		mapGetters
+	} from "vuex";
+	import authorize from '@/components/Authorize';
+	import emptyPage from '@/components/emptyPage.vue';
+	import {
+		configMap
+	} from '@/utils'
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app';
+	export default {
+		components: {
+			payment,
+			emptyPage,
+			home,
+			authorize,
+			addInvoicing
+		},
+		data() {
+			return {
+				loading: false, //是否加载中
+				loadend: false, //是否加载完毕
+				loadTitle: '加载更多', //提示语
+				orderList: [], //订单数组
+				presellProList: [], //定金预售订单
+				presellOrderCount: 0,
+				orderData: {}, //订单详细统计
+				orderStatus: 0, //订单状态
+				page: 1,
+				limit: 20,
+				domain: HTTP_REQUEST_URL,
+				payMode: [{
+						name: "微信支付",
+						icon: "icon-weixinzhifu",
+						value: 'wechat',
+						title: '微信快捷支付',
+						payStatus: 1
+					},
+					{
+						name: "支付宝支付",
+						icon: "icon-zhifubao",
+						value: 'alipay',
+						title: '支付宝支付',
+						payStatus: this.$store.getters.globalData.alipay_open
+					},
+					{
+						name: "余额支付",
+						icon: "icon-yuezhifu",
+						value: 'balance',
+						title: '可用余额:',
+						number: 0,
+						payStatus: this.$store.getters.globalData.yue_pay_status
+					},
+					
+				],
+				pay_close: false,
+				pay_order_id: '',
+				invoice_order_id: '',
+				totalPrice: '0',
+				isAuto: false, //没有授权的不会自动授权
+				isShowAuth: false, //是否隐藏授权
+				isReady: true,
+				invoice: {
+					invoice: false,
+					add: false,
+				},
+				show: false,
+				shouhuo: {
+					index: '',
+					id: ''
+				},
+				//商品分类
+				activity_type: ''
+			};
+		},
+		computed: {
+			...mapGetters(['isLogin', 'viewColor']),
+			...configMap(['hide_mer_status', 'community_status', 'alipay_open', 'yue_pay_status']),
+		},
+		watch: {
+			alipay_open(n) {
+				this.payMode[1].payStatus = n
+			},
+			yue_pay_status(n) {
+				this.payMode[2].payStatus = n
+			}
+		},
+		onShow() {
+			if (this.isLogin) {
+				this.page = 1;
+				this.loadend = false;
+				this.loading = false;
+				this.getOrderData();
+				this.getOrderList();
+				this.getUserInfo();
+				this.getpreSellOrderList();
+			} else {
+				this.isAuto = true;
+				this.isShowAuth = true
+			}
+		},
+		onReady() {},
+		mounted: function() {},
+		methods: {
+			// 去商铺
+			goMall(item) {
+				if (this.hide_mer_status == 0) {
+					uni.navigateTo({
+						url: '/pages/store/home/index?id=' + item.mer_id
+					})
+				}
+			},
+			onLoadFun() {
+				this.isShowAuth = false;
+				this.getOrderData();
+				this.getOrderList();
+				this.getUserInfo();
+			},
+			// 授权关闭
+			authColse: function(e) {
+				this.isShowAuth = e
+			},
+			/**
+			 * 事件回调
+			 *
+			 */
+			onChangeFun: function(e) {
+				let opt = e;
+				let action = opt.action || null;
+				let value = opt.value != undefined ? opt.value : null;
+				(action && this[action]) && this[action](value);
+			},
+			/**
+			 * 获取用户信息
+			 *
+			 */
+			getUserInfo: function() {
+				let that = this;
+				getUserInfo().then(res => {
+					that.payMode[2].number = res.data.now_money;
+					// that.$set(that, 'payMode', that.payMode);
+				});
+			},
+			/**
+			 * 关闭支付组件
+			 *
+			 */
+			payClose: function() {
+				this.pay_close = false;
+			},
+			/**
+			 * 生命周期函数--监听页面加载
+			 */
+			onLoad: function(options) {
+				if (options.status) this.orderStatus = options.status;
+			},
+			/**
+			 * 获取订单统计数据
+			 *
+			 */
+			getOrderData: function() {
+				let that = this;
+				orderData().then(res => {
+					that.$set(that, 'orderData', res.data);
+				})
+			},
+			/**
+			 * 取消订单
+			 *
+			 */
+			cancelOrder: function(index, order_id) {
+				let that = this;
+				if (!order_id) return that.$util.Tips({
+					title: '缺少订单号无法取消订单'
+				});
+				unOrderCancel(order_id).then(res => {
+					return that.$util.Tips({
+						title: res.message,
+						icon: 'success'
+					}, function() {
+						that.orderList.splice(index, 1);
+						that.$set(that, 'orderList', that.orderList);
+						that.$set(that.orderData, 'unpaid_count', that.orderData.unpaid_count - 1);
+						that.getOrderData();
+					});
+				}).catch(err => {
+					return that.$util.Tips({
+						title: err
+					});
+				});
+			},
+			/**
+			 * 打开支付组件
+			 *
+			 */
+			goPay: function(pay_price, order_id) {
+				uni.navigateTo({
+					url: '/pages/users/payment/payment?order_id=' + order_id
+				});
+				// this.$set(this, 'pay_close', true);
+				// this.order_id = order_id;
+				// this.pay_order_id = order_id.toString()
+				// this.$set(this, 'totalPrice', pay_price);
+			},
+			/**
+			 * 支付成功回调
+			 *
+			 */
+			pay_complete: function() {
+				this.loadend = false;
+				this.page = 1;
+				this.$set(this, 'orderList', []);
+				this.pay_close = false;
+				this.pay_order_id = '';
+				this.getOrderData();
+				this.getOrderList();
+			},
+			/**
+			 * 支付失败回调
+			 *
+			 */
+			pay_fail: function() {
+				this.pay_close = false;
+				this.pay_order_id = '';
+			},
+			/**
+			 * 去订单详情
+			 */
+			goOrderDetails: function(order_id) {
+				let self = this
+				if (!order_id) return that.$util.Tips({
+					title: '缺少订单号无法查看订单详情'
+				});
+				// #ifdef MP
+				uni.showLoading({
+					title: '正在加载',
+				})
+				openOrderSubscribe().then(() => {
+					uni.hideLoading();
+					if (self.orderStatus == 0) {
+						uni.navigateTo({
+							url: '/pages/order_details/stay?order_id=' + order_id
+						})
+					} else {
+						uni.navigateTo({
+							url: '/pages/order_details/index?order_id=' + order_id
+						})
+					}
+				}).catch(() => {
+					uni.hideLoading();
+				})
+				// #endif
+				// #ifndef MP
+				if (self.orderStatus == 0) {
+					uni.navigateTo({
+						url: '/pages/order_details/stay?order_id=' + order_id
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pages/order_details/index?order_id=' + order_id
+					})
+				}
+				// #endif
+			},
+			/**
+			 * 点击去评价
+			 */
+			goOrderDetails_Evaluation: function(order_id) {
+				let self = this
+				if (!order_id) return that.$util.Tips({
+					title: '缺少订单号无法查看订单详情和评价'
+				});
+				// #ifdef MP
+				if (self.orderStatus == 0) {
+					uni.navigateTo({
+						url: '/pages/order_details/stay?order_id=' + order_id
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pages/order_details/index?order_id=' + order_id
+					})
+				}
+				// #endif
+				// #ifndef MP
+				if (self.orderStatus == 0) {
+					uni.navigateTo({
+						url: '/pages/order_details/stay?order_id=' + order_id
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pages/order_details/index?order_id=' + order_id
+					})
+				}
+				// #endif
+			},
+			/**
+			 * 切换类型
+			 */
+			statusClick: function(status) {
+				if (status == this.orderStatus) return;
+				this.orderStatus = status;
+				this.loadend = false;
+				this.loading = false;
+				this.page = 1;
+				this.$set(this, 'orderList', []);
+				this.getOrderList();
+			},
+			/**
+			 * 获取订单列表
+			 */
+			getOrderList: function() {
+				let that = this;
+				if (that.loadend) return;
+				if (that.loading) return;
+				that.loading = true;
+				that.loadTitle = "加载更多";
+				if (that.isReady) {
+					that.isReady = false
+				
+						getOrderList({
+							status: that.orderStatus - 1,
+							page: that.page,
+							limit: that.limit,
+						}).then(res => {
+							console.log(res);
+							let list = res.data.list || [];
+							let loadend = list.length < that.limit;
+							that.orderList = that.page == 1 ? list : that.$util.SplitArray(list, that
+								.orderList);
+							that.$set(that, 'orderList', that.orderList);
+							that.getProductCount();
+							that.loadend = loadend;
+							that.loading = false;
+							that.loadTitle = loadend ? "我也是有底线的" : '加载更多';
+							that.page = that.page + 1;
+							that.isReady = true;
+						}).catch(err => {
+							that.loading = false;
+							that.loadTitle = "加载更多";
+						})
+					
+				}
+			},
+			/**
+			 * 获取定金预售订单列表
+			 */
+			getpreSellOrderList: function() {
+				let that = this;
+				getOrderList({
+					status: 10,
+					page: 1,
+					limit: 1,
+				}).then(res => {
+					let list = res.data.list || [];
+					that.presellOrderCount = res.data.count;
+					that.$set(that, 'presellProList', list);
+				})
+			},
+			/**
+			 * 获取单个订单商品数量
+			 */
+			getProductCount: function() {
+				if (this.orderStatus !== 0) {
+					this.orderList.forEach((item, i) => {
+						let orderNum = 0
+						if (item.orderProduct) {
+							item.orderProduct.forEach((val) => {
+								orderNum += val.product_num
+							})
+							this.orderList[i]['orderNum'] = orderNum;
+						}
+					})
+				}
+			},
+			/**
+			 * 删除订单
+			 */
+			delOrder: function(order_id, index) {
+				let that = this;
+				orderDel(order_id).then(res => {
+					that.orderList.splice(index, 1);
+					that.$set(that, 'orderList', that.orderList);
+					that.$set(that.orderData, 'unpaid_count', that.orderData.unpaid_count - 1);
+					that.getOrderData();
+					return that.$util.Tips({
+						title: '删除成功',
+						icon: 'success'
+					});
+				}).catch(err => {
+					return that.$util.Tips({
+						title: err
+					});
+				})
+			},
+			// 确认收货
+			confirmOrder: function(item, index) {
+				this.show = true
+				this.shouhuo.id = item.order_id
+				this.shouhuo.index = index
+				// uni.showModal({
+				// 	title: '确认收货',
+				// 	content: '为保障权益，请收到货确认无误后，再确认收货',
+				// 	success: function(res) {
+				// 		if (res.confirm) {
+				// 			orderTake(item.order_id).then(res => {
+				// 				return that.$util.Tips({
+				// 					title: '操作成功',
+				// 					icon: 'success'
+				// 				}, function() {
+				// 					that.orderList.splice(index, 1);
+				// 					that.getOrderData();
+				// 				});
+				// 			}).catch(err => {
+				// 				return that.$util.Tips({
+				// 					title: err
+				// 				});
+				// 			})
+				// 		}
+				// 	}
+				// })
+			},
+			queding() {
+				let that = this;
+				orderTake(that.shouhuo.id).then(res => {
+							that.show = false
+							that.orderList.splice(that.shouhuo.index, 1); 
+							that.getOrderData();
+							return that.$util.Tips({
+									title: '操作成功',
+									icon: 'success',
+								})
+
+							}).catch(err => {
+							return that.$util.Tips({
+								title: err
+							});
+							that.show = false
+						})
+					},
+					/*申请开票*/
+					applyInvoice(order_id) {
+						let that = this;
+						that.invoice_order_id = order_id
+						that.invoice.invoice = true;
+						that.$refs.addInvoicing.getInvoiceDefault();
+						that.$refs.addInvoicing.getInvoiceList();
+					},
+					// 关闭发票弹窗
+					changeInvoiceClose: function(data) {
+						if (data) this.getInvoiceData(data);
+						this.$set(this.invoice, 'invoice', false);
+					},
+					// 开票回调
+					getInvoiceData(data) {
+						let that = this
+						applyInvoiceApi(that.invoice_order_id, data).then(res => {
+							return that.$util.Tips({
+								title: res.message,
+							});
+						}).catch(err => {
+							return that.$util.Tips({
+								title: err
+							});
+						})
+					},
+					close() {
+						this.show = false
+					}
+			},
+			onReachBottom: function() {
+				this.getOrderList();
+			}
+		}
+</script>
+
+<style scoped lang="scss">
+	.my-order .header {
+		height: 260rpx;
+		padding: 0 30rpx;
+		background-color: var(--view-theme);
+	}
+
+	.t-color {
+		color: var(--view-theme);
+	}
+
+	.p-color {
+		color: var(--view-priceColor);
+	}
+
+	.b-color {
+		background-color: var(--view-theme);
+	}
+
+	.my-order .header .picTxt {
+		height: 190rpx;
+	}
+
+	.my-order .header .picTxt .text {
+		color: rgba(255, 255, 255, 0.8);
+		font-size: 26rpx;
+		// font-family: 'Guildford Pro';
+	}
+
+	.my-order .header .picTxt .text .name {
+		font-size: 34rpx;
+		font-weight: bold;
+		color: #fff;
+		margin-bottom: 20rpx;
+	}
+
+	.my-order .header .picTxt .pictrue {
+		width: 122rpx;
+		height: 109rpx;
+	}
+
+	.my-order .header .picTxt .pictrue image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.my-order .nav {
+		background-color: #fff;
+		width: 690rpx;
+		height: 140rpx;
+		border-radius: 16rpx;
+		margin: 20rpx auto 0 auto;
+	}
+
+	.my-order .nav .item {
+		text-align: center;
+		font-size: 26rpx;
+		color: #282828;
+		padding: 29rpx 0;
+	}
+
+	.my-order .nav .item.on {
+		font-weight: bold;
+		border-bottom: 5rpx solid var(--view-theme);
+	}
+
+	.my-order .nav .item .num {
+		margin-top: 18rpx;
+	}
+
+	.my-order .list {
+		width: 690rpx;
+		margin: 14rpx auto 0 auto;
+	}
+
+	.my-order .list .item {
+		background-color: #fff;
+		border-radius: 16rpx;
+		margin-bottom: 14rpx;
+	}
+
+	.my-order .list .item .title {
+		height: 84rpx;
+		padding: 0 30rpx;
+		border-bottom: 1px solid #eee;
+		font-size: 28rpx;
+		color: #282828;
+
+		.left-wrapper {
+			.iconfont {
+				margin-top: 5rpx;
+			}
+
+			.store-name {
+				margin: 0 10rpx;
+			}
+
+			.icon-xiangyou {
+				font-size: 20rpx;
+			}
+		}
+	}
+
+	.my-order .list .item .title .sign {
+		font-size: 24rpx;
+		padding: 0 7rpx;
+		height: 36rpx;
+		margin-right: 15rpx;
+	}
+
+	.my-order .list .item .item-info {
+		padding: 0 30rpx;
+		margin-top: 22rpx;
+	}
+
+	.my-order .list .item .item-info .pictrue {
+		width: 120rpx;
+		height: 120rpx;
+	}
+
+	.my-order .list .item .item-info .pictrue image {
+		width: 100%;
+		height: 100%;
+		border-radius: 6rpx;
+	}
+
+	.my-order .list .item .item-info .text {
+		width: 486rpx;
+		font-size: 28rpx;
+		color: #999;
+		margin-top: 6rpx;
+	}
+
+	.my-order .list .item .item-info .text .name {
+		width: 320rpx;
+		color: #282828;
+	}
+
+	.event_bg {
+		background: #FF7F00;
+	}
+
+	.event_color {
+		color: #FF7F00;
+	}
+
+	.my-order .list .item .event_name {
+		display: inline-block;
+		margin-right: 9rpx;
+		color: #fff;
+		font-size: 20rpx;
+		padding: 0 8rpx;
+		line-height: 30rpx;
+		text-align: center;
+		border-radius: 6rpx;
+	}
+
+	.my-order .list .item .event_ship {
+		font-size: 20rpx;
+		margin-top: 10rpx;
+	}
+
+	.my-order .list .event_price {
+		margin: 0 0 50rpx 120rpx;
+	}
+
+	.my-order .list .item .item-info .text .money {
+		text-align: right;
+	}
+
+	.my-order .list .item .totalPrice {
+		font-size: 26rpx;
+		color: #282828;
+		text-align: right;
+		margin: 27rpx 0 0 30rpx;
+		padding: 0 30rpx 30rpx 0;
+	}
+
+	.my-order .list .item .totalPrice .money {
+		font-size: 28rpx;
+		font-weight: bold;
+	}
+
+	.my-order .list .item .bottom {
+		height: 107rpx;
+		padding: 0 30rpx;
+		border-top: 1px solid #f0f0f0;
+	}
+
+	.my-order .list .item .bottom .bnt {
+		width: 176rpx;
+		height: 60rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		color: #fff;
+		border-radius: 50rpx;
+		font-size: 27rpx;
+	}
+
+	.my-order .list .item .bottom .bnt.cancelBnt {
+		border: 1px solid #ddd;
+		color: #aaa;
+	}
+
+	.my-order .list .item .bottom .bnt.colorBnt {
+		border: 1px solid var(--view-theme);
+		color: var(--view-theme);
+	}
+
+	.my-order .list .item .bottom .bnt .icon-fabu {
+		font-size: 26rpx;
+		margin-right: 10rpx;
+	}
+
+	.my-order .list .item .bottom .bnt~.bnt {
+		margin-left: 17rpx;
+	}
+
+	.noCart {
+		margin-top: 171rpx;
+		padding-top: 0.1rpx;
+	}
+
+	.noCart .pictrue {
+		width: 414rpx;
+		height: 336rpx;
+		margin: 78rpx auto 56rpx auto;
+	}
+
+	.noCart .pictrue image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.event_container {
+		width: 690rpx;
+		background-image: url(../static/images/presell_orderBg.png);
+		background-size: cover;
+		background-repeat: no-repeat;
+		margin: 20rpx auto;
+		padding: 26rpx 30rpx;
+		border-radius: 16rpx;
+
+		.info {
+			width: 420rpx;
+
+			.title {
+				color: #282828;
+				font-size: 26rpx;
+			}
+
+			.desc {
+				color: #999;
+				font-size: 24rpx;
+				margin-top: 30rpx;
+			}
+		}
+
+		.photo {
+			width: 180rpx;
+
+			.picture {
+				width: 120rpx;
+				height: 120rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+					border-radius: 8rpx;
+				}
+			}
+
+			.more_btn {
+				color: #fff;
+				background: #F97E3B;
+				width: 40rpx;
+				height: 40rpx;
+				border-radius: 40rpx;
+				text-align: center;
+				line-height: 40rpx;
+				position: relative;
+				top: 40rpx;
+
+				text {
+					font-size: 20rpx;
+				}
+			}
+		}
+	}
+
+	.search {
+		height: 70rpx;
+		padding: 0 30rpx;
+		border-radius: 35rpx;
+		margin: -35rpx 30rpx 0;
+		background-color: #FFFFFF;
+		font-size: 26rpx;
+		color: #999999;
+
+		.iconfont {
+			margin-right: 10rpx;
+			font-size: 23rpx;
+		}
+	}
+
+	.warp {
+		margin: auto;
+
+		.guanbi {
+			position: absolute;
+			right: 0px;
+			z-index: 1;
+			width: 30px;
+			height: 30px;
+		}
+	}
+
+	.textp {
+		width: 320px;
+		padding-bottom: 20px;
+		position: absolute;
+		top: 130px;
+		border-radius: 10px;
+
+		h3 {
+			text-align: center;
+		}
+
+		span {
+			display: block;
+			width: 280px;
+			padding-top: 20px;
+			margin: auto;
+		}
+
+		.shouhuobtn {
+			margin: auto;
+			line-height: 54px;
+			margin-top: 30px;
+			width: 191px;
+			height: 54px;
+			color: white;
+			background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
+			border-radius: 27px 27px 27px 27px;
+		}
+
+		.cle {
+			margin: auto;
+			text-align: center;
+			margin-top: 15px;
+			height: 40px;
+			background-color: #FFFFFF;
+			border-radius: 10px;
+			color: #999999;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/users/payment/payment.vue b/pages/users/payment/payment.vue
new file mode 100644
index 0000000..ca3618d
--- /dev/null
+++ b/pages/users/payment/payment.vue
@@ -0,0 +1,491 @@
+<template>
+	<view class="center">
+
+
+		<view class='wrapper'>
+			<view class='item'>
+				<view>支付方式</view>
+				<view class='list'>
+					<!-- #ifdef H5 -->
+					<view class='payItem acea-row row-middle' :class='active==index ?"on":""' @tap='payItem(index)'
+						v-for="(item,index) in cartArr" :key='index' v-if="item.payStatus==1">
+						<view class='name acea-row row-center-wrapper'>
+							<view class='iconfont animated'
+								:class='(item.icon) + " " + (animated==true&&active==index ?"bounceIn":"")'></view>
+							{{item.name}}
+						</view>
+						<view class='tip'>
+							{{item.title}}
+							<block v-if="item.value == 'balance'">
+								{{userInfo.now_money}}
+							</block>
+						</view>
+					</view>
+					<!-- #endif -->
+					<!-- #ifdef MP || APP-PLUS -->
+					<view class='payItem acea-row row-middle' :class='active==index ?"on":""' @tap='payItem(index)'
+						v-for="(item,index) in cartArr" :key='index' v-if="item.payStatus==1">
+						<view class='name acea-row row-center-wrapper'>
+							<view class='iconfont animated'
+								:class='(item.icon) + " " + (animated==true&&active==index ?"bounceIn":"")'></view>
+							{{item.name}}
+						</view>
+						<view class='tip'>
+							{{item.title}}
+							<block v-if="item.value == 'balance'">
+								{{userInfo.now_money}}
+							</block>
+						</view>
+					</view>
+					<!-- #endif -->
+				</view>
+			</view>
+		</view>
+		<view class="settel">
+			<view class='settel-t'>
+				<view>商品总价：</view>
+				<view class='conter'>￥ {{couponData.total_price}}</view>
+			</view>
+		</view>
+		<view class="settel" v-if="(this.be_overdue == 0 || this.be_overdue < 0) &&couponData.total_postage>0">
+			<view class='settel-t'>
+				<view>利息合计:</view>
+				<view class="conter">
+					<view class='con_text'>￥ {{couponData.total_postage}}</view>
+					<view class='con_text' style="color: #F84221;" v-if="couponData.pay_type == 8">
+						已逾期{{this.be_overday}}天</view>
+				</view>
+
+			</view>
+		</view>
+		<view class='footer acea-row row-between-wrapper'>
+			<view class="footer_count">
+				<view>
+					合计:
+					<text class='conter' v-if="cartArr[4].payStatus == 1">￥0.00</text>
+					<text class='conter' v-else>￥{{couponData.pay_price}}</text>
+				</view>
+				<!-- <view style="font-size: 14px;color: #F84221;" v-if="this.be_overdue == 0 || this.be_overdue < 0 ">
+          可结算周期到期后再付款￥{{totalPrice}}
+        </view> -->
+			</view>
+			<view class='settlement' @tap="SubOrder">
+				提交订单
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+
+		getUserInfo,
+
+	} from '@/api/user.js';
+	import {
+		groupOrderDetail,
+		orderPay
+	} from '@/api/order.js'
+	import {
+		postsettle,
+	} from '@/api/admin.js'
+	export default {
+		data() {
+			return {
+				animated: false,
+				totalPrice: 0,
+				couponData: {},
+				active: 0, //支付方式切换	,
+				userInfo: {}, //用户信息
+				cartArr: [{
+						"name": "微信支付",
+						"icon": "icon-weixin2",
+						value: 'weixin',
+						title: '微信快捷支付',
+						payStatus: 1,
+					},
+					{
+						name: "支付宝支付",
+						icon: "icon-icon34",
+						// #ifdef H5 || APP-PLUS
+						value: 'alipay',
+						// #endif
+						// #ifdef MP
+						value: 'alipayQr',
+						// #endif
+						title: '支付宝支付',
+						payStatus: this.$store.getters.globalData.alipay_open
+					},
+					{
+						"name": "余额支付",
+						"icon": "icon-icon-test",
+						value: 'balance',
+						title: '可用余额:',
+						payStatus: this.$store.getters.globalData.yue_pay_status,
+					},
+					{
+						"name": "线下支付",
+						"icon": "icon-yinhangqia",
+						value: 'offline',
+						title: '线下支付',
+						payStatus: 2,
+					}, {
+						"name": "先货后款",
+						"icon": "tan-a-lujing17324",
+						value: 'creditBuy',
+						title: `结算周期：30天 `,
+						label: '日利率：0.05%',
+						order_id: '',
+					},
+				],
+				order_id: '',
+				product_type: 0,
+				mer_id: '',
+				be_overdue: '', //逾期时间
+				be_overday: '', //逾期天数
+			};
+		},
+		onLoad(options) {
+			this.payType = 'weixin'
+			this.order_id = options.order_id
+			if (options.product_type) {
+				this.product_type = options.product_type
+			}
+			this.$nextTick(() => {
+				this.getOrderInfo()
+				this.getUserInfo()
+			})
+		},
+		methods: {
+			payItem: function(e) {
+				let that = this;
+				let active = e;
+				that.active = active;
+				that.animated = true;
+				that.payType = that.cartArr[active].value;
+			},
+			getUserInfo() {
+				getUserInfo().then(res => {
+					this.userInfo = res.data
+					this.mer_id = res.data.service.mer_id
+				})
+			},
+			getOrderInfo() {
+				groupOrderDetail(this.order_id, this.product_type).then(res => {
+					console.log(res)
+					this.couponData = res.data
+					this.$nextTick(() => {
+						if (this.couponData.interest !== null) {
+							this.moerTime(this.couponData.interest.start_time)
+						}
+					})
+				})
+			},
+			SubOrder() {
+				if (this.couponData.pay_type == 8) {
+					postsettle(
+						this.mer_id, {
+							id: this.order_id,
+							pay_type: this.payType
+						}
+					).then(res => {
+						if (res.data.paid === false) {
+							//拉起微信支付
+
+						}
+						if (res.message == 'success') {
+							uni.showToast({
+								title: '付款成功'
+							})
+							setTimeout(() => {
+								uni.navigateBack({
+									delta: 1
+								})
+							}, 1000)
+						}
+					}).catch(err => {
+						uni.showToast({
+							title: err.message
+						})
+					})
+				} else {
+					orderPay(this.order_id, {
+						type: this.payType
+					}).then(res => {
+						let jsConfig = res.data.result.config
+						if (res.data.status === 'weixinApp') {
+							//拉起微信支付
+							// #ifdef APP-PLUS
+							let mp_pay_name = ''
+							if (uni.requestOrderPayment) {
+								mp_pay_name = 'requestOrderPayment'
+							} else {
+								mp_pay_name = 'requestPayment'
+							}
+							uni[mp_pay_name]({
+								provider: 'wxpay',
+								orderInfo: jsConfig,
+								success: (e) => {
+									uni.navigateBack({
+										delta: 1
+									})
+
+								},
+								fail: (e) => {
+									// 暂不跳转
+									let url = '/pages/order_pay_status/index?order_id=' + orderId +
+										'&msg=取消支付' + '&product_type=' + that.product_type;
+									return that.$util.Tips({
+										title: '取消支付',
+									}, {
+										tab: 4,
+										url: url
+									});
+								},
+								complete: () => {
+									// 暂不跳转
+									let url = '/pages/order_pay_status/index?order_id=' + orderId +
+										'&msg=取消支付' + '&product_type=' + that.product_type;
+									return that.$util.Tips({
+										title: '取消支付',
+									}, {
+										tab: 4,
+										url: url
+									});
+								},
+							});
+							// #endif
+
+						}
+						// setTimeout(() => {
+						// 	uni.navigateBack({
+						// 		delta: 1
+						// 	})
+						// }, 1000)
+						uni.showToast({
+							title: res.message
+						})
+					})
+				}
+
+			},
+			//计算是否逾期
+			moerTime(autoTime) {
+				var date1 = (Date.parse(new Date())) / 1000;
+				var date2 = (Date.parse(new Date(autoTime))) / 1000;
+				var date3 = (date2 - date1) * 1000;
+				this.be_overdue = Math.floor(date3 / (24 * 3600 * 1000));
+				if (this.be_overdue == 0 || this.be_overdue < 0) {
+					var date1 = (Date.parse(new Date())) / 1000;
+					var date2 = (Date.parse(new Date(autoTime))) / 1000;
+					var date3 = (date1 - date2) * 1000;
+					this.be_overday = Math.floor(date3 / (24 * 3600 * 1000));
+				}
+			}
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.center {
+		.conter {
+			color: red;
+			font-weight: bold;
+		}
+
+		.wrapper .item .discount .placeholder {
+			color: #ccc;
+			text-align: right;
+		}
+
+		.wrapper {
+			margin-bottom: 12rpx;
+			background-color: #fff;
+			padding-top: 20px;
+		}
+
+		.wrapper .item {
+			padding: 27rpx 30rpx;
+			font-size: 30rpx;
+			color: #282828;
+		}
+
+		.wrapper .item .discount .iconfont {
+			color: #515151;
+			font-size: 30rpx;
+			margin-left: 15rpx;
+		}
+
+		.wrapper .item .discount .num {
+			font-size: 32rpx;
+			margin-right: 20rpx;
+		}
+
+		.wrapper .item .shipping {
+			font-size: 30rpx;
+			color: #999;
+			position: relative;
+			padding-right: 58rpx;
+		}
+
+		.wrapper .item .shipping .iconfont {
+			font-size: 35rpx;
+			color: #707070;
+			position: absolute;
+			right: 0;
+			top: 50%;
+			transform: translateY(-50%);
+			margin-left: 30rpx;
+		}
+
+		.wrapper .item input {
+			flex: 1;
+			height: 100%;
+			margin-left: 20rpx;
+			text-align: right;
+		}
+
+		.wrapper .item .placeholder {
+			color: #ccc;
+		}
+
+		.wrapper .item .list {
+			margin-top: 35rpx;
+		}
+
+		.wrapper .item .list .payItem {
+			border: 1px solid #eee;
+			border-radius: 6rpx;
+			height: 86rpx;
+			width: 100%;
+			box-sizing: border-box;
+			margin-top: 20rpx;
+			font-size: 28rpx;
+			color: #282828;
+		}
+
+		.wrapper .item .list .payItem.on {
+			border-color: var(--view-theme);
+			color: var(--view-theme);
+		}
+
+		.wrapper .item .list .payItem .name {
+			width: 50%;
+			text-align: center;
+			border-right: 1px solid #eee;
+			justify-content: left;
+			padding-left: 80rpx;
+		}
+
+		.wrapper .item .list .payItem .name .iconfont {
+			width: 44rpx;
+			height: 44rpx;
+			border-radius: 50%;
+			text-align: center;
+			line-height: 44rpx;
+			background-color: #fe960f;
+			color: #fff;
+			font-size: 30rpx;
+			margin-right: 15rpx;
+		}
+
+		.wrapper .item .list .payItem .name .iconfont.icon-weixin2 {
+			background-color: #41b035;
+		}
+
+		.wrapper .item .list .payItem .name .iconfont.icon-icon34 {
+			background-color: #4295D5;
+		}
+
+		.wrapper .item .list .payItem .tip {
+			width: 49%;
+			text-align: center;
+			font-size: 26rpx;
+			color: #aaa;
+		}
+
+		.footer {
+			width: 100%;
+			height: 100rpx;
+			height: calc(100rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
+			height: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
+			background-color: #fff;
+			padding: 0 30rpx;
+			font-size: 28rpx;
+			color: #333;
+			box-sizing: border-box;
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			z-index: 30;
+
+			.footer_count {
+				font-size: 28rpx;
+			}
+
+			.coupon_price {
+				color: #999999;
+				font-size: 20rpx;
+				margin-top: 10rpx;
+
+				text {
+					color: #282828;
+					padding: 2rpx 10rpx;
+					background: #F5F5F5;
+					border-radius: 26rpx;
+					margin-left: 20rpx;
+					line-height: 30rpx;
+					height: 30rpx;
+					display: inline-block;
+				}
+			}
+
+			.settlement {
+				font-size: 30rpx;
+				color: #fff;
+				width: 240rpx;
+				height: 70rpx;
+				background: linear-gradient(90deg, #F98649 0%, #F34E45 100%);
+				border-radius: 50rpx;
+				text-align: center;
+				line-height: 70rpx;
+
+				&.disabled {
+					background-color: #cccccc;
+				}
+			}
+
+			.transparent {
+				opacity: 0
+			}
+
+		}
+
+		.settel {
+			width: 100%;
+			background-color: #fff;
+			height: 70px;
+			padding: 0 15px 0 15px;
+			line-height: 70px;
+
+			.settel-t {
+				width: 100%;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+			}
+
+			.con_text {
+				display: flex;
+				justify-content: flex-end;
+				height: 20px;
+				margin: auto;
+				line-height: 30px;
+			}
+
+
+		}
+
+	}
+</style>
\ No newline at end of file
diff --git a/pages/users/supply_procurement/index.vue b/pages/users/supply_procurement/index.vue
new file mode 100644
index 0000000..b968269
--- /dev/null
+++ b/pages/users/supply_procurement/index.vue
@@ -0,0 +1,75 @@
+<template>
+	<view class="conent">
+		<view class="con_kuo" @click="navigator(`/pages/nongKe/supply_chain/supplier?type_id=12&isDetail=1&product_type=98&cate_id=${id}`)">
+			<image class="con_img" src="@/static/images/bg1.png" mode=""></image>
+			<image class="con_ico" src="@/static/images/bgic1.png" mode=""></image>
+			<view class="con_text">
+				<h3>先款后货</h3>
+				<span>先付款后发货</span>
+			</view>
+		</view>
+		<view class="con_kuo"  @click="navigator(`/pages/nongKe/supply_chain/supplier?type_id=12&isDetail=1&product_type=98&cate_id=${id}&credit_buy=1`)">
+			<image class="con_img" src="@/static/images/bg2.png" mode=""></image>
+			<image  class="con_ico" src="@/static/images/bgic2.png" mode=""></image>
+			<view class="con_text">
+				<h3>先货后款</h3>
+				<span>先发货后付款</span>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data(){
+			return{
+				id:''
+			}
+		},
+		onLoad(option) {
+			
+			this.id=option.cate_id
+		},
+		methods:{
+			navigator(url, t) {
+				uni.navigateTo({
+					url: url
+				})
+			},
+		}
+	}
+
+</script>
+
+<style lang="scss" scoped>
+	*{
+		padding: 0;
+		margin: 0;
+	}
+	.conent{
+		width: 100%;
+		display: flex;
+		justify-content: space-around;
+		margin-top: 20px;
+		.con_kuo{
+			position: relative;
+			.con_img{
+				width: 192px;
+				height: 92px;
+			}
+			.con_ico{
+				position: absolute;
+				left: 25px;
+				top: 32px;
+				width: 31px;
+				height: 32px;
+			}
+			.con_text{
+				position: absolute;
+				left: 66px;
+				top: 20px;
+				color: white;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/users/trading_hall/index.vue b/pages/users/trading_hall/index.vue
new file mode 100644
index 0000000..dbfe411
--- /dev/null
+++ b/pages/users/trading_hall/index.vue
@@ -0,0 +1,460 @@
+<template>
+	<view>
+		<view class="content-header">
+			<view class="header">
+				<view class="top-header">
+					<view class="search">
+						<view class="search-content acea-row row-middle">
+							<text class="iconfont icon-sousuo"></text>
+							<input v-model="where.keyword" confirm-type="search" placeholder="请输入关键字" class="input" />
+							<view class="search_btn">
+								<image src="@/static/images/serchbtn.png" mode="aspectFill" @click="handleSearch">
+								</image>
+
+							</view>
+						</view>
+
+					</view>
+				</view>
+				<view class="recom">
+					<view class="recom_bnt">
+						<rudon-rowMenuDotDotDot :localdata="options" @change="menuAction($event)"
+							style="color: #000000;">
+							<view class="" style="color: #F84221;">
+								{{this.recomname}}
+							</view>
+							<view class="recom_sym">
+								<image src='@/static/images/arrow-bottom.png' mode="aspectFit"></image>
+							</view>
+						</rudon-rowMenuDotDotDot>
+					</view>
+				</view>
+			</view>
+			<view class="type_switch">
+				<view class="recom_mend" v-for="(item,i) in options" :key="i" :class="i==num?'tradcolor':''"
+					@click="btntap(i)">
+					{{item.text}}
+
+					<view :class="i==num?'tradline':''"></view>
+				</view>
+			</view>
+
+
+		</view>
+		<view class="list">
+			<view class="item" v-for='(item,index) in datatlist' :key='index' @click="shopping(item)">
+
+				<image class="shopimg" :src="item.image[0]" mode="aspectFit"></image>
+				<view class="item_text">
+					<span v-if='item.resale_type==1'>调货</span>
+					<span v-else>打折</span>
+					{{item.title}}
+				</view>
+				<view class="item_prices">
+					<span>￥</span>{{item.total_price}}
+
+				</view>
+				<view class="item_name">
+					<image class="avater" :src="item.mer_avatar" mode="aspectFit"></image>
+					<view class="item_name_text">
+						{{item.mer_name}}
+					</view>
+				</view>
+			</view>
+		</view>
+
+
+		<view class="tardimg_add" @click="open">
+			<!-- <img src="@/static/images/trad-add.png" mode="widthFix" alt=""> -->
+			<image src="@/static/images/trad-add.png" mode="aspectFit"></image>
+		</view>
+
+		<release :isShow='visible' :bottom='true' @close="closeMadle" @cancel="cancel" @confirm="confirm"
+			style="z-index: 999999!important;"></release>
+
+
+		<view class="empty_wrapper" v-if="emptyShow">
+			<u-empty :show="emptyShow" mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png"></u-empty>
+		</view>
+		<u-loadmore :status="status" v-if="datatlist.length>0"/>
+
+	</view>
+</template>
+
+<script>
+	import {
+		getCommunityList,
+		getCommunitygetOrderList
+	} from '@/api/trading-floor.js'
+	import {
+		data,
+		methods
+	} from '../../../uni_modules/uview-ui/libs/mixin/mixin'
+	import release from '@/components/release/release.vue';
+	import emptyPage from '@/components/emptyPage.vue';
+	export default {
+		components: {
+			release,
+			emptyPage
+		},
+		data() {
+			return {
+				status: 'loadmore',
+				where: {
+					page: 1,
+					limit: 10,
+					is_type: 3,
+					keyword: '',
+
+				},
+
+				visible: false,
+				num: 0,
+				options: [{
+						value: '0',
+						text: '推荐'
+					},
+					{
+						value: '1',
+						text: '调货'
+					},
+					{
+						value: '2',
+						text: '打折专区'
+					}
+				],
+				datatlist: [],
+				recomname: '',
+				emptyShow: false,
+			}
+		},
+		onLoad() {
+			this.getlist()
+		},
+		onReachBottom() {
+			if (this.status == 'nomore') return;
+			this.status = 'loading';
+			this.where.page = ++this.where.page;
+			this.getlist(this.num)
+		},
+		methods: {
+			
+
+			//选择 打折  调货 
+			btntap(index) {
+				this.num = index
+				this.getlist()
+			},
+			//商品详情
+			shopping(item) {
+
+				let data = {
+					type: item.resale_type,
+					id: item.community_id
+				}
+				uni.navigateTo({
+					url: '/pages/trading_hall/product_details/index?key=' + encodeURIComponent(JSON.stringify(
+						data))
+				})
+			},
+			//控制 发布弹窗
+			open() {
+				this.visible = true
+
+			},
+
+			//查询
+			handleSearch() {
+				if (this.num == 0) {
+					this.where.resale_type = ''
+				} else if (this.num == 1) {
+					this.where.resale_type = 1
+				} else {
+					this.where.resale_type = 2
+				}
+
+				getCommunityList(this.where).then(res => {
+					if (res.status == 200) {
+						this.datatlist.push(...res.data.list)
+						if (res.data.list.length < this.where.limit) this.status = 'nomore'
+						if (this.where.page == 1 && res.data.list.length <= 0) this.emptyShow = true
+					}
+
+				})
+
+			},
+			//列表
+			getlist(index) {
+				if (this.num == 0) {
+					this.where.resale_type = ''
+					this.datatlist=[]
+				} else if (this.num == 1) {
+					this.where.resale_type = 1
+						this.datatlist=[]
+				} else {
+					this.where.resale_type = 2
+				    this.datatlist=[]
+				}
+				getCommunityList(this.where).then(res => {
+					if (res.status == 200) {
+						this.datatlist.push(...res.data.list)
+						if (res.data.list.length < this.where.limit) this.status = 'nomore'
+						if (this.where.page == 1 && res.data.list.length <= 0) this.emptyShow = true
+					}
+
+				})
+
+			},
+			closeMadle() {
+				this.visible = false
+
+			},
+			confirm() {
+				// 这里调用接口执行点击确定后的操作并关闭弹窗
+				console.log('点击了确认按钮')
+				this.visible = false
+			},
+			cancel() {
+				// 点击了取消按钮直接关闭弹窗
+				console.log('点击了取消按钮')
+				this.visible = false
+			},
+			menuAction(action, rowId) {
+				// console.log(action);
+				// 忽略初始化时的传入的空操作
+				this.num = action
+				this.getlist(action)
+				if (action === '') {
+					this.recomname = this.options[0].text
+				} else {
+					this.recomname = this.options[action].text
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content-header {
+		position: absolute;
+		position: fixed;
+		top: 0;
+		z-index: 8888;
+	}
+
+	.header {
+		width: 100%;
+		display: flex;
+		justify-content: flex-start;
+		align-items: center;
+		background-color: #fff;
+
+		.top-header {
+
+			width: 80%;
+
+			.search {
+				padding: 17rpx 30rpx;
+
+				.search-content {
+					width: 100%;
+					height: 60rpx;
+					padding-left: 30rpx;
+					border-radius: 30rpx;
+					background-color: #F5F5F5;
+					font-size: 26rpx;
+				}
+
+				.iconfont {
+					margin-right: 10rpx;
+					font-size: 26rpx;
+					color: #999999;
+				}
+
+				.input-placeholder {
+					font-size: 26rpx;
+					color: #999999;
+				}
+
+				.input {
+					flex: 1;
+				}
+
+				.search_btn {
+					width: 98rpx;
+					height: 60rpx;
+
+					margin-left: 20rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+			}
+
+
+
+		}
+
+		.recom {
+			width: 200rpx;
+			margin-right: 39rpx;
+			height: 60rpx;
+			text-align: center;
+			border-radius: 30px;
+			border: 1px solid #F84221;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+
+			.recom_bnt {
+				font-size: 32rpx;
+				font-family: 'PingFang SC';
+				font-weight: 400;
+
+
+				.recom_sym {
+					width: 28rpx;
+					height: 28rpx;
+					margin-left: 0rpx;
+
+					image {
+						width: 28rpx;
+						height: 28rpx;
+						margin-left: 10rpx;
+					}
+				}
+			}
+		}
+
+	}
+
+
+	.type_switch {
+		display: flex;
+		justify-content: space-around;
+		padding-top: 17rpx;
+		font-size: 32rpx;
+		background-color: #fff;
+		font-weight: 500;
+		color: #999999;
+		padding-bottom: 10rpx;
+
+		.tradcolor {
+			color: #F84221;
+		}
+
+		.tradline {
+			width: 26rpx;
+			height: 4rpx;
+			opacity: 1;
+			background-color: #F84221;
+			margin: 0 auto;
+		}
+	}
+
+	.tardimg_add {
+		position: absolute;
+		bottom: 193rpx;
+		right: 0rpx;
+		position: fixed;
+		width: 176rpx;
+		height: 176rpx;
+
+		image {
+			width: 100%;
+			width: 100%;
+		}
+	}
+
+	.list {
+		width: 694.74rpx;
+		margin: 0 auto;
+		display: flex;
+		margin-bottom: 21rpx;
+		justify-content: space-between;
+		align-items: center;
+		flex-wrap: wrap;
+		margin-top: 170rpx;
+
+
+		.item {
+			width: 336rpx;
+			height: 561rpx;
+			background-color: #fff;
+			margin-top: 21rpx;
+
+			border-radius: 14rpx 14rpx 0 0;
+
+			.shopimg {
+				width: 336rpx;
+				height: 314rpx
+			}
+
+			.item_text {
+				width: 100%;
+				padding-left: 25rpx;
+				padding-right: 25rpx;
+				margin-top: 19rpx;
+
+				margin-bottom: 20rpx;
+				text-overflow: ellipsis;
+				overflow: hidden;
+				white-space: nowrap;
+
+				span {
+					height: 35rpx;
+					width: 100%;
+					padding: 3px;
+					margin: 2px;
+					background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
+					border-radius: 7px 0px 7px 0px;
+					font-weight: 400;
+					color: #FFFFFF;
+					font-size: 25rpx;
+					margin-right: 15rpx;
+				}
+			}
+
+			.item_prices {
+				font-size: 18px;
+				color: #F84221;
+				padding-left: 15px;
+				padding-bottom: 18rpx;
+				border-bottom: 1px solid #707070;
+
+			}
+
+			.item_name {
+				width: 100%;
+				padding-left: 15rpx;
+				display: flex;
+
+				font-size: 28rpx;
+				font-family: 'PingFang SC';
+				font-weight: 400;
+				color: #333333;
+
+				.avater {
+					width: 60rpx;
+					height: 60rpx;
+					border-radius: 50%;
+					margin-top: 19rpx;
+					margin-right: 10rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
+						display: block;
+
+					}
+				}
+
+				.item_name_text {
+					margin-top: 30rpx;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/static/iconfont/icontan.css b/static/iconfont/icontan.css
new file mode 100644
index 0000000..60c97bc
--- /dev/null
+++ b/static/iconfont/icontan.css
@@ -0,0 +1,82 @@
+@font-face {
+  font-family: "icontan"; /* Project id 3552766 */
+  src: url('//at.alicdn.com/t/c/font_3552766_bmogttr4zyj.woff2?t=1688542944134') format('woff2'),
+       url('//at.alicdn.com/t/c/font_3552766_bmogttr4zyj.woff?t=1688542944134') format('woff'),
+       url('//at.alicdn.com/t/c/font_3552766_bmogttr4zyj.ttf?t=1688542944134') format('truetype');
+}
+
+.icontan {
+  font-family: "icontan" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.tan-a-lujing17324:before {
+  content: "\e602";
+}
+
+.tan-xianhuo:before {
+  content: "\e601";
+}
+
+.tan-dianpu:before {
+  content: "\e600";
+}
+
+.tan-clock:before {
+  content: "\e627";
+}
+
+.tan-ditu_dingwei_o:before {
+  content: "\ebbb";
+}
+
+.tan-f24gl-telephone:before {
+  content: "\e953";
+}
+
+.tan-sound-Mute:before {
+  content: "\e766";
+}
+
+.tan-vehivles:before {
+  content: "\e76b";
+}
+
+.tan-shoes:before {
+  content: "\e76c";
+}
+
+.tan-aviation:before {
+  content: "\e770";
+}
+
+.tan-landtransportation:before {
+  content: "\e773";
+}
+
+.tan-dingwei:before {
+  content: "\e8c4";
+}
+
+.tan-favorites-fill:before {
+  content: "\e721";
+}
+
+.tan-rmb:before {
+  content: "\e761";
+}
+
+.tan-scanning:before {
+  content: "\e762";
+}
+
+.tan-raw:before {
+  content: "\e75e";
+}
+
+.tan-service:before {
+  content: "\e764";
+}
diff --git a/static/images/GRZX/BG.png b/static/images/GRZX/BG.png
new file mode 100644
index 0000000..e40b080
Binary files /dev/null and b/static/images/GRZX/BG.png differ
diff --git a/static/images/GRZX/DFH.png b/static/images/GRZX/DFH.png
new file mode 100644
index 0000000..0d592ac
Binary files /dev/null and b/static/images/GRZX/DFH.png differ
diff --git a/static/images/GRZX/DFK.png b/static/images/GRZX/DFK.png
new file mode 100644
index 0000000..df28e06
Binary files /dev/null and b/static/images/GRZX/DFK.png differ
diff --git a/static/images/GRZX/DPJ.png b/static/images/GRZX/DPJ.png
new file mode 100644
index 0000000..587f2ce
Binary files /dev/null and b/static/images/GRZX/DPJ.png differ
diff --git a/static/images/GRZX/DSH.png b/static/images/GRZX/DSH.png
new file mode 100644
index 0000000..899c3b7
Binary files /dev/null and b/static/images/GRZX/DSH.png differ
diff --git a/static/images/GRZX/KF.png b/static/images/GRZX/KF.png
new file mode 100644
index 0000000..464955b
Binary files /dev/null and b/static/images/GRZX/KF.png differ
diff --git a/static/images/GRZX/SH.png b/static/images/GRZX/SH.png
new file mode 100644
index 0000000..010ba1c
Binary files /dev/null and b/static/images/GRZX/SH.png differ
diff --git a/static/images/GRZX/SZ.png b/static/images/GRZX/SZ.png
new file mode 100644
index 0000000..4348966
Binary files /dev/null and b/static/images/GRZX/SZ.png differ
diff --git a/static/images/GZT/BG.png b/static/images/GZT/BG.png
new file mode 100644
index 0000000..f660a31
Binary files /dev/null and b/static/images/GZT/BG.png differ
diff --git a/static/images/GZT/DDGL.png b/static/images/GZT/DDGL.png
new file mode 100644
index 0000000..aace7ea
Binary files /dev/null and b/static/images/GZT/DDGL.png differ
diff --git a/static/images/GZT/DDHX.png b/static/images/GZT/DDHX.png
new file mode 100644
index 0000000..fe482a8
Binary files /dev/null and b/static/images/GZT/DDHX.png differ
diff --git a/static/images/GZT/DDHX1.png b/static/images/GZT/DDHX1.png
new file mode 100644
index 0000000..097c705
Binary files /dev/null and b/static/images/GZT/DDHX1.png differ
diff --git a/static/images/GZT/FBGL.png b/static/images/GZT/FBGL.png
new file mode 100644
index 0000000..b5c6a14
Binary files /dev/null and b/static/images/GZT/FBGL.png differ
diff --git a/static/images/GZT/GHCG.png b/static/images/GZT/GHCG.png
new file mode 100644
index 0000000..4bf1198
Binary files /dev/null and b/static/images/GZT/GHCG.png differ
diff --git a/static/images/GZT/JHGL.png b/static/images/GZT/JHGL.png
new file mode 100644
index 0000000..e9c71fe
Binary files /dev/null and b/static/images/GZT/JHGL.png differ
diff --git a/static/images/GZT/JYDT.png b/static/images/GZT/JYDT.png
new file mode 100644
index 0000000..77473ab
Binary files /dev/null and b/static/images/GZT/JYDT.png differ
diff --git a/static/images/GZT/KFJL.png b/static/images/GZT/KFJL.png
new file mode 100644
index 0000000..82ce5ff
Binary files /dev/null and b/static/images/GZT/KFJL.png differ
diff --git a/static/images/GZT/RKGL.png b/static/images/GZT/RKGL.png
new file mode 100644
index 0000000..218620a
Binary files /dev/null and b/static/images/GZT/RKGL.png differ
diff --git a/static/images/GZT/SHSZ.png b/static/images/GZT/SHSZ.png
new file mode 100644
index 0000000..5b28957
Binary files /dev/null and b/static/images/GZT/SHSZ.png differ
diff --git a/static/images/GZT/SMCK.png b/static/images/GZT/SMCK.png
new file mode 100644
index 0000000..76f0338
Binary files /dev/null and b/static/images/GZT/SMCK.png differ
diff --git a/static/images/GZT/SMCK1.png b/static/images/GZT/SMCK1.png
new file mode 100644
index 0000000..0f816a9
Binary files /dev/null and b/static/images/GZT/SMCK1.png differ
diff --git a/static/images/GZT/SPGL.png b/static/images/GZT/SPGL.png
new file mode 100644
index 0000000..4af08e1
Binary files /dev/null and b/static/images/GZT/SPGL.png differ
diff --git a/static/images/GZT/TXGL.png b/static/images/GZT/TXGL.png
new file mode 100644
index 0000000..79f603f
Binary files /dev/null and b/static/images/GZT/TXGL.png differ
diff --git a/static/images/GZT/WDDP.png b/static/images/GZT/WDDP.png
new file mode 100644
index 0000000..3fac232
Binary files /dev/null and b/static/images/GZT/WDDP.png differ
diff --git a/static/images/GZT/WTXS.png b/static/images/GZT/WTXS.png
new file mode 100644
index 0000000..cfb45ad
Binary files /dev/null and b/static/images/GZT/WTXS.png differ
diff --git a/static/images/SHSZ/BKQS.png b/static/images/SHSZ/BKQS.png
new file mode 100644
index 0000000..a3e2d78
Binary files /dev/null and b/static/images/SHSZ/BKQS.png differ
diff --git a/static/images/SHSZ/BZ.png b/static/images/SHSZ/BZ.png
new file mode 100644
index 0000000..056446e
Binary files /dev/null and b/static/images/SHSZ/BZ.png differ
diff --git a/static/images/SHSZ/BZ1.png b/static/images/SHSZ/BZ1.png
new file mode 100644
index 0000000..54506f0
Binary files /dev/null and b/static/images/SHSZ/BZ1.png differ
diff --git a/static/images/SHSZ/DPPZ.png b/static/images/SHSZ/DPPZ.png
new file mode 100644
index 0000000..ca03695
Binary files /dev/null and b/static/images/SHSZ/DPPZ.png differ
diff --git a/static/images/SHSZ/DW.png b/static/images/SHSZ/DW.png
new file mode 100644
index 0000000..66ef5e3
Binary files /dev/null and b/static/images/SHSZ/DW.png differ
diff --git a/static/images/SHSZ/FHPZ.png b/static/images/SHSZ/FHPZ.png
new file mode 100644
index 0000000..2749278
Binary files /dev/null and b/static/images/SHSZ/FHPZ.png differ
diff --git a/static/images/SHSZ/JBPZ.png b/static/images/SHSZ/JBPZ.png
new file mode 100644
index 0000000..b88e0f0
Binary files /dev/null and b/static/images/SHSZ/JBPZ.png differ
diff --git a/static/images/SHSZ/SCBJ.png b/static/images/SHSZ/SCBJ.png
new file mode 100644
index 0000000..eeff659
Binary files /dev/null and b/static/images/SHSZ/SCBJ.png differ
diff --git a/static/images/SHSZ/SGQL.png b/static/images/SHSZ/SGQL.png
new file mode 100644
index 0000000..358606f
Binary files /dev/null and b/static/images/SHSZ/SGQL.png differ
diff --git a/static/images/SHSZ/SLDP.png b/static/images/SHSZ/SLDP.png
new file mode 100644
index 0000000..ea4bbd3
Binary files /dev/null and b/static/images/SHSZ/SLDP.png differ
diff --git a/static/images/SHSZ/YYZZ.png b/static/images/SHSZ/YYZZ.png
new file mode 100644
index 0000000..d047006
Binary files /dev/null and b/static/images/SHSZ/YYZZ.png differ
diff --git a/static/images/SHSZ/ZPMH.png b/static/images/SHSZ/ZPMH.png
new file mode 100644
index 0000000..ce2d33c
Binary files /dev/null and b/static/images/SHSZ/ZPMH.png differ
diff --git a/static/images/SJRZ/CG.png b/static/images/SJRZ/CG.png
new file mode 100644
index 0000000..1a4a8dc
Binary files /dev/null and b/static/images/SJRZ/CG.png differ
diff --git a/static/images/SJRZ/CGBZ.png b/static/images/SJRZ/CGBZ.png
new file mode 100644
index 0000000..ab775ee
Binary files /dev/null and b/static/images/SJRZ/CGBZ.png differ
diff --git a/static/images/SJRZ/DSH.png b/static/images/SJRZ/DSH.png
new file mode 100644
index 0000000..29f0623
Binary files /dev/null and b/static/images/SJRZ/DSH.png differ
diff --git a/static/images/SJRZ/FH.png b/static/images/SJRZ/FH.png
new file mode 100644
index 0000000..3bacef0
Binary files /dev/null and b/static/images/SJRZ/FH.png differ
diff --git a/static/images/SJRZ/JL.png b/static/images/SJRZ/JL.png
new file mode 100644
index 0000000..3fc883d
Binary files /dev/null and b/static/images/SJRZ/JL.png differ
diff --git a/static/images/SJRZ/SB.png b/static/images/SJRZ/SB.png
new file mode 100644
index 0000000..7cb9b86
Binary files /dev/null and b/static/images/SJRZ/SB.png differ
diff --git a/static/images/SJRZ/SBBZ.png b/static/images/SJRZ/SBBZ.png
new file mode 100644
index 0000000..73ec1c4
Binary files /dev/null and b/static/images/SJRZ/SBBZ.png differ
diff --git a/static/images/SJRZ/SB_a.png b/static/images/SJRZ/SB_a.png
new file mode 100644
index 0000000..d7864d1
Binary files /dev/null and b/static/images/SJRZ/SB_a.png differ
diff --git a/static/images/SJRZ/TIT.png b/static/images/SJRZ/TIT.png
new file mode 100644
index 0000000..af9a145
Binary files /dev/null and b/static/images/SJRZ/TIT.png differ
diff --git a/static/images/SJRZ/bg.png b/static/images/SJRZ/bg.png
new file mode 100644
index 0000000..e487c8a
Binary files /dev/null and b/static/images/SJRZ/bg.png differ
diff --git a/static/images/SJRZ/main_tit.png b/static/images/SJRZ/main_tit.png
new file mode 100644
index 0000000..25ce5e7
Binary files /dev/null and b/static/images/SJRZ/main_tit.png differ
diff --git a/static/images/SJRZ/succes.png b/static/images/SJRZ/succes.png
new file mode 100644
index 0000000..68c3e4b
Binary files /dev/null and b/static/images/SJRZ/succes.png differ
diff --git a/static/images/arrow-bottom.png b/static/images/arrow-bottom.png
new file mode 100644
index 0000000..25a4aa8
Binary files /dev/null and b/static/images/arrow-bottom.png differ
diff --git a/static/images/beijin.png b/static/images/beijin.png
new file mode 100644
index 0000000..5cae1e7
Binary files /dev/null and b/static/images/beijin.png differ
diff --git a/static/images/bg1.png b/static/images/bg1.png
new file mode 100644
index 0000000..8146a52
Binary files /dev/null and b/static/images/bg1.png differ
diff --git a/static/images/bg2.png b/static/images/bg2.png
new file mode 100644
index 0000000..feb62ae
Binary files /dev/null and b/static/images/bg2.png differ
diff --git a/static/images/bgic1.png b/static/images/bgic1.png
new file mode 100644
index 0000000..f4ccad2
Binary files /dev/null and b/static/images/bgic1.png differ
diff --git a/static/images/bgic2.png b/static/images/bgic2.png
new file mode 100644
index 0000000..8aa55f6
Binary files /dev/null and b/static/images/bgic2.png differ
diff --git a/static/images/close.png b/static/images/close.png
new file mode 100644
index 0000000..2bb7c86
Binary files /dev/null and b/static/images/close.png differ
diff --git a/static/images/daoru.png b/static/images/daoru.png
new file mode 100644
index 0000000..e3a669e
Binary files /dev/null and b/static/images/daoru.png differ
diff --git a/static/images/ddjk.png b/static/images/ddjk.png
new file mode 100644
index 0000000..7529c03
Binary files /dev/null and b/static/images/ddjk.png differ
diff --git a/static/images/diaohuo.png b/static/images/diaohuo.png
new file mode 100644
index 0000000..132b867
Binary files /dev/null and b/static/images/diaohuo.png differ
diff --git a/static/images/discounts.png b/static/images/discounts.png
new file mode 100644
index 0000000..9b5ff9c
Binary files /dev/null and b/static/images/discounts.png differ
diff --git a/static/images/fabu.png b/static/images/fabu.png
new file mode 100644
index 0000000..a71d25b
Binary files /dev/null and b/static/images/fabu.png differ
diff --git a/static/images/index/DW.png b/static/images/index/DW.png
new file mode 100644
index 0000000..7b45edc
Binary files /dev/null and b/static/images/index/DW.png differ
diff --git a/static/images/index/GWC.png b/static/images/index/GWC.png
new file mode 100644
index 0000000..3210a6c
Binary files /dev/null and b/static/images/index/GWC.png differ
diff --git a/static/images/index/KF.png b/static/images/index/KF.png
new file mode 100644
index 0000000..2fc2cf2
Binary files /dev/null and b/static/images/index/KF.png differ
diff --git a/static/images/index/PEN.png b/static/images/index/PEN.png
new file mode 100644
index 0000000..0627f8d
Binary files /dev/null and b/static/images/index/PEN.png differ
diff --git a/static/images/index/SS.png b/static/images/index/SS.png
new file mode 100644
index 0000000..4ef601e
Binary files /dev/null and b/static/images/index/SS.png differ
diff --git a/static/images/isshow.png b/static/images/isshow.png
new file mode 100644
index 0000000..310e51e
Binary files /dev/null and b/static/images/isshow.png differ
diff --git a/static/images/jiankong.png b/static/images/jiankong.png
new file mode 100644
index 0000000..b25184b
Binary files /dev/null and b/static/images/jiankong.png differ
diff --git a/static/images/loction.png b/static/images/loction.png
new file mode 100644
index 0000000..1f394cc
Binary files /dev/null and b/static/images/loction.png differ
diff --git a/static/images/season.png b/static/images/season.png
new file mode 100644
index 0000000..d2568dd
Binary files /dev/null and b/static/images/season.png differ
diff --git a/static/images/serch.png b/static/images/serch.png
new file mode 100644
index 0000000..9dd2354
Binary files /dev/null and b/static/images/serch.png differ
diff --git a/static/images/serchbtn.png b/static/images/serchbtn.png
new file mode 100644
index 0000000..d6138db
Binary files /dev/null and b/static/images/serchbtn.png differ
diff --git a/static/images/shop.png b/static/images/shop.png
new file mode 100644
index 0000000..d1561fd
Binary files /dev/null and b/static/images/shop.png differ
diff --git a/static/images/shouhuo.png b/static/images/shouhuo.png
new file mode 100644
index 0000000..b40bd73
Binary files /dev/null and b/static/images/shouhuo.png differ
diff --git a/static/images/show.png b/static/images/show.png
new file mode 100644
index 0000000..46f80e2
Binary files /dev/null and b/static/images/show.png differ
diff --git a/static/images/sjtj.png b/static/images/sjtj.png
new file mode 100644
index 0000000..6454bca
Binary files /dev/null and b/static/images/sjtj.png differ
diff --git a/static/images/sym.png b/static/images/sym.png
new file mode 100644
index 0000000..9a5d259
Binary files /dev/null and b/static/images/sym.png differ
diff --git a/static/images/tabbar/BDSH.png b/static/images/tabbar/BDSH.png
new file mode 100644
index 0000000..e057896
Binary files /dev/null and b/static/images/tabbar/BDSH.png differ
diff --git a/static/images/tabbar/DH.png b/static/images/tabbar/DH.png
new file mode 100644
index 0000000..f2b4776
Binary files /dev/null and b/static/images/tabbar/DH.png differ
diff --git a/static/images/tabbar/DW.png b/static/images/tabbar/DW.png
new file mode 100644
index 0000000..a2a02bf
Binary files /dev/null and b/static/images/tabbar/DW.png differ
diff --git a/static/images/tabbar/GWC.png b/static/images/tabbar/GWC.png
new file mode 100644
index 0000000..5310dac
Binary files /dev/null and b/static/images/tabbar/GWC.png differ
diff --git a/static/images/tabbar/GY.png b/static/images/tabbar/GY.png
new file mode 100644
index 0000000..852233f
Binary files /dev/null and b/static/images/tabbar/GY.png differ
diff --git a/static/images/tabbar/GY1.png b/static/images/tabbar/GY1.png
new file mode 100644
index 0000000..37560ad
Binary files /dev/null and b/static/images/tabbar/GY1.png differ
diff --git a/static/images/tabbar/GZT.png b/static/images/tabbar/GZT.png
new file mode 100644
index 0000000..c3963ba
Binary files /dev/null and b/static/images/tabbar/GZT.png differ
diff --git a/static/images/tabbar/GZT1.png b/static/images/tabbar/GZT1.png
new file mode 100644
index 0000000..52f89d7
Binary files /dev/null and b/static/images/tabbar/GZT1.png differ
diff --git a/static/images/tabbar/JD.png b/static/images/tabbar/JD.png
new file mode 100644
index 0000000..1c72ce3
Binary files /dev/null and b/static/images/tabbar/JD.png differ
diff --git a/static/images/tabbar/PF.png b/static/images/tabbar/PF.png
new file mode 100644
index 0000000..ebfb755
Binary files /dev/null and b/static/images/tabbar/PF.png differ
diff --git a/static/images/tabbar/SCFW.png b/static/images/tabbar/SCFW.png
new file mode 100644
index 0000000..6d2b508
Binary files /dev/null and b/static/images/tabbar/SCFW.png differ
diff --git a/static/images/tabbar/SHFW.png b/static/images/tabbar/SHFW.png
new file mode 100644
index 0000000..005ee11
Binary files /dev/null and b/static/images/tabbar/SHFW.png differ
diff --git a/static/images/tabbar/SJ.png b/static/images/tabbar/SJ.png
new file mode 100644
index 0000000..c682b08
Binary files /dev/null and b/static/images/tabbar/SJ.png differ
diff --git a/static/images/tabbar/WD.png b/static/images/tabbar/WD.png
new file mode 100644
index 0000000..9c23696
Binary files /dev/null and b/static/images/tabbar/WD.png differ
diff --git a/static/images/tabbar/WD1.png b/static/images/tabbar/WD1.png
new file mode 100644
index 0000000..1331fc6
Binary files /dev/null and b/static/images/tabbar/WD1.png differ
diff --git a/static/images/tabbar/XX.png b/static/images/tabbar/XX.png
new file mode 100644
index 0000000..e77d376
Binary files /dev/null and b/static/images/tabbar/XX.png differ
diff --git a/static/images/tabbar/YCBG.png b/static/images/tabbar/YCBG.png
new file mode 100644
index 0000000..2048994
Binary files /dev/null and b/static/images/tabbar/YCBG.png differ
diff --git a/static/images/tabbar/YCGG.png b/static/images/tabbar/YCGG.png
new file mode 100644
index 0000000..bfd24de
Binary files /dev/null and b/static/images/tabbar/YCGG.png differ
diff --git a/static/images/tabbar/ZY.png b/static/images/tabbar/ZY.png
new file mode 100644
index 0000000..cef4a33
Binary files /dev/null and b/static/images/tabbar/ZY.png differ
diff --git a/static/images/tabbar/ZY1.png b/static/images/tabbar/ZY1.png
new file mode 100644
index 0000000..a41b859
Binary files /dev/null and b/static/images/tabbar/ZY1.png differ
diff --git a/static/images/tabbar/a-a.png b/static/images/tabbar/a-a.png
new file mode 100644
index 0000000..89b7e43
Binary files /dev/null and b/static/images/tabbar/a-a.png differ
diff --git a/static/images/tabbar/a.png b/static/images/tabbar/a.png
new file mode 100644
index 0000000..ae60e2c
Binary files /dev/null and b/static/images/tabbar/a.png differ
diff --git a/static/images/tabbar/b-a.png b/static/images/tabbar/b-a.png
new file mode 100644
index 0000000..c477790
Binary files /dev/null and b/static/images/tabbar/b-a.png differ
diff --git a/static/images/tabbar/b.png b/static/images/tabbar/b.png
new file mode 100644
index 0000000..4fb3ab9
Binary files /dev/null and b/static/images/tabbar/b.png differ
diff --git a/static/images/tabbar/c-a.png b/static/images/tabbar/c-a.png
new file mode 100644
index 0000000..c3501e3
Binary files /dev/null and b/static/images/tabbar/c-a.png differ
diff --git a/static/images/tabbar/c.png b/static/images/tabbar/c.png
new file mode 100644
index 0000000..8d184d3
Binary files /dev/null and b/static/images/tabbar/c.png differ
diff --git a/static/images/tabbar/d-2.png b/static/images/tabbar/d-2.png
new file mode 100644
index 0000000..2609082
Binary files /dev/null and b/static/images/tabbar/d-2.png differ
diff --git a/static/images/tabbar/d-a.png b/static/images/tabbar/d-a.png
new file mode 100644
index 0000000..03e6599
Binary files /dev/null and b/static/images/tabbar/d-a.png differ
diff --git a/static/images/tabbar/d.png b/static/images/tabbar/d.png
new file mode 100644
index 0000000..0ad3e83
Binary files /dev/null and b/static/images/tabbar/d.png differ
diff --git a/static/images/tabbar/e-a.png b/static/images/tabbar/e-a.png
new file mode 100644
index 0000000..81392a2
Binary files /dev/null and b/static/images/tabbar/e-a.png differ
diff --git a/static/images/tabbar/e.png b/static/images/tabbar/e.png
new file mode 100644
index 0000000..2eb0788
Binary files /dev/null and b/static/images/tabbar/e.png differ
diff --git a/static/images/tabbar/iconfont.css b/static/images/tabbar/iconfont.css
new file mode 100644
index 0000000..01f51bf
--- /dev/null
+++ b/static/images/tabbar/iconfont.css
@@ -0,0 +1,232 @@
+@font-face {
+  font-family: "iconfont2";
+  /* Project id 3861260 */
+  src: url('//at.alicdn.com/t/c/font_3861260_kcyv21x2z6e.woff2?t=1683356048406') format('woff2'),
+    url('//at.alicdn.com/t/c/font_3861260_kcyv21x2z6e.woff?t=1683356048406') format('woff'),
+    url('//at.alicdn.com/t/c/font_3861260_kcyv21x2z6e.ttf?t=1683356048406') format('truetype'),
+    url('//at.alicdn.com/t/c/font_3861260_kcyv21x2z6e.svg?t=1683356048406#iconfont2') format('svg');
+}
+
+.iconfont2 {
+  font-family: "iconfont2" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.custom-icona-zu2901:before {
+  content: "\e648";
+}
+
+.custom-iconoasa1:before {
+  content: "\e649";
+}
+
+.custom-icongengduo:before {
+  content: "\e64a";
+}
+
+.custom-iconyijian:before {
+  content: "\e644";
+}
+
+.custom-icongongzi:before {
+  content: "\e645";
+}
+
+.custom-iconwendang:before {
+  content: "\e646";
+}
+
+.custom-iconweixin:before {
+  content: "\e647";
+}
+
+.custom-iconoaha:before {
+  content: "\e634";
+}
+
+.custom-iconoamy:before {
+  content: "\e635";
+}
+
+.custom-iconoamya:before {
+  content: "\e63e";
+}
+
+.custom-iconoasa:before {
+  content: "\e63f";
+}
+
+.custom-iconoara:before {
+  content: "\e640";
+}
+
+.custom-iconoar:before {
+  content: "\e641";
+}
+
+.custom-iconoah:before {
+  content: "\e642";
+}
+
+.custom-iconoas:before {
+  content: "\e643";
+}
+
+.custom-iconhangye:before {
+  content: "\e636";
+}
+
+.custom-iconhangye-a:before {
+  content: "\e637";
+}
+
+.custom-iconxinwen:before {
+  content: "\e638";
+}
+
+.custom-icongonying:before {
+  content: "\e639";
+}
+
+.custom-icongonying-a:before {
+  content: "\e63a";
+}
+
+.custom-iconmy-a:before {
+  content: "\e63b";
+}
+
+.custom-iconxiaoxi-a:before {
+  content: "\e63c";
+}
+
+.custom-iconmy:before {
+  content: "\e63d";
+}
+
+.custom-iconchuang:before {
+  content: "\e631";
+}
+
+.custom-iconyouhuiquan:before {
+  content: "\e632";
+}
+
+.custom-iconmeishi:before {
+  content: "\e633";
+}
+
+.custom-iconsmfw:before {
+  content: "\e62c";
+}
+
+.custom-iconzxyy:before {
+  content: "\e62d";
+}
+
+.custom-iconzxjd:before {
+  content: "\e62e";
+}
+
+.custom-iconhtqd:before {
+  content: "\e62f";
+}
+
+.custom-iconzxsg:before {
+  content: "\e630";
+}
+
+.custom-iconhbxs:before {
+  content: "\e622";
+}
+
+.custom-iconmsgy:before {
+  content: "\e623";
+}
+
+.custom-iconylbj:before {
+  content: "\e624";
+}
+
+.custom-iconfwzx:before {
+  content: "\e625";
+}
+
+.custom-iconjypx:before {
+  content: "\e626";
+}
+
+.custom-iconshfw:before {
+  content: "\e627";
+}
+
+.custom-iconnfcp:before {
+  content: "\e628";
+}
+
+.custom-iconsczl:before {
+  content: "\e629";
+}
+
+.custom-iconscfw:before {
+  content: "\e62a";
+}
+
+.custom-iconwyly:before {
+  content: "\e62b";
+}
+
+.custom-iconmdtj:before {
+  content: "\e615";
+}
+
+.custom-iconxjjb:before {
+  content: "\e616";
+}
+
+.custom-iconcmtxl:before {
+  content: "\e617";
+}
+
+.custom-iconcunwu:before {
+  content: "\e618";
+}
+
+.custom-iconysdt:before {
+  content: "\e619";
+}
+
+.custom-icongsrz:before {
+  content: "\e61a";
+}
+
+.custom-icongstz:before {
+  content: "\e61b";
+}
+
+.custom-iconxzcg:before {
+  content: "\e61c";
+}
+
+.custom-iconcaiwu:before {
+  content: "\e61d";
+}
+
+.custom-iconshce:before {
+  content: "\e61e";
+}
+
+.custom-iconsqhf:before {
+  content: "\e61f";
+}
+
+.custom-iconxxlr:before {
+  content: "\e620";
+}
+
+.custom-icondangwu:before {
+  content: "\e621";
+}
\ No newline at end of file
diff --git a/static/images/tj.png b/static/images/tj.png
new file mode 100644
index 0000000..7e45c6d
Binary files /dev/null and b/static/images/tj.png differ
diff --git a/static/images/trad-add.png b/static/images/trad-add.png
new file mode 100644
index 0000000..6a6d1ae
Binary files /dev/null and b/static/images/trad-add.png differ
diff --git a/static/images/trad-close.png b/static/images/trad-close.png
new file mode 100644
index 0000000..88a1167
Binary files /dev/null and b/static/images/trad-close.png differ
diff --git a/static/images/weituo.png b/static/images/weituo.png
new file mode 100644
index 0000000..241aa0a
Binary files /dev/null and b/static/images/weituo.png differ
diff --git a/static/images/wenhao.png b/static/images/wenhao.png
new file mode 100644
index 0000000..6ce5247
Binary files /dev/null and b/static/images/wenhao.png differ
diff --git a/static/images/wt_close.png b/static/images/wt_close.png
new file mode 100644
index 0000000..bbf3914
Binary files /dev/null and b/static/images/wt_close.png differ
diff --git a/static/images/wtbg1.png b/static/images/wtbg1.png
new file mode 100644
index 0000000..bc8848a
Binary files /dev/null and b/static/images/wtbg1.png differ
diff --git a/static/images/wtbg2.png b/static/images/wtbg2.png
new file mode 100644
index 0000000..bb868ad
Binary files /dev/null and b/static/images/wtbg2.png differ
diff --git a/static/images/wtbg3.png b/static/images/wtbg3.png
new file mode 100644
index 0000000..d47183a
Binary files /dev/null and b/static/images/wtbg3.png differ
diff --git a/static/images/wtbg4.png b/static/images/wtbg4.png
new file mode 100644
index 0000000..24285e9
Binary files /dev/null and b/static/images/wtbg4.png differ
diff --git a/static/images/wtbg5.png b/static/images/wtbg5.png
new file mode 100644
index 0000000..c048ae0
Binary files /dev/null and b/static/images/wtbg5.png differ
diff --git a/static/images/wtt1.png b/static/images/wtt1.png
new file mode 100644
index 0000000..fdb0772
Binary files /dev/null and b/static/images/wtt1.png differ
diff --git a/static/images/wtt2.png b/static/images/wtt2.png
new file mode 100644
index 0000000..987b35b
Binary files /dev/null and b/static/images/wtt2.png differ
diff --git a/static/images/xianshang.png b/static/images/xianshang.png
new file mode 100644
index 0000000..404b420
Binary files /dev/null and b/static/images/xianshang.png differ
diff --git a/static/images/xianxia.png b/static/images/xianxia.png
new file mode 100644
index 0000000..f5acbd5
Binary files /dev/null and b/static/images/xianxia.png differ
diff --git a/static/images/xxsj.png b/static/images/xxsj.png
new file mode 100644
index 0000000..55d8775
Binary files /dev/null and b/static/images/xxsj.png differ
diff --git a/static/images/yuqi.png b/static/images/yuqi.png
new file mode 100644
index 0000000..87ae36a
Binary files /dev/null and b/static/images/yuqi.png differ
diff --git a/static/tabbar_icon/组 17762.png b/static/tabbar_icon/组 17762.png
new file mode 100644
index 0000000..a41b859
Binary files /dev/null and b/static/tabbar_icon/组 17762.png differ
diff --git a/static/tabbar_icon/组 17763.png b/static/tabbar_icon/组 17763.png
new file mode 100644
index 0000000..52f89d7
Binary files /dev/null and b/static/tabbar_icon/组 17763.png differ
diff --git a/static/tabbar_icon/组 17764.png b/static/tabbar_icon/组 17764.png
new file mode 100644
index 0000000..37560ad
Binary files /dev/null and b/static/tabbar_icon/组 17764.png differ
diff --git a/static/tabbar_icon/组 17765.png b/static/tabbar_icon/组 17765.png
new file mode 100644
index 0000000..cef4a33
Binary files /dev/null and b/static/tabbar_icon/组 17765.png differ
diff --git a/static/tabbar_icon/组 17766.png b/static/tabbar_icon/组 17766.png
new file mode 100644
index 0000000..c3963ba
Binary files /dev/null and b/static/tabbar_icon/组 17766.png differ
diff --git a/static/tabbar_icon/组 17767.png b/static/tabbar_icon/组 17767.png
new file mode 100644
index 0000000..852233f
Binary files /dev/null and b/static/tabbar_icon/组 17767.png differ
diff --git a/static/tabbar_icon/组 17768.png b/static/tabbar_icon/组 17768.png
new file mode 100644
index 0000000..9c23696
Binary files /dev/null and b/static/tabbar_icon/组 17768.png differ
diff --git a/static/tabbar_icon/组 17769.png b/static/tabbar_icon/组 17769.png
new file mode 100644
index 0000000..1331fc6
Binary files /dev/null and b/static/tabbar_icon/组 17769.png differ
diff --git a/static/test/DFH.png b/static/test/DFH.png
new file mode 100644
index 0000000..5cd03c5
Binary files /dev/null and b/static/test/DFH.png differ
diff --git a/static/test/DPJ.png b/static/test/DPJ.png
new file mode 100644
index 0000000..3a9216d
Binary files /dev/null and b/static/test/DPJ.png differ
diff --git a/static/test/DSH.png b/static/test/DSH.png
new file mode 100644
index 0000000..3949fce
Binary files /dev/null and b/static/test/DSH.png differ
diff --git a/static/test/DZGL.png b/static/test/DZGL.png
new file mode 100644
index 0000000..016c3a8
Binary files /dev/null and b/static/test/DZGL.png differ
diff --git a/static/test/FPGL.png b/static/test/FPGL.png
new file mode 100644
index 0000000..10f4039
Binary files /dev/null and b/static/test/FPGL.png differ
diff --git a/static/test/GZDP.png b/static/test/GZDP.png
new file mode 100644
index 0000000..c6a5419
Binary files /dev/null and b/static/test/GZDP.png differ
diff --git a/static/test/KH.png b/static/test/KH.png
new file mode 100644
index 0000000..52772c2
Binary files /dev/null and b/static/test/KH.png differ
diff --git a/static/test/LLJL.png b/static/test/LLJL.png
new file mode 100644
index 0000000..702997c
Binary files /dev/null and b/static/test/LLJL.png differ
diff --git a/static/test/SH.png b/static/test/SH.png
new file mode 100644
index 0000000..f191a19
Binary files /dev/null and b/static/test/SH.png differ
diff --git a/static/test/SJRZ.png b/static/test/SJRZ.png
new file mode 100644
index 0000000..e0f6e70
Binary files /dev/null and b/static/test/SJRZ.png differ
diff --git a/static/test/SYS.png b/static/test/SYS.png
new file mode 100644
index 0000000..29421cc
Binary files /dev/null and b/static/test/SYS.png differ
diff --git a/static/test/SZ.png b/static/test/SZ.png
new file mode 100644
index 0000000..41579df
Binary files /dev/null and b/static/test/SZ.png differ
diff --git a/static/test/WDSC.png b/static/test/WDSC.png
new file mode 100644
index 0000000..6a92d86
Binary files /dev/null and b/static/test/WDSC.png differ
diff --git a/static/test/WTFK.png b/static/test/WTFK.png
new file mode 100644
index 0000000..9a71bb3
Binary files /dev/null and b/static/test/WTFK.png differ
diff --git a/uni_modules/rudon-rowMenuDotDotDot-left/changelog.md b/uni_modules/rudon-rowMenuDotDotDot-left/changelog.md
new file mode 100644
index 0000000..62a754a
--- /dev/null
+++ b/uni_modules/rudon-rowMenuDotDotDot-left/changelog.md
@@ -0,0 +1,2 @@
+## 1.0.0（2022-09-29）
+无
diff --git a/uni_modules/rudon-rowMenuDotDotDot-left/components/rudon-rowMenuDotDotDot-left/rudon-rowMenuDotDotDot-left.vue b/uni_modules/rudon-rowMenuDotDotDot-left/components/rudon-rowMenuDotDotDot-left/rudon-rowMenuDotDotDot-left.vue
new file mode 100644
index 0000000..4922103
--- /dev/null
+++ b/uni_modules/rudon-rowMenuDotDotDot-left/components/rudon-rowMenuDotDotDot-left/rudon-rowMenuDotDotDot-left.vue
@@ -0,0 +1,422 @@
+<template>
+	<view class="uni-stat__select">
+		
+		<!-- 组件介绍 -->
+		<!-- 名称：rudon-rowMenuDotDotDot 行内三点式下拉菜单 -->
+		<!-- 作者：Rudon <https://rudon.blog.csdn.net> -->
+		<!-- 用途：点击三点 -->
+		<!-- 用法：
+				0）参考https://uniapp.dcloud.net.cn/component/uniui/uni-data-select.html
+				1）项目安装本组件， 
+				2）vue中直接引用即可，例如下面的例子 （插槽可随意修改，例如...）：
+		-->
+		<!-- 例如:
+		<rudon-rowMenuDotDotDot :clear="false" :localdata="菜单对象" @change="ccc($event, item)">
+			...
+		</rudon-rowMenuDotDotDot>
+		-->
+		
+		
+		<span v-if="label" class="uni-label-text hide-on-phone">{{label + '：'}}</span>
+		<view class="uni-select">
+			<view class="uni-select__input-box" @click="toggleSelector">
+				
+				<!-- 显示插槽内容 -->
+				<slot></slot>
+				
+			</view>
+			<view class="uni-select--mask" v-if="showSelector" @click="toggleSelector" />
+			<view class="uni-select__selector" v-if="showSelector">
+				<view class="uni-popper__arrow"></view>
+				<scroll-view scroll-y="true" class="uni-select__selector-scroll">
+					<view class="uni-select__selector-empty" v-if="mixinDatacomResData.length === 0">
+						<text>{{emptyTips}}</text>
+					</view>
+					<view v-else class="uni-select__selector-item" v-for="(item,index) in mixinDatacomResData"
+						:key="index" @click="change(item)">
+						<text :class="{'uni-select__selector__disabled': item.disable}">{{formatItemName(item)}}</text>
+					</view>
+				</scroll-view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * DataChecklist 数据选择器
+	 * @description 通过数据渲染的下拉框组件
+	 * @tutorial https://uniapp.dcloud.io/component/uniui/uni-data-select
+	 * @property {String} value 默认值
+	 * @property {Array} localdata 本地数据 ，格式 [{text:'',value:''}]
+	 * @property {Boolean} clear 是否可以清空已选项
+	 * @property {Boolean} emptyText 没有数据时显示的文字 ，本地数据无效
+	 * @property {String} label 左侧标题
+	 * @property {String} placeholder 输入框的提示文字
+	 * @event {Function} change  选中发生变化触发
+	 */
+
+	export default {
+		name: "uni-stat-select",
+		mixins: [uniCloud.mixinDatacom || {}],
+		data() {
+			return {
+				showSelector: false,
+				current: '',
+				mixinDatacomResData: [],
+				apps: [],
+				channels: []
+			};
+		},
+		props: {
+			localdata: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Number],
+				default: ''
+			},
+			label: {
+				type: String,
+				default: ''
+			},
+			placeholder: {
+				type: String,
+				default: '...'
+			},
+			emptyTips: {
+				type: String,
+				default: '无选项'
+			},
+			clear: {
+				type: Boolean,
+				default: true
+			},
+			defItem: {
+				type: Number,
+				default: 0
+			}
+		},
+		created() {
+			this.last = `${this.collection}_last_selected_option_value`
+			if (this.collection && !this.localdata.length) {
+				this.mixinDatacomEasyGet()
+			}
+		},
+		computed: {
+			typePlaceholder() {
+				const text = {
+					'opendb-stat-app-versions': '版本',
+					'opendb-app-channels': '渠道',
+					'opendb-app-list': '应用'
+				}
+				const common = '请选择'
+				const placeholder = text[this.collection]
+				return placeholder ?
+					common + placeholder :
+					common
+			}
+		},
+		watch: {
+			localdata: {
+				immediate: true,
+				handler(val, old) {
+					if (Array.isArray(val)) {
+						this.mixinDatacomResData = val
+					}
+				}
+			},
+			// #ifndef VUE3
+			value() {
+				this.initDefVal()
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue() {
+				this.initDefVal()
+			},
+			// #endif
+			mixinDatacomResData: {
+				immediate: true,
+				handler(val) {
+					if (val.length) {
+						this.initDefVal()
+					}
+				}
+			}
+		},
+		methods: {
+			initDefVal() {
+				let defValue = ''
+				if ((this.value || this.value === 0) && !this.isDisabled(this.value)) {
+					defValue = this.value
+				} else if ((this.modelValue || this.modelValue === 0) && !this.isDisabled(this.modelValue)) {
+					defValue = this.modelValue
+				} else {
+					let strogeValue
+					if (this.collection) {
+						strogeValue = uni.getStorageSync(this.last)
+					}
+					if (strogeValue || strogeValue === 0) {
+						defValue = strogeValue
+					} else {
+						let defItem = ''
+						if (this.defItem > 0 && this.defItem < this.mixinDatacomResData.length) {
+							defItem = this.mixinDatacomResData[this.defItem - 1].value
+						}
+						defValue = defItem
+					}
+					this.emit(defValue)
+				}
+				const def = this.mixinDatacomResData.find(item => item.value === defValue)
+				this.current = def ? this.formatItemName(def) : ''
+			},
+
+			/**
+			 * @param {[String, Number]} value
+			 * 判断用户给的 value 是否同时为禁用状态
+			 */
+			isDisabled(value) {
+				let isDisabled = false;
+
+				this.mixinDatacomResData.forEach(item => {
+					if (item.value === value) {
+						isDisabled = item.disable
+					}
+				})
+
+				return isDisabled;
+			},
+
+			clearVal() {
+				this.emit('')
+				if (this.collection) {
+					uni.removeStorageSync(this.last)
+				}
+			},
+			change(item) {
+				if (!item.disable) {
+					this.showSelector = false
+					this.current = this.formatItemName(item)
+					this.emit(item.value)
+				}
+			},
+			emit(val) {
+				this.$emit('change', val)
+				this.$emit('input', val)
+				this.$emit('update:modelValue', val)
+				if (this.collection) {
+					uni.setStorageSync(this.last, val)
+				}
+			},
+
+			toggleSelector() {
+				this.showSelector = !this.showSelector
+			},
+			formatItemName(item) {
+				let {
+					text,
+					value,
+					channel_code
+				} = item
+				channel_code = channel_code ? `(${channel_code})` : ''
+				return this.collection.indexOf('app-list') > 0 ?
+					`${text}(${value})` :
+					(
+						text ?
+						text :
+						`未命名${channel_code}`
+					)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	$uni-base-color: #6a6a6a !default;
+	$uni-main-color: #3a3a3a !default;
+	$uni-secondary-color: #909399 !default;
+	$uni-border-3: #DCDCDC;
+
+
+	/* #ifndef APP-NVUE */
+	@media screen and (max-width: 100%) {
+		.hide-on-phone {
+			display: none;
+		}
+	}
+
+	/* #endif */
+	.uni-stat__select {
+		display: flex;
+		align-items: center;
+		cursor: pointer;
+	}
+
+	.uni-label-text {
+		font-size: 14px;
+		font-weight: bold;
+		color: $uni-base-color;
+		margin: auto 0;
+		margin-right: 5px;
+	}
+
+	.uni-select {
+		font-size: 14px;
+		// border: 1px solid $uni-border-3;
+		box-sizing: border-box;
+		border-radius: 1px;
+		padding: 0 5px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		user-select: none;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		// border-bottom: solid 1px $uni-border-3;
+	}
+
+	.uni-select__label {
+		font-size: 16px;
+		line-height: 22px;
+		padding-right: 10px;
+		color: $uni-secondary-color;
+	}
+
+	.uni-select__input-box {
+		min-height: 20px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		align-items: center;
+	}
+
+	.uni-select__input {
+		flex: 1;
+		font-size: 14px;
+		height: 22px;
+		line-height: 22px;
+	}
+
+	.uni-select__input-plac {
+		font-size: 14px;
+		color: $uni-secondary-color;
+	}
+
+	.uni-select__selector {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		/* #endif */
+		position: absolute;
+		top: calc(100% + 12px);
+		left: 0;
+		width: auto;
+		background-color: #FFFFFF;
+		border: 1px solid #EBEEF5;
+		border-radius: 6px;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		z-index: 2;
+		padding: 4px 0;
+	}
+
+	.uni-select__selector-scroll {
+		/* #ifndef APP-NVUE */
+		max-height: 200px;
+		box-sizing: border-box;
+		/* #endif */
+	}
+
+	.uni-select__selector-empty,
+	.uni-select__selector-item {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		cursor: pointer;
+		/* #endif */
+		line-height: 20px;
+		font-size: 14px;
+		text-align: center;
+		/* border-bottom: solid 1px $uni-border-3; */
+		padding: 10px 20px;
+		
+		width: auto;
+		white-space: nowrap;
+		flex-wrap: nowrap;
+	}
+
+	.uni-select__selector-item:hover {
+		background-color: #f9f9f9;
+	}
+
+	.uni-select__selector-empty:last-child,
+	.uni-select__selector-item:last-child {
+		/* #ifndef APP-NVUE */
+		border-bottom: none;
+		/* #endif */
+	}
+
+	.uni-select__selector__disabled {
+		opacity: 0.4;
+		cursor: default;
+	}
+
+	/* picker 弹出层通用的指示小三角 */
+	.uni-popper__arrow,
+	.uni-popper__arrow::after {
+		position: absolute;
+		display: block;
+		width: 0;
+		height: 0;
+		border-color: transparent;
+		border-style: solid;
+		border-width: 6px;
+	}
+
+	.uni-popper__arrow {
+		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
+		top: -6px;
+		left: 10%;
+		margin-right: 3px;
+		border-top-width: 0;
+		border-bottom-color: #EBEEF5;
+	}
+
+	.uni-popper__arrow::after {
+		content: " ";
+		top: 1px;
+		margin-left: -6px;
+		border-top-width: 0;
+		border-bottom-color: #fff;
+	}
+
+	.uni-select__input-text {
+		color: $uni-main-color;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		-o-text-overflow: ellipsis;
+		overflow: hidden;
+		width: auto;
+	}
+
+	.uni-select__input-placeholder {
+		color: $uni-base-color;
+	}
+
+	.uni-select--mask {
+		position: fixed;
+		top: 0;
+		bottom: 0;
+		right: 0;
+		left: 0;
+	}
+</style>
diff --git a/uni_modules/rudon-rowMenuDotDotDot-left/package.json b/uni_modules/rudon-rowMenuDotDotDot-left/package.json
new file mode 100644
index 0000000..4bcc1dd
--- /dev/null
+++ b/uni_modules/rudon-rowMenuDotDotDot-left/package.json
@@ -0,0 +1,82 @@
+{
+  "id": "rudon-rowMenuDotDotDot-left",
+  "displayName": "行内三点式下拉菜单-左对齐-向下展开",
+  "version": "1.0.0",
+  "description": "行内三点式下拉菜单（左对齐）",
+  "keywords": [
+    "select",
+    "picker",
+    "下拉菜单"
+],
+  "repository": "",
+"engines": {
+  },
+  "dcloudext": {
+    "type": "component-vue",
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "使用方法参考： https://ext.dcloud.net.cn/plugin?id=9350",
+      "data": "使用方法参考： https://ext.dcloud.net.cn/plugin?id=9350",
+      "permissions": "使用方法参考： https://ext.dcloud.net.cn/plugin?id=9350"
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "Vue": {
+          "vue2": "u",
+          "vue3": "u"
+        },
+        "App": {
+          "app-vue": "u",
+          "app-nvue": "u"
+        },
+        "H5-mobile": {
+          "Safari": "u",
+          "Android Browser": "u",
+          "微信浏览器(Android)": "u",
+          "QQ浏览器(Android)": "u"
+        },
+        "H5-pc": {
+          "Chrome": "u",
+          "IE": "u",
+          "Edge": "u",
+          "Firefox": "u",
+          "Safari": "u"
+        },
+        "小程序": {
+          "微信": "u",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+          "QQ": "u",
+          "钉钉": "u",
+          "快手": "u",
+          "飞书": "u",
+          "京东": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/rudon-rowMenuDotDotDot-left/readme.md b/uni_modules/rudon-rowMenuDotDotDot-left/readme.md
new file mode 100644
index 0000000..8011c51
--- /dev/null
+++ b/uni_modules/rudon-rowMenuDotDotDot-left/readme.md
@@ -0,0 +1 @@
+# rudon-rowMenuDotDotDot-left
\ No newline at end of file
diff --git a/uni_modules/rudon-rowMenuDotDotDot/changelog.md b/uni_modules/rudon-rowMenuDotDotDot/changelog.md
new file mode 100644
index 0000000..0b50306
--- /dev/null
+++ b/uni_modules/rudon-rowMenuDotDotDot/changelog.md
@@ -0,0 +1,2 @@
+## 1.0.0（2022-09-05）
+模仿并改进uniapp官方ui的组件uni-data-select，自定义显示插槽（允许变量），手册：https://uniapp.dcloud.net.cn/component/uniui/uni-data-select.html
diff --git a/uni_modules/rudon-rowMenuDotDotDot/components/rudon-rowMenuDotDotDot/rudon-rowMenuDotDotDot.vue b/uni_modules/rudon-rowMenuDotDotDot/components/rudon-rowMenuDotDotDot/rudon-rowMenuDotDotDot.vue
new file mode 100644
index 0000000..67fef69
--- /dev/null
+++ b/uni_modules/rudon-rowMenuDotDotDot/components/rudon-rowMenuDotDotDot/rudon-rowMenuDotDotDot.vue
@@ -0,0 +1,422 @@
+<template>
+	<view class="uni-stat__select">
+		
+		<!-- 组件介绍 -->
+		<!-- 名称：rudon-rowMenuDotDotDot 行内三点式下拉菜单 -->
+		<!-- 作者：Rudon <https://rudon.blog.csdn.net> -->
+		<!-- 用途：点击三点 -->
+		<!-- 用法：
+				0）参考https://uniapp.dcloud.net.cn/component/uniui/uni-data-select.html
+				1）项目安装本组件， 
+				2）vue中直接引用即可，例如下面的例子 （插槽可随意修改，例如...）：
+		-->
+		<!-- 例如:
+		<rudon-rowMenuDotDotDot :clear="false" :localdata="菜单对象" @change="ccc($event, item)">
+			...
+		</rudon-rowMenuDotDotDot>
+		-->
+		
+		
+		<span v-if="label" class="uni-label-text hide-on-phone">{{label + '：'}}</span>
+		<view class="uni-select">
+			<view class="uni-select__input-box" @click="toggleSelector">
+				
+				<!-- 显示插槽内容 -->
+				<slot></slot>
+				
+			</view>
+			<view class="uni-select--mask" v-if="showSelector" @click="toggleSelector" />
+			<view class="uni-select__selector" v-if="showSelector">
+				<view class="uni-popper__arrow"></view>
+				<scroll-view scroll-y="true" class="uni-select__selector-scroll">
+					<view class="uni-select__selector-empty" v-if="mixinDatacomResData.length === 0">
+						<text>{{emptyTips}}</text>
+					</view>
+					<view v-else class="uni-select__selector-item" v-for="(item,index) in mixinDatacomResData"
+						:key="index" @click="change(item)">
+						<text :class="{'uni-select__selector__disabled': item.disable}">{{formatItemName(item)}}</text>
+					</view>
+				</scroll-view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * DataChecklist 数据选择器
+	 * @description 通过数据渲染的下拉框组件
+	 * @tutorial https://uniapp.dcloud.io/component/uniui/uni-data-select
+	 * @property {String} value 默认值
+	 * @property {Array} localdata 本地数据 ，格式 [{text:'',value:''}]
+	 * @property {Boolean} clear 是否可以清空已选项
+	 * @property {Boolean} emptyText 没有数据时显示的文字 ，本地数据无效
+	 * @property {String} label 左侧标题
+	 * @property {String} placeholder 输入框的提示文字
+	 * @event {Function} change  选中发生变化触发
+	 */
+
+	export default {
+		name: "uni-stat-select",
+		mixins: [uniCloud.mixinDatacom || {}],
+		data() {
+			return {
+				showSelector: false,
+				current: '',
+				mixinDatacomResData: [],
+				apps: [],
+				channels: []
+			};
+		},
+		props: {
+			localdata: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Number],
+				default: ''
+			},
+			label: {
+				type: String,
+				default: ''
+			},
+			placeholder: {
+				type: String,
+				default: '...'
+			},
+			emptyTips: {
+				type: String,
+				default: '无选项'
+			},
+			clear: {
+				type: Boolean,
+				default: true
+			},
+			defItem: {
+				type: Number,
+				default: 0
+			}
+		},
+		created() {
+			this.last = `${this.collection}_last_selected_option_value`
+			if (this.collection && !this.localdata.length) {
+				this.mixinDatacomEasyGet()
+			}
+		},
+		computed: {
+			typePlaceholder() {
+				const text = {
+					'opendb-stat-app-versions': '版本',
+					'opendb-app-channels': '渠道',
+					'opendb-app-list': '应用'
+				}
+				const common = '请选择'
+				const placeholder = text[this.collection]
+				return placeholder ?
+					common + placeholder :
+					common
+			}
+		},
+		watch: {
+			localdata: {
+				immediate: true,
+				handler(val, old) {
+					if (Array.isArray(val)) {
+						this.mixinDatacomResData = val
+					}
+				}
+			},
+			// #ifndef VUE3
+			value() {
+				this.initDefVal()
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue() {
+				this.initDefVal()
+			},
+			// #endif
+			mixinDatacomResData: {
+				immediate: true,
+				handler(val) {
+					if (val.length) {
+						this.initDefVal()
+					}
+				}
+			}
+		},
+		methods: {
+			initDefVal() {
+				let defValue = ''
+				if ((this.value || this.value === 0) && !this.isDisabled(this.value)) {
+					defValue = this.value
+				} else if ((this.modelValue || this.modelValue === 0) && !this.isDisabled(this.modelValue)) {
+					defValue = this.modelValue
+				} else {
+					let strogeValue
+					if (this.collection) {
+						strogeValue = uni.getStorageSync(this.last)
+					}
+					if (strogeValue || strogeValue === 0) {
+						defValue = strogeValue
+					} else {
+						let defItem = ''
+						if (this.defItem > 0 && this.defItem < this.mixinDatacomResData.length) {
+							defItem = this.mixinDatacomResData[this.defItem - 1].value
+						}
+						defValue = defItem
+					}
+					this.emit(defValue)
+				}
+				const def = this.mixinDatacomResData.find(item => item.value === defValue)
+				this.current = def ? this.formatItemName(def) : ''
+			},
+
+			/**
+			 * @param {[String, Number]} value
+			 * 判断用户给的 value 是否同时为禁用状态
+			 */
+			isDisabled(value) {
+				let isDisabled = false;
+
+				this.mixinDatacomResData.forEach(item => {
+					if (item.value === value) {
+						isDisabled = item.disable
+					}
+				})
+
+				return isDisabled;
+			},
+
+			clearVal() {
+				this.emit('')
+				if (this.collection) {
+					uni.removeStorageSync(this.last)
+				}
+			},
+			change(item) {
+				if (!item.disable) {
+					this.showSelector = false
+					this.current = this.formatItemName(item)
+					this.emit(item.value)
+				}
+			},
+			emit(val) {
+				this.$emit('change', val)
+				this.$emit('input', val)
+				this.$emit('update:modelValue', val)
+				if (this.collection) {
+					uni.setStorageSync(this.last, val)
+				}
+			},
+
+			toggleSelector() {
+				this.showSelector = !this.showSelector
+			},
+			formatItemName(item) {
+				let {
+					text,
+					value,
+					channel_code
+				} = item
+				channel_code = channel_code ? `(${channel_code})` : ''
+				return this.collection.indexOf('app-list') > 0 ?
+					`${text}(${value})` :
+					(
+						text ?
+						text :
+						`未命名${channel_code}`
+					)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	$uni-base-color: #6a6a6a !default;
+	$uni-main-color: #3a3a3a !default;
+	$uni-secondary-color: #909399 !default;
+	$uni-border-3: #DCDCDC;
+
+
+	/* #ifndef APP-NVUE */
+	@media screen and (max-width: 100%) {
+		.hide-on-phone {
+			display: none;
+		}
+	}
+
+	/* #endif */
+	.uni-stat__select {
+		display: flex;
+		align-items: center;
+		cursor: pointer;
+	}
+
+	.uni-label-text {
+		font-size: 14px;
+		font-weight: bold;
+		color: $uni-base-color;
+		margin: auto 0;
+		margin-right: 5px;
+	}
+
+	.uni-select {
+		font-size: 14px;
+		// border: 1px solid $uni-border-3;
+		box-sizing: border-box;
+		border-radius: 1px;
+		padding: 0 5px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		user-select: none;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		// border-bottom: solid 1px $uni-border-3;
+	}
+
+	.uni-select__label {
+		font-size: 16px;
+		line-height: 22px;
+		padding-right: 10px;
+		color: $uni-secondary-color;
+	}
+
+	.uni-select__input-box {
+		min-height: 20px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		align-items: center;
+	}
+
+	.uni-select__input {
+		flex: 1;
+		font-size: 14px;
+		height: 22px;
+		line-height: 22px;
+	}
+
+	.uni-select__input-plac {
+		font-size: 14px;
+		color: $uni-secondary-color;
+	}
+
+	.uni-select__selector {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		/* #endif */
+		position: absolute;
+		top: calc(100% + 12px);
+		right: 0;
+		width: auto;
+		background-color: #FFFFFF;
+		border: 1px solid #EBEEF5;
+		border-radius: 6px;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		z-index: 2;
+		padding: 4px 0;
+	}
+
+	.uni-select__selector-scroll {
+		/* #ifndef APP-NVUE */
+		max-height: 200px;
+		box-sizing: border-box;
+		/* #endif */
+	}
+
+	.uni-select__selector-empty,
+	.uni-select__selector-item {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		cursor: pointer;
+		/* #endif */
+		line-height: 20px;
+		font-size: 14px;
+		text-align: center;
+		/* border-bottom: solid 1px $uni-border-3; */
+		padding: 10px 20px;
+		
+		width: auto;
+		white-space: nowrap;
+		flex-wrap: nowrap;
+	}
+
+	.uni-select__selector-item:hover {
+		background-color: #f9f9f9;
+	}
+
+	.uni-select__selector-empty:last-child,
+	.uni-select__selector-item:last-child {
+		/* #ifndef APP-NVUE */
+		border-bottom: none;
+		/* #endif */
+	}
+
+	.uni-select__selector__disabled {
+		opacity: 0.4;
+		cursor: default;
+	}
+
+	/* picker 弹出层通用的指示小三角 */
+	.uni-popper__arrow,
+	.uni-popper__arrow::after {
+		position: absolute;
+		display: block;
+		width: 0;
+		height: 0;
+		border-color: transparent;
+		border-style: solid;
+		border-width: 6px;
+	}
+
+	.uni-popper__arrow {
+		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
+		top: -6px;
+		right: 10%;
+		margin-right: 3px;
+		border-top-width: 0;
+		border-bottom-color: #EBEEF5;
+	}
+
+	.uni-popper__arrow::after {
+		content: " ";
+		top: 1px;
+		margin-left: -6px;
+		border-top-width: 0;
+		border-bottom-color: #fff;
+	}
+
+	.uni-select__input-text {
+		color: $uni-main-color;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		-o-text-overflow: ellipsis;
+		overflow: hidden;
+		width: auto;
+	}
+
+	.uni-select__input-placeholder {
+		color: $uni-base-color;
+	}
+
+	.uni-select--mask {
+		position: fixed;
+		top: 0;
+		bottom: 0;
+		right: 0;
+		left: 0;
+	}
+</style>
diff --git a/uni_modules/rudon-rowMenuDotDotDot/package.json b/uni_modules/rudon-rowMenuDotDotDot/package.json
new file mode 100644
index 0000000..32fcd74
--- /dev/null
+++ b/uni_modules/rudon-rowMenuDotDotDot/package.json
@@ -0,0 +1,82 @@
+{
+  "id": "rudon-rowMenuDotDotDot",
+  "displayName": "行内三点式下拉菜单-右对齐-向下展开",
+  "version": "1.0.0",
+  "description": "行内三点式下拉菜单",
+  "keywords": [
+    "select",
+    "picker",
+    "下拉菜单"
+],
+  "repository": "",
+"engines": {
+  },
+  "dcloudext": {
+    "type": "component-vue",
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "【相关插件】\r\n行内三点式下拉菜单-左对齐-向下展开 https://ext.dcloud.net.cn/plugin?id=9651\r\n行内三点式下拉菜单-左对齐-向上展开 https://ext.dcloud.net.cn/plugin?id=9652\r\n行内三点式下拉菜单-右对齐-向下展开 https://ext.dcloud.net.cn/plugin?id=9350",
+      "data": "【相关插件】\r\n行内三点式下拉菜单-左对齐-向下展开 https://ext.dcloud.net.cn/plugin?id=9651\r\n行内三点式下拉菜单-左对齐-向上展开 https://ext.dcloud.net.cn/plugin?id=9652\r\n行内三点式下拉菜单-右对齐-向下展开 https://ext.dcloud.net.cn/plugin?id=9350",
+      "permissions": "【相关插件】\r\n行内三点式下拉菜单-左对齐-向下展开 https://ext.dcloud.net.cn/plugin?id=9651\r\n行内三点式下拉菜单-左对齐-向上展开 https://ext.dcloud.net.cn/plugin?id=9652\r\n行内三点式下拉菜单-右对齐-向下展开 https://ext.dcloud.net.cn/plugin?id=9350"
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "Vue": {
+          "vue2": "y",
+          "vue3": "y"
+        },
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y",
+          "钉钉": "y",
+          "快手": "y",
+          "飞书": "y",
+          "京东": "y"
+        },
+        "快应用": {
+          "华为": "y",
+          "联盟": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/rudon-rowMenuDotDotDot/readme.md b/uni_modules/rudon-rowMenuDotDotDot/readme.md
new file mode 100644
index 0000000..d2466ab
--- /dev/null
+++ b/uni_modules/rudon-rowMenuDotDotDot/readme.md
@@ -0,0 +1 @@
+# rudon-rowMenuDotDotDot
\ No newline at end of file
diff --git a/uni_modules/uni-data-select/changelog.md b/uni_modules/uni-data-select/changelog.md
new file mode 100644
index 0000000..eb3d1ce
--- /dev/null
+++ b/uni_modules/uni-data-select/changelog.md
@@ -0,0 +1,35 @@
+## 1.0.6（2023-04-12）
+- 修复 微信小程序点击时会改变背景颜色的 bug
+## 1.0.5（2023-02-03）
+- 修复 禁用时会显示清空按钮
+## 1.0.4（2023-02-02）
+- 优化 查询条件短期内多次变更只查询最后一次变更后的结果
+- 调整 内部缓存键名调整为 uni-data-select-lastSelectedValue
+## 1.0.3（2023-01-16）
+- 修复 不关联服务空间报错的问题
+## 1.0.2（2023-01-14）
+- 新增  属性 `format` 可用于格式化显示选项内容
+## 1.0.1（2022-12-06）
+- 修复  当where变化时，数据不会自动更新的问题
+## 0.1.9（2022-09-05）
+- 修复 微信小程序下拉框出现后选择会点击到蒙板后面的输入框
+## 0.1.8（2022-08-29）
+- 修复 点击的位置不准确
+## 0.1.7（2022-08-12）
+- 新增 支持 disabled 属性
+## 0.1.6（2022-07-06）
+- 修复 pc端宽度异常的bug
+## 0.1.5
+- 修复 pc端宽度异常的bug
+## 0.1.4（2022-07-05）
+- 优化 显示样式
+## 0.1.3（2022-06-02）
+- 修复 localdata 赋值不生效的 bug
+- 新增 支持  uni.scss 修改颜色
+- 新增 支持选项禁用（数据选项设置 disabled: true 即禁用）
+## 0.1.2（2022-05-08）
+- 修复 当 value 为 0 时选择不生效的 bug
+## 0.1.1（2022-05-07）
+- 新增 记住上次的选项（仅 collection 存在时有效）
+## 0.1.0（2022-04-22）
+- 初始化
diff --git a/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue b/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
new file mode 100644
index 0000000..9b32348
--- /dev/null
+++ b/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
@@ -0,0 +1,517 @@
+<template>
+	<view class="uni-stat__select">
+		<span v-if="label" class="uni-label-text hide-on-phone">{{label + '：'}}</span>
+		<view class="uni-stat-box" :class="{'uni-stat__actived': current}">
+			<view class="uni-select" :class="{'uni-select--disabled':disabled}">
+				<view class="uni-select__input-box" @click="toggleSelector">
+					<view v-if="current" class="uni-select__input-text">{{current}}</view>
+					<view v-else class="uni-select__input-text uni-select__input-placeholder">{{typePlaceholder}}</view>
+					<view v-if="current && clear && !disabled" @click.stop="clearVal" >
+						<uni-icons type="clear" color="#c0c4cc" size="24"/>
+					</view>
+					<view v-else>
+						<uni-icons :type="showSelector? 'top' : 'bottom'" size="14" color="#999" />
+					</view>
+				</view>
+				<view class="uni-select--mask" v-if="showSelector" @click="toggleSelector" />
+				<view class="uni-select__selector" v-if="showSelector">
+					<view class="uni-popper__arrow"></view>
+					<scroll-view scroll-y="true" class="uni-select__selector-scroll">
+						<view class="uni-select__selector-empty" v-if="mixinDatacomResData.length === 0">
+							<text>{{emptyTips}}</text>
+						</view>
+						<view v-else class="uni-select__selector-item" v-for="(item,index) in mixinDatacomResData" :key="index"
+							@click="change(item)">
+							<text :class="{'uni-select__selector__disabled': item.disable}">{{formatItemName(item)}}</text>
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * DataChecklist 数据选择器
+	 * @description 通过数据渲染的下拉框组件
+	 * @tutorial https://uniapp.dcloud.io/component/uniui/uni-data-select
+	 * @property {String} value 默认值
+	 * @property {Array} localdata 本地数据 ，格式 [{text:'',value:''}]
+	 * @property {Boolean} clear 是否可以清空已选项
+	 * @property {Boolean} emptyText 没有数据时显示的文字 ，本地数据无效
+	 * @property {String} label 左侧标题
+	 * @property {String} placeholder 输入框的提示文字
+	 * @property {Boolean} disabled 是否禁用
+	 * @event {Function} change  选中发生变化触发
+	 */
+
+	export default {
+		name: "uni-data-select",
+		mixins: [uniCloud.mixinDatacom || {}],
+		props: {
+			localdata: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Number],
+				default: ''
+			},
+			label: {
+				type: String,
+				default: ''
+			},
+			placeholder: {
+				type: String,
+				default: '请选择'
+			},
+			emptyTips: {
+				type: String,
+				default: '无选项'
+			},
+			clear: {
+				type: Boolean,
+				default: true
+			},
+			defItem: {
+				type: Number,
+				default: 0
+			},
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			// 格式化输出 用法 field="_id as value, version as text, uni_platform as label" format="{label} - {text}"
+			format: {
+				type: String,
+				default: ''
+			},
+		},
+		data() {
+			return {
+				showSelector: false,
+				current: '',
+				mixinDatacomResData: [],
+				apps: [],
+				channels: [],
+				cacheKey: "uni-data-select-lastSelectedValue",
+			};
+		},
+		created() {
+			this.debounceGet = this.debounce(() => {
+				this.query();
+			}, 300);
+			if (this.collection && !this.localdata.length) {
+				this.debounceGet();
+			}
+		},
+		computed: {
+			typePlaceholder() {
+				const text = {
+					'opendb-stat-app-versions': '版本',
+					'opendb-app-channels': '渠道',
+					'opendb-app-list': '应用'
+				}
+				const common = this.placeholder
+				const placeholder = text[this.collection]
+				return placeholder ?
+					common + placeholder :
+					common
+			},
+			valueCom(){
+				// #ifdef VUE3
+				return this.modelValue;
+				// #endif
+				// #ifndef VUE3
+				return this.value;
+				// #endif
+			}
+		},
+		watch: {
+			localdata: {
+				immediate: true,
+				handler(val, old) {
+					if (Array.isArray(val) && old !== val) {
+						this.mixinDatacomResData = val
+					}
+				}
+			},
+			valueCom(val, old) {
+				this.initDefVal()
+			},
+			mixinDatacomResData: {
+				immediate: true,
+				handler(val) {
+					if (val.length) {
+						this.initDefVal()
+					}
+				}
+			}
+		},
+		methods: {
+			debounce(fn, time = 100){
+				let timer = null
+				return function(...args) {
+					if (timer) clearTimeout(timer)
+					timer = setTimeout(() => {
+						fn.apply(this, args)
+					}, time)
+				}
+			},
+			// 执行数据库查询
+			query(){
+				this.mixinDatacomEasyGet();
+			},
+			// 监听查询条件变更事件
+			onMixinDatacomPropsChange(){
+				if (this.collection) {
+					this.debounceGet();
+				}
+			},
+			initDefVal() {
+				let defValue = ''
+				if ((this.valueCom || this.valueCom === 0) && !this.isDisabled(this.valueCom)) {
+					defValue = this.valueCom
+				} else {
+					let strogeValue
+					if (this.collection) {
+						strogeValue = this.getCache()
+					}
+					if (strogeValue || strogeValue === 0) {
+						defValue = strogeValue
+					} else {
+						let defItem = ''
+						if (this.defItem > 0 && this.defItem <= this.mixinDatacomResData.length) {
+							defItem = this.mixinDatacomResData[this.defItem - 1].value
+						}
+						defValue = defItem
+					}
+          if (defValue || defValue === 0) {
+					  this.emit(defValue)
+          }
+				}
+				const def = this.mixinDatacomResData.find(item => item.value === defValue)
+				this.current = def ? this.formatItemName(def) : ''
+			},
+
+			/**
+			 * @param {[String, Number]} value
+			 * 判断用户给的 value 是否同时为禁用状态
+			 */
+			isDisabled(value) {
+				let isDisabled = false;
+
+				this.mixinDatacomResData.forEach(item => {
+					if (item.value === value) {
+						isDisabled = item.disable
+					}
+				})
+
+				return isDisabled;
+			},
+
+			clearVal() {
+				this.emit('')
+				if (this.collection) {
+					this.removeCache()
+				}
+			},
+			change(item) {
+				if (!item.disable) {
+					this.showSelector = false
+					this.current = this.formatItemName(item)
+					this.emit(item.value)
+				}
+			},
+			emit(val) {
+				this.$emit('input', val)
+				this.$emit('update:modelValue', val)
+				this.$emit('change', val)
+				if (this.collection) {
+					this.setCache(val);
+				}
+			},
+			toggleSelector() {
+				if (this.disabled) {
+					return
+				}
+
+				this.showSelector = !this.showSelector
+			},
+			formatItemName(item) {
+				let {
+					text,
+					value,
+					channel_code
+				} = item
+				channel_code = channel_code ? `(${channel_code})` : ''
+
+				if (this.format) {
+					// 格式化输出
+					let str = "";
+					str = this.format;
+					for (let key in item) {
+						str = str.replace(new RegExp(`{${key}}`,"g"),item[key]);
+					}
+					return str;
+				} else {
+					return this.collection.indexOf('app-list') > 0 ?
+						`${text}(${value})` :
+						(
+							text ?
+							text :
+							`未命名${channel_code}`
+						)
+				}
+			},
+			// 获取当前加载的数据
+			getLoadData(){
+				return this.mixinDatacomResData;
+			},
+			// 获取当前缓存key
+			getCurrentCacheKey(){
+				return this.collection;
+			},
+			// 获取缓存
+			getCache(name=this.getCurrentCacheKey()){
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				return cacheData[name];
+			},
+			// 设置缓存
+			setCache(value, name=this.getCurrentCacheKey()){
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				cacheData[name] = value;
+				uni.setStorageSync(this.cacheKey, cacheData);
+			},
+			// 删除缓存
+			removeCache(name=this.getCurrentCacheKey()){
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				delete cacheData[name];
+				uni.setStorageSync(this.cacheKey, cacheData);
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	$uni-base-color: #6a6a6a !default;
+	$uni-main-color: #333 !default;
+	$uni-secondary-color: #909399 !default;
+	$uni-border-3: #e5e5e5;
+
+
+	/* #ifndef APP-NVUE */
+	@media screen and (max-width: 500px) {
+		.hide-on-phone {
+			display: none;
+		}
+	}
+
+	/* #endif */
+	.uni-stat__select {
+		display: flex;
+		align-items: center;
+		// padding: 15px;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+		width: 100%;
+		flex: 1;
+		box-sizing: border-box;
+	}
+
+	.uni-stat-box {
+		width: 100%;
+		flex: 1;
+	}
+
+	.uni-stat__actived {
+		width: 100%;
+		flex: 1;
+		// outline: 1px solid #2979ff;
+	}
+
+	.uni-label-text {
+		font-size: 14px;
+		font-weight: bold;
+		color: $uni-base-color;
+		margin: auto 0;
+		margin-right: 5px;
+	}
+
+	.uni-select {
+		font-size: 14px;
+		border: 1px solid $uni-border-3;
+		box-sizing: border-box;
+		border-radius: 4px;
+		padding: 0 5px;
+		padding-left: 10px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		user-select: none;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		border-bottom: solid 1px $uni-border-3;
+		width: 100%;
+		flex: 1;
+		height: 35px;
+
+		&--disabled {
+			background-color: #f5f7fa;
+			cursor: not-allowed;
+		}
+	}
+
+	.uni-select__label {
+		font-size: 16px;
+		// line-height: 22px;
+		height: 35px;
+		padding-right: 10px;
+		color: $uni-secondary-color;
+	}
+
+	.uni-select__input-box {
+		height: 35px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		align-items: center;
+	}
+
+	.uni-select__input {
+		flex: 1;
+		font-size: 14px;
+		height: 22px;
+		line-height: 22px;
+	}
+
+	.uni-select__input-plac {
+		font-size: 14px;
+		color: $uni-secondary-color;
+	}
+
+	.uni-select__selector {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		/* #endif */
+		position: absolute;
+		top: calc(100% + 12px);
+		left: 0;
+		width: 100%;
+		background-color: #FFFFFF;
+		border: 1px solid #EBEEF5;
+		border-radius: 6px;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		z-index: 3;
+		padding: 4px 0;
+	}
+
+	.uni-select__selector-scroll {
+		/* #ifndef APP-NVUE */
+		max-height: 200px;
+		box-sizing: border-box;
+		/* #endif */
+	}
+
+	/* #ifdef H5 */
+	@media (min-width: 768px) {
+		.uni-select__selector-scroll {
+			max-height: 600px;
+		}
+	}
+	/* #endif */
+
+	.uni-select__selector-empty,
+	.uni-select__selector-item {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		cursor: pointer;
+		/* #endif */
+		line-height: 35px;
+		font-size: 14px;
+		text-align: center;
+		/* border-bottom: solid 1px $uni-border-3; */
+		padding: 0px 10px;
+	}
+
+	.uni-select__selector-item:hover {
+		background-color: #f9f9f9;
+	}
+
+	.uni-select__selector-empty:last-child,
+	.uni-select__selector-item:last-child {
+		/* #ifndef APP-NVUE */
+		border-bottom: none;
+		/* #endif */
+	}
+
+	.uni-select__selector__disabled {
+		opacity: 0.4;
+		cursor: default;
+	}
+
+	/* picker 弹出层通用的指示小三角 */
+	.uni-popper__arrow,
+	.uni-popper__arrow::after {
+		position: absolute;
+		display: block;
+		width: 0;
+		height: 0;
+		border-color: transparent;
+		border-style: solid;
+		border-width: 6px;
+	}
+
+	.uni-popper__arrow {
+		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
+		top: -6px;
+		left: 10%;
+		margin-right: 3px;
+		border-top-width: 0;
+		border-bottom-color: #EBEEF5;
+	}
+
+	.uni-popper__arrow::after {
+		content: " ";
+		top: 1px;
+		margin-left: -6px;
+		border-top-width: 0;
+		border-bottom-color: #fff;
+	}
+
+	.uni-select__input-text {
+		// width: 280px;
+		width: 100%;
+		color: $uni-main-color;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		-o-text-overflow: ellipsis;
+		overflow: hidden;
+	}
+
+	.uni-select__input-placeholder {
+		color: $uni-base-color;
+		font-size: 12px;
+	}
+
+	.uni-select--mask {
+		position: fixed;
+		top: 0;
+		bottom: 0;
+		right: 0;
+		left: 0;
+		z-index: 2;
+	}
+</style>
diff --git a/uni_modules/uni-data-select/package.json b/uni_modules/uni-data-select/package.json
new file mode 100644
index 0000000..0187429
--- /dev/null
+++ b/uni_modules/uni-data-select/package.json
@@ -0,0 +1,85 @@
+{
+  "id": "uni-data-select",
+  "displayName": "uni-data-select 下拉框选择器",
+  "version": "1.0.6",
+  "description": "通过数据驱动的下拉框选择器",
+  "keywords": [
+    "uni-ui",
+    "select",
+    "uni-data-select",
+    "下拉框",
+    "下拉选"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.1.1"
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-load-more"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "u",
+          "app-nvue": "n"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+        "QQ": "u",
+        "京东": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-data-select/readme.md b/uni_modules/uni-data-select/readme.md
new file mode 100644
index 0000000..eb58de3
--- /dev/null
+++ b/uni_modules/uni-data-select/readme.md
@@ -0,0 +1,8 @@
+## DataSelect 下拉框选择器
+> **组件名：uni-data-select**
+> 代码块： `uDataSelect`
+
+当选项过多时，使用下拉菜单展示并选择内容
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-data-select)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
diff --git a/uni_modules/uni-share/changelog.md b/uni_modules/uni-share/changelog.md
new file mode 100644
index 0000000..c858c67
--- /dev/null
+++ b/uni_modules/uni-share/changelog.md
@@ -0,0 +1,18 @@
+## 2.0.2（2021-12-16）
+修复在某些情况下报：`Cannot read property 'hide' of undefined`的问题
+## 2.0.1（2021-11-29）
+修改错误的scene值WXSenceTimeline(分享到朋友圈)更正为WXSceneTimeline
+## 2.0.0（2021-10-14）
+支持监听返回操作(如：物理返回，全面屏手机侧滑)关闭分享弹窗
+## 1.0.6（2021-08-25）
+兼容vue3
+## 1.0.5（2021-08-05）
+优化代码实现，修改原来用`eval()`函数实现的逻辑
+## 1.0.4（2021-06-07）
+为符合苹果应用市场的审核，只显示存在对应的分享客户端的选项。如：配置包含微信分享，但是用户手机上并没有安装微信，就不显示微信分享。
+## 1.0.2（2021-05-06）
+修复错误的提示：“打包时未添加oauth模块”
+## 1.0.1（2021-04-30）
+新增完整示例
+## 1.0.0（2021-04-28）
+第1版发布
diff --git a/uni_modules/uni-share/js_sdk/uni-image-menu.js b/uni_modules/uni-share/js_sdk/uni-image-menu.js
new file mode 100644
index 0000000..c03e51b
--- /dev/null
+++ b/uni_modules/uni-share/js_sdk/uni-image-menu.js
@@ -0,0 +1,204 @@
+var nvMask, nvImageMenu;
+class NvImageMenu {
+	constructor(arg) {
+		this.isShow = false
+	}
+	show({
+		list,
+		cancelText
+	}, callback) {
+		if (!list) {
+			list = [{
+				"img": "/static/sharemenu/wechatfriend.png",
+				"text": "图标文字"
+			}]
+		}
+		//以下为计算菜单的nview绘制布局，为固定算法，使用者无关关心
+		var screenWidth = plus.screen.resolutionWidth
+		//以360px宽度屏幕为例，上下左右边距及2排按钮边距留25像素，图标宽度55像素，同行图标间的间距在360宽的屏幕是30px，但需要动态计算，以此原则计算4列图标分别的left位置
+		//图标下的按钮文字距离图标5像素，文字大小12像素
+		//底部取消按钮高度固定为44px
+		//TODO 未处理横屏和pad，这些情况6个图标应该一排即可
+		var margin = 20,
+			iconWidth = 60,
+			icontextSpace = 5,
+			textHeight = 12
+		var left1 = margin / 360 * screenWidth
+		var iconSpace = (screenWidth - (left1 * 2) - (iconWidth * 4)) / 3 //屏幕宽度减去左右留白间距，再减去4个图标的宽度，就是3个同行图标的间距
+		if (iconSpace <= 5) { //屏幕过窄时，缩小边距和图标大小，再算一次
+			margin = 15
+			iconWidth = 40
+			left1 = margin / 360 * screenWidth
+			iconSpace = (screenWidth - (left1 * 2) - (iconWidth * 4)) / 3 //屏幕宽度减去左右留白间距，再减去4个图标的宽度，就是3个同行图标的间距
+		}
+		var left2 = left1 + iconWidth + iconSpace
+		var left3 = left1 + (iconWidth + iconSpace) * 2
+		var left4 = left1 + (iconWidth + iconSpace) * 3
+		var top1 = left1
+		var top2 = top1 + iconWidth + icontextSpace + textHeight + left1
+
+		const TOP = {
+				top1,
+				top2
+			},
+			LEFT = {
+				left1,
+				left2,
+				left3,
+				left4
+			};
+
+		nvMask = new plus.nativeObj.View("nvMask", { //先创建遮罩层
+			top: '0px',
+			left: '0px',
+			height: '100%',
+			width: '100%',
+			backgroundColor: 'rgba(0,0,0,0.2)'
+		});
+		nvImageMenu = new plus.nativeObj.View("nvImageMenu", { //创建底部图标菜单
+			bottom: '0px',
+			left: '0px',
+			height: (iconWidth + textHeight + 2 * margin) * Math.ceil(list.length / 4) + 44 +
+				'px', //'264px',
+			width: '100%',
+			backgroundColor: 'rgb(255,255,255)'
+		});
+		nvMask.addEventListener("click", () => { //处理遮罩层点击
+			// console.log('处理遮罩层点击');
+			this.hide()
+			callback({
+				event: "clickMask"
+			})
+		})
+		let myList = []
+		list.forEach((item, i) => {
+			myList.push({
+				tag: 'img',
+				src: item.img,
+				position: {
+					top: TOP['top' + (parseInt(i / 4) + 1)],
+					left: LEFT['left' + (1 + i % 4)],
+					width: iconWidth,
+					height: iconWidth
+				}
+			})
+			myList.push({
+				tag: 'font',
+				text: item.text,
+				textStyles: {
+					size: textHeight
+				},
+				position: {
+					top: TOP['top' + (parseInt(i / 4) + 1)] + iconWidth + icontextSpace,
+					left: LEFT['left' + (1 + i % 4)],
+					width: iconWidth,
+					height: textHeight
+				}
+			})
+		})
+
+		//绘制底部图标菜单的内容
+		nvImageMenu.draw([{
+				tag: 'rect', //菜单顶部的分割灰线
+				color: '#e7e7e7',
+				position: {
+					top: '0px',
+					height: '1px'
+				}
+			},
+			{
+				tag: 'font',
+				text: cancelText, //底部取消按钮的文字
+				textStyles: {
+					size: '14px'
+				},
+				position: {
+					bottom: '0px',
+					height: '44px'
+				}
+			},
+			{
+				tag: 'rect', //底部取消按钮的顶部边线
+				color: '#e7e7e7',
+				position: {
+					bottom: '45px',
+					height: '1px'
+				}
+			},
+			...myList
+		])
+		nvMask.show()
+		nvImageMenu.show()
+		// 开始动画
+		/*
+			plus.nativeObj.View.startAnimation({
+				type: 'slide-in-bottom',
+				duration: 300
+			}, nvImageMenu, {}, function() {
+				console.log('plus.nativeObj.View.startAnimation动画结束');
+				// 关闭原生动画
+				plus.nativeObj.View.clearAnimation();
+				nvImageMenu.show()
+			});
+		*/
+
+
+		this.isShow = true
+		nvImageMenu.addEventListener("click", e => { //处理底部图标菜单的点击事件，根据点击位置触发不同的逻辑
+			// console.log("click menu"+JSON.stringify(e));
+			if (e.screenY > plus.screen.resolutionHeight - 44) { //点击了底部取消按钮
+				// callback({event:"clickCancelButton"})
+				this.hide()
+			} else if (e.clientX < 5 || e.clientX > screenWidth - 5 || e.clientY < 5) {
+				//屏幕左右边缘5像素及菜单顶部5像素不处理点击
+			} else { //点击了图标按钮
+				var iClickIndex = -1 //点击的图标按钮序号，第一个图标按钮的index为0
+				var iRow = e.clientY < (top2 - (left1 / 2)) ? 0 : 1
+				var iCol = -1
+				if (e.clientX < (left2 - (iconSpace / 2))) {
+					iCol = 0
+				} else if (e.clientX < (left3 - (iconSpace / 2))) {
+					iCol = 1
+				} else if (e.clientX < (left4 - (iconSpace / 2))) {
+					iCol = 2
+				} else {
+					iCol = 3
+				}
+				if (iRow == 0) {
+					iClickIndex = iCol
+				} else {
+					iClickIndex = iCol + 4
+				}
+				// console.log("点击按钮的序号: " + iClickIndex);
+				// if (iClickIndex >= 0 && iClickIndex <= 5) { //处理具体的点击逻辑，此处也可以自行定义逻辑。如果增减了按钮，此处也需要跟着修改
+				// }
+				callback({
+					event: "clickMenu",
+					index: iClickIndex
+				})
+			}
+		})
+		/* nvImageMenu.addEventListener("touchstart", function(e) {
+			if (e.screenY > (plus.screen.resolutionHeight - 44)) {
+				//TODO 这里可以处理按下背景变灰的效果
+			}
+		})
+		nvImageMenu.addEventListener("touchmove", function(e) {
+			//TODO 这里可以处理按下背景变灰的效果
+			if (e.screenY > plus.screen.resolutionHeight - 44) {}
+		})
+		nvImageMenu.addEventListener("touchend", function(e) {
+			//TODO 这里可以处理释放背景恢复的效果
+		})
+		*/
+	}
+
+	hide() {
+		if (this.isShow) {
+			nvMask.hide()
+			nvImageMenu.hide()
+			this.isShow = false
+		}
+	}
+}
+export default NvImageMenu
\ No newline at end of file
diff --git a/uni_modules/uni-share/js_sdk/uni-share.js b/uni_modules/uni-share/js_sdk/uni-share.js
new file mode 100644
index 0000000..8af8631
--- /dev/null
+++ b/uni_modules/uni-share/js_sdk/uni-share.js
@@ -0,0 +1,98 @@
+import UniImageMenu from './uni-image-menu.js';
+class UniShare extends UniImageMenu{
+	constructor(arg) {
+		super()
+		this.isShow = super.isShow
+	}
+	async show(param, callback){
+		var menus = []
+		plus.share.getServices(services => { //只显示有服务的项目
+			services = services.filter(item => item.nativeClient)
+			let servicesList = services.map(e => e.id)
+			param.menus.forEach(item => {
+				if (servicesList.includes(item.share.provider) || typeof(item.share) == 'string') {
+					menus.push(item)
+				}
+			})
+			super.show({
+				list: menus,
+				cancelText: param.cancelText
+			}, e => {
+				callback(e)
+				if(e.event == 'clickMenu'){
+					if (typeof(menus[e.index]['share']) == 'string') {
+						this[menus[e.index]['share']](param)
+					} else {
+						uni.share({
+							...param.content,
+							...menus[e.index].share,
+							success: res=> {
+								console.log("success:" + JSON.stringify(res));
+								super.hide()
+							},
+							fail: function(err) {
+								console.log("fail:" + JSON.stringify(err));
+								uni.showModal({
+									content: JSON.stringify(err),
+									showCancel: false,
+									confirmText: "知道了"
+								});
+							}
+						})
+					}
+				}
+			})
+		}, err => {
+			uni.showModal({
+				title: '获取服务供应商失败：' + JSON.stringify(err),
+				showCancel: false,
+				confirmText: '知道了'
+			});
+			console.error('获取服务供应商失败：' + JSON.stringify(err));
+		})
+	}
+	hide(){
+		super.hide()
+	}
+	copyurl(param) {
+		console.log('copyurl',param);
+		uni.setClipboardData({
+			data: param.content.href,
+			success: ()=>{
+				console.log('success');
+				uni.hideToast() //关闭自带的toast
+				uni.showToast({
+					title: '复制成功',
+					icon: 'none'
+				});
+				super.hide();
+			},
+			fail: (err) => {
+				uni.showModal({
+					content: JSON.stringify(err),
+					showCancel: false
+				});
+			}
+		});
+	}
+	// 使用系统分享发送分享消息 
+	shareSystem(param) {
+		console.log('shareSystem',param);
+		plus.share.sendWithSystem({
+			type: 'text',
+			content: param.content.title + param.content.summary || '',
+			href: param.content.href,
+		}, (e)=> {
+			console.log('分享成功');
+			super.hide()
+		}, (err)=> {
+			console.log('分享失败：' + JSON.stringify(err));
+			uni.showModal({
+				title: '获取服务供应商失败：' + JSON.stringify(err),
+				showCancel: false,
+				confirmText: '知道了'
+			});
+		});
+	}
+}
+export default UniShare
\ No newline at end of file
diff --git a/uni_modules/uni-share/package.json b/uni_modules/uni-share/package.json
new file mode 100644
index 0000000..fa43a0e
--- /dev/null
+++ b/uni_modules/uni-share/package.json
@@ -0,0 +1,80 @@
+{
+  "id": "uni-share",
+  "displayName": "uni-share",
+  "version": "2.0.2",
+  "description": "底部弹出宫格图标式的分享菜单，可覆盖原生组件。",
+  "keywords": [
+    "分享菜单"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "category": [
+        "JS SDK",
+        "通用 SDK"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "n",
+          "Android Browser": "n",
+          "微信浏览器(Android)": "n",
+          "QQ浏览器(Android)": "n"
+        },
+        "H5-pc": {
+          "Chrome": "n",
+          "IE": "n",
+          "Edge": "n",
+          "Firefox": "n",
+          "Safari": "n"
+        },
+        "小程序": {
+          "微信": "n",
+          "阿里": "n",
+          "百度": "n",
+          "字节跳动": "n",
+          "QQ": "n"
+        },
+        "快应用": {
+          "华为": "n",
+          "联盟": "n"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-share/readme.md b/uni_modules/uni-share/readme.md
new file mode 100644
index 0000000..dced6d6
--- /dev/null
+++ b/uni_modules/uni-share/readme.md
@@ -0,0 +1,95 @@
+#### 本功能基于[底部图标菜单](https://ext.dcloud.net.cn/plugin?id=4858)封装而成。
+### 示例代码
+```
+<template>
+	<button type="default" @click="uniShare">显示</button>
+</template>
+<script>
+	import uniShare from '@/uni_modules/uni-share/js_sdk/uni-share.js';
+	export default {
+		onBackPress({from}) {
+			console.log(from);
+			if(from=='backbutton'){
+				this.$nextTick(function(){
+					uniShare.hide()
+				})
+				return uniShare.isShow;
+			}
+		},
+		methods: {
+			uniShare() {
+				uniShare.show({
+					content: { //公共的分享参数配置  类型（type）、链接（herf）、标题（title）、summary（描述）、imageUrl（缩略图）
+						type: 0,
+						href: 'https://uniapp.dcloud.io/',
+						title: '标题',
+						summary: '描述',
+						imageUrl: 'https://img-cdn-aliyun.dcloud.net.cn/stream/icon/__UNI__HelloUniApp.png'
+					},
+					menus: [{
+							"img": "/static/app-plus/sharemenu/wechatfriend.png",
+							"text": "微信好友",
+							"share": { //当前项的分享参数配置。可覆盖公共的配置如下：分享到微信小程序，配置了type=5
+								"provider": "weixin",
+								"scene": "WXSceneSession"
+							}
+						},
+						{
+							"img": "/static/app-plus/sharemenu/wechatmoments.png",
+							"text": "微信朋友圈",
+							"share": {
+								"provider": "weixin",
+								"scene": "WXSceneTimeline"
+							}
+						},
+						{
+							"img": "/static/app-plus/sharemenu/mp_weixin.png",
+							"text": "微信小程序",
+							"share": {
+								provider: "weixin",
+								scene: "WXSceneSession",
+								type: 5,
+								miniProgram: {
+									id: '123',
+									path: '/pages/list/detail',
+									webUrl: '/#/pages/list/detail',
+									type: 0
+								},
+							}
+						},
+						{
+							"img": "/static/app-plus/sharemenu/weibo.png",
+							"text": "微博",
+							"share": {
+								"provider": "sinaweibo"
+							}
+						},
+						{
+							"img": "/static/app-plus/sharemenu/qq.png",
+							"text": "QQ",
+							"share": {
+								"provider": "qq"
+							}
+						},
+						{
+							"img": "/static/app-plus/sharemenu/copyurl.png",
+							"text": "复制",
+							"share": "copyurl"
+						},
+						{
+							"img": "/static/app-plus/sharemenu/more.png",
+							"text": "更多",
+							"share": "shareSystem"
+						}
+					],
+					cancelText: "取消分享",
+				}, e => { //callback
+					console.log(uniShare.isShow);
+					console.log(e);
+				})
+			}
+		}
+	}
+</script>
+
+```
\ No newline at end of file