0

src/api/yjbdc/yjbdcController.js

@@ -402,25 +402,39 @@ export async function GetMiaoguoTodayAllWords(ctx) {
         .then(res => {
             let list = res.data.result.List;
             if (list && list.length>0) {
-
-                
-                let arr=[];
+                let arr=[],arrNew=[];
+                const today=moment().format("YYYY-MM-DD 00:00:00");
                 for(let i=0;i<list.length;i++){
-                    console.log("问题:"+list[i].Content[1].Content);
-                    console.log("标签:"+list[i].Content[0].Content);
-                    console.log("答案:"+list[i].Content[2].Content);
+                    // console.log("问题:"+list[i].Content[1].Content);
+                    // console.log("标签:"+list[i].Content[0].Content);
+                    // console.log("答案:"+list[i].Content[2].Content);
                     
                     let str1=fun1(list[i].Content[1].Content);
-                    if (str1)
-                        arr.push(str1);
+                    if (str1){
+                        if (list[i].FirstTime>today){
+                            arrNew.push(str1)
+                        }
+                        else{
+                            arr.push(str1);
+                        }
+                    }
                     else{
                         let str2=fun1(list[i].Content[2].Content);
-                        if (str2)
-                            arr.push(str2);
+                        if (str2){
+                            if (list[i].FirstTime>today){
+                                arrNew.push(str2)
+                            }
+                            else{
+                                arr.push(str2);
+                            }
+                        }
                     }
                 }
                 let arr2=stringUtils.extractEnglishWords(arr);
-                return {"errcode": 10000, result:arr2.join(",")}
+                let arr3=stringUtils.extractEnglishWords(arrNew);
+                let arr4=arr3.concat(arr2); 
+                
+                return {"errcode": 10000, result:arr4.join(",")}
             }
             else{
                 return {errcode: 101};