From 7f70a581c0be449a2d243e690ba2c7a8c15a994e Mon Sep 17 00:00:00 2001
From: zhouwentao <zwt>
Date: Fri, 7 Nov 2025 09:25:22 +0800
Subject: [PATCH] update,backup

---
 .gitignore                                    |    6 +
 App.vue                                       |   18 +-
 common/StaticConstant.js                      |    4 +
 common/request.js                             |   25 +-
 config/env.js                                 |   26 +
 main.js                                       |    2 +-
 pages.json                                    |    7 +
 pages/zyb/fillVolunteer/detail.vue            | 1801 +++++++++--------
 pages/zyb/fillVolunteer/index.vue             |   71 +-
 pages/zyb/fillVolunteer/mockList.vue          |   42 +-
 pages/zyb/fillVolunteer/my-detail.vue         |   18 +-
 pages/zyb/home.vue                            |   66 +-
 pages/zyb/other/volunteerCardDesc.vue         |    6 +-
 pages/zyb/score/edit.vue                      |   76 +-
 pages/zyb/testCultural/detail2.vue            |  322 +++
 pages/zyb/user/index - 副本.vue               |  451 +++++
 pages/zyb/user/index.vue                      |  870 ++++----
 pages/zyb/vip/cardamom.vue                    |    8 +-
 pages/zyb/vip/index-bak.vue                   |    7 +-
 pages/zyb/vip/index.vue                       |   10 +-
 static/image.png                              |  Bin 0 -> 524 bytes
 static/plus.png                               |  Bin 0 -> 1252 bytes
 static/uni.png                                |  Bin 0 -> 4162 bytes
 .../uni-config-center/package-lock.json       |   20 +
 .../common/uni-id/package-lock.json           |   38 +
 .../checkVersion/package-lock.json            |   17 +
 26 files changed, 2495 insertions(+), 1416 deletions(-)
 create mode 100644 config/env.js
 create mode 100644 pages/zyb/testCultural/detail2.vue
 create mode 100644 pages/zyb/user/index - 副本.vue
 create mode 100644 static/image.png
 create mode 100644 static/plus.png
 create mode 100644 static/uni.png
 create mode 100644 uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/package-lock.json
 create mode 100644 uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/package-lock.json
 create mode 100644 uni_modules/uni-upgrade-center-app/uniCloud/cloudfunctions/checkVersion/package-lock.json

diff --git a/.gitignore b/.gitignore
index 8da0824..a42ba9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,3 +69,9 @@ fabric.properties
 
 # Android studio 3.1+ serialized cache file
 .idea/caches/build_file_checksums.ser
+
+node_modules
+node_modules/
+.idea/
+unpackage
+unpackage/
\ No newline at end of file
diff --git a/App.vue b/App.vue
index 9d95ae7..f16388e 100644
--- a/App.vue
+++ b/App.vue
@@ -6,6 +6,15 @@
 		version
 	} from './package.json'
 	import checkUpdate from '@/uni_modules/uni-upgrade-center-app/utils/check-update';
+
+  import ApiConstant from "@/common/ApiConstant";
+  import StaticConstant from "@/common/StaticConstant";
+  import ImagesConstant from "@/common/ImagesConstant";
+  import Request from "@/common/request";
+  import JumpTool from "@/common/js/jumpTool";
+  import CommonTool from "@/common/js/commonTool";
+
+  const request = new Request();
 	export default {
 		onLaunch: function() {
 			// #ifdef H5
@@ -46,7 +55,14 @@
 			console.log('App Hide')
 		},
 		globalData: {
-			test: ''
+			test: '',
+
+      ApiConstant: ApiConstant,
+      StaticConstant: StaticConstant,
+      ImagesConstant: ImagesConstant,
+      JumpTool: JumpTool,
+      CommonTool: CommonTool,
+      Request: request,
 		},
 		methods: {
 			...mapMutations(['setUniverifyErrorMsg', 'setUniverifyLogin'])
diff --git a/common/StaticConstant.js b/common/StaticConstant.js
index d82f24a..d56f58a 100644
--- a/common/StaticConstant.js
+++ b/common/StaticConstant.js
@@ -30,6 +30,10 @@ export default {
             value: '高职高专'
         }
     ],
+    showZeSuan: true,
+    tiQianPiZhiYuanNum: 1,
+    benZhiYuanNum: 35,
+    zhuanZhiYuanNum: 35,
     //专业选项
     professionalCategoryList: [
         {value: '美术与设计类', label: '美术与设计类', scoreMax: 300},
diff --git a/common/request.js b/common/request.js
index 91b24f8..a5bf5df 100644
--- a/common/request.js
+++ b/common/request.js
@@ -1,7 +1,5 @@
 /*网络请求*/
-// import operate from '@/common/operate';
 import ENV_CONFIG from '@/config/env.js';
-import {stringIsNotEmpty} from "@/common/util";
 import ApiConstant from "@/common/ApiConstant";
 // vuex 的使用  详情参考官网 https://uniapp.dcloud.io/vue-vuex
 
@@ -74,11 +72,24 @@ export default class Request {
                         try {
                             uni.clearStorageSync();
                         } catch (e) {}
-                        //请登录
-                        wx.reLaunch({
-                            url: '/pages/zyb/login',
-                        })
-                        return;
+                        // 先显示提示框
+						uni.showModal({
+							title: '提示',
+							content: '该功能需要登录后使用喔~',
+							confirmText: '去登录',
+							cancelText: '取消',
+							success: (res) => {
+								if (res.confirm) {
+									// 用户点击去登录
+									wx.reLaunch({
+										url: '/pages/zyb/login',
+									})
+								}else{
+									uni.navigateBack();
+								}
+							}
+						});
+						return;
                     }
                     // 将结果抛出
                     resolve(res.data)
diff --git a/config/env.js b/config/env.js
new file mode 100644
index 0000000..ab2fb4e
--- /dev/null
+++ b/config/env.js
@@ -0,0 +1,26 @@
+// 不同的环境变量配置
+const wx_yitisheng_prod = {
+    // requestBaseUrl: 'https://yitisheng.vip/jbt',
+	requestBaseUrl: 'http://127.0.0.1:8080/jeecg-boot/',
+    appid: 'wxb9cf28f42ffa35e5',
+    name:'艺体志愿宝'
+}
+
+const dy_yitisheng_prod = {
+    requestBaseUrl: 'https://yitisheng.vip/jbt',
+    appid: 'tt59a72f1ac6964bfa01',
+    name:'艺体志愿宝'
+}
+
+const dy_tiyu_prod = {
+    requestBaseUrl: 'https://yitisheng.vip/jbt',
+    // requestBaseUrl: 'http://192.168.1.108:8080/jeecg-boot/',
+    appid: 'tt9a2bec96051c14c001',
+    name:'体育志愿宝'
+}
+
+export default {
+    wx_yitisheng_prod,
+	dy_yitisheng_prod,
+	dy_tiyu_prod
+}
diff --git a/main.js b/main.js
index 6483825..c597fc9 100644
--- a/main.js
+++ b/main.js
@@ -1,6 +1,7 @@
 import App from './App'
 import store from './store'
 
+
 // #ifndef VUE3
 import Vue from 'vue'
 Vue.config.productionTip = false
@@ -23,7 +24,6 @@ app.$mount()
 import {
 	createSSRApp
 } from 'vue'
-import {setSystemName} from "./common/util";
 export function createApp() {
 	const app = createSSRApp(App)
 	app.use(store)
diff --git a/pages.json b/pages.json
index 62efad6..9fedb72 100644
--- a/pages.json
+++ b/pages.json
@@ -410,6 +410,13 @@
       "style": {
         "navigationBarTitleText": "体育成绩计算器"
       }
+    },
+    {
+      "path": "pages/zyb/testCultural/detail2",
+      "style": {
+        "navigationBarTitleText": "算投档",
+        "enablePullDownRefresh": true
+      }
     }
   ],
   "subPackages": [
diff --git a/pages/zyb/fillVolunteer/detail.vue b/pages/zyb/fillVolunteer/detail.vue
index cd08e2e..9cd7a9e 100644
--- a/pages/zyb/fillVolunteer/detail.vue
+++ b/pages/zyb/fillVolunteer/detail.vue
@@ -1,940 +1,1011 @@
 <script>
-import StaticConstant from "@/common/StaticConstant";
-import ApiConstant from "@/common/ApiConstant";
-import Request from '@/common/request'
-import ImagesConstant from "@/common/ImagesConstant";
-import {stringIsNotEmpty} from "@/common/util";
-import CommonTool from "@/common/js/commonTool";
+	import StaticConstant from "@/common/StaticConstant";
+	import ApiConstant from "@/common/ApiConstant";
+	import Request from '@/common/request'
+	import ImagesConstant from "@/common/ImagesConstant";
+	import {
+		stringIsNotEmpty
+	} from "@/common/util";
+	import CommonTool from "@/common/js/commonTool";
 
-let request = new Request()
-// 缓存每页最多
-const MAX_CACHE_DATA = 100;
-// 缓存页签数量
-const MAX_CACHE_PAGE = 3;
-export default {
-  name: "我的志愿明细",
-  computed: {
-    ImagesConstant() {
-      return ImagesConstant
-    }
-  },
-  data() {
-    return {
-      vipInfo:{},
-      paneFlag: false,
-      scoreStatus: true,
-      moveVolunteer: {
-        batch: '',//移动的批次
-        indexs: '',
-        volunteerId: ''
-      },
-      volunteer:{},
-      volunteerId: '',//志愿id
-      volunteerName: '',//志愿单名称
-      topBackShow: true,//显示回到顶部
-      selectForm: {
-        address: '',
-        schoolName: '',
-        paneName: '全部',
-        batch: '',
-      },
-      scoreInfo: {},//成绩信息
-      volunteerInfo: {},//志愿单信息
-      tabIndex: 0,//导航栏选中的下标
-      scrollInto: "",
-      newsList: [],
-      cacheTab: [],
-      filledVolunteer: {
-        volunteerRecordEarlyAdmissionNum:0,
-        volunteerUndergraduateANum:0,
-        volunteerUndergraduateBNum:0,
-        volunteerUndergraduateNum:0,
-        volunteerJuniorCollegeNum:0,
-        volunteerEarlyAdmissionList: [],//本科提前批
-        volunteerUndergraduateList: [],//体育本科
-        volunteerJuniorCollegeList: [],//高职高专
-        volunteerMap: new Map()
-      },//已填志愿信息
-      years: StaticConstant.years,
-      nowYear: StaticConstant.year,
-      allCollapseItemList: [
-        {batchLabel: '提前批', batch: '提前批', type: '顺序志愿', max: 1, status: false},
-        {batchLabel: '本科批', batch: '本科批', type: '平行志愿', max: 35, status: false},
-        {batchLabel: '高职高专', batch: '高职高专', type: '平行志愿', max: 35, status: false},
-      ],
-      collapseItemList: [],
-      volunteerPreview:{}
-    }
-  },
-  onShow() {
-    //
-    let userInfo = uni.getStorageSync('userInfo')
-    this.scoreInfo = uni.getStorageSync('scoreInfo')
-    this.volunteer = uni.getStorageSync('volunteer')
-    if (userInfo) {
-      //有登录状态
-      this.userStatus = true
-      //判断是否有成绩信息
-      this.scoreInfo = uni.getStorageSync('scoreInfo')
-      if (this.scoreInfo === undefined || this.scoreInfo === null || this.scoreInfo === '') {
-        //缓存中没有成绩，后端接口获取成绩
-        request.getUserScore()
-        this.scoreInfo = uni.getStorageSync('scoreInfo')
-        this.volunteer = uni.getStorageSync('volunteer')
-        if (!this.scoreInfo) {
-          this.scoreStatus = false
-        }else{
-          this.scoreStatus = true
-        }
-      }
-      this.vipInfo = uni.getStorageSync('vipInfo')
-    } else {
-      //没有登录，跳转到登录页
-      this.goto('/pages/zyb/login')
-      return
-    }
+	let request = new Request()
+	// 缓存每页最多
+	const MAX_CACHE_DATA = 100;
+	// 缓存页签数量
+	const MAX_CACHE_PAGE = 3;
 
-    //有成绩信息，且成绩中返回了志愿单信息
-    if (this.scoreInfo && this.volunteer) {
-      this.volunteerId = this.volunteer.id
-    }
+	const app = getApp()
+	export default {
+		name: "我的志愿明细",
+		computed: {
+			ImagesConstant() {
+				return ImagesConstant
+			},
+			app() {
+				return app
+			},
+		},
+		data() {
+			return {
+				vipInfo: {},
+				paneFlag: false,
+				scoreStatus: true,
+				moveVolunteer: {
+					batch: '', //移动的批次
+					indexs: '',
+					volunteerId: ''
+				},
+				volunteer: {},
+				volunteerId: '', //志愿id
+				volunteerName: '', //志愿单名称
+				topBackShow: true, //显示回到顶部
+				selectForm: {
+					address: '',
+					schoolName: '',
+					paneName: '全部',
+					batch: '',
+				},
+				scoreInfo: {}, //成绩信息
+				volunteerInfo: {}, //志愿单信息
+				tabIndex: 0, //导航栏选中的下标
+				scrollInto: "",
+				newsList: [],
+				cacheTab: [],
+				filledVolunteer: {
+					volunteerRecordEarlyAdmissionNum: 0,
+					volunteerUndergraduateANum: 0,
+					volunteerUndergraduateBNum: 0,
+					volunteerUndergraduateNum: 0,
+					volunteerJuniorCollegeNum: 0,
+					volunteerEarlyAdmissionList: [], //本科提前批
+					volunteerUndergraduateList: [], //体育本科
+					volunteerJuniorCollegeList: [], //高职高专
+					volunteerMap: new Map()
+				}, //已填志愿信息
+				years: StaticConstant.years,
+				nowYear: StaticConstant.year,
+				allCollapseItemList: [{
+						batchLabel: '提前批',
+						batch: '提前批',
+						type: '顺序志愿',
+						max: app.globalData.StaticConstant.tiQianPiZhiYuanNum,
+						status: false
+					},
+					{
+						batchLabel: '本科批',
+						batch: '本科批',
+						type: '平行志愿',
+						max: app.globalData.StaticConstant.benZhiYuanNum,
+						status: false
+					},
+					{
+						batchLabel: '高职高专',
+						batch: '高职高专',
+						type: '平行志愿',
+						max: app.globalData.StaticConstant.zhuanZhiYuanNum,
+						status: false
+					},
+				],
+				collapseItemList: [],
+				volunteerPreview: {}
+			}
+		},
+		onShow() {
+			//
+			let userInfo = uni.getStorageSync('userInfo')
+			this.scoreInfo = uni.getStorageSync('scoreInfo')
+			this.volunteer = uni.getStorageSync('volunteer')
+			if (userInfo) {
+				//有登录状态
+				this.userStatus = true
+				//判断是否有成绩信息
+				this.scoreInfo = uni.getStorageSync('scoreInfo')
+				if (this.scoreInfo === undefined || this.scoreInfo === null || this.scoreInfo === '') {
+					//缓存中没有成绩，后端接口获取成绩
+					request.getUserScore()
+					this.scoreInfo = uni.getStorageSync('scoreInfo')
+					this.volunteer = uni.getStorageSync('volunteer')
+					if (!this.scoreInfo) {
+						this.scoreStatus = false
+					} else {
+						this.scoreStatus = true
+					}
+				}
+				this.vipInfo = uni.getStorageSync('vipInfo')
+			} else {
+				//没有登录，跳转到登录页
+				this.goto('/pages/zyb/login')
+				return
+			}
 
-    if (stringIsNotEmpty(this.volunteerId)) {
-      this.getFilledVolunteerList()
-    }
-  },
-  async onLoad(e) {
-    if (e.volunteerId) {
-      //从志愿列表进来
-      this.volunteerId = e.volunteerId;
-      console.log(e.volunteerId)
-    }
-    // 志愿单打印配置
-    this.volunteerPreview = await CommonTool.loadStaticConfig('volunteer_preview')
-  },
-  methods: {
-    goto(url) {
-      uni.navigateTo({url: url})
-    },
-    gotoSchool(e) {
-      this.goto('/pages/zyb/school/detail?schoolCode=' + e)
-    },
-    topBack() {
-      uni.pageScrollTo({
-        scrollTop: 0,   // 滚动到页面的目标位置  这个是滚动到顶部, 0
-        duration: 300  // 滚动动画的时长
-      })
-    },
-    clearTabData(e) {
-      this.newsList[e].data.length = 0;
-      this.newsList[e].loadingText = "加载更多...";
-    },
+			//有成绩信息，且成绩中返回了志愿单信息
+			if (this.scoreInfo && this.volunteer) {
+				this.volunteerId = this.volunteer.id
+			}
 
-    /*获取已填报志愿数据*/
-    getFilledVolunteerList() {
-      request.get(ApiConstant.Volunteer.artVolunteerDetail, {id: this.volunteerId},{showLoad:false}).then(res => {
-        if (res.success) {
-          let dataResult = res.result
-          //有数据情况下
-          const volunteerMap = new Map();
-          if (dataResult != null) {
-            this.volunteerId = dataResult.id
-            this.volunteerInfo = dataResult
-            this.scoreInfo = dataResult.userScoreInfo
-            //如果当前专业是体育，更改展开栏
-            if (this.scoreInfo.professionalCategory === '体育类') {
-              this.allCollapseItemList = [
-                {batchLabel: '本科批', batch: '本科批', type: '平行志愿', max: 35, status: false},
-                {batchLabel: '高职高专', batch: '高职高专', type: '平行志愿', max: 35, status: false},
-              ]
-            }
-            if (this.scoreInfo.batch) {
-              this.paneFlag = true
-              this.selectForm.batch = this.scoreInfo.batch
-              let allCollapseItemList = this.allCollapseItemList
-              let collapseItemList = []
-              //调整 当前成绩批次可以看到的导航栏
-              for (let i = 0; i < allCollapseItemList.length; i++) {
-                if (this.scoreInfo.batch === '高职高专') {
-                  if (allCollapseItemList[i].batch === '本科批') {
-                    continue
-                  }
-                }
-                collapseItemList.push(allCollapseItemList[i])
-                this.collapseItemList = collapseItemList
-              }
-            }
-            let key = ''
-            let volunteer = {indexStr: 0}
-            let indexs = 1;
-            if (true) {
-              //==================================提前批 start
-              let volunteerRecordEarlyAdmissionList = dataResult.volunteerRecordEarlyAdmissionList;
-              this.filledVolunteer.volunteerRecordEarlyAdmissionNum = volunteerRecordEarlyAdmissionList.length;
-              for (let i = 0; i < volunteerRecordEarlyAdmissionList.length; i++) {
-                key = volunteerRecordEarlyAdmissionList[i].majorCode + volunteerRecordEarlyAdmissionList[i].schoolCode
-                volunteer = volunteerRecordEarlyAdmissionList[i]
-                volunteerMap.set(key, volunteerRecordEarlyAdmissionList[i])
-              }
-              let volunteerRecordEarlyAdmissionList2 = [];
-              while (indexs <= 1) {
-                let record = {
-                  actives: false,
-                  indexs: indexs
-                }
-                for (let i = 0; i < volunteerRecordEarlyAdmissionList.length; i++) {
-                  if (volunteerRecordEarlyAdmissionList[i].indexs === indexs) {
-                    record = volunteerRecordEarlyAdmissionList[i]
-                    record.actives = true
-                  }
-                }
-                volunteerRecordEarlyAdmissionList2.push(record)
-                indexs++;
-              }
-              this.filledVolunteer.volunteerEarlyAdmissionList = volunteerRecordEarlyAdmissionList2
-              //==================================提前批 end
-              //==================================本科 start
-              let volunteerUndergraduateList = dataResult.volunteerRecordUndergraduateList;
-              this.filledVolunteer.volunteerUndergraduateNum = volunteerUndergraduateList.length;
-              console.log('//==================================本科 start')
-              console.log(volunteerUndergraduateList)
-              for (let i = 0; i < volunteerUndergraduateList.length; i++) {
-                key = volunteerUndergraduateList[i].majorCode + volunteerUndergraduateList[i].schoolCode
-                volunteerMap.set(key, volunteerUndergraduateList[i])
-              }
-              indexs = 1;
-              let volunteerUndergraduateList2 = [];
-              while (indexs <= 35) {
-                let record = {actives: false, indexs: indexs}
-                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;
-              this.filledVolunteer.volunteerJuniorCollegeNum = volunteerJuniorCollegeList.length;
-              for (let i = 0; i < volunteerJuniorCollegeList.length; i++) {
-                key = volunteerJuniorCollegeList[i].majorCode + volunteerJuniorCollegeList[i].schoolCode
-                volunteerMap.set(key, volunteerJuniorCollegeList[i])
-              }
-              indexs = 1;
-              let volunteerJuniorCollegeList2 = [];
-              while (indexs <= 35) {
-                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
-              //==================================高职高专 end
-            }
-          } else {
-            this.filledVolunteer.volunteerEarlyAdmissionList = []
-            this.filledVolunteer.volunteerJuniorCollegeList = []
-            this.filledVolunteer.volunteerUndergraduateList = []
-            this.filledVolunteer.volunteerList = []
-          }
-          this.filledVolunteer.volunteerMap = volunteerMap
-        }
-      }).catch(err => {
-      }).finally(() => {
-      });
-    },
-    /*计算百分比*/
-    toPercent(num, total) {
-      return (Math.round(num / total * 10000) / 100.00);// 小数点后两位百分比
-    },
-    /*悬浮按钮*/
-    trigger(e) {
-      console.log(e)
-      /*this.fab.content[e.index].active = !e.item.active*/
-      if (e.item.text === '回到顶部') {
-        this.topBack()
-      }
-    },
-    fabClick() {
-    },
-    /*点击移动*/
-    onClickMove(e) {
-      this.moveVolunteer.volunteerId = this.volunteerId;
-      this.moveVolunteer.id = e.id;
-      this.moveVolunteer.batch = e.batch
-      this.$refs.inputDialog.open()
-    },
-    /*点击交换*/
-    onClickExChange(e) {
-      this.moveVolunteer.volunteerId = this.volunteerId;
-      this.moveVolunteer.id = e.id;
-      this.moveVolunteer.batch = e.batch
-      this.$refs.inputDialog.open()
-    },
-    /*选择是否删除明细*/
-    confirmDelVolunteerItem(e) {
-      let that = this
-      console.log('删除提示')
-      console.log(e)
-      uni.showModal({
-        title: '提示',
-        content: '确认要删除志愿' + e.indexs + '吗?',
-        confirmText: '确定',
-        cancelText: '取消',
-        success: function (res) {
-          if (res.confirm) {
-            that.deleteVolunteerItem(e)
-          }
-        }
-      });
-    },
-    /*确认删除志愿明细*/
-    deleteVolunteerItem(e) {
-      let that = this
-      request.delete(ApiConstant.Volunteer.volunteerRecordDelete, {id: e.id}).then(res => {
-        if (res.success) {
-          setTimeout(function () {
-            uni.showToast({title: '删除成功', icon: "none"});
-          }, 1000)
-          setTimeout(function () {
-            that.getFilledVolunteerList()
-          }, 1500)
-        } else {
-          setTimeout(function () {
-            uni.showToast({title: res.message, icon: "none"});
-          }, 500)
-        }
-      }).catch(err => {
-      }).finally(() => {
-      });
-    },
-    fctjCheckboxChange(e) {
-      console.log('服从调剂')
-      console.log(e)
-      request.post(ApiConstant.Volunteer.updateFctj, {id: e}).then(res => {
-      }).catch(err => {
-      }).finally(() => {
-      });
-    },
-    toAdd() {
-      uni.navigateTo({
-        url: 'mockList?batch=' + this.selectForm.batch + '&volunteerId=' + this.volunteerId
-      })
-    },
-    change(e) {
-      console.log(e);
-    },
-    /*确认移动志愿*/
-    moveIndexsConfirm() {
-      if (!this.moveVolunteer.indexs) {
-        uni.showToast({title: '请输入志愿序号', icon: "none"});
-        return;
-      }
-      let indexs = parseFloat(this.moveVolunteer.indexs)
-      if (this.moveVolunteer.batch === '提前批') {
-        if (indexs > 4 || indexs < 0) {
-          uni.showToast({title: '您输入的序号超出', icon: "none"});
-          this.moveVolunteer.indexs = ''
-          return;
-        }
-      } else {
-        if (indexs > (this.scoreInfo.professionalCategory==='体育类'?12:35) || indexs < 0) {
-          uni.showToast({title: '您输入的序号超出', icon: "none"});
-          this.moveVolunteer.indexs = ''
-          return;
-        }
-      }
-      let that = this
-      request.post(ApiConstant.Volunteer.exChangeIndexs, this.moveVolunteer).then(res => {
-        if (res.success) {
-          this.moveVolunteer.indexs = ''
-          this.moveVolunteer.batch = ''
-          this.moveVolunteer.volunteerId = ''
-          setTimeout(function () {
-            that.getFilledVolunteerList();
-          }, 1000)
-        } else {
-          setTimeout(function () {
-            uni.showToast({title: res.message, icon: "none"});
-          }, 500)
-        }
-      }).catch(err => {
-      }).finally(() => {
-      });
-    },
-    onClickEditUserScore() {
-      this.goto('/pages/zyb/score/edit')
-    },
-    /*点击创建志愿单*/
-    onClickCreateVolunteer(){
-      let that = this
-      request.post(ApiConstant.Volunteer.addNew, {
-        volunteerName:'模拟志愿草表'
-      },{}).then(res => {
-        uni.setStorageSync('volunteerInfo',res.result)
-        request.getUserScore()
-      }).catch(err => {
-      }).finally(() => {
-      });
-    },
-    /*返回已填志愿数量*/
-    getVolunteerNum(citem){
-      if (citem.batch === '提前批') {
-        return this.filledVolunteer.volunteerRecordEarlyAdmissionNum
-      }else if(citem.batch === '本科批'){
-        return this.filledVolunteer.volunteerUndergraduateNum
-      }else{
-        return this.filledVolunteer.volunteerJuniorCollegeNum
-      }
-    },
-    onPreview(){
-      if(this.volunteerPreview && this.volunteerPreview.type==='1'){
-        let href = this.volunteerPreview.filePrefixUrl +'?id='+this.volunteerId+"&type=1"
-        let message = this.volunteerPreview.message
-        // 跳转浏览器下载
-        uni.setClipboardData({
-          data: href
-        });
-        uni.showModal({
-          content: message,
-          showCancel: false
-        });
-      }else{
-        // web-view预览
-        let href = this.volunteerPreview.webViewUrl+'?id='+this.volunteerId+"&type=2"
-        uni.setStorageSync('volunteer_preview',href)
-        uni.navigateTo({
-          url: '/pages/zyb/other/web-view?url=volunteer_preview'
-        })
-      }
+			if (stringIsNotEmpty(this.volunteerId)) {
+				this.getFilledVolunteerList()
+			}
+		},
+		async onLoad(e) {
+			if (e.volunteerId) {
+				//从志愿列表进来
+				this.volunteerId = e.volunteerId;
+				console.log(e.volunteerId)
+			}
+			// 志愿单打印配置
+			this.volunteerPreview = await CommonTool.loadStaticConfig('volunteer_preview')
+		},
+		methods: {
+			goto(url) {
+				uni.navigateTo({
+					url: url
+				})
+			},
+			gotoSchool(e) {
+				this.goto('/pages/zyb/school/detail?schoolCode=' + e)
+			},
+			topBack() {
+				uni.pageScrollTo({
+					scrollTop: 0, // 滚动到页面的目标位置  这个是滚动到顶部, 0
+					duration: 300 // 滚动动画的时长
+				})
+			},
+			clearTabData(e) {
+				this.newsList[e].data.length = 0;
+				this.newsList[e].loadingText = "加载更多...";
+			},
 
-    }
-  }
-}
+			/*获取已填报志愿数据*/
+			getFilledVolunteerList() {
+				request.get(ApiConstant.Volunteer.artVolunteerDetail, {
+					id: this.volunteerId
+				}, {
+					showLoad: false
+				}).then(res => {
+					if (res.success) {
+						let dataResult = res.result
+						//有数据情况下
+						const volunteerMap = new Map();
+						if (dataResult != null) {
+							this.volunteerId = dataResult.id
+							this.volunteerInfo = dataResult
+							this.scoreInfo = dataResult.userScoreInfo
+							//如果当前专业是体育，更改展开栏
+							if (this.scoreInfo.professionalCategory === '体育类') {
+								this.allCollapseItemList = [{
+										batchLabel: '本科批',
+										batch: '本科批',
+										type: '平行志愿',
+										max: 64,
+										status: false
+									},
+									{
+										batchLabel: '高职高专',
+										batch: '高职高专',
+										type: '平行志愿',
+										max: 64,
+										status: false
+									},
+								]
+							}
+							if (this.scoreInfo.batch) {
+								this.paneFlag = true
+								this.selectForm.batch = this.scoreInfo.batch
+								let allCollapseItemList = this.allCollapseItemList
+								let collapseItemList = []
+								//调整 当前成绩批次可以看到的导航栏
+								for (let i = 0; i < allCollapseItemList.length; i++) {
+									if (this.scoreInfo.batch === '高职高专') {
+										if (allCollapseItemList[i].batch === '本科批') {
+											continue
+										}
+									}
+									collapseItemList.push(allCollapseItemList[i])
+									this.collapseItemList = collapseItemList
+								}
+							}
+							let key = ''
+							let volunteer = {
+								indexStr: 0
+							}
+							let indexs = 1;
+							if (true) {
+								//==================================提前批 start
+								let volunteerRecordEarlyAdmissionList = dataResult
+									.volunteerRecordEarlyAdmissionList;
+								this.filledVolunteer.volunteerRecordEarlyAdmissionNum =
+									volunteerRecordEarlyAdmissionList.length;
+								for (let i = 0; i < volunteerRecordEarlyAdmissionList.length; i++) {
+									key = volunteerRecordEarlyAdmissionList[i].majorCode +
+										volunteerRecordEarlyAdmissionList[i].schoolCode
+									volunteer = volunteerRecordEarlyAdmissionList[i]
+									volunteerMap.set(key, volunteerRecordEarlyAdmissionList[i])
+								}
+								let volunteerRecordEarlyAdmissionList2 = [];
+								while (indexs <= 1) {
+									let record = {
+										actives: false,
+										indexs: indexs
+									}
+									for (let i = 0; i < volunteerRecordEarlyAdmissionList.length; i++) {
+										if (volunteerRecordEarlyAdmissionList[i].indexs === indexs) {
+											record = volunteerRecordEarlyAdmissionList[i]
+											record.actives = true
+										}
+									}
+									volunteerRecordEarlyAdmissionList2.push(record)
+									indexs++;
+								}
+								this.filledVolunteer.volunteerEarlyAdmissionList =
+									volunteerRecordEarlyAdmissionList2
+								//==================================提前批 end
+								//==================================本科 start
+								let volunteerUndergraduateList = dataResult.volunteerRecordUndergraduateList;
+								this.filledVolunteer.volunteerUndergraduateNum = volunteerUndergraduateList.length;
+								console.log('//==================================本科 start')
+								console.log(volunteerUndergraduateList)
+								for (let i = 0; i < volunteerUndergraduateList.length; i++) {
+									key = volunteerUndergraduateList[i].majorCode + volunteerUndergraduateList[i]
+										.schoolCode
+									volunteerMap.set(key, volunteerUndergraduateList[i])
+								}
+								indexs = 1;
+								let volunteerUndergraduateList2 = [];
+								while (indexs <= 64) {
+									let record = {
+										actives: false,
+										indexs: indexs
+									}
+									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;
+								this.filledVolunteer.volunteerJuniorCollegeNum = volunteerJuniorCollegeList.length;
+								for (let i = 0; i < volunteerJuniorCollegeList.length; i++) {
+									key = volunteerJuniorCollegeList[i].majorCode + volunteerJuniorCollegeList[i]
+										.schoolCode
+									volunteerMap.set(key, volunteerJuniorCollegeList[i])
+								}
+								indexs = 1;
+								let volunteerJuniorCollegeList2 = [];
+								while (indexs <= 64) {
+									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
+								//==================================高职高专 end
+							}
+						} else {
+							this.filledVolunteer.volunteerEarlyAdmissionList = []
+							this.filledVolunteer.volunteerJuniorCollegeList = []
+							this.filledVolunteer.volunteerUndergraduateList = []
+							this.filledVolunteer.volunteerList = []
+						}
+						this.filledVolunteer.volunteerMap = volunteerMap
+					}
+				}).catch(err => {}).finally(() => {});
+			},
+			/*计算百分比*/
+			toPercent(num, total) {
+				return (Math.round(num / total * 10000) / 100.00); // 小数点后两位百分比
+			},
+			/*悬浮按钮*/
+			trigger(e) {
+				console.log(e)
+				/*this.fab.content[e.index].active = !e.item.active*/
+				if (e.item.text === '回到顶部') {
+					this.topBack()
+				}
+			},
+			fabClick() {},
+			/*点击移动*/
+			onClickMove(e) {
+				this.moveVolunteer.volunteerId = this.volunteerId;
+				this.moveVolunteer.id = e.id;
+				this.moveVolunteer.batch = e.batch
+				this.$refs.inputDialog.open()
+			},
+			/*点击交换*/
+			onClickExChange(e) {
+				this.moveVolunteer.volunteerId = this.volunteerId;
+				this.moveVolunteer.id = e.id;
+				this.moveVolunteer.batch = e.batch
+				this.$refs.inputDialog.open()
+			},
+			/*选择是否删除明细*/
+			confirmDelVolunteerItem(e) {
+				let that = this
+				console.log('删除提示')
+				console.log(e)
+				uni.showModal({
+					title: '提示',
+					content: '确认要删除志愿' + e.indexs + '吗?',
+					confirmText: '确定',
+					cancelText: '取消',
+					success: function(res) {
+						if (res.confirm) {
+							that.deleteVolunteerItem(e)
+						}
+					}
+				});
+			},
+			/*确认删除志愿明细*/
+			deleteVolunteerItem(e) {
+				let that = this
+				request.delete(ApiConstant.Volunteer.volunteerRecordDelete, {
+					id: e.id
+				}).then(res => {
+					if (res.success) {
+						setTimeout(function() {
+							uni.showToast({
+								title: '删除成功',
+								icon: "none"
+							});
+						}, 1000)
+						setTimeout(function() {
+							that.getFilledVolunteerList()
+						}, 1500)
+					} else {
+						setTimeout(function() {
+							uni.showToast({
+								title: res.message,
+								icon: "none"
+							});
+						}, 500)
+					}
+				}).catch(err => {}).finally(() => {});
+			},
+			fctjCheckboxChange(e) {
+				console.log('服从调剂')
+				console.log(e)
+				request.post(ApiConstant.Volunteer.updateFctj, {
+					id: e
+				}).then(res => {}).catch(err => {}).finally(() => {});
+			},
+			toAdd() {
+				uni.navigateTo({
+					url: 'mockList?batch=' + this.selectForm.batch + '&volunteerId=' + this.volunteerId
+				})
+			},
+			change(e) {
+				console.log(e);
+			},
+			/*确认移动志愿*/
+			moveIndexsConfirm() {
+				if (!this.moveVolunteer.indexs) {
+					uni.showToast({
+						title: '请输入志愿序号',
+						icon: "none"
+					});
+					return;
+				}
+				let indexs = parseFloat(this.moveVolunteer.indexs)
+				if (this.moveVolunteer.batch === '提前批') {
+					if (indexs > 4 || indexs < 0) {
+						uni.showToast({
+							title: '您输入的序号超出',
+							icon: "none"
+						});
+						this.moveVolunteer.indexs = ''
+						return;
+					}
+				} else {
+					if (indexs > (this.scoreInfo.professionalCategory === '体育类' ? 64:64) || indexs < 0) {
+						uni.showToast({
+							title: '您输入的序号超出',
+							icon: "none"
+						});
+						this.moveVolunteer.indexs = ''
+						return;
+					}
+				}
+				let that = this
+				request.post(ApiConstant.Volunteer.exChangeIndexs, this.moveVolunteer).then(res => {
+					if (res.success) {
+						this.moveVolunteer.indexs = ''
+						this.moveVolunteer.batch = ''
+						this.moveVolunteer.volunteerId = ''
+						setTimeout(function() {
+							that.getFilledVolunteerList();
+						}, 1000)
+					} else {
+						setTimeout(function() {
+							uni.showToast({
+								title: res.message,
+								icon: "none"
+							});
+						}, 500)
+					}
+				}).catch(err => {}).finally(() => {});
+			},
+			onClickEditUserScore() {
+				this.goto('/pages/zyb/score/edit')
+			},
+			/*点击创建志愿单*/
+			onClickCreateVolunteer() {
+				let that = this
+				request.post(ApiConstant.Volunteer.addNew, {
+					volunteerName: '模拟志愿草表'
+				}, {}).then(res => {
+					uni.setStorageSync('volunteerInfo', res.result)
+					request.getUserScore()
+				}).catch(err => {}).finally(() => {});
+			},
+			/*返回已填志愿数量*/
+			getVolunteerNum(citem) {
+				if (citem.batch === '提前批') {
+					return this.filledVolunteer.volunteerRecordEarlyAdmissionNum
+				} else if (citem.batch === '本科批') {
+					return this.filledVolunteer.volunteerUndergraduateNum
+				} else {
+					return this.filledVolunteer.volunteerJuniorCollegeNum
+				}
+			},
+			onPreview() {
+				if (this.volunteerPreview && this.volunteerPreview.type === '1') {
+					let href = this.volunteerPreview.filePrefixUrl + '?id=' + this.volunteerId + "&type=1"
+					let message = this.volunteerPreview.message
+					// 跳转浏览器下载
+					uni.setClipboardData({
+						data: href
+					});
+					uni.showModal({
+						content: message,
+						showCancel: false
+					});
+				} else {
+					// web-view预览
+					let href = this.volunteerPreview.webViewUrl + '?id=' + this.volunteerId + "&type=2"
+					uni.setStorageSync('volunteer_preview', href)
+					uni.navigateTo({
+						url: '/pages/zyb/other/web-view?url=volunteer_preview'
+					})
+				}
+
+			}
+		}
+	}
 </script>
 
 <template>
-  <view class="divider"/>
-  <!-- 没有成绩界面 -->
-  <view class="container" v-if="!this.scoreInfo">
-    <text>当前没有成绩信息，请先修改成绩~</text>
-    <text class="margin-left-30 font-weight-none mediumSlateBlue" @click="onClickEditUserScore">修改成绩</text>
-  </view>
-  <view class="container">
-    <!--成绩卡片-->
-    <view class="score-info-card white" v-if="this.scoreInfo">
-      <view class="flexWrap">
-        <view class="flex-item-8">
-          <text class="font-size-mini4 font-weight-550">{{ volunteerInfo.volunteerName }}</text>
-        </view>
-        <view class="flex-item-2">
-          <button v-show="volunteerId" type="primary" style="height: 42rpx;line-height: 42rpx" @click="onPreview">打印</button>
-        </view>
+	<view class="divider" />
+	<!-- 没有成绩界面 -->
+	<view class="container" v-if="!this.scoreInfo">
+		<text>当前没有成绩信息，请先修改成绩~</text>
+		<text class="margin-left-30 font-weight-none mediumSlateBlue" @click="onClickEditUserScore">修改成绩</text>
+	</view>
+	<view class="container">
+		<!--成绩卡片-->
+		<view class="score-info-card white" v-if="this.scoreInfo">
+			<view class="flexWrap">
+				<view class="flex-item-8">
+					<text class="font-size-mini4 font-weight-550">{{ volunteerInfo.volunteerName }}</text>
+				</view>
+				<view class="flex-item-2">
+					<button v-show="volunteerId" type="primary" style="height: 42rpx;line-height: 42rpx"
+						@click="onPreview">打印</button>
+				</view>
 
-      </view>
-      <view class="flexWrap tags font-size-mini2" v-if="scoreInfo">
-        <view class="tag">{{ scoreInfo.province }}</view>
-        <view class="tag">{{ scoreInfo.cognitioPolyclinic === '文科'?'历史组':'物理组' }}</view>
-        <view class="tag">{{ scoreInfo.professionalCategory }}</view>
-      </view>
-      <view class="flexWrap">
-        <view class="score flex-item-10">
-          <view class="flexWrap" style="height: 30rpx;">
-            <view class="scoreLeft margin-right-30">
-              <text class="margin-right-10">文化分</text>
-              <text class="font-weight-b">{{ scoreInfo.culturalScore }}</text>
-            </view>
-            <view style="border-right:1rpx solid white"></view>
-            <view class="scoreRight margin-left-30">
-              <text class="margin-right-10">统考分</text>
-              <text class="margin-right-10 font-weight-b">{{ scoreInfo.professionalScore }}</text>
-            </view>
-          </view>
-          <view class="flexWrap" style="margin-top: 30rpx;height: 30rpx;"  v-if="scoreInfo && scoreInfo.professionalCategoryChildren">
-            <view class="scoreLeft margin-right-20" v-if="scoreInfo.yybysy && scoreInfo.yybysy!==0">
-              <text class="margin-right-10">音乐表演声乐</text>
-              <text class="font-weight-b">{{ scoreInfo.yybysy }}</text>
-            </view>
-            <view class="scoreLeft margin-right-20" v-if="scoreInfo.yybyqy && scoreInfo.yybyqy!==0">
-              <text class="margin-right-10">音乐表演器乐</text>
-              <text class="font-weight-b">{{ scoreInfo.yybyqy }}</text>
-            </view>
-            <view class="scoreLeft margin-right-20" v-if="scoreInfo.yyjy && scoreInfo.yyjy!==0">
-              <text class="margin-right-10">音乐教育</text>
-              <text class="font-weight-b">{{ scoreInfo.yyjy }}</text>
-            </view>
-            <view class="scoreLeft margin-right-20" v-if="scoreInfo.fzby && scoreInfo.fzby!==0">
-              <text class="margin-right-10">服装表演</text>
-              <text class="font-weight-b">{{ scoreInfo.fzby }}</text>
-            </view>
-            <view class="scoreLeft margin-right-20" v-if="scoreInfo.xjysdy && scoreInfo.xjysdy!==0">
-              <text class="margin-right-10">戏剧影视导演</text>
-              <text class="font-weight-b">{{ scoreInfo.xjysdy }}</text>
-            </view>
-            <view class="scoreLeft margin-right-20" v-if="scoreInfo.xjysby && scoreInfo.xjysby!==0">
-              <text class="margin-right-10">戏剧影视表演</text>
-              <text class="font-weight-b">{{ scoreInfo.xjysby }}</text>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-    <view class="divider"/>
-    <!--志愿信息-->
-    <view class="fillVolunteerList" v-if="collapseItemList.length>0">
-      <view class="collapse">
-        <view class="collapse-item" v-for="(citem,cindex) in collapseItemList" :key="cindex">
-          <view class="collapse-head" @click="collapseItemList[cindex].status=!collapseItemList[cindex].status">
-            <view class="flexWrap" style="background-color: #f5f5f5;line-height: 80rpx;">
-              <view class="flex-item-8">
-                <view style="padding-left: 30rpx;">
-                  <text class="font-size-mini3 font-weight-b">{{ citem.batchLabel }}({{getVolunteerNum(citem)}}/{{ citem.max }})</text>
-                  <text class="font-size-mini margin-left-10 slateGray">{{ citem.type }}</text>
-                </view>
-              </view>
-              <view class="flex-item-2">
-                <text class="float-right" style="margin-right: 30rpx">{{ citem.status ? '收起' : '展开' }}</text>
-              </view>
-            </view>
-          </view>
-          <view class="collapse-body" v-show="citem.status" style="">
-            <view class="volunteerItem" v-for="(item,index) in (citem.batch==='高职高专')?filledVolunteer.volunteerJuniorCollegeList:
+			</view>
+			<view class="flexWrap tags font-size-mini2" v-if="scoreInfo">
+				<view class="tag">{{ scoreInfo.province }}</view>
+				<view class="tag">{{ scoreInfo.cognitioPolyclinic === '文科'?'历史组':'物理组' }}</view>
+				<view class="tag">{{ scoreInfo.professionalCategory }}</view>
+			</view>
+			<view class="flexWrap">
+				<view class="score flex-item-10">
+					<view class="flexWrap" style="height: 30rpx;">
+						<view class="scoreLeft margin-right-30">
+							<text class="margin-right-10">文化分</text>
+							<text class="font-weight-b">{{ scoreInfo.culturalScore }}</text>
+						</view>
+						<view style="border-right:1rpx solid white"></view>
+						<view class="scoreRight margin-left-30">
+							<text class="margin-right-10">统考分</text>
+							<text class="margin-right-10 font-weight-b">{{ scoreInfo.professionalScore }}</text>
+						</view>
+					</view>
+					<view class="flexWrap" style="margin-top: 30rpx;height: 30rpx;"
+						v-if="scoreInfo && scoreInfo.professionalCategoryChildren">
+						<view class="scoreLeft margin-right-20" v-if="scoreInfo.yybysy && scoreInfo.yybysy!==0">
+							<text class="margin-right-10">音乐表演声乐</text>
+							<text class="font-weight-b">{{ scoreInfo.yybysy }}</text>
+						</view>
+						<view class="scoreLeft margin-right-20" v-if="scoreInfo.yybyqy && scoreInfo.yybyqy!==0">
+							<text class="margin-right-10">音乐表演器乐</text>
+							<text class="font-weight-b">{{ scoreInfo.yybyqy }}</text>
+						</view>
+						<view class="scoreLeft margin-right-20" v-if="scoreInfo.yyjy && scoreInfo.yyjy!==0">
+							<text class="margin-right-10">音乐教育</text>
+							<text class="font-weight-b">{{ scoreInfo.yyjy }}</text>
+						</view>
+						<view class="scoreLeft margin-right-20" v-if="scoreInfo.fzby && scoreInfo.fzby!==0">
+							<text class="margin-right-10">服装表演</text>
+							<text class="font-weight-b">{{ scoreInfo.fzby }}</text>
+						</view>
+						<view class="scoreLeft margin-right-20" v-if="scoreInfo.xjysdy && scoreInfo.xjysdy!==0">
+							<text class="margin-right-10">戏剧影视导演</text>
+							<text class="font-weight-b">{{ scoreInfo.xjysdy }}</text>
+						</view>
+						<view class="scoreLeft margin-right-20" v-if="scoreInfo.xjysby && scoreInfo.xjysby!==0">
+							<text class="margin-right-10">戏剧影视表演</text>
+							<text class="font-weight-b">{{ scoreInfo.xjysby }}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="divider" />
+		<!--志愿信息-->
+		<view class="fillVolunteerList" v-if="collapseItemList.length>0">
+			<view class="collapse">
+				<view class="collapse-item" v-for="(citem,cindex) in collapseItemList" :key="cindex">
+					<view class="collapse-head"
+						@click="collapseItemList[cindex].status=!collapseItemList[cindex].status">
+						<view class="flexWrap" style="background-color: #f5f5f5;line-height: 80rpx;">
+							<view class="flex-item-8">
+								<view style="padding-left: 30rpx;">
+									<text
+										class="font-size-mini3 font-weight-b">{{ citem.batchLabel }}({{getVolunteerNum(citem)}}/{{ citem.max }})</text>
+									<text class="font-size-mini margin-left-10 slateGray">{{ citem.type }}</text>
+								</view>
+							</view>
+							<view class="flex-item-2">
+								<text class="float-right"
+									style="margin-right: 30rpx">{{ citem.status ? '收起' : '展开' }}</text>
+							</view>
+						</view>
+					</view>
+					<view class="collapse-body" v-show="citem.status" style="">
+						<view class="volunteerItem" v-for="(item,index) in (citem.batch==='高职高专')?filledVolunteer.volunteerJuniorCollegeList:
             citem.batch==='提前批'?filledVolunteer.volunteerEarlyAdmissionList:filledVolunteer.volunteerUndergraduateList"
-                  :key="item.indexs">
-              <view v-if="item.majorCode">
-                <view class="flexWrap">
-                  <view class="flex-item-15 select">
-                    <view class="selectIndex">
-                      <text style="line-height: 50rpx">{{ item.indexs }}</text>
-                    </view>
-                  </view>
-                  <view class="flex-item-85" @click="gotoSchool(item.schoolCode)">
-                    <text style="line-height: 50rpx">[{{ item.schoolCode }}]{{ item.schoolName }}</text>
-                  </view>
-                </view>
-                <view class="flexWrap marginTopBot20">
-                  <view class="flex-item-15 select"></view>
-                  <view class="flex-item-7">
-                    <text class="darkGray">[{{ item.enrollmentCode }}]</text>
-                    <text class="margin-left-10">{{ item.majorName }}</text>
-                  </view>
-                  <view class="flex-item-15">
-                    <text class="darkGray float-right" v-if="item.enrollProbability && this.vipInfo && this.vipInfo.vipLevel >= 2">
-                      {{ item.enrollProbability.toString().substring(0,4) }}%
-                    </text>
-                    <text class="darkGray float-right" v-else>
-                      ??%
-                    </text>
-                  </view>
-                </view>
-                <!--操作栏-->
-                <view class="flexWrap border-top" style="line-height: 60rpx">
-                  <view class="flex-item-4">
-                    <checkbox-group @change="fctjCheckboxChange(item.id)" v-if="citem.batch==='提前批'">
-                      <label>
-                        <checkbox value="cb" :checked="item.fctj===1" color="#FFCC33" style="transform:scale(0.7)"/>
-                        服从调剂
-                      </label>
-                    </checkbox-group>
-                  </view>
-                  <view class="flex-item-6">
-                    <view class="float-right">
-                      <image @click="onClickExChange(item)" src="/static/icons/move.png" class="icon50 margin-left-50"/>
-                      <!--                      <image src="/static/icons/edit.png" class="icon50 margin-left-50"/>-->
-                      <image @click="confirmDelVolunteerItem(item)" src="/static/icons/delete.png"
-                             class="icon50 margin-left-50"/>
-                    </view>
-                  </view>
-                </view>
-              </view>
-              <!--空白专业-->
-              <view v-else @click="toAdd()">
-                <view class="notSelect flexWrap">
-                  <view class="notSelectIndex">
-                    <text style="line-height: 50rpx">{{ item.indexs }}</text>
-                  </view>
-                  <view class="margin-left-30">
-                    点击添加专业志愿
-                  </view>
-                </view>
-              </view>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
+							:key="item.indexs">
+							<view v-if="item.majorCode">
+								<view class="flexWrap">
+									<view class="flex-item-15 select">
+										<view class="selectIndex">
+											<text style="line-height: 50rpx">{{ item.indexs }}</text>
+										</view>
+									</view>
+									<view class="flex-item-85" @click="gotoSchool(item.schoolCode)">
+										<text
+											style="line-height: 50rpx">[{{ item.schoolCode }}]{{ item.schoolName }}</text>
+									</view>
+								</view>
+								<view class="flexWrap marginTopBot20">
+									<view class="flex-item-15 select"></view>
+									<view class="flex-item-7">
+										<text class="darkGray">[{{ item.enrollmentCode }}]</text>
+										<text class="margin-left-10">{{ item.majorName }}</text>
+									</view>
+									<view class="flex-item-15">
+										<text class="darkGray float-right"
+											v-if="item.enrollProbability && this.vipInfo && this.vipInfo.vipLevel >= 2">
+											{{ item.enrollProbability.toString().substring(0,4) }}%
+										</text>
+										<text class="darkGray float-right" v-else>
+											??%
+										</text>
+									</view>
+								</view>
+								<!--操作栏-->
+								<view class="flexWrap border-top" style="line-height: 60rpx">
+									<view class="flex-item-4">
+										<checkbox-group @change="fctjCheckboxChange(item.id)"
+											v-if="citem.batch==='提前批'">
+											<label>
+												<checkbox value="cb" :checked="item.fctj===1" color="#FFCC33"
+													style="transform:scale(0.7)" />
+												服从调剂
+											</label>
+										</checkbox-group>
+									</view>
+									<view class="flex-item-6">
+										<view class="float-right">
+											<image @click="onClickExChange(item)" src="/static/icons/move.png"
+												class="icon50 margin-left-50" />
+											<!--                      <image src="/static/icons/edit.png" class="icon50 margin-left-50"/>-->
+											<image @click="confirmDelVolunteerItem(item)" src="/static/icons/delete.png"
+												class="icon50 margin-left-50" />
+										</view>
+									</view>
+								</view>
+							</view>
+							<!--空白专业-->
+							<view v-else @click="toAdd()">
+								<view class="notSelect flexWrap">
+									<view class="notSelectIndex">
+										<text style="line-height: 50rpx">{{ item.indexs }}</text>
+									</view>
+									<view class="margin-left-30">
+										点击添加专业志愿
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
 
-    <!--有成绩，没有志愿信息-->
-    <view class="" v-if="this.scoreInfo && !this.volunteerId">
-      <view>
-        <text class="mediumSlateBlue" @click="onClickCreateVolunteer">创建志愿单</text>
-      </view>
-    </view>
-  </view>
+		<!--有成绩，没有志愿信息-->
+		<view class="" v-if="this.scoreInfo && !this.volunteerId">
+			<view>
+				<text class="mediumSlateBlue" @click="onClickCreateVolunteer">创建志愿单</text>
+			</view>
+		</view>
+	</view>
 
-  <uni-popup ref="inputDialog" type="dialog">
-    <uni-popup-dialog ref="inputClose" mode="input"
-                      placeholder="N" @confirm="moveIndexsConfirm">
-      <view>
-        <view class="flexWrap" style="height: 50rpx;line-height: 50rpx">
-          <view class="flex-item-3">
-            移动志愿
-          </view>
-          <view class="flex-item-3">
-            <view style="border: 1rpx solid #979797">
-              <input type="number" v-model="moveVolunteer.indexs" placeholder="N"/>
-            </view>
-          </view>
-        </view>
-      </view>
-    </uni-popup-dialog>
-  </uni-popup>
+	<uni-popup ref="inputDialog" type="dialog">
+		<uni-popup-dialog ref="inputClose" mode="input" placeholder="N" @confirm="moveIndexsConfirm">
+			<view>
+				<view class="flexWrap" style="height: 50rpx;line-height: 50rpx">
+					<view class="flex-item-3">
+						移动志愿
+					</view>
+					<view class="flex-item-3">
+						<view style="border: 1rpx solid #979797">
+							<input type="number" v-model="moveVolunteer.indexs" placeholder="N" />
+						</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup-dialog>
+	</uni-popup>
 </template>
 <style>
-page {
-  background-color: white;
-}
+	page {
+		background-color: white;
+	}
 </style>
 
 <style scoped lang="scss">
-.divider {
-  background: #f5f5f5;
-  width: 100%;
-  height: 3rpx;
-}
+	.divider {
+		background: #f5f5f5;
+		width: 100%;
+		height: 3rpx;
+	}
 
-.container {
-  padding: 30rpx;
-  max-height: 100%;
-}
+	.container {
+		padding: 30rpx;
+		max-height: 100%;
+	}
 
-/*成绩卡片 start*/
-.score-info-card {
-  padding: 20rpx;
-  background: #f99352;
-  border-radius: 15rpx;
+	/*成绩卡片 start*/
+	.score-info-card {
+		padding: 20rpx;
+		background: #f99352;
+		border-radius: 15rpx;
 
-  .tags {
-    margin: 10rpx 0;
+		.tags {
+			margin: 10rpx 0;
 
-    .tag {
-      background-color: #faa069;
-      padding: 0 15rpx;
-      line-height: 40rpx;
-      margin-right: 20rpx;
-    }
-  }
+			.tag {
+				background-color: #faa069;
+				padding: 0 15rpx;
+				line-height: 40rpx;
+				margin-right: 20rpx;
+			}
+		}
 
-  .score {
-    margin-top: 30rpx;
-    margin-bottom: 10rpx;
-  }
-}
+		.score {
+			margin-top: 30rpx;
+			margin-bottom: 10rpx;
+		}
+	}
 
-/*成绩卡片 end*/
+	/*成绩卡片 end*/
 
-/*志愿列表 start*/
+	/*志愿列表 start*/
 
-.collapse-item {
-  margin-top: 30rpx;
+	.collapse-item {
+		margin-top: 30rpx;
 
-  .collapse-body {
-    border-left: 1rpx solid #f5f5f5;
-    border-right: 1rpx solid #f5f5f5;
-    border-bottom: 1rpx solid #f5f5f5;
-    background-color: #f5f5f5;
-  }
-}
+		.collapse-body {
+			border-left: 1rpx solid #f5f5f5;
+			border-right: 1rpx solid #f5f5f5;
+			border-bottom: 1rpx solid #f5f5f5;
+			background-color: #f5f5f5;
+		}
+	}
 
-.collapse-body .volunteerItem {
-  background-color: white;
-  margin-bottom: 10rpx;
-  padding: 10rpx 30rpx;
+	.collapse-body .volunteerItem {
+		background-color: white;
+		margin-bottom: 10rpx;
+		padding: 10rpx 30rpx;
 
-  .notSelect {
-    line-height: 80rpx;
-    height: 80rpx;
-    color: #999999;
-  }
+		.notSelect {
+			line-height: 80rpx;
+			height: 80rpx;
+			color: #999999;
+		}
 
-  .select {
-    .selectIndex {
-      background-color: #feeee2;
-      color: #f96712;
-      width: 20rpx;
-      height: 50rpx;
-      margin: auto 0;
-      line-height: 50rpx;
-      padding: 0 20rpx;
-      text-align: center;
-    }
-  }
+		.select {
+			.selectIndex {
+				background-color: #feeee2;
+				color: #f96712;
+				width: 20rpx;
+				height: 50rpx;
+				margin: auto 0;
+				line-height: 50rpx;
+				padding: 0 20rpx;
+				text-align: center;
+			}
+		}
 
-  //未填报时索引
-  .notSelectIndex {
-    background-color: #f2f2f2;
-    width: 20rpx;
-    height: 50rpx;
-    margin: auto 0;
-    line-height: 50rpx;
-    padding: 0 20rpx;
-    text-align: center;
-  }
-}
+		//未填报时索引
+		.notSelectIndex {
+			background-color: #f2f2f2;
+			width: 20rpx;
+			height: 50rpx;
+			margin: auto 0;
+			line-height: 50rpx;
+			padding: 0 20rpx;
+			text-align: center;
+		}
+	}
 
-.fillVolunteerList {
-  margin: 10rpx 0;
-  border-top: 1rpx solid #f5f5f5;
-}
+	.fillVolunteerList {
+		margin: 10rpx 0;
+		border-top: 1rpx solid #f5f5f5;
+	}
 
-/*志源列表 end*/
+	/*志源列表 end*/
 
 
-.uni-row {
-  margin-bottom: 30rpx;
-}
+	.uni-row {
+		margin-bottom: 30rpx;
+	}
 
-/*导航栏部分 start*/
-.tabs {
-  flex: 1;
-  flex-direction: column;
-  overflow: hidden;
-  background-color: #ffffff;
-  /* #ifndef APP-PLUS */
-  /*height: 100vh;*/
-  /* #endif */
+	/*导航栏部分 start*/
+	.tabs {
+		flex: 1;
+		flex-direction: column;
+		overflow: hidden;
+		background-color: #ffffff;
+		/* #ifndef APP-PLUS */
+		/*height: 100vh;*/
+		/* #endif */
 
-  .scroll-h {
-    /*width: 750rpx;*/
-    /* #ifdef H5 */
-    width: 100%;
-    /* #endif */
-    height: 80rpx;
-    flex-direction: row;
-    /* #ifndef APP-PLUS */
-    white-space: nowrap;
-    /* #endif */
-    /* flex-wrap: nowrap; */
-    /* border-color: #cccccc;
+		.scroll-h {
+			/*width: 750rpx;*/
+			/* #ifdef H5 */
+			width: 100%;
+			/* #endif */
+			height: 80rpx;
+			flex-direction: row;
+			/* #ifndef APP-PLUS */
+			white-space: nowrap;
+			/* #endif */
+			/* flex-wrap: nowrap; */
+			/* border-color: #cccccc;
   border-bottom-style: solid;
   border-bottom-width: 1px; */
-  }
+		}
 
-  .line-h {
-    height: 1rpx;
-    background-color: #cccccc;
-  }
+		.line-h {
+			height: 1rpx;
+			background-color: #cccccc;
+		}
 
-  .uni-tab-item {
-    /* #ifndef APP-PLUS */
-    display: inline-block;
-    /* #endif */
-    flex-wrap: nowrap;
-    padding-left: 34rpx;
-    padding-right: 34rpx;
-  }
+		.uni-tab-item {
+			/* #ifndef APP-PLUS */
+			display: inline-block;
+			/* #endif */
+			flex-wrap: nowrap;
+			padding-left: 34rpx;
+			padding-right: 34rpx;
+		}
 
-  .uni-tab-item-title {
-    color: #555;
-    font-size: 30rpx;
-    height: 80rpx;
-    line-height: 80rpx;
-    flex-wrap: nowrap;
-    /* #ifndef APP-PLUS */
-    white-space: nowrap;
-    /* #endif */
-  }
+		.uni-tab-item-title {
+			color: #555;
+			font-size: 30rpx;
+			height: 80rpx;
+			line-height: 80rpx;
+			flex-wrap: nowrap;
+			/* #ifndef APP-PLUS */
+			white-space: nowrap;
+			/* #endif */
+		}
 
-  .uni-tab-item-title-active {
-    color: #007AFF;
-  }
+		.uni-tab-item-title-active {
+			color: #007AFF;
+		}
 
-  .swiper-box {
-    flex: 1;
-  }
+		.swiper-box {
+			flex: 1;
+		}
 
-  .swiper-item {
-    flex: 1;
-    flex-direction: row;
-  }
+		.swiper-item {
+			flex: 1;
+			flex-direction: row;
+		}
 
-  .scroll-v {
-    flex: 1;
-    /* #ifndef MP-ALIPAY */
-    flex-direction: column;
-    /* #endif */
-    /*width: 750rpx;*/
-    width: 100%;
-  }
+		.scroll-v {
+			flex: 1;
+			/* #ifndef MP-ALIPAY */
+			flex-direction: column;
+			/* #endif */
+			/*width: 750rpx;*/
+			width: 100%;
+		}
 
-  .update-tips {
-    position: absolute;
-    left: 0;
-    top: 41px;
-    right: 0;
-    padding-top: 5px;
-    padding-bottom: 5px;
-    background-color: #FDDD9B;
-    align-items: center;
-    justify-content: center;
-    text-align: center;
-  }
+		.update-tips {
+			position: absolute;
+			left: 0;
+			top: 41px;
+			right: 0;
+			padding-top: 5px;
+			padding-bottom: 5px;
+			background-color: #FDDD9B;
+			align-items: center;
+			justify-content: center;
+			text-align: center;
+		}
 
-  .update-tips-text {
-    font-size: 14px;
-    color: #ffffff;
-  }
+		.update-tips-text {
+			font-size: 14px;
+			color: #ffffff;
+		}
 
-  .refresh {
-    /*width: 750rpx;*/
-    width: 100%;
-    height: 64px;
-    justify-content: center;
-  }
+		.refresh {
+			/*width: 750rpx;*/
+			width: 100%;
+			height: 64px;
+			justify-content: center;
+		}
 
-  .refresh-view {
-    flex-direction: row;
-    flex-wrap: nowrap;
-    align-items: center;
-    justify-content: center;
-  }
+		.refresh-view {
+			flex-direction: row;
+			flex-wrap: nowrap;
+			align-items: center;
+			justify-content: center;
+		}
 
-  .refresh-icon {
-    width: 30px;
-    height: 30px;
-    transition-duration: .5s;
-    transition-property: transform;
-    transform: rotate(0deg);
-    transform-origin: 15px 15px;
-  }
+		.refresh-icon {
+			width: 30px;
+			height: 30px;
+			transition-duration: .5s;
+			transition-property: transform;
+			transform: rotate(0deg);
+			transform-origin: 15px 15px;
+		}
 
-  .refresh-icon-active {
-    transform: rotate(180deg);
-  }
+		.refresh-icon-active {
+			transform: rotate(180deg);
+		}
 
-  .loading-icon {
-    width: 20px;
-    height: 20px;
-    margin-right: 5px;
-    color: #999999;
-  }
+		.loading-icon {
+			width: 20px;
+			height: 20px;
+			margin-right: 5px;
+			color: #999999;
+		}
 
-  .loading-text {
-    margin-left: 2px;
-    font-size: 16px;
-    color: #999999;
-  }
+		.loading-text {
+			margin-left: 2px;
+			font-size: 16px;
+			color: #999999;
+		}
 
-  .loading-more {
-    align-items: center;
-    justify-content: center;
-    padding-top: 10px;
-    padding-bottom: 10px;
-    text-align: center;
-  }
+		.loading-more {
+			align-items: center;
+			justify-content: center;
+			padding-top: 10px;
+			padding-bottom: 10px;
+			text-align: center;
+		}
 
-  .loading-more-text {
-    font-size: 28rpx;
-    color: #999;
-  }
-}
+		.loading-more-text {
+			font-size: 28rpx;
+			color: #999;
+		}
+	}
 
-/*导航栏部分 end*/
+	/*导航栏部分 end*/
 
 
-/*志愿信息头部信息 start*/
-.header-info {
-  padding: 30rpx 30rpx 0 30rpx;
-  background-color: white;
-  margin-bottom: 30rpx;
+	/*志愿信息头部信息 start*/
+	.header-info {
+		padding: 30rpx 30rpx 0 30rpx;
+		background-color: white;
+		margin-bottom: 30rpx;
 
-  .h1 {
-    padding: 10rpx 0;
-  }
+		.h1 {
+			padding: 10rpx 0;
+		}
 
-  .tt1 {
-    margin-right: 30rpx;
-  }
-}
+		.tt1 {
+			margin-right: 30rpx;
+		}
+	}
 
-/*志愿信息头部信息 end*/
+	/*志愿信息头部信息 end*/
 
-/*志愿明细列表 start*/
-.volunteerList {
-  padding: 30rpx 30rpx 0 30rpx;
-  background-color: white;
+	/*志愿明细列表 start*/
+	.volunteerList {
+		padding: 30rpx 30rpx 0 30rpx;
+		background-color: white;
 
-  .v-title {
-    color: #666666;
-    margin-bottom: 30rpx;
-  }
+		.v-title {
+			color: #666666;
+			margin-bottom: 30rpx;
+		}
 
-  .volunteerItem {
-    margin-bottom: 50rpx;
+		.volunteerItem {
+			margin-bottom: 50rpx;
 
-    .item_left {
-      .schoolInfo {
-        border-bottom: 1px solid #e5e5e5;
-        padding: 15rpx 0 30rpx 0;
-      }
+			.item_left {
+				.schoolInfo {
+					border-bottom: 1px solid #e5e5e5;
+					padding: 15rpx 0 30rpx 0;
+				}
 
-      .majorInfo {
-        padding: 30rpx 0;
-        border-bottom: 1px solid #f5f5f5;
+				.majorInfo {
+					padding: 30rpx 0;
+					border-bottom: 1px solid #f5f5f5;
 
-        .enrollProbability {
-          color: #9b9b9b;
-          font-size: 25rpx;
-        }
-      }
-    }
+					.enrollProbability {
+						color: #9b9b9b;
+						font-size: 25rpx;
+					}
+				}
+			}
 
-    .item_right {
-      padding: 150rpx 0 0 20rpx;
-    }
+			.item_right {
+				padding: 150rpx 0 0 20rpx;
+			}
 
-    /*序号*/
-    .indexs {
-      color: white;
-      width: 30rpx;
-      height: 40rpx;
-      background-color: #1275ec;
-      border-radius: 50%;
-      padding-left: 10rpx;
-      margin-right: 30rpx;
+			/*序号*/
+			.indexs {
+				color: white;
+				width: 30rpx;
+				height: 40rpx;
+				background-color: #1275ec;
+				border-radius: 50%;
+				padding-left: 10rpx;
+				margin-right: 30rpx;
 
-    }
+			}
 
-    /*tags*/
-    .tags {
-      margin-top: 15rpx;
+			/*tags*/
+			.tags {
+				margin-top: 15rpx;
 
-      .tag {
-        margin-right: 20rpx;
-        color: #9b9b9b;
-        font-size: 25rpx;
-      }
-    }
+				.tag {
+					margin-right: 20rpx;
+					color: #9b9b9b;
+					font-size: 25rpx;
+				}
+			}
 
-    .low-text {
-      color: #9b9b9b;
-      font-size: 22rpx;
-      margin-bottom: 15rpx;
-    }
-  }
-}
+			.low-text {
+				color: #9b9b9b;
+				font-size: 22rpx;
+				margin-bottom: 15rpx;
+			}
+		}
+	}
 
-/*志愿明细列表 end*/
-</style>
+	/*志愿明细列表 end*/
+</style>
\ No newline at end of file
diff --git a/pages/zyb/fillVolunteer/index.vue b/pages/zyb/fillVolunteer/index.vue
index e129a0f..ef16334 100644
--- a/pages/zyb/fillVolunteer/index.vue
+++ b/pages/zyb/fillVolunteer/index.vue
@@ -1,13 +1,10 @@
 <script>
-import StaticConstant from "@/common/StaticConstant";
-import ApiConstant from "@/common/ApiConstant";
-import Request from '@/common/request'
-import ImagesConstant from "@/common/ImagesConstant";
 import {arrayIsNotEmpty,stringIsNotEmpty} from "@/common/util";
 import vip from "../vip/index.vue";
-import CommonTool from "@/common/js/commonTool";
 
-let request = new Request()
+
+const app = getApp()
+
 // 缓存每页最多
 const MAX_CACHE_DATA = 100;
 // 缓存页签数量
@@ -19,12 +16,6 @@ export default {
     vip() {
       return vip
     },
-    StaticConstant() {
-      return StaticConstant
-    },
-    ImagesConstant() {
-      return ImagesConstant
-    }
   },
   data() {
     return {
@@ -64,7 +55,7 @@ export default {
       },
       /*筛选项 参数 start*/
       defaultSelected: [],
-      menuList: StaticConstant.fillVolunteerMenuData,
+      menuList: app.globalData.StaticConstant.fillVolunteerMenuData,
       /*筛选项 参数 end*/
       tabIndex: 0,
       scrollInto: "",
@@ -87,18 +78,18 @@ export default {
         volunteerUndergraduateList: [],//体育本科
         volunteerMap: new Map()
       },//已填志愿信息
-      years: StaticConstant.years,
+      years: app.globalData.StaticConstant.years,
       //
       status: 'more',
-      statusTypes: StaticConstant.loadStatusTypes,
-      contentText: StaticConstant.loadContentText,
+      statusTypes: app.globalData.StaticConstant.loadStatusTypes,
+      contentText: app.globalData.StaticConstant.loadContentText,
     }
   },
   onShow(e) {
     this.userInfo = uni.getStorageSync('userInfo')
   },
   onLoad(e) {
-    this.systemName = CommonTool.getSystemName()
+    this.systemName = app.globalData.CommonTool.getSystemName()
     this.vipInfo = uni.getStorageSync('vipInfo')
     if (e.batch && e.volunteerId) {
       //从我的志愿 点击跳转而来
@@ -186,7 +177,7 @@ export default {
     },
     loadMenu() {
       //加载筛选项
-      request.get(ApiConstant.Major.rulesEnrollrobabilityMenuList, {
+      app.globalData.Request.get(app.globalData.ApiConstant.Major.rulesEnrollrobabilityMenuList, {
         professionalCategory: this.scoreInfo.professionalCategory
       }, {showLoading: false}).then(r => {
         if (r.success) {
@@ -293,7 +284,7 @@ export default {
         cancelText: '取消',
         success: function (res) {
           if (res.confirm) {
-            request.post(ApiConstant.Volunteer.volunteerSave, {
+            app.globalData.Request.post(app.globalData.ApiConstant.Volunteer.volunteerSave, {
               volunteerId: that.filledVolunteer.volunteerId,
               schoolCode: item.schoolCode,
               majorCode: item.majorCode,
@@ -356,7 +347,7 @@ export default {
           }
         }
       }
-      request.get(ApiConstant.Volunteer.artVolunteerDetail, {id: this.filledVolunteer.volunteerId}).then(res => {
+      app.globalData.Request.get(app.globalData.ApiConstant.Volunteer.artVolunteerDetail, {id: this.filledVolunteer.volunteerId}).then(res => {
         if (res.success) {
           let dataResult = res.result
           //有数据情况下
@@ -563,7 +554,7 @@ export default {
         kyjxStrs:kyjxStrs,
         scoreId: this.scoreInfo.id,
       }
-      request.get(ApiConstant.Major.recommendMajorPage, params).then(res => {
+      app.globalData.Request.get(app.globalData.ApiConstant.Major.recommendMajorPage, params).then(res => {
         if (res.success) {
           let result = res.result
           let allNumber = result.allNumber
@@ -632,13 +623,13 @@ export default {
     },
     checkBao(e) {
       if (e >= 93) {
-        return ImagesConstant.bao.kebaodi;
+        return app.globalData.ImagesConstant.bao.kebaodi;
       } else if (e < 93 && e >= 74) {
-        return ImagesConstant.bao.jiaowentuo;
+        return app.globalData.ImagesConstant.bao.jiaowentuo;
       } else if (e < 74 && e >= 60) {
-        return ImagesConstant.bao.kechongji;
+        return app.globalData.ImagesConstant.bao.kechongji;
       }
-      return ImagesConstant.bao.nanluqu;
+      return app.globalData.ImagesConstant.bao.nanluqu;
     },
     checkColorText(e) {
       if (this.vipInfo && this.vipInfo.vipLevel < 2) {
@@ -688,7 +679,7 @@ export default {
       //当前选中的专业 key
       let eKey = e.enrollmentCode + "_" + e.majorCode + "_" + e.schoolCode
       this.otherMajor.status = 'loading'
-      request.get(ApiConstant.Major.recommendSchoolOtherMajor, params, {showLoad: false}).then(res => {
+      app.globalData.Request.get(app.globalData.ApiConstant.Major.recommendSchoolOtherMajor, params, {showLoad: false}).then(res => {
         console.log('返回值')
         console.log(res)
         if (res.success && res.result) {
@@ -755,7 +746,8 @@ export default {
         })
         return
       }
-    }
+    },
+
   },
   onPageScroll(e) { //根据距离顶部距离是否显示回到顶部按钮
     //当距离大于600时显示回到顶部按钮，//当距离小于600时隐藏回到顶部按钮
@@ -796,7 +788,7 @@ export default {
             <text style="font-size: 50rpx">我的成绩</text>
           </view>
           <view class="flex-item-2" @click="goto('/pages/zyb/score/edit?scoreId='+this.scoreInfo.id)">
-            <image :src="ImagesConstant.edit" class="icon50 float-right" style="line-height: 50rpx"/>
+            <image :src="app.globalData.ImagesConstant.edit" class="icon50 float-right" style="line-height: 50rpx"/>
           </view>
         </view>
 
@@ -898,7 +890,7 @@ export default {
       <view class="flex" @click="goto('/pages/zyb/school/detail?schoolCode='+item.schoolCode)">
         <!--院校图片-->
         <view class="flex-item-22">
-          <image :src="item.schoolIcon||ImagesConstant.defaultIcon" class="icon128"/>
+          <image :src="item.schoolIcon||app.globalData.ImagesConstant.defaultIcon" class="icon128"/>
         </view>
         <!--院校代码-->
         <view class="flex-item-77">
@@ -940,7 +932,8 @@ export default {
                   {{item.studentConvertedScore}}
                 </text>
               </view>
-              <view style="float: right;line-height: 50rpx;" class="font-weight-600" v-if="item.studentScore">
+              <!--v-if="item.studentScore"-->
+              <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 }}
@@ -961,7 +954,7 @@ export default {
         </view>
         <view class="flex-item-5" style="line-height: 40rpx">
           <view class="flex" style="float: right">
-            <text>{{ StaticConstant.year }}省内计划录取：</text>
+            <text>{{ app.globalData.StaticConstant.year }}省内计划录取：</text>
             <text v-if="item.planNum" class="green font-weight-600">{{ item.planNum }}人</text>
             <text v-else class="green">暂未发布</text>
           </view>
@@ -969,7 +962,7 @@ export default {
       </view>
       <view class="flex" style="line-height: 50rpx">
         <view class="flex-item-7">
-          <text>{{ StaticConstant.year }}录取方式:</text>
+          <text>{{ app.globalData.StaticConstant.year }}录取方式:</text>
           <text v-if="item.rulesEnrollProbability" class="blue">{{ item.rulesEnrollProbability }}</text>
           <text v-else class="blue">暂未发布</text>
         </view>
@@ -993,7 +986,7 @@ export default {
         <text class="darkGray font-weight-550">{{ otherMajor.schoolName }}</text>
       </view>
       <view class="flex-item-2">
-        <image @click="onOtherMajorClose" :src="ImagesConstant.close" class="icon32 float-right"
+        <image @click="onOtherMajorClose" :src="app.globalData.ImagesConstant.close" class="icon32 float-right"
                style="position: relative;top: 5rpx"/>
       </view>
     </view>
@@ -1046,7 +1039,7 @@ export default {
                 </view>
               </view>
               <view class="flex" style="float: right">
-                <text>{{ StaticConstant.year }}省内计划录取：</text>
+                <text>{{ app.globalData.StaticConstant.year }}省内计划录取：</text>
                 <text v-if="otherMajor.nowMajor.planNum" class="green font-weight-600">{{
                     otherMajor.nowMajor.planNum
                   }}人
@@ -1057,7 +1050,7 @@ export default {
           </view>
           <view class="flex" style="line-height: 50rpx">
             <view class="flex-item-7">
-              <text>{{ StaticConstant.year }}录取方式:</text>
+              <text>{{ app.globalData.StaticConstant.year }}录取方式:</text>
               <text v-if="otherMajor.nowMajor.rulesEnrollProbability" class="blue">
                 {{ otherMajor.nowMajor.rulesEnrollProbability }}
               </text>
@@ -1066,7 +1059,7 @@ export default {
             <view class="flex-item-3" v-if="otherMajor.nowMajor.enrollProbability">
               <view class="radius10 font-weight-b" @click="saveVolunteer(otherMajor.nowMajor)"
                     :class="otherMajor.nowMajor.volunteerIndexs?'volunteerIndexs':'saveVolunteer'">
-                <image :src="otherMajor.nowMajor.volunteerIndexs?ImagesConstant.duigou_orange:ImagesConstant.add_orange"
+                <image :src="otherMajor.nowMajor.volunteerIndexs?app.globalData.ImagesConstant.duigou_orange:app.globalData.ImagesConstant.add_orange"
                        class="icon32"/>
                 <text>{{
                     otherMajor.nowMajor.volunteerIndexs ? '志愿' + otherMajor.nowMajor.volunteerIndexs : '加入志愿表'
@@ -1124,7 +1117,7 @@ export default {
                 </view>
               </view>
               <view class="flex" style="float: right">
-                <text>{{ StaticConstant.year }}省内计划录取：</text>
+                <text>{{ app.globalData.StaticConstant.year }}省内计划录取：</text>
                 <text v-if="item.planNum" class="green font-weight-600">{{ item.planNum }}人</text>
                 <text v-else class="green">暂未发布</text>
               </view>
@@ -1132,14 +1125,14 @@ export default {
           </view>
           <view class="flex" style="line-height: 50rpx">
             <view class="flex-item-7">
-              <text>{{ StaticConstant.year }}录取方式:</text>
+              <text>{{ app.globalData.StaticConstant.year }}录取方式:</text>
               <text v-if="item.rulesEnrollProbability" class="blue">{{ item.rulesEnrollProbability }}</text>
               <text v-else class="blue">暂未发布</text>
             </view>
             <view class="flex-item-3" v-if="item.enrollProbability">
               <view class="radius10 font-weight-b" @click="saveVolunteer(item)"
                     :class="item.volunteerIndexs?'volunteerIndexs':'saveVolunteer'">
-                <image :src="item.volunteerIndexs?ImagesConstant.duigou_orange:ImagesConstant.add_orange"
+                <image :src="item.volunteerIndexs?app.globalData.ImagesConstant.duigou_orange:app.globalData.ImagesConstant.add_orange"
                        class="icon32"/>
                 <text>{{ item.volunteerIndexs ? '志愿' + item.volunteerIndexs : '加入志愿表' }}</text>
               </view>
diff --git a/pages/zyb/fillVolunteer/mockList.vue b/pages/zyb/fillVolunteer/mockList.vue
index b039a55..b4cd13d 100644
--- a/pages/zyb/fillVolunteer/mockList.vue
+++ b/pages/zyb/fillVolunteer/mockList.vue
@@ -7,6 +7,8 @@ import {arrayIsNotEmpty} from "@/common/util";
 import vip from "../vip/index.vue";
 import {stringIsNotEmpty} from "../../../common/util";
 
+const app = getApp()
+
 let request = new Request()
 // 缓存每页最多
 const MAX_CACHE_DATA = 100;
@@ -16,6 +18,9 @@ const MAX_CACHE_PAGE = 3;
 export default {
   name: "模拟填报",
   computed: {
+	app(){
+	  return app
+	},
     vip() {
       return vip
     },
@@ -457,7 +462,7 @@ export default {
               }
               indexs = 1;
               let volunteerUndergraduateList2 = [];
-              while (indexs <= 35) {
+              while (indexs <= app.globalData.StaticConstant.benZhiYuanNum) {
                 let record = {actives: false, indexs: indexs}
                 for (let i = 0; i < volunteerUndergraduateList.length; i++) {
                   if (volunteerUndergraduateList[i].indexs === indexs) {
@@ -478,7 +483,7 @@ export default {
               }
               indexs = 1;
               let volunteerJuniorCollegeList2 = [];
-              while (indexs <= 35) {
+              while (indexs <= app.globalData.StaticConstant.zhuanZhiYuanNum) {
                 let record = {
                   actives: false,
                   indexs: indexs
@@ -719,6 +724,17 @@ export default {
       }
       return ImagesConstant.bao.nanluqu;
     },
+	//格式化录取概率
+	formatDecimal(e) {
+	  try {
+	    if(e <= 0){
+	      return '无概率'
+	    }
+	    return parseFloat(e).toFixed(2) + '%';
+	  } catch (error) {
+	    return '??';
+	  }
+	},
     checkColorText(e) {
       if (this.vipInfo && this.vipInfo.vipLevel < 2) {
         return '#868686';
@@ -996,7 +1012,7 @@ export default {
             <view class="flex-item-35" v-if="selectForm.kslx==='统考'">
               <view style="float: right;line-height: 50rpx;" class="font-weight-600">
                 <text class="font-size-mini" :style="'color:'+checkColorText(item.enrollProbability)">
-                  {{ vipInfo && vipInfo.vipLevel >= 2 ? item.enrollProbability : '??' }}%
+                  {{ vipInfo && vipInfo.vipLevel >= 2 ? formatDecimal(item.enrollProbability) : '??' }}%
                 </text>
                 <image :src="checkBao(item.enrollProbability)" class="icon50" v-if="vipInfo && vipInfo.vipLevel>=2"/>
               </view>
@@ -1014,6 +1030,7 @@ export default {
             <view class="flex-item-65 slateGray" style="line-height: 50rpx">
               <text v-if="item.state==='新增'" style="color: red;font-size: 25rpx">新增</text>
               <text class="tag">[{{ item.enrollmentCode }}]{{ item.majorName }}</text>
+			  <text class="tag">{{item.tuition}}</text>
               <text v-if="item.limitation">{{ item.majorDetail }}</text>
               <text class="margin-left-10">
                 <text class="tag" v-if="item.otherScoreLimitation && item.otherScoreLimitation!==''">
@@ -1030,7 +1047,7 @@ export default {
                   {{ item.privateStudentScore||item.studentConvertedScore }}
                 </text>
               </view>
-              <view style="float: right;line-height: 50rpx;" class="font-weight-600" v-if="item.studentScore">
+              <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 }}
@@ -1059,7 +1076,7 @@ export default {
       </view>
       <view class="flex" style="line-height: 50rpx">
         <view class="flex-item-7">
-          <text>{{ StaticConstant.year }}录取方式:</text>
+          <text>{{ app.globalData.StaticConstant.year }}录取方式1:</text>
           <text v-if="item.rulesEnrollProbability" class="blue">{{ item.rulesEnrollProbability }}</text>
           <text v-else class="blue">暂未发布</text>
         </view>
@@ -1095,7 +1112,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="">[{{ 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>-->
                 <text class="margin-left-10">
@@ -1108,7 +1126,7 @@ 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) ? 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)"/>
@@ -1125,7 +1143,7 @@ export default {
               </view>
             </view>
             <view class="flex-item-5" style="line-height: 40rpx">
-              <view class="flex" style="float: right">
+              <view class="flex" style="float: right" v-show="app.globalData.StaticConstant.showZeSuan">
                 <view style="float: right;line-height: 50rpx;" class="font-weight-600">
                   <text>折合分</text>
                   <text class="font-size-mini margin-left-10"
@@ -1175,7 +1193,8 @@ export default {
           <view class="flexWrap" @click="goto('/pages/zyb/school/detail?schoolCode='+item.schoolCode)">
             <view class="flex-item-10 flexWrap">
               <view class="flex-item-65 font-weight-b" style="line-height: 50rpx">
-                <text class="">[{{ item.enrollmentCode }}]{{ item.majorName }}</text>
+                <text class="" style="display: flex;">[{{ item.enrollmentCode }}]{{ item.majorName }}</text>
+				<text class="tag">{{item.tuition}}</text>
                 <text v-if="item.majorDetail">{{ item.majorDetail }}</text>
                 <!--                <text v-if="item.limitation">({{item.limitation}})</text>-->
                 <text class="margin-left-10">
@@ -1187,7 +1206,7 @@ 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(item.enrollProbability)">
-                    {{ (vipInfo && vipInfo.vipLevel >= 2) ? item.enrollProbability : '??' }}%
+                    {{ (vipInfo && vipInfo.vipLevel >= 2) ? formatDecimal(item.enrollProbability) : '??' }}%
                   </text>
                   <image :src="checkBao(item.enrollProbability)" class="icon50" v-if="vipInfo&&vipInfo.vipLevel>=2"/>
                 </view>
@@ -1205,7 +1224,8 @@ export default {
             <view class="flex-item-5" style="line-height: 40rpx">
               <view class="flex" style="float: right">
                 <view style="float: right;line-height: 50rpx;" class="font-weight-600"
-                      v-if="item.studentConvertedScore">
+                      v-show="app.globalData.StaticConstant.showZeSuan">
+                  <!--v-if="item.studentConvertedScore"-->
                   <text>折合分</text>
                   <text class="font-size-mini margin-left-10" :style="'color:'+checkColorText(item.enrollProbability)">
                     {{ vipInfo && vipInfo.vipLevel >= 2 ? item.studentScore : '??' }}
diff --git a/pages/zyb/fillVolunteer/my-detail.vue b/pages/zyb/fillVolunteer/my-detail.vue
index 4ba06ba..59d3714 100644
--- a/pages/zyb/fillVolunteer/my-detail.vue
+++ b/pages/zyb/fillVolunteer/my-detail.vue
@@ -15,6 +15,9 @@ export default {
   computed: {
     ImagesConstant() {
       return ImagesConstant
+    },
+    app(){
+      return getApp()
     }
   },
   data() {
@@ -58,13 +61,14 @@ export default {
       nowYear: StaticConstant.year,
       allCollapseItemList: [
         {batchLabel: '提前批', batch: '提前批', type: '顺序志愿', max: 1, status: false},
-        {batchLabel: '本科批', batch: '本科批', type: '平行志愿', max: 35, status: false},
-        {batchLabel: '高职高专', batch: '高职高专', type: '平行志愿', max: 35, status: false},
+        {batchLabel: '本科批', batch: '本科批', type: '平行志愿', max: 64, status: false},
+        {batchLabel: '高职高专', batch: '高职高专', type: '平行志愿', max: 64, status: false},
       ],
       collapseItemList: []
     }
   },
   onShow() {
+    console.log(app.globalData)
     //
     let userInfo = uni.getStorageSync('userInfo')
     if (userInfo) {
@@ -136,8 +140,8 @@ export default {
             //如果当前专业是体育，更改展开栏
             if (this.scoreInfo.professionalCategory === '体育类') {
               this.allCollapseItemList = [
-                {batchLabel: '本科批', batch: '本科批', type: '平行志愿', max: 35, status: false},
-                {batchLabel: '高职高专', batch: '高职高专', type: '平行志愿', max: 35, status: false},
+                {batchLabel: '本科批', batch: '本科批', type: '平行志愿', max: 64, status: false},
+                {batchLabel: '高职高专', batch: '高职高专', type: '平行志愿', max: 64, status: false},
               ]
             }
             if (this.scoreInfo.batch) {
@@ -196,7 +200,7 @@ export default {
               }
               indexs = 1;
               let volunteerUndergraduateList2 = [];
-              while (indexs <= 35) {
+              while (indexs <= 64) {
                 let record = {actives: false, indexs: indexs}
                 for (let i = 0; i < volunteerUndergraduateList.length; i++) {
                   if (volunteerUndergraduateList[i].indexs === indexs) {
@@ -218,7 +222,7 @@ export default {
               }
               indexs = 1;
               let volunteerJuniorCollegeList2 = [];
-              while (indexs <= 35) {
+              while (indexs <= 64) {
                 let record = {
                   actives: false,
                   indexs: indexs
@@ -359,7 +363,7 @@ export default {
           return;
         }
       } else {
-        if (indexs > (this.scoreInfo.professionalCategory==='体育类'?12:35) || indexs < 0) {
+        if (indexs > (this.scoreInfo.professionalCategory==='体育类'?64:64) || indexs < 0) {
           uni.showToast({title: '您输入的序号超出', icon: "none"});
           this.moveVolunteer.indexs = ''
           return;
diff --git a/pages/zyb/home.vue b/pages/zyb/home.vue
index 6d8be07..39fe969 100644
--- a/pages/zyb/home.vue
+++ b/pages/zyb/home.vue
@@ -1,19 +1,9 @@
 <script>
-import StaticConstant from "@/common/StaticConstant";
-import ImagesConstant from "@/common/ImagesConstant";
-import ApiConstant from "@/common/ApiConstant";
-import Request from "@/common/request";
-import JumpTool from "@/common/js/jumpTool";
-import CommonTool from "@/common/js/commonTool";
-
-let request = new Request()
+const app = getApp()
 export default {
   name: "home",
   components: {},
   computed: {
-    StaticConstant() {
-      return StaticConstant
-    }
   },
   data() {
     return {
@@ -22,17 +12,17 @@ export default {
       userStatus: false,
       scoreInfo: null,
       zyNum: null,//专业数量
-      defaultIcon: ImagesConstant.defaultIcon,//默认图片
+      defaultIcon: app.globalData.ImagesConstant.defaultIcon,//默认图片
       fillVolunteer: {
         all: null,//全部
         kcj: null,//冲刺推荐
         jwt: null,//较稳妥
         kbd: null//可保底
       },
-      options: StaticConstant.HomeOptions,
+      options: app.globalData.StaticConstant.HomeOptions,
       statusList: [{status: 'noMore'}, {status: 'noMore'},],
-      statusTypes: StaticConstant.loadStatusTypes,
-      contentText: StaticConstant.loadContentText,
+      statusTypes: app.globalData.StaticConstant.loadStatusTypes,
+      contentText: app.globalData.StaticConstant.loadContentText,
 
       admissionsRegulationsList: [],//招生章程
       //底部tab切换
@@ -48,7 +38,7 @@ export default {
     }
   },
   onLoad(){
-    this.systemName = CommonTool.getSystemName()
+    this.systemName = app.globalData.CommonTool.getSystemName()
     if(this.systemName === '体育志愿宝'){
       this.playerType = '体育考生'
       for (let i = 0; i < this.options.length; i++) {
@@ -63,6 +53,8 @@ export default {
       title: this.systemName
     });
     this.getAdmissionsRegulationsList()
+
+	this.getSystemConfig()
   },
   onShow() {
     //进入页面后，判断是否登录了
@@ -104,18 +96,18 @@ export default {
       console.log('1111')
       if (this.options && this.options[e.detail.index].url) {
         if (this.options[e.detail.index].title !== '艺考考研' && this.options[e.detail.index].title !== '招生章程') {
-          if (this.checkUserScore()) {
-            JumpTool.goto(this.options[e.detail.index].url)
-          }
+          // if (this.checkUserScore()) {
+            app.globalData.JumpTool.goto(this.options[e.detail.index].url)
+          // }
         } else {
-          JumpTool.goto(this.options[e.detail.index].url)
+          app.globalData.JumpTool.goto(this.options[e.detail.index].url)
         }
       }
     },
     /*判断用户是否登录*/
     checkUserStatus() {
       if (!this.userStatus) {
-        JumpTool.goLogin()
+        app.globalData.JumpTool.goLogin()
         return false
       }
     },
@@ -124,32 +116,32 @@ export default {
       //判断登录状态
       this.checkUserStatus()
       if (!this.scoreInfo) {
-        JumpTool.openScoreEdit()
+        app.globalData.JumpTool.openScoreEdit()
         return false
       } else {
         return true
       }
     },
     onClickEditUserScore() {
-      JumpTool.openScoreEdit()
+      app.globalData.JumpTool.openScoreEdit()
     },
     /*点击AI一键填报*/
     onClickAi() {
       if (this.checkUserScore()) {
-        JumpTool.goto('/pages/zyb/fillVolunteer/aiAuto')
+        app.globalData.JumpTool.goto('/pages/zyb/fillVolunteer/aiAuto')
       }
 
     },
     /*点击模拟填报*/
     onClickMn() {
       if (this.checkUserScore()) {
-        //JumpTool.goto('/pages/zyb/fillVolunteer/index')
-        JumpTool.goto('/pages/zyb/fillVolunteer/mockList')
+        //app.globalData.JumpTool.goto('/pages/zyb/fillVolunteer/index')
+        app.globalData.JumpTool.goto('/pages/zyb/fillVolunteer/mockList')
       }
     },
     /*获取用户的分数信息*/
     getUserScore() {
-      request.get(ApiConstant.Score.getScore, {}).then(res => {
+      app.globalData.Request.get(app.globalData.ApiConstant.Score.getScore, {}).then(res => {
         if (res.success) {
           if (res.result) {
             //接口返回了成绩
@@ -182,7 +174,7 @@ export default {
         pageNum: this.tabs[this.currentTab].current,
         pageSize: 5
       }
-      request.get(ApiConstant.Article.articlePage, params).then(res => {
+      app.globalData.Request.get(app.globalData.ApiConstant.Article.articlePage, params).then(res => {
         console.log(res)
         if (res.success) {
           this.tabs[this.currentTab].current = res.result.current
@@ -235,9 +227,21 @@ export default {
         console.log(this.scrollLeft, 60, id)
       }
     },
-	goArticleDetail(e){
-		JumpTool.goArticleDetail(e)
-	},
+	  goArticleDetail(e){
+      app.globalData.JumpTool.goArticleDetail(e)
+    },
+
+    async getSystemConfig(){
+      let miniConfig = await app.globalData.CommonTool.loadStaticConfig('miniConfig')
+      console.log(miniConfig)
+      app.globalData.StaticConstant.year = miniConfig.nowYear
+      app.globalData.StaticConstant.showZeSuan = miniConfig.showZeSuan
+      app.globalData.StaticConstant.tiQianPiZhiYuanNum = miniConfig.tiQianPiZhiYuanNum
+      app.globalData.StaticConstant.benZhiYuanNum = miniConfig.zhuanZhiYuanNum
+      app.globalData.StaticConstant.zhuanZhiYuanNum = miniConfig.zhuanZhiYuanNum
+	  app.globalData.StaticConstant.contact = miniConfig.contact
+	  app.globalData.StaticConstant.memberDeadline = miniConfig.memberDeadline
+    },
   }
 }
 </script>
diff --git a/pages/zyb/other/volunteerCardDesc.vue b/pages/zyb/other/volunteerCardDesc.vue
index e1683bb..aad2979 100644
--- a/pages/zyb/other/volunteerCardDesc.vue
+++ b/pages/zyb/other/volunteerCardDesc.vue
@@ -1,9 +1,13 @@
 <!--志愿卡说明-->
 <script>
 import commonTool from "@/common/js/commonTool";
+const app = getApp()
 export default {
   name: "volunteerCardDesc",
   computed: {
+	  app(){
+		  return app
+	  }
   },
   data() {
     return {
@@ -19,7 +23,7 @@ export default {
 <template>
 <view class="body">
   <text class="text-l uni-flex flex">（一）、适用范围:{{playerType}}文理科考生(自主招生暂不适用)。</text>
-  <text class="text-l uni-flex flex">（二）、使用期限:自购买起，截止到2024-08-31日有效。</text>
+  <text class="text-l uni-flex flex">（二）、使用期限:自购买起，截止到{{app.globalData.StaticConstant.memberDeadline}}有效。</text>
   <text class="text-l uni-flex flex">（三）、分数修改次数:每届服务期内高考分数放榜前可修改10次，放榜后只可修改1次。</text>
   <text class="text-l uni-flex flex">（四）、系统数据来源于及第生涯部门，由合作网站提供。</text>
   <text class="text-l uni-flex flex">（五）、部分年份数据如果为空可能是当年不在查询地招生。系统数据不包含高考加分，如果录取数据与院校公布数据不一致，请以高校正式公布的数据为准。</text>
diff --git a/pages/zyb/score/edit.vue b/pages/zyb/score/edit.vue
index b9b8dd8..274f07d 100644
--- a/pages/zyb/score/edit.vue
+++ b/pages/zyb/score/edit.vue
@@ -55,6 +55,7 @@ export default {
       professionalCategoryScoreMax: '',//选择的专业最高分
       contentHeight: 600,
       reloadMajorModalMessageConfig:{},
+      popupContent: '',
     }
   },
   async onLoad() {
@@ -127,16 +128,7 @@ export default {
         ...this.saveScoreInfo
       }).then(res => {
         if (res.success) {
-          let scoreInfo = res.result
           request.getUserScore()
-          /*uni.removeStorageSync('scoreInfo')//清除之前的成绩缓存
-          uni.setStorageSync('scoreInfo', scoreInfo)
-          uni.removeStorageSync('fillVolunteer')//清除可报志愿数量
-          //全部推荐数量
-          let all = parseInt(scoreInfo.kcjNum) + parseInt(scoreInfo.jwtNum) + parseInt(scoreInfo.kbdNum);
-          //+parseInt(scoreInfo.nlqNum)
-          let fillVolunteer = {jwt: scoreInfo.jwtNum, kbd: scoreInfo.kbdNum, kcj: scoreInfo.kcjNum, allNumber: all}
-          uni.setStorageSync('fillVolunteer', fillVolunteer)*/
           setTimeout(() => {
             uni.reLaunch({
               url: '/pages/zyb/home'
@@ -215,7 +207,7 @@ export default {
 		}else{
 			// 只可以选两个
 			if(this.scoreInfo.subjectList.length <= 1){
-				this.scoreInfo.subjectList.push(e);	
+				this.scoreInfo.subjectList.push(e);
 			}
 		}
 	},
@@ -302,17 +294,35 @@ export default {
       if (this.scoreInfo.professionalCategory !== '表演类') {
         title += " " + (this.scoreInfo.professionalScore ? (this.pCategoryChildrenList && this.pCategoryChildrenList.length > 0 ? '主项成绩:' : '统考成绩:') + this.scoreInfo.professionalScore : "")
       }
-      uni.showModal({
-        title: '确认高考成绩',
-        content: title,
-        confirmText: '确定',
-        cancelText: '取消',
-        success: function (res) {
-          if (res.confirm) {
-            that.saveScore()
-          }
+      if (this.pCategoryChildrenList && this.pCategoryChildrenList.length > 0) {
+        for (let i = 0; i < this.pCategoryChildrenList.length; i++) {
+          title += '\n ' + this.pCategoryChildrenList[i] + ':' + this.scoreInfo[this.checkChildrenNameToKey(this.pCategoryChildrenList[i])]
         }
-      });
+      }
+      this.popupContent = title;
+
+      if(this.formRuleFlag){
+        this.$refs.popup.open() // 打开弹窗
+      }
+
+      // uni.showModal({
+      //   title: '确认高考成绩',
+      //   content: title,
+      //   confirmText: '确定',
+      //   cancelText: '取消',
+      //   success: function (res) {
+      //     if (res.confirm) {
+      //       that.saveScore()
+      //     }
+      //   }
+      // });
+    },
+    handleCancel(){
+      this.$refs.popup.close()
+    },
+    handleConfirm() {
+      this.$refs.popup.close() // 关闭弹窗
+      this.saveScore() // 执行你的逻辑
     },
     formReset: function (e) {
       console.log('清空数据')
@@ -414,6 +424,19 @@ export default {
         请输入成绩
       </view>
     </view>
+    <!-- 弹窗组件 -->
+    <uni-popup ref="popup" type="dialog">
+      <view class="popup-content">
+        <view style="font-weight: bold;font-size: 1em">确认高考成绩</view>
+        <br/>
+        <view>{{popupContent}}</view>
+      </view>
+      <view class="popup-buttons">
+        <button @click="handleCancel">取消</button>
+        <button @click="handleConfirm">确定</button>
+      </view>
+    </uni-popup>
+
     <!--表单-->
     <view class="uni-padding-wrap uni-common-mt border-top">
       <view class="forms">
@@ -716,5 +739,18 @@ export default {
   margin: 20rpx;
 }
 
+
+.popup-content {
+  white-space: pre-line; /* 关键！让 \n 生效 */
+  padding: 20px;
+  text-align: center;
+  background-color: white;
+}
+.popup-buttons {
+  display: flex;
+  justify-content: space-around;
+  padding: 10px;
+  background-color: white;
+}
 /*底部抽屉 报考方向内容 end*/
 </style>
diff --git a/pages/zyb/testCultural/detail2.vue b/pages/zyb/testCultural/detail2.vue
new file mode 100644
index 0000000..a5d2ac4
--- /dev/null
+++ b/pages/zyb/testCultural/detail2.vue
@@ -0,0 +1,322 @@
+<template>
+	<view class="container">		
+		<!-- College Info Section -->
+		<view class="college-info-section">
+			<view class="college-header-top">
+				<!-- <image class="college-logo" src="/static/college-logo.png" mode="aspectFit"></image> -->
+				<view class="college-details">
+					<text class="college-name">吉林艺术学院</text>
+					<view class="college-tags">
+						<text class="college-tag">本科</text>
+						<text class="college-tag">艺术类</text>
+						<text class="college-tag">公办</text>
+					</view>
+					<text class="college-location">吉林 长春市</text>
+				</view>
+			</view>
+			<view class="college-nav">
+				<view class="nav-item">
+					<view class="nav-icon-placeholder"></view> <!-- Icon placeholder -->
+					<text>院校介绍</text>
+				</view>
+				<view class="nav-item">
+					<view class="nav-icon-placeholder"></view> <!-- Icon placeholder -->
+					<text>招录数据</text>
+				</view>
+				<view class="nav-item">
+					<view class="nav-icon-placeholder"></view> <!-- Icon placeholder -->
+					<text>录取信息</text>
+				</view>
+			</view>
+		</view>
+			
+		<!-- Major Section -->
+		<view class="section major-section">
+			<text class="section-title">专业名称</text>
+			<view class="major-detail">
+				<view class="major-text-info">
+					<text class="major-name">产品设计[文科](提前批)</text>
+					<text class="major-info">(专业组61)(13200元/年; 办学地点: 吉林艺术学院红旗街校区)</text>
+				</view>
+				<view class="major-count">
+					<view class="count-square"></view>
+					<text>共8个</text>
+				</view>
+			</view>
+		</view>
+			
+		<!-- Prediction Result Section -->
+		<view class="section prediction-section">
+			<view class="prediction-header">
+				<text class="prediction-title">测算结果</text>
+			</view>
+			<view class="prediction-content">
+				<text class="required-score">当前需要超过528分</text>
+			</view>
+		</view>
+			
+		<!-- Notes/Score Thresholds Section -->
+		<view class="section notes-section">
+			<text class="section-title">注:</text>
+			<text class="note-item">2023河南文化分控线为 <text class="highlight-score">370</text> 分</text>
+			<text class="note-item">2023河南专业分控线为 <text class="highlight-score">216</text> 分</text>
+		</view>
+			
+		<!-- Admission Method Section -->
+		<view class="section admission-method-section">
+			<text class="section-title">录取方式</text>
+			<text class="method-item">文*<text class="highlight-score">0.067</text>+专*<text class="highlight-score">0.167</text></text>
+			<text class="method-item">院校限制 暂无</text>
+		</view>
+			
+		<!-- Bottom Button -->
+		<view class="bottom-button-container">
+			<button class="collect-button">收藏院校</button>
+		</view>
+	</view>
+	
+</template>
+
+<script>
+	export default {
+		name: "test-cultural-detail2",
+		components: {},
+		data() {
+			return {
+				// 数据可以在这里定义
+			}
+		},
+		methods: {
+			goBack() {
+				uni.navigateBack(); // 返回上一页
+			}
+			// 其他方法
+		}
+	}
+</script>
+
+<style scoped>
+	.container {
+		background-color: #f8f8f8; /* Slightly grey background */
+		min-height: 100vh;
+		padding-bottom: 100rpx; /* Space for the bottom button */
+	}
+	.eye-icon {
+		font-size: 36rpx; /* Adjust eye icon size */
+	}
+
+
+	/* College Info Section */
+	.college-info-section {
+		background-color: #fff;
+		padding: 30rpx;
+		margin-top: 20rpx;
+	}
+
+	.college-header-top {
+		display: flex;
+		align-items: center;
+		margin-bottom: 30rpx;
+	}
+
+	.college-logo {
+		width: 120rpx;
+		height: 120rpx;
+		margin-right: 30rpx;
+		border-radius: 50%; /* If logo is round */
+		background-color: #eee; /* Placeholder background */
+	}
+
+	.college-details {
+		flex: 1;
+	}
+
+	.college-name {
+		font-size: 36rpx;
+		font-weight: bold;
+		display: block;
+	}
+
+	.college-tags {
+		display: flex;
+		margin: 10rpx 0;
+	}
+
+	.college-tag {
+		font-size: 24rpx;
+		color: #007aff; /* Blue/teal like color */
+		border: 1rpx solid #007aff;
+		padding: 4rpx 12rpx;
+		margin-right: 15rpx;
+		border-radius: 8rpx;
+	}
+
+	.college-location {
+		font-size: 28rpx;
+		color: #666;
+		display: block;
+		margin-top: 8rpx;
+	}
+
+	.college-nav {
+		display: flex;
+		justify-content: space-around;
+		text-align: center;
+		border-top: 1rpx solid #eee;
+		padding-top: 30rpx;
+	}
+
+	.nav-item {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		font-size: 28rpx;
+		color: #333;
+	}
+	.nav-item text {
+		margin-top: 8rpx;
+	}
+
+	.nav-icon-placeholder {
+		width: 60rpx;
+		height: 60rpx;
+		background-color: #e0e0e0; /* Placeholder grey circle/square */
+		border-radius: 50%; /* Or remove for square */
+	}
+
+
+	/* Generic Section Styling */
+	.section {
+		background-color: #fff;
+		padding: 30rpx;
+		margin-top: 20rpx;
+	}
+
+	.section-title {
+		font-size: 28rpx;
+		color: #999;
+		margin-bottom: 20rpx;
+		display: block; /* Ensures title takes full width */
+	}
+
+	/* Major Section */
+	.major-detail {
+		display: flex;
+		justify-content: space-between;
+		align-items: flex-start; /* Align items to the top */
+	}
+
+	.major-text-info {
+		flex: 1; /* Allows text to take available space and wrap */
+		margin-right: 20rpx; /* Space between text and count */
+	}
+
+	.major-name {
+		font-size: 32rpx;
+		font-weight: bold;
+		display: block;
+		margin-bottom: 10rpx;
+	}
+
+	.major-info {
+		font-size: 26rpx;
+		color: #666;
+		display: block;
+	}
+
+	.major-count {
+		display: flex;
+		flex-direction: column; /* Stack icon and text */
+		align-items: center; /* Center content horizontally */
+		font-size: 28rpx;
+		color: #333;
+	}
+	.count-square {
+		width: 40rpx;
+		height: 40rpx;
+		background-color: #00c8a8; /* Teal color from image */
+		margin-bottom: 8rpx; /* Space between square and text */
+		border-radius: 8rpx;
+	}
+
+	/* Prediction Result Section */
+	.prediction-section {
+		text-align: right; /* Align content to the right */
+	}
+	.prediction-header {
+		/* This title seems right aligned but separate */
+		/* It might be better to place it within the content area and align right */
+		/* Or use flex to push it right */
+		display: flex;
+		justify-content: flex-end;
+		margin-bottom: 10rpx;
+	}
+	.prediction-title {
+		font-size: 28rpx;
+		color: #00c8a8; /* Teal color */
+		/* Removing section-title margin-bottom if using prediction-header margin */
+	}
+
+	.prediction-content {
+		/* Content below the title */
+		text-align: right;
+	}
+
+	.required-score {
+		font-size: 36rpx;
+		font-weight: bold;
+		color: #333;
+	}
+
+	/* Notes/Score Thresholds Section */
+	.notes-section text {
+		display: block; /* Each text on a new line */
+		font-size: 28rpx;
+		color: #333;
+		margin-bottom: 10rpx;
+	}
+	.notes-section text:last-child {
+		margin-bottom: 0;
+	}
+
+	.highlight-score {
+		color: #007aff; /* Blue/teal highlight color */
+	}
+
+	/* Admission Method Section */
+	.admission-method-section .method-item {
+		display: block; /* Each item on a new line */
+		font-size: 28rpx;
+		color: #333;
+		margin-bottom: 10rpx;
+	}
+	.admission-method-section .method-item:last-child {
+		margin-bottom: 0;
+	}
+
+
+	/* Bottom Button */
+	.bottom-button-container {
+		position: fixed; /* Fix button to the bottom */
+		bottom: 0;
+		left: 0;
+		right: 0;
+		padding: 20rpx 30rpx;
+		background-color: #fff;
+		box-shadow: 0 -2rpx 4rpx rgba(0,0,0,0.1); /* Add shadow above button */
+		z-index: 10; /* Ensure button is above other content */
+	}
+
+	.collect-button {
+		width: 100%;
+		height: 90rpx;
+		line-height: 90rpx;
+		background-color: #e0e0e0; /* Grey background */
+		color: #666; /* Grey text */
+		font-size: 34rpx;
+		border-radius: 10rpx;
+		border: none;
+		outline: none;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/zyb/user/index - 副本.vue b/pages/zyb/user/index - 副本.vue
new file mode 100644
index 0000000..5460f3a
--- /dev/null
+++ b/pages/zyb/user/index - 副本.vue	
@@ -0,0 +1,451 @@
+<script>
+import Request from '@/common/request';
+import ImagesConstant from "@/common/ImagesConstant";
+import commonTool from "@/common/js/commonTool";
+
+let request = new Request()
+export default {
+  name: "user-index",
+  components: {},
+  computed: {
+    commonTool() {
+      return commonTool
+    },
+    ImagesConstant() {
+      return ImagesConstant
+    },
+  },
+  data() {
+    return {
+		imId:'Shilo_',
+      systemName:'',
+      avatar: ImagesConstant.systemIcon,
+      userInfo: {},
+      vipInfo: {},
+      scoreInfo: {},//成绩信息
+      volunteerInfo: {},//当前志愿单信息
+      itemList: [
+        {
+          title: '会员卡激活',
+          icon:'/static/icons/gif/icons8-cards.gif',
+          url: '/pages/zyb/vip/cardamom'
+        },
+        // #ifdef MP-TOUTIAO
+        {
+          title: '我的订单',
+          icon:'/static/icons/gif/icons8-order.gif',
+          url: '/pages/zyb/order/list'
+        },
+        {
+          title: '联系客服',
+          type:'im',
+          icon:'/static/icons/gif/icons8-customer-service.gif',
+        },
+        // #endif
+        // #ifdef MP-WEIXIN
+        {
+          title: '联系客服',
+          type:'contact',
+          icon:'/static/icons/gif/icons8-customer-service.gif',
+        },
+        {
+          title: '专家一对一',
+          //icon: '/static/icons/linear/calendar.png',
+          icon: '/static/icons/gif/icons8-man.gif',
+          url: '/pages/zyb/other/updateLogs'
+        },
+        {
+          title: '商务合作',
+          //icon: '/static/icons/linear/quest.png',
+          icon: '/static/icons/gif/icons8-cooperate.gif',
+          method:'cooperate',
+          url: '/pages/zyb/other/commonProblem'
+        },
+        // #endif
+
+
+        /*{
+          title: '更新快报',
+          //icon: '/static/icons/linear/calendar.png',
+          icon: '/static/icons/gif/icons8-calendar.gif',
+          url: '/pages/zyb/other/updateLogs'
+        },*/
+        {
+          title: '我的收藏',
+          //icon: '/static/icons/linear/love.png',
+          icon: '/static/icons/gif/icons8-loading-heart.gif',
+          url: '/pages/zyb/user/myCollect'
+        },
+        {
+          title: '使用说明',
+          //icon: '/static/icons/linear/illustrate.png',
+          icon: '/static/icons/gif/detail.gif',
+          url: '/pages/zyb/other/useHelp'
+        },
+
+       /* {
+          title: '问题反馈',
+          //icon: '/static/icons/linear/quest.png',
+          icon: '/static/icons/gif/icons8-doubt.gif',
+          url: '/pages/zyb/other/commonProblem'
+        },*/
+        {
+          title: '常见问题',
+          //icon: '/static/icons/linear/quest.png',
+          icon: '/static/icons/gif/icons8-doubt.gif',
+          url: '/pages/zyb/other/commonProblem'
+        },
+        {
+          title: '设置',
+          //icon: '/static/icons/linear/settings.png',
+          icon: '/static/icons/gif/icons8-wotuishi-settings.gif',
+          url: '/pages/zyb/settings'
+        },
+
+
+      ]
+    }
+  },
+  onShow() {
+    this.userInfo = uni.getStorageSync('userInfo')
+    if (this.userInfo === null || this.userInfo.id=== undefined) {
+      wx.reLaunch({
+        url: '/pages/zyb/login',
+      })
+    }
+    this.vipInfo = uni.getStorageSync('vipInfo')
+    this.getScore()
+  },
+  onLoad() {
+    this.systemName = commonTool.getSystemName()
+    if(this.systemName === '体育志愿宝'){
+      this.playerType = '体育考生'
+    }
+  },
+  methods: {
+    //获取成绩信息
+    getScore() {
+      this.scoreInfo = uni.getStorageSync('scoreInfo')
+      if (this.scoreInfo) {
+        this.volunteerInfo = uni.getStorageSync('volunteer')
+      }
+    },
+    gotoEditScore() {
+      console.log('前往修改成绩页面')
+      this.goto('/pages/zyb/score/edit')
+    },
+    switchFillVolunteer() {
+      this.goto('/pages/zyb/fillVolunteer/my')
+    },
+    /*前往开通vip*/
+    gotoOpenVip() {
+      this.goto('/pages/zyb/vip/index')
+    },
+    /*商务合作弹框事件*/
+    cooperate(){
+      console.log('商务合作')
+      this.$refs.popup2.open("center")
+    },
+    cooperateClose(){
+      this.$refs.popup2.close()
+    },
+    goto(e) {
+      uni.navigateTo({
+        url: e,
+        nimationType: 'pop-in',
+        animationDuration: 2000
+      })
+    },
+    previewImage(e){
+      console.log('e', e);
+      uni.previewImage({
+        // 需要预览的图片链接列表
+        urls: [],
+        // 为当前显示图片的链接/索引值
+        current: ImagesConstant.customerServiceQrCode,
+        // 图片指示器样式
+        indicator:'default',
+        // 是否可循环预览
+        loop:false,
+        // 长按图片显示操作菜单，如不填默认为保存相册
+        // longPressActions:{
+        // 	itemList:[this.l('发送给朋友'),this.l]
+        // },
+        success: res => {
+          console.log('res', res);
+        },
+        fail: err => {
+          console.log('err', err);
+        }
+      });
+    },
+	imCallback(e) {
+	    console.log("跳转IM客服成功", e.detail);
+	},
+	onimError(e) {
+	    console.log("拉起IM客服失败", e.detail);
+	},
+  }
+}
+</script>
+
+<template>
+  <uni-popup ref="popup2" background-color="#fff" class="radius15">
+    <view class="popup-content radius15" style="padding: 30rpx 30rpx">
+      <view class="font-size-mini4 font-weight-b" style="text-align: center">添加老师微信</view>
+      <image @click="previewImage" :show-menu-by-longpress="true" :src="ImagesConstant.customerServiceQrCode" style="width: 600rpx;height: 800rpx"/>
+      <view class="flexWrap marginTopBot20 margin-top-20"><text class="text">联系人：周老师</text></view>
+      <view class="flexWrap marginTopBot20"><text class="text">电话：15090658223(微信同号)</text></view>
+      <view class="font-size-mini4 font-weight-b margin-top-20 margin-top-20" @click="cooperateClose" style="text-align: center">知道了</view>
+    </view>
+  </uni-popup>
+  <!-- 普通弹窗 -->
+  <uni-popup ref="popup" background-color="#fff" class="radius15">
+    <view class="popup-content radius15" style="padding: 30rpx 50rpx">
+      <view class="font-size-mini4 font-weight-b" style="text-align: center">商务合作</view>
+      <view class="flexWrap marginTopBot20 margin-top-20"><text class="text">联系人：周老师</text></view>
+      <view class="flexWrap marginTopBot20"><text class="text">电话：15090658223(微信同号)</text></view>
+      <view class="font-size-mini4 font-weight-b margin-top-20 margin-top-20" @click="cooperateClose" style="text-align: center">知道了</view>
+    </view>
+  </uni-popup>
+  <!--头部-->
+  <view class="header" style="z-index: 1">
+    <view class="uni-flex flex" style="padding: 30rpx 30rpx 0 30rpx" @click="goto('/pages/zyb/user/detail')">
+      <!--头像-->
+      <view class="flex-item2 t1">
+        <image class="avatar" :src="avatar"/>
+      </view>
+      <!--手机号-->
+      <view class="flex-item-7 t2">
+        <view class="flex font-weight-600">
+          <text style="line-height: 50rpx">{{ userInfo.realname }}</text>
+        </view>
+        <view class="flex">
+          <text style="line-height: 50rpx">{{ scoreInfo.province }}</text>
+          <text style="line-height: 50rpx;font-size: 24rpx">/2024</text>
+        </view>
+      </view>
+      <!--按钮-->
+      <view class="flex-item2" style="padding-top: 60rpx;">
+        <image class="arrow-right" :src="ImagesConstant.keyboard.arrowRight"/>
+      </view>
+    </view>
+    <!--开通vip提示-->
+    <view class="uni-flex flex white" style="margin-top: 30rpx">
+      <view class="flex-item-10 vipBackground" style="height: 50rpx;padding: 30rpx"
+            v-if="vipInfo && vipInfo.vipLevel>0">
+        <text>
+          {{ vipInfo.skuName || 'VIP' }}到期时间：{{ commonTool.dateFormatYYYYMMDD(vipInfo.validTime) }}
+        </text>
+        <text class="float-right radius60" style="border: 1rpx solid white;padding: 0 20rpx" @click="gotoOpenVip">
+          查看更多
+        </text>
+      </view>
+      <view class="flex-item-10 vipBackground" style="height: 50rpx;line-height: 50rpx;padding: 30rpx;"
+            v-if="(!vipInfo) || !vipInfo.vipLevel || vipInfo.vipLevel===0">
+        <text>升级为VIP, 准确查大学录取率</text>
+        <text class="float-right radius60" style="border: 1rpx solid white;padding: 0 20rpx" @click="gotoOpenVip">
+          开通VIP
+        </text>
+      </view>
+    </view>
+  </view>
+  <view class="body" style="z-index: 2">
+    <!--我的成绩-->
+    <view class="uni-flex flex trow1">
+      <view class="flex-item-1">
+        <text style="font-size: 24rpx">我的成绩</text>
+      </view>
+      <view class="flex-item-7 trow1-center">
+        <view class="flexWrap margin-left-30">
+          <view class="flex-item-10">
+            <text class="margin-right-10">文化:{{ this.scoreInfo.culturalScore }}分</text>
+            <text class="margin-right-10" v-if="scoreInfo && scoreInfo.professionalCategory!=='表演类'">{{scoreInfo.professionalCategory==='音乐类'?'主项':'统考'}}:{{ this.scoreInfo.professionalScore }}分</text>
+            <br v-if="scoreInfo && scoreInfo.professionalCategory!=='表演类'"/>
+            <text v-if="scoreInfo && scoreInfo.yybysy">音表声乐:</text>
+            <text class="margin-right-10" v-if="scoreInfo && scoreInfo.yybysy">{{ scoreInfo && scoreInfo.yybysy }}分</text>
+            <text v-if="scoreInfo && scoreInfo.yybyqy">音表器乐:</text>
+            <text class="margin-right-10" v-if="scoreInfo && scoreInfo.yybyqy">{{ scoreInfo && scoreInfo.yybyqy }}分</text>
+            <text v-if="scoreInfo && scoreInfo.yyjy">音乐教育:</text>
+            <text class="margin-right-10" v-if="scoreInfo && scoreInfo.yyjy">{{ scoreInfo && scoreInfo.yyjy }}分</text>
+            <!--表演类-->
+            <text v-if="scoreInfo && scoreInfo.fzby">服装表演:</text>
+            <text class="margin-right-10" v-if="scoreInfo && scoreInfo.fzby">{{ scoreInfo && scoreInfo.fzby }}分</text>
+            <text v-if="scoreInfo && scoreInfo.xjysdy">影视导演:</text>
+            <text class="margin-right-10" v-if="scoreInfo && scoreInfo.xjysdy">{{ scoreInfo && scoreInfo.xjysdy }}分</text>
+            <text v-if="scoreInfo && scoreInfo.xjysby">影视表演:</text>
+            <text v-if="scoreInfo && scoreInfo.xjysby">{{ scoreInfo && scoreInfo.xjysby }}分</text>
+          </view>
+        </view>
+        </view>
+        <view class="flexWrap margin-left-30"></view>
+
+      <view class="flex-item-2" @click="gotoEditScore()">
+        <view class="" style="margin-top: 20rpx">
+          <view style="width: 100rpx;text-align: center;position: relative;left: 20rpx">
+            <image :src="ImagesConstant.edit2" class="icon40"/>
+          </view>
+        </view>
+      </view>
+
+    </view>
+    <!--我的志愿-->
+<!--	<button-->
+<!--	  open-type="im"-->
+<!--	  data-im-id="Shilo_"-->
+<!--	  bindim="imCallback"-->
+<!--	  binderror="onimError"-->
+<!--	>-->
+<!--	  跳转 IM-->
+<!--	</button>-->
+	<!-- <button class='contact-btn' open-type="im" bindim="imCallback" binderror="onimError" data-im-id="Shilo_">联系客服</button> -->
+
+    <view class="uni-flex flex trow1">
+      <view class="flex-item-1">
+        <text style="font-size: 24rpx">我的志愿</text>
+      </view>
+      <view class="flex-item-7">
+        <view class="trow1-center" style="">
+          <view class="flex" v-if="scoreInfo && volunteerInfo">
+            <text style="margin:0 30rpx">{{ volunteerInfo.volunteerName || '' }}</text>
+          </view>
+          <view class="flex" style="margin-left:30rpx;color:#c1c4cc">
+            <!--            <text>{{ scoreInfo && scoreInfo.professionalScore || '&#45;&#45;' }}分&nbsp;&nbsp;/</text>-->
+            <text>{{ scoreInfo && scoreInfo.province || '--' }}&nbsp;/</text>
+            <text>&nbsp;{{ scoreInfo && scoreInfo.cognitioPolyclinic ==='文科'?'历史组':'物理组' || '--' }}&nbsp;/</text>
+            <text>&nbsp;{{ scoreInfo && scoreInfo.professionalCategory || '--' }}</text>
+          </view>
+        </view>
+      </view>
+      <view class="flex-item-2" @click="switchFillVolunteer">
+        <view style="padding: 15rpx 0 15rpx 65rpx">
+          <image src="/static/icons/icons8-menu.png" class="icon32"/>
+        </view>
+      </view>
+    </view>
+    <!--剩余选项-->
+    <view class="trow1">
+      <view class="uni-flex flex" v-for="(item,index) in itemList" :key="index">
+        <!--联系客服-->
+        <view class="flex-item-10" v-if="item.type==='contact' || item.type ==='im'">
+			{{item.type}}
+          <view class="uni-flex flex trow1-child">
+            <button class='contact-btn' :open-type="item.type" data-im-id="Shilo_">aa</button>
+            <view class="flex-item-1">
+              <image :src="item.icon" class="icon40"/>
+            </view>
+            <view class="flex-item-8">
+              <text>{{item.title}}</text>
+            </view>
+            <view class="flex-item-1">
+              <image :src="ImagesConstant.keyboard.arrowRight" style="width: 40rpx;height: 40rpx"/>
+            </view>
+          </view>
+        </view>
+        <view class="flex-item-10" v-else @click="item.method==='cooperate'?cooperate() : goto(item.url)">
+          <view class=""
+                :class="index===itemList.length-1?'uni-flex flex trow1-child-last':'uni-flex flex trow1-child'">
+            <view class="flex-item-1">
+              <image :src="item.icon" style="width: 40rpx;height: 40rpx"/>
+            </view>
+            <view class="flex-item-8">
+              <text>{{ item.title }}</text>
+            </view>
+            <view class="flex-item-1">
+              <image :src="ImagesConstant.keyboard.arrowRight" style="width: 40rpx;height: 40rpx"/>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <!---->
+    <view class="uni-flex flex">
+      <view class="flex-item-10" style="text-align: center;">
+        <text>{{ systemName }}</text>
+      </view>
+    </view>
+  </view>
+</template>
+
+<style scoped lang="scss">
+.header {
+  background: repeating-linear-gradient(#dcdaf7, #f7f7f7, #e6e4e4);
+  background: -ms-repeating-linear-gradient(#dcdaf7, #f7f7f7, #e6e4e4);
+  background: -webkit-repeating-linear-gradient(#dcdaf7, #f7f7f7, #e6e4e4);
+  background: -moz-repeating-linear-gradient(#dcdaf7, #f7f7f7, #e6e4e4);
+  /*background: linear-gradient(131deg, rgb(18, 117, 236) 0%, rgb(122, 182, 249) 100%);*/
+  height: 340rpx;
+  /*头像*/
+  .avatar {
+    border-radius: 50%;
+    width: 150rpx;
+    height: 148rpx;
+  }
+
+  .arrow-right {
+    width: 70rpx;
+    height: 70rpx;
+    position: absolute;
+    right: 8rpx;
+  }
+
+  .t1 {
+    padding: 20rpx 0 0 0;
+  }
+
+  .t2 {
+    padding: 40rpx 20rpx 0 20rpx;
+    font-weight: 500;
+    color: black;
+  }
+
+  /*开通vip框*/
+  .vipBackground {
+    background-color: #e5620f;
+    border-radius: 40rpx 40rpx 0 0;
+  }
+}
+
+.body {
+  background-color: #f4f5f7;
+  min-height: 880rpx;
+  padding: 30rpx;
+  /*单行*/
+  .trow1 {
+    background-color: #ffffff;
+    border-radius: 15rpx;
+    padding: 20rpx 30rpx;
+    margin-bottom: 20rpx;
+
+    .trow1-center {
+      font-size: 24rpx;
+      margin: 10rpx 0 0 20rpx;
+      border-left: 5rpx solid #f1b481;
+    }
+
+    .trow1-child {
+      margin-top: 20rpx;
+      padding-bottom: 20rpx;
+      border-bottom: 2rpx solid #f8f8f8;
+    }
+
+    .trow1-child-last {
+      margin-top: 20rpx;
+      padding-bottom: 20rpx;
+      border-bottom: none;
+    }
+  }
+}
+
+
+//覆盖联系客服按钮原生样式
+:deep(.contact-btn) {
+  display: inline-block;
+  position: absolute;
+  width: 80%;
+  background: salmon;
+  // opacity: 0;
+  // border-radius: 0;
+}
+
+</style>
diff --git a/pages/zyb/user/index.vue b/pages/zyb/user/index.vue
index 8804723..92ffe6a 100644
--- a/pages/zyb/user/index.vue
+++ b/pages/zyb/user/index.vue
@@ -1,451 +1,469 @@
 <script>
-import Request from '@/common/request';
-import ImagesConstant from "@/common/ImagesConstant";
-import commonTool from "@/common/js/commonTool";
+	import Request from '@/common/request';
+	import ImagesConstant from "@/common/ImagesConstant";
+	import commonTool from "@/common/js/commonTool";
 
-let request = new Request()
-export default {
-  name: "user-index",
-  components: {},
-  computed: {
-    commonTool() {
-      return commonTool
-    },
-    ImagesConstant() {
-      return ImagesConstant
-    },
-  },
-  data() {
-    return {
-		imId:'Shilo_',
-      systemName:'',
-      avatar: ImagesConstant.systemIcon,
-      userInfo: {},
-      vipInfo: {},
-      scoreInfo: {},//成绩信息
-      volunteerInfo: {},//当前志愿单信息
-      itemList: [
-        {
-          title: '会员卡激活',
-          icon:'/static/icons/gif/icons8-cards.gif',
-          url: '/pages/zyb/vip/cardamom'
-        },
-        // #ifdef MP-TOUTIAO
-        {
-          title: '我的订单',
-          icon:'/static/icons/gif/icons8-order.gif',
-          url: '/pages/zyb/order/list'
-        },
-        {
-          title: '联系客服',
-          type:'im',
-          icon:'/static/icons/gif/icons8-customer-service.gif',
-        },
-        // #endif
-        // #ifdef MP-WEIXIN
-        {
-          title: '联系客服',
-          type:'contact',
-          icon:'/static/icons/gif/icons8-customer-service.gif',
-        },
-        {
-          title: '专家一对一',
-          //icon: '/static/icons/linear/calendar.png',
-          icon: '/static/icons/gif/icons8-man.gif',
-          url: '/pages/zyb/other/updateLogs'
-        },
-        {
-          title: '商务合作',
-          //icon: '/static/icons/linear/quest.png',
-          icon: '/static/icons/gif/icons8-cooperate.gif',
-          method:'cooperate',
-          url: '/pages/zyb/other/commonProblem'
-        },
-        // #endif
+	let request = new Request()
+	const app = getApp()
+	export default {
+		name: "user-index",
+		components: {},
+		computed: {
+			commonTool() {
+				return commonTool
+			},
+			ImagesConstant() {
+				return ImagesConstant
+			},
+			app() {
+				return app
+			},
+		},
+		data() {
+			return {
+				imId: 'Shilo_',
+				systemName: '',
+				avatar: ImagesConstant.systemIcon,
+				userInfo: {},
+				vipInfo: {},
+				scoreInfo: {}, //成绩信息
+				volunteerInfo: {}, //当前志愿单信息
+				itemList: [{
+						title: '会员卡激活',
+						icon: '/static/icons/gif/icons8-cards.gif',
+						url: '/pages/zyb/vip/cardamom'
+					},
+					// #ifdef MP-TOUTIAO
+					{
+						title: '我的订单',
+						icon: '/static/icons/gif/icons8-order.gif',
+						url: '/pages/zyb/order/list'
+					},
+					{
+						title: '联系客服',
+						type: 'im',
+						icon: '/static/icons/gif/icons8-customer-service.gif',
+					},
+					// #endif
+					// #ifdef MP-WEIXIN
+					{
+						title: '联系客服',
+						type: 'contact',
+						icon: '/static/icons/gif/icons8-customer-service.gif',
+					},
+					{
+						title: '专家一对一',
+						//icon: '/static/icons/linear/calendar.png',
+						icon: '/static/icons/gif/icons8-man.gif',
+						url: '/pages/zyb/other/updateLogs'
+					},
+					{
+						title: '商务合作',
+						//icon: '/static/icons/linear/quest.png',
+						icon: '/static/icons/gif/icons8-cooperate.gif',
+						method: 'cooperate',
+						url: '/pages/zyb/other/commonProblem'
+					},
+					// #endif
 
 
-        /*{
-          title: '更新快报',
-          //icon: '/static/icons/linear/calendar.png',
-          icon: '/static/icons/gif/icons8-calendar.gif',
-          url: '/pages/zyb/other/updateLogs'
-        },*/
-        {
-          title: '我的收藏',
-          //icon: '/static/icons/linear/love.png',
-          icon: '/static/icons/gif/icons8-loading-heart.gif',
-          url: '/pages/zyb/user/myCollect'
-        },
-        {
-          title: '使用说明',
-          //icon: '/static/icons/linear/illustrate.png',
-          icon: '/static/icons/gif/detail.gif',
-          url: '/pages/zyb/other/useHelp'
-        },
+					/*{
+					  title: '更新快报',
+					  //icon: '/static/icons/linear/calendar.png',
+					  icon: '/static/icons/gif/icons8-calendar.gif',
+					  url: '/pages/zyb/other/updateLogs'
+					},*/
+					{
+						title: '我的收藏',
+						//icon: '/static/icons/linear/love.png',
+						icon: '/static/icons/gif/icons8-loading-heart.gif',
+						url: '/pages/zyb/user/myCollect'
+					},
+					{
+						title: '使用说明',
+						//icon: '/static/icons/linear/illustrate.png',
+						icon: '/static/icons/gif/detail.gif',
+						url: '/pages/zyb/other/useHelp'
+					},
 
-       /* {
-          title: '问题反馈',
-          //icon: '/static/icons/linear/quest.png',
-          icon: '/static/icons/gif/icons8-doubt.gif',
-          url: '/pages/zyb/other/commonProblem'
-        },*/
-        {
-          title: '常见问题',
-          //icon: '/static/icons/linear/quest.png',
-          icon: '/static/icons/gif/icons8-doubt.gif',
-          url: '/pages/zyb/other/commonProblem'
-        },
-        {
-          title: '设置',
-          //icon: '/static/icons/linear/settings.png',
-          icon: '/static/icons/gif/icons8-wotuishi-settings.gif',
-          url: '/pages/zyb/settings'
-        },
+					/* {
+					   title: '问题反馈',
+					   //icon: '/static/icons/linear/quest.png',
+					   icon: '/static/icons/gif/icons8-doubt.gif',
+					   url: '/pages/zyb/other/commonProblem'
+					 },*/
+					{
+						title: '常见问题',
+						//icon: '/static/icons/linear/quest.png',
+						icon: '/static/icons/gif/icons8-doubt.gif',
+						url: '/pages/zyb/other/commonProblem'
+					},
+					{
+						title: '设置',
+						//icon: '/static/icons/linear/settings.png',
+						icon: '/static/icons/gif/icons8-wotuishi-settings.gif',
+						url: '/pages/zyb/settings'
+					},
 
 
-      ]
-    }
-  },
-  onShow() {
-    this.userInfo = uni.getStorageSync('userInfo')
-    if (this.userInfo === null || this.userInfo.id=== undefined) {
-      wx.reLaunch({
-        url: '/pages/zyb/login',
-      })
-    }
-    this.vipInfo = uni.getStorageSync('vipInfo')
-    this.getScore()
-  },
-  onLoad() {
-    this.systemName = commonTool.getSystemName()
-    if(this.systemName === '体育志愿宝'){
-      this.playerType = '体育考生'
-    }
-  },
-  methods: {
-    //获取成绩信息
-    getScore() {
-      this.scoreInfo = uni.getStorageSync('scoreInfo')
-      if (this.scoreInfo) {
-        this.volunteerInfo = uni.getStorageSync('volunteer')
-      }
-    },
-    gotoEditScore() {
-      console.log('前往修改成绩页面')
-      this.goto('/pages/zyb/score/edit')
-    },
-    switchFillVolunteer() {
-      this.goto('/pages/zyb/fillVolunteer/my')
-    },
-    /*前往开通vip*/
-    gotoOpenVip() {
-      this.goto('/pages/zyb/vip/index')
-    },
-    /*商务合作弹框事件*/
-    cooperate(){
-      console.log('商务合作')
-      this.$refs.popup2.open("center")
-    },
-    cooperateClose(){
-      this.$refs.popup2.close()
-    },
-    goto(e) {
-      uni.navigateTo({
-        url: e,
-        nimationType: 'pop-in',
-        animationDuration: 2000
-      })
-    },
-    previewImage(e){
-      console.log('e', e);
-      uni.previewImage({
-        // 需要预览的图片链接列表
-        urls: [],
-        // 为当前显示图片的链接/索引值
-        current: ImagesConstant.customerServiceQrCode,
-        // 图片指示器样式
-        indicator:'default',
-        // 是否可循环预览
-        loop:false,
-        // 长按图片显示操作菜单，如不填默认为保存相册
-        // longPressActions:{
-        // 	itemList:[this.l('发送给朋友'),this.l]
-        // },
-        success: res => {
-          console.log('res', res);
-        },
-        fail: err => {
-          console.log('err', err);
-        }
-      });
-    },
-	imCallback(e) {
-	    console.log("跳转IM客服成功", e.detail);
-	},
-	onimError(e) {
-	    console.log("拉起IM客服失败", e.detail);
-	},
-  }
-}	
+				]
+			}
+		},
+		onShow() {
+			this.userInfo = uni.getStorageSync('userInfo')
+			if (this.userInfo === null || this.userInfo.id === undefined) {
+				wx.reLaunch({
+					url: '/pages/zyb/login',
+				})
+			}
+			this.vipInfo = uni.getStorageSync('vipInfo')
+			this.getScore()
+		},
+		onLoad() {
+			this.systemName = commonTool.getSystemName()
+			if (this.systemName === '体育志愿宝') {
+				this.playerType = '体育考生'
+			}
+		},
+		methods: {
+			//获取成绩信息
+			getScore() {
+				this.scoreInfo = uni.getStorageSync('scoreInfo')
+				if (this.scoreInfo) {
+					this.volunteerInfo = uni.getStorageSync('volunteer')
+				}
+			},
+			gotoEditScore() {
+				console.log('前往修改成绩页面')
+				this.goto('/pages/zyb/score/edit')
+			},
+			switchFillVolunteer() {
+				this.goto('/pages/zyb/fillVolunteer/my')
+			},
+			/*前往开通vip*/
+			gotoOpenVip() {
+				this.goto('/pages/zyb/vip/index')
+			},
+			/*商务合作弹框事件*/
+			cooperate() {
+				console.log('商务合作')
+				this.$refs.popup2.open("center")
+			},
+			cooperateClose() {
+				this.$refs.popup2.close()
+			},
+			goto(e) {
+				uni.navigateTo({
+					url: e,
+					nimationType: 'pop-in',
+					animationDuration: 2000
+				})
+			},
+			previewImage(e) {
+				console.log('e', e);
+				uni.previewImage({
+					// 需要预览的图片链接列表
+					urls: [],
+					// 为当前显示图片的链接/索引值
+					current: app.globalData.StaticConstant.contact.images,
+					// 图片指示器样式
+					indicator: 'default',
+					// 是否可循环预览
+					loop: false,
+					// 长按图片显示操作菜单，如不填默认为保存相册
+					// longPressActions:{
+					// 	itemList:[this.l('发送给朋友'),this.l]
+					// },
+					success: res => {
+						console.log('res', res);
+					},
+					fail: err => {
+						console.log('err', err);
+					}
+				});
+			},
+			imCallback(e) {
+				console.log("跳转IM客服成功", e.detail);
+			},
+			onimError(e) {
+				console.log("拉起IM客服失败", e.detail);
+			},
+		}
+	}
 </script>
 
 <template>
-  <uni-popup ref="popup2" background-color="#fff" class="radius15">
-    <view class="popup-content radius15" style="padding: 30rpx 30rpx">
-      <view class="font-size-mini4 font-weight-b" style="text-align: center">添加老师微信</view>
-      <image @click="previewImage" :show-menu-by-longpress="true" :src="ImagesConstant.customerServiceQrCode" style="width: 600rpx;height: 800rpx"/>
-      <view class="flexWrap marginTopBot20 margin-top-20"><text class="text">联系人：周老师</text></view>
-      <view class="flexWrap marginTopBot20"><text class="text">电话：15090658223(微信同号)</text></view>
-      <view class="font-size-mini4 font-weight-b margin-top-20 margin-top-20" @click="cooperateClose" style="text-align: center">知道了</view>
-    </view>
-  </uni-popup>
-  <!-- 普通弹窗 -->
-  <uni-popup ref="popup" background-color="#fff" class="radius15">
-    <view class="popup-content radius15" style="padding: 30rpx 50rpx">
-      <view class="font-size-mini4 font-weight-b" style="text-align: center">商务合作</view>
-      <view class="flexWrap marginTopBot20 margin-top-20"><text class="text">联系人：周老师</text></view>
-      <view class="flexWrap marginTopBot20"><text class="text">电话：15090658223(微信同号)</text></view>
-      <view class="font-size-mini4 font-weight-b margin-top-20 margin-top-20" @click="cooperateClose" style="text-align: center">知道了</view>
-    </view>
-  </uni-popup>
-  <!--头部-->
-  <view class="header" style="z-index: 1">
-    <view class="uni-flex flex" style="padding: 30rpx 30rpx 0 30rpx" @click="goto('/pages/zyb/user/detail')">
-      <!--头像-->
-      <view class="flex-item2 t1">
-        <image class="avatar" :src="avatar"/>
-      </view>
-      <!--手机号-->
-      <view class="flex-item-7 t2">
-        <view class="flex font-weight-600">
-          <text style="line-height: 50rpx">{{ userInfo.realname }}</text>
-        </view>
-        <view class="flex">
-          <text style="line-height: 50rpx">{{ scoreInfo.province }}</text>
-          <text style="line-height: 50rpx;font-size: 24rpx">/2024</text>
-        </view>
-      </view>
-      <!--按钮-->
-      <view class="flex-item2" style="padding-top: 60rpx;">
-        <image class="arrow-right" :src="ImagesConstant.keyboard.arrowRight"/>
-      </view>
-    </view>
-    <!--开通vip提示-->
-    <view class="uni-flex flex white" style="margin-top: 30rpx">
-      <view class="flex-item-10 vipBackground" style="height: 50rpx;padding: 30rpx"
-            v-if="vipInfo && vipInfo.vipLevel>0">
-        <text>
-          {{ vipInfo.skuName || 'VIP' }}到期时间：{{ commonTool.dateFormatYYYYMMDD(vipInfo.validTime) }}
-        </text>
-        <text class="float-right radius60" style="border: 1rpx solid white;padding: 0 20rpx" @click="gotoOpenVip">
-          查看更多
-        </text>
-      </view>
-      <view class="flex-item-10 vipBackground" style="height: 50rpx;line-height: 50rpx;padding: 30rpx;"
-            v-if="(!vipInfo) || !vipInfo.vipLevel || vipInfo.vipLevel===0">
-        <text>升级为VIP, 准确查大学录取率</text>
-        <text class="float-right radius60" style="border: 1rpx solid white;padding: 0 20rpx" @click="gotoOpenVip">
-          开通VIP
-        </text>
-      </view>
-    </view>
-  </view>
-  <view class="body" style="z-index: 2">
-    <!--我的成绩-->
-    <view class="uni-flex flex trow1">
-      <view class="flex-item-1">
-        <text style="font-size: 24rpx">我的成绩</text>
-      </view>
-      <view class="flex-item-7 trow1-center">
-        <view class="flexWrap margin-left-30">
-          <view class="flex-item-10">
-            <text class="margin-right-10">文化:{{ this.scoreInfo.culturalScore }}分</text>
-            <text class="margin-right-10" v-if="scoreInfo && scoreInfo.professionalCategory!=='表演类'">{{scoreInfo.professionalCategory==='音乐类'?'主项':'统考'}}:{{ this.scoreInfo.professionalScore }}分</text>
-            <br v-if="scoreInfo && scoreInfo.professionalCategory!=='表演类'"/>
-            <text v-if="scoreInfo && scoreInfo.yybysy">音表声乐:</text>
-            <text class="margin-right-10" v-if="scoreInfo && scoreInfo.yybysy">{{ scoreInfo && scoreInfo.yybysy }}分</text>
-            <text v-if="scoreInfo && scoreInfo.yybyqy">音表器乐:</text>
-            <text class="margin-right-10" v-if="scoreInfo && scoreInfo.yybyqy">{{ scoreInfo && scoreInfo.yybyqy }}分</text>
-            <text v-if="scoreInfo && scoreInfo.yyjy">音乐教育:</text>
-            <text class="margin-right-10" v-if="scoreInfo && scoreInfo.yyjy">{{ scoreInfo && scoreInfo.yyjy }}分</text>
-            <!--表演类-->
-            <text v-if="scoreInfo && scoreInfo.fzby">服装表演:</text>
-            <text class="margin-right-10" v-if="scoreInfo && scoreInfo.fzby">{{ scoreInfo && scoreInfo.fzby }}分</text>
-            <text v-if="scoreInfo && scoreInfo.xjysdy">影视导演:</text>
-            <text class="margin-right-10" v-if="scoreInfo && scoreInfo.xjysdy">{{ scoreInfo && scoreInfo.xjysdy }}分</text>
-            <text v-if="scoreInfo && scoreInfo.xjysby">影视表演:</text>
-            <text v-if="scoreInfo && scoreInfo.xjysby">{{ scoreInfo && scoreInfo.xjysby }}分</text>
-          </view>
-        </view>
-        </view>
-        <view class="flexWrap margin-left-30"></view>
+	<uni-popup ref="popup2" background-color="#fff" class="radius15">
+		<view class="popup-content radius15" style="padding: 30rpx 30rpx">
+			<view class="font-size-mini4 font-weight-b" style="text-align: center">添加老师微信</view>
+			<image @click="previewImage" :show-menu-by-longpress="true"
+				:src="app.globalData.StaticConstant.contact.images" style="width: 600rpx;height: 600rpx" />
+			<view class="flexWrap marginTopBot20 margin-top-20"><text
+					class="text">联系人：{{app.globalData.StaticConstant.contact.personName}}</text></view>
+			<view class="flexWrap marginTopBot20"><text
+					class="text">电话：{{app.globalData.StaticConstant.contact.personNumber}}(微信同号)</text></view>
+			<view class="font-size-mini4 font-weight-b margin-top-20 margin-top-20" @click="cooperateClose"
+				style="text-align: center">知道了</view>
+		</view>
+	</uni-popup>
+	<!-- 普通弹窗 -->
+	<uni-popup ref="popup" background-color="#fff" class="radius15">
+		<view class="popup-content radius15" style="padding: 30rpx 50rpx">
+			<view class="font-size-mini4 font-weight-b" style="text-align: center">商务合作</view>
+			<view class="flexWrap marginTopBot20 margin-top-20"><text
+					class="text">联系人：{{app.globalData.StaticConstant.contact.personName}}</text></view>
+			<view class="flexWrap marginTopBot20"><text
+					class="text">电话：{{app.globalData.StaticConstant.contact.personNumber}}(微信同号)</text></view>
+			<view class="font-size-mini4 font-weight-b margin-top-20 margin-top-20" @click="cooperateClose"
+				style="text-align: center">知道了</view>
+		</view>
+	</uni-popup>
+	<!--头部-->
+	<view class="header" style="z-index: 1">
+		<view class="uni-flex flex" style="padding: 30rpx 30rpx 0 30rpx" @click="goto('/pages/zyb/user/detail')">
+			<!--头像-->
+			<view class="flex-item2 t1">
+				<image class="avatar" :src="avatar" />
+			</view>
+			<!--手机号-->
+			<view class="flex-item-7 t2">
+				<view class="flex font-weight-600">
+					<text style="line-height: 50rpx">{{ userInfo.realname }}</text>
+				</view>
+				<view class="flex">
+					<text style="line-height: 50rpx">{{ scoreInfo.province }}</text>
+					<text style="line-height: 50rpx;font-size: 24rpx">/2024</text>
+				</view>
+			</view>
+			<!--按钮-->
+			<view class="flex-item2" style="padding-top: 60rpx;">
+				<image class="arrow-right" :src="ImagesConstant.keyboard.arrowRight" />
+			</view>
+		</view>
+		<!--开通vip提示-->
+		<view class="uni-flex flex white" style="margin-top: 30rpx">
+			<view class="flex-item-10 vipBackground" style="height: 50rpx;padding: 30rpx"
+				v-if="vipInfo && vipInfo.vipLevel>0">
+				<text>
+					{{ vipInfo.skuName || 'VIP' }}到期时间：{{ commonTool.dateFormatYYYYMMDD(vipInfo.validTime) }}
+				</text>
+				<text class="float-right radius60" style="border: 1rpx solid white;padding: 0 20rpx"
+					@click="gotoOpenVip">
+					查看更多
+				</text>
+			</view>
+			<view class="flex-item-10 vipBackground" style="height: 50rpx;line-height: 50rpx;padding: 30rpx;"
+				v-if="(!vipInfo) || !vipInfo.vipLevel || vipInfo.vipLevel===0">
+				<text>升级为VIP, 准确查大学录取率</text>
+				<text class="float-right radius60" style="border: 1rpx solid white;padding: 0 20rpx"
+					@click="gotoOpenVip">
+					开通VIP
+				</text>
+			</view>
+		</view>
+	</view>
+	<view class="body" style="z-index: 2">
+		<!--我的成绩-->
+		<view class="uni-flex flex trow1">
+			<view class="flex-item-1">
+				<text style="font-size: 24rpx">我的成绩</text>
+			</view>
+			<view class="flex-item-7 trow1-center">
+				<view class="flexWrap margin-left-30">
+					<view class="flex-item-10">
+						<text class="margin-right-10">文化:{{ this.scoreInfo.culturalScore }}分</text>
+						<text class="margin-right-10"
+							v-if="scoreInfo && scoreInfo.professionalCategory!=='表演类'">{{scoreInfo.professionalCategory==='音乐类'?'主项':'统考'}}:{{ this.scoreInfo.professionalScore }}分</text>
+						<br v-if="scoreInfo && scoreInfo.professionalCategory!=='表演类'" />
+						<text v-if="scoreInfo && scoreInfo.yybysy">音表声乐:</text>
+						<text class="margin-right-10"
+							v-if="scoreInfo && scoreInfo.yybysy">{{ scoreInfo && scoreInfo.yybysy }}分</text>
+						<text v-if="scoreInfo && scoreInfo.yybyqy">音表器乐:</text>
+						<text class="margin-right-10"
+							v-if="scoreInfo && scoreInfo.yybyqy">{{ scoreInfo && scoreInfo.yybyqy }}分</text>
+						<text v-if="scoreInfo && scoreInfo.yyjy">音乐教育:</text>
+						<text class="margin-right-10"
+							v-if="scoreInfo && scoreInfo.yyjy">{{ scoreInfo && scoreInfo.yyjy }}分</text>
+						<!--表演类-->
+						<text v-if="scoreInfo && scoreInfo.fzby">服装表演:</text>
+						<text class="margin-right-10"
+							v-if="scoreInfo && scoreInfo.fzby">{{ scoreInfo && scoreInfo.fzby }}分</text>
+						<text v-if="scoreInfo && scoreInfo.xjysdy">影视导演:</text>
+						<text class="margin-right-10"
+							v-if="scoreInfo && scoreInfo.xjysdy">{{ scoreInfo && scoreInfo.xjysdy }}分</text>
+						<text v-if="scoreInfo && scoreInfo.xjysby">影视表演:</text>
+						<text v-if="scoreInfo && scoreInfo.xjysby">{{ scoreInfo && scoreInfo.xjysby }}分</text>
+					</view>
+				</view>
+			</view>
+			<view class="flexWrap margin-left-30"></view>
 
-      <view class="flex-item-2" @click="gotoEditScore()">
-        <view class="" style="margin-top: 20rpx">
-          <view style="width: 100rpx;text-align: center;position: relative;left: 20rpx">
-            <image :src="ImagesConstant.edit2" class="icon40"/>
-          </view>
-        </view>
-      </view>
+			<view class="flex-item-2" @click="gotoEditScore()">
+				<view class="" style="margin-top: 20rpx">
+					<view style="width: 100rpx;text-align: center;position: relative;left: 20rpx">
+						<image :src="ImagesConstant.edit2" class="icon40" />
+					</view>
+				</view>
+			</view>
 
-    </view>
-    <!--我的志愿-->
-	<button
-	  open-type="im"
-	  data-im-id="Shilo_"
-	  bindim="imCallback"
-	  binderror="onimError"
-	>
-	  跳转 IM
-	</button>
-	<!-- <button class='contact-btn' open-type="im" bindim="imCallback" binderror="onimError" data-im-id="Shilo_">联系客服</button> -->
-	
-    <view class="uni-flex flex trow1">
-      <view class="flex-item-1">
-        <text style="font-size: 24rpx">我的志愿</text>
-      </view>
-      <view class="flex-item-7">
-        <view class="trow1-center" style="">
-          <view class="flex" v-if="scoreInfo && volunteerInfo">
-            <text style="margin:0 30rpx">{{ volunteerInfo.volunteerName || '' }}</text>
-          </view>
-          <view class="flex" style="margin-left:30rpx;color:#c1c4cc">
-            <!--            <text>{{ scoreInfo && scoreInfo.professionalScore || '&#45;&#45;' }}分&nbsp;&nbsp;/</text>-->
-            <text>{{ scoreInfo && scoreInfo.province || '--' }}&nbsp;/</text>
-            <text>&nbsp;{{ scoreInfo && scoreInfo.cognitioPolyclinic ==='文科'?'历史组':'物理组' || '--' }}&nbsp;/</text>
-            <text>&nbsp;{{ scoreInfo && scoreInfo.professionalCategory || '--' }}</text>
-          </view>
-        </view>
-      </view>
-      <view class="flex-item-2" @click="switchFillVolunteer">
-        <view style="padding: 15rpx 0 15rpx 65rpx">
-          <image src="/static/icons/icons8-menu.png" class="icon32"/>
-        </view>
-      </view>
-    </view>
-    <!--剩余选项-->
-    <view class="trow1">
-      <view class="uni-flex flex" v-for="(item,index) in itemList" :key="index">
-        <!--联系客服-->
-        <view class="flex-item-10" v-if="item.type==='contact' || item.type ==='im'">
-			{{item.type}}
-          <view class="uni-flex flex trow1-child">
-            <button class='contact-btn' :open-type="item.type" data-im-id="Shilo_">aa</button>
-            <view class="flex-item-1">
-              <image :src="item.icon" class="icon40"/>
-            </view>
-            <view class="flex-item-8">
-              <text>{{item.title}}</text>
-            </view>
-            <view class="flex-item-1">
-              <image :src="ImagesConstant.keyboard.arrowRight" style="width: 40rpx;height: 40rpx"/>
-            </view>
-          </view>
-        </view>
-        <view class="flex-item-10" v-else @click="item.method==='cooperate'?cooperate() : goto(item.url)">
-          <view class=""
-                :class="index===itemList.length-1?'uni-flex flex trow1-child-last':'uni-flex flex trow1-child'">
-            <view class="flex-item-1">
-              <image :src="item.icon" style="width: 40rpx;height: 40rpx"/>
-            </view>
-            <view class="flex-item-8">
-              <text>{{ item.title }}</text>
-            </view>
-            <view class="flex-item-1">
-              <image :src="ImagesConstant.keyboard.arrowRight" style="width: 40rpx;height: 40rpx"/>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-    <!---->
-    <view class="uni-flex flex">
-      <view class="flex-item-10" style="text-align: center;">
-        <text>{{ systemName }}</text>
-      </view>
-    </view>
-  </view>
+		</view>
+		<!--我的志愿-->
+		<!--	<button-->
+		<!--	  open-type="im"-->
+		<!--	  data-im-id="Shilo_"-->
+		<!--	  bindim="imCallback"-->
+		<!--	  binderror="onimError"-->
+		<!--	>-->
+		<!--	  跳转 IM-->
+		<!--	</button>-->
+		<!-- <button class='contact-btn' open-type="im" bindim="imCallback" binderror="onimError" data-im-id="Shilo_">联系客服</button> -->
+
+		<view class="uni-flex flex trow1">
+			<view class="flex-item-1">
+				<text style="font-size: 24rpx">我的志愿</text>
+			</view>
+			<view class="flex-item-7">
+				<view class="trow1-center" style="">
+					<view class="flex" v-if="scoreInfo && volunteerInfo">
+						<text style="margin:0 30rpx">{{ volunteerInfo.volunteerName || '' }}</text>
+					</view>
+					<view class="flex" style="margin-left:30rpx;color:#c1c4cc">
+						<!--            <text>{{ scoreInfo && scoreInfo.professionalScore || '&#45;&#45;' }}分&nbsp;&nbsp;/</text>-->
+						<text>{{ scoreInfo && scoreInfo.province || '--' }}&nbsp;/</text>
+						<text>&nbsp;{{ scoreInfo && scoreInfo.cognitioPolyclinic ==='文科'?'历史组':'物理组' || '--' }}&nbsp;/</text>
+						<text>&nbsp;{{ scoreInfo && scoreInfo.professionalCategory || '--' }}</text>
+					</view>
+				</view>
+			</view>
+			<view class="flex-item-2" @click="switchFillVolunteer">
+				<view style="padding: 15rpx 0 15rpx 65rpx">
+					<image src="/static/icons/icons8-menu.png" class="icon32" />
+				</view>
+			</view>
+		</view>
+		<!--剩余选项-->
+		<view class="trow1">
+			<view class="uni-flex flex" v-for="(item,index) in itemList" :key="index">
+				<!--联系客服-->
+				<view class="flex-item-10" v-if="item.type==='contact' || item.type ==='im'">
+					<view class="uni-flex flex trow1-child">
+						<button class='contact-btn' :open-type="item.type" data-im-id="Shilo_">{{item.title}}</button>
+						<view class="flex-item-1">
+							<image :src="item.icon" class="icon40" />
+						</view>
+						<view class="flex-item-8">
+							<text>{{item.title}}</text>
+						</view>
+						<view class="flex-item-1">
+							<image :src="ImagesConstant.keyboard.arrowRight" style="width: 40rpx;height: 40rpx" />
+						</view>
+					</view>
+				</view>
+				<view class="flex-item-10" v-else @click="item.method==='cooperate'?cooperate() : goto(item.url)">
+					<view class=""
+						:class="index===itemList.length-1?'uni-flex flex trow1-child-last':'uni-flex flex trow1-child'">
+						<view class="flex-item-1">
+							<image :src="item.icon" style="width: 40rpx;height: 40rpx" />
+						</view>
+						<view class="flex-item-8">
+							<text>{{ item.title }}</text>
+						</view>
+						<view class="flex-item-1">
+							<image :src="ImagesConstant.keyboard.arrowRight" style="width: 40rpx;height: 40rpx" />
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!---->
+		<view class="uni-flex flex">
+			<view class="flex-item-10" style="text-align: center;">
+				<text>{{ systemName }}</text>
+			</view>
+		</view>
+	</view>
 </template>
 
 <style scoped lang="scss">
-.header {
-  background: repeating-linear-gradient(#dcdaf7, #f7f7f7, #e6e4e4);
-  background: -ms-repeating-linear-gradient(#dcdaf7, #f7f7f7, #e6e4e4);
-  background: -webkit-repeating-linear-gradient(#dcdaf7, #f7f7f7, #e6e4e4);
-  background: -moz-repeating-linear-gradient(#dcdaf7, #f7f7f7, #e6e4e4);
-  /*background: linear-gradient(131deg, rgb(18, 117, 236) 0%, rgb(122, 182, 249) 100%);*/
-  height: 340rpx;
-  /*头像*/
-  .avatar {
-    border-radius: 50%;
-    width: 150rpx;
-    height: 148rpx;
-  }
+	.header {
+		background: repeating-linear-gradient(#dcdaf7, #f7f7f7, #e6e4e4);
+		background: -ms-repeating-linear-gradient(#dcdaf7, #f7f7f7, #e6e4e4);
+		background: -webkit-repeating-linear-gradient(#dcdaf7, #f7f7f7, #e6e4e4);
+		background: -moz-repeating-linear-gradient(#dcdaf7, #f7f7f7, #e6e4e4);
+		/*background: linear-gradient(131deg, rgb(18, 117, 236) 0%, rgb(122, 182, 249) 100%);*/
+		height: 340rpx;
 
-  .arrow-right {
-    width: 70rpx;
-    height: 70rpx;
-    position: absolute;
-    right: 8rpx;
-  }
+		/*头像*/
+		.avatar {
+			border-radius: 50%;
+			width: 150rpx;
+			height: 148rpx;
+		}
 
-  .t1 {
-    padding: 20rpx 0 0 0;
-  }
+		.arrow-right {
+			width: 70rpx;
+			height: 70rpx;
+			position: absolute;
+			right: 8rpx;
+		}
 
-  .t2 {
-    padding: 40rpx 20rpx 0 20rpx;
-    font-weight: 500;
-    color: black;
-  }
+		.t1 {
+			padding: 20rpx 0 0 0;
+		}
 
-  /*开通vip框*/
-  .vipBackground {
-    background-color: #e5620f;
-    border-radius: 40rpx 40rpx 0 0;
-  }
-}
+		.t2 {
+			padding: 40rpx 20rpx 0 20rpx;
+			font-weight: 500;
+			color: black;
+		}
 
-.body {
-  background-color: #f4f5f7;
-  min-height: 880rpx;
-  padding: 30rpx;
-  /*单行*/
-  .trow1 {
-    background-color: #ffffff;
-    border-radius: 15rpx;
-    padding: 20rpx 30rpx;
-    margin-bottom: 20rpx;
+		/*开通vip框*/
+		.vipBackground {
+			background-color: #e5620f;
+			border-radius: 40rpx 40rpx 0 0;
+		}
+	}
 
-    .trow1-center {
-      font-size: 24rpx;
-      margin: 10rpx 0 0 20rpx;
-      border-left: 5rpx solid #f1b481;
-    }
+	.body {
+		background-color: #f4f5f7;
+		min-height: 880rpx;
+		padding: 30rpx;
 
-    .trow1-child {
-      margin-top: 20rpx;
-      padding-bottom: 20rpx;
-      border-bottom: 2rpx solid #f8f8f8;
-    }
+		/*单行*/
+		.trow1 {
+			background-color: #ffffff;
+			border-radius: 15rpx;
+			padding: 20rpx 30rpx;
+			margin-bottom: 20rpx;
 
-    .trow1-child-last {
-      margin-top: 20rpx;
-      padding-bottom: 20rpx;
-      border-bottom: none;
-    }
-  }
-}
+			.trow1-center {
+				font-size: 24rpx;
+				margin: 10rpx 0 0 20rpx;
+				border-left: 5rpx solid #f1b481;
+			}
+
+			.trow1-child {
+				margin-top: 20rpx;
+				padding-bottom: 20rpx;
+				border-bottom: 2rpx solid #f8f8f8;
+			}
+
+			.trow1-child-last {
+				margin-top: 20rpx;
+				padding-bottom: 20rpx;
+				border-bottom: none;
+			}
+		}
+	}
 
 
-//覆盖联系客服按钮原生样式
-:deep(.contact-btn) {
-  display: inline-block;
-  position: absolute;
-  width: 80%;
-  background: salmon;
-  // opacity: 0;
-  // border-radius: 0;
-}
-
-</style>
+	//覆盖联系客服按钮原生样式
+	:deep(.contact-btn) {
+		display: inline-block;
+		position: absolute;
+		width: 80%;
+		background: salmon;
+		opacity: 0;
+		border-radius: 0;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/zyb/vip/cardamom.vue b/pages/zyb/vip/cardamom.vue
index 0504367..ffa98f8 100644
--- a/pages/zyb/vip/cardamom.vue
+++ b/pages/zyb/vip/cardamom.vue
@@ -6,12 +6,16 @@ import Request from '@/common/request'
 import commonTool from "@/common/js/commonTool";
 import {stringIsNotEmpty} from "@/common/util";
 let request = new Request()
+const app = getApp()
 export default {
   name: "cardamom",
   computed: {
     StaticConstant() {
       return StaticConstant
-    }
+    },
+	app() {
+		return app
+	},
   },
   data() {
     return {
@@ -89,7 +93,7 @@ export default {
       <view class="text-body">
         <text class="text-item">-适用范围:{{playerType}}文理科考生(自主招生暂不适用)。</text>
         <text class="text-item">
-          -使用期限:自购买起，截止到2024-08-31日有效。分数修改次数:每届服务期内高考分数放榜前每日可修改10次，放榜后仅可修改1次。
+          -使用期限:自购买起，截止到{{app.globalData.StaticConstant.memberDeadline}}有效。分数修改次数:每届服务期内高考分数放榜前每日可修改10次，放榜后仅可修改1次。
         </text>
         <text class="text-item">-系统数据来源于{{ StaticConstant.bm }}部门，由合作网站提供。</text>
         <text class="text-item">
diff --git a/pages/zyb/vip/index-bak.vue b/pages/zyb/vip/index-bak.vue
index a5a04d3..8bbf830 100644
--- a/pages/zyb/vip/index-bak.vue
+++ b/pages/zyb/vip/index-bak.vue
@@ -7,7 +7,7 @@ import ApiConstant from "@/common/ApiConstant";
 import ImagesConstant from "@/common/ImagesConstant";
 import Request from '@/common/request';
 import {stringIsNotEmpty} from "../../../common/util";
-
+const app = getApp()
 let request = new Request()
 export default {
   name: "vip-index",
@@ -18,7 +18,10 @@ export default {
     },
     StaticConstant() {
       return StaticConstant
-    }
+    },
+	app(){
+		return app
+	}
   },
   data() {
     return {
diff --git a/pages/zyb/vip/index.vue b/pages/zyb/vip/index.vue
index 3d19f5f..8343308 100644
--- a/pages/zyb/vip/index.vue
+++ b/pages/zyb/vip/index.vue
@@ -8,7 +8,7 @@ import ImagesConstant from "@/common/ImagesConstant";
 import Request from '@/common/request';
 import {stringIsNotEmpty} from "../../../common/util";
 import Image from "../../component/image/image.vue";
-
+const app = getApp()
 let request = new Request()
 export default {
   name: "vip-index",
@@ -19,7 +19,10 @@ export default {
     },
     StaticConstant() {
       return StaticConstant
-    }
+    },
+	app(){
+		return app
+	}
   },
   data() {
     return {
@@ -214,7 +217,8 @@ export default {
                     模拟报志愿VIP
                   </view>
                   <view class="flex font-size-mini2 brown">
-                    <text>{{item.skuCode==='9000'?'咨询详谈':'有效期截至：2024-08-31'}}</text>
+					  <text v-if="item.skuCode==='9000'">咨询详谈</text>
+					  <text v-else>'有效期截至：{{app.globalData.StaticConstant.memberDeadline}}</text>
                   </view>
                 </view>
                 <view class="flex-item-3 brown marginRight" style="padding: 30rpx 0;text-align: right">
diff --git a/static/image.png b/static/image.png
new file mode 100644
index 0000000000000000000000000000000000000000..008a677cfcab867c2fc39586c19b8cf1b0eb9d95
GIT binary patch
literal 524
zcmeAS@N?(olHy`uVBq!ia0vp^GC(ZG!3-pyc<>wmQjEnx?oJHr&dIz4a&`sygt!7}
zAgHge4-E}1EG$e)N{Wt-PD@M6%*+Im>FMb}GBq_7&H!>#Qc~bt2m?q0)c~b{03w2)
z0agey7Q!HjgzK_zR+tQQx@}32UoZnB6B{QlAHSf6zN3q)w_j9Ta(YHaW`0R&S$RcM
zb5H+-iF21MU%P(K$#WMk-G1`o<*V19zkL1n{nzim|NcGTaSsI=wB6IiF+}5h?WLP#
zjEMrS4=)Qk3Ow!?P;6dUI@`(oP~HFQMS_Pm?Rs<j{j#volf{lMPJs_>EIaCix)v;)
zuxojXjr)oU-Nm6gVq)hklh<ALiH^8&z$AGA{{_PWwhx&P#1C{g-n^LiRn1e2Z~y%K
z<yRj!tE}AH?)y^g|Fui(3DNtG?RhV*x|D7C+W*(|B5od9w`%#v|Gs={jrYA{<a<B)
y_2g1hcb#gLZyO!%cy7$y$RzD-DJ{M0dxHCs^#Q+<YnZ2l;?dL9&t;ucLK6UVrP_i3

literal 0
HcmV?d00001

diff --git a/static/plus.png b/static/plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..73ddfe38b3506689a58960ac244a04b871f90074
GIT binary patch
literal 1252
zcmeAS@N?(olHy`uVBq!ia0vp^(|~vq2OE%FKEe14kYX$ja(7}_cTVOd0|U!EPZ!6K
z3dXl{4`u~BO0=d2EqUNn@S6Dt(^8c}#dTXcIymmWINZU%*jrFAv;2{or+54T_5$r4
z8dE0q6iaJN@tflPuAs<&-@1}_CC}{d|I9h4lgClx$iO7fz`&xwz{uf1A~RyPL(FfM
z$IO0yesX7@zs%HplpxU8e)!>%FFjiY1hQLMFTZ^GS>V$1DVOG6nkMl$_1O0;lUx78
zs`kCj?g%wVu(G|)o%m1LyL9`9A61&COXUuodwenD{hO+Z_A!DI2OgR=PI(spPd)T=
z?Adu~@81eXIIda5{L-;-=Z+g``5zfhyB^uJCRCnl;}_WozlMluTVFXVPTR+Pnp5EP
zrm$L#BbUk(EE$s`udU*5jrhf<qwb({I_m2}0q^^bPgy!rBUjsrB)zoWFo$8IPWIJy
zC!JdMX~GKAQrG?p=veyxKoQemHaz6&_WHAFo7=lxD;D?PtZFLP-T%1u^xsc!f7W)(
zfBr32e@$x1tcb}cUrrVfoB!#-_iWztJF^9U$R2v|wPMfz+O@%9HN{ioTYsuw?f!FV
z>*5;qptTJ98Bgz=U9#oPs^6KbI;IBwn9zRjZC#Atn`sWWV#}_+U3oTh>ycg8|E`!5
z(d;0$+ABQt$STGL<KM0f8-HC5&tK-c=3dCv^^St8<7>aB-O@@rD)H}2+kt8PQL9%+
zCGF)^jLWG^x9yPE-xRTP^}GE*8|<}y%sOgy;_<Wpcb{fEb3Vy?ba2z^cj{}tP4qL?
znlD-w9}%wp?c3%<>lif7&GboId3NvPj~iauUohL8bLyVfelBxWnc^253e)=bem&cf
z8oORkCh6sk==(hp*S@|wq&SR)MQ<LDKl=1h((JuQnRUbkR|jPGSnDVEJa2V3pEk?(
z>^<r3KTo?Dl0;o3dcU3fwEGX=W{c^q$HTo(r++NiS$=ih+t}x&8UJ6{?awdV6VZ~s
xRQG3X{qdiwlO|s>zD7<d04h8-)Uy0z%Hk}G-qFFd6j*FAc)I$ztaD0e0svn$Pxb%+

literal 0
HcmV?d00001

diff --git a/static/uni.png b/static/uni.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e3a80f4b84ca9dfad7bc1ab724810a1b3be3ba8
GIT binary patch
literal 4162
zcmaJ^c{r5a`+p1xWy!vTF_yQojIk7xu`i>nV;hxajKN@*7|h6;Xpt>j)`TpD(yK_e
zM93CJvScSABxLP3dh30Ee{_A%^*q;e&VBCBeLnYc&h?z@7G_55Y{F~+0I(Y)^-=V%
z^Zv`i3;+ztcZ|vafK3mtr)OcTrw1ncklgUzH~^pyW?2QG6F2xZM>lYswz>n$<*DA`
z07SBcrIpJ*m+KaQxx&S*-5hz1&6bz%NG8&z>2e<%GV9tz&ao<Yog3HAMcZ6Z`yxJE
z_#`-RX>oD;{dUc4=Il-vt(!CK2)9haOs*%Oj*8TP4~WN^Bb(Z4!$5q<F(xqAOnamI
zfo1?$W~5O=D37#u7#@-U5J2uzkm7C`{}EAbA!7%C6M!)Y_v|5tcofj8VBN|Kv<d=`
ztp0Xo1Cjv1n--)C0q(N{3*U@24*&zjiNgZGK<?3E79fTJNIPaE1=4;FINOAy<UkFL
zKu(D^M1iTHj3Lbasge;Wto8ulAB&FX)OH5K(sboI0I(Ve&=ce7WCWWq<|y{oj}<$S
zBdd@MKtp?SXX@ErW!|dfH^Kp5m&Ya~CK|oVbuj|Rx!hQ%AepHdl03*+Mw70?03f{C
z^I}g;D}HunYJA3R)_dt&bMBtkG6|w7u`;?>a}&e_aG7;44LVIv_cM}P7#{i6dljDt
z25kY4(M<>CA=aF8Y;OWLqiJe8+G5#vEm}21kFp&)v?%Rzw^ng7TJwkUIB6_8WSu^{
zHx#%GTuj$aD{aV&*u97$`j??%XWN-{VZ@DD$-S1y(B0VMJrgSB7v%VEte~$~SwKu%
zXwOgy`Vwu)6Wnv5N-N?iyR3-;>_ADBd4t*0gHPJM8$!M?fTB6jz5al9$g2EJ;X?@k
zm%EA*Z36%j>o?=HWf_3Z)ci>RsQDy#p(shf<P{45=;wr=c%*ai@C)9O29C@ZqBRWy
zAPlp<_F<_84K7{gsj#DLcLh^)gsdCj158gIF$(7#NgwB`cmY#mpB>}A5I#>9V0ISF
zZWOGEVr9~4W#Pd{z^@%~i5-A+u?VEaGC?p%m0Mx?;JItOmXPLFpL|fUu4jS+Qu3?3
z53hR61?{c)p;oZcjh!1cMzEyt$CixmKz`cKio}I)yvp(Ip{Q^=gr($q^$1spA;O;K
z7WSO|<VOL5Z^UB5dSD!GH$Px5+`MYwd>t(;)54FPMyuM!sbWRZr~LUu8nQ7<EK;E8
zFrEb#$17Zo-k0O!jnF1&y&~xa$qMdj7CY96E3n4DAc;lh71Dv+n@v;~czHb9utesI
zgqTFOwBuhKJWh#7DUP;VQ)X-u((y{hhm5_DLrD32t9;E~E_|km%zQkd?c)^7<FFEN
zYC>f^XT15X?Y5UwmAvrgYZE4{xl*Y7B<?e+IIU@>dv}y{({k=xb{1#9W4V6~e&?Jq
zA;;eWYIU`kN5wB)x-)}cuRUKrukTGd-W|W;0iB~%vyMcF8Kk~R?e+R}aBg-k;#<IB
z_9*s<7NpBDAupjzLWP2rLeMmmf&*_;(^{<+-z$lvx!>lzO|n6sSU(ZOm++c98J=vL
z9FjbH-`d94Myro@|B&?q8_oxgw!sC4Hh)`87PG$Nf6!MfYV*AKWLXy~02OD^ZRwO(
z=d^oy3(NjED$+0~3Ylk(t$ZaEBf<Yl3AcjQ?f0=|oR{;uZR&FV@#cbw|AB20f9NF>
zD?Q))ZY6FBZdo%II~h1$m5(i}f5<%3CDFy+bxEF4UQ52b-?P-MG^F&@VBlcgpv$7q
zBLCw2;F2FXOFK(0YYk3-Z}_oRpRBg5j;tQ?>;A0y7CTRyV_kc_#xXb2W3)#2mbWJG
zd8vP?NBoqc3d_lOA#a!(cDW-S`^oDzzN%;W%6QR{c8}_WCXc)x<GjDBWWHQ=pH!s^
zXu6e<j=Gene8dfVX<%INN<;Zg`OQ;x$2*g}(%q_iD&A5$I$Gt1O9o2X7Gl-=GQF}f
zbsuVmc48v$8Dut}i9Q+Kk}{YQ)P5kvG-adYwymZu&34W9eTi}Zg?YJoLcg82g@|3o
z;S6|2`_rP*jM66m48kby1aI8&-s5Xl#6j4?&H~#)`U3N!`Z{J^dY!P|E!uIETeSZ)
z<#dn_#jnHPn_M%WKd$n!xT*N%oSnOf`(59xRaJq4v+?cRss5<~R)oSEg~U67?a9-^
zU#febyj{!7c%Cs_`hoCnqyy0${9xNuAw#6i;U!{8=iBlIdg5ZoWL9BDVdHB2EY#88
z(cW>pR?PhGOquL{MMCRP)A_O5_DjxiO$2VMYmQO#l_uy;;GL^=1$B^7M4e<ve@I%$
z!JX{w(_8Jkao_95X<zwQ%nmp+ykMASs0|km|C`Z^QJg7_>E1!r12G4lGeZw+^64IC
zWw#giNhCE0d==TmDi6EMrT6f?X363^C$gp3A!8!ee<U`ln`M+MgjBF;GS~5x<=U8$
z_q8f<yil6JW-#yZ6H50LK3i5;Q7%$8<oZjd?6=)(V^`veZ$3Lc<oVRc-@U}s8|95%
z$fyddx?dGez53l?C6$}PBgMLSeX41o32}YW7c}dguADiQZk<BGmQ4@mJ`<Rk>uS#q
z(6Cpvj}KCdyv?2ZSZg{0tZM-kG@mXcnu_v#y^;}WZcvvSlWSRCS#?I^)=ZXd^19l{
z>0rGrk0^6PzgNnv<|tWOg3zsJlB=e+`u!hEx<6d}Ag`X3nUtA_V#lXc$i7#sJXUG$
zCM%oBK1G`$ycS8k`g&tZa?^Kph|fFHq$jTeRc67#ZvrinrJff&Ppv}MBG0{39(CLM
zyeWC;GJjBQ{3DC1M}H4gQSDd8AoT{%`6Z*R1OgOb4ybBZDt@^)xZR`uamud61R7=Y
z)sr^-H5L`od+(l}>}5NZ<l>~Zc4FDLbI-7Rm}FO*CC}8p^R}TU1d^Rf$R$N(-ya!P
z%}m&tIrRmt(FlWsAJ0_2UYtkH=g$*MHtg#ko~iZJ>3b8k%w8(85;HC0L^$)2ayQU(
zEw;0w^K~bqDn@nje8<z0p|5vO=B)>2g*vp`?v_5NtotA{*k3;qaA}nzLX_|H$EBo&
znkTYUJFi-U;5B0Jm&+q@!Y(4!^)n$ORYn2k&Dn96?p->#Zm=}(Ng;U;Kdi5R%t}C=
zj1fb^$<rBOq`{2E^nfSib0;_&b*5kZHChmKY0~1;-L99zFFQxmLMzu;=8-hnUU<D<
ziF_U*2XVJ{>C?@;EKx^Mqq@o;Axp4HtY3?2oLzQK)-lA&=G5iH$wJq{>?|`a#JjX%
z+J?zanwNv6L#?}Bcea)Q<%>zB(?;9s$JscC<r?xg$cD?1bmiGnL>a;;guFYBe0ZKT
zkK1Tpw9_b~d^4Rt-Lv#Ibj!1$&-eZJ_X-YoXthhP7DOtEG9yQ;q^sAy`>!tw1h9QE
z8FmPaqdwfJ8{GYTaEtSEXvJPRu7NQ2-MPWJ`=veS5(n$m?7gHPZ?BH`8g&@;Ng7JV
z#AS(#i?9pVes%3i94~xa$kY8g#P$bm-uJ=m=<dY!*>3dC!1AHZ=<fP5TJfsS(u3lM
z@D|Ay@tQ6gVx?fGv}-7MscNZuw53)&?bwd?p2cd<7Ph7EjroS=Y|!2gbmPkEc9^>K
z5&FNS5XAsZu_C!q0x&)}K*yEjf&&{9Fzz@M4&zF@*oM;p0LBw|YcvIIY68cS2nv{e
z9R(_ZOh*HNh8C5K!Fu5+U>BS_o``@fJ+Fs=@vaDnovNv#DOnHafky`V;H(18tg(S!
zSany3mL^z(3a1+&;3ya{mEcYEg;NobpLXH&{=OIr0smB?cp)JFkV2bUfb~c|IIyb1
zNqH<xSqXefT>+-5uB4_S2Ub#qorEf?Kw;|gFl9LXQBef{Y7qKrKCW(Xl)mAwwdf-R
z#DhX1!=ccCfB=O6Wd)LtI~}X84pmfwDk;g+HROG1L<)u~PxO`iZ9yOBi}k^iDR>eQ
zyl)ZXLh_>^AathxxIiGAn*M8;==&>B^pHWR7%~*5pa>-p_Wk;)?Mp%7{-g0nZC`5|
z83#q-d`W&jSb9F(B!7eHvHRZ(?JLsR!1YO3KLU<OG1f;w=n@52yer($P)9}S6ioe;
zzTQa~%s@@oP)AK)Pt8DA&p<_0(Gd0<YfSW|V2D`UZ!G>ltlIy?!u5P`7z)Y9nnd#c
zojnT=5{2aJK_Y|cHy3)gR25Xg$4oI;JaJ!qd_Tm$7~_2K{y0}d9})rlGe&UyA9(2M
zs2S?$p4#W3`ez^h!Mgsz|6kaB|No4I(#b&g6a4=Y{#!(^qW$i_<x3y@y8&=Sde!^T
z%bT@sfe8RWPR9B=*3>~4R{*q_mhwaB8k0%>F=j7k@R1yks$2et^%#(c?K71`qKcUL
zz3=K)FlX7@z6;>i24JAXSF&LFGx=MQCQ`?k!>NP$_r_CHqV&#zSiq>a+>Gks`pPfc
zzA81BM~Pj!0%2B9DKEbFjMGpataa;p=lzKH2b+>anzo!J<bwe&?VQI*KICX_<hb42
zIAx`t*JSi0Q6-PPH%PmPMdlt_JSM{OkfFR_={F-Hm*oQkSh~q|5Wt}S*8hlTLqLJV
z0+nmb)kSc^`5j}PSdJggxM(83qCe+dM~{@s=Wt8Tn}I)P1lJnk@n_!TI%x_s<{v9?
z3kX$VHbf|*HGp((Q19r~qU~J(^vJhGg||@~(B?VG<jlZBZ2)->G#=J@aVNfkLlz;m
zTo~~_Ut;7-k7J@E>ye-fr#q)%QfxucT3KjlbYs6IvtO@}$AhL9M&}>@brCCafPVgv
zb2jI{7s2HZ?jJ_~H8E9zkrb|m)LR3U-1|}z<8Y|uTq1MmUV&c?lgH8*OD^Wiz)d#^
z_hlvZ@W>}u%h$ojtqwV!NG0<RJ4P#-P{rkPBd-L@@Na&&So=oa@oDjTvg|z>tyc)Z
zv2?8YoVzFCho<$}JtlyDabf_#0Kk+(S+#W9nHOqb;F10?gy$r)fcC{e7yxk5%K^{^
ze(TN>x;}<248<%maOlwG_Rowu#C}anGb|KHl-4rJS&dBJJ@I}v2tPRzu(@h<)9YsR
lruvM4_@wCMht!$R;z59{S)f^hqSH_Rj1A26%XFPD{~u#uFwFn}

literal 0
HcmV?d00001

diff --git a/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/package-lock.json b/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/package-lock.json
new file mode 100644
index 0000000..9255af0
--- /dev/null
+++ b/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/package-lock.json
@@ -0,0 +1,20 @@
+{
+  "name": "uni-config-center",
+  "version": "0.0.2",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "uni-config-center",
+      "version": "0.0.2",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "uni-config-center": "file:"
+      }
+    },
+    "node_modules/uni-config-center": {
+      "resolved": "",
+      "link": true
+    }
+  }
+}
diff --git a/uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/package-lock.json b/uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/package-lock.json
new file mode 100644
index 0000000..db91e49
--- /dev/null
+++ b/uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/package-lock.json
@@ -0,0 +1,38 @@
+{
+  "name": "uni-id",
+  "version": "3.3.29",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "uni-id",
+      "version": "3.3.29",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "uni-config-center": "file:../../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center",
+        "uni-id": "file:",
+        "uni-open-bridge-common": "file:../../../../../uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common"
+      }
+    },
+    "../../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center": {
+      "version": "0.0.2",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "uni-config-center": "file:"
+      }
+    },
+    "../../../../../uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common": {},
+    "node_modules/uni-config-center": {
+      "resolved": "../../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center",
+      "link": true
+    },
+    "node_modules/uni-id": {
+      "resolved": "",
+      "link": true
+    },
+    "node_modules/uni-open-bridge-common": {
+      "resolved": "../../../../../uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common",
+      "link": true
+    }
+  }
+}
diff --git a/uni_modules/uni-upgrade-center-app/uniCloud/cloudfunctions/checkVersion/package-lock.json b/uni_modules/uni-upgrade-center-app/uniCloud/cloudfunctions/checkVersion/package-lock.json
new file mode 100644
index 0000000..0aa0528
--- /dev/null
+++ b/uni_modules/uni-upgrade-center-app/uniCloud/cloudfunctions/checkVersion/package-lock.json
@@ -0,0 +1,17 @@
+{
+  "name": "checkVersion",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "checkVersion",
+      "dependencies": {
+        "checkVersion": "file:"
+      }
+    },
+    "node_modules/checkVersion": {
+      "resolved": "",
+      "link": true
+    }
+  }
+}