Merge remote-tracking branch 'origin/developerC' into developerD

# Conflicts:
#	pages/goods/product.vue

common/css/iconfont.scss

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 1519039 */
-  src: url('//at.alicdn.com/t/font_1519039_u43k2sbvzfj.woff2?t=1647842651579') format('woff2'),
-       url('//at.alicdn.com/t/font_1519039_u43k2sbvzfj.woff?t=1647842651579') format('woff'),
-       url('//at.alicdn.com/t/font_1519039_u43k2sbvzfj.ttf?t=1647842651579') format('truetype');
+  src: url('//at.alicdn.com/t/font_1519039_w6mj588b15f.woff2?t=1647943328937') format('woff2'),
+       url('//at.alicdn.com/t/font_1519039_w6mj588b15f.woff?t=1647943328937') format('woff'),
+       url('//at.alicdn.com/t/font_1519039_w6mj588b15f.ttf?t=1647943328937') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-fuzhi_o:before {
+  content: "\eb4e";
+}
+
 .icon-shibai:before {
   content: "\e735";
 }

components/cm-module/orderDetails/paymentRecord.vue

@@ -13,8 +13,8 @@
 			</view>
 			<view class="record-list" v-else>
 				<view class="record-item" v-for="(item,index) in discernReceiptList" :key="index">
-					<view class="item-time tt">{{item.receiptDate}}</view>
-					<view class="item-time pp">{{payTypeText(item.payType)}}</view>
+					<view class="item-time tt">{{ item.receiptDate }}</view>
+					<view class="item-time pp">{{ item.payTypeStr }}</view>
 					<view class="item-time mm">￥{{item.associateAmount.toFixed(2)}}</view>
 				</view>
 			</view>
@@ -64,6 +64,7 @@
 						14:'支付宝',
 						15:'微信支付',
 						16:'余额抵扣',
+						18:'大额银联转账',
 					}
 				Object.keys(stateTextObject).forEach(key => {
 					if(key == state){
@@ -135,11 +136,11 @@
 							text-align: right;
 						}
 						&.pp{
-							flex: 2;
+							flex: 3;
 							color: $text-color;
 						}
 						&.tt{
-							flex: 5;
+							flex: 4;
 							color: #999999;
 						}
 					}

pages.json

@@ -314,6 +314,13 @@
                         "navigationStyle": "custom"
                     }
                 },
+                {
+                    "path": "order/order-success-tips",
+                    "style": {
+                        "navigationBarTitleText": "支付结果",
+                        "navigationStyle": "custom"
+                    }
+                },
                 {
                     "path": "order/order-payment",
                     "style": {

pages/goods/product.vue

@@ -97,7 +97,7 @@
 											<view class="cm-product-type" v-if="product.productType == 2">医疗器械</view>
 											<view class="cm-product-cover" v-if="product.appletsActType === 1"></view>
 										</view>
-                                       
+
 									</swiper-item>
 								</swiper>
 								<view class="swiper__dots-box">
@@ -841,7 +841,7 @@ export default {
 				this.isShowButton = false
 			}
 			if (isPreviewImg) {
-				isPreviewImg = false 
+				isPreviewImg = false
 				return
 			} else {
 				this.initData()
@@ -859,7 +859,7 @@ export default {
 					this.shop = response.data.shop
 					this.shopId = response.data.shopId
 					this.product = response.data
-					if(this.shopId == 10255){
+					if(this.shopId == 1161){
 						this.isShowCaimeiShop = true
 					}
 					if (this.product.userLike && this.product.userLike == 1) {
@@ -1008,10 +1008,10 @@ export default {
 						if(this.firstClubType != 1){// 会员非医美机构跳转资料页
 							this.$api.navigateTo('/pages/login/information')
 						}
-					}	
+					}
 				}
 				this.modal1 = false
-			}else{ 
+			}else{
 				this.modal1 = false
 				if (this.isShareType == 'share') {
 					this.$api.switchTabTo('/pages/tabBar/home/index')

pages/search/search-supplier.vue

@@ -209,8 +209,11 @@
 				})
 				return Array
 			},
-			goSupplier(value){//跳供应商资料页
-				this.$api.navigateTo('/pages/supplier/user/my-shop?shopId='+value)
+			goSupplier(shopId){//跳供应商资料页
+				if(shopId == 1161){
+					return
+				}
+				this.$api.navigateTo('/pages/supplier/user/my-shop?shopId='+shopId)
 			},
 		},
 		onReachBottom() {

pages/second/form/form-seller.vue

@@ -1,7 +1,7 @@
 <template name="secondHandrelease">
 	<view class="fleaMarketForm">
 		<view class="bannerimg"><image src="https://static.caimei365.com/app/img/bg/secondbg.jpg"></image></view>
-		<view class="my-maintenance" :style="{ paddingBottom: isIphoneX ? '270rpx' : '168rpx' }">
+		<view class="my-maintenance" :style="{ paddingBottom: isIphoneX ? '270rpx' : '250rpx' }">
 			<view class="newsTitle">
 				<view class="nestext">
 					欢迎您来到采美365网二手商品市场，您可以在这里发布二手设备、产品信息，
@@ -638,7 +638,7 @@
 			},
 			contactMobileOnblur(e){// 识别手机号是否正确
 				if(this.$reg.isMobile(e.detail.value)){
-					this.isMobileDisabled = false;
+					this.isMobileDisabled = false
 				}
 			},
 			getMobileCodeFn(){
@@ -648,19 +648,19 @@
 						activateCodeType:6,
 						platformType:2
 					}
-				this.isMobileDisabled = true;
+				this.isMobileDisabled = true
 				this.PublicService.GetRegisterMobileCode(params).then(response =>{
-					this.$util.msg('验证短信已发送',2000);
-					const TIME_COUNT = 60;
+					this.$util.msg('验证短信已发送',2000)
+					const TIME_COUNT = 60
 			     	if (!this.mobilTime) {
-			       		this.mobilCount = TIME_COUNT;
-			       		this.isMobileDisabled = true;
+			       		this.mobilCount = TIME_COUNT
+			       		this.isMobileDisabled = true
 			       		this.mobilTime = setInterval(() => {
 			       			if (this.mobilCount > 1 && this.mobilCount <= TIME_COUNT) {
 			         			this.mobilCount--
 			         			this.mobileCodeText = this.mobilCount +'s重新发送'
 			        		} else {
-				         		this.isMobileDisabled = false;
+				         		this.isMobileDisabled = false
 				         		clearInterval(this.mobilTime)
 				         		this.mobilTime = null
 								this.mobileCodeText = '获取验证码'
@@ -668,8 +668,8 @@
 			       		},1000)
 			      	}
 				}).catch( error =>{
-					this.$util.msg(error.msg,2000);
-					this.isMobileDisabled = false;
+					this.$util.msg(error.msg,2000)
+					this.isMobileDisabled = false
 				})
 			},
 			handleSubmitBtn () {
@@ -691,12 +691,12 @@
 					this.$util.msg('请输入商品名称',2000)
 					return
 				}
-				// if(this.secondParams.secondHandType ==2) {
-				// 	if (this.secondParams.maturityYears=='') {
-				// 		 this.$util.msg('请输入产品到期日',2000);
-				// 		 return
-				// 	} 
-				// }
+				if(this.secondParams.publishIdentity === 2) {
+					if (this.secondParams.companyName=='') {
+						 this.$util.msg('请输入公司名称',2000)
+						 return
+					} 
+				}
 				if(!this.$api.isNumber(this.secondParams.price)){
 					  this.$util.msg('请输入交易价',2000)
 						return
@@ -772,23 +772,34 @@
 					this.$util.msg('请勾选已阅读',2000)
 					return
 				}
-				console.log(this.secondParams)
-				if(this.secondParams.licenseImage == ''){
-					this.modal1 = true
-					this.tipsContentText = '上传身份验证照片,您的二手商品将获得更好的推荐推荐和曝光，方便您快速卖出。'
-					this.cancelButtonText = '继续发布'
-					this.confirmButtonText = '去上传'
-					this.isButtonsType = 1
-					return
+				if(this.secondParams.publishIdentity === 1){
+					if(this.secondParams.authenticationImage == '' && this.secondParams.authenticationBackImage == ''){
+						this.modal1 = true
+						this.tipsContentText = '上传身份证照片,您的二手商品将获得更好的推荐和曝光，方便您快速卖出。'
+						this.cancelButtonText = '继续发布'
+						this.confirmButtonText = '去上传'
+						this.isButtonsType = 1
+						return
+					}
+				}else{
+					if(this.secondParams.licenseImage == ''){
+						this.modal1 = true
+						this.tipsContentText = '上传营业执照照片,您的二手商品将获得更好的推荐和曝光，方便您快速卖出。'
+						this.cancelButtonText = '继续发布'
+						this.confirmButtonText = '去上传'
+						this.isButtonsType = 1
+						return
+					}
 				}
 				if(this.secondParams.commitmentImage == '' || this.secondParams.ossName == ''){
 					this.modal1 = true
-					this.tipsContentText = '上传二手出让承诺函,您的二手商品将获得更好的推荐推荐和曝光，方便您快速卖出。'
+					this.tipsContentText = '上传二手出让承诺函,您的二手商品将获得更好的推荐和曝光，方便您快速卖出。'
 					this.cancelButtonText = '继续发布'
 					this.confirmButtonText = '去上传'
 					this.isButtonsType = 1
 					return
 				}
+				console.log(this.secondParams)
 			},
 			SecondHandProduct(params){//提交发布
 				this.SecondService.SecondHandProduct(params).then(res=>{ 
@@ -964,6 +975,7 @@
 				margin-bottom: 10rpx;
 				box-sizing: border-box;
 				float: left;
+				color: #333333;
 				.icon-yixuanze{
 					margin-right: 10rpx;
 					color: #E15616;

pages/second/form/form.vue

@@ -1,7 +1,7 @@
 <template name="secondHandrelease">
 	<view class="fleaMarketForm">
 		<view class="bannerimg"><image src="https://static.caimei365.com/app/img/bg/secondbg.jpg"></image></view>
-		<view class="my-maintenance" :style="{ paddingBottom: isIphoneX ? '270rpx' : '168rpx' }">
+		<view class="my-maintenance" :style="{ paddingBottom: isIphoneX ? '270rpx' : '250rpx' }">
 			<view class="newsTitle">
 				<view class="nestext">
 					欢迎您来到采美365网二手商品市场，您可以在这里发布二手设备、产品信息，
@@ -638,7 +638,7 @@
 			},
 			contactMobileOnblur(e){// 识别手机号是否正确
 				if(this.$reg.isMobile(e.detail.value)){
-					this.isMobileDisabled = false;
+					this.isMobileDisabled = false
 				}
 			},
 			getMobileCodeFn(){
@@ -648,19 +648,19 @@
 						activateCodeType:6,
 						platformType:2
 					}
-				this.isMobileDisabled = true;
+				this.isMobileDisabled = true
 				this.PublicService.GetRegisterMobileCode(params).then(response =>{
-					this.$util.msg('验证短信已发送',2000);
-					const TIME_COUNT = 60;
+					this.$util.msg('验证短信已发送',2000)
+					const TIME_COUNT = 60
 			     	if (!this.mobilTime) {
-			       		this.mobilCount = TIME_COUNT;
-			       		this.isMobileDisabled = true;
+			       		this.mobilCount = TIME_COUNT
+			       		this.isMobileDisabled = true
 			       		this.mobilTime = setInterval(() => {
 			       			if (this.mobilCount > 1 && this.mobilCount <= TIME_COUNT) {
 			         			this.mobilCount--
 			         			this.mobileCodeText = this.mobilCount +'s重新发送'
 			        		} else {
-				         		this.isMobileDisabled = false;
+				         		this.isMobileDisabled = false
 				         		clearInterval(this.mobilTime)
 				         		this.mobilTime = null
 								this.mobileCodeText = '获取验证码'
@@ -668,8 +668,8 @@
 			       		},1000)
 			      	}
 				}).catch( error =>{
-					this.$util.msg(error.msg,2000);
-					this.isMobileDisabled = false;
+					this.$util.msg(error.msg,2000)
+					this.isMobileDisabled = false
 				})
 			},
 			handleSubmitBtn () {
@@ -689,14 +689,14 @@
 				}
 				if(this.secondParams.name == ''){
 					this.$util.msg('请输入商品名称',2000)
-					return
+					return 
+				}
+				if(this.secondParams.publishIdentity === 2) {
+					if (this.secondParams.companyName=='') {
+						 this.$util.msg('请输入公司名称',2000);
+						 return
+					} 
 				}
-				// if(this.secondParams.secondHandType ==2) {
-				// 	if (this.secondParams.maturityYears=='') {
-				// 		 this.$util.msg('请输入产品到期日',2000);
-				// 		 return
-				// 	} 
-				// }
 				if(!this.$api.isNumber(this.secondParams.price)){
 					  this.$util.msg('请输入交易价',2000)
 						return
@@ -772,23 +772,34 @@
 					this.$util.msg('请勾选已阅读',2000)
 					return
 				}
-				console.log(this.secondParams)
-				if(this.secondParams.licenseImage == ''){
-					this.modal1 = true
-					this.tipsContentText = '上传身份验证照片,您的二手商品将获得更好的推荐推荐和曝光，方便您快速卖出。'
-					this.cancelButtonText = '继续发布'
-					this.confirmButtonText = '去上传'
-					this.isButtonsType = 1
-					return
+				if(this.secondParams.publishIdentity === 1){
+					if(this.secondParams.authenticationImage == '' && this.secondParams.authenticationBackImage == ''){
+						this.modal1 = true
+						this.tipsContentText = '上传身份证照片,您的二手商品将获得更好的推荐和曝光，方便您快速卖出。'
+						this.cancelButtonText = '继续发布'
+						this.confirmButtonText = '去上传'
+						this.isButtonsType = 1
+						return
+					}
+				}else{
+					if(this.secondParams.licenseImage == ''){
+						this.modal1 = true
+						this.tipsContentText = '上传营业执照照片,您的二手商品将获得更好的推荐和曝光，方便您快速卖出。'
+						this.cancelButtonText = '继续发布'
+						this.confirmButtonText = '去上传'
+						this.isButtonsType = 1
+						return
+					}
 				}
 				if(this.secondParams.commitmentImage == '' || this.secondParams.ossName == ''){
 					this.modal1 = true
-					this.tipsContentText = '上传二手出让承诺函,您的二手商品将获得更好的推荐推荐和曝光，方便您快速卖出。'
+					this.tipsContentText = '上传二手出让承诺函,您的二手商品将获得更好的推荐和曝光，方便您快速卖出。'
 					this.cancelButtonText = '继续发布'
 					this.confirmButtonText = '去上传'
 					this.isButtonsType = 1
 					return
 				}
+				console.log(this.secondParams)
 			},
 			SecondHandProduct(params){//提交发布
 				this.SecondService.SecondHandProduct(params).then(res=>{ 
@@ -964,6 +975,7 @@
 				margin-bottom: 10rpx;
 				box-sizing: border-box;
 				float: left;
+				color: #333333;
 				.icon-yixuanze{
 					margin-right: 10rpx;
 					color: #E15616;

pages/second/form/introduce.vue

@@ -52,7 +52,7 @@
 	                  </view>
 	                  <view class="content_list">
 	                    <view class="content_list">2.自主发布</view>
-	                    <text class="content-text"> 卖家每上传一款商品，占据一个展示位,<text class="bluefont">平台收取每款商品100元的展示费用 ，有效期为<text style="font-size: 48px">6</text>个月</text>
+	                    <text class="content-text"> 卖家每上传一款商品，占据一个展示位,<text class="bluefont">有效期为<text style="font-size: 48px">3</text>个月</text>
 	                           平台提供与该商品匹配的详情信息以及文章信息，降低买家决策成本，以促进销售。特殊政策除外（如特定免费时段）。</text>
 	                  </view>
 	                   <view class="content_list">
@@ -103,13 +103,13 @@
 		},
 		methods:{
 			gotoform:function(){
-				this.$api.navigateTo('/pages/second/form/form');
+				this.$api.navigateTo('/pages/second/form/form')
 			},
 			gotolist:function(){
-				this.$api.navigateTo('/pages/second/product/product-list');
+				this.$api.navigateTo('/pages/second/product/product-list')
 			},
 			gotorepair:function(){
-				this.$api.navigateTo('/pages/h5/article/page?linkType=7');
+				this.$api.navigateTo('/pages/h5/article/page?linkType=7')
 			},
 		},
 		

pages/user/order/order-pay.vue

@@ -85,11 +85,12 @@
 					<view class="tui-prompt-item">
 						<text class="text">户名：</text>
 						{{ bigPayInfo.receiveName }}
+						<view class="copy" @click.stop="copyClipboard(bigPayInfo.receiveName)"><text class="iconfont icon-fuzhi_o"></text></view>
 					</view>
 					<view class="tui-prompt-item">
 						<text class="text">收款账号：</text>
 						{{ bigPayInfo.receiveAccountNo }}
-						<view class="clipboard" @click.stop="copyClipboard(bigPayInfo)">复制</view>
+						<view class="copy" @click.stop="copyClipboard(bigPayInfo.receiveAccountNo)"><text class="iconfont icon-fuzhi_o"></text></view>
 					</view>
 					<view class="tui-prompt-item">
 						<text class="text">银行：</text>
@@ -242,25 +243,30 @@
 					this.$util.msg('请输入本次支付的金额',2000)
 					return
 				}
-				if(this.payAmount <=10){
+				if(this.payAmount <=12){
 					this.$util.msg('网银支付的金额必须大于￥12.00',2000)
 					return
 				}
 				this.PayService.PayOrderTransferUnion({payAmount:this.accMul(this.payAmount,100),orderId:this.orderId}).then(response =>{
 					this.bigPayInfo = JSON.parse(response.data.data.payInfo)
-					this.mbOrderId = response.data.data.mbOrderId;
+					this.mbOrderId = response.data.data.mbOrderId
 					this.modal = true
 					console.log('PayInfo',this.bigPayInfo)
 				})
 			},
 			handleClick(){// 查询是否支付成功
 				this.PayService.PayOrderFindOrderStatus({mbOrderId:this.mbOrderId}).then(response =>{
-					let data =  {
-						  payAmount:this.payAmount,
-						  orderId:this.orderId,
-						  type:response.data.data === '1' ? 'success' : 'error'
+					const data = response.data.data
+					const linkData =  {
+							  payAmount:this.payAmount,
+							  orderId:this.orderId,
+							  type:data.status === '1' ? 'success' : 'error'
 						}
-					this.$api.navigateTo(`/pages/user/order/order-success?data=${JSON.stringify({ data: data })}`)
+					if(data.status === '1'){
+						this.$api.navigateTo(`/pages/user/order/order-success?data=${JSON.stringify({ data: linkData })}`)
+					}else{
+						this.$api.navigateTo(`/pages/user/order/order-success-tips?data=${JSON.stringify({ data: linkData })}`)
+					}	
 				})
 			},
 			hideMobel(){
@@ -408,12 +414,11 @@
 			},
 			copyClipboard(data){
 				//复制账号
-				let thoruiData =  data.receiveName + '' + data.receiveAccountNo
-				thorui.getClipboardData(thoruiData, (res) => {
+				thorui.getClipboardData(data, (res) => {
 					if (res) {
-						this.$util.msg('复制成功',2000,true,'success')
+						this.$util.msg('已复制',2000)
 					} else {
-						this.$util.msg('复制失败',2000,true,'none')
+						this.$util.msg('复制失败',2000)
 					}
 				})
 			},
@@ -422,7 +427,7 @@
 				thorui.getClipboardData(data, (res) => {
 					if (res) {
 						this.isShowTip = false
-						this.$util.msg('复制成功',2000,true,'success')
+						this.$util.msg('已复制',2000)
 						// 友盟埋点收集复制网银链接
 						if(process.env.NODE_ENV != 'development'){
 							this.$uma.trackEvent('Um_Event_CopyUnionPay', {
@@ -433,7 +438,7 @@
 							})
 						}
 					} else {
-						this.$util.msg('复制失败',2000,true,'none')
+						this.$util.msg('复制失败',2000)
 					}
 				})
 			},
@@ -764,19 +769,17 @@
 			.text{
 				font-weight: bold;
 			}
-			.clipboard{
+			.copy{
 				height: 38rpx;
 				box-sizing: border-box;
 				padding: 0 24rpx;
-				background:#FFE6DC;
 				text-align: center;
-				font-size: $font-size-22;
-				color: #E15616;
-				border-radius: 18rpx;
 				line-height: 36rpx;
 				display: inline-block;
-				margin-left: 20rpx;
-				border: 1px solid #E15616;
+				.iconfont{
+					font-size: $font-size-40;
+					color: #666666;
+				}
 			}
 		}	
 	}

pages/user/order/order-success-tips.vue

@@ -0,0 +1,149 @@
+<template>
+	<view class="container cashier">
+		<cu-custom :navbar-data='nvabarData'></cu-custom>
+		<view class="container-cash clearfix" :style="{marginTop:CustomBar+'px'}">
+			<view class="container-wrapper">
+				<view class="cash-icon">
+					<image class="icon-image" :src="StaticUrl + '/icon/icon-paywring@2x.png'" mode=""></image>
+				</view>
+				<view class="cash-text">
+					大额银联转账耗时较久，大致需要 <text class="tx">5-15分钟</text> 才能
+					到账成功。后续您可在订单详情页面查看订单的
+					已支付金额和订单状态。
+				</view>
+			</view>
+			<view class="container-button">
+				<view class="btn btn-home" @click="this.$api.switchTabTo('/pages/tabBar/home/index')">回到首页</view>
+				<view class="btn btn-open" @click="details">查看订单</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		data(){
+			return{
+				orderId:0,
+				nvabarData: {		//顶部自定义导航
+					haveBack:false,
+					haveHome:true,
+					showCapsule:1, // 是否显示左上角图标  1表示显示  0表示不显示,
+					showSearch: 0,
+					title: '支付结果',  // 导航栏 中间的标题
+					textLeft:this.$store.state.isIphone
+				},
+				payType:'',
+				payStatus:false,
+				amuntMoney:0,
+				successText:'本次支付失败',
+				StaticUrl: this.$Static,
+				isIphoneX:this.$store.state.isIphoneX,
+				CustomBar:this.CustomBar,// 顶部导航栏高度
+				
+			}
+		},
+		filters:{
+			NumFormat(value) {
+			    //处理金额
+			    if (value) {
+			        return Number(value).toFixed(2)
+			    } else {
+			        return '0.00'
+			    }
+			}
+		},
+		onLoad(option) {
+			this.initData(option)
+		},
+		methods:{
+			initData(option){
+				const data = JSON.parse(option.data)
+				this.orderId = data.data.orderId
+				this.payType = data.data.type
+				this.amuntMoney = data.data.payAmount
+				if(this.payType == 'success'){
+					this.payStatus = true
+					this.successText = '本次支付成功'
+				}else{
+					this.payStatus = false
+					this.successText = '本次支付失败'
+				}
+				console.log(this.orderId)
+			},
+			toAgainPay(){
+				this.$api.navigateBack(2)
+			},
+			details(){
+				this.$api.redirectTo('/pages/user/order/order-details?type=share&orderId='+this.orderId)
+			}
+		},
+		onShow() {
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	page{
+		height: auto !important;
+	}
+	.container-cash{
+		width: 100%;
+		.container-wrapper{
+			width:100%;
+			height: auto;
+			padding: 120rpx 24rpx 0 24rpx;
+			box-sizing: border-box;
+			.cash-icon{
+				width: 100%;
+				height: 260rpx;
+				text-align: center;
+				.icon-image{
+					width: 260rpx;
+					height: 260rpx;
+					margin: 0 auto;
+					display: block;
+				}
+			}
+			.cash-text{
+				width: 100%;
+				height: 90rpx;
+				box-sizing: border-box;
+				padding: 0 50rpx;
+				text-align: center;
+				font-size: $font-size-26;
+				color: $text-color;
+				line-height: 44rpx;
+				padding-bottom: 40rpx;
+				.tx{
+					color: $color-system;
+				}
+			}
+		}
+		.container-button{
+			width: 100%;
+			box-sizing: border-box;
+			padding: 80rpx 75rpx;
+			.btn{
+				width: 100%;
+				height: 90rpx;
+				border-radius: 50rpx;
+				line-height: 90rpx;
+				box-sizing: border-box;
+				text-align: center;
+				font-size: $font-size-26;
+				color: #FFFFFF;
+				margin: 24rpx 0;
+				&.btn-open{
+					background:#FFFFFF;
+					border: 1px solid $color-system;
+					color: $color-system;
+				}
+				&.btn-home{
+					background:$btn-confirm;
+				}
+			}
+		}
+	}
+</style>