updates

pages/zyb/fillVolunteer/aiAuto.vue

@@ -7,15 +7,20 @@ import Request from "@/common/request";
 import ImagesConstant from "@/common/ImagesConstant";
 
 let request = new Request()
+
+const app = getApp()
 export default {
   name: "auto",
   computed: {
+    app(){
+      return app
+    },
     ImagesConstant() {
       return ImagesConstant
     },
     StaticConstant() {
       return StaticConstant
-    }
+    },
   },
   data() {
     return {
@@ -66,10 +71,6 @@ export default {
       this.getMajorList()
       this.majorCodeArray = []
       this.onBatchClose()
-    },
-    /*设置个性偏好*/
-    selectSetting(e) {
-
     },
     /*选择专业*/
     selectMajor(e) {
@@ -547,7 +548,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.remote.nowYear }}省内计划录取：</text>
               <text v-if="item.planNum" class="green font-weight-600">{{ item.planNum }}人</text>
               <text v-else class="green">暂未发布</text>
             </view>
@@ -555,7 +556,7 @@ export default {
         </view>
         <view class="flex" style="line-height: 50rpx">
           <view class="flex-item-7">
-            <text>{{ StaticConstant.year }}录取方式:</text>
+            <text>{{ app.globalData.StaticConstant.remote.nowYear }}录取方式:</text>
             <text v-if="item.rulesEnrollProbability" class="blue">{{ item.rulesEnrollProbability }}</text>
             <text v-else class="blue">暂未发布</text>
           </view>

pages/zyb/fillVolunteer/mockList.vue

@@ -37,7 +37,9 @@ export default {
       circle: { kcj: 0, jwt: 0, nlq: 0, kbd: 0, },//百分比
       modelVale: 0,
       topFlag: false,//显示回到顶部
-
+      popupData:{
+        text: '',
+      },
       otherMajor: {
         visible: false,
         status: 'noMore',
@@ -97,7 +99,6 @@ export default {
         volunteerMap: new Map()
       },//已填志愿信息
       currentEduLevel: '本科', // 当前学历层次
-      years: StaticConstant.years,
       //
       status: 'more',
       statusTypes: StaticConstant.loadStatusTypes,
@@ -868,8 +869,9 @@ export default {
     switchEduLevel(level) {
       this.currentEduLevel = level
     },
-    
+    showHistoryInfo(history){
-    
+      uni.showToast({ title: `录取方式：${history.rulesEnrollProbability|| ''}，\n计算方式：${history.probabilityOperator || ''}`, icon: "none" });
+    },
     //打开选择其他专业
     onOtherMajorOpen(e) {
       this.otherMajor.nowMajor = { ...e }
@@ -1109,14 +1111,14 @@ export default {
       <!--招录信息-->
       <view class="flex font-size-mini">
         <view class="flex-item-5" style="line-height: 40rpx">
-          <view v-for="(history, h) in item.historyMajorEnrollList" :key="h">
+          <view v-for="(history, h) in item.historyMajorEnrollList" :key="h"  @click="showHistoryInfo(history)">
             <text>{{ history.year }}年录取最低分：</text>
             <text class="red">{{ history.admissionLine }}分</text>
           </view>
         </view>
         <view class="flex-item-5" style="line-height: 40rpx">
           <view class="flex" style="float: right">
-            <text>{{ StaticConstant.year }}省内计划录取：</text>
+            <text>{{ app.globalData.StaticConstant.remote.nowYear }}省内计划录取：</text>
             <text v-if="item.planNum" class="green font-weight-600">{{ item.planNum }}人</text>
             <text v-else class="green">暂未发布</text>
           </view>
@@ -1124,7 +1126,7 @@ export default {
       </view>
       <view class="flex" style="line-height: 50rpx">
         <view class="flex-item-7">
-          <text>{{ app.globalData.StaticConstant.remote.year }}录取方式1:</text>
+          <text>{{ app.globalData.StaticConstant.remote.nowYear }}录取方式:</text>
           <text v-if="item.rulesEnrollProbability" class="blue">{{ item.rulesEnrollProbability }}</text>
           <text v-else class="blue">暂未发布</text>
         </view>
@@ -1249,8 +1251,8 @@ export default {
           </view>
           <!--招录信息-->
           <view class="flex font-size-mini">
-            <view class="flex-item-5" style="line-height: 40rpx">
+            <view class="flex-item-5" style="line-height: 60rpx">
-              <view v-for="(history, h) in otherMajor.nowMajor.historyMajorEnrollList" :key="h">
+              <view v-for="(history, h) in otherMajor.nowMajor.historyMajorEnrollList" @click="showHistoryInfo(history)" :key="h">
                 <text>{{ history.year }}年录取最低分：</text>
                 <text class="red">{{ history.admissionLine }}分</text>
               </view>
@@ -1266,7 +1268,7 @@ export default {
                 </view>
               </view>
               <view class="flex" style="float: right">
-                <text>{{ StaticConstant.year }}省内计划录取：</text>
+                <text>{{ app.globalData.StaticConstant.remote.nowYear }}省内计划录取：</text>
                 <text v-if="otherMajor.nowMajor.planNum" class="green font-weight-600">{{
                   otherMajor.nowMajor.planNum
                 }}人
@@ -1277,7 +1279,7 @@ export default {
           </view>
           <view class="flex" style="line-height: 50rpx">
             <view class="flex-item-7">
-              <text>{{ StaticConstant.year }}录取方式:</text>
+              <text>{{ app.globalData.StaticConstant.remote.nowYear }}录取方式:</text>
               <text v-if="otherMajor.nowMajor.rulesEnrollProbability" class="blue">
                 {{ otherMajor.nowMajor.rulesEnrollProbability }}
               </text>
@@ -1345,7 +1347,7 @@ export default {
                 </view>
               </view>
               <view class="flex" style="float: right">
-                <text>{{ StaticConstant.year }}省内计划录取：</text>
+                <text>{{ app.globalData.StaticConstant.remote.nowYear }}省内计划录取：</text>
                 <text v-if="item.planNum" class="green font-weight-600">{{ item.planNum }}人</text>
                 <text v-else class="green">暂未发布</text>
               </view>
@@ -1353,7 +1355,7 @@ export default {
           </view>
           <view class="flex" style="line-height: 50rpx">
             <view class="flex-item-7">
-              <text>{{ StaticConstant.year }}录取方式:</text>
+              <text>{{ app.globalData.StaticConstant.remote.nowYear }}录取方式:</text>
               <text v-if="item.rulesEnrollProbability" class="blue">{{ item.rulesEnrollProbability }}</text>
               <text v-else class="blue">暂未发布</text>
             </view>

pages/zyb/fillVolunteer/my-detail.vue

@@ -57,8 +57,6 @@ export default {
         volunteerJuniorCollegeList: [],//高职高专
         volunteerMap: new Map()
       },//已填志愿信息
-      years: StaticConstant.years,
-      nowYear: StaticConstant.year,
       allCollapseItemList: [
         {batchLabel: '提前批', batch: '提前批', type: '顺序志愿', max: 1, status: false},
         {batchLabel: '本科批', batch: '本科批', type: '平行志愿', max: 64, status: false},

pages/zyb/fillVolunteer/old-detail.vue

@@ -50,8 +50,6 @@ export default {
         volunteerJuniorCollegeList: [],//高职高专
         volunteerMap: new Map()
       },//已填志愿信息
-      years: StaticConstant.years,
-      nowYear: StaticConstant.year,
       allCollapseItemList: [
         {
           batchLabel: '本科提前批',

pages/zyb/login.vue

@@ -1,21 +1,156 @@
 <!--登录页面-->
-<script>
+<template>
+  <view class="header" style="border-top:3rpx solid #f6f6f6"></view>
+  <view class="content" v-if="showFlag">
+    <!-- 标题区域 -->
+    <view class="textcenter">
+      <view class="flex">
+        <view class="title">{{ StaticConstant.systemName }}</view>
+      </view>
+    </view>
+    <view class="textcenter">
+      <text class="low-title">艺术生 更轻松的报志愿</text>
+    </view>
 
+    <!-- 快捷登录 showType===1 -->
+    <view style="margin-top: 200rpx" v-if="showType === 1">
+      <!-- #ifdef MP-TOUTIAO -->
+      <button class="login-but" @click="handleQuickLogin">抖音一键登录</button>
+      <!-- #endif -->
+      <!-- #ifdef MP-WEIXIN -->
+      <button 
+        class="login-but" 
+        v-if="checkFlag" 
+        open-type="getPhoneNumber" 
+        @getphonenumber="getPhoneNumber"
+      >
+        手机号快捷登录
+      </button>
+      <button class="login-but" v-else @click="showAgreementTip">手机号快捷登录</button>
+      <!-- #endif -->
+      <button class="login-pwd-but margin-top-20" @click="showType = 2">账号密码登录</button>
+    </view>
+
+    <!-- 账号密码登录 showType===2 -->
+    <view style="margin-top: 180rpx" class="uni-padding-wrap border-top" v-if="showType === 2">
+      <view class="forms">
+        <view class="form-item">
+          <view class="form-item-view form-input">
+            <input 
+              class="uni-input" 
+              type="text"
+              v-model="formData.userName"
+              placeholder="请输入用户名或手机号"
+            />
+          </view>
+        </view>
+        <view class="form-item">
+          <view class="form-item-view form-input">
+            <input 
+              class="uni-input" 
+              type="password" 
+              password
+              v-model="formData.password"
+              placeholder="请输入密码"
+            />
+          </view>
+        </view>
+        <view class="form-item">
+          <button 
+            class="login-but margin-top-20" 
+            :disabled="!checkFlag" 
+            :class="{ 'login-but-disabled': !checkFlag }"
+            @click="pwdLogin"
+          >
+            登录
+          </button>
+        </view>
+      </view>
+    </view>
+
+    <!-- 注册 showType===3 -->
+    <view style="margin-top: 180rpx" class="uni-padding-wrap border-top" v-if="showType === 3">
+      <view class="forms">
+        <view class="form-item">
+          <view class="form-item-view form-input">
+            <input 
+              class="uni-input" 
+              type="text"
+              v-model="formData.userName"
+              placeholder="请输入手机号"
+            />
+          </view>
+        </view>
+        <view class="form-item">
+          <view class="form-item-view form-input">
+            <input 
+              class="uni-input" 
+              type="password" 
+              password
+              v-model="formData.password"
+              placeholder="请输入密码"
+            />
+          </view>
+        </view>
+        <view class="form-item">
+          <view class="form-item-view form-input">
+            <input 
+              class="uni-input" 
+              type="password" 
+              password
+              v-model="formData.password2"
+              placeholder="请再次输入密码"
+            />
+          </view>
+        </view>
+        <view class="form-item">
+          <button 
+            class="login-but margin-top-20" 
+            :disabled="!checkFlag" 
+            :class="{ 'login-but-disabled': !checkFlag }"
+            @click="register"
+          >
+            注册
+          </button>
+        </view>
+      </view>
+      <view style="display: flex; justify-content: space-between;">
+        <text @click="showType = 1" class="redOrange">快捷登录</text>
+        <text @click="showType = 2" class="redOrange">已有账号登录</text>
+      </view>
+    </view>
+
+    <view style="margin-top: 80rpx;display: flex; justify-content: space-between;" class="uni-padding-wrap border-top">
+      <text @click="showType = 1" class="redOrange">快捷登录</text>
+      <text @click="cancelLogin" class="redOrange">取消登录</text>
+    </view>
+
+    <!-- 用户协议 -->
+    <view class="uni-flex flex agreement-wrap">
+      <checkbox-group @change="checkboxChange">
+        <label>
+          <checkbox value="cb" />
+          登录代表同意
+          <text class="link-text" @click="gotoXieyi">《{{ systemName }}用户协议》</text>
+          <text class="link-text" @click="gotoMianze">《免责声明》</text>
+          ，并授权使用您的{{ systemName }}账号信息（如昵称、头像）以便您统一管理
+        </label>
+      </checkbox-group>
+    </view>
+  </view>
+</template>
+
+<script>
 import ApiConstant from "@/common/ApiConstant";
 import Request from '@/common/request'
 import StaticConstant from "@/common/StaticConstant";
 import commonTool from "../../common/js/commonTool";
 import { stringIsNotEmpty } from "../../common/util";
 
-let request = new Request()
+const request = new Request()
+
 export default {
-  name: "home",
+  name: "login",
-  components: {},
-  computed: {
-    StaticConstant() {
-      return StaticConstant
-    }
-  },
   data() {
     return {
       systemName: '',
@@ -26,11 +161,16 @@ export default {
         password: '',
         password2: ''
       },
-      isTick: true,
       showFlag: false
     }
   },
-  onReady() {
+  computed: {
+    StaticConstant() {
+      return StaticConstant
+    }
+  },
+  onLoad() {
+    this.systemName = commonTool.getSystemName()
   },
   onShow() {
     // #ifdef MP-TOUTIAO
@@ -41,139 +181,121 @@ export default {
     // #endif
   },
   methods: {
+    // 显示协议提示
+    showAgreementTip() {
+      uni.showToast({
+        title: `请阅读后同意《${this.systemName}用户协议》`,
+        icon: 'none'
+      })
+    },
+
+    // 快捷登录入口（抖音）
+    handleQuickLogin() {
+      if (!this.checkFlag) {
+        this.showAgreementTip()
+        return
+      }
+      this.dyLogin()
+    },
+
+    // 登录成功统一处理
+    handleLoginSuccess(r, successMsg = '') {
+      this.otherSystemMessage(r)
+      uni.setStorageSync('token', r.result.token)
+      if (r.result.userInfo) {
+        uni.setStorageSync('userInfo', r.result.userInfo)
+      }
+      commonTool.checkVipInfo(r.result.vipInfo)
+      
+      if (successMsg) {
+        uni.showToast({ title: successMsg, icon: 'none' })
+      }
+      this.reloadHome()
+    },
+
     // 其他设备下线提示
     otherSystemMessage(r) {
-      if (r.result.loginState && r.result.loginState === 'more') {
+      if (r.result.loginState === 'more') {
         uni.showToast({
           title: '其他设备已下线，请稍等',
           icon: 'none'
         })
       }
     },
+
     // 刷新到首页
     reloadHome() {
-      setTimeout(function () {
+      setTimeout(() => {
-        wx.reLaunch({
+        // #ifdef MP-WEIXIN
-          url: '/pages/zyb/home',
+        wx.reLaunch({ url: '/pages/zyb/home' })
-        })
+        // #endif
+        // #ifndef MP-WEIXIN
+        uni.reLaunch({ url: '/pages/zyb/home' })
+        // #endif
       }, 500)
     },
+
     // 抖音登录
     dyLogin() {
-      //今日头条用户信息授权
-      let that = this
       uni.login({
         provider: 'toutiao',
-        success: function(loginRes) {
+        success: (loginRes) => {
-          console.log(loginRes);
           request.post(ApiConstant.User.dyLogin, {
             code: loginRes.code,
             anonymousCode: loginRes.anonymousCode,
           }).then(r => {
-            console.log('请求登录', r)
             if (r.success) {
-              console.log(r)
+              this.handleLoginSuccess(r)
-              that.otherSystemMessage(r)
-              //token
-              uni.setStorageSync('token', r.result.token)
-              //用户信息
-              if (r.result.userInfo) {
-                uni.setStorageSync('userInfo', r.result.userInfo)
-              }
-              //vip信息
-              commonTool.checkVipInfo(r.result.vipInfo)
-              //重新打开首页
-              that.reloadHome()
             } else {
-              uni.showToast({
+              uni.showToast({ title: r.message, icon: 'none' })
-                title: r.message,
+            }
-                icon: 'none'
           })
         }
-          }).catch(err => {
+      })
-          }).finally(() => {
-          });
-        }
-      });
     },
+
+    // 微信手机号登录
     getPhoneNumber(e) {
-      console.log(e.detail.errMsg);
-      console.log(e.detail.iv);
-      console.log(e.detail.encryptedData);
       if (!this.checkFlag) {
-        uni.showToast({
+        this.showAgreementTip()
-          title: '请阅读后同意《'+this.systemName+'用户协议》',
-          icon: 'none'
-        })
         return
       }
-      var sessionKey = ''
+      
-      if (e && e.detail && e.detail.code) {
+      if (!e?.detail?.code) {
-        //选择授权
+        uni.showToast({ title: '授权失败,请同意授权', icon: 'none' })
+        return
+      }
+
       uni.login({
         success: (res) => {
-            console.log('获取code', res)
+          if (!res.code) {
-            if (res.code) {
+            uni.showModal({ title: '未获取到code' })
-              let code = res.code
+            return
+          }
+          
           request.post(ApiConstant.User.wxLogin, {
-                code: code,
+            code: res.code,
             encryptedData: e.detail.encryptedData,
             iv: e.detail.iv
           }).then(r => {
-                console.log('请求登录', r)
             if (r.success) {
-                  console.log(r)
+              this.handleLoginSuccess(r)
-                  this.otherSystemMessage(r)
-                  //token
-                  uni.setStorageSync('token', r.result.token)
-                  //用户信息
-                  if (r.result.userInfo) {
-                    uni.setStorageSync('userInfo', r.result.userInfo)
-                  }
-
-                  //vip信息
-                  commonTool.checkVipInfo(r.result.vipInfo)
-                  //重新打开首页
-                  this.reloadHome()
             } else {
-                  uni.showToast({
+              uni.showToast({ title: '微信授权登录失败', icon: 'none' })
-                    title: '微信授权登录失败',
+            }
-                    icon: 'none'
           })
         }
-              }).catch(err => {
-              }).finally(() => {
-              });
-            } else {
-              uni.showModal({
-                title: '未获取到code'
       })
-            }
-          }
-        });
-      } else {
-        uni.showToast({
-          title: '授权失败,请同意授权',
-          icon: 'none'
-        })
-        return
-      }
-      console.log(e)
     },
+
     // 密码登录
     pwdLogin() {
       if (!stringIsNotEmpty(this.formData.userName)) {
-        uni.showToast({
+        uni.showToast({ title: '请输入用户名', icon: 'none' })
-          title: '请输入用户名',
-          icon: 'none'
-        })
         return
       }
       if (!stringIsNotEmpty(this.formData.password)) {
-        uni.showToast({
+        uni.showToast({ title: '请输入密码', icon: 'none' })
-          title: '请输入密码',
-          icon: 'none'
-        })
         return
       }
 
@@ -182,263 +304,91 @@ export default {
         password: this.formData.password
       }).then(r => {
         if (r.success) {
-          console.log(r)
+          this.handleLoginSuccess(r)
-          this.otherSystemMessage(r)
-          //token
-          uni.setStorageSync('token', r.result.token)
-          //用户信息
-          if (r.result.userInfo) {
-            uni.setStorageSync('userInfo', r.result.userInfo)
-          }
-          //vip信息
-          commonTool.checkVipInfo(r.result.vipInfo)
-          //重新打开首页
-          this.reloadHome()
         } else {
-          uni.showToast({
+          uni.showToast({ title: r.message, icon: 'none' })
-            title: r.message,
-            icon: 'none'
-          })
         }
-      }).catch(err => {
+      })
-      }).finally(() => {
-      });
-
     },
+
+    // 注册
     register() {
       if (!stringIsNotEmpty(this.formData.userName)) {
-        uni.showToast({
+        uni.showToast({ title: '请输入手机号码', icon: 'none' })
-          title: '请输入手机号码',
-          icon: 'none'
-        })
         return
       }
-      let phoneNumberPattern = /^1[3-9]\d{9}$/;
+      if (!/^1[3-9]\d{9}$/.test(this.formData.userName)) {
-      let isValidPhoneNumber = phoneNumberPattern.test(this.formData.userName);
+        uni.showToast({ title: '手机号码格式不正确', icon: 'none' })
-      if (!isValidPhoneNumber) {
-        uni.showToast({
-          title: '手机号码格式不正确',
-          icon: 'none'
-        })
         return
       }
       if (!stringIsNotEmpty(this.formData.password)) {
-        uni.showToast({
+        uni.showToast({ title: '请输入密码', icon: 'none' })
-          title: '请输入密码',
-          icon: 'none'
-        })
         return
       }
       if (this.formData.password !== this.formData.password2) {
-        uni.showToast({
+        uni.showToast({ title: '两次密码不一致', icon: 'none' })
-          title: '两次密码不一致',
-          icon: 'none'
-        })
         return
       }
+
       request.post(ApiConstant.User.register, {
         username: this.formData.userName,
         password: this.formData.password
       }).then(r => {
         if (r.success) {
-          console.log(r)
+          this.handleLoginSuccess(r, '注册成功')
-          setTimeout(function () {
-            uni.showToast({
-              title: '注册成功',
-              icon: 'none'
-            })
-          }, 100)
-          //token
-          uni.setStorageSync('token', r.result.token)
-          //用户信息
-          if (r.result.userInfo) {
-            uni.setStorageSync('userInfo', r.result.userInfo)
-          }
-          //vip信息
-          commonTool.checkVipInfo(r.result.vipInfo)
-          //重新打开首页
-          this.reloadHome()
-
         } else {
-          uni.showToast({
+          uni.showToast({ title: r.message, icon: 'none' })
-            title: r.message,
-            icon: 'none'
-          })
         }
-      }).catch(err => {
+      })
-      }).finally(() => {
-      });
     },
-    //显示密码输入框
+
-    showPwdInput() {
+    cancelLogin() {
+      uni.navigateBack()
     },
+
     gotoMianze() {
-      uni.navigateTo({
+      uni.navigateTo({ url: '/pages/zyb/other/disclaimer' })
-        url: '/pages/zyb/other/disclaimer'
-      })
     },
-    gotoXieyi() {
-      uni.navigateTo({
-        url: '/pages/zyb/other/userAgreement'
-      })
 
+    gotoXieyi() {
+      uni.navigateTo({ url: '/pages/zyb/other/userAgreement' })
     },
+
     checkboxChange(r) {
-      console.log(r)
+      this.checkFlag = r.detail.value?.length > 0
-      if (r.detail.value && r.detail.value.length > 0) {
-        this.checkFlag = true
-      } else {
-        this.checkFlag = false
     }
   }
-  },
-  onload() {
-    this.systemName = commonTool.getSystemName()
-  }
 }
 </script>
 
-<template>
-  <view class="header" style="border-top:3rpx solid #f6f6f6"></view>
-  <view class="content" v-if="showFlag">
-    <view class="textcenter">
-      <view class="flex">
-        <view class="title">
-          {{ StaticConstant.systemName }}
-        </view>
-
-      </view>
-    </view>
-    <view class="textcenter">
-      <text class="low-title">
-        <!--        全国<text style="font-size: 35rpx">600</text>万+考生的选择-->
-        艺术生 更轻松的报志愿
-      </text>
-    </view>
-
-    <view style="margin-top: 200rpx" v-if="showType===1">
-      <button class='login-but' v-if="!checkFlag" @click="getPhoneNumber">
-        /*#ifdef MP-TOUTIAO*/
-        抖音一键登录
-        /*#endif*/
-        /*#ifdef MP-WEIXIN*/
-        手机号快捷登录
-        /*#endif*/
-      </button>
-      /*#ifdef MP-TOUTIAO*/
-      <button class='login-but' v-if="checkFlag" @click="dyLogin">
-        抖音一键登录
-      </button>
-      /*#endif*/
-      /*#ifdef MP-WEIXIN*/
-      <button class='login-but' v-if="checkFlag" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
-        手机号快捷登录
-      </button>
-      /*#endif*/
-      <button class='login-pwd-but margin-top-20' @click="showType=2">
-        账号密码登录
-      </button>
-    </view>
-    <view style="margin-top: 180rpx" class="uni-padding-wrap border-top" v-if="showType===2">
-      <view class="forms">
-        <view class="form-item">
-          <view class="form-item-view form-input">
-            <input class="uni-input" type="text"
-                   v-model="formData.userName"
-                   name="contactPersonPhone"
-                   :placeholder="'请输入用户名或手机号'"/>
-          </view>
-        </view>
-        <view class="form-item">
-          <view class="form-item-view form-input">
-            <input class="uni-input" type="password" password="true"
-                   v-model="formData.password"
-                   name="password"
-                   :placeholder="'请输入密码'"/>
-          </view>
-        </view>
-        <view class="form-item">
-          <button class='login-but margin-top-20' :disabled="!checkFlag" :class="checkFlag?'':'login-but-disabled'"
-                  @click="pwdLogin">
-            登录
-          </button>
-        </view>
-      </view>
-      <view>
-        <text @click="showType=1" class="redOrange">快捷登录</text>
-      </view>
-    </view>
-    <!--注册-->
-    <view style="margin-top: 180rpx" class="uni-padding-wrap border-top" v-if="showType===3">
-      <view class="forms">
-        <view class="form-item">
-          <view class="form-item-view form-input">
-            <input class="uni-input" type="text"
-                   v-model="formData.userName"
-                   name="contactPersonPhone"
-                   :placeholder="'请输入手机号'"/>
-          </view>
-        </view>
-        <view class="form-item">
-          <view class="form-item-view form-input">
-            <input class="uni-input" type="password" password="true"
-                   v-model="formData.password"
-                   name="password"
-                   :placeholder="'请输入密码'"/>
-          </view>
-        </view>
-        <view class="form-item">
-          <view class="form-item-view form-input">
-            <input class="uni-input" type="password" password="true"
-                   v-model="formData.password2"
-                   name="password2"
-                   :placeholder="'请再次输入密码'"/>
-          </view>
-        </view>
-      </view>
-      <view>
-        <text @click="showType=1" class="redOrange">快捷登录</text>
-      </view>
-    </view>
-    <view class="uni-flex flex" style="margin-top: 100rpx">
-      <checkbox-group @change="checkboxChange">
-        <label>
-          <checkbox value="cb"/>
-          登录代表{{ systemName }}
-          <text style="color: #4975fd" @click="gotoXieyi">{{systemName}}用户协议、</text>
-          <text style="color: #4975fd" @click="gotoMianze">免责声明</text>，并授权使用您的{{ systemName }}账号信息（如昵称、头像）以便您统一管理
-        </label>
-      </checkbox-group>
-    </view>
-  </view>
-
-</template>
-
 <style scoped lang="scss">
 .content {
   margin-top: 200rpx;
   padding: 30rpx;
 }
 
-.container {
+.textcenter {
-  height: 100%;
+  text-align: center;
+  margin: 30rpx 0;
 }
 
-.uni-form-item .title {
+.title {
-  padding: 20rpx 0;
+  font-family: "Bookshelf Symbol 7";
+  margin: 0 auto;
+  font-size: 90rpx;
+  font-weight: 600;
+}
+
+.low-title {
+  font-size: 40rpx;
 }
 
-/*表单 start*/
 .form-item {
   display: flex;
   align-items: center;
   margin: 30rpx 0;
 }
 
-.form-item-label {
-  width: 20%;
-}
-
 .form-item-view {
   width: 100%;
   min-height: 80rpx;
@@ -452,46 +402,32 @@ export default {
   border: none;
 }
 
-.textcenter {
-  text-align: center;
-  margin: 30rpx 0;
-}
-
-/*标题*/
-.title {
-  font-family: "Bookshelf Symbol 7";
-  margin: 0 auto;
-  //color:white;
-  font-size: 90rpx;
-  font-weight: 600;
-}
-
-/*小标题*/
-.low-title {
-  font-size: 40rpx;
-}
-
-.login-pwd-but {
-  color: #222222;
-  width: 500rpx;
-  background: #eeeeee;
-  //background-color: ;
-  border-radius: 10rpx;
-  font-weight: 550;
-}
-
-///登录按钮
 .login-but {
   color: white;
   width: 500rpx;
-  //background: linear-gradient(rgba(52, 145, 212, 0.83), #3658d0);
   background: linear-gradient(#f96543, #f96543);
-  //background-color: ;
   border-radius: 10rpx;
   font-weight: 550;
 }
 
 .login-but-disabled {
   background: #eeeeee;
+  color: #999;
+}
+
+.login-pwd-but {
+  color: #222222;
+  width: 500rpx;
+  background: #eeeeee;
+  border-radius: 10rpx;
+  font-weight: 550;
+}
+
+.agreement-wrap {
+  margin-top: 100rpx;
+}
+
+.link-text {
+  color: #4975fd;
 }
 </style>

pages/zyb/school/detail.vue

@@ -532,17 +532,21 @@ export default {
         </view>
         <view class="historyScoreLineList slateGray" v-if="majorList && majorList.length>0">
           <view class="hsl-item" v-for="(item,index) in majorList[fsxIndex].historyMajorEnrollList" :key="index">
-            <view class="other-item">
+            <!-- <view class="other-item">
               批次：
               <text>{{ item.batch }}</text>
-            </view>
+            </view> -->
-            <view class="other-item right-item">
+			<view class="other-item">
-              <text>{{ item.year }}</text>
+			  <text>年份：</text>
+			  <text>{{ item.year || '-' }}</text>
 			</view>
             <view class="other-item">
               <text>备注：</text>
               <text>{{ item.detail || '-' }}</text>
             </view>
+			<!-- <view class="other-item right-item">
+			  <text>{{ item.year }}</text>
+			</view> -->
             <view class="other-item">
               <text>录取方式：</text>
               <text>{{ item.rulesEnrollProbability || '未公布' }}</text>

pages/zyb/testCultural/detail.vue

@@ -8,10 +8,15 @@ import Request from '@/common/request'
 import ImagesConstant from "@/common/ImagesConstant";
 
 let request = new Request()
+
+const app = getApp()
 export default {
   name: "test-cultural-detail",
   components: {},
   computed: {
+	app(){
+		return app
+	},
     ImagesConstant() {
 		return ImagesConstant
     },
@@ -121,7 +126,7 @@ export default {
     getTestCultural() {
       request.get(ApiConstant.Major.testCultural, {
         schoolCode: this.schoolCode,
-        year: this.year
+        year: app.globalData.StaticConstant.remote.nowYear
       }).then(r => {
         console.log(r)
         if (r.success) {
@@ -131,7 +136,6 @@ export default {
       }).finally(() => {
       });
     },
-    /**/
     shareToggle() {
       uni.share({
         provider: "weixin",
@@ -154,16 +158,16 @@ export default {
   <view class="head">
     <view class="school-item">
       <view class="uni-flex flex">
-        <view class="flex-item-25 t_item">
+        <view class="flex-item-2 t_item">
           <image :src="schoolInfo.schoolIcon||ImagesConstant.defaultIcon" style="width: 128rpx;height: 128rpx"
                  mode="aspectFill"/>
         </view>
-        <view class="flex-item-75 t_item">
+        <view class="flex-item-8 t_item">
           <view class="uni-flex flex">
-            <view class="flex-item-6 t_item" style="display: flex;height: 80rpx;">
+            <view class="flex-item-7 t_item" style="display: flex;height: 80rpx;">
               <text style="font-size: 35rpx;">{{ schoolInfo.schoolName }}</text>
             </view>
-            <view class="flex-item-4 t_item" style="display: flex;height: 60rpx;font-size: 30rpx;">
+            <view class="flex-item-3 t_item" style="display: flex;height: 60rpx;font-size: 30rpx;">
               <view class="address adrs" v-if="schoolInfo.cityProvince">
                 <!--直辖市-->
                 <view class="address-item address-item-before" v-if="schoolInfo.city">{{ schoolInfo.city }}</view>
@@ -224,7 +228,7 @@ export default {
             <view class="flex majorTitle">专业名称</view>
             <view class="flex" style="padding: 0 30rpx 30rpx 30rpx">
               <view class="majorName flexWrap">
-              <text>{{ majorArray[majorIndex].majorNameAll }}</text>
+              <text>{{ majorArray[majorIndex].majorName + `[${majorArray[majorIndex].category}]` }}</text>
               <text class="darkGray">{{majorArray[majorIndex].detail}}</text>
               </view>
             </view>

pages/zyb/testCultural/index.vue

@@ -158,11 +158,11 @@ export default {
     <view class="school-list">
       <view class="school-item uni-flex flex" v-for="(item,index) in tk.schoolList" :key="index"
             @click="goto('/pages/zyb/testCultural/detail?schoolCode='+item.schoolCode)">
-        <view class="flex-item-25 t_item">
+        <view class="flex-item-22 t_item">
           <image :src="item.schoolIcon||ImagesConstant.defaultIcon" style="width: 128rpx;height: 128rpx"
                  mode="aspectFill"/>
         </view>
-        <view class="flex-item-75 t_item">
+        <view class="flex-item-77 t_item">
           <view class="uni-flex flex">
             <view :class="item.schoolName.length<8?'flex-item-6':'flex-item-75'" class=" t_item" style="display: flex;height: 80rpx">
               <text>[{{item.schoolCode}}]</text>

pages/zyb/user/detail.vue

@@ -4,9 +4,13 @@ import ApiConstant from "@/common/ApiConstant";
 import Link from "@/pages/extUI/link/link.vue";
 import StaticConstant from "../../../common/StaticConstant";
 let request = new Request()
+let app = getApp()
 export default {
   name: "user-index",
   computed: {
+    app(){
+      return app
+    },
     StaticConstant() {
       return StaticConstant
     }
@@ -74,7 +78,7 @@ export default {
       </view>
       <view class="item">
         <view class="left">高考年份</view>
-        <view class="right dark">{{StaticConstant.year}}</view>
+        <view class="right dark">{{app.globalData.StaticConstant.remote.nowYear}}</view>
       </view>
     </view>