Merge branch 'umiami-plus' of…

modules/my/review/components/qrcodePay.vue

@@ -6,7 +6,7 @@
       </div>
       <h1>欢迎您</h1>
       <p class="t1">
-        申请斯蒂文斯理工学院工程管理硕士保研项目，需缴纳留位费<span>2000</span>元，请扫描二维码以完成缴费。
+        申请迈阿密大学硕士保研项目，需缴纳留位费<span>2000</span>元，请扫描二维码以完成缴费。
       </p>
     </div>
     <div class="qrcode-error" v-if="qrcodeError">生成二维码失败请刷新<i class="el-icon-refresh-left" @click="getOrder" title="刷新"></i></div>

modules/my/review/form/index.js

@@ -12,6 +12,13 @@ export default function(_this) {
   return {
     id: 'admission',
     title: '综合评审',
-    children: [{ required: true, id: 'application_pay', title: '缴留位费' }, cjd(_this), tjx(_this), grcs(_this), byzs(_this), form(_this)]
+    children: [
+      // { required: true, id: 'application_pay', title: '缴留位费' },
+      cjd(_this),
+      tjx(_this),
+      grcs(_this),
+      byzs(_this),
+      form(_this)
+    ]
   }
 }

modules/my/review/index.vue

@@ -53,11 +53,11 @@ export default {
     const menus = getMenu(this)
     return {
       menus: [menus],
-      currentActive: 'application_pay',
+      currentActive: 'admission_cjd',
       dialogVisible: false,
       detail: null,
       completeVisible: false,
-      isPay: false
+      isPay: true
     }
   },
   watch: {
@@ -65,7 +65,7 @@ export default {
       immediate: true,
       handler(route) {
         const { query = {} } = route
-        this.currentActive = query.active || 'application_pay'
+        this.currentActive = query.active || 'admission_cjd'
       }
     },
     showSubmittedDialog(value) {

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)