更新

dist/assets/home-layout-center-legacy.48febd3f.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/home-layout-center-legacy.48febd3f.js
 !function(){function e(e,t,n,r,o,s,u){try{var a=e[s](u),c=a.value}catch(i){return void n(i)}a.done?t(c):Promise.resolve(c).then(r,o)}System.register(["./index-legacy.77fd7daf.js","./index-legacy.a347bd23.js","./auth-legacy.52a59e00.js","./routes-common-legacy.e64ce7f5.js"],(function(t){"use strict";var n,r,o,s,u,a,c,i,f,l;return{setters:[function(e){n=e.d,r=e.g,o=e.t,s=e.p,u=e.i,a=e.j,c=e.C,i=e.F},function(e){f=e.a,l=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,c;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:c=e.sent,u(c.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,c,"next",t)}function c(t){e(u,o,s,a,c,"throw",t)}a(void 0)}))})()}},render:function(){return a(i,null,[this.status?a("div",{class:l.error},[a(c,{type:"notFond",classImgSize:"CERT",tips:"加载失败，请稍后重试",buttonText:"重新加载",plain:!0,onClick:this.getUserInfo},null)]):a("div",null,null)])}}))}}}))}();
+========
+!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.69881216.js","./auth-legacy.0d8e68e9.js","./routes-common-legacy.69eb0f83.js"],(function(t){"use strict";var n,r,o,s,u,a,i,c,f,l;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,l=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:l.error},[a(i,{type:"notFond",classImgSize:"CERT",tips:"加载失败，请稍后重试",buttonText:"重新加载",plain:!0,onClick:this.getUserInfo},null)]):a("div",null,null)])}}))}}}))}();
+>>>>>>>> iteration-1130:dist/assets/home-layout-center-legacy.4e0dfebe.js

dist/assets/home-layout-center-legacy.4e0dfebe.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/home-layout-center-legacy.48febd3f.js
+!function(){function e(e,t,n,r,o,s,u){try{var a=e[s](u),c=a.value}catch(i){return void n(i)}a.done?t(c):Promise.resolve(c).then(r,o)}System.register(["./index-legacy.77fd7daf.js","./index-legacy.a347bd23.js","./auth-legacy.52a59e00.js","./routes-common-legacy.e64ce7f5.js"],(function(t){"use strict";var n,r,o,s,u,a,c,i,f,l;return{setters:[function(e){n=e.d,r=e.g,o=e.t,s=e.p,u=e.i,a=e.j,c=e.C,i=e.F},function(e){f=e.a,l=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,c;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:c=e.sent,u(c.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,c,"next",t)}function c(t){e(u,o,s,a,c,"throw",t)}a(void 0)}))})()}},render:function(){return a(i,null,[this.status?a("div",{class:l.error},[a(c,{type:"notFond",classImgSize:"CERT",tips:"加载失败，请稍后重试",buttonText:"重新加载",plain:!0,onClick:this.getUserInfo},null)]):a("div",null,null)])}}))}}}))}();
+========
+!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.69881216.js","./auth-legacy.0d8e68e9.js","./routes-common-legacy.69eb0f83.js"],(function(t){"use strict";var n,r,o,s,u,a,i,c,f,l;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,l=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:l.error},[a(i,{type:"notFond",classImgSize:"CERT",tips:"加载失败，请稍后重试",buttonText:"重新加载",plain:!0,onClick:this.getUserInfo},null)]):a("div",null,null)])}}))}}}))}();
+>>>>>>>> iteration-1130:dist/assets/home-layout-center-legacy.4e0dfebe.js

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

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/home-layout-center.e331ba4d.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.b8dfb6b2.js";import"./auth.502d2fa7.js";import"./routes-common.5ef114ca.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.f58fa63b.js";import"./auth.85fc1c66.js";import"./routes-common.43726862.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-1130:dist/assets/home-layout-center.d0389d8e.js

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

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/home-layout-center.e331ba4d.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.b8dfb6b2.js";import"./auth.502d2fa7.js";import"./routes-common.5ef114ca.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.f58fa63b.js";import"./auth.85fc1c66.js";import"./routes-common.43726862.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-1130:dist/assets/home-layout-center.d0389d8e.js

dist/index.html

@@ -52,10 +52,17 @@
             _T_));
     })(Object);
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index.b8dfb6b2.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.5ef114ca.js">
+=======
+  <script type="module" crossorigin src="./assets/index.f58fa63b.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.43726862.js">
+>>>>>>> iteration-1130
   <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.c8e8477e.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.a347bd23.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.69881216.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-1130
 </body>
 
 </html>

dist/teacher.html

@@ -52,9 +52,15 @@
             _T_));
     })(Object);
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/teacher.a495dc95.js"></script>
   <link rel="modulepreload" href="./assets/index.4f40e5e1.js">
   <link rel="modulepreload" href="./assets/routes-common.5ef114ca.js">
+=======
+  <script type="module" crossorigin src="./assets/teacher.424e9b46.js"></script>
+  <link rel="modulepreload" href="./assets/index.65bb5fc0.js">
+  <link rel="modulepreload" href="./assets/routes-common.43726862.js">
+>>>>>>> iteration-1130
   <link rel="stylesheet" href="./assets/index.90dd4d0d.css">
   <link rel="stylesheet" href="./assets/teacher.ded4b243.css">
   <script type="module">!function(){try{new Function("m","return import(m)")}catch(o){console.warn("vite: loading legacy build because dynamic import is unsupported, syntax error above should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}}();</script>
@@ -65,7 +71,11 @@
   
   <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.c8e8477e.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.7b827fff.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.bb64ab0d.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-1130
 </body>
 
 </html>

dist/tenant.html

@@ -52,9 +52,15 @@
             _T_));
     })(Object);
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/tenant.8615faa9.js"></script>
   <link rel="modulepreload" href="./assets/index.4f40e5e1.js">
   <link rel="modulepreload" href="./assets/auth.502d2fa7.js">
+=======
+  <script type="module" crossorigin src="./assets/tenant.5456c1a6.js"></script>
+  <link rel="modulepreload" href="./assets/index.65bb5fc0.js">
+  <link rel="modulepreload" href="./assets/auth.85fc1c66.js">
+>>>>>>> iteration-1130
   <link rel="stylesheet" href="./assets/index.90dd4d0d.css">
   <link rel="stylesheet" href="./assets/auth.f09b6d78.css">
   <link rel="stylesheet" href="./assets/tenant.d44cc3f0.css">
@@ -67,7 +73,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.c8e8477e.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.79bb4a2b.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.5c3217af.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-1130
 </body>
 
 </html>

src/views/creation/share-model/index.tsx

@@ -45,7 +45,7 @@ export default defineComponent({
         }
       })
       if (res?.content?.status === 'success') {
-        Toast.success('保存至相册')
+        Toast.success('已保存到相册')
       } else {
         Toast.fail('保存失败')
       }

src/views/member-center/index.module.less

@@ -1,374 +1,414 @@
-.member-center {
-  background-color: #ffe5cc;
-  min-height: 100vh;
-  position: relative;
-
-  :global {
-    .van-nav-bar {
-      background-color: transparent;
-    }
-  }
-
-  .member_container {
-    padding: 10px 14px 0;
-    .title {
-      display: flex;
-      align-items: center;
-      font-size: 16px;
-      line-height: 28px;
-      font-weight: 500;
-      color: #333333;
-      &::before {
-        content: ' ';
-        width: 4px;
-        height: 17px;
-        background: #01c1b5;
-        display: inline-block;
-        margin-right: 7px;
-        border-radius: 8px;
-      }
-    }
-  }
-  .level {
-    width: 18px;
-    height: 16px;
-  }
-  .userMember {
-    background: url('./images/member_bg.png') no-repeat center #534754;
-    background-size: cover;
-    width: auto;
-    border-radius: 10px;
-    padding: 20px 12px 30px;
-    .userImgSection {
-      padding: 2px;
-      border: 1px solid #feecd2;
-      background-color: transparent;
-      margin-right: 12px;
-      border-radius: 50%;
-    }
-    .userImg {
-      width: 46px;
-      height: 46px;
-      border-radius: 50%;
-      vertical-align: middle;
-      overflow: hidden;
-    }
-    .userInfo {
-      display: flex;
-      align-items: center;
-      color: #fff;
-      padding-bottom: 5px;
-      .name {
-        font-size: 18px;
-        padding-right: 5px;
-        max-width: 100px;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-      }
-      .phone {
-        font-size: 14px;
-      }
-    }
-    .timeRemaining {
-      margin-top: 0;
-      font-size: 14px;
-      color: #c0c0c0;
-      .remaining {
-        color: #f7b500;
-        padding: 0 5px;
-      }
-    }
-    .member_time {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-    }
-  }
-
-  .intro {
-    background: url('./images/tip_bg.png') no-repeat center;
-    background-size: contain;
-    height: 142px;
-    font-size: 14px;
-    color: #bb6e3a;
-    p {
-      padding: 45px 25px 0;
-      text-align: justify;
-      line-height: 22px;
-    }
-  }
-
-  .memberContainer {
-    // height: calc(100vh - 196px);
-    // overflow-y: auto;
-    background-color: #fff;
-    border-radius: 18px 18px 0px 0px;
-    position: relative;
-    margin-top: -15px;
-    padding: 0 14px 75px;
-    z-index: 99;
-  }
-  .memberItem {
-    padding-top: 20px;
-    .title {
-      font-size: 16px;
-      color: #333333;
-      font-weight: 500;
-      span {
-        color: #f7b500;
-      }
-    }
-  }
-
-  .member_function {
-    display: flex;
-    justify-content: space-between;
-    flex-wrap: wrap;
-    .function_item__content {
-      height: 100%;
-    }
-    .function_item {
-      width: 80px;
-      padding: 12px 0;
-      margin-top: 8px;
-      border-radius: 8px;
-      overflow: hidden;
-      background-color: #faefe3;
-      text-align: center;
-    }
-    .function_text {
-      font-size: 12px;
-      color: #814014;
-      line-height: 16px;
-    }
-  }
-  .system-list::-webkit-scrollbar {
-    display: none; /* Chrome Safari */
-  }
-  .system-list {
-    width: 100%;
-    overflow-x: auto;
-    overflow-y: hidden;
-    display: flex;
-    position: relative;
-    user-select: none;
-    box-sizing: content-box;
-    padding-top: 16px;
-    padding-bottom: 10px;
-    margin-bottom: 10px;
-  }
-  .system-item {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    flex: 1 0 auto;
-    width: 96px;
-    min-height: 120px;
-    box-sizing: border-box;
-    background: #ffffff;
-    border-radius: 12px;
-    border: 1px solid #e5e5e5;
-    margin-left: 10px;
-    &:first-child {
-      margin-left: 0;
-    }
-    .title {
-      font-size: 14px;
-      font-weight: 500;
-      color: #333333;
-      line-height: 20px;
-    }
-    .price {
-      color: #dc9362;
-      font-size: 25px;
-      line-height: 1.5;
-      span {
-        font-size: 16px;
-      }
-    }
-    .originalPrice {
-      color: #937059;
-      font-size: 13px;
-    }
-
-    &.active {
-      background: linear-gradient(
-        215deg,
-        #ffe7c4 0%,
-        rgba(250, 211, 156, 0.21) 100%
-      );
-      border: 1px solid #b1652e;
-      position: relative;
-      .title {
-        color: #814014;
-      }
-      .price {
-        color: #b1652e;
-      }
-      .originalPrice {
-        color: #937059;
-      }
-      &::before {
-        content: '\e728';
-        font: 14px/1 'vant-icon';
-        color: #fff;
-        background-color: #b1652e;
-        width: 27px;
-        height: 18px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        position: absolute;
-        top: -1px;
-        right: -1px;
-        border-radius: 0 12px 0 12px;
-      }
-    }
-  }
-
-  .btnGroup {
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    z-index: 100;
-    background-color: #fff;
-    display: flex;
-    align-items: center;
-    padding: 12px 16px;
-    justify-content: space-between;
-    border-top: 1px solid #f0f0f0;
-    .btn {
-      padding: 0 22px;
-      color: #7a3104 !important;
-    }
-
-    .priceSection {
-      display: flex;
-      align-items: center;
-      font-size: 16px;
-      color: #1a1a1a;
-      .price {
-        font-size: 18px;
-        font-weight: bold;
-        color: #ff3535;
-
-        .priceUnit {
-          font-size: 14px;
-        }
-      }
-    }
-  }
-}
-
-.memberDiscount {
-  margin-top: 16px;
-  position: relative;
-  background: url('./images/discount_bg.png') no-repeat center;
-  background-size: contain;
-  display: flex;
-  align-items: center;
-  height: 44px;
-  font-size: 16px;
-  color: #ff7100;
-  line-height: 18px;
-
-  .discountAvatar {
-    margin-left: 15px;
-    width: 36px;
-    height: 36px;
-    border-radius: 50%;
-    overflow: hidden;
-    border: 1px solid #ffaf59;
-  }
-
-  .discountName {
-    padding-left: 30px;
-    max-width: 200px;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-
-  .discountGift {
-    position: absolute;
-    right: 26px;
-    top: 7px;
-    width: 29px;
-    height: 29px;
-  }
-}
-
-.discountItem {
-  height: 14px;
-  padding-bottom: 2px;
-  img {
-    height: 100%;
-  }
-}
-
-.discountBuy {
-  height: 18px;
-  padding-bottom: 0;
-  margin-left: 8px;
-}
-
-.shareBtn {
-  display: flex;
-  align-items: flex-start;
-  color: #666;
-  font-size: 14px;
-  line-height: 20px !important;
-  :global(.van-image) {
-    width: 18px;
-    height: 18px;
-    margin-right: 6px;
-  }
-}
-
-.shareVip {
-  position: relative;
-  margin-top: 50px;
-  display: flex;
-  flex: 1;
-  align-items: center;
-  padding: 11px 6px 11px;
-  background: #ffffff;
-  border-radius: 10px;
-
-  .icon {
-    width: 36px;
-    height: 36px;
-    border-radius: 10px;
-  }
-  .info {
-    margin-left: 6px;
-    flex: 1;
-    word-break: break-all;
-    > h4 {
-      color: var(--music-list-item-title-color);
-      font-size: 14px;
-      font-weight: 600;
-    }
-    > p {
-      color: var(--music-list-item-mate-color);
-      line-height: 17px;
-    }
-  }
-}
-
-.tagDiscount {
-  position: absolute;
-  top: -23px;
-  left: 15px;
-  padding: 0 10px;
-  height: 23px;
-  background: linear-gradient(180deg, #ffb635 0%, #ff4e18 100%);
-  border-radius: 8px 8px 0px 0px;
-  font-size: 14px;
-  font-weight: 600;
-  color: #ffffff;
-  line-height: 24px;
-}
+.member-center {
+  background-color: #ffe5cc;
+  min-height: 100vh;
+  position: relative;
+
+  :global {
+    .van-nav-bar {
+      background-color: transparent;
+    }
+  }
+
+  .member_container {
+    padding: 10px 14px 0;
+
+    .title {
+      display: flex;
+      align-items: center;
+      font-size: 16px;
+      line-height: 28px;
+      font-weight: 500;
+      color: #333333;
+
+      &::before {
+        content: ' ';
+        width: 4px;
+        height: 17px;
+        background: #01c1b5;
+        display: inline-block;
+        margin-right: 7px;
+        border-radius: 8px;
+      }
+    }
+  }
+
+  .level {
+    width: 18px;
+    height: 16px;
+  }
+
+  .userMember {
+    background: url('./images/member_bg.png') no-repeat center #534754;
+    background-size: cover;
+    width: auto;
+    border-radius: 10px;
+    padding: 20px 12px 30px;
+
+    .userImgSection {
+      background-color: transparent;
+      margin-right: 12px;
+    }
+
+    .userImg {
+      padding: 2px;
+      border: 1px solid #feecd2;
+      border-radius: 50%;
+      vertical-align: middle;
+      overflow: hidden;
+
+      img {
+        width: 46px;
+        height: 46px;
+        border-radius: 50%;
+      }
+    }
+
+    .userInfo {
+      display: flex;
+      align-items: center;
+      color: #fff;
+      padding-bottom: 5px;
+
+      .name {
+        font-size: 18px;
+        padding-right: 5px;
+        max-width: 100px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+
+      .phone {
+        font-size: 14px;
+      }
+    }
+
+    .timeRemaining {
+      margin-top: 0;
+      font-size: 14px;
+      color: #c0c0c0;
+
+      .remaining {
+        color: #f7b500;
+        padding: 0 5px;
+      }
+    }
+
+    .member_time {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+    }
+  }
+
+  .intro {
+    background: url('./images/tip_bg.png') no-repeat center;
+    background-size: contain;
+    height: 142px;
+    font-size: 14px;
+    color: #bb6e3a;
+
+    p {
+      padding: 45px 25px 0;
+      text-align: justify;
+      line-height: 22px;
+    }
+  }
+
+  .memberContainer {
+    // height: calc(100vh - 196px);
+    // overflow-y: auto;
+    background-color: #fff;
+    border-radius: 18px 18px 0px 0px;
+    position: relative;
+    margin-top: -15px;
+    padding: 0 14px 75px;
+    z-index: 99;
+  }
+
+  .memberItem {
+    padding-top: 20px;
+
+    .title {
+      font-size: 16px;
+      color: #333333;
+      font-weight: 500;
+
+      span {
+        color: #f7b500;
+      }
+    }
+  }
+
+  .member_function {
+    display: flex;
+    justify-content: space-between;
+    flex-wrap: wrap;
+
+    .function_item__content {
+      height: 100%;
+    }
+
+    .function_item {
+      width: 80px;
+      padding: 12px 0;
+      margin-top: 8px;
+      border-radius: 8px;
+      overflow: hidden;
+      background-color: #faefe3;
+      text-align: center;
+    }
+
+    .function_text {
+      font-size: 12px;
+      color: #814014;
+      line-height: 16px;
+    }
+  }
+
+  .system-list::-webkit-scrollbar {
+    display: none;
+    /* Chrome Safari */
+  }
+
+  .system-list {
+    width: 100%;
+    overflow-x: auto;
+    overflow-y: hidden;
+    display: flex;
+    position: relative;
+    user-select: none;
+    box-sizing: content-box;
+    padding-top: 16px;
+    padding-bottom: 10px;
+    margin-bottom: 10px;
+  }
+
+  .system-item {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    flex: 1 0 auto;
+    width: 96px;
+    min-height: 120px;
+    box-sizing: border-box;
+    background: #ffffff;
+    border-radius: 12px;
+    border: 1px solid #e5e5e5;
+    margin-left: 10px;
+
+    &:first-child {
+      margin-left: 0;
+    }
+
+    .title {
+      font-size: 14px;
+      font-weight: 500;
+      color: #333333;
+      line-height: 20px;
+    }
+
+    .price {
+      color: #dc9362;
+      font-size: 25px;
+      line-height: 1.5;
+
+      span {
+        font-size: 16px;
+      }
+    }
+
+    .originalPrice {
+      color: #937059;
+      font-size: 13px;
+    }
+
+    &.active {
+      background: linear-gradient(215deg,
+          #ffe7c4 0%,
+          rgba(250, 211, 156, 0.21) 100%);
+      border: 1px solid #b1652e;
+      position: relative;
+
+      .title {
+        color: #814014;
+      }
+
+      .price {
+        color: #b1652e;
+      }
+
+      .originalPrice {
+        color: #937059;
+      }
+
+      &::before {
+        content: '\e728';
+        font: 14px/1 'vant-icon';
+        color: #fff;
+        background-color: #b1652e;
+        width: 27px;
+        height: 18px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        position: absolute;
+        top: -1px;
+        right: -1px;
+        border-radius: 0 12px 0 12px;
+      }
+    }
+  }
+
+  .btnGroup {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    z-index: 100;
+    background-color: #fff;
+    display: flex;
+    align-items: center;
+    padding: 12px 16px;
+    justify-content: space-between;
+    border-top: 1px solid #f0f0f0;
+
+    .btn {
+      padding: 0 22px;
+      color: #7a3104 !important;
+    }
+
+    .priceSection {
+      display: flex;
+      align-items: center;
+      font-size: 16px;
+      color: #1a1a1a;
+
+      .price {
+        font-size: 18px;
+        font-weight: bold;
+        color: #ff3535;
+
+        .priceUnit {
+          font-size: 14px;
+        }
+      }
+    }
+  }
+}
+
+.memberDiscount {
+  margin-top: 16px;
+  position: relative;
+  background: url('./images/discount_bg.png') no-repeat center;
+  background-size: contain;
+  display: flex;
+  align-items: center;
+  height: 44px;
+  font-size: 16px;
+  color: #ff7100;
+  line-height: 18px;
+
+  .discountAvatar {
+    margin-left: 15px;
+    width: 36px;
+    height: 36px;
+    border-radius: 50%;
+    overflow: hidden;
+    border: 1px solid #ffaf59;
+  }
+
+  .discountName {
+    padding-left: 30px;
+    max-width: 200px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .discountGift {
+    position: absolute;
+    right: 26px;
+    top: 7px;
+    width: 29px;
+    height: 29px;
+  }
+}
+
+.discountItem {
+  height: 14px;
+  padding-bottom: 2px;
+
+  img {
+    height: 100%;
+  }
+}
+
+.discountBuy {
+  height: 18px;
+  padding-bottom: 0;
+  margin-left: 8px;
+}
+
+.shareBtn {
+  display: flex;
+  align-items: flex-start;
+  color: #666;
+  font-size: 14px;
+  line-height: 20px !important;
+
+  :global(.van-image) {
+    width: 18px;
+    height: 18px;
+    margin-right: 6px;
+  }
+}
+
+.shareVip {
+  position: relative;
+  margin-top: 50px;
+  display: flex;
+  flex: 1;
+  align-items: center;
+  padding: 11px 6px 11px;
+  background: #ffffff;
+  border-radius: 10px;
+
+  .icon {
+    width: 36px;
+    height: 36px;
+    border-radius: 10px;
+  }
+
+  .info {
+    margin-left: 6px;
+    flex: 1;
+    word-break: break-all;
+
+    >h4 {
+      color: var(--music-list-item-title-color);
+      font-size: 14px;
+      font-weight: 600;
+    }
+
+    >p {
+      color: var(--music-list-item-mate-color);
+      line-height: 17px;
+    }
+  }
+}
+
+.tagDiscount {
+  position: absolute;
+  top: -23px;
+  left: 15px;
+  padding: 0 10px;
+  height: 23px;
+  background: linear-gradient(180deg, #ffb635 0%, #ff4e18 100%);
+  border-radius: 8px 8px 0px 0px;
+  font-size: 14px;
+  font-weight: 600;
+  color: #ffffff;
+  line-height: 24px;
+}

src/views/member-center/index.tsx

@@ -243,7 +243,7 @@ export default defineComponent({
                   {!!this.userInfo.isVip && (
                     <Image
                       class={styles.level}
-                      src="https://daya.ks3-cn-beijing.ksyun.com/202107/ScSTL1D.png"
+                      src="https://oss.dayaedu.com/daya/202107/ScSTL1D.png"
                     />
                   )}
                   <span

src/views/tenantStudentRejest/index.tsx

@@ -54,6 +54,7 @@ export default defineComponent({
       birthdate: new Date(dayjs().year(), dayjs().month() + 1, dayjs().date()),
       schoolName: route.query.name || '',
       id: route.query.tenantId,
+      tenantGroupId: route.query.tenantGroupId,
       userSchoolName: '',
       cityName: '', // 所属城市
       showArea: false,
@@ -193,6 +194,9 @@ export default defineComponent({
     }
     onMounted(() => {
       removeAuth()
+      if (data.tenantGroupId) {
+        forms.tenantGroupId = data.tenantGroupId
+      }
       tenantGroupList()
       getSubjectList()
     })
@@ -403,28 +407,32 @@ export default defineComponent({
                         )
                       }}
                     </Field>
-                    <Field
-                      border={false}
-                      inputAlign="right"
-                      label="小组"
-                      placeholder="请选择小组"
-                      readonly
-                      v-model={forms.tenantGroupName}
-                      onClick={() => (data.tenantGroupStatus = true)}
-                    >
-                      {{
-                        button: () => (
-                          <img
-                            style={{
-                              display: 'block',
-                              width: '12px',
-                              height: '12px'
-                            }}
-                            src={icon_arrow}
-                          />
-                        )
-                      }}
-                    </Field>
+                    {data.tenantGroupId ? (
+                      ''
+                    ) : (
+                      <Field
+                        border={false}
+                        inputAlign="right"
+                        label="小组"
+                        placeholder="请选择小组"
+                        readonly
+                        v-model={forms.tenantGroupName}
+                        onClick={() => (data.tenantGroupStatus = true)}
+                      >
+                        {{
+                          button: () => (
+                            <img
+                              style={{
+                                display: 'block',
+                                width: '12px',
+                                height: '12px'
+                              }}
+                              src={icon_arrow}
+                            />
+                          )
+                        }}
+                      </Field>
+                    )}
                   </CellGroup>
                 </Form>
               </div>