feat:备份页面

pages/zyb/fillVolunteer/mockList.vue

@@ -1,11 +1,10 @@
 <script>
 import StaticConstant from "@/common/StaticConstant";
 import ApiConstant from "@/common/ApiConstant";
-import Request from '@/common/request'
+import Request from '@/common/request';
 import ImagesConstant from "@/common/ImagesConstant";
-import {arrayIsNotEmpty} from "@/common/util";
+import { arrayIsNotEmpty, stringIsNotEmpty } from "@/common/util";
 import vip from "../vip/index.vue";
-import {stringIsNotEmpty} from "../../../common/util";
 
 const app = getApp()
 
@@ -38,6 +37,7 @@ export default {
       circle: { kcj: 0, jwt: 0, nlq: 0, kbd: 0, },//百分比
       modelVale: 0,
       topFlag: false,//显示回到顶部
+
       otherMajor: {
         visible: false,
         status: 'noMore',
@@ -84,6 +84,9 @@ export default {
         total: 0,
       },//分页结果
       filledVolunteer: {
+        visible: false,
+        status: 'noMore',
+
         volunteerId: '',
         volunteerName: '',
         volunteerEarlyAdmissionList: [],//本科提前批
@@ -111,33 +114,19 @@ export default {
       this.selectForm.batch = e.batch;
       this.filledVolunteer.volunteerId = e.volunteerId;
     }
-    if (e.rulesEnrollProbability) {
-      //如果进入页面带着录取方式
-      this.selectForm.rulesEnrollProbabilityList = [e.rulesEnrollProbability]
+    // 判断是否带着录取方式进入页面的
+    this.selectForm.rulesEnrollProbabilityList = e.rulesEnrollProbability ? [e.rulesEnrollProbability] : []
     //遍历筛选菜单，回显高亮录取方式
     for (let i = 0; i < this.menuList.length; i++) {
       if (this.menuList[i].title === '筛选') {
         for (let j = 0; j < this.menuList[i].children.length; j++) {
           if (this.menuList[i].children[j].title === '录取方式') {
-              this.menuList[i].children[j].value=[e.rulesEnrollProbability]
+            this.menuList[i].children[j].value = this.selectForm.rulesEnrollProbabilityList
             break
           }
         }
       }
     }
-    }else{
-      this.selectForm.rulesEnrollProbabilityList = []
-      for (let i = 0; i < this.menuList.length; i++) {
-        if (this.menuList[i].title === '筛选') {
-          for (let j = 0; j < this.menuList[i].children.length; j++) {
-            if (this.menuList[i].children[j].title === '录取方式') {
-              this.menuList[i].children[j].value=[]
-              break
-            }
-          }
-        }
-      }
-    }
 
     setTimeout(() => {
       this.tabBars.forEach((tabBar) => {
@@ -153,6 +142,7 @@ export default {
     this.artVolunteerDetail()
     this.loadMenu()
   },
+  // 当翻滚到底部时
   onReachBottom() {
     if (this.vipInfo && this.vipInfo.vipLevel >= 2) {
       this.loadMore()
@@ -233,28 +223,7 @@ export default {
 
     },
     search() {
-      if (!this.vipInfo || !stringIsNotEmpty(this.vipInfo.vipLevel) || this.vipInfo.vipLevel < 2) {
-        uni.showModal({
-          title: 'VIP专享',
-          // 提示文字
-          content: '该功能为增值内容，开通会员后即可免费查看！',
-          // 取消按钮的文字自定义
-          cancelText: "取消",
-          // 确认按钮的文字自定义
-          confirmText: "开通服务",
-          //删除字体的颜色
-          confirmColor: 'red',
-          //取消字体的颜色
-          cancelColor: '#dddddd',
-          success: function (res) {
-            if (res.confirm) {
-              // 执行确认后的操作
-              that.goto('/pages/zyb/vip/index')
-            }
-          }
-        })
-        return
-      }
+      this.checkVip();
       this.recommendVolunteerList = []
       this.selectForm.paneName = '全部'
       this.page.current = 1
@@ -409,7 +378,6 @@ export default {
           }, { name: '高职高专', id: '高职高专' }]
         }
         //======目前所有批次的专业都可以看到 end
-		console.log('qqq')
         //====================调整默认选中的导航栏 start
         if (this.scoreInfo.professionalCategory === '体育类') {
           if (this.scoreInfo.batch === '本科') {
@@ -437,7 +405,6 @@ export default {
             }
           }
         }
-
         //=====================调整默认选中的导航栏 end
       }
       request.get(ApiConstant.Volunteer.artVolunteerDetail, { id: this.filledVolunteer.volunteerId }).then(res => {
@@ -462,18 +429,14 @@ export default {
               }
               indexs = 1;
               let volunteerUndergraduateList2 = [];
-              while (indexs <= app.globalData.StaticConstant.benZhiYuanNum) {
-                let record = {actives: false, indexs: indexs}
+              let record = {}
               for (let i = 0; i < volunteerUndergraduateList.length; i++) {
-                  if (volunteerUndergraduateList[i].indexs === indexs) {
                 record = volunteerUndergraduateList[i]
                 record.actives = true
-                  }
-                }
                 volunteerUndergraduateList2.push(record)
-                indexs++;
               }
               this.filledVolunteer.volunteerUndergraduateList = volunteerUndergraduateList2
+              
               //==================================本科 end
               //==================================高职高专 start
               let volunteerJuniorCollegeList = dataResult.volunteerRecordJuniorCollegeList;
@@ -481,21 +444,11 @@ export default {
                 key = volunteerJuniorCollegeList[i].enrollmentCode + "_" + volunteerJuniorCollegeList[i].majorCode + "_" + volunteerJuniorCollegeList[i].schoolCode
                 volunteerMap.set(key, volunteerJuniorCollegeList[i])
               }
-              indexs = 1;
               let volunteerJuniorCollegeList2 = [];
-              while (indexs <= app.globalData.StaticConstant.zhuanZhiYuanNum) {
-                let record = {
-                  actives: false,
-                  indexs: indexs
-                }
               for (let i = 0; i < volunteerJuniorCollegeList.length; i++) {
-                  if (volunteerJuniorCollegeList[i].indexs === indexs) {
                 record = volunteerJuniorCollegeList[i]
                 record.actives = true
-                  }
-                }
                 volunteerJuniorCollegeList2.push(record)
-                indexs++;
               }
               this.filledVolunteer.volunteerJuniorCollegeList = volunteerJuniorCollegeList2
             }
@@ -817,6 +770,15 @@ export default {
         this.otherMajor.status = 'noMore'
       });
     },
+    onFillVolunteerOpen(e){
+      console.log(this.filledVolunteer);
+      this.filledVolunteer.visible = true
+    },
+    onFillVolunteerClose(){
+      console.log('关闭已填报专业');
+      
+      this.filledVolunteer.visible = false
+    },
     //打开选择其他专业
     onOtherMajorOpen(e) {
       this.otherMajor.nowMajor = { ...e }
@@ -873,13 +835,8 @@ export default {
             <text @click="search">搜索</text>
           </view>
         </view>
-        <le-dropdown
-            v-model:menuList="menuList"
-            themeColor="#3d76fd"
-            :duration="200"
-            :isCeiling="true"
-            @onConfirm="onConfirm"
-            @onChange="onChange"></le-dropdown>
+        <le-dropdown v-model:menuList="menuList" themeColor="#3d76fd" :duration="200" :isCeiling="true"
+          @onConfirm="onConfirm" @onChange="onChange"></le-dropdown>
       </view>
     </view>
     <view class="divider" />
@@ -935,8 +892,7 @@ export default {
       <scroll-view id="tab-bar" class="scroll-h border-top" :scroll-x="true" :show-scrollbar="false"
         :scroll-into-view="scrollInto" v-if="tabBars[tabIndex] && tabBars[tabIndex].childrenTabBars">
         <view v-for="(tab, index) in tabBars[tabIndex].childrenTabBars" :key="tab.id" class="uni-tab-item2" :id="tab.id"
-              :data-current="index"
-              @click="ontabtap2">
+          :data-current="index" @click="ontabtap2">
           <text class="uni-tab-item-title" :class="tabIndex2 === index ? 'uni-tab-item-title-active' : ''">{{ tab.name }}
           </text>
         </view>
@@ -1047,7 +1003,8 @@ export default {
                   {{ item.privateStudentScore || item.studentConvertedScore }}
                 </text>
               </view>
-              <view style="float: right;line-height: 50rpx;" class="font-weight-600" v-show="app.globalData.StaticConstant.showZeSuan">
+              <view style="float: right;line-height: 50rpx;" class="font-weight-600"
+                v-show="app.globalData.StaticConstant.showZeSuan">
                 <text>折合分</text>
                 <text class="font-size-mini margin-left-10" :style="'color:' + checkColorText(item.enrollProbability)">
                   {{ item.studentScore }}
@@ -1092,9 +1049,22 @@ export default {
       <uni-load-more :status="status" :content-text="contentText" />
     </view>
   </view>
+  <!--已填志愿-->
+  <px-popup-bottom :background="'#ffffff'" :color="'black'" :visible.sync="filledVolunteer.visible" title="" maxHeight="1200"
+  radius="40" @close="onFillVolunteerClose">
+    <view class="flexWrap" style="height: 50rpx;line-height: 50rpx">
+      <view class="flex-item-8">
+        <text class="darkGray font-weight-550">已填志愿信息</text>
+      </view>
+      <view class="flex-item-2">
+        <image @click="onFillVolunteerClose" :src="ImagesConstant.close" class="icon32 float-right"
+          style="position: relative;top: 5rpx" />
+      </view>
+    </view>
+  </px-popup-bottom>
   <!--其他专业-->
-  <px-popup-bottom :background="'#ffffff'" :color="'black'" :visible.sync="otherMajor.visible" title=""
-                   maxHeight="1200" radius="40" @close="onOtherMajorClose">
+  <px-popup-bottom :background="'#ffffff'" :color="'black'" :visible.sync="otherMajor.visible" title="" maxHeight="1200"
+    radius="40" @close="onOtherMajorClose">
     <view class="flexWrap" style="height: 50rpx;line-height: 50rpx">
       <view class="flex-item-8">
         <text class="darkGray font-weight-550">{{ otherMajor.schoolName }}</text>
@@ -1112,7 +1082,8 @@ export default {
           <view class="flexWrap" @click="goto('/pages/zyb/school/detail?schoolCode=' + otherMajor.nowMajor.schoolCode)">
             <view class="flex-item-10 flexWrap">
               <view class="flex-item-65 font-weight-b" style="line-height: 50rpx">
-                <text class="" style="display: flex;">[{{ otherMajor.nowMajor.enrollmentCode }}]{{ otherMajor.nowMajor.majorName }}</text>
+                <text class="" style="display: flex;">[{{ otherMajor.nowMajor.enrollmentCode }}]{{
+                  otherMajor.nowMajor.majorName }}</text>
                 <text class="tag">{{ otherMajor.nowMajor.tuition }}</text>
                 <text v-if="otherMajor.nowMajor.majorDetail">{{ otherMajor.nowMajor.majorDetail }}</text>
                 <!--                <text v-if="otherMajor.nowMajor.limitation">({{otherMajor.nowMajor.limitation}})</text>-->
@@ -1126,7 +1097,8 @@ export default {
               <view class="flex-item-35">
                 <view style="float: right;line-height: 50rpx;" class="font-weight-600" v-if="selectForm.kslx === '统考'">
                   <text class="font-size-mini" :style="'color:' + checkColorText(otherMajor.nowMajor.enrollProbability)">
-                    {{ (vipInfo && vipInfo.vipLevel >= 2) ? formatDecimal(otherMajor.nowMajor.enrollProbability) : '??' }}
+                    {{ (vipInfo && vipInfo.vipLevel >= 2) ? formatDecimal(otherMajor.nowMajor.enrollProbability) : '??'
+                    }}
                   </text>
                   <image :src="checkBao(otherMajor.nowMajor.enrollProbability)" class="icon50"
                     v-if="(vipInfo && vipInfo.vipLevel >= 2)" />
@@ -1262,6 +1234,7 @@ export default {
   <view v-if="recommendVolunteerList && recommendVolunteerList.length > 0">
     <my-checkvip :vip-flag="(vipInfo && vipInfo.vipLevel >= 2)" />
   </view>
+  <uni-icons class="topc" style="top: 73%;" type="eye" size="40" @click="onFillVolunteerOpen"></uni-icons>
   <view class="top" :style="{ 'display': (topFlag === true ? 'block' : 'none') }">
     <uni-icons class="topc" type="arrowthinup" size="40" @click="clickTop"></uni-icons>
   </view>
@@ -1507,6 +1480,7 @@ export default {
 .header {
   border-top: 3rpx solid #f6f6f6;
   background-color: white;
+
   //min-height: 500rpx;
   //搜索栏
   .search-view {
@@ -1570,11 +1544,13 @@ export default {
 /*推荐志愿列表 start*/
 
 .fillVolunteer {
+
   /*padding:0 30rpx 10rpx 30rpx;*/
   .volunteerItem {
     background-color: white;
     padding: 30rpx;
     margin: 10rpx 0;
+
     /*院校标签*/
     .tags {
       display: flex;
@@ -1630,7 +1606,8 @@ export default {
 /* 回到顶部 start*/
 .top {
   position: relative;
-  display: none; /* 先将元素隐藏 */
+  display: none;
+  /* 先将元素隐藏 */
   transition: 0.5s;
 }
 
@@ -1652,5 +1629,4 @@ scroll-view ::-webkit-scrollbar {
   height: 0;
   background-color: transparent;
 }
-
 </style>

pages/zyb/vip/index.vue

@@ -6,7 +6,7 @@ import StaticConstant from "@/common/StaticConstant";
 import ApiConstant from "@/common/ApiConstant";
 import ImagesConstant from "@/common/ImagesConstant";
 import Request from '@/common/request';
-import {stringIsNotEmpty} from "../../../common/util";
+import {stringIsNotEmpty} from "@/common/util";
 import Image from "../../component/image/image.vue";
 const app = getApp()
 let request = new Request()