commit -m 采美豆测试修复

components/cm-module/orderDetails/orderButton.vue

@@ -12,9 +12,9 @@
 			<view class="btn btn-cancel" v-if="btnState.isCancel" @click.stop="btnConfirm('cancel',order)">取消订单</view>
 			<!-- <view class="btn btn-delete" v-if="btnState.isDelete" @click.stop="btnConfirm('delete',order)">删除订单</view> -->
 			<view class="btn btn-query" v-if="btnState.isQuery && order.secondHandOrderFlag!=1" @click.stop="btnConfirm('query',order)">查看物流</view>
-			<view class="btn " v-if="btnState.isConfirm" @click.stop="btnConfirm('confirm',order)">
+			<view class="btn btn-firm" v-if="btnState.isConfirm" @click.stop="btnConfirm('confirm',order)">
 				确认收货
-				<view class="tips">采美豆</view>
+				<view class="tips">采美豆<text class="line"></text></view>
 			</view>
 		</view>
 	</view>
@@ -162,36 +162,6 @@
 					position: relative;
 				}
 			}
-			.btn-color{
-				background: $btn-confirm;
-				margin: 22rpx 0 22rpx 22rpx;
-				.tips{
-					width: 160rpx;
-					height: 34rpx;
-					padding: 10rpx 10rpx;
-					background:linear-gradient(45deg,rgba(0,0,0,1) 0%,rgba(87,87,87,1) 100%);
-					box-shadow:0px 2px 4px 0px rgba(0,0,0,0.2);
-					border-radius: 8rpx;
-					position: absolute;
-					color: #FFFFFF;
-					line-height: 34rpx;
-					font-size: $font-size-24;
-					text-align: left;
-					right: 24rpx;
-					top: -45rpx;
-					&:before{
-						content: "";
-						width: 25rpx;
-						height: 25rpx;
-						background:linear-gradient(45deg,rgba(0,0,0,1) 0%,rgba(87,87,87,1) 100%);
-						position: absolute;
-						bottom: -8rpx;
-						right: 30rpx;
-						z-index: -1;
-						transform:rotate(45deg);
-					}
-				}
-			}
 			.btn-confirm{
 				background:#ff7a51;
 				border-color:#ff7a51;
@@ -203,6 +173,35 @@
 				border: 2rpx solid #f94b4b;
 				color: #fff;
 			}
+			.btn-firm{
+				position:relative;
+				.tips{
+					width: 74rpx;
+					height: 32rpx;
+					line-height: 32rpx;
+					padding: 0 7rpx;
+					border-radius: 16rpx;
+					background-color: #ffe6dc;
+					color: $color-system;
+					text-align: center;
+					font-size: $font-size-20;
+					position:absolute;
+					right: 0;
+					top: -40rpx;
+					z-index: 90;
+					.line{
+						display: block;
+						width: 20rpx;
+						height: 20rpx;
+						background-color: #ffe6dc;
+						position: relative;
+						bottom: 18rpx;
+						left: 15rpx;
+						z-index: -1;
+						transform:rotate(45deg);
+					}
+				}
+			}
 			.btn-share{
 				.tips{
 					width: 160rpx;

components/cm-module/orderDetails/orderInformation.vue

@@ -34,7 +34,7 @@
 					<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="view-man" >采美豆抵用运费：<label class="label">￥{{ orderData.promotionFullReduction | NumFormat}}</label></view>
+					<view class="view-man" >采美豆抵用运费：<label class="label">￥{{ orderData.userBeans }}</label></view>
 				</view>
 				<view class="information-view">
 					<view class="view-num">经理折扣：<label class="label">￥{{ orderData.discountFee =='undefined' ? '' : orderData.discountFee | NumFormat}}</label></view>

pages/login/information.vue

@@ -364,9 +364,7 @@
 						this.addressData.address =  organizationClub.provincialAddress ? organizationClub.provincialAddress : ''
 						this.businessLicense = this.$reg.checkData(organizationClub.businessLicense)
 						this.medicalPracticeLicense = this.$reg.checkData(organizationClub.medicalPracticeLicense)
-						this.medicalPracticeLicense = 'https://dss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=1306508493,2006189766&fm=26&gp=0.jpg'
 						this.shopPhoto = this.$reg.checkData(organizationClub.shopPhoto)
-						this.shopPhoto = 'https://dss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=1306508493,2006189766&fm=26&gp=0.jpg'
 						this.department = organizationClub.department						
 						this.clubTelePhone = this.$reg.checkData(organizationClub.contractPhone)
 						this.clubFax = this.$reg.checkData(organizationClub.fax)

pages/tabBar/user/user.vue

@@ -120,7 +120,7 @@
 				</view>
 			</view>
 			<!-- 底部跳转 -->
-			<view class="foot-list" :style="{paddingTop: hasLogin ? '360rpx': '160rpx'}">
+			<view class="foot-list" :style="{paddingTop: hasLogin ? '380rpx': '160rpx'}">
 			<!-- 	<view class="list-cell-avtiv" @click="navigator('/pages/user/coupon/coupon')">
 					<image src="http://static.caimei365.com/app/meibohui/app/activity-in.png" mode=""></image>
 				</view> -->

pages/user/account/account-bean.vue

@@ -42,13 +42,13 @@
 					<view class="list-t">
 						<view class="t-t">{{ item.beansType | BeansStatusFilter }}</view>
 						<view class="t-t bold" :style="{color:item.type == '1' ? '#ff2a2a' : '#15C47A'}">
-							<text class="txt">{{item.type == 1 ? '+' : '-'}}</text>
-							<text class="txt">￥{{item.num}}</text>
+							<text class="txt">{{ item.type == 1 ? '+' : '-' }}</text>
+							<text class="txt">{{ item.num }}</text>
 						</view>
 					</view>
 					<view class="list-b">
-						<view class="t-t">{{item.addTime}}</view>
-						<view class="t-t">{{item.type =='1'? '收入' : '支出'}}</view>
+						<view class="t-t">{{ item.addTime }}</view>
+						<view class="t-t">{{ item.type =='1'? '收入' : '支出' }}</view>
 					</view>
 				</view>
 				<!--加载loadding-->
@@ -104,7 +104,7 @@
 				hasNextPage: false,
 				pullFlag: true,
 				nomoreText: '上拉显示更多',
-				errorText:'本月没有任何余额收支记录',
+				errorText:'本月没有任何采美豆收支记录',
 				navList: [	
 					{state: 0,text: '全部'},
 					{state: 1,text: '收入'},

pages/user/account/account.vue

@@ -59,7 +59,7 @@
 				<!--加载loadding-->
 			</view>
 		</scroll-view>
-		<view class="showAccounExp" :class="[isShowAccounExp == true ? 'show':'hide']" @tap="hideAccounExp">
+		<view class="showAccounExp" v-if="isShowAccounExp" :class="[isShowAccounExp == true ? 'show':'hide']" @tap="hideAccounExp">
 			<image src="https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SAZeZlAA2oDvspRRU204.png" mode=""></image>
 			<text class="iconfont icon-close" @click="hideAccounExp"></text>
 		</view>

pages/user/order/create-order.vue

@@ -234,9 +234,14 @@
 					this.hanldUserBeans = this.freightBeansMoney*100
 					if(this.hanldFreePostFlag == 1){
 						this.payAllPrice = this.allPrice + this.hanldFreight - this.freightBeansMoney
+						console.log('抵扣',this.payAllPrice)
 					}
 				}else{
 					this.hanldUserBeans = 0
+					if(this.hanldFreePostFlag == 1){
+						this.payAllPrice = this.allPrice + this.hanldFreight
+						console.log('不抵扣',this.payAllPrice)
+					}
 				}
 			},
 			checkedBalabce(){//勾选使用余额