局部颜色样式修改及优化，图片替换

common/common.scss

@@ -94,12 +94,12 @@ button::after{
 		width: 702rpx;
 		height: 88rpx;
 		font-size: $font-size-base;
+		border-radius: 14rpx;
 		line-height: 88rpx;
 		color: #FFFFFF;
 		margin: 0 auto;
 		text-align: center;
 		background: $btn-confirm;
-		border-radius: 0;
 		margin-top: 40rpx;
 	}
 }
@@ -265,7 +265,7 @@ button::after{
 	color: #FFFFFF;
 	text-align: center;
 	background: $btn-confirm;
-	border-radius: 0;
+	border-radius: 14rpx;
 }
 // 小红点
 .uni-badge--small {

components/module/creatOrder/choiceAddress.vue

@@ -98,7 +98,7 @@
 			width: 100%;
 			height: 84rpx;
 			line-height: 84rpx;
-			color: #AA8420;
+			color: #E15616;
 			text-align: center;
 			font-size: $font-size-sb;
 			font-weight: bold;
@@ -122,7 +122,7 @@
 			align-items: center;
 			justify-content: center;
 			width: 40rpx;
-			color: #AA8420;
+			color: #E15616;
 			font-size: 46rpx;
 			margin-right: 10rpx;
 		}	
@@ -179,7 +179,7 @@
 			.nexpage{
 				text-align: right;
 				font-size: $font-size-se;
-				color: #AA8420;
+				color: #E15616;
 				position: absolute;
 				right: 0;
 				top: 45rpx;

components/module/creatOrder/freight.vue

@@ -73,7 +73,7 @@
 				.icon-yunfeishuoming{
 					height: 100%;
 					padding:15rpx;
-					color: #AA8420;
+					color: #E15616;
 					font-weight: normal;
 				}
 			}

components/module/listTemplate/commodityList.vue

@@ -125,9 +125,6 @@
 				if(self.$parent.lastPageType === '常采购商品') {
 					self.fromRegularPurchasePage = true;
 				}
-				if(!loadMore && self.fromRegularPurchasePage) {
-					self.showRegularBtn = true;
-				}
 				self.$api.get(thisServerurl,{index:self.pageNum,pageSize:self.pageSize,
 											organizeID:self.userOrganizeID},
 					response => {
@@ -137,6 +134,9 @@
 							const resList = resData.results,
 								  getCartNum = response.data.count;
 							this.cartNum = getCartNum > 99 ?'99+' :getCartNum;
+							if(!loadMore && self.fromRegularPurchasePage && resData.hasNextPage) {
+								self.showRegularBtn = true;
+							}
 							if(resList && resList.length > 0){
 								self.hasNextPage = resData.hasNextPage;
 								self.totalPage = resData.totalPage;

components/module/orderDetails/orderAddress.vue

@@ -74,7 +74,7 @@
 			width: 100%;
 			height: 84rpx;
 			line-height: 84rpx;
-			color: #AA8420;
+			color: #E15616;
 			text-align: center;
 			font-size: $font-size-sb;
 			font-weight: bold;
@@ -98,7 +98,7 @@
 			align-items: center;
 			justify-content: center;
 			width: 40rpx;
-			color: #AA8420;
+			color: #E15616;
 			font-size: 46rpx;
 			margin-right: 10rpx;
 		}	

components/module/orderDetails/orderInformation.vue

@@ -134,7 +134,7 @@
 					margin-left: 40rpx;
 				}
 				.view-num.ord{
-					color: #AA8420;
+					color: #E15616;
 					text-align: left;
 					font-weight: bold;
 					float: left;

components/module/productDetails/productDetails.vue

@@ -273,7 +273,7 @@
 		font-size: $font-size-base;
 		color: $text-color;
 		.iconfont{
-			color: #AA8420;
+			color: #E15616;
 			margin-left: 16rpx;
 		}
 		.text{

config/caimeiApi.js

@@ -5,8 +5,8 @@
  */
 // const requestUrl ='http://192.168.1.22:8107'//本地联调地址
 // const requestUrl ='http://192.168.1.24:8107'//俊俊联调地址
-const requestUrl ='https://mall-b.caimei365.com'//测试
-// const requestUrl ='https://mall.caimei365.com'//正式
+// const requestUrl ='https://mall-b.caimei365.com'//测试
+const requestUrl ='https://mall.caimei365.com'//正式
 const caimeiApi = {
 	/**
 	 * @封装公共get数据请求方法无加载动画

main.js

@@ -6,7 +6,7 @@ import * as Api from './config/caimeiApi.js'
 import * as Regs from './config/common.js'
 import Json from './json' //本地数据
 
-const userOrganizeID = 1 //组织ID
+const userOrganizeID = 2 //组织ID
 /**
  *  示例使用了uni.scss下的变量, 除变量外已尽量移除特有语法,可直接替换为其他预处理器使用
  */

manifest.json

@@ -1,7 +1,7 @@
 {
-    "name" : "caimei-starstyle-mini",
+    "name" : "caimei-applets-caimei",
     "appid" : "__UNI__1EA8401",
-    "description" : "采美商城",
+    "description" : "采美采购商城",
     "versionName" : "1.0.0",
     "versionCode" : "100",
     "transformPx" : false,
@@ -56,7 +56,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx5a5cda32926f55ac",
+        "appid" : "wxf3cd4ae0cdd11c36",
         "setting" : {
             "urlCheck" : true,
             "minified" : true,

pages.json

@@ -3,7 +3,7 @@
 		{
 			"path": "pages/tabBar/home/home",
 			"style": {
-				"navigationBarTitleText": "采美商城",
+				"navigationBarTitleText": "采美采购商城",
 				"enablePullDownRefresh":true
 			}
 		},
@@ -155,7 +155,7 @@
 	"tabBar": {
 			"height":"80",
 			"color": "#999999",
-			"selectedColor": "#333333",
+			"selectedColor": "#E15616",
 			"borderStyle": "black",
 			"backgroundColor": "#ffffff",
 			"list": [{
@@ -180,7 +180,7 @@
 		},
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "采美商城",
+		"navigationBarTitleText": "采美采购商城",
 		"navigationBarBackgroundColor": "#FFFFFF",
 		"backgroundColor": "#FFFFFF"
 	}

pages/goods/product.vue

@@ -619,7 +619,7 @@
 			color: $text-color;
 			border-bottom: 1px solid #F8F8F8;
 			.iconfont{
-				color: #AA8420;
+				color: #E15616;
 				margin-left: 20rpx;
 				font-size: $font-size-sm;
 			}
@@ -660,10 +660,10 @@
 					left: 0;
 				}
 				&.current{
-					color:#AA8420;
+					color:#E15616;
 					font-weight: bold;
 					.line{
-						background: #AA8420;
+						background: #E15616;
 					}
 				}
 			}
@@ -781,7 +781,7 @@
 				background-color: #7F7F7F;
 			}
 			.btn-bay{
-				background-color: #FF2A2A;
+				background:linear-gradient(135deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);
 			}
 			.btn-bay.disabled{
 				background-color: #FF9494;
@@ -909,8 +909,9 @@
 					display: flex;
 					align-items: center;
 					justify-content: center;
-					background-color: #000000;
+					background-color: #E15616;
 					font-size: $font-size-base;
+					border-radius: 14rpx;
 				}
 			}
 		}

pages/login/login.vue

@@ -2,6 +2,7 @@
 	<view class="container login">
 		<view class="login-main">
 			<image class="logo" src="../../static/login-logo@3x.png" mode=""></image>
+			<text class="logo-text">生美/医美采购服务平台</text>
 		</view>
 		<view class="login-input">
 			<input type="number" 
@@ -27,7 +28,7 @@
 		<view class="model-warp" :class="[isUserInfo===false ? 'none':'show']">
 			<view class="model-alert">
 				<view class="alert-content">
-					<view class="t-p">星范商城需要获取您的微信授权才能正常提供服务</view>
+					<view class="t-p">采美采购商城需要获取您的微信授权才能正常提供服务</view>
 				</view>
 				<view class="alert-btn">
 					<view class="btn btn-cancel" @click="hideModel">取消</view>
@@ -208,12 +209,19 @@
 			flex-direction: column;
 			align-items: center;
 			height: 198rpx;
-			padding: 128rpx 0;
+			padding: 170rpx 0 60rpx 0;
 			.logo{
-				width: 546rpx;
-				height: 207rpx;
+				width: 138rpx;
+				height: 118rpx;
 				display: block;
 			}
+			.logo-text{
+				font-size: 30rpx;
+				line-height: 44rpx;
+				color: #E15616;
+				font-weight: 600;
+				margin-top: 20rpx;
+			}
 		}
 		.login-input{
 			width: 654rpx;
@@ -222,6 +230,7 @@
 			margin: 0 auto;
 			margin-bottom: 60rpx;
 			background: #F7F7F7;
+			border-radius: 14rpx;
 			.input{
 				width: 100%;
 				height: 100%;
@@ -229,18 +238,19 @@
 				font-size: $font-size-base;
 				line-height: 40rpx;
 				color: #333333;
+				border-radius: 14rpx;
 			}
 		}
 		.login-btn{
 			width: 702rpx;
 			height: 88rpx;
+			border-radius: 14rpx;
 			font-size: $font-size-base;
 			line-height: 88rpx;
 			color: #FFFFFF;
 			margin: 0 auto;
 			text-align: center;
 			background: $btn-confirm;
-			border-radius: 0;
 		}
 		.model-authorization{
 			width: 100%;

pages/tabBar/cart/cart.vue

@@ -707,7 +707,7 @@
 			overflow: hidden;
 			background-color:#FFFFFF;
 			font-size: 36rpx;
-			color:#333333;
+			color:#E15616;
 		}
 		&.disabled{
 			.checkbox{
@@ -978,7 +978,7 @@
 		.footer-ri{
 			width: 200rpx;
 			height: 100%;
-			background: #FF2A2A;
+			background:linear-gradient(135deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);
 			float: right;
 			display: flex;
 			justify-content: space-between;
@@ -1026,7 +1026,7 @@
 				background: #000000;
 			}
 			.btn.btn-confirm{
-				background: #FF2A2A;
+				background:linear-gradient(135deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);
 			}
 			@keyframes showDelbtn {
 				0% {

pages/tabBar/home/home.vue

@@ -147,8 +147,8 @@
 				productsClassify:[], //导航分类
 				mallPageModules:'', //优惠模块分类
 				navInforList:[
-					{text:'会员中心',icon:'https://img.caimei365.com/group1/M00/03/83/Cmis214FbbCAN1DUAACN4QezCQg932.png'},
-					{text:'在线客服',icon:'https://img.caimei365.com/group1/M00/03/83/Cmis214FbbCAAtjBAACWFNlS2jU759.png'}
+					{text:'会员中心',icon:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/02/%E4%BC%9A%E5%91%98%E4%B8%AD%E5%BF%83%E5%A4%87%E4%BB%BD%202%403x.png'},
+					{text:'在线客服',icon:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/02/%E5%9C%A8%E7%BA%BF%E5%AE%A2%E6%9C%8D%E5%A4%87%E4%BB%BD%403x.png'}
 				],
 				navServerList:[
 					{text:'会员优惠',icon:'../../../static/temp/server1@2x.png',path:'/pages/service/member'},
@@ -269,9 +269,9 @@
 		      console.log(res.target)
 		    }
 			return {
-			  title: '星范Starstyle-全球医美领导品牌',
+			  title: '采美采购商城-生美/医美采购服务平台',
 			  path: 'pages/tabBar/home/home',
-			  imageUrl:'https://img.caimei365.com/group1/M00/03/88/Cmis214gJkOAAJBGABjUCizCahk919.png'
+			  imageUrl:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/02/%E5%88%86%E4%BA%AB%E7%95%8C%E9%9D%A2a%CC%8A%403x.png'
 			}
 		},
 		onShow(){
@@ -574,8 +574,8 @@
 		}	
 		.f-text{
 			.logo{
-				width: 40rpx;
-				height: 40rpx;
+				width: 80rpx;
+				height: 80rpx;
 				float: left;
 				margin: 0 6rpx;
 			}
@@ -584,8 +584,8 @@
 			align-items: center;
 			font-size: $font-size-sm;
 			color: $text-color;
-			line-height: 40rpx;
-			padding-top: 80rpx;
+			line-height: 80rpx;
+			padding-top: 20rpx;
 		}
 	}
 </style>

pages/tabBar/user/user.vue

@@ -2,7 +2,7 @@
 	<view class="container user clearfix">
 		<view class="user-section" :class="[!isShowNoLogin  ? 'show' : 'none']">
 			<view class="u-header">
-				<image src="https://img.caimei365.com/group1/M00/03/71/Cmis2F3wna-AWFlPAAMESXjOeRI709.png" mode=""></image>
+				<image src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/02/%E4%BD%8D%E5%9B%BE%403x.png" mode=""></image>
 				<view class="u-header-main">
 					<view class="user-item">
 						<view class="logo-m">
@@ -163,7 +163,9 @@
 								}
 							}
 							this.name = user_data.name //会所名称
-							this.headpic = user_data.headpic //会所头像
+							if(user_data.headpic!=''){
+								this.headpic = user_data.headpic //会所头像
+							}
 							this.contactNumber = user_data.contactNumber //联系电话		
 							this.paymentCount = this.showBadge(user_data.paymentCount);
 							this.waitShipmentsCount = this.showBadge(user_data.waitShipmentsCount);			
@@ -252,7 +254,7 @@
 				width: 410rpx;
 				font-size: $font-size-base;
 				line-height: 40rpx;
-				color: #F8C499;
+				color: #FFFFFF;
 				margin-bottom: 8rpx;
 				-o-text-overflow: ellipsis;
 				text-overflow: ellipsis;
@@ -266,7 +268,7 @@
 			.u-p{
 				font-size: $font-size-sm;
 				line-height: 40rpx;
-				color: #F8C499;
+				color: #FFFFFF;
 			}
 		}
 		.logo-m{

pages/user/account/account.vue

@@ -2,7 +2,7 @@
 	<view class="container account clearfix">
 		<view class="account-header">
 			<view class="h-account">
-				<image src="https://img.caimei365.com/group1/M00/03/71/Cmis2F3wna6AA0IsAAMxscl5Qvw370.png" mode=""></image>
+				<image src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/02/%E8%B4%A6%E6%88%B7%E4%BD%99%E9%A2%9D%E6%98%8E%E7%BB%86bg%403x.png" mode=""></image>
 				<view class="m-account">
 					<view class="m-m title">
 						<text class="m-p">可用余额</text>
@@ -306,14 +306,14 @@ page, .container{
 		.m-p{
 			flex: 1;
 			font-size: 40rpx;
-			color: #D3D4D3;
+			color: #FFFFFF;
 			text-align: left;
 			line-height: 74rpx;
 		}
 		.iconfont{
 			flex: 1;
 			font-size: 52rpx;
-			color: #F8C499;
+			color: #FFFFFF;
 			text-align: right;
 			line-height: 74rpx;
 		}
@@ -322,7 +322,7 @@ page, .container{
 		height: 142rpx;
 		.m-t{
 			font-size: 84rpx;
-			color: #F8C499;
+			color: #FFFFFF;
 			text-align: left;
 			line-height: 142rpx;
 			&.b{
@@ -368,7 +368,7 @@ page, .container{
 		text-align: center;
 		position: relative;
 		&.current{
-			color: #AA8420;
+			color: #E15616;
 		}
 	}	
 }
@@ -523,7 +523,7 @@ page, .container{
 	justify-content: center;
 	flex-direction: column;
 	background: $bg-color;
-	height: 600rpx;
+	min-height: 800rpx;
 	&-image {
 		width: 160rpx;
 		height: 158rpx;

pages/user/address/address.vue

@@ -237,7 +237,7 @@
 			.tag{
 				width: 120rpx;
 				height: 40rpx;
-				background: #AA8420;
+				background: #E15616;
 				border-radius: 20rpx;
 				font-size: $font-size-sm;
 				color: #FFFFFF;
@@ -297,7 +297,7 @@
 		color: #FFFFFF;
 		text-align: center;
 		background: $btn-confirm;
-		border-radius: 0;
+		border-radius: 14rpx;
 	}
 	.adds-btn{
 		width: 702rpx;
@@ -308,7 +308,7 @@
 		margin: 0 auto;
 		text-align: center;
 		background: #000000;
-		border-radius: 0;
+		border-radius: 14rpx;
 	}
 </style>
 

pages/user/address/addressManage.vue

@@ -255,12 +255,12 @@
 		margin: 0 auto;
 		text-align: center;
 		background: $btn-confirm;
-		border-radius: 0;
+		border-radius: 14rpx;
 		margin-top: 80rpx;
 	}
 	.add-btn.disabled{
 		background: #F8F8F8;
-		border-radius: 0;
+		border-radius: 14rpx;
 	}
 </style>
 

pages/user/order/create-order.vue

@@ -294,7 +294,7 @@
 			.icon-yunfeishuoming{
 				height: 100%;
 				padding: 0 15rpx;
-				color: #AA8420;
+				color: #E15616;
 				font-weight: normal;
 			}
 		}
@@ -482,7 +482,7 @@
 			width: 200rpx;
 			height: 100%;
 			color: #FFFFFF;
-			background-color:#FF2A2A;
+			background:linear-gradient(135deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);
 		}
 	}
 	

pages/user/order/myOrder.vue

@@ -7,8 +7,8 @@
 			<tui-tabs :tabs="tabs" 
 					  :isFixed="scrollTop>=0" 
 					  :currentTab="currentTab" 
-					  selectedColor="#AA8420" 
-					  sliderBgColor="#AA8420"
+					  selectedColor="#E15616" 
+					  sliderBgColor="#E15616"
 					  @change="change"
 					  :marginTop="navbarHeight">
 			</tui-tabs>
@@ -318,7 +318,7 @@
 				return {
 					title: '您有新的分享订单，快来查看吧~',
 					path: `/pages/user/order/orderShareLogin?orderID=${this.btnoRderID}&userID=${this.userID}`,
-					imageUrl:'https://img.caimei365.com/group1/M00/03/88/Cmis214gHZKAU1akAA0_wnPokp4277.png'
+					imageUrl:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/02/%E5%88%86%E4%BA%AB%E7%95%8C%E9%9D%A2a%CC%8A%403x.png'
 				}
 			},
 			//订单状态文字和颜色
@@ -357,14 +357,14 @@
 				let statusBarHeight = this.systeminfo.statusBarHeight
 				let headerPosi = this.headerBtnPosi
 				let btnPosi = { // 胶囊实际位置，坐标信息不是左上角原点
-				      height: headerPosi.height,
-				      width: headerPosi.width,
-				      // 胶囊top - 状态栏高度
-				      top: headerPosi.top - statusBarHeight,
-				      // 胶囊bottom - 胶囊height - 状态栏height （现胶囊bottom 为距离导航栏底部的长度）
-				      bottom: headerPosi.bottom - headerPosi.height - statusBarHeight,
-				      // 屏幕宽度 - 胶囊right
-				      right: this.systeminfo.screenWidth - headerPosi.right
+				      height: headerPosi.height,
+				      width: headerPosi.width,
+				      // 胶囊top - 状态栏高度
+				      top: headerPosi.top - statusBarHeight,
+				      // 胶囊bottom - 胶囊height - 状态栏height （现胶囊bottom 为距离导航栏底部的长度）
+				      bottom: headerPosi.bottom - headerPosi.height - statusBarHeight,
+				      // 屏幕宽度 - 胶囊right
+				      right: this.systeminfo.screenWidth - headerPosi.right
 				}
 				this.navbarHeight= headerPosi.bottom + btnPosi.bottom// 原胶囊bottom + 现胶囊bottom
 			},
@@ -448,7 +448,7 @@
 			.order-title-num{
 				float: left;
 				text-align: left;
-				color: #AA8420;
+				color: #E15616;
 			}
 			.order-title-tip{
 				float: right;

pages/user/order/order-cashier.vue

@@ -162,7 +162,7 @@
 				return {
 					title: '您有新的分享订单，快来查看吧~',
 					path: `/pages/user/order/orderShareLogin?orderID=${this.shareOrderID}&userID=${this.userID}`,
-					imageUrl:'https://img.caimei365.com/group1/M00/03/88/Cmis214gHZKAU1akAA0_wnPokp4277.png'
+					imageUrl:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/02/%E5%88%86%E4%BA%AB%E7%95%8C%E9%9D%A2a%CC%8A%403x.png'
 				}
 			},
 			goIndex(){

pages/user/order/order-details.vue

@@ -232,7 +232,7 @@
 				return {
 					title: '您有新的分享订单，快来查看吧~',
 					path: `/pages/user/order/orderShareLogin?orderID=${this.orderID}&userID=${this.userID}`,
-					imageUrl:'https://img.caimei365.com/group1/M00/03/88/Cmis214gHZKAU1akAA0_wnPokp4277.png'
+					imageUrl:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/02/%E5%88%86%E4%BA%AB%E7%95%8C%E9%9D%A2a%CC%8A%403x.png'
 				}
 			},
 			getHeaderTopHeight(){

pages/user/order/order-list.vue

@@ -388,7 +388,7 @@
 				return {
 					title: '您有新的分享订单，快来查看吧~',
 					path: `/pages/user/order/orderShareLogin?orderID=${this.btnoRderID}&userID=${this.userID}`,
-					imageUrl:'https://img.caimei365.com/group1/M00/03/88/Cmis214gHZKAU1akAA0_wnPokp4277.png'
+					imageUrl:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/02/%E5%88%86%E4%BA%AB%E7%95%8C%E9%9D%A2a%CC%8A%403x.png'
 				}
 			},
 			//订单状态文字和颜色
@@ -427,14 +427,14 @@
 				let statusBarHeight = this.systeminfo.statusBarHeight
 				let headerPosi = this.headerBtnPosi
 				let btnPosi = { // 胶囊实际位置，坐标信息不是左上角原点
-				      height: headerPosi.height,
-				      width: headerPosi.width,
-				      // 胶囊top - 状态栏高度
-				      top: headerPosi.top - statusBarHeight,
-				      // 胶囊bottom - 胶囊height - 状态栏height （现胶囊bottom 为距离导航栏底部的长度）
-				      bottom: headerPosi.bottom - headerPosi.height - statusBarHeight,
-				      // 屏幕宽度 - 胶囊right
-				      right: this.systeminfo.screenWidth - headerPosi.right
+				      height: headerPosi.height,
+				      width: headerPosi.width,
+				      // 胶囊top - 状态栏高度
+				      top: headerPosi.top - statusBarHeight,
+				      // 胶囊bottom - 胶囊height - 状态栏height （现胶囊bottom 为距离导航栏底部的长度）
+				      bottom: headerPosi.bottom - headerPosi.height - statusBarHeight,
+				      // 屏幕宽度 - 胶囊right
+				      right: this.systeminfo.screenWidth - headerPosi.right
 				}
 				this.navbarHeight= headerPosi.bottom + btnPosi.bottom// 原胶囊bottom + 现胶囊bottom
 				console.log(this.navbarHeight)
@@ -519,11 +519,11 @@
 	}
 
 	.active {
-		border-bottom: 4rpx solid #AA8420;
+		border-bottom: 4rpx solid #E15616;
 	}
 
 	.active .tab-bar-title {
-		color: #AA8420 !important;
+		color: #E15616 !important;
 	}
 
 	/*tabbar end*/
@@ -568,7 +568,7 @@
 			.order-title-num{
 				float: left;
 				text-align: left;
-				color: #AA8420;
+				color: #E15616;
 			}
 			.order-title-tip{
 				float: right;

uni.scss

@@ -14,8 +14,8 @@
 /* 颜色变量 */
 $border-color:#EBEBEB;
 $text-color:#333333;
-$btn-confirm:#000000;
-$btn-cancel:#785034;
+$btn-confirm:#E15616;
+$btn-cancel:#EEC1AB;
 $bg-color:#ffffff;
 $sub-bg-color: #F7F7F7;
 $green-color: #62BF00;
@@ -26,9 +26,7 @@ $font-size-sb:26rpx;
 $font-size-base:28rpx;
 $font-size-se:30rpx;
 $font-size-lg:32rpx;
-/* 颜色变量 */
-$btn-confirm:#000000;
-$btn-cancel:#785034;
+
 /* 行为相关颜色 */
 $uni-color-primary: #007aff;
 $uni-color-success: #4cd964;