fix: 修复报名申请#2387,#2391,#2392

modules/my/application/form/info/career.js

@@ -146,7 +146,7 @@ export default function(_this) {
           type: 'v-input',
           label: '年薪收入(万元)',
           model: 'annual_salary',
-          attrs: { placeholder: '请输入您的年薪收入', maxlength: '20' },
+          attrs: { placeholder: '请输入您的年薪收入', type: 'number', maxlength: '20' },
           rules: [{ required: true, message: '请输入您的年薪收入', trigger: 'blur' }]
         },
         {

modules/my/application/pay.vue

@@ -53,7 +53,7 @@ export default {
     },
     // 支付成功
     paySuccess() {
-      return this.order.payment_status === 'SUCCESS'
+      return this.order.payment_status === 'SUCCESS' || this.dialogVisible
     },
     // 待支付订单
     orderList() {

modules/my/application/preview.vue

@@ -50,29 +50,7 @@
                   </dl>
                 </div>
               </template>
-              <template v-else>
-                <div class="group">
-                  <dl v-for="subitem in item.items" :key="subitem.code">
-                    <dt>{{ subitem.label }}：</dt>
-                    <dd>
-                      <template v-if="subitem.computed">
-                        <div v-html="subitem.computed(material[item.code])"></div>
-                      </template>
-                      <template v-else>{{ material[item.code][subitem.code] }}</template>
-                    </dd>
-                  </dl>
-                </div>
-              </template>
-            </div>
-          </div>
-        </template>
-        <div class="preview-item is-success" v-if="isManager">
-          <div class="preview-item-hd">
-            <div class="title">照片/附件</div>
-            <div class="line"></div>
-          </div>
-          <div class="preview-item-bd">
-            <template v-if="material.attachments">
+              <template v-else-if="item.code === 'attachments'">
                 <ul class="attachments">
                   <li class="attachments-item" v-for="(item, index) in material.attachments" :key="index">
                     <div class="inner" @click="handlePreview(item)">
@@ -90,11 +68,36 @@
                       <el-button size="mini" :disabled="item.status === 'INACTIVE'" @click="handleRemove(item)"
                         >删除</el-button
                       >
-                    <el-button size="mini" :disabled="item.status === 'LOG'" @click="handleSave(item)">存档</el-button>
+                      <el-button size="mini" :disabled="item.status === 'LOG'" @click="handleSave(item)"
+                        >存档</el-button
+                      >
                     </el-button-group>
                   </li>
                 </ul>
               </template>
+              <template v-else>
+                <div class="group">
+                  <dl v-for="subitem in item.items" :key="subitem.code">
+                    <dt>{{ subitem.label }}：</dt>
+                    <dd>
+                      <template v-if="subitem.computed">
+                        <div v-html="subitem.computed(material[item.code])"></div>
+                      </template>
+                      <template v-else>{{ material[item.code][subitem.code] }}</template>
+                    </dd>
+                  </dl>
+                </div>
+              </template>
+            </div>
+          </div>
+        </template>
+        <div class="preview-item is-success">
+          <div class="preview-item-hd">
+            <div class="title">照片/附件</div>
+            <div class="line"></div>
+          </div>
+          <div class="preview-item-bd">
+            <template v-if="material.attachments"> </template>
           </div>
         </div>
         <div class="preview-item is-success" v-if="isManager">
@@ -307,8 +310,15 @@ export default {
           items: [
             { label: '获取时间', code: 'time' },
             { label: '荣誉奖励', code: 'title' },
-            { label: '证书颁发机构', code: 'institution_cn' }
+            { label: '授予机构', code: 'institution_cn' }
           ]
+        },
+        {
+          title: '照片/附件',
+          code: 'attachments',
+          edit: {
+            to: { path: '/my/application', query: { active: 'application_info', tab: 'application_info_attachment' } }
+          }
         }
         // {
         //   title: '推荐信',
@@ -360,8 +370,8 @@ export default {
         if (error.toString() === '0') {
           const { material, progress } = data
           this.material = material
-          const missedRequiredList = progress.FILLING.attachments.missed_required_list
-          progress.FILLING.attachments.progress = missedRequiredList.NO_CRIMINAL_CERT ? 0 : 1
+          // const missedRequiredList = progress.FILLING.attachments.missed_required_list
+          // progress.FILLING.attachments.progress = missedRequiredList.NO_CRIMINAL_CERT ? 0 : 1
           this.progress = progress
         } else {
           this.$message.error(message)