commit -m 订单接口联调

components/cm-module/headerNavbar/header-back.vue

@@ -116,12 +116,12 @@
 				}
 		    },
 		    _goHome: function () {
-		      	uni.navigateTo({
+		      	uni.switchTab({
 		        	url: '/pages/tabBar/index/index'
 		      	})
 		    },
 		    _goUser: function () {
-		      	uni.navigateTo({
+		      	uni.switchTab({
 		        	url: '/pages/tabBar/user/index'
 		      	})
 		    }, 

components/cm-module/orderDetails/goodsList.vue

@@ -15,7 +15,7 @@
 						<view class="pros-product">
 							<view class="producttitle">{{pros.name}}</view>
 							<view class="productspec product-view" v-if="pros.productCategory != 2">规格：{{pros.productUnit ? pros.productUnit : ''}}</view>
-							<view class="floor-item-act"><view class="tag">活动价</view></view>
+							<view class="floor-item-act" v-if="pros.ladderPriceFlag == 1"><view class="tag">活动价</view></view>
 							<view class="product-view">
 								<view class="view-num red">￥{{pros.price | NumFormat}}</view>
 							</view>

components/cm-module/orderDetails/orderInformation.vue

@@ -23,7 +23,7 @@
 				<view class="view-num time">支付时间：<label class="label">{{ orderData.orderTime =='undefined' ? '' : orderData.orderTime }}</label></view>
 			</view>
 			<view class="information-view bame">
-				<view class="view-man">已退货/已取消：<label class="label">2/0</label></view>
+				<view class="view-man">已退货/已取消：<label class="label">{{ orderData.returnedNum }}/{{ orderData.actualCancelNum }}</label></view>
 			</view>
 		 </view>
 	</view>

pages.json

@@ -136,7 +136,8 @@
 					"navigationBarTitleText": "活动详情",
 					"enablePullDownRefresh":true,
 					"backgroundColor":"#ff457b",
-					"backgroundTextStyle":"light"
+					"backgroundTextStyle":"light",
+					"onReachBottomDistance":50
 				}
 			},
 			{
@@ -145,7 +146,8 @@
 					"navigationBarTitleText": "活动专区",
 					"enablePullDownRefresh":true,
 					"backgroundColor":"#ff457b",
-					"backgroundTextStyle":"light"
+					"backgroundTextStyle":"light",
+					"onReachBottomDistance":50
 				}
 			}
 		]

pages/goods/cart.vue

@@ -146,6 +146,7 @@
 		},
 		data(){
 			return{
+				StaticUrl:this.$Static,
 				nvabarData: {//顶部自定义导航
 					showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
 					showSearch: 0,
@@ -186,6 +187,7 @@
 				modal:false,
 				contentModalText:'',
 				deleteType:0,
+				
 			}
 		},
 		onLoad(){
@@ -198,9 +200,9 @@
 			NumFormat(value) {//处理金额
 				return Number(value).toFixed(2);
 			},
-			totalprice(val,count){//单件商品的价格 × 数量
-				return (val * count).toFixed(2)
-			}
+		    totalprice(val,count){//单件商品的价格 × 数量
+		        return (val * count).toFixed(2)
+		    }
 		},	
 		methods:{
 			initData(){
@@ -235,7 +237,7 @@
 					this.skeletonShow = false
 					let data = response.data
 					this.kindCount = data.cartQuantity
-					if( data.shopList.length > 0 || data.invalid.length > 0){
+					if( data.shopList.length > 0 || data.products.length > 0){
 						this.isEmpty =false
 					}else{
 						this.isEmpty =true
@@ -247,17 +249,8 @@
 					} else {
 						this.goodsList = [];
 					}
-					if( data.invalid && data.invalid.length > 0){
-						let newFailureList = [],isFailureLayer;
-						data.invalid.forEach((failure,index) => {
-							if(failure.status == 1 || failure.status == 2) {
-								isFailureLayer = true
-							}else{
-								isFailureLayer = false
-							}
-							newFailureList.push(Object.assign({},failure,{isFailureLayer:isFailureLayer}))
-						})
-						this.failureList = newFailureList
+					if( data.products && data.products.length > 0){
+						this.failureList = data.products
 					} else {
 						this.failureList = [];
 					}
@@ -364,7 +357,7 @@
 				}
 			},
 			checkAll(){//全选方法内调用方法
-				this.isCheckAll = !this.isCheckAll;
+			    this.isCheckAll = !this.isCheckAll;
 				this.updateBothCheckBtn();     
 			},
 			totalShopPeice(){//每次所属会所下的商品增减重新计算合计价格&减去含有下架的商品
@@ -432,12 +425,12 @@
 				this.allPrice = totalPrice ;
 			},
 			totalCount(){//计算总数量
-				this.allCount = 0
+			    this.allCount = 0
 				let prosAllCount=0
 				let validCount = 0
 				let validList =[];
 				let productList =[];
-				this.goodsList.forEach(item=>{
+			    this.goodsList.forEach(item=>{
 					productList = item.productList
 					productList.forEach(pros=>{
 						if(pros.productsChecked){
@@ -445,7 +438,7 @@
 							this.allCount = prosAllCount
 						}
 					})
-				})
+			    })
 			},		
 			changeCountAdd(item,pros){//商品数量加加
 				if(pros.step === 2){
@@ -529,7 +522,7 @@
 					let products = res.productList
 					products.forEach(pros=>{
 						if(pros.productsChecked){
-							setGoodsList.push(pros.productId)
+						    setGoodsList.push(pros.productId)
 						}
 					})
 				})
@@ -609,7 +602,7 @@
 					let products = delitem.productList
 					products.forEach(pros=>{
 						if(pros.productsChecked){
-							this.delGoodsList += pros.cartId+','
+						    this.delGoodsList += pros.cartId+','
 						}
 					})
 				})
@@ -657,9 +650,9 @@
 			hideMobel(){
 				this.modal = false;
 			},
-			navToListPage(productId){
+			navToListPage(item){
 				this.isModallayer = true;
-				this.$api.navigateTo(`/pages/goods/product?productId=${productId}`)
+				this.$api.navigateTo(`/pages/goods/product?productId=${item.productId}`)
 			},
 			setHeaderBtnPosi(){
 				// 获得胶囊按钮位置信息
@@ -687,13 +680,13 @@
 			}
 		},
 		watch:{//深度监听所有数据，每次改变重新计算总价和总数
-			goodsList:{
-				deep:true,
-				handler(val,oldval){
-					this.totalPeice()
-					this.totalCount()
-				}
-			}
+		    goodsList:{
+		        deep:true,
+		        handler(val,oldval){
+		            this.totalPeice()
+		            this.totalCount()
+		        }
+		    }
 		},
 		onPullDownRefresh() {//下拉刷新
 			this.InitGetCartGoodsList()
@@ -1289,42 +1282,15 @@
 				float: right;
 				box-sizing: border-box;
 				padding:0 10rpx;
-				.sum-none{
-					width: 100%;
-					height: 40rpx;
-					line-height: 40rpx;
-					color: $text-color;
-					float: left;
-					text-align: right;
-					.money{
-						font-size: $font-size-24;
-						color: #999999;
-						text-decoration: line-through;
-					}
-					.money-sign{
-						font-size: $font-size-24;
-						color: #999999;
-						text-decoration: line-through;
-					}
-					.money-reduced{
-						margin-left: 10rpx;
-						font-size: $font-size-24;
-						color: $color-system;
-					}
-				}
 				.sum-price{
 					text-align: right;
 					width: 100%;
-					height: 40rpx;
-					line-height: 40rpx;
+					height: 80rpx;
+					line-height: 80rpx;
 					font-size: $font-size-30;
 					color: $text-color;
 					float: left;
 					font-weight: normal;
-					&.none{
-						height: 80rpx;
-						line-height: 80rpx;
-					}
 					.money{
 						color: $color-system;
 					}

pages/goods/product.vue

@@ -400,7 +400,7 @@
 						this.$api.navigateTo('/pages/login/login')
 					}
 				}else{
-					this.$api.navigateTo('/pages/authorization/authorization?type=1')
+					this.$api.navigateTo('/pages/authorize/authorize')
 				}
 			},
 			btnGetConfirm(type){//加入购物车&&立即购买点击
@@ -411,7 +411,7 @@
 						this.$api.navigateTo('/pages/login/login')
 					}
 				}else{
-					this.$api.navigateTo('/pages/authorization/authorization?type=1')
+					this.$api.navigateTo('/pages/authorize/authorize')
 				}
 			},	
 			changeCountAdd(){//popup弹窗数量增加按钮
@@ -1100,7 +1100,7 @@
 		bottom: 0;
 		left: 0;
 		background: #FFFFFF;
-		z-index: 99;
+		z-index: 999;
 		.bottom-le{
 			width: 300rpx;
 			height: 100rpx;

pages/login/login.vue

@@ -33,7 +33,15 @@
 		</view>
 		<!-- 提示信息 -->
 		<view class="logo-message"><text>{{ loginMessage }}</text></view>
-		<view class="login-btn" :class="[isLoginStatus  ? 'disabled' : '']" @click="SubMitLogins">登录</view>
+		<button class="login-btn"
+				:class="[isLoginStatus  ? 'disabled' : '']"
+				type="primary" 
+				open-type="getUserInfo" 
+				size="small" 
+				@click="SubMitLogins" 
+				lang="zh_CN">
+				登录
+		</button>
 	</view>
 </template>
 
@@ -70,7 +78,7 @@ export default {
 		...mapMutations(['login', 'wxLogin']),
 		// 登录
 		SubMitLogins() {		
-			const WechatInfo = uni.getStorageSync('wechatUserInfo')
+			// const WechatInfo = uni.getStorageSync('wechatUserInfo')
 			if(this.isLoginStatus){return}
 			if(!this.params.mobile){
 				this.$util.msg('请输入手机号',2000);
@@ -84,14 +92,29 @@ export default {
 				this.$util.msg('请输入短信验证码',2000);
 				return
 			}
-			if(!uni.getStorageSync('_WX_State')){
-				this.$api.navigateTo(`/pages/authorize/authorize`)
-				return;
-			}
 			this.params.openId = uni.getStorageSync('openId');
-			this.params.nickName = WechatInfo.nickName
-			this.params.headImgUrl = WechatInfo.avatarUrl
-			this.isLoginStatus = true
+			this.GetUserProfile();
+			
+		},
+		GetUserProfile(){
+			const self = this
+			// 可以通过 wx.getSetting 先查询一下用户是否授权了 "scope.record" 这个 scope
+			wx.getUserProfile({
+				desc: '呵呵商城小程序获取您的信息', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
+				success(res) {
+					console.log('新API',res)	
+					self.wxLogin(res.userInfo)	
+					self.params.nickName = res.userInfo.nickName
+					self.params.headImgUrl = res.userInfo.avatarUrl
+					self.isLoginStatus = true
+					self.LoginGetUser()
+				},
+				fail() {
+					self.$util.msg('授权失败', 2000)
+				}
+			})
+		},
+		LoginGetUser(){
 			this.UserService.UserMobileLogin(this.params)
 			.then(response => {
 				// 保存用户信息

pages/tabBar/cart/index.vue

@@ -72,14 +72,13 @@
 									</view>
 									<text class="img-tip">失效</text>
 									<view class="pros-img">
-										<image :src="failure.image ? failure.image:''" alt="" />
+										<image :src="failure.mainImage ? failure.mainImage:''" alt="" />
 									</view>
 									<view class="pros-product">
 										<view class="producttitle">{{failure.name}}</view>
 										<view class="productspec">规格:{{failure.unit ? failure.unit : ''}}</view>
 										<view class="productstate">商品已下架</view>
 									</view>
-									<view class="pros-marks" v-if="failure.isFailureLayer"></view>
 								</view>
 							</view>
 						</view>	
@@ -226,7 +225,7 @@
 					this.skeletonShow = false
 					let data = response.data
 					this.kindCount = data.cartQuantity
-					if( data.shopList.length > 0 || data.invalid.length > 0){
+					if( data.shopList.length > 0 || data.products.length > 0){
 						this.isEmpty =false
 					}else{
 						this.isEmpty =true
@@ -238,17 +237,8 @@
 					} else {
 						this.goodsList = [];
 					}
-					if( data.invalid && data.invalid.length > 0){
-						let newFailureList = [],isFailureLayer;
-						data.invalid.forEach((failure,index) => {
-							if(failure.status == 1 || failure.status == 2) {
-								isFailureLayer = true
-							}else{
-								isFailureLayer = false
-							}
-							newFailureList.push(Object.assign({},failure,{isFailureLayer:isFailureLayer}))
-						})
-						this.failureList = newFailureList
+					if( data.products && data.products.length > 0){
+						this.failureList = data.products
 					} else {
 						this.failureList = [];
 					}
@@ -648,9 +638,9 @@
 			hideMobel(){
 				this.modal = false;
 			},
-			navToListPage(productId){
+			navToListPage(item){
 				this.isModallayer = true;
-				this.$api.navigateTo(`/pages/goods/product?productId=${productId}`)
+				this.$api.navigateTo(`/pages/goods/product?productId=${item.productId}`)
 			},
 			setHeaderBtnPosi(){
 				// 获得胶囊按钮位置信息

pages/tabBar/index/index.vue

@@ -145,7 +145,6 @@
 					this.productList = data.list
 					this.hasNextPage = data.hasNextPage
 					this.GetCartNumber();
-					this.skeletonShow = false;
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})
@@ -182,6 +181,7 @@
 			GetCartNumber(){//查询购物车数量
 				this.ProductService.QueryShoppingQuantity({userId:this.userId}).then(response => {
 					this.$store.commit('updateAllNum',response.data)
+					this.skeletonShow = false;
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000);
 				})

pages/tabBar/user/index.vue

@@ -81,7 +81,7 @@
 			<!-- 订单状态区域END -->
 			<!-- 菜单导航区域 -->
 			<view class="place-menu-conten clearfix">
-				<view class="place-menu-cell"  @click="navigator('/pages/user/activity/activity-list')" v-if="userIdentity == 2">
+				<view class="place-menu-cell"  @click="navigator('/pages/user/activity/activity-list')" v-if="UserInfo.userIdentity == 2">
 					<view class="place-left">
 						<image class="place-menu-icon" :src="StaticUrl+'icon-user-h@2x.png'" mode=""></image>
 						<text class="place-menu-title">活动专区</text>
@@ -105,7 +105,7 @@
 			</view>
 			<!-- 菜单导航区域END -->
 			<!-- 底部 -->
-			<view class="user-support" :class=" userIdentity == 2 ? 'top' : ''">
+			<view class="user-support" :class="UserInfo.userIdentity == 2 ? 'top' : ''">
 				<image class="user-support-image" :src="StaticUrl+'icon-logo@1x.png'" mode=""></image>
 				<view class="user-support-text">采美365网提供商品技术服务</view>
 			</view>
@@ -133,6 +133,7 @@ export default {
 			waitShipmentsCount: 20, //待收货角标
 			shipmentsCount: 123, //已发货角标
 			salesReturnCount: 0, //退货/款角标
+			userId:0
 		}
 	},
 	onLoad() {
@@ -158,17 +159,20 @@ export default {
 		...mapMutations(['login', 'logout']),
 		GetUserInfo(){
 			this.UserInfo = uni.getStorageSync('userInfo')
+			this.$api.getStorage().then((resolve) => {
+				this.userId = resolve.userId ? resolve.userId : '';	
+				this.GetUserInfoPersonal()
+			})
 		},
 		//初始化个人中心数据
-		getUserInfoPersonal(organizeId) {
-			this.UserService.userInfoPersonal({ organizeId: organizeId })
+		GetUserInfoPersonal() {
+			this.UserService.GetUserOrderTotal({ userId: this.userId })
 			.then(response => {
-				console.log(response)
-				this.organizeName = response.data.organizeName //采购员组织名称
-				this.paymentCount = response.data.paymentCount //待付款
-				this.waitShipmentsCount = response.data.waitShipmentsCount //待收货
-				this.shipmentsCount = response.data.shipmentsCount //已发货
-				this.salesReturnCount = response.data.salesReturnCount //退货/款
+				const data = response.data
+				this.paymentCount = data.paymentCount //待付款
+				this.waitShipmentsCount = data.waitShipmentsCount //待收货
+				this.shipmentsCount = data.shipmentsCount //已发货
+				this.salesReturnCount = data.salesReturnCount //退货/款
 			})
 			.catch(error => {
 				this.$util.msg(error.msg, 2000)
@@ -193,7 +197,10 @@ export default {
 		},
 	},
 	onShow() {
-		this.GetUserInfo()
+		console.log(this.hasLogin)
+		if(this.hasLogin){
+			this.GetUserInfo()
+		}
 	}
 }
 </script>

pages/user/activity/activity-list.vue

@@ -3,14 +3,14 @@
 		<view class="activity-content">
 			<view class="activity-list" v-for="(activity,index) in activityList" :key="index" @click="NavigatorPath(activity)">
 				<view class="activity-list-pic">
-					<image class="activity-image" :src="activity.image" mode=""></image>
+					<image class="activity-image" :src="activity.listImage" mode=""></image>
 				</view>
 				<view class="activity-list-msg">
 					<view class="activity-title">{{ activity.name }}</view>
-					<view class="activity-numbe">商品数：<text class="color">{{ activity.num }}</text> </view>
+					<view class="activity-numbe">商品数：<text class="color">{{ activity.productCount }}</text> </view>
 					<view class="activity-times">
 						<text class="label">活动时间：</text>
-						<text class="color">{{ activity.startTime }}~{{ activity.endTime }}</text>
+						<text class="color">{{ activity.beginTime }}~{{ activity.endTime }}</text>
 					</view>
 				</view>
 			</view>
@@ -22,115 +22,58 @@
 	export default{
 		data(){
 			return{
-				activityList:[
-					{
-						num:10,
-						image:'https://img.caimei365.com/group1/M00/00/0A/rB-lGGBrzcmAbarfAG8gcPdEFtI777.jpg',
-						name:'韩国恩盛进口氢洁气小气泡清韩国恩盛进口氢洁气小气泡清',
-						startTime:'2021-04-12 15:19:32',
-						endTime:'2021-06-31 15:19:32'
-					},
-					{
-						num:10,
-						image:'https://img.caimei365.com/group1/M00/00/0A/rB-lGGBrzcmAbarfAG8gcPdEFtI777.jpg',
-						name:'韩国恩盛进口氢洁气小气泡清韩国恩盛进口氢洁气小气泡清',
-						startTime:'2021-04-12 15:19:32',
-						endTime:'2021-06-31 15:19:32'
-					},
-					{
-						num:10,
-						image:'https://img.caimei365.com/group1/M00/00/0A/rB-lGGBrzcmAbarfAG8gcPdEFtI777.jpg',
-						name:'韩国恩盛进口氢洁气小气泡清韩国恩盛进口氢洁气小气泡清',
-						startTime:'2021-04-12 15:19:32',
-						endTime:'2021-06-31 15:19:32'
-					},
-					{
-						num:10,
-						image:'https://img.caimei365.com/group1/M00/00/0A/rB-lGGBrzcmAbarfAG8gcPdEFtI777.jpg',
-						name:'韩国恩盛进口氢洁气小气泡清韩国恩盛进口氢洁气小气泡清',
-						startTime:'2021-04-12 15:19:32',
-						endTime:'2021-06-31 15:19:32'
-					},
-					{
-						num:10,
-						image:'https://img.caimei365.com/group1/M00/00/0A/rB-lGGBrzcmAbarfAG8gcPdEFtI777.jpg',
-						name:'韩国恩盛进口氢洁气小气泡清韩国恩盛进口氢洁气小气泡清',
-						startTime:'2021-04-12 15:19:32',
-						endTime:'2021-06-31 15:19:32'
-					},
-					{
-						num:10,
-						image:'https://img.caimei365.com/group1/M00/00/0A/rB-lGGBrzcmAbarfAG8gcPdEFtI777.jpg',
-						name:'韩国恩盛进口氢洁气小气泡清韩国恩盛进口氢洁气小气泡清',
-						startTime:'2021-04-12 15:19:32',
-						endTime:'2021-06-31 15:19:32'
-					},
-					{
-						num:10,
-						image:'https://img.caimei365.com/group1/M00/00/0A/rB-lGGBrzcmAbarfAG8gcPdEFtI777.jpg',
-						name:'韩国恩盛进口氢洁气小气泡清韩国恩盛进口氢洁气小气泡清',
-						startTime:'2021-04-12 15:19:32',
-						endTime:'2021-06-31 15:19:32'
-					},
-					{
-						num:10,
-						image:'https://img.caimei365.com/group1/M00/00/0A/rB-lGGBrzcmAbarfAG8gcPdEFtI777.jpg',
-						name:'韩国恩盛进口氢洁气小气泡清韩国恩盛进口氢洁气小气泡清',
-						startTime:'2021-04-12 15:19:32',
-						endTime:'2021-06-31 15:19:32'
-					},
-					{
-						num:10,
-						image:'https://img.caimei365.com/group1/M00/00/0A/rB-lGGBrzcmAbarfAG8gcPdEFtI777.jpg',
-						name:'韩国恩盛进口氢洁气小气泡清韩国恩盛进口氢洁气小气泡清',
-						startTime:'2021-04-12 15:19:32',
-						endTime:'2021-06-31 15:19:32'
-					},
-					{
-						num:10,
-						image:'https://img.caimei365.com/group1/M00/00/0A/rB-lGGBrzcmAbarfAG8gcPdEFtI777.jpg',
-						name:'韩国恩盛进口氢洁气小气泡清韩国恩盛进口氢洁气小气泡清',
-						startTime:'2021-04-12 15:19:32',
-						endTime:'2021-06-31 15:19:32'
-					},
-					{
-						num:10,
-						image:'https://img.caimei365.com/group1/M00/00/0A/rB-lGGBrzcmAbarfAG8gcPdEFtI777.jpg',
-						name:'韩国恩盛进口氢洁气小气泡清韩国恩盛进口氢洁气小气泡清',
-						startTime:'2021-04-12 15:19:32',
-						endTime:'2021-06-31 15:19:32'
-					},
-					{
-						num:10,
-						image:'https://img.caimei365.com/group1/M00/00/0A/rB-lGGBrzcmAbarfAG8gcPdEFtI777.jpg',
-						name:'韩国恩盛进口氢洁气小气泡清韩国恩盛进口氢洁气小气泡清',
-						startTime:'2021-04-12 15:19:32',
-						endTime:'2021-06-31 15:19:32'
-					},
-					{
-						num:10,
-						image:'https://img.caimei365.com/group1/M00/00/0A/rB-lGGBrzcmAbarfAG8gcPdEFtI777.jpg',
-						name:'韩国恩盛进口氢洁气小气泡清韩国恩盛进口氢洁气小气泡清',
-						startTime:'2021-04-12 15:19:32',
-						endTime:'2021-06-31 15:19:32'
-					},
-				]
+				activityList:[],
+				hasNextPage:false,
+				listQuery:{
+					userId:0,
+					pageNum:1,
+					pageSize:10
+				}
 			}
 		},
 		onLoad() {
 			
 		},
 		methods:{
+			GetInitProductList(){//初始化活动列表数据
+				this.ProductService.GetProductActivityAreaList(this.listQuery).then(response => {
+					const data = response.data
+					this.hasNextPage = data.hasNextPage
+					this.activityList = data.list
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000);
+				})
+			},
+			GetOnReachBottomData(){//上滑加载更多
+				this.listQuery.pageNum+=1
+				this.ProductService.GetProductActivityAreaList(this.listQuery).then(response => {
+					const data = response.data
+					this.hasNextPage = data.hasNextPage
+					this.activityList = this.activityList.concat(data.list) 
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000);
+				})
+			},
 			NavigatorPath(item){
 				console.log(item)
-				this.$api.navigateTo('/pages/user/activity/activity')
+				this.$api.navigateTo(`/pages/user/activity/activity?activityId=${item.activityId}&userId=${this.listQuery.userId}`)
 			}
 		},
 		onPullDownRefresh() {//下拉刷新
+			this.listQuery.pageNum = 1
+			this.GetInitProductList()
 			uni.stopPullDownRefresh()
 		},
+		onReachBottom(){
+			if(this.hasNextPage){
+				this.GetOnReachBottomData()
+			}
+		},
 		onShow() {
-			
+			this.$api.getStorage().then((resolve) => {
+				this.listQuery.userId = resolve.userId ? resolve.userId : '';	
+				this.GetInitProductList()
+			})
 		}
 	}
 </script>

pages/user/activity/activity.vue

@@ -7,15 +7,15 @@
 		<view class="container-section tui-skeleton clearfix">
 			<view class="product-list" v-for="(pro,index) in productList" :key="index" @click.stop="Details(pro)">
 				<view class="product-list-image">
-					<image class="product-image" :src="pro.image" mode=""></image>
-					<image class="product-icon" :src="StaticUrl+'icon-hot.png'" mode="" v-if="pro.activistatus == 1"></image>
+					<image class="product-image" :src="pro.mainImage" mode=""></image>
+					<image class="product-icon" :src="StaticUrl+'icon-hot.png'" mode="" v-if="pro.activeStatus == 1"></image>
 				</view>
 				<view class="product-list-msg">
 					<view class="product-msg-name">{{ pro.name }}</view>
-					<view class="product-list-tag" v-if="pro.activistatus == 1"><text class="tag">活动价</text></view>
+					<view class="product-list-tag" v-if="pro.activeStatus == 1"><text class="tag">活动价</text></view>
 					<view class="product-list-pri">
 						<view class="price">￥{{ pro.price | PriceFormat}}</view>
-						<view class="carts" @click.stop="handAddCarts">
+						<view class="carts" @click.stop="handAddCarts(pro)">
 							<view class="carts-add">
 								<text class="iconfont icon-gouwuche"></text>
 							</view>
@@ -32,205 +32,20 @@
 		data(){
 			return{
 				activityBanner:`${this.$Static}banner.png`,
-				productList:[
-					{
-						image:'https://img.caimei365.com/group1/M00/03/E7/Cmis21__-MOABqnlAAJUIFDLc8U188.jpg',
-						name:'小气泡水氧嫩肤仪小气泡水氧嫩肤仪',
-						activistatus:1,
-						price:888,
-					},
-					{
-						image:'https://img.caimei365.com/group1/M00/03/E7/Cmis21__-MOABqnlAAJUIFDLc8U188.jpg',
-						name:'小气泡水氧嫩肤仪小气泡水氧嫩肤仪',
-						activistatus:2,
-						price:888,
-					},
-					{
-						image:'https://img.caimei365.com/group1/M00/03/E7/Cmis21__-MOABqnlAAJUIFDLc8U188.jpg',
-						name:'小气泡水氧嫩肤仪小气泡水氧嫩肤仪',
-						activistatus:1,
-						price:888,
-					},
-					{
-						image:'https://img.caimei365.com/group1/M00/03/E7/Cmis21__-MOABqnlAAJUIFDLc8U188.jpg',
-						name:'小气泡水氧嫩肤仪小气泡水氧嫩肤仪',
-						activistatus:2,
-						price:888,
-					},
-					{
-						image:'https://img.caimei365.com/group1/M00/03/E7/Cmis21__-MOABqnlAAJUIFDLc8U188.jpg',
-						name:'小气泡水氧嫩肤仪小气泡水氧嫩肤仪',
-						activistatus:2,
-						price:888,
-					},
-					{
-						image:'https://img.caimei365.com/group1/M00/03/E7/Cmis21__-MOABqnlAAJUIFDLc8U188.jpg',
-						name:'小气泡水氧嫩肤仪小气泡水氧嫩肤仪',
-						activistatus:1,
-						price:888,
-					},
-					{
-						image:'https://img.caimei365.com/group1/M00/03/E7/Cmis21__-MOABqnlAAJUIFDLc8U188.jpg',
-						name:'小气泡水氧嫩肤仪小气泡水氧嫩肤仪',
-						activistatus:2,
-						price:888,
-					},
-					{
-						image:'https://img.caimei365.com/group1/M00/03/E7/Cmis21__-MOABqnlAAJUIFDLc8U188.jpg',
-						name:'小气泡水氧嫩肤仪小气泡水氧嫩肤仪',
-						activistatus:1,
-						price:888,
-					},
-					{
-						image:'https://img.caimei365.com/group1/M00/03/E7/Cmis21__-MOABqnlAAJUIFDLc8U188.jpg',
-						name:'小气泡水氧嫩肤仪小气泡水氧嫩肤仪',
-						activistatus:2,
-						price:888,
-					},
-					{
-						image:'https://img.caimei365.com/group1/M00/03/E7/Cmis21__-MOABqnlAAJUIFDLc8U188.jpg',
-						name:'小气泡水氧嫩肤仪小气泡水氧嫩肤仪',
-						activistatus:1,
-						price:888,
-					},
-					{
-						image:'https://img.caimei365.com/group1/M00/03/E7/Cmis21__-MOABqnlAAJUIFDLc8U188.jpg',
-						name:'小气泡水氧嫩肤仪小气泡水氧嫩肤仪',
-						activistatus:2,
-						price:888,
-					},
-					{
-						image:'https://img.caimei365.com/group1/M00/03/E7/Cmis21__-MOABqnlAAJUIFDLc8U188.jpg',
-						name:'小气泡水氧嫩肤仪小气泡水氧嫩肤仪',
-						activistatus:1,
-						price:888,
-					},
-					{
-						image:'https://img.caimei365.com/group1/M00/03/E7/Cmis21__-MOABqnlAAJUIFDLc8U188.jpg',
-						name:'小气泡水氧嫩肤仪小气泡水氧嫩肤仪',
-						activistatus:2,
-						price:888,
-					},
-					{
-						image:'https://img.caimei365.com/group1/M00/03/E7/Cmis21__-MOABqnlAAJUIFDLc8U188.jpg',
-						name:'小气泡水氧嫩肤仪小气泡水氧嫩肤仪',
-						activistatus:1,
-						price:888,
-					},
-					{
-						image:'https://img.caimei365.com/group1/M00/03/E7/Cmis21__-MOABqnlAAJUIFDLc8U188.jpg',
-						name:'小气泡水氧嫩肤仪小气泡水氧嫩肤仪',
-						activistatus:2,
-						price:888,
-					},
-					{
-						image:'https://img.caimei365.com/group1/M00/03/E7/Cmis21__-MOABqnlAAJUIFDLc8U188.jpg',
-						name:'小气泡水氧嫩肤仪小气泡水氧嫩肤仪',
-						activistatus:1,
-						price:888,
-					},
-					{
-						image:'https://img.caimei365.com/group1/M00/03/E7/Cmis21__-MOABqnlAAJUIFDLc8U188.jpg',
-						name:'小气泡水氧嫩肤仪小气泡水氧嫩肤仪',
-						activistatus:2,
-						price:888,
-					},
-					{
-						image:'https://img.caimei365.com/group1/M00/03/E7/Cmis21__-MOABqnlAAJUIFDLc8U188.jpg',
-						name:'小气泡水氧嫩肤仪小气泡水氧嫩肤仪',
-						activistatus:1,
-						price:888,
-					},
-					{
-						image:'https://img.caimei365.com/group1/M00/03/E7/Cmis21__-MOABqnlAAJUIFDLc8U188.jpg',
-						name:'小气泡水氧嫩肤仪小气泡水氧嫩肤仪',
-						activistatus:2,
-						price:888,
-					},
-					{
-						image:'https://img.caimei365.com/group1/M00/03/E7/Cmis21__-MOABqnlAAJUIFDLc8U188.jpg',
-						name:'小气泡水氧嫩肤仪小气泡水氧嫩肤仪',
-						activistatus:1,
-						price:888,
-					},
-					{
-						image:'https://img.caimei365.com/group1/M00/03/E7/Cmis21__-MOABqnlAAJUIFDLc8U188.jpg',
-						name:'小气泡水氧嫩肤仪小气泡水氧嫩肤仪',
-						activistatus:2,
-						price:888,
-					},
-					{
-						image:'https://img.caimei365.com/group1/M00/03/E7/Cmis21__-MOABqnlAAJUIFDLc8U188.jpg',
-						name:'小气泡水氧嫩肤仪小气泡水氧嫩肤仪',
-						activistatus:1,
-						price:888,
-					},
-					{
-						image:'https://img.caimei365.com/group1/M00/03/E7/Cmis21__-MOABqnlAAJUIFDLc8U188.jpg',
-						name:'小气泡水氧嫩肤仪小气泡水氧嫩肤仪',
-						activistatus:2,
-						price:888,
-					},
-					{
-						image:'https://img.caimei365.com/group1/M00/03/E7/Cmis21__-MOABqnlAAJUIFDLc8U188.jpg',
-						name:'小气泡水氧嫩肤仪小气泡水氧嫩肤仪',
-						activistatus:1,
-						price:888,
-					},
-					{
-						image:'https://img.caimei365.com/group1/M00/03/E7/Cmis21__-MOABqnlAAJUIFDLc8U188.jpg',
-						name:'小气泡水氧嫩肤仪小气泡水氧嫩肤仪',
-						activistatus:2,
-						price:888,
-					},
-					{
-						image:'https://img.caimei365.com/group1/M00/03/E7/Cmis21__-MOABqnlAAJUIFDLc8U188.jpg',
-						name:'小气泡水氧嫩肤仪小气泡水氧嫩肤仪',
-						activistatus:1,
-						price:888,
-					},
-					{
-						image:'https://img.caimei365.com/group1/M00/03/E7/Cmis21__-MOABqnlAAJUIFDLc8U188.jpg',
-						name:'小气泡水氧嫩肤仪小气泡水氧嫩肤仪',
-						activistatus:2,
-						price:888,
-					},
-					{
-						image:'https://img.caimei365.com/group1/M00/03/E7/Cmis21__-MOABqnlAAJUIFDLc8U188.jpg',
-						name:'小气泡水氧嫩肤仪小气泡水氧嫩肤仪',
-						activistatus:1,
-						price:888,
-					},
-					{
-						image:'https://img.caimei365.com/group1/M00/03/E7/Cmis21__-MOABqnlAAJUIFDLc8U188.jpg',
-						name:'小气泡水氧嫩肤仪小气泡水氧嫩肤仪',
-						activistatus:2,
-						price:888,
-					},
-					{
-						image:'https://img.caimei365.com/group1/M00/03/E7/Cmis21__-MOABqnlAAJUIFDLc8U188.jpg',
-						name:'小气泡水氧嫩肤仪小气泡水氧嫩肤仪',
-						activistatus:1,
-						price:888,
-					},
-					{
-						image:'https://img.caimei365.com/group1/M00/03/E7/Cmis21__-MOABqnlAAJUIFDLc8U188.jpg',
-						name:'小气泡水氧嫩肤仪小气泡水氧嫩肤仪',
-						activistatus:2,
-						price:888,
-					},
-					{
-						image:'https://img.caimei365.com/group1/M00/03/E7/Cmis21__-MOABqnlAAJUIFDLc8U188.jpg',
-						name:'小气泡水氧嫩肤仪小气泡水氧嫩肤仪',
-						activistatus:1,
-						price:888,
-					},
-					
-				],//商品列表
+				listQuery:{
+					activityId:0,
+					userId:0,
+					pageNum:1,
+					pageSize:10
+				},
+				hasNextPage:false,
+				productList:[],//商品列表
 			}
 		},
-		onLoad() {
-			
+		onLoad(option) {
+			this.listQuery.activityId = option.activityId
+			this.listQuery.userId = option.userId
+			this.GetProductActivityDetails();
 		},
 		filters: {
 			//处理金额
@@ -239,16 +54,48 @@
 			}
 		},
 		methods:{
+			GetProductActivityDetails(){//初始化活动详情
+				this.ProductService.GetProductActivityDetails(this.listQuery).then(response => {
+					const data = response.data
+					this.activityBanner = data.image
+					this.hasNextPage = data.pageInfo.hasNextPage
+					this.productList = data.pageInfo.list
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000);
+				})
+			},
+			GetOnReachBottomData(){//上滑加载更多
+				this.listQuery.pageNum+=1
+				this.ProductService.GetProductActivityDetails(this.listQuery).then(response => {
+					const data = response.data
+					this.hasNextPage = data.pageInfo.hasNextPage
+					this.productList = this.productList.concat(data.pageInfo.list) 
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000);
+				})
+			},
 			Details(pro){
-				this.$api.navigateTo(`/pages/goods/product?id=${pro.productId}`)
+				this.$api.navigateTo(`/pages/goods/product?productId=${pro.productId}`)
 			},
 			handAddCarts(pro){
-				this.$util.msg('加入成功',1500,true,'success')
+				this.ProductService.shoppingAddCart({productId:pro.productId,userId:this.listQuery.userId,productCount:1}).then(response => {
+					this.$util.msg('加入购物车成功',1500,true,'success')
+					this.GetCartNumber()
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000);
+				})
 			},
 		},
 		onPullDownRefresh() {//下拉刷新
+			this.listQuery.pageNum = 1
+			THIS.GetProductActivityDetails()
 			uni.stopPullDownRefresh()
 		},
+		onReachBottom(){
+			if(this.hasNextPage){
+				this.GetOnReachBottomData()
+			}
+		},
 		onShow() {
 			
 		}

pages/user/order/order-details.vue

@@ -60,7 +60,6 @@
 		data() {
 			return {
 				state:0,
-				userID:'',
 				orderId:'',
 				shareCode:'',				//分享码
 				shareType:'',               //分享登录页过来记录的状态
@@ -95,7 +94,7 @@
 				},
 				clauseData:{},
 				orderSubmitType:false,//自主订单
-				organizeId:0,
+				userId:0,
 				modal:false,
 				OperationType:'',
 				contentModalText:''
@@ -104,7 +103,7 @@
 		onLoad(option){
 			console.log(option)
 			this.$api.getStorage().then((resolve) =>{
-				this.organizeId = resolve.organizeId
+				this.userId = resolve.userId ? resolve.userId : 0
 			})
 			this.shareType = option.type;
 			this.orderId = option.orderId
@@ -153,11 +152,11 @@
 				this.$api.navigateTo(`/pages/service/sellconten?clauseId=${id}`)
 			},
 			GetOrderDetaileData(){//初始化页面数据@参数：订单ID
-				this.OrderService.QueryOrderDetails({ orderID : 15522 }).then(response =>{
+				this.OrderService.QueryOrderDetails({ orderId : this.orderId }).then(response =>{
 					let resData = response.data;
 					this.isRequest = true
 					this.orderInfo = resData.order
-					this.userID = resData.order.userID
+					this.userId = resData.order.userId
 					this.shareCode = resData.shareCode
 					this.addressData = resData.userInfo
 					this.information = resData.order

pages/user/order/order-list.vue

@@ -43,7 +43,9 @@
 											<view class="pros-product clearfix">
 												<view class="producttitle tui-skeleton-fillet">{{pros.name}}</view>
 												<view class="productspec tui-skeleton-fillet" v-if="pros.productCategory!=2">规格:{{pros.productUnit}}</view>
-												<view class="floor-item-act"><view class="tag" @click.stop="clickPopupShow(pros,2)">活动价</view></view>
+												<view class="floor-item-act" v-if="pros.ladderPriceFlag == 1">
+													<view class="tag" @click.stop="clickPopupShow(pros,2)">活动价</view>
+												</view>
 												<view class="productprice">
 													<view class="price tui-skeleton-fillet"><text>￥{{pros.price | NumFormat}}</text></view>
 													<view class="count tui-skeleton-fillet"><text class="small">x</text>{{pros.num}}</view>
@@ -116,8 +118,6 @@
 	import orderButton from '@/components/cm-module/orderDetails/orderListButton'		 //按钮
 	import modalLayer from "@/components/modal-layer"
 	import empty from "@/components/empty";
-	import { orderDataList } from '@/common/json/data.json.js' //本地数据
-	
 	
 	export default {
 		components: {
@@ -225,9 +225,6 @@
 			},
 		},	
 		methods: {
-			goShophome(id){
-				this.$api.navigateTo(`/supplier/pages/user/my-shop?shopId=${id}`)
-			},
 			// 滚动切换标签样式
 			onChange: function(e) {
 				let index = e.target.current || e.detail.current;
@@ -283,37 +280,37 @@
 					this.skeletonShow = false
 					this.isOnloadFlag = false
 				},1500)
-				let orderItem = this.orderTabBar[0];
-				// let state = orderItem.state;
-				// if(source === 'tabChange' && orderItem.loaded === true){
-				// 	//tab切换只有第一次需要加载数据
-				// 	return;
-				// }
+				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
-					// 	this.organizeId = resolve.organizeId
-					// 	this.OrderService.QueryOrderList(
-					// 		{
-					// 			orderState:index,
-					// 			organizeId:resolve.organizeId,
-					// 			pageNum:1,
-					// 			pageSize:this.pageSize,
-					// 			}
-					// 	)
-					// 	.then(response =>{
+					this.$api.getStorage().then((resolve) =>{
+						this.userId = resolve.userId
+						this.OrderService.QueryOrderList(
+							{
+								orderState:index,
+								userId:resolve.userId,
+								pageNum:1,
+								pageSize:this.pageSize,
+							}
+						)
+						.then(response =>{
+							let data = response.data
 							//loaded新字段用于表示数据加载完毕，如果为空可以显示空白页
-							let orderList = orderDataList.filter(item=>{
-									//添加不同状态下订单的表现形式
-									item = Object.assign(item, this.StateExpFormat(item.state));
-									return item;
+							let orderList = data.list.filter(item=>{
+								//添加不同状态下订单的表现形式
+								item = Object.assign(item, this.StateExpFormat(item.state));
+								return item;
 							});
 							orderItem.orderList =[];
 							orderList.forEach(item=>{
 								orderItem.orderList.push(item);
 							})
 							this.$set(orderItem, 'loaded', true);
-							this.hasNextPage = response.data.hasNextPage;
+							this.hasNextPage = data.hasNextPage;
 							if(this.hasNextPage){
 								this.pullUpOn = false
 								this.nomoreText = '上拉显示更多'
@@ -325,10 +322,10 @@
 									this.nomoreText = '已至底部'
 								}
 							}
-					// 	}).catch(error =>{
-					// 		this.$util.msg(error.msg,2000);
-					// 	})
-					// })
+						}).catch(error =>{
+							this.$util.msg(error.msg,2000);
+						})
+					})
 				}, 600);	
 			}, 
 			getOnReachBottomData(index){//上拉加载
@@ -336,16 +333,16 @@
 				this.OrderService.QueryOrderList(
 					{
 						orderState:index,
-						organizeId:this.organizeId,
+						userId:this.userId,
 						pageNum:this.pageNum,
 						pageSize:this.pageSize
 					}
 				)
 				.then(response =>{
 					let orderItem = this.orderTabBar[index];
-					let resData = response.data.results
-					this.hasNextPage = response.data.hasNextPage;
-					orderItem.orderList = orderItem.orderList.concat(resData)
+					let data = response.data
+					this.hasNextPage = data.hasNextPage;
+					orderItem.orderList = orderItem.orderList.concat(data.list)
 					this.pullFlag = false;// 防上拉暴滑
 					setTimeout(()=>{this.pullFlag = true;},500)
 					if(this.hasNextPage){

pages/user/order/order-logistics.vue

@@ -10,9 +10,9 @@
 					</view>
 					<view class="goods-item" v-for="(pros,prosIndex) in comItem.productsList" :key="prosIndex">
 						<view class="goods-pros-t">
-							<view class="pros-img"><image :src="pros.mainImage" alt="" /></view>
+							<view class="pros-img"><image :src="pros.image" alt="" /></view>
 							<view class="pros-product">
-								<view class="producttitle">{{pros.name}}</view>
+								<view class="producttitle">{{pros.productName}}</view>
 								<view class="productspec">
 									购买数量：<text class="color">{{pros.number}}</text>
 								</view>
@@ -99,7 +99,7 @@
 				})
 			},
 			getData() {
-				this.OrderService.QueryLogistics({orderID: this.orderId}).then(response =>{
+				this.OrderService.QueryLogistics({orderId: this.orderId}).then(response =>{
 					const resData = response.data;
 					// 添加订单列表信息
 					let orderListArr = [];
@@ -142,8 +142,8 @@
 							cmLogisticsRecords.forEach((prosItem,prosIndex) => {
 								prosListArr.push({
 									id: prosItem.organizeProductID,
-									name: prosItem.productName,
-									mainImage: prosItem.image,
+									productName: prosItem.productName,
+									image: prosItem.image,
 									number: prosItem.buyNum,
 									logNumber: prosItem.num
 								})

pages/user/order/search-order.vue

@@ -31,7 +31,6 @@
 					<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="order-title">
-								<view class="order-title-name">{{order.clubName}}</view>
 								<view class="order-title-t">
 									<text class="bage-text tui-skeleton-fillet"><text class="text">订单编号：</text>{{order.orderNo}}</text>
 								</view>
@@ -134,7 +133,7 @@
 				isShowEmpty:false,
 				windowHeight: '',
 				showSkeleton: true,
-				userID:0,
+				userId:0,
 				orderList: [],
 				btnoRderID: 0, //点击按钮传入的的订单ID
 				pageNum: 1,	  //页数
@@ -157,8 +156,8 @@
 		},
 		onLoad() {
 			this.$api.getStorage().then((resolve) =>{
-				this.organizeId = resolve.organizeId
-				this.InitGetSerachRecord(this.organizeId)
+				this.userId = resolve.userId
+				this.InitGetSerachRecord(this.userId)
 			})	
 		},
 		filters:{
@@ -176,7 +175,7 @@
 				}
 			},
 			InitGetSerachRecord(){		
-				this.OrderService.SearchOrderHistory({organizeId:this.organizeId}).then(response =>{
+				this.OrderService.SearchOrderHistory({userId:this.userId}).then(response =>{
 					this.serachRecordList = response.data
 					if(this.serachRecordList.length>0){
 						this.isSearchHistory = true
@@ -226,13 +225,14 @@
 				 * @param：userId(用户ID)
 				 * @param：pageNum(页码数)
 				 * @param：pageSize(每页条数)
-				 * @param：organizeID(全局变量组织ID)
+				 * @param：userId(全局变量组织ID)
 				 */ 
 				this.OrderService.SearchOrderInfo(
 					{
 						searchWord:this.searchInputVal,
-						organizeId:this.organizeId,
-						pageNum:1,pageSize:this.pageSize,
+						userId:this.userId,
+						pageNum:1,
+						pageSize:this.pageSize,
 					}
 				)
 				.then(response =>{
@@ -274,7 +274,7 @@
 				this.OrderService.SearchOrderInfo(
 					{
 						searchWord:this.searchInputVal,
-						organizeId:this.organizeId,
+						userId:this.userId,
 						pageNum:this.pageNum,
 						pageSize:this.pageSize,
 					}
@@ -359,7 +359,7 @@
 							this.handOrderConfirm(this.btnoRderID);
 							break;
 						case 'history':	
-							this.handDeleteHistory(this.organizeId)
+							this.handDeleteHistory(this.userId)
 					}
 				}
 				this.modal = false;
@@ -394,8 +394,8 @@
 					this.$util.msg(error.msg,2000)
 				})
 			},
-			handDeleteHistory(id){
-				this.OrderService.ClearOrderHistory({organizeId:id}).then(response =>{
+			handDeleteHistory(){
+				this.OrderService.ClearOrderHistory({userId:this.userId}).then(response =>{
 					this.$util.msg('删除记录成功',2000,true,'success')
 					this.serachRecordList=[]
 				}).catch(error =>{
@@ -677,14 +677,6 @@
 		width: 100%;
 		height: auto;
 		padding-bottom: 20rpx;
-		.order-title-name{
-			width: 100%;
-			height: 48rpx;
-			line-height: 48rpx;
-			text-align: left;
-			font-size: $font-size-28;
-			color: #333333;
-		}
 		.order-title-t{
 			width: 100%;
 			height: 48rpx;

services/product.service.js

@@ -114,4 +114,20 @@ export default class ProductService {
 			isLoading: true ,
 		})
 	}
+	/* 活动专区 */
+	GetProductActivityAreaList (data = {}) {
+		return this.AjaxService.get({ 
+			url:'/product/activityArea', 
+			data, 
+			isLoading: true ,
+		})
+	}
+	/* 活动详情 */
+	GetProductActivityDetails (data = {}) {
+		return this.AjaxService.get({ 
+			url:'/product/activity/details', 
+			data, 
+			isLoading: true ,
+		})
+	}
 }

services/user.service.js

@@ -73,4 +73,16 @@ export default class UserService {
 			isLoading: false
 		})
 	}
+	/**
+	 * @设置默认地址
+	 * @param:userId 用户ID(必传)，
+	 * @param:addressId 地址ID，
+	 */
+	GetUserOrderTotal(data = {}) {
+		return this.AjaxService.get({
+			url: '/order/order/total',
+			data,
+			isLoading: false
+		})
+	}
 }