Przeglądaj źródła

commit -m 修改配置

zhengjinyi 4 lat temu
rodzic
commit
75ba124b9c

Plik diff jest za duży
+ 0 - 2
common/css/iconfont.scss


+ 4 - 4
pages/user/order/order-list.vue

@@ -347,11 +347,11 @@
 						this.$api.navigateTo('/pages/user/order/order-logistics?orderId='+data.orderId)
 						break;
 					case 'pay':
-						if(data.order.onlinePayFlag == '0'){
+						// if(data.order.onlinePayFlag == '0'){
 							this.$api.navigateTo(`/pages/user/order/order-payment?type=payfirm&orderId=${data.orderId}`)
-						}else{
-							this.$api.navigateTo(`/pages/user/order/order-payment?type=onlinePay&Amount=${data.order.pendingPayments}&orderId=${data.orderId}`)
-						}
+						// }else{
+							// this.$api.navigateTo(`/pages/user/order/order-payment?type=onlinePay&Amount=${data.order.pendingPayments}&orderId=${data.orderId}`)
+						// }
 						break;
 				}
 			},

+ 52 - 19
pages/user/order/order-payment.vue

@@ -29,7 +29,10 @@
 		</template>
 		<template v-else>
 			<view class="container-cash clearfix" v-if="invoiceStatus">
-				<view class="pay-bring-title">{{payBringTitle}}</view>
+				<view class="pay-bring-title">
+					<text class="iconfont icon-tongzhi"></text>
+					{{payBringTitle}}
+				</view>
 				<view class="container-wrapper">
 					<view class="pay-content">
 						<view class="pay-p"><text>待付金额</text></view>
@@ -42,14 +45,14 @@
 				</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"><text class="line"></text>转账信息</view>
+						<view class="text-v">开户行:<text class="span">中信银行(深圳泰然支行)</text></view>
+						<view class="text-v">银行卡号:<text class="span">{{ bankNumber }}</text> </view>
+						<view class="text-v">户名: <text class="span">周仁声</text></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 class="text-v bg-color">请在转账备注中填写上述订单标识,方便财务快速审核,提高发货速度</view> -->
+				</view>
 				</view>
 			</view>		
 			<view class="container-cash clearfix" v-else>
@@ -262,11 +265,11 @@
 					this.onlinePayFlag = data.onlinePayFlag		
 					this.initAbleUserMoney(this.payableAmount)
 					//判断线上线下显示
-					if(this.optionType == 'onlinePay'){
-						this.invoiceStatus = true
-					}else{
-						this.invoiceStatus = data.invoiceStatus
-					}
+					// if(this.optionType == 'onlinePay'){
+					// 	this.invoiceStatus = true
+					// }else{
+					this.invoiceStatus = true
+					// }
 					if(data.receiptAmount > 0){
 						this.payStatusText = '使用微信和网银支付全部金额后,供应商会在24小时后发货(周末、节假日顺延)。'
 						this.isReceiptStatus = false
@@ -432,13 +435,26 @@
 		.pay-bring-title{
 			box-sizing: border-box;
 			width: 100%;
-			min-height: 96rpx;
-			padding: 20rpx 24rpx;
-			line-height: 48rpx;
+			min-height: 90rpx;
+			padding: 0 24rpx;
+			line-height: 90rpx;
 			text-align: left;
 			font-size: $font-size-24;
-			background:rgba(255,234,221,1);
-			color: $color-system;
+			background:#fff3e2;
+			color: #ff9723;
+			padding-left: 84rpx;
+			position: relative;
+			.icon-tongzhi{
+				width: 60rpx;
+				line-height: 90rpx;
+				text-align: center;
+				display: block;
+				position: absolute;
+				left: 24rpx;
+				top: 0;
+				color: #ff9723;
+				font-size: 36rpx;
+			}
 		}
 		.container-wrapper{
 			width:100%;
@@ -449,9 +465,9 @@
 				background: url(https://static-b.caimei365.com/app/wisa/img/icon/pay_bg.png) no-repeat;
 				background-size: cover;
 				float: left;
-				margin-top: 15rpx;
 				box-sizing: border-box;
 				padding: 40rpx 84rpx;
+				border-bottom: 10px solid #F7F7F7;
 				.pay-p{
 					font-size: $font-size-26;
 					color: #fff3e2;
@@ -648,6 +664,7 @@
 					line-height: 70rpx;
 					text-align: left;
 					&.title{
+						padding-left: 10rpx;
 						font-size: $font-size-26;
 						color: #666666;
 					}
@@ -696,9 +713,25 @@
 					color: #999;
 					line-height: 70rpx;
 					text-align: left;
+					.span{
+						color: #333333;
+					}
 					&.title{
 						font-size: $font-size-28;
 						color: #666666;
+						position: relative;
+						padding-left: 20rpx;
+						font-weight: bold;
+						.line{
+							display: block;
+							width: 6rpx;
+							height: 22rpx;
+							background-color: #c4761f;
+							border-radius: 3rpx;
+							position: absolute;
+							left: 0;
+							top: 26rpx;
+						}
 					}
 					&.bg-color{
 						line-height: 44rpx;

+ 3 - 4
services/config.env.js

@@ -4,11 +4,10 @@ if(process.env.NODE_ENV === 'development'){
 	// URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
 	URL_CONFIG = 'http://192.168.2.67:8010'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
-    // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
-	// URL_CONFIG = 'https://spi.caimei365.com'
+    URL_CONFIG = 'https://mall2b-b.caimei365.com'	 //采美测试地址
+	// URL_CONFIG = 'https://mall2b.caimei365.com'
 }else{
     // 生产环境
-	// URL_CONFIG = 'https://spi-b.caimei365.com'
-    URL_CONFIG = 'https://spi.caimei365.com'
+    URL_CONFIG = 'https://mall2b.caimei365.com'
 }
 export default URL_CONFIG

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików