Kaynağa Gözat

订单模块修改

zhengjinyi 3 yıl önce
ebeveyn
işleme
27688b85cd

+ 21 - 0
components/cm-module/orderDetails/goodsList.vue

@@ -182,6 +182,27 @@
 				height: 56rpx;
 				line-height: 56rpx;
 				margin-bottom: 12rpx;
+				.floor-item-act{
+					height: 56rpx;
+					text-align: center;
+					box-sizing: border-box;
+					float: left;
+					padding: 10rpx 0;
+					margin-right: 12rpx;
+					.floor-tags{
+						height: 28rpx;
+						border-radius: 6rpx;
+						background-color: #FFFFFF;
+						line-height: 28rpx;
+						color: $color-system;
+						text-align: center;
+						display: inline-block;
+						padding:0 6rpx;
+						font-size: $font-size-20;
+						border: 1px solid #E15616;
+						float: left;
+					}
+				}	
 				.title-text{
 					width: 400rpx;
 					overflow: hidden;

+ 260 - 248
pages/goods/goods-active.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container" v-show="isRepuest">
 		<view class="container-title">
-			<view class="name">【{{promotionsInfo.name}}】{{promotionsInfo.description}}</view>
+			<view class="name">【{{ promotionsInfo.name }}】{{ promotionsInfo.description }}</view>
 			<view class="text">
 				<text class="span">促销时间:</text>
 				<text class="span r">
@@ -14,322 +14,334 @@
 		<view class="tui-order-content">
 			<view class="hotgoods-swiper">
 				<view class="scoll-wrapper clearfix">
-					<view class="floor-item" v-for="(item, index) in  productList" :key="index" @click.stop="detail(item.productId)">
+					<view
+						class="floor-item"
+						v-for="(item, index) in productList"
+						:key="index"
+						@click.stop="detail(item.productId)"
+					>
 						<image class="tui-skeleton-fillet" :src="item.image" mode="aspectFill"></image>
 						<view class="floor-item-content">
-							<view class="title"><text class="mclap">{{item.name}}</text></view>
+							<view class="title"
+								><text class="mclap">{{ item.name }}</text></view
+							>
 							<view class="price">
-								<text class="p sm">¥</text>
-								<text class="p big">{{item.price | NumFormat}}</text>
+								<text class="p sm">¥</text> <text class="p big">{{ item.price | NumFormat }}</text>
 							</view>
 						</view>
 					</view>
 				</view>
-			</view>	
+			</view>
 			<!--加载loadding-->
 			<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-			<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
+			<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text="nomoreText"></tui-nomore>
 			<!--加载loadding-->
 		</view>
 	</view>
 </template>
 
 <script>
-	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
-	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	import { mapState,mapMutations} from 'vuex';
-	
-	export default {
-		components: {
-			tuiLoadmore,
-			tuiNomore,
-		},
-		data() {
-			return {
-				isRepuest:false,
-				userID:0,
-				promotionsId:0,
-				productList: [],
-				pageSize:10,
-				pageNum:1,
-				loadding: false,
-				pullUpOn: true,
-				modal:false,
-				promotionsInfo:{},
-				loadding: false,
-				pullUpOn: true,
-				hasNextPage: false,
-				pullFlag: true,
-				nomoreText: '上拉显示更多',
-			}
-		},
-		computed: {
-			...mapState(['identity'])
-		},
-		onLoad(option) {
-			this.promotionsId=option.id
-			this.$api.getComStorage('userInfo').then((resolve) =>{
-				this.userID = resolve.userId ? resolve.userId :0;
+import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
+import tuiNomore from '@/components/tui-components/nomore/nomore'
+import { mapState, mapMutations } from 'vuex'
+
+export default {
+	components: {
+		tuiLoadmore,
+		tuiNomore
+	},
+	data() {
+		return {
+			isRepuest: false,
+			userID: 0,
+			promotionsId: 0,
+			productList: [],
+			pageSize: 10,
+			pageNum: 1,
+			loadding: false,
+			pullUpOn: true,
+			modal: false,
+			promotionsInfo: {},
+			loadding: false,
+			pullUpOn: true,
+			hasNextPage: false,
+			pullFlag: true,
+			nomoreText: '上拉显示更多'
+		}
+	},
+	computed: {
+		...mapState(['identity'])
+	},
+	onLoad(option) {
+		this.promotionsId = option.id
+		this.$api
+			.getComStorage('userInfo')
+			.then(resolve => {
+				this.userID = resolve.userId ? resolve.userId : 0
 				this.initSsoMemberCollectionList()
-			}).catch(error =>{
+			})
+			.catch(error => {
 				this.initSsoMemberCollectionList()
 			})
-		},
-		filters: {
-			NumFormat:function(text) {//处理金额
-				return Number(text).toFixed(2);
-			},
-		},
-		methods: {
-			initSsoMemberCollectionList(id){//凑单初始化
-				this.ProductService.queryProductPromotionInfo(
-					{
-						promotionsId:this.promotionsId,
-					}
-				)
-				.then(response =>{
+	},
+	filters: {
+		NumFormat: function(text) {
+			//处理金额
+			return Number(text).toFixed(2)
+		}
+	},
+	methods: {
+		initSsoMemberCollectionList(id) {
+			//凑单初始化
+			this.ProductService.queryProductPromotionInfo({
+				promotionsId: this.promotionsId
+			})
+				.then(response => {
 					let data = response.data
 					this.promotionsInfo = data
 					this.queryProductPromotionList()
 				})
-				.catch(error =>{
-					this.$util.msg(error.message,2000)
-				})	
-			},
-			queryProductPromotionList(id){//查询凑单商品列表
-				this.ProductService.queryProductPromotionList(
-					{
-						identity:this.identity,
-						pageNum:this.pageNum,
-						pageSize:this.pageSize,
-						promotionsId:this.promotionsId,
-					}
-				)
-				.then(response =>{
+				.catch(error => {
+					this.$util.msg(error.message, 2000)
+				})
+		},
+		queryProductPromotionList(id) {
+			//查询凑单商品列表
+			this.ProductService.queryProductPromotionList({
+				identity: this.identity,
+				pageNum: this.pageNum,
+				pageSize: this.pageSize,
+				promotionsId: this.promotionsId
+			})
+				.then(response => {
 					let data = response.data
-					if(data.list && data.list.length > 0){
-						this.hasNextPage = data.hasNextPage;
-						this.productList = data.list;
+					if (data.list && data.list.length > 0) {
+						this.hasNextPage = data.hasNextPage
+						this.productList = data.list
 						this.getProductPrice()
 						// 防上拉暴滑
-						this.pullFlag = false;
-						setTimeout(()=>{ this.pullFlag = true; },500)
+						this.pullFlag = false
+						setTimeout(() => {
+							this.pullFlag = true
+						}, 500)
 						// 底部提示文案
-						if(this.hasNextPage){
+						if (this.hasNextPage) {
 							this.pullUpOn = false
 							this.nomoreText = '上拉显示更多'
-						}else{
-							if(this.productList.length < 2){
+						} else {
+							if (this.productList.length < 2) {
 								this.pullUpOn = true
-							}else{
+							} else {
 								this.pullUpOn = false
 								this.nomoreText = '已至底部'
 							}
 						}
 					}
 				})
-				.catch(error =>{
-					this.$util.msg(error.message,2000)
-				})	
-			},
-			getOnReachBottomData(){//上滑加载
-				this.pageNum+=1
-				this.ProductService.queryProductPromotionList(
-					{
-						pageNum:this.pageNum,
-						pageSize:this.pageSize,
-						promotionsId:this.promotionsId,
-					}
-				)
-				.then(response =>{
+				.catch(error => {
+					this.$util.msg(error.message, 2000)
+				})
+		},
+		getOnReachBottomData() {
+			//上滑加载
+			this.pageNum += 1
+			this.ProductService.queryProductPromotionList({
+				pageNum: this.pageNum,
+				pageSize: this.pageSize,
+				promotionsId: this.promotionsId
+			})
+				.then(response => {
 					let data = response.data
-					if(data.list&&data.list.length > 0){
-						this.hasNextPage = data.hasNextPage;
-						this.productList = this.productList.concat(data.list) 
+					if (data.list && data.list.length > 0) {
+						this.hasNextPage = data.hasNextPage
+						this.productList = this.productList.concat(data.list)
 						this.getProductPrice()
-						this.pullFlag = false;// 防上拉暴滑
-						setTimeout(()=>{this.pullFlag = true;},500)
-						if(this.hasNextPage){
+						this.pullFlag = false // 防上拉暴滑
+						setTimeout(() => {
+							this.pullFlag = true
+						}, 500)
+						if (this.hasNextPage) {
 							this.pullUpOn = false
 							this.nomoreText = '上拉显示更多'
-						}else{
+						} else {
 							this.pullUpOn = false
 							this.loadding = false
 							this.nomoreText = '已至底部'
 						}
 					}
 				})
-				.catch(error =>{
-					this.$util.msg(error.msg,2000)
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
 				})
-			},
-			getProductPrice(){//获取商品或者活动价格
-				let productIdArr = [];
-				let productIds ='';
-				this.productList.map(item=>{
-					productIdArr.push(item.id)
+		},
+		getProductPrice() {
+			//获取商品或者活动价格
+			let productIdArr = []
+			let productIds = ''
+			this.productList.map(item => {
+				productIdArr.push(item.productId)
+			})
+			productIds = productIdArr.join(',')
+			this.ProductService.querySearchProductPrice({
+				userId: this.userID,
+				productIds: productIds,
+				source: 2
+			})
+				.then(response => {
+					this.productList = this.ReturnNewProducts(this.productList, response.data)
+					this.isRepuest = true
 				})
-				productIds = productIdArr.join(",");
-				this.ProductService.querySearchProductPrice(
-					{
-						userId: this.userID,
-						productIds:productIds,
-						source: 2
-					}
-				).then(response =>{
-					this.productList = this.ReturnNewProducts(this.productList,response.data);
-					this.isRepuest = true;
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
 				})
-			},
-			ReturnNewProducts(Array,list){
-				let NewArray = []
-				Array.map(item=>{
-					for (let i = 0; i < list.length; i++) {
-						if( item.id == list[i].productId ){
-							NewArray.push(Object.assign(item,list[i])) 
-						}
-					}
-				});
-				return NewArray
-			},
-			detail: function(id) {
-				this.$api.navigateTo(`/pages/goods/productDetail?id=${id}`)
-			},
 		},
-		onReachBottom() {
-			if(this.hasNextPage){
-				this.loadding = true
-				this.pullUpOn = true
-				this.getOnReachBottomData()
-			}	
-		},
-		onPullDownRefresh() {//下拉刷新
-			this.pageNum = 1
-			this.queryProductPromotionList()
-			uni.stopPullDownRefresh()
+		ReturnNewProducts(Array, list) {
+			let NewArray = []
+			Array.map(item => {
+				for (let i = 0; i < list.length; i++) {
+					if (item.productId == list[i].productId) {
+						NewArray.push(Object.assign(item, list[i]))
+					}
+				}
+			})
+			return NewArray
 		},
-		onShow() {
-			
+		detail: function(id) {
+			this.$api.navigateTo(`/pages/goods/productDetail?id=${id}`)
 		}
-	}
+	},
+	onReachBottom() {
+		if (this.hasNextPage) {
+			this.loadding = true
+			this.pullUpOn = true
+			this.getOnReachBottomData()
+		}
+	},
+	onPullDownRefresh() {
+		//下拉刷新
+		this.pageNum = 1
+		this.queryProductPromotionList()
+		uni.stopPullDownRefresh()
+	},
+	onShow() {}
+}
 </script>
 
 <style lang="scss">
-	page{
-		background-color: #F7F7F7;
-	}
-	.container {
-		padding-bottom: 0;
-	}
-	.container-title{
+page {
+	background-color: #f7f7f7;
+}
+.container {
+	padding-bottom: 0;
+}
+.container-title {
+	width: 100%;
+	height: 242rpx;
+	box-sizing: border-box;
+	padding: 21rpx 24rpx 23rpx 24rpx;
+	background: url(https://static.caimei365.com/app/img/bg/icon-activity-bg@2x.png);
+	background-size: cover;
+	.name {
 		width: 100%;
-		height: 242rpx;
 		box-sizing: border-box;
-		padding:21rpx 24rpx 23rpx 24rpx;
-		background-size: cover;
-		.name{
-			width: 100%;
-			box-sizing: border-box;
-			height: 96rpx;
-			line-height: 36rpx;
-			padding: 12rpx 0;
-			font-size: $font-size-28;
-			color: #FFFFFF;
-		}
-		.text{
-			width: 100%;
-			height: 48rpx;
-			line-height: 48rpx;
-			font-size: $font-size-24;
-			color: #FFFFFF;
-			.span{
-				display: inline-block;
-				float: left;
-				&.r{
-					padding:0 20rpx;
-					height: 36rpx;
-					line-height: 36rpx;
-					border-radius: 6rpx;
-					text-align: center;
-					color: $color-system;
-					font-size: $font-size-26;
-					margin-top: 4rpx;
-					background-color: #FFFFFF;
-					margin-left: 10rpx;
-				}
+		height: 96rpx;
+		line-height: 36rpx;
+		padding: 12rpx 0;
+		font-size: $font-size-28;
+		color: #ffffff;
+	}
+	.text {
+		width: 100%;
+		height: 48rpx;
+		line-height: 48rpx;
+		font-size: $font-size-24;
+		color: #ffffff;
+		.span {
+			display: inline-block;
+			float: left;
+			&.r {
+				padding: 0 20rpx;
+				height: 36rpx;
+				line-height: 36rpx;
+				border-radius: 6rpx;
+				text-align: center;
+				color: $color-system;
+				font-size: $font-size-26;
+				margin-top: 4rpx;
+				background-color: #ffffff;
+				margin-left: 10rpx;
 			}
 		}
 	}
-	.hotgoods-swiper{
+}
+.hotgoods-swiper {
+	width: 100%;
+	height: auto;
+	overflow: hidden;
+	margin-bottom: 20rpx;
+	.scoll-wrapper {
 		width: 100%;
-		height: auto;				
-		overflow: hidden;
-		margin-bottom: 20rpx;
-		.scoll-wrapper{
-			width: 100%;
+		height: auto;
+		box-sizing: border-box;
+		padding: 24rpx;
+		background: #f7f7f7;
+		.floor-item {
+			width: 340rpx;
 			height: auto;
+			margin-right: 20rpx;
+			font-size: $font-size-24;
+			color: $text-color;
+			background: #ffffff;
+			line-height: 36rpx;
+			border-radius: 14rpx;
+			margin-bottom: 20rpx;
+			float: left;
 			box-sizing: border-box;
-			padding: 24rpx;
-			background: #F7F7F7;
-			.floor-item{
-				width: 340rpx;
-				height: auto;
-				margin-right: 20rpx;
-				font-size: $font-size-24;
-				color: $text-color;
-				background: #FFFFFF;
-				line-height: 36rpx;
-				border-radius: 14rpx;
+			padding-bottom: 16rpx;
+			&:nth-child(2n) {
+				margin-right: 0;
+			}
+			image {
+				width: 341rpx;
+				height: 341rpx;
+				border-radius: 20rpx 20rpx 0 0;
+				display: block;
 				margin-bottom: 20rpx;
-				float: left;
+			}
+			.floor-item-content {
+				width: 100%;
+				padding: 0 15rpx;
 				box-sizing: border-box;
-				padding-bottom: 16rpx;
-				&:nth-child(2n){
-					margin-right: 0;
-				}
-				image{
-					width: 341rpx;
-					height: 341rpx;
-					border-radius: 20rpx 20rpx 0 0;
-					display: block;
-					margin-bottom: 20rpx;
-				}
-				.floor-item-content{
+			}
+			.title {
+				width: 100%;
+				height: 72rpx;
+				display: flex;
+				flex-direction: column;
+				padding: 10rpx 0;
+				.mclap {
 					width: 100%;
-					padding: 0 15rpx;
-					box-sizing: border-box;
+					line-height: 36rpx;
+					text-overflow: ellipsis;
+					display: -webkit-box;
+					word-break: break-all;
+					-webkit-box-orient: vertical;
+					-webkit-line-clamp: 2;
+					overflow: hidden;
+					font-size: 26rpx;
 				}
-				.title{
-					width: 100%;
-					height: 72rpx;
-					display: flex;
-					flex-direction: column;
-					padding: 10rpx 0;
-					.mclap{
-						width: 100%;
-						line-height: 36rpx;
-						text-overflow:ellipsis;
-						display: -webkit-box;
-						word-break: break-all;
-						-webkit-box-orient: vertical;
-						-webkit-line-clamp: 2;
-						overflow: hidden;
-						font-size: 26rpx;
-					}
+			}
+			.price {
+				color: #ff2a2a;
+				line-height: 44rpx;
+				.sm {
+					font-size: $font-size-24;
 				}
-				.price{
-					color: #333333;
-					line-height: 44rpx;
-					.sm{
-						font-size: $font-size-24;
-					}
-					.big{
-						font-size: $font-size-28;
-					}
+				.big {
+					font-size: $font-size-28;
 				}
 			}
 		}
 	}
+}
 </style>

+ 1 - 1
pages/user/order/order-list.vue

@@ -758,7 +758,7 @@
 				color: $color-system;
 				text-align: center;
 				display: inline-block;
-				padding:0 16rpx;
+				padding:0 6rpx;
 				font-size: $font-size-20;
 				border: 1px solid #E15616;
 				float: left;

+ 368 - 336
pages/user/regularPurchase/regularPurchase.vue

@@ -2,27 +2,43 @@
 	<view class="container all-type-list-wrapper">
 		<product-list ref="productList" @operationConfim="hanldOperationConfim"></product-list>
 		<!--底部选择模态层弹窗组件 -->
-		<view class="popup spec" :class="specClass"  @touchmove.stop.prevent="discard" @tap="hideSpec">
+		<view class="popup spec" :class="specClass" @touchmove.stop.prevent="discard" @tap="hideSpec">
 			<!-- 遮罩层 -->
 			<view class="mask"></view>
-			<view class="layer" @tap.stop="discard" :style="{paddingBottom :isIphoneX ? '68rpx' : '36rpx',bottom:isIphoneX ?'-332rpx' : '-294rpx'}">
+			<view
+				class="layer"
+				@tap.stop="discard"
+				:style="{ paddingBottom: isIphoneX ? '68rpx' : '36rpx', bottom: isIphoneX ? '-332rpx' : '-294rpx' }"
+			>
 				<view class="content">
-					<view class="layer-smimg">
-						<image :src="handleData.image" mode=""></image>
-					</view>
+					<view class="layer-smimg"> <image :src="handleData.image" mode=""></image> </view>
 					<view class="layer-nunbox">
 						<view class="layer-nunbox-t">
 							<view class="layer-nunbox-text">数量:</view>
 							<view class="number-box">
-								<view  class="iconfont icon-jianhao" :class="[isQuantity==true?'disabled':'']" @click="changeCountSub()"></view>
-								<input class="btn-input" type="number" v-model="number" maxlength='4'  @blur="changeNumber($event)">
-								<view  class="iconfont icon-jiahao"  :class="[isStock==true?'disabled':'']" @click="changeCountAdd()"></view>
+								<view
+									class="iconfont icon-jianhao"
+									:class="[isQuantity == true ? 'disabled' : '']"
+									@click="changeCountSub()"
+								></view>
+								<input
+									class="btn-input"
+									type="number"
+									v-model="number"
+									maxlength="4"
+									@blur="changeNumber($event)"
+								/>
+								<view
+									class="iconfont icon-jiahao"
+									:class="[isStock == true ? 'disabled' : '']"
+									@click="changeCountAdd()"
+								></view>
 							</view>
 						</view>
 						<view class="layer-nunbox-b">
-							<view class="text">单价:
-								<text class="p sm">¥</text>
-								<text class="p bg">{{buyRetailPrice.toFixed(2)}}</text>
+							<view class="text"
+								>单价: <text class="p sm">¥</text>
+								<text class="p bg">{{ buyRetailPrice.toFixed(2) }}</text>
 							</view>
 						</view>
 					</view>
@@ -37,383 +53,399 @@
 </template>
 
 <script>
-	import productList from '@/components/cm-module/listTemplate/productList'
-	export default{
-		components:{
-			productList
-		},
-		data(){
-			return{
-				userId: '',
-				serverUrl: '',
-				emptyText: '',
-				lastPageType: '',
-				lastPageVal: '',
-				isIphoneX:this.$store.state.isIphoneX,
-				specClass: '',//规格弹窗css类,控制开关动画
-				handleData:{},
-				isQuantity:false,
-				isStock:false,
-				minBuyNumber:0,
-				number:0,
-				buyRetailPrice:0,
-				buyRetailPriceStep:1,
+import productList from '@/components/cm-module/listTemplate/productList'
+export default {
+	components: {
+		productList
+	},
+	data() {
+		return {
+			userId: '',
+			serverUrl: '',
+			emptyText: '',
+			lastPageType: '',
+			lastPageVal: '',
+			isIphoneX: this.$store.state.isIphoneX,
+			specClass: '', //规格弹窗css类,控制开关动画
+			handleData: {},
+			isQuantity: false,
+			isStock: false,
+			minBuyNumber: 0,
+			number: 0,
+			buyRetailPrice: 0,
+			buyRetailPriceStep: 1
+		}
+	},
+	onLoad() {},
+	methods: {
+		hanldOperationConfim(data) {
+			//显示选择数量确认弹窗
+			this.specClass = 'show'
+			this.handleData = data
+			this.minBuyNumber = data.minBuyNumber
+			this.buyRetailPrice = data.price
+			this.buyRetailPriceStep = data.step
+			if (this.handleData.ladderPriceFlag == 1) {
+				this.number = data.maxBuyNumber
+			} else {
+				this.number = data.minBuyNumber
 			}
 		},
-		onLoad() {
-
+		hideSpec() {
+			//关闭选择数量确认弹窗
+			this.specClass = 'hide'
+			setTimeout(() => {
+				this.specClass = 'none'
+			}, 200)
 		},
-		methods:{
-			hanldOperationConfim(data){//显示选择数量确认弹窗
-				this.specClass = 'show'
-				this.handleData = data
-				this.minBuyNumber = data.minBuyNumber
-				this.buyRetailPrice = data.price
-				this.buyRetailPriceStep = data.step
-				if(this.handleData.ladderPriceFlag == 1){
-					this.number = data.maxBuyNumber
-				}else{
-					this.number = data.minBuyNumber
-				}
-			},
-			hideSpec() {//关闭选择数量确认弹窗
-				this.specClass = 'hide'
-				setTimeout(() => {
-					this.specClass = 'none'
-				}, 200)
-			},
-			changeCountAdd(){//popup弹窗数量增加按钮
-				if(this.buyRetailPriceStep == 2){
-					this.number += this.minBuyNumber
-				}else{
-					this.number++
+		changeCountAdd() {
+			//popup弹窗数量增加按钮
+			if (this.buyRetailPriceStep == 2) {
+				this.number += this.minBuyNumber
+			} else {
+				this.number++
+			}
+			this.calculatPerice()
+		},
+		changeCountSub() {
+			//popup弹窗数量减按钮
+			if (this.number <= this.minBuyNumber) {
+				this.number = this.minBuyNumber
+				this.isQuantity = true
+				this.$util.msg(`该商品最小起订量为${this.minBuyNumber}`, 2000)
+				return
+			} else {
+				if (this.buyRetailPriceStep == 2) {
+					this.number -= this.minBuyNumber
+				} else {
+					this.number--
 				}
 				this.calculatPerice()
-			},
-			changeCountSub(){//popup弹窗数量减按钮
-				if(this.number<=this.minBuyNumber){
-					this.number= this.minBuyNumber
-					this.isQuantity =true
-					this.$util.msg(`该商品最小起订量为${this.minBuyNumber}`,2000)
-					return
-				}else{
-					if(this.buyRetailPriceStep == 2){
-						this.number-=this.minBuyNumber
-					}else{
-						this.number--
+				this.isQuantity = false
+			}
+		},
+		changeNumber(e) {
+			let _value = e.detail.value
+			if (!this.$api.isNumber(_value)) {
+				this.number = this.minBuyNumber
+			} else if (_value < this.minBuyNumber) {
+				this.$util.msg(`该商品最小起订量为${this.minBuyNumber}`, 2000)
+				this.number = this.minBuyNumber
+			} else if (_value % this.minBuyNumber != 0) {
+				this.$util.msg('购买量必须为起订量的整数倍', 2000)
+				this.number = this.minBuyNumber
+			} else {
+				this.number = e.detail.value
+				this.calculatPerice()
+			}
+		},
+		calculatPerice() {
+			//判断是否为阶梯价然后做计算价格处理
+			if (this.handleData.ladderPriceFlag == 1) {
+				this.handleData.ladderPriceList.forEach((item, index) => {
+					if (this.number >= item.buyNum) {
+						this.buyRetailPrice = item.buyPrice
 					}
-					this.calculatPerice()
-					this.isQuantity =false
-				}
-			 },
-			changeNumber(e){
-				let _value = e.detail.value
-				if(!this.$api.isNumber(_value)){
-					this.number = this.minBuyNumber
-				}else if(_value < this.minBuyNumber){	
-					this.$util.msg(`该商品最小起订量为${this.minBuyNumber}`,2000)
-					this.number = this.minBuyNumber
-				}else if( _value % this.minBuyNumber !=0 ){
-					this.$util.msg('购买量必须为起订量的整数倍',2000)
-					this.number = this.minBuyNumber
-				}else{
-					this.number = e.detail.value
-					this.calculatPerice()
-				}
-			},
-			calculatPerice(){//判断是否为阶梯价然后做计算价格处理
-				if(this.handleData.ladderPriceFlag == 1){
-					this.handleData.ladderPriceList.forEach((item,index)=>{
-						if(this.number>=item.buyNum){
-							this.buyRetailPrice = item.buyPrice
-						}
-					})
-				}
-			},
-			toConfirmation(){//跳转确认订单页面
-				this.specClass = 'hide'
-				let productStp ={
-						allPrice:this.number*this.buyRetailPrice,
-						allCount:this.number,
-						productID:this.handleData.productId,
-						productCount:this.number
-				}	
-				this.$api.navigateTo(`/pages/user/order/create-order?type=prodcut&data=${JSON.stringify({data:productStp})}`)
-				setTimeout(() => {
-					this.specClass = 'none'
-				}, 200)
-			},
-			getAddProductCart(){//增加购物车成功和toast弹窗提示成功
-				this.ProductService.shoppingAddCart({productID:this.handleData.productId,userID:this.userId,productCount:this.number}).then(response => {
+				})
+			}
+		},
+		toConfirmation() {
+			//跳转确认订单页面
+			this.specClass = 'hide'
+			let productStp = {
+					productIds:this.handleData.productId,
+					productCount: this.number
+			}
+			this.$api.navigateTo(
+				`/pages/user/order/create-order?type=prodcut&data=${JSON.stringify({ data: productStp })}`
+			)
+			setTimeout(() => {
+				this.specClass = 'none'
+			}, 200)
+		},
+		getAddProductCart() {
+			//增加购物车成功和toast弹窗提示成功
+			this.ProductService.shoppingAddCart({
+				productId: this.handleData.productId,
+				userId: this.userId,
+				productCount: this.number
+			})
+				.then(response => {
 					this.specClass = 'hide'
-					this.$util.msg(response.msg,1500,true,'success')
-					setTimeout(() => {this.specClass = 'none'}, 200)
+					this.$util.msg('加入购物车成功', 1500, true, 'success')
+					setTimeout(() => {
+						this.specClass = 'none'
+					}, 1500)
 					this.GetUserCartNumber()
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
 				})
-			},
-			GetUserCartNumber(){
-				this.UserService.GetUserCartNumber({userId:this.userId}).then(response =>{
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
+				})
+		},
+		GetUserCartNumber() {
+			this.UserService.GetUserCartNumber({ userId: this.userId })
+				.then(response => {
 					this.$refs.productList.cartQuantity = response.data.length
-				}).catch(error =>{
+				})
+				.catch(error => {
 					console.log('查询用户购物车数量失败')
 				})
-			},
-			discard(){
-				//丢弃
-			}
-		},
-		onShow() {
-			let pages = getCurrentPages(),thisPage = pages[pages.length - 1]
-			this.$api.getStorage().then((resolve) =>{
-				this.userId = resolve.userId ? resolve.userId : 0
-			})
 		},
+		discard() {
+			//丢弃
+		}
+	},
+	onShow() {
+		let pages = getCurrentPages(),
+			thisPage = pages[pages.length - 1]
+		this.$api.getStorage().then(resolve => {
+			this.userId = resolve.userId ? resolve.userId : 0
+		})
 	}
+}
 </script>
 
 <style lang="scss">
-	page {
-		background: $sub-bg-color;
-		.all-type-list-wrapper {
-			display: flex;
-			flex-direction: column;
-		}
+page {
+	background: $sub-bg-color;
+	.all-type-list-wrapper {
+		display: flex;
+		flex-direction: column;
 	}
-	/* 加入购物模态层*/
-	@keyframes showPopup {
-		0% {
-			opacity: 0;
-		}
-		100% {
-			opacity: 1;
-		}
+}
+/* 加入购物模态层*/
+@keyframes showPopup {
+	0% {
+		opacity: 0;
 	}
-	@keyframes hidePopup {
-		0% {
-			opacity: 1;
-		}
-		100% {
-			opacity: 0;
-		}
+	100% {
+		opacity: 1;
 	}
-	@keyframes showLayer {
-		0% {
-			transform: translateY(0);
-		}
-		100% {
-			transform: translateY(-100%);
-		}
+}
+@keyframes hidePopup {
+	0% {
+		opacity: 1;
 	}
-	@keyframes hideLayer {
-		0% {
-			transform: translateY(-100%);
-		}
-		100% {
-			transform: translateY(0);
-		}
+	100% {
+		opacity: 0;
 	}
-	@keyframes showAmnation {
-		0% {
-			top: -12rpx;
-			opacity: 0;
-		}
-		50% {
-			top: -60rpx;
-			opacity: 1;
-		}
-		100% {
-			top: -100rpx;
-			opacity: 0;
-		}
+}
+@keyframes showLayer {
+	0% {
+		transform: translateY(0);
 	}
-	@keyframes hideAmnation {
-		0% {
-			top: -100rpx;
-			opacity: 0;
-		}
-		100% {
-			top: -12rpx;
-			opacity: 0;
-		}
+	100% {
+		transform: translateY(-100%);
+	}
+}
+@keyframes hideLayer {
+	0% {
+		transform: translateY(-100%);
+	}
+	100% {
+		transform: translateY(0);
+	}
+}
+@keyframes showAmnation {
+	0% {
+		top: -12rpx;
+		opacity: 0;
+	}
+	50% {
+		top: -60rpx;
+		opacity: 1;
+	}
+	100% {
+		top: -100rpx;
+		opacity: 0;
 	}
-	.popup {
+}
+@keyframes hideAmnation {
+	0% {
+		top: -100rpx;
+		opacity: 0;
+	}
+	100% {
+		top: -12rpx;
+		opacity: 0;
+	}
+}
+.popup {
+	position: fixed;
+	top: 0;
+	width: 100%;
+	height: 100%;
+	z-index: 999;
+	display: none;
+	.mask {
 		position: fixed;
 		top: 0;
 		width: 100%;
 		height: 100%;
-		z-index: 999;
-		display: none;
-		.mask{
-			position: fixed;
-			top: 0;
+		z-index: 21;
+		background-color: rgba(0, 0, 0, 0.6);
+	}
+	.layer {
+		position: fixed;
+		z-index: 22;
+		bottom: -294rpx;
+		width: 702rpx;
+		padding: 24rpx 24rpx 36rpx 24rpx;
+		height: 236rpx;
+		border-radius: 20rpx 20rpx 0 0;
+		background-color: #fff;
+		display: flex;
+		flex-wrap: wrap;
+		align-content: space-between;
+		.content {
 			width: 100%;
-			height: 100%;
-			z-index: 21;
-			background-color: rgba(0, 0, 0, 0.6);
 		}
-		.layer {
-			position: fixed;
-			z-index: 22;
-			bottom: -294rpx;
-			width: 702rpx;
-			padding: 24rpx 24rpx 36rpx 24rpx;
-			height: 236rpx;
-			border-radius: 20rpx 20rpx 0 0;
-			background-color: #fff;
+		.btn {
+			width: 100%;
+			height: 88rpx;
 			display: flex;
-			flex-wrap: wrap;
-			align-content: space-between;
-			.content {
-				width: 100%;
-			}
-			.btn {
-				width: 100%;
+			.button {
+				width: 340rpx;
 				height: 88rpx;
+				color: #fff;
 				display: flex;
-				.button {
-					width: 340rpx;
-					height: 88rpx;
-					color: #fff;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					font-size: $font-size-28;
-					border-radius: 44rpx;
-					&.buy{
-						background: $btn-confirm;
-					}
-					&.add{
-						background: rgba(239, 175, 0, 1);
-						margin-left: 20rpx;
-					}
+				align-items: center;
+				justify-content: center;
+				font-size: $font-size-28;
+				border-radius: 44rpx;
+				&.buy {
+					background: $btn-confirm;
+				}
+				&.add {
+					background: rgba(239, 175, 0, 1);
+					margin-left: 20rpx;
 				}
 			}
 		}
-		
-		&.show {
-			display: block;
-			.mask{
-				animation: showPopup 0.2s linear both;
-			}
-			.layer {
-				animation: showLayer 0.2s linear both;
-			}
+	}
+
+	&.show {
+		display: block;
+		.mask {
+			animation: showPopup 0.2s linear both;
 		}
-		&.hide {
-			display: block;
-			.mask{
-				animation: hidePopup 0.2s linear both;
-			}
-			
-			.layer {
-				animation: hideLayer 0.2s linear both;
-			}
+		.layer {
+			animation: showLayer 0.2s linear both;
 		}
-		&.none {
-			display: none;
+	}
+	&.hide {
+		display: block;
+		.mask {
+			animation: hidePopup 0.2s linear both;
 		}
-		&.service {
-			.row {
-				margin: 30upx 0;
-				.title {
-					font-size: 30upx;
-					margin: 10upx 0;
-				}
-				.description {
-					font-size: 28upx;
-					color: #999;
-				}
+
+		.layer {
+			animation: hideLayer 0.2s linear both;
+		}
+	}
+	&.none {
+		display: none;
+	}
+	&.service {
+		.row {
+			margin: 30upx 0;
+			.title {
+				font-size: 30upx;
+				margin: 10upx 0;
+			}
+			.description {
+				font-size: 28upx;
+				color: #999;
 			}
 		}
-		.layer-smimg{
+	}
+	.layer-smimg {
+		width: 114rpx;
+		height: 114rpx;
+		float: left;
+		border-radius: 10rpx;
+		margin-right: 24rpx;
+		image {
 			width: 114rpx;
 			height: 114rpx;
-			float: left;
 			border-radius: 10rpx;
-			margin-right: 24rpx;
-			image{
-				width: 114rpx;
-				height: 114rpx;	
-				border-radius: 10rpx;
-			}
 		}
-		.layer-nunbox{
-			justify-content: space-between;
-			align-items: center;
-			width: 536rpx;
-			height: 88rpx;
-			padding: 13rpx 0 0 0;
-			float: left;
-			.layer-nunbox-t{
-				width: 100%;
-				height:44rpx;
-				position:relative;
+	}
+	.layer-nunbox {
+		justify-content: space-between;
+		align-items: center;
+		width: 536rpx;
+		height: 88rpx;
+		padding: 13rpx 0 0 0;
+		float: left;
+		.layer-nunbox-t {
+			width: 100%;
+			height: 44rpx;
+			position: relative;
+			display: flex;
+			.layer-nunbox-text {
+				line-height: 44rpx;
+				font-size: $font-size-28;
+			}
+			.number-box {
 				display: flex;
-				.layer-nunbox-text{
-					line-height: 44rpx;
-					font-size: $font-size-28;
-				}
-				.number-box{
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					border: 2rpx solid #ffe6dc;
-					border-radius: 30rpx;
-					height: 48rpx;
-					margin-left: 20rpx;
-					.iconfont{
-						font-size: $font-size-24;
-						padding:0 18rpx;
-						color: #999999;
-						text-align: center;
-						line-height: 48rpx;
-						font-weight: bold;
-						background: #fef6f3;
-						&.icon-jianhao{
-							border-radius: 30rpx 0 0 30rpx;
-						}
-						&.icon-jiahao{
-							border-radius: 0 30rpx 30rpx 0;
-						}
+				justify-content: center;
+				align-items: center;
+				border: 2rpx solid #ffe6dc;
+				border-radius: 30rpx;
+				height: 48rpx;
+				margin-left: 20rpx;
+				.iconfont {
+					font-size: $font-size-24;
+					padding: 0 18rpx;
+					color: #999999;
+					text-align: center;
+					line-height: 48rpx;
+					font-weight: bold;
+					background: #fef6f3;
+					&.icon-jianhao {
+						border-radius: 30rpx 0 0 30rpx;
 					}
-					.btn-input{
-						width: 62rpx;
-						height: 48rpx;
-						line-height: 48rpx;
-						background: #FFFFFF;
-						border-radius: 4rpx;
-						text-align: center;
-						font-size: $font-size-28;
+					&.icon-jiahao {
+						border-radius: 0 30rpx 30rpx 0;
 					}
 				}
-				.product-step{
-					position: absolute;
-					left: 45rpx;
-					bottom: 0;
-					height: 44rpx;
-					background: #FFFFFF;
+				.btn-input {
+					width: 62rpx;
+					height: 48rpx;
+					line-height: 48rpx;
+					background: #ffffff;
+					border-radius: 4rpx;
+					text-align: center;
+					font-size: $font-size-28;
 				}
 			}
-			.layer-nunbox-b{
-				width: 100%;
-				height:44rpx;
-				margin-top: 13rpx;
+			.product-step {
+				position: absolute;
+				left: 45rpx;
+				bottom: 0;
+				height: 44rpx;
+				background: #ffffff;
 			}
-			.text{
-				line-height: 44rpx;
-				font-size: $font-size-28;
-				.p{
-					color: #FF2A2A;
-				}
-				.p:first-child{
-					margin-left: 30rpx;
-				}
-				.p.sm{
-					font-size: $font-size-24;
-				}
+		}
+		.layer-nunbox-b {
+			width: 100%;
+			height: 44rpx;
+			margin-top: 13rpx;
+		}
+		.text {
+			line-height: 44rpx;
+			font-size: $font-size-28;
+			.p {
+				color: #ff2a2a;
+			}
+			.p:first-child {
+				margin-left: 30rpx;
+			}
+			.p.sm {
+				font-size: $font-size-24;
 			}
 		}
-	}	
+	}
+}
 </style>

+ 282 - 282
services/user.service.js

@@ -2,146 +2,146 @@
  * 这是用户业务逻辑的服务
  */
 export default class UserService {
-	constructor(AjaxService) {
-		Object.assign(this, { AjaxService })
-		this.name = 'UserService'
-	}
-	/* 初始化授权登录 */
-	UserLoginAuthApplets (data = {}) {
-		return this.AjaxService.post({
-			url: '/user/login/auth/applets',
-			data,
-			isLoading: false,
-			isHost:true
-		})
-	}
-	/* 邀请码授权登录 */
-	InvitationCodeLogin (data = {}) {
-		return this.AjaxService.post({
-			url: '/user/login/auth/invitation',
-			data,
-			isLoading: true,
-			isStatus: false,
-			isHost:true
-		})
-	}
-	/* 普通机构注册 */
-	UserRegisterClub (data = {}) {
-		return this.AjaxService.post({ 
-			url:'/user/register/club', 
-			data, 
-			isLoading: true,
-			isHost:true
-		})
-	}
-	/* 供应商注册 */ 
-	SupplierAppletsRegistered (data = {}) {
-		return this.AjaxService.post({ 
-			url:'/user/register/shop', 
-			data, 
-			isLoading: true,
-			isHost:true
-		})
-	}
-	/**
+    constructor(AjaxService) {
+        Object.assign(this, { AjaxService })
+        this.name = 'UserService'
+    }
+    /* 初始化授权登录 */
+    UserLoginAuthApplets (data = {}) {
+        return this.AjaxService.post({
+            url: '/user/login/auth/applets',
+            data,
+            isLoading: false,
+            isHost:true
+        })
+    }
+    /* 邀请码授权登录 */
+    InvitationCodeLogin (data = {}) {
+        return this.AjaxService.post({
+            url: '/user/login/auth/invitation',
+            data,
+            isLoading: true,
+            isStatus: false,
+            isHost:true
+        })
+    }
+    /* 普通机构注册 */
+    UserRegisterClub (data = {}) {
+        return this.AjaxService.post({ 
+            url:'/user/register/club', 
+            data, 
+            isLoading: true,
+            isHost:true
+        })
+    }
+    /* 供应商注册 */ 
+    SupplierAppletsRegistered (data = {}) {
+        return this.AjaxService.post({ 
+            url:'/user/register/shop', 
+            data, 
+            isLoading: true,
+            isHost:true
+        })
+    }
+    /**
 	 * 账号登录
 	 * @param mobileOrEmail 邮箱或手机
 	 * @param password	密码
 	 * @param source 来源 PC与小程序传:'www'crm就传'crm'
 	 */
-	AorganizationLogin (data = {}) {
-		return this.AjaxService.post({ 
-			url:'/user/login/password', 
-			data, 
-			isLoading: true ,
-			isStatus: true,
-			isHost:true
-		})
-	}
-	/* 查询机构资料*/
-	OrganizationUpdateModifyInfo (data = {}) {
-		return this.AjaxService.get({ 
-			url:'/user/club/info',
-			data, 
-			isLoading: true,
-			isHost:true
-		})
-	}
-	/* 协销拉机构上线(查询暂时数据)*/
-	UseRregisterTemporaryInfo (data = {}) {
-		return this.AjaxService.get({ 
-			url:'/user/register/temporary/data',
-			data, 
-			isLoading: true,
-			isHost:true
-		})
-	}
-	/* 机构升级会员机构 */
-	OrganizationRegister (data = {}) {
-		return this.AjaxService.post({ 
-			url:'/user/register/club/upgrade', 
-			data, 
-			isLoading: true,
-			isHost:true
-		})
-	}
-	/* 机构提交资料修改 */
-	OrganizationUpdate (data = {}) {
-		return this.AjaxService.post({ 
-			url:'/user/club/info/update', 
-			data, 
-			isLoading: true,
-			isHost:true
-		})
-	}
-	/* 供应商资料信息-数据回显 */
-	SupplierShopInfo (data = {}) {
-		return this.AjaxService.get({ 
-			url:'/user/shop/info', 
-			data, 
-			isLoading: true,
-			isHost:true
-		})
-	}
-	/* 供应商修改申请信息保存 */
-	SupplierUpdateCompanyInfo (data = {}) {
-		return this.AjaxService.post({ 
-			url:'/user/register/shop/apply', 
-			data, 
-			isLoading: true,
-			isHost:true
-		})
-	}
-	/* 供应商资料信息-提交修改 */
-	SupplierModifiedData (data = {}) {
-		return this.AjaxService.post({ 
-			url:'/user/shop/info/update', 
-			data, 
-			isLoading: true,
-			isHost:true
-		})
-	}
-	/**
+    AorganizationLogin (data = {}) {
+        return this.AjaxService.post({ 
+            url:'/user/login/password', 
+            data, 
+            isLoading: true ,
+            isStatus: true,
+            isHost:true
+        })
+    }
+    /* 查询机构资料*/
+    OrganizationUpdateModifyInfo (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/user/club/info',
+            data, 
+            isLoading: true,
+            isHost:true
+        })
+    }
+    /* 协销拉机构上线(查询暂时数据)*/
+    UseRregisterTemporaryInfo (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/user/register/temporary/data',
+            data, 
+            isLoading: true,
+            isHost:true
+        })
+    }
+    /* 机构升级会员机构 */
+    OrganizationRegister (data = {}) {
+        return this.AjaxService.post({ 
+            url:'/user/register/club/upgrade', 
+            data, 
+            isLoading: true,
+            isHost:true
+        })
+    }
+    /* 机构提交资料修改 */
+    OrganizationUpdate (data = {}) {
+        return this.AjaxService.post({ 
+            url:'/user/club/info/update', 
+            data, 
+            isLoading: true,
+            isHost:true
+        })
+    }
+    /* 供应商资料信息-数据回显 */
+    SupplierShopInfo (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/user/shop/info', 
+            data, 
+            isLoading: true,
+            isHost:true
+        })
+    }
+    /* 供应商修改申请信息保存 */
+    SupplierUpdateCompanyInfo (data = {}) {
+        return this.AjaxService.post({ 
+            url:'/user/register/shop/apply', 
+            data, 
+            isLoading: true,
+            isHost:true
+        })
+    }
+    /* 供应商资料信息-提交修改 */
+    SupplierModifiedData (data = {}) {
+        return this.AjaxService.post({ 
+            url:'/user/shop/info/update', 
+            data, 
+            isLoading: true,
+            isHost:true
+        })
+    }
+    /**
 	 *运营人员绑定微信
 	 */
-	BindingWechat (data = {}) {
-		return this.AjaxService.post({ 
-			url:'/user/login/auth/bind', 
-			data, 
-			isLoading: true,
-			isHost:true
-		})
-	}
-	/*普通机构取消提示*/
-	CancelPrompt (data = {}) {
-		return this.AjaxService.get({ 
-			url:'/user/register/guide', 
-			data, 
-			isLoading: false ,
-			isHost:true
-		})
-	}
-	/**
+    BindingWechat (data = {}) {
+        return this.AjaxService.post({ 
+            url:'/user/login/auth/bind', 
+            data, 
+            isLoading: true,
+            isHost:true
+        })
+    }
+    /*普通机构取消提示*/
+    CancelPrompt (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/user/register/guide', 
+            data, 
+            isLoading: false ,
+            isHost:true
+        })
+    }
+    /**
 	 * 找回密码&修改密码
 	 * @param: mobileOrEmail	手机号或邮箱	
 	 * @param: password			密码
@@ -149,15 +149,15 @@ export default class UserService {
 	 * @param: smsCode			短信验证码
 	 * @param: status			1:手机号找回,2:邮箱找回
 	*/
-	ModifyMobilePassword (data = {}) {
-		return this.AjaxService.post({ 
-			url:'/user/update/password', 
-			data, 
-			isLoading: true ,
-			isHost:true
-		})
-	}
-	/**
+    ModifyMobilePassword (data = {}) {
+        return this.AjaxService.post({ 
+            url:'/user/update/password', 
+            data, 
+            isLoading: true ,
+            isHost:true
+        })
+    }
+    /**
 	 * 更换手机号
 	 * @param: mobile			原手机号	
 	 * @param: newMobile		新手机号
@@ -165,172 +165,172 @@ export default class UserService {
 	 * @param: newSmsCode		新手机号验证码
 	 * @param: userId			用户userId
 	*/
-	UserUpdateMobile (data = {}) {
-		return this.AjaxService.post({ 
-			url:'/user/update/mobile', 
-			data, 
-			isLoading: true ,
-			isHost:true
-		})
-	}
-	/**
+    UserUpdateMobile (data = {}) {
+        return this.AjaxService.post({ 
+            url:'/user/update/mobile', 
+            data, 
+            isLoading: true ,
+            isHost:true
+        })
+    }
+    /**
 	 * @机构-地址列表
 	 * @param:userId 用户ID(必传),
 	 * @param:pageNum 页码
 	 * @param:pageSize 每页条数
 	 */
-	QueryAddressList (data = {}) {
-		return this.AjaxService.get({ 
-			url:'/order/address/list', 
-			data, 
-			isLoading: true ,
-			isHost:true
-		})
-	}
-	/**
+    QueryAddressList (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/order/address/list', 
+            data, 
+            isLoading: true ,
+            isHost:true
+        })
+    }
+    /**
 	 * @机构-添加&&修改地址
 	 * @param:userId 用户ID(必传),
 	 * @param:地址信息,
 	 */
-	AddressSave (data = {}) {
-		return this.AjaxService.post({ 
-			url:'/order/address/save', 
-			data, 
-			isLoading: true ,
-			isHost:true
-		})
-	}
-	/**
+    AddressSave (data = {}) {
+        return this.AjaxService.post({ 
+            url:'/order/address/save', 
+            data, 
+            isLoading: true ,
+            isHost:true
+        })
+    }
+    /**
 	 * @机构-删除地址
 	 * @param:userId 用户ID(必传),
 	 * @param:地址信息,
 	 */
-	DeleteAddress (data = {}) {
-		return this.AjaxService.post({ 
-			url:'/order/address/delete', 
-			data, 
-			isLoading: true ,
-			isHost:true
-		})
-	}
-	/**
+    DeleteAddress (data = {}) {
+        return this.AjaxService.post({ 
+            url:'/order/address/delete', 
+            data, 
+            isLoading: true ,
+            isHost:true
+        })
+    }
+    /**
 	 * @机构-个人中心
 	 * @param:userId 用户ID(必传),
 	 */
-	PersonalInfo (data = {}) {
-		return this.AjaxService.get({ 
-			url:'/personalCenter/myCentre', 
-			data, 
-			isLoading: false ,
-		})
-	}
-	/**
+    PersonalInfo (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/personalCenter/myCentre', 
+            data, 
+            isLoading: false ,
+        })
+    }
+    /**
 	 * @机构-获取账户余额明细
 	 * @param:userId 用户ID(必传),
 	 */
-	GetAccountInfo (data = {}) {
-		return this.AjaxService.get({ 
-			url:'/personalCenter/touchBalance', 
-			data, 
-			isLoading: true ,
-		})
-	}
-	/* 运营人员管理-列表 */
-	QueryOperatorList (data = {}) {
-		return this.AjaxService.get({ 
-			url:'/user/operation/list', 
-			data, 
-			isLoading: true ,
-			isHost:true
-		})
-	}
-	/* 运营人员管理-添加 */
-	PostAddOperator (data = {}) {
-		return this.AjaxService.post({ 
-			url:'/user/operation/save', 
-			data, 
-			isLoading: true ,
-			isHost:true
-		})
-	}
-	/* 运营人员管理-删除 */
-	PostDeleteOperator (data = {}) {
-		return this.AjaxService.post({ 
-			url:'/user/operation/delete', 
-			data, 
-			isLoading: true ,
-			isHost:true
-		})
-	}
-	/* 运营人员管理-更新邀请码 */
-	PostUpdateOperatorCode (data = {}) {
-		return this.AjaxService.post({ 
-			url:'/user/operation/code/update', 
-			data, 
-			isLoading: true ,
-			isHost:true
-		})
-	}
-	/* 机构购物车简单列表*/
-	GetUserCartNumber (data = {}) {
-		return this.AjaxService.get({ 
-			url:'/shoppingCart/header/cart', 
-			data, 
-			isLoading: true ,
-		})
-	}
-	/**
+    GetAccountInfo (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/personalCenter/touchBalance', 
+            data, 
+            isLoading: true ,
+        })
+    }
+    /* 运营人员管理-列表 */
+    QueryOperatorList (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/user/operation/list', 
+            data, 
+            isLoading: true ,
+            isHost:true
+        })
+    }
+    /* 运营人员管理-添加 */
+    PostAddOperator (data = {}) {
+        return this.AjaxService.post({ 
+            url:'/user/operation/save', 
+            data, 
+            isLoading: true ,
+            isHost:true
+        })
+    }
+    /* 运营人员管理-删除 */
+    PostDeleteOperator (data = {}) {
+        return this.AjaxService.post({ 
+            url:'/user/operation/delete', 
+            data, 
+            isLoading: true ,
+            isHost:true
+        })
+    }
+    /* 运营人员管理-更新邀请码 */
+    PostUpdateOperatorCode (data = {}) {
+        return this.AjaxService.post({ 
+            url:'/user/operation/code/update', 
+            data, 
+            isLoading: true ,
+            isHost:true
+        })
+    }
+    /* 机构购物车简单列表*/
+    GetUserCartNumber (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/shoppingCart/header/cart', 
+            data, 
+            isLoading: false ,
+        })
+    }
+    /**
 	 *@协销帮机构注册 待注册列表
 	 *@param userId	协销用户userId
 	 *@param searchName 关键词
 	 *@param pageNum 页码
 	 *@param pageSize 条数
 	 */
-	SellerUserTemporaryClub (data = {}) {
-		return this.AjaxService.get({ 
-			url:'/user/seller/temporary/club', 
-			data, 
-			isLoading: true ,
-			isHost:true
-		})
-	}
-	/**
+    SellerUserTemporaryClub (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/user/seller/temporary/club', 
+            data, 
+            isLoading: true ,
+            isHost:true
+        })
+    }
+    /**
 	 *@协销待注册列表 删除操作
 	 *@param ID
 	 */
-	SellerDeleteUserTemporaryClub (data = {}) {
-		return this.AjaxService.post({ 
-			url:'/user/seller/delete/temporary/club', 
-			data, 
-			isLoading: true ,
-			isHost:true
-		})
-	}
-	/**
+    SellerDeleteUserTemporaryClub (data = {}) {
+        return this.AjaxService.post({ 
+            url:'/user/seller/delete/temporary/club', 
+            data, 
+            isLoading: true ,
+            isHost:true
+        })
+    }
+    /**
 	 *@获取采美豆状态 
 	 *@userId userId
 	 */
-	GetHomeObtainBeans (data = {}) {
-		return this.AjaxService.get({ 
-			url:'/user/club/obtain/beans', 
-			data, 
-			isLoading: false,
-			isHost:true
-		})
-	}
-	/**
+    GetHomeObtainBeans (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/user/club/obtain/beans', 
+            data, 
+            isLoading: false,
+            isHost:true
+        })
+    }
+    /**
 	 *@获取机构个人中心
 	 *@userId userId
 	 */
-	GetClubObtainCenter (data = {}) {
-		return this.AjaxService.get({ 
-			url:'/user/club/home', 
-			data, 
-			isLoading: false,
-			isHost:true
-		})
-	}
-	/**
+    GetClubObtainCenter (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/user/club/home', 
+            data, 
+            isLoading: false,
+            isHost:true
+        })
+    }
+    /**
 	 *@机构采美豆收支明细 
 	 *@param userId	机构用户userId
 	 *@param year 年份
@@ -339,12 +339,12 @@ export default class UserService {
 	 *@param pageNum 页码
 	 *@param pageSize 条数
 	 */
-	GetUserClubBeansList (data = {}) {
-		return this.AjaxService.get({ 
-			url:'/user/club/beans/history', 
-			data, 
-			isLoading: false,
-			isHost:true
-		})
-	}
+    GetUserClubBeansList (data = {}) {
+        return this.AjaxService.get({ 
+            url:'/user/club/beans/history', 
+            data, 
+            isLoading: false,
+            isHost:true
+        })
+    }
 }