优化支付

components/cm-custom/cu-custom.vue

@@ -2,7 +2,7 @@
 	<!-- 自定义导航栏 -->
 	<view class='navbar-wrap' :style="{height:CustomBar+'px',paddingTop:StatusBar+'px',background:navbarData.bgColor ? navbarData.bgColor : '#FFFFFF'}"> 
 	  	<view class="navbar-text" 
-			  :style="{color:navbarData.textColor ? navbarData.textColor:'',lineHeight:(CustomBar - StatusBar)+'px;',fontSize:fontSizeSetting+'px;',paddingLeft:navbarData.textLeft ? '' : capsule.height+'px'}" :class="platformClass">
+			  :style="{color:navbarData.textColor ? navbarData.textColor:'',lineHeight:(CustomBar - StatusBar)+'px;',fontSize:fontSizeSetting+'px;',paddingLeft:navbarData.textLeft ? '' : (capsule.height+5)+'px'}" :class="platformClass">
 	    	  {{navbarData.title ? navbarData.title : " "}}
 	  	</view>
 	  	<view class="navbar-icon" v-if="navbarData.showCapsule == 1 ? true : false" 

components/cm-module/modelAlert/supplierShareAlert.vue

@@ -52,13 +52,11 @@
 			},
 			clipboard(data) {
 				thorui.getClipboardData(data, (res) => {
-					// #ifdef H5
 					if (res) {
-						this.$util.msg("复制成功",2000);
+						this.$util.msg("复制成功",2000,true,'success');
 					} else {
-						this.$util.msg("复制失败",2000);
+						this.$util.msg("复制失败",2000,true,'none');
 					}
-					// #endif
 				})
 			},
 			hideConfirm(){

components/cm-module/orderDetails/logisticsRecord.vue

@@ -60,13 +60,11 @@
 			},
 			clipboard(data) {
 				thorui.getClipboardData(data, (res) => {
-					// #ifdef H5
 					if (res) {
-						this.$util.msg("复制成功",2000);
+						this.$util.msg("复制成功",2000,true,'success');
 					} else {
-						this.$util.msg("复制失败",2000);
+						this.$util.msg("复制失败",2000,true,'none');
 					}
-					// #endif
 				})
 			}
 		}

components/cm-module/orderDetails/orderInformation.vue

@@ -117,13 +117,11 @@
 			},
 			clipboard(data) {
 				thorui.getClipboardData(data, (res) => {
-					// #ifdef H5
 					if (res) {
-						this.$util.msg("复制成功",2000);
+						this.$util.msg("复制成功",2000,true,'success');
 					} else {
-						this.$util.msg("复制失败",2000);
+						this.$util.msg("复制失败",2000,true,'none');
 					}
-					// #endif
 				})
 			},
 			toFiexdFn(n){

components/cm-module/orderDetails/paymentRecord.vue

@@ -9,12 +9,13 @@
 				</view>
 			</view>
 			<view class="record-empty" v-if="isEmpty">
-			 	<text>无</text>
+			 	<text>暂无支付记录</text>
 			</view>
 			<view class="record-list" v-else>
 				<view class="record-item" v-for="(item,index) in discernReceiptList" :key="index">
-					<view class="item-time">{{item.receiptDate}}</view>
-					<view class="item-nums">￥{{item.associateAmount.toFixed(2)}}</view>
+					<view class="item-time mm">￥{{item.associateAmount.toFixed(2)}}</view>
+					<view class="item-time pp">{{payTypeText(item.payType)}}</view>
+					<view class="item-time tt">{{item.receiptDate}}</view>
 				</view>
 			</view>
 		</view>
@@ -55,6 +56,22 @@
 					this.isEmpty = true
 				}
 			},
+			payTypeText (state){//处理支付记录文字
+				let stateText = '',
+					stateTextObject={
+						12:'企业网银',
+						13:'微信支付',
+						14:'支付宝',
+						15:'微信支付',
+						16:'余额抵扣',
+					}
+				Object.keys(stateTextObject).forEach(key => {
+					if(key == state){
+						stateText = stateTextObject[key]
+					}
+				})
+				return stateText;
+			},
 		}
 	}
 </script>
@@ -108,14 +125,22 @@
 					font-size: $font-size-28;
 					line-height: 40rpx;
 					float: left;
+					display: flex;
+					justify-content: center;
+					flex-direction: row;
 					.item-time{
-						float: left;
-						color: #999999;
-					}
-					.item-nums{
-						font-weight: bold;
-						float: right;
-						color: $text-color;
+						&.mm{
+							flex: 3;
+							color: $text-color;
+						}
+						&.pp{
+							flex: 3;
+							color: $text-color;
+						}
+						&.tt{
+							flex: 4;
+							color: #999999;
+						}
 					}
 				}
 			}

components/cm-module/orderDetails/transfeRecord.vue

@@ -1,7 +1,7 @@
 <template name="transfe">
 	<view class="transfe-template">
 		 <!-- 转账信息 -->
-		 <view class="transfe-content">
+		 <view class="transfe-content" >
 			<view class="transfe-top" @click="showTransfe">
 				<text class="name">转账信息</text>
 				<text class="iconfont icon-web_xiangxiazhankai" :class="{'icon-web_xiangxiazhankai-active':isOpen}"></text>

pages/user/order/order-cashier.vue

@@ -135,13 +135,11 @@
 			},
 			clipboard(data) {
 				thorui.getClipboardData(data, (res) => {
-					// #ifdef H5
 					if (res) {
-						this.$util.msg("复制成功",2000);
+						this.$util.msg("复制成功",2000,true,'success');
 					} else {
-						this.$util.msg("复制失败",2000);
+						this.$util.msg("复制失败",2000,true,'none');
 					}
-					// #endif
 				})
 			},
 			onShareCode(){

pages/user/order/order-details.vue

@@ -12,7 +12,7 @@
 			<!-- 发票信息 -->
 			<invoice-tent ref="invoice" v-if="isRequest" :orderInvoice="orderInvoice"></invoice-tent>
 			<!-- 转账信息 -->
-			<transfe-record ref="transfe" v-if="isRequest"></transfe-record>
+			<transfe-record ref="transfe" v-if="onlinePayFlag != 0"></transfe-record>
 			<!-- 支付记录 -->
 			<payment-record ref="payment" v-if="isRequest" :discernReceiptList="discernReceiptList" :receiptAmount="receiptAmount"></payment-record>
 			<!-- 退款记录 -->

pages/user/order/order-logistics.vue

@@ -87,13 +87,11 @@
 			},
 			clipboard(data) {
 				thorui.getClipboardData(data, (res) => {
-					// #ifdef H5
 					if (res) {
-						this.$util.msg("复制成功",2000);
+						this.$util.msg("复制成功",2000,true,'success');
 					} else {
-						this.$util.msg("复制失败",2000);
+						this.$util.msg("复制失败",2000,true,'none');
 					}
-					// #endif
 				})
 			},
 			getData() {

pages/user/order/order-pay.vue

@@ -46,7 +46,7 @@
 					<view class="record-list">
 						<view class="list-main" v-if="discernReceipt.length>0">
 							<view class="list-item" v-for="(item,index) in discernReceipt" :key="index">
-								<text class="text row-1">￥{{item.receiptAmount}}</text>
+								<text class="text row-1">￥{{toFixedFn(item.receiptAmount)}}</text>
 								<text class="text row-2">{{payTypeText(item.payType)}}</text>
 								<text class="text row-3">{{item.receiptDate}}</text>
 							</view>
@@ -64,7 +64,7 @@
 			<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">
@@ -233,9 +233,13 @@
 				this.showDigitKeyboard = false
 			},
 			chechValue(value){
-				if(value == 0){
-					this.payAmount = this.payableAmount.toFixed(2)
-					this.balanceAmount = this.payableAmount-this.payAmount
+				let patern = /\d+\.\d+/g;
+				if(value && value.split('.').length > 2) {
+					value= patern.exec(value);
+				}
+				if(value == "" || value <0 ){
+					this.payAmount = '';
+					this.balanceAmount = this.payableAmount;
 				}else if(parseInt(value)>this.payableAmount){
 					this.payAmount = this.payableAmount.toFixed(2)
 					this.balanceAmount = this.payableAmount - this.payAmount
@@ -252,9 +256,9 @@
 			payTypeText (state){//处理支付记录文字
 				let stateText = '',
 					stateTextObject={
-						12:'网银支付',
+						12:'企业网银',
 						13:'微信支付',
-						14:'支付宝支付',
+						14:'支付宝',
 						15:'微信支付',
 						16:'余额抵扣',
 					}
@@ -268,15 +272,17 @@
 			hideTips(){//隐藏弹窗
 				this.isShowTip = false
 			},
+			toFixedFn(text){//处理小数点后两位数
+				return Number(text).toFixed(2);
+			},
 			clipboard(data) {//复制链接
 				thorui.getClipboardData(data, (res) => {
-					// #ifdef H5
 					if (res) {
-						this.$util.msg("复制成功",2000);
+						this.isShowTip = false;
+						this.$util.msg("复制成功",2000,true,'success');
 					} else {
-						this.$util.msg("复制失败",2000);
+						this.$util.msg("复制失败",2000,true,'none');
 					}
-					// #endif
 				})
 			},
 			discard(){
@@ -300,7 +306,7 @@
 				width: 662rpx;
 				height: 420rpx;
 				padding: 64rpx 44rpx 0 44rpx;
-				background: url(https://admin-b.caimei365.com/userfiles/1/images/photo/2020/07/icon-kdnakdj.png) no-repeat;
+				background: url(https://img.caimei365.com/group1/M00/03/BD/Cmis218elN6AY6VeAAqw4n3n4nw186.png) no-repeat;
 				background-size: cover;
 				float: left;
 				position: relative;
@@ -461,6 +467,7 @@
 								&.row-3{
 									flex: 4;
 									text-align: right;
+									color: #999999;
 								}
 							}
 						}

pages/user/order/order-payment.vue

@@ -87,6 +87,7 @@
 					showSearch: 0,
 					title: '选择支付方式',  // 导航栏 中间的标题
 					haveBack:false,
+					haveHome:true,
 					textLeft:this.$store.state.isIphone
 				},
 				isIphoneX:this.$store.state.isIphoneX,
@@ -111,10 +112,12 @@
 					case 'confirm':
 						this.isConfirm = true
 						this.nvabarData.haveBack = false
+						this.nvabarData.haveHome = true
 						break;
 					case 'payfirm':
 						this.isConfirm = false
 						this.nvabarData.haveBack = true
+						this.nvabarData.haveHome = false
 						break;
 				}
 				this.orderID = e.orderID
@@ -166,13 +169,11 @@
 			},
 			clipboard(data) {
 				thorui.getClipboardData(data, (res) => {
-					// #ifdef H5
 					if (res) {
-						this.$util.msg("复制成功",2000);
+						this.$util.msg("复制成功",2000,true,'success');
 					} else {
-						this.$util.msg("复制失败",2000);
+						this.$util.msg("复制失败",2000,true,'none');
 					}
-					// #endif
 				})
 			},
 		},
@@ -205,7 +206,7 @@
 				width: 574rpx;
 				height: 136rpx;
 				padding: 52rpx 44rpx;
-				background: url(https://admin-b.caimei365.com/userfiles/1/images/photo/2020/07/icon-monen.png) no-repeat;
+				background: url(https://img.caimei365.com/group1/M00/03/BD/Cmis218ekFyAHoAzAALhR3oBpDI049.png) no-repeat;
 				background-size: cover;
 				float: left;
 				margin-top: 40rpx;
@@ -399,7 +400,7 @@
 				padding: 0 24rpx;
 				.text{
 					font-size: $font-size-24;
-					color: #999;
+					color: #666;
 					line-height: 44rpx;
 					text-align: center;
 					&.bg-color{