lex 3 years ago
parent
commit
5a652f84bf

File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.2e84fa4a.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.3784527c.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.58a65b89.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.85d146d0.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.9883c557.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.048fd7f3.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.38a9697d.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.8a46d66e.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.a63c0ce4.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.b988df99.css


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.d418e461.css


File diff suppressed because it is too large
+ 0 - 0
dist/assets/teacher-legacy.3df9810f.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/teacher.5c1382c4.js


+ 2 - 2
dist/index.html

@@ -35,7 +35,7 @@
     <meta name="msapplication-tap-highlight" content="no" />
     <title>酷乐秀</title>
     <script src="./flexible.js" charset="UTF-8"></script>
-    <script type="module" crossorigin src="./assets/index.3a6aca37.js"></script>
+    <script type="module" crossorigin src="./assets/index.8a46d66e.js"></script>
     <link rel="modulepreload" href="./assets/vendor.d0a55a8b.js">
     <link rel="modulepreload" href="./assets/index.c98d2464.js">
     <link rel="stylesheet" href="./assets/vendor.68261ebd.css">
@@ -50,6 +50,6 @@
     <!-- <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.11b78793.js"></script>
-    <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.e3e261aa.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+    <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.2e84fa4a.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
   </body>
 </html>

+ 2 - 2
dist/teacher.html

@@ -35,7 +35,7 @@
     <meta name="msapplication-tap-highlight" content="no" />
     <title>酷乐秀</title>
     <script src="./flexible.js" charset="UTF-8"></script>
-    <script type="module" crossorigin src="./assets/teacher.e6919c81.js"></script>
+    <script type="module" crossorigin src="./assets/teacher.5c1382c4.js"></script>
     <link rel="modulepreload" href="./assets/vendor.d0a55a8b.js">
     <link rel="modulepreload" href="./assets/index.c98d2464.js">
     <link rel="stylesheet" href="./assets/index.cb2212cc.css">
@@ -49,6 +49,6 @@
     
     <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.11b78793.js"></script>
-    <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.9b663db8.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+    <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.3df9810f.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
   </body>
 </html>

+ 5 - 1
src/student/share-active/track-review-activity/index.tsx

@@ -12,6 +12,7 @@ import qs from 'query-string'
 import dayjs from 'dayjs'
 import { orderStatus } from '@/views/order-detail/orderStatus'
 import { difficulty } from '@/constant'
+import { state } from '@/state'
 
 export const getAssetsHomeFile = (fileName: string) => {
   const path = `./images/${fileName}`
@@ -58,6 +59,9 @@ export default defineComponent({
       this.popupStatus = true
       removeAuth()
       return
+    } else if (state.platformType === 'TEACHER') {
+      this.onBackDialog('请使用酷乐秀学生端扫码打开')
+      return
     } else {
       this.hiddenProperty =
         'hidden' in document
@@ -152,7 +156,7 @@ export default defineComponent({
           // 判断是否是收费活动
           orderStatus.orderObject.orderType = 'ACTI_REGIST'
           orderStatus.orderObject.orderName = activeInfo.activityName
-          orderStatus.orderObject.orderDesc = activeInfo.describe
+          orderStatus.orderObject.orderDesc = activeInfo.activityName
           orderStatus.orderObject.actualPrice = activeInfo.registrationPrice
           orderStatus.orderObject.orderNo = res.data?.orderNo || ''
           orderStatus.orderObject.recomUserId = this.recomUserId

+ 10 - 1
src/teacher/share-page/track-review-activity/index.module.less

@@ -1,11 +1,13 @@
 .review {
   min-height: 100vh;
-
+  position: relative;
   overflow: hidden;
   color: #333;
 }
 
 .reviewContainer {
+  position: relative;
+  z-index: 2;
   padding: 0 12px;
 }
 
@@ -289,6 +291,13 @@
   overflow: hidden;
 }
 
+.cover {
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+}
+
 .shareCodeUrl {
   padding: 11px;
   background-color: rgba(255, 255, 255, 0.85);

+ 2 - 0
src/teacher/share-page/track-review-activity/index.tsx

@@ -41,6 +41,7 @@ export default defineComponent({
           '/api-teacher/open/activity/info/' + this.id
         )
         this.activeInfo = res.data
+        document.title = this.activeInfo.activityName
 
         // 设置连接
         this.shareUrl = `${location.origin}/student/#/track-review-activity?recomUserId=${state.user.data?.userId}&id=${this.activeInfo.id}`
@@ -162,6 +163,7 @@ export default defineComponent({
                                 <Image
                                   src={item.userAvatar}
                                   class={styles.userLogo}
+                                  fit="cover"
                                 />
                                 <img
                                   src={getAssetsHomeFile('icon_level.png')}

+ 20 - 11
src/teacher/share-page/track-review-activity/share-model.tsx

@@ -28,11 +28,15 @@ export default defineComponent({
   data() {
     return {
       image: null as any,
-      codeUrl: ''
+      codeUrl: '',
+      subjectUrl: ''
     }
   },
   async mounted() {
     try {
+      // this.subjectUrl = this.activeInfo.subjectUrl + `?t=${dayjs().unix()}`
+      this.subjectUrl = this.activeInfo.subjectUrl + '@base@tag=imgScale&w=570'
+      console.log(this.subjectUrl)
       const shortRes = await request.post('/api-teacher/sysConfig/shortURL', {
         requestType: 'form',
         data: {
@@ -113,10 +117,21 @@ export default defineComponent({
               class={styles.shareContainer}
               id="share-preview-container"
               style={{
-                background: `url(${this.activeInfo.subjectUrl}) no-repeat top center ${this.activeInfo.backgroundUrl}`,
-                backgroundSize: 'contain'
+                // backgroundImage: `url(${this.subjectUrl})`,
+                // backgroundPosition: 'top center',
+                backgroundColor: this.activeInfo.backgroundUrl
+                // backgroundRepeat: 'no-repeat',
+                // backgroundSize: 'contain'
               }}
             >
+              <img
+                class={[styles.cover]}
+                src={this.subjectUrl}
+                crossorigin="anonymous"
+                style={{
+                  objectFit: 'cover'
+                }}
+              />
               <div class={styles.reviewContainer}>
                 <div
                   class={[
@@ -146,16 +161,10 @@ export default defineComponent({
               </div>
             </div>
             <div class={['btnGroup', styles.shareGroupBtn]}>
-              <Button type="primary" plain round>
+              <Button type="primary" plain round onClick={this.onSaveImg}>
                 保存图片
               </Button>
-              <Button
-                type="primary"
-                round
-                onClick={() => {
-                  // this.shareShow()
-                }}
-              >
+              <Button type="primary" round onClick={this.shareShow}>
                 立即分享
               </Button>
             </div>

Some files were not shown because too many files changed in this diff