定金

src/components/Index/expandActiveToast/index.js

@@ -42,7 +42,7 @@ class ExpandActiveToast extends Component {
                         <div className="expand-toast-swiper">
                             <p>您有<span className="red">{this.state.expandLength}个</span>待支付尾款的课程 再不支付就要过期了！</p>
                         </div>
-                        <Link to='/expandorder?sourcenum=1'>查看</Link>
+                        <Link to='/final-deposit-order?source=1'>查看</Link>
 
                         <img
                            onClick={e => this.cleseExpand()}

src/components/detail/btnstatus/index.js

@@ -253,7 +253,7 @@ class BtnStatus extends Component {
         } else {
             if(type == 1){
                 this.props.history.push(
-                    '/deposit-order',
+                    `/deposit-order?oid=${getParam('id')}&source=${1}`,
                     {
                         id: getParam('id'),
                         isexpand: 1,
@@ -264,7 +264,7 @@ class BtnStatus extends Component {
                 let timeStamp = Date.parse(new Date()) / 1000;
                 if (timeStamp >= info.start_timestamp) {
                     this.props.history.push(
-                        '/expandorder',
+                        '/final-deposit-order?source=1',
                         {
                             id: getParam('id'),
                             sourcenum: 1

src/components/expand/share.js

@@ -90,7 +90,7 @@ class ExpandShare extends Component {
             this.props.history.push('/passport/login')
         } else {
             this.props.history.push(
-                '/course/smallOrder',
+                `/deposit-order?oid=${getParam('id')}&source=${1}`,
                 {
                     id: courseId,
                     isexpand: 1,
@@ -109,7 +109,7 @@ class ExpandShare extends Component {
             let timeStamp = Date.parse(new Date()) / 1000;
             if (timeStamp >= time) {
                 this.props.history.push(
-                    '/expandorder',
+                    '/final-deposit-order?source=1',
                     {
                         id: courseId,
                         sourcenum: 1

src/components/order/deposit/deposit-order/index.scss

@@ -233,4 +233,68 @@
         line-height: 1.7;
     }
 
+    .order-balance {
+        line-height: 44px;
+        background: #fff;
+        margin: 8px 0;
+
+        .am-list-item {
+            padding-left: 0 !important;
+        }
+
+        .am-list-line {
+            padding: 0 15px;
+        }
+
+        .am-list-content {
+            color: $color_333;
+            font-size: $font_16;
+
+            .iconiconfront-22 {
+                font-size: 18px;
+                margin-left: 15px;
+            }
+        }
+
+        .order-balanceprice {
+            color: $color_666;
+            font-size: $font_12;
+
+            .order-money {
+                color: #ff2121;
+                font-size: $font_12 !important;
+                font-weight: normal;
+                font-style: inherit;
+                vertical-align: middle;
+                margin: 0;
+            }
+        }
+
+        .iconiconfront-22.question-mark {
+            font-size: 24px;
+            margin-left: 15px;
+        }
+
+        .am-list-body {
+            &::before, &::after {
+                display: none;
+            }
+
+        }
+
+        .balance-used {
+            font-size: 24px;
+            color: #0099FF;
+        }
+
+        .circle-icon {
+            width: 20px;
+            height: 20px;
+            border: 1px solid #BFBFBF;
+            border-radius: 50%;
+            margin-right: 2px;
+        }
+    }
+
+
 }

src/components/order/index.js

@@ -545,4 +545,4 @@ class Order extends Component {
 
 }
 
-export default Order;
\ No newline at end of file
+export default Order;

src/router/router-config.js

 import loadable from '@loadable/component'
 
 
-import Index from '@/components/Index';
-import My from '@/components/my';
-import Passport from '@/components/passport';
-import Scholarship from '@/components/scholarship';
+import Index from '@/components/Index'
+import My from '@/components/my'
+import Passport from '@/components/passport'
+import Scholarship from '@/components/scholarship'
 
 const Coupons = loadable(() => import(/* webpackChunkName: 'coupons'*/ '@/components/coupons'))
 const Study = loadable(() => import(/* webpackChunkName: 'study'*/'@/components/study'))
@@ -171,14 +171,21 @@ export default [
         path: '/aist-share',
         component: loadable(() => import(/* webpackChunkName: 'aist-share'*/'@/components/share-page/aist-share'))
     },
+    //定金订单页面
     {
         path: '/deposit-order',
         component: loadable(() => import(/* webpackChunkName: 'deposit-order' */ '@components/order/deposit/deposit-order'))
     },
+    //定金支付页面
     {
         path: '/deposit-pay-order',
         component: loadable(() => import(/* webpackChunkName: 'deposit-pay-order' */ '@components/order/deposit/deposit-pay-order'))
     },
+    //尾款支付页面
+    {
+        path: '/final-deposit-order',
+        component: loadable(() => import(/* webpackChunkName: 'deposit-pay-order' */ '@components/order/deposit/final-order'))
+    },
     // 定金支付之后
     {
         path: '/expand/callback',