From 5885261a6073e7e525dd366d42cd9f2daf466adb Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Wed, 16 Aug 2023 17:59:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=A4=A7=E5=8E=85=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AF=B9=E6=8E=A5=E5=8F=8A=E7=95=8C=E9=9D=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       |  16 +-
 api/trading-floor.js                          |  24 +-
 components/release/release.vue                |   4 +-
 components/shoppinglist/shoppinglist.vue      |  94 ++--
 .../commissionedSales/addDelegation/index.vue |  11 +-
 pages/gather/gather.vue                       |   7 +-
 pages/releaseManagement/index.vue             |  12 +-
 pages/trading_hall/adddiscounts/index.vue     | 446 +++++++++++-------
 pages/trading_hall/product_details/index.vue  |  87 ++--
 pages/trading_hall/transfer_goods/index.vue   | 215 ++++++++-
 pages/users/trading_hall/index.vue            | 130 +++--
 plugin/voice/voice.js                         | 200 ++------
 static/css/base.css                           |   2 +-
 static/images/sym.png                         | Bin 2854 -> 7163 bytes
 14 files changed, 735 insertions(+), 513 deletions(-)

diff --git a/App.vue b/App.vue
index 6841165..9965722 100644
--- a/App.vue
+++ b/App.vue
@@ -22,6 +22,7 @@ import {
     history
   } from '@/api/public.js'
   import Routine from './libs/routine.js';
+  import voice from'./plugin/voice/voice.js'
   export default {
     globalData: {
       spid: 0,
@@ -119,8 +120,7 @@ import {
       // #endif
       that.getConfigData()
 	  
-	  
-	  //#ifdef APP-PLUS
+	        //#ifdef APP-PLUS
 	  		jpushModule.setLoggerEnable(true);
 	  		jpushModule.initJPushService()
 	  		jpushModule.addConnectEventListener(result=>{
@@ -152,6 +152,14 @@ import {
 	  			let extras = result.extras
 
 	  			console.log("通知", result)
+				// if(result.content=="您有新的订单，请注意查看。"){
+				// 		console.log("通知", '11111111')
+				// 	voice.init()
+				// }
+			    if(result.extras.type=='ORDER_CREATE'){
+					voice.init()
+					
+				}
 	  			// 点击事件
 	  			if (notificationEventType == 'notificationOpened') {
 	  				uni.navigateTo({
@@ -173,6 +181,10 @@ import {
 
     },
     onShow() {
+	// console.log(voice.in)
+	 
+	     // voice.connectSocketGlobal()
+	   
       let that = this
       // 记录H5和公众号
       if (this.$store.state.app.token) {
diff --git a/api/trading-floor.js b/api/trading-floor.js
index c50c5c5..1c80359 100644
--- a/api/trading-floor.js
+++ b/api/trading-floor.js
@@ -24,7 +24,7 @@ export function getCommunityList(data) {
  */
 export function getCommunityshow(data) {
 
-	return request.get('community/show/'+data,{}, {
+	return request.get('community/show/' + data, {}, {
 		noAuth: true
 	});
 }
@@ -43,23 +43,35 @@ export function getCommunitygetOrderList(data) {
  * 发起转售
  * 
  */
-export function getCommunitycreate( data) {
-  return request.post(`community/create`, data, { login: true });
+export function getCommunitycreate(data) {
+	return request.post(`community/create`, data, {
+		login: true
+	});
 }
 
 /**
  * 修改转售
  * 
  */
-export function getCommunityUpdate( data) {
-  return request.post(`community/update`, data, { login: true });
+export function getCommunityUpdate(data) {
+	return request.post(`community/update`, data, {
+		login: true
+	});
 }
 /**
  * 加入购物车
  * 
  */
 export function getCommunityaddCart(data) {
-	return request.get('community/addCart', data, {
+	return request.post('community/addCart', data, {
 		noAuth: true
 	});
+}
+
+//商品宝贝详情
+
+export function getProductDetail(id) {
+  return request.get('store/product/detail/' + id, {
+    noAuth: true
+  });
 }
\ No newline at end of file
diff --git a/components/release/release.vue b/components/release/release.vue
index eb7e02f..bacdf9e 100644
--- a/components/release/release.vue
+++ b/components/release/release.vue
@@ -158,7 +158,7 @@
 		}
 
 		.title {
-			margin-top: 21rpx;
+			margin-top: 23rpx;
 		}
 
 		.title1 {
@@ -173,7 +173,7 @@
 			font-family: PingFang SC-Regular, PingFang SC;
 			font-weight: 400;
 			color: #666666;
-			margin-top: 9rpx;
+			margin-top: 11rpx;
 		}
 	}
 
diff --git a/components/shoppinglist/shoppinglist.vue b/components/shoppinglist/shoppinglist.vue
index 258289d..a15c8a6 100644
--- a/components/shoppinglist/shoppinglist.vue
+++ b/components/shoppinglist/shoppinglist.vue
@@ -13,7 +13,7 @@
 			</view>
 		</view>
 		<view class="main">
-			<scroll-view scroll-y="true">
+			<scroll-view scroll-y="true" @touchmove.stop>
 				<block>
 					<view v-if="bought.length" @touchmove="onTouchmove" id="goods" class="goods">
 						<view class="picTxt acea-row" v-for="(item, i) in bought" :key="i">
@@ -33,10 +33,12 @@
 
 
 								<view class="picTxt_one" v-if="item.attrValue.length>0">
-									<picker class="slecte" @change="bindPickerChange($event,item.attrValue,i)"
-										:value="index" :range="item.attrValue" :range-key="'sku'">
+									<picker class="slecte" v-if="item.attrValue.length>1"
+										@change="bindPickerChange($event,item.attrValue,i)" :value="index"
+										:range="item.attrValue" :range-key="'sku'">
 										<view class="uni-input">{{item.attrValue[index].sku}}</view>
 									</picker>
+                           
 									<view class="" style="margin-top: 10rpx;">
 										库存:{{item.attrValue[index].stock}}
 									</view>
@@ -53,17 +55,19 @@
 								<view class="price">
 									<span>出售价格</span>
 									<input type="text" :value="item.price" placeholder="输入出售价格"
+										@input="producrprice($event,i)" adjust-position=""
 										placeholder-style="color: #CCCCCC;" />
 								</view>
 								<view class="price_num">
 									<span>出售数量</span>
-									<subtractive v-if='item.num==0' style="margin-top: 10rpx;margin-left: 20rpx;" class="step" :min="1"
-										:max="item.attrValue[index].stock" :value="peicenumber" :isMax="true" :isMin="true" index="11"
-										@eventChange="numberChange($event,i)"></subtractive>
-										
-									<subtractive v-else style="margin-top: 10rpx;margin-left: 20rpx;" class="step" :min="1"
-										:max="item.attrValue[index].stock" :value="item.num" :isMax="true" :isMin="true" index="11"
-										@eventChange="numberChange($event,i)"></subtractive>
+									<subtractive v-if='item.num==0' style="margin-top: 10rpx;margin-left: 20rpx;"
+										class="step" :min="1" :max="item.attrValue[index].stock" :value="peicenumber"
+										:isMax="true" :isMin="true" index="11" @eventChange="numberChange($event,i)">
+									</subtractive>
+
+									<subtractive v-else style="margin-top: 10rpx;margin-left: 20rpx;" class="step"
+										:min="1" :max="item.attrValue[index].stock" :value="item.num" :isMax="true"
+										:isMin="true" index="11" @eventChange="numberChange($event,i)"></subtractive>
 								</view>
 							</view>
 						</view>
@@ -164,22 +168,33 @@
 			this.getBounht();
 		},
 		methods: {
+			//价格
+			producrprice(e, i) {
+				this.bought[i].price = e.detail.value
 
+			},
 			// picker修改事件
-			bindPickerChange: function(e, storage, num) {	
-				this.bought[num].attrValue[this.index].stock=storage[e.detail.value].stock
-				this.bought[num].product_attr_unique=storage[e.detail.value].unique
+			bindPickerChange: function(e, storage, num) {
+				this.bought[num].attrValue[this.index].sku = storage[e.detail.value].sku
+				this.bought[num].attrValue[this.index].stock = storage[e.detail.value].stock
+				this.bought[num].product_attr_unique = storage[e.detail.value].unique
 				this.pickerData = storage[this.index] // 这里就是选中的对象
+
+				if (this.bought[num].attrValue[this.index].stock == 0) {
+					this.$util.Tips({
+						title: '库存不足'
+					});
+				}
 			},
 
 			// 点击关闭按钮
 			close() {
 				this.$emit('close');
 			},
-			numberChange(data,i) {
+			numberChange(data, i) {
 				this.peicenumber = data.number;
-				this.bought[i].num=data.number
-				
+				this.bought[i].num = data.number
+
 			},
 			tabs(index) {
 				this.isActive = index
@@ -207,7 +222,7 @@
 			},
 			searchBut() {
 				this.whereb.page = this.wherec.page = this.wheres.page =
-				this.bought = []
+					this.bought = []
 				this.isActive == 0 ? this.getBounht() : ''
 			},
 			getBounht() {
@@ -241,13 +256,11 @@
 						if (item.product_id == val.product_id) {
 							that.$set(item, 'check', true);
 							that.$set(item, 'num', val.num);
-						
-						}else{
-							that.$set(item, 'num', 0);
+							that.$set(item, 'price', val.price);
 						}
 					})
 				})
-	
+
 			},
 			/*已选中的商品打钩*/
 			getCheckedGoods() {
@@ -258,19 +271,18 @@
 			},
 			/*点击选中与否*/
 			goodsCheck(item) {
-				this.$set(item, 'check', !item.check);			
+				this.$set(item, 'check', !item.check);
+				console.log( item.num)
 				if (item.check) {
-					if(this.peicenumber>0){
-						 item.num=this.peicenumber	
-					}else{
-						item.num=1
-					}
-				     		
-					if(!item.product_attr_unique){
-					 item.product_attr_unique=item.attrValue[0].unique
+					if (this.peicenumber > 0) {
+						item.num = this.peicenumber
+					} 
+
+					if (!item.product_attr_unique) {
+						item.product_attr_unique = item.attrValue[0].unique
 					}
 					this.checkedArr.push(item)
-					
+
 				} else {
 					this.checkedArr.splice(this.checkedArr.findIndex(itemn => ((itemn.spu_id == item.spu_id) || (item
 						.spu_id == (
@@ -280,9 +292,8 @@
 			},
 			/*确定提交*/
 			submit() {
-				
 				this.$emit('getProduct', this.checkedArr);
-				
+
 			},
 		}
 	}
@@ -331,6 +342,7 @@
 			.iconclose {
 				width: 44rpx;
 				height: 44rpx;
+				line-height: 44rpx;
 				border: 2rpx solid #fff;
 				border-radius: 50%;
 				text-align: center;
@@ -393,27 +405,29 @@
 		position: relative;
 		align-items: center;
 		justify-content: space-between;
-		margin-bottom: 10rpx;
+		
 		border-top: 2rpx solid #E7E6E4;
-
+     
 		.picTxt_one {
 			display: flex;
 			margin-top: 20rpx;
-
+ 
 
 			.slecte {
 				margin-right: 30rpx;
-				width: 140rpx;
+			    width: 280rpx;
 				height: 60rpx;
-				line-height: 50rpx;
+				line-height: 60rpx;
 				text-align: center;
 				font-size: 28rpx;
 				font-family: PingFang SC-Regular, PingFang SC;
 				font-weight: 400;
-				color: #CCCCCC;
+				color: #959595;
+				background-color: #E7E6E4;
+				border-radius: 10rpx 10rpx 10rpx 10rpx;
 				white-space: nowrap;
 				overflow: hidden;
-				border: 1px solid #CCCCCC;
+			
 			}
 		}
 
diff --git a/pages/commissionedSales/addDelegation/index.vue b/pages/commissionedSales/addDelegation/index.vue
index a9821f4..7746811 100644
--- a/pages/commissionedSales/addDelegation/index.vue
+++ b/pages/commissionedSales/addDelegation/index.vue
@@ -53,9 +53,9 @@
 								</view>
 							</view>
 						</view>
-					
+
 					</view>
-<view class="content_center-one">
+					<view class="content_center-one">
 						<view class="center-one">
 							<view class="center-one-img">
 								<image src="../../annex/static/left.png" mode=""></image>
@@ -74,7 +74,7 @@
 								</view>
 							</view>
 						</view>
-					
+
 					</view>
 				</view>
 				<button class="release_btn button" form-type="submit">发布</button>
@@ -154,7 +154,8 @@
 
 		padding: 0 28rpx;
 		margin-top: 28rpx;
-.content_center-one {
+
+		.content_center-one {
 			display: flex;
 			padding: 0 28rpx;
 
@@ -200,6 +201,7 @@
 			}
 
 		}
+
 		.release_item {
 			background: #ffffff;
 			padding: 0 30rpx;
@@ -389,7 +391,6 @@
 		font-weight: 500;
 		color: #FFFFFF;
 	}
-
 	.release_btn {
 		margin-top: 100rpx;
 	}
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index 5a2dc20..e96c03d 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -127,12 +127,12 @@
 								</image>
 								<text class="text">交易大厅</text>
 							</view>
-							<view class="examine" @click="navigator(`/pages/commissionedSales/index/index`)">
+							<view class="examine" @click="navigator(`/pages/commissionedSales/index/index?mer_id=${mer_id}`)">
 								<image class="icon_img" src="@/static/images/weituo.png" mode="aspectFill">
 								</image>
 								<text class="text">委托销售</text>
 							</view>
-							<view class="examine" @click="navigator(`/pages/releaseManagement/index`)">
+							<view class="examine" @click="navigator(`/pages/releaseManagement/index?mer_id=${mer_id}`)">
 								<image class="icon_img" src="@/static/images/fabu.png" mode="aspectFill">
 								</image>
 								<text class="text">发布管理</text>
@@ -313,10 +313,11 @@
 						this.isShow = true
 						this.mer_id = res.data.service.mer_id
 					}
+					
 					if (!res.data.mer_info) {
 						that.$set(this, 'jurisdiction', false);
 					}
-					console.log(that.userInfoData);
+					// console.log(that.userInfoData);
 				});
 			}
 		}
diff --git a/pages/releaseManagement/index.vue b/pages/releaseManagement/index.vue
index 58aa571..90cc1d0 100644
--- a/pages/releaseManagement/index.vue
+++ b/pages/releaseManagement/index.vue
@@ -188,13 +188,13 @@
 			}
 		},
 		onLoad(num) {
-			
-				this.tabTitle = this.tabs[0].name
-				
-			if(num.key=='2'){
-				 this.activeItem='tabThree'	
+
+			this.tabTitle = this.tabs[0].name
+
+			if (num.key == '2') {
+				this.activeItem = 'tabThree'
 			}
-		
+
 			//有时进入页面需要获取默认的第一个标签做逻辑判断 -- 如下:
 			// console.log(this.tabs[0])
 		},
diff --git a/pages/trading_hall/adddiscounts/index.vue b/pages/trading_hall/adddiscounts/index.vue
index 94a594c..f946de1 100644
--- a/pages/trading_hall/adddiscounts/index.vue
+++ b/pages/trading_hall/adddiscounts/index.vue
@@ -75,9 +75,8 @@
 								</view>
 							</view>
 							<view class="textarea">
-								<textarea placeholder='请输入商品描述' name="comment"
-									placeholder-class='placeholder' v-model="formData.content"
-									maxlength="600"></textarea>
+								<textarea placeholder='请输入商品描述' name="comment" placeholder-class='placeholder'
+									v-model="formData.content" maxlength="600"></textarea>
 							</view>
 						</view>
 						<view class="release_item">
@@ -96,18 +95,60 @@
 								</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='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  >
+										<view v-else >
 											<input type="number" value="" v-model="price" placeholder="请输入价格"
 												style="text-align: right;font-size: 28rpx;" />
 										</view>
 
 									</view>
-								</view>
+								</view> -->
 							</view>
+							<view class="popup_group">
+								<view class="radio" v-if="this.formData.product_info.length>0">
+									<view class="radio_label ">送货方式</view>
+									<checkbox-group class="select_group flex_start" @change="deliveryWayChange">
+										<label class="radio_select" v-for="(val, i) in deliveryFreeList"
+											:key="val.value">
+											<view>
+												<checkbox :value="val.value"
+													:checked="delivery_way.includes(val.value)" />
+											</view>
+											<view>{{ val.name }}</view>
+										</label>
+									</checkbox-group>
+								</view>
+
+							<!-- 	<view class="popup_group_item" v-if="delivery_way.includes('2')">
+									<view class="popup_group_item_label">是否包邮</view>
+									<view class="popup_group_item_value">
+										<view class="popup_group_item_message">
+											<switch :checked="delivery_free == '1'" color="#E93323"
+												style="transform:scale(0.8)" @change="deliveryFreeChange" />
+										</view>
+									</view>
+								</view> -->
+
+								<!-- 		<view class="popup_group_item" v-if="delivery_way.includes('2') && delivery_free == 0"
+									@click="tempIdSelect">
+									<view class="popup_group_item_label">运费模板</view>
+									<view class="popup_group_item_value">
+										<view class="popup_group_item_message">
+											<span v-if="setFormData.tempName"
+												class="popup_group_item_message_value">{{ setFormData.tempName }}</span>
+											<span v-else>请选择运费模板</span>
+										</view>
+										<view><span class="iconfont">&#xe6bd;</span></view>
+									</view>
+								</view> -->
+							</view>
+
+
 						</view>
 					</view>
 					<button class="release_btn button" form-type="submit">发布</button>
@@ -136,29 +177,20 @@
 			<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 {
-			getCommunitygetOrderList
-	} from '@/api/trading-floor.js'
-
 	import authorize from '@/components/Authorize';
 	import avatar from "@/components/yq-avatar/yq-avatar.vue";
 	import associated from '@/components/shoppinglist/shoppinglist.vue';
-	
+
 	import {
 		TOKENNAME,
 		HTTP_REQUEST_URL
@@ -177,26 +209,47 @@
 	import {
 		configMap
 	} from '@/utils';
+	import {
+		getCommunitycreate,
+
+	} from '@/api/trading-floor.js'
+
+	import {
+
+		getUserInfo
+	} from '@/api/user.js'
 	import store from '@/store';
 	export default {
 		components: {
 			avatar,
 			associated,
-			
 			authorize,
 			easyLoadimage,
-			mTabbar
+			mTabbar,
+
 		},
 		data() {
 			return {
 				formData: {
 					image: [],
 					content: "",
-					topic_id: "",
-					spu_id: [],
-					video_link: ''
+					topic_id: 0,
+					category_id: 0,
+					video_link: '',
+					is_type: 3,
+					resale_type:2,
+					product_info: []
 				},
-				price:0,
+				price: 0,
+				deliveryFreeList: [{
+						value: '1',
+						name: '到店核销'
+					},
+					{
+						value: '2',
+						name: '快递配送'
+					}
+				],
 				imageSrc: '',
 				productList: [],
 				topicName: {},
@@ -227,7 +280,16 @@
 				video_link: "",
 				showVideo: false,
 				videoplay: false,
-				videoContext: ''
+				videoContext: '',
+				delivery_free: 1,
+				templateListPage: {
+					page: 1,
+					limit: 10000
+				},
+				merId: '',
+				delivery_way: [], // 配送方式 1 到店核销 2 快递配送
+
+
 			};
 		},
 		computed: {
@@ -252,13 +314,12 @@
 			// #ifndef APP-PLUS
 			this.videoContext = uni.createVideoContext('myVideo', this);
 			// #endif
+			this.getUserInfo()
 		},
 		onLoad(options) {
-			this.list()
 			// 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]
@@ -267,16 +328,8 @@
 				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);
 		},
@@ -285,18 +338,50 @@
 			this.formData.content = ''
 			this.formData.image = []
 			this.formData.topic_id = ''
-			this.formData.spu_id = ''
+
+
 			this.formData.video_link = ''
 			this.productList = []
 			this.topicName = {}
 		},
 
 		methods: {
-			list(){
-				getCommunitygetOrderList().then(res=>{
-					console.log(res.data)
+			getUserInfo: function() {
+				let that = this;
+				getUserInfo().then(res => {
+
+
+
+					this.merId = res.data.service.mer_id
+
 				})
+
+
 			},
+			// 是否包邮选择
+			deliveryFreeChange(val) {
+				if (val.detail.value) {
+					this.delivery_free = '1';
+				} else {
+					this.delivery_free = '0';
+				}
+			},
+			// 送货方式选择
+			deliveryWayChange(obj) {
+				this.delivery_way = obj.detail.value;
+				if(this.formData.product_info.length>0){
+					for(let i  in  this.formData.product_info){
+						this.formData.product_info[i].deliver_method = obj.detail.value.toString();
+					}
+				}else{
+					this.$util.Tips({
+						title: '请选择产品,再选择送货方式'
+					});
+				}
+		
+				
+			},
+
 			onLoadFun() {
 				this.isShowAuth = false;
 			},
@@ -304,31 +389,7 @@
 			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 = true
@@ -491,12 +552,13 @@
 			},
 			/*添加宝贝*/
 			addProduct() {
+			
 				this.$refs.associated.open();
 			},
 
 			close() {
 				this.$refs.associated.close();
-				
+
 			},
 			/*查看视频*/
 			videoshow() {
@@ -519,8 +581,25 @@
 			},
 			/*获取选中的宝贝*/
 			getProduct(data) {
-				this.productList = data;
-				this.formData.spu_id = data.map(val => val.spu_id)
+				this.productList=[]
+				this.price = 0
+				if (data.length > 0) {
+					this.productList = data;
+					for (let i in data) {
+						this.price = Number(this.price) + (Number(data[i].num) * Number(data[i].price))
+						this.formData.product_info.push({
+							product_attr_unique: data[i].product_attr_unique,
+							number: Number(data[i].num),
+							price: data[i].price
+						})
+					}
+				} else {
+					this.price = 0
+				}
+
+
+
+
 				this.$refs.associated.close();
 			},
 
@@ -528,128 +607,64 @@
 			 * 提交数据
 			 */
 			formSubmit: function(e) {
+				// console.log(this.id)
+
 				let that = this,
+
 					value = that.formData;
 				if (value.image.length == 0) return that.$util.Tips({
-					title: '请添加话题图片'
+					title: '请添加图文图片'
+				});
+				if (value.product_info.length == 0) return that.$util.Tips({
+					title: '请选择产品'
 				});
 				if (!value.content) return that.$util.Tips({
-					title: '请分享使用心得和体会'
+					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
-							})
-						}
-						/**
-						 * 将对象所有值为空
-						 * */
-						/**
-						 * 将对象所有值为空
-						 * */
+				getCommunitycreate(value).then(res => {
+					if (res.status == '200') {
+						uni.hideLoading()
+						that.$util.Tips({
+							title: '发布成功',
+							icon: 'success'
+						});
 						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: "",
+							topic_id: 0,
+							category_id: 0,
+							video_link: '',
+							is_type: 3,
+							product_info: []
 						}
+						uni.navigateTo({
+							url: '/pages/releaseManagement/index?key=' + 2
+						})
 
-					}, 1000);
+					} else {
+						that.$util.Tips({
+							title: res.messge,
+							icon: 'success'
+						});
+					}
 				}).catch(err => {
-					// console.log('aaa', value)
+
 					return that.$util.Tips({
 						title: err
 					});
 				})
+
+
 			}
 		}
 	}
@@ -986,4 +1001,99 @@
 			height: 500rpx;
 		}
 	}
+
+	.popup_group {
+		background: #fff;
+		margin: 31rpx auto;
+		width: 710rpx;
+		font-size: 30rpx;
+		border-radius: 10rpx;
+
+		.popup_group_item {
+			padding: 32rpx 30rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+
+			.popup_group_item_value {
+				display: flex;
+				align-items: center;
+
+				.popup_group_item_message {
+					margin-right: 15rpx;
+					color: #bbbbbb;
+					max-width: 400rpx;
+
+					&_value {
+						display: inline-block;
+						max-width: 400rpx;
+						color: #000;
+					}
+				}
+
+				.iconfont {
+					color: #bbbbbb;
+				}
+
+				input {
+					text-align: right;
+				}
+			}
+		}
+
+		>view:not(:last-child) {
+			border-bottom: 1px solid #eeeeee;
+		}
+	}
+
+	.radio {
+		padding: 30rpx;
+
+		&_label {
+			padding-left: 10rpx;
+			color: #333333;
+			font-size: 30rpx;
+			display: flex;
+			align-items: center;
+
+			.select_check {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 40rpx;
+				height: 40rpx;
+				border: 1px solid #cccccc;
+				border-radius: 50%;
+				margin-right: 20rpx;
+
+				.iconfont {
+					font-size: 24rpx;
+				}
+			}
+
+			.select {
+				background: #e93323;
+				border: none;
+
+				.iconfont {
+					color: #fff;
+				}
+			}
+		}
+
+		.select_group {
+			display: flex;
+		}
+
+		.flex_start {
+			padding: 0 10rpx;
+			margin-top: 40rpx;
+			justify-content: flex-start;
+		}
+
+		&_select {
+			display: flex;
+			margin-right: 110rpx;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/trading_hall/product_details/index.vue b/pages/trading_hall/product_details/index.vue
index 4d3ed10..dc7811e 100644
--- a/pages/trading_hall/product_details/index.vue
+++ b/pages/trading_hall/product_details/index.vue
@@ -8,6 +8,7 @@
 				<view class="content_title" v-if="listobj.author">
 					<view class="title_one">
 						{{listobj.mer_name}}
+
 					</view>
 					<view class="title_two">
 						{{listobj.care_count>0?listobj.care_count:0}}人关注 {{listobj.sales>0?listobj.sales:0}}销量
@@ -20,10 +21,11 @@
 			<view view class="content_top-two">
 				<view class="price">
 					￥{{listobj.total_price}}
+					<!-- <input type="text" :value="listobj.total_price" v-model="listobj.total_price" /> -->
 				</view>
 
 				<view class="top-two_content">
-					{{listobj.content}}
+					<textarea :value="listobj.content" placeholder="" style="height: auto;" />
 				</view>
 				<view class="top-two_img" v-for="(item,index) in listobj.image">
 
@@ -42,20 +44,20 @@
 		<view class="content_middle">
 			<view class="middle-one" v-for="(item,b) in listobj.resale" :key='b'>
 				<view class="midding-img">
-					<image :src="item.spu.image" mode=""></image>
+					<image :src="item.image" mode=""></image>
 				</view>
 				<view class="middle-one_text">
 					<view class="one_text_a">
-						{{item.spu.store_name}}
+						{{item.store_name}}
 					</view>
 					<view class="one_text_b">
 						￥{{item.price}}
 					</view>
 					<view class="one_text_c">
 
-						<view class="">
-							采购价:{{item.spu.price}}
-						</view>
+						<!-- <view class="">
+							采购价:{{item.price}}
+						</view> -->
 						<view class="">
 							数量: {{item.number}}
 						</view>
@@ -76,38 +78,31 @@
 			<view class="content_enter-two" v-else>
 				打折
 			</view>
-		
+
 
 		</view>
-				
-		<view class="content_bootm" v-if="listobj.relevance.length>0">
+
+		<view class="content_bootm" v-if='listobj.resale'>
 			<view class="content_bootm_txt">
-				查看TA提到的宝贝({{listobj.relevance.length}})
+				查看TA提到的宝贝({{listobj.resale.length}})
 			</view>
 
-			<view class="content_bootm_one" v-for="(items,i) in listobj.relevance" :key='i'>
+			<view class="content_bootm_one" v-for="(items,i) in listobj.resale" :key='i' @click="Merchbaby(items)">
 				<view class="bootm_oneimg">
-					<image :src="items.spu.image" mode=""></image>
+					<image :src="items.image" mode=""></image>
 				</view>
-				<view class="">
-					{{items.spu.store_name}}
+				<view class="" style="margin-top: 15rpx;">
+					{{items.store_name}}
 				</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" v-if="this.detail.type==1">
+		<view class="pay" v-if="this.detail.type==1||this.detail.type==2">
 			<view class="pay_tilte-a">
 				合计: <span>￥{{listobj.total_price}}</span>
 			</view>
-			<view class="pay_tilte-b">提交订单</view>
+			<view class="pay_tilte-b" @click="prouctOrder">提交订单</view>
 		</view>
 
 		<view class="domain" v-else>
@@ -124,7 +119,8 @@
 
 <script>
 	import {
-		getCommunityshow
+		getCommunityshow,
+		getCommunityaddCart
 	} from '@/api/trading-floor.js'
 	export default {
 
@@ -132,7 +128,7 @@
 		data() {
 			return {
 				detail: {},
-				listobj: {}
+				listobj: {},
 			}
 		},
 		onLoad(e) {
@@ -144,17 +140,35 @@
 
 		},
 		methods: {
+			//商品详情
 			shopdetil(id) {
 
 				getCommunityshow(id).then(res => {
 					if (res.data.status = 200) {
-						console.log(res.data)
 						this.listobj = res.data
 					}
 				})
-			}
-		},
+			},
 
+			//商品宝贝详情
+			Merchbaby(item) {
+				uni.navigateTo({
+					url: `/pages/goods_details/index?id=${item.product_id}`
+				})
+
+			},
+			prouctOrder() {
+				getCommunityaddCart(this.listobj).then(res => {
+					if (res.status == 200) {
+						uni.navigateTo({
+							url: '/pages/users/order_confirm/index?cartId=' + res.data.cart_id.toString()
+						})
+					}
+				}).catch((err) => {
+					console.log(err)
+				})
+			}
+		}
 	}
 </script>
 
@@ -200,7 +214,7 @@
 			}
 
 			.content_titimg {
-				width: 136rpx;
+				width: 116rpx;
 				height: 64rpx;
 				margin-top: -10rpx;
 				margin-left: 10rpx;
@@ -214,11 +228,19 @@
 
 		.content_top-two {
 			.price {
+				display: flex;
 				margin-top: 21rpx;
 				font-size: 46rpx;
 				font-family: PingFang SC;
 				font-weight: 500;
-				color: #F84221
+				color: #F84221;
+
+				input {
+					font-size: 46rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #F84221
+				}
 			}
 
 			.top-two_content {
@@ -332,11 +354,12 @@
 		.content_bootm_txt {
 			margin-top: 42rpx;
 			padding-left: 28rpx;
+
 		}
 
 		.content_bootm_one {
 			height: 112rpx;
-			line-height: 112rpx;
+			padding-right: 28rpx;
 			background: #FFFFFF;
 			display: flex;
 			margin-top: 21rpx;
diff --git a/pages/trading_hall/transfer_goods/index.vue b/pages/trading_hall/transfer_goods/index.vue
index f5c8493..ba786bc 100644
--- a/pages/trading_hall/transfer_goods/index.vue
+++ b/pages/trading_hall/transfer_goods/index.vue
@@ -97,7 +97,7 @@
 							<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>
+									价格：￥{{price.toFixed(2)}}</view>
 								<!-- <view class="select">
 									<view class="select_count" @click="addprice">
 										<text v-if="!isshow" class="text1">点击输入价格</text>
@@ -109,6 +109,46 @@
 									</view>
 								</view> -->
 							</view>
+							<view class="popup_group">
+								<view class="radio" v-if="this.formData.product_info.length>0">
+									<view class="radio_label ">送货方式</view>
+									<checkbox-group class="select_group flex_start" @change="deliveryWayChange">
+										<label class="radio_select" v-for="(val, i) in deliveryFreeList"
+											:key="val.value">
+											<view>
+												<checkbox :value="val.value"
+													:checked="delivery_way.includes(val.value)" />
+											</view>
+											<view>{{ val.name }}</view>
+										</label>
+									</checkbox-group>
+								</view>
+
+							<!-- 	<view class="popup_group_item" v-if="delivery_way.includes('2')">
+									<view class="popup_group_item_label">是否包邮</view>
+									<view class="popup_group_item_value">
+										<view class="popup_group_item_message">
+											<switch :checked="delivery_free == '1'" color="#E93323"
+												style="transform:scale(0.8)" @change="deliveryFreeChange" />
+										</view>
+									</view>
+								</view> -->
+
+								<!-- 		<view class="popup_group_item" v-if="delivery_way.includes('2') && delivery_free == 0"
+									@click="tempIdSelect">
+									<view class="popup_group_item_label">运费模板</view>
+									<view class="popup_group_item_value">
+										<view class="popup_group_item_message">
+											<span v-if="setFormData.tempName"
+												class="popup_group_item_message_value">{{ setFormData.tempName }}</span>
+											<span v-else>请选择运费模板</span>
+										</view>
+										<view><span class="iconfont">&#xe6bd;</span></view>
+									</view>
+								</view> -->
+							</view>
+
+
 						</view>
 					</view>
 					<button class="release_btn button" form-type="submit">发布</button>
@@ -143,6 +183,7 @@
 
 <script>
 	import mTabbar from '@/components/m-tabbar/m-tabbar.vue'
+
 	import {
 		mapGetters
 	} from "vuex";
@@ -169,8 +210,14 @@
 		configMap
 	} from '@/utils';
 	import {
-		getCommunitycreate
+		getCommunitycreate,
+
 	} from '@/api/trading-floor.js'
+
+	import {
+
+		getUserInfo
+	} from '@/api/user.js'
 	import store from '@/store';
 	export default {
 		components: {
@@ -178,7 +225,8 @@
 			associated,
 			authorize,
 			easyLoadimage,
-			mTabbar
+			mTabbar,
+
 		},
 		data() {
 			return {
@@ -189,9 +237,19 @@
 					category_id: 0,
 					video_link: '',
 					is_type: 3,
+					resale_type:1,
 					product_info: []
 				},
 				price: 0,
+				deliveryFreeList: [{
+						value: '1',
+						name: '到店核销'
+					},
+					{
+						value: '2',
+						name: '快递配送'
+					}
+				],
 				imageSrc: '',
 				productList: [],
 				topicName: {},
@@ -223,6 +281,13 @@
 				showVideo: false,
 				videoplay: false,
 				videoContext: '',
+				delivery_free: 1,
+				templateListPage: {
+					page: 1,
+					limit: 10000
+				},
+				merId: '',
+				delivery_way: [], // 配送方式 1 到店核销 2 快递配送
 
 
 			};
@@ -249,6 +314,7 @@
 			// #ifndef APP-PLUS
 			this.videoContext = uni.createVideoContext('myVideo', this);
 			// #endif
+			this.getUserInfo()
 		},
 		onLoad(options) {
 			// uni.hideTabBar()
@@ -280,6 +346,42 @@
 		},
 
 		methods: {
+			getUserInfo: function() {
+				let that = this;
+				getUserInfo().then(res => {
+
+
+
+					this.merId = res.data.service.mer_id
+
+				})
+
+
+			},
+			// 是否包邮选择
+			deliveryFreeChange(val) {
+				if (val.detail.value) {
+					this.delivery_free = '1';
+				} else {
+					this.delivery_free = '0';
+				}
+			},
+			// 送货方式选择
+			deliveryWayChange(obj) {
+				this.delivery_way = obj.detail.value;
+				if(this.formData.product_info.length>0){
+					for(let i  in  this.formData.product_info){
+						this.formData.product_info[i].deliver_method = obj.detail.value.toString();
+					}
+				}else{
+					this.$util.Tips({
+						title: '请选择产品,再选择送货方式'
+					});
+				}
+		
+				
+			},
+
 			onLoadFun() {
 				this.isShowAuth = false;
 			},
@@ -450,6 +552,7 @@
 			},
 			/*添加宝贝*/
 			addProduct() {
+			
 				this.$refs.associated.open();
 			},
 
@@ -478,9 +581,12 @@
 			},
 			/*获取选中的宝贝*/
 			getProduct(data) {
+				this.productList=[]
+				this.price = 0
 				if (data.length > 0) {
-this.productList = data;
+					this.productList = data;
 					for (let i in data) {
+						console.log(Number(data[i].num) , Number(data[i].price),(Number(data[i].num) * Number(data[i].price)))
 						this.price = Number(this.price) + (Number(data[i].num) * Number(data[i].price))
 						this.formData.product_info.push({
 							product_attr_unique: data[i].product_attr_unique,
@@ -493,7 +599,7 @@ this.productList = data;
 				}
 
 
-				
+
 
 				this.$refs.associated.close();
 			},
@@ -502,8 +608,10 @@ this.productList = data;
 			 * 提交数据
 			 */
 			formSubmit: function(e) {
-				console.log(this.id)
+				// console.log(this.id)
+
 				let that = this,
+
 					value = that.formData;
 				if (value.image.length == 0) return that.$util.Tips({
 					title: '请添加图文图片'
@@ -894,4 +1002,99 @@ this.productList = data;
 			height: 500rpx;
 		}
 	}
+
+	.popup_group {
+		background: #fff;
+		margin: 31rpx auto;
+		width: 710rpx;
+		font-size: 30rpx;
+		border-radius: 10rpx;
+
+		.popup_group_item {
+			padding: 32rpx 30rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+
+			.popup_group_item_value {
+				display: flex;
+				align-items: center;
+
+				.popup_group_item_message {
+					margin-right: 15rpx;
+					color: #bbbbbb;
+					max-width: 400rpx;
+
+					&_value {
+						display: inline-block;
+						max-width: 400rpx;
+						color: #000;
+					}
+				}
+
+				.iconfont {
+					color: #bbbbbb;
+				}
+
+				input {
+					text-align: right;
+				}
+			}
+		}
+
+		>view:not(:last-child) {
+			border-bottom: 1px solid #eeeeee;
+		}
+	}
+
+	.radio {
+		padding: 30rpx;
+
+		&_label {
+			padding-left: 10rpx;
+			color: #333333;
+			font-size: 30rpx;
+			display: flex;
+			align-items: center;
+
+			.select_check {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 40rpx;
+				height: 40rpx;
+				border: 1px solid #cccccc;
+				border-radius: 50%;
+				margin-right: 20rpx;
+
+				.iconfont {
+					font-size: 24rpx;
+				}
+			}
+
+			.select {
+				background: #e93323;
+				border: none;
+
+				.iconfont {
+					color: #fff;
+				}
+			}
+		}
+
+		.select_group {
+			display: flex;
+		}
+
+		.flex_start {
+			padding: 0 10rpx;
+			margin-top: 40rpx;
+			justify-content: flex-start;
+		}
+
+		&_select {
+			display: flex;
+			margin-right: 110rpx;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/users/trading_hall/index.vue b/pages/users/trading_hall/index.vue
index 3c7f6c1..841ed43 100644
--- a/pages/users/trading_hall/index.vue
+++ b/pages/users/trading_hall/index.vue
@@ -5,10 +5,9 @@
 				<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" />
+						<input v-model="where.keyword" confirm-type="search" placeholder="请输入关键字" class="input" />
 						<view class="search_btn">
-							<image src="@/static/images/serchbtn.png" mode="aspectFill"></image>
+							<image src="@/static/images/serchbtn.png" mode="aspectFill" @click="handleSearch"></image>
 
 						</view>
 					</view>
@@ -37,12 +36,12 @@
 			</view>
 		</view>
 		<view class="list">
-			<view class="item" v-for='(item,index) in datatlist' :key='index' @click="shopping(item.community_id)">
+			<view class="item" v-for='(item,index) in datatlist' :key='index' @click="shopping(item)">
 
 				<image class="shopimg" :src="item.image[0]" mode="aspectFit"></image>
 				<view class="item_text">
-					<span v-if='item.is_type==3'>调货</span>
-					<span v-else>委托销售</span>
+					<span v-if='item.resale_type==1'>调货</span>
+					<span v-else>打折</span>
 					{{item.title}}
 				</view>
 				<view class="item_prices">
@@ -64,16 +63,14 @@
 			<image src="@/static/images/trad-add.png" mode="aspectFit"></image>
 		</view>
 
-		<release :isShow='visible' :bottom='true' @close="closeMadle" @cancel="cancel" @confirm="confirm"></release>
-		<view
-			v-if="datatlist.length == 0||datatlist.length == 0 && where.page > 1 || datatlist.length == 0 && where1.page > 1||datatlist.length == 0 && where2.page > 1 ">
-
+		<release :isShow='visible' :bottom='true' @close="closeMadle" @cancel="cancel" @confirm="confirm"
+			style="z-index: 999999!important;"></release>
+		<view v-if="datatlist.length == 0||datatlist.length == 0 && where.page > 1 ">
 			<emptyPage title="暂无商品信息"></emptyPage>
 		</view>
 
 
-		<u-loadmore :status="status"
-			v-if="datatlist.length == 0 && where.page > 1 || datatlist.length == 0 && where1.page > 1||datatlist.length == 0 && where2.page > 1 " />
+	<u-loadmore :status="status" />
 
 	</view>
 </template>
@@ -104,18 +101,7 @@
 					keyword: '',
 
 				},
-				where1: {
-					page: 1,
-					limit: 10,
-					keyword: ''
 
-				},
-				where2: {
-					page: 1,
-					limit: 10,
-					keyword: ''
-
-				},
 				visible: false,
 				num: 0,
 				options: [{
@@ -143,70 +129,73 @@
 				if (this.status == 'nomore') return;
 				this.status = 'loading';
 				this.where.page = ++this.where.page;
-				this.getGoods()
+                this.getlist(this.num)
 			},
+
+			//选择 打折  调货 
 			btntap(index) {
 				this.num = index
 				this.getlist()
 			},
-			shopping(pid) {
+			//商品详情
+			shopping(item) {
+
 				let data = {
-					type: 1,
-					id: pid
+					type: item.resale_type,
+					id: item.community_id
 
 				}
-				
+
 				uni.navigateTo({
 					url: '/pages/trading_hall/product_details/index?key=' + encodeURIComponent(JSON.stringify(
 						data))
 				})
 			},
+			//控制 发布弹窗
 			open() {
 				this.visible = true
 
 			},
-			getlist(index) {
-			
+
+			//查询
+			handleSearch() {
 				if (this.num == 0) {
-					this.where = {
-							page: 1,
-							limit: 10,
-							is_type: 3,
-							keyword: '',
-
-						},
-						getCommunitygetOrderList(this.where).then(res => {
-
-							if (res.status == 200) {
-								// this.datatlist = res.data.listcons
-								// console.log(res.data)
-								this.datatlist = []
-							}
-
-						})
+					this.where.resale_type = ''
 				} else if (this.num == 1) {
-					this.where1 = {
-							page:1,
-							limit:10,
-							keyword:'',
-						},
-						getCommunityList(this.where).then(res => {
-							if (res.status == 200) {
-								this.datatlist = res.data.list
-							}
-
-						})
+					this.where.resale_type = 1
 				} else {
-					this.where2 = {
-							page: 1,
-							limit: 10,
-
-							keyword: '',
-
-						},
-						this.datatlist = []
+					this.where.resale_type = 2
 				}
 
+				getCommunityList(this.where).then(res => {
+					if (res.status == 200) {
+						if (res.data.list.length < this.where.limit) {
+							this.status = 'nomore'
+						}
+						this.datatlist = res.data.list
+					}
+
+				})
+
+			},
+			//列表
+			getlist(index) {
+				if (this.num == 0) {
+					this.where.resale_type = ''
+				} else if (this.num == 1) {
+					this.where.resale_type = 1
+				} else {
+					this.where.resale_type = 2
+				}
+				getCommunityList(this.where).then(res => {
+					if (res.status == 200) {
+						if (res.data.list.length < this.where.limit) {
+							this.status = 'nomore'
+						}
+						this.datatlist = res.data.list
+					}
+
+				})
 
 			},
 			closeMadle() {
@@ -226,7 +215,7 @@
 			menuAction(action, rowId) {
 				// console.log(action);
 				// 忽略初始化时的传入的空操作
-				this.num=action
+				this.num = action
 				this.getlist(action)
 				if (action === '') {
 					this.recomname = this.options[0].text
@@ -309,7 +298,7 @@
 				font-size: 32rpx;
 				font-family: 'PingFang SC';
 				font-weight: 400;
-				
+
 
 				.recom_sym {
 					width: 28rpx;
@@ -344,8 +333,9 @@
 
 		.tradline {
 			width: 26rpx;
+			height: 4rpx;
 			opacity: 1;
-			border: 2rpx solid #F84221;
+			background-color: #F84221;
 			margin: 0 auto;
 		}
 	}
@@ -368,7 +358,7 @@
 		width: 694.74rpx;
 		margin: 0 auto;
 		display: flex;
-
+		margin-bottom: 21rpx;
 		justify-content: space-between;
 		align-items: center;
 		flex-wrap: wrap;
@@ -379,7 +369,7 @@
 			height: 561rpx;
 			background-color: #fff;
 			margin-top: 21rpx;
-			
+
 			border-radius: 14rpx 14rpx 0 0;
 
 			.shopimg {
diff --git a/plugin/voice/voice.js b/plugin/voice/voice.js
index eba91a9..e0999fa 100644
--- a/plugin/voice/voice.js
+++ b/plugin/voice/voice.js
@@ -5,8 +5,6 @@
  * @Date 2022-01-26
  */
 
-// import store from '../store'
-
 // 是否播放中
 let isPlaying = false;
 // 播放列表
@@ -19,166 +17,24 @@ let audioPlayer = null;
 let platform = 'iOS';
 // 定时器
 let timer = null;
-// socket地址
-const socketUrl = "wss://gateworker.yngod.cn:8686";
+
 
 const voice = {
 	// 创建播放器
 	init: () => {
-		// platform = plus.os.name;
-		// if (platform == 'Android') {
-		// 	let MediaPlayer = plus.android.importClass("android.media.MediaPlayer");
-		// 	audioPlayer = new MediaPlayer()
-		// }
-		// if (platform == "iOS") {
-		// 	let AVAudioPlayer = plus.ios.importClass("AVAudioPlayer");
-		// 	audioPlayer = new AVAudioPlayer();
-		// }
+		platform = plus.os.name;
+		if (platform == 'Android') {
+			let MediaPlayer = plus.android.importClass("android.media.MediaPlayer");
+			audioPlayer = new MediaPlayer()
+		}
+		if (platform == "iOS") {
+			let AVAudioPlayer = plus.ios.importClass("AVAudioPlayer");
+			audioPlayer = new AVAudioPlayer();
+		}
 		console.log('创建播放器成功');
-		// voice.playAudio();
-	},
-	// 连接socket
-	connectSocketGlobal: () => {
-		uni.connectSocket({
-			url: socketUrl,
-			success: (res) => {
-				console.log('连接成功');
-			}
-		})
-
-		uni.onSocketOpen((success) => {
-			console.log('WebSocket连接已打开！');
-			let storeIds = store.state.storeIds;
-			if (storeIds.length > 0) {
-				storeIds.forEach(sid => {
-					uni.sendSocketMessage({
-						data: sid.toString(),
-						success: (s) => {
-							console.log('成功');
-						}
-					});
-				})
-			}
-			store.commit('setData', {
-				key: 'socketIsOpen',
-				val: true
-			});
-		})
-
-		uni.onSocketError(function(error) {
-			console.log('WebSocket连接打开失败，请检查！');
-		});
-
-		uni.onSocketMessage((res) => {
-			console.log('接收播报数据', res)
-			//按接收的内容播放信息
-			try {
-				if (typeof res == 'string') {
-					res = JSON.parse(res);
-				}
-				if (typeof res.data == 'string') {
-					res.data = JSON.parse(res.data);
-				}
-				if(res.data?.Hearbeat) {
-					uni.sendSocketMessage({
-						data: "hearbeat",
-						success: (s) => {
-							console.log('成功');
-						}
-					});
-					return ;
-				}
-				if (res.data.needPlay) {
-					try {
-						// var parseStr = voice.parseAudioData(res.data);
-					} catch (e) {
-						// console.log('解析出错', e)
-					}
-					// console.log('解析数据', parseStr)
-					// voice.addAudioQueue(parseStr);
-				}
-			} catch (e) {}
-		})
-	},
-	//解析服务器数据
-	parseAudioData: function(serverData) {
-		let audio = [];
-		//头部
-		//处理中间数字
-		serverData.data = parseFloat(serverData.data).toString();
-		//如果当前数字中没有小数点，则用.00补足
-		if (serverData.data.indexOf('.') == -1) serverData.data += '.00';
-		let dot = serverData.data.indexOf('.');
-		let l = serverData.data.length;
-		for (let n = 0; n < l; n++) {
-			//如果上一位是0则不加入
-			if (audio[audio.length - 1] != 0 || serverData.data.substr(n, 1) != '0') {
-				audio.push(serverData.data.substr(n, 1));
-				//根据当前数字的位置与dot的位置决定后缀并且当前不是小数点
-				if (serverData.data.substr(n, 1) != '.' && serverData.data.substr(n, 1) != '0') {
-					if (dot - n == 2) {
-						audio.push('ten');
-					} else if (dot - n == 3) {
-						audio.push('hundred');
-					} else if (dot - n == 4) {
-						audio.push('thousand');
-					} else if (dot - n == 5) {
-						audio.push('ten_thousand');
-					}
-				}
-			}
-		}
-		//如果出现1shi则去掉1
-		let _audio = audio.join('&');
-		if (audio[0] == 1) {
-			_audio = _audio.replace('1&shi', 'shi'); //应对一十元问题
-		}
-		if (audio[0] != 0) {
-			_audio = _audio.replace('0&.', '.'); //应对一十点问题
-		}
-		if (_audio.indexOf('.&0') == _audio.length - 2 - 1) { //应对末尾是.0
-			_audio = _audio.substr(0, _audio.length - 2 - 2);
-		}
-		//加入前缀
-		if (_audio) {
-			_audio = 'header_' + serverData.header.toString() + '&' + _audio;
-		} else {
-			_audio = 'header_' + serverData.header.toString();
-		}
-		audio = _audio.split("&");
-		//如果有金额
-		if (l) {
-			audio.push('yuan');
-		}
-		//底部
-		if (serverData.footer) {
-			audio.push('footer');
-		}
-		let result = [];
-		audio.map(item => {
-			if (item != '.')
-				result.push(`/static/audio/tts_${item}.mp3`);
-			else
-				result.push(`/static/audio/tts_dot.mp3`);
-		})
-		return result;
-	},
-	// 随机数
-	getRandomKey: () => {
-		var max = 99999;
-		var min = 1;
-		return (Date.parse(new Date()) + '' + parseInt(Math.random() * (max - min + 1) + min, 10)).toString();
+		voice.playAudio();
 	},
 
-	// 语言播报语音数据 加入到队列里面
-	addAudioQueue: (parseStr) => {
-		let audioList = store.state.audioList;
-		audioList[voice.getRandomKey()] = parseStr;
-		store.commit('setData', {
-			key: 'audioList',
-			val: audioList
-		});
-	},
 	// 重置播放列表
 	resetPlayList: () => {
 		playIndex = 0;
@@ -204,20 +60,18 @@ const voice = {
 		}
 
 		let audioList = currentAudio;
-		if (currentAudio.length == 0) {
-			const keys = Object.keys(audioList)
-			if (keys.length) {
-				currentAudio = Object.values(audioList)[0]
-				delete audioList[keys[0]]
-				playIndex = 0
-				// store.commit('setData', {
-				// 	key: 'audioList',
-				// 	val: audioList
-				// });
-			} else {
-				voice.resetPlayList();
-			}
-		}
+          // voice.resetPlayList();
+		// if (currentAudio.length == 0) {
+		// 	const keys = Object.keys(audioList)
+		// 	console.log(audioList)
+		// 	if (keys.length) {
+		// 		currentAudio = Object.values(audioList)[0]
+		// 		delete audioList[keys[0]]
+		// 		playIndex = 0
+		// 	} else {
+		// 		voice.resetPlayList();
+		// 	}
+		// }
 		console.log('正在播报：', currentAudio[playIndex]);
 		let path = plus.io.convertLocalFileSystemURL(currentAudio[playIndex]);
 		let currentTime = 0; // 当前流媒体的播放的位置，单位是秒
@@ -240,14 +94,16 @@ const voice = {
 			audioPlayer.start();
 			isPlaying = audioPlayer.isPlaying();
 			// 获取音乐的总时长  
-			// console.log(audioPlayer.getDuration());
+			console.log(isPlaying, audioPlayer.getDuration());
 			// 当前播放进度  getCurrentPosition 毫秒
 		}
+		
 		timer = setInterval(function() {
 			currentTime = platform == 'iOS' ? audioPlayer.currentTime() : audioPlayer
 				.getCurrentPosition() / 1000;
 			currentDuration = platform == 'iOS' ? audioPlayer.duration() : audioPlayer
 				.getDuration() / 1000;
+			// console.log(currentTime, currentDuration)
 			if (currentTime == currentDuration || currentTime == 0) {
 				isPlaying = false;
 				voice.clearTimer();
@@ -260,10 +116,10 @@ const voice = {
 				if (Object.keys(audioList).length == 0 && currentAudio.length == 0) {
 					voice.resetPlayList();
 				}
-				voice.playAudio();
+				// voice.playAudio();
 			}
 		}, 200);
 	}
 }
 
-export default voice
+export default voice
\ No newline at end of file
diff --git a/static/css/base.css b/static/css/base.css
index 0364327..cc6bd59 100644
--- a/static/css/base.css
+++ b/static/css/base.css
@@ -54,7 +54,7 @@ body {overflow-x: hidden;}
   -o-box-pack: end;
   -ms-flex-pack: end;
   -webkit-justify-content: flex-end;
-  justify-content: flex-end
+  justify-content: flex-end;
 }
 .acea-row.row-left {
   -webkit-box-pack: start;
diff --git a/static/images/sym.png b/static/images/sym.png
index 8e4d962f287e2800d714bf871444d02a34334009..9a5d259daadb8ba07a11c1abdd317d4b950c7270 100644
GIT binary patch
literal 7163
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

literal 2854
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
Ef=i82o&W#<