更新乐团和拖拽问题

package-lock.json

@@ -40,7 +40,7 @@
         "vue-qr": "^4.0.9",
         "vue-router": "^4.0.12",
         "vue3-lottie": "^2.4.0",
-        "vuedraggable": "^2.24.3",
+        "vuedraggable": "^4.1.0",
         "vuex": "^4.0.2"
       },
       "devDependencies": {
@@ -9580,17 +9580,20 @@
       }
     },
     "node_modules/vuedraggable": {
-      "version": "2.24.3",
-      "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.24.3.tgz",
-      "integrity": "sha512-6/HDXi92GzB+Hcs9fC6PAAozK1RLt1ewPTLjK0anTYguXLAeySDmcnqE8IC0xa7shvSzRjQXq3/+dsZ7ETGF3g==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmmirror.com/vuedraggable/-/vuedraggable-4.1.0.tgz",
+      "integrity": "sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==",
       "dependencies": {
-        "sortablejs": "1.10.2"
+        "sortablejs": "1.14.0"
+      },
+      "peerDependencies": {
+        "vue": "^3.0.1"
       }
     },
     "node_modules/vuedraggable/node_modules/sortablejs": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.10.2.tgz",
-      "integrity": "sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A=="
+      "version": "1.14.0",
+      "resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.14.0.tgz",
+      "integrity": "sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w=="
     },
     "node_modules/vuex": {
       "version": "4.0.2",
@@ -16428,17 +16431,17 @@
       }
     },
     "vuedraggable": {
-      "version": "2.24.3",
-      "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.24.3.tgz",
-      "integrity": "sha512-6/HDXi92GzB+Hcs9fC6PAAozK1RLt1ewPTLjK0anTYguXLAeySDmcnqE8IC0xa7shvSzRjQXq3/+dsZ7ETGF3g==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmmirror.com/vuedraggable/-/vuedraggable-4.1.0.tgz",
+      "integrity": "sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==",
       "requires": {
-        "sortablejs": "1.10.2"
+        "sortablejs": "1.14.0"
       },
       "dependencies": {
         "sortablejs": {
-          "version": "1.10.2",
-          "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.10.2.tgz",
-          "integrity": "sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A=="
+          "version": "1.14.0",
+          "resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.14.0.tgz",
+          "integrity": "sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w=="
         }
       }
     },

package.json

@@ -52,7 +52,7 @@
     "vue-qr": "^4.0.9",
     "vue-router": "^4.0.12",
     "vue3-lottie": "^2.4.0",
-    "vuedraggable": "^2.24.3",
+    "vuedraggable": "^4.1.0",
     "vuex": "^4.0.2"
   },
   "devDependencies": {

public/project/css/initiation.css

@@ -184,7 +184,7 @@ span {
     height: 154px;
   }
 .popupContainer {
-  background: url('../images/initiation/wx-no-bg.png') no-repeat top center !important;
+  background: url('../images/initiation/wx-no-bg.png') no-repeat top center;
   background-size: cover;
   border-radius: 20px;
   overflow: hidden;

public/project/css/preRegister.css

@@ -184,7 +184,7 @@ span {
     height: 154px;
   }
 .popupContainer {
-  background: url('../images/initiation/wx-no-bg.png') no-repeat top center !important;
+  background: url('../images/initiation/wx-no-bg.png') no-repeat top center;
   background-size: cover;
   border-radius: 20px;
   overflow: hidden;

src/school/companion-teacher/companion-teacher-register.module.less

@@ -266,7 +266,7 @@ span {
   }
 }
 .popupContainer {
-  background: url('../../student/music-group/pre-apply/images/wx-no-bg.png') no-repeat top center !important;
+  background: url('../../student/music-group/pre-apply/images/wx-no-bg.png') no-repeat top center;
   background-size: cover;
   border-radius: 20px;
   overflow: hidden;

src/school/manage-teacher/manage-teacher-register.module.less

@@ -267,7 +267,7 @@ span {
   }
 }
 .popupContainer {
-  background: url('../../student/music-group/pre-apply/images/wx-no-bg.png') no-repeat top center !important;
+  background: url('../../student/music-group/pre-apply/images/wx-no-bg.png') no-repeat top center;
   background-size: cover;
   border-radius: 20px;
   overflow: hidden;

src/student/music-group/layout/index.module.less

@@ -93,7 +93,7 @@
     }
   }
   .popupContainer {
-    background: url('../pre-apply/images/wx-no-bg.png') no-repeat top center !important;
+    background: url('../pre-apply/images/wx-no-bg.png') no-repeat top center;
     background-size: cover;
     border-radius: 20px;
     overflow: hidden;

src/student/music-group/layout/login.tsx

@@ -40,7 +40,7 @@ export default defineComponent({
       orchestraInfo: {} as any,
 
       // 是否开启微信登录（测试使用）默认为false
-      testIsWeixin: false
+      testIsWeixin: true
     }
   },
   computed: {

src/student/music-group/pre-apply/component/order.tsx

@@ -152,7 +152,8 @@ export default defineComponent({
       router.push({
         path: 'payment-result',
         query: {
-          orderNo: item.orderNo
+          orderNo: item.orderNo,
+          refund: 'refund'
         }
       })
     }

src/student/music-group/pre-apply/component/payment.tsx

@@ -340,7 +340,9 @@ export default defineComponent({
                           >
                             {state.goodsInfo.brandName}
                           </Tag>
-                          <p class={styles.model}>{state.goodsInfo.desciption}</p>
+                          <p class={[styles.model, 'van-multi-ellipsis--l2']}>
+                            {state.goodsInfo.description}
+                          </p>
                         </div>
                       </div>
                     )
@@ -448,7 +450,9 @@ export default defineComponent({
                           >
                             {state.textBookInfo.brandName}
                           </Tag>
-                          <p class={styles.model}>{state.textBookInfo.description}</p>
+                          <p class={[styles.model, 'van-multi-ellipsis--l2']}>
+                            {state.textBookInfo.description}
+                          </p>
                         </div>
                       </div>
                     )
@@ -545,7 +549,9 @@ export default defineComponent({
                           >
                             6个月
                           </Tag>
-                          <p class={styles.model}>{state.vipInfo.description}</p>
+                          <p class={[styles.model, 'van-multi-ellipsis--l2']}>
+                            {state.vipInfo.description}
+                          </p>
                         </div>
                       </div>
                     )

src/student/music-group/pre-apply/index.tsx

@@ -29,7 +29,7 @@ export default defineComponent({
       dialogMessage: '',
 
       // 是否开启微信登录（测试使用）默认为false
-      testIsWeixin: false
+      testIsWeixin: true
     })
 
     const onNext = async (name: string) => {

src/student/payment-result/index.tsx

@@ -30,6 +30,7 @@ export default defineComponent({
   setup() {
     const route = useRoute()
     const state = reactive({
+      refund: route.query.refund,
       orders: {} as any,
       goodsInfos: [] as any,
       background: 'transparent',
@@ -224,7 +225,7 @@ export default defineComponent({
             <div class={styles.buyDetailTitle}>
               <i></i> 购买详情
             </div>
-            {state.orders.refundable ? (
+            {state.orders.refundable && state.refund === 'refund' ? (
               <div
                 class={styles.refundBtn}
                 onClick={() => {

src/student/trade-record/component/paid-list.tsx

@@ -129,7 +129,8 @@ export default defineComponent({
       router.push({
         path: 'payment-result',
         query: {
-          orderNo: item.orderNo
+          orderNo: item.orderNo,
+          refund: 'refund'
         }
       })
     }

src/views/unit-test/model/drag-question/index.tsx

@@ -56,10 +56,15 @@ export default defineComponent({
       drag: false,
       sortable: null as any,
       list: [] as any,
-      options: [] as any
+      options: [] as any,
+      alst: [] as any
     })
 
     onMounted(() => {
+      initSortable()
+    })
+
+    const initSortable = () => {
       nextTick(() => {
         const el = document.getElementById(state.domId)
         state.sortable = Sortable.create(el, {
@@ -80,17 +85,14 @@ export default defineComponent({
           }
         })
       })
-    })
+    }
 
     // 返回选中的结果
     const onSelect = () => {
-      // const options = state.options || []
       const list = state.list || []
       const result: any = []
 
-      console.log(list, '1212')
       list.forEach((item: any, index: number) => {
-        console.log(index, '测试返回')
         result.push({
           answerId: item.index,
           answer: item.leftValue,
@@ -160,8 +162,9 @@ export default defineComponent({
           }
           state.options.push(tmp)
         })
+        state.list = state.options
       }
-      //  else {
+      // else {
       //   const resultValue: any = []
       //   answers.forEach((answer: any) => {
       //     const tmp = {
@@ -235,17 +238,11 @@ export default defineComponent({
                   answers.forEach((item: any) => {
                     ids.push(item.itemIndex)
                   })
-                  console.log(ids)
                   state.sortable.sort(
                     ids.sort((a: any, b: any) => a - b),
                     true
                   )
 
-                  // state.options.forEach((item: any) => {
-                  //   item.checked = false
-                  // })
-                  // state.list = []
-
                   onSelect()
                 }}
               >
@@ -263,7 +260,7 @@ export default defineComponent({
                   {item.leftType === AnswerType.IMAGE && (
                     <Image
                       src={item.leftValue}
-                      data-id={item.index}
+                      data-id={item.itemIndex}
                       class={[styles.imgs, 'van-hairline--surround']}
                       fit="cover"
                     />

src/views/unit-test/unit-list/index.tsx

@@ -44,8 +44,12 @@ export default defineComponent({
           form.list = []
           refreshing.value = false
         }
+        const url =
+          state.platformType === 'TEACHER'
+            ? `${platformApi}/studentUnitExamination/queryPageByTeacher`
+            : `${platformApi}/studentUnitExamination/queryPageByManage`
 
-        const res = await request.post(`${platformApi}/studentUnitExamination/queryPageByTeacher`, {
+        const res = await request.post(url, {
           data: { ...form.params }
         })