Merge remote-tracking branch 'origin/marywood-plus+' into marywood-plus+

components/layout/pc/Head.vue

@@ -8,7 +8,7 @@
         </nuxt-link> -->
         <nuxt-link to="/">
           <div class="logo-box">
-            <img src="http://zws-imgs-pub.ezijing.com/static/ezijing/logo/ezijing-logo.svg" />
+            <img src="https://zws-imgs-pub.ezijing.com/static/ezijing/logo/ezijing-logo.svg" />
             <div class="line"></div>
             <div class="title">
               国际硕士1+1

modules/my/application/preview.vue

@@ -238,7 +238,7 @@ export default {
               label: '教育时间',
               code: 'start_date',
               computed(data) {
-                return `${data.start_date}至${data.end_date}`
+                return (data.start_date || '') + (data.end_date ? `至${data.end_date}` : '')
               }
             },
             { label: '专业名称', code: 'major_cn' },
@@ -258,7 +258,7 @@ export default {
               label: '工作时间',
               code: 'start_date',
               computed(data) {
-                return `${data.start_date}至${data.end_date}`
+                return (data.start_date || '') + (data.end_date ? `至${data.end_date}` : '')
               }
             },
             { label: '工作单位', code: 'company_name_cn' },
@@ -300,7 +300,7 @@ export default {
               label: '培训时间',
               code: 'start_date',
               computed(data) {
-                return `${data.start_date}至${data.end_date}`
+                return (data.start_date || '') + (data.end_date ? `至${data.end_date}` : '')
               }
             },
             { label: '培训机构', code: 'institution_cn' },

modules/my/interview/form/byzs.js

@@ -39,7 +39,6 @@ export default function(_this) {
         {
           label: '毕业证书',
           type: 'v-upload',
-          required: true,
           model: 'DIPLOMA_CN',
           attrs: {
             action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/put`,

modules/my/interview/form/ywjl.js

@@ -52,7 +52,7 @@ export default function(_this) {
             data: { file_type: 'RESUME_EN' }
           },
           append: `
-        <p>请下载填写英文简历模板后上传 [<a href="https://webapp-pub.ezijing.com/project/marywood-plus/%E8%8B%B1%E6%96%87%E7%AE%80%E5%8E%86%E6%A8%A1%E6%9D%BF.docx" target="_blank" download="英文简历模板">下载模板</a>]</p>
+        <p>请下载填写英文简历模板后上传 [<a href="https://webapp-pub.ezijing.com/project/marywood-plus/%E8%8B%B1%E6%96%87%E7%AE%80%E5%8E%86%E6%A8%A1%E6%9D%BF.doc" target="_blank" download="英文简历模板">下载模板</a>]</p>
         <p>请将英文简历填写完存为"pdf"格式上传，文件小于10MB。</p>`
         }
       ]