updates

common/ApiConstant.js

@@ -8,8 +8,8 @@ export default {
         majorList: '/yx/yxMajor/list',//获取专业信息表-分页列表查询
         majorInfo: '/mini/major/majorInfo',//获取专业详情
         miniMajorList: '/mini/major/miniMajorList',//专业列表
-        calculateInvestment: '/mini/recommendMajor/calculateInvestment',//投档分测算
+        calculateInvestment: '/mini/major/calculateInvestment',//投档分测算
-        testCultural: '/mini/recommendMajor/testCultural',//文化分测算
+        testCultural: '/mini/major/testCultural',//文化分测算
         groupByBatchNumber:'/mini/major/groupByBatchNumber',//获取各个批次是否有专业
         rulesEnrollrobabilityMenuList: '/mini/major/rulesEnrollrobabilityMenuList',
         schoolMajorListByBatchAndMajorType: '/mini/major/schoolMajorListByBatchAndMajorType',//智能填报页面获取专业列表
@@ -22,18 +22,18 @@ export default {
 //用户类
     User: {
         exchangeVipCard: '/yx/yxVipCard/exchange',//兑换vip卡
-        login:'/mini/user/login',//密码登录
+        login:'/mini/user/v1/login',//密码登录
         userInfo: '/wx/userInfo',
-        register:'/mini/user/register',//注册
+        register:'/mini/user/v1/register',//注册
         //微信
-        wxLogin: '/mini/user/phoneLogin',//手机号快捷登录
+        wxLogin: '/mini/user/v1/wechatLogin',//手机号快捷登录
         wxQrCodeStatus:'/wx/user/getQrCodeStatus',//获取微信二维码登录 状态
         wxQrCodeUpdateStatus:'/wx/user/updateQrCodeStatus',//更新微信二维码登录 状态
         wxQrCodeExit:'/wx/user/cancelQrCode',//取消微信二维码登录
         //=================================================================抖音
-        dyLogin:'/mini/user/dy/login',//抖音登录
+        dyLogin:'/mini/user/v1/dyLogin',//抖音登录
-        dyCheckBindPhone :'/mini/user/dy/checkBindPhone',//抖音判断手机号绑定
+        dyCheckBindPhone :'/mini/user/v1/dyCheckBindPhone',//抖音判断手机号绑定
-        dyBindPhone :'/mini/user/dy/bindPhone',//抖音判断手机号绑定
+        dyBindPhone :'/mini/user/v1/dyBindPhone',//抖音判断手机号绑定
     },
     System: {
         findPassWord: '/sys/findPassWord',//找回密码
@@ -80,11 +80,11 @@ export default {
         vip1: '/mini/pay/v1/jsApiPay',//支付类型1
     },
     VIP: {
-        cardActivation: '/mini/vip/card/activation',//卡密兑换
+        cardActivation: '/mini/vip/v1/card/activation',//卡密兑换
         orderList:'/mini/order/orderList',//获取订单列表
         orderDetail: '/mini/order/orderDetail',//获取订单信息
-        skuList: '/mini/vip/sku/all',//获取全部商品
+        skuList: '/mini/vip/v1/sku/all',//获取全部商品
-        vipInfo: '/mini/vip/getVipInfo',//获取当前用户vip信息
+        vipInfo: '/mini/vip/v1/getVipInfo',//获取当前用户vip信息
     },
     Article: {
         articlePage: '/mini/article/page',//文章列表

common/StaticConstant.js

@@ -1,5 +1,4 @@
 import ImagesConstant from "@/common/ImagesConstant";
-
 export default {
     systemName: '艺体志愿宝',
     email:'yitisheng@163.com',
@@ -33,7 +32,7 @@ export default {
     ],
     //专业选项
     professionalCategoryList: [
-        {value: '美术与设计类', label: '美术与设计类', scoreMax: 300,},
+        {value: '美术与设计类', label: '美术与设计类', scoreMax: 300},
         {
             value: '音乐类', label: '音乐类', scoreMax: 300, children: [
                 {label: '音乐表演声乐', value: '音乐表演声乐', exclude: '音乐表演器乐'},
@@ -41,8 +40,8 @@ export default {
                 {label: '音乐教育', value: '音乐教育'}
             ]
         },
-        {value: '舞蹈类', label: '舞蹈类', scoreMax: 300,},
+        {value: '舞蹈类', label: '舞蹈类', scoreMax: 300},
-        {value: '播音与主持类', label: '播音与主持类', scoreMax: 300,},
+        {value: '播音与主持类', label: '播音与主持类', scoreMax: 300},
         {
             value: '表演类', label: '表演类', scoreMax: 300, children: [
                 {label: '服装表演', value: '服装表演'},
@@ -50,7 +49,7 @@ export default {
                 {label: '戏剧影视表演', value: '戏剧影视表演'}
             ]
         },
-        {value: '书法类', label: '书法类', scoreMax: 300,},
+        {value: '书法类', label: '书法类', scoreMax: 300},
         {value: '戏曲类', label: '戏曲类', scoreMax: 300},
         {value: '体育类', label: '体育类', scoreMax: 150,},
         /*{value: '艺术舞蹈类', label: '艺术舞蹈类', scoreMax: 200},

common/js/commonTool.js

@@ -1,4 +1,6 @@
-import Request from '@/common/request'
+import Request from '@/common/request';
+import ENV_CONFIG from '@/config/env.js';
+import ApiConstant from "../ApiConstant";
 let request = new Request()
 export default {
     //调试vip信息
@@ -11,22 +13,29 @@ export default {
         }
     },
     //刷新vip信息
-    reloadVipInfo() {
+	reloadVipInfo() {
-        return request.post('/api/static/data/getJson', { key: key }, { showLoad: false }).then(r => {
+		request.get(ApiConstant.VIP.vipInfo,{},{showLoad:false}).then(r => {
+			console.log(r)
+			if (r.success) {
+				this.checkVipInfo(r.result)
+			}
+		}).catch(err => {
+		}).finally(() => {
+		});
+	},
+    async loadStaticConfig(key){
+        return request.post('/api/static/data/getJson',{key:key},{showLoad:false}).then(r => {
+            console.log(r)
             if (r.success) {
-                return r.result;
+                return r.result
-            } else {
-                return {};
             }
         }).catch(err => {
-            console.log('请求:'+key+"时出错:")
+            return {}
-            console.log(err)
-            return {};
         }).finally(() => {
         });
     },
-    async loadStaticConfig(key){
+    async loadStaticConfigParams(key,params){
-        return request.post('/api/static/data/getJson',{key:key},{showLoad:false}).then(r => {
+        return request.post('/api/static/data/getJson',{key:key,...params},{showLoad:false}).then(r => {
             console.log(r)
             if (r.success) {
                 return r.result
@@ -50,4 +59,10 @@ export default {
     // return year + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + seconds;
     return year + "-" + month + "-" + day;
     },
+    getSystemName(){
+        return ENV_CONFIG[process.env.NAME].name
+    },
+    getPlayerType(){
+        return this.getSystemName()==='体育志愿宝'?'体育类':'艺术类'
+    },
 }

common/js/jumpTool.js

@@ -9,6 +9,7 @@ export default{
         this.goto('/pages/zyb/login')
     },
     goArticleDetail(e){
+        console.log(e)
         this.goto('/pages/zyb/article/detail?articleId='+e.id)
     },
     /*打开成绩修改界面*/

common/request.js

@@ -1,5 +1,6 @@
 /*网络请求*/
-import operate from '@/common/operate'
+// 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
@@ -18,15 +19,20 @@ export default class Request {
         if (param.showLoad===false) {
             showLoading = false;
         }
-        /*hideLoading = param.hideLoading || false;
-        token = param.token || "",*/
 
         //拼接完整请求地址
-        var requestUrl = operate.api + url;
+        var requestUrl = ENV_CONFIG[process.env.NAME].requestBaseUrl + url;
-        //console.log(requestUrl)
+
         //拼接完整请求地址（根据环境切换）
         //请求方式:GET或POST(POST需配置
         if (method) {
+            if(process.env.NAME){
+                if(process.env.NAME === 'dy_tiyu_prod'){
+                    data['programType'] = '体育志愿宝'
+                }else{
+                    data['programType'] = '艺体志愿宝'
+                }
+            }
             method = method.toUpperCase(); //小写改为大写
             if (method === "POST") {
                 header = {"content-type":'application/json',...header}

common/util.js

@@ -116,6 +116,7 @@ function yearAbridge(year){
 	return '未知'
 }
 
+
 export {
 	formatTime,
 	formatLocation,

main.js

@@ -23,6 +23,7 @@ app.$mount()
 import {
 	createSSRApp
 } from 'vue'
+import {setSystemName} from "./common/util";
 export function createApp() {
 	const app = createSSRApp(App)
 	app.use(store)

manifest.json

@@ -135,7 +135,7 @@
         "uniStatistics" : {
             "enable" : true
         },
-        "appid" : "tt59a72f1ac6964bfa01"
+        "appid" : "tt9a2bec96051c14c001"
     },
     "mp-jd" : {
         "usingComponents" : true,

package-lock.json

@@ -1,13 +1,26 @@
 {
 	"name": "hello-uniapp",
 	"version": "3.4.5",
-	"lockfileVersion": 1,
+	"lockfileVersion": 3,
 	"requires": true,
-	"dependencies": {
+	"packages": {
-		"@dcloudio/uni-helper-json": {
+		"": {
+			"name": "hello-uniapp",
+			"version": "3.4.5",
+			"license": "MIT",
+			"dependencies": {
+				"@dcloudio/uni-helper-json": "^1.0.13",
+				"hello-uniapp": "file:"
+			}
+		},
+		"node_modules/@dcloudio/uni-helper-json": {
 			"version": "1.0.13",
 			"resolved": "https://registry.npmmirror.com/@dcloudio/uni-helper-json/-/uni-helper-json-1.0.13.tgz",
 			"integrity": "sha512-FO9Iu4zW4td3Tr+eiCDWuele2ehkJ4qxQ/UhpAMLjso+ZdWz6NagK5Syh6cdy1hoDqbxpNoqnLynuJXe81Ereg=="
+		},
+		"node_modules/hello-uniapp": {
+			"resolved": "",
+			"link": true
 		}
 	}
 }

package.json

@@ -107,10 +107,32 @@
 				"define": {
 					"H5-DEMO": true
 				}
+			},
+			"wx-yitisheng": {
+				"title": "微信小程序-艺体志愿宝",
+				"env": {
+					"UNI_PLATFORM": "mp-weixin",
+					"NAME": "wx_yitisheng_prod"
+				}
+			},
+			"dy-yitisheng": {
+				"title": "抖音小程序-艺体志愿宝",
+				"env": {
+					"UNI_PLATFORM": "mp-toutiao",
+					"NAME": "dy_yitisheng_prod"
+				}
+			},
+			"dy-tiyu": {
+				"title": "抖音小程序-体育志愿宝",
+				"env": {
+					"UNI_PLATFORM": "mp-toutiao",
+					"NAME": "dy_tiyu_prod"
+				}
 			}
 		}
 	},
 	"dependencies": {
-		"@dcloudio/uni-helper-json": "^1.0.13"
+		"@dcloudio/uni-helper-json": "^1.0.13",
+		"hello-uniapp": "file:"
 	}
 }

pages.json

@@ -17,7 +17,7 @@
     {
       "path": "pages/zyb/home",
       "style": {
-        "navigationBarTitleText": "艺体志愿宝",
+        "navigationBarTitleText": " ",
         "app-plus": {
           "bounce": "none",
           "titleNView": {
@@ -42,7 +42,7 @@
     {
       "path": "pages/zyb/qrcodeLogin",
       "style": {
-        "navigationBarTitleText": "艺体志愿宝"
+        "navigationBarTitleText": "扫码登录"
       }
     },
 
@@ -81,7 +81,7 @@
     {
       "path": "pages/zyb/login",
       "style": {
-        "navigationBarTitleText": "艺体志愿宝"
+        "navigationBarTitleText": "登录账号"
       }
     },
     {
@@ -365,7 +365,7 @@
     {
       "path": "pages/zyb/other/web-view",
       "style": {
-        "navigationBarTitleText": "艺体志愿宝"
+        "navigationBarTitleText": "在线预览"
       }
     },
 
@@ -404,6 +404,12 @@
       "style": {
         "navigationBarTitleText": "招生章程"
       }
+    },
+    {
+      "path": "pages/zyb/tiyujisuan/index",
+      "style": {
+        "navigationBarTitleText": "体育成绩计算器"
+      }
     }
   ],
   "subPackages": [

pages/zyb/fillVolunteer/detail.vue

@@ -20,6 +20,7 @@ export default {
   },
   data() {
     return {
+      vipInfo:{},
       paneFlag: false,
       scoreStatus: true,
       moveVolunteer: {
@@ -86,6 +87,7 @@ export default {
           this.scoreStatus = true
         }
       }
+      this.vipInfo = uni.getStorageSync('vipInfo')
     } else {
       //没有登录，跳转到登录页
       this.goto('/pages/zyb/login')
@@ -444,7 +446,7 @@ export default {
       </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.cognitioPolyclinic === '文科'?'历史组':'物理组' }}</view>
         <view class="tag">{{ scoreInfo.professionalCategory }}</view>
       </view>
       <view class="flexWrap">
@@ -529,7 +531,12 @@ export default {
                     <text class="margin-left-10">{{ item.majorName }}</text>
                   </view>
                   <view class="flex-item-15">
-                    <text class="darkGray float-right" v-if="item.enrollProbability">{{ item.enrollProbability.toString().substring(0,4) }}%</text>
+                    <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>
                 <!--操作栏-->

pages/zyb/fillVolunteer/index.vue

@@ -3,9 +3,9 @@ import StaticConstant from "@/common/StaticConstant";
 import ApiConstant from "@/common/ApiConstant";
 import Request from '@/common/request'
 import ImagesConstant from "@/common/ImagesConstant";
-import {arrayIsNotEmpty} from "@/common/util";
+import {arrayIsNotEmpty,stringIsNotEmpty} from "@/common/util";
 import vip from "../vip/index.vue";
-import {stringIsNotEmpty} from "../../../common/util";
+import CommonTool from "@/common/js/commonTool";
 
 let request = new Request()
 // 缓存每页最多
@@ -29,6 +29,7 @@ export default {
   data() {
     return {
       ///
+      systemName:'',
       num: {kcj: 0, jwt: 0, nlq: 0, kbd: 0,},
       circle: {kcj: 0, jwt: 0, nlq: 0, kbd: 0,},//百分比
       modelVale: 0,
@@ -97,6 +98,7 @@ export default {
     this.userInfo = uni.getStorageSync('userInfo')
   },
   onLoad(e) {
+    this.systemName = CommonTool.getSystemName()
     this.vipInfo = uni.getStorageSync('vipInfo')
     if (e.batch && e.volunteerId) {
       //从我的志愿 点击跳转而来
@@ -124,14 +126,14 @@ export default {
   },
   onShareAppMessage() {
     return {
-      title: '艺体志愿宝-测一测你能上的大学', //分享标题
+      title: systemName+'-测一测你能上的大学', //分享标题
       path: "/pages/zyb/fillVolunteer/index"
     }
   },
   // 分享到微信朋友圈
   onShareTimeline(res) {
     return {
-      title: '测一测你能上的大学', //分享标题
+      title: systemName+'测一测你能上的大学', //分享标题
       path: "/pages/zyb/fillVolunteer/index"
     }
   },
@@ -800,7 +802,7 @@ export default {
 
         <view class="text-list">
           <text class="t">省份：{{ scoreInfo.province }}</text>
-          <text class="t">选科：{{ scoreInfo.cognitioPolyclinic }}</text>
+          <text class="t">选科：{{ scoreInfo.cognitioPolyclinic ==='文科'?'历史组':'物理组' }}</text>
           <text class="t">类别：{{ scoreInfo.professionalCategory }}</text>
         </view>
         <view class="text-list">

pages/zyb/fillVolunteer/mockList.vue

@@ -155,7 +155,7 @@ export default {
   },
   onShareAppMessage() {
     return {
-      title: '艺体志愿宝-测一测你能上的大学', //分享标题
+      title: '测一测你能上的大学', //分享标题
       path: "/pages/zyb/fillVolunteer/index"
     }
   },
@@ -881,7 +881,7 @@ export default {
 
         <view class="text-list">
           <text class="t">省份：{{ scoreInfo.province }}</text>
-          <text class="t">选科：{{ scoreInfo.cognitioPolyclinic }}</text>
+          <text class="t">选科：{{ scoreInfo.cognitioPolyclinic ==='文科'?'历史组':'物理组' }}</text>
           <text class="t">类别：{{ scoreInfo.professionalCategory }}</text>
         </view>
         <view class="text-list">

pages/zyb/fillVolunteer/my-detail.vue

@@ -448,7 +448,7 @@ export default {
       </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.cognitioPolyclinic === '文科'?'历史组':'物理组' }}</view>
         <view class="tag">{{ scoreInfo.professionalCategory }}</view>
       </view>
       <view class="flexWrap">

pages/zyb/fillVolunteer/my.vue

@@ -153,7 +153,7 @@ export default {
           <view class="uni-flex uni-row">
             <view class="flex-item-8 t_item">
               <text>{{
-                  item.userScoreInfo.cognitioPolyclinic
+                  item.userScoreInfo.cognitioPolyclinic === '文科'?'历史组':'物理组'
                 }}&nbsp;&nbsp;|&nbsp;&nbsp;{{ item.userScoreInfo.professionalCategory }}
               </text>
             </view>

pages/zyb/fillVolunteer/old-detail.vue

@@ -494,7 +494,7 @@ export default {
       </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.cognitioPolyclinic === '文科'?'历史组':'物理组' }}</view>
         <view class="tag">{{ scoreInfo.professionalCategory }}</view>
       </view>
       <view class="flexWrap">

pages/zyb/home.vue

@@ -4,22 +4,21 @@ import ImagesConstant from "@/common/ImagesConstant";
 import ApiConstant from "@/common/ApiConstant";
 import Request from "@/common/request";
 import JumpTool from "@/common/js/jumpTool";
-import jumpTool from "@/common/js/jumpTool";
+import CommonTool from "@/common/js/commonTool";
 
 let request = new Request()
 export default {
   name: "home",
   components: {},
   computed: {
-    jumpTool() {
-      return jumpTool
-    },
     StaticConstant() {
       return StaticConstant
     }
   },
   data() {
     return {
+      systemName:"",
+      playerType:'艺体考生',
       userStatus: false,
       scoreInfo: null,
       zyNum: null,//专业数量
@@ -48,6 +47,23 @@ export default {
       currentTab: 0,
     }
   },
+  onLoad(){
+    this.systemName = CommonTool.getSystemName()
+    if(this.systemName === '体育志愿宝'){
+      this.playerType = '体育考生'
+      for (let i = 0; i < this.options.length; i++) {
+        if(this.options[i].title === '艺考考研'){
+          this.options[i].title = '体育计分器'
+          this.options[i].url = '/pages/zyb/tiyujisuan/index'
+        }
+      }
+    }
+    // 动态设置标题
+    uni.setNavigationBarTitle({
+      title: this.systemName
+    });
+    this.getAdmissionsRegulationsList()
+  },
   onShow() {
     //进入页面后，判断是否登录了
     let userInfo = uni.getStorageSync('userInfo')
@@ -62,9 +78,6 @@ export default {
       }
     }
   },
-  onLoad() {
-    this.getAdmissionsRegulationsList()
-  },
   onReachBottom() {
       this.loadMore()
   },
@@ -74,14 +87,14 @@ export default {
   },
   onShareAppMessage() {
     return {
-      title: StaticConstant.systemName, //分享标题
+      title: '测一测你能上的大学', //分享标题
       path: "/pages/zyb/home"
     }
   },
   // 分享到微信朋友圈
   onShareTimeline(res) {
     return {
-      title: StaticConstant.systemName, //分享标题
+      title: '测一测你能上的大学', //分享标题
       path: "/pages/zyb/home"
     }
   },
@@ -222,7 +235,9 @@ export default {
         console.log(this.scrollLeft, 60, id)
       }
     },
-
+	goArticleDetail(e){
+		JumpTool.goArticleDetail(e)
+	},
   }
 }
 </script>
@@ -232,8 +247,8 @@ export default {
     <!--顶部搜素框-->
     <view class="header">
       <view class="flexWrap systemNameLine">
-        <text class="font-size-big font-weight-b margin-left-50">{{ StaticConstant.systemName }}</text>
+        <text class="font-size-big font-weight-b margin-left-50">{{ systemName }}</text>
-        <text style="position: absolute;left: 350rpx;top:50rpx">河南艺体考生专属VIP</text>
+        <text style="position: absolute;left: 350rpx;top:50rpx">河南{{playerType}}专属VIP</text>
       </view>
       <!--      <view class="flexWrap search">
               <view>
@@ -259,7 +274,7 @@ export default {
             <view class="flex-item-7">
               <text class="margin-right-10">{{ scoreInfo && scoreInfo.province }}
                 <text class="font-weight-none">·</text>
-                {{ scoreInfo && scoreInfo.cognitioPolyclinic === '文科' ? '文' : '理' }}
+                {{ scoreInfo && scoreInfo.cognitioPolyclinic === '文科' ? '历史组' : '物理组' }}
               </text>
               <text class="margin-right-10">{{ scoreInfo && scoreInfo.professionalCategory }}</text>
             </view>
@@ -406,7 +421,7 @@ export default {
       </scroll-view>
       <view class="messageList" v-for="(item,index) in this.tabs[this.currentTab].list" :key="index"
             v-if="this.tabs[this.currentTab]">
-        <view class="messageItem" @click="jumpTool.goArticleDetail(item)"
+        <view class="messageItem" @click="goArticleDetail(item)"
               :class="index ===admissionsRegulationsList.length-1?'':'border-bottom'">
           <text class="flexWrap">{{ item.title }}</text>
           <view class="flexWrap margin-top-10">

pages/zyb/login.vue

@@ -18,6 +18,7 @@ export default {
   },
   data() {
     return {
+      systemName:'',
       checkFlag: false,
       showType: 1,
       formData: {
@@ -101,7 +102,7 @@ export default {
       console.log(e.detail.encryptedData);
       if (!this.checkFlag) {
         uni.showToast({
-          title: '请阅读后同意《艺体志愿宝用户协议》',
+          title: '请阅读后同意《'+this.systemName+'用户协议》',
           icon: 'none'
         })
         return
@@ -292,6 +293,7 @@ export default {
     }
   },
   onload() {
+    this.systemName = commonTool.getSystemName()
   }
 }
 </script>
@@ -402,11 +404,11 @@ export default {
       <checkbox-group @change="checkboxChange">
         <label>
           <checkbox value="cb"/>
-          登录代表{{ StaticConstant.systemName }}
+          登录代表{{ systemName }}
-          <text style="color: #4975fd" @click="gotoXieyi">艺体志愿宝用户协议、</text>
+          <text style="color: #4975fd" @click="gotoXieyi">{{systemName}}用户协议、</text>
           <text style="color: #4975fd" @click="gotoMianze">免责声明、</text>
           ，
-          并授权使用您的{{ StaticConstant.systemName }}账号信息（如昵称、头像）以便您统一管理
+          并授权使用您的{{ systemName }}账号信息（如昵称、头像）以便您统一管理
         </label>
       </checkbox-group>
     </view>

pages/zyb/order/list.vue

@@ -2,14 +2,16 @@
   <view class="order-list border-top">
     <view v-if="orders.length > 0">
       <view v-for="(order, index) in orders" :key="index">
-        <view class="order-item" @click="openDetail(order)">
+        <view class="order-item">
+			<!--  @click="openDetail(order)" -->
           <view class="flexWrap border-bottom" style="padding: 20rpx">
             <view class="flex-item-2">订单号</view>
             <view class="flex-item-6">
               <text class="multiline-text">{{ order.orderCode }}</text>
             </view>
             <view class="flex-item-2 font-weight-b">
-              <text class="float-right" :style="'color:'+getColorByStatus(order.orderStatus)">{{ getTextByStatus(order.orderStatus) }}</text>
+				<!-- <text class="float-right" >{{ order.orderStatusName }}</text> -->
+				<text class="float-right" :style="'color:'+getColorByStatus(order.orderStatusName)">{{ order.orderStatusName }}</text>
             </view>
           </view>
           <view class="flexWrap" style="padding: 5rpx 0">
@@ -24,7 +26,7 @@
             <view class="flex-item-2"></view>
             <view class="flex-item-8">下单时间：<text>{{ order.createTime }}</text></view>
           </view>
-          <view class="flexWrap" style="padding: 5rpx 0" v-if="order.orderStatus && order.orderStatus==='2'">
+          <view class="flexWrap" style="padding: 5rpx 0" v-if="order.orderStatus && order.paymentTime">
             <view class="flex-item-2"></view>
             <view class="flex-item-8">付款时间：<text>{{ order.paymentTime }}</text></view>
           </view>
@@ -36,6 +38,12 @@
             <view class="flex-item-2"></view>
             <view class="flex-item-8"><text class="redOrange2">￥{{ order.totalAmount }}</text></view>
           </view>
+		  <view class="flexWrap" style="padding: 5rpx 0" v-show="order.orderStatusName === '待支付'">
+		    <view class="flex-item-2"></view>
+		    <view class="flex-item-8">
+				<text class="redOrange2" @click="goPay(order)" style="border: 1rpx solid #f2891b;border-radius: 30rpx;padding: 0 10rpx;">去付款</text>
+			</view>
+		  </view>
         </view>
         <view class="divider" v-if="index !== orders.length - 1"></view>
       </view>
@@ -88,10 +96,15 @@ export default {
       this.getOrderList()
     },
     openDetail(e){
-      uni.navigateTo({
+		uni.navigateTo({
-        url: '/pages/zyb/order/detail?orderCode='+e.orderCode
+			url: '/pages/zyb/order/detail?orderCode='+e.orderCode
-      })
+		})
     },
+	goPay(e){
+		uni.navigateTo({
+			url: '/pages/zyb/vip/checkoutCounter?orderCode='+e.orderCode
+		})
+	},
     getOrderList(){
       request.get(ApiConstant.VIP.orderList,{}).then(r => {
         console.log(r)
@@ -104,12 +117,10 @@ export default {
       });
     },
     getColorByStatus(status){
-      if (status === '1') {
+      if (status === '待支付') {
         return '#f96543';
-      }else if (status === '2') {
+      }else if (status === '已支付') {
         return '#85e689';
-      }else if (status === '5') {
-        return '#f2891b';
       }else{
         return '#bb0303';
       }

pages/zyb/other/calculateInvestment.vue

@@ -213,7 +213,7 @@ export default {
             <view class="left-t color3">文理<label></label></view>
           </view>
           <view class="flex-item-7 ml10">
-            <view class="right-input">{{this.scoreInfo.cognitioPolyclinic}}</view>
+            <view class="right-input">{{this.scoreInfo.cognitioPolyclinic === '文科'?'历史组':'物理组'}}</view>
 <!--            <picker @change="bindCategoryArrayPickerChange" :value="categoryIndex" :range="categoryArray"
                     range-key='name'>
               <view class="right-input">{{ categoryArray[categoryIndex].name }}</view>

pages/zyb/other/checkRanking.vue

@@ -5,6 +5,7 @@
 import StaticConstant from "@/common/StaticConstant";
 import ApiConstant from "@/common/ApiConstant";
 import Request from '@/common/request'
+import CommonTool from "@/common/js/commonTool";
 let request = new Request()
 export default {
   name: "checkRanking",
@@ -25,7 +26,7 @@ export default {
       styles: {},
       array: ['河南'],
       index: 0,
-      professionalCategoryArray:StaticConstant.professionalCategoryList,
+      professionalCategoryArray:[],
       professionalCategoryIndex:0,
       fdbList:[
         {
@@ -43,6 +44,9 @@ export default {
       ]
     }
   },
+  async onLoad() {
+    this.professionalCategoryArray = await CommonTool.loadStaticConfig('professionalCategoryList')
+  },
   methods: {
     handle(type) {
       this.show = !this.show

pages/zyb/other/volunteerCardDesc.vue

@@ -1,13 +1,24 @@
 <!--志愿卡说明-->
 <script>
+import commonTool from "@/common/js/commonTool";
 export default {
-  name: "volunteerCardDesc"
+  name: "volunteerCardDesc",
+  computed: {
+  },
+  data() {
+    return {
+      playerType: '艺术类',
+    }
+  },
+  onLoad() {
+    this.playerType = commonTool.getPlayerType()
+  }
 }
 </script>
 
 <template>
 <view class="body">
-  <text class="text-l uni-flex flex">（一）、适用范围:艺术类文理科考生(自主招生暂不适用)。</text>
+  <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">（三）、分数修改次数:每届服务期内高考分数放榜前可修改10次，放榜后只可修改1次。</text>
   <text class="text-l uni-flex flex">（四）、系统数据来源于及第生涯部门，由合作网站提供。</text>

pages/zyb/qrcodeLogin.vue

@@ -4,16 +4,12 @@ import ApiConstant from "@/common/ApiConstant";
 import Request from '@/common/request'
 import StaticConstant from "@/common/StaticConstant";
 import commonTool from "@/common/js/commonTool";
-import CommonTool from "@/common/js/commonTool";
 
 let request = new Request()
 export default {
   name: "home",
   components: {},
   computed: {
-    CommonTool() {
-      return CommonTool
-    },
     StaticConstant() {
       return StaticConstant
     }
@@ -34,7 +30,7 @@ export default {
       console.log(options.scene)
       console.log(this.uuid)
 	  this.getQrCodeStatus()
-      
+
     }
   },
   onShow() {
@@ -198,7 +194,7 @@ export default {
         <label>
           <checkbox value="cb"/>
           登录代表{{ StaticConstant.systemName }}
-          <text style="color: #4975fd" @click="gotoXieyi">艺体志愿宝用户协议、</text>
+          <text style="color: #4975fd" @click="gotoXieyi">{{commonTool.getSystemName()}}用户协议、</text>
           <text style="color: #4975fd" @click="gotoMianze">免责声明、</text>
           ，
           并授权使用您的{{ StaticConstant.systemName }}账号信息（如昵称、头像）以便您统一管理
@@ -225,7 +221,7 @@ export default {
     </view>
   </view>
   <view class="content" v-else-if="showFlag && showType===3">
-    <view class="textcenter">      
+    <view class="textcenter">
       <text class="low-title">
         二维码已失效
       </text><br/>

pages/zyb/school/list.vue

@@ -340,7 +340,7 @@ export default {
                 <text class="font-weight-b xk-color">{{ item.zdf }}分</text>
               </view>
             </view>-->
-            <view class="flex-item-38">
+            <view class="flex-item-4">
               <view class="font-size-mini-mini float-right" v-if="item.jhs">
                 <text class="slateGray">23年省内计划录取:</text>
                 <text class="font-weight-b xk-color">{{ item.jhs }}人</text>
@@ -354,13 +354,13 @@ export default {
                 <text class="font-size-mini font-weight-550 tk-color">{{ item.kslx }}</text>
               </view>
             </view>
-            <view class="flex-item-42">
+            <view class="flex-item-4">
               <view class="font-size-mini-mini" v-if="item.zdf">
                 <text class="slateGray">{{ yearAbridge(item.zdfYear) }}年录取最低分:</text>
                 <text class="font-weight-b tk-color">{{ item.zdf }}分</text>
               </view>
             </view>
-            <view class="flex-item-38">
+            <view class="flex-item-4">
               <view class="font-size-mini-mini float-right" v-if="item.jhs">
                 <text class="slateGray">{{item.luquYear}}年省内计划录取:</text>
                 <text class="font-weight-b tk-color">{{ item.jhs }}人</text>

pages/zyb/score/edit.vue

@@ -28,7 +28,8 @@ export default {
         culturalScore: '',//文化分
         professionalScore: '',//统考分
         chineseScore: '',
-        englishScore: ''
+        englishScore: '',
+		subjectList: [],
       },
       formRuleFlag: false,//表单是否校验成功
       provinceArray: [{
@@ -37,8 +38,17 @@ export default {
         value: "河南",
       },],//
       cognitioPolyclinicArray: StaticConstant.categoryList,//文理分科
+	  subjectArray: [{
+		  name:'地理'
+	  },{
+		  name:'政治'
+	  },{
+		  name:'化学'
+	  },{
+		  name:'生物'
+	  }],
       //===========================================================
-      professionalCategoryArray: StaticConstant.professionalCategoryList,//专业类别大类array
+      professionalCategoryArray: [],//专业类别大类array
       professionalCategoryVisible: false,//专业类别 是否显示
       professionalCategoryIndex: null,
       pCategoryChildrenList: [],//子级选择
@@ -51,7 +61,16 @@ export default {
     // 志愿单打印配置
     this.reloadMajorModalMessageConfig = await CommonTool.loadStaticConfig('reload_major_modal_message')
   },
-  onShow() {
+  async onShow() {
+    if(uni.getStorageSync('professionalCategoryArray')){
+      this.professionalCategoryArray = uni.getStorageSync('professionalCategoryArray')
+    }else{
+      this.professionalCategoryArray = await CommonTool.loadStaticConfig('professionalCategoryList')
+      if(this.professionalCategoryArray){
+        uni.setStorageSync('professionalCategoryArray',this.professionalCategoryArray)
+      }
+    }
+
     this.getEditScoreCount()
     this.getUserScore()
     this.vipInfo = uni.getStorageSync('vipInfo')
@@ -123,7 +142,9 @@ export default {
               url: '/pages/zyb/home'
             })
           }, 800)
-        }
+        }else{
+			uni.showToast({title: res.message, icon: "none"});
+		}
       }).catch(err => {
       }).finally(() => {
       });
@@ -183,9 +204,21 @@ export default {
     },
     //选择科目
     switchKelei(e) {
-      this.scoreInfo.cognitioPolyclinic = e.name
+		this.scoreInfo.cognitioPolyclinic = e.name
-      this.checkForm()
+		this.checkForm()
     },
+	switchSubject(e){
+		let index = this.scoreInfo.subjectList.indexOf(e);
+		if(index > -1){
+			// 删除
+			this.scoreInfo.subjectList.splice(index, 1);
+		}else{
+			// 只可以选两个
+			if(this.scoreInfo.subjectList.length <= 1){
+				this.scoreInfo.subjectList.push(e);	
+			}
+		}
+	},
     formSubmit: function (e) {
       let that = this
       console.log('form发生了submit事件，携带数据为：' + JSON.stringify(e.detail.value))
@@ -195,7 +228,6 @@ export default {
         return;
       }
       //选择科目（文理分科)
-      console.log(this.scoreInfo.cognitioPolyclinic)
       if (!stringIsNotEmpty(this.scoreInfo.cognitioPolyclinic)) {
         uni.showToast({title: '请选择选考科目', icon: "none"});
         return;
@@ -430,11 +462,23 @@ export default {
               <view class="kelei-item" @click="switchKelei(item)"
                     :class="scoreInfo.cognitioPolyclinic===item.name?'kelei-item-active':''"
                     v-for="(item,index) in cognitioPolyclinicArray" :key="index">
-                <text>{{ item.name }}</text>
+                <text>{{ item.name==='文科'?'历史组':'物理组' }}</text>
               </view>
             </view>
           </view>
         </view>
+		<view class="form-item">
+		  <view class="form-item-label"></view>
+		  <view class="form-item-view">
+		    <view class="flexWrap">
+		      <view class="kelei-item" style="padding: 15rpx 20rpx;" @click="switchSubject(item.name)"
+		            :class="scoreInfo.subjectList.includes(item.name)?'kelei-item-active':''"
+		            v-for="(item,index) in subjectArray" :key="index">
+		        <text>{{ item.name }}</text>
+		      </view>
+		    </view>
+		  </view>
+		</view>
         <!--子项专业成绩-->
         <view class="form-item" v-if="professionalCategoryArray[professionalCategoryIndex]"
               v-for="(item,index) in pCategoryChildrenList" :key="index">
@@ -536,7 +580,7 @@ export default {
       <text class="font-weight-b">还可更改{{ 5-useCount }}次</text>
     </view>
     <view v-else class="submitButtonView button-disabled">
-      <text class="font-weight-b">今日修改次数已用完</text>
+      <text class="font-weight-b">修改次数已用完</text>
     </view>
     <view class="submitButtonView button-active" v-if="scoreInfo && scoreInfo.id && scoreInfo.professionalCategory" @click="reloadMajor">
       <text class="font-weight-b">刷新专业</text>

pages/zyb/tiyujisuan/index.vue

@@ -0,0 +1,307 @@
+<script>
+import StaticConstant from "@/common/StaticConstant";
+import ApiConstant from "@/common/ApiConstant";
+import Request from '@/common/request'
+import {arrayIsNotEmpty, stringIsNotEmpty} from "@/common/util";
+import CommonTool from "@/common/js/commonTool";
+import commonTool from "../../../common/js/commonTool";
+
+let request = new Request()
+export default {
+  name: "socre-edit",
+  computed: {
+    StaticConstant() {
+      return StaticConstant
+    }
+  },
+  data() {
+    return {
+      sportsScore:[0,0,0],
+      sportsScoreSum:0,
+      formData:{
+        year:'2024',// 年份
+        sex:'男',
+        sprint:'',//100米短跑
+        jump:'',// 立定跳远
+        shotPut:'',// 推铅球
+      },
+      sexList:[
+        {name:'男'},
+        {name:'女'}
+      ],
+      scoreInfo: {
+        province: '河南',//省份
+      },
+      formRuleFlag: false,//表单是否校验成功
+    }
+  },
+  async onLoad() {
+  },
+  async onShow() {
+  },
+  methods: {
+    stringIsNotEmpty() {
+      return stringIsNotEmpty
+    },
+    validateSprint(e) {
+      let that = this
+      e.target.value = (e.target.value.match(/^\d*(\.?\d{0,3})/g)[0]) || null
+      this.$nextTick(() => {
+        that.formData.sprint= e.target.value
+      })
+      this.checkForm()
+    },
+    validateJump(e) {
+      let that = this
+      e.target.value = (e.target.value.match(/^\d*(\.?\d{0,3})/g)[0]) || null
+      this.$nextTick(() => {
+        that.formData.jump= e.target.value
+      })
+      this.checkForm()
+    },
+    validateShotPut(e) {
+      let that = this
+      e.target.value = (e.target.value.match(/^\d*(\.?\d{0,3})/g)[0]) || null
+      this.$nextTick(() => {
+        that.formData.shotPut= e.target.value
+      })
+      this.checkForm()
+    },
+    checkForm() {
+      console.log('qqq')
+      this.formRuleFlag = false
+      if(!this.formData.sex){
+        return;
+      }
+      if(!this.formData.sprint){
+        return;
+      }
+      if(!this.formData.jump){
+        return;
+      }
+      if(!this.formData.shotPut){
+        return;
+      }
+      this.formRuleFlag = true
+    },
+    //选择考区
+    bindPicker_provinceChange: function (e) {
+      console.log('考区picker发送选择改变，携带值为：' + e)
+      this.scoreInfo.province = this.provinceArray[e.detail.value].name
+      this.checkForm()
+    },
+    switchSex(e){
+      this.formData.sex = e.name
+      this.checkForm()
+    },
+    //选择科目
+    switchKelei(e) {
+      this.scoreInfo.cognitioPolyclinic = e.name
+      this.checkForm()
+    },
+    formSubmit:async function (e) {
+      let that = this
+      //==
+      this.sportsScore = await commonTool.loadStaticConfigParams('sportsScore',this.formData)
+      console.log(this.sportsScore)
+      let sum = 0
+      this.sportsScore.forEach((s,index)=>{
+        sum+=s
+      })
+      this.sportsScoreSum = sum
+
+      this.$refs.popup.open("center")
+    },
+    cooperateClose(){
+      this.$refs.popup.close()
+    },
+    formReset: function (e) {
+      console.log('清空数据')
+    },
+    onProfessionalCategoryOpen() {
+      console.log('打开')
+    },
+    onProfessionalCategoryBottom() {
+      console.log('触底');
+    },
+  }
+}
+</script>
+
+<template>
+  <view class="container" style="background-color: #ffffff">
+    <view class="uni-padding-wrap" style="text-align: center">
+      <view class="font-size-medium font-weight-b">
+        河南体育成绩计算器
+      </view>
+    </view>
+    <!--表单-->
+    <view class="uni-padding-wrap uni-common-mt border-top">
+      <view class="forms">
+        <!--选考科目-->
+        <view class="form-item">
+          <view class="form-item-label">性别</view>
+          <view class="form-item-view">
+            <view class="flexWrap">
+              <view class="kelei-item" @click="switchSex(item)"
+                    :class="formData.sex===item.name?'kelei-item-active':''"
+                    v-for="(item,index) in sexList" :key="index">
+                <text>{{ item.name }}</text>
+              </view>
+            </view>
+          </view>
+        </view>
+        <!--100米-->
+        <view class="form-item">
+          <view class="form-item-label">100米</view>
+          <view class="form-item-view form-input flexWrap">
+            <view class="flex-item-9">
+              <input class="uni-input" type="digit" @input="validateSprint" v-model="formData.sprint" name="sprint"
+                     placeholder="请输入成绩"/>
+            </view>
+            <view class="flex-item-1">
+              <text style="line-height: 80rpx">秒</text>
+            </view>
+          </view>
+        </view>
+        <!--立定跳远-->
+        <view class="form-item">
+          <view class="form-item-label">立定跳远</view>
+          <view class="form-item-view form-input flexWrap">
+            <view class="flex-item-9">
+              <input class="uni-input" type="text" @input="validateJump" v-model="formData.jump" name="jump"
+                     placeholder="请输入成绩"/>
+            </view>
+            <view class="flex-item-1">
+              <text style="line-height: 80rpx">米</text>
+            </view>
+          </view>
+        </view>
+        <!--原地推铅球-->
+        <view class="form-item">
+          <view class="form-item-label">原地推铅球</view>
+          <view class="form-item-view form-input flexWrap">
+            <view class="flex-item-9">
+              <input class="uni-input" type="text" @input="validateShotPut" v-model="formData.shotPut" name="shotPut"
+                     placeholder="请输入成绩"/>
+            </view>
+            <view class="flex-item-1">
+              <text style="line-height: 80rpx">米</text>
+            </view>
+          </view>
+        </view>
+
+      </view>
+    </view>
+
+    <view class="submitButtonView"
+          :class="formRuleFlag?'button-active':'button-disabled'" @click="formSubmit">
+      <text class="font-weight-b">查询</text>
+    </view>
+
+    <uni-popup ref="popup" 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>
+        <view class="font-size-mini4 font-weight-b" style="text-align: center">{{sportsScoreSum}}</view>
+        <view class="flexWrap marginTopBot20 margin-top-20"><text class="text">100米，成绩：{{formData.sprint}}，分数：{{sportsScore[0]}}</text></view>
+        <view class="flexWrap marginTopBot20 margin-top-20"><text class="text">立定跳远，成绩：{{formData.jump}}，分数：{{sportsScore[1]}}</text></view>
+        <view class="flexWrap marginTopBot20 margin-top-20"><text class="text">原地推铅球，成绩：{{formData.shotPut}}，分数：{{sportsScore[2]}}</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>
+
+</template>
+
+<style scoped lang="scss">
+.container {
+  height: 100%;
+}
+
+.uni-form-item .title {
+  padding: 20rpx 0;
+}
+
+/*表单 start*/
+.form-item {
+  display: flex;
+  align-items: center;
+  margin: 30rpx 0;
+}
+
+.form-item-label {
+  width: 20%;
+}
+
+.form-item-view {
+  width: 80%;
+  min-height: 80rpx;
+}
+
+.form-input {
+  border: 1rpx solid #e6e6e6;
+}
+
+//选考科目
+.kelei-item {
+  background-color: #f7f7f7;
+  color: black;
+  padding: 20rpx 30rpx;
+  margin-right: 30rpx;
+}
+
+.kelei-item-active {
+  background-color: #feede1;
+  color: #f96712;
+}
+
+.submitButtonView {
+  margin: 30rpx;
+  text-align: center;
+  border-radius: 15rpx;
+  line-height: 80rpx;
+}
+
+.button-disabled {
+  color: white;
+  background-color: #d8d8d8;
+}
+
+.button-active {
+  color: white;
+  background: linear-gradient(#f79459, #f96622);
+}
+
+/*表单 end*/
+
+.uni-picker-tips {
+  font-size: 12px;
+  color: #666;
+  margin-bottom: 15px;
+  padding: 0 15px;
+}
+
+/*底部抽屉 报考方向内容 start*/
+.professionalCategoryPopup .professionalCategoryItem {
+  margin: 20rpx;
+  padding: 20rpx;
+  text-align: center;
+  border: 1rpx solid #f1f2f3;
+
+  .text {
+    margin: 0 auto;
+  }
+}
+
+.active {
+  background-color: #3e89fe;
+  color: white;
+  border-radius: 15rpx;
+}
+
+.professionalCategoryChildren .childrenItem {
+  margin: 20rpx;
+}
+
+/*底部抽屉 报考方向内容 end*/
+</style>

pages/zyb/user/bindPhone.vue

@@ -37,7 +37,7 @@ export default {
     /*绑定手机号*/
     bindPhone(){
       //先判断是否可绑定
-      request.get(ApiConstant.User.dyCheckBindPhone, {phone: this.userInputPhone},{showLoad:false}).then(r => {
+      request.post(ApiConstant.User.dyCheckBindPhone, {phone: this.userInputPhone},{showLoad:false}).then(r => {
         console.log(r)
         if (r.success) {
           if(r.result.status === 0){

pages/zyb/user/detail.vue

@@ -86,7 +86,7 @@ export default {
       <view class="item item-border">
         <view class="left">选考科目</view>
         <view class="right dark">
-          {{scoreInfo.cognitioPolyclinic}}
+          {{ scoreInfo.cognitioPolyclinic === '文科'?'历史组':'物理组' }}
         </view>
       </view>
       <view class="item">

pages/zyb/user/index.vue

@@ -1,15 +1,12 @@
 <script>
-import Request from '@/common/request'
+import Request from '@/common/request';
-import ApiConstant from "@/common/ApiConstant";
-import StaticConstant from "@/common/StaticConstant";
 import ImagesConstant from "@/common/ImagesConstant";
-import commonTool from "../../../common/js/commonTool";
+import commonTool from "@/common/js/commonTool";
-import NavImage from "../../template/nav-image/nav-image.vue";
 
 let request = new Request()
 export default {
   name: "user-index",
-  components: {NavImage},
+  components: {},
   computed: {
     commonTool() {
       return commonTool
@@ -17,12 +14,11 @@ export default {
     ImagesConstant() {
       return ImagesConstant
     },
-    StaticConstant() {
-      return StaticConstant
-    }
   },
   data() {
     return {
+		imId:'Shilo_',
+      systemName:'',
       avatar: ImagesConstant.systemIcon,
       userInfo: {},
       vipInfo: {},
@@ -121,7 +117,10 @@ export default {
     this.getScore()
   },
   onLoad() {
-
+    this.systemName = commonTool.getSystemName()
+    if(this.systemName === '体育志愿宝'){
+      this.playerType = '体育考生'
+    }
   },
   methods: {
     //获取成绩信息
@@ -179,9 +178,15 @@ export default {
           console.log('err', err);
         }
       });
-    }
+    },
+	imCallback(e) {
+	    console.log("跳转IM客服成功", e.detail);
+	},
+	onimError(e) {
+	    console.log("拉起IM客服失败", e.detail);
+	},
   }
-}
+}	
 </script>
 
 <template>
@@ -217,7 +222,7 @@ export default {
         </view>
         <view class="flex">
           <text style="line-height: 50rpx">{{ scoreInfo.province }}</text>
-          <text style="line-height: 50rpx;font-size: 24rpx">/2023</text>
+          <text style="line-height: 50rpx;font-size: 24rpx">/2024</text>
         </view>
       </view>
       <!--按钮-->
@@ -285,6 +290,16 @@ export default {
 
     </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>
@@ -297,7 +312,7 @@ export default {
           <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.cognitioPolyclinic ==='文科'?'历史组':'物理组' || '--' }}&nbsp;/</text>
             <text>&nbsp;{{ scoreInfo && scoreInfo.professionalCategory || '--' }}</text>
           </view>
         </view>
@@ -313,8 +328,9 @@ export default {
       <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" :open-type="item.type">
+			{{item.type}}
-            <button class='contact-btn' :open-type="item.type" data-im-id="Shilo_">a</button>
+          <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>
@@ -345,7 +361,7 @@ export default {
     <!---->
     <view class="uni-flex flex">
       <view class="flex-item-10" style="text-align: center;">
-        <text>{{ StaticConstant.systemName }}</text>
+        <text>{{ systemName }}</text>
       </view>
     </view>
   </view>
@@ -428,8 +444,8 @@ export default {
   position: absolute;
   width: 80%;
   background: salmon;
-  opacity: 0;
+  // opacity: 0;
-  border-radius: 0;
+  // border-radius: 0;
 }
 
 </style>

pages/zyb/vip/cardamom.vue

@@ -3,9 +3,8 @@
 import StaticConstant from "@/common/StaticConstant";
 import ApiConstant from "@/common/ApiConstant";
 import Request from '@/common/request'
-import user from "@/pages/zyb/user/index.vue";
+import commonTool from "@/common/js/commonTool";
-import commonTool from "../../../common/js/commonTool";
+import {stringIsNotEmpty} from "@/common/util";
-import {stringIsNotEmpty} from "../../../common/util";
 let request = new Request()
 export default {
   name: "cardamom",
@@ -16,9 +15,13 @@ export default {
   },
   data() {
     return {
+      playerType:'艺术类',
       userInputCardNum: '', // 卡账号
     }
   },
+  onLoad(){
+    this.playerType = commonTool.getPlayerType()
+  },
   methods: {
     bankcardInput(e) {
       setTimeout(() => {
@@ -84,7 +87,7 @@ export default {
     <view class="card-label">使用须知</view>
     <view class="card-body">
       <view class="text-body">
-        <text class="text-item">-适用范围:艺术类文理科考生(自主招生暂不适用)。</text>
+        <text class="text-item">-适用范围:{{playerType}}文理科考生(自主招生暂不适用)。</text>
         <text class="text-item">
           -使用期限:自购买起，截止到2024-08-31日有效。分数修改次数:每届服务期内高考分数放榜前每日可修改10次，放榜后仅可修改1次。
         </text>

pages/zyb/vip/checkoutCounter.vue

@@ -22,12 +22,14 @@ export default {
   },
   data() {
     return {
+      playerType: '艺术类',
       orderCode: '',//订单号
       totalAmount: '',//金额
       signStr:''
     }
   },
   onLoad(e) {
+    this.playerType = commonTool.getPlayerType()
     if (e.orderCode) {
       this.orderCode = e.orderCode
       this.getOrderDetail()
@@ -93,7 +95,7 @@ export default {
             setTimeout(function () {
               commonTool.reloadVipInfo()
               uni.showToast({title:'支付成功', icon: "none"});
-            }, 200)
+            }, 500)
             setTimeout(function () {
               uni.switchTab({
                 url: '/pages/zyb/home'
@@ -115,7 +117,7 @@ export default {
             setTimeout(function () {
               commonTool.reloadVipInfo()
               that.openPopup2()
-            }, 100)
+            }, 500)
           }else{
             uni.showToast({
               title: 1===code?'支付超时':2===code?'支付失败':3===code?'支付关闭':4===code?'支付取消':"支付失败",
@@ -184,9 +186,9 @@ export default {
       <view class="card">
         <text class="z-h6">使用须知</text>
         <view class="text-body">
-          <text class="text-item">适用考生：艺术类考生</text>
+          <text class="text-item">适用考生：{{playerType}}考生</text>
           <text class="text-item">使用专业类别：省内统考</text>
-          <text class="text-item">适用批次：艺考类本科及专科批</text>
+          <text class="text-item">适用批次：{{playerType}}本科及专科批</text>
           <text class="text-item">适用范围：河南省</text>
         </view>
       </view>

pages/zyb/vip/index.vue

@@ -113,7 +113,7 @@ export default {
       this.goto('/pages/zyb/vip/cardamom')
     },
     getSkuList() {
-      request.get(ApiConstant.VIP.skuList, {provider:uni.getStorageSync('providerpayment')}).then(r => {
+      request.post(ApiConstant.VIP.skuList, {provider:uni.getStorageSync('providerpayment')}).then(r => {
         console.log(r)
         if (r.success) {
           this.cardArray = r.result
@@ -283,7 +283,7 @@ export default {
           </checkbox-group>
           <view></view>
         </view>
-        <view class="flex-item-55 flex">
+        <view class="flex-item-55 flex" v-show="cardArray && cardArray.length>0">
           <view class="kmBtn radius8" @click="kaMi">卡密激活</view>
           <view class="ktBtn radius8" @click="pay">立即开通</view>
         </view>

uni_modules/mrsong-charts/components/mrsong-charts/uchart.config.js

@@ -42,13 +42,14 @@ export function initColumnData(options) {
 			"fontColor": "#666666",
 			"fontSize": 11,
 			"rotateLabel": true,
-			"itemCount": 4,
+
 			"padding": 10,
 			"margin": 10,
 			"boundaryGap": "center",
 			"disableGrid": true,
 			"gridColor": "#CCCCCC",
-			"gridType": "solid",
+			/*"itemCount": 4,
+			"gridType": "solid",*/
 			"dashLength": 4,
 			"gridEval": 1,
 			"type": 'grid',
@@ -183,7 +184,7 @@ export function initLineData() {
 			"boundaryGap": "center",
 			"disableGrid": true,
 			"gridColor": "#CCCCCC",
-			"gridType": "solid",
+			/*"gridType": "solid",*/
 			"dashLength": 4,
 			"gridEval": 1,
 			"type": 'grid',

uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/package.json

@@ -5,5 +5,8 @@
   "main": "index.js",
   "keywords": [],
   "author": "DCloud",
-  "license": "Apache-2.0"
+  "license": "Apache-2.0",
-}
+  "dependencies": {
+    "uni-config-center": "file:"
+  }
+}

uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/package.json

@@ -12,6 +12,7 @@
   "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_modules/uni-upgrade-center-app/uniCloud/cloudfunctions/checkVersion/package.json

@@ -1,7 +1,9 @@
 {
   "name": "checkVersion",
-  "dependencies": {},
+  "dependencies": {
+    "checkVersion": "file:"
+  },
   "extensions": {
     "uni-cloud-jql": {}
   }
-}
+}