commit -m 采美豆

common/css/common.scss

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

components/cm-module/creatOrder/freight.vue

@@ -13,8 +13,8 @@
 				</view>
 			</view>
 			<view class="freight-bean" v-if="isBeansShow">
-				<view class="bean-le" v-if="freightData.freePostFlag == 1">可用{{ deductionBeans }}采美豆抵用{{ freightMoney }}元运费</view>
-				<view class="bean-le" v-if="freightData.freePostFlag == -1">可用{{ deductionBeans }}采美豆抵用{{ freightMoney }}运费</view>
+				<view class="bean-le" v-if="freePostFlag == 1">可用{{ deductionBeans }}采美豆抵用{{ freightMoney }}元运费</view>
+				<view class="bean-le" v-if="freePostFlag == -1">可用{{ deductionBeans }}采美豆抵用{{ freightMoney }}运费</view>
 				<view class="bean-ri">
 					<view class="checkbox-box">
 						<button class="checkbox iconfont"
@@ -89,6 +89,7 @@
 						break
 					case -1:
 						this.freightText = '到付'
+						this.freightMoney = '到付'
 						this.userBeans = res.userBeans
 						this.freePostFlag = res.freePostFlag
 						this.freightData.freight  = 0
@@ -106,7 +107,7 @@
 						break
 				}
 			},
-			selectFreight (){
+			selectFreight (){//切换运费
 				let self = this,value;
 				uni.showActionSheet({
 				    itemList: self.optionList,
@@ -118,6 +119,11 @@
 								if( self.userBeans > 0 ){
 									self.isBeansShow = true
 									self.freightBeansMoney = self.freightMoney
+									if(self.userBeans >= self.freightBeansMoney*100){
+										self.deductionBeans = self.freightBeansMoney*100
+									}else{
+										self.deductionBeans = self.userBeans
+									}
 								}else{
 									self.isBeansShow = false
 									self.freightBeansMoney = 0
@@ -129,6 +135,11 @@
 								if( self.userBeans > 0 ){
 									self.freightBeansMoney = 30
 									self.isBeansShow = true
+									if(self.userBeans >= self.freightBeansMoney*100){
+										self.deductionBeans = self.freightBeansMoney*100
+									}else{
+										self.deductionBeans = self.userBeans
+									}
 								}else{
 									self.freightBeansMoney = 0
 									self.isBeansShow = false

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="hasLogin && item.productCode!=''&&item.productCode!=null">商品编码：{{item.productCode}}</view>
-					<view class="list-details-price" v-if="hasLogin">
+					<view class="list-details-specs" v-if="item.productCode!=''&&item.productCode!=null">商品编码：{{item.productCode}}</view>
+					<view class="list-details-price">
 						<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 service_none">
+						<view  v-else class="list-login-now">
 							<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="hasLogin && item.p_code!=''&& item.p_code!=null">商品编码：{{item.p_code}}</view>
-					<view class="list-details-price" v-if="hasLogin">
+					<view class="list-details-specs" v-if="item.p_code!=''&& item.p_code!=null">商品编码：{{item.p_code}}</view>
+					<view class="list-details-price">
 						<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 service_none">
+						<view  v-else class="list-login-now">
 							<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"  v-if="hasLogin">
+					<view class="floor-item-act">
 						<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 service_none">
+					<view v-else class="no-price">
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
@@ -195,9 +195,6 @@
 </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"  v-if="hasLogin">
+					<view class="floor-item-act">
 						<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 service_none">
+					<view v-else class="no-price">
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
@@ -207,9 +207,6 @@
 </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"  v-if="hasLogin">
+					<view class="floor-item-act">
 						<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 service_none">
+					<view v-else class="no-price">
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
@@ -207,9 +207,6 @@
 </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"  v-if="hasLogin">
+					<view class="floor-item-act">
 						<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 service_none">
+									<view class="no-price">
 										<view class="p-stars">
 											<text class="p-no">￥</text>
 											<uni-grader :grade="Number(item.product.priceGrade)" :margin="14"></uni-grader>
@@ -219,9 +219,6 @@
 </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"  v-if="hasLogin">
+					<view class="floor-item-act">
 						<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 service_none">
+					<view v-else class="no-price">
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
@@ -195,9 +195,6 @@
 </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"  v-if="hasLogin">
+					<view class="floor-item-act">
 						<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 service_none">
+					<view v-else class="no-price">
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
@@ -180,9 +180,6 @@
 </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"  v-if="hasLogin">
+					<view class="floor-item-act">
 						<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 service_none">
+					<view v-else class="no-price">
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
@@ -179,9 +179,6 @@
 </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"  v-if="hasLogin">
+					<view class="floor-item-act">
 						<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 service_none">
+					<view v-else class="no-price">
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
@@ -319,9 +319,6 @@ 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"  v-if="hasLogin">
+					<view class="floor-item-act">
 						<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 service_none">
+					<view v-else class="no-price">
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
@@ -320,9 +320,6 @@ 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"  v-if="hasLogin">
+					<view class="floor-item-act">
 						<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 service_none">
+					<view v-else class="no-price">
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
@@ -359,10 +359,7 @@ export default {
 </script>
 
 <style lang="scss">
-.service_none{
-	display: none !important;
-}		
-.section_page_main {
+	.section_page_main {
 	width: 100%;
 	height: auto;
 	box-sizing: border-box;

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"  v-if="hasLogin">
+					<view class="floor-item-act">
 						<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 service_none">
+					<view v-else class="no-price">
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
@@ -195,9 +195,6 @@
 </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"  v-if="hasLogin">
+					<view class="floor-item-act">
 						<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 service_none">
+					<view v-else class="no-price">
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
@@ -207,9 +207,6 @@
 </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"  v-if="hasLogin">
+					<view class="floor-item-act">
 						<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 service_none">
+					<view v-else class="no-price">
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
@@ -207,9 +207,6 @@
 </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"  v-if="hasLogin">
+					<view class="floor-item-act">
 						<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 service_none">
+					<view v-else class="no-price">
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
@@ -219,9 +219,6 @@
 </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"  v-if="hasLogin">
+					<view class="floor-item-act">
 						<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 service_none">
+					<view v-else class="no-price">
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
@@ -195,9 +195,6 @@
 </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"  v-if="hasLogin">
+					<view class="floor-item-act">
 						<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 service_none">
+					<view v-else class="no-price">
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
@@ -195,9 +195,6 @@
 </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"  v-if="hasLogin">
+					<view class="floor-item-act">
 						<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 service_none">
+					<view v-else class="no-price">
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
@@ -181,9 +181,6 @@
 </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"  v-if="hasLogin">
+								<view class="floor-item-act">
 									<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 service_none">
+								<view v-else class="no-price">
 									<template v-if="item.product.productCategory == 1">
 										<view class="p-stars">
 											<text class="p-no">￥</text>
@@ -212,9 +212,6 @@
 </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"  v-if="hasLogin">
+					<view class="floor-item-act">
 						<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 service_none">
+					<view v-else class="no-price">
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
@@ -320,9 +320,6 @@ 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"  v-if="hasLogin">
+					<view class="floor-item-act">
 						<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 service_none">
+					<view v-else class="no-price">
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
@@ -321,9 +321,6 @@ 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"  v-if="hasLogin">
+					<view class="floor-item-act">
 						<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 service_none">
+					<view v-else class="no-price">
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
@@ -360,9 +360,6 @@ 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 service_none">
+			<view class="p-login grade tui-skeleton-fillet">
 				<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 service_none">
+			<view class="p-login grade tui-skeleton-fillet">
 				<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="hasLogin && item.code!=''&&item.code!=null">商品编码：{{item.code}}</view>
-							<view class="list-details-price"  v-if="hasLogin">
+							<view class="list-details-specs" v-if="item.code!=''&&item.code!=null">商品编码：{{item.code}}</view>
+							<view class="list-details-price">
 								<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 service_none">
+								<view  v-else class="list-login-now">
 									<text class="p-no">￥</text>
 									<uni-grader :grade="Number(item.priceGrade)"></uni-grader>
 								</view>

pages/goods/product.vue

@@ -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" v-if="hasLogin">
+								<view class="content-tr">
 									<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" v-if="hasLogin">
+								<view class="content-tr">
 									<view class="content-td">商品编码</view>
 									<view class="content-th">{{product.productCode}}</view>
 								</view>
-								<view class="content-tr" v-if="hasLogin">
+								<view class="content-tr">
 									<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="hasLogin && isShowButton">
+				<view class="menu" v-if="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')">

pages/user/order/create-order.vue

@@ -327,19 +327,25 @@
 			attributeHashfreight(freight){// 计算需要邮费的支付价格
 				this.payAllPrice = this.allPrice+parseInt(freight)// 计算不包邮的价格 总价等于商品价格+邮费
 				if(this.ischecked){
-					if(this.userMoney>=this.payAllPrice){// 余额大于支付金额
+					if(this.userMoney>=this.payAllPrice){// 全部抵扣
 						this.payAllPrice =0.00
-						if(this.isCheckedBeans){
+						if(this.isCheckedBeans){// 抵扣运费了
 							this.deductMoney = this.allPrice								// 当前使用金额等于订单金额
 							this.surplusMoney = this.userMoney - this.deductMoney	    	// 剩余金额等于余额减去当前使用金额
 						}else{
 							this.deductMoney = this.allPrice + parseInt(freight)			// 当前使用金额等于订单金额+运费金额
 							this.surplusMoney = this.userMoney - this.deductMoney	    	// 剩余余额等于总余额-当前使用金额
 						}
-					}else{
-						this.payAllPrice = this.allPrice+parseInt(freight) - this.userMoney // 订单最终支付金额等于订单金额+运费-账户余额
-						this.deductMoney = this.userMoney				            		// 当前使用金额等于账户余额
-						this.surplusMoney = this.userMoney - this.deductMoney	    		// 剩余余额等于账户余额-当前使用金额
+					}else{// 部分抵扣
+						if(this.isCheckedBeans){// 抵扣运费了
+							this.payAllPrice = this.allPrice - this.userMoney // 订单最终支付金额等于订单金额+运费-账户余额
+							this.deductMoney = this.userMoney				            		// 当前使用金额等于账户余额
+							this.surplusMoney = this.userMoney - this.deductMoney	    		// 剩余余额等于账户余额-当前使用金额
+						}else{
+							this.payAllPrice = this.allPrice+parseInt(freight) - this.userMoney // 订单最终支付金额等于订单金额+运费-账户余额
+							this.deductMoney = this.userMoney				            		// 当前使用金额等于账户余额
+							this.surplusMoney = this.userMoney - this.deductMoney	    		// 剩余余额等于账户余额-当前使用金额
+						}
 					}
 				}else{
 					this.payAllPrice = this.allPrice+parseInt(freight)

search/pages/search/search.vue

@@ -137,7 +137,7 @@
 									</text>
 								</template>
 							</view>	
-							<view  v-else class="list-login-now service_none">
+							<view  v-else class="list-login-now">
 								<text class="p-no">￥</text>
 								<uni-grader :grade="Number(item.priceGrade)"></uni-grader>
 							</view>

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" v-if="hasLogin">
+		                    <view class="targetprice">
 		                        <text v-if="item.detailTalkFlag ==2 && hasLogin==false">￥详聊</text>
-		                        <text v-else-if="!hasLogin" class="priceparam service_none" @click.stop="NavigatorLogin(item)">登录查看价格></text>
+		                        <text v-else-if="!hasLogin" class="priceparam" @click.stop="NavigatorLogin(item)">登录查看价格></text>
 		                        <text v-else-if="hasLogin && item.detailTalkFlag==2">￥详聊</text>
 		                        <text v-else>￥{{ item.price | NumFormat}}</text>
 		                    </view>