commit -m 增加非订单款类别

pages/relation/nonorder/add.vue

@@ -121,7 +121,10 @@
 					/>
 				</view>
 			</view>
-			<view class="distinguish-button"> <view class="button" @click="confirmDistinguish">确定</view> </view>
+			<view class="distinguish-button"> 
+				<view class="button cancel" @click.stop="this.$api.navigateBack(1)">取消</view>
+				<view class="button confirm" @click="confirmDistinguish">确定</view>
+			 </view>
 		</view>
 		<!-- 时间组件 -->
 		<tui-datetime
@@ -574,17 +577,24 @@ page {
 	margin-top: 100rpx;
 	box-sizing: border-box;
 	padding: 0 50rpx;
-
+	display: flex;
 	.button {
-		width: 100%;
+		flex: 1;
 		height: 80rpx;
-		background: $btn-confirm;
+		margin: 0 20rpx;
 		border-radius: 40rpx;
 		text-align: center;
 		color: #ffffff;
 		line-height: 80rpx;
 		font-size: $font-size-28;
 		box-shadow: 0 10rpx 14rpx 0 rgba(86, 119, 252, 0.2);
+		&.confirm{
+			background: $btn-confirm;
+		}
+		&.cancel{
+			background: $btn-cancel;
+			color: #999999;
+		}
 	}
 }
 

services/config.env.js

@@ -3,8 +3,8 @@ if(process.env.NODE_ENV === 'development'){
     // 开发环境
     // URL_CONFIG = 'http://192.168.2.67:18014'	 //智捷联调地址
     // URL_CONFIG = 'http://192.168.2.68:18014'	 //涛涛联调地址
-    URL_CONFIG = 'http://192.168.2.75:18014'	 //超超联调地址
-    // URL_CONFIG = 'https://core-b.caimei365.com'
+    // URL_CONFIG = 'http://192.168.2.75:18014'	 //超超联调地址
+    URL_CONFIG = 'https://core-b.caimei365.com'
     // URL_CONFIG = 'https://core.caimei365.com'
 }else{
     // 生产环境

uni.scss

@@ -16,7 +16,7 @@ $color-system:#4688fa;
 $border-color:#EBEBEB;
 $text-color:#333333;
 $btn-confirm:#4688fa;
-$btn-cancel:#EEC1AB;
+$btn-cancel:#eff0f2;
 $bg-color:#ffffff;
 $sub-bg-color: #F7F7F7;
 $green-color: #07c160;