Merge branch 'developer' into developerD

common/css/common.scss

@@ -1,3 +1,6 @@
+.service_none{
+	display: none !important;
+}
 .clearfix:after {
   content: ".";
   display: block;

components/cm-module/listTemplate/classifyProductList.vue

@@ -8,8 +8,8 @@
 				<view class="list-details-info">
 					<text class="list-details-title">{{item.name}}</text>
 					<text class="list-details-specs">规格：{{item.unit}}</text>
-					<view class="list-details-specs" v-if="item.productCode!=''&&item.productCode!=null">商品编码：{{item.productCode}}</view>
-					<view class="list-details-price">
+					<view class="list-details-specs" v-if="hasLogin && item.productCode!=''&&item.productCode!=null">商品编码：{{item.productCode}}</view>
+					<view class="list-details-price" v-if="hasLogin">
 						<template v-if="userIdentity == 3">
 							<view class="floor-item-act" v-if="item.actStatus==1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
@@ -64,7 +64,7 @@
 								</template>
 							</view>
 						</view>	
-						<view  v-else class="list-login-now">
+						<view  v-else class="list-login-now service_none">
 							<text class="p-no">￥</text>
 							<uni-stars :stars="parseInt(item.price1Grade)" :font-size='36' :width-info="180"></uni-stars>
 						</view>

components/cm-module/listTemplate/commodityList.vue

@@ -8,8 +8,8 @@
 				<view class="list-details-info">
 					<text class="list-details-title">{{item.p_name}}</text>
 					<text class="list-details-specs">规格：{{item.p_unit}}</text>
-					<view class="list-details-specs" v-if="item.p_code!=''&&item.p_code!=null">商品编码：{{item.p_code}}</view>
-					<view class="list-details-price">
+					<view class="list-details-specs" v-if="hasLogin && item.p_code!=''&& item.p_code!=null">商品编码：{{item.p_code}}</view>
+					<view class="list-details-price" v-if="hasLogin">
 						<template v-if="userIdentity == 3">
 							<view class="floor-item-act" v-if="item.actStatus==1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
@@ -84,7 +84,7 @@
 								</template>
 							</template>
 						</view>	
-						<view  v-else class="list-login-now">
+						<view  v-else class="list-login-now service_none">
 							<text class="p-no">￥</text>
 							<uni-grader :grade="Number(item.p_price_grade)"></uni-grader>
 						</view>

components/cm-module/pageFloorTemplate/templateA.vue

@@ -23,7 +23,7 @@
 					<text class="mclap" :class="item.product.beautyActFlag == '1' ? 'indent' : ''">{{item.name}} </text>
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
-					<view class="floor-item-act">
+					<view class="floor-item-act"  v-if="hasLogin">
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">
@@ -103,7 +103,7 @@
 							</view>
 						</template>
 					</view>
-					<view v-else class="no-price">
+					<view v-else class="no-price service_none">
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
@@ -195,6 +195,9 @@
 </script>
 
 <style lang="scss">
+	.service_none{
+		display: none !important;
+	}
 	.section_page_main{
 		width: 100%;
 		height: auto;

components/cm-module/pageFloorTemplate/templateB.vue

@@ -35,7 +35,7 @@
 					<text class="mclap" :class="item.product.beautyActFlag == '1' ? 'indent' : ''">{{item.name}} </text>
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
-					<view class="floor-item-act">
+					<view class="floor-item-act"  v-if="hasLogin">
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">
@@ -115,7 +115,7 @@
 							</view>
 						</template>
 					</view>
-					<view v-else class="no-price">
+					<view v-else class="no-price service_none">
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
@@ -207,6 +207,9 @@
 </script>
 
 <style lang="scss">
+	.service_none{
+		display: none !important;
+	}
 	.section_page_main{
 		width: 100%;
 		height: auto;

components/cm-module/pageFloorTemplate/templateC.vue

@@ -35,7 +35,7 @@
 					<text class="mclap" :class="item.product.beautyActFlag == '1' ? 'indent' : ''">{{item.name}} </text>
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
-					<view class="floor-item-act">
+					<view class="floor-item-act"  v-if="hasLogin">
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">
@@ -115,7 +115,7 @@
 							</view>
 						</template>
 					</view>
-					<view v-else class="no-price">
+					<view v-else class="no-price service_none">
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
@@ -207,6 +207,9 @@
 </script>
 
 <style lang="scss">
+	.service_none{
+		display: none !important;
+	}
 	.section_page_main{
 		width: 100%;
 		height: auto;

components/cm-module/pageFloorTemplate/templateD.vue

@@ -47,7 +47,7 @@
 					<text class="mclap" :class="item.product.beautyActFlag == '1' ? 'indent' : ''">{{item.name}} </text>
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
-					<view class="floor-item-act">
+					<view class="floor-item-act"  v-if="hasLogin">
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">
@@ -86,7 +86,7 @@
 									</view>
 								</template>	
 								<template v-else>
-									<view class="no-price">
+									<view class="no-price service_none">
 										<view class="p-stars">
 											<text class="p-no">￥</text>
 											<uni-grader :grade="Number(item.product.priceGrade)" :margin="14"></uni-grader>
@@ -219,6 +219,9 @@
 </script>
 
 <style lang="scss">
+	.service_none{
+		display: none !important;
+	}
 	.section_page_main{
 		width: 100%;
 		height: auto;

components/cm-module/pageFloorTemplate/templateE.vue

@@ -23,7 +23,7 @@
 					<text class="mclap" :class="item.product.beautyActFlag == '1' ? 'indent' : ''">{{item.name}} </text>
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
-					<view class="floor-item-act">
+					<view class="floor-item-act"  v-if="hasLogin">
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">
@@ -103,7 +103,7 @@
 							</view>
 						</template>
 					</view>
-					<view v-else class="no-price">
+					<view v-else class="no-price service_none">
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
@@ -195,6 +195,9 @@
 </script>
 
 <style lang="scss">
+	.service_none{
+		display: none !important;
+	}
 	.section_page_main{
 		width: 100%;
 		height: auto;

components/cm-module/pageFloorTemplate/templateF.vue

@@ -11,7 +11,7 @@
 					<text class="mclap" :class="item.product.beautyActFlag == '1' ? 'indent' : ''">{{item.name}} </text>
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
-					<view class="floor-item-act">
+					<view class="floor-item-act"  v-if="hasLogin">
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">
@@ -91,7 +91,7 @@
 							</view>
 						</template>
 					</view>
-					<view v-else class="no-price">
+					<view v-else class="no-price service_none">
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
@@ -180,6 +180,9 @@
 </script>
 
 <style lang="scss">
+	.service_none{
+		display: none !important;
+	}
 	.section_page_main{
 		width: 100%;
 		height: auto;

components/cm-module/pageFloorTemplate/templateG.vue

@@ -11,7 +11,7 @@
 					<text class="mclap" :class="item.product.beautyActFlag == '1' ? 'indent' : ''">{{item.name}} </text>
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
-					<view class="floor-item-act">
+					<view class="floor-item-act"  v-if="hasLogin">
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">
@@ -91,7 +91,7 @@
 							</view>
 						</template>
 					</view>
-					<view v-else class="no-price">
+					<view v-else class="no-price service_none">
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
@@ -179,6 +179,9 @@
 </script>
 
 <style lang="scss">
+	.service_none{
+		display: none !important;
+	}
 	.section_page_main{
 		width: 100%;
 		height: auto;

components/cm-module/pageFloorTemplate/templateI.vue

@@ -78,7 +78,7 @@
 					</text>
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
-					<view class="floor-item-act">
+					<view class="floor-item-act"  v-if="hasLogin">
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus === 1">
 								<view
@@ -223,7 +223,7 @@
 							</view>
 						</template>
 					</view>
-					<view v-else class="no-price">
+					<view v-else class="no-price service_none">
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
@@ -319,6 +319,9 @@ export default {
 </script>
 
 <style lang="scss">
+.service_none{
+	display: none !important;
+}	
 .section_page_main {
 	width: 100%;
 	height: auto;

components/cm-module/pageFloorTemplate/templateJ.vue

@@ -79,7 +79,7 @@
 					</text>
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
-					<view class="floor-item-act">
+					<view class="floor-item-act"  v-if="hasLogin">
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus === 1">
 								<view
@@ -224,7 +224,7 @@
 							</view>
 						</template>
 					</view>
-					<view v-else class="no-price">
+					<view v-else class="no-price service_none">
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
@@ -320,6 +320,9 @@ export default {
 </script>
 
 <style lang="scss">
+.service_none{
+	display: none !important;
+}	
 .section_page_main {
 	width: 100%;
 	height: auto;

components/cm-module/pageFloorTemplate/templateK.vue

@@ -118,7 +118,7 @@
 					</text>
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
-					<view class="floor-item-act">
+					<view class="floor-item-act"  v-if="hasLogin">
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus === 1">
 								<view
@@ -263,7 +263,7 @@
 							</view>
 						</template>
 					</view>
-					<view v-else class="no-price">
+					<view v-else class="no-price service_none">
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
@@ -359,6 +359,9 @@ export default {
 </script>
 
 <style lang="scss">
+.service_none{
+	display: none !important;
+}		
 .section_page_main {
 	width: 100%;
 	height: auto;

components/cm-module/pageTemplate/templateA.vue

@@ -23,7 +23,7 @@
 					<text class="mclap" :class="item.product.beautyActFlag == '1' ? 'indent' : ''">{{item.name}} </text>
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
-					<view class="floor-item-act" >
+					<view class="floor-item-act"  v-if="hasLogin">
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">
@@ -103,7 +103,7 @@
 							</view>
 						</template>
 					</view>
-					<view v-else class="no-price">
+					<view v-else class="no-price service_none">
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
@@ -195,6 +195,9 @@
 </script>
 
 <style lang="scss">
+	.service_none{
+		display: none !important;
+	}
 	.section_page_main{
 		width: 100%;
 		height: auto;

components/cm-module/pageTemplate/templateB.vue

@@ -35,7 +35,7 @@
 					<text class="mclap" :class="item.product.beautyActFlag == '1' ? 'indent' : ''">{{item.name}} </text>
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
-					<view class="floor-item-act">
+					<view class="floor-item-act"  v-if="hasLogin">
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">
@@ -115,7 +115,7 @@
 							</view>
 						</template>
 					</view>
-					<view v-else class="no-price">
+					<view v-else class="no-price service_none">
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
@@ -207,6 +207,9 @@
 </script>
 
 <style lang="scss">
+	.service_none{
+		display: none !important;
+	}
 	.section_page_main{
 		width: 100%;
 		height: auto;

components/cm-module/pageTemplate/templateC.vue

@@ -35,7 +35,7 @@
 					<text class="mclap" :class="item.product.beautyActFlag == '1' ? 'indent' : ''">{{item.name}} </text>
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
-					<view class="floor-item-act">
+					<view class="floor-item-act"  v-if="hasLogin">
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">
@@ -115,7 +115,7 @@
 							</view>
 						</template>
 					</view>
-					<view v-else class="no-price">
+					<view v-else class="no-price service_none">
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
@@ -207,6 +207,9 @@
 </script>
 
 <style lang="scss">
+	.service_none{
+		display: none !important;
+	}
 	.section_page_main{
 		width: 100%;
 		height: auto;

components/cm-module/pageTemplate/templateD.vue

@@ -47,7 +47,7 @@
 					<text class="mclap" :class="item.product.beautyActFlag == '1' ? 'indent' : ''">{{item.name}} </text>
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
-					<view class="floor-item-act">
+					<view class="floor-item-act"  v-if="hasLogin">
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">
@@ -127,7 +127,7 @@
 							</view>
 						</template>
 					</view>
-					<view v-else class="no-price">
+					<view v-else class="no-price service_none">
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
@@ -219,6 +219,9 @@
 </script>
 
 <style lang="scss">
+	.service_none{
+		display: none !important;
+	}
 	.section_page_main{
 		width: 100%;
 		height: auto;

components/cm-module/pageTemplate/templateE.vue

@@ -23,7 +23,7 @@
 					<text class="mclap" :class="item.product.beautyActFlag == '1' ? 'indent' : ''">{{item.name}} </text>
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
-					<view class="floor-item-act">
+					<view class="floor-item-act"  v-if="hasLogin">
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">
@@ -103,7 +103,7 @@
 							</view>
 						</template>
 					</view>
-					<view v-else class="no-price">
+					<view v-else class="no-price service_none">
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
@@ -195,6 +195,9 @@
 </script>
 
 <style lang="scss">
+	.service_none{
+		display: none !important;
+	}
 	.section_page_main{
 		width: 100%;
 		height: auto;

components/cm-module/pageTemplate/templateF.vue

@@ -11,7 +11,7 @@
 					<text class="mclap" :class="item.product.beautyActFlag == '1' ? 'indent' : ''">{{item.name}} </text>
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
-					<view class="floor-item-act">
+					<view class="floor-item-act"  v-if="hasLogin">
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">
@@ -91,7 +91,7 @@
 							</view>
 						</template>
 					</view>
-					<view v-else class="no-price">
+					<view v-else class="no-price service_none">
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
@@ -195,6 +195,9 @@
 </script>
 
 <style lang="scss">
+	.service_none{
+		display: none !important;
+	}
 	.section_page_main{
 		width: 100%;
 		height: auto;

components/cm-module/pageTemplate/templateG.vue

@@ -11,7 +11,7 @@
 					<text class="mclap" :class="item.product.beautyActFlag == '1' ? 'indent' : ''">{{item.name}} </text>
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
-					<view class="floor-item-act">
+					<view class="floor-item-act"  v-if="hasLogin">
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">
@@ -91,7 +91,7 @@
 							</view>
 						</template>
 					</view>
-					<view v-else class="no-price">
+					<view v-else class="no-price service_none">
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
@@ -181,6 +181,9 @@
 </script>
 
 <style lang="scss">
+	.service_none{
+		display: none !important;
+	}
 	.section_page_main{
 		width: 100%;
 		height: auto;

components/cm-module/pageTemplate/templateH.vue

@@ -14,7 +14,7 @@
 								<text class="mclap" :class="item.product.beautyActFlag == '1' ? 'indent' : ''">{{item.name}} </text>
 							</view>
 							<view class="floor-item-price" v-if="item.listType == 1">
-								<view class="floor-item-act">
+								<view class="floor-item-act"  v-if="hasLogin">
 									<template v-if="userIdentity === 3">
 										<template v-if="item.product.actStatus===1">
 											<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">
@@ -94,7 +94,7 @@
 										</view>
 									</template>
 								</view>
-								<view v-else class="no-price">
+								<view v-else class="no-price service_none">
 									<template v-if="item.product.productCategory == 1">
 										<view class="p-stars">
 											<text class="p-no">￥</text>
@@ -212,6 +212,9 @@
 </script>
 
 <style lang="scss">
+	.service_none{
+		display: none !important;
+	}
 	.section_page_main{
 		width: 100%;
 		height: auto;

components/cm-module/pageTemplate/templateI.vue

@@ -79,7 +79,7 @@
 					</text>
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
-					<view class="floor-item-act">
+					<view class="floor-item-act"  v-if="hasLogin">
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus === 1">
 								<view
@@ -224,7 +224,7 @@
 							</view>
 						</template>
 					</view>
-					<view v-else class="no-price">
+					<view v-else class="no-price service_none">
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
@@ -320,6 +320,9 @@ export default {
 </script>
 
 <style lang="scss">
+.service_none{
+	display: none !important;
+}	
 .section_page_main {
 	width: 100%;
 	height: auto;

components/cm-module/pageTemplate/templateJ.vue

@@ -80,7 +80,7 @@
 					</text>
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
-					<view class="floor-item-act">
+					<view class="floor-item-act"  v-if="hasLogin">
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus === 1">
 								<view
@@ -225,7 +225,7 @@
 							</view>
 						</template>
 					</view>
-					<view v-else class="no-price">
+					<view v-else class="no-price service_none">
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
@@ -321,6 +321,9 @@ export default {
 </script>
 
 <style lang="scss">
+.service_none{
+	display: none !important;
+}		
 .section_page_main {
 	width: 100%;
 	height: auto;

components/cm-module/pageTemplate/templateK.vue

@@ -119,7 +119,7 @@
 					</text>
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
-					<view class="floor-item-act">
+					<view class="floor-item-act"  v-if="hasLogin">
 						<template v-if="userIdentity === 3">
 							<template v-if="item.product.actStatus === 1">
 								<view
@@ -264,7 +264,7 @@
 							</view>
 						</template>
 					</view>
-					<view v-else class="no-price">
+					<view v-else class="no-price service_none">
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
@@ -360,6 +360,9 @@ export default {
 </script>
 
 <style lang="scss">
+.service_none{
+	display: none !important;
+}	
 .section_page_main {
 	width: 100%;
 	height: auto;

components/cm-module/productDetails/cm-price.vue

@@ -2,7 +2,7 @@
 	<!-- 商品详情价格判断 -->
 	<view class="wrap-main">
 		<template v-if="!hasLogin">
-			<view class="p-login grade tui-skeleton-fillet">
+			<view class="p-login grade tui-skeleton-fillet service_none">
 				<text class="p-no">￥</text>
 				<uni-grader :grade="Number(product.priceGrade)"></uni-grader>
 				<view v-if="product.actStatus==1" class="floor-item-act">

components/cm-module/productDetails/secondPrice.vue

@@ -2,7 +2,7 @@
 	<!-- 商品详情价格判断 -->
 	<view class="wrap-main">
 		<template v-if="!hasLogin">
-			<view class="p-login grade tui-skeleton-fillet">
+			<view class="p-login grade tui-skeleton-fillet service_none">
 				<view class="floor-item-btn" v-if="product.detailTalkFlag !=2">
 					<view class="btn" @click.stop="loginClick">登录查看价格</view>
 				</view>

pages/goods/goods-classify.vue

@@ -49,8 +49,8 @@
 								<text class="mclap" :class="item.beautyActFlag == 1 ? 'indent' : ''">{{ item.name }}</text>
 							</text>
 							<text class="list-details-specs">规格：{{item.unit}}</text>
-							<view class="list-details-specs" v-if="item.code!=''&&item.code!=null">商品编码：{{item.code}}</view>
-							<view class="list-details-price">
+							<view class="list-details-specs" v-if="hasLogin && item.code!=''&&item.code!=null">商品编码：{{item.code}}</view>
+							<view class="list-details-price"  v-if="hasLogin">
 								<template v-if="userIdentity == 3">
 									<view class="floor-item-act" v-if="item.actStatus==1">
 										<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
@@ -125,7 +125,7 @@
 										</template>
 									</template>
 								</view>	
-								<view  v-else class="list-login-now">
+								<view  v-else class="list-login-now service_none">
 									<text class="p-no">￥</text>
 									<uni-grader :grade="Number(item.priceGrade)"></uni-grader>
 								</view>

pages/goods/product.vue

@@ -77,7 +77,7 @@
 								<view class="wrap-label" v-if="product.tagsList.length>0">
 									<view class="label-a tui-skeleton-fillet" v-for="(label,index) in  product.tagsList" :key="index">{{label}}</view>
 								</view>
-								<view class="product-seve">
+								<view class="product-seve" v-if="hasLogin">
 									<text class="label">采美承诺：</text>
 									<text class="iconfont icon-dui tui-skeleton-rect"><text class="text">无忧退货</text></text>
 									<text class="iconfont icon-dui tui-skeleton-rect"><text class="text">快速退款</text></text>
@@ -152,7 +152,7 @@
 						<view class="title">商品参数</view>
 						<div class="tui-popup-main">
 							<scroll-view class="tui-popup-scroll"  scroll-y="true">
-								<view class="content-tr">
+								<view class="content-tr" v-if="hasLogin">
 									<view class="content-td">起订量</view>
 									<view class="content-th">{{product.minBuyNumber}}</view>
 								</view>
@@ -168,11 +168,11 @@
 									<view class="content-td">包装规格</view> 
 									<view class="content-th">{{product.unit}}</view>
 								</view>
-								<view class="content-tr">
+								<view class="content-tr" v-if="hasLogin">
 									<view class="content-td">商品编码</view>
 									<view class="content-th">{{product.productCode}}</view>
 								</view>
-								<view class="content-tr">
+								<view class="content-tr" v-if="hasLogin">
 									<view class="content-td">库存</view>
 									<view class="content-th">{{product.stock}}</view>
 								</view>
@@ -190,7 +190,7 @@
 					</view>	
 				</tui-bottom-popup>	
 				<!-- 底部按钮 -->
-				<view class="menu" v-if="isShowButton">
+				<view class="menu" v-if="hasLogin && isShowButton">
 					<view class="bottom-btn" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
 						<view class="bottom-le">
 							<view class="item-bt" @click="this.$api.switchTabTo('/pages/tabBar/home/index')">

search/pages/search/search.vue

@@ -63,10 +63,10 @@
 							<text class="mclap" :class="item.beautyActFlag == 1 ? 'indent' : ''">{{isInterceptHtmlFn(item.name)}}</text>
 						</view>
 						<text class="list-details-specs">规格：{{item.unit}}</text>
-						<view class="list-details-specs" v-if="item.code!=''&&item.code!=null">
+						<view class="list-details-specs" v-if="hasLogin && item.code!=''&&item.code!=null">
 							<view>商品编码：{{item.code}}</view>
 						</view>
-						<view class="list-details-price">
+						<view class="list-details-price" v-if="hasLogin">
 							<template v-if="userIdentity == 3">
 								<view class="floor-item-act" v-if="item.actStatus==1">
 									<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
@@ -137,7 +137,7 @@
 									</text>
 								</template>
 							</view>	
-							<view  v-else class="list-login-now">
+							<view  v-else class="list-login-now service_none">
 								<text class="p-no">￥</text>
 								<uni-grader :grade="Number(item.priceGrade)"></uni-grader>
 							</view>

second/pages/product/product-details.vue

@@ -71,7 +71,7 @@
 							</view>
 						</view>
 					</view>	
-						<view class="product-seve">
+						<view class="product-seve" v-if="hasLogin">
 							<text class="iconfont icon-wuyoutuihuo tui-skeleton-rect"><text class="text">无忧退货</text></text>
 							<text class="iconfont icon-wuyoutuihuoi tui-skeleton-rect"><text class="text">快速退款</text></text>
 							<text class="iconfont icon-wuyoutuihuo tui-skeleton-rect"><text class="text">正品保证</text></text>
@@ -80,7 +80,7 @@
 				
 				<view class="product-parameter" @click="showPopup">
 					<text class="title">参数：</text>
-					<text class="name">品牌  起订量  分类...</text>
+					<text class="name">品牌  参数  分类...</text>
 					<text class="iconfont icon-xiayibu"></text>
 				</view>
 			</view>
@@ -89,7 +89,7 @@
 				<view class="title">
 					<view class="title-tab">商品详情</view>
 				</view>
-				<view class="Disclaimer">
+				<view class="Disclaimer" v-if="hasLogin">
 					<span >免责声明</span>
 					<text class="text">
 						鉴于本商城提供的二手版块信息包括但不限于公司名称，商品的简介、性能、描述与说明，相关图片、视频等均由卖家自行提供，由卖家对其提供的信息承担相应法律责任。买家应自行甄别商品信息并查验商品性状。本商城对二手版块中买卖双方的交易不提供任何形式的担保与保证，特此声明！

second/pages/product/product-list.vue

@@ -42,9 +42,9 @@
 		                    <view class="productname" href="" :style="item.sold==0&&item.newAdded==1?'text-indent:60rpx':''">
 		                        {{item.name}}
 		                    </view>
-		                    <view class="targetprice" >
+		                    <view class="targetprice" v-if="hasLogin">
 		                        <text v-if="item.detailTalkFlag ==2 && hasLogin==false">￥详聊</text>
-		                        <text v-else-if="!hasLogin" class="priceparam" @click.stop="NavigatorLogin(item)">登录查看价格></text>
+		                        <text v-else-if="!hasLogin" class="priceparam service_none" @click.stop="NavigatorLogin(item)">登录查看价格></text>
 		                        <text v-else-if="hasLogin && item.detailTalkFlag==2">￥详聊</text>
 		                        <text v-else>￥{{ item.price | NumFormat}}</text>
 		                    </view>