Merge branch 'startLogin' into dev

src/custom-plugins/guide-page/index.module.less

@@ -63,7 +63,7 @@
   border-radius: 8px;
   z-index: 100;
   position: relative;
-  border: 3px solid #55C9F7;
+  border: 3Px solid #55C9F7;
 }
 
 .item {

src/custom-plugins/guide-page/shareResources-guide.tsx

@@ -57,13 +57,13 @@ export default defineComponent({
           img: getImage('shareResources2.png'),
           imgStyle: {
             top: '100%',
-            left:  '630px',
+            left:  '0',
             width: '515px',
             height:'227px'
           },
           btnsStyle: {
             bottom: '75px',
-            left: '724px',
+            left: '125px',
           },
 
           eleRectPadding:{
@@ -72,6 +72,9 @@ export default defineComponent({
             width:14,
             height:14
           },
+          boxStyle:{
+            borderRadius: '15px'
+          },
           type:'bottom'
 
         },
@@ -96,12 +99,23 @@ export default defineComponent({
         const top = data.steps[data.step].eleRectPadding?.top || 0;
         const width = data.steps[data.step].eleRectPadding?.width || 0;
         const height = data.steps[data.step].eleRectPadding?.height || 0
-        data.box = {
-          left: eleRect.x - left+ 'px',
-          top: eleRect.y - top +'px',
-          width: eleRect.width + width+'px',
-          height: eleRect.height +height+ 'px'
-        };
+
+        if(`shareResources-${data.step}`=='shareResources-1'){
+          data.box = {
+            left: eleRect.x - left+ 'px',
+            top: eleRect.y - top +'px',
+            width: (eleRect.width + width)*2+width+'px',
+            height: eleRect.height +height+ 'px'
+          };
+          console.log( data.box.width,'---',eleRect.width)
+        }else{
+          data.box = {
+            left: eleRect.x - left+ 'px',
+            top: eleRect.y - top +'px',
+            width: eleRect.width + width+'px',
+            height: eleRect.height +height+ 'px'
+          };
+        }
         console.log(`coai-${data.step}`,data.box);
       }
     };

src/views/natural-resources/components/share-resources/index.tsx

@@ -95,9 +95,11 @@ export default defineComponent({
         />
 
         <NSpin v-model:show={state.loading} style={{ 'min-height': '50vh' }}>
-          <div class={styles.list} id='shareResources-1'>
-            {state.tableList.map((item: any) => (
-              <CardType
+          <div class={styles.list}>
+            {state.tableList.map((item: any,index:number) => (
+              <>
+              {index ==0?    <CardType
+              {...{id:'shareResources-1'}}
                 item={item}
                 disabledMouseHover={false}
                 onClick={(val: any) => {
@@ -106,7 +108,18 @@ export default defineComponent({
                   state.item = val;
                 }}
                 onCollect={(item: any) => onCollect(item)}
-              />
+              />:    <CardType
+              item={item}
+              disabledMouseHover={false}
+              onClick={(val: any) => {
+                if (val.type === 'IMG') return;
+                state.show = true;
+                state.item = val;
+              }}
+              onCollect={(item: any) => onCollect(item)}
+            />}
+
+              </>
             ))}
 
             {!state.loading && state.tableList.length <= 0 && (

src/views/natural-resources/index.tsx

@@ -16,13 +16,7 @@ export default defineComponent({
           justifyContent="center"
           animated
           paneWrapperClass={styles.paneWrapperContainer}>
-          <NTabPane
-            name="shareResources"
-            tab="共享资源"
-            v-slots={{ tab: () => <span id='shareResources-0'>共享资源</span> }}
-          >
-            <ShareResources />
-          </NTabPane>
+
           <NTabPane
             name="myResources"
             tab="我的资源"
@@ -32,6 +26,13 @@ export default defineComponent({
             <MyResources />
           </NTabPane>
           <NTabPane
+            name="shareResources"
+            tab="共享资源"
+            v-slots={{ tab: () => <span id='shareResources-0'>共享资源</span> }}
+          >
+            <ShareResources />
+          </NTabPane>
+          <NTabPane
             name="myCollect"
             tab="我的收藏"
           // displayDirective="show:lazy"

src/views/prepare-lessons/components/lesson-main/courseware/index.tsx

@@ -309,9 +309,11 @@ export default defineComponent({
                       }}
                       class={styles.list}>
                       {{
-                        item: (element: any) => {
+                        item: (element: any,index:number) => {
                           const item = element.element;
-                          return (
+                          return (<>
+
+
                             <div
                               data-id={item.id}
                               class={[styles.itemBlock, 'row-nav']}>
@@ -333,13 +335,15 @@ export default defineComponent({
                                 />
                               </div>
                             </div>
+                            </>
                           );
                         }
                       }}
                     </Draggable>
                   ) : (
                     <div class={styles.list}>
-                      {forms.coursewareList.map((item: any) => (
+                      {forms.coursewareList.map((item: any,index:number) => (
+
                         <CardType
                           class={[styles.itemContent, 'handle']}
                           isShowCollect={false}