Merge branch 'gyt-feature-tianyong' into online

src/subpages/colexiu/App.tsx

@@ -80,6 +80,7 @@ export const userInfo = reactive({
   purchaseMemberRecord: false,
   /**是否会员 */
   vipMember: false,
+  phone: null,
 })
 export const renderError = ref(false)
 export default defineComponent({

src/subpages/colexiu/popups/feedback/index.module.less

@@ -32,8 +32,8 @@
   margin-bottom: 6px;
 }
 .group {
-  display: flex;
-  flex-wrap: wrap;
+  // display: flex;
+  // flex-wrap: wrap;
   :global {
     .van-radio__icon {
       display: none;

src/subpages/colexiu/popups/feedback/index.tsx

@@ -1,9 +1,11 @@
 import { Button, Checkbox, CheckboxGroup, RadioGroup, Radio, Col, Field, Row, Toast } from 'vant'
-import { defineComponent, ref } from 'vue'
+import { defineComponent, ref, onMounted } from 'vue'
 import styles from './index.module.less'
 import bgSubmit from '../../popups/setting/icons/submit.png'
 import request from '/src/helpers/request'
 import { suggestPopup } from '../setting/sett'
+import AppState from '/src/state'
+import { userInfo } from '/src/subpages/colexiu/App'
 
 export default defineComponent({
   name: 'ColexiuFeedBack',
@@ -11,6 +13,8 @@ export default defineComponent({
     const select = ref<string>('识别不准')
     const text = ref<string>('')
     const loading = ref<boolean>(false)
+    const suggestionTypeList = ref([] as any);
+    const suggestId = ref(null as any); // 类型id
 
     const list = [
       { name: '识别不准' },
@@ -21,17 +25,36 @@ export default defineComponent({
       { name: '其他' },
     ]
 
+		// 获取建议类别
+		const getTypeList = async () => {
+			try {
+			  const res = await request.post('/sysSuggestionType/page', {
+          data: { rows: 9999, page: 1 },
+          requestType: "json",
+        })
+			  suggestionTypeList.value = res.data.rows || [];
+			} catch (e) {
+			  //
+			}
+		}    
+
     const submit = () => {
       try {
+        if (!suggestId.value) {
+          return Toast('请先选择问题类型')
+        }
         if (!text.value) {
           return Toast('请先填写意见反馈')
         }
         loading.value = true
+        const phone = userInfo?.phone || AppState.user?.phone
         request.post('/sysSuggestion/save', {
           data: {
             clientType: 'STUDENT',
-            content: text.value + '#' + select.value,
+            content: text.value,
             type: 'SMART_PRACTICE',
+            suggestionTypeId: suggestId.value,
+            mobileNo: phone
           },
         })
         suggestPopup.value?.close()
@@ -39,7 +62,9 @@ export default defineComponent({
       } catch (error) {}
       loading.value = false
     }
-
+		onMounted(() => {
+			getTypeList();
+		});
     return () => (
       <div class={styles.feedback}>
         <div class={styles.wrap}>
@@ -47,9 +72,9 @@ export default defineComponent({
           <div class={styles.sub}>请选择问题类型</div>
           <RadioGroup class={styles.group} v-model={select.value}>
             <Row gutter={4}>
-              {list.map((item) => (
+              {suggestionTypeList.value.map((item: any) => (
                 <Col span={8}>
-                  <Radio name={item.name}>{item.name}</Radio>
+                  <Radio name={item.name} onClick={() => (suggestId.value = item.id)}>{item.name}</Radio>
                 </Col>
               ))}
             </Row>

src/subpages/colexiu/uses/use-app.ts

@@ -51,7 +51,10 @@ export const useXml = async (url: string, detail: MusicSheelDetail) => {
       })
       // 多种乐器分轨合并显示
       if (state.isCombineRender) {
-        setGlobalData('wrapNum', 4)
+        const customNoduleInfo = JSON.parse(localStorage.getItem('customNoduleInfo')) || []
+        const matchMusic = customNoduleInfo.find((n: any) => n.id === id)
+        const xjNum = matchMusic ? matchMusic.customNum : 4
+        setGlobalData('wrapNum', xjNum)
       } else {
         score.value = onlyVisible(score.value, partIndex)
       }