Merge branch 'developerB' of git.caimei365.com:caimei-repository/caimei-applets-caimei into developerB

components/cm-module/creatOrder/sellerRegulations.vue

@@ -18,7 +18,7 @@
 					<view class="freight-radio">
 						<radio-group class="row-group" @change="radioChange">
 							<label class="row-input" v-for="(item, index) in regulaDatas" :key="index">
-								<view class="row-text" @click.stop="gotoConten(item.id)">{{item.name.length>10?item.name.substring(0,10)+'...':item.name}}</view>
+								<view class="row-text" @click.stop="gotoConten(item)">{{item.name.length>10?item.name.substring(0,10)+'...':item.name}}</view>
 								<radio class="row-radio" :value="item.id" color="#E15616"/>
 							</label>
 						</radio-group>
@@ -50,8 +50,10 @@
 		created() {
 		},
 		methods:{
-			gotoConten(id){
-				this.$api.navigateTo(`/pages/service/sellconten?clauseId=${id}`)
+			gotoConten(item){
+				if(item.name!='无条款'){
+					this.$api.navigateTo(`/pages/service/sellconten?clauseId=${item.id}`)
+				}
 			},
 			radioChange(e){
 				this.clauseId = e.target.value;
@@ -169,10 +171,10 @@
 			line-height: 66rpx;
 			width: 100%;
 			display: block;
-			.row-text:nth-child(1){
-				color: #666666;
-				pointer-events: none;
-			}
+			// .row-text:nth-child(1){
+			// 	color: #666666;
+			// 	pointer-events: none;
+			// }
 		}
 		.row-radio{
 			float: right;

components/cm-module/orderDetails/goodsList.vue

@@ -24,6 +24,15 @@
 							<view class="product-view">
 								<view class="view-num red">￥{{pros.price | NumFormat}}</view>
 							</view>
+							<view class="floor-item-act" v-if="pros.productPromotion!=null" >
+								<view v-if="PromotionsFormat(pros.productPromotion)" class="floor-tags" @click.stop="clickPopupShow(pros.productPromotion)">
+									{{pros.productPromotion.name}}
+									<text v-if ="pros.productPromotion!=null && pros.productPromotion.type !=3">
+										:￥{{ pros.productPromotion == null ? '0.00' : pros.productPromotion.touchPrice | NumFormat}}
+									</text>
+								</view>
+								<view v-else-if="pros.productPromotion.type !=3" class="floor-tags" @click.stop="clickPopupShow(pros.productPromotion)">{{pros.productPromotion.name}}</view>	
+							</view>
 							<view class="product-view">
 								<view class="view-num right">x {{pros.num}}</view>
 							</view>
@@ -46,15 +55,6 @@
 							<view class="view-num">折后单价</view>
 							<view class="view-right">￥{{pros.discountPrice | NumFormat}}</view>
 						</view>
-						<view class="floor-item-act" v-if="pros.productPromotion!=null" >
-							<view v-if="PromotionsFormat(pros.productPromotion)" class="floor-tags" @click.stop="clickPopupShow(pros.productPromotion)">
-								{{pros.productPromotion.name}}
-								<text v-if ="pros.productPromotion!=null && pros.productPromotion.type !=3">
-									:￥{{ pros.productPromotion == null ? '0.00' : pros.productPromotion.touchPrice | NumFormat}}
-								</text>
-							</view>
-							<view v-else-if="pros.productPromotion.type !=3" class="floor-tags" @click.stop="clickPopupShow(pros.productPromotion)">{{pros.productPromotion.name}}</view>	
-						</view>
 						<view class="product-view allPrice">
 							<view class="view-num">合计</view>
 							<view class="view-right">￥{{pros.totalFee | NumFormat}}</view>
@@ -190,28 +190,7 @@
 						margin-left: 10rpx;
 					}
 				}
-				.floor-item-act{
-					height: 56rpx;
-					text-align: center;
-					box-sizing: border-box;
-					float: left;
-					padding: 10rpx 0;
-					margin-right: 12rpx;
-					.floor-tags{
-						float: left;
-						height: 36rpx;
-						border-radius: 6rpx;
-						background-color: #FFFFFF;
-						line-height: 36rpx;
-						color: $color-system;
-						text-align: center;
-						display: inline-block;
-						padding:0 16rpx;
-						font-size: $font-size-20;
-						margin-left: 15rpx;
-						border: 1px solid #E15616;
-					}
-				}
+				
 			}
 			.productlist{
 				width: 100%;
@@ -257,7 +236,6 @@
 				}
 			}
 			.product-info{
-				// border-top: 2rpx solid #e1e1e1;
 				padding: 10rpx 0;
 				.product-view{
 					font-size:$font-size-24;
@@ -273,6 +251,7 @@
 						float: right;
 					}
 				}
+				
 			}
 			.pros-product{
 				width: 468rpx;
@@ -281,10 +260,6 @@
 				font-size: $font-size-26;	
 				position: relative;
 				.product-view{
-					// width: 50%;
-					// height: auto;
-					// display: flex;
-					// display: inline-block;
 					&.allPrice{
 						width: 100%;
 					}
@@ -320,7 +295,6 @@
 					height: 44rpx;
 					color: #999999;
 					line-height: 44rpx;
-					margin: 20rpx 0;
 				}
 				.productprice{
 					height: 48rpx;
@@ -363,6 +337,27 @@
 						font-size: $font-size-20;
 					}
 				}
+				.floor-item-act{
+					height: 56rpx;
+					text-align: center;
+					box-sizing: border-box;
+					float: left;
+					padding: 10rpx 0;
+					margin-right: 12rpx;
+					.floor-tags{
+						float: left;
+						height: 36rpx;
+						border-radius: 6rpx;
+						background-color: #FFFFFF;
+						line-height: 36rpx;
+						color: $color-system;
+						text-align: center;
+						display: inline-block;
+						padding:0 16rpx;
+						font-size: $font-size-20;
+						border: 1px solid #E15616;
+					}
+				}
 			}
 			.goods-pros-m{
 				width: 100%;