commit -m 微服务模块联调

common/config/wxLogin.js

@@ -46,9 +46,9 @@ const wxLoginQuick = async function(){// 根据微信的code获取用户登录
 			}
 		})
 		.catch(error =>{
-			uni.setStorageSync('unionId',response.data.unionId)
-			store.commit('logout',response.data)
-			store.commit('updateStatus',response.data)
+			uni.setStorageSync('unionId',error.data.unionId)
+			store.commit('logout',error.data)
+			store.commit('updateStatus',error.data)
 			store.commit('wxLogin',getUserInfo.userInfo);
 		})
 }

components/cm-module/creatOrder/invoiceTent.vue

@@ -138,7 +138,7 @@
 		methods:{
 			getUseFindInvoice(){//获取发票信息
 				this.$api.getStorage().then((resolve) => {
-					this.OrderService.GetFindInvoice({userId:resolve.userID}).then(response =>{
+					this.OrderService.GetFindInvoice({userId:resolve.userId}).then(response =>{
 						if(response.data == null){
 							this.invoiceData = Object.assign(this.invoiceData,'',{type:0})
 						}else{
@@ -149,8 +149,8 @@
 			},
 			updateInvoiceFn(){//保存发票信息
 				this.$api.getStorage().then((resolve) => {
-					console.log(resolve.userID)
-					this.OrderService.UpdateInvoice(Object.assign({userId:resolve.userID},this.invoiceData)).then(response =>{})
+					console.log(resolve.userId)
+					this.OrderService.UpdateInvoice(Object.assign({userId:resolve.userId},this.invoiceData)).then(response =>{})
 				})
 			},
 			choiceaInvoiceConfim(){

pages/goods/cart.vue

@@ -231,7 +231,7 @@
 				this.isCheckAll=false//是否全选
 				this.submitIds = []
 				this.$api.getStorage().then((resolve) => {
-					this.userID = resolve.userID;
+					this.userID = resolve.userId;
 					this.initGetCartGoodsList();
 				})	
 			},

pages/goods/instrument-details.vue

@@ -326,7 +326,7 @@
 		},
 		onShow() {
 			this.$api.getStorage().then((resolve) => {
-				this.userID = resolve.userID ? resolve.userID : '';	
+				this.userID = resolve.userId ? resolve.userId : '';	
 				this.userIdentity = resolve.userIdentity ? resolve.userIdentity : 3
 				if (isPreviewImg) {
 					isPreviewImg = false;

pages/goods/product.vue

@@ -745,9 +745,9 @@
 		},
 		onShow() {
 			this.$api.getStorage().then((resolve) => {
-				this.userID = resolve.userID ? resolve.userID : '';	
+				this.userID = resolve.userId ? resolve.userId : '';	
 				this.userIdentity = resolve.userIdentity ? resolve.userIdentity : 0
-				this.shopID =  resolve.shopID ? resolve.shopID : '';
+				this.shopID =  resolve.shopId ? resolve.shopId : '';
 				if(this.userIdentity == 0 || this.userIdentity == 2 || this.userIdentity == 4){
 					this.isShowButton = true
 				}else{

pages/login/bindemail.vue

@@ -133,7 +133,7 @@
 		},
 		onShow() {
 			this.$api.getStorage().then((resolve) => {
-				this.userID = resolve.userID
+				this.userID = resolve.userId
 			})
 		}
 	}

pages/login/register-supplier.vue

@@ -278,7 +278,7 @@
 					address:'',
 					shortName:'',	 	//公司简称
 					socialCreditCode:'',	//统一社会信用代码
-					businessLicense:'https://static.caimei365.com/app/img/upload/club-zizhi.png',	//营业执照图片
+					businessLicense:'',	//营业执照图片
 					provinceId :'',
 					cityId : '',
 					townId : '',

pages/tabBar/cart/cart.vue

@@ -219,7 +219,7 @@
 				this.isCheckAll=false//是否全选
 				this.submitIds = []
 				this.$api.getStorage().then((resolve) => {
-					this.userID = resolve.userID;
+					this.userID = resolve.userId;
 					this.initGetCartGoodsList();
 				})	
 			},

pages/tabBar/user/user.vue

@@ -234,6 +234,7 @@
 						this.userType = '会员机构'
 					}else{
 						this.name = $userData.userName //普通机构名称
+						this.isUpgradeAlert = true
 						this.userType = '普通机构'
 					}
 					this.headpic = $userData.image //会所头像
@@ -246,9 +247,6 @@
 					this.shipmentsCount = this.showBadge(data.shipmentsCount)//已发货	
 					this.salesReturnCount = this.showBadge(data.salesReturnCount)//退货/款	
 					let clubInfo ={name:this.name,image:this.headpic,clubID:$clubData.clubID}
-					if($userData.tipStatus == '0'){
-						this.isUpgradeAlert = true
-					}
 					uni.setStorage({key: 'clubInfo',data: clubInfo}) 
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)

pages/user/order/create-order.vue

@@ -141,7 +141,7 @@
 		},	
 		methods: {
 			getInitCrearOrder(option){//获取订单商品信息
-				let params ={userId:this.userID,count:this.productCount,productIds:this.productIds}
+				let params ={userId:this.userID,count:this.productCount,productIds:this.productIds,unionId:uni.getStorageSync('unionId')}
 				this.OrderService.CreateOrderInfo(params).then(response =>{
 					let resData = response.data
 					this.isRequest = true

second/pages/product/product-details.vue

@@ -430,7 +430,7 @@
 		},
 		onShow() {
 			this.$api.getStorage().then((resolve) => {
-				this.userID = resolve.userID ? resolve.userID : '';	
+				this.userID = resolve.userId ? resolve.userId : '';	
 				this.userIdentity = resolve.userIdentity ? resolve.userIdentity : 3
 				if (isPreviewImg) {
 					isPreviewImg = false;

seller/pages/cart/cart.vue

@@ -231,7 +231,7 @@
 				this.isCheckAll=false//是否全选
 				this.submitIds = []
 				this.$api.getStorage().then((resolve) => {
-					this.serviceProviderId = resolve.serviceProviderID;
+					this.serviceProviderId = resolve.serviceProviderId;
 					this.initGetCartGoodsList();
 				})	
 			},

services/ajax.service.js

@@ -48,6 +48,7 @@ class AjaxService {
 						resolve(res.data)
 					}else{
 						if (res.data.code === 0) {
+							console.log('2222222222')
 							resolve(res.data)
 						} else {
 							reject(res.data)