Browse Source

修改字体

yuanyiming 1 năm trước cách đây
mục cha
commit
a3159f9c5d

BIN
public/SourceHanSans-Regular.otf


+ 11 - 0
public/index.html

@@ -14,6 +14,17 @@
   <title>
     <%= webpackConfig.name %>
   </title>
+  <style>
+    @font-face {
+      font-family: 'Source Han Sans SC';
+      src: url('./SourceHanSans-Regular.otf') format('truetype');
+      font-weight: normal;
+      font-style: normal;
+    }
+    html,body{
+      font-family: 'Source Han Sans SC', sans-serif;
+    }
+  </style>
 </head>
 
 <body>

+ 8 - 1
src/views/eva/studentDetail.vue

@@ -669,7 +669,13 @@ export default {
   font-size: 14px;
   color: black;
 }
-
+/deep/ .van-dropdown-menu__title::after {
+  border-color: transparent transparent #000 #000;
+  opacity: 0.5;
+}
+/deep/ .van-dropdown-menu__title--active::after {
+  border-color: transparent transparent currentColor currentColor;
+}
 /deep/ .van-cell__title,
 .van-cell__value {
   font-weight: normal;
@@ -688,6 +694,7 @@ export default {
 /deep/ .van-dropdown-menu__title--active {
   color: #3b84fc;
 }
+
 .goods-card {
   margin: 0;
   background-color: #fff;

+ 17 - 3
src/views/eva/studentEvaluate.vue

@@ -288,6 +288,9 @@ export default {
       // 图片列表
       imgList: [],
 
+      // 存储获取的record内容,在上传新纪录的时候进行判断,有修改文案为保存
+      oldRecordData: {},
+
       isShowMask: false, // 控制删除弹框的显示与隐藏
       isShowMask2: false, // 控制保存弹框的显示与隐藏
       // 是否显示分享和继续记录按钮
@@ -454,14 +457,24 @@ export default {
 
       if (this.selectWData.length === 0) return (this.wei = true)
 
-      // if (this.visitTime === '') {
-      //   this.tim = true
-      //   isOk = 1
+      // let conVal = []
+      // if (this.oldRecordData.contact !== '') {
+      //   conVal = this.oldRecordData.contact.split(',')
       // }
+
+      // console.log(this.arraysAreEqual(this.selectSData, conVal))
+      // console.log(this.year == this.oldRecordData.term)
+
+      // this.oldRecordData.contact
+      // console.log('this.oldRecordData', this.oldRecordData)
+
       // if (isOk === 1) return
       this.repMaskNum = e
       this.repShowMask = true
     },
+    arraysAreEqual(arr1, arr2) {
+      return JSON.stringify(arr1) === JSON.stringify(arr2)
+    },
     // 获取记录地点
     getRecordPlace() {
       const data = {
@@ -744,6 +757,7 @@ export default {
       // console.log('getRecord', this.$route.query.rid)
       selectRecordDetail(data).then(res => {
         console.log('获取单个学生记录详情', res[0][0])
+        this.oldRecordData = res[0][0]
         const allData = res[0][0]
         if (allData.contact !== '') {
           this.selectSData = allData.contact.split(',')