From c9cbc6a43c5507dfb12f2ec5ab719e11f3646988 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Tue, 8 Aug 2023 17:31:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=B0=83=E8=B4=A7=E3=80=81?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E7=95=8C=E9=9D=A2=EF=BC=8C=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/api.js                                    |  18 +
 components/areaWindow/index.vue               | 105 +-
 components/release/release.vue                | 185 ++++
 components/shoppinglist/shoppinglist.vue      | 531 ++++++++++
 components/subtractive/subtractive.vue        | 208 ++++
 components/villageTeam/villageTeam.vue        | 261 +++++
 config/app.js                                 |   3 +-
 pages.json                                    |  25 +-
 pages/trading_hall/adddiscounts/index.vue     | 979 ++++++++++++++++++
 pages/trading_hall/product_details/index.vue  | 351 +++++++
 pages/users/online_warehousing/index.vue      | 791 +++++++-------
 pages/users/order_list/index.vue              |   2 +
 pages/users/order_list/indexCopy.vue          |   2 +
 pages/users/releaseOrdermanagement/index.vue  |  37 +
 pages/users/trading_hall/index.vue            | 527 ++++++----
 pages/users/user_address/index.vue            |  55 +-
 static/images/arrow-bottom.png                | Bin 0 -> 196 bytes
 static/images/discounts.png                   | Bin 0 -> 4459 bytes
 static/images/season.png                      | Bin 0 -> 3928 bytes
 static/images/serchbtn.png                    | Bin 0 -> 1463 bytes
 static/images/sym.png                         | Bin 0 -> 2854 bytes
 static/images/trad-add.png                    | Bin 0 -> 7614 bytes
 static/images/trad-close.png                  | Bin 0 -> 25243 bytes
 uni_modules/uni-share/changelog.md            |  18 +
 .../uni-share/js_sdk/uni-image-menu.js        | 204 ++++
 uni_modules/uni-share/js_sdk/uni-share.js     |  98 ++
 uni_modules/uni-share/package.json            |  80 ++
 uni_modules/uni-share/readme.md               |  95 ++
 28 files changed, 3974 insertions(+), 601 deletions(-)
 create mode 100644 components/release/release.vue
 create mode 100644 components/shoppinglist/shoppinglist.vue
 create mode 100644 components/subtractive/subtractive.vue
 create mode 100644 components/villageTeam/villageTeam.vue
 create mode 100644 pages/trading_hall/adddiscounts/index.vue
 create mode 100644 pages/trading_hall/product_details/index.vue
 create mode 100644 pages/users/releaseOrdermanagement/index.vue
 create mode 100644 static/images/arrow-bottom.png
 create mode 100644 static/images/discounts.png
 create mode 100644 static/images/season.png
 create mode 100644 static/images/serchbtn.png
 create mode 100644 static/images/sym.png
 create mode 100644 static/images/trad-add.png
 create mode 100644 static/images/trad-close.png
 create mode 100644 uni_modules/uni-share/changelog.md
 create mode 100644 uni_modules/uni-share/js_sdk/uni-image-menu.js
 create mode 100644 uni_modules/uni-share/js_sdk/uni-share.js
 create mode 100644 uni_modules/uni-share/package.json
 create mode 100644 uni_modules/uni-share/readme.md

diff --git a/api/api.js b/api/api.js
index 3daf575..b0c8f23 100644
--- a/api/api.js
+++ b/api/api.js
@@ -268,4 +268,22 @@ export function ajcaptchaCheck(data) {
   return request.post("ajcheck", data, {
     noAuth: true
   });
+}
+
+
+
+/**
+ * 获取所在的地区数据
+ * @param {Object} data
+ */
+export function village(data) {
+ return request.get('v2/system/geo/lst', data, { noAuth: true });
+}
+
+/**
+ * 获取所在的村队数据
+ * @param {Object} data
+ */
+export function brigade(data) {
+ return request.get('v2/system/brigade', data, { noAuth: true });
 }
\ No newline at end of file
diff --git a/components/areaWindow/index.vue b/components/areaWindow/index.vue
index 13797f3..d217e3a 100644
--- a/components/areaWindow/index.vue
+++ b/components/areaWindow/index.vue
@@ -36,7 +36,7 @@
 	// | Author: CRMEB Team <admin@crmeb.com>
 	// +----------------------------------------------------------------------
 	import {getAddressList} from '@/api/user.js';
-	import { getCityV2 } from '@/api/api.js';
+	import { getCityV2,village } from '@/api/api.js';
 	import { mapGetters } from "vuex";
 	const CACHE_ADDRESS = {};	
 	export default {
@@ -87,25 +87,74 @@
 			this.loadAddress(0)
 		},
 		methods: {
-			change(pid,index){
+			change(pid){
 				if(this.selectedIndex == index) return;
 				if(pid === -1){
 					pid = this.selectedArr.length ? this.selectedArr[this.selectedArr.length -1].id : 0;
 				}
+				console.log(index)
 				this.selectedIndex = index;
 				this.loadAddress(pid);
 			},
-			loadAddress(pid){
+			loadAddress(pid,type){
 				if(CACHE_ADDRESS[pid]){
 					this.addressList = CACHE_ADDRESS[pid];
 					return ;
 				}
 				this.is_loading = true;
-				getCityV2(pid).then(res=>{
-					this.is_loading = false;
-					CACHE_ADDRESS[pid] = res.data;
-					this.addressList = res.data;
-				})
+				// getCityV2(pid).then(res=>{
+				
+				// 	this.is_loading = false;
+				// 	CACHE_ADDRESS[pid] = res.data;
+				// 	this.addressList = res.data;
+				// })
+				
+				if(type=='province'){
+					
+					village({province_code:pid}).then(res=>{
+						this.is_loading = false;
+						CACHE_ADDRESS[pid] = res.data;
+						this.addressList = res.data;
+					
+					})
+				}else if(type=='city'){
+					village({city_code:pid}).then(res=>{
+						this.is_loading = false;
+						CACHE_ADDRESS[pid] = res.data;
+						this.addressList = res.data;
+					
+					})
+				}else if(type=='area'){
+					village({area_code:pid}).then(res=>{
+						if(res.data.length>0){
+							this.is_loading = false;
+							CACHE_ADDRESS[pid] = res.data;
+							this.addressList = res.data;
+						}else{
+							this.$emit('submit', [...this.selectedArr]);
+							this.$emit('changeClose');
+						}
+					})
+				}else if(type=='street'){
+					village({street_code:pid}).then(res=>{
+						if(res.data.length>0){
+							this.is_loading = false;
+							CACHE_ADDRESS[pid] = res.data;
+							this.addressList = res.data;
+						}else{
+							this.$emit('submit', [...this.selectedArr]);
+							this.$emit('changeClose');
+						}
+					})
+				}else{
+					
+					village().then(res=>{
+						this.is_loading = false;
+						CACHE_ADDRESS[pid] = res.data;
+						this.addressList = res.data;
+					})
+				}
+				
 				this.goTop()
 			},
 			selected(item){
@@ -114,17 +163,49 @@
 					this.selectedArr.splice(this.selectedIndex + 1,999)
 					this.selectedArr[this.selectedIndex] = item;
 					this.selectedIndex = -1;
-				}else if(!item.parent_id){
+				}
+				
+				// else if(!item.parent_id){
+				// 	this.selectedArr = [item];
+				// }else{
+				// 	this.selectedArr.push(item);
+				// }
+				else if(!item.id){
 					this.selectedArr = [item];
 				}else{
-					this.selectedArr.push(item);
+				
+					if(this.selectedArr.length>4){
+						let arry=[]
+						arry.push(item)
+						this.selectedArr=arry
+					}else{
+						this.selectedArr.push(item);
+					}
+					
+					
 				}
-				if(item.snum){
-					this.loadAddress(item.id);
+				
+				if(item.type=="province"){
+							 
+				 this.loadAddress(item.code,"province");
+				
+				}else if(item.type=="city"){
+					this.loadAddress(item.code,"city");
+				}else if(item.type=="area"){
+					this.loadAddress(item.code,"area");
+				}else if(item.type=="street"){
+					this.loadAddress(item.code,"street");
 				} else {
 					this.$emit('submit', [...this.selectedArr]);
 					this.$emit('changeClose');
 				}
+				
+				// if(item.snum){
+				// 	this.loadAddress(item.id);
+				// } else {
+				// 	this.$emit('submit', [...this.selectedArr]);
+				// 	this.$emit('changeClose');
+				// }
 				this.goTop()
 			},
 			close: function() {
diff --git a/components/release/release.vue b/components/release/release.vue
new file mode 100644
index 0000000..8bd80f2
--- /dev/null
+++ b/components/release/release.vue
@@ -0,0 +1,185 @@
+<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/adddiscounts/index'
+					})
+				} else {
+
+				}
+			},
+			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;
+			margin-left: -15rpx;
+
+			image {
+				width: 111rpx;
+				height: 96rpx;
+			}
+		}
+
+		.release_imga {
+			width: 76rpx;
+			height: 113rpx;
+			margin-left: 21rpx;
+			margin-top: 5rpx;
+			margin-right: 19rpx;
+
+			image {
+				width: 76rpx;
+				height: 113rpx;
+			}
+		}
+
+		.title {
+			margin-top: 21rpx;
+		}
+
+		.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: 9rpx;
+		}
+	}
+
+	.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..0af82a1
--- /dev/null
+++ b/components/shoppinglist/shoppinglist.vue
@@ -0,0 +1,531 @@
+<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">
+				<block>
+					<view v-if="bought.length" @touchmove="onTouchmove" id="goods">
+						<view class="picTxt acea-row" v-for="(item, index) in bought" :key="index">
+							<view class="checkbox">
+								<text @click.stop="goodsCheck(item,index)" v-if="item.check"
+									class="iconfont icon-xuanzhong1"></text>
+								<text @click.stop="goodsCheck(item,index)" 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="">
+									<view class="">
+										采购价格:100 库存:100
+									</view>
+
+								</view>
+
+							</view>
+
+
+							<view class="picTxt_price">
+								<view class="price">
+									<span>出售价格</span>
+									<input type="text" value="" placeholder="输入出售价格" />
+								</view>
+								<view class="price_num">
+									<span>出售数量</span>
+                                     <subtractive
+									
+                                    style="margin-top: -10rpx;margin-left: 30rpx;"
+                                     	class="step"
+                                     	:min="1" 
+                                     	:max="100"
+                                     	:value="peicenumber"
+                                     	:isMax="true"
+                                     	:isMin="true"
+                                     	:index="11"
+                                     	@eventChange="numberChange"
+                                     ></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 {
+		boughtLstApi,
+		collectLstApi,
+		browseLstApi
+	} from "@/api/community";
+	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,
+				wherec: {
+					page: 1,
+					limit: 10,
+					keyword: '',
+				},
+				wheres: {
+					page: 1,
+					limit: 10,
+					keyword: '',
+				},
+				searchVal: "",
+				checked: [],
+				list: [],
+				collect: [],
+				bought: [],
+				browse: [],
+				checkedArr: [],
+			};
+		},
+		watch: {
+			checkedObj: {
+				handler(n) {
+					// this.checkedArr = n
+				},
+				deep: true
+			}
+		},
+		mounted() {
+			this.checkedArr = this.checkedObj
+			this.getBounht();
+			this.getCollect();
+			this.getBrowse();
+		},
+		methods: {
+			// 点击关闭按钮
+			close() {
+				this.$emit('close');
+			},
+			numberChange(data){
+				this.peicenumber = 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();
+				// 模拟触底刷新
+			},
+			onTouchmove1(e) {
+				if (this.loadendc) return;
+				if (this.loadingc) return;
+				const query = uni.createSelectorQuery().in(this);
+				query.select('#collect').boundingClientRect(data => {
+					if (data.bottom < 1500 && data.top < 0) {
+						this.getCollect();
+					}
+				}).exec();
+				// 模拟触底刷新
+			},
+			onTouchmove2(e) {
+				if (this.loadends) return;
+				if (this.loadings) return;
+				const query = uni.createSelectorQuery().in(this);
+				query.select('#browse').boundingClientRect(data => {
+					if (data.bottom < 1500 && data.top < 0) {
+						this.getBrowse();
+					}
+				}).exec();
+				// 模拟触底刷新
+			},
+			setValue: function(event) {
+				this.$set(this.whereb, 'keyword', event.detail.value);
+
+			},
+			searchBut() {
+
+				this.getBounht()
+			},
+			getBounht() {
+				var that = this;
+				if (that.loadingb || that.loadedb) return;
+				that.loadingb = true;
+				boughtLstApi(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
+						})
+					}
+				);
+			},
+			getCollect() {
+				var that = this;
+				if (that.loadingc || that.loadedc) return;
+				that.loadingc = true;
+				collectLstApi(that.wherec).then(
+					res => {
+						that.loadingc = false;
+						that.loadedc = res.data.list.length < that.wherec.limit;
+						that.collect.push.apply(that.collect, res.data.list);
+						that.wherec.page = that.wherec.page + 1;
+						that.getInitchecked(that.collect);
+					},
+					error => {
+						that.$util.Tips({
+							title: error.msg
+						})
+					}
+				);
+			},
+			getBrowse() {
+				var that = this;
+				if (that.loadings || that.loadeds) return;
+				that.loadings = true;
+				browseLstApi(that.wheres).then(
+					res => {
+						that.loadings = false;
+						that.loadeds = res.data.list.length < that.wheres.limit;
+						that.browse.push.apply(that.browse, res.data.list);
+						that.wheres.page = that.wheres.page + 1;
+						that.getInitchecked(that.browse);
+					},
+					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.spu_id == (val.spu && val.spu.spu_id)) || (item.spu_id == val.spu_id)) {
+							that.$set(item, 'check', true);
+						}
+					})
+				})
+			},
+			/*已选中的商品打钩*/
+			getCheckedGoods() {
+				this.checked = []
+				this.checkedArr.forEach((item, index) => {
+					this.check.push(item)
+				})
+			},
+			/*点击选中与否*/
+			goodsCheck(item, index) {
+				this.$set(item, 'check', !item.check);
+				if (item.check) {
+					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;
+				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;
+		margin-bottom: 10rpx;
+		border-top: 2rpx solid #E7E6E4;
+
+		.picTxt_price {
+			display: flex;
+			margin-top: 37rpx;
+
+			.price {
+				display: flex;
+				margin-right: 30rpx;
+
+				input {
+					width: 168rpx;
+					height: 39rpx;
+					font-size: 28rpx;
+					font-family: PingFang SC-Regular, PingFang SC;
+					font-weight: 400;
+					color: #CCCCCC;
+					margin-left: 30rpx;
+				}
+			}
+			.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..0cd0015
--- /dev/null
+++ b/components/villageTeam/villageTeam.vue
@@ -0,0 +1,261 @@
+<template>
+	<view :style="viewColor">
+		<view class="address-window" :class="display==true?'on':''">
+			<view class='title'>请选择所在村队<text class='iconfont icon-guanbi' @tap='close'></text></view>
+			<view class="address-count">
+				<view class="address-selected">
+					<view v-for="(item,index) in selectedArr" :key="index" class="selected-list" :class="{active:index === selectedIndex}" @click="change(item.parent_id, index)">
+						{{item.name}}
+						<text class="iconfont icon-xiangyou"></text>
+					</view>
+					<view class="selected-list" :class="{active:-1 === selectedIndex}"  v-if="showMore" @click="change(-1, -1)">
+						<text class="iconfont icon-xiangyou"></text>
+						请选择
+					</view>
+				</view>
+				<scroll-view scroll-y="true" :scroll-top="scrollTop" class="address-list" @scroll="scroll">
+					<view v-for="(item,index) in addressList" :key="index" class="list" :class="{active:item.id === activeId}" @click="selected(item)">
+						<text class="item-name">{{item.name}}</text>
+						<text v-if="item.id === activeId" class="iconfont icon-duihao2"></text>
+					</view>
+				</scroll-view>
+			</view>
+		</view>
+		<view class='mask' catchtouchmove="true" :hidden='display==false' @tap='close'></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 {getAddressList} from '@/api/user.js';
+	import {brigade } from '@/api/api.js';
+	import { mapGetters } from "vuex";
+	const CACHE_ADDRESS = {};	
+	export default {
+		props: {
+			display: {
+				type: Boolean,
+				default: true
+			},
+			address: Array,
+		},
+		data() {
+			return {
+				active: 0,
+				//地址列表
+				addressList: [],
+				selectedArr: [],
+				selectedIndex: -1,
+				is_loading: false,
+				old: { scrollTop: 0 },
+				scrollTop: 0
+			};
+		},
+		computed:{
+			...mapGetters(['viewColor']),
+			activeId(){
+				return this.selectedIndex == -1 ? 0 : this.selectedArr[this.selectedIndex].id
+			},
+			showMore(){
+				return this.selectedArr.length ? this.selectedArr[this.selectedArr.length - 1].snum > 0 : true
+			}
+		},
+		watch:{
+			address(n){
+				this.selectedArr = n ? [...n] : []
+			},
+			display(n){
+				if(!n) {
+					this.addressList = [];
+					this.selectedArr =  this.address ? [...this.address] : [];
+					this.selectedIndex = -1;
+					this.is_loading = false;
+				}else{
+					this.loadAddress()
+				}
+			}
+		},
+		mounted() {
+			this.loadAddress()
+		},
+		methods: {
+			change(pid,index){
+				if(this.selectedIndex == index) return;
+				if(pid === -1){
+					pid = this.selectedArr.length ? this.selectedArr[this.selectedArr.length -1].id : 0;
+				}
+				console.log(index)
+				this.selectedIndex = index;
+				this.loadAddress();
+			},
+			loadAddress(pid){
+				if(CACHE_ADDRESS[pid]){
+					this.addressList = CACHE_ADDRESS[pid];
+					return ;
+				}
+				this.is_loading = true;
+				brigade(pid).then(res=>{
+					console.log(res.data)
+					this.is_loading = false;
+					CACHE_ADDRESS[pid] = res.data;
+					this.addressList = res.data;
+				})
+				this.goTop()
+			},
+			selected(item){
+				if(this.is_loading) return;
+				if(this.selectedIndex > -1){
+					this.selectedArr.splice(this.selectedIndex + 1,999)
+					this.selectedArr[this.selectedIndex] = item;
+					this.selectedIndex = -1;
+				}else if(!item.parent_id){
+					this.selectedArr = [item];
+				}else{
+					this.selectedArr.push(item);
+				}
+				if(item.snum){
+					this.loadAddress(item.id);
+				} else {
+					this.$emit('submit', [...this.selectedArr]);
+					this.$emit('changeClose');
+				}
+				this.goTop()
+			},
+			close: function() {
+				this.$emit('changeClose');
+			},
+			scroll : function(e) {
+				this.old.scrollTop = e.detail.scrollTop
+			},
+			goTop: function(e) {
+			    this.scrollTop = this.old.scrollTop
+			    this.$nextTick(() => {
+			        this.scrollTop = 0
+			    });
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.address-window {
+		background-color: #fff;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		z-index: 101;
+		border-radius: 30rpx 30rpx 0 0;
+		transform: translate3d(0, 100%, 0);
+		transition: all .3s cubic-bezier(.25, .5, .5, .9);
+	}
+	.address-window.on {
+		transform: translate3d(0, 0, 0);
+	}
+	.address-window .title {
+		font-size: 32rpx;
+		font-weight: bold;
+		text-align: center;
+		height: 123rpx;
+		line-height: 123rpx;
+		position: relative;
+	}
+	.address-window .title .iconfont {
+		position: absolute;
+		right: 30rpx;
+		color: #8a8a8a;
+		font-size: 35rpx;
+	}
+	.address-count{
+		.address-selected{
+			padding: 0 30rpx;
+			margin-top: 10rpx;
+			position: relative;
+			padding-bottom: 20rpx;
+			border-bottom: 2rpx solid #f7f7f7;
+		}
+		.selected-list{
+			font-size: 26rpx;
+			color: #282828;
+			line-height: 50rpx;
+			padding-bottom: 10rpx;
+			padding-left: 60rpx;
+			position: relative;
+			&.active{
+				color: #e28d54;
+			}
+			&:before,&:after{
+				content: '';
+				display: block;
+				position: absolute;			
+			}
+			&:before{
+				width: 4rpx;
+				height: 100%;
+				background-color: var(--view-theme);
+				top: 0;
+				left: 10rpx;
+			}
+			&:after{
+				width: 12rpx;
+				height: 12rpx;
+				background: var(--view-theme);
+				border-radius: 100%;
+				left: 6rpx;
+				top: 50%;
+				margin-top: -8rpx;
+			}
+			&:first-child,&:last-child{
+				&:before{
+					height: 50%;
+				}
+			}
+			&:first-child{
+				&:before{
+					top: auto;
+					bottom: 0;
+				}
+			}
+			.iconfont{
+				font-size: 20rpx;
+				float: right;
+				color: #dddddd;
+			}
+		}
+		scroll-view{
+			height: 550rpx;
+		}
+		.address-list{
+			padding: 0 30rpx;
+			margin-top: 20rpx;
+			box-sizing: border-box;
+			.list{
+				.iconfont{
+					float: right;
+					color: #ddd;
+					font-size: 22rpx;
+				}
+				.item-name{
+					display: inline-block;
+					line-height: 50rpx;
+					margin-bottom: 20rpx;
+					font-size: 26rpx;
+				}
+				&.active{
+					color: #e28d54;
+					.iconfont{
+						color: #e28d54;
+					}
+				}
+			}
+		}
+	}
+</style>
diff --git a/config/app.js b/config/app.js
index 2eae9d4..1284abe 100644
--- a/config/app.js
+++ b/config/app.js
@@ -10,8 +10,9 @@ let httpApiThree
 // let httpApi = 'http://192.168.31.110:8324' // 测试
 if (process.env.NODE_ENV === "development") {
 	// httpApi = 'https://shop.lihaink.cn' // 生产
-	httpApi = "https://crmeb-test.shop.lihaink.cn"
+	// httpApi = "https://crmeb-test.shop.lihaink.cn"
 	// httpApi = "http://192.168.0.222"
+	  httpApi = "http://192.168.0.108:8325"
 	// #ifdef MP-WEIXIN
 	httpApiTwo = "https://nk.lihaink.cn"
 	httpApiThree = 'http://ceshi-oa.lihaink.cn'
diff --git a/pages.json b/pages.json
index 62b545c..83381a8 100644
--- a/pages.json
+++ b/pages.json
@@ -694,13 +694,36 @@
 				}, {
 					"path": "trading_hall/index",
 					"style": {
-						"navigationBarTitleText": "",
+						"navigationBarTitleText": "交易大厅",
 						"enablePullDownRefresh": false
 					}
 
 				}
 			]
 		},
+		{
+			"root": "pages/trading_hall",
+			"name": "trading_hall",
+			"pages": [{
+					"path": "adddiscounts/index",
+					"style": {
+						"navigationBarTitleText": "新增调货",
+						"enablePullDownRefresh": false
+					}
+
+				},{
+					"path": "product_details/index",
+					"style": {
+						"navigationBarTitleText": "商品详情",
+						"enablePullDownRefresh": false
+					}
+
+				}
+				
+			]
+		},
+		
+		
 		{
 			"root": "pages/store",
 			"name": "store",
diff --git a/pages/trading_hall/adddiscounts/index.vue b/pages/trading_hall/adddiscounts/index.vue
new file mode 100644
index 0000000..d1a28a4
--- /dev/null
+++ b/pages/trading_hall/adddiscounts/index.vue
@@ -0,0 +1,979 @@
+<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='分享使用体验和心得，获得更多点赞和关注哦~(600字以内)' 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 @click.stop="deleteTopic">
+											<input type="number" value="" v-model="price" placeholder="请输入价格"
+												style="text-align: right;font-size: 28rpx;" />
+										</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>
+
+			<!-- <m-tabbar native>
+      <template v-slot:tabbar_index_2>
+        <view class="custom_style">
+          <view class="custom_style_icon"></view>
+        </view>
+      </template>
+    </m-tabbar> -->
+		</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 participateTopic from '@/components/participateTopic.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 store from '@/store';
+	export default {
+		components: {
+			avatar,
+			associated,
+			participateTopic,
+			authorize,
+			easyLoadimage,
+			mTabbar
+		},
+		data() {
+			return {
+				formData: {
+					image: [],
+					content: "",
+					topic_id: "",
+					spu_id: [],
+					video_link: ''
+				},
+				price:0,
+				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: ''
+			};
+		},
+		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
+		},
+		onLoad(options) {
+			// uni.hideTabBar()
+			this.id = options.id;
+			this.order_id = options.order_id;
+			// console.log("options.order_id", options.order_id)
+			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.id) {
+					this.getDetail()
+				} else {
+					// const data = getStorage('addPlant');
+					// if(data){
+					// 	this.formData.content = data.content || '';
+					// 	this.formData.image = data.image || [];
+					// }
+				}
+				if (this.order_id) this.getOrderGoods()
+			}
+			this.videoContext = uni.createVideoContext("myvideo", this);
+		},
+		onTabItemTap() {
+			this.$refs.associated.close();
+			this.formData.content = ''
+			this.formData.image = []
+			this.formData.topic_id = ''
+			this.formData.spu_id = ''
+			this.formData.video_link = ''
+			this.productList = []
+			this.topicName = {}
+		},
+
+		methods: {
+			onLoadFun() {
+				this.isShowAuth = false;
+			},
+			// 授权关闭
+			authColse: function(e) {
+				this.isShowAuth = e;
+			},
+			/*获取图文详情*/
+			getDetail() {
+				let that = this
+				plantDetailApi(that.id).then(res => {
+					that.formData = res.data
+					that.productList = res.data.relevance || []
+					that.topicName = res.data.topic || {}
+				}).catch(err => {
+					return that.$util.Tips({
+						title: err
+					});
+				})
+			},
+			/*获取关联订单商品*/
+			getOrderGoods() {
+				let that = this
+				orderAssociatePlantApi(that.order_id).then(res => {
+					that.productList = res.data || []
+					that.formData.spu_id = res.data.map(val => val.spu_id)
+				}).catch(err => {
+					return that.$util.Tips({
+						title: err
+					});
+				})
+			},
+			/*点击输入价格*/
+			addprice() {
+				this.isshow = !this.isshow
+			},
+			/*切换tab*/
+			changeTab(item) {
+				if (this.tabActive == item.value) return
+				this.tabActive = item.value
+				this.formData.image = []
+			},
+
+			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();
+				this.$refs.participateTopic.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 = data;
+				this.formData.spu_id = data.map(val => val.spu_id)
+				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.content) return that.$util.Tips({
+					title: '请分享使用心得和体会'
+				});
+				if (that.tabActive == 2 && !value.video_link) {
+					return that.$util.Tips({
+						title: '请添加话题视频'
+					});
+				}
+				if (!value.category_id || !value.topic_id) {
+					return that.$util.Tips({
+						title: '请选择话题'
+					})
+				}
+				if (that.id) {
+					if (value.relevance.length) {
+						value.spu_id = value.relevance.map(val => (val.spu && val.spu.spu_id) || val.spu_id)
+					}
+				}
+				value.order_id = that.order_id
+				value.is_type = that.tabActive
+				uni.showLoading({
+					title: '保存中',
+					mask: true
+				})
+				that.id ? updatePlantApi(that.id, value).then(res => {
+					uni.hideLoading()
+					that.$util.Tips({
+						title: res.messge,
+						icon: 'success'
+					});
+
+					setTimeout(function() {
+						if (that.tabActive == 2) {
+							uni.navigateTo({
+								//#ifdef APP
+								url: '/pages/short_video/appSwiper/index?id=' + res.data
+									.community_id + '&user=1&uid=' +
+									that.uid
+								//#endif
+								//#ifndef APP
+								url: '/pages/short_video/nvueSwiper/index?id=' + res.data
+									.community_id + '&user=1&uid=' +
+									that.uid
+								//#endif
+							});
+						} else {
+							uni.navigateTo({
+								url: '/pages/plantGrass/plant_detail/index?id=' + res.data
+									.community_id + '&type=' + that
+									.tabActive
+							})
+						}
+						/**
+						 * 将对象所有值为空
+						 * */
+						/**
+						 * 将对象所有值为空
+						 * */
+						that.formData = {
+							image: [],
+							content: "",
+							topic_id: "",
+							spu_id: [],
+							video_link: "",
+						}
+						that.topicName = {}
+					}, 1000);
+				}).catch(err => {
+					return that.$util.Tips({
+						title: err
+					});
+				}) : createPlantApi(value).then(res => {
+					uni.hideLoading()
+					that.$util.Tips({
+						title: res.messge,
+						icon: 'success'
+					});
+					setStorage('addPlant', '');
+					setTimeout(function() {
+						if (that.tabActive == 2) {
+							uni.navigateTo({
+								//#ifdef APP
+								url: '/pages/short_video/appSwiper/index?id=' + res.data
+									.community_id + '&user=1&uid=' +
+									that.uid
+								//#endif
+								//#ifndef APP
+								url: '/pages/short_video/nvueSwiper/index?id=' + res.data
+									.community_id + '&user=1&uid=' +
+									that.uid
+								//#endif
+							});
+						} else {
+							uni.navigateTo({
+								url: '/pages/plantGrass/plant_detail/index?id=' + res.data
+									.community_id + '&type=' + that
+									.tabActive
+							})
+						}
+						/**
+						 * 将对象所有值为空
+						 * */
+						that.formData = {
+							image: [],
+							content: "",
+							topic_id: "",
+							spu_id: [],
+							video_link: "",
+						}
+
+					}, 1000);
+				}).catch(err => {
+					// console.log('aaa', value)
+					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;
+		}
+	}
+</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..db78bd5
--- /dev/null
+++ b/pages/trading_hall/product_details/index.vue
@@ -0,0 +1,351 @@
+<template>
+	<view class="content">
+		<view class="content_top">
+			<view class="content_top-one">
+				<view class="content_symbol">
+					<image src="@/static/images/f.png" mode="aspectFit"></image>
+				</view>
+				<view class="content_title">
+					<view class="title_one">
+						张三生产资料供销
+					</view>
+					<view class="title_two">
+						100+人关注 100+销量
+					</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">
+					￥100
+				</view>
+
+				<view class="top-two_content">
+					【新鲜上架】“新鲜摘下，美味到你口，我们为您带来最新鲜的蔬菜，从田地到餐桌，健康从这里开始！快来选择你的绿色盛宴吧！"
+				</view>
+				<view class="top-two_img">
+					<view class="">
+						<image src="../../annex/static/vipBg.png" mode=""></image>
+					</view>
+					<view class="">
+						<image src="../../annex/static/vipBg.png" mode=""></image>
+					</view>
+					<view class="">
+						<image src="../../annex/static/vipBg.png" mode=""></image>
+					</view>
+				</view>
+
+
+
+
+			</view>
+		</view>
+
+		<view class="content_middle">
+			<view class="middle-one">
+				<view class="midding-img">
+					<image src="@/static/images/bg2.png" mode=""></image>
+				</view>
+				<view class="middle-one_text">
+					<view class="one_text_a">
+						良品铺子肉松饼1000g/箱 面包糕...
+					</view>
+					<view class="one_text_b">
+						￥100
+					</view>
+					<view class="one_text_c">
+
+						<view class="">
+							采购价:¥34.90
+						</view>
+						<view class="">
+							数量:100个
+						</view>
+
+					</view>
+				</view>
+			</view>
+			<view class="middle-one">
+				<view class="midding-img">
+					<image src="@/static/images/bg2.png" mode=""></image>
+				</view>
+				<view class="middle-one_text">
+					<view class="one_text_a">
+						良品铺子肉松饼1000g/箱 面包糕...
+					</view>
+					<view class="one_text_b">
+						￥100
+					</view>
+					<view class="one_text_c">
+
+						<view class="">
+							采购价:¥34.90
+						</view>
+						<view class="">
+							数量:100个
+						</view>
+
+					</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>
+
+		<view class="pay">
+			<view class="pay_tilte-a">
+				合计: <span>￥200.00</span>
+			</view>
+			<view class="pay_tilte-b">提交订单</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+
+
+		data() {
+			return {
+
+			}
+		},
+		onLoad() {},
+		methods: {},
+
+	}
+</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: 136rpx;
+				height: 64rpx;
+				margin-top: -10rpx;
+				margin-left: 10rpx;
+
+				image {
+					width: 136rpx;
+					height: 64rpx;
+				}
+			}
+		}
+
+		.content_top-two {
+			.price {
+				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;
+			}
+
+			.top-two_img {
+				display: flex;
+				justify-content: space-between;
+
+				view {
+					width: 217rpx;
+					height: 217rpx;
+					border-radius: 14rpx 14rpx 14rpx 14rpx;
+				}
+
+				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-Regular, PingFang SC;
+					font-weight: 400;
+					color: #999999;
+					margin-top: 12rpx;
+					display: flex;
+					justify-content: space-between;
+					margin-right: 50rpx;
+				}
+			}
+
+		}
+	}
+
+	.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;
+				}
+			}
+
+		}
+	}
+
+	.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;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/users/online_warehousing/index.vue b/pages/users/online_warehousing/index.vue
index 968e232..38c6fb1 100644
--- a/pages/users/online_warehousing/index.vue
+++ b/pages/users/online_warehousing/index.vue
@@ -1,460 +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="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'>s
-              共{{item.orderProduct.length}}件商品，总金额
-              <text class='money'>￥{{item.pay_price}}</text>
-            </view>
-           <!-- <view class="totalfooter">
+										</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>
+					</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
+	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
-        });
-      }
-    }
-  }
+			},
+			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 {
+		background-color: red;
 
-    .top-header {
-      position: fixed;
-      top: 0;
-      left: 0;
-      z-index: 9999;
-      width: 100%;
-      background-color: #fff;
+		.top-header {
+			position: fixed;
+			top: 0;
+			left: 0;
+			z-index: 9999;
+			width: 100%;
+			background-color: #fff;
 
-      .search {
-        padding: 17rpx 30rpx;
+			.search {
+				padding: 17rpx 30rpx;
 
-        .search-content {
-          width: 100%;
-          height: 60rpx;
-          padding: 0 30rpx;
-          border-radius: 30rpx;
-          background-color: #F5F5F5;
-          font-size: 26rpx;
-        }
+				.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;
-        }
+				.iconfont {
+					margin-right: 10rpx;
+					font-size: 26rpx;
+					color: #999999;
+				}
 
-        .input-placeholder {
-          font-size: 26rpx;
-          color: #999999;
-        }
+				.input-placeholder {
+					font-size: 26rpx;
+					color: #999999;
+				}
 
-        .input {
-          flex: 1;
-        }
-      }
-    }
-  }
+				.input {
+					flex: 1;
+				}
+			}
+		}
+	}
 
-  .bgc_img {
-    position: absolute;
-    top: 30vh;
-    left: 10vw;
+	.bgc_img {
+		position: absolute;
+		top: 30vh;
+		left: 10vw;
 
-    image {
-      width: 300px;
-    }
+		image {
+			width: 300px;
+		}
 
-    .txt {
-      text-align: center;
-    }
-  }
+		.txt {
+			text-align: center;
+		}
+	}
 
-  .list {
-    width: 690rpx;
-    margin: 50px auto 0 auto;
+	.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;
+		.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;
-        }
+			.left-wrapper {
+				.iconfont {
+					margin-top: 5rpx;
+				}
 
-        .store-name {
-          margin: 0 10rpx;
-        }
+				.store-name {
+					margin: 0 10rpx;
+				}
 
-        .icon-xiangyou {
-          font-size: 20rpx;
-        }
-      }
+				.icon-xiangyou {
+					font-size: 20rpx;
+				}
+			}
 
-      .sign {
-        font-size: 24rpx;
-        padding: 0 7rpx;
-        height: 36rpx;
-        margin-right: 15rpx;
-      }
-    }
+			.sign {
+				font-size: 24rpx;
+				padding: 0 7rpx;
+				height: 36rpx;
+				margin-right: 15rpx;
+			}
+		}
 
-    .item {
-      background-color: #fff;
-      margin: 5px 0 5px 0;
+		.item {
+			background-color: #fff;
+			margin: 5px 0 5px 0;
 
-      .item-info {
-        padding: 0 30rpx;
-        margin-top: 22rpx;
+			.item-info {
+				padding: 0 30rpx;
+				margin-top: 22rpx;
 
-        .pictrue {
-          width: 120rpx;
-          height: 120rpx;
+				.pictrue {
+					width: 120rpx;
+					height: 120rpx;
 
-          image {
-            width: 100%;
-            height: 100%;
-            border-radius: 6rpx;
-          }
-        }
+					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;
+				.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;
-          }
+					._left {
+						width: 300rpx;
+						color: #282828;
+						white-space: nowrap;
+						overflow: hidden;
+						text-overflow: ellipsis;
+					}
 
-          .name {
-            width: 100rpx;
-            color: #282828;
+					.name {
+						width: 100rpx;
+						color: #282828;
 
-          }
+					}
 
-          .money {
-            text-align: right;
-            float: right;
+					.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_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;
-      }
+			.event_ship {
+				font-size: 20rpx;
+				margin-top: 10rpx;
+			}
 
-      ._order {
-        font-size: 28rpx;
-        margin: 5px 0 0 15px;
-      }
+			._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;
+			.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);
-        }
+				.money {
+					font-size: 34rpx;
+					font-weight: bold;
+					color: rgb(233, 51, 35);
+				}
 
-      }
+			}
 
-      .totalfooter {
-        width: 100%;
-        height: 50px;
-        position: relative;
-        border-top: 1px solid #CCCCCC;
+			.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;
+				.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;
+			.bottom {
+				height: 107rpx;
+				padding: 0 30rpx;
+				border-top: 1px solid #f0f0f0;
 
 
-      }
-    }
+			}
+		}
 
-    .event_price {
-      margin: 0 0 50rpx 120rpx;
-    }
-  }
+		.event_price {
+			margin: 0 0 50rpx 120rpx;
+		}
+	}
 
-  .popen {
-    position: absolute;
-    top: 110px;
-    width: 100%;
-    margin: auto;
-    padding: 10px;
+	.popen {
+		position: absolute;
+		top: 110px;
+		width: 100%;
+		margin: auto;
+		padding: 10px;
 
-    h4 {
-      font-weight: 400;
-      font-size: 20px;
-      padding: 5px;
-      text-align: center;
-    }
+		h4 {
+			font-weight: 400;
+			font-size: 20px;
+			padding: 5px;
+			text-align: center;
+		}
 
-    .guige {
-      margin: 10px 0 10px 20px;
-    }
+		.guige {
+			margin: 10px 0 10px 20px;
+		}
 
-    .shuru {
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      font-size: 18px;
-      padding: 5px;
+		.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 {
+			display: flex;
+			justify-content: flex-start;
+			align-items: center;
+			margin: 10px;
 
-      .btn_l {
-        padding: 5px;
-        width: 100px;
-        border-radius: 4px;
-      }
+			.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;
-      }
-    }
-  }
+			.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/index.vue b/pages/users/order_list/index.vue
index 99e989b..79bb8e2 100644
--- a/pages/users/order_list/index.vue
+++ b/pages/users/order_list/index.vue
@@ -650,6 +650,7 @@
 							groupOrderList({
 								page: that.page,
 								limit: that.limit,
+								product_type:0
 							}).then(res => {
 								that.isReady = true;
 								let list = res.data.list || [];
@@ -670,6 +671,7 @@
 								status: that.orderStatus - 1,
 								page: that.page,
 								limit: that.limit,
+								product_type:0
 							}).then(res => {
 								let list = res.data.list || [];
 								let loadend = list.length < that.limit;
diff --git a/pages/users/order_list/indexCopy.vue b/pages/users/order_list/indexCopy.vue
index 496ccd8..936566b 100644
--- a/pages/users/order_list/indexCopy.vue
+++ b/pages/users/order_list/indexCopy.vue
@@ -651,6 +651,7 @@
 							groupOrderList({
 								page: that.page,
 								limit: that.limit,
+							
 							}).then(res => {
 								that.isReady = true;
 								let list = res.data.list || [];
@@ -671,6 +672,7 @@
 								status: that.orderStatus - 1,
 								page: that.page,
 								limit: that.limit,
+								product_type:98
 							}).then(res => {
 								let list = res.data.list || [];
 								let loadend = list.length < that.limit;
diff --git a/pages/users/releaseOrdermanagement/index.vue b/pages/users/releaseOrdermanagement/index.vue
new file mode 100644
index 0000000..bc5b404
--- /dev/null
+++ b/pages/users/releaseOrdermanagement/index.vue
@@ -0,0 +1,37 @@
+<template>
+	<view class="">
+         <view class="">
+         
+         </view>
+		 
+		 
+	</view>
+</template>
+
+<script>
+	export default {
+	
+	data() {
+	return {
+	list:[{
+		name:在售
+	},
+	{
+		name:已售出
+	},
+	{
+		name:待审核
+	},
+	{
+		name:审核未通过
+	},
+	{
+		name:在售
+	}]
+	}
+	}
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/pages/users/trading_hall/index.vue b/pages/users/trading_hall/index.vue
index 1509485..e4c4770 100644
--- a/pages/users/trading_hall/index.vue
+++ b/pages/users/trading_hall/index.vue
@@ -1,208 +1,371 @@
 <template>
-  <view>
-    <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"
-              @confirm="handleSearch" />
-          </view>
-        </view>
-      </view>
-      <view class="recom">
-        <view class="recom_bnt">
-          <rudon-rowMenuDotDotDot :localdata="options" @change="menuAction($event)">
-            {{this.recomname}}
-          </rudon-rowMenuDotDotDot>
-        </view>
-      </view>
-    </view>
-    <view class="type_switch">
-      <view class="recom_mend">
-        推荐
-      </view>
-    </view>
-    <view class="type_switch">
-      <view class="recom_mend">
-        调货
-      </view>
-    </view>
-    <view class="type_switch">
-      <view class="recom_mend">
-        打折专区
-      </view>
-    </view>
-    <view class="list">
-      <view class="item">
-        <image class="shopimg" src="@/static/images/2-002.png" mode="widthFix"></image>
-        <view class="item_text">
-          <span>调货</span> 夹岸数范德萨范德萨衣服上的
-        </view>
-        <view class="item_prices">
-          啊沙发上
-        </view>
-        <view class="item_name">
-          <image class="avater" src="../user_grade/images/suozi.png" mode="widthFix"></image>
-          <view class="item_name_text">
-            啊沙发上
-          </view>
-        </view>
-      </view>
+	<view>
+		<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"
+							@confirm="handleSearch" />
+						<view class="search_btn">
+							<image src="@/static/images/serchbtn.png" mode="aspectFill"></image>
 
+						</view>
+					</view>
 
-    </view>
-  </view>
+				</view>
+			</view>
+			<view class="recom">
+				<view class="recom_bnt">
+					<rudon-rowMenuDotDotDot :localdata="options" @change="menuAction($event)">
+						{{this.recomname}}
+						<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 class="list">
+			<view class="item" v-for='(item,index) in datatlist' :key='index' @click="shopping">
+				<image class="shopimg" :src="item.img" mode="aspectFit"></image>
+				<view class="item_text">
+					<span>{{item.txt}}</span> {{item.name}}
+				</view>
+				<view class="item_prices">
+					<span>￥</span>{{item.price}}
+				</view>
+				<view class="item_name">
+					<image class="avater" :src="item.img1" mode="aspectFit"></image>
+					<view class="item_name_text">
+						{{item.adess}}
+					</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"></release>
+	</view>
 </template>
 
 <script>
-  import { methods } from '../../../uni_modules/uview-ui/libs/mixin/mixin'
-  export default {
-    data() {
-      return {
-        where: {
-          page: 1,
-          limit: 10,
-          status: 20,
-          product_type: 98,
-          keyword: '',
-        },
-        options: [{
-            value: '0',
-            text: '推荐'
-          },
-          {
-            value: '1',
-            text: '调货'
-          },
-          {
-            value: '2',
-            text: '打折专区'
-          }
-        ],
-        recomname: '',
-      }
-    },
-    methods: {
-      menuAction(action, rowId) {
-        console.log(action);
-        // 忽略初始化时的传入的空操作
-        if (action === '') {
-          this.recomname = this.options[0].text
-        } else {
-          this.recomname = this.options[action].text
-        }
-      },
-    }
-  }
+	import {
+		methods
+	} from '../../../uni_modules/uview-ui/libs/mixin/mixin'
+	import release from '@/components/release/release.vue';
+	export default {
+		components: {
+			release
+		},
+		data() {
+			return {
+				where: {
+					page: 1,
+					limit: 10,
+					status: 20,
+					product_type: 98,
+					keyword: '',
+
+				},
+				visible: false,
+				num: 0,
+				options: [{
+						value: '0',
+						text: '推荐'
+					},
+					{
+						value: '1',
+						text: '调货'
+					},
+					{
+						value: '2',
+						text: '打折专区'
+					}
+				],
+				datatlist: [{
+					img: require('@/static/images/2-002.png'),
+					txt: "调货",
+					name: '焦糖山核桃味瓜子90g',
+					price: '25.00',
+					// ../user_grade/images/suozi.png
+					img1: require('@/static/images/2-002.png'),
+					adess: '张三生活超市'
+
+				}, {
+					img: require('@/static/images/2-002.png'),
+					txt: "委托销售",
+					name: '焦糖山核桃味瓜子90g',
+					price: '25.00',
+					// ../user_grade/images/suozi.png
+					img1: require('@/static/images/2-002.png'),
+					adess: '张三生活超市'
+
+				}, {
+					img: require('@/static/images/2-002.png'),
+					txt: "打折专区",
+					name: '焦糖山核桃味瓜子90g',
+					price: '25.00',
+					// ../user_grade/images/suozi.png
+					img1: require('@/static/images/2-002.png'),
+					adess: '张三生活超市'
+
+				}],
+				recomname: '',
+			}
+		},
+		methods: {
+			btntap(index) {
+				this.num = index
+			},
+			shopping(){
+				uni.navigateTo({
+					url:'/pages/trading_hall/product_details/index'
+				})
+			},
+			open() {
+
+				this.visible = true
+
+			},
+			closeMadle() {
+				this.visible = false
+
+			},
+			confirm() {
+				// 这里调用接口执行点击确定后的操作并关闭弹窗
+				console.log('点击了确认按钮')
+				this.visible = false
+			},
+			cancel() {
+				// 点击了取消按钮直接关闭弹窗
+				console.log('点击了取消按钮')
+				this.visible = false
+			},
+			menuAction(action, rowId) {
+				console.log(action);
+				// 忽略初始化时的传入的空操作
+				if (action === '') {
+					this.recomname = this.options[0].text
+				} else {
+					this.recomname = this.options[action].text
+				}
+			},
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-  .header {
-    width: 100%;
-    display: flex;
-    justify-content: flex-start;
-    align-items: center;
+	.header {
+		width: 100%;
+		display: flex;
+		justify-content: flex-start;
+		align-items: center;
+		background-color: #fff;
 
-    .top-header {
-      z-index: 9999;
-      width: 80%;
-      background-color: #fff;
+		.top-header {
 
-      .search {
-        padding: 17rpx 30rpx;
+			width: 80%;
 
-        .search-content {
-          width: 100%;
-          height: 60rpx;
-          padding: 0 30rpx;
-          border-radius: 30rpx;
-          background-color: #F5F5F5;
-          font-size: 26rpx;
-        }
+			.search {
+				padding: 17rpx 30rpx;
 
-        .iconfont {
-          margin-right: 10rpx;
-          font-size: 26rpx;
-          color: #999999;
-        }
+				.search-content {
+					width: 100%;
+					height: 60rpx;
+					padding-left: 30rpx;
+					border-radius: 30rpx;
+					background-color: #F5F5F5;
+					font-size: 26rpx;
+				}
 
-        .input-placeholder {
-          font-size: 26rpx;
-          color: #999999;
-        }
+				.iconfont {
+					margin-right: 10rpx;
+					font-size: 26rpx;
+					color: #999999;
+				}
 
-        .input {
-          flex: 1;
-        }
-      }
-    }
+				.input-placeholder {
+					font-size: 26rpx;
+					color: #999999;
+				}
 
-    .recom {
-      width: 78px;
-      height: 34px;
-      text-align: center;
-      border-radius: 30px;
-      border: 1px solid #F84221;
-      display: flex;
-      justify-content: center;
-      align-items: center;
+				.input {
+					flex: 1;
+				}
 
-      .recom_bnt {}
-    }
-  }
+				.search_btn {
+					width: 98rpx;
+					height: 60rpx;
 
-  .list {
-    width: 100%;
-    display: flex;
-    justify-content: flex-start;
-    align-items: center;
-    flex-wrap: wrap;
+					margin-left: 20rpx;
 
-    .item {
-      width: 45%;
-      margin: 9px;
+					image {
+						width: 98rpx;
+						height: 60rpx;
+					}
+				}
+			}
 
-      .shopimg {
-        width: 100%;
-      }
 
-      .item_text {
-        width: 100%;
-        padding: 15px 10px 15px 10px;
-        text-overflow: ellipsis;
-        overflow: hidden;
-        white-space: nowrap;
 
-        span {
-          height: 20px;
-          padding: 3px;
-          margin: 2px;
-          background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
-          border-radius: 4px 0px 4px 0px;
-          color: white;
-        }
-      }
+		}
 
-      .item_prices {
-        font-size: 18px;
-        color: #F84221;
-        padding-left: 15px;
-        border-bottom: 1px solid #707070;
-      }
+		.recom {
+			width: 137rpx;
+			height: 60rpx;
+			text-align: center;
+			border-radius: 30px;
+			border: 1px solid #F84221;
+			display: flex;
+			justify-content: center;
+			align-items: center;
 
-      .item_name {
-        width: 100%;
-        height: 50px;
-        display: flex;
-        align-items: center;
+			.recom_bnt {
+				font-size: 32rpx;
+				font-family: 'PingFang SC';
+				font-weight: 400;
+				color: #F84221;
 
-        .avater {
-          margin: 5px;
-          width: 40px;
-          height: 40px;
-        }
-      }
-    }
-  }
+				.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: 18px;
+		background-color: #fff;
+		font-weight: 500;
+		color: #999999;
+		padding-bottom: 10rpx;
+
+		.tradcolor {
+			color: #F84221;
+		}
+
+		.tradline {
+			width: 26rpx;
+			opacity: 1;
+			border: 2rpx solid #F84221;
+			margin: 0 auto;
+		}
+	}
+
+	.tardimg_add {
+		position: absolute;
+		bottom: 193rpx;
+		right: 0rpx;
+		position: fixed;
+		width: 176rpx;
+		height: 176rpx;
+
+		image {
+			width: 176rpx;
+			height:176rpx;
+		}
+	}
+
+	.list {
+		width: 100%;
+		display: flex;
+
+		justify-content: flex-start;
+		align-items: center;
+		flex-wrap: wrap;
+
+
+		.item {
+			width: 336rpx;
+			height: 561rpx;
+			background-color: #fff;
+			margin-top: 21rpx;
+			margin-left: 25rpx;
+			border-radius: 14rpx 14rpx 0 0;
+
+			.shopimg {
+				width: 336rpx;
+				height: 314rpx
+			}
+
+			.item_text {
+				width: 100%;
+				padding: 15px 10px 15px 10px;
+				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;
+				}
+			}
+
+			.item_prices {
+				font-size: 18px;
+				color: #F84221;
+				padding-left: 15px;
+				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: 60rpx;
+						height: 60rpx;
+						display: block;
+						
+					}
+				}
+				.item_name_text{
+					   margin-top: 30rpx;
+				}
+			}
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/users/user_address/index.vue b/pages/users/user_address/index.vue
index 6a49cd2..4f48e4b 100644
--- a/pages/users/user_address/index.vue
+++ b/pages/users/user_address/index.vue
@@ -17,22 +17,33 @@
 						<view class='name'>所在地区</view>
 						<view class="region">
 							<view class="region_count" @click="changeRegion">
-								<text v-if="!addressInfo.length" style="color:#cdcdcd;">请选择地址</text>
+								<text v-if="!addressInfo.length" style="color:#cdcdcd;">请选择地区</text>
 								<text v-else>{{addressText}}</text>
 								<text class="iconfont icon-xiangyou"></text>
 							</view>
 						</view>
 
+					</view>
+					<view class='item acea-row row-between-wrapper'>
+						<view class='name'>所在村队</view>
+						<view class="region">
+							<view class="region_count" @click="changevillage">
+								<text v-if="!villageInfo.length" style="color:#cdcdcd;">请选择村队</text>
+								<text v-else>{{villageText}}</text>
+								<text class="iconfont icon-xiangyou"></text>
+							</view>
+						</view>
+
 					</view>
 					<view class='item acea-row row-between-wrapper'>
 						<view class='name'>详细地址</view>
 						<input type='text' class="location-input" placeholder='请填写具体地址' name='detail'
 							placeholder-class='placeholder' v-model="userAddress.detail"></input>
-						<view class="location" @click="selfLocation">
+						<!--<view class="location" @click="selfLocation">
 							<text class="iconfont icon-chakanditu"></text>
 							<br>
 							定位
-						</view>
+						</view> -->
 
 					</view>
 				</view>
@@ -54,6 +65,9 @@
 		</form>
 		<areaWindow ref="areaWindow" :display="display" :address="addressInfo" @submit="OnChangeAddress"
 			@changeClose="changeClose"></areaWindow>
+		<villageTeam ref="villageTeam" :display="display_one" :address="villageInfo" :villageaddress="list"
+			@submit="OnChangevAddress" @changeClose="changevClose"></villageTeam>
+
 		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
 	</view>
 </template>
@@ -80,6 +94,7 @@
 		mapGetters
 	} from "vuex";
 	import areaWindow from '@/components/areaWindow';
+	import villageTeam from '@/components/villageTeam/villageTeam.vue';
 	import {
 		getGeocoder
 	} from '@/api/store.js';
@@ -88,6 +103,7 @@
 		components: {
 			areaWindow,
 			authorize,
+			villageTeam
 		},
 		data() {
 			return {
@@ -107,7 +123,10 @@
 				multiIndex: [0, 0, 0],
 				cityId: 0,
 				display: false,
+				display_one: false,
 				addressInfo: [],
+				villageInfo: [],
+				list: [],
 				latitude: '',
 				longitude: ''
 			};
@@ -116,6 +135,9 @@
 			...mapGetters(['isLogin', 'viewColor']),
 			addressText() {
 				return this.addressInfo.map(v => v.name).join('/');
+			},
+			villageText() {
+				return this.villageInfo.map(v => v.name).join('/');
 			}
 		},
 		onLoad(options) {
@@ -137,6 +159,11 @@
 		methods: {
 			OnChangeAddress(address) {
 				this.addressInfo = address;
+				this.list = address
+			},
+			OnChangevAddress(address) {
+				this.villageInfo = address;
+			console.log(this.villageInfo)
 			},
 			// 地址数据
 			getCityList: function() {
@@ -148,10 +175,16 @@
 			changeRegion() {
 				this.display = true;
 			},
+			changevillage() {
+				this.display_one = true;
+			},
 			// 关闭地址弹窗；
 			changeClose: function() {
 				this.display = false;
 			},
+			changevClose: function() {
+				this.display_one = false;
+			},
 			// 授权回调
 			onLoadFun: function() {
 				this.isShowAuth = false;
@@ -171,11 +204,12 @@
 				if (!this.address_id) return false;
 				let that = this;
 				getAddressDetail(this.address_id).then(res => {
-					let region = [res.data.province, res.data.city, res.data.district];
+					let region = [res.data.province, res.data.city, res.data.district, res.data.street, res.data.village];
 					that.$set(that, 'userAddress', res.data);
 					that.$set(that, 'region', region);
 					that.city_id = res.data.city_id
-					that.addressInfo = res.data.area
+					that.addressInfo = res.data.areas
+					that.villageInfo = [res.data.brigade]
 				});
 			},
 			// 导入共享地址（小程序）
@@ -240,17 +274,14 @@
 					// console.log(err);
 				});
 			},
-
 			selfLocation() {
-				console.log(66)
 				let self = this
 				uni.showLoading({
 					title: '定位中',
 					mask: true,
 				});
 				uni.getLocation({
-					type: 'wgs84',
-					timeout: '10',
+					type: 'gcj02',
 					success: (res) => {
 						let latitude, longitude;
 						latitude = res.latitude.toString();
@@ -316,13 +347,17 @@
 				if (!that.addressInfo.length) return that.$util.Tips({
 					title: '请选择所在地区'
 				});
+				if (!that.villageInfo.length) return that.$util.Tips({
+					title: '请选择所在村队'
+				});
 				if (!value.detail) return that.$util.Tips({
 					title: '请填写详细地址'
 				});
 				value.address_id = that.address_id;
 				value.is_default = that.userAddress.is_default ? 1 : 0;
 				value.area = that.addressInfo;
-
+				value.brigade=that.villageInfo[0]
+				
 				uni.showLoading({
 					title: '保存中',
 					mask: true
diff --git a/static/images/arrow-bottom.png b/static/images/arrow-bottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..25a4aa84cf0ab0b7febf161f9417f646e1b543e6
GIT binary patch
literal 196
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`-JULvAr}70DGLM)f>z8=6p;LI
zI`G_#-2aO=AF1Gs)V;yIUna%(pW((i|IUBd-&}mZ*{i0lraUMkJtbjH!mt0=SyB{j
zcoKwu@ElymrYi7JvdNoIS!{#mk#vJ=87|itxcDc`FRbKEw`!1NGGd6|@xa%^URE^Q
tk!{2K{r7vc)7S#NRMc3Lf}J;tGpOwe6V%?6JQe6H22WQ%mvv4FO#rmHMMD4p

literal 0
HcmV?d00001

diff --git a/static/images/discounts.png b/static/images/discounts.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b5ff9c29cafdcee69d2b015ded0beae72678dbf
GIT binary patch
literal 4459
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

literal 0
HcmV?d00001

diff --git a/static/images/season.png b/static/images/season.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2568dd81b21a5f6d74044720ed53775f6a831b4
GIT binary patch
literal 3928
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

literal 0
HcmV?d00001

diff --git a/static/images/serchbtn.png b/static/images/serchbtn.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6138db67b268cc5e299bf764830aba7000a13bf
GIT binary patch
literal 1463
zcmV;o1xWgdP)<h;3K|Lk000e1NJLTq001}u001Hg1^@s63d<Vf000GkNkl<ZSVz@a
zTWnNS6kYq=J2RbDY$Q;yU^@evC>S15l=7T`4-79s3>Jz38i)q_A+)ie!4D}Q5(r8N
z2Fk-k)BtHp0Y5O(7I|n<OF)$PfGIC|DB4y!k2`a=xr2jD+v(it+)+5cXYIAm+WVY+
z&)Judz-Y<q-AmZiNi29cf%=2t1SkUpO9C{;p$rY+n;@KH@M)5CB&3C^GLBrhY?OqI
z09#y+p^88$Gff0RHDZ%83?m5Uy%KmQy~gupJU<-@^tyUF2x)6Um;xe0!HDP3w0UL*
zqmtoUWUsm6iNzap(JgN0bcL{qflSjDl>#CH8bhJb{Pf!MyV|2~SD@eJC}qORyDn?7
z0;FeCa%oy^!|K+MHUj-F$6^+=G6lg-IVDM6Vyp4IeW#-+fqr++bcXokp2=M6kTEks
z=G&^z?~F{{7U&z1(+5_i9>D#kggPr5%ETEELq>yg`T|xP@Y@y0@9QBCR6u@JZHk+A
zNSZh(2iXrboYUuS3-r4kdzff)(q4stGIIfxf>%IR8(2!<`mbPL3n(iaWX}k@kf*;v
za8(KTQbW=%+Ym5UrB!>Ly)964=L`>#ayV&ELO@--7RuPk;HEzj+OYwl0~J8iAGfH5
z01bE=>Wf7XgYv+QH=vcw0-rsTwCmOcGAM_qA8I%n&Y;ijs02}1aWX@hRRneJBFM96
zpe-p3Z^>9g&#+op48D39fqBmWEq^8Bx*c1tOgreAO3fpCcDJbZ%Sqo*va(_Q;B&y|
zMPUB;4#h=QqrSQf%A^7WKiY`UmNpeWIl&A~3wnD|z~z`N1#M4`4NwY8pcX7ZaAO%l
zySEyn%jg2@$A<xC1fG8i&;rKn45EbOIplXcwldLNgElc?miMbbefuFWZOFf8&H$<U
z+G;4{rXjE}AAGXTfQ4}gF>fR97)Kp}h8Q<%A8Flx8fd(Mz|4^eQHiN@U@3YN+PbBX
zdv_#c8xKt2I`X-l*FfkV4;*ja`q|Im3%@`s92XB7H7~}$088;o1UD>0sA5|}wg$l0
z$T!C617I@%?hq0_OI<P%m^={BzkLQr<m_s16+za1YS79cjM-<JKy~SQD6R<z6c>O`
z95c8Az_MvSMBm5YpD_ZsX80Xzl;5v!(d!^|GinhFCx*IVS-u6b{us290z-5nZ!9cj
zn;}ouL0gz_$R;5W<2w1>&f`pYG9kklV9R^EAo@Rn;MO(aTTF)|I~Ue>cY+@1cB_J(
zI&Q`iqBxlGwO&QH5onGn?7bYYuHOyH?21s;hX|Ih25vUDq1H2}E?NQV+8y%3IcP6U
z0Q`C>Fn2I`yJ;W#$kM3Kqp*~fgL-6xZ#F|7J^=aCci|fjJ(vT1E9+-Y|G3MG9*BpW
zko8BQy)n;pk>L-0^ROOS7F+tIq_1js20x<<lo>CFuVHjw+t-(V=JajMKc0eRc{#-3
zVdjfu1ht?yJAB#pyB(Em!ezV72D4Z}{RV?_9|oyb@b6b4e>f3cEp2J35y`wKt=cms
zEYR!989_q%!rT*(09y(~Mm?AQ$)Y(A-UM_-LGKj#?Gb3DvlF^7v?`y`58iMVN98(6
z6(>w<S#(CIF0yPh=#j?}$R8FiOr01_EP0^4#uM(9-hE9cA#U|=IwP*5rc)$Res}Kc
zOk#N_BKN<W#BCc!R_Jv(787B`J<~qaGsn<-qN`d*Id<!QRPJ*^75dZsu5R4}Xp}4q
z)2kaQ+S@{Le!e&yL|A7=Ln<}<mn&IfVWglWEHGlwGCDU;5h!L7lK@y#vslBdez4pp
zCDx?ZHpG3GCG<<IF|T)5yIo9R7Gs$(;J^F<N{o{d@?gLx_hlZtc*AHo{sy4EF3|jb
REGhs1002ovPDHLkV1oB^lkorm

literal 0
HcmV?d00001

diff --git a/static/images/sym.png b/static/images/sym.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e4d962f287e2800d714bf871444d02a34334009
GIT binary patch
literal 2854
zcmV+>3)%FEP)<h;3K|Lk000e1NJLTq002Y)001Be1^@s6t9IW0000W@Nkl<ZXhZFo
zd2|)!8ODDzbGK|a3p<E}U1TX+4_kq<2#72pY*w^|0@k_}P(TYVRZyVSQV)kCn+mNg
zHYD+&f*4~J1nPnokwt_A0w{s3H``rirf0sHxw*L{SkLKy<|g;f%)Q_8e$V^7@Atir
zMB}Rt0#YL$brEO;B#IG@fHVSf<0R3@kcJpiGl@<v2djXwI#N73#=rGp;ij8c9jWg3
z_OoPsZ?`pC8uyYlj*WffHEJBYuhB<LZjB*qk;G{BnC76CJrVcj{1J0leIv&*ewT!;
zR7kK-M}N$dTW~f!qCS<*Ivhr)i4B5r)gufPK!g`-Ei%$bT})%zX#pgFi+GMSRMP9V
zjr`37!vw3&7}i))6ae8lg^>~CTF<uawSbzonxEpXNDrxlJRe;=BiiWcWa<)AgaH;a
zY(Q+|OrUI!)b)0)?;;k_fM?95Hoy|APn|i#Y_XRkQ3sHy-=hJEcB<hB@h3&VVcL`B
z$<0p}ciL3Sfdm1D1&Ai@C8PmqsNZ~wUVJ%>zCDS1{$B}fe-<iBks}r=yqeS!x%&`8
z2QtMka%vB>!i!K@R_m82_Sm3@odGC)M`BnX`s@RnA7S4{vQ`;<JL>UI(aMTVQbst>
zl{OoH_G`GtOh<kHO(ZphY+E5&9MSQ4KFIglfS9&efEZvHZ&h&;^Y?31FCKzgZ~`f@
zInL2@!nwsW`#EY}TV~>`sf04uihBbP=iF5g<E8qg2LvFo&t?<Y^&;w52asE|!!>%A
zSg6rHxNjT!)$h<12U4@PVtmsv5^|S5#NM|O-=c{~x*0$=SM;JQ=zhQG=iPk*-$N5n
zFPw=88`G&N@8(f7wgd4CS3yNNflaGXB#@2yjZl{icY-H3-yn`)hzW=Wn(=IaVSMwm
zvBW&R7rnAnbg0Q*iyjJ!#&XlPxQE|Kb;e&z`l%)$#!K$do0t`E;d^KhN|*k~Z93z=
z?H)qM4xoLXPw1<IIC>5h{fy;>a&}-WPHLG-{HtG}2mMy=x$&j)v6+O99Y*Olg7{TC
z(JRVKJKx!kvukgYD1fuqK!V4PAh|p!&D&7(@(Q%vHw8-svl{|L)64->%>=}`co*uG
z^Z5U@T@0=jeTUqpD~{fyP;R;fXP5re<i0LE7CQ14`nmrgH@lg*H91tjvJC%+yKxMg
zhSIhxo{@JFJboDU$^`=NZbiR(S$HU%QFIBpRVwitk5D?HRXCX%&T)^NPUun|p;Mn*
zRIg2n29x3*UyoW=Le0J%f>~On4>_f|V27^jG<_+HqKDH(kSGQ#3NIrU7oymy)e4*I
z7-9e-7-C#+>W1gf|E6qyXVlWG7L6rhr!T?La|9J{tQP1QOG=pgJpR3#3GUyDJMBS%
zXwBQ3iT_h3<<I{b)mKK+%5183y-4ub0URybiML>rB%ytO0qsfwa?4Z_HeC;h_ql)K
z|0IX%tc_v`k@-q)(~-mtxs*ON2d(%jx~3C6dlJttC!@5!SpejnyOi=RYlN+G&`)sp
z797YXID#Q&9=S0f?fW1Pn}ut_L!dYy6rg0`KwSOD6FYSg>b1*ZJ}WI!soJ=hz<XPf
z6bHJh;vPQ_=g?_rMmtX&&RYkdUOJ0jR)iFr0BQ(l@8N__e@@`7R|w?3Apr3<0EnY&
zU-X*F+87E1D4RV1Ikg+E(KB$5nSmUih+24w!n+5PvSvG>E0+mfK2PG@rIc-1gOZR$
z+{9UwP3j@o;rKCtgmegL5^|5>xPSE&rH_vi6pWj`1ZS@i_;#(f_XxZOL*Cge01;kq
z)0xD-eN4&15fGOw099`4idOs`RQb?L3Q-Hr&?Msmz9n~{ojY#sL~T3cU7JH`da4K+
zd&e^v5<Ghxe{QDfWuvvO6UsX&5~va0O1J*R&0kK@f^@;=CTq4+{`xv<zBo+VoO~{h
zZjY-?JDP3WN9n}wI3$xHW)5k9A$C$VCQv<z$RlS%%T74@jiY+cIzk1fadhm1dvF?6
zAM7*%F=F_R`Bd*-D*#cN-Auysdy!kU=i2S@A_NT}lUHU_X@!hU`;?3VDwf=VY5}5j
z>_z;_3`%EqjW`cUB-Rr$MnV(;8=HW0?48KX+u|BDmddOx_)i?gJLgecJqLiQBF80&
zykZ{qG)gD-5bXG2K&<Un>@o?>aLj%Il3Jj&??vF~djw7#LW)l&cH#pB^9`?>FIVS&
zRKBuI0OIO52DwElvG=Z_Xi^ICi#Ox!ITSguDO!~ef_^GDEhq3%7AYAQ>Hy;CJsi((
zmQlW7EQuRFMvC*Aj7w~S?ysp6GUa#mF^}JINw}xXM{3p@XWwB|?c0U_%R|K9_2B=3
zA(4PsAtQAkj>`%eDXAr~)0d*OY>#i-)8QS$`@l;CkLD0~djpggiSLuLODLY40?94G
z6+^<J4OG9qh2W{rpzIn{R}jq*_vGK9^calq+1aFI=HXkr0QKV8+WN@a6_Pi8NXh7C
zA|V^>GaRUN>qpGI<rFPU7wj@}2$GCie3jVI=~U%pB75R+_Z{-%7$UYU>l~sQr#%ah
zvd2c@nY@6QDSxndVHIYwBsv(*s(yV1L6Ju!60=GunVb?nV0l+$Q=PRQt-J_1sX3uf
z_LH1(fy#)GiFsr_p}eoD&R8!1DSdPzp>tn{3rTyEZkltA(%YJg_&0Kh5ti~T{qW3N
zPRYV_VSmb+9Rx3)L%o=f_x>j-U;hk>H<{R}b19qD{eRnKjBF&1?8aHd07a9KdX2(0
zZ!N(S2ML`yO5n&I;udU1{q`u;|9A%Piw96IoWj5L2`DWLpCS{oO7Pv&3D?Xe$gMl!
z=spn19gBMYB!TyLQj@iwWGjbgdB;I<lCb?W6^kbl%0Efc?mQ|tK7n>Qzt#a3C%rGc
zNtq1@CPU<&gNS)}6~Uti&@~OET^B01uOsl~AzJLur*KRM9Ie}tvSF{e%NRN2ht453
zAmR`vSRx@$`y<ML$pqee6=D)`Pkn@7&Q@x+Jqf`ek~;?X%*Sz#n@7!4lhD6CDt3st
z%n~ZnQgF?96z%FI0fg~3PP(4ou0T#{g>%>xD(Ce@zfyqG>le81TTR99hYE*yGxE^R
zpGL2)h&ZmAhj!=BN8-D!xp_ji7~-6@2<ND2`1kFkX3sX_m%mKaj&+2-JWP{!^C-Q4
z0&#Pf;<&jJzPpFk0mLjJBF`b|lp~Q~Yaq1+o{7F4r*hYU=#}MY1*gJHu<Hut)*)!$
zegXb!;YVe{eT4RGs8<e9dXF?~mhbaXj~xt;CAaQ?dMQtYnREOcf(Q4YmlfBJVKKy=
zb}ymqO|>;mM3t;rMV({FI6|k7i5kf@W(L7S`*95&kNVZ8a52x^z9VWGNyq077kBAo
zA(0j-3PqOxT6BqR7w}Pfi4o62cd1V%u;l<t%cv{()K;fLPztvZ8~b%)lqkp|TvA_^
z9M)H&Y&6UN+OvnPi-4Zx$vtnD|N2yJ(RB_3Np%DsTQ#ds^@<c}>M{B{ai>Air+)P<
zT9vb(BefLMcuS+PH5N-Ciq=8wcD2Hg3AR=I7wdu0AkV=|-`GkGdKw*dSxAWEgoJ37
zinRmRdfqmwp-H2?TA$=-_YE)b2J&QBL9@=r2187S)e22v$*}>&tS)2B{Yr)k9rh6|
zAx31apZsl@AwPK}>TK?fXoL}HWJnYl8Ubkp<i`2ozad{iYyo-?FaQ7m07*qoM6N<$
Ef=i82o&W#<

literal 0
HcmV?d00001

diff --git a/static/images/trad-add.png b/static/images/trad-add.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a6d1ae8a3ad997dee9a0083b84ce23989dc4836
GIT binary patch
literal 7614
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

literal 0
HcmV?d00001

diff --git a/static/images/trad-close.png b/static/images/trad-close.png
new file mode 100644
index 0000000000000000000000000000000000000000..88a11674039e7b519cfbe4e3cda80e88e5f88472
GIT binary patch
literal 25243
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

literal 0
HcmV?d00001

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