Merge branch 'cbu-enterprise' of…

components/layout/h5/Footer.vue

 <template>
   <div class="foot-main">
     <div class="logo-title">
-      <img src="https://webapp-pub.ezijing.com/project/cbu-enterprise/logo.png" width="40px" />
-      <h1>亦学创新国际教育中心</h1>
+      <img src="https://webapp-pub.ezijing.com/project/cbu-enterprise/82/logo.png" />
+      <!-- <h1>亦学创新国际教育中心</h1> -->
     </div>
     <div class="bottom">
       <div class="bottom-item">

components/layout/pc/Foot.vue

@@ -2,7 +2,7 @@
   <div class="foot-main">
     <div class="foot-box">
       <div class="logo-title">
-        <img src="https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/cbu-enterprise/82/logo.png" />
+        <img src="https://webapp-pub.ezijing.com/project/cbu-enterprise/82/logo.png" />
         <!-- <h1>亦学创新国际教育中心</h1> -->
       </div>
       <div class="bottom">

package-lock.json

@@ -15,7 +15,6 @@
         "driver.js": "^0.9.8",
         "element-ui": "^2.15.1",
         "file-saver": "^2.0.5",
-        "js-file-download": "^0.4.12",
         "nuxt": "^2.15.3",
         "qrcode.vue": "^1.7.0",
         "qs": "^6.10.1",
@@ -6492,11 +6491,6 @@
         "jiti": "bin/jiti.js"
       }
     },
-    "node_modules/js-file-download": {
-      "version": "0.4.12",
-      "resolved": "https://registry.npmjs.org/js-file-download/-/js-file-download-0.4.12.tgz",
-      "integrity": "sha512-rML+NkoD08p5Dllpjo0ffy4jRHeY6Zsapvr/W86N7E0yuzAO6qa5X9+xog6zQNlH102J7IXljNY2FtS6Lj3ucg=="
-    },
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -18337,11 +18331,6 @@
       "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.9.1.tgz",
       "integrity": "sha512-AhYrAxJ/IW2257nHkJasUjtxHhmYIUEHEjsofJtGYsPWk8pTjqjbPFlJfOwfY+WX8YBiKHM1l0ViDC/mye2SWg=="
     },
-    "js-file-download": {
-      "version": "0.4.12",
-      "resolved": "https://registry.npmjs.org/js-file-download/-/js-file-download-0.4.12.tgz",
-      "integrity": "sha512-rML+NkoD08p5Dllpjo0ffy4jRHeY6Zsapvr/W86N7E0yuzAO6qa5X9+xog6zQNlH102J7IXljNY2FtS6Lj3ucg=="
-    },
     "js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",

package.json

@@ -17,7 +17,6 @@
     "driver.js": "^0.9.8",
     "element-ui": "^2.15.1",
     "file-saver": "^2.0.5",
-    "js-file-download": "^0.4.12",
     "nuxt": "^2.15.3",
     "qrcode.vue": "^1.7.0",
     "qs": "^6.10.1",

pages/degree/index.vue

@@ -7,14 +7,10 @@
           数字领导力企业家学者DBA
           由学说国际教育独家运营，学员在完成所有毕业要求后，将获得加州浸会大学授予的工商管理博士学位。该学位证书与学生去加州浸会大学线下就读所获证书相同。加州浸会大学是受中国教育部承认的正规国际名校，该项目由学说平台、清控紫荆教育提供学术及技术支持。
         </p>
-        <img
-          class="logo-all"
-          src="https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/cbu-enterprise/82/logo-all.png"
-        />
+        <img class="logo-all" src="https://webapp-pub.ezijing.com/project/cbu-enterprise/82/logo-all.png" />
         <p class="mb-30">
-          加州浸会大学，创立于1950 年, 位于美国加州“科技、创新之都”河滨市，距离洛杉矶仅60 英里，北邻硅谷是拥有11000
-          余名在校生的综合性大学, 加州浸会大学工商管理博士DBA 项目是经过美国教育监管机构WASC、BPPE、DOE
-          等批准的正规博士项目。该项目强调课程学习与论文写作结合，以培养将管理实践和理论研究深度融合的商业领袖和学者为目标。
+          加州浸会大学，创立于1950 年, 位于美国加州“科技、创新之都”河滨市，距离洛杉矶仅60 英里，北邻硅谷是拥有11000 余名在校生的综合性大学, 加州浸会大学工商管理博士DBA
+          项目是经过美国教育监管机构WASC、BPPE、DOE 等批准的正规博士项目。该项目强调课程学习与论文写作结合，以培养将管理实践和理论研究深度融合的商业领袖和学者为目标。
         </p>
 
         <p class="mb-30">
@@ -23,10 +19,10 @@
 
         <p class="mb-30">学校开设超过150 多种本科专业、40 多种硕士学位专业以及7 种博士学位专业。</p>
         <div class="degree-logo">
-          <img src="https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/cbu-enterprise/82/degree-logo1.png" />
-          <img src="https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/cbu-enterprise/82/degree-logo2.png" />
-          <img src="https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/cbu-enterprise/82/degree-logo3.png" />
-          <img src="https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/cbu-enterprise/82/degree-logo4.png" />
+          <img src="https://webapp-pub.ezijing.com/project/cbu-enterprise/82/degree-logo1.png" />
+          <img src="https://webapp-pub.ezijing.com/project/cbu-enterprise/82/degree-logo2.png" />
+          <img src="https://webapp-pub.ezijing.com/project/cbu-enterprise/82/degree-logo3.png" />
+          <img src="https://webapp-pub.ezijing.com/project/cbu-enterprise/82/degree-logo4.png" />
         </div>
       </div>
       <div class="content-bottom">

pages/plan/index.vue

@@ -5,9 +5,7 @@
     </section>
     <section class="section">
       <h2 class="title">课程结构</h2>
-      <p>
-        ·必修课程含6大主题模块，每个模块不少于2天线下授课，不少于96学时。<br />·学位课程共12门专业课，每三个月修完1门并安排1次专题实践。
-      </p>
+      <p>·必修课程含6大主题模块，每个模块不少于2天线下授课，不少于96学时。<br />·学位课程共12门专业课，每三个月修完1门并安排1次专题实践。</p>
       <br />
       <img src="https://webapp-pub.ezijing.com/project/cbu-enterprise/course.png" />
     </section>
@@ -16,10 +14,7 @@
       <p>
         ·顶配师资，国内外一流专家学者及代表性企业家担任授课老师<br />·论文导师匹配将在第二学年开启。我们在第二学年设计了丰富的必修、学位课和更多的专题实践，帮助学生深入了解不同教授的研究领域,为大家确定研究方向和匹配导师提供平台。
       </p>
-      <img
-        style="width: 993px;display: block;margin: 60px auto;"
-        src="https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/cbu-enterprise/82/tea-all.png"
-      />
+      <img style="width: 993px;display: block;margin: 60px auto;" src="https://webapp-pub.ezijing.com/project/cbu-enterprise/82/tea-all.png" />
     </section>
     <section class="section">
       <h2 class="title">国际游学</h2>

pages/project/index.vue

@@ -68,7 +68,7 @@ export default {
       featureList: [
         {
           img: 'https://webapp-pub.ezijing.com/project/cbu-enterprise/feature_1.png',
-          desc: '国内最权威、最专业、最系统的数字经济高管教育课程'
+          desc: '国内最权威、最专业、最系统的数字经济高管教育课程之一'
         },
         {
           img: 'https://webapp-pub.ezijing.com/project/cbu-enterprise/feature_2.png',

plugins/element-ui.js

 import Vue from 'vue'
 import Element from 'element-ui'
-import locale from 'element-ui/lib/locale/lang/en'
 import VueForm from '@ezijing/vue-form'
 
-Vue.use(Element, { locale })
+Vue.use(Element)
 Vue.use(VueForm)