采美线上支付

api/order.js

@@ -261,7 +261,7 @@ export function clearOrderHistory(params) {
 	})
 }
 /**
- *清楚订单历史记录
+ *初始化收银台
  *@param  orderId 订单ID
  */
 export function PayOrderCheckoutCounter(params) {
@@ -295,4 +295,20 @@ export function WeChatMiniWxPay(params) {
 		})
 	})
 }
+/**
+ *生成支付链接
+ *@param  unpaidAmount 本次待付款金额
+ *@param  orderId  主订单ID
+ */
+export function PayOrderPayLink(params) {
+	return new Promise(function(resolve,reject) {
+		request.post('/PayOrder/payLink',params,true,res => {
+			if(res.code == 0){
+				resolve(res)
+			}else{
+				reject(res)
+			}
+		})
+	})
+}
 

common/config/config.js

@@ -1,9 +1,9 @@
 let URL_CONFIG = ""
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
-	// URL_CONFIG = 'http://192.168.1.22:8008'	 //裴裴联调地址
+	URL_CONFIG = 'http://192.168.1.22:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'https://spi.caimei365.com'	 //超超联调地址
-    URL_CONFIG = 'https://spi-b.caimei365.com'//采美测试地址
+    // URL_CONFIG = 'https://spi-b.caimei365.com'//采美测试地址
 }else{
     // 生产环境
     URL_CONFIG = 'https://spi.caimei365.com'

common/css/iconfont.scss

@@ -4,7 +4,7 @@
 	font-family: iconfont;
 	font-weight: normal;
 	font-style: normal;
-	src: url('https://at.alicdn.com/t/font_1519039_awwryhp1s7o.ttf') format('truetype');
+	src: url('https://at.alicdn.com/t/font_1519039_dc2175m9e7.ttf') format('truetype');
 }
 .iconfont {
 	font-family: "iconfont" !important;
@@ -13,6 +13,10 @@
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
 }
+.icon-gou:before {
+  content: "\e628";
+}
+
 .icon-gougou:before {
   content: "\e6a3";
 }

components/keyboard/keyboard.vue

@@ -4,7 +4,7 @@
 	        <view class='key-cell cell_b' data-num='7'>7</view>
 	        <view class='key-cell cell_b' data-num='8'>8</view>
 	        <view class='key-cell cell_b' data-num='9'>9</view>
-			<view class='key-cell cell_b' data-num='-1'></view>
+			<view class='key-cell cell_b ac' data-num='-1'></view>
 	    </view>
 	    <view class='key-row'>
 	        <view class='key-cell cell_b' data-num='4'>4</view>
@@ -24,7 +24,7 @@
 		 </view>
 		 
 		<view  @touchstart="touchstart" @touchend="touchend" data-num='D' class="key-confirm2">
-			<text data-num='D'>C</text>
+			<text data-num='D'>删除</text>
 		</view>
 		
 	    <view class='key-confirm' :style="{'background':btnColor}" data-num='S'>
@@ -40,7 +40,7 @@
 		name:"keyBoard",
 		props:{
 			title:{
-				default:'确认',
+				default:'完成',
 				type:String
 			},
 			btnColor:{
@@ -54,22 +54,19 @@
 				Time:''
 			}
 		},
-		
 		watch:{
 			money(val){
 				this.$emit('update:money',val);			
 			}
 		},
-
 		methods : {
 			touchstart(){
 				 this.Time=setInterval(()=>{
-						console.log(this.money);
-						if(this.money==''){
-							clearInterval();
-						}
-						this.money = this.money.substring(0,this.money.length - 1);
-					},200)
+					if(this.money==''){
+						clearInterval();
+					}
+					this.money = this.money.substring(0,this.money.length - 1);
+				},200)
 			},
 			touchend(){
 				clearInterval(this.Time);
@@ -155,18 +152,20 @@
 				let S = this.money;
 				//未输入
 				if (!S.length||S==0){
-					 uni.showToast({
-						title: '请输入支付金额',
-						icon:'none',
-						duration: 1000
-					 });
-					return false;
+					S = this.$parent.payAmount
+					//  uni.showToast({
+					// 	title: '请输入支付金额',
+					// 	icon:'none',
+					// 	duration: 1000
+					//  });
+					// return false;
+				}else{
+					//将 8. 这种转换成 8.00
+					if (S.indexOf('.') > -1 && S.indexOf('.') == (S.length - 1))
+						S = Number(S.substring(0, S.length - 1)).toFixed(2);
+					//保留两位
+					S = Number(S).toFixed(2);
 				}
-				//将 8. 这种转换成 8.00
-				if (S.indexOf('.') > -1 && S.indexOf('.') == (S.length - 1))
-					S = Number(S.substring(0, S.length - 1)).toFixed(2);
-				//保留两位
-				S = Number(S).toFixed(2);
 				this.$emit('confirmEvent',S);    //提交参数
 			}
 		}
@@ -178,13 +177,11 @@
 		border-right: 1px solid #d5d5d6;
 		border-bottom: 1px solid #d5d5d6;
 	}
-		
     .key-container {
         width: 100%;
         display: flex; 
         flex-direction: column;
     }
- 
     .keyboard {
 		flex: 1;
         position: fixed;
@@ -192,8 +189,8 @@
         left: 0;
         height: 600rpx;
         width: 100%;
-		
 		background: #FFFFFF;
+		border-top: 1px solid #d5d5d6;
     }
     .keyboard .key-row {
         display: flex;
@@ -201,31 +198,30 @@
         position: relative;
         height: 150rpx;
         line-height: 150rpx;
-		
-		
     }
  
     .keyboard .key-cell {
         flex: 1;
         -webkit-box-flex: 1;
 		font-size: 60upx;
-		
 		display: flex;
 		justify-content: center;
 		align-items: center;
+		&.ac{
+			border-bottom:none;
+		}
     }
   
     .keyboard .key-confirm {
         position: absolute;
         text-align: center;
-        height: 450rpx;
+        height: 300rpx;
         width: 25%;
-        line-height: 450rpx;
+        line-height: 300rpx;
 		color: #FFFFFF;
         z-index: 5;
         right: 0;
         bottom: 0;
-		
 		display:flex;
 		justify-content: center;
 		align-items: center;
@@ -233,17 +229,16 @@
 	
 	.keyboard .key-confirm2 {
 	    position: absolute;
-	    height: 150rpx;
+	    height: 300rpx;
 	    width: 25%;
-	    line-height: 150rpx;
+	    line-height: 300rpx;
 	    z-index: 9999;
 	    right: 0;
 		top: 0;
-		
-			
 		display: flex;
 		justify-content: center;
 		align-items: center;
+		background: #EBEBEB;
 	}
 	.key-zero-and-point{
 		 display: flex;height: 150rpx;justify-content: center;align-items: center;width:75%;font-size: 60upx;
@@ -254,14 +249,14 @@
 			  display: flex;justify-content: center;align-items: center;width: 33.33%;font-size: 60upx;text-align: center;height: 100%;
 		 }
 	}
- .key-cell:active{
-	            color: white;  
-	            background: black;  //黑色
-	            opacity: 0.1;    //这里重要，就是通过这个透明度来设置
-	        }
-.a:active,.key-confirm2:active{
-				            color: white;
-				            background: black;  //黑色
-				            opacity: 0.1;    //这里重要，就是通过这个透明度来设置
-				        }
+	.key-cell:active{
+		color: white;  
+		background: black;  //黑色
+		opacity: 0.1;    //这里重要，就是通过这个透明度来设置
+	}
+	.a:active,.key-confirm2:active{
+		color: white;
+		background: black;  //黑色
+		opacity: 0.1;    //这里重要，就是通过这个透明度来设置
+	}
 </style>

pages/authorization/authorization.vue

@@ -27,6 +27,8 @@
 					showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
 					showSearch: 0,
 					title: '微信授权', // 导航栏 中间的标题
+					haveBack:true,
+					textLeft:this.$store.state.isIphoneX
 				},
 				CustomBar:this.CustomBar,// 顶部导航栏高度
 				authorizeType:''

pages/goods/product.vue

@@ -190,7 +190,7 @@
 		data(){
 			return{			
 				html:'<div style="text-align: center;color:#333333;">暂无内容</div>',
-				tabNavList:[{name:'商品详情'},{name:'供应商细信息'},{name:'相关推荐'},{name:'评价'}],
+				tabNavList:[{name:'商品详情'},{name:'供应商信息'},{name:'相关推荐'},{name:'评价'}],
 				disabledTabNavList:[{name:'相关推荐'},{name:'评价'}],
 				mode:'round',
 				specClass: '',//规格弹窗css类，控制开关动画

pages/login/information.vue

@@ -253,6 +253,8 @@
 					showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
 					showSearch: 0,
 					title: '修改资料', // 导航栏 中间的标题
+					haveBack:true,
+					textLeft:this.$store.state.isIphoneX
 				},
 				CustomBar:this.CustomBar,// 顶部导航栏高度
 				isPreviewImage:false,   	//预览图片开关

pages/login/register.vue

@@ -275,6 +275,8 @@
 					showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
 					showSearch: 0,
 					title: '注册', // 导航栏 中间的标题
+					haveBack:true,
+					textLeft:this.$store.state.isIphoneX
 				},
 				CustomBar:this.CustomBar,// 顶部导航栏高度
 				tabCurrentIndex:1,			//显示step

pages/login/registers.vue

@@ -312,6 +312,8 @@
 					showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
 					showSearch: 0,
 					title: '注册', // 导航栏 中间的标题
+					haveBack:true,
+					textLeft:this.$store.state.isIphoneX
 				},
 				CustomBar:this.CustomBar,// 顶部导航栏高度
 				tabCurrentIndex:1,			//显示step

pages/user/order/create-order.vue

@@ -270,14 +270,8 @@
 						let data = {orderID:response.data.orderID}
 						this.$api.navigateTo(`/pages/user/order/success?data=${JSON.stringify({data:data})}`)
 					}else if(response.code === 2){
-						this.submitState ='nosuccess'
-						let data = {
-								orderID:response.data.orderID,
-								orderNo:response.data.orderNo,
-								orderMark:response.data.orderMark,
-								payableAmount:response.data.payableAmount
-							}
-						this.$api.redirectTo(`/pages/user/order/order-payment?type=${this.submitState}&data=${JSON.stringify({data:data})}`)
+						this.submitState ='confirm'
+						this.$api.redirectTo(`/pages/user/order/order-payment?type=${this.submitState}&orderID=${response.data.orderID}`)
 					}else{
 						this.$util.msg(response.msg,2000);
 					}

pages/user/order/order-details.vue

@@ -144,6 +144,9 @@
 					case 'confirm':
 						this.handOrderConfirm()
 						break
+					case 'pay':
+						this.$api.navigateTo(`/pages/user/order/order-payment?type=payfirm&orderID=${this.orderID}`)
+						break
 					case 'confirmation':
 						this.handOrderConfirmation()
 						break

pages/user/order/order-list.vue

@@ -304,7 +304,7 @@
 						this.handOrderConfirm(data.orderId);
 						break
 					case 'pay':
-						this.$api.navigateTo('/pages/user/order/order-pay?orderID='+data.orderId)
+						this.$api.navigateTo(`/pages/user/order/order-payment?type=payfirm&orderID=${data.orderId}`)
 						break
 					case 'confirmation':
 						this.handOrderConfirmation(data.orderId);

pages/user/order/order-pay.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="container cashier">
+	<view class="container cashier"  @touchmove.stop.prevent="discard" @tap="hideKeyboard">
 		<cu-custom :navbar-data='nvabarData' @navigateBack="hanldNavigateBack"></cu-custom>
 		<view class="container-cash clearfix" :style="{marginTop:CustomBar+'px'}">
 			<view class="container-wrapper">
@@ -18,18 +18,17 @@
 						<view class="bot-title"><text>本次支付金额</text></view>
 						<view class="bot-input">
 							<text>￥</text>
-							<view class="input" @click.stop="focusInput">
+ 					<!-- 	<view class="input" @click.stop="focusInput">
 								<text class="text" v-if="payAmount>=0">{{payAmount}}</text>
 								<text class="none" v-else>输入金额不能大于待付金额</text>
-							</view>
-			<!-- 				<input class="" 
-								   type="button" 
-								   value="" 
-								   @focus="focusInput"  
-								   @input="inputMoney" 
-								   @blur="blurInput" 
-								   v-model="" 
-								   placeholder="" maxlength="10"/> -->
+							</view> -->
+							<input  class="input"
+									type="digit"
+									v-model="payAmount" 
+									@focus="focusInput" 
+									@blur="blurInput" 
+									placeholder="输入金额不能大于待付金额"
+									placeholder-class="placeholder"/>
 						</view>
 						<view class="bot-resid">
 							<text>订单剩余￥{{balanceAmount.toFixed(2)}}</text>
@@ -51,7 +50,7 @@
 				</view>
 			</view>
 			<view class="pay-button">
-				<view class="btn" @click.stop="MiniWxPayFor">{{buttonText}}</view>
+				<view class="btn" @click.stop="buttonSubMit" :style="{'background':btnColor}">{{buttonText}}</view>
 			</view>
 		</view>
 		<view class="alert spec" :class="specClass" v-if="isShowTip">
@@ -59,48 +58,50 @@
 			<view class="freight-alert"  @tap="hideTips">
 				<view class="content">
 					<view class="title">
-						<text>提示</text>
+						<text>生成链接</text>
 						<text class="iconfont icon-iconfontguanbi" @click.stop="hideTips"></text>
 					</view>
 					<view class="text-content">
-						<view class="text">除了以下两种支付方式，您还可以通过线下直接转账的方式付款。获取转账信息请联系您的采美销售人员或直接拨打客服热线。</view>
-						<view class="text-p">客服热线：</view>
-						<view class="text-p">0755-22907771 / 15338851365</view>
-						<view class="text-p">（周一至周五 09:00-18:00）</view>
+						<view class="text">请复制以下链接，并发送至电脑端，在浏览器访问该链接并选择银行尽快完成支付</view>
+						<view class="text-p">{{payHttpUrl}}</view>
+						<view class="text-b">链接有效期为24小时</view>
 					</view>
+					<view class="text-button" @click.stop="clipboard(payHttpUrl)">复制链接</view>
 				</view>
 			</view>
 		</view>
 		<!-- 数字键盘 -->
-		<keyboard v-if="showDigitKeyboard"  
+<!-- 	<keyboard v-if="showDigitKeyboard"  
 				  @confirmEvent="confirmEvent" 
 				  :money.sync="payAmount" 
 				  btn-color='linear-gradient(135deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%)' 
 				  title="完成">
-		</keyboard>
+		</keyboard> -->
 	</view>
 </template>
 
 <script>
 	import authorize from '@/common/config/authorize.js'
-	import keyboard from "@/components/keyboard/keyboard.vue"
-	import { PayOrderCheckoutCounter,WeChatMiniWxPay } from "@/api/order.js"
+	// import keyboard from "@/components/keyboard/keyboard.vue"
+	import thorui from "@/components/clipboard/clipboard.thorui.js"
+	import { PayOrderCheckoutCounter,WeChatMiniWxPay,PayOrderPayLink } from "@/api/order.js"
 	export default{
 		components: {
-			keyboard
+			// keyboard
 		},
 		data(){
 			return{
 				orderID:'',
-				payableAmount:2222,
+				payType:'',
+				payableAmount:0,
 				receiptAmount:0,
 				balanceAmount:0,
 				payAmount:0,
 				nvabarData: {		//顶部自定义导航
-					haveBack:true,
 					showCapsule:1, // 是否显示左上角图标  1表示显示  0表示不显示,
 					showSearch: 0,
 					title: '收银台',  // 导航栏 中间的标题
+					haveBack:true,
 					textLeft:this.$store.state.isIphoneX
 				},
 				idCardList:[],
@@ -109,25 +110,33 @@
 				tabCurrentIndex:0,
 				isShowTip:false,
 				buttonText:'去支付',
+				btnColor:'#09BB07',
 				discernReceipt:[],
-				showDigitKeyboard:false
+				showDigitKeyboard:false,
+				payHttpUrl:''
 			}
 		},
 		onLoad(option) {
-			// this.initData(option)
-		},
-		computed:{
-			passStr(){
-				let str='';
-				this.idCardList.forEach(item=>{
-					str+=item.toString();
-				})
-				return str;
-			}
+			this.initData(option)
 		},
 		methods:{
 			initData(e){
+				this.payType = e.type
+				console.log(this.payType)
 				this.orderID = e.orderID
+				switch(this.payType){
+					case '0':
+						this.btnColor="#09BB07"
+						this.buttonText = '去支付'
+						break;
+					case '1':
+						this.btnColor="#034582"
+						this.buttonText = '生成支付链接'
+						break;
+				}
+				this.GetPayOrderInfo()
+			},
+			GetPayOrderInfo(){
 				PayOrderCheckoutCounter({orderId:this.orderID}).then(response =>{
 					console.log(response)
 					this.discernReceipt = response.data.discernReceipt 		//支付记录
@@ -139,6 +148,22 @@
 					this.$util.msg(error.msg,2000)
 				})
 			},
+			buttonSubMit(){
+				switch(this.payType){
+					case '0':
+						this.MiniWxPayFor()
+						break;
+					case '1':
+						this.isShowTip = true
+						this.BuildCatenate()
+						break;
+				}
+			},
+			BuildCatenate(){
+				PayOrderPayLink({unpaidAmount:this.payAmount,orderId:this.orderID}).then(response =>{
+					this.payHttpUrl = response.data
+				})
+			},
 			MiniWxPayFor(){
 				let self = this
 				authorize.getCode('weixin').then(wechatcode =>{
@@ -179,37 +204,38 @@
 					})
 				})
 			},
-			focusInput(){
-				this.showDigitKeyboard = true
-			},
-			confirmEvent(value){
-				//点击键盘完成的回调函数
+			confirmEvent(value){//点击自定义键盘完成的回调函数
 				console.log(value)
 				this.chechValue(value)
 				this.showDigitKeyboard = false
 			},
+			blurInput(e){
+				this.chechValue(e.detail.value)
+			},
+			focusInput(){
+				// this.showDigitKeyboard = true
+			},
+			hideKeyboard(){
+				this.showDigitKeyboard = false
+			},
 			chechValue(value){
-				console.log(parseInt(value))
 				if(value == 0){
-					console.log('1111',value)
-					this.payAmount = 0
-					this.balanceAmount = this.payableAmount
+					this.payAmount = this.payableAmount.toFixed(2)
+					this.balanceAmount = this.payableAmount-this.payAmount
 				}else if(parseInt(value)>this.payableAmount){
-					console.log('2222',value)
-					this.payAmount = this.payableAmount
+					this.payAmount = this.payableAmount.toFixed(2)
 					this.balanceAmount = this.payableAmount - this.payAmount
 				}else{
-					console.log('33333',value)
-					this.payAmount = value
+					this.payAmount =Number(value).toFixed(2)
 					this.balanceAmount = this.payableAmount - this.payAmount
 				}
 			},
-			hanldNavigateBack(){
+			hanldNavigateBack(){//页面返回
 				uni.navigateBack({
 					delta: 1
 				});
 			},
-			payTypeText (state){
+			payTypeText (state){//处理支付记录文字
 				let stateText = '',
 					stateTextObject={
 						12:'PC-B2B网银',
@@ -225,6 +251,23 @@
 				})
 				return stateText;
 			},
+			hideTips(){//隐藏弹窗
+				this.isShowTip = false
+			},
+			clipboard(data) {//复制链接
+				thorui.getClipboardData(data, (res) => {
+					// #ifdef H5
+					if (res) {
+						this.$util.msg("复制成功",2000);
+					} else {
+						this.$util.msg("复制失败",2000);
+					}
+					// #endif
+				})
+			},
+			discard(){
+				//丢弃
+			}
 		},
 		onShow() {
 			
@@ -293,7 +336,7 @@
 							float: left;
 						}
 						.input{
-							font-size: $font-size-28;
+							font-size: $font-size-40;
 							width: 500rpx;
 							height: 66rpx;
 							padding: 0 10rpx;
@@ -307,6 +350,9 @@
 								color:$text-color;
 							}
 						}
+						.placeholder{
+							font-size: $font-size-26;
+						}
 					}
 					.bot-resid{
 						line-height: 36rpx;
@@ -373,7 +419,7 @@
 		.pay-button{
 			width: 100%;
 			position: fixed;
-			bottom: 40rpx;
+			bottom: 80rpx;
 			.btn{
 				width: 702rpx;
 				height: 88rpx;
@@ -438,18 +484,42 @@
 				width: 100%;
 				height: auto;
 				.text{
-					padding: 20rpx 0;
+					padding: 20rpx 0 0 0;
 					line-height: 44rpx;
 					font-size: $font-size-26;
 					color:#666666;
 					text-align: justify;
 				}
 				.text-p{
+					width: 100%;
 					line-height: 44rpx;
 					font-size: $font-size-26;
 					color:$color-system;
 					text-align: left;
+					text-overflow:ellipsis;
+					display: -webkit-box;
+					word-break: break-all;
+					-webkit-box-orient: vertical;
+					-webkit-line-clamp: 1;
+					overflow: hidden;
 				}
+				.text-b{
+					line-height: 44rpx;
+					font-size: $font-size-24;
+					color:#999999;
+					text-align: left;
+				}
+			}
+			.text-button{
+				width: 100%;
+				height: 88rpx;
+				line-height: 88rpx;
+				background: $btn-confirm;
+				font-size: $font-size-28;
+				border-radius: 14rpx;
+				color:#FFFFFF;
+				text-align: center;
+				margin-top: 20rpx;
 			}
 		}
 	}

pages/user/order/order-payment.vue

@@ -1,16 +1,16 @@
 <template>
 	<view class="container cashier">
-		<cu-custom :navbar-data='nvabarData'></cu-custom>
+		<cu-custom :navbar-data='nvabarData' @navigateBack="hanldNavigateBack"></cu-custom>
 		<view class="container-cash clearfix" :style="{marginTop:CustomBar+'px'}">
 			<view class="container-wrapper">
-				<view class="pay-title">
+				<view class="pay-title" v-show="isConfirm">
 					<text>订单提交成功，请支付订单</text>
 				</view>
 				<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}}</text>
+						<text class="pay-bg">{{payableAmount.toFixed(2)}}</text>
 					</view>
 				</view>
 				<view class="pay-check">
@@ -44,7 +44,7 @@
 				</view>
 			</view>
 			<view class="pay-button">
-				<view class="btn" @click.stop="goOrderCash">{{buttonText}}</view>
+				<view class="btn" @click.stop="goOrderCash" :style="{'background':btnColor}">{{buttonText}}</view>
 			</view>
 		</view>
 		<view class="alert spec" :class="specClass" v-if="isShowTip">
@@ -68,25 +68,27 @@
 </template>
 
 <script>
+	import { PayOrderCheckoutCounter } from "@/api/order.js"
 	export default{
 		data(){
 			return{
 				orderID:'',
-				stateType:'',
 				payableAmount:0,
 				emptyWrapperH: '',
 				nvabarData: {		//顶部自定义导航
-					haveBack:false,
 					showCapsule:1, // 是否显示左上角图标  1表示显示  0表示不显示,
 					showSearch: 0,
 					title: '选择支付方式',  // 导航栏 中间的标题
+					haveBack:false,
 					textLeft:true
 				},
 				isIphoneX:this.$store.state.isIphoneX,
 				CustomBar:this.CustomBar,// 顶部导航栏高度
 				tabCurrentIndex:0,
 				isShowTip:false,
+				isConfirm:false,
 				buttonText:'使用微信支付',
+				btnColor:'#09BB07'
 			}
 		},
 		onLoad(option) {
@@ -94,10 +96,24 @@
 		},
 		methods:{
 			initData(e){
-				let data = JSON.parse(e.data);
-				console.log(data)
-				this.orderID = parseInt(data.data.orderID) 
-				this.payableAmount = data.data.payableAmount
+				console.log(this.orderID)
+				switch(e.type){
+					case 'confirm':
+						this.isConfirm = true
+						this.nvabarData.haveBack = false
+						break;
+					case 'payfirm':
+						this.isConfirm = false
+						this.nvabarData.haveBack = true
+						break;
+				}
+				this.orderID = e.orderID
+				PayOrderCheckoutCounter({orderId:this.orderID}).then(response =>{
+					console.log(response)
+					this.payableAmount = response.data.order.payableAmount - response.data.order.receiptAmount  //待付金额
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000)
+				})
 			},
 			goOrderCash(){
 				switch(this.tabCurrentIndex){
@@ -113,13 +129,20 @@
 				this.tabCurrentIndex = index;
 				switch(index){
 					case 0:
+						this.btnColor="#09BB07"
 						this.buttonText='使用微信支付';
 						break;
 					case 1:
+						this.btnColor="#034582"
 						this.buttonText='使用网银支付';
 						break;
 				}
 			},
+			hanldNavigateBack(){//页面返回
+				uni.navigateBack({
+					delta: 1
+				});
+			},
 			showTips(){
 				this.isShowTip=true
 			},
@@ -158,6 +181,7 @@
 				background: url(https://admin-b.caimei365.com/userfiles/1/images/photo/2020/05/%E4%BB%A3%E4%BB%98%E9%87%91%E9%A2%9Dbg%402x.png) no-repeat;
 				background-size: cover;
 				float: left;
+				margin-top: 54rpx;
 				margin-bottom: 40rpx;
 				.pay-p{
 					font-size: $font-size-26;
@@ -274,7 +298,7 @@
 		.pay-button{
 			width: 100%;
 			float: left;
-			margin-top: 100rpx;
+			margin-top: 200rpx;
 			.btn{
 				width: 662rpx;
 				height: 88rpx;

seller/pages/login/apply.vue

@@ -281,6 +281,8 @@ import { mapMutations } from 'vuex';
 					showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
 					showSearch: 0,
 					title: '修改资料', // 导航栏 中间的标题
+					haveBack:true,
+					textLeft:this.$store.state.isIphoneX
 				},
 				CustomBar:this.CustomBar,// 顶部导航栏高度
 				errorList:[],

seller/pages/login/information.vue

@@ -261,6 +261,8 @@
 					showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
 					showSearch: 0,
 					title: '修改资料', // 导航栏 中间的标题
+					haveBack:true,
+					textLeft:this.$store.state.isIphoneX
 				},
 				CustomBar:this.CustomBar,// 顶部导航栏高度
 				isPreviewImage:false,   //预览图片开关

seller/pages/login/login.vue

@@ -38,7 +38,8 @@
 					showCapsule: 0, // 是否显示左上角图标  1表示显示  0表示不显示,
 					showSearch: 0,
 					title: '登录',  // 导航栏 中间的标题
-					textLeft:true
+					haveBack:true,
+					textLeft:this.$store.state.isIphoneX
 				},
 				isIphoneX:this.$store.state.isIphoneX,
 				CustomBar:this.CustomBar,// 顶部导航栏高度

seller/pages/login/register.vue

@@ -250,6 +250,8 @@
 					showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
 					showSearch: 0,
 					title: '拉机构上线', // 导航栏 中间的标题
+					haveBack:true,
+					textLeft:this.$store.state.isIphoneX
 				},
 				CustomBar:this.CustomBar,// 顶部导航栏高度
 				userID:'',//协销ID