Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/boot/permission.js

@@ -8,7 +8,7 @@ LoadingBar.setDefaults({
     position: "bottom"
 });
 let loadAsyncRouter = false;
-const whiteList = ["/login", "/", "/contractConfirm", "contractView","noticeView"]; // 不重定向白名单
+const whiteList = ["/login", "/", "/contractConfirm","contractPay","contractView","noticeView"]; // 不重定向白名单
 router.beforeEach((to, from, next) => {
     localStorage.setItem("routerBefore", from.path);
     LoadingBar.start();

src/pages/contractPay.vue

+<style>
+  .ContractPay {
+    width: 100%;
+    margin: 0 auto;
+    background-color: #fff;
+    height: 100%;
+    color: #000;
+    padding: 20px;
+  }
+
+  .ContracPay_Title {
+    position: relative;
+    color: #111111;
+    font-size: 23px;
+    text-align: center;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .ContracPay_Title i {
+    position: absolute;
+    left: 0;
+    top: 3px;
+    font-size: 20px;
+    color: #111111;
+  }
+
+  .Contract_TwoDiv {
+    width: 100%;
+    height: 28rem;
+    margin-top:50px;
+    background-color: #F3F9FC;
+    text-align: center;
+    color: #111111;
+    font-weight: 500;
+  }
+
+  .contractTotal {
+    font-size: 20px;
+    padding-top:50px;
+  }
+
+  .contractMoney {
+    font-size: 30px;
+    font-weight: bold;
+    margin-top:10px;
+  }
+  .contractTwoCode{
+    width:180px;
+    height:180px;
+    border:1px solid #d1d1d1;
+    margin:20px auto;
+  }
+  .TwoCodeRemind{
+    color:#888888;
+    font-size:20px;
+    margin-top:20px;
+  }
+</style>
+<template>
+  <div class="ContractPay">
+    <div class="ContracPay_Title">
+      <i @click="goContractConfirm" class="iconfont icon-line-arrow-left"></i>合同签订成功
+    </div>
+    <div class="Contract_TwoDiv">
+      <div class="contractTotal">合同总价</div>
+      <div class="contractMoney">10000.00</div>
+      <div class="contractTwoCode">
+          
+      </div>
+      <div class="TwoCodeRemind">长按识别上图收款码，完成支付</div>
+    </div>
+  </div>
+</template>
+<script>
+  export default {
+    data() {
+      return {
+        dataList: [],
+      };
+    },
+    created() {
+
+    },
+    methods: {
+      //获取数据
+      getList() {
+        // GetEducationContractInfo(this.gmsg).then(res => {
+        //   if (res.Code == 1) {
+        //     this.dataList = res.Data;
+        //   }
+        // })
+      },
+      //跳转至合同详情
+      goContractConfirm(){
+        this.$router.push({
+          path: 'contractConfirm',
+          query: {} 
+        });
+      }
+    },
+    mounted() {}
+  };
+
+</script>

src/router/routes.js

@@ -716,6 +716,11 @@ const routes = [{
     component: () =>
       import("pages/contractConfirm.vue")
   },
+  {
+    path: "/contractPay",
+    component: () =>
+      import("pages/contractPay.vue")
+  },
   //公告预览
   {
     path: "/noticeView",