Merge remote-tracking branch 'origin/developerC' into developerD

# Conflicts:
#	common/css/iconfont.scss

common/config/caimeiApi.js

@@ -320,6 +320,11 @@ const caimeiApi = {
             url:url
         })
     },
+	navigateBack:function(page){
+	    uni.navigateBack({
+		    delta: page
+	    })
+	},
     isNumber:function(value){//验证是否为数字
 	    var patrn = /^(-)?\d+(\.\d+)?$/
 	    if (patrn.exec(value) == null || value == '') {
@@ -418,6 +423,7 @@ module.exports = {
     reLaunch: caimeiApi.reLaunch,
     redirectTo: caimeiApi.redirectTo,
     switchTabTo: caimeiApi.switchTabTo,
+    navigateBack: caimeiApi.navigateBack,
     formatDate: caimeiApi.formatDate,
     loginStatus: caimeiApi.loginStatus,
     setStorage: caimeiApi.setStorage,

common/css/iconfont.scss

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 1519039 */
-  src: url('//at.alicdn.com/t/font_1519039_8ndehzm6pfp.woff2?t=1647332278079') format('woff2'),
-       url('//at.alicdn.com/t/font_1519039_8ndehzm6pfp.woff?t=1647332278079') format('woff'),
-       url('//at.alicdn.com/t/font_1519039_8ndehzm6pfp.ttf?t=1647332278079') format('truetype');
+  src: url('//at.alicdn.com/t/font_1519039_u43k2sbvzfj.woff2?t=1647842651579') format('woff2'),
+       url('//at.alicdn.com/t/font_1519039_u43k2sbvzfj.woff?t=1647842651579') format('woff'),
+       url('//at.alicdn.com/t/font_1519039_u43k2sbvzfj.ttf?t=1647842651579') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,18 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-shibai:before {
+  content: "\e735";
+}
+
+.icon-wancheng:before {
+  content: "\e734";
+}
+
+.icon-daewangyinzhuanzhang:before {
+  content: "\e732";
+}
+
 .icon-xiaochengxu:before {
   content: "\e731";
 }

components/cm-module/productDetails/secondParameters.vue

@@ -50,6 +50,10 @@
 			<view class="content-td">所在地</view>
 			<view class="content-th">{{product.provinceCityDistrict}}</view>
 		</view>
+		<view class="content-tr">
+			<view class="content-td">提供方</view>
+			<view class="content-th">{{product.publishIdentity == 1 ? '采美二手代售' : product.companyName}}</view>
+		</view>
 	</view>
 </template>
 

pages.json

@@ -307,6 +307,13 @@
                         "navigationStyle": "custom"
                     }
                 },
+                {
+                    "path": "order/order-success",
+                    "style": {
+                        "navigationBarTitleText": "支付结果",
+                        "navigationStyle": "custom"
+                    }
+                },
                 {
                     "path": "order/order-payment",
                     "style": {

pages/goods/product.vue

@@ -247,7 +247,7 @@
 								</view>
 							</view>
 						</view>
-						<view class="right"><text class="iconfont icon-xiayibu"></text></view>
+						<view class="right" v-if="!isShowCaimeiShop"><text class="iconfont icon-xiayibu"></text></view>
 					</view>
 				</view>
 				<!-- 商品详情 -->
@@ -734,6 +734,7 @@ export default {
 					plain: false
 				}
 			],
+			isShowCaimeiShop:false
 		}
 	},
 	computed: {
@@ -832,6 +833,9 @@ export default {
 					this.shop = response.data.shop
 					this.shopId = response.data.shopId
 					this.product = response.data
+					if(this.shopId == 10235){
+						this.isShowCaimeiShop = true
+					}
 					if (this.product.userLike && this.product.userLike == 1) {
 						this.collectionType = true
 					} else {
@@ -1350,7 +1354,9 @@ export default {
 		},
 		goSupplier() {
 			//跳供应商资料页
-			this.$api.navigateTo('/pages/supplier/user/my-shop?shopId=' + this.shopId)
+			if(!this.isShowCaimeiShop){
+				this.$api.navigateTo('/pages/supplier/user/my-shop?shopId=' + this.shopId)
+			}
 		},
 		discard() {
 			//丢弃

pages/second/form/form.vue

@@ -180,20 +180,39 @@
 							 placeholder="请输入联系人姓名" 
 							 placeholder-class="placeholder">
 				</view> 
-			 </view>
-			 <view class="row">
+			</view>
+			<view class="row">
 				<view class="label">联系方式：</view>
 				<view class="spacing">
 					<input  type="text" 
 							v-model="secondParams.contactMobile" 
 							maxlength="11" 
 							placeholder="请输入联系人手机号" 
+							@blur="contactMobileOnblur"
 							placeholder-class="placeholder">
 				</view> 
-			 </view>
+			</view>
+			<view class="row">
+				<view class="label">验证码：</view>
+				<view class="spacing">
+					<input  type="text" 
+							v-model="secondParams.checkCode" 
+							maxlength="6" 
+							placeholder="请输入验证码" 
+							placeholder-class="placeholder">
+				</view> 
+				<view class="row-btn" :class="[isMobileDisabled  ? 'disabled' : '']">
+					<button class="row-input"
+							type="button" 
+							@click.stop="getMobileCodeFn" 
+							:disabled="isMobileDisabled">
+							{{ mobileCodeText }}
+					</button>
+				</view>		
+			</view>
 			<view class="row none" v-if="secondParams.publishIdentity === 1">
 				<view class="label-im">身份证照片：</view>
-				<view class="label-em">个人请上传身份证正面照片(图片大小不超过5M)</view>
+				<view class="label-em">个人请上传身份证正反面照片(图片大小不超过5M)</view>
 				<view class="release-input upload image uploadGoodsImages" >
 					<view class="upload-file-view">
 						<view class="upload-file" v-if="secondParams.authenticationImage == ''">
@@ -353,7 +372,7 @@
 				</view>
 			</view>	
 		</view>
-		<view class="secondBj thebj"   v-show="model1" :class="model1 ? 'show':''">
+		<view class="secondBj thebj"   v-show="modal1" :class="modal1 ? 'show':''">
 			<view class="bjmain theresult">
 				<text class="title">发布提示</text>
 				<text class="content"> {{ tipsContentText }} </text>
@@ -376,11 +395,11 @@
 				<view class="tui-right-flex tui-popup-btn" :style="{ paddingBottom: isIphoneX ? '68rpx' : '34rpx' }">
 					<view class="tui-flex-1">
 						<view class="tui-button-text" @click="handleChangAgree">
-							<text  @click="changeBox($event)"
-								   class="iconfont"
+							<text  class="iconfont"
 								   :class="checkbox ? 'icon-yixuanze':'icon-weixuanze'" >
 							</text>
-							已阅读并同意采美<text style="color:#1890f9;">《二手出让协议》</text>
+							已阅读并同意采美
+							<text style="color:#1890f9;" @click.stop="this.$api.navigateTo('/pages/service/service?id=1013&title=二手出让协议')">《二手出让协议》</text>
 						</view>
 					</view>
 					<view class="tui-flex-1">
@@ -419,7 +438,7 @@
 				isIphoneX: this.$store.state.isIphoneX,
 				popupShow:true,
 				userIdentity:0,
-				publisherText:'请选择发布身份',
+				publisherText:'个人身份',
 				organizationTypeText:'请选择二手分类',
 				organizationTypeText1:'请选择商品类型',
 				brandActions:[],
@@ -459,11 +478,13 @@
 					originalPrice:'',//采购价
 					stock:'',//数量
 					productQuality:'',//商品成色
+					fileType:'', // 商品文件类型
 					contactName:'',//联系人
 					contactMobile:'',//联系方式
+					checkCode:'',// 联系人手机验证码
 					authenticationImage:'', //身份证正面
 					authenticationBackImage:'', //身份证反面
-					licenseImage:'',//身份验证图片
+					licenseImage:'',//营业执照图片
 					commitmentImage:'',//承诺函图片
 					dockingPeopleName:'',//采美对接人姓名
 					dockingPeopleMobile:'',//采美对接人手机号
@@ -493,7 +514,11 @@
 				isButtonsType:0,
 				vShow_detailTalkFlag:false,
 				modal:false,
-				model1:false
+				modal1:false,
+				isMobileDisabled: true,	//手机验证码按钮控制
+				mobilCount: '',				//倒计时
+				mobileCodeText: '获取验证码',
+				mobilTime: null,
 			}
 		},
 		methods:{
@@ -611,6 +636,42 @@
 			removeCommitmentImageFn(index){//删除承诺函图片
 				this.secondParams.commitmentImage = ''
 			},
+			contactMobileOnblur(e){// 识别手机号是否正确
+				if(this.$reg.isMobile(e.detail.value)){
+					this.isMobileDisabled = false;
+				}
+			},
+			getMobileCodeFn(){
+				let params = {
+						mobile:this.secondParams.contactMobile,
+						isCheckCaptcha:1,
+						activateCodeType:6,
+						platformType:2
+					}
+				this.isMobileDisabled = true;
+				this.PublicService.GetRegisterMobileCode(params).then(response =>{
+					this.$util.msg('验证短信已发送',2000);
+					const TIME_COUNT = 60;
+			     	if (!this.mobilTime) {
+			       		this.mobilCount = TIME_COUNT;
+			       		this.isMobileDisabled = true;
+			       		this.mobilTime = setInterval(() => {
+			       			if (this.mobilCount > 1 && this.mobilCount <= TIME_COUNT) {
+			         			this.mobilCount--
+			         			this.mobileCodeText = this.mobilCount +'s重新发送'
+			        		} else {
+				         		this.isMobileDisabled = false;
+				         		clearInterval(this.mobilTime)
+				         		this.mobilTime = null
+								this.mobileCodeText = '获取验证码'
+			        		}
+			       		},1000)
+			      	}
+				}).catch( error =>{
+					this.$util.msg(error.msg,2000);
+					this.isMobileDisabled = false;
+				})
+			},
 			handleSubmitBtn () {
 				if(this.secondParams.secondHandType == ''){
 					this.$util.msg('请选择分类',2000)
@@ -658,6 +719,10 @@
 					this.$util.msg('请输入商品成色',2000)
 					return
 				}
+				if(this.secondParams.fileType == ''){
+					this.$util.msg('请选择商品包含的文件',2000)
+					return
+				}
 				if(this.secondParams.contactName == ''){
 					this.$util.msg('请输入联系人姓名',2000)
 					return
@@ -671,6 +736,10 @@
 					this.$util.msg('请填写正确的手机号',2000)
 					return
 				}
+				if(this.secondParams.checkCode == ''){
+					this.$util.msg('请输入短信验证码',2000)
+					return
+				}
 				if(this.userIdentity === 1){
 					if(this.secondParams.dockingPeopleName == ''){
 						this.$util.msg('请输入采美对接人姓名',2000)
@@ -705,7 +774,7 @@
 				}
 				console.log(this.secondParams)
 				if(this.secondParams.licenseImage == ''){
-					this.model1 = true
+					this.modal1 = true
 					this.tipsContentText = '上传身份验证照片,您的二手商品将获得更好的推荐推荐和曝光，方便您快速卖出。'
 					this.cancelButtonText = '继续发布'
 					this.confirmButtonText = '去上传'
@@ -713,39 +782,40 @@
 					return
 				}
 				if(this.secondParams.commitmentImage == '' || this.secondParams.ossName == ''){
-					this.model1 = true
+					this.modal1 = true
 					this.tipsContentText = '上传二手出让承诺函,您的二手商品将获得更好的推荐推荐和曝光，方便您快速卖出。'
 					this.cancelButtonText = '继续发布'
 					this.confirmButtonText = '去上传'
 					this.isButtonsType = 1
 					return
 				}
-				this.SecondHandProduct()
 			},
-			SecondHandProduct(){//提交发布
-				this.SecondService.SecondHandProduct(this.secondParams).then(res=>{ 
-					this.model = true
-				}).catch(error =>{
+			SecondHandProduct(params){//提交发布
+				this.SecondService.SecondHandProduct(params).then(res=>{ 
+					this.modal = true
+				})
+				.catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})
 			},
 			cancelButtonFn(){//弹窗操作按钮
 				switch(this.isButtonsType){
 					case 1:
+						this.modal1 = false
 						this.SecondHandProduct(this.secondParams)
 						break
 					case 2:	
-						this.model1 = false
+						this.modal1 = false
 						break
 				}
 			},
 			confirmButtonFn(){//弹窗操作按钮
 				switch(this.isButtonsType){
 					case 1:
-						this.model1 = false
+						this.modal1 = false
 						break
 					case 2:	
-						this.model1 = false
+						this.modal1 = false
 						break
 				}
 			},
@@ -771,7 +841,7 @@
 			},
 			handleClick(){
 				this.modal = false
-				this.$api.navigateTo('/pages/second/product/product-list')
+				this.$api.redirectTo ('/pages/second/product/product-list')
 			}
 		},
 		onShow() {
@@ -904,6 +974,42 @@
 				}
 			}
 		}
+		.row-btn{
+			width: 180rpx;
+			height:64rpx;
+			background: $btn-confirm;
+			padding: 0;
+			border-radius: 32rpx;
+			position: absolute;
+			right: 0;
+			top: 10rpx;
+			.row-input{
+				width: 180rpx;
+				height: 64rpx;
+				line-height: 64rpx;
+				padding: 0;
+				color: #FFFFFF;
+				background: $btn-confirm;
+				text-align: center;
+				border-radius: 32rpx;
+				&.other{
+					width: 180rpx;
+					background: #F7F7F7;
+					margin-right: 20rpx;
+				}
+				&.none{
+					background: #F7F7F7;
+				}
+			}
+			&.disabled{
+				background: #F7F7F7;
+				.row-input{
+					background: #F7F7F7;
+					color: #999999;
+					font-size: 24rpx;
+				}
+			}
+		}
 		&.none{
 			border-bottom: none;
 		}

pages/user/order/order-list.vue

@@ -581,7 +581,7 @@ export default {
 		},
 		hanldCancelConfirm(data) {
 			//不使用余额抵扣直接跳转收银台
-			if (data.onlinePayFlag == '1') {
+			if (data.onlinePayFlag === 1) {
 				this.$api.navigateTo(
 					`/pages/user/order/order-payment?type=onlinePay&Amount=${
 						this.hanldOrderData.pendingPayments

pages/user/order/order-pay.vue

@@ -76,6 +76,40 @@
 				</view>
 			</view>
 		</view>
+		<!--大额转账弹窗  -->
+		<tui-modal :show="modal" :padding="'30rpx 30rpx'" @cancel="hideMobel(0)" :custom="true" fadeIn >
+			<view class="tui-modal-custom">
+				<view class="tui-prompt-title">大额银联转账信息</view>
+				<view class="tui-prompt-text">
+					<view class="tui-prompt-tips">请使用银行手机app或者网银输入以下信息进行转账。每次发起支付请求，收款账号都会变化，请使用最新的收款账号进行转账。</view>
+					<view class="tui-prompt-item">
+						<text class="text">户名：</text>
+						{{ bigPayInfo.receiveName }}
+					</view>
+					<view class="tui-prompt-item">
+						<text class="text">收款账号：</text>
+						{{ bigPayInfo.receiveAccountNo }}
+						<view class="clipboard" @click.stop="copyClipboard(bigPayInfo)">复制</view>
+					</view>
+					<view class="tui-prompt-item">
+						<text class="text">银行：</text>
+						{{ bigPayInfo.accountName }}
+					</view>
+					<view class="tui-prompt-item">
+						<text class="text">收款方开户地：</text>
+						{{ bigPayInfo.areaInfo }}
+					</view>
+					<view class="tui-prompt-item">
+						<text class="text">收款网点：</text>
+						{{ bigPayInfo.accountName }}
+					</view>
+				</view>
+				<view class="tui-prompt-flex">
+					<view class="btn btn-confirm" @click="handleClick">已完成转账，请点击</view>
+					<view class="btn btn-cancel" @click="hideMobel">关闭</view>
+				</view>	
+			</view>
+		</tui-modal>	
 	</view>
 </template>
 
@@ -113,7 +147,10 @@
 				btnColor:'#09BB07',
 				discernReceipt:[],
 				showDigitKeyboard:false,
-				payHttpUrl:''
+				payHttpUrl:'',
+				bigPayInfo:{},// 大额网银转账
+				mbOrderId:0, // 支付记录订单Id
+				modal:false,
 			}
 		},
 		onLoad(option) {
@@ -162,6 +199,11 @@
 						this.btnColor='#034582'
 						this.buttonText = '生成个人网银支付链接'
 						break
+					case '3':
+						this.payWay = 'UNIONPAY'
+						this.btnColor='#034582'
+						this.buttonText = '去转账'
+						break
 				}
 				this.GetPayOrderInfo()
 			},
@@ -190,9 +232,41 @@
 					case '2':
 						this.BuildCatenate()
 						break
+					case '3':
+						this.LargePayment()
+						break
 				}
 			},
-			BuildCatenate(){
+			LargePayment(){// 大额银联
+				if(this.payAmount == 0){
+					this.$util.msg('请输入本次支付的金额',2000)
+					return
+				}
+				if(this.payAmount <=10){
+					this.$util.msg('网银支付的金额必须大于￥12.00',2000)
+					return
+				}
+				this.PayService.PayOrderTransferUnion({payAmount:this.accMul(this.payAmount,100),orderId:this.orderId}).then(response =>{
+					this.bigPayInfo = JSON.parse(response.data.data.payInfo)
+					this.mbOrderId = response.data.data.mbOrderId;
+					this.modal = true
+					console.log('PayInfo',this.bigPayInfo)
+				})
+			},
+			handleClick(){// 查询是否支付成功
+				this.PayService.PayOrderFindOrderStatus({mbOrderId:this.mbOrderId}).then(response =>{
+					let data =  {
+						  payAmount:this.payAmount,
+						  orderId:this.orderId,
+						  type:response.data.data === '1' ? 'success' : 'error'
+						}
+					this.$api.navigateTo(`/pages/user/order/order-success?data=${JSON.stringify({ data: data })}`)
+				})
+			},
+			hideMobel(){
+				this.modal = false
+			},
+			BuildCatenate(){// 企业网银  个人网银
 				if(this.payAmount == 0){
 					this.$util.msg('请输入本次支付的金额',2000)
 					return
@@ -206,7 +280,7 @@
 					this.isShowTip = true
 				})
 			},
-			MiniWxPayFor(){
+			MiniWxPayFor(){// 微信支付
 				authorize.getCode('weixin').then(wechatcode =>{
 					if(this.payAmount > 5000){
 						this.$util.modal('','本次支付金额已超出微信支付限额，请输入小于5千的金额进行支付','知道了','',false,() =>{})
@@ -332,7 +406,19 @@
 			toFixedFn(text){//处理小数点后两位数
 				return Number(text).toFixed(2)
 			},
+			copyClipboard(data){
+				//复制账号
+				let thoruiData =  data.receiveName + '' + data.receiveAccountNo
+				thorui.getClipboardData(thoruiData, (res) => {
+					if (res) {
+						this.$util.msg('复制成功',2000,true,'success')
+					} else {
+						this.$util.msg('复制失败',2000,true,'none')
+					}
+				})
+			},
 			clipboard(data) {//复制链接
+				console.log('data',data)
 				thorui.getClipboardData(data, (res) => {
 					if (res) {
 						this.isShowTip = false
@@ -651,4 +737,72 @@
 			}
 		}
 	}
+	.tui-prompt-title{
+		width: 100%;
+		height: 44rpx;
+		line-height: 44rpx;
+		padding: 20rpx 0;
+		text-align: center;
+		color: #333333;
+		border-bottom: 1px solid #E2E7EF;
+	}
+	.tui-prompt-text{
+		padding-top: 20rpx;
+		.tui-prompt-tips{
+			width: 100%;
+			line-height: 36rpx;
+			font-size: $font-size-22;
+			color: #E15616;
+			text-align: justify;
+			margin-bottom: 24rpx;
+		}
+		.tui-prompt-item{
+			width: 100%;
+			line-height: 60rpx;
+			color: #333333;
+			font-size: $font-size-26;
+			.text{
+				font-weight: bold;
+			}
+			.clipboard{
+				height: 38rpx;
+				box-sizing: border-box;
+				padding: 0 24rpx;
+				background:#FFE6DC;
+				text-align: center;
+				font-size: $font-size-22;
+				color: #E15616;
+				border-radius: 18rpx;
+				line-height: 36rpx;
+				display: inline-block;
+				margin-left: 20rpx;
+				border: 1px solid #E15616;
+			}
+		}	
+	}
+	.tui-prompt-flex{
+		width: 100%;
+		height: auto;
+		margin-top: 20rpx;
+		box-sizing: border-box;
+		padding: 0 35rpx;
+		.btn{
+			width: 100%;
+			line-height: 84rpx;
+			font-size: $font-size-26;
+			text-align: center;
+			color: #FFFFFF;
+			border-radius: 44rpx;
+			margin: 20rpx 0;
+			&.btn-cancel{
+				background: #FFFFFF;
+				color: #333333;
+				border: 1px solid #979797;
+			}
+			&.btn-confirm{
+				background: $btn-confirm;
+			}
+		}
+		
+	}
 </style>

pages/user/order/order-payment.vue

@@ -95,6 +95,19 @@
 									<text class="iconfont icon-duigou"></text>
 								</view>
 							</view>
+							<view  class="pay-item" :class="{ 'current' : tabCurrentIndex === 3}"   @click="tabClick(3)" >
+								<view class="item-l">
+									<view class="item-icon"><text class="iconfont icon-daewangyinzhuanzhang"></text></view>
+									<view class="item-text">
+										<view class="txt-p">大额银联转账</view>
+										<view class="txt-t">需要使用银行App或网银进行转账</view>
+									</view>
+								</view>
+								<view class="item-r">
+									<text class="iconfont icon-duigou"></text>
+								</view>
+							</view>
+							
 						</view>
 					</view>
 				</view>
@@ -107,27 +120,11 @@
 							<text class="iconfont icon-gantanhao-yuankuang"></text>
 						</view>
 						<view class="pay-text">
-							<text>{{payStatusText}}</text>
+							<view>1.{{payStatusText}}</view>
+							<view>2.大额支付请使用大额银联转账方式进行付款。</view>
 						</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>
-					<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>
 		</template>
 	</view>
@@ -154,7 +151,6 @@
 				isIphoneX:this.$store.state.isIphoneX,
 				CustomBar:this.CustomBar,// 顶部导航栏高度
 				tabCurrentIndex:0,
-				isShowTip:false,
 				isReceiptStatus:false,
 				buttonText:'使用微信支付',
 				btnColor:'#09BB07',
@@ -164,7 +160,7 @@
 				optionType:'',
 				onlinePayFlag:'',
 				payBringTitle:'本次交易暂不支持线上支付，请使用线下转账方式付款',
-				payStatusText:'使用微信和网银支付全部金额后，供应商会在24小时后发货（周末、节假日顺延）。若着急发货，可以选择使用线下转账进行付款。',
+				payStatusText:'使用任何一种线上支付方式支付全部金额后，供应商会在24小时后发货（周末、节假日顺延）。',
 				pageType:''
 			}
 		},
@@ -250,10 +246,10 @@
 						this.onlinePay = response.data.onlinePay
 					}
 					if(data.receiptAmount>0){
-						this.payStatusText = '使用微信和网银支付全部金额后，供应商会在24小时后发货（周末、节假日顺延）。'
+						this.payStatusText = '使用任何一种线上支付方式支付全部金额后，供应商会在24小时后发货（周末、节假日顺延）。'
 						this.isReceiptStatus = false
 					}else{
-						this.payStatusText = '使用微信和网银支付全部金额后，供应商会在24小时后发货（周末、节假日顺延）。若着急发货，可以选择使用线下转账进行付款。'
+						this.payStatusText = '使用任何一种线上支付方式支付全部金额后，供应商会在24小时后发货（周末、节假日顺延）。'
 						this.isReceiptStatus = true
 					}
 				}).catch(error =>{
@@ -285,6 +281,9 @@
 						case 2:
 							this.$api.navigateTo(`/pages/user/order/order-pay?type=2&orderId=${this.orderId}`)
 							break
+						case 3:
+							this.$api.navigateTo(`/pages/user/order/order-pay?type=3&orderId=${this.orderId}`)
+							break
 					}
 				}
 			},
@@ -303,6 +302,10 @@
 						this.btnColor='#034582'
 						this.buttonText='使用个人网银支付'
 						break
+					case 3:
+						this.btnColor='#034582'
+						this.buttonText='使用大额银联转账'
+						break
 				}
 			},
 			hanldNavigateBack(){//页面返回
@@ -310,9 +313,6 @@
 					delta: 1
 				})
 			},
-			showTips(){
-				this.isShowTip=!this.isShowTip
-			},
 			clipboard(data) {
 				thorui.getClipboardData(data, (res) => {
 					if (res) {
@@ -451,6 +451,10 @@
 								.icon-gerenwangyinzhifu{
 									color: #034582;
 								}
+								.icon-daewangyinzhuanzhang{
+									font-size: 68rpx;
+									color: #034582;
+								}
 								.icon-qiyewangyinzhifu{
 									color: #004889;
 								}
@@ -467,6 +471,7 @@
 									color: $text-color;
 								}
 								.txt-t{
+									font-size: $font-size-24;
 									color: #999999;
 								}
 							}
@@ -502,7 +507,7 @@
 		}
 		.pay-statustext{
 			width: 100%;
-			height: 120rpx;
+			height: auto;
 			float: left;
 			margin-top:40rpx;
 			.pay-statustext-inner{
@@ -525,7 +530,7 @@
 					height: 100%;
 					float: left;
 					line-height: 40rpx;
-					font-size: $font-size-26;
+					font-size: $font-size-24;
 					color: #FF2A2A;
 					text-align: justify;
 				}

pages/user/order/order-success.vue

@@ -0,0 +1,169 @@
+<template>
+	<view class="container cashier">
+		<cu-custom :navbar-data='nvabarData'></cu-custom>
+		<view class="container-cash clearfix" :style="{marginTop:CustomBar+'px'}">
+			<view class="container-wrapper">
+				<view class="cash-icon">
+					<text class="iconfont" :class="payStatus ? 'icon-wancheng' : 'icon-shibai'"></text>
+				</view>
+				<view class="cash-text">
+					<text>{{ successText }}</text>
+				</view>
+			</view>
+			<view class="container-amount">
+				<view class="amount-label">支付金额</view>
+				<view class="amount-money">￥{{ amuntMoney | NumFormat }}</view>
+			</view>
+			<view class="container-button">
+				<view class="btn btn-home" v-if="payStatus" @click="this.$api.switchTabTo('/pages/tabBar/home/index')">回到首页</view>
+				<view class="btn btn-home" v-else @click="toAgainPay">重新支付</view>
+				<view class="btn btn-open" @click="details">查看订单</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		data(){
+			return{
+				orderId:0,
+				nvabarData: {		//顶部自定义导航
+					haveBack:false,
+					haveHome:true,
+					showCapsule:1, // 是否显示左上角图标  1表示显示  0表示不显示,
+					showSearch: 0,
+					title: '支付结果',  // 导航栏 中间的标题
+					textLeft:this.$store.state.isIphone
+				},
+				payType:'',
+				payStatus:false,
+				amuntMoney:0,
+				successText:'本次支付失败',
+				isIphoneX:this.$store.state.isIphoneX,
+				CustomBar:this.CustomBar,// 顶部导航栏高度
+				
+			}
+		},
+		filters:{
+			NumFormat(value) {
+			    //处理金额
+			    if (value) {
+			        return Number(value).toFixed(2)
+			    } else {
+			        return '0.00'
+			    }
+			}
+		},
+		onLoad(option) {
+			this.initData(option)
+		},
+		methods:{
+			initData(option){
+				const data = JSON.parse(option.data);
+				this.orderId = data.data.orderId
+				this.payType = data.data.type
+				this.amuntMoney = data.data.payAmount
+				if(this.payType == 'success'){
+					this.payStatus = true
+					this.successText = '本次支付成功'
+				}else{
+					this.payStatus = false
+					this.successText = '本次支付失败'
+				}
+				console.log(this.orderId)
+			},
+			toAgainPay(){
+				this.$api.navigateBack(2)
+			},
+			details(){
+				this.$api.redirectTo('/pages/user/order/order-details?type=share&orderId='+this.orderId)
+			}
+		},
+		onShow() {
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	page{
+		height: auto !important;
+	}
+	.container-cash{
+		width: 100%;
+		.container-wrapper{
+			width:100%;
+			height: auto;
+			padding: 120rpx 24rpx 0 24rpx;
+			box-sizing: border-box;
+			.cash-icon{
+				width: 100%;
+				height: 90rpx;
+				text-align: center;
+				.iconfont{
+					font-size: 80rpx;
+					&.icon-wancheng{
+						color:#00BE6F ;
+					}
+					&.icon-shibai{
+						color:#F94B4B ;
+					}
+				}
+			}
+			.cash-text{
+				width: 100%;
+				height: 90rpx;
+				text-align: center;
+				font-size: $font-size-28;
+				color: $text-color;
+				line-height: 90rpx;
+				padding-bottom: 40rpx;
+			}
+		}
+		.container-amount{
+			width: 100%;
+			height: 130rpx;
+			box-sizing: border-box;
+			padding: 0 24rpx;
+			margin-bottom: 24rpx;
+			font-size: $font-size-28;
+			color: #333333;
+			line-height: 90rpx;
+			border-top: 20rpx solid #F7F7F7;
+			border-bottom: 20rpx solid #F7F7F7;
+			.amount-label{
+				float: left;
+				font-weight: bold;
+			}
+			.amount-money{
+				float: right;
+				text-align: right;
+			}
+		}
+		.container-button{
+			width: 100%;
+			box-sizing: border-box;
+			padding: 80rpx 75rpx;
+			.btn{
+				width: 100%;
+				height: 90rpx;
+				border-radius: 50rpx;
+				line-height: 90rpx;
+				box-sizing: border-box;
+				text-align: center;
+				font-size: $font-size-26;
+				color: #FFFFFF;
+				margin: 24rpx 0;
+				&.btn-open{
+					background:#FFFFFF;
+					border: 1px solid $color-system;
+					color: $color-system;
+				}
+				&.btn-home{
+					background:$btn-confirm;
+				}
+			}
+		}
+	}
+</style>

services/pay.service.js

@@ -129,4 +129,29 @@ export default class PayService {
               
         })
     } 
+    /**
+	 *@param 订单支付大额网银转账
+	 *@param  payAmount  转账金额
+	 *@param  orderId 订单ID
+	 */
+    PayOrderTransferUnion (data = {}) {
+        return this.AjaxService.post({
+            url:'/order/pay/transfer/union', 
+            data, 
+            isLoading: true ,
+              
+        })
+    } 
+    /**
+	 *@param 校验是否网银转账成功
+	 *@param  mbOrderId  交易订单号
+	 */
+    PayOrderFindOrderStatus (data = {}) {
+        return this.AjaxService.get({
+            url:'/order/pay/result/json', 
+            data, 
+            isLoading: true ,
+              
+        })
+    } 
 }

services/public.service.js

@@ -53,9 +53,9 @@ export default class PublicService {
 	}
 	/**
 	 * 获取手机短信验证码
-	 * isCheckCaptcha 	是否需要图形验证码：1:检查 , 0：不检查
+	 * isCheckCaptcha 	是否需要图形验证码：1:不检查 , 0：检查
 	 * mobile			手机号
-	 * activateCodeType 短信类型 :1:找回密码, 2:手机号注册机构, 3:供应商注册
+	 * activateCodeType 短信类型 :1:找回密码, 2:手机号注册机构, 3:供应商注册 6:二手发布
 	 * imgCode          图片验证码
 	 * token            图片验证码token
 	 * platformType: 	来源：0:www，1:crm/h5，2:小程序