commit -m 修复bug

components/cm-module/listTemplate/productList.vue

@@ -140,8 +140,7 @@
 				if(loadMore) {this.pageNum += 1;}
 				this.ProductService.GetRepeatBuyAgainProductList(
 					{
-						userId:13863,
-						// userId:this.userId,
+						userId:this.userId,
 						identity:this.identity,
 						pageNum:this.pageNum,
 						pageSize:this.pageSize,

components/cm-module/pageTemplate/templateC.vue

@@ -89,7 +89,7 @@
 								<view class="title-none"  v-if="item.product.priceFlag === 2">
 									<text class="p big">￥价格仅会员可见</text>
 								</view>
-								<view class="price tui-skeleton-rect" v-if="item.product.priceFlag === '0'" :class="PromotionsFormat(item.product.promotions) ? 'none' : ''">
+								<view class="price tui-skeleton-rect" v-if="item.product.priceFlag === 0" :class="PromotionsFormat(item.product.promotions) ? 'none' : ''">
 									<text class="p sm">￥</text>
 									<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.originalPrice : item.product.price ) | NumFormat}}</text>
 								</view>

components/cm-module/pageTemplate/templateG.vue

@@ -65,7 +65,7 @@
 								<view class="title-none"  v-if="item.product.priceFlag === 2">
 									<text class="p big">￥价格仅会员可见</text>
 								</view>
-								<view class="price tui-skeleton-rect" v-if="item.product.priceFlag === '0'" :class="PromotionsFormat(item.product.promotions) ? 'none' : ''">
+								<view class="price tui-skeleton-rect" v-if="item.product.priceFlag === 0" :class="PromotionsFormat(item.product.promotions) ? 'none' : ''">
 									<text class="p sm">￥</text>
 									<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.originalPrice : item.product.price ) | NumFormat}}</text>
 								</view>

components/cm-module/pageTemplate/templateH.vue

@@ -68,7 +68,7 @@
 											<view class="title-none"  v-if="item.product.priceFlag === 2">
 												<text class="p big">￥价格仅会员可见</text>
 											</view>
-											<view class="price tui-skeleton-rect" v-if="item.product.priceFlag === '0'" :class="PromotionsFormat(item.product.promotions) ? 'none' : ''">
+											<view class="price tui-skeleton-rect" v-if="item.product.priceFlag === 0" :class="PromotionsFormat(item.product.promotions) ? 'none' : ''">
 												<text class="p sm">￥</text>
 												<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.originalPrice : item.product.price ) | NumFormat}}</text>
 											</view>
@@ -155,6 +155,7 @@
 		},
 		created(){
 			this.initData(this.pageData)
+			console.log(this.userIdentity)
 		},
 		computed: {
 			...mapState(['hasLogin','userInfo','isActivity'])

pages/goods/cart.vue

@@ -2,7 +2,7 @@
 	<view class="container cart clearfix" v-if="hasLogin" :style="{paddingTop:CustomBar+'px'}"> 	
 		<headerNavbar :systeminfo='systeminfo' :navbar-data='nvabarData' :headerBtnPosi ="headerBtnPosi" :page='1'></headerNavbar>
 		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5"></tui-skeleton>
-		<view class="container-cart-main tui-skeleton" :style="{paddingTop:isshowDelbtn || goodsList.length == 0 ? '0rpx':'80rpx'}">
+		<view class="container-cart-main tui-skeleton" :style="{paddingTop:isshowDelbtn ? '0rpx':'80rpx'}">
 			<view class="foot-check-delbtn" v-if="!isshowDelbtn && goodsList.length>0" :style="{top:CustomBar+'px'}">
 				<view class="foot-text">共<text>{{kindCount}}</text>件商品</view>
 				<view class="delBtn" @tap.stop="showDelManager">删除</view>

pages/goods/product.vue

@@ -422,9 +422,9 @@
 						this.ladderPriceList = this.product.ladderPriceList;
 					}
 					//拆分金额并转千分位格式显示
-					if(this.product.retailPrice!=null){
-						this.retailPrice = this.product.retailPrice.toFixed(2);
-						this.buyRetailPrice = this.product.retailPrice;
+					if(this.product.price!=null){
+						this.retailPrice = this.product.price.toFixed(2);
+						this.buyRetailPrice = this.product.price;
 					}
 					//处理下架商品和售罄商品
 					if(this.product.validFlag =='3' || this.stock == 0){

services/ajax.env.js

@@ -5,8 +5,8 @@ if(process.env.NODE_ENV === 'development'){
 	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.81:8008'
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
-    // 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'
 }else{
     // 生产环境
 	URL_CONFIG = 'https://spi-b.caimei365.com'

services/common.service.js

@@ -34,17 +34,19 @@ export default class CommonService {
 	/* 首页楼层查看更多数据 */
 	GetHomeFloorContentDetails (data = {}) {
 		return this.AjaxService.get({ 
-			url:'/home/floorContentDetails', 
+			url:'/commodity/page/floor/details', 
 			data, 
 			isLoading: false ,
+			isHost:true
 		})
 	}
 	/* 二级页楼层查看更多数据 */
 	GePageFloorContentDetails (data = {}) {
 		return this.AjaxService.get({ 
-			url:'/home/pageFloorDetails', 
+			url:'/commodity/page/floor/centre', 
 			data, 
 			isLoading: false ,
+			isHost:true
 		})
 	}
 	/* 首页顶部三个模块数据 */
@@ -115,7 +117,6 @@ export default class CommonService {
 	/* 一级分类 */
 	GetFirstClassly (data = {}) {
 		return this.AjaxService.get({ 
-			// url:'/product/classify', 
 			url:'/commodity/classify', 
 			data, 
 			isLoading: false ,

services/config.env.js

@@ -3,8 +3,8 @@ if(process.env.NODE_ENV === 'development'){
     // 开发环境
     // URL_CONFIG = 'http://192.168.2.75:18002'	 //超超联调地址
 	// URL_CONFIG = 'http://192.168.2.67:18002'	 //裴裴联调地址
-	// 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'
 }else{
     // 生产环境
 	URL_CONFIG = 'https://core-b.caimei365.com'