Merge remote-tracking branch 'remotes/origin/developer' into developerB

api/use.js

@@ -6,20 +6,6 @@
  */
 import request from '@/common/config/caimeiApi.js'
 import $reg from '@/common/config/common.js'
-/**
- *游客入驻咨询
- */
-export function quickConsultation(params) {
-	return new Promise(function(resolve,reject) {
-		request.post('/club/advisory',params,false, res => {
-			if(res.code == 0 ){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
 /**
  *机构普通注册
  */

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

@@ -120,7 +120,7 @@
 								<text class="txt">¥{{ product.promotions == null ? '0.00' : product.promotions.touchPrice | NumFormat }}</text>赠送商品
 							</view>
 							<view class="box-product" v-show="product.promotions.mode==3">
-								<view class="box-product-main"  v-for="(item, index) in product.romotions.giftList" :key="index">
+								<view class="box-product-main"  v-for="(item, index) in product.promotions.giftList" :key="index">
 									<view class="image"><image :src="item.image" mode="widthFix"></image></view>
 									<view class="info">
 										<view class="name">{{ item.name }}</view>
@@ -291,6 +291,8 @@
 			.box-product-main{
 				width: 100%;
 				height: 136rpx;
+				float: left;
+				margin: 10rpx 0;
 				.image{
 					width: 134rpx;
 					height: 134rpx;

components/cm-module/productDetails/recommend.vue

@@ -5,8 +5,8 @@
 		<view class="recommend-list" v-else>
 			<swiper class="tui-banner-swiper" :autoplay="false" :interval="5000" :duration="500" :circular="true" @change="swiperChange">
 				<swiper-item v-for="(item,index) in recommendList" :key="index">
-					<view class="row-list" v-for="(pros, idx) in item" :key="idx" @click.stop="navToDetailPage(pros.productID)">
-						<view class="list-image"><image :src="pros.mainImage" mode=""></image></view>
+					<view class="row-list" v-for="(pros, idx) in item" :key="idx" @click.stop="navToDetailPage(pros.id)">
+						<view class="list-image"><image :src="pros.image" mode=""></image></view>
 						<view class="list-name">{{pros.name}}</view>
 					</view>
 				</swiper-item>
@@ -56,14 +56,12 @@
 		},
 		methods:{
 			infoRecommend(id){
-				this.SellerService.ProductRecommend({productId:id}).then(response =>{
-					console.log(response)
+				this.ProductService.queryProductDetilsRelevant({productId:id,recommendType:0}).then(response =>{
 					if( response.data && response.data.length > 0){
 						this.isEmpty = false
 						for (var i = 0, j = response.data.length; i < j; i += this.pageSize) {
 							this.recommendList.push(response.data.slice(i, i + this.pageSize));
 						}
-						console.log(this.recommendList)
 					}else{
 						this.isEmpty = true
 					}

components/cm-module/productDetails/secondRecommend.vue

@@ -0,0 +1,196 @@
+<template name="recommend">
+	<!-- 供应商信息 -->
+	<view class="recommend clearfix">
+		<view class="recommend-empty" v-if="isEmpty">暂无相关推荐商品</view>
+		<view class="recommend-list" v-else>
+			<swiper class="tui-banner-swiper" :autoplay="false" :interval="5000" :duration="500" :circular="true" @change="swiperChange">
+				<swiper-item v-for="(item,index) in recommendList" :key="index">
+					<view class="row-list" v-for="(pros, idx) in item" :key="idx" @click.stop="navToDetailPage(pros.productID)">
+						<view class="list-image"><image :src="pros.mainImage" mode=""></image></view>
+						<view class="list-name">{{pros.name}}</view>
+					</view>
+				</swiper-item>
+			</swiper>
+			<view class="swiper__recommenddots-box" v-if="recommendList.length > 1">
+				<view v-for="(item,idx) in recommendList" 
+					  :key="idx" 
+					  :class="[idx===current?'swiper__dots-long':'none']" 
+					  :data-index="current" class="swiper__dots-item">
+				</view>	  
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import authorize from '@/common/config/authorize.js'
+	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
+	import tuiNomore from "@/components/tui-components/nomore/nomore"
+	import { queryRelevant } from "@/api/product.js" 
+	
+	export default{
+		name:'recommend',
+		props:{
+			queryProductid: {
+				// Unistars类型
+				type: Number,
+				default: 0
+			}
+		},
+		components:{
+			tuiLoadmore,
+			tuiNomore,
+		},
+		data() {
+			return{
+				current:0,
+				recommendList:[],
+				isEmpty:false,
+				pageSize:4,
+				productID:'',
+			}
+		},
+		created() {
+			this.productID = this.queryProductid
+			this.infoRecommend(this.queryProductid)
+		},
+		methods:{
+			infoRecommend(id){
+				this.SellerService.ProductRecommend({productId:id}).then(response =>{
+					console.log(response)
+					if( response.data && response.data.length > 0){
+						this.isEmpty = false
+						for (var i = 0, j = response.data.length; i < j; i += this.pageSize) {
+							this.recommendList.push(response.data.slice(i, i + this.pageSize));
+						}
+						console.log(this.recommendList)
+					}else{
+						this.isEmpty = true
+					}
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000)
+				})
+			},
+			//轮播图切换修改背景色
+			swiperChange(e) {
+				const index = e.detail.current;
+				this.current = index;
+			},
+			navToDetailPage(id) {//跳转商品详情页
+				this.$api.navigateTo(`/pages/goods/product?id=${id}`)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">	
+.recommend{
+	background: #FFFFFF;
+	width: 100%;
+	.recommend-empty{
+		width: 702rpx;
+		height: 100rpx;
+		line-height: 100rpx;
+		padding: 0 24rpx;
+		font-size: $font-size-28;
+		color: #999999;
+		text-align: center;
+	}
+	.recommend-list{
+		width: 100%;
+		height: auto;
+		position: relative;
+		padding-bottom: 20rpx;
+		.tui-banner-swiper {
+			width: 702rpx;
+			margin: 0 auto;
+			background: #F7F7F7;
+			padding: 20rpx 24rpx;
+			height: 900rpx;
+			overflow: hidden;
+			transform: translateY(0);
+			.row-list{
+				width: 340rpx;
+				height: auto;
+				float: left;
+				margin-right: 20rpx;
+				margin-bottom: 20rpx;
+				border-radius: 20rpx;
+				background: #FFFFFF;
+				&:nth-child(2n){
+					margin-right: 0;
+				}
+				.list-image{
+					width: 100%;
+					height: 340rpx;
+					border-radius: 20rpx 20rpx 0 0;
+					image{
+						width: 100%;
+						height: 340rpx;
+						border-radius: 20rpx 20rpx 0 0;
+					}
+				}	
+				.list-name{
+					font-size: $font-size-28;
+					color: $text-color;
+					line-height:88rpx;
+					padding: 0 10rpx;
+					overflow: hidden;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+				}
+			}
+		}
+	}
+	.swiper__recommenddots-box{
+		position: absolute;
+		bottom: -20rpx;
+		left: 0;
+		right: 0;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 60rpx;
+		background: #FFFFFF;
+		.swiper__dots-item{
+			width: 8rpx;
+			height: 8rpx;
+			border-radius: 100%;
+			margin-left: 6px;
+			background-color:rgba(0,0,0,.3);
+		}
+		.swiper__dots-long{
+			width: 32rpx;
+			height: 8rpx;
+			border-radius: 4rpx;
+			background-color: #000;
+			transition: all 0.4s;
+		}
+	}
+}
+</style>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

pages.json

@@ -224,11 +224,6 @@
 				"navigationBarTitleText": "注册",
 				"navigationStyle":"custom"
 			}
-		},{
-			"path": "pages/login/consult",
-			"style": {
-				"navigationBarTitleText": "入驻咨询"
-			}
 		},{
 			"path": "pages/login/apply",
 			"style": {

pages/goods/product.vue

@@ -59,10 +59,14 @@
 			<view class="product-details">
 				<!-- 头部 -->
 				<view  v-if="goodsData.isNoneDisabled" class="navbar" :class="navbarFiexd" :style="{top:headerBtnPosi.bottom + (headerBtnPosi.bottom - headerBtnPosi.height - systeminfo.statusBarHeight) +'px'}">
-					<view class="nav-item tui-skeleton-fillet" v-for="(item,index) in  disabledTabNavList" :key="index" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index+2)">
+					<view class="nav-item tui-skeleton-fillet" :class="{ current: tabCurrentIndex === 0 }" @click="tabClick(0)">
+						<text>商品详情</text>
 						<text class="line"></text>
-						<text>{{item.name}}</text>
-					</view>					
+					</view>
+					<view class="nav-item tui-skeleton-fillet" :class="{ current: tabCurrentIndex === 3 }" @click="tabClick(3)">
+						<text>相关推荐</text>
+						<text class="line"></text>
+					</view>				
 				</view>
 				<view v-else class="navbar" :class="navbarFiexd" :style="{top:headerBtnPosi.bottom + (headerBtnPosi.bottom - headerBtnPosi.height - systeminfo.statusBarHeight) +'px'}">
 					<view class="nav-item tui-skeleton-fillet" :class="{ current: tabCurrentIndex === 0 }" @click="tabClick(0)">
@@ -308,11 +312,10 @@
 						this.buyRetailPrice = this.product.retailPrice;
 					}
 					//处理下架商品和售罄商品
-
 					if(this.product.validFlag =='3' || this.stock == 0 ){
 						this.disabled = true
 						this.isNoneDisabled = true
-						this.tabCurrentIndex = 2;// 页面显示是默认选中第一
+						this.tabCurrentIndex = 3;// 页面显示是默认选中第一
 						this.isRecommend = true
 						this.goodsData.disabledText = '下架'
 					}else{
@@ -358,8 +361,9 @@
 				})
 			},
 			tabClick(index) {//商品详情&&供应商信息tab切换
+				console.log(index)
 				this.tabCurrentIndex = index;
-				switch(this.tabCurrentIndex){
+				switch(index){
 					case 1:
 						this.isRarameter = true
 						break;

pages/goods/secondProduct.vue

@@ -92,7 +92,7 @@
 	import authorize from '@/common/config/authorize.js'
 	import parser from "@/components/jyf-Parser/index" //富文本处理
 	import tuiSkeleton from "@/components/tui-skeleton/tui-skeleton"
-	import recommend from "@/components/cm-module/productDetails/recommend" //相关推荐
+	import recommend from "@/components/cm-module/productDetails/secondRecommend" //相关推荐
 	import secondDeatail from "@/components/cm-module/productDetails/secondDeatail" // 商品信息
 	import secondBrand from "@/components/cm-module/productDetails/secondBrand" // 品牌信息
 	import wxLogin from "@/common/config/wxLogin.js"

pages/login/consult.vue

@@ -1,141 +0,0 @@
-
-<template>
-	<view class="container consult">
-		<view class="consult-main">
-			<text class="main-text">注:若暂不方便入驻机构或无法入驻，您可以留下您的姓名和联系方式，采美工作人员会第一时间联系您</text>
-		</view>
-		<view class="consult-input">
-			<input type="text"  v-model="userName"  maxlength="6" class="input" placeholder="姓名"/>
-		</view>
-		<view class="consult-input">
-			<input type="number"  v-model="mobile"  maxlength="11" class="input" placeholder="手机号"/>
-		</view>
-		<view class="consult-btn"  @click="goconsult">提交</view>
-	</view>
-</template>
-
-<script>
-	import {mapState,mapMutations } from 'vuex';
-	import authorize from '@/common/config/authorize.js' 
-	import { quickConsultation  } from '@/api/use.js'
-	export default{
-		data() {
-			return{
-				userName:'',
-				mobile:''
-			}
-		},
-		onLoad(option) {
-			
-		},
-		methods:{
-			goconsult(){
-				if( this.userName == ''){
-					this.$util.msg('请输入姓名',2000);
-					return
-				}
-				if( this.mobile == ''){
-					this.$util.msg('请输入手机号',2000);
-					return
-				}
-				if(!this.$reg.isMobile(this.mobile)){
-					this.$util.msg('手机号格式不正确',2000);
-					return
-				}
-				quickConsultation({name:this.userName,mobile:this.mobile}).then(response=>{
-					this.$util.modal('提交成功','您的信息已提交成功,采美工作人员会第一时间联系您','确定','',false,() =>{
-						this.$api.switchTabTo('/pages/tabBar/home/home')
-					})
-				}).catch(error=>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-		}
-	}
-</script>
-
-<style lang="scss">
-	.consult{
-		width: 100%;
-		height: auto;
-		.consult-main{
-			width: 100%;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			height: auto;
-			padding: 260rpx 0 60rpx 0;
-			.main-text{
-				width: 654rpx;
-				display: block;
-				font-size: $font-size-28;
-				color: #999999;
-			}
-		}
-		.consult-input{
-			width: 654rpx;
-			height: 40rpx;
-			padding: 24rpx;
-			margin: 0 auto;
-			margin-bottom: 60rpx;
-			background: #F7F7F7;
-			border-radius: 14rpx;
-			margin-bottom: 20rpx;
-			.input{
-				width: 100%;
-				height: 100%;
-				background: #F7F7F7;
-				font-size: $font-size-28;
-				line-height: 40rpx;
-				color: #333333;
-				border-radius: 14rpx;
-			}
-		}
-		.consult-btn{
-			width: 702rpx;
-			height: 88rpx;
-			border-radius: 14rpx;
-			font-size: $font-size-28;
-			line-height: 88rpx;
-			color: #FFFFFF;
-			margin: 0 auto;
-			text-align: center;
-			background: $btn-confirm;
-			margin-top: 80rpx;
-		}
-		.model-authorization{
-			width: 100%;
-			height: 100%;
-			position: fixed;
-			top: 0;
-			left: 0;
-			z-index: 999;
-			.authorization{
-				width: 518rpx;
-				height: 320rpx;
-				position: absolute;
-				background: rgba(255,255,255,.7);
-				left: 0;
-				right: 0;
-				bottom: 0;
-				top: 0;
-				margin: auto;
-				.to-btn{
-					position: absolute;
-					top: 0;
-					left: 0;
-					right: 0;
-					bottom: 0;
-					margin: auto;
-					width: 70%;
-					height: 88rpx;
-					font-size: $font-size-28;
-					line-height: 88rpx;
-					color: #FFFFFF;
-					text-align: center;
-					border-radius: 44rpx;
-				}
-			}
-		}
-	}
-</style>

pages/login/register.vue

@@ -61,10 +61,6 @@
 						<text @click.stop="this.$api.navigateTo('/pages/service/privacyagree')">《隐私权政策》</text>
 					</view>
 				</view>
-				<view class="register-consult"  @click.stop="goFastConsult">
-					<text class="iconfont icon-kefunv"></text>
-					<text class="text">入驻咨询</text>
-				</view>
 			</view>
 		</view>
 	</view>
@@ -200,9 +196,6 @@
 				}else{
 					this.isAgreed = 0
 				}
-			},
-			goFastConsult(){
-				this.$api.navigateTo('/pages/login/consult')
 			}
 		},
 		onShow() {

pages/user/order/order-list.vue

@@ -287,7 +287,7 @@
 			}, 
 			getOnReachBottomData(index){//上拉加载
 				this.pageNum+=1
-				let params = {orderState:index,userId:this.userID,pageNum:1,pageSize:this.pageSize};
+				let params = {orderState:index,userId:this.userID,pageNum:this.pageNum,pageSize:this.pageSize};
 				queryOrderList(params).then(response =>{
 					let orderItem = this.orderTabBar[index];
 					let resData = response.data.results

pages/user/order/order-payment.vue

@@ -1,96 +1,123 @@
 <template>
 	<view class="container cashier" :style="{paddingTop:CustomBar+'px'}">
 		<cu-custom :navbar-data='nvabarData' @navigateBack="hanldNavigateBack"></cu-custom>
-		<view class="container-cash clearfix" v-if="invoiceStatus">
-			<view class="pay-bring-title">{{payBringTitle}}</view>
-			<view class="container-wrapper">
-				<view class="pay-content">
-					<view class="pay-p"><text>待付金额</text></view>
-					<view class="pay-money">
-						<text class="pay-sm">￥</text>
-						<text class="pay-bg">{{payableAmount | NumFormat}}</text>
+		<template v-if="isPaySwitch">
+			<view class="container-cash clearfix">
+				<view class="pay-bring-title">线上支付功能正在维护中，请使用线下转账方式支付订单</view>
+				<view class="container-wrapper">
+					<view class="pay-content">
+						<view class="pay-p"><text>待付金额</text></view>
+						<view class="pay-money">
+							<text class="pay-sm">￥</text>
+							<text class="pay-bg">{{payableAmount | NumFormat}}</text>
+						</view>
 					</view>
 				</view>
-			</view>
-			<view class="pay-bring-wrapper clearfix">
-				<view class="pay-bring-content">
-					<view class="text-v title">转账信息</view>
-					<view class="text-v">开户行：中信银行（深圳泰然支行）</view>
-					<view class="text-v">银行卡号：{{bankNumber}}</view>
-					<view class="text-v">户名：周仁声</view>
-					<view class="text-v">订单标识：{{payOrderId}} <text class="clipboard" @click.stop="clipboard(payOrderId)">复制</text></view>
-					<view class="text-v title">特别注意</view>
-					<view class="text-v bg-color">请在转账备注中填写上述订单标识，方便财务快速审核，提高发货速度</view>
+				<view class="pay-bring-wrapper clearfix">
+					<view class="pay-bring-content">
+						<view class="text-v title">转账信息</view>
+						<view class="text-v">开户行：中信银行（深圳泰然支行）</view>
+						<view class="text-v">银行卡号：{{bankNumber}}</view>
+						<view class="text-v">户名：周仁声</view>
+						<view class="text-v">订单标识：{{payOrderId}} <text class="clipboard" @click.stop="clipboard(payOrderId)">复制</text></view>
+						<view class="text-v title">特别注意</view>
+						<view class="text-v bg-color">请在转账备注中填写上述订单标识，方便财务快速审核，提高发货速度</view>
+					</view>
 				</view>
-			</view>
-		</view>		
-		<view class="container-cash clearfix" v-else>
-			<view class="container-wrapper">
-				<view class="pay-content">
-					<view class="pay-p"><text>待付金额</text></view>
-					<view class="pay-money">
-						<text class="pay-sm">￥</text>
-						<text class="pay-bg">{{payableAmount | NumFormat}}</text>
+			</view>		
+		</template>
+		<template v-else>
+			<view class="container-cash clearfix" v-if="invoiceStatus">
+				<view class="pay-bring-title">{{payBringTitle}}</view>
+				<view class="container-wrapper">
+					<view class="pay-content">
+						<view class="pay-p"><text>待付金额</text></view>
+						<view class="pay-money">
+							<text class="pay-sm">￥</text>
+							<text class="pay-bg">{{payableAmount | NumFormat}}</text>
+						</view>
 					</view>
 				</view>
-				<view class="pay-check">
-					<view class="check-title"><view class="text">选择支付方式</view></view>
-					<view class="pay-checked">
-						<view  class="pay-item" :class="{ 'current' : tabCurrentIndex === 0}"   @click="tabClick(0)" >
-							<view class="item-l">
-								<view class="item-icon"><text class="iconfont icon-weixinzhifu"></text></view>
-								<view class="item-texts"><text>微信支付</text></view>
-							</view>
-							<view class="item-r">
-								<text class="iconfont icon-gougou"></text>
-							</view>
+				<view class="pay-bring-wrapper clearfix">
+					<view class="pay-bring-content">
+						<view class="text-v title">转账信息</view>
+						<view class="text-v">开户行：中信银行（深圳泰然支行）</view>
+						<view class="text-v">银行卡号：{{bankNumber}}</view>
+						<view class="text-v">户名：周仁声</view>
+						<view class="text-v">订单标识：{{payOrderId}} <text class="clipboard" @click.stop="clipboard(payOrderId)">复制</text></view>
+						<view class="text-v title">特别注意</view>
+						<view class="text-v bg-color">请在转账备注中填写上述订单标识，方便财务快速审核，提高发货速度</view>
+					</view>
+				</view>
+			</view>		
+			<view class="container-cash clearfix" v-else>
+				<view class="container-wrapper">
+					<view class="pay-content">
+						<view class="pay-p"><text>待付金额</text></view>
+						<view class="pay-money">
+							<text class="pay-sm">￥</text>
+							<text class="pay-bg">{{payableAmount | NumFormat}}</text>
 						</view>
-						<view  class="pay-item" :class="{ 'current' : tabCurrentIndex === 1}"   @click="tabClick(1)" >
-							<view class="item-l">
-								<view class="item-icon"><text class="iconfont icon-yinlianzhifu"></text></view>
-								<view class="item-text">
-									<view class="txt-p">企业网银支付</view>
-									<view class="txt-t">需要在电脑端汇款</view>
+					</view>
+					<view class="pay-check">
+						<view class="check-title"><view class="text">选择支付方式</view></view>
+						<view class="pay-checked">
+							<view  class="pay-item" :class="{ 'current' : tabCurrentIndex === 0}"   @click="tabClick(0)" >
+								<view class="item-l">
+									<view class="item-icon"><text class="iconfont icon-weixinzhifu"></text></view>
+									<view class="item-texts"><text>微信支付</text></view>
+								</view>
+								<view class="item-r">
+									<text class="iconfont icon-gougou"></text>
 								</view>
 							</view>
-							<view class="item-r">
-								<text class="iconfont icon-gougou"></text>
+							<view  class="pay-item" :class="{ 'current' : tabCurrentIndex === 1}"   @click="tabClick(1)" >
+								<view class="item-l">
+									<view class="item-icon"><text class="iconfont icon-yinlianzhifu"></text></view>
+									<view class="item-text">
+										<view class="txt-p">企业网银支付</view>
+										<view class="txt-t">需要在电脑端汇款</view>
+									</view>
+								</view>
+								<view class="item-r">
+									<text class="iconfont icon-gougou"></text>
+								</view>
 							</view>
 						</view>
 					</view>
 				</view>
-			</view>
-			<view class="pay-button">
-				<view class="btn" @click.stop="goOrderCash" :style="{'background':btnColor}">{{buttonText}}</view>
-			</view>
-			<view class="pay-statustext">
-				<view class="pay-statustext-inner">
-					<view class="pay-icon">
-						<text class="iconfont icon-gantanhao-yuankuang"></text>
-					</view>
-					<view class="pay-text">
-						<text>{{payStatusText}}</text>
-					</view>
+				<view class="pay-button">
+					<view class="btn" @click.stop="goOrderCash" :style="{'background':btnColor}">{{buttonText}}</view>
 				</view>
-			</view>
-			<view class="pay-bring clearfix" :style="{paddingBottom:isIphoneX ? '68rpx' : '24rpx'}" @click.stop="showTips" v-if="isReceiptStatus">
-				<view class="pay-bring-line"><text class="line"></text></view>
-				<view class="pay-bring-content" v-if="!isShowTip">
-					<view class="text bg-color">查看转账信息</view>
-					<view class="text">除了以上两种支付方式</view>
-					<view class="text">您还可以通过线下转账的方式付款</view>
+				<view class="pay-statustext">
+					<view class="pay-statustext-inner">
+						<view class="pay-icon">
+							<text class="iconfont icon-gantanhao-yuankuang"></text>
+						</view>
+						<view class="pay-text">
+							<text>{{payStatusText}}</text>
+						</view>
+					</view>
 				</view>
-				<view class="pay-bring-content" v-else>
-					<view class="text-v title">转账信息</view>
-					<view class="text-v">开户行：中信银行（深圳泰然支行）</view>
-					<view class="text-v">银行卡号：{{bankNumber}}</view>
-					<view class="text-v">户名：周仁声</view>
-					<view class="text-v">订单标识：{{payOrderId}} <text class="clipboard" @click.stop="clipboard(payOrderId)">复制</text></view>
-					<view class="text-v title">特别注意</view>
-					<view class="text-v bg-color">请在转账备注中填写上述订单标识，方便财务快速审核，提高发货速度</view>
+				<view class="pay-bring clearfix" :style="{paddingBottom:isIphoneX ? '68rpx' : '24rpx'}" @click.stop="showTips" v-if="isReceiptStatus">
+					<view class="pay-bring-line"><text class="line"></text></view>
+					<view class="pay-bring-content" v-if="!isShowTip">
+						<view class="text bg-color">查看转账信息</view>
+						<view class="text">除了以上两种支付方式</view>
+						<view class="text">您还可以通过线下转账的方式付款</view>
+					</view>
+					<view class="pay-bring-content" v-else>
+						<view class="text-v title">转账信息</view>
+						<view class="text-v">开户行：中信银行（深圳泰然支行）</view>
+						<view class="text-v">银行卡号：{{bankNumber}}</view>
+						<view class="text-v">户名：周仁声</view>
+						<view class="text-v">订单标识：{{payOrderId}} <text class="clipboard" @click.stop="clipboard(payOrderId)">复制</text></view>
+						<view class="text-v title">特别注意</view>
+						<view class="text-v bg-color">请在转账备注中填写上述订单标识，方便财务快速审核，提高发货速度</view>
+					</view>
 				</view>
 			</view>
-		</view>
+		</template>
 	</view>
 </template>
 
@@ -121,6 +148,7 @@
 				btnColor:'#09BB07',
 				receiptStatus:'',
 				invoiceStatus:false,
+				isPaySwitch:false,
 				optionType:'',
 				onlinePayFlag:'',
 				payBringTitle:'本次交易暂不支持线上支付，请使用线下转账方式付款',
@@ -163,31 +191,44 @@
 						this.nvabarData.haveBack = false
 						this.nvabarData.haveHome = true
 						this.nvabarData.title = '支付'
+						this.PayOrderOnLineSwitch()
 						this.PayOrderCheckoutCounter(this.orderID)
 						break;
 					case 'payfirm':
 						this.nvabarData.haveBack = true
 						this.nvabarData.haveHome = false
 						this.nvabarData.title = '选择支付方式'
+						this.PayOrderOnLineSwitch()
 						this.PayOrderCheckoutCounter(this.orderID)
 						break;
 					case 'onlinePay':
 						this.invoiceStatus = true
+						this.isPaySwitch = false
 						this.nvabarData.haveBack = true
 						this.nvabarData.haveHome = false
 						this.nvabarData.title = '付款提示'
 						this.payableAmount = e.Amount
-						// this.PayOrderCheckoutCounter(this.orderID)
 						this.payBringTitle = '您已通过线下转账的方式支付了订单部分款项，剩余款项依然需要使用线下转账方式，给您带来的不便敬请谅解'
 						break;
 				}
 			},
+			PayOrderOnLineSwitch(){
+				this.PayService.PayOrderOnLineSwitch().then(response=>{
+					if(response.data === 0 ){
+						this.isPaySwitch = true
+					}else{
+						this.isPaySwitch = false
+					}
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000)
+				})
+			},
 			PayOrderCheckoutCounter(orderId){
 				this.PayService.PayOrderCheckoutCounter({orderId:orderId}).then(response =>{
 					let data = response.data.order
 					this.payableAmount = data.payableAmount - data.receiptAmount  //待付金额
 					this.receiptStatus =  data.receiptStatus
-					this.onlinePayFlag = data.onlinePayFlag
+					this.onlinePayFlag = data.onlinePayFlag					
 					//判断线上线下显示
 					if(this.optionType == 'onlinePay'){
 						this.invoiceStatus = true

services/pay.service.js

@@ -6,6 +6,10 @@ export default class PayService {
 		Object.assign(this, { AjaxService })
 		this.name = 'PayService'
 	}
+	/* 小程序支付-查询线上支付开关状态 */
+	PayOrderOnLineSwitch (data = {}) {
+		return this.AjaxService.get({ url:'/PayOrder/onLineSwitch', data, isLoading: false })
+	}
 	/* 小程序支付-初始化收银台 */
 	PayOrderCheckoutCounter (data = {}) {
 		return this.AjaxService.get({ url:'/PayOrder/checkoutCounter', data, isLoading: true })

services/product.service.js

@@ -51,6 +51,13 @@ export default class ProductService {
 	queryProductDetils (data = {}) {
 		return this.AjaxService.get({ url:'/product/details', data, isLoading: false })
 	}
+	/**
+	 * @商品详情-相关推荐
+	 * @param:productIds 商品ID
+	 */
+	queryProductDetilsRelevant (data = {}) {
+		return this.AjaxService.get({ url:'/product/detail/recommend', data, isLoading: false })
+	}
 	
 	/**
 	 * @加入购物车