Merge remote-tracking branch 'remotes/origin/developer' into developerB

pages/goods/product.vue

@@ -426,6 +426,7 @@
 						this.retailPrice = this.product.price.toFixed(2);
 						this.buyRetailPrice = this.product.price;
 					}
+					
 					//处理下架商品和售罄商品
 					if(this.product.validFlag =='3' || this.stock == 0){
 						this.isNoneDisabled = true
@@ -435,9 +436,9 @@
 						this.isNoneDisabled = false
 						this.goodsData.disabledText = ''
 					}
-					if(this.product.price1TextFlag == "1"){
+					if(this.product.priceFlag == 1){
 						this.disabled = true
-					}else if(this.product.price1TextFlag == "2"){
+					}else if(this.product.priceFlag == 2){
 						if(this.userIdentity == 4){
 							this.disabled = true
 						}else{
@@ -457,6 +458,7 @@
 					if(this.stock == 0){
 						this.goodsData.disabledText = '售罄'
 					}
+					console.log(this.disabled);
 					setTimeout(()=>{
 						this.getSectionProps();
 					},2000)
@@ -568,7 +570,7 @@
 			},
 			processActivityPrice(){//单独处理活动价格和阶梯价格
 				if(this.ladderPriceFlag == '0' && this.product.actStatus == 0 || this.product.actStatus == 1){
-					this.buyRetailPrice = this.product.retailPrice
+					this.buyRetailPrice = this.product.price
 				}else{
 					this.ladderPriceList.forEach((item,index)=>{
 						if(this.number>=item.buyNum){
@@ -580,6 +582,9 @@
 			showSpec(type) {//显示选择数量确认弹窗
 				this.isBtnType = type
 				this.specClass = 'show';
+				if (this.ladderPriceFlag) {
+					this.processActivityPrice()
+				}
 			},
 			hideSpec() {//关闭选择数量确认弹窗
 				this.specClass = 'hide';

pages/login/register-supplier.vue

@@ -315,7 +315,7 @@
 				isCheck:false,			//是否勾选协议
 				userID:'',		//公司userID
 				clubID:'',		//公司ID
-				stepIndex:2,
+				stepIndex:1,
 				firstParmas:{
 					bindMobile:'',
 					smsCode:'',

search/pages/search/search.vue

@@ -402,7 +402,7 @@
 			},
 			confirmDetele() {//清空历史记录
 				this.$util.modal('提示','确定删除历史记录？','确定','取消',true,() =>{
-					this.ProductService.GetDeleteProductSearchHistory({userId:this.userID}).then(response =>{
+					this.ProductService.GetDeleteProductSearchHistory({userId:this.userId}).then(response =>{
 						this.$util.msg('删除成功',2000,true,'success')
 						this.serachRecordList=[];
 					}).catch(error =>{

services/ajax.env.js

@@ -9,7 +9,7 @@ if(process.env.NODE_ENV === 'development'){
 	// URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境
-	URL_CONFIG = 'https://spi-b.caimei365.com'
-    // URL_CONFIG = 'https://spi.caimei365.com'
+	// URL_CONFIG = 'https://spi-b.caimei365.com'
+    URL_CONFIG = 'https://spi.caimei365.com'
 }
 export default URL_CONFIG

services/common.service.js

@@ -66,11 +66,19 @@ export default class CommonService {
 		})
 	}
 	/* 首页金刚区分类 */
+	// GetHomeInit (data = {}) {
+	// 	return this.AjaxService.get({ 
+	// 		url:'/home/init', 
+	// 		data, 
+	// 		isLoading: false ,
+	// 	})
+	// }
 	GetHomeInit (data = {}) {
 		return this.AjaxService.get({ 
-			url:'/home/init', 
+			url:'/commodity/home/init', 
 			data, 
 			isLoading: false ,
+			isHost:true
 		})
 	}
 	/* 首页金刚区二级分类 */

services/config.env.js

@@ -7,7 +7,7 @@ if(process.env.NODE_ENV === 'development'){
 	// URL_CONFIG = 'https://core.caimei365.com'
 }else{
     // 生产环境
-	URL_CONFIG = 'https://core-b.caimei365.com'
-	// URL_CONFIG = 'https://core.caimei365.com'
+	// URL_CONFIG = 'https://core-b.caimei365.com'
+	URL_CONFIG = 'https://core.caimei365.com'
 }
 export default URL_CONFIG