Merge branch 'developer' into developerB

components/cm-module/activity/activityBean.vue

@@ -1,22 +1,29 @@
  <template>
 	<view>
 		<view class="tui-alert-class tui-alert-box" :class="[show?'tui-alert-show':'tui-alert-hide']"  @touchmove.stop.prevent="discard">
-			<view class="tui-alert-content" :style="{'background-image': 'url('+bgImagePath+')'}">
-				<view class="tui-alert-content-text">恭喜您获得采美豆！</view>
-				<view class="tui-alert-content-bean">
-					<view class="tui-alert-main">
-						<image class="tui-alert-icon" src="https://static.caimei365.com/app/img/icon/bean-icon@2x.png" mode=""></image>
-						<view class="tui-alert-text">
-							<text class="icon-add">+</text>
-							<text class="icon-text">{{ beanNumber }}</text>
+			<template v-if="beansType == 12">
+				<view class="tui-alert-image">
+					<image :src="bgImagePath" mode=""></image>
+				</view>
+			</template>
+			<template v-else>
+				<view class="tui-alert-content" :style="{'background-image': 'url('+bgImagePath+')'}">
+					<view class="tui-alert-content-text">恭喜您获得采美豆！</view>
+					<view class="tui-alert-content-bean">
+						<view class="tui-alert-main">
+							<image class="tui-alert-icon" src="https://static.caimei365.com/app/img/icon/bean-icon@2x.png" mode=""></image>
+							<view class="tui-alert-text">
+								<text class="icon-add">+</text>
+								<text class="icon-text">{{ beanNumber }}</text>
+							</view>
 						</view>
 					</view>
+					<view class="tui-alert-content-tips">
+						<view class="tips">采美豆可抵扣运费</view>
+					</view>
 				</view>
-				<view class="tui-alert-content-tips">
-					<view class="tips">采美豆可抵扣运费</view>
-				</view>
-			</view>
-			<text class="iconfont icon-2guanbi" @click.stop="handleClickCancel"></text>
+			</template>
+			<text class="iconfont icon-2guanbi" :style="{bottom :beansType == 12 ? '25%' : '13%'}" @click.stop="handleClickCancel"></text>
 		</view>
 	</view> 
 </template>
@@ -99,7 +106,7 @@
 		left: 0;
 		top: 100%;
 		opacity: 0;
-		background: rgba(51,51,51,0.5);
+		background: rgba(51,51,51,0.7);
 		z-index: 99999;
 	}
 	.tui-alert-show {
@@ -112,6 +119,21 @@
 		opacity: 0;
 		// animation:rundbottom 0.5s;
 	}
+	.tui-alert-image{
+		width: 626rpx;
+		height: 532rpx;
+		position: absolute;
+		top: 0;
+		left: 0;
+		bottom: 0;
+		right: 0;
+		margin: auto;
+		image{
+			width: 626rpx;
+			height: 532rpx;
+			display: block;
+		}
+	}
 	.tui-alert-content{
 		width: 580rpx;
 		height: 790rpx;
@@ -193,7 +215,7 @@
 		position: absolute;
 		bottom: 13%;
 		left: 50%;
-		font-size: 60rpx;
+		font-size: 58rpx;
 		margin-left: -50rpx;
 	}
 	.tui-alert-mask-show {

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">可用{{ freightBeansMoney*100 }}采美豆抵用{{ freightBeansMoney }}元运费</view>
-				<view class="bean-le" v-if="freightData.freePostFlag == -1">可用{{ freightBeansMoney*100 }}采美豆抵用{{ 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"
@@ -49,6 +49,7 @@
 				ischecked:false,
 				isBeansShow:false,
 				userBeans:0,
+				deductionBeans:0,
 				freightBeansMoney:0,
 				
 			}
@@ -75,27 +76,38 @@
 						this.userBeans = res.userBeans
 						this.freePostFlag = res.freePostFlag
 						this.optionList.unshift(this.orderPriceToFixed(this.freightMoney))
-						if( res.userBeans >= this.freightMoney*100 ){
+						if( res.userBeans > 0 ){
 							this.isBeansShow = true
 						}else{
 							this.isBeansShow = false
 						}
+						if(res.userBeans >= this.freightBeansMoney*100){
+							this.deductionBeans = this.freightBeansMoney*100
+						}else{
+							this.deductionBeans = res.userBeans
+						}
 						break
 					case -1:
 						this.freightText = '到付'
+						this.freightMoney = '到付'
 						this.userBeans = res.userBeans
 						this.freePostFlag = res.freePostFlag
 						this.freightData.freight  = 0
-						if( res.userBeans >= 3000 ){
-							this.freightBeansMoney = 30
+						this.freightBeansMoney = 30
+						if( res.userBeans >0 ){
 							this.isBeansShow = true
 						}else{
 							this.isBeansShow = false
 						}
+						if(res.userBeans >= this.freightBeansMoney*100){
+							this.deductionBeans = this.freightBeansMoney*100
+						}else{
+							this.deductionBeans = res.userBeans
+						}
 						break
 				}
 			},
-			selectFreight (){
+			selectFreight (){//切换运费
 				let self = this,value;
 				uni.showActionSheet({
 				    itemList: self.optionList,
@@ -104,9 +116,14 @@
 							case 0:
 								self.freightMoney = self.infoData.freight
 								self.freePostFlag = 1
-								if( self.userBeans >= self.freightMoney*100 ){
+								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
@@ -115,9 +132,14 @@
 							case 1:
 								self.freePostFlag = -1
 								self.freightMoney = '到付'
-								if( self.userBeans >= 3000 ){
+								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/commodityList.vue

@@ -8,7 +8,7 @@
 				<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-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">

components/cm-module/orderDetails/orderInformation.vue

@@ -33,16 +33,16 @@
 					<view class="view-num" v-if="orderData.freePostFlag == '-1'">运费：<label class="label">到付</label></view>
 					<view class="view-num" v-if="orderData.freePostFlag == '1'">运费：<label class="label">￥{{ orderData.freight | NumFormat}}</label></view>
 				</view>
-				<view class="information-view same">
+				<view class="information-view same" v-show="orderData.userBeans>0">
 					<view class="view-man" >采美豆抵用运费：<label class="label">{{ orderData.userBeans }}</label></view>
 				</view>
-				<view class="information-view">
+				<view class="information-view" v-show="orderData.discountFee>0">
 					<view class="view-num">经理折扣：<label class="label">￥{{ orderData.discountFee =='undefined' ? '' : orderData.discountFee | NumFormat}}</label></view>
 				</view>
 				<view class="information-view same" v-show="orderData.promotionFullReduction>0">
 					<view class="view-man" >促销满减：<label class="label">￥{{ orderData.promotionFullReduction | NumFormat}}</label></view>
 				</view>
-				<view class="information-view">
+				<view class="information-view" v-show="(orderData.presentCount + orderData.promotionalGiftsCount)>0">
 					<view class="view-man">赠品总数：<label class="label">{{ orderData.presentCount + orderData.promotionalGiftsCount}}</label></view>
 				</view>
 				<view class="information-view same">

components/cm-module/pageFloorTemplate/templateK.vue

@@ -359,7 +359,7 @@ export default {
 </script>
 
 <style lang="scss">
-.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" >
+					<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)">

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>

pages/login/apply.vue

@@ -201,7 +201,7 @@
 		<!-- 提交审核提示弹窗 -->
 		<view class="tui-alert-box" v-if="isConfirmShow">
 			<view class="tui-alert-content">
-				<view class="tui-alert-main">升级信息提交成功，审核通过后您的身份将成为会员机构，并且获得<text class="red">20</text>采美豆的奖励</view>
+				<view class="tui-alert-main">升级信息提交成功，审核通过后您的身份将成为会员机构，并且获得<text class="red">500</text>采美豆的奖励</view>
 				<view class="tui-alert-btn" @click="handleClick">知道了</view>
 			</view>
 		</view>

pages/user/account/account-bean.vue

@@ -137,7 +137,8 @@
 						8:'系统发放',
 						9:'抵用退回',
 						10:'抵用运费',
-						11:'退款回收'
+						11:'退款回收',
+						12:'登录奖励'
 					};
 				Object.keys(stateTextObject).forEach(function(key){
 					if(key == state){

pages/user/order/create-order.vue

@@ -167,6 +167,7 @@
 				})
 			},
 			getFreightData(){//获取邮费信息
+				this.isFreight = false
 				let params ={
 						userId:this.userID,
 						productIds:this.productIds,
@@ -180,7 +181,7 @@
 					this.hanldFreePostFlag = response.data.freePostFlag
 					this.hanldFreight = response.data.freight
 					if(this.hanldFreePostFlag == 1){
-						if( this.freightData.userBeans >= this.hanldFreight*100 ){
+						if( this.freightData.userBeans > 0 ){
 							this.freightBeansMoney = this.hanldFreight
 						}else{
 							this.freightBeansMoney = 0
@@ -189,7 +190,7 @@
 						this.attributePallPrice()
 						this.hanldFreightBeans(this.isCheckedBeans)
 					}else{
-						if( this.freightData.userBeans >= 3000 ){
+						if( this.freightData.userBeans > 0 ){
 							this.freightBeansMoney = 30
 						}else{
 							this.freightBeansMoney = 0
@@ -247,7 +248,7 @@
 				this.isCheckedBeans = data;
 				if(this.isCheckedBeans){
 					// 判断如果采美豆大于等于运费*100
-					if( this.freightData.userBeans >= this.hanldFreight*100 ){
+					if( this.freightData.userBeans > 0 ){
 						this.hanldUserBeans = this.freightBeansMoney*100
 					}else{
 						this.hanldUserBeans = 0
@@ -327,19 +328,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)

pages/user/order/order-details.vue

@@ -309,7 +309,7 @@
 				this.$util.modal('提示','是否确认收货','确定','取消',true,() =>{
 					this.OrderService.ConfirmReceipt({orderID:this.orderID}).then(response =>{
 						this.beansType = 7
-						this.beanNumber = 10
+						this.beanNumber = 100
 						this.isActivityBean = true
 					}).catch(error =>{
 						this.$util.msg(error.msg,2000)

pages/user/order/order-list.vue

@@ -435,7 +435,7 @@
 				this.$util.modal('提示','是否确认收货','确定','取消',true,() =>{
 					this.OrderService.ConfirmReceipt({orderID:id}).then(response =>{
 						this.beansType = 7
-						this.beanNumber = 10
+						this.beanNumber = 100
 						this.isActivityBean = true
 					}).catch(error =>{
 						this.$util.msg(error.msg,2000)

search/pages/search/search-order.vue

@@ -347,7 +347,7 @@
 				this.$util.modal('提示','是否确认收货','确定','取消',true,() =>{
 					this.OrderService.ConfirmReceipt({orderID:id}).then(response =>{
 						this.beansType = 7
-						this.beanNumber = 10
+						this.beanNumber = 100
 						this.isActivityBean = true
 					}).catch(error =>{
 						this.$util.msg(error.msg,2000)

search/pages/search/search-second.vue

@@ -24,7 +24,7 @@
 				            <text v-if="item.detailTalkFlag ==2 && hasLogin==false">￥详聊</text>
 				            <text v-else-if="!hasLogin" class="priceparam" @click.stop="this.$api.navigateTo('/pages/login/login')">登录查看价格></text>
 				            <text v-else-if="hasLogin && item.detailTalkFlag==2">￥详聊</text>
-				            <text v-else>￥{{item.price1Str}}</text>
+				            <text v-else>￥{{ item.price | NumFormat }}</text>
 				        </view>
 						<view class="shijian">
 							<text class="iconfont  icon-shijian"></text> {{item.onLineDateStr}}

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)">

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,7 +42,7 @@
 		                    <view class="productname" href="" :style="item.sold==0&&item.newAdded==1?'text-indent:60rpx':''">
 		                        {{item.name}}
 		                    </view>
-		                    <view class="targetprice" >
+		                    <view class="targetprice">
 		                        <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 && item.detailTalkFlag==2">￥详聊</text>