Jelajahi Sumber

修改页面细节问题

空白格 3 tahun lalu
induk
melakukan
9694bbf225

+ 7 - 0
h5_web/common/apiurl.js

@@ -118,6 +118,13 @@ const apiurl = {
 		submitJobIntentionUrl: '/memberinfo/saveJobIntention',
 		// 保存自我评价
 		submitSelfAssessmentUrl: '/memberinfo/saveSelfAssessment'
+	},
+	/**
+	 * 我的评价
+	 */
+	evaluation: {
+		// 获取我的评价列表
+		getEvaluationListUrl: ''
 	}
 }
 

+ 3 - 2
h5_web/common/config.js

@@ -4,8 +4,9 @@
 let base = '';
 if(process.env.NODE_ENV=="development"){
 	base = 'https://wx.hw.hongweisoft.com/veterans/app';
-}else if(process.env.NODE_ENV=="production"){
-	base = 'https://veterwebpro.hw.hongweisoft.com/veterans-prod-api/app';
+} else if(process.env.NODE_ENV=="production"){
+	base = 'https://wx.hw.hongweisoft.com/veterans/app';
+	// base = 'https://veterwebpro.hw.hongweisoft.com/veterans-prod-api/app';
 }
 // console.log('base',base);
 const config = {

+ 8 - 1
h5_web/common/http.api.js

@@ -108,11 +108,17 @@ const install = (Vue, vm) => {
 	let interview = {
 		getInterviewList: (params = {}) => vm.$u.get(apiurl.interview.getInterviewListUrl, params)
 	};
+	
 	// 我的简历
 	let resume = {
 		submitJobIntention: (params = {}) => vm.$u.put(apiurl.resume.submitJobIntentionUrl, params),
 		submitSelfAssessment: (params = {}) => vm.$u.put(apiurl.resume.submitSelfAssessmentUrl, params)
 	}
+	
+	// 我的评价
+	let evaluation = {
+		getEvaluationList: (params = {}) => vm.$u.get(apiurl.evaluation.getEvaluationListUrl, params)
+	}
 	// 将各个定义的接口名称,统一放进对象挂载到vm.$u.api(因为vm就是this,也即this.$u.api)下
 	vm.$u.api = {
 		test,
@@ -146,7 +152,8 @@ const install = (Vue, vm) => {
     recruitment,
 		interview,
 		resume,
-		modifyUserInfo
+		modifyUserInfo,
+		evaluation
 	};
 }
 

+ 1 - 1
h5_web/common/http.interceptor.js

@@ -12,7 +12,7 @@ const install = (Vue, vm) => {
 		dataType: 'json',
 		showLoading: true, // 是否显示请求中的loading
 		loadingText: '请求中...', // 请求loading中的文字提示
-		loadingTime: 800, // 在此时间内,请求还没回来的话,就显示加载中动画,单位ms
+		loadingTime: 100, // 在此时间内,请求还没回来的话,就显示加载中动画,单位ms
 		originalData: false, // 是否在拦截器中返回服务端的原始数据
 		loadingMask: true, // 展示loading的时候,是否给一个透明的蒙层,防止触摸穿透
 		// 配置请求头信息

+ 401 - 398
h5_web/pages.json

@@ -1,428 +1,431 @@
 {
-  "easycom": {
-    "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
-  },
-  "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
-    {
-      "path": "pages/index/index",
-      "style": {
-        "navigationStyle": "custom", // 隐藏系统导航栏
-        "navigationBarTitleText": "首页"
-      }
-    }, {
-      "path": "pages/mycode/mycode",
-      "style": {
-        "navigationBarTitleText": "退役军人码"
-      }
+	"easycom": {
+		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
+	},
+	"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
+		{
+			"path": "pages/index/index",
+			"style": {
+				"navigationStyle": "custom", // 隐藏系统导航栏
+				"navigationBarTitleText": "首页"
+			}
+		}, {
+			"path": "pages/mycode/mycode",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "退役军人码"
+			}
 
-    },
-    {
-      "path": "pages/authentication/authentication",
-      "style": {
-        "navigationBarTitleText": "退役军人职业教育码申请"
-      }
+		},
+		{
+			"path": "pages/authentication/authentication",
+			"style": {
+				"navigationBarTitleText": "退役军人职业教育码申请"
+			}
 
-    },
-    {
-      "path": "pages/phoneLogin/phoneLogin",
-      "style": {
-        "navigationStyle": "custom",
-        "navigationBarTitleText": "手机登录"
-      }
-    },
-    {
-      "path": "pages/bannerDetails/bannerDetails",
-      "style": {
-        "navigationBarTitleText": "详情页"
-      }
+		},
+		{
+			"path": "pages/phoneLogin/phoneLogin",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "手机登录"
+			}
+		},
+		{
+			"path": "pages/bannerDetails/bannerDetails",
+			"style": {
+				"navigationBarTitleText": "详情页"
+			}
 
-    }, {
-      "path": "pages/policyNews/policyNews",
-      "style": {
-        "navigationBarTitleText": "政策资讯"
+		}, {
+			"path": "pages/policyNews/policyNews",
+			"style": {
+				"navigationBarTitleText": "政策资讯"
 
-      }
+			}
 
-    }, {
-      "path": "pages/policyNewsDetails/policyNewsDetails",
-      "style": {
-        "navigationBarTitleText": "文章详情"
+		}, {
+			"path": "pages/policyNewsDetails/policyNewsDetails",
+			"style": {
+				"navigationBarTitleText": "文章详情"
 
-      }
-    }, {
-      "path": "pages/newsDetails/newsDetails",
-      "style": {
-        "navigationBarTitleText": "新闻详情",
-        "navigationBarBackgroundColor": "#3D5D4C",
-        "navigationBarTextStyle": "white"
-      }
-    },
-    {
-      "path": "pages/login/code",
-      "style": {
-        "navigationBarTitleText": "验证码"
-      }
-    },
-    {
-      "path": "pages/mine/mine",
-      "style": {
-        "navigationBarTitleText": "个人中心",
-        "navigationStyle": "custom"
-      }
+			}
+		}, {
+			"path": "pages/newsDetails/newsDetails",
+			"style": {
+				"navigationBarTitleText": "新闻详情",
+				"navigationBarBackgroundColor": "#3D5D4C",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/login/code",
+			"style": {
+				"navigationBarTitleText": "验证码"
+			}
+		},
+		{
+			"path": "pages/mine/mine",
+			"style": {
+				"navigationBarTitleText": "个人中心",
+				"navigationStyle": "custom"
+			}
 
-    },
-    {
-      "path": "pages/center/center",
-      "style": {
-        "navigationBarTitleText": "中心",
-        "enablePullDownRefresh": false
-      }
+		},
+		{
+			"path": "pages/center/center",
+			"style": {
+				"navigationBarTitleText": "中心",
+				"enablePullDownRefresh": false
+			}
 
-    }, {
-      "path": "pages/privacyPolicy/privacyPolicy",
-      "style": {
-        "navigationBarTitleText": "隐私政策"
-      }
-    }, {
-      "path": "pages/schools/schools",
-      "style": {
-        "navigationBarTitleText": "学院列表",
-        "navigationBarBackgroundColor": "#3D5D4C",
-        "navigationBarTextStyle": "white"
-      }
-    }, {
-      "path": "pages/skillsTraining/skillsTraining",
-      "style": {
-        "navigationBarTitleText": "技能培训"
-      }
-    }, {
-      "path": "pages/basicTraining/basicTraining",
-      "style": {
-        "navigationBarTitleText": "适应性培训"
-      }
-    }, {
-      "path": "pages/basicTraining/myBasicTraining/myBasicTraining",
-      "style": {
-        "navigationBarTitleText": "我的适应性培训"
-      }
-    }, {
-      "path": "pages/basicTraining/basicTrainingDetails/basicTrainingDetails",
-      "style": {
-        "navigationBarTitleText": "在线上课"
-      }
-    }, {
-      "path": "pages/upgrade/upgrade",
-      "style": {
-        "navigationBarTitleText": "学历提升"
-      }
-    }, {
-      "path": "pages/inbuild/inbuild",
-      "style": {
-        "navigationBarTitleText": "建设中"
-      }
-    }, {
-      "path": "pages/recruitment/recruitment",
-      "style": {
-        "navigationStyle": "custom",
-        "navigationBarTitleText": "招聘就业"
-      }
-    }, {
-      "path": "pages/myResume/myResume",
-      "style": {
-        "navigationBarTitleText": "简历",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3D5D4C",
-        "navigationBarTextStyle": "white"
-      }
-    }, {
-      "path": "pages/myResume/addExperience",
-      "style": {
-        "navigationBarTitleText": "添加工作经历",
-        "enablePullDownRefresh": false,
-        "navigationStyle": "custom"
-      }
-    },
-    {
-      "path": "pages/myResume/addEducation",
-      "style": {
-        "navigationBarTitleText": "添加培训与教育经历",
-        "enablePullDownRefresh": false,
-        "navigationStyle": "custom"
-      }
-    },
-    {
-      "path": "pages/dynamicTracking/dynamicTracking",
-      "style": {
-        "navigationBarTitleText": "全链条动态跟踪",
-        "enablePullDownRefresh": false
-      }
+		}, {
+			"path": "pages/privacyPolicy/privacyPolicy",
+			"style": {
+				"navigationBarTitleText": "隐私政策"
+			}
+		}, {
+			"path": "pages/schools/schools",
+			"style": {
+				"navigationBarTitleText": "学院列表",
+				"navigationBarBackgroundColor": "#3D5D4C",
+				"navigationBarTextStyle": "white"
+			}
+		}, {
+			"path": "pages/skillsTraining/skillsTraining",
+			"style": {
+				"navigationBarTitleText": "技能培训"
+			}
+		}, {
+			"path": "pages/basicTraining/basicTraining",
+			"style": {
+				"navigationBarTitleText": "适应性培训"
+			}
+		}, {
+			"path": "pages/basicTraining/myBasicTraining/myBasicTraining",
+			"style": {
+				"navigationBarTitleText": "我的适应性培训"
+			}
+		}, {
+			"path": "pages/basicTraining/basicTrainingDetails/basicTrainingDetails",
+			"style": {
+				"navigationBarTitleText": "在线上课"
+			}
+		}, {
+			"path": "pages/upgrade/upgrade",
+			"style": {
+				"navigationBarTitleText": "学历提升"
+			}
+		}, {
+			"path": "pages/inbuild/inbuild",
+			"style": {
+				"navigationBarTitleText": "建设中"
+			}
+		}, {
+			"path": "pages/recruitment/recruitment",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "招聘就业"
+			}
+		}, {
+			"path": "pages/myResume/myResume",
+			"style": {
+				"navigationBarTitleText": "简历",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3D5D4C",
+				"navigationBarTextStyle": "white"
+			}
+		}, {
+			"path": "pages/myResume/addExperience",
+			"style": {
+				"navigationBarTitleText": "添加工作经历",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/myResume/addEducation",
+			"style": {
+				"navigationBarTitleText": "添加培训与教育经历",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/dynamicTracking/dynamicTracking",
+			"style": {
+				"navigationBarTitleText": "全链条动态跟踪",
+				"enablePullDownRefresh": false
+			}
 
-    }, {
-      "path": "pages/personalModify/personalModify",
-      "style": {
-        "navigationBarTitleText": "个人资料修改",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3D5D4C",
-        "navigationBarTextStyle": "white"
-      }
-    }, {
-      "path": "pages/schools/schools",
-      "style": {
-        "navigationBarTitleText": "学院列表",
-        "navigationBarBackgroundColor": "#3D5D4C",
-        "navigationBarTextStyle": "white"
-      }
-    }, {
-      "path": "pages/skillsTraining/skillsTraining",
-      "style": {
-        "navigationBarTitleText": "技能培训"
-      }
-    }, {
-      "path": "pages/basicTraining/basicTraining",
-      "style": {
-        "navigationBarTitleText": "适应性培训"
-      }
-    }, {
-      "path": "pages/basicTraining/myBasicTraining/myBasicTraining",
-      "style": {
-        "navigationBarTitleText": "我的适应性培训"
-      }
-    }, {
-      "path": "pages/basicTraining/basicTrainingDetails/basicTrainingDetails",
-      "style": {
-        "navigationBarTitleText": "在线上课"
-      }
-    }, {
-      "path": "pages/upgrade/upgrade",
-      "style": {
-        "navigationBarTitleText": "学历提升"
-      }
-    }, {
-      "path": "pages/inbuild/inbuild",
-      "style": {
-        "navigationBarTitleText": "建设中"
-      }
-    }, {
-      "path": "pages/recruitment/recruitment",
-      "style": {
-        "navigationStyle": "custom",
-        "navigationBarTitleText": "招聘就业"
-      }
-    }, {
-      "path": "pages/myResume/myResume",
-      "style": {
-        "navigationBarTitleText": "简历",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#2a82e4",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "pages/personalModify/personalModify",
+			"style": {
+				"navigationBarTitleText": "个人资料修改",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3D5D4C",
+				"navigationBarTextStyle": "white"
+			}
+		}, {
+			"path": "pages/schools/schools",
+			"style": {
+				"navigationBarTitleText": "学院列表",
+				"navigationBarBackgroundColor": "#3D5D4C",
+				"navigationBarTextStyle": "white"
+			}
+		}, {
+			"path": "pages/skillsTraining/skillsTraining",
+			"style": {
+				"navigationBarTitleText": "技能培训"
+			}
+		}, {
+			"path": "pages/basicTraining/basicTraining",
+			"style": {
+				"navigationBarTitleText": "适应性培训"
+			}
+		}, {
+			"path": "pages/basicTraining/myBasicTraining/myBasicTraining",
+			"style": {
+				"navigationBarTitleText": "我的适应性培训"
+			}
+		}, {
+			"path": "pages/basicTraining/basicTrainingDetails/basicTrainingDetails",
+			"style": {
+				"navigationBarTitleText": "在线上课"
+			}
+		}, {
+			"path": "pages/upgrade/upgrade",
+			"style": {
+				"navigationBarTitleText": "学历提升"
+			}
+		}, {
+			"path": "pages/inbuild/inbuild",
+			"style": {
+				"navigationBarTitleText": "建设中"
+			}
+		}, {
+			"path": "pages/recruitment/recruitment",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "招聘就业"
+			}
+		}, {
+			"path": "pages/myResume/myResume",
+			"style": {
+				"navigationBarTitleText": "简历",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#2a82e4",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "pages/dynamicTracking/dynamicTracking",
-      "style": {
-        "navigationBarTitleText": "全链条动态跟踪",
-        "enablePullDownRefresh": false
-      }
+		}, {
+			"path": "pages/dynamicTracking/dynamicTracking",
+			"style": {
+				"navigationBarTitleText": "全链条动态跟踪",
+				"enablePullDownRefresh": false
+			}
 
-    }, {
-      "path": "pages/personalModify/personalModify",
-      "style": {
-        "navigationBarTitleText": "个人资料修改",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#fff"
-      }
+		}, {
+			"path": "pages/personalModify/personalModify",
+			"style": {
+				"navigationBarTitleText": "个人资料修改",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#fff"
+			}
 
-    }, {
-      "path": "pages/evaluationIntention/evaluationIntention",
-      "style": {
-        "navigationBarTitleText": "求职意向自我评价",
-        "enablePullDownRefresh": false,
-        "navigationStyle": "custom"
-      }
+		}, {
+			"path": "pages/evaluationIntention/evaluationIntention",
+			"style": {
+				"navigationBarTitleText": "求职意向自我评价",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
 
-    }, {
-      "path": "pages/myDelivery/myDelivery",
-      "style": {
-        "navigationBarTitleText": "我的投递",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3D5D4C",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "pages/myDelivery/myDelivery",
+			"style": {
+				"navigationBarTitleText": "我的投递",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3D5D4C",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "pages/myInterview/myInterview",
-      "style": {
-        "navigationBarTitleText": "我的面试",
-        "enablePullDownRefresh": false
-      }
+		}, {
+			"path": "pages/myInterview/myInterview",
+			"style": {
+				"navigationBarTitleText": "我的面试",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3D5D4C",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "pages/mySkillsTraining/mySkillsTraining",
-      "style": {
-        "navigationBarTitleText": "我的技能培训",
-        "enablePullDownRefresh": false
-      }
+		}, {
+			"path": "pages/mySkillsTraining/mySkillsTraining",
+			"style": {
+				"navigationBarTitleText": "我的技能培训",
+				"enablePullDownRefresh": false
+			}
 
-    }, {
-      "path": "pages/myEvaluation/myEvaluation",
-      "style": {
-        "navigationBarTitleText": "我的评价",
-        "enablePullDownRefresh": false,
+		}, {
+			"path": "pages/myEvaluation/myEvaluation",
+			"style": {
+				"navigationBarTitleText": "我的评价",
+				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#3D5D4C",
 				"navigationBarTextStyle": "white"
-      }
+			}
 
-    }, {
-      "path": "pages/setting/setting",
-      "style": {
-        "navigationBarTitleText": "设置",
-        "enablePullDownRefresh": false
-      }
+		}, {
+			"path": "pages/setting/setting",
+			"style": {
+				"navigationBarTitleText": "设置",
+				"enablePullDownRefresh": false
+			}
 
-    }, {
-      "path": "pages/progressiveIntegral/progressiveIntegral",
-      "style": {
-        "navigationBarTitleText": "进步积分",
-        "enablePullDownRefresh": false,
-        "navigationStyle": "custom"
-      }
+		}, {
+			"path": "pages/progressiveIntegral/progressiveIntegral",
+			"style": {
+				"navigationBarTitleText": "进步积分",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
 
-    }, {
-      "path": "pages/cooperativeEnterprise/cooperativeEnterprise",
-      "style": {
-        "navigationBarTitleText": "企业列表",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3D5D4C",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "pages/cooperativeEnterprise/cooperativeEnterprise",
+			"style": {
+				"navigationBarTitleText": "企业列表",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3D5D4C",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "pages/businessDetails/businessDetails",
-      "style": {
-        "navigationBarTitleText": "企业详情",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#fff",
-        "backgroundColor": "#f2f2f2"
-      }
+		}, {
+			"path": "pages/businessDetails/businessDetails",
+			"style": {
+				"navigationBarTitleText": "企业详情",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#fff",
+				"backgroundColor": "#f2f2f2"
+			}
 
-    }, {
-      "path": "pages/jobDetails/jobDetails",
-      "style": {
-        "navigationBarTitleText": "职位详情",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3D5D4C",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "pages/jobDetails/jobDetails",
+			"style": {
+				"navigationBarTitleText": "职位详情",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3D5D4C",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "pages/resumeDeliveryResults/resumeDeliveryResults",
-      "style": {
-        "navigationBarTitleText": "简历投递结果",
-        "enablePullDownRefresh": false,
-        "navigationStyle": "custom"
-      }
+		}, {
+			"path": "pages/resumeDeliveryResults/resumeDeliveryResults",
+			"style": {
+				"navigationBarTitleText": "简历投递结果",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
 
-    }, {
-      "path": "pages/applyEducationCode/applyEducationCode",
-      "style": {
-        "navigationBarTitleText": "退役军人职业教育码申请",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3D5D4C",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "pages/applyEducationCode/applyEducationCode",
+			"style": {
+				"navigationBarTitleText": "退役军人职业教育码申请",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3D5D4C",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "pages/applyEducationCode/applyEducationSuccess",
-      "style": {
-        "navigationBarTitleText": "退役军人职业教育码申请",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3D5D4C",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "pages/applyEducationCode/applyEducationSuccess",
+			"style": {
+				"navigationBarTitleText": "退役军人职业教育码申请",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3D5D4C",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "pages/newsInformation/newsInformation",
-      "style": {
-        "navigationBarTitleText": "新闻动态",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3D5D4C",
-        "navigationBarTextStyle": "white"
-      }
+		}, {
+			"path": "pages/newsInformation/newsInformation",
+			"style": {
+				"navigationBarTitleText": "新闻动态",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3D5D4C",
+				"navigationBarTextStyle": "white"
+			}
 
-    }, {
-      "path": "pages/schoolDetails/schoolDetails",
-      "style": {
-        "navigationBarTitleText": "学校详情",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#fff"
-      }
-    }, {
-      "path": "pages/professionalDetails/professionalDetails",
-      "style": {
-        "navigationBarTitleText": "专业详情",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3D5D4C",
-        "navigationBarTextStyle": "white"
-      }
-    }, {
-      "path": "pages/policyInfo/policyInfo",
-      "style": {
-        "navigationBarTitleText": "政策资讯",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3D5D4C",
-        "navigationBarTextStyle": "white"
-      }
-    }, {
-      "path": "pages/notification/notification",
-      "style": {
-        "navigationBarTitleText": "消息通知",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3D5D4C",
-        "navigationBarTextStyle": "white"
-      }
-    }, {
-      "path": "pages/questionConsulting/questionConsulting",
-      "style": {
-        "navigationBarTitleText": "问题咨询",
-        "enablePullDownRefresh": false,
-        "navigationStyle": "custom"
-      }
-    }, {
-      "path": "pages/policyInfo/policyInfoDetails",
-      "style": {
-        "navigationBarTitleText": "政策资讯详情",
-        "enablePullDownRefresh": false,
-        "navigationBarBackgroundColor": "#3D5D4C",
-        "navigationBarTextStyle": "white"
-      }
-    }
-  ],
-  "globalStyle": {
-    "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "uni-app",
-    "navigationBarBackgroundColor": "#F2F2F2",
-    "backgroundColor": "#F2F2F2"
-  },
-  "tabBar": {
-    "color": "#909399",
-    "selectedColor": "#303133",
-    "borderStyle": "black",
-    "backgroundColor": "#ffffff",
-    "list": [{
-      "pagePath": "pages/index/index",
-      "iconPath": "static/icons/index-gray.png",
-      "selectedIconPath": "static/icons/index.png",
-      "text": "首页"
-    }, {
-      "pagePath": "pages/mycode/mycode",
-      "iconPath": "static/icons/code-gray.png",
-      "selectedIconPath": "static/icons/code.png",
-      "text": "退役军人码"
-    }, {
-      "pagePath": "pages/mine/mine",
-      "iconPath": "static/icons/mine-gray.png",
-      "selectedIconPath": "static/icons/mine.png",
-      "text": "我"
-    }]
-  }
+		}, {
+			"path": "pages/schoolDetails/schoolDetails",
+			"style": {
+				"navigationBarTitleText": "学校详情",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#fff"
+			}
+		}, {
+			"path": "pages/professionalDetails/professionalDetails",
+			"style": {
+				"navigationBarTitleText": "专业详情",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3D5D4C",
+				"navigationBarTextStyle": "white"
+			}
+		}, {
+			"path": "pages/policyInfo/policyInfo",
+			"style": {
+				"navigationBarTitleText": "政策资讯",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3D5D4C",
+				"navigationBarTextStyle": "white"
+			}
+		}, {
+			"path": "pages/notification/notification",
+			"style": {
+				"navigationBarTitleText": "消息通知",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3D5D4C",
+				"navigationBarTextStyle": "white"
+			}
+		}, {
+			"path": "pages/questionConsulting/questionConsulting",
+			"style": {
+				"navigationBarTitleText": "问题咨询",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		}, {
+			"path": "pages/policyInfo/policyInfoDetails",
+			"style": {
+				"navigationBarTitleText": "政策资讯详情",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3D5D4C",
+				"navigationBarTextStyle": "white"
+			}
+		}
+	],
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "uni-app",
+		"navigationBarBackgroundColor": "#F2F2F2",
+		"backgroundColor": "#F2F2F2"
+	},
+	"tabBar": {
+		"color": "#909399",
+		"selectedColor": "#303133",
+		"borderStyle": "black",
+		"backgroundColor": "#ffffff",
+		"list": [{
+			"pagePath": "pages/index/index",
+			"iconPath": "static/icons/index-gray.png",
+			"selectedIconPath": "static/icons/index.png",
+			"text": "首页"
+		}, {
+			"pagePath": "pages/mycode/mycode",
+			"iconPath": "static/icons/code-gray.png",
+			"selectedIconPath": "static/icons/code.png",
+			"text": "退役军人码"
+		}, {
+			"pagePath": "pages/mine/mine",
+			"iconPath": "static/icons/mine-gray.png",
+			"selectedIconPath": "static/icons/mine.png",
+			"text": "我"
+		}]
+	}
 }

+ 4 - 4
h5_web/pages/mine/mine.vue

@@ -18,7 +18,7 @@
 				</view>
 				<view class="mine-info-header-right" @click="jumpPage('/pages/progressiveIntegral/progressiveIntegral')">
 					<view>进步<br/>积分</view>
-					<view>688</view>
+					<view>0</view>
 					<u-icon name="arrow-right" color="#fff" size="30"/>
 				</view>
 			</view>
@@ -40,15 +40,15 @@
 			<!-- 个人获得 -->
 			<view class="mine-info-gain">
 				<view class="mine-info-gain-item">
-					<view>8<text>个</text></view>
+					<view>0<text>个</text></view>
 					<view>技能培训</view>
 				</view>
 				<view class="mine-info-gain-item">
-					<view>68.5<text>小时</text></view>
+					<view>0<text>小时</text></view>
 					<view>学习时长</view>
 				</view>
 				<view class="mine-info-gain-item">
-					<view>10<text>次</text></view>
+					<view>0<text>次</text></view>
 					<view>获得面试</view>
 				</view>
 			</view>

+ 0 - 159
h5_web/pages/mine/mine1.vue

@@ -1,159 +0,0 @@
-<template>
-	<view class="mine">
-		<u-navbar :is-back="false" title=" " :border-bottom="false">
-			<view class="u-flex u-row-right" style="width: 100%;">
-				<!-- <view class="camera u-flex u-row-center">
-					<u-icon name="camera-fill" color="#000000" size="48"></u-icon>
-				</view> -->
-			</view>
-		</u-navbar>
-		<view class="u-flex user-box u-p-l-30 u-p-r-20 u-p-b-30">
-			<view class="u-m-r-10">
-				<u-avatar :src="memberinfo.avatar||pic" size="140"></u-avatar>
-			</view>
-			<view class="u-flex-1">
-				<view class="u-font-18 u-p-b-20">{{memberinfo.name}}</view>
-				<view class="u-font-14 u-tips-color">
-				军人认证状态:
-				{{memberinfo.auditStatus|verifyStatusFilter}}
-				<text v-if="memberinfo.auditStatus==1||memberinfo.auditStatus==9" @click="openPage('pages/authentication/authentication')" style="margin-left: 24rpx;">去认证</text>
-			</view>
-			</view>
-			<view class="u-m-l-10 u-p-10">
-				<u-icon name="arrow-right" color="#969799" size="28" @click="openPage('pages/inbuild/inbuild','个人信息')"></u-icon>
-			</view>
-		</view>
-		<view class="mine-todo u-flex u-row-between">
-			<view class="mine-todo-item" @click="openPage('pages/inbuild/inbuild','我的投递')">
-				<view class="num">25</view>
-				<view class="text">我的投递</view>
-			</view>
-			<view class="mine-todo-item" @click="openPage('pages/inbuild/inbuild','我的面试')">
-				<view class="num">18</view>
-				<view class="text">我的面试</view>
-			</view>
-			<view class="mine-todo-item" @click="openPage('pages/inbuild/inbuild','关注企业')">
-				<view class="num">6</view>
-				<view class="text">关注企业</view>
-			</view>
-			<view class="mine-todo-item" @click="openPage('pages/inbuild/inbuild','消息通知')">
-				<view class="num">8</view>
-				<view class="text">消息通知</view>
-			</view>
-		</view>
-		
-		<view class="u-m-t-20">
-			<u-cell-group>
-				<u-cell-item icon="order" title="电子简历" @click="openPage('pages/inbuild/inbuild','电子简历')" ></u-cell-item>
-				<u-cell-item icon="heart" title="求职意向" @click="openPage('pages/inbuild/inbuild','求职意向')"></u-cell-item>
-			</u-cell-group>
-		</view>
-		
-		<view class="u-m-t-20">
-			<u-cell-group>
-				<u-cell-item icon="cut" title="我的技能培训" @click="openPage('pages/inbuild/inbuild','我的技能培训')"></u-cell-item>
-				<u-cell-item icon="photo" title="我的学历提升" @click="openPage('pages/inbuild/inbuild','我的学历提升')"></u-cell-item>
-				<u-cell-item icon="coupon" title="我的适应性培训" @click="openPage('pages/basicTraining/myBasicTraining/myBasicTraining')"></u-cell-item>
-				<u-cell-item icon="edit-pen" title="我的考试考核" @click="openPage('pages/inbuild/inbuild','我的考试考核')"></u-cell-item>
-				<u-cell-item icon="android-circle-fill" title="我的班级" @click="openPage('pages/inbuild/inbuild','我的班级')"></u-cell-item>
-				<u-cell-item icon="file-text" title="行为积分" @click="openPage('pages/inbuild/inbuild','行为积分')"></u-cell-item>
-			</u-cell-group>
-		</view>
-		
-		<view class="u-m-t-20">
-			<u-cell-group>
-				<u-cell-item icon="setting" title="设置" @click="openPage('pages/inbuild/inbuild','设置')"></u-cell-item>
-				<u-cell-item icon="level" title="注销登录" @click="loginOut"></u-cell-item>
-			</u-cell-group>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				pic:'/static/img/default-avatar.png',
-				show:true,
-				veteEducStatus:null,
-				memberinfo:[],
-			}
-		},
-		onLoad() {
-			
-			// this.veteEducCheck();
-		},
-		onShow() {
-			this.getmemberinfo();
-		},
-		filters: {
-		  verifyStatusFilter(value) {
-			if (value === 0) {
-			  return '审核中';
-			}else if(value === 1){
-				return '不通过';
-			}else if(value === 2){
-				return '通过';
-			}else if(value === 9){
-				return '未认证';
-			} else {
-			  return '未知';
-			}
-		  },
-		},
-		methods: {
-			openPage(path,msg) {
-			  this.$u.route({
-			    url: path,
-				params:{
-					msg:msg
-				}
-			  })
-			},
-			veteEducCheck(){
-				this.$u.api.getVeteEducCheck().then(res=>{
-					// console.log('res',res);
-					this.veteEducStatus = res.data;
-				})
-			},
-			getmemberinfo(){
-				this.$u.api.getmemberinfo().then(res=>{
-					this.memberinfo = res.data;
-					console.log('this.memberinfo',JSON.parse(JSON.stringify(this.memberinfo)));
-				})
-			},
-			loginOut(){
-				let that = this;
-				this.$u.vuex('vuex_hasLogin', false);
-				this.$u.vuex('vuex_token', '');
-				this.$u.vuex('vuex_user', '');
-				this.$u.route('/pages/phoneLogin/phoneLogin');
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-page{
-	background-color: #ededed;	
-}
-
-.camera{
-	width: 54px;
-	height: 44px;
-	
-	&:active{
-		background-color: #ededed;
-	}
-}
-.user-box{
-	background-color: #fff;
-}
-.mine /deep/ .u-cell_title{font-size: 30rpx;}
-.mine /deep/ .u-iconfont{font-size: 45rpx!important;}
-.mine-todo{
-	background-color: #fff;
-	text-align: center;
-	padding: 0 24rpx 24rpx;
-}
-</style>

+ 31 - 4
h5_web/pages/myEvaluation/myEvaluation.vue

@@ -25,6 +25,7 @@
 				</view>
 			</view>
 		</z-paging>
+		<u-toast ref="uToast" />
 	</view>
 </template>
 
@@ -37,11 +38,37 @@
 			}
 		},
 		methods: {
+			/**
+			 * 获取我的评价列表
+			 * @param { Number } pageNum
+			 * @param { Number } pageSize
+			 */
+			getList(pageNum, pageSize) {
+				this.$u.api.evaluation.getEvaluationList({ pageNum, pageSize }).then(res => {
+					if (res.code === 200) {
+						this.$refs.paging.complete(res.rows)
+					} else {
+						this.$refs.paging.complete([])
+						this.$refs.uToast.show({
+							title: err.msg,
+							type: 'error'
+						})
+					}
+				}).catch(() => {
+					this.$refs.paging.complete([])
+					this.$refs.uToast.show({
+						title: '程序错误!',
+						type: 'error'
+					})
+				})
+			},
+			/**
+			 * 下拉刷新组件触发
+			 * @param { Number } pageNo
+			 * @param { Number } pageSize
+			 */
 			queryList(pageNo, pageSize) {
-				this.$refs.paging.complete([
-					{ title: '汽车检测与维修技能课程1', src: require('../../static/img/major-工商企业管理.png'), name: '李立萍', star: 4, date: '2021-07-21', remark: '老师给人感觉很专业,学习过程轻松愉快。' },
-					{ title: '汽车检测与维修技能课程1', src: require('../../static/img/major-工商企业管理.png'), name: '李立萍', star: 4, date: '2021-07-21', remark: '老师给人感觉很专业,学习过程轻松愉快。' }
-				])
+				this.getList(pageNo, pageSize)
 			}
 		}
 	}

+ 84 - 67
h5_web/pages/myInterview/myInterview.scss

@@ -1,102 +1,119 @@
 /* 我的面试 */
 .interview {
+	min-height: calc(100vh - 44px);
+	background-color: #F2F2F2;
+	font-family: 'PingFangSC-Regular, PingFang SC';
+	
 	&-list {
-		padding: 44rpx 40rpx;
+		padding: 26rpx 30rpx;
+		
 		&-item {
-			border: solid 1px #e5e5e5;
-			border-radius: 24rpx;
-			padding: 24rpx 32rpx;
-			margin-bottom: 30rpx;
-			&-status {
-				color: #505050;
+			border-radius: 10rpx;
+			background-color: #fff;
+			padding: 30rpx 32rpx;
+			margin-bottom: 20rpx;
+			
+			&-title {
 				font-size: 32rpx;
-				font-weight: bold;
-				margin-bottom: 16rpx;
+				color: #000;
+				display: flex;
+				align-items: center;
+				
+				image {
+					width: 24rpx;
+					height: 24rpx;
+					margin-left: 10rpx;
+				}
 			}
-			&-time {
-				color: #2a82e4;
-				font-size: 48rpx;
-				margin-bottom: 16rpx;
+			
+			&-date {
+				color: #028DFE;
+				font-size: 50rpx;
+				font-weight: 600;
+				line-height: 70rpx;
 			}
-			&-address {
-				font-size: 28rpx;
-				color: #505050;
-				margin-bottom: 40rpx;
+			
+			&-way {
+				font-size: 22rpx;
+				color: #9B9B9B;
+				margin-bottom: 22rpx;
 			}
-			&-company {
+			
+			&-position {
 				display: flex;
 				justify-content: space-between;
+				
 				.left {
 					display: flex;
+					align-items: center;
+					
 					image {
-						width: 102rpx;
-						height: 102rpx;
-						border-radius: 10rpx;
-						border: solid 1px #f2f2f2;
-						margin-right: 38rpx;
+						width: 98rpx;
+						height: 98rpx;
+						border-radius: 6rpx;
+						margin-right: 22rpx;
 					}
-					&-info {
-						color: #a6a6a6;
-						font-size: 22rpx;
+					
+					.info {
+						color: #9B9B9B;
+						font-size: 24rpx;
+						line-height: 40rpx;
 						view {
-							line-height: 40rpx;
 							&:first-child {
-								color: #383838;
-								font-weight: bold;
-								font-size: 28rpx;
+								color: #000;
+								font-size: 32rpx;
 							}
 						}
 					}
 				}
+				
 				.right {
-					text-align: right;
 					view {
-						font-size: 22rpx;
+						font-size: 24rpx;
+						color: #9B9B9B;
+						text-align: right;
 						&:first-child {
-							color: #ff5733;
-						}
-						&:last-child {
-							margin-top: 10rpx;
-							color: #a6a6a6;
+							color: #EF651F;
+							margin-bottom: 12rpx;
 						}
 					}
 				}
 			}
-			&-btn {
-				.single-btn {
-					color: #fff;
-					font-size: 32rpx;
-					border-radius: 46rpx;
-					text-align: center;
+			
+			&-button {
+				margin-top: 52rpx;
+				.btn {
+					width: 100%;
 					height: 80rpx;
 					line-height: 80rpx;
-					margin-top: 52rpx;
+					text-align: center;
+					font-size: 30rpx;
+					color: rgba(255, 255, 255, 0.8);
 				}
-				.not-arrive {
-					background-color: #a6a6a6;
+				.submit {
+					background-color: #028DFE;
 				}
-				.arrive {
-					background-color: #2a82e4;
+				.not {
+					background-color: #D2D2D2;
 				}
-				.double-btn {
-					display: flex;
-					justify-content: space-between;
-					view {
-						width: 280rpx;
-						height: 80rpx;
-						line-height: 80rpx;
-						text-align: center;
-						font-size: 36rpx;
-						border-radius: 46rpx;
-						margin-top: 52rpx;
-						&:first-child {
-							background-color: #2a82e4;
-							color: #fff;
-						}
-						&:last-child {
-							border: solid 1px #2a82e4;
-							color: #2a82e4;
-						}
+			}
+			
+			.double {
+				display: flex;
+				justify-content: space-between;
+				.btn {
+					width: 280rpx;
+					height: 80rpx;
+					line-height: 80rpx;
+					text-align: center;
+					font-size: 30rpx;
+					&:first-child {
+						background-color: #028DFE;
+						color: #fff;
+					}
+					&:last-child {
+						border: solid 1px #028DFE;
+						color: #028DFE;
 					}
 				}
 			}

+ 35 - 25
h5_web/pages/myInterview/myInterview.vue

@@ -6,38 +6,48 @@
 			v-model="interviewList"
 			@query="queryList"
 		>
-		<view class="interview-list">
-			<view class="interview-list-item" v-for="(item, index) in interviewList" :key="index">
-				<view class="interview-list-item-status">{{ getDictLabel(item.status, 'deliveryStatusList') }}</view>
-				<view class="interview-list-item-time">{{ item.interviewTime || '2021-10-29 10:00' }}</view>
-				<view class="interview-list-item-address">{{ item.interviewAddress }}</view>
-				<view class="interview-list-item-company">
-					<view class="left">
+			<view class="interview-list">
+				<view class="interview-list-item" v-for="(item, index) in interviewList" :key="index">
+					<view class="interview-list-item-title">
+						<view>{{ getDictLabel(item.status, 'deliveryStatusList') }}</view>
 						<view>
-							<image :src="item.companyLogoUrl"/>
+							<image src="../../static/img/shijian.png"/>
 						</view>
-						<view class="left-info">
-							<view>{{ item.postName }}</view>
-							<view>{{ `${item.workPlace} | 经验${item.workYear}年 | ${item.educationBg}` }}</view>
-							<view>{{ item.companyName }}</view>
+					</view>
+					<view class="interview-list-item-date">{{ item.interviewTime }}</view>
+					<view class="interview-list-item-way">{{ item.interviewAddress }}</view>
+					<view class="interview-list-item-position">
+						<view class="left">
+							<view>
+								<image :src="item.companyLogoUrl"/>
+							</view>
+							<view class="info">
+								<view>{{ item.postName }}</view>
+								<view>{{ `${item.workPlace} | 经验${item.workYear}年 | ${item.educationBg}` }}</view>
+								<view>{{ item.companyName }}</view>
+							</view>
+						</view>
+						<view class="right">
+							<view>{{ `${item.lowestSalary}k ~ ${item.highestSalary}k` }}</view>
+							<view v-if="item.updateTime">{{ item.updateTime.split(' ')[0] }}</view>
+							<view v-else>{{ item.createTime.split(' ')[0] }}</view>
 						</view>
 					</view>
-					<view class="right">
-						<view>{{ `${item.lowestSalary}k ~ ${item.highestSalary}k` }}</view>
-						<view v-if="item.updateTime">{{ item.updateTime.split(' ')[0] }}</view>
-						<view v-else>{{ item.createTime.split(' ')[0] }}</view>
+					
+					<view class="interview-list-item-button" v-if="Number(item.status) === 20 && new Date('2021-10-29 10:00').valueOf() > new Date().valueOf()">
+						<view class="submit btn">发起视频面试</view>
 					</view>
-				</view>
-				<view class="interview-list-item-btn">
-					<view class="single-btn not-arrive" v-if="Number(item.status) === 20 && new Date('2021-10-29 10:00').valueOf() > new Date().valueOf()">未到面试时间</view>
-					<view class="single-btn arrive" v-else-if="Number(item.status) === 20 && new Date('2021-10-29 10:00').valueOf() <= new Date().valueOf()">发起视频面试</view>
-					<view class="double-btn" v-else-if="Number(item.status) === 50">
-						<view>接受</view>
-						<view>拒绝</view>
+					
+					<view class="interview-list-item-button" v-else-if="Number(item.status) === 20 && new Date('2021-10-29 10:00').valueOf() <= new Date().valueOf()">
+						<view class="not btn">未到视频面试</view>
+					</view>
+					
+					<view class="interview-list-item-button double" v-else-if="Number(item.status) === 50">
+						<view class="btn">接受</view>
+						<view class="btn">拒绝</view>
 					</view>
 				</view>
 			</view>
-		</view>
 		</z-paging>
 		<u-toast ref="uToast" />
 	</view>
@@ -86,7 +96,7 @@
 			 * @param { Number } pageSize
 			 */
 			queryList(pageNo, pageSize) {
-				this.getInterviewList(pageNo, pageSize)
+				this.getInterviewList(pageNo, pageSize);
 			},
 			/**
 			 * 获取数据字典

+ 3 - 2
h5_web/pages/mycode/mycode.vue

@@ -137,9 +137,10 @@
 
 		.content .tip {
 			font-size: 32rpx;
-			margin: 0 24rpx;
+			margin: 0 40rpx;
 			text-align: left;
-			text-indent: 2em;
+			// text-indent: 2em;
+			text-align: center;
 			color: #3D5D4C;
 		}
 

+ 1 - 0
h5_web/pages/newsDetails/newsDetails.vue

@@ -88,6 +88,7 @@
 		}
 		&-content {
 			padding: 18rpx 0;
+			line-height: 50rpx;
 		}
 	}
 </style>

+ 2 - 2
h5_web/pages/policyInfo/policyInfo.vue

@@ -54,7 +54,7 @@
       </view>
     </z-paging>
 
-    <view class="policybtn">
+<!--    <view class="policybtn">
       <view class="policybtn-container">
         <view class="policybtn-content">
           <view>
@@ -64,7 +64,7 @@
           </view>
         </view>
       </view>
-    </view>
+    </view> -->
   </view>
 </template>
 

+ 43 - 40
h5_web/pages/progressiveIntegral/progressiveIntegral.vue

@@ -13,7 +13,7 @@
 		<view class="integral-content">
 			
 			<view class="integral-content-header">
-				<view class="integral-content-header-grade">688</view>
+				<view class="integral-content-header-grade">0</view>
 				<view class="integral-content-header-point">
 					<view class="point">
 						<view></view>
@@ -25,8 +25,8 @@
 				</view>
 				<view class="integral-content-header-rules">积分规则<u-icon name="arrow-right"/></view>
 				<view class="integral-content-header-behavior">
-					<view class="item">286<text>个加分行为</text></view>
-					<view class="item">33<text>个减分行为</text></view>
+					<view class="item">0<text>个加分行为</text></view>
+					<view class="item">0<text>个减分行为</text></view>
 				</view>
 			</view>
 			
@@ -45,7 +45,7 @@
 				</view>
 			</view>
 			
-			<view class="integral-content-list">
+			<view class="integral-content-list" v-if="integralList.length">
 				<view class="integral-content-list-item" v-for="(item, index) in integralList" :key="index">
 					<view class="left">
 						<view>{{ item.title }}</view>
@@ -57,6 +57,9 @@
 					</view>
 				</view>
 			</view>
+			<view class="integral-content-list" v-else>
+				<u-empty mode="list"></u-empty>
+			</view>
 		</view>
 	</view>
 </template>
@@ -70,42 +73,42 @@
 				},
 				// 积分列表
 				integralList: [
-					{
-						title: '签到成功',
-						date: '2021-03-25',
-						grade: 100,
-						type: 0
-					},
-					{
-						title: '积分商城兑换',
-						date: '2021-03-24',
-						grade: 5000,
-						type: 1
-					},
-					{
-						title: '签到成功',
-						date: '2021-03-24',
-						grade: 100,
-						type: 0
-					},
-					{
-						title: '签到成功',
-						date: '2021-03-23',
-						grade: 100,
-						type: 0
-					},
-					{
-						title: '签到成功',
-						date: '2021-03-22',
-						grade: 100,
-						type: 0
-					},
-					{
-						title: '签到成功',
-						date: '2021-03-21',
-						grade: 100,
-						type: 0
-					}
+					// {
+					// 	title: '签到成功',
+					// 	date: '2021-03-25',
+					// 	grade: 100,
+					// 	type: 0
+					// },
+					// {
+					// 	title: '积分商城兑换',
+					// 	date: '2021-03-24',
+					// 	grade: 5000,
+					// 	type: 1
+					// },
+					// {
+					// 	title: '签到成功',
+					// 	date: '2021-03-24',
+					// 	grade: 100,
+					// 	type: 0
+					// },
+					// {
+					// 	title: '签到成功',
+					// 	date: '2021-03-23',
+					// 	grade: 100,
+					// 	type: 0
+					// },
+					// {
+					// 	title: '签到成功',
+					// 	date: '2021-03-22',
+					// 	grade: 100,
+					// 	type: 0
+					// },
+					// {
+					// 	title: '签到成功',
+					// 	date: '2021-03-21',
+					// 	grade: 100,
+					// 	type: 0
+					// }
 				]
 			}
 		},

+ 1 - 1
h5_web/pages/schools/schools.vue

@@ -21,7 +21,7 @@
 								<!-- <view class="icon">
 									<u-icon class="icon-img" name="star-fill" color="#EF651F" /> {{item.count}}
 								</view> -->
-								<view>{{ `${item.count}个专业 · ${getSchoolTypeName(item.schoolNature)} ` }}</view>
+								<view>{{ `${item.count}个专业 · ${getSchoolTypeName(item.schoolNature) || '-'} ` }}</view>
 							</view>
 						</view>
 					</view>

TEMPAT SAMPAH
h5_web/static/img/shijian.png