修改测试bug

components/cm-module/creatOrder/goodsList.vue

@@ -14,11 +14,6 @@
 						</view>
 						<view class="pros-product">
 							<view class="producttitle">{{ pros.productName }}</view>
-							<view class="productspec">规格:{{ pros.unit }}</view>
-							<view class="productprice">
-								<view class="price"><text>￥{{ (pros.productType == 2 ? 0 : pros.retailPrice) | NumFormat }}</text></view>
-								<view class="count"><text class="small">x</text>{{ pros.productCount }}</view>
-							</view>
 							<view class="floor-item-act" v-if="pros.promotion!=null">
 								<view v-if="PromotionsFormat(pros.promotion)" class="floor-tags">
 									{{pros.promotion.name}}
@@ -28,6 +23,11 @@
 								</view>
 								<view v-else-if="pros.promotion.type !=3" class="floor-tags">{{pros.promotion.name}}</view>	
 							</view>
+							<view class="productspec">规格:{{ pros.unit }}</view>
+							<view class="productprice">
+								<view class="price"><text>￥{{ (pros.productType == 2 ? 0 : pros.retailPrice) | NumFormat }}</text></view>
+								<view class="count"><text class="small">x</text>{{ pros.productCount }}</view>
+							</view>
 						</view>	
 					</view>
 				</view>	
@@ -201,6 +201,8 @@
 					margin-bottom: 8rpx;
 				}
 				.productspec{
+					width: 100%;
+					float: left;
 					height: 40rpx;
 					color: #999999;
 					line-height: 40rpx;
@@ -212,10 +214,12 @@
 					overflow: hidden;
 				}
 				.productprice{
+					width: 100%;
 					height: 54rpx;
 					line-height: 54rpx;
 					width: 100%;
 					float: left;
+					margin-top: 30rpx;
 					.price{
 						line-height: 54rpx;
 						font-size: $font-size-28;
@@ -234,7 +238,7 @@
 				}
 				.floor-item-act{
 					width: 100%;
-					height: 56rpx;
+					height: auto;
 					text-align: center;
 					box-sizing: border-box;
 					float: left;

components/cm-module/modelAlert/shareAlert.vue

@@ -4,8 +4,11 @@
 		<view class="freight-alert"  @click.stop="hideConfirm">
 			<view class="content clearfix">
 				<view class="text-content">
-					<view class="text-t">分享码</view>
-					<view class="text-c">{{shareCode}} <text class="clipboard" @click.stop="clipboard(shareCode)">复制</text></view>
+					<view class="text-t">
+						<text class="text-a">您的分享码：</text>
+						<text class="text-c">{{shareCode}}</text>
+						<text class="clipboard" @click.stop="clipboard(shareCode)">复制</text>
+					</view>
 					<view class="text-h1">有效期为72小时，分享后对方需要输入分享码才能查看订单。</view>
 				</view>
 				<view class="text-btn">
@@ -115,15 +118,21 @@
 				.text-t{
 					font-size: $font-size-28;
 					color: $text-color;
-					text-align: center;
-					line-height: 44rpx;
-				}
-				.text-c{
-					font-size: $font-size-44;
-					color: #16E17C;
-					text-align: center;
+					text-align: left;
 					line-height: 80rpx;
-					position: relative;
+					display: inline-block;
+					.text-a{
+						display: inline-block;
+						float: left;
+					}
+					.text-c{
+						font-size: $font-size-44;
+						color: #c4761f;
+						text-align: center;
+						line-height: 80rpx;
+						display: inline-block;
+						float: left;
+					}
 					.clipboard{
 						width: 84rpx;
 						height: 36rpx;
@@ -134,9 +143,8 @@
 						border-radius: 4rpx;
 						line-height: 36rpx;
 						display: inline-block;
-						position: absolute;
-						top: 29%;
-						right: 18%;
+						float: left;
+						margin: 20rpx 0 0 20rpx;
 					}
 				}
 				.text-h1{

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

@@ -158,7 +158,7 @@
 			text-align: left;
 			line-height: 56rpx;
 			.txt{
-				color: $color-system;
+				color: #ff2a2a;
 			}
 		}
 		.box-product{

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

@@ -269,13 +269,13 @@ export default {
 			margin: 0 8rpx;
 		}
 	}
-	.box-text {
+	.box-text{
 		font-size: $font-size-26;
 		color: $text-color;
 		text-align: left;
 		line-height: 56rpx;
-		.txt {
-			color: $color-system;
+		.txt{
+			color: #ff2a2a;
 		}
 	}
 	.box-product {

pages/user/cart/cart.vue

@@ -27,12 +27,24 @@
 										<view class="pros-img" @click.stop="navToListPage(pros.productId)"	><image :src="pros.mainImage ? pros.mainImage:''" alt="" /></view>
 										<view class="pros-product">
 											<view class="producttitle" @click.stop="navToListPage(pros.productId)"	>{{pros.productName}}</view>
+											<view v-show="pros.actStatus==1" class="floor-item-act">
+												<view v-if="PromotionsFormat(pros.promotion)"  class="floor-tags" @click.stop="clickPopupShow(pros,1)">
+													{{pros.promotion.name}}
+													<text v-if ="pros.promotion!=null && pros.promotion.type!=3">
+														:￥{{ pros.promotion == null ? '0.00' : pros.promotion.touchPrice | NumFormat}}
+													</text>
+												</view>
+												<view v-else-if="pros.promotion.type!=3" class="floor-tags" @click.stop="clickPopupShow(pros,2)">{{pros.promotion.name}}</view>	
+											</view>
+											<view  v-if="pros.actStatus == null  &&  pros.ladderPriceFlag == 1" class="floor-item-act">
+												<view class="floor-tags" @click.stop="clickPopupShow(pros,2)">阶梯价格</view>	
+											</view>
 											<view class="productspec">规格:{{pros.unit ? pros.unit : ''}}</view>
 											<view class="productprice">
 												<!--使用过滤器对总价改变-->
 												<view class="price" :class="PromotionsFormat(pros.promotion) ? 'disabled' : ''">
 													<text>￥</text>
-													{{ (PromotionsFormat(pros.promotion) ? pros.retailPrice : pros.retailPrice)  | NumFormat }}
+													{{ (PromotionsFormat(pros.promotion) ? pros.price : pros.retailPrice)  | NumFormat }}
 												</view>
 												<view class="count">
 													<view class="number-box">
@@ -42,18 +54,6 @@
 													</view>
 												</view>
 											</view>
-											<view v-show="pros.actStatus==1" class="floor-item-act">
-												<view v-if="PromotionsFormat(pros.promotion)"  class="floor-tags" @click.stop="clickPopupShow(pros,1)">
-													{{pros.promotion.name}}
-													<text v-if ="pros.promotion!=null && pros.promotion.type!=3">
-														:￥{{ pros.promotion == null ? '0.00' : pros.promotion.touchPrice | NumFormat}}
-													</text>
-												</view>
-												<view v-else-if="pros.promotion.type!=3" class="floor-tags" @click.stop="clickPopupShow(pros,2)">{{pros.promotion.name}}</view>	
-											</view>
-											<view  v-if="pros.actStatus == null  &&  pros.ladderPriceFlag == 1" class="floor-item-act">
-												<view class="floor-tags" @click.stop="clickPopupShow(pros,2)">阶梯价格</view>	
-											</view>
 										</view>	
 									</view>
 								</view>
@@ -126,9 +126,8 @@
 			</view>
 			<view v-else class="cart-content empty">
 				<view  class="empty-container">
-					<image class="empty-container-image" src="https://img.caimei365.com/group1/M00/03/71/Cmis2F3wna6AWdWzAAGlgAP0das422.png" mode="aspectFit"></image>
+					<image class="empty-container-image" src="https://static-b.caimei365.com/app/wisa/img/icon/cart_empth.png" mode="aspectFit"></image>
 					<text class="error-text">购物车空空如也，快去下单吧～</text>
-					<view class="login-btn"  @click="goIndex">去商城</view>
 				</view>
 			</view>
 		</view>
@@ -532,15 +531,14 @@
 					pros.productCount = pros.minBuyNumber
 				}else if(_value < pros.minBuyNumber){	
 					this.$util.msg(`该商品最小起订量为${pros.minBuyNumber}`,2000);
-					pros.number = pros.minBuyNumber
+					pros.productCount = pros.minBuyNumber
 				}else if(_value % pros.minBuyNumber != 0){
-					pros.isStep = true
 					pros.productCount = pros.minBuyNumber
 				}else{
-					pros.isStep = false
 					pros.productCount = e.detail.value
 					this.processActivityPrice(pros)
 				}
+				console.log('222222222222')
 				this.updateShoppogNum(pros)
 				this.totalShopPeice();
 			},
@@ -716,11 +714,6 @@
 			hideMobel(){
 				this.modal = false;
 			},
-			goIndex(){
-				uni.redirectTo({
-				    url: `/pages/goods/list`
-				});
-			},
 			goNavto(url){
 				uni.navigateTo ({
 					url
@@ -1047,7 +1040,10 @@
 				}
 			}
 			.productspec{
+				width: 100%;
 				height: 36rpx;
+				float: left;
+				margin-top: 10rpx;
 				color: #999999;
 				font-size: $font-size-26;
 			}
@@ -1055,6 +1051,7 @@
 				width: 100%;
 				height: 48rpx;
 				margin: 30rpx 0 0 0;
+				float: left;
 				.price{
 					line-height: 48rpx;
 					font-size: $font-size-26;
@@ -1163,7 +1160,7 @@
 			}
 			.floor-item-act{
 				width: 100%;
-				height: 56rpx;
+				height: auto;
 				text-align: center;
 				box-sizing: border-box;
 				float: left;

pages/user/order/order-payment.vue

@@ -353,7 +353,6 @@
 				})
 			},
 			initAbleUserMoney(money){//拆分金额并转千分位格式显示
-				console.log(money)
 				if(money == 0){
 					this.showIndexOfMoney ='0';
 					this.smallMoney=".00"
@@ -366,7 +365,11 @@
 					}else{
 						this.smallMoney = this.ableUserMoney.toString().substring(i);
 						this.showIndexOfMoney= this.$api.FormatMoney(this.ableUserMoney.toString().substring(0,i))
+						if(this.smallMoney.length == 2) { //补0,实际上用不着
+							this.smallMoney = this.smallMoney + '0';
+						}
 					}
+					console.log(this.smallMoney)
 				}
 			},
 			tabClick(index) {//tab切换