Merge branch 'master' of…

src/components/filter/index.vue

@@ -94,7 +94,7 @@
             </div>
         </div>
         <div class="bottom-wrap">
-            <button class="cancel" @click="onCancel">取消</button>
+            <button class="cancel" @click="onCancel">重置</button>
             <button class="confirm" @click="onConfirm">确认</button>
         </div>
     </div>
@@ -209,7 +209,9 @@ initData();
 const emit = defineEmits(["confirm", "cancel"]);
 // 2. 取消
 const onCancel = () => {
-    emit("cancel");
+    initData()
+    onConfirm()
+    // emit("cancel");
 };
 // 1. 确认 接收数据
 const onConfirm = () => {

src/pages/recommend/index.vue

@@ -47,7 +47,7 @@
                                 @confirm="handleConfirmMajor"
                                 use-default-slot
                             >
-                                <view class="item">{{ majorText || "全部" }} <view class="arrow"></view> </view>
+                                <view class="item">{{ majorText || "不限" }} <view class="arrow"></view> </view>
                             </wd-col-picker>
                         </view>
                         <!-- <view class="item">默认排序<view class="arrow"></view> </view> -->
@@ -231,7 +231,7 @@ const getResumeRecommendList = () => {
     if (activeTab.value === "求职推荐") {
         return getRecommendedResumeListApi(getResumeRecommendListParams.value).then(res => {
             xma.hideLoading();
-            res.data = res.data.filter(v => !v.applied);
+            res.data = res.data?.filter(v => !v.applied);
             refresherEnabled.value = false;
             if (!res.data) {
                 res.data = [];