Merge branch 'master' of http://git.ichunt.net/xiaokang/H5_2.0

assets/css/confirm/confirmSuccess.scss

 .confirmsuccesspage{
+	padding-top: 88rpx;
+	height:100vh;
+	box-sizing: border-box;
+	background: #fff;
+	.chead{
+		width: 100%;
+		height: 88rpx;
+		background: #FFFFFF;
+		position: fixed;
+		left:0rpx;
+		top:0rpx;
+		.icon{
+			font-size: 44rpx;
+			color:$uni-color999;
+			margin-left: 32rpx;
+		}
+		.titlesi{
+			color:$uni-color333;
+			font-size: 34rpx;
+			font-weight: 500;
+			width:650rpx;
+			text-align: center;
+		}
+	}
 	
+	.step{
+		padding: 24rpx;
+		.stime{
+			width: 163rpx;
+			border-top: 4rpx solid #F0F0F2;
+			border-radius: 2rpx;
+			padding:10rpx 0;
+			font-size: 22rpx;
+			text-align: center;
+			color:$uni-color999;
+			&.act{
+				border-top: 4rpx solid $uni-coloract;
+				color:$uni-color666;
+				font-weight: 600;
+			}
+		}
+		
+	}
 	
-	
+	.seuuceslogi{
+		display: block;
+		width:356rpx;
+		height:356rpx;
+		margin:0 auto;
+		margin-top: 34rpx;
+	}
+	.tsu1{
+		margin-top: 32rpx;
+		text-align: center;
+		font-size: 38rpx;
+		color:$uni-color333;
+	}
+	.tsu2{
+		margin-top: 16rpx;
+		text-align: center;
+		font-size: 24rpx;
+		color:$uni-color999;
+		line-height: 33rpx;
+	}
+	.ckorder{
+		display: block;
+		margin:0 auto;
+		margin-top: 130rpx;
+		width: 344rpx;
+		height: 68rpx;
+		background:  $uni-coloract;
+		border-radius: 10rpx;
+		text-align: center;
+		line-height: 68rpx;
+		color:#fff;
+		font-size: 28rpx;
+	}
+	.tsu3{
+		font-size: 24rpx;
+		color:$uni-color999;
+		text-align: center;
+		margin-top: 40rpx;
+		navigator{
+			color:$uni-coloract;
+		}
+	}
 }
\ No newline at end of file

assets/css/confirm/pay.scss

+.paypage{
+	
+}
\ No newline at end of file

pages.json

@@ -53,6 +53,12 @@
                 "navigationBarTitleText": "提交订单"
             }
         },
+		{
+		    "path": "pages/confirm/pay",
+		    "style": {
+		        "navigationBarTitleText": "猎芯收银台"
+		    }
+		},
         {
             "path": "pages/confirm/confirmSuccess",
             "style": {

pages/confirm/confirmSuccess.vue

 <template>
 	<view class="confirmsuccesspage">
+		<drag-button-follow follow="left,right" className="drag-button" class="drag-button" :url="kfurl"></drag-button-follow>
 		<view class="chead row verCenter">
 			<text v-back class="icon iconfont icon-arrleft"></text>
 			<view class="titlesi">订单确认</view>
 		</view>
-		
+		<view class="step row avarage">
+			<view class="stime act">提交订单</view>
+			<view class="stime">订单审核</view>
+			<view class="stime">订单支付</view>
+			<view class="stime">等待收货</view>
+		</view>
+		<image src="https://img.ichunt.com/images/ichunt/202305/22/b5df3ff4bf0d8377674a70598d4f37b2.png" class="seuuceslogi"></image>
+		<view class="tsu1">订单提交成功</view>
+		<view class="tsu2">
+			我们将在15分钟内尽快为您处理，<br>
+			我们将有可能采用电话的方式与您确认订单
+		</view>
+		<navigator url="/user/shoporder" class="ckorder">查看订单</navigator>
+		<view class="tsu3 row rowCenter">
+			<text>订单编号：</text>
+			<navigator url="/user/orderdetail" class="ckorderdetail">12022071810404SZ</navigator>
+		</view>
 	</view>
 </template>
 
@@ -12,7 +29,7 @@
 	export default {
 		data() {
 			return {
-				
+				kfurl:""
 			}
 		},
 		methods: {

pages/confirm/pay.vue

+<template>
+	<view class="paypage">
+		<view class="chead row verCenter">
+			<text v-back class="icon iconfont icon-arrleft"></text>
+			<view class="titlesi">猎芯收银台</view>
+		</view>
+		
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import '../../assets/css/confirm/pay.scss';
+</style>

router/index.js

@@ -79,6 +79,13 @@ const router = new Router({
                 title: '确认订单'
             }
         },
+		{
+		    path: '/pages/confirm/pay',
+		    aliasPath: '/pay/online',
+		    meta: {
+		        title: '猎芯收银台'
+		    }
+		},
         {
             path: '/pages/confirm/confirmSuccess',
             aliasPath: '/order/success',