Merge branch 'developerB' of git.caimei365.com:caimei-repository/caimei-applets-caimei into developerB

pages/goods/goods-secondary.vue

@@ -198,11 +198,9 @@
 				})
 			},
 			tabSelect(index,item) {//tab菜单被点击
-				console.log(item)
 				this.headTab.TabCur = index;
 				this.headTab.scrollLeft = (index - 1) * 50;
 				this.headTabId = item.linkParam.id;
-				console.log(this.headTabId)
 				uni.setNavigationBarTitle({title:item.name});
 				if(item.linkType === 8){
 					this.isActivityFlag = true

pages/login/login.vue

@@ -164,7 +164,7 @@
 			&.link{
 				background: #FFFFFF;
 				margin-bottom: 40rpx;
-				padding: 0 24rpx;
+				padding: 0 0;
 				line-height: 40rpx;
 				font-size: $font-size-28;
 				border-bottom: none;

seller/pages/order/create-order.vue

@@ -374,7 +374,7 @@
 						orderInvoice:this.invoiceData //发票信息
 					}
 				this.modalLayer = true;	
-				if(this.rebateFlag==1){
+				if(this.rebateFlag == 1){
 					this.$util.modal('','确定该订单为返佣订单吗？点击确定按钮继续提交订单','确定','取消',true,() =>{
 						this.SellerService.SellerCreateOrderSubmit({'params':JSON.stringify(params)}).then(response =>{
 							const data = response.data;