commit -m 订单模块接口联调

components/cm-module/creatOrder/sellerAddress.vue

@@ -8,8 +8,8 @@
 		 	<view class="address-content" v-else>
 		 		<view class="address-cen">
 		 			<view class="top">
-		 				<view class="name">{{addressData.shouHuoRen !== undefined ? addressData.shouHuoRen : ''}}</view>
-		 				<view class="mobile">{{addressData.mobile !== undefined ? addressData.mobile : ''}}</view>
+		 				<view class="name">{{addressData.receiver  ? addressData.receiver : ''}}</view>
+		 				<view class="mobile">{{addressData.mobile  ? addressData.mobile : ''}}</view>
 		 			</view>
 		 			<view class="address">
 						<view class="address-icon">
@@ -17,10 +17,10 @@
 						</view>
 						<view class="address-text">
 							收货地址：
-							{{addressData.province !== undefined ? addressData.province : ''}}
-							{{addressData.city !== undefined ? addressData.city : ''}}
-							{{addressData.town !== undefined ? addressData.town : ''}}
-							{{addressData.address !== undefined ? addressData.address : ''}}
+							{{addressData.province ? addressData.province : ''}}
+							{{addressData.city ? addressData.city : ''}}
+							{{addressData.town ? addressData.town : ''}}
+							{{addressData.address ? addressData.address : ''}}
 						</view>
 					</view>
 					<view class="nexpage"><text class="iconfont icon-genghuan"></text></view>

components/cm-module/creatOrder/sellerFreight.vue

@@ -5,7 +5,7 @@
 			<view class="freight-left">运费</view>
 			<view class="freight-right">
 				<text class="text-l">{{freightText}}</text>
-				<text class="text" v-if="freightData.freePostFlag == 1">￥{{orderPriceToFixed(freightMoney)}}</text>
+				<text class="text" v-if="freightData.postageFlag == 1">￥{{orderPriceToFixed(freightMoney)}}</text>
 				<text class="iconfont icon-xiayibu"></text>
 			</view>
 		</view>
@@ -24,15 +24,15 @@
 							</label>
 						</radio-group>
 					</view>
-					<view class="freight-group" v-if="freightData.freePostFlag == 1">
+					<view class="freight-group" v-if="freightData.postageFlag == 1">
 						<view class="group-from">
 							<input class="form-input" type="text" v-model="hanldFreight" @input="setFreightMoney" placeholder="请填写运费" maxlength="20">
 						</view>
 					</view>	
-					<view class="freight-group" v-if="freightData.freePostFlag == 0">
+					<view class="freight-group" v-if="freightData.postageFlag == 0">
 						<text class="text">{{freightText}}</text>
 					</view>
-					<view class="freight-group" v-if="freightData.freePostFlag == -1">
+					<view class="freight-group" v-if="freightData.postageFlag == -1">
 						<text class="text">{{freightText}}</text>
 					</view>
 				</view>
@@ -65,8 +65,8 @@
 				current:0,
 				hanldFreight:0,
 				freightData:{
-					freePostFlag:1,
-					freight:0
+					postageFlag:1,
+					postage:0
 				}
 			}
 		},
@@ -76,41 +76,41 @@
 		methods:{
 			infoData(data){//初始化运费
 				// console.log(data)
-				switch(data.freePostFlag){
+				switch(data.postageFlag){
 					case 1:
 						this.current = 0;
-						this.freightData.freePostFlag = data.freePostFlag;
+						this.freightData.postageFlag = data.postageFlag;
 						if(data.freight == 0){
 							this.hanldFreight = ''
 						}else{
-							this.hanldFreight = data.freight
+							this.hanldFreight = data.postage
 						}
-						this.freightData.freight = data.freight;
+						this.freightData.postage = data.postage;
 						this.freightMoney = this.hanldFreight;
 						this.freightText = ''
 						break;
 					case 0:
 						this.current = 1;
-						this.freightData.freePostFlag = data.freePostFlag;
+						this.freightData.postageFlag = data.postageFlag;
 						this.freightText = '包邮'
 						break;
 					case -1:
 						this.current = 2;
-						this.freightData.freePostFlag = data.freePostFlag;
+						this.freightData.postageFlag = data.postageFlag;
 						this.freightText = '到付'
 						break;
 				}
 			},
 			freightConfim(){//提交完成运费选择
-				switch(this.freightData.freePostFlag){
+				switch(this.freightData.postageFlag){
 					case 1:
-						this.choiceaFreightFirst(this.freightData.freePostFlag)
+						this.choiceaFreightFirst(this.freightData.postageFlag)
 						break;
 					case 0:
-						this.choiceaFreightFirst(this.freightData.freePostFlag)
+						this.choiceaFreightFirst(this.freightData.postageFlag)
 						break;
 					case -1:
-						this.choiceaFreightFirst(this.freightData.freePostFlag)
+						this.choiceaFreightFirst(this.freightData.postageFlag)
 						break;	
 				}		
 			},
@@ -120,10 +120,10 @@
 						this.$util.msg('请填写运费',2000)
 						return
 					}
-					this.freightData.freight = this.hanldFreight
+					this.freightData.postage = this.hanldFreight
 					this.$emit('handleChoiceaFreight',this.freightData)
 				}else{
-					this.freightData.freight = 0
+					this.freightData.postage = 0
 					this.$emit('handleChoiceaFreight',this.freightData)
 				}
 				this.hideSpec()
@@ -142,8 +142,8 @@
 				this.freightMoney = this.hanldFreight
 			},
 			radioChange(e) {//运费选择切换
-				this.freightData.freePostFlag = parseInt(e.target.value);
-				switch(this.freightData.freePostFlag){
+				this.freightData.postageFlag = parseInt(e.target.value);
+				switch(this.freightData.postageFlag){
 					case 1:
 						this.freightText = '不包邮'
 						break;
@@ -155,7 +155,7 @@
 						break;	
 				}		
 				for (let i = 0; i < this.freightList.length; i++) {
-					if (this.freightList[i].value === this.freePostFlag) {
+					if (this.freightList[i].value === this.postageFlag) {
 						this.current = i;
 						break;
 					}
@@ -164,9 +164,9 @@
 			setFreightMoney(e){//处理邮费显示
 				if(e.detail.value == ''){
 					this.freightMoney=0
-					this.freightData.freight=0
+					this.freightData.postage=0
 				}else{
-					this.freightData.freight = e.detail.value
+					this.freightData.postage = e.detail.value
 					this.freightMoney = this.orderPriceToFixed(e.detail.value)
 				}
 			},

components/cm-module/creatOrder/sellerGoodsList.vue

@@ -7,23 +7,23 @@
 					<view v-if="item.promotions" class="floor-item-act">
 						<view class="floor-tags">{{item.promotions.name}}</view>	
 					</view>
-					<view class="title-text">{{item.name}}</view> 
+					<view class="title-text">{{item.shopName}}</view> 
 				</view>
-				<view class="productlist" v-for="(pros,idx) in item.productsList" :key="idx">
+				<view class="productlist" v-for="(pros,idx) in item.cartList" :key="idx">
 					<view class="goods-pros-t">
 						<view class="pros-img">
-							<image :src="pros.mainImage" alt="" />
+							<image :src="pros.image" alt="" />
 							<text class="tips" v-if="pros.giftType == 2 || pros.giftType == 1">赠品</text>
 						</view>
 						<view class="pros-product">
-							<view class="producttitle">{{pros.name}}</view>
-							<view class="productspec"  v-if="pros.productCategory!=2">规格:{{pros.unit}}</view>
-							<view class="productspec" v-if="pros.productCode!=''&&pros.productCode!=null">
+							<view class="producttitle">{{ pros.name }}</view>
+							<view class="productspec"  v-if="pros.productCategory!=2">规格:{{ pros.unit }}</view>
+							<view class="productspec" v-if="pros.productCode!='' && pros.productCode!=null">
 								<view >商品编码:{{pros.productCode}}</view>
 							</view>
 							<view class="productprice">
-								<view class="price"><text>￥{{pros.retailPrice | NumFormat}}</text></view>
-								<view class="count"><text class="small">x</text>{{pros.productCount}}</view>
+								<view class="price"><text>￥{{ pros.price | NumFormat }}</text></view>
+								<view class="count"><text class="small">x</text>{{ pros.number }}</view>
 							</view>
 							<view class="floor-item-act" v-if="pros.promotions!=null">
 								<view v-if="PromotionsFormat(pros.promotions)" class="floor-tags">
@@ -32,7 +32,7 @@
 										:￥{{ pros.promotions == null ? '0.00' : pros.promotions.touchPrice | NumFormat}}
 									</text>
 								</view>
-								<view v-else-if="pros.promotions.type !=3" class="floor-tags">{{pros.promotions.name}}</view>	
+								<view v-else-if="pros.promotions.type !=3" class="floor-tags">{{ pros.promotions.name }}</view>	
 							</view>
 						</view>	
 					</view>

pages/search/search-order.vue

@@ -150,8 +150,8 @@
 			return {
 				listQuery:Object.assign({}, defaultListQuery),
 				themeClass: 'block',
-				isShowClose:false,							//是否显示清空输入框图标
-				isSearchHistory:false,						//是都显示搜索历史
+				isShowClose:false,		// 是否显示清空输入框图标
+				isSearchHistory:false,	// 是都显示搜索历史
 				serachRecordList:[],
 				isShowWrapper:false,
 				isModallayer:false,
@@ -159,13 +159,12 @@
 				windowHeight: '',
 				showSkeleton: true,
 				orderList: [],
-				btnoRderID: 0, //点击按钮传入的的订单ID
+				btnoRderID: 0, 			// 点击按钮传入的的订单ID
 				scrollTop: 0,
-				deteleType:'',
 				skeletonShow: true,
-				isShareModal: false,//控制分享弹窗
-				isCenceModal: false,//控制取消订单弹窗
-				isShowDelModal: false,//控制删除订单弹窗
+				isShareModal: false,	// 控制分享弹窗
+				isCenceModal: false,	// 控制取消订单弹窗
+				isShowDelModal: false,	// 控制删除订单弹窗
 				isModalLayer: false,
 				loadding: false,
 				pullUpOn: true,
@@ -197,20 +196,19 @@
 					this.getOrderDatainit()
 				}
 			},
-			initGetSerachRecord(){
-				this.$api.getStorage().then((resolve) =>{
-					this.listQuery.userId = resolve.userId ? resolve.userId : 0
-					this.OrderService.SearchOrderHistory({userId:this.listQuery.userId}).then(response =>{
-						this.serachRecordList = response.data
-						if(this.serachRecordList.length>0){
-							this.isSearchHistory = true
-						}else{
-							this.isSearchHistory = false
-						}
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})	
+			async initGetSerachRecord(){
+				const userInfo = await this.$api.getStorage()
+				this.listQuery.userId = userInfo.userId ? userInfo.userId : 0
+				this.OrderService.SearchOrderHistory({userId:this.listQuery.userId}).then(response =>{
+					this.serachRecordList = response.data
+					if(this.serachRecordList.length>0){
+						this.isSearchHistory = true
+					}else{
+						this.isSearchHistory = false
+					}
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000)
+				})
 			},
 			onShowClose () { //输入框失去焦点时触发
 				this.inputEmpty(this.listQuery.searchWord)
@@ -250,14 +248,6 @@
 				}
 			},
 			getOrderDatainit(index,source){
-				/**
-				 * @订单初始化加载  仅加载第一页码
-				 * @param：searchWord(搜索关键词)
-				 * @param：userId(用户ID)
-				 * @param：pageNum(页码数)
-				 * @param：pageSize(每页条数)
-				 * @param：organizeID(全局变量组织ID)
-				 */ 
 				this.OrderService.SearchOrderInfo(this.listQuery).then(response =>{
 					this.isShowWrapper = true
 					this.showSkeleton = true
@@ -292,7 +282,7 @@
 					this.$util.msg(error.msg,2000)
 				})
 			}, 
-			getOnReachBottomData(index){//上拉加载
+			getOnReachBottomData(){//上拉加载
 				this.listQuery.pageNum+=1
 				this.OrderService.SearchOrderInfo(this.listQuery).then(response =>{
 					let data = response.data

pages/seller/address/address.vue

@@ -11,7 +11,7 @@
 				<view class="list" v-for="(item, index) in addressList" :key="index" @click="checkAddress(item)">
 					<view class="wrapper">
 						<view class="u-box">
-							<text class="name">{{item.shouHuoRen}}</text>
+							<text class="name">{{item.receiver}}</text>
 							<text class="mobile">{{item.mobile}}</text>
 						</view>
 						<view class="u-box b-b">
@@ -23,7 +23,7 @@
 							</view>
 							<view v-else class="tag-left"></view>
 							<view class="tag-right">
-								<view class="t-b"  @click.stop="deleteAddress(item.addressID)">
+								<view class="t-b"  @click.stop="deleteAddress(item.addressId)">
 									<text class="iconfont icon-shanchu"></text>
 									<text class="txt">删除</text>
 								</view>
@@ -37,31 +37,24 @@
 					</view>
 				</view>
 			</scroll-view>
-			<view class="add-btn" @click="addAddress('add')">添加新地址</view>
+			<view class="add-btn" @click="addAddress('add')" :style="{bottom :isIphoneX ? '68rpx' : '34rpx'}">添加新地址</view>
 		</view>
-		<!-- 删除弹窗 -->
-		<model-alert v-if="isShowDelModal"
-					 :alertText='alertText' 
-					 @btnConfirm ='confirmDetele'>
-		</model-alert>
 	</view>
 </template>
 
 <script>
 	import authorize from '@/common/config/authorize.js'	
-	import modelAlert from '@/components/cm-module/modelAlert/modelAlert.vue'
 	export default {
-		components:{
-			modelAlert
-		},
 		data() {
 			return {
+				isIphoneX:this.$store.state.isIphoneX,
 				isSelect:false,
 				isEmpty:false,
-				isLoadMore:false,
-				userID:'',
-				pageNum:1,
-				pageSize:10,
+				listQuery:{
+					userId:0,
+					pageNum:1,
+					pageSize:10
+				},
 				addressList: [],
 				hasNextPage:false,
 				allowDataStatus:true,
@@ -75,11 +68,6 @@
 			if(option.type=='select'){this.isSelect = true;}
 			this.setScrollHeight();
 		},
-		onReachBottom() {
-			if(this.isLoadMore) {
-				this.initAddressList();
-			}
-		},
 		methods: {
 			setScrollHeight() {	// 窗口高度 - 底部距离
 				setTimeout(()=> {
@@ -94,33 +82,34 @@
 					})
 				}, 500)
 			},
-			initAddressList(){	
-				this.$api.getComStorage('orderUserInfo').then((resolve) =>{
-					this.userID = resolve.userID
-					let params = {pageNum:this.pageNum,pageSize:this.pageSize,userID:this.userID}
-					this.UserService.QueryAddressList(params).then(response =>{
-						if(response.data.results == ''){
-							this.isEmpty = true
-						}else{
-							this.isEmpty = false
-							let results =[];
-							results = response.data.results;
-							this.addressList = this.addressList.concat(results);
-							this.pageNum = response.index +1;
-							if(this.pageNum === response.totalPage + 1 ){
-								this.isLoadMore = false;
-							} else {
-								this.isLoadMore = true;
-							}
-						}
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
+			getQueryAddressList(){	//初始化地址列表数据
+				this.UserService.QueryAddressList(this.listQuery).then(response =>{
+					let data = response.data
+					if(data.list&&data.list.length > 0){
+						this.isEmpty = false
+						this.hasNextPage = data.hasNextPage
+						this.addressList = data.list
+					}else{
+						this.isEmpty = true
+					}
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000)
 				})
-				
 			},
-			//选择地址
-			checkAddress(item){
+			getOnReachBottomData(){// 上滑加载分页
+				this.listQuery.pageNum+=1
+				this.UserService.QueryAddressList(this.listQuery).then(response =>{
+					let data = response.data
+					if(data.list&&data.list.length > 0){
+						this.hasNextPage = data.hasNextPage
+						this.addressList = this.addressList.concat(data.list) 
+					}
+				})
+				.catch(error =>{
+					this.$util.msg(error.msg,2000)
+				})
+			},
+			checkAddress(item){//选择地址
 				//是否需要返回地址(从订单确认页跳过来选收货地址)
 				if(!this.isSelect){return ;}
 				uni.setStorageSync('selectAddress',item)
@@ -131,36 +120,35 @@
 			},
 			addAddress(type,item){
 				uni.navigateTo({
-					url: `/pages/seller/address/addressManage?type=${type}&data=${JSON.stringify(item)}`
+					url: `/pages/user/address/addressManage?type=${type}&data=${JSON.stringify(item)}`
 				})
 			},
-			//删除收货地址
-			deleteAddress(id){
+			deleteAddress(addressId){//删除收货地址
 				this.$util.modal('','确定要删除该地址？','确定','取消',true,() =>{
-					this.UserService.DeleteNewAddress({addressID:id,userID:this.userID}).then(response =>{
+					this.UserService.DeleteAddress({addressId:addressId,userId:this.listQuery.userId}).then(response =>{
 						this.$util.msg('删除成功',2000,true,'success')
 						setTimeout(() =>{
-							this.pageNum = 1;
+							this.listQuery.pageNum = 1;
 							this.addressList = [];
-							this.initAddressList();
+							this.getQueryAddressList();
 						},2000)
 					}).catch(error =>{
 						this.$util.msg(error.msg,2000);
-						setTimeout(function(){
-							uni.switchTab({
-								url:'/pages/seller/home/home'
-							})
-						},1000)
 					})
 				})
 			}
 		},
+		onReachBottom() {
+			if(this.hasNextPage) {
+				this.getOnReachBottomData();
+			}
+		},
 		onShow() {
-			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userId ? resolve.userId : 0
-				this.pageNum = 1;
+			this.$api.getComStorage('orderUserInfo').then((resolve) =>{
+				this.listQuery.userId = resolve.userID? resolve.userID : 0
+				this.listQuery.pageNum = 1;
 				this.addressList = [];
-				this.initAddressList();
+				this.getQueryAddressList();
 				var pages = getCurrentPages();
 				var prevPage = pages[pages.length - 2];  //上一个页面	
 					// prevPage.setData({select:''})
@@ -270,24 +258,24 @@
 	}
 	.add-btn{
 		position: fixed;
-		left: 24rpx;
-		right: 24rpx;
+		left: 75rpx;
+		right: 75rpx;
 		bottom: 34rpx;
 		z-index: 95;
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		width: 702rpx;
+		width: 600rpx;
 		height: 88rpx;
 		font-size: $font-size-28;
 		line-height: 88rpx;
 		color: #FFFFFF;
 		text-align: center;
 		background: $btn-confirm;
-		border-radius: 45rpx;
+		border-radius: 44rpx;
 	}
 	.adds-btn{
-		width: 702rpx;
+		width: 600rpx;
 		height: 88rpx;
 		font-size: 28rpx;
 		line-height: 88rpx;
@@ -295,7 +283,7 @@
 		margin: 0 auto;
 		text-align: center;
 		background: #000000;
-		border-radius: 14rpx;
+		border-radius: 44rpx;
 	}
 </style>
 

pages/seller/address/addressManage.vue

@@ -2,19 +2,24 @@
 	<view class="container clearfix">
 		<view class="add-content">
 			<view class="input-row b-b">
-				<input class="input" type="text" v-model="addressData.shouHuoRen" @input="onShouHuoRen" placeholder="收货人姓名" placeholder-class="placeholder" />
+				<view class="label">收货人:</view>
+				<input class="input" type="text" v-model="addressData.receiver" @input="onShouHuoRen" placeholder="请输入收货人姓名" placeholder-class="placeholder" />
 			</view>
 			<view class="input-row b-b">
-				<input class="input" type="number" maxlength="11" v-model="addressData.mobile"  @input="onMobile" placeholder="手机号码" placeholder-class="placeholder" />
+				<view class="label">手机号:</view>
+				<input class="input" type="number" maxlength="11" v-model="addressData.mobile"  @input="onMobile" placeholder="请输入手机号码" placeholder-class="placeholder" />
 			</view>
 			<view class="input-row b-b" @click="showMulLinkageThreePicker">
-				<text class="input">
+				<view class="label address">所在地区:</view>
+				<text class="input" :style="addressData.allAddress=='请选择收货地区'?'color:#b2b2b2':''">
 					{{addressData.allAddress}}
 				</text>		
 				<text class="iconfont icon-xiayibu"></text>
 			</view>
 			<view class="text-textarea b-b"> 
-				<view class="textarea show" v-if="isShowInput">{{addressData.address ?addressData.address :'详细地址：如道路、门牌号、小区、楼房号、单元室等'}}</view>
+				<view class="textarea show" v-if="isShowInput">
+					{{addressData.address ? addressData.address :'详细地址：如道路、门牌号、小区、楼房号、单元室等'}}
+				</view>
 				<textarea 	v-else
 							class="textarea" 
 							type="text" 
@@ -57,12 +62,12 @@
 				isShowInput:false,
 				switchDefault:false,
 				addressData:{
-					addressID:'',
-					allAddress:'所在地区',
-					userID: '',			//用户id ,只在新增收货地址时传
-					shouHuoRen: '',		//收货人
+					addressId:'',
+					allAddress:'请选择收货地区',
+					userId: '',			//用户id ,只在新增收货地址时传
+					receiver: '',		//收货人
 					mobile:'',			//收货人手机
-					townID:'',			//区ID
+					townId:'',			//区ID
 					address: '',	//地址
 					defaultFlag:0,		//是否默认收货地址(0 不是默认,1 默认)
 				},
@@ -74,18 +79,17 @@
 			if(option.type==='edit'){
 				title = '编辑收货地址'
 				this.isConfirm = false;
-				this.addType = 2;	
+				this.addType = 2;			
 				let optionData = JSON.parse(option.data)
 				this.addressData.allAddress = `${optionData.province}-${optionData.city}-${optionData.town}`
-				this.addressData.address = optionData.address
+				this.addressData.address = optionData.address?optionData.address:''
 				this.addressData.defaultFlag = optionData.defaultFlag;
-				this.addressData.userID = optionData.userID;
+				this.addressData.userId = optionData.userId;
 				this.addressData.mobile = optionData.mobile;
-				this.addressData.townID = optionData.townID;
-				this.addressData.addressID = optionData.addressID;
-				this.addressData.shouHuoRen = optionData.shouHuoRen;
-				this.addressData.addressID = optionData.addressID;
-				if(optionData.defaultFlag == 1){
+				this.addressData.townId = optionData.townId;
+				this.addressData.addressId = optionData.addressId;
+				this.addressData.receiver = optionData.receiver;
+				if(this.addressData.defaultFlag == 1){
 					this.switchDefault = true
 				}else{
 					this.switchDefault = false
@@ -98,9 +102,9 @@
 		methods: {			
 			switchChange(e){
 				if(e.detail.value== true){
-					this.addressData.defaultFlag = 1;
+					this.addressData.defaultFlag = '1';
 				}else{
-					this.addressData.defaultFlag = 0;
+					this.addressData.defaultFlag = '0';
 				}
 			},
 			// 三级联动选择
@@ -109,52 +113,50 @@
 				this.$refs.mpvueCityPicker.show()
 			},
 			onConfirm(e) {
+				console.log(e)
 				this.addressData.allAddress = e.name;
-				this.addressData.townID = e.townCode;
+				this.addressData.townId = e.townCode;	
 				this.initInput();
 			},			
 			//提交
 			confirm(){
-				if(!this.addressData.shouHuoRen){
+				let data = this.addressData;
+				if(!data.receiver){
 					this.$util.msg('请填写收货人');
 				}
-				if(this.addressData.address =='所在地区'){
+				if(data.address =='所在地区'){
 					this.$util.msg('请选择所在地区');
 				}
-				if(!/(^1[0-9][0-9]{9}$)/.test(this.addressData.mobile)){
+				if(!/(^1[0-9][0-9]{9}$)/.test(data.mobile)){
 					this.$util.msg('请输入正确的手机号码');
 					return;
 				}
 				if(this.addType ==1){
 					this.params ={
-							userID:this.addressData.userID,			//用户id ,只在新增收货地址时传
-							shouHuoRen:this.addressData.shouHuoRen ,//收货人
-							townID:this.addressData.townID,			//区ID
-							address:this.addressData.address,		//地址
-							mobile:this.addressData.mobile,			//手机
-							defaultFlag:this.addressData.defaultFlag//是否默认收货地址(0 不是默认,1 默认)
+							userId:data.userId  ,		//用户id ,只在新增收货地址时传
+							receiver:data.receiver ,//收货人
+							townId:data.townId,			//区ID
+							address:data.address,//地址
+							mobile:data.mobile,			//手机
+							defaultFlag:data.defaultFlag//是否默认收货地址(0 不是默认,1 默认)
 						}
 					this.postAddressData(this.params)	
 				}else{
-					this.params = this.addressData;
+					this.params =  this.addressData;
 					this.postAddressData(this.params)
 				}
 			},
-			postAddressData(res){
+			postAddressData(params){
 				this.btnText(true)
-				this.UserService.AddNewAddress(res).then( response=>{
-					this.$util.msg('保存成功',2000,true,'success')
+				this.UserService.AddressSave(params).then( response=>{
+					this.$util.msg('保存成功',1500,true,'success')
 					this.btnText(false)
 					setTimeout(()=>{
 						uni.navigateBack();
 					},2000)
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000);
-					setTimeout(function(){
-						uni.switchTab({
-							url:'/pages/seller/index/index'
-						})
-					},1000)
+					this.btnText(false)
 				})
 			},
 			btnText(flg){
@@ -167,7 +169,7 @@
 				}
 			},
 			onShouHuoRen(e){
-			   this.addressData.shouHuoRen = e.detail.value;
+			   this.addressData.receiver = e.detail.value;
 			   this.initInput();
 			},
 			onMobile(e){
@@ -179,7 +181,7 @@
 			   this.initInput();
 			},
 			initInput(){
-				if(this.addressData.shouHuoRen !== "" && this.addressData.mobile !=="" && this.addressData.address !=="" && this.addressData.townID!==""){
+				if(this.addressData.receiver !== "" && this.addressData.mobile !=="" && this.addressData.address !=="" && this.addressData.townId!==""){
 					this.isConfirm =false;
 				}else{
 					this.isConfirm =true;
@@ -188,7 +190,7 @@
 		},
 		onShow() {
 			this.$api.getComStorage('orderUserInfo').then((resolve) =>{
-				this.addressData.userID = resolve.userID
+				this.addressData.userId = resolve.userID ? resolve.userID : 0
 			})
 		}
 	}
@@ -200,28 +202,36 @@
 		background: $bg-color;
 		// border-top: 1px solid #EBEBEB;
 	}
+	.placeholder{color: #b2b2b2;}
 	.add-content{
 		width: 702rpx;
 		padding:0 24rpx;
 		.input-row{
-			display: flex;
 			align-items: center;
 			position: relative;
-			width: 654rpx;
+			width: 702rpx;
 			height: 88rpx;
-			padding:0 24rpx;
 			margin: 0 auto;
-			// background: #F7F7F7;
-			// border-radius: 14rpx;
+			border-bottom: 2rpx solid #e1e1e1;
+			.label{
+				width:100rpx ;
+				line-height: 88rpx;
+				color: #666666;
+				font-size: $font-size-28;
+				float: left;
+				&.address{
+					width: 120rpx;
+				}
+			}
 			.input{
-				width: 100%;
+				width: 500rpx;
 				height: 100%;
-				// background: #F7F7F7;
 				font-size: $font-size-28;
 				line-height: 88rpx;
+				display: inline-block;
 				color: #333333;
-				border-bottom: 2rpx solid #e1e1e1;
-
+				float: left;
+				padding-left: 20rpx;
 			}
 			&.b-b{
 				margin: 20rpx 0;
@@ -233,11 +243,12 @@
 		color: #b2b2b2;
 		position: absolute;
 		right: 0;
+		top: 10rpx;
 	}
 	.text-textarea{
 		width: 654rpx;
-		height: 146rpx;
-		padding: 0 24rpx;
+		height: 147rpx;
+		padding: 24rpx;
 		// background: #F7F7F7;
 		border-bottom: 2rpx solid #e1e1e1;
 		.textarea{
@@ -268,20 +279,21 @@
 		}
 	}
 	.add-btn{
-		width: 600rpx;
-		height: 90rpx;
-		font-size: $font-size-28;
+		width: 702rpx;
+		height:90rpx;
+		font-size: $font-size-30;
 		line-height: 90rpx;
 		color: #FFFFFF;
 		margin: 0 auto;
 		text-align: center;
 		background: $btn-confirm;
 		border-radius: 45rpx;
+		border-radius: 44rpx;
 		margin-top: 80rpx;
 	}
 	.add-btn.disabled{
 		background: #F8F8F8;
-		border-radius: 45rpx;
+		border-radius: 44rpx;
 	}
 </style>
 

pages/seller/cart/second.vue

@@ -165,14 +165,11 @@
 			},
 			toConfirmation(){//跳转确认订单页面
 				this.specClass = 'hide';
-				let cartPramsData={
-						clubId:this.clubID,
-						allPrice:this.buyRetailPrice,
-						allCount:this.number,
-						productID:this.handleData.productId,
+				let productStp ={
+						productIds:this.handleData.productId,
 						productCount:this.number
-				}
-				this.$api.navigateTo(`/pages/seller/order/create-order?type=prodcut&data=${JSON.stringify({data:cartPramsData})}`)
+				}	
+				this.$api.navigateTo(`/pages/seller/order/create-order?type=prodcut&data=${JSON.stringify({data:productStp})}`)
 				setTimeout(() => {
 					this.specClass = 'none';
 				}, 200);

pages/seller/club/list.vue

@@ -254,7 +254,7 @@
 			},
 			orderHistory(item){//跳转机构历史订单
 				this.$api.setStorage('orderUserInfo',item)
-				this.$api.navigateTo(`/pages/seller/order/order-historylist?clubID=${item.clubID}&listType=0`)
+				this.$api.navigateTo(`/pages/seller/order/order-historylist?clubId=${item.clubID}&listType=0`)
 			},
 			onShowClose () {//输入框失去焦点时触发
 				if(this.searchInputVal != ''){

pages/seller/order/create-order.vue

@@ -47,7 +47,7 @@
 								hover-class="btn-hover"
 								v-if="userMoney!=0"
 								@click.stop="checkedBalabce"
-								:class="[ischecked ?'icon-gouxuanl':'icon-weigouxuan']"
+								:class="[ischecked ?'icon-yixuanze':'icon-weixuanze']"
 						>
 						</button>
 					</view>
@@ -64,14 +64,14 @@
 		<seller-regulations  ref="regulations"
 							 v-if="isRequest && isDepositFlg && seconDepositFlg" 
 							:regulaDatas="clauseList" 
-							@handleData="claData">
+							@handleData="handleClauseData">
 		</seller-regulations>
 		<regula-alert v-if="isregulaTip" ref="csPhone"></regula-alert>
 		<!-- 底部 -->
 		<view class="footer" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
 			<view class="footer-le">
 				<view class="footer-count">
-					<text>共{{allCount}}件商品</text>
+					<text>共{{ totalCount }}件商品</text>
 				</view>
 				<view class="footer-price">
 					<view class="sum" :class="totalDiscountAmount == 0 ? 'none' : ''">
@@ -150,7 +150,7 @@
 			townId:0			// 地区Id
 		};
 	const defaultConfirmParam = {
-			cartType:1, 		// 购买类型:（1自主下单, 3协销下单）
+			cartType:3, 		// 购买类型:（1自主下单, 3协销下单）
 			orderSource:6,		// 订单来源 1WWW 6小程序[采美,星范]
 			addressId:0,		// 收货地址Id
 			clubCouponId:0,		// 关联优惠券Id
@@ -192,7 +192,7 @@
 				confirmType:1,			  
 				submitState:'',  		  // 提交状态
 				balanceDeductionFlag:2,   // 勾选余额的状态(1使用，2不使用)
-				allCount:1,				  // 订单提交总数量
+				totalCount:0,				  // 订单提交总数量
 				reducedPrice:0,			  // 满减金额
 				couponAmount:0,	  		  // 优惠券金额
 				totalDiscountAmount:0,	  // 共减金额
@@ -201,8 +201,6 @@
 				surplusMoney:0.00,		  // 显示勾选后的剩余抵扣
 				userMoney:0.00,			  // 显示可使用余额
 				deductMoney:0.00,		  // 显示已使用的余额
-				addressID:'',			  // 地址ID
-				townID:'',				  // 区ID
 				isRequest:false,		  // 是否加载完成渲染子组件
 				isFreight:false,		  // 是否加载完成渲染子组件
 				isAddress:false,		  // 是否加载完成地址
@@ -220,9 +218,7 @@
 				isDepositFlg:true,
 				depositIds : [6060,6061,6062,6063,6064,6065,6066,6067,6068,6069],//定金&充值余额商品ID
 				clauseList:[],
-				clauseId:0,
 				seconDepositFlg:true,
-				rebateFlag:0,
 				rebatecheck:false,
 				isCouponShow:false,		  // 是否显示可选优惠券
 				secondflag:true,
@@ -253,11 +249,11 @@
 						this.productParam.productCount = data.data.productCount
 						this.productParam.productId = data.data.productIds
 						this.productIds = this.postageParam.productIds = data.data.productIds
-						this.getInitProdcutCrearOrder();
+						this.getInitProdcutCrearOrder()
 					}else{
 						this.confirmType = 2
 						this.productIds = this.cartParam.productIds = this.postageParam.productIds = data.data.productIds
-						this.getInitCrearOrder();
+						this.getInitCrearOrder()
 					}
 			},
 			getInitCrearOrder(){//协销购物车跳转确认订单初始化信息
@@ -268,7 +264,10 @@
 					this.userMoney = data.userMoney
 					this.couponList = data.couponList
 					this.reducedPrice = data.reducedPrice
-					this.allPrice = data.totalAmount
+					this.totalCount = data.totalCount
+					this.allPrice = data.totalPrice
+					this.rechargeGoods = data.includeRecharge
+					this.clauseList = data.clauseList
 					this.isCouponShow = true
 					if(this.couponList.length>0){
 						this.couponAmount = data.couponList[0].couponAmount
@@ -276,8 +275,6 @@
 					}
 					this.orderShouldPayFee = this.allPrice - this.couponAmount
 					this.totalDiscountAmount = this.reducedPrice + this.couponAmount
-					this.rechargeGoods = data.includeRecharge
-					this.clauseList = data.clauseList
 					this.goodsData.forEach(item =>{
 						item.cartList.forEach(pros =>{
 							if(this.depositIds.indexOf(pros.productId)>=0){
@@ -292,10 +289,14 @@
 			getInitProdcutCrearOrder(){//二手下单初始化查询
 				this.seconDepositFlg = false;
 				this.SellerService.GetSettlementBySencondProduct(this.productParam).then(response =>{
-					let resData = response.data
+					const data = response.data
 					this.isRequest = true
-					this.goodsData = resData.shopList
-					this.userMoney = resData.userMoney
+					this.goodsData = data.list
+					this.userMoney = data.userMoney
+					this.totalCount = data.totalCount
+					this.allPrice = data.totalPrice
+					this.orderShouldPayFee = this.allPrice
+					this.isCouponShow = false
 					this.secondflag = false
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
@@ -303,10 +304,11 @@
 			},
 			getFreightData(){//获取邮费信息
 				this.OrderService.GetOrderPostage(this.postageParam).then(response =>{
+					const data = response.data
 					this.isFreight = true
-					this.freightData = response.data
-					if(response.data.freePostFlag== 1){
-						this.orderShouldPayFee = this.allPrice + response.data.freight
+					this.freightData = data
+					if(data.postageFlag== 1){
+						this.orderShouldPayFee = this.allPrice + data.postage
 						this.attributePallPrice()
 					}else{
 						this.orderShouldPayFee = this.allPrice
@@ -314,32 +316,38 @@
 					}
 				})
 			},
-			getAddressData(){//获取地址信息
-				this.$api.getComStorage('orderUserInfo').then((resolve) =>{
-					this.UserService.QueryAddressList({pageNum:1,pageSize:1,userID:resolve.userID}).then(response =>{
-						this.isAddress = true
-						this.addressData = {}
-						if(response.data.results != ''){
-							this.addressID = response.data.results[0].addressID;
-							this.townID = response.data.results[0].townID;
-							this.addressData = response.data.results[0];
-							this.getFreightData()
-						}else{
-							this.addressData = this.addressData;
-						}
-					})
+			async getAddressData(){//获取地址信息
+				const clubInfo = await this.$api.getComStorage('orderUserInfo')
+				this.UserService.QueryAddressList(
+					{
+						pageNum:1,
+						pageSize:1,
+						userId:clubInfo.userID,
+					}
+				).then(response =>{
+					let data = response.data
+					this.isAddress = true
+					this.addressData = {}
+					if(response.data.results != ''){
+						this.confirmParam.addressId = data.list[0].addressId;
+						this.postageParam.townId = data.list[0].townId;
+						this.addressData = data.list[0];
+						this.getFreightData()
+					}else{
+						this.addressData = this.addressData;
+					}
 				})
 			},
 			handChangeInputGoodsList(data){//对应供应商的留言信息
 				this.goodsData = data;
 			},
 			handleChoiceaInvoiceData(data){//获取发票信息
-				this.invoiceData = data
+				this.confirmParam.orderInvoice = data
 			},
 			handleChoiceaFreightData(data){//获取运费信息
-				if(data.freePostFlag == '1'){
+				if(data.postageFlag == 1){
 					this.freightData = data
-					this.orderShouldPayFee = this.allPrice + parseInt(data.freight)
+					this.orderShouldPayFee = this.allPrice + parseInt(data.postage)
 					this.attributePallPrice()
 				}else{
 					this.freightData = data
@@ -347,8 +355,8 @@
 					this.attributePallPrice()
 				}
 			},
-			claData(id){
-				this.clauseId = id;
+			handleClauseData(clauseId){// 条款Id
+				this.confirmParam.payInfo.clauseId = parseInt(clauseId);
 			},
 			handleChoiceaCouponData(data){// 勾选使用优惠券
 				console.log('优惠券信息',data)
@@ -365,8 +373,8 @@
 						this.attributePallPrice()
 					}else{
 						this.balanceDeductionFlag = 2
-						if(this.freightData.freePostFlag == 1 || this.freightData.freePostFlag == '1'){
-							this.orderShouldPayFee = this.allPrice + parseInt(this.freightData.freight) - this.couponAmount
+						if( this.freightData.postageFlag == 1 ){
+							this.orderShouldPayFee = this.allPrice + parseInt(this.freightData.postage) - this.couponAmount
 						}else{
 							this.orderShouldPayFee = this.allPrice - this.couponAmount
 						}
@@ -378,8 +386,8 @@
 				}
 			},	
 			attributePallPrice(){//计算价格
-				if(this.freightData.freePostFlag == 1 || this.freightData.freePostFlag == '1'){
-					this.attributeHashfreight(this.freightData.freight)
+				if( this.freightData.postageFlag == 1){
+					this.attributeHashfreight(this.freightData.postage)
 				}else{
 					this.attributeNofreight()
 				}
@@ -404,20 +412,20 @@
 				console.log('最终订单支付金额',this.orderShouldPayFee)
 				console.log('优惠券金额',this.couponAmount)
 			},
-			attributeHashfreight(freight){//计算需要邮费的支付价格
-				let totalAmount = this.allPrice + parseInt(freight) - this.couponAmount//计算不包邮的价格 总价等于商品价格+邮费
+			attributeHashfreight(postage){//计算需要邮费的支付价格
+				let totalAmount = this.allPrice + parseInt(postage) - this.couponAmount//计算不包邮的价格 总价等于商品价格+邮费
 				if(this.ischecked){
 					if(this.userMoney > totalAmount ){							//余额大于支付金额
 						this.orderShouldPayFee = 0.00
-						this.deductMoney = this.allPrice + parseInt(freight) - this.couponAmount			//勾选后使用抵余额
+						this.deductMoney = this.allPrice + parseInt(postage) - this.couponAmount			//勾选后使用抵余额
 						this.surplusMoney = this.userMoney - this.deductMoney	    //勾选后的剩余抵扣
 					}else{
-						this.orderShouldPayFee = this.allPrice + parseInt(freight) - this.userMoney  - this.couponAmount       	//勾选后的总价
+						this.orderShouldPayFee = this.allPrice + parseInt(postage) - this.userMoney  - this.couponAmount       	//勾选后的总价
 						this.deductMoney = this.userMoney				            //勾选后使用抵余额
 						this.surplusMoney = this.userMoney - this.deductMoney	    //勾选后的剩余抵扣
 					}
 				}else{
-					this.orderShouldPayFee = this.allPrice + parseInt(freight) - this.couponAmount
+					this.orderShouldPayFee = this.allPrice + parseInt(postage) - this.couponAmount
 					this.deductMoney = 0.00
 					this.surplusMoney = this.userMoney
 				}
@@ -425,57 +433,42 @@
 				console.log('优惠券金额',this.couponAmount)
 			},
 			orderSubmitMit(){//提交订单
-				if(this.addressID == ''){
+				if(this.confirmParam.addressId == ''){
 					this.$util.msg('请先添加收货地址～',2000)
 					return
 				}
-				// 处理商品信息及留言
-				this.orderInfo = this.goodsData.map(el => {
+				this.confirmParam.orderInfo = this.goodsData.map(el => {
 					let productInfo = [];
 					el.cartList.forEach(item => {
 						productInfo.push({
-							productId:item.productID,
-							productNum:item.productCount,
-							productType:item.giftType ? Number(item.giftType) : 0,
+							productId:item.productId,
+							productNum:item.number,
 							presentNum:0,
+							productType:item.productType
 						})
-					})				
-					return {shopId:el.shopID,note:el.note?el.note:'',productInfo:productInfo}
+					})
+					return {shopId:el.shopId,note:el.note?el.note:'',productInfo:productInfo}
 				})
-				//订单信息
-				this.payInfo = {
-						orderShouldPayFee:this.orderShouldPayFee.toFixed(2),//提交的总价
-						balancePayFlag:this.balanceDeductionFlag,//余额抵扣的状态
-						freight:parseInt(this.freightData.freight).toFixed(2),//邮费
-						freePostFlag:parseInt(this.freightData.freePostFlag),//运费形式
-						clauseId:this.clauseId,//售后条款
-						rebateFlag:this.rebateFlag,//返佣
-					}
-					console.log(this.payInfo)
-				let params = {
-						clubCouponId:this.clubCouponId,
-						orderSource:6,				  //提交来源
-						clubUserId:this.clubUserId,   //机构UserID
-						cartType:this.cartType,		  //从购物车提交
-						serviceProviderId:this.serviceProviderId,//帮下单协销ID
-						addressId:this.addressID,	  //地址ID
-						orderInfo:this.orderInfo,	  //商品信息
-						payInfo:this.payInfo,		  //订单信息
-						orderInvoice:this.invoiceData //发票信息
-					}
+				this.confirmParam.payInfo.postage = parseInt(this.freightData.postage).toFixed(2)
+				this.confirmParam.payInfo.postageFlag = parseInt(this.freightData.postageFlag)
+				this.confirmParam.payInfo.orderShouldPayFee = this.orderShouldPayFee.toFixed(2)
+				this.confirmParam.payInfo = JSON.stringify(this.confirmParam.payInfo)
+				this.confirmParam.orderInfo = JSON.stringify(this.confirmParam.orderInfo)
+				this.confirmParam.orderInvoice = JSON.stringify(this.confirmParam.orderInvoice)
+				console.log(this.confirmParam)
 				this.modalLayer = true;	
 				this.$util.modal('','请仔细确认订单是否为返佣订单后再提交订单','继续提交','再想一想',true,() =>{
-					this.SellerService.SellerCreateOrderSubmit({'params':JSON.stringify(params)}).then(response =>{
+					this.SellerService.SellerCreateOrderSubmit(this.confirmParam).then(response =>{
 						const data = response.data;
-						if(data.code === '1'){
+						if(data.code === 1){
 							this.$util.msg('支付成功',2000,true,'success')
 							setTimeout(() =>{
-								this.$api.redirectTo(`/pages/seller/order/order-details?type=cash&orderID=${data.orderID}&userId=${this.clubUserId}`)
+								this.$api.redirectTo(`/pages/seller/order/order-details?type=cash&orderId=${data.orderId}&userId=${this.postageParam.userId}`)
 							},2000)
 						}else{
 							this.$util.msg('订单提交成功',2000,true,'success')
 							setTimeout(()=>{
-								this.$api.redirectTo(`/pages/seller/order/order-details?type=cash&orderID=${data.orderID}&userId=${this.clubUserId}`)
+								this.$api.redirectTo(`/pages/seller/order/order-details?type=cash&orderId=${data.orderId}&userId=${this.postageParam.userId}`)
 							},2000)
 						}
 					}).catch(error =>{
@@ -486,11 +479,11 @@
 			RebateChang(){//  返佣订单勾选
 				this.rebatecheck = !this.rebatecheck;
 				if(this.rebatecheck){
-					this.rebateFlag=1;
+					this.confirmParam.payInfo.rebateFlag=1;
 				}else{
-					this.rebateFlag=0;
+					this.confirmParam.payInfo.rebateFlag=0;
 				}
-				console.log(this.rebateFlag)
+				console.log(this.confirmParam.payInfo.rebateFlag)
 			},
 			handFreightAlertShow(){//显示邮费弹窗
 				this.isfreightTip = true;
@@ -504,13 +497,13 @@
 			},
 		},
 		onShow() {
-			// this.addressID = ''		
 			let pages = getCurrentPages();
 			let currPage = pages[pages.length-1];
 			if(currPage.data.select =='select'){
 				this.isAddress = true
 				let SelectData = uni.getStorageSync('selectAddress');
-				this.addressID = SelectData.addressID;
+				this.confirmParam.addressId = SelectData.addressId;
+				this.postageParam.townId = SelectData.townId 
 				this.addressData = SelectData
 				this.getFreightData()
 			}else{

pages/seller/order/create-recharge-order.vue

@@ -49,20 +49,18 @@
 			return {
 				isIphoneX:this.$store.state.isIphoneX,
 				productInfo:{},
+				userId:0,
 				params:{
 					name:'',
 					price:'', 
 					note:'', 
-					userId:0 , 
+					clubId:0 , 
 					serviceProviderId:0
 				}
 			}
 		},
-		onLoad(option){//商品数据
-			this.$api.getComStorage('orderUserInfo').then((resolve) =>{
-				this.params.userId = resolve.userID
-				this.getInitCrearOrder();
-			})
+		onLoad(){
+			this.initStorage()
 		},
 		filters:{
 			NumFormat(value) {//处理金额
@@ -70,19 +68,24 @@
 			},
 		},
 		methods: {
+			async initStorage(){
+					const culbInfo = await this.$api.getComStorage('orderUserInfo')
+					const userInfo = await this.$api.getStorage()
+					this.userId = culbInfo.userID ? culbInfo.userID : 0
+					this.params.clubId = culbInfo.clubID ? culbInfo.clubID : 0
+					this.params.serviceProviderId = userInfo.serviceProviderId ? userInfo.serviceProviderId : 0
+					this.getInitCrearOrder()
+			},
 			getInitCrearOrder(option){//协销购物车跳转确认订单初始化信息
-				this.$api.getStorage().then((resolve) =>{
-					this.params.serviceProviderId = resolve.serviceProviderId
-					this.SellerService.SellerProductRechargeGoods({
-						productId:6060,
-					})
-					.then(response =>{
-						this.productInfo = response.data
-						console.log(this.productInfo)
-					})
-					.catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
+				this.SellerService.SellerProductRechargeGoods({
+					productId:6060,
+				})
+				.then(response =>{
+					this.productInfo = response.data
+					console.log(this.productInfo)
+				})
+				.catch(error =>{
+					this.$util.msg(error.msg,2000)
 				})
 			},
 			orderSubmitMit(){//提交订单
@@ -94,19 +97,12 @@
 					this.$util.msg('请填写商品价格',2000);
 					return
 				}
-				this.SellerService.SellerSubmitRechargeOrder({'params':JSON.stringify(this.params)}).then(response =>{
+				this.SellerService.SellerSubmitRechargeOrder(this.params).then(response =>{
 					const data = response.data;
-					if(data.code === '1'){
-						this.$util.msg('支付成功',2000,true,'success')
-						setTimeout(() =>{
-							this.$api.redirectTo(`/pages/seller/order/order-details?type=cash&orderID=${data.orderID}&userId=${this.params.userId}`)
-						},2000)
-					}else{
-						this.$util.msg('订单提交成功',2000,true,'success')
-						setTimeout(()=>{
-							this.$api.redirectTo(`/pages/seller/order/order-details?type=cash&orderID=${data.orderID}&userId=${this.params.userId}`)
-						},2000)
-					}
+					this.$util.msg('订单提交成功',2000,true,'success')
+					setTimeout(()=>{
+						this.$api.redirectTo(`/pages/seller/order/order-details?type=cash&orderId=${data.orderId}&userId=${this.userId}`)
+					},2000)
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000);
 				})

pages/seller/order/order-historylist.vue

@@ -25,32 +25,54 @@
 								<view class="order-title">
 									<view class="order-title-name">{{order.clubName}}</view>
 									<view class="order-title-t">
-										<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</text>
-										<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</text>
-										<text class="bage-text tui-skeleton-fillet">订单编号：{{order.orderNo}}({{order.orderID}})</text>
-										<image class="bage-icon" src="https://static.caimei365.com/app/img/icon/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
+										<text class="bage-buss tui-skeleton-fillet" 
+											  v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">
+											  协销
+										</text>
+										<text class="bage-auto tui-skeleton-fillet" 
+											  v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">
+											  自主
+										</text>
+										<text class="bage-text tui-skeleton-fillet">
+											订单编号：{{order.orderNo}}({{order.orderId}})
+										</text>
+										<image class="bage-icon" 
+											   src="https://static.caimei365.com/app/img/icon/icon-type@3x.png" 
+											   mode="widthFix" 
+											   v-if="order.secondHandOrderFlag == 1">
+										</image>
 									</view>
 									<view class="order-title-b">
-										<view class="order-title-btxt tui-skeleton-fillet">下单时间：{{order.orderTime}}</view>
-										<view class="order-title-tip tui-skeleton-fillet">{{StateExpFormat(order.status)}}</view>
+										<view class="order-title-btxt tui-skeleton-fillet">
+											下单时间：{{order.orderTime}}
+										</view>
+										<view class="order-title-tip tui-skeleton-fillet">
+											{{StateExpFormat(order.status)}}
+										</view>
 									</view>
 								</view>
 								<block v-for="(shop,index) in order.shopOrderList" :key="index">
 									<view class="goods-title">
 										<view v-if="shop.shopPromotion" class="floor-item-act">
-											<view class="floor-tags">{{shop.shopPromotion.name}}</view>	
+											<view class="floor-tags">
+												{{ shop.shopPromotion.name }}
+											</view>	
+										</view>
+										<view class="title-text tui-skeleton-fillet">
+											{{ shop.shopName }}
 										</view>
-										<view class="title-text tui-skeleton-fillet">{{shop.shopName}}</view>
 									</view>
 									<view class="goods-item" v-for="(pros,prosIndex) in shop.orderProductList" :key="prosIndex">
 										<view class="goods-pros-t">
 											<view class="pros-img tui-skeleton-fillet">
-												<image :src="pros.productImage" alt="" />
+												<image :src="pros.image" alt="" />
 												<text class="tips" v-if="pros.productType ==2 || pros.productType ==1">赠品</text>
 											</view>
 											<view class="pros-product clearfix">
 												<view class="producttitle tui-skeleton-fillet">{{pros.name}}</view>
-												<view class="productspec tui-skeleton-fillet" v-if="pros.productCategory != 2">规格:{{pros.productUnit ? pros.productUnit : ''}}</view>
+												<view class="productspec tui-skeleton-fillet" v-if="pros.productCategory != 2">
+													规格:{{pros.productUnit ? pros.productUnit : ''}}
+												</view>
 												<view class="productprice">
 													<view class="price tui-skeleton-fillet">
 														<text>￥{{ pros.price | NumFormat }}</text>
@@ -66,26 +88,34 @@
 															:￥{{ pros.productPromotion == null ? '0.00' : pros.productPromotion.touchPrice | NumFormat}}
 														</text>
 													</view>
-													<view v-else-if="pros.productPromotion.type !=3" class="floor-tags">{{pros.productPromotion.name}}</view>	
+													<view v-else-if="pros.productPromotion.type !=3" class="floor-tags">
+														{{ pros.productPromotion.name }}
+													</view>	
 												</view>
 											</view>	
 										</view>
 									</view>	
 								</block>
 								<view class="order-footer">
-									<view class="order-footer-top" v-if="order.discountFee!=0">经理折扣：¥{{ order.discountFee | NumFormat }}</view>
+									<view class="order-footer-top" v-if="order.discountFee!=0">
+										经理折扣：¥{{ order.discountFee | NumFormat }}
+									</view>
 									<view class="order-footer-bot">
 										<view class="count tui-skeleton-fillet">共{{order.productCount}}件商品</view>
-										<view class="money tui-skeleton-fillet" v-if="order.status==31||order.status==32||order.status==33">已支付：<label style="color:#f94b4b ;">¥{{ order.receiptAmount | NumFormat }}</label></view>
-										<view class="money tui-skeleton-fillet" v-else>待付总额：<label style="color:#f94b4b ;">¥{{ order.pendingPayments | NumFormat }}</label></view>
+										<view class="money tui-skeleton-fillet" v-if="order.status==31||order.status==32||order.status==33">
+											已支付：<label style="color:#f94b4b ;">¥{{ order.receiptAmount | NumFormat }}</label>
+										</view>
+										<view class="money tui-skeleton-fillet" v-else>
+											待付总额：<label style="color:#f94b4b ;">¥{{ order.pendingPayments | NumFormat }}</label>
+										</view>
 									</view>
 								</view>
 								<!-- 底部button -->
 								<order-button ref="orderButton" 
 											  :status="order.status" 
 											  :rechargeGoods = "order.rechargeGoods"
-											  :orderID="order.orderID" 
-											  :userID = "order.userID"
+											  :orderId="order.orderId" 
+											  :userId = "order.userId"
 											  :secondHandOrderFlag = "order.secondHandOrderFlag"
 											  @buttonConfirm="handButtonConfirm">
 								</order-button>
@@ -101,24 +131,40 @@
 		</swiper>
 		<!-- 分享弹窗 -->
 		<share-alert   v-if="isShareModal"
-					   :orderID="btnoRderID" 
+					   :orderId="btnoRderID" 
 					   @shareConfirm ='onShareAppMessage'>
 		</share-alert>
 		<!-- 透明模态层 -->
 		<modal-layer v-if='isModalLayer'></modal-layer>
+		<!-- 再来一单弹窗 -->
+		<view class="aganBj" v-show="showAgan">
+			<view class="alertAgan">
+				<text class="title">{{ promptitle }}</text>
+				<view class="goods">
+					<view class="list" v-for="(item,index) in failList"  :key="index">
+						<image class="image-left" :src="item.image"></image>
+						<view class="name-right">{{item.name}}</view>
+					</view>
+				</view>
+				<view class="BtnAll">
+					<view class="closebtn btn" @click="closeBtn">取消</view>
+					<view class="cancel btn" @click="cancelBtn">确定</view>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
 <script>
-	import headerBack from '@/components/cm-module/headerNavbar/header-back' 		//自定义顶部导航
-	import btSearch from '@/components/uni-search/bt-search.vue'				//搜索
+	import headerBack from '@/components/cm-module/headerNavbar/header-back' 	// 自定义顶部导航
+	import btSearch from '@/components/uni-search/bt-search.vue'				// 搜索
 	import tuiSkeleton from "@/components/tui-skeleton/tui-skeleton"
 	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
 	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	import orderButton from '@/components/cm-module/orderDetails/sellerOrderButton' //操作按钮
+	import orderButton from '@/components/cm-module/orderDetails/sellerOrderButton' // 操作按钮
 	import modalLayer from "@/components/modal-layer"
 	import empty from "@/components/empty";
-	import shareAlert from '@/components/cm-module/modelAlert/shareAlert'			 //分享弹窗
+	import shareAlert from '@/components/cm-module/modelAlert/sellerShareAlert'		// 分享弹窗
 	
 	export default {
 		components: {
@@ -147,7 +193,8 @@
 								{type:2,text:'协销订单'}
 							],			 
 				winHeight: "", //窗口高度
-				clubID:'',		//机构ID
+				clubId:0,		//机构ID
+				userId:0,
 				currentTab: 0, //预设当前项的值
 				screenTab:0,   //筛选预设当前项的值
 				scrollLeft: 0 ,//tab标题的滚动条位置
@@ -170,23 +217,22 @@
 				pullFlag: true,
 				navbarHeight:'',
 				nomoreText: '上拉显示更多',
-				userID:0
+				showAgan:false,
+				failList:[],  // 再来一单可购买商品
+				promptitle:'',
+				aganOrderId:0
 			}
 		},
 		onLoad(option) {
 			let self = this
-			this.clubID = option.clubID
 			this.currentTab = option.listType
-			//  高度自适应
-			uni.getSystemInfo({
+			this.initDataInfo()
+			uni.getSystemInfo({//  高度自适应
 				success: function(res) {
 					let calc = res.windowHeight;
 					self.winHeight = calc-82;
 				}
 			});
-			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userId ? resolve.userId : 0
-			})
 		},
 		filters:{
 			NumFormat(value) {//处理金额
@@ -194,8 +240,15 @@
 			},
 		},
 		methods: {
-			// 滚动切换标签样式
-			onChange (e) {
+			async initDataInfo(){
+				const clubInfo = await this.$api.getComStorage('orderUserInfo')
+				const userInfo = await this.$api.getStorage()
+				this.clubId = clubInfo.clubID ? clubInfo.clubID : 0
+				this.userId = clubInfo.userID ? clubInfo.userID : 0
+				this.serviceProviderId = userInfo.serviceProviderId ? userInfo.serviceProviderId : 0
+				this.getOrderDatainit(this.currentTab)
+			},
+			onChange (e) {// 滚动切换标签样式
 				let index = e.target.current || e.detail.current;
 				if (this.isClickChange) {
 					this.currentTab = index;
@@ -251,61 +304,74 @@
 					return;
 				}
 				setTimeout(()=>{
-					this.$api.getComStorage('orderUserInfo').then((resolve) =>{
-						let params = {listType:index,clubID:resolve.clubID,orderSubmitType:this.screenTab,serviceProviderId:this.serviceProviderId,pageNum:1,pageSize:this.pageSize};
-						this.SellerService.GetSellerClubOrderList(params).then(response =>{
-							let orderList = response.data.results.filter(item=>{
-								//添加不同状态下订单的表现形式
-								item = Object.assign(item, this.StateExpFormat(item.listType));
-								return item;
-							});
-							orderItem.orderList =[];
-							orderList.forEach(item=>{
-								orderItem.orderList.push(item);
-							})
-							//loaded新字段用于表示数据加载完毕，如果为空可以显示空白页
-							this.$set(orderItem, 'loaded', true);
-							this.hasNextPage = response.data.hasNextPage;
-							if(this.hasNextPage){
-								this.pullUpOn = false
-								this.nomoreText = '上拉显示更多'
-							}else{
-								if(orderItem.orderList.length < 2){
-									this.pullUpOn = true
-								}else{
-									this.pullUpOn = false
-									this.nomoreText = '已至底部'
-								}
-							}
-						}).catch(error =>{
-							this.$util.msg(error.msg,2000);
+					this.SellerService.GetSellerClubOrderList(
+						{
+							listType:index,
+							clubId:this.clubId,
+							orderSubmitType:this.screenTab,
+							serviceProviderId:this.serviceProviderId,
+							pageNum:1,
+							pageSize:this.pageSize,
+						}
+					).then(response =>{
+						let data  = response.data
+						let orderList = data.list.filter(item=>{
+							//添加不同状态下订单的表现形式
+							item = Object.assign(item, this.StateExpFormat(item.listType));
+							return item;
+						});
+						orderItem.orderList =[];
+						orderList.forEach(item=>{
+							orderItem.orderList.push(item);
 						})
-					})
-				}, 600);	
-			}, 
-			getOnReachBottomData(index){//上拉加载
-				this.pageNum += 1
-				this.$api.getComStorage('orderUserInfo').then((resolve) =>{
-					let params = {listType:index,clubID:resolve.clubID,orderSubmitType:this.screenTab,serviceProviderId:this.serviceProviderId,pageNum:this.pageNum,pageSize:this.pageSize};
-					this.SellerService.GetSellerClubOrderList(params).then(response =>{
-						let orderItem = this.orderTabBar[index];
-						let resData = response.data.results
-						this.hasNextPage = response.data.hasNextPage;
-						orderItem.orderList = orderItem.orderList.concat(resData)
-						this.pullFlag = false;// 防上拉暴滑
-						setTimeout(()=>{this.pullFlag = true;},500)
+						//loaded新字段用于表示数据加载完毕，如果为空可以显示空白页
+						this.$set(orderItem, 'loaded', true);
+						this.hasNextPage = data.hasNextPage;
 						if(this.hasNextPage){
 							this.pullUpOn = false
 							this.nomoreText = '上拉显示更多'
 						}else{
-							this.loadding = false
-							this.pullUpOn = false
-							this.nomoreText = '已至底部'
+							if(orderItem.orderList.length < 2){
+								this.pullUpOn = true
+							}else{
+								this.pullUpOn = false
+								this.nomoreText = '已至底部'
+							}
 						}
 					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
+						this.$util.msg(error.msg,2000);
 					})
-				})	
+				}, 600);	
+			}, 
+			getOnReachBottomData(index){//上拉加载
+				this.pageNum += 1
+				this.SellerService.GetSellerClubOrderList(
+					{
+						listType:index,
+						clubId:this.clubId,
+						orderSubmitType:this.screenTab,
+						serviceProviderId:this.serviceProviderId,
+						pageNum:this.pageNum,
+						pageSize:this.pageSize,
+					}
+				).then(response =>{
+					let orderItem = this.orderTabBar[index];
+					let data = response.data
+					this.hasNextPage = data.hasNextPage;
+					orderItem.orderList = orderItem.orderList.concat(data.list)
+					this.pullFlag = false;// 防上拉暴滑
+					setTimeout(()=>{this.pullFlag = true;},500)
+					if(this.hasNextPage){
+						this.pullUpOn = false
+						this.nomoreText = '上拉显示更多'
+					}else{
+						this.loadding = false
+						this.pullUpOn = false
+						this.nomoreText = '已至底部'
+					}
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000)
+				})
 			},
 			scrolltolower() {
 				if(this.hasNextPage){
@@ -326,7 +392,7 @@
 				switch(data.type){
 					case 'query':
 						this.isModalLayer = true;
-						this.$api.navigateTo('/pages/user/order/order-logistics?orderID='+data.orderId)
+						this.$api.navigateTo('/pages/user/order/order-logistics?orderId='+data.orderId)
 						break
 					case 'delete':
 						this.handOrderDetele(data.orderId);
@@ -342,28 +408,51 @@
 						break		
 				}
 			},
-			handOrderAgain(id){
-				this.aganOrderID = id;
-				this.SellerService.SellerCreateOrderAgain({orderId:this.aganOrderID,userId:this.userID,confirmFlag:0}).then(res =>{
+			handOrderAgain(orderId){// 再来一单
+				this.aganOrderId = orderId;
+				this.SellerService.SellerCreateOrderAgain(
+					{
+						confirmFlag:0,	
+						orderId:this.aganOrderId,
+						serviceProviderId:this.serviceProviderId
+					}
+				).then(res =>{
 					if(res.code==0){
-						this.$api.setStorage('orderUserInfo',{clubID:res.data.clubId,againBuyProductIds:res.data.againBuyProductIds,userID:res.data.userId})
+						this.$api.setStorage('orderUserInfo',{clubID:res.data.clubId,againBuyProductIds:res.data.againBuyProductIds})
 						this.$api.navigateTo('/pages/seller/cart/cart');
 					}
 				}).catch(error =>{
 					if(error.code== -3){
-						this.showAgan = true;
-						this.promptitle = error.msg;
-						this.failList = error.data;
+						this.showAgan = true
+						this.promptitle = error.msg
+						this.failList = error.data
 					}else if(error.code== -2){
 						this.$util.modal('',error.msg,'确定','',false,() =>{})
 					}else{
 						this.$util.msg(error.msg,2000)
 					}
-					})
+				})
+			},
+			closeBtn(){//
+				this.showAgan = false;
+			},
+			cancelBtn(){// 再来一单弹窗
+				this.SellerService.SellerCreateOrderAgain(
+					{
+						serviceProviderId:this.serviceProviderId,
+						orderId:this.aganOrderId,
+						confirmFlag:1,
+					}
+				).then(res =>{
+					if(res.code==0){
+						this.$api.navigateTo('/pages/seller/cart/cart');
+						this.showAgan = false;
+					}
+				})
 			},
-			handOrderConfirm (id){//确认订单
+			handOrderConfirm (orderId){//确认订单
 				this.$util.modal('提示','确认此订单？','确定','取消',true,() =>{
-					this.OrderService.AffirmOrder({orderID:id}).then(response =>{
+					this.OrderService.AffirmOrder({orderId:orderId}).then(response =>{
 						this.$util.msg(response.msg,2000,true,'success');
 						setTimeout(() => {
 							this.getOrderDatainit(this.currentTab)
@@ -373,9 +462,9 @@
 					})
 				})
 			},
-			handOrderDetele(id){//删除订单
+			handOrderDetele(orderId){//删除订单
 				this.$util.modal('提示','确认删除该订单吗？','确定','取消',true,() =>{
-					this.OrderService.DeleteOrder({orderID:id}).then(response =>{
+					this.OrderService.DeleteOrder({orderId:orderId}).then(response =>{
 						this.$util.msg(response.msg,2000,true,'success');
 						setTimeout(() => {
 							this.getOrderDatainit(this.currentTab)
@@ -385,9 +474,9 @@
 					})
 				})
 			},
-			handCenceConfirm(id){//取消订单
+			handCenceConfirm(orderId){//取消订单
 				this.$util.modal('提示','确认取消该订单吗？','确定','取消',true,() =>{
-					this.OrderService.CancelOrder({orderID:id}).then(response =>{
+					this.OrderService.CancelOrder({orderId:orderId}).then(response =>{
 						this.$util.msg(response.msg,2000,true,'success');
 						setTimeout(() => {
 							this.getOrderDatainit(this.currentTab)
@@ -407,7 +496,7 @@
 			    }
 				return {
 					title: '您有新的分享订单，快来查看吧~',
-					path: `/pages/user/order/order-sharelogin?orderID=${this.btnoRderID}&userID=${this.btnClubUserID}&serviceProviderId=${this.serviceProviderId}`,
+					path: `/pages/user/order/order-sharelogin?orderId=${this.btnoRderID}&userId=${this.btnClubUserID}&serviceProviderId=${this.serviceProviderId}`,
 					imageUrl:'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
 				}
 			},
@@ -460,7 +549,6 @@
 		},
 		onShow() {
 			this.isModalLayer = false;
-			this.getOrderDatainit(this.currentTab)
 		}
 	}
 </script>
@@ -833,4 +921,80 @@
 			}
 		}
 	}
+	.aganBj {
+	    position: fixed;
+	    left: 0;
+	    top: 0;
+	    bottom: 0;
+	    width: 100%;
+	    height: 100%;
+	    background-color: rgba(0, 0, 0, .5);
+	    z-index: 999999;
+		.alertAgan {
+		    position: absolute;
+		    top: 50%;
+		    left: 50%;
+		    transform: translate(-50%, -50%);
+		    width:580rpx;
+		    background-color: #fff;
+		    border-radius: 16rpx;
+			.title{
+				font-size: 30rpx;
+				color: #333333;
+				line-height: 42rpx;
+				padding: 30rpx;
+				display: block;
+			}
+			.goods{
+				padding: 0 30rpx;
+				.list{
+					padding: 10px 0;
+					border-bottom: 1rpx solid #e1e1e1;
+					margin: 10rpx 0;
+					.image-left{
+						width: 86rpx;
+						height: 86rpx;
+						border: 2rpx solid #e1e1e1;
+						border-radius: 6rpx;
+						display: inline-block;
+						vertical-align: middle;
+					}
+					.name-right{
+						display: inline-block;
+						width: 416rpx;
+						margin-left: 15rpx;
+						font-size: 26rpx;
+						color: #666666;
+						vertical-align: middle;
+						word-break: break-all;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						display: -webkit-inline-box;
+						-webkit-line-clamp: 2;
+						-webkit-box-orient: vertical;
+					}
+				}
+			}
+			.BtnAll{
+				margin-top: 30rpx;
+				.btn{
+				 	display: inline-block;
+					width: 290rpx;
+					height: 90rpx;
+					line-height: 90rpx;
+					text-align: center;
+					&.closebtn{
+						border-radius: 0px 0px 0px 10px;
+						color:#999999 ;
+						background: #efefef;
+					}
+					&.cancel{
+						border-radius: 0px 0px 8px 0px;
+						background: $btn-confirm;
+						color: #fff;
+					}
+				}
+			}
+		}
+	}
 </style>

pages/seller/order/order-list.vue

@@ -507,7 +507,7 @@
 			    }
 				return {
 					title: '您有新的订单，请点击查看~',
-					path: `/pages/user/order/order-sharelogin?orderId=${this.btnoRderID}&orderId=${this.btnClubUserID}&serviceProviderId=${this.serviceProviderId}`,
+					path: `/pages/user/order/order-sharelogin?orderId=${this.btnoRderID}&userId=${this.btnClubUserID}&serviceProviderId=${this.serviceProviderId}`,
 					imageUrl:'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
 				}
 			},

pages/seller/search/search-order.vue

@@ -5,7 +5,7 @@
 			<view class="search">
 				<view class="search-input">
 					<text class="iconfont icon-iconfonticonfontsousuo1"></text>
-					<input maxlength="20" focus type="text" value="" confirm-type="search" @focus="onFocus" @input="onShowClose" @confirm="subMitSearch()" placeholder="请输入商品关键词" v-model.trim="searchInputVal"/>
+					<input maxlength="20" focus type="text" value="" confirm-type="search" @focus="onFocus" @input="onShowClose" @confirm="subMitSearch()" placeholder="请输入商品关键词" v-model.trim="listQuery.searchWord"/>
 					<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
 				</view>
 				<view class="search-btn" @click="subMitSearch()">搜索</view>
@@ -33,9 +33,18 @@
 								<view class="order-title-name">{{order.clubName ? order.clubName : ''}}</view>
 								<view class="order-title-t">
 									<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</text>
-									<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</text>
-									<text class="bage-text tui-skeleton-fillet">订单号：{{order.orderNo}}({{order.orderID}})</text>
-									<image class="bage-icon" src="https://static.caimei365.com/app/img/icon/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
+									<text class="bage-auto tui-skeleton-fillet" 
+										  v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">
+										  自主
+									</text>
+									<text class="bage-text tui-skeleton-fillet">
+										订单号：{{order.orderNo}}({{order.orderId}})
+									</text>
+									<image class="bage-icon" 
+										   src="https://static.caimei365.com/app/img/icon/icon-type@3x.png" 
+										   mode="widthFix" 
+										   v-if="order.secondHandOrderFlag == 1">
+									</image>
 								</view>
 								<view class="order-title-b">
 									<view class="order-title-btxt tui-skeleton-fillet">下单时间：{{order.orderTime}}</view>
@@ -52,7 +61,7 @@
 								<view class="goods-item" v-for="(pros,prosIndex) in shop.orderProductList" :key="prosIndex">
 									<view class="goods-pros-t">
 										<view class="pros-img tui-skeleton-fillet">
-											<image :src="pros.productImage" alt="" />
+											<image :src="pros.image" alt="" />
 											<text class="tips" v-if="pros.productType ==2 || pros.productType ==1">赠品</text>
 										</view>
 										<view class="pros-product clearfix">
@@ -83,16 +92,21 @@
 								<view class="order-footer-top" v-if="order.discountFee!=0">经理折扣：¥{{ order.discountFee | NumFormat }}</view>
 								<view class="order-footer-bot">
 									<view class="count tui-skeleton-fillet">共{{order.productCount}}件商品</view>
-									<view class="money tui-skeleton-fillet" v-if="order.status==31||order.status==32||order.status==33">已支付：<label style="color:#f94b4b ;">¥{{ order.receiptAmount | NumFormat }}</label></view>
-									<view class="money tui-skeleton-fillet" v-else>待付总额：<label style="color:#f94b4b ;">¥{{ order.pendingPayments | NumFormat }}</label></view>
+									<view class="money tui-skeleton-fillet" v-if="order.status==31||order.status==32||order.status==33">
+										已支付：<label style="color:#f94b4b ;">¥{{ order.receiptAmount | NumFormat }}</label>
+									</view>
+									<view class="money tui-skeleton-fillet" v-else>
+										待付总额：<label style="color:#f94b4b ;">¥{{ order.pendingPayments | NumFormat }}</label>
+									</view>
 								</view>
 							</view>
 							<!-- 底部button -->
 							<order-button ref="orderButton" 
 										  :status="order.status" 
 										  :rechargeGoods = "order.rechargeGoods"
-										  :orderID="order.orderID" 
-										  :userID="order.userID" 
+										  :orderId="order.orderId" 
+										  :userId="order.userId" 
+										  :secondHandOrderFlag = "order.secondHandOrderFlag"
 										  @buttonConfirm="handButtonConfirm">
 							</order-button>
 						</view>
@@ -106,11 +120,27 @@
 		</view>
 		<!-- 分享弹窗 -->
 		<share-alert   v-if="isShareModal"
-					   :orderID="btnoRderID" 
+					   :orderId="btnoRderID" 
 					   @shareConfirm ='onShareAppMessage'>
 		</share-alert>
 		<!-- 透明模态层 -->
 		<modal-layer v-if='isModalLayer'></modal-layer>
+		<!-- 再来一单弹窗 -->
+		<view class="aganBj" v-show="showAgan">
+			<view class="alertAgan">
+				<text class="title">{{ promptitle }}</text>
+				<view class="goods">
+					<view class="list" v-for="(item,index) in failList"  :key="index">
+						<image class="image-left" :src="item.image"></image>
+						<view class="name-right">{{item.name}}</view>
+					</view>
+				</view>
+				<view class="BtnAll">
+					<view class="closebtn btn" @click="closeBtn">取消</view>
+					<view class="cancel btn" @click="cancelBtn">确定</view>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -121,8 +151,14 @@
 	import orderButton from '@/components/cm-module/orderDetails/sellerOrderButton' //按钮
 	import modalLayer from "@/components/modal-layer"
 	import empty from "@/components/empty";
-	import shareAlert from '@/components/cm-module/modelAlert/shareAlert' //分享弹窗
+	import shareAlert from '@/components/cm-module/modelAlert/sellerShareAlert'			 //分享弹窗
 	import authorize from '@/common/config/authorize.js'
+	const defaultListQuery = {
+			pageNum:1,			// 页码
+			pageSize:10,		// 每页条数
+			serviceProviderId:0,// 用户Id
+			searchWord:''		// 搜索关键词
+		};
 	export default {
 		components: {
 			orSearch,
@@ -134,9 +170,8 @@
 		},
 		data() {
 			return {
+				listQuery:Object.assign({}, defaultListQuery),
 				themeClass: 'block',
-				searchInputVal:'',
-				serviceProviderId:'',//协销ID
 				isShowClose:false,							//是否显示清空输入框图标
 				isSearchHistory:false,						//是都显示搜索历史
 				serachRecordList:[],
@@ -145,12 +180,10 @@
 				isShowEmpty:false,
 				windowHeight: '',
 				showSkeleton: true,
-				userID:0,
+				userId:0,
 				orderList: [],
 				btnClubUserID:0,
 				btnoRderID: 0, //点击按钮传入的的订单ID
-				pageNum: 1,	  //页数
-				pageSize: 10,  //条数
 				scrollTop: 0,
 				deteleType:'',
 				skeletonShow: true,
@@ -164,7 +197,11 @@
 				pullFlag: true,
 				navbarHeight:'',
 				nomoreText: '上拉显示更多',
-				scrollHeight:''
+				scrollHeight:'',
+				showAgan:false,
+				failList:[],  // 再来一单可购买商品
+				promptitle:'',
+				aganOrderId:0
 			}
 		},
 		onLoad() {
@@ -177,17 +214,18 @@
 		},
 		methods:{
 			subMitSearch() {
-				if (this.searchInputVal == '') {
+				if (this.listQuery.searchWord == '') {
 					this.$util.msg('请输入订单编号',2000);
 				}else{
 					this.commodityList =[]
 					this.getOrderDatainit()
 				}
 			},
-			initGetSerachRecord(){
-				this.$api.getComStorage('userInfo').then((resolve) =>{
-					this.userID = resolve.userId ? resolve.userId : 0
-					this.OrderService.SearchOrderHistory({userId:this.userID}).then(response =>{
+			async initGetSerachRecord(){
+					const userInfo = await this.$api.getStorage()
+					this.listQuery.serviceProviderId = userInfo.serviceProviderId ? userInfo.serviceProviderId : 0
+					this.userId = userInfo.userId ? userInfo.userId : 0
+					this.OrderService.SearchOrderHistory({userId:this.userId}).then(response =>{
 						this.serachRecordList = response.data
 						if(this.serachRecordList.length>0){
 							this.isSearchHistory = true
@@ -197,30 +235,29 @@
 					}).catch(error =>{
 						this.$util.msg(error.msg,2000)
 					})
-				})	
 			},
 			onShowClose () { //输入框失去焦点时触发
-				this.inputEmpty(this.searchInputVal)
+				this.inputEmpty(this.listQuery.searchWord)
 			},
 			onFocus () { //输入框获取焦点时触发
-				this.inputEmpty(this.searchInputVal)
+				this.inputEmpty(this.listQuery.searchWord)
 				this.initGetSerachRecord()
 			},
 			delInputText () { //清除输入框内容
-				this.searchInputVal = ''
+				this.listQuery.searchWord = ''
 				this.isShowClose = false
 				this.isShowWrapper = false
-				this.inputEmpty(this.searchInputVal)
+				this.inputEmpty(this.listQuery.searchWord)
 				this.initGetSerachRecord()
 			},
 			keywordsClick (item) {	//关键词搜索与历史搜索
-				this.searchInputVal = item;
+				this.listQuery.searchWord = item;
 				this.isShowClose = true;
 				this.subMitSearch();
 			},
 			confirmDetele () {//清空历史记录
 				this.$util.modal('提示','确定删除历史记录？','确定','取消',true,() =>{
-					this.OrderService.ClearOrderHistory({userId:this.userID}).then(response =>{
+					this.OrderService.ClearOrderHistory({userId:this.userId}).then(response =>{
 						this.$util.msg('删除记录成功',2000,true,'success')
 						this.serachRecordList=[]
 					}).catch(error =>{
@@ -242,16 +279,15 @@
 				 * @param：searchWord(关键词)
 				 * @param：serviceProviderId(用户ID)
 				 * @param：pageNum(页码数)
-				 * @param：pageSize(每页条数)
+				 * @param：listQuery.pageSize(每页条数)
 				 * @param：organizeID(全局变量组织ID)
 				 */ 
-				let params = {searchWord:this.searchInputVal,userId:this.userID,pageNum:1,pageSize:this.pageSize};
-				this.SellerService.getSellerOrderList(params).then(response =>{
+				this.SellerService.getSellerOrderList(this.listQuery).then(response =>{
 					this.isShowWrapper = true
 					this.showSkeleton = true
-					const _responseData = response.data.results;
-					if(_responseData && _responseData.length > 0){
-						let filrerData = _responseData.filter(item=>{
+					let data = response.data;
+					if(data.list && data.list.length > 0){
+						let filrerData = data.list.filter(item=>{
 							//添加不同状态下订单的表现形式
 							item = Object.assign(item, this.StateExpFormat(item.state));
 							return item;
@@ -260,7 +296,7 @@
 						filrerData.forEach(item=>{
 							this.orderList.push(item);
 						})
-						this.hasNextPage = response.data.hasNextPage;
+						this.hasNextPage = data.hasNextPage;
 						if(this.hasNextPage){
 							this.pullUpOn = false
 							this.nomoreText = '上拉显示更多'
@@ -281,12 +317,11 @@
 				})
 			}, 
 			getOnReachBottomData(index){//上拉加载
-				this.pageNum+=1
-				let params = {searchWord:this.searchInputVal,userId:this.userID,pageNum:this.pageNum,pageSize:this.pageSize}
-				this.SellerService.getSellerOrderList(params).then(response =>{
-					let resData = response.data.results
-					this.hasNextPage = response.data.hasNextPage;
-					this.orderList = this.orderList.concat(resData)
+				this.listQuery.pageNum+=1
+				this.SellerService.getSellerOrderList(this.listQuery).then(response =>{
+					let data = response.data
+					this.hasNextPage = data.hasNextPage;
+					this.orderList = this.orderList.concat(data.list)
 					this.pullFlag = false;// 防上拉暴滑
 					setTimeout(()=>{this.pullFlag = true;},500)
 					if(this.hasNextPage){
@@ -311,7 +346,7 @@
 			},
 			detail(order) {//订单详情跳转
 				this.isModalLayer = true;	
-				this.$api.navigateTo(`/pages/seller/order/order-details?type=seacrch&orderID=${order.orderID}&userId=${order.userID}`)
+				this.$api.navigateTo(`/pages/seller/order/order-details?type=seacrch&orderId=${order.orderId}&userId=${order.userId}`)
 			},
 			handButtonConfirm(data) {//获取点击
 				this.handShowAlert(data)
@@ -337,28 +372,51 @@
 						
 				}
 			},
-			handOrderAgain(id){
-				this.aganOrderID = id;
-				this.SellerService.SellerCreateOrderAgain({orderId:this.aganOrderID,userId:this.userID,confirmFlag:0}).then(res =>{
+			handOrderAgain(orderId){// 再来一单
+				this.aganOrderId = orderId;
+				this.SellerService.SellerCreateOrderAgain(
+					{
+						confirmFlag:0,	
+						orderId:this.aganOrderId,
+						serviceProviderId:this.listQuery.serviceProviderId
+					}
+				).then(res =>{
 					if(res.code==0){
-						this.$api.setStorage('orderUserInfo',{clubID:res.data.clubId,againBuyProductIds:res.data.againBuyProductIds,userID:res.data.userId})
+						this.$api.setStorage('orderUserInfo',{clubID:res.data.clubId,againBuyProductIds:res.data.againBuyProductIds})
 						this.$api.navigateTo('/pages/seller/cart/cart');
 					}
 				}).catch(error =>{
 					if(error.code== -3){
-						this.showAgan = true;
-						this.promptitle = error.msg;
-						this.failList = error.data;
+						this.showAgan = true
+						this.promptitle = error.msg
+						this.failList = error.data
 					}else if(error.code== -2){
 						this.$util.modal('',error.msg,'确定','',false,() =>{})
 					}else{
 						this.$util.msg(error.msg,2000)
 					}
-					})
+				})
+			},
+			closeBtn(){//
+				this.showAgan = false;
+			},
+			cancelBtn(){// 再来一单弹窗
+				this.SellerService.SellerCreateOrderAgain(
+					{
+						serviceProviderId:this.listQuery.serviceProviderId,
+						orderId:this.aganOrderId,
+						confirmFlag:1,
+					}
+				).then(res =>{
+					if(res.code==0){
+						this.$api.navigateTo('/pages/seller/cart/cart');
+						this.showAgan = false;
+					}
+				})
 			},
-			handOrderConfirm (id){//确认订单
+			handOrderConfirm (orderId){//确认订单
 				this.$util.modal('提示','确认此订单？','确定','取消',true,() =>{
-					this.OrderService.AffirmOrder({orderID:id}).then(response =>{
+					this.OrderService.AffirmOrder({orderId:orderId}).then(response =>{
 						this.$util.msg(response.msg,2000,true,'success');
 						setTimeout(() => {
 							this.getOrderDatainit()
@@ -368,9 +426,9 @@
 					})
 				})
 			},
-			handOrderDetele(id){//删除订单
+			handOrderDetele(orderId){//删除订单
 				this.$util.modal('提示','确认删除该订单吗？','确定','取消',true,() =>{
-					this.OrderService.DeleteOrder({orderID:id}).then(response =>{
+					this.OrderService.DeleteOrder({orderId:orderId}).then(response =>{
 						this.$util.msg(response.msg,2000,true,'success');
 						setTimeout(() => {
 							this.getOrderDatainit()
@@ -380,9 +438,9 @@
 					})
 				})
 			},
-			handCenceConfirm(id){//取消订单
+			handCenceConfirm(orderId){//取消订单
 				this.$util.modal('提示','确认取消该订单吗？','确定','取消',true,() =>{
-					this.OrderService.CancelOrder({orderID:id}).then(response =>{
+					this.OrderService.CancelOrder({orderId:orderId}).then(response =>{
 						this.$util.msg(response.msg,2000,true,'success');
 						setTimeout(() => {
 							this.getOrderDatainit()
@@ -398,7 +456,7 @@
 			    }
 				return {
 					title: '您有新的分享订单，快来查看吧~',
-					path: `/pages/user/order/order-sharelogin?orderID=${this.btnoRderID}&userID=${this.btnClubUserID}&serviceProviderId=${this.serviceProviderId}`,
+					path: `/pages/user/order/order-sharelogin?orderId=${this.btnoRderID}&userId=${this.btnClubUserID}&serviceProviderId=${this.serviceProviderId}`,
 					imageUrl:'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
 				}
 			},
@@ -915,4 +973,80 @@
 			}
 		}
 	}
+	.aganBj {
+	    position: fixed;
+	    left: 0;
+	    top: 0;
+	    bottom: 0;
+	    width: 100%;
+	    height: 100%;
+	    background-color: rgba(0, 0, 0, .5);
+	    z-index: 999999;
+		.alertAgan {
+		    position: absolute;
+		    top: 50%;
+		    left: 50%;
+		    transform: translate(-50%, -50%);
+		    width:580rpx;
+		    background-color: #fff;
+		    border-radius: 16rpx;
+			.title{
+				font-size: 30rpx;
+				color: #333333;
+				line-height: 42rpx;
+				padding: 30rpx;
+				display: block;
+			}
+			.goods{
+				padding: 0 30rpx;
+				.list{
+					padding: 10px 0;
+					border-bottom: 1rpx solid #e1e1e1;
+					margin: 10rpx 0;
+					.image-left{
+						width: 86rpx;
+						height: 86rpx;
+						border: 2rpx solid #e1e1e1;
+						border-radius: 6rpx;
+						display: inline-block;
+						vertical-align: middle;
+					}
+					.name-right{
+						display: inline-block;
+						width: 416rpx;
+						margin-left: 15rpx;
+						font-size: 26rpx;
+						color: #666666;
+						vertical-align: middle;
+						word-break: break-all;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						display: -webkit-inline-box;
+						-webkit-line-clamp: 2;
+						-webkit-box-orient: vertical;
+					}
+				}
+			}
+			.BtnAll{
+				margin-top: 30rpx;
+				.btn{
+				 	display: inline-block;
+					width: 290rpx;
+					height: 90rpx;
+					line-height: 90rpx;
+					text-align: center;
+					&.closebtn{
+						border-radius: 0px 0px 0px 10px;
+						color:#999999 ;
+						background: #efefef;
+					}
+					&.cancel{
+						border-radius: 0px 0px 8px 0px;
+						background: $btn-confirm;
+						color: #fff;
+					}
+				}
+			}
+		}
+	}
 </style>

pages/user/order/create-order.vue

@@ -204,11 +204,20 @@
 			}
 		},
 		onLoad(option){//商品数据
-			let data = JSON.parse(option.data);
-			console.log('infodata',data)
-			this.$api.getStorage().then((resolve) =>{
-				this.productParam.userId = this.cartParam.userId = this.postageParam.userId = resolve.userId ? resolve.userId : 0
-				this.confirmParam.clubId = resolve.clubId ? resolve.clubId : 0
+			this.initStorage(option)
+		},
+		filters:{
+			NumFormat(value) {//处理金额
+				return Number(value).toFixed(2)
+			},
+		},	
+		methods: {
+			async initStorage(option){
+				const data = JSON.parse(option.data)
+				const userInfo = await this.$api.getStorage()
+				console.log('infodata',data)
+				this.productParam.userId = this.cartParam.userId = this.postageParam.userId = userInfo.userId ? userInfo.userId : 0
+				this.confirmParam.clubId = userInfo.clubId ? userInfo.clubId : 0
 				if(option.type =='prodcut'){
 					this.confirmType = 1
 					this.productParam.productCount = data.data.productCount
@@ -220,14 +229,7 @@
 					this.productIds = this.cartParam.productIds = this.postageParam.productIds = data.data.productIds
 					this.CartCreateOrderInfo()
 				}
-			})
-		},
-		filters:{
-			NumFormat(value) {//处理金额
-				return Number(value).toFixed(2)
 			},
-		},	
-		methods: {
 			GetProductCreateOrderInfo(){// 商品立即购买确认订单数据初始化
 				this.OrderService.ProductCreateOrderInfo(this.productParam).then(response =>{
 					let data = response.data
@@ -239,8 +241,8 @@
 					this.totalCount = data.totalCount
 					this.allPrice = data.totalPrice
 					this.rechargeGoods = data.rechargeGoods
+					this.isCouponShow = true
 					if(this.couponList.length>0){
-						this.isCouponShow = true
 						this.couponAmount = data.couponList[0].couponAmount
 						this.confirmParam.clubCouponId = data.couponList[0].clubCouponId 
 					}
@@ -305,20 +307,24 @@
 				})
 			},
 			getAddressData(){//获取地址信息
-				this.$api.getStorage().then((resolve) => {
-					this.UserService.QueryAddressList({pageNum:1,pageSize:1,userId:resolve.userId}).then(response =>{
-						let data = response.data
-						this.isAddress = true
-						this.addressData = {}
-						if( data.list && data.list.length > 0 ){
-							this.confirmParam.addressId = data.list[0].addressId;
-							this.postageParam.townId = data.list[0].townId;
-							this.addressData = data.list[0];
-							this.getFreightData()
-						}else{
-							this.addressData = this.addressData
-						}
-					})
+				this.UserService.QueryAddressList(
+					{
+						pageNum:1,
+						pageSize:1,
+						userId:this.productParam.userId,
+					}
+				).then(response =>{
+					let data = response.data
+					this.isAddress = true
+					this.addressData = {}
+					if( data.list && data.list.length > 0 ){
+						this.confirmParam.addressId = data.list[0].addressId;
+						this.postageParam.townId = data.list[0].townId;
+						this.addressData = data.list[0];
+						this.getFreightData()
+					}else{
+						this.addressData = this.addressData
+					}
 				})
 			},
 			handChangeInputGoodsList(data){//对应供应商的留言信息

pages/user/order/order-sharelogin.vue

@@ -5,7 +5,7 @@
 			<view class="main-list clearfix">
 				<view class="main-list-item" v-for="(item, index) in productList" :key="index">
 					<view class="item-image">
-						<image :src="item.productImage" mode="scaleToFill"></image>
+						<image :src="item.image" mode="scaleToFill"></image>
 					</view>
 					<view class="item-mesage">
 						<view class="item-name">{{item.name}}</view>
@@ -54,35 +54,36 @@
 			if(e.serviceProviderId){
 				this.serviceProviderId = e.serviceProviderId
 			}
+			this.initQueryUser()
 		},
 		methods:{
-			initQueryUser(){
-				authorize.getCode('weixin').then(wechatcode =>{
-					let params ={
-							code:wechatcode,
-							orderId:this.orderId,
-							userId:this.userId,
-							shareCode:this.shareCode,
-							serviceProviderId:this.serviceProviderId
-						}
-					this.OrderService.OrderShareCode(params).then(response =>{
-						console.log(response.code)
-						if(response.code === 2){
-							this.$api.navigateTo(`/pages/seller/order/order-details?type=share&orderId=${this.orderId}`)
-						}else if(response.code === 0) {
-							console.log(response.data)
-							if(response.data == true){//同为会所运营人员查看订单详情
-								this.$api.navigateTo(`/pages/user/order/order-details?type=share&orderId=${this.orderId}`)
-							}else{//游客第二次查看订单详情
-								this.$api.redirectTo(`/pages/user/order/order-sharedetails?orderId=${this.orderId}&userId=${this.userId}`)
-							}
-						}else if(response.code === -2){
-							this.$util.modal('提示',response.msg,'确定','',false,() =>{})
-						}else{
-							console.log(response.msg);
-							this.getOrderCommodityData()
+			async initQueryUser(){
+				const code = await authorize.getCode('weixin')
+				this.OrderService.OrderShareCode(
+					{
+						code:code,
+						orderId:this.orderId,
+						userId:this.userId,
+						shareCode:this.shareCode,
+						serviceProviderId:this.serviceProviderId
+					}
+				).then(response =>{
+					console.log(response.code)
+					if(response.code === 2){
+						this.$api.navigateTo(`/pages/seller/order/order-details?type=share&orderId=${this.orderId}`)
+					}else if(response.code === 0) {
+						console.log(response.data)
+						if(response.data == true){//同为会所运营人员查看订单详情
+							this.$api.navigateTo(`/pages/user/order/order-details?type=share&orderId=${this.orderId}`)
+						}else{//游客第二次查看订单详情
+							this.$api.redirectTo(`/pages/user/order/order-sharedetails?orderId=${this.orderId}&userId=${this.userId}`)
 						}
-					})
+					}else if(response.code === -2){
+						this.$util.modal('提示',response.msg,'确定','',false,() =>{})
+					}else{
+						console.log(response.msg);
+						this.getOrderCommodityData()
+					}
 				})
 			},
 			getOrderCommodityData(){//查询订单商品信息s
@@ -107,7 +108,7 @@
 			}
 		},
 		onShow() {
-			this.initQueryUser()
+			
 		}
 	}
 </script>

services/ajax.env.js

@@ -4,8 +4,8 @@ if(process.env.NODE_ENV === 'development'){
     // URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
     // URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
     // URL_CONFIG = 'http://192.168.2.81:8008'
-    // URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
-    URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
+    URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
+    // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
     // URL_CONFIG = 'https://spi.caimei365.com'
 }else{ 
     // 生产环境

services/config.env.js

@@ -1,9 +1,9 @@
 let URL_CONFIG = ''
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
-    // URL_CONFIG = 'http://192.168.2.75:18002'	 //超超联调地址
+    URL_CONFIG = 'http://192.168.2.75:18002'	 //超超联调地址
     // URL_CONFIG = 'http://192.168.2.68:18002'	 //裴裴联调地址
-    URL_CONFIG = 'https://core-b.caimei365.com'
+    // URL_CONFIG = 'https://core-b.caimei365.com'
     // URL_CONFIG = 'https://core.caimei365.com'
 }else{
     // 生产环境

services/other.service.js

@@ -10,7 +10,12 @@ export default class OtherService {
 	 * 售后条款
 	 */
 	QuerySaveClause (data) {
-		return this.AjaxService.get({ url:'/seller/clause', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/order/club/clause', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 	/**
 	 * 正品联盟

services/sellse.service.js

@@ -167,7 +167,7 @@ export default class SellerService {
 	 *@param productCount:二手购买数量 
 	 */
 	GetSettlementBySencondProduct (data = {}) {
-		return this.AjaxService.post({ 
+		return this.AjaxService.get({ 
 			url:'/order/seller/second/settlement', 
 			data, 
 			isLoading: true ,
@@ -292,24 +292,22 @@ export default class SellerService {
 	 */
 	SellerSubmitRechargeOrder (data = {}) {
 		return this.AjaxService.post({ 
-			url:'/order/submit/rechargeOrder', 
+			url:'/order/submit/recharge', 
 			data, 
-			isLoading: true
+			isLoading: true,
+			isHost:true
 		})
 	}
 	/**
 	 *@协销帮机构下单提交订单
-	 *@param orderSource 2,//提交来源
-	 *@param clubUserId//机构UserID
-	 *@param cartType	//从购物车提交
-	 *@param serviceProviderId//帮下单协销ID
-	 *@param addressId//地址ID
-	 *@param orderInfo//商品信息
-	 *@param payInfo//订单信息
-	 *@param orderInvoice//发票信息
 	 */
 	SellerCreateOrderSubmit (data = {}) {
-		return this.AjaxService.post({ url:'/seller/order/submit', data, isLoading: true })
+		return this.AjaxService.post({ 
+			url:'/order/submit/generate', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 	// 协销购物车清空失效列表
 	SellerCartdelete (data = {}) {