commit -m 订单模块联调

components/cm-module/modelAlert/shareAlert.vue

@@ -24,7 +24,7 @@
 	export default{
 		name:'sharealert',
 		props:{
-			orderID:{
+			orderId:{
 				type:Number
 			}
 		},
@@ -34,11 +34,11 @@
 			}
 		},
 		created() {
-			this.getShareCode(this.orderID)
+			this.getShareCode(this.orderId)
 		},
 		methods:{
 			getShareCode(res){
-				this.OrderService.QueryOrderShareCode({orderID:res}).then(response =>{
+				this.OrderService.QueryOrderShareCode({orderId:res}).then(response =>{
 					this.shareCode = response.data
 					this.$parent.shareCode = this.shareCode;
 				}).catch(error =>{

components/cm-module/orderDetails/goodsList.vue

@@ -7,14 +7,19 @@
 					<view v-if="item.shopPromotion" class="floor-item-act">
 						<view class="floor-tags" @click.stop="clickPopupShow(item.shopPromotion)">{{item.shopPromotion.name}}</view>	
 					</view>
-					<view class="title-text" v-if="information.secondHandOrderFlag==1">{{item.shopName}}<label class="paymenttext" v-if="information.affirmPaymentFlag==1">已确认打款供应商</label></view>
-					<view class="title-text" v-else @click="goShophome(item.shopID)">{{item.shopName}}<label class="iconfont icon-jinrudianpu"></label></view> 
+					<view class="title-text" v-if="information.secondHandOrderFlag==1">{{item.shopName}}
+						<label class="paymenttext" v-if="information.affirmPaymentFlag==1">已确认打款供应商</label>
+					</view>
+					<view class="title-text" v-else @click="goShophome(item.shopId)">
+						{{item.shopName}}
+						<label class="iconfont icon-jinrudianpu"></label>
+					</view> 
 				</view>
 				<view class="productlist" v-for="(pros,idx) in item.orderProductList" :key="idx">
 					<view class="goods-pros-t " @click="details(pros)">
 						<view class="pros-left">
 							<view class="pros-img">
-								<image :src="pros.productImage" alt="" />
+								<image :src="pros.image" alt="" />
 								<text class="tips" v-if="pros.productType ==2 || pros.productType ==1">赠品</text>
 							</view>
 						</view>
@@ -22,7 +27,7 @@
 							<view class="producttitle">{{pros.name}}</view>
 							<view class="productspec product-view" v-if="pros.productCategory != 2">规格：{{pros.productUnit ? pros.productUnit : ''}}</view>
 							<view class="product-view">
-								<view class="view-num red">￥{{pros.price | NumFormat}}</view>
+								<view class="view-num red">￥{{ pros.price | NumFormat }}</view>
 							</view>
 							<view class="floor-item-act" v-if="pros.productPromotion!=null" >
 								<view v-if="PromotionsFormat(pros.productPromotion)" class="floor-tags" @click.stop="clickPopupShow(pros.productPromotion)">

components/cm-module/orderDetails/invoiceTent.vue

@@ -69,7 +69,7 @@
 		},
 		methods:{
 			initData(res) {
-				if(res == null || res.type == '0'){
+				if(res == null || res.type == 0){
 					this.isEmpty = true
 				}else{
 					this.isEmpty = false

components/cm-module/orderDetails/orderAddress.vue

@@ -5,18 +5,18 @@
 		 	<view class="address-content">
 				<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">
 							<text class="iconfont icon-shouhuodizhi"></text>
 						</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>

components/cm-module/orderDetails/orderButton.vue

@@ -2,7 +2,7 @@
 	<view class="button-template" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
 		<!-- 底部按钮 -->
 		<view class="button-content">
-			<view class="btn btn-payment" v-if="order.affirmPaymentFlag=='00'" @click.stop="btnConfirm('payment',order)">确认打款<text>供应商</text></view>
+			<view class="btn btn-payment" v-if="order.affirmPaymentFlag == 10" @click.stop="btnConfirm('payment',order)">确认打款<text>供应商</text></view>
 			<view class="btn btn-confirm" v-if="btnState.isConfirmation" @click.stop="btnConfirm('confirmation',order)">确认订单</view>
 			<view class="btn btn-pay" v-if="btnState.isPay" @click.stop="btnConfirm('pay',order)">付款</view>
 			<view class="btn btn-share" @click.stop="onShareCode">

components/cm-module/orderDetails/orderInformation.vue

@@ -4,61 +4,93 @@
 		 <view class="information-content">
 			<view class="information-view title">
 				<view class="view-num">
-					<view class="bage-text">订单编号：<label class="label">{{orderData.orderNo =='undefined' ? '' : orderData.orderNo}}</label></view>
+					<view class="bage-text">
+						订单编号：<label class="label">{{orderData.orderNo ? orderData.orderNo : '' }}</label>
+					</view>
 				</view>
 			</view>
 			<view class="information-view same">
-				<view class="view-num">订单总额：<label class="label">￥{{ orderData.payTotalFee =='undefined' ? '' : orderData.payTotalFee | NumFormat }}</label></view>
+				<view class="view-num">
+					订单总额：<label class="label">￥{{ orderData.payTotalFee ? (orderData.payTotalFee | NumFormat) : '0.00' }}</label>
+				</view>
 			</view>
 			<view class="information-view">
 				<view class="view-num bold">
-					订单标识：<label class="label">{{ orderData.orderMark =='undefined' ? '' : orderData.orderMark }}</label>
+					订单标识：<label class="label">{{ orderData.orderMark ? orderData.orderMark : '' }}</label>
 					<text class="clipboard" @click="clipboard(orderData.orderMark)">复制</text>
 				</view>
 			</view>
 			<view class="information-view same">
-				<view class="view-num">待付金额：<text class="red">￥{{ orderData.pendingPayments =='undefined' ? '0.00' : orderData.pendingPayments | NumFormat }}</text></view>
+				<view class="view-num">
+					待付金额：<text class="red">￥{{ orderData.pendingPayments ? (orderData.pendingPayments | NumFormat) : '0.00' }}</text>
+				</view>
 				<view class="view-man"></view>
 			</view>
 			<template v-if="openShowflag">
 				<view class="information-view">
-					<view class="view-num time">下单时间：<label class="label">{{ orderData.orderTime =='undefined' ? '' : orderData.orderTime }}</label></view>
+					<view class="view-num time">
+						下单时间：<label class="label">{{ orderData.orderTime ? orderData.orderTime : '' }}</label>
+					</view>
 					<!-- <view class="view-type">{{ orderData.status | TextFormat }}</view> -->
 				</view>
 				<view class="information-view same">
-					<view class="view-num">余额抵扣：<label class="label">￥{{ orderData.balancePayFee =='undefined' ? '' : orderData.balancePayFee | NumFormat}}</label></view>
+					<view class="view-num">
+						余额抵扣：<label class="label">￥{{ orderData.balancePayFee ? (orderData.balancePayFee | NumFormat) : '0.00' }}</label>
+					</view>
 				</view>
 				<view class="information-view ">
-					<view class="view-num" v-if="orderData.freePostFlag == '0'">运费：<label class="label">包邮</label></view>
-					<view class="view-num" v-if="orderData.freePostFlag == '-1'">运费：<label class="label">到付</label></view>
-					<view class="view-num" v-if="orderData.freePostFlag == '1'">运费：<label class="label">￥{{ orderData.freight | NumFormat}}</label></view>
+					<view class="view-num" v-if="orderData.postageFlag == 0">
+						运费：<label class="label">包邮</label>
+					</view>
+					<view class="view-num" v-if="orderData.postageFlag == -1">
+						运费：<label class="label">到付</label>
+					</view>
+					<view class="view-num" v-if="orderData.postageFlag == 1">
+						运费：<label class="label">￥{{ orderData.postage | NumFormat}}</label>
+					</view>
 				</view>
-				<view class="information-view same" v-show="orderData.userBeans>0">
-					<view class="view-man" >采美豆抵用运费：<label class="label">{{ orderData.userBeans }}</label></view>
+				<view class="information-view same" v-if="orderData.userBeans>0">
+					<view class="view-man" >
+						采美豆抵用运费：<label class="label">{{ orderData.userBeans }}</label>
+					</view>
 				</view>
-				<view class="information-view" v-show="orderData.discountFee>0">
-					<view class="view-num">经理折扣：<label class="label">￥{{ orderData.discountFee =='undefined' ? '' : orderData.discountFee | NumFormat}}</label></view>
+				<view class="information-view" v-if=" orderData.discountFee && orderData.discountFee>0">
+					<view class="view-num">
+						经理折扣：<label class="label">￥{{ orderData.discountFee ? (orderData.discountFee | NumFormat) : '0.00' }}</label>
+					</view>
 				</view>
-				<view class="information-view same" v-show="orderData.promotionFullReduction>0">
-					<view class="view-man" >促销满减：<label class="label">￥{{ orderData.promotionFullReduction | NumFormat}}</label></view>
+				<view class="information-view same" v-if="orderData.promotionFullReduction && orderData.promotionFullReduction>0">
+					<view class="view-man" >
+						促销满减：<label class="label">￥{{ orderData.promotionFullReduction | NumFormat}}</label>
+					</view>
 				</view>
-				<view class="information-view" v-show="orderData.couponAmount>0">
-					<view class="view-man" >优惠券：<label class="label">￥{{ orderData.couponAmount | NumFormat}}</label></view>
+				<view class="information-view" v-if="orderData.couponAmount && orderData.couponAmount>0">
+					<view class="view-man">
+						优惠券：<label class="label">￥{{ orderData.couponAmount | NumFormat}}</label>
+					</view>
 				</view>
-				<view class="information-view same" v-show="(orderData.presentCount + orderData.promotionalGiftsCount)>0">
-					<view class="view-man">赠品总数：<label class="label">{{ orderData.presentCount + orderData.promotionalGiftsCount}}</label></view>
+				<view class="information-view same" v-if="(orderData.presentCount + orderData.promotionalGiftsCount)>0">
+					<view class="view-man">
+						赠品总数：<label class="label">{{ orderData.presentCount + orderData.promotionalGiftsCount}}</label>
+					</view>
 				</view>
 				<view class="information-view">
-					<view class="view-man">应付总额：<label class="red">￥{{ orderData.payableAmount =='undefined' ? '0.00' : orderData.payableAmount | NumFormat }}</label></view>
+					<view class="view-man">
+						应付总额：<label class="red">￥{{ orderData.payableAmount ? (orderData.payableAmount | NumFormat) : '0.00' }}</label>
+					</view>
 				</view>
 				<view class="information-view same">
-					<view class="view-num">已支付：<label class="red">￥{{ orderData.receiptAmount == null ? '0.00' : orderData.receiptAmount | NumFormat }}</label></view>
+					<view class="view-num">
+						已支付：<label class="red">￥{{ orderData.receiptAmount ? (orderData.receiptAmount | NumFormat) : '0.00' }}</label>
+					</view>
 					<view class="view-man"></text></view>
 				</view>
 			</template>
 		 </view>
 		 <view class="openinfo" v-if="infoflag">
-		 	<view class="btnInfo" @click="openShow">查看更多<label class="iconfont icon-xiangxiajiantou"></label></view>
+		 	<view class="btnInfo" @click="openShow">
+				查看更多<label class="iconfont icon-xiangxiajiantou"></label>
+			</view>
 		 </view>
 	</view>
 </template>
@@ -75,7 +107,6 @@
 		data() {
 			return{
 				orderData:'',
-				freePostFlag:'',
 				openShowflag:false,
 				infoflag:true
 			}

components/cm-module/orderDetails/orderListButton.vue

@@ -2,10 +2,10 @@
 	<view class="button-template">
 		<!-- 底部按钮 -->
 		<view class="button-content">
-			<view class="btn btn-payment" v-if="order.affirmPaymentFlag=='00'" @click.stop="btnConfirm('payment',order)">确认打款<text>供应商</text></view>
+			<view class="btn btn-payment" v-if="order.affirmPaymentFlag == 10" @click.stop="btnConfirm('payment',order)">确认打款<text>供应商</text></view>
 			<view class="btn btn-pay" v-if="btnState.isPay" @click.stop="btnConfirm('pay',order)">付款</view>
 			<view class="btn btn-confirm" v-if="btnState.isConfirmation" @click.stop="btnConfirm('confirmation',order)">确认订单</view>
-			<view class="btn btn-share"  @click.stop="onShareCode(order.orderID)">分享订单</view>
+			<view class="btn btn-share"  @click.stop="onShareCode(order.orderId)">分享订单</view>
 			<view class="btn btn-cancel" v-if="btnState.isCancel" @click.stop="btnConfirm('cancel',order)">取消订单</view>
 			<!-- <view class="btn btn-delete" v-if="btnState.isDelete" @click.stop="btnConfirm('delete',order)">删除订单</view> -->
 			<view class="btn btn-query" v-if="btnState.isQuery && order.secondHandOrderFlag!=1" @click.stop="btnConfirm('query',order)">查看物流</view>
@@ -99,7 +99,7 @@
 			btnConfirm(type,order){
 				let data = {
 						type:type,
-						orderId:order.orderID,
+						orderId:order.orderId,
 						order:order
 					}
 				this.$emit('buttonConfirm',data)

pages.json

@@ -569,12 +569,6 @@
                     }
                 },
                 {
-                    "path": "activity/meobohui",
-                    "style": {
-                        "navigationBarTitleText": "美博会",
-                        "enablePullDownRefresh": true
-                    }
-                }, {
                     "path": "activity/couponExp",
                     "style": {
                         "navigationBarTitleText": "优惠券介绍",
@@ -602,20 +596,6 @@
                         "enablePullDownRefresh": true
                     }
                 },
-                {
-                    "path": "activity/meobohui-booth",
-                    "style": {
-                        "navigationBarTitleText": "展位图",
-                        "enablePullDownRefresh": true
-                    }
-                },
-                {
-                    "path": "activity/meobohui-supplier",
-                    "style": {
-                        "navigationBarTitleText": "参展商",
-                        "enablePullDownRefresh": true
-                    }
-                },
                 {
                     "path": "article/page",
                     "style": {

pages/h5/activity/meobohui-booth.vue

@@ -1,168 +0,0 @@
-<template>
-	<view class="container home clearfix">
-		<!-- 展位图 -->
-		<view class="container-page clearfix">
-			<view class="tui-group-list">
-				<view class="floor-item-booth" v-for="(booths,index) in boothList" :key="index"  @click="previewImg(index)">
-					<view class="floor-item-booth-image">
-						<image :src="booths.image" class="floor-item-image" mode="" ></image>
-					</view>
-					<view class="floor-item-text">
-						<view class="floor-item-p one">{{booths.name}}</view>
-						<view class="floor-item-p two">展位号：{{booths.num}}</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<!-- 侧边 -->
-		<scroll-top :isScrollTop="isScrollTop" :bottom="50"></scroll-top>
-	</view>
-</template>
-
-<script>
-	import authorize from '@/common/config/authorize.js'
-	import pageFloor from '@/components/cm-module/homeIndex/pageFloor.vue'
-	import supplierList from '@/components/cm-module/homeIndex/supplierList.vue'
-	import { mapState,mapMutations} from 'vuex';
-	var isPreviewImg;
-	export default {
-		components:{
-			pageFloor,
-			supplierList,
-		},
-		data() {
-			return {
-				userID:0,
-				current:0,
-				mode:'round',
-				modallayer:false,
-				isLogin:false,
-				skeletonShow: true,
-				boothList:[
-					{image:'http://static.caimei365.com/app/meibohui/meibo_img_02.jpg',name:'GMS(可现场体验)',num:'B区 12.2馆C31'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_img_03.jpg',name:'优斐斯',num:'A区 4.2号馆A31'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_img_04.jpg',name:'唯美概念(可现场体验)',num:'B区 12.2馆B41'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_img_05.jpg',name:'美生美(可现场体验)',num:'B区 12.2馆B39'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_img_06.jpg',name:'品辉(可现场体验)',num:'B区 11.2馆H49'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_img_07.jpg',name:'和创元(可现场体验)',num:'B区 11.2馆F41'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_img_08.jpg',name:'瑞恺迪(可现场体验)',num:'B区 12.2 馆E40'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_img_09.jpg',name:'塑美颜(可现场体验)',num:'B区11.2 D41'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_img_10.jpg',name:'塑美颜(可现场体验)',num:'B区13.2 K29'}
-				],				
-				productImage:[],
-				isScrollTop:false,
-
-			}
-		},
-		onLoad() {
-			//处理商品图片列表
-			this.boothList.forEach(item =>{
-				this.productImage.push(item.image);
-			})
-		},
-		computed: {
-			...mapState(['hasLogin','userInfo','identity','isActivity'])
-		},
-		methods: {
-			...mapMutations(['login','logout']),
-			previewImg (index) {//顶部商品图片预览
-				isPreviewImg = true
-				let previewUrls = this.productImage
-				uni.previewImage({
-					current: index, 	//图片索引
-					urls: previewUrls, //必须是http图片，本地图片无效
-					longPressActions:''
-				})
-			},
-		},
-		onPageScroll(e){//实时获取到滚动的值
-			if(e.scrollTop>400){
-				this.isScrollTop = true
-			}else{
-				this.isScrollTop = false
-			}	
-		},
-		onPullDownRefresh() {//下拉刷新
-			uni.stopPullDownRefresh()
-		},
-		onShareAppMessage(res){//分享转发
-			if (res.from === 'button') {
-		      // 来自页面内转发按钮
-		    }
-			return {
-			  title: '生美医美正品采购服务平台',
-			  path: '/pages/h5/activity/meobohui',
-			  imageUrl:'https://static.caimei365.com/app/img/bg/min-banner.jpg'
-			}
-		},
-		onShow(){
-			
-		}
-	}
-</script>
-
-<style lang="scss">
-	page{
-		background-color: #F7F7F7;
-	}
-	.container-page{
-		background-color: #F7F7F7;
-		width: 100%;
-		height: auto;
-		box-sizing: border-box;
-		padding:24rpx;
-		float: left;
-	}
-	.tui-group-list{
-		width: 100%;
-		height: auto;
-		.floor-item-booth{
-			width: 339rpx;
-			height: 382rpx;
-			float: left;
-			margin-right: 24rpx;
-			margin-bottom: 24rpx;
-			background-color: #FFFFFF;
-			border-radius: 16rpx;
-			&:nth-child(2n){
-				margin-right: 0;
-			}
-			.floor-item-booth-image{
-				width: 100%;
-				height: 240rpx;
-				.floor-item-image{
-					width: 100%;
-					height: 100%;
-					display: block;
-					border-radius: 16rpx 16rpx 0 0;
-				}
-			}
-			.floor-item-text{
-				width: 100%;
-				height: 142rpx;
-				box-sizing: border-box;
-				padding: 31rpx 16rpx;
-				.floor-item-p{
-					width: 100%;
-					line-height: 40rpx;
-					text-align: left;
-					font-size: $font-size-24;
-					white-space: nowrap;
-					text-overflow: ellipsis;
-					overflow: hidden;
-					&.one{
-						color: #333333;
-					}
-					&.two{
-						color: #999999;
-					}
-				}
-			}
-		}
-	}
-	.container-section{
-		width: 100%;
-		height: auto;
-		background-color: #F7F7F7;
-	}
-</style>

pages/h5/activity/meobohui-supplier.vue

@@ -1,134 +0,0 @@
-<template>
-	<view class="container home clearfix">
-		<!-- 参展商 -->
-		<view class="container-page clearfix">
-			<view class="tui-group-list">
-				<view class="floor-item-sup" v-for="(supps,index) in supplierList2" :key="index" @click="goSupplierPath(supps.type,supps.id,supps.keyWord)">
-					<image :src="supps.image" class="floor-item-image" mode=""></image>
-				</view>
-			</view>
-		</view>
-		<!-- 侧边 -->
-		<scroll-top :isScrollTop="isScrollTop" :bottom="50"></scroll-top>
-	</view>
-</template>
-
-<script>
-	import authorize from '@/common/config/authorize.js'
-	import pageFloor from '@/components/cm-module/homeIndex/pageFloor.vue'
-	import supplierList from '@/components/cm-module/homeIndex/supplierList.vue'
-	import { mapState,mapMutations} from 'vuex';
-	export default {
-		components:{
-			pageFloor,
-			supplierList,
-		},
-		data() {
-			return {
-				userID:0,
-				current:0,
-				mode:'round',
-				modallayer:false,
-				isLogin:false,
-				skeletonShow: true,
-				userIdentity:'',
-				supplierList2:[
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_01.jpg',id:1172,type:1,keyWord:''},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_02.jpg',id:8888,type:2,keyWord:'INDIBA'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_03.jpg',id:8888,type:2,keyWord:'维锶'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_04.jpg',id:8888,type:2,keyWord:'imperium'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_05.jpg',id:8888,type:2,keyWord:'易路达'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_06.jpg',id:8888,type:2,keyWord:'ACTIVE'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_07.jpg',id:1201,type:1,keyWord:''},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_09.jpg',id:1285,type:1,keyWord:''},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_10.jpg',id:1206,type:1,keyWord:''},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_11.jpg',id:1258,type:1,keyWord:''},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_12.jpg',id:1184,type:1,keyWord:''},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_13.jpg',id:1193,type:1,keyWord:''},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_14.jpg',id:1292,type:1,keyWord:''},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_15.jpg',id:1201,type:1,keyWord:''},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_16.jpg',id:1217,type:1,keyWord:''}
-				],
-				isScrollTop:false
-			}
-		},
-		onLoad() {
-			
-		},
-		computed: {
-			...mapState(['hasLogin','userInfo','identity','isActivity'])
-		},
-		methods: {
-			...mapMutations(['login','logout']),
-			goSupplierPath(type,value,keyWord){
-				if(type == 1){
-					this.$api.navigateTo('/pages/supplier/user/my-shop?shopId='+value)
-				}else if(type == 2){
-					this.$api.navigateTo(`/pages/search/search?keyWord=${keyWord}`)
-				}
-			},
-		},
-		onPageScroll(e){//实时获取到滚动的值
-			if(e.scrollTop>400){
-				this.isScrollTop = true
-			}else{
-				this.isScrollTop = false
-			}	
-		},
-		onPullDownRefresh() {//下拉刷新
-			this.getHomeInformation()
-			uni.stopPullDownRefresh()
-		},
-		onShareAppMessage(res){//分享转发
-			if (res.from === 'button') {
-		      // 来自页面内转发按钮
-		    }
-			return {
-			  title: '生美医美正品采购服务平台',
-			  path: '/pages/h5/activity/meobohui',
-			  imageUrl:'https://static.caimei365.com/app/img/bg/min-banner.jpg'
-			}
-		},
-		onShow(){
-			
-		}
-	}
-</script>
-
-<style lang="scss">
-	page{
-		background-color: #F7F7F7;
-	}
-	.container-page{
-		background-color: #F7F7F7;
-		width: 100%;
-		height: auto;
-		box-sizing: border-box;
-		padding: 24rpx;
-		float: left;
-	}
-	.tui-group-list{
-		width: 100%;
-		height: auto;
-		.floor-item-sup{
-			width: 162rpx;
-			height: 162rpx;
-			float: left;
-			margin-right: 18rpx;
-			margin-bottom: 24rpx;
-			&:nth-child(4n){
-				margin-right: 0;
-			}
-			.floor-item-image{
-				width: 100%;
-				height: 100%;
-				display: block;
-			}
-		}
-	}
-	.container-section{
-		width: 100%;
-		height: auto;
-		background-color: #F7F7F7;
-	}
-</style>

pages/h5/activity/meobohui.vue

@@ -1,739 +0,0 @@
-<template>
-	<view class="container home clearfix">
-		<!-- top -->
-		<view class="container-top"><image src="http://static.caimei365.com/app/meibohui/banner.jpg" mode=""></image></view>
-		<view class="container-activ" @click="LookMyCouponDetils"><image src="http://static.caimei365.com/app/meibohui/meibo_coupon_02.png" mode=""></image></view>
-		<!-- VIP品牌线上馆 -->
-		<view class="container-page clearfix">
-			<view class="tui-group-name">
-				<view class="tui-group-title">
-					<view class="tui-group-l">VIP品牌线上馆</view>
-				</view>
-				<view class="tui-sub__desc">高新科技品牌尽在采美</view>
-			</view>
-			<view class="tui-group-list">
-				<view class="floor-item-vip" v-for="(vips,index) in supplierList1" :key="index">
-					<image :src="vips.image" class="floor-item-image" mode=""></image>
-				</view>
-			</view>
-		</view>
-		<!-- 参展商 -->
-		<view class="container-page clearfix">
-			<view class="tui-group-name">
-				<view class="tui-group-title">
-					<view class="tui-group-l">参展商</view>
-					<view class="tui-group-r" @click="NavToDetailPage('/pages/h5/activity/meobohui-supplier')">
-						<text>更多</text>
-						<text class="iconfont icon-xiayibu"></text>
-					</view>
-				</view>
-				<view class="tui-sub__desc">美博会采美合作品牌</view>
-			</view>
-			<view class="tui-group-list">
-				<view class="floor-item-sup" v-for="(supps,index) in supplierList2" :key="index" @click="goSupplierPath(supps.type,supps.id,supps.keyWord)">
-					<image :src="supps.image" class="floor-item-image" mode=""></image>
-				</view>
-			</view>
-		</view>
-		<!-- 现场直击 -->
-		<view class="container-page clearfix">
-			<view class="tui-group-name">
-				<view class="tui-group-title">
-					<view class="tui-group-l">现场直击</view>
-				</view>
-				<view class="tui-sub__desc">采美云逛展带你体验另样平行世界</view>
-			</view>
-			<view class="tui-group-scroll clearfix">
-				<scroll-view scroll-x>
-					<view class="floor-item__list">
-						<view class="floor-item__live" v-for="(lives,index) in liveList" :key="index" @click="LiveGoPathPros(lives)">
-							<view class="floor-item__image">
-								<image :src="lives.image" mode=""></image>
-							</view>
-							<view class="floor-item__text">{{lives.liveTitle}}</view>
-						</view>
-					</view>
-				</scroll-view>
-			</view>
-		</view>
-		<!-- 展位图 -->
-		<view class="container-page clearfix">
-			<view class="tui-group-name">
-				<view class="tui-group-title">
-					<view class="tui-group-l">展位图</view>
-					<view class="tui-group-r" @click="NavToDetailPage('/pages/h5/activity/meobohui-booth')">
-						<text>更多</text>
-						<text class="iconfont icon-xiayibu"></text>
-					</view>
-				</view>
-				<view class="tui-sub__desc">广州美博会采美合作展位</view>
-			</view>
-			<view class="tui-group-list">
-				<view class="floor-item-booth" v-for="(booths,index) in boothList" :key="index" @click="previewImg(index)">
-					<view class="floor-item-booth-image">
-						<image :src="booths.image" class="floor-item-image" mode=""></image>
-					</view>
-					<view class="floor-item-text">
-						<view class="floor-item-p one">{{booths.name}}</view>
-						<view class="floor-item-p two">展位号：{{booths.num}}</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<!-- 供应商商品楼层 -->
-		<view class="container-page clearfix" v-for="(floors,index) in flootData" :key="index">
-			<view class="tui-group-name">
-				<view class="tui-group-title">
-					<view class="tui-group-l">{{ floors.shopName }}</view>
-					<view class="tui-group-r" v-if="floors.shopId != 1161" @click="goSupplierPath(floors.type,floors.shopId,floors.keyWord)">
-						<text>更多</text>
-						<text class="iconfont icon-xiayibu"></text>
-					</view>
-				</view>
-				<view class="tui-sub__desc">{{ floors.marke }}</view>
-			</view>
-			<view class="tui-group-good__scroll clearfix">
-				<scroll-view scroll-x>
-					<view class="floor-good__list">
-						<view class="floor-item ad_04 clearfix" v-for="(product, idx) in floors.productSet" :key="idx" @click.stop="RouterDetailPage(product.productID)">
-							<image class="item-img tui-skeleton-fillet" :src="product.mainImage" mode="aspectFill"></image>
-							<view class="floor-item-content">
-								<view class="title tui-skeleton-rect">
-									<text class="mclap-tag">美博会</text>
-									<text class="mclap">{{product.name}}</text>
-								</view>
-								<view class="floor-item-price">
-									<view class="floor-item-act">
-										<template v-if="userIdentity === 3">
-											<template v-if="product.actStatus===1">
-												<view class="floor-tags" v-if="PromotionsFormat(product.promotions)">
-													{{product.promotions.name}}
-													<text v-if="hasLogin && product.price1TextFlag != 1 && product.shopID == shopId">:￥{{product.retailPrice | NumFormat}}</text>
-												</view>
-												<view class="floor-tags" v-else>{{product.promotions.name}}</view>	
-											</template>
-											<template v-if="product.actStatus ===0  &&  product.ladderPriceFlag===1">
-												<view class="floor-tags">阶梯价格</view>	
-											</template>
-										</template>	
-										<template v-else>
-											<template v-if="product.actStatus===1">
-												<view class="floor-tags" v-if="PromotionsFormat(product.promotions)">
-													{{product.promotions.name}}
-													<text v-if="hasLogin && product.price1TextFlag != 1">:￥{{product.retailPrice | NumFormat}}</text>
-												</view>
-												<view class="floor-tags" v-else>{{product.promotions.name}}</view>	
-											</template>
-											<template v-if="product.actStatus ===0  &&  product.ladderPriceFlag===1">
-												<view class="floor-tags">阶梯价格</view>	
-											</template>
-										</template>
-									</view>	
-									<view v-if="hasLogin">
-										<template v-if="product.productCategory == 1">
-											<template v-if="userIdentity == 3">
-												<template v-if="product.shopID == shopId">
-													<view class="title-none" v-if="product.price1TextFlag === '1'">
-														<text class="p big">￥未公开价格</text>
-													</view>
-													<view class="price tui-skeleton-rect" v-else :class="PromotionsFormat(product.promotions) ? 'none' : ''">
-														<text class="p sm">￥</text>
-														<text class="p big">{{ (PromotionsFormat(product.promotions) ? product.price1 : product.retailPrice ) | NumFormat}}</text>
-													</view>
-												</template>	
-												<template v-else>
-													<view class="no-price">
-														<view class="p-stars">
-															<text class="p-no">￥</text>
-															<uni-grader :grade="Number(product.price1Grade)" :margin="14"></uni-grader>
-														</view>
-													</view>	
-												</template>
-											</template>
-											<template v-else-if="userIdentity ===4">
-												<view class="title-none" v-if="product.price1TextFlag === '1'">
-													<text class="p big">￥未公开价格</text>
-												</view>
-												<view class="title-none"  v-if="product.price1TextFlag === '2'">
-													<text class="p big">￥价格仅会员可见</text>
-												</view>
-												<view class="price tui-skeleton-rect" v-if="product.price1TextFlag === '0'" :class="PromotionsFormat(product.promotions) ? 'none' : ''">
-													<text class="p sm">￥</text>
-													<text class="p big">{{ (PromotionsFormat(product.promotions) ? product.price1 : product.retailPrice ) | NumFormat}}</text>
-												</view>
-											</template>
-											<template v-else>
-												<view class="title-none" v-if="product.price1TextFlag === '1'">
-													<text class="p big">￥未公开价格</text>
-												</view>
-												<view class="price tui-skeleton-rect" v-else :class="PromotionsFormat(product.promotions) ? 'none' : ''">
-													<text class="p sm">￥</text>
-													<text class="p big">{{ (PromotionsFormat(product.promotions) ? product.price1 : product.retailPrice ) | NumFormat}}</text>
-												</view>
-											</template>
-										</template>	
-										<template v-else>
-											<view class="price tui-skeleton-rect">
-												<text class="p sm">￥</text>
-												<text class="p big">{{ product.retailPrice | NumFormat }}</text>
-											</view>
-										</template>
-									</view>
-									<view v-else class="no-price">
-										<template>
-											<view class="p-stars">
-												<text class="p-no">￥</text>
-												<uni-grader :grade="Number(product.price1Grade)" :margin="14"></uni-grader>
-											</view>
-										</template>
-									</view>	
-								</view>
-							</view>
-						</view>
-					</view>
-				</scroll-view>
-			</view>
-		</view>
-		<!-- 侧边 -->
-		<scroll-top :isScrollTop="isScrollTop" :bottom="50"></scroll-top>
-		<!-- 透明模态层 -->
-		<modal-layer v-if='isModallayer'></modal-layer>
-	</view>
-</template>
-
-<script>
-	import authorize from '@/common/config/authorize.js'
-	import uniGrader from '@/components/uni-grade/uni-grade.vue'
-	import modalLayer from "@/components/modal-layer"
-	import { mapState,mapMutations} from 'vuex';
-	var isPreviewImg;
-	export default {
-		components:{
-			uniGrader,
-			modalLayer
-		},
-		data() {
-			return {
-				userID:0,
-				current:0,
-				mode:'round',
-				isModallayer:false,
-				isLogin:false,
-				skeletonShow: true,
-				userIdentity:'',
-				supplierList1:[
-					{image:'http://static.caimei365.com/app/meibohui/meibo_sup_01.jpg',id:1172,type:1,keyWord:''},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_sup_02.jpg',id:1172,type:1,keyWord:''},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_sup_03.jpg',id:1170,type:2,keyWord:'INDIBA'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_sup_04.jpg',id:1258,type:1,keyWord:''}
-				],
-				supplierList2:[
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_01.jpg',id:1172,type:1,keyWord:''},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_02.jpg',id:8888,type:2,keyWord:'INDIBA'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_03.jpg',id:8888,type:2,keyWord:'维锶'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_04.jpg',id:8888,type:2,keyWord:'imperium'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_05.jpg',id:8888,type:2,keyWord:'易路达'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_06.jpg',id:8888,type:2,keyWord:'ACTIVE'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_07.jpg',id:1201,type:1,keyWord:''},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_09.jpg',id:1285,type:1,keyWord:''},
-				],
-				liveList:[
-					{image:'http://static.caimei365.com/app/meibohui/meibo_live@_01.jpg',liveTitle:'采美LIVE带你体验美博会现场氛围',optionTitle:'直播详情',liveImg:'http://static.caimei365.com/app/meibohui/meibo_live_01.jpg'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_live@_02.jpg',liveTitle:'探访美博会采美合作展位上',optionTitle:'直播详情',liveImg:'http://static.caimei365.com/app/meibohui/meibo_live_02.jpg'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_live@_03.jpg',liveTitle:'探访美博会采美合作展位下',optionTitle:'直播详情',liveImg:'http://static.caimei365.com/app/meibohui/meibo_live_03.jpg'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_live@_05.jpg',liveTitle:'探访VIP品牌INDIBA体验点',optionTitle:'直播详情',liveImg:'http://static.caimei365.com/app/meibohui/meibo_live_04.jpg'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_live@_04.jpg',liveTitle:'探访VIP品牌科医人体验点',optionTitle:'直播详情',liveImg:'http://static.caimei365.com/app/meibohui/meibo_live_05.jpg'},
-				],
-				boothList:[
-					{image:'http://static.caimei365.com/app/meibohui/meibo_img_02.jpg',name:'GMS(可现场体验)',num:'B区 12.2馆C31'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_img_03.jpg',name:'优斐斯',num:'A区 4.2号馆A31'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_img_04.jpg',name:'唯美概念(可现场体验)',num:'B区 12.2馆B41'},
-					{image:'http://static.caimei365.com/app/meibohui/meibo_img_05.jpg',name:'美生美(可现场体验)',num:'B区 12.2馆B39'},
-				],
-				SuppierNoteList:[
-					{shopId:1172,marke:'光子嫩肤的黄金标准——美国高端技术品牌',type:1,keyWord:''},
-					{shopId:1161,marke:'专注于细胞治疗的西班牙高端技术品牌',type:2,keyWord:'INDIBA'},
-					{shopId:1258,marke:'专注于进口医学美容仪器及产品',type:1,keyWord:''},
-					{shopId:1193,marke:'坚持原装进口先进光电设备',type:1,keyWord:''},
-					{shopId:1285,marke:'国货之光——专注医学美容术前术后修复',type:1,keyWord:''},
-					{shopId:1184,marke:'专注于进口国际顶级医疗美容设备',type:1,keyWord:''},
-					{shopId:1292,marke:'专注于进口国际品牌医疗美容设备和医用级护肤品',type:1,keyWord:''},
-					{shopId:1205,marke:'致力于韩国原装进口高端美容仪器',type:1,keyWord:''},
-					{shopId:1201,marke:'专注原装进口国际高端高科技美容设备',type:1,keyWord:''},
-					{shopId:1206,marke:'致力于光学医疗美容设备的研发',type:1,keyWord:''},
-					{shopId:1217,marke:'专注于原装进口国际医疗美容设备',type:1,keyWord:''},
-				],
-				flootData:[],//楼层
-				isScrollTop:false,
-				isRequest:false,
-				isNavRequest:false,
-				isLiveRequest:false,
-				productImage:[],
-			}
-		},
-		onLoad() {
-			this.modallayer = false
-			this.$api.getComStorage('userInfo').then((resolve) =>{
-				this.clubStatus = resolve.clubStatus
-				this.userID = resolve.userId ? resolve.userId : 0;
-				this.shopId = resolve.shopId ? resolve.shopId : 0;
-				this.userIdentity = resolve.userIdentity
-				this.GetActitityInit()
-			}).catch(error =>{
-				this.GetActitityInit()
-			})
-		},
-		filters: {
-			NumFormat:function(text) {//处理金额
-				return Number(text).toFixed(2);
-			}
-		},
-		computed: {
-			...mapState(['hasLogin','userInfo','identity','isActivity'])
-		},
-		methods: {
-			...mapMutations(['login','logout']),
-			LookMyCouponDetils(){//点击优惠券 跳转处理
-				if(this.hasLogin){
-					if(this.userIdentity == 2 || this.userIdentity == 4){
-						this.$api.navigateTo('/pages/user/coupon/coupon')
-					}else if(this.userIdentity == 3){
-						this.$api.navigateTo('/pages/supplier/index/index')
-					}else{
-						return;
-					}
-				}else{
-					this.$api.navigateTo('/pages/login/login')
-				}
-			},
-			GetActitityInit(){
-				this.ActivityService.GetRepeatActivityFloorData({userId:this.userID}).then(response =>{
-					this.flootData = this.ReturnNewFlootData(response.data,this.SuppierNoteList)
-					console.log(this.flootData);
-					//处理商品图片列表
-					this.productImage =[]
-					this.boothList.forEach(item =>{
-						this.productImage.push(item.image);
-					})
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			ReturnNewFlootData(listA,listB){
-				let NewArray = []
-				listA.map(item=>{
-					for (let i = 0; i < listB.length; i++) {
-						if( item.shopId == listB[i].shopId ){
-							NewArray.push(Object.assign(item,listB[i])) 
-						}
-					}
-				});
-				return NewArray
-			},
-			NavToDetailPage(path){
-				this.$api.navigateTo(path)
-			},
-			RouterDetailPage(id) {
-				this.isModallayer = true;
-				this.$api.navigateTo(`/pages/goods/product?id=${id}`);
-				this.isModallayer = false;
-			},
-			goSupplierPath(type,value,keyWord){
-				if(type == 1){
-					this.$api.navigateTo('/pages/supplier/user/my-shop?shopId='+value)
-				}else if(type == 2){
-					this.$api.navigateTo(`/pages/search/search?keyWord=${keyWord}`)
-				}
-			},
-			LiveGoPathPros(live){
-				this.$api.navigateTo(`/pages/h5/article/page-image?title=${live.optionTitle}&image=${live.liveImg}`)
-			},
-			PromotionsFormat(promo){//促销活动类型数据处理
-				if(promo!=null){
-					if(promo.type == 1 && promo.mode == 1){
-						return true
-					}else{
-						return false
-					}
-				}
-				return false
-			},
-			previewImg (index) {//顶部商品图片预览
-				// isPreviewImg = true
-				let previewUrls = this.productImage
-				uni.previewImage({
-					current: index, 	//图片索引
-					urls: previewUrls, //必须是http图片，本地图片无效
-					longPressActions:''
-				})
-			},
-		},
-		onPageScroll(e){//实时获取到滚动的值
-			if(e.scrollTop>400){
-				this.isScrollTop = true
-			}else{
-				this.isScrollTop = false
-			}	
-		},
-		onPullDownRefresh() {//下拉刷新
-			this.GetActitityInit()
-			uni.stopPullDownRefresh()
-		},
-		onShareAppMessage(res){//分享转发
-			if (res.from === 'button') {
-		      // 来自页面内转发按钮
-		    }
-			return {
-			  title: '美博会震撼开启，重磅优惠等你来领~',
-			  path: '/pages/h5/activity/meobohui',
-			  imageUrl:'http://static.caimei365.com/app/meibohui/meibo_share_01.jpg'
-			}
-		},
-		onShow(){
-		
-		}
-	}
-</script>
-
-<style lang="scss">
-	page{
-		background-color: #F7F7F7;
-	}
-	.container-top{
-		width: 100%;
-		height: 500rpx;
-		float: left;
-		image{
-			width: 100%;
-			height: 100%;
-			display: block;
-		}
-	}
-	.container-activ{
-		width: 100%;
-		height: 240rpx;
-		box-sizing: border-box;
-		padding: 0 24rpx;
-		margin: 24rpx 0;
-		float: left;
-		image{
-			width: 100%;
-			height: 240rpx;
-			display: block;
-		}
-	}
-	.container-page{
-		background-color: #F7F7F7;
-		width: 100%;
-		height: auto;
-		box-sizing: border-box;
-		padding: 0 24rpx;
-		float: left;
-	}
-	.tui-group-name {
-		width: 100%;
-		height: 92rpx;
-		padding: 20rpx 0;
-	}
-	.tui-group-title{
-		width: 100%;
-		float: left;
-		.tui-group-l{
-			float: left;
-			font-size: 34rpx;
-			font-weight: bold;
-			text-align: left;
-			line-height: 49rpx;
-			color: #333;
-		}
-		.tui-group-r{
-			float: right;
-			font-size: $font-size-26;
-			text-align: right;
-			line-height: 49rpx;
-			color: #999999;
-			.icon-xiayibu{
-				font-size: $font-size-30;
-				color: #999999;
-			}
-		}
-	}
-	.tui-sub__desc {
-		width: 100%;
-		float: left;
-		color: rgba(153,153,153,0.9);
-		font-size: $font-size-26;
-	}
-	.tui-group-list{
-		width: 100%;
-		height: auto;
-		.floor-item-vip{
-			width: 339rpx;
-			height: 240rpx;
-			float: left;
-			margin-right: 24rpx;
-			margin-bottom: 24rpx;
-			&:nth-child(2n){
-				margin-right: 0;
-			}
-			.floor-item-image{
-				width: 100%;
-				height: 100%;
-				display: block;
-				border-radius: 16rpx;
-			}
-		}
-		.floor-item-sup{
-			width: 162rpx;
-			height: 162rpx;
-			float: left;
-			margin-right: 18rpx;
-			margin-bottom: 24rpx;
-			&:nth-child(4n){
-				margin-right: 0;
-			}
-			.floor-item-image{
-				width: 100%;
-				height: 100%;
-				display: block;
-			}
-		}
-		.floor-item-booth{
-			width: 339rpx;
-			height: 382rpx;
-			float: left;
-			margin-right: 24rpx;
-			margin-bottom: 24rpx;
-			background-color: #FFFFFF;
-			border-radius: 16rpx;
-			&:nth-child(2n){
-				margin-right: 0;
-			}
-			.floor-item-booth-image{
-				width: 100%;
-				height: 240rpx;
-				.floor-item-image{
-					width: 100%;
-					height: 100%;
-					display: block;
-					border-radius: 16rpx 16rpx 0 0;
-				}
-			}
-			.floor-item-text{
-				width: 100%;
-				height: 142rpx;
-				box-sizing: border-box;
-				padding: 31rpx 16rpx;
-				.floor-item-p{
-					width: 100%;
-					line-height: 40rpx;
-					text-align: left;
-					font-size: $font-size-24;
-					white-space: nowrap;
-					text-overflow: ellipsis;
-					overflow: hidden;
-					&.one{
-						color: #333333;
-					}
-					&.two{
-						color: #999999;
-					}
-				}
-			}
-		}
-		
-	}
-	.tui-group-scroll{
-		width: 100%;
-		height:392rpx;
-		float: left;
-		background-color: #F7F7F7;
-		box-sizing: border-box;
-		background-color: #F7F7F7;
-		overflow: hidden;
-		display: flex;
-		align-items: center;
-		.floor-item__list {
-			display: flex;
-			align-items: center;
-		}
-		.floor-item__live {
-			background-color: #fff;
-			width: 310rpx;
-			height: 392rpx;
-			border-radius: 16rpx;
-			box-sizing: border-box;
-			margin-right: 16rpx;
-			.floor-item__image{
-				width: 310rpx;
-				height: 310rpx;
-				float: left;
-				image{
-					width: 100%;
-					height: 100%;
-					display: block;
-					border-radius: 16rpx 16rpx 0 0;
-				}
-			}
-			.floor-item__text{
-				width: 100%;
-				height: 82rpx;
-				line-height: 82rpx;
-				box-sizing: border-box;
-				padding: 0 24rpx;
-				text-align: center;
-				font-size: $font-size-24;
-				color: #333333;
-				white-space: nowrap;
-				text-overflow: ellipsis;
-				overflow: hidden;
-			}
-		}
-	}
-	.tui-group-good__scroll{
-		.floor-good__list{
-			display: flex;
-			align-items: center;
-		}
-		.floor-item{
-			width: 310rpx;
-			height: 516rpx;
-			margin-right: 20rpx;
-			font-size: $font-size-24;
-			color: $text-color;
-			background: #FFFFFF;
-			line-height: 36rpx;
-			border-radius: 16rpx;
-			margin-bottom: 20rpx;
-			float: left;
-			box-sizing: border-box;
-			position: relative;
-			.item-img{
-				width: 310rpx;
-				height: 310rpx;
-				border-radius: 16rpx 16rpx 0 0;
-				display: block;
-				margin-bottom: 8rpx;
-			}
-			.floor-item_tag{
-				width: 100%;
-				height: 32rpx;
-				float: left;
-				margin: 20rpx 0;
-				padding: 0 20rpx;
-				box-sizing: border-box;
-				text{
-					display: inline-block;
-					padding: 0 8rpx;
-					border: 1px solid #e3ebf7;
-					border-radius: 8rpx ;
-					color: #9aa5b5;
-					font-size: $font-size-22;
-					line-height: 32rpx;
-					text-align: center;
-					float: left;
-				}
-			}
-			.floor-item-content{
-				width: 100%;
-				padding: 0 20rpx;
-				box-sizing: border-box;
-			}
-			.floor-item-act{
-				display: block;
-				width: 100%;
-				height: 32rpx;
-				text-align: center;
-				box-sizing: border-box;
-			}
-			.floor-tags{
-				height: 28rpx;
-				border-radius: 6rpx;
-				background-color: #FFFFFF;
-				line-height: 28rpx;
-				color: $color-system;
-				text-align: center;
-				display: inline-block;
-				padding:0 16rpx;
-				font-size: $font-size-20;
-				border: 1px solid #E15616;
-				float: left;
-			}
-			.title-none{
-				font-size: $font-size-26;
-				color: #FF2A2A;
-				line-height: 54rpx;
-			}
-			.title{
-				width: 100%;
-				height: 70rpx;
-				display: flex;
-				line-height: 35rpx;
-				flex-direction: column;
-				margin: 20rpx 0 10rpx 0;
-				padding: 0;
-				position: relative;
-				.mclap{
-					width: 100%;
-					line-height:35rpx;
-					text-overflow:ellipsis;
-					display: -webkit-box;
-					word-break: break-all;
-					-webkit-box-orient: vertical;
-					-webkit-line-clamp: 2;
-					overflow: hidden;
-					font-size: 26rpx;
-					text-indent: 95rpx;
-				}
-				.mclap-tag{
-					display: block;
-					width: 84rpx;
-					height: 32rpx;
-					background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);
-					border-radius: 4rpx 48rpx 4px 4px;
-					line-height: 32rpx;
-					font-size: $font-size-22;
-					color: #FFFFFF;
-					text-align: center;
-					position: absolute;
-					left: 0;
-					top: 0;
-				}
-			}
-			.no-price{
-				height: 54rpx;
-				line-height: 54rpx;
-				display: flex;
-				box-sizing: border-box;
-				.p-no{
-					font-size: $font-size-28;
-					color: $text-color;
-					display: block;
-					float: left;
-				}
-				.p-stars{
-					float: left;
-				}
-			}
-			.price{
-				color: #FF2A2A;
-				line-height:54rpx;
-				&.none{
-					text-decoration: line-through;
-					color: #999999;
-				}
-				.sm{
-					font-size: $font-size-24;
-				}
-				.big{
-					font-size: $font-size-28;
-				}
-			}
-		}
-	}
-	.container-section{
-		width: 100%;
-		height: auto;
-		background-color: #F7F7F7;
-	}
-</style>

pages/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>
@@ -29,7 +29,7 @@
 					<empty v-if="isShowEmpty" :navbarHeight="navbarHeight"></empty>
 					<!-- 列表 -->
 					<view v-else class="tui-order-content">
-						<view  class="tui-order-item" v-for="(order,orderIndex) in orderList" :key="orderIndex" @click.stop="detail(order.orderID)">
+						<view  class="tui-order-item" v-for="(order,orderIndex) in orderList" :key="orderIndex" @click.stop="detail(order.orderId)">
 							<view class="order-title">
 								<view class="order-title-t">
 									<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</text>
@@ -52,7 +52,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">
@@ -83,13 +83,18 @@
 								<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">待付总额：¥{{ order.pendingPayments | NumFormat}}</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" 
-										  :orderID="order.orderID" 
+										  :order="order" 
 										  :onlinePayFlag = "order.onlinePayFlag"
 										  @buttonConfirm="handButtonConfirm">
 							</order-button>
@@ -104,7 +109,7 @@
 		</view>
 		<!-- 分享弹窗 -->
 		<share-alert   v-if="isShareModal"
-					   :orderID="btnoRderID" 
+					   :orderId="btnoRderID" 
 					   @shareConfirm ='onShareAppMessage'>
 		</share-alert>
 		<!-- 透明模态层 -->
@@ -125,7 +130,12 @@
 	import shareAlert from '@/components/cm-module/modelAlert/shareAlert'			 //分享弹窗
 	import authorize from '@/common/config/authorize.js'
 	import activityBean from '@/components/cm-module/activity/activityBean.vue'
-	
+	const defaultListQuery = {
+			pageNum:1,			// 页码
+			pageSize:10,			// 每页条数
+			userId:0,			// 用户Id
+			searchWord:''		// 搜索关键词
+		};
 	export default {
 		components: {
 			orSearch,
@@ -138,8 +148,8 @@
 		},
 		data() {
 			return {
+				listQuery:Object.assign({}, defaultListQuery),
 				themeClass: 'block',
-				searchInputVal:'',
 				isShowClose:false,							//是否显示清空输入框图标
 				isSearchHistory:false,						//是都显示搜索历史
 				serachRecordList:[],
@@ -148,11 +158,8 @@
 				isShowEmpty:false,
 				windowHeight: '',
 				showSkeleton: true,
-				userID:0,
 				orderList: [],
 				btnoRderID: 0, //点击按钮传入的的订单ID
-				pageNum: 1,	  //页数
-				pageSize: 10,  //条数
 				scrollTop: 0,
 				deteleType:'',
 				skeletonShow: true,
@@ -183,7 +190,7 @@
 		},
 		methods:{
 			subMitSearch() {
-				if (this.searchInputVal == '') {
+				if (this.listQuery.searchWord == '') {
 					this.$util.msg('请输入商品关键词',2000);
 				}else{
 					this.commodityList =[]
@@ -192,8 +199,8 @@
 			},
 			initGetSerachRecord(){
 				this.$api.getStorage().then((resolve) =>{
-					this.userID = resolve.userId ? resolve.userId : 0
-					this.OrderService.SearchOrderHistory({userId:this.userID}).then(response =>{
+					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
@@ -206,27 +213,27 @@
 				})	
 			},
 			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.listQuery.userId}).then(response =>{
 						this.$util.msg('删除记录成功',2000,true,'success')
 						this.serachRecordList=[]
 					}).catch(error =>{
@@ -251,22 +258,21 @@
 				 * @param：pageSize(每页条数)
 				 * @param：organizeID(全局变量组织ID)
 				 */ 
-				let params = {searchWord:this.searchInputVal,userId:this.userID,pageNum:1,pageSize:this.pageSize};
-				this.OrderService.SearchOrderInfo(params).then(response =>{
+				this.OrderService.SearchOrderInfo(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 && data.list.length > 0){
+						let filrerData = data.list.filter(item=>{
 							//添加不同状态下订单的表现形式
-							item = Object.assign(item, this.StateExpFormat(item.state));
+							item = Object.assign(item, this.StateExpFormat(item.status));
 							return item;
 						});
 						this.orderList =[];
 						filrerData.forEach(item=>{
 							this.orderList.push(item);
 						})
-						this.hasNextPage = response.data.hasNextPage;
+						this.hasNextPage = data
 						if(this.hasNextPage){
 							this.pullUpOn = false
 							this.nomoreText = '上拉显示更多'
@@ -287,12 +293,11 @@
 				})
 			}, 
 			getOnReachBottomData(index){//上拉加载
-				this.pageNum+=1
-				let params = {searchWord:this.searchInputVal,userId:this.userID,pageNum:this.pageNum,pageSize:this.pageSize}
-				this.OrderService.SearchOrderInfo(params).then(response =>{
-					let resData = response.data.results
-					this.hasNextPage = response.data.hasNextPage;
-					this.orderList = this.orderList.concat(resData)
+				this.listQuery.pageNum+=1
+				this.OrderService.SearchOrderInfo(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){
@@ -315,9 +320,9 @@
 					this.getOnReachBottomData();
 				}	
 			},
-			detail(id) {//订单详情跳转
+			detail(orderId) {//订单详情跳转
 				this.isModalLayer = true;	
-				this.$api.navigateTo(`/pages/user/order/order-details?type=search&orderID=${id}`)
+				this.$api.navigateTo(`/pages/user/order/order-details?type=search&orderId=${orderId}`)
 			},
 			handButtonConfirm(data) {//获取点击
 				this.handShowAlert(data)
@@ -333,7 +338,7 @@
 						break
 					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 'confirm':
 						this.handOrderConfirm(data.orderId);
@@ -343,9 +348,9 @@
 						break	
 				}
 			},
-			handOrderConfirm (id){//确认收货
+			handOrderConfirm (orderId){//确认收货
 				this.$util.modal('提示','是否确认收货','确定','取消',true,() =>{
-					this.OrderService.ConfirmReceipt({orderID:id}).then(response =>{
+					this.OrderService.ConfirmReceipt({orderId:orderId}).then(response =>{
 						this.beansType = 7
 						this.beanNumber = 100
 						this.isActivityBean = true
@@ -354,9 +359,9 @@
 					})
 				})
 			},
-			handOrderConfirmation (id){//确认订单
+			handOrderConfirmation (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()
@@ -366,9 +371,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()
@@ -378,9 +383,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()
@@ -396,7 +401,7 @@
 			    }
 				return {
 					title: '您有新的分享订单，快来查看吧~',
-					path: `/pages/user/order/order-sharelogin?orderID=${this.btnoRderID}&userID=${this.userID}`,
+					path: `/pages/user/order/order-sharelogin?orderID=${this.btnoRderID}&userId=${this.listQuery.userId}`,
 					imageUrl:'https://static.caimei365.com/app/img/bg/min-banner.jpg'
 				}
 			},

pages/user/order/create-order.vue

@@ -525,7 +525,7 @@
 							this.isSubLoading = false
 						},2000)
 						setTimeout(()=>{
-							this.$api.redirectTo(`/pages/user/order/order-payment?type=${this.submitState}&orderID=${data.orderId}`)
+							this.$api.redirectTo(`/pages/user/order/order-payment?type=${this.submitState}&orderId=${data.orderId}`)
 						},3000)
 					}
 				}).catch(error =>{

pages/user/order/order-details.vue

@@ -41,7 +41,7 @@
 					@cancelConfirm = "hanldCancelConfirm"
 					@paymentConfirm ='hanldPaymentConfirm'/>
 		<!-- 分享弹窗 -->			
-		<share-alert  :orderID="orderID" 
+		<share-alert  :orderId="orderId" 
 					  v-if="isShareModal"  
 					  @btnConfirm ='onShareAppMessage'>
 		</share-alert>		
@@ -88,8 +88,8 @@
 		data() {
 			return {
 				state:0,
-				userID:'',
-				orderID:'',
+				userId:'',
+				orderId:'',
 				shareCode:'',				//分享码
 				shareType:'',               //分享登录页过来记录的状态
 				cellPhone:'',				//客服电话
@@ -134,7 +134,7 @@
 		onLoad(option){
 			console.log(option)
 			this.shareType = option.type;
-			this.orderID = option.orderID
+			this.orderId = option.orderId
 			if(this.shareType ==='share'){
 				this.state = 0
 				this.isOrderShare = true
@@ -146,7 +146,7 @@
 			}
 			this.getHeaderTopHeight()
 			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userId ? resolve.userId : 0
+				this.userId = resolve.userId ? resolve.userId : 0
 				this.initOrderDetaileData()
 			})	
 		},
@@ -184,25 +184,25 @@
 				this.$api.navigateTo(`/pages/service/sellconten?clauseId=${id}`)
 			},
 			initOrderDetaileData(){//初始化页面数据@参数：订单ID
-				this.OrderService.QueryOrderDetails({ orderID : this.orderID, userId : this.userID}).then(response =>{
-					let resData = response.data;
+				this.OrderService.QueryOrderDetails({ orderId : this.orderId, userId : this.userId}).then(response =>{
+					let data = response.data;
 					this.isRequest = true
-					this.orderInfo = resData.order
-					this.shareCode = resData.shareCode
-					this.addressData = resData.userInfo
-					this.information = resData.order
-					this.rechargeGoods = resData.order.rechargeGoods
-					this.btnStatus = resData.order.status
-					this.payStatus = resData.order.payStatus
-					this.payableAmount = resData.order.payableAmount
-					this.shopOrderData = resData.shopOrderList
-					this.orderInvoice = resData.orderInvoice
-					this.onlinePayFlag = resData.order.onlinePayFlag
-					this.returnedPurchaseList = resData.returnedPurchaseList
-					this.discernReceiptList = resData.discernReceiptList
-					this.receiptAmount = resData.order.receiptAmount
-					this.returnedPurchaseFee = resData.order.returnedPurchaseFee
-					this.clauseData = resData.clause
+					this.orderInfo = data.order
+					this.shareCode = data.shareCode
+					this.addressData = data.userInfo
+					this.information = data.order
+					this.rechargeGoods = data.order.rechargeGoods
+					this.btnStatus = data.order.status
+					this.payStatus = data.order.payStatus
+					this.payableAmount = data.order.payableAmount
+					this.shopOrderData = data.shopOrderList
+					this.orderInvoice = data.orderInvoice
+					this.onlinePayFlag = data.order.onlinePayFlag
+					this.returnedPurchaseList = data.returnedPurchaseList
+					this.discernReceiptList = data.discernReceiptList
+					this.receiptAmount = data.order.receiptAmount
+					this.returnedPurchaseFee = data.order.returnedPurchaseFee
+					this.clauseData = data.clause
 					if(this.information.orderSubmitType == 0 || this.information.orderSubmitType == 1 ||this.information.orderSubmitType == 2){
 						this.orderSubmitType=true
 					}else{
@@ -226,7 +226,7 @@
 						this.handCenceConfirm();
 						break
 					case 'query':
-						this.$api.navigateTo('/pages/user/order/order-logistics?orderID='+this.orderID)
+						this.$api.navigateTo('/pages/user/order/order-logistics?orderId='+this.orderId)
 						break
 					case 'confirm':
 						this.handOrderConfirm()
@@ -260,9 +260,9 @@
 							break;
 						default:
 							if(response.data.onlinePayFlag == '1'){
-								this.$api.navigateTo(`/pages/user/order/order-payment?type=onlinePay&Amount=${response.data.pendingPayments}&orderID=${data.orderId}`)
+								this.$api.navigateTo(`/pages/user/order/order-payment?type=onlinePay&Amount=${response.data.pendingPayments}&orderId=${data.orderId}`)
 							}else{
-								this.$api.navigateTo(`/pages/user/order/order-payment?type=payfirm&orderID=${data.orderId}`)
+								this.$api.navigateTo(`/pages/user/order/order-payment?type=payfirm&orderId=${data.orderId}`)
 							}
 					}
 					
@@ -273,13 +273,13 @@
 			hanldPaymentConfirm(data){//余额抵扣跳转
 				this.OrderService.OrderBalanceDeduction({orderId:data.order.orderId}).then(response =>{
 					if(data.type === 2){
-						let _data = {orderID:data.order.orderId}
+						let _data = {orderId:data.order.orderId}
 						this.$api.navigateTo(`/pages/user/order/success?type=deduction&data=${JSON.stringify({data:_data})}`)
 					}else{
 						if(data.order.onlinePayFlag === '1'){
-							this.$api.navigateTo(`/pages/user/order/order-payment?type=onlinePay&Amount=${data.order.pendingPayments}&orderID=${data.order.orderId}`)
+							this.$api.navigateTo(`/pages/user/order/order-payment?type=onlinePay&Amount=${data.order.pendingPayments}&orderId=${data.order.orderId}`)
 						}else{
-							this.$api.navigateTo(`/pages/user/order/order-payment?type=payfirm&orderID=${data.order.orderId}`)
+							this.$api.navigateTo(`/pages/user/order/order-payment?type=payfirm&orderId=${data.order.orderId}`)
 						}
 					}
 				}).catch(error =>{
@@ -288,14 +288,14 @@
 			},
 			hanldCancelConfirm(data){//不使用余额抵扣直接跳转收银台
 				if(data.onlinePayFlag == '1'){
-					this.$api.navigateTo(`/pages/user/order/order-payment?type=onlinePay&Amount=${this.orderInfo.pendingPayments}&orderID=${data.orderId}`)
+					this.$api.navigateTo(`/pages/user/order/order-payment?type=onlinePay&Amount=${this.orderInfo.pendingPayments}&orderId=${data.orderId}`)
 				}else{
-					this.$api.navigateTo(`/pages/user/order/order-payment?type=payfirm&orderID=${data.orderId}`)
+					this.$api.navigateTo(`/pages/user/order/order-payment?type=payfirm&orderId=${data.orderId}`)
 				}
 			},
 			hanldConfirmFn (orderId){//确认打款供应商
 				this.$util.modal('提示','确定委托采美平台打款给供应商吗？确定之前请务必确保货品完好？','确定','取消',true,() =>{
-					this.OrderService.confirmpayment({orderID:orderId,userId:this.userID}).then(response =>{
+					this.OrderService.confirmpayment({orderId:orderId,userId:this.userId}).then(response =>{
 						this.$util.msg('确认成功',2000,true,'success');
 						setTimeout(() => {
 							this.getOrderDatainit(this.currentTab)
@@ -307,7 +307,7 @@
 			},
 			handOrderConfirm(){//确认收货
 				this.$util.modal('提示','是否确认收货','确定','取消',true,() =>{
-					this.OrderService.ConfirmReceipt({orderID:this.orderID}).then(response =>{
+					this.OrderService.ConfirmReceipt({orderId:this.orderId}).then(response =>{
 						this.beansType = 7
 						this.beanNumber = 100
 						this.isActivityBean = true
@@ -318,7 +318,7 @@
 			},
 			handOrderConfirmation (){//确认订单
 				this.$util.modal('提示','确认此订单？','确定','取消',true,() =>{
-					this.OrderService.AffirmOrder({orderID:this.orderID}).then(response =>{
+					this.OrderService.AffirmOrder({orderId:this.orderId}).then(response =>{
 						this.$util.msg(response.msg,2000,true,'success');
 						setTimeout(() => {
 							this.initOrderDetaileData()
@@ -330,7 +330,7 @@
 			},
 			handOrderDetele(){//删除订单
 				this.$util.modal('提示','确认删除该订单吗？','确定','取消',true,() =>{
-					this.OrderService.DeleteOrder({orderID:this.orderID}).then(response =>{
+					this.OrderService.DeleteOrder({orderId:this.orderId}).then(response =>{
 						this.$util.msg(response.msg,2000,true,'success');
 						setTimeout(() => {
 							if(this.shareType ==='share'){
@@ -346,7 +346,7 @@
 			},
 			handCenceConfirm(){//取消订单
 				this.$util.modal('提示','确认取消该订单吗？','确定','取消',true,() =>{
-					this.OrderService.CancelOrder({orderID:this.orderID}).then(response =>{
+					this.OrderService.CancelOrder({orderId:this.orderId}).then(response =>{
 						this.$util.msg(response.msg,2000,true,'success');
 						this.initOrderDetaileData()
 					}).catch(error =>{
@@ -361,7 +361,7 @@
 			    }
 				return {
 					title: '您有新的分享订单，快来查看吧~',
-					path: `/pages/user/order/order-sharelogin?orderID=${this.orderID}&userID=${this.userID}`,
+					path: `/pages/user/order/order-sharelogin?orderId=${this.orderId}&userId=${this.userId}`,
 					imageUrl:'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
 				}
 			},

pages/user/order/order-list.vue

@@ -37,13 +37,15 @@
 										<view v-if="shop.shopPromotion" class="floor-item-act">
 											<view class="floor-tags">{{shop.shopPromotion.name}}</view>	
 										</view>
-										<view class="title-text" v-if="order.secondHandOrderFlag==1">{{shop.shopName}}<label class="paymenttext" v-if="order.affirmPaymentFlag==1">已确认打款供应商</label></view>
-										<view class="title-text tui-skeleton-fillet" v-else @click="goShophome(shop.shopID)">{{shop.shopName}}<label class="iconfont icon-jinrudianpu"></label></view>
+										<view class="title-text" v-if="order.secondHandOrderFlag==1">{{shop.shopName}}
+											<label class="paymenttext" v-if="order.affirmPaymentFlag==1">已确认打款供应商</label>
+										</view>
+										<view class="title-text tui-skeleton-fillet" v-else @click="goShophome(shop.shopId)">{{shop.shopName}}<label class="iconfont icon-jinrudianpu"></label></view>
 									</view>
-									<view class="goods-item" v-for="(pros,prosIndex) in shop.orderProductList" :key="prosIndex" @click.stop="detail(order.orderID)">
+									<view class="goods-item" v-for="(pros,prosIndex) in shop.orderProductList" :key="prosIndex" @click.stop="detail(order.orderId)">
 										<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">
@@ -74,8 +76,12 @@
 									<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 -->
@@ -101,7 +107,7 @@
 					@cancelConfirm = "hanldCancelConfirm"
 					@paymentConfirm ='hanldPaymentConfirm'/>
 		<!-- 分享弹窗 -->
-		<share-alert   v-if="isShareModal" :orderID="btnoRderID" @shareConfirm ='onShareAppMessage' />
+		<share-alert   v-if="isShareModal" :orderId="btnoRderID" @shareConfirm ='onShareAppMessage' />
 		<!-- 透明模态层 -->
 		<modal-layer v-if='isModalLayer'></modal-layer>
 		<!-- 采美豆提示弹窗 -->
@@ -157,7 +163,7 @@
 				winHeight: "", //窗口高度
 				currentTab: 0, //预设当前项的值
 				scrollLeft: 0 ,//tab标题的滚动条位置
-				userID:0,
+				userId:0,
 				orderData: [],
 				btnoRderID: 0, //点击按钮传入的的订单ID
 				pageNum: 1,	  //页数
@@ -186,11 +192,10 @@
 		},
 		onLoad(e) {
 			let self = this;
-			
-			if(e.type ==='detele'){self.isDelete = true}
-			self.currentTab = e.state
-			self.isOnloadFlag = true
-			self.getHeaderTopHeight()//设置自定义导航高度
+			if(e.type ==='detele'){this.isDelete = true}
+			this.currentTab = e.state
+			this.isOnloadFlag = true
+			this.getHeaderTopHeight()//设置自定义导航高度
 			//  高度自适应
 			uni.getSystemInfo({
 				success: function(res) {
@@ -254,7 +259,7 @@
 				/**
 				 * @订单初始化加载  仅加载第一页码
 				 * @param：orderState(订单状态:0全部,1待付款,2待发货,3已发货,4退货款)
-				 * @param：userID(用户ID)
+				 * @param：userId(用户ID)
 				 * @param：pageNum(页码数)
 				 * @param：pageSize(每页条数)
 				 * @param：organizeID(全局变量组织ID)
@@ -264,19 +269,19 @@
 					this.isOnloadFlag = false
 				},1500)
 				let orderItem = this.orderTabBar[index];
-				let state = orderItem.state;
 				if(source === 'tabChange' && orderItem.loaded === true){
 					//tab切换只有第一次需要加载数据
 					return;
 				}
 				setTimeout(()=>{
 					this.$api.getStorage().then((resolve) =>{
-						this.userID = resolve.userId ? resolve.userId : 0
-						let params = {orderState:index,userId:this.userID,pageNum:1,pageSize:this.pageSize};
+						this.userId = resolve.userId ? resolve.userId : 0
+						let params = {orderState:index,userId:this.userId,pageNum:1,pageSize:this.pageSize};
 						this.OrderService.QueryOrderList(params).then(response =>{
-							let orderList = response.data.results.filter(item=>{
+							let data = response.data
+							let orderList = data.list.filter(item=>{
 								//添加不同状态下订单的表现形式
-								item = Object.assign(item, this.StateExpFormat(item.state));
+								item = Object.assign(item, this.StateExpFormat(item.status));
 								return item;
 							});
 							orderItem.orderList =[];
@@ -285,7 +290,7 @@
 							})
 							//loaded新字段用于表示数据加载完毕，如果为空可以显示空白页
 							this.$set(orderItem, 'loaded', true);
-							this.hasNextPage = response.data.hasNextPage;
+							this.hasNextPage = data.hasNextPage;
 							if(this.hasNextPage){
 								this.pullUpOn = false
 								this.nomoreText = '上拉显示更多'
@@ -305,12 +310,12 @@
 			}, 
 			getOnReachBottomData(index){//上拉加载
 				this.pageNum+=1
-				let params = {orderState:index,userId:this.userID,pageNum:this.pageNum,pageSize:this.pageSize};
+				let params = {orderState:index,userId:this.userId,pageNum:this.pageNum,pageSize:this.pageSize};
 				this.OrderService.QueryOrderList(params).then(response =>{
+					let data = response.data
 					let orderItem = this.orderTabBar[index];
-					let resData = response.data.results
-					this.hasNextPage = response.data.hasNextPage;
-					orderItem.orderList = orderItem.orderList.concat(resData)
+					this.hasNextPage = data.hasNextPage;
+					orderItem.orderList = orderItem.orderList.concat(data.list)
 					this.pullFlag = false;// 防上拉暴滑
 					setTimeout(()=>{this.pullFlag = true;},500)
 					if(this.hasNextPage){
@@ -332,10 +337,9 @@
 					this.getOnReachBottomData(this.currentTab);
 				}	
 			},
-			detail(id) {//订单详情跳转
-				console.log(id)
+			detail(orderId) {//订单详情跳转
 				this.isModalLayer = true;	
-				this.$api.navigateTo(`/pages/user/order/order-details?state=${this.currentTab}&orderID=${id}`)
+				this.$api.navigateTo(`/pages/user/order/order-details?state=${this.currentTab}&orderId=${orderId}`)
 			},
 			handButtonConfirm(data) {//获取点击
 				this.handShowAlert(data)
@@ -351,7 +355,7 @@
 						break
 					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 'confirm':
 						this.handOrderConfirm(data.orderId);
@@ -386,9 +390,9 @@
 							break;
 						default:
 							if(response.data.onlinePayFlag == '1'){
-								this.$api.navigateTo(`/pages/user/order/order-payment?type=onlinePay&Amount=${response.data.pendingPayments}&orderID=${data.orderId}`)
+								this.$api.navigateTo(`/pages/user/order/order-payment?type=onlinePay&Amount=${response.data.pendingPayments}&orderId=${data.orderId}`)
 							}else{
-								this.$api.navigateTo(`/pages/user/order/order-payment?type=payfirm&orderID=${data.orderId}`)
+								this.$api.navigateTo(`/pages/user/order/order-payment?type=payfirm&orderId=${data.orderId}`)
 							}
 					}
 					
@@ -399,13 +403,13 @@
 			hanldPaymentConfirm(data){//余额抵扣跳转
 				this.OrderService.OrderBalanceDeduction({orderId:data.order.orderId}).then(response =>{
 					if(data.type === 2){
-						let _data = {orderID:data.order.orderId}
+						let _data = {orderId:data.order.orderId}
 						this.$api.navigateTo(`/pages/user/order/success?type=deduction&data=${JSON.stringify({data:_data})}`)
 					}else{
 						if(data.order.onlinePayFlag === '1'){
-							this.$api.navigateTo(`/pages/user/order/order-payment?type=onlinePay&Amount=${data.order.pendingPayments}&orderID=${data.order.orderId}`)
+							this.$api.navigateTo(`/pages/user/order/order-payment?type=onlinePay&Amount=${data.order.pendingPayments}&orderId=${data.order.orderId}`)
 						}else{
-							this.$api.navigateTo(`/pages/user/order/order-payment?type=payfirm&orderID=${data.order.orderId}`)
+							this.$api.navigateTo(`/pages/user/order/order-payment?type=payfirm&orderId=${data.order.orderId}`)
 						}
 					}
 				}).catch(error =>{
@@ -414,14 +418,14 @@
 			},
 			hanldCancelConfirm(data){//不使用余额抵扣直接跳转收银台
 				if(data.onlinePayFlag == '1'){
-					this.$api.navigateTo(`/pages/user/order/order-payment?type=onlinePay&Amount=${this.hanldOrderData.pendingPayments}&orderID=${data.orderId}`)
+					this.$api.navigateTo(`/pages/user/order/order-payment?type=onlinePay&Amount=${this.hanldOrderData.pendingPayments}&orderId=${data.orderId}`)
 				}else{
-					this.$api.navigateTo(`/pages/user/order/order-payment?type=payfirm&orderID=${data.orderId}`)
+					this.$api.navigateTo(`/pages/user/order/order-payment?type=payfirm&orderId=${data.orderId}`)
 				}
 			},
 			hanldConfirmFn (orderId){//确认打款供应商
 				this.$util.modal('提示','确定委托采美平台打款给供应商吗？确定之前请务必确保货品完好？','确定','取消',true,() =>{
-					this.OrderService.confirmpayment({orderID:orderId,userId:this.userID}).then(response =>{
+					this.OrderService.confirmpayment({orderId:orderId,userId:this.userId}).then(response =>{
 						this.$util.msg('确认成功',2000,true,'success');
 						setTimeout(() => {
 							this.getOrderDatainit(this.currentTab)
@@ -431,9 +435,9 @@
 					})
 				})
 			},
-			handOrderConfirm (id){//确认收货
+			handOrderConfirm (orderId){//确认收货
 				this.$util.modal('提示','是否确认收货','确定','取消',true,() =>{
-					this.OrderService.ConfirmReceipt({orderID:id}).then(response =>{
+					this.OrderService.ConfirmReceipt({orderId:orderId}).then(response =>{
 						this.beansType = 7
 						this.beanNumber = 100
 						this.isActivityBean = true
@@ -442,9 +446,9 @@
 					})
 				})
 			},
-			handOrderConfirmation (id){//确认订单
+			handOrderConfirmation (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)
@@ -454,9 +458,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)
@@ -466,9 +470,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)
@@ -487,7 +491,7 @@
 			    }
 				return {
 					title: '您有新的分享订单，快来查看吧~',
-					path: `/pages/user/order/order-sharelogin?orderID=${this.btnoRderID}&userID=${this.userID}`,
+					path: `/pages/user/order/order-sharelogin?orderId=${this.btnoRderID}&userId=${this.userId}`,
 					imageUrl:'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
 				}
 			},

pages/user/order/order-logistics.vue

@@ -67,12 +67,12 @@
 		},
 		data() {
 			return {
-				orderID: '',
+				orderId: '',
 				goodsList:[]
 			}
 		},
 		onLoad(option){//商品数据
-			this.orderID = option.orderID;
+			this.orderId = option.orderId;
 			this.getData();
 		},
 		methods: {
@@ -94,7 +94,7 @@
 				})
 			},
 			getData() {
-				this.OrderService.QueryLogistics({orderID: this.orderID}).then(response =>{
+				this.OrderService.QueryLogistics({orderId: this.orderId}).then(response =>{
 					const resData = response.data;
 					// 添加订单列表信息
 					let orderListArr = [];

pages/user/order/order-pay.vue

@@ -88,7 +88,7 @@
 		},
 		data(){
 			return{
-				orderID:'',
+				orderId:'',
 				payType:'',
 				payWay:'',
 				isRepuest:false,
@@ -145,7 +145,7 @@
 			initData(e){
 				this.payType = e.type
 				console.log(this.payType)
-				this.orderID = e.orderID
+				this.orderId = e.orderId
 				switch(this.payType){
 					case '0':
 						this.payWay = 'WEIXIN'
@@ -166,7 +166,7 @@
 				this.GetPayOrderInfo()
 			},
 			GetPayOrderInfo(){//初始化支付信息
-				this.PayService.PayOrderCheckoutCounter({orderId:this.orderID}).then(response =>{
+				this.PayService.PayOrderCheckoutCounter({orderId:this.orderId}).then(response =>{
 					this.isRepuest = true
 					this.discernReceipt = response.data.discernReceipt 			// 支付记录
 					this.payTotalFee = response.data.order.payTotalFee  		// 订单总额
@@ -201,7 +201,7 @@
 					this.$util.msg("企业网银支付的金额必须大于￥10.00",2000)
 					return
 				}
-				this.PayService.PayOrderPayLink({unpaidAmount:this.payAmount,orderId:this.orderID,payType:this.payType}).then(response =>{
+				this.PayService.PayOrderPayLink({unpaidAmount:this.payAmount,orderId:this.orderId,payType:this.payType}).then(response =>{
 					this.payHttpUrl = response.data
 					this.isShowTip = true
 				})
@@ -225,7 +225,7 @@
 							payAmount:this.accMul(this.payAmount,100),
 							payWay:"WEIXIN",
 							code:wechatcode,
-							orderId:this.orderID
+							orderId:this.orderId
 						}
 					this.PayService.WeChatMiniWxPay(params).then(response =>{
 						// 友盟埋点收集微信支付
@@ -234,7 +234,7 @@
 								Um_Key_PageName: '微信支付',
 								Um_Key_SourcePage: '线上支付',
 								Um_Key_PayName:`${this.buttonText}`,
-								Um_Key_PayOrderID:`${this.orderID}`
+								Um_Key_PayOrderID:`${this.orderId}`
 							})
 						}
 						let PayInfo = JSON.parse(response.data.data.payInfo);
@@ -343,11 +343,11 @@
 								Um_Key_PageName: '网银支付',
 								Um_Key_SourcePage: '线上支付',
 								Um_Key_PayName:`${this.buttonText}`,
-								Um_Key_PayOrderID:`${this.orderID}`
+								Um_Key_PayOrderID:`${this.orderId}`
 							})
 						}
 						setTimeout(()=>{
-							this.$api.navigateTo(`/pages/user/order/order-details?state=0&orderID=${this.orderID}`)
+							this.$api.navigateTo(`/pages/user/order/order-details?state=0&orderId=${this.orderId}`)
 						},2000)
 					} else {
 						this.$util.msg("复制失败",2000,true,'none');

pages/user/order/order-payment.vue

@@ -138,11 +138,11 @@
 	export default{
 		data(){
 			return{
-				orderID:'',
+				orderId:'',
 				payableAmount:0,
 				emptyWrapperH: '',
 				bankNumber:'6217 6803 0362 0897',
-				payOrderId:'',
+				payorderId:'',
 				nvabarData: {		//顶部自定义导航
 					showCapsule:1, // 是否显示左上角图标  1表示显示  0表示不显示,
 					showSearch: 0,
@@ -196,8 +196,9 @@
 		},
 		methods:{
 			initData(e){
-				this.orderID = e.orderID;
-				this.payOrderId ='#'+e.orderID+'#';
+				console.log(e)
+				this.orderId = e.orderId;
+				this.payOrderId ='#'+e.orderId+'#';
 				this.optionType = e.type;
 				switch(e.type){
 					case 'confirm':
@@ -205,14 +206,14 @@
 						this.nvabarData.haveHome = true
 						this.nvabarData.title = '支付'
 						this.PayOrderOnLineSwitch()
-						this.PayOrderCheckoutCounter(this.orderID)
+						this.PayOrderCheckoutCounter(this.orderId)
 						break;
 					case 'payfirm':
 						this.nvabarData.haveBack = true
 						this.nvabarData.haveHome = false
 						this.nvabarData.title = '选择支付方式'
 						this.PayOrderOnLineSwitch()
-						this.PayOrderCheckoutCounter(this.orderID)
+						this.PayOrderCheckoutCounter(this.orderId)
 						break;
 					case 'onlinePay':
 						this.invoiceStatus = true
@@ -271,18 +272,18 @@
 							Um_Key_PageName: '线上支付',
 							Um_Key_SourcePage: '选择支付',
 							Um_Key_PayName:`${this.buttonText}`,
-							Um_Key_PayOrderID:`${this.orderID}`
+							Um_Key_PayOrderID:`${this.orderId}`
 						})
 					}
 					switch(this.tabCurrentIndex){
 						case 0:
-							this.$api.navigateTo(`/pages/user/order/order-pay?type=0&orderID=${this.orderID}`)
+							this.$api.navigateTo(`/pages/user/order/order-pay?type=0&orderId=${this.orderId}`)
 							break;
 						case 1:
-							this.$api.navigateTo(`/pages/user/order/order-pay?type=1&orderID=${this.orderID}`)
+							this.$api.navigateTo(`/pages/user/order/order-pay?type=1&orderId=${this.orderId}`)
 							break;
 						case 2:
-							this.$api.navigateTo(`/pages/user/order/order-pay?type=2&orderID=${this.orderID}`)
+							this.$api.navigateTo(`/pages/user/order/order-pay?type=2&orderId=${this.orderId}`)
 							break;
 					}
 				}

pages/user/order/order-sharedetails.vue

@@ -47,8 +47,8 @@
 		data() {
 			return {
 				status:'',
-				userID:'',
-				orderID:'',
+				userId:'',
+				orderId:'',
 				cellPhone:'',				//客服电话
 				btnStatus:0,				//按钮组件状态
 				isRequest:false,			//是否加载完成渲染子组件
@@ -72,13 +72,13 @@
 			}
 		},
 		onLoad(option){
-			this.orderID = option.orderID
-			this.userID = option.userId
+			this.orderId = option.orderId
+			this.userId = option.userId
 			this.initOrderDetaileData()
 		},
 		methods: {
 			initOrderDetaileData(){//初始化页面数据@参数：订单ID
-				this.OrderService.QueryOrderDetails({ orderID : this.orderID,userId : this.userID }).then(response =>{
+				this.OrderService.QueryOrderDetails({ orderId : this.orderId,userId : this.userId }).then(response =>{
 					let resData = response.data;
 					this.isRequest = true
 					this.status = resData.order.status
@@ -106,7 +106,7 @@
 				this.handlerPros = data
 			},
 			queryLogistics(){//跳转查询物流页面
-				this.$api.navigateTo('/pages/user/order/order-logistics?orderID='+this.orderID)
+				this.$api.navigateTo('/pages/user/order/order-logistics?orderId='+this.orderId)
 			},
 		},
 		onShow() {

pages/user/order/order-sharelogin.vue

@@ -40,8 +40,8 @@
 				isUserInfo:false,	//控制显示授权弹窗
 				nickName:'',		//存储用户名
 				userInfo:'',		//存储微信用户授权信息
-				orderID:0,			//订单ID
-				userID:0,			//分享人的用户ID
+				orderId:0,			//订单ID
+				userId:0,			//分享人的用户ID
 				isShareStatus:false,
 				serviceProviderId:'',
 				productList:[]
@@ -49,8 +49,8 @@
 		},
 		onLoad(e) {
 			console.log(e)
-			this.orderID = e.orderID
-			this.userID = e.userID
+			this.orderId = e.orderId
+			this.userId = e.userId
 			if(e.serviceProviderId){
 				this.serviceProviderId = e.serviceProviderId
 			}
@@ -60,21 +60,21 @@
 				authorize.getCode('weixin').then(wechatcode =>{
 					let params ={
 							code:wechatcode,
-							orderID:this.orderID,
-							userID:this.userID,
+							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}`)
+							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}`)
+								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}`)
+								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,() =>{})
@@ -86,7 +86,7 @@
 				})
 			},
 			getOrderCommodityData(){//查询订单商品信息s
-				this.OrderService.OrderCommodityData({orderId:this.orderID}).then(response =>{
+				this.OrderService.OrderCommodityData({orderId:this.orderId}).then(response =>{
 					this.productList = response.data
 					this.isShareStatus = true
 				}).catch(error =>{
@@ -97,11 +97,11 @@
 				switch(index){
 					case 1:
 						this.$store.commit('setLoginType',7)
-						this.$store.commit('setLoginOrderId',this.orderID)
+						this.$store.commit('setLoginOrderId',this.orderId)
 						this.$api.navigateTo('/pages/login/login')
 						break;
 					case 2:
-						this.$api.navigateTo(`/pages/user/order/orderShareLogin?orderID=${this.orderID}&userID=${this.userID}`)
+						this.$api.navigateTo(`/pages/user/order/orderShareLogin?orderId=${this.orderId}&userId=${this.userId}`)
 						break;
 				}
 			}

pages/user/order/success.vue

@@ -10,7 +10,7 @@
 					<text>{{ successText }}</text>
 				</view>
 				<view class="cash-btn">
-					<view class="btn btn-open" @click="this.$api.navigateTo('/pages/user/order/order-details?type=confim&orderID='+orderID)">查看订单</view>
+					<view class="btn btn-open" @click="this.$api.navigateTo('/pages/user/order/order-details?type=confim&orderId='+orderId)">查看订单</view>
 					<view class="btn btn-home" @click="this.$api.switchTabTo('/pages/tabBar/home/index')">继续采购</view>
 				</view>
 			</view>
@@ -22,7 +22,7 @@
 	export default{
 		data(){
 			return{
-				orderID:'',
+				orderId:'',
 				nvabarData: {		//顶部自定义导航
 					haveBack:false,
 					showCapsule:1, // 是否显示左上角图标  1表示显示  0表示不显示,
@@ -47,8 +47,8 @@
 		methods:{
 			initData(e){
 				let data = JSON.parse(e.data);
-				this.orderID = data.data.orderID
-				console.log(this.orderID)
+				this.orderId = data.data.orderId
+				console.log(this.orderId)
 			}
 		},
 		onShow() {

services/order.service.js

@@ -8,45 +8,91 @@ export default class OrderService {
 	}
 	/* 查询订单列表 */
 	QueryOrderList (data = {}) {
-		return this.AjaxService.get({ url:'/order/list', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/order/club/list', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 	/* 查询订单详情 */
 	QueryOrderDetails (data = {}) {
-		return this.AjaxService.get({ url:'/order/detail', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/order/club/detail', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 	/* 操作取消订单 */
 	CancelOrder (data = {}) {
-		return this.AjaxService.get({ url:'/order/cancel', data, isLoading: true })
+		return this.AjaxService.post({ 
+			url:'/order/club/cancel', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 	/* 操作删除订单 */
 	DeleteOrder (data = {}) {
-		return this.AjaxService.get({ url:'/order/delete', data, isLoading: true })
+		return this.AjaxService.post({ 
+			url:'/order/club/delete', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 	/* 确认订单操作 */
 	AffirmOrder (data = {}) {
-		return this.AjaxService.post({ url:'/order/affirmOrder', data, isLoading: true })
+		return this.AjaxService.post({ 
+			url:'/order/club/confirm', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 	/* 确认收货操作 */
 	ConfirmReceipt (data = {}) {
-		return this.AjaxService.get({ url:'/order/affirm', data, isLoading: true })
+		return this.AjaxService.post({ 
+			url:'/order/club/receive', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
-	/* 确认收货操作 */
+	/* 订单物流信息 */
 	QueryLogistics (data = {}) {
-		return this.AjaxService.get({ url:'/order/logistics', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/order/club/logistics', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 	/**
 	 *获取订单分享码
 	 * @param orderID
 	 */
 	QueryOrderShareCode (data = {}) {
-		return this.AjaxService.get({ url:'/order/share', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/order/club/share/code', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 	/**
-	 *获取订单分享码
+	 *校验订单分享码
 	 * @param orderID
 	 */
 	OrderShareCode (data = {}) {
-		return this.AjaxService.get({ url:'/order/shareCode', data, isLoading: true,isStatus: true })
+		return this.AjaxService.get({ 
+			url:'/order/club/share/code/check', 
+			data, 
+			isLoading: true,
+			isStatus: true ,
+			isHost:true
+		})
 	}
 	/**
 	 *机构搜索订单
@@ -56,21 +102,36 @@ export default class OrderService {
 	 *@param pageSize	条数
 	 */
 	SearchOrderInfo (data = {}) {
-		return this.AjaxService.get({ url:'/order/search', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/order/club/search', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 	/**
 	 *搜索订单历史记录
 	 * @param orderID
 	 */
 	SearchOrderHistory (data = {}) {
-		return this.AjaxService.get({ url:'/order/searchHistory', data, isLoading: false })
+		return this.AjaxService.get({ 
+			url:'/order/club/search/history', 
+			data, 
+			isLoading: false ,
+			isHost:true
+		})
 	}
 	/**
 	 *清楚订单历史记录
 	 * @param orderID
 	 */
 	ClearOrderHistory (data = {}) {
-		return this.AjaxService.get({ url:'/order/searchHistory/delete', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/order/club/search/history/delete', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 	/**
 	 *@机构-商品立即购买确认订单初始化数据
@@ -151,18 +212,38 @@ export default class OrderService {
 	}
 	/* 订单支付,效验付款规则 orderId 订单ID */
 	OrderPaymentValidation (data = {}) {
-		return this.AjaxService.get({ url:'/order/paymentValidation', data, isLoading: false })
+		return this.AjaxService.get({ 
+			url:'/order/pay/check', 
+			data, 
+			isLoading: false ,
+			isHost:true
+		})
 	}
 	/* 余额抵扣 orderId 订单ID */
 	OrderBalanceDeduction (data = {}) {
-		return this.AjaxService.post({ url:'/order/balanceDeduction', data, isLoading: false })
+		return this.AjaxService.post({ 
+			url:'/order/pay/balance/deduction', 
+			data, 
+			isLoading: false ,
+			isHost:true
+		})
 	}
 	/* 分享订单初始化查询 orderId 订单ID */
 	OrderCommodityData (data = {}) {
-		return this.AjaxService.get({ url:'/order/commodityData', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/order/club/share/product', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 	/*二手订单 打款供应商 */
 	confirmpayment (data = {}) {
-		return this.AjaxService.post({ url:'/order/affirm/payment', data, isLoading: true })
+		return this.AjaxService.post({ 
+			url:'/order/club/second/payment/confirm', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 }