合并

dist/assets/home-layout-center-legacy.77e09534.js

@@ -0,0 +1 @@
+!function(){function e(e,t,n,r,o,s,u){try{var a=e[s](u),i=a.value}catch(c){return void n(c)}a.done?t(i):Promise.resolve(i).then(r,o)}System.register(["./index-legacy.1d96369d.js","./index-legacy.760faaa6.js","./auth-legacy.0d8e68e9.js","./routes-common-legacy.693df4a2.js"],(function(t){"use strict";var n,r,o,s,u,a,i,c,f,d;return{setters:[function(e){n=e.d,r=e.g,o=e.t,s=e.p,u=e.i,a=e.j,i=e.C,c=e.F},function(e){f=e.a,d=e.b},function(){},function(){}],execute:function(){t("default",n({name:"home-layout-center",data:function(){return{status:!1}},mounted:function(){this.getUserInfo()},methods:{getUserInfo:function(){var t,n=this;return(t=regeneratorRuntime.mark((function e(){var t,a,i;return regeneratorRuntime.wrap((function(e){for(;;)switch(e.prev=e.next){case 0:return e.prev=0,e.next=3,f.post("/api-auth/smsLogin",{requestType:"form",data:{clientId:"student",clientSecret:"student",phone:r.orchestraInfo.phone,token:r.orchestraInfo.token,isSurportRegister:!0}});case 3:return t=e.sent,a=t.data.authentication,o(a.token_type+" "+a.access_token),s({api:"setCache",content:{key:"h5-colexiu-token",value:a.token_type+" "+a.access_token}}),e.next=9,f.get("/api-student/student/queryUserInfo",{initRequest:!0});case 9:i=e.sent,u(i.data),n.$router.push("/home"),e.next=17;break;case 14:e.prev=14,e.t0=e.catch(0),n.status=!0;case 17:case"end":return e.stop()}}),e,null,[[0,14]])})),function(){var n=this,r=arguments;return new Promise((function(o,s){var u=t.apply(n,r);function a(t){e(u,o,s,a,i,"next",t)}function i(t){e(u,o,s,a,i,"throw",t)}a(void 0)}))})()}},render:function(){return a(c,null,[this.status?a("div",{class:d.error},[a(i,{type:"notFond",classImgSize:"CERT",tips:"加载失败，请稍后重试",buttonText:"重新加载",plain:!0,onClick:this.getUserInfo},null)]):a("div",null,null)])}}))}}}))}();

dist/assets/home-layout-center.8fedff86.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/home-layout-center.c9dc897a.js
+import{d as r,g as s,t as u,p as i,i as c,j as e,C as l,F as p}from"./index.4f40e5e1.js";import{a,b as h}from"./index.0bc69707.js";import"./auth.502d2fa7.js";import"./routes-common.94c909a7.js";var g=r({name:"home-layout-center",data(){return{status:!1}},mounted(){this.getUserInfo()},methods:{async getUserInfo(){try{const o=await a.post("/api-auth/smsLogin",{requestType:"form",data:{clientId:"student",clientSecret:"student",phone:s.orchestraInfo.phone,token:s.orchestraInfo.token,isSurportRegister:!0}}),{authentication:t}=o.data;u(t.token_type+" "+t.access_token),i({api:"setCache",content:{key:"h5-colexiu-token",value:t.token_type+" "+t.access_token}});const n=await a.get("/api-student/student/queryUserInfo",{initRequest:!0});c(n.data),this.$router.push("/home")}catch{this.status=!0}}},render(){return e(p,null,[this.status?e("div",{class:h.error},[e(l,{type:"notFond",classImgSize:"CERT",tips:"\u52A0\u8F7D\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5",buttonText:"\u91CD\u65B0\u52A0\u8F7D",plain:!0,onClick:this.getUserInfo},null)]):e("div",null,null)])}});export{g as default};
+========
+import{d as r,g as s,t as u,p as i,i as c,j as e,C as l,F as p}from"./index.65bb5fc0.js";import{a,b as h}from"./index.7e1dcc9b.js";import"./auth.85fc1c66.js";import"./routes-common.e0bfd066.js";var g=r({name:"home-layout-center",data(){return{status:!1}},mounted(){this.getUserInfo()},methods:{async getUserInfo(){try{const o=await a.post("/api-auth/smsLogin",{requestType:"form",data:{clientId:"student",clientSecret:"student",phone:s.orchestraInfo.phone,token:s.orchestraInfo.token,isSurportRegister:!0}}),{authentication:t}=o.data;u(t.token_type+" "+t.access_token),i({api:"setCache",content:{key:"h5-colexiu-token",value:t.token_type+" "+t.access_token}});const n=await a.get("/api-student/student/queryUserInfo",{initRequest:!0});c(n.data),this.$router.push("/home")}catch{this.status=!0}}},render(){return e(p,null,[this.status?e("div",{class:h.error},[e(l,{type:"notFond",classImgSize:"CERT",tips:"\u52A0\u8F7D\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5",buttonText:"\u91CD\u65B0\u52A0\u8F7D",plain:!0,onClick:this.getUserInfo},null)]):e("div",null,null)])}});export{g as default};
+>>>>>>>> iteration-upload-works:dist/assets/home-layout-center.8fedff86.js

dist/assets/home-layout-center.c9dc897a.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/home-layout-center.c9dc897a.js
 import{d as r,g as s,t as u,p as i,i as c,j as e,C as l,F as p}from"./index.4f40e5e1.js";import{a,b as h}from"./index.0bc69707.js";import"./auth.502d2fa7.js";import"./routes-common.94c909a7.js";var g=r({name:"home-layout-center",data(){return{status:!1}},mounted(){this.getUserInfo()},methods:{async getUserInfo(){try{const o=await a.post("/api-auth/smsLogin",{requestType:"form",data:{clientId:"student",clientSecret:"student",phone:s.orchestraInfo.phone,token:s.orchestraInfo.token,isSurportRegister:!0}}),{authentication:t}=o.data;u(t.token_type+" "+t.access_token),i({api:"setCache",content:{key:"h5-colexiu-token",value:t.token_type+" "+t.access_token}});const n=await a.get("/api-student/student/queryUserInfo",{initRequest:!0});c(n.data),this.$router.push("/home")}catch{this.status=!0}}},render(){return e(p,null,[this.status?e("div",{class:h.error},[e(l,{type:"notFond",classImgSize:"CERT",tips:"\u52A0\u8F7D\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5",buttonText:"\u91CD\u65B0\u52A0\u8F7D",plain:!0,onClick:this.getUserInfo},null)]):e("div",null,null)])}});export{g as default};
+========
+import{d as r,g as s,t as u,p as i,i as c,j as e,C as l,F as p}from"./index.65bb5fc0.js";import{a,b as h}from"./index.7e1dcc9b.js";import"./auth.85fc1c66.js";import"./routes-common.e0bfd066.js";var g=r({name:"home-layout-center",data(){return{status:!1}},mounted(){this.getUserInfo()},methods:{async getUserInfo(){try{const o=await a.post("/api-auth/smsLogin",{requestType:"form",data:{clientId:"student",clientSecret:"student",phone:s.orchestraInfo.phone,token:s.orchestraInfo.token,isSurportRegister:!0}}),{authentication:t}=o.data;u(t.token_type+" "+t.access_token),i({api:"setCache",content:{key:"h5-colexiu-token",value:t.token_type+" "+t.access_token}});const n=await a.get("/api-student/student/queryUserInfo",{initRequest:!0});c(n.data),this.$router.push("/home")}catch{this.status=!0}}},render(){return e(p,null,[this.status?e("div",{class:h.error},[e(l,{type:"notFond",classImgSize:"CERT",tips:"\u52A0\u8F7D\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5",buttonText:"\u91CD\u65B0\u52A0\u8F7D",plain:!0,onClick:this.getUserInfo},null)]):e("div",null,null)])}});export{g as default};
+>>>>>>>> iteration-upload-works:dist/assets/home-layout-center.8fedff86.js

dist/index.html

@@ -52,10 +52,17 @@
             _T_));
     })(Object);
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index.0bc69707.js"></script>
   <link rel="modulepreload" href="./assets/index.4f40e5e1.js">
   <link rel="modulepreload" href="./assets/auth.502d2fa7.js">
   <link rel="modulepreload" href="./assets/routes-common.94c909a7.js">
+=======
+  <script type="module" crossorigin src="./assets/index.7e1dcc9b.js"></script>
+  <link rel="modulepreload" href="./assets/index.65bb5fc0.js">
+  <link rel="modulepreload" href="./assets/auth.85fc1c66.js">
+  <link rel="modulepreload" href="./assets/routes-common.e0bfd066.js">
+>>>>>>> iteration-upload-works
   <link rel="stylesheet" href="./assets/index.90dd4d0d.css">
   <link rel="stylesheet" href="./assets/auth.f09b6d78.css">
   <link rel="stylesheet" href="./assets/index.820e7d12.css">
@@ -68,7 +75,11 @@
   <!-- <script type="module" src="/src/teacher/main.ts"></script> -->
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.9d7739ea.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.9524fb68.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.760faaa6.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-upload-works
 </body>
 
 </html>

src/teacher/cash-protocol/index.module.less

@@ -2,11 +2,13 @@
   position: relative;
 
   .submit {
-    width: 90%;
+    width: 85%;
     margin-left: 5%;
     margin-bottom: 15px;
     position: absolute;
     bottom: 0;
+    height: 44px;
+    line-height: 44px;
     z-index: 99;
   }
-}
+}

src/teacher/cash-protocol/index.tsx

@@ -13,7 +13,8 @@ export default defineComponent({
   data() {
     return {
       realStatus: true, // 是否已经实名认证
-      url: ''
+      url: '',
+      signStatus: '' // 签署状态
     }
   },
   async mounted() {
@@ -26,7 +27,14 @@ export default defineComponent({
       } else {
         this.getDetail()
       }
-    } catch {}
+
+      const { data } = await request.get(
+        '/api-teacher/sysUserContractRecord/checkContractSignV2?contractType=WITHDRAW'
+      )
+      this.signStatus = data
+    } catch {
+      //
+    }
   },
   methods: {
     async getDetail() {
@@ -95,19 +103,23 @@ export default defineComponent({
                 border: 'none'
               }}
             ></iframe>
-            <Button
-              type="primary"
-              size="large"
-              block
-              round
-              class={styles.submit}
-              onClick={this.onSubmit}
-            >
-              我已阅读并同意
-            </Button>
+            {this.signStatus === 'NOT_SIGN' ? (
+              <Button
+                type="primary"
+                size="large"
+                block
+                round
+                class={styles.submit}
+                onClick={this.onSubmit}
+              >
+                我已阅读并同意
+              </Button>
+            ) : (
+              ''
+            )}
           </>
         ) : (
-          <UserAuth onSuccess={this.onSuccess} />
+          <UserAuth hideHeader onSuccess={this.onSuccess} />
         )}
       </div>
     )