commtit -m 新品橱窗

components/cm-module/homeIndex/hotFloor.vue

@@ -13,7 +13,7 @@
 				</view>
 			</view>
 			<template>
-				<templateL :pageData="page" :userIdentity="userIdentity"></templateL>
+				<templateL :pageData="page" :userIdentity="userIdentity" :autoplay="autoplay"></templateL>
 			</template>
 		</view>
 	</view>
@@ -32,7 +32,11 @@ export default {
 		},
 		userIdentity: {
 			type: Number
-		}
+		},
+		autoplay: {
+		    type: Boolean,
+		    default: true
+		},
 	},
 	data() {
 		return {

components/cm-module/pageTemplate/template-product.vue

@@ -64,7 +64,7 @@ export default {
 
 <style lang="scss" scoped>
 .floor-item {
-	width: 330rpx;
+	width: 332rpx;
 	height: 516rpx;
 	font-size: $font-size-24;
 	color: $text-color;

components/cm-module/pageTemplate/templateL.vue

@@ -15,7 +15,7 @@
 				:gapY="12"
 				:gapX="12"
 				:autoFill="true"
-				:autoplay="true"
+				:autoplay="autoplay"
 				padding="0 10rpx"
 			>
 				<template v-slot:slide="{ row }">
@@ -42,7 +42,11 @@ export default {
 		},
 		userIdentity: {
 			type: Number
-		}
+		},
+		autoplay: {
+		    type: Boolean,
+		    default: true
+		},
 	},
 	data() {
 		return {
@@ -90,7 +94,6 @@ export default {
 		onChange(e) {
 		    this.current = e.current
 		},
-
 	}
 }
 </script>

pages/goods/good-hot.vue

@@ -254,7 +254,8 @@ export default {
 				userId:0,
 				brandID:'',
 				pageSize: 10,
-				pageNum: 1
+				pageNum: 1,
+				source:2
 			},
 			NavigationBarTitle: '',
 			nomoreText: '上拉显示更多',
@@ -893,10 +894,7 @@ page {
 				top: 0;
 			}
 		}
-		.list-price {
-			color: #ff2a2a;
-			height: 44rpx;
-			float: left;
+		.floor-item-price{
 			.list-login-now{
 				line-height: 44rpx;
 				.p-no{
@@ -906,23 +904,28 @@ page {
 					float: left;
 				}
 			}
-			.price-larger {
-				width: 100%;
+			.list-price {
+				color: #ff2a2a;
 				height: 44rpx;
-				font-size: 32rpx;
-				&.none {
-					text-decoration: line-through;
-					color: #999999;
-				}
-				&.small {
-					font-size: $font-size-24;
-				}
-				.txt {
-					font-size: $font-size-24;
-					display: inline-block;
-					line-height: 44rpx;
-					text-align: left;
-					float: left;
+				float: left;
+				.price-larger {
+					width: 100%;
+					height: 44rpx;
+					font-size: 32rpx;
+					&.none {
+						text-decoration: line-through;
+						color: #999999;
+					}
+					&.small {
+						font-size: $font-size-24;
+					}
+					.txt {
+						font-size: $font-size-24;
+						display: inline-block;
+						line-height: 44rpx;
+						text-align: left;
+						float: left;
+					}
 				}
 			}
 		}

pages/second/form/form.vue

@@ -350,7 +350,7 @@
 					fileName:'',
 					ossName:'',
 					productDetails:'',//商品详细信息
-					announType:1,//发布类型 1.二手预成交商品 2.二手估价商品
+					announType:2,//发布类型 1.二手预成交商品 2.二手估价商品
 					source:2//二手发布来源.1:WWW,2:小程序,3:后台,4:协销
 				 },
 				 addressData:{

pages/tabBar/home/index.vue

@@ -15,7 +15,7 @@
 			<!-- 直播 -->
 			<page-special :templateData="templateData" v-if="isLiveRequest"></page-special>
 			<!-- 新品橱窗 -->
-			<hot-floor :list="hotListPageFloor" :usserIdentity="userIdentity" v-if="isRequest && hotListPageFloor.length > 0"></hot-floor>
+			<hot-floor :list="hotListPageFloor" :usserIdentity="userIdentity" :autoplay="autoplay" v-if="isRequest && hotListPageFloor.length > 0"></hot-floor>
 		</view>	
 		<!-- 楼层 -->
 		<view class="container-section tui-skeleton">
@@ -96,6 +96,7 @@
 				beansType:1,
 				beanNumber:50,
 				couponEntry:2,
+				autoplay:true
 			}
 		},
 		onLoad() {
@@ -253,8 +254,13 @@
 		},
 		onShow(){
 			this.modallayer = false
+			this.autoplay = true
 			this.GetWxAuthorize()
-		}
+		},
+		onHide() {
+		    this.autoplay = false
+		},
+		
 	}
 </script>
 

pages/user/order/order-payment.vue

@@ -71,7 +71,7 @@
 									<text class="iconfont icon-duigou"></text>
 								</view>
 							</view>
-							<view  class="pay-item" :class="{ 'current' : tabCurrentIndex === 1}"   @click="tabClick(1)" >
+							<view v-if="B2BpayFlag === 1" class="pay-item" :class="{ 'current' : tabCurrentIndex === 1}"   @click="tabClick(1)" >
 								<view class="item-l">
 									<view class="item-icon"><text class="iconfont icon-qiyewangyinzhifu"></text></view>
 									<view class="item-text">
@@ -140,6 +140,7 @@
 				emptyWrapperH: '',
 				bankNumber:'6214 6202 2800 0415 461',
 				payOrderId:'',
+				B2BpayFlag:1,
 				nvabarData: {		//顶部自定义导航
 					showCapsule:1, // 是否显示左上角图标  1表示显示  0表示不显示,
 					showSearch: 0,
@@ -238,19 +239,26 @@
 			PayOrderCheckoutCounter(shopOrderId){
 				this.PayService.PayOrderCheckoutShoporders({shopOrderId:shopOrderId}).then(response =>{
 					let data = response.data.shopOrder
+					this.B2BpayFlag = response.data.B2BpayFlag  //待付金额
 					this.payableAmount = data.obligation  //待付金额
                     // 判断微信支付是否可用
                     this.weChatFlag = response.data.weChatFlag === '1'
                     if(!this.weChatFlag){
-                        this.tabCurrentIndex = 1
-                        this.btnColor='#034582'
-                        this.buttonText='使用企业网银支付'
+						if(this.B2BpayFlag ===1){
+							this.tabCurrentIndex = 1
+							this.btnColor='#034582'
+							this.buttonText='使用企业网银支付'
+						}else{
+							this.tabCurrentIndex = 2
+							this.btnColor='#034582'
+							this.buttonText='使用个人网银支付'
+						}
                     }
 					//判断线上线下显示
 					if(this.optionType == 'onlinePay'){
 						this.onlinePay = 2
 					}else{
-						this.onlinePay = data.onlinePay
+						this.onlinePay = response.data.onlinePay
 					}
 					if(data.obligation>0){
 						this.payStatusText = '使用任何一种线上支付方式支付全部金额后，供应商会在24小时后发货（周末、节假日顺延）。'