浏览代码

修改判断

lex-xin 4 年之前
父节点
当前提交
581a7a9e01
共有 45 个文件被更改,包括 397 次插入51 次删除
  1. 0 0
      dist/app.19a3ecd218140fa8df9b.js
  2. 二进制
      dist/app.19a3ecd218140fa8df9b.js.gz
  3. 0 0
      dist/app.1f34a35ffff2920c6dc1.js
  4. 二进制
      dist/app.1f34a35ffff2920c6dc1.js.gz
  5. 0 0
      dist/css/AppDetail.62df73a1.css
  6. 1 1
      dist/css/AppRecord.4ffbe6b3.css
  7. 0 0
      dist/css/ApplyList.f217d476.css
  8. 1 1
      dist/css/ExamRecord.575234fd.css
  9. 0 0
      dist/css/SignUpAccount.557a1ade.css
  10. 0 0
      dist/css/SignUpBaseInfo.790d937d.css
  11. 0 0
      dist/css/SignUpBaseInfo.da8c3f66.css
  12. 0 0
      dist/css/SignUpLevel.75244051.css
  13. 0 0
      dist/css/SignUpPayment.7b1d75e7.css
  14. 1 0
      dist/css/test.722bacca.css
  15. 0 0
      dist/index.html
  16. 0 0
      dist/js/AppDetail.241fc73b.js
  17. 二进制
      dist/js/AppDetail.241fc73b.js.gz
  18. 0 0
      dist/js/AppDetail.e3254edc.js
  19. 0 0
      dist/js/AppDetail~PayDefine~PayQRCode~PayResult~PaymentResult~SignUp~SignUpAccount~SignUpBaseInfo~SignUpLeve~4fcc2e00.c9f9cabd.js
  20. 二进制
      dist/js/AppDetail~PayDefine~PayQRCode~PayResult~PaymentResult~SignUp~SignUpAccount~SignUpBaseInfo~SignUpLeve~4fcc2e00.c9f9cabd.js.gz
  21. 0 0
      dist/js/AppRecord.7d150ba1.js
  22. 0 0
      dist/js/AppRecord.ecf5afd1.js
  23. 0 0
      dist/js/ExamRecord.d7f79141.js
  24. 0 0
      dist/js/PayDefine~PayQRCode~PayResult~PaymentResult~SignUp~SignUpAccount~SignUpBaseInfo~SignUpLevel~SignUpPayment.6916391a.js
  25. 二进制
      dist/js/PayDefine~PayQRCode~PayResult~PaymentResult~SignUp~SignUpAccount~SignUpBaseInfo~SignUpLevel~SignUpPayment.6916391a.js.gz
  26. 0 0
      dist/js/SignUpBaseInfo.05f5f219.js
  27. 二进制
      dist/js/SignUpBaseInfo.05f5f219.js.gz
  28. 0 0
      dist/js/SignUpBaseInfo.1690de22.js
  29. 二进制
      dist/js/SignUpBaseInfo.1690de22.js.gz
  30. 0 0
      dist/js/SignUpBaseInfo~test.ff02df3a.js
  31. 二进制
      dist/js/SignUpBaseInfo~test.ff02df3a.js.gz
  32. 0 0
      dist/js/SignUpLevel.98ae0f27.js
  33. 二进制
      dist/js/SignUpLevel.98ae0f27.js.gz
  34. 0 0
      dist/js/SignUpLevel.e35c3de4.js
  35. 二进制
      dist/js/SignUpLevel.e35c3de4.js.gz
  36. 1 0
      dist/js/test.37520d52.js
  37. 0 0
      dist/js/test.8f981d14.js
  38. 二进制
      dist/js/test.8f981d14.js.gz
  39. 9 0
      src/router/appRouter.js
  40. 222 8
      src/views/app/AppDetail.vue
  41. 8 1
      src/views/app/AppRecord.vue
  42. 108 0
      src/views/app/ExamRecord.vue
  43. 0 4
      src/views/app/test.vue
  44. 44 34
      src/views/signup/SignUpBaseInfo.vue
  45. 2 2
      src/views/signup/SignUpLevel.vue

文件差异内容过多而无法显示
+ 0 - 0
dist/app.19a3ecd218140fa8df9b.js


二进制
dist/app.19a3ecd218140fa8df9b.js.gz


文件差异内容过多而无法显示
+ 0 - 0
dist/app.1f34a35ffff2920c6dc1.js


二进制
dist/app.1f34a35ffff2920c6dc1.js.gz


文件差异内容过多而无法显示
+ 0 - 0
dist/css/AppDetail.62df73a1.css


+ 1 - 1
dist/css/AppRecord.2920600d.css → dist/css/AppRecord.4ffbe6b3.css

@@ -1 +1 @@
-.mheader[data-v-9865a7b0]{height:.44rem;overflow:hidden}.m-nav-header[data-v-9865a7b0]{position:absolute;left:0;top:0;width:100%;height:.44rem;line-height:.44rem;text-align:center;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;color:#1a1a1a;background:#fff}.m-nav-header.fixed[data-v-9865a7b0]{position:fixed;z-index:99}.m-nav-header.headerColor[data-v-9865a7b0]{background-color:#14928a;color:#fff}.m-nav-header.headerColor .m-nav-bar__title[data-v-9865a7b0]{color:#fff;font-size:.18rem}.m-nav-header .m-nav-bar__title[data-v-9865a7b0]{max-width:60%;margin:0 auto;color:#333;font-weight:500;font-size:.18rem}.m-nav-header .m-nav-bar__left[data-v-9865a7b0],.m-nav-header .m-nav-bar__right[data-v-9865a7b0]{position:absolute;bottom:0}.m-nav-header .m-nav-bar__left[data-v-9865a7b0]{left:.12rem}.m-nav-header .m-nav-bar__left .arrow-left[data-v-9865a7b0]{font-size:.21rem;vertical-align:middle}.m-nav-header .m-nav-bar__right[data-v-9865a7b0]{right:.12rem}.appRecord[data-v-02d2085a]{min-height:100vh}[data-v-02d2085a] .van-cell{padding:14px 16px;font-size:16px;color:var(--font-main-color)}[data-v-02d2085a] .van-cell .van-cell__value{width:40%;text-align:left;-webkit-box-flex:1;-ms-flex:auto;flex:auto;color:var(--font-second-color)}[data-v-02d2085a] .van-cell .payTime{color:var(--red-color)}.section[data-v-02d2085a]{margin-top:10px}.van-button--primary[data-v-02d2085a]{margin:.35rem 0 .1rem;background-color:var(--main-color);border:1px solid var(--main-color);color:#fff;font-size:.18rem;height:.5rem;line-height:.52rem;width:90%;margin-left:5%}
+.mheader[data-v-9865a7b0]{height:.44rem;overflow:hidden}.m-nav-header[data-v-9865a7b0]{position:absolute;left:0;top:0;width:100%;height:.44rem;line-height:.44rem;text-align:center;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;color:#1a1a1a;background:#fff}.m-nav-header.fixed[data-v-9865a7b0]{position:fixed;z-index:99}.m-nav-header.headerColor[data-v-9865a7b0]{background-color:#14928a;color:#fff}.m-nav-header.headerColor .m-nav-bar__title[data-v-9865a7b0]{color:#fff;font-size:.18rem}.m-nav-header .m-nav-bar__title[data-v-9865a7b0]{max-width:60%;margin:0 auto;color:#333;font-weight:500;font-size:.18rem}.m-nav-header .m-nav-bar__left[data-v-9865a7b0],.m-nav-header .m-nav-bar__right[data-v-9865a7b0]{position:absolute;bottom:0}.m-nav-header .m-nav-bar__left[data-v-9865a7b0]{left:.12rem}.m-nav-header .m-nav-bar__left .arrow-left[data-v-9865a7b0]{font-size:.21rem;vertical-align:middle}.m-nav-header .m-nav-bar__right[data-v-9865a7b0]{right:.12rem}.appRecord[data-v-2ca3f40e]{min-height:100vh}[data-v-2ca3f40e] .van-cell{padding:14px 16px;font-size:16px;color:var(--font-main-color)}[data-v-2ca3f40e] .van-cell .van-cell__value{width:40%;text-align:left;-webkit-box-flex:1;-ms-flex:auto;flex:auto;color:var(--font-second-color)}[data-v-2ca3f40e] .van-cell .payTime{color:var(--red-color)}.section[data-v-2ca3f40e]{margin-top:10px}.van-button--default[data-v-2ca3f40e]{border:0;color:var(--main-color);font-size:15px;height:.5rem;line-height:.52rem}.van-button--primary[data-v-2ca3f40e]{margin:.35rem 0 .1rem;background-color:var(--main-color);border:1px solid var(--main-color);color:#fff;font-size:.18rem;height:.5rem;line-height:.52rem;width:90%;margin-left:5%}

+ 0 - 0
dist/css/ApplyList.fcc59f51.css → dist/css/ApplyList.f217d476.css


+ 1 - 1
dist/css/AppDetail.cc1096d7.css → dist/css/ExamRecord.575234fd.css

@@ -1 +1 @@
-.mheader[data-v-9865a7b0]{height:.44rem;overflow:hidden}.m-nav-header[data-v-9865a7b0]{position:absolute;left:0;top:0;width:100%;height:.44rem;line-height:.44rem;text-align:center;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;color:#1a1a1a;background:#fff}.m-nav-header.fixed[data-v-9865a7b0]{position:fixed;z-index:99}.m-nav-header.headerColor[data-v-9865a7b0]{background-color:#14928a;color:#fff}.m-nav-header.headerColor .m-nav-bar__title[data-v-9865a7b0]{color:#fff;font-size:.18rem}.m-nav-header .m-nav-bar__title[data-v-9865a7b0]{max-width:60%;margin:0 auto;color:#333;font-weight:500;font-size:.18rem}.m-nav-header .m-nav-bar__left[data-v-9865a7b0],.m-nav-header .m-nav-bar__right[data-v-9865a7b0]{position:absolute;bottom:0}.m-nav-header .m-nav-bar__left[data-v-9865a7b0]{left:.12rem}.m-nav-header .m-nav-bar__left .arrow-left[data-v-9865a7b0]{font-size:.21rem;vertical-align:middle}.m-nav-header .m-nav-bar__right[data-v-9865a7b0]{right:.12rem}.appDetail[data-v-55a83729]{min-height:100vh;overflow:hidden}[data-v-55a83729] .van-cell{padding:14px 16px;font-size:16px;color:var(--font-main-color)}[data-v-55a83729] .van-cell .van-cell__value{width:40%;text-align:left;-webkit-box-flex:1;-ms-flex:auto;flex:auto;color:var(--font-second-color)}[data-v-55a83729] .van-cell .van-cell__right-icon{position:absolute;right:16px}[data-v-55a83729] .van-cell .payTime{color:var(--red-color)}.section[data-v-55a83729]{margin-top:10px}.van-button--primary[data-v-55a83729]{margin:.15rem 0 .2rem;background-color:var(--main-color);border:1px solid var(--main-color);color:#fff;font-size:.18rem;height:.5rem;line-height:.52rem;width:90%;margin-left:5%}
+.mheader[data-v-9865a7b0]{height:.44rem;overflow:hidden}.m-nav-header[data-v-9865a7b0]{position:absolute;left:0;top:0;width:100%;height:.44rem;line-height:.44rem;text-align:center;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;color:#1a1a1a;background:#fff}.m-nav-header.fixed[data-v-9865a7b0]{position:fixed;z-index:99}.m-nav-header.headerColor[data-v-9865a7b0]{background-color:#14928a;color:#fff}.m-nav-header.headerColor .m-nav-bar__title[data-v-9865a7b0]{color:#fff;font-size:.18rem}.m-nav-header .m-nav-bar__title[data-v-9865a7b0]{max-width:60%;margin:0 auto;color:#333;font-weight:500;font-size:.18rem}.m-nav-header .m-nav-bar__left[data-v-9865a7b0],.m-nav-header .m-nav-bar__right[data-v-9865a7b0]{position:absolute;bottom:0}.m-nav-header .m-nav-bar__left[data-v-9865a7b0]{left:.12rem}.m-nav-header .m-nav-bar__left .arrow-left[data-v-9865a7b0]{font-size:.21rem;vertical-align:middle}.m-nav-header .m-nav-bar__right[data-v-9865a7b0]{right:.12rem}.appRecord[data-v-ae47ed9a]{min-height:100vh}.appRecord .container[data-v-ae47ed9a]{margin-bottom:20px}[data-v-ae47ed9a] .van-cell{padding:14px 16px;font-size:16px;color:var(--font-main-color)}[data-v-ae47ed9a] .van-cell .van-cell__value{width:40%;text-align:left;-webkit-box-flex:1;-ms-flex:auto;flex:auto;color:var(--font-second-color)}[data-v-ae47ed9a] .van-cell .payTime{color:var(--red-color)}.section[data-v-ae47ed9a]{margin-top:10px}.van-button--default[data-v-ae47ed9a]{border:0;color:var(--main-color);font-size:15px;height:.5rem;line-height:.52rem}[data-v-ae47ed9a] .van-button__text{display:-webkit-box;display:-ms-flexbox;display:flex}.arrow[data-v-ae47ed9a]{min-width:1em;font-size:1.2em;line-height:inherit;margin-left:5px}

+ 0 - 0
dist/css/SignUpAccount.d201fd1a.css → dist/css/SignUpAccount.557a1ade.css


文件差异内容过多而无法显示
+ 0 - 0
dist/css/SignUpBaseInfo.790d937d.css


文件差异内容过多而无法显示
+ 0 - 0
dist/css/SignUpBaseInfo.da8c3f66.css


文件差异内容过多而无法显示
+ 0 - 0
dist/css/SignUpLevel.75244051.css


+ 0 - 0
dist/css/SignUpPayment.f052c6ad.css → dist/css/SignUpPayment.7b1d75e7.css


+ 1 - 0
dist/css/test.722bacca.css

@@ -0,0 +1 @@
+.dome[data-v-3acbc04c]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;padding-left:22px}.cropper[data-v-3acbc04c]{width:80px;height:80px;line-height:80px;position:relative;border-radius:80px;overflow:hidden;text-align:center}.img[data-v-3acbc04c]{position:absolute;width:100%;height:100%;left:0;top:0}.info[data-v-3acbc04c]{font-size:18px;height:40px;line-height:40px;margin-left:30px;-webkit-box-flex:1;-ms-flex:1;flex:1;text-align:left}

文件差异内容过多而无法显示
+ 0 - 0
dist/index.html


文件差异内容过多而无法显示
+ 0 - 0
dist/js/AppDetail.241fc73b.js


二进制
dist/js/AppDetail.241fc73b.js.gz


文件差异内容过多而无法显示
+ 0 - 0
dist/js/AppDetail.e3254edc.js


文件差异内容过多而无法显示
+ 0 - 0
dist/js/AppDetail~PayDefine~PayQRCode~PayResult~PaymentResult~SignUp~SignUpAccount~SignUpBaseInfo~SignUpLeve~4fcc2e00.c9f9cabd.js


二进制
dist/js/AppDetail~PayDefine~PayQRCode~PayResult~PaymentResult~SignUp~SignUpAccount~SignUpBaseInfo~SignUpLeve~4fcc2e00.c9f9cabd.js.gz


文件差异内容过多而无法显示
+ 0 - 0
dist/js/AppRecord.7d150ba1.js


文件差异内容过多而无法显示
+ 0 - 0
dist/js/AppRecord.ecf5afd1.js


文件差异内容过多而无法显示
+ 0 - 0
dist/js/ExamRecord.d7f79141.js


文件差异内容过多而无法显示
+ 0 - 0
dist/js/PayDefine~PayQRCode~PayResult~PaymentResult~SignUp~SignUpAccount~SignUpBaseInfo~SignUpLevel~SignUpPayment.6916391a.js


二进制
dist/js/PayDefine~PayQRCode~PayResult~PaymentResult~SignUp~SignUpAccount~SignUpBaseInfo~SignUpLevel~SignUpPayment.6916391a.js.gz


文件差异内容过多而无法显示
+ 0 - 0
dist/js/SignUpBaseInfo.05f5f219.js


二进制
dist/js/SignUpBaseInfo.05f5f219.js.gz


文件差异内容过多而无法显示
+ 0 - 0
dist/js/SignUpBaseInfo.1690de22.js


二进制
dist/js/SignUpBaseInfo.1690de22.js.gz


文件差异内容过多而无法显示
+ 0 - 0
dist/js/SignUpBaseInfo~test.ff02df3a.js


二进制
dist/js/SignUpBaseInfo~test.ff02df3a.js.gz


文件差异内容过多而无法显示
+ 0 - 0
dist/js/SignUpLevel.98ae0f27.js


二进制
dist/js/SignUpLevel.98ae0f27.js.gz


文件差异内容过多而无法显示
+ 0 - 0
dist/js/SignUpLevel.e35c3de4.js


二进制
dist/js/SignUpLevel.e35c3de4.js.gz


+ 1 - 0
dist/js/test.37520d52.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["test"],{6666:function(t,e,a){"use strict";a.r(e);var o=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"dome"},[a("div",{staticClass:"cropper"},[a("img",{staticClass:"img",attrs:{src:t.img}}),a("h5-cropper",{attrs:{option:t.option},on:{getbase64Data:t.getbase64Data,getblobData:t.getblobData,getFile:t.getFile}})],1)])},n=[],i=a("5dd4"),s=a.n(i),c={components:{H5Cropper:s.a},data:function(){return{option:{canScale:!0,outputSize:.6},img:"http://geren.yi-school.top/images/logo.png"}},methods:{getbase64Data:function(t){this.img=t},getblobData:function(){},getFile:function(t){console.log(t)}}},r=c,l=(a("c8de"),a("2877")),p=Object(l["a"])(r,o,n,!1,null,"3acbc04c",null);e["default"]=p.exports},c8de:function(t,e,a){"use strict";var o=a("e5de"),n=a.n(o);n.a},e5de:function(t,e,a){}}]);

文件差异内容过多而无法显示
+ 0 - 0
dist/js/test.8f981d14.js


二进制
dist/js/test.8f981d14.js.gz


+ 9 - 0
src/router/appRouter.js

@@ -17,6 +17,15 @@ let appRouter = [{
 		weight: 3 // 页面权重
 	}
 }, {
+	path: "/examRecord",
+	name: "examRecord",
+	component: () =>
+		import( /* webpackChunkName: "ExamRecord" */ "@/views/app/ExamRecord"),
+	meta: {
+		description: "考试记录",
+		weight: 3 // 页面权重
+	}
+}, {
 	path: "/test",
 	name: "test",
 	component: () =>

+ 222 - 8
src/views/app/AppDetail.vue

@@ -4,35 +4,107 @@
 		<van-cell-group>
             <van-field v-model="form.name" disabled label="订单编号" />
             <van-field v-model="form.name" disabled label="考级名称" />
+            <van-field v-model="form.transStatusTxt" :class="[form.transStatus === 'SUCCESS' ? 'pass' : null]" disabled label="缴费状态" />
             <van-field v-model="form.name" disabled label="考试日期" />
             <van-field v-model="form.name" disabled label="专业等级" />
-            <van-field v-model="form.name" disabled label="练习曲" is-link />
+            <van-field v-model="form.name" disabled label="练习曲" @click="onOpen" is-link />
             <van-field v-model="form.name" disabled label="练习曲" is-link />
             <van-field v-model="form.name" disabled label="演奏曲" is-link />
             <van-field v-model="form.name" disabled label="演奏曲" is-link />
-            <van-field v-model="form.name" disabled label="考级证书" />
+            <van-field v-model="form.name" disabled label="考级证书" >
+                <template #input>
+                    <van-uploader
+                        name="certificate"
+                        :before-read="beforeRead"
+                        :before-delete="beforeDelete"
+                        :after-read="afterRead"
+                        accept="image/*"
+                        disabled
+                        v-model="uploadCertificate"
+                        :max-count="1" />
+                </template>
+            </van-field>
             <van-field v-model="form.name" disabled label="乐理等级" />
-            <van-field v-model="form.name" disabled label="乐理证书" />
+            <van-field v-model="form.name" disabled label="乐理证书" >
+                <template #input>
+                    <van-uploader
+                        name="certificate2"
+                        :before-read="beforeRead"
+                        :before-delete="beforeDelete"
+                        :after-read="afterRead"
+                        v-model="uploadCertificate2"
+                        disabled
+                        accept="image/*"
+                        :max-count="1" />
+                </template>
+            </van-field>
         </van-cell-group>
 
         <van-cell-group style="margin-top: 20px">
-            <van-field v-model="form.name" disabled label="报名审核" />
-            <van-field v-model="form.name" disabled label="备注" />
+            <van-field v-model="form.statusTxt" :class="[form.status === 'pass' ? 'pass' : null]" disabled label="报名审核" />
+            <van-field v-model="form.memo" disabled label="备注" />
         </van-cell-group>
         <van-button type="primary" round block>重新提交</van-button>
+
+        <van-popup class="van-popup-song" v-model="songUpload.songStatus" :close-on-click-overlay="false">
+            <div class="song-popup">
+                <div class="title">自定义曲目</div>
+                <van-field readonly clearable >
+                    <template #input>
+                        <van-uploader
+                            :before-read="beforeRead"
+                            :before-delete="beforeDelete"
+                            :after-read="afterRead"
+                            v-model.trim="performNumUpload"
+                            multiple
+                            accept="image/*"
+                            :max-count="5" >
+                        </van-uploader>
+                    </template>
+                </van-field>
+                <p class="song-popup-tips"><i style="color: #ee0a24">*</i>支持格式:pdf,png,jpg,bmp</p>
+
+                <div class="popup-group">
+                    <span @click="onSaveCancel">取消</span>
+                    <span class="popup-sure">确定</span>
+                </div>
+            </div>
+        </van-popup>
     </div>
 </template>
 <script>
 import MHeader from '@/components/MHeader'
 // import { browser } from '@/common/common'
+import { uploadFile } from '../signup/SignUpApi'
 export default {
     name: 'appDetail',
 	components: { MHeader },
     data () {
         return {
             form: {
-                name: '测试测试测试'
-            }
+                name: '测试测试测试',
+                transStatus: "SUCCESS",
+                transStatusTxt: "已缴费",
+                status: "pass",
+                statusTxt: "已通过",
+                memo: "这里是备注"
+            },
+            uploadCertificate: [],
+            uploadCertificate2: [],
+            songUpload: {
+                songStatus: false, // 曲目状态
+                indexName: null,
+                index: null, // 索引
+                name: null, // 曲名
+                author: null // 作者
+            },
+            performNumUpload: [{
+                url: "https://daya-online.oss-cn-beijing.aliyuncs.com/202007/S3wXfqp.jpg"
+            }, {
+                url: "https://daya-online.oss-cn-beijing.aliyuncs.com/202007/S3wrElA.jpg"
+            }, {
+                url: "https://daya-online.oss-cn-beijing.aliyuncs.com/202007/S3wuoPO.jpg"
+            }]
         }
     },
     mounted() {
@@ -44,6 +116,62 @@ export default {
         document.title = "报考详情"
     },
     methods: {
+        onOpen() {
+            this.songUpload.songStatus = true
+        },
+        beforeRead(file) {
+            const isLt2M = file.size / 1024 / 1024 < 2
+
+            if (!isLt2M) {
+                this.$toast('上传证书大小不能超过 2MB')
+                return false
+            }
+            return true
+        },
+        beforeDelete(file, detail) {
+            const obj = detail.name.split('-')
+            let form = this.form
+            if(obj[0] == "certificate2") {
+                form.lastMusicTheoryCertificateUrl = "" // 上传图片地址为空
+            } else if(obj[0] == "certificate") {
+                form.lastExamCertificateUrl = ""
+            }
+            return true
+        },
+        async afterRead(file, detail) { // 上传头像
+            const obj = detail.name.split('-')
+            try {
+                file.status = 'uploading'
+                file.message = '上传中...'
+                let formData = new FormData()
+                formData.append('file', file.file)
+                let res = await uploadFile(formData)
+                let result = res.data
+                if(result.code == 200) {
+                    file.status = 'done'
+                    let form = this.form
+                    if(obj[0] == "certificate2") {
+                        form.lastMusicTheoryCertificateUrl = result.data.url // 上传图片地址为空
+                    } else if(obj[0] == "certificate") {
+                        form.lastExamCertificateUrl = result.data.url
+                    } else if(obj[0] == 'practiceNum') {
+                        file.url = result.data.url
+                    } else if(obj[0] == 'performNum') {
+                        file.url = result.data.url
+                    }
+                } else {
+                    file.status = 'failed'
+                    file.message = '上传失败'
+                    this.$toast(result.msg)
+                    return false
+                }
+            } catch (err) {
+                return false
+            }
+        },
+        onSaveCancel() {
+            this.songUpload.songStatus = false
+        }
     }
 }
 </script>
@@ -55,7 +183,7 @@ export default {
 /deep/.van-cell {
     padding: 14px 16px;
     font-size: 16px;
-    color: var(--font-main-color);
+    // color: var(--font-main-color);
     .van-cell__value {
         width: 40%;
         text-align: left;
@@ -69,7 +197,93 @@ export default {
     .payTime {
         color: var(--red-color);
     }
+    &.van-field--disabled .van-field__label {
+        color: var(--font-main-color);
+    }
+    .van-field__control:disabled {
+        color: var(--font-second-color);
+    }
+    &.noPass {
+        .van-field__control:disabled {
+            color: var(--red-color);
+        }
+    }
+    &.pass {
+        .van-field__control:disabled {
+            color: var(--main-color);
+        }
+    }
 }
+.van-popup-song {
+    width: 80%;
+    border-radius: .08rem;
+}
+.song-popup {
+    text-align: center;
+    .title {
+        font-size: 18px;
+        font-weight: 500;
+        color: var(--font-main-color);
+        padding: .2rem 0 .15rem;
+    }
+    .song-upload {
+        border-radius: .05rem;
+        border: 1px solid #c5c7cb;
+        background-position: 0 0, 100% 0, 0 0, 0 100%;
+        font-size: .16rem;
+        color: #777;
+        width: 80px;
+        height: 80px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        text-align: center;
+        .van-uploader__preview {
+            margin: 0;
+        }
+        p {
+            font-size: 13px;
+        }
+    }
+    /deep/.van-uploader {
+        margin: 0 auto;
+    }
+    /deep/.van-uploader__upload,
+    /deep/.van-uploader__preview-image {
+            width: 65px;
+            height: 65px;
+        }
+    .song-popup-tips {
+        font-size: .14rem;
+        color: #808080;
+        padding-bottom: .15rem
+        // padding-top: .1rem;
+        // padding-bottom: .25rem;
+    }
+    /deep/.van-cell {
+        padding: 13px 35px;
+    }
+    /deep/.van-field__label {
+        width: .8rem;
+        text-align: left;
+    }
+    .popup-group {
+        width: 100%;
+        display: flex;
+        color: var(--main-color);
+        background-color: #F0F0F0;
+        font-size: .18rem;
+        span {
+            padding: .12rem 0;
+            flex: 1;
+        }
+        .popup-sure {
+            color: #ffffff;
+            background-color: var(--main-color);
+        }
+    }
+}
+
 .section {
     margin-top: 10px;
 }

+ 8 - 1
src/views/app/AppRecord.vue

@@ -8,8 +8,8 @@
                     <van-cell :value="item.orderNo" title="订单编号" />
                     <van-cell :value="item.level | formatLevel" title="专业等级" />
                     <van-cell :value="item.examTime" title="考试日期" />
+                    <van-button type="default" @click="onDetail" block>查看资料</van-button>
                 </van-cell-group>
-                <van-button type="primary" @click="onDetail" round block>查看资料</van-button>
             </van-tab>
             <van-tab title="未缴费">
                 <van-cell-group class="section" v-for="(item, index) in notPayList" :key="index">
@@ -88,6 +88,13 @@ export default {
 .section {
     margin-top: 10px;
 }
+.van-button--default {
+    border: 0;
+    color: var(--main-color);
+    font-size: 15px;
+    height: .5rem;
+    line-height: .52rem;
+}
 .van-button--primary {
     margin: .35rem 0 .1rem;
     background-color: var(--main-color);

+ 108 - 0
src/views/app/ExamRecord.vue

@@ -0,0 +1,108 @@
+<template>
+    <div class="appRecord">
+        <m-header />
+		<div class="container">
+            <van-cell-group class="section" v-for="(item, index) in payList" :key="index">
+                <van-cell :value="item.examTime" title="考试日期" />
+                <van-cell :value="item.level | formatLevel" title="专业等级" />
+                <!-- <transition name="fade"> -->
+                    <div v-if="item.status">
+                        <van-cell :value="item.name" title="准考证号" />
+                        <van-cell :value="item.orderNo" t itle="专业等级" />
+                        <van-cell :value="item.examTime" title="乐理等级" />
+                        <van-cell :value="item.level | formatLevel" title="考试地点" />
+                    </div>
+                <!-- </transition> -->
+                <van-cell :value="item.name" title="考试状态" />
+                <van-cell :value="item.orderNo" title="考试结果" :border="!item.status" />
+                <!-- <transition name="fade"> -->
+                    <div v-if="item.status">
+                        <van-button type="default" class="van-hairline--top-bottom" block>考级回看</van-button>
+                    </div>
+                <!-- </transition> -->
+                <van-button type="default" v-if="item.status" @click="onDetail(item)" block>点击收起<van-icon class="arrow" name="arrow-up" /></van-button>
+                <van-button type="default" v-else @click="onDetail(item)" block>展开全部<van-icon class="arrow" name="arrow-down" /></van-button>
+            </van-cell-group>
+        </div>
+    </div>
+</template>
+<script>
+import MHeader from '@/components/MHeader'
+// import { browser } from '@/common/common'
+export default {
+    name: 'appRecord',
+	components: { MHeader },
+    data () {
+        return {
+            payList: [{
+                name: "大白来了大白来了大白",
+                orderNo: "12121212121212",
+                level: 1,
+                status: false,
+                examTime: "2020-05-20~2020-05-30"
+            }, {
+                name: "大白来了大白来了大白",
+                orderNo: "12121212121212",
+                level: 1,
+                status: false,
+                examTime: "2020-05-20~2020-05-30"
+            }], // 已缴费
+            show: false
+        }
+    },
+    mounted() {
+        // 插入token
+        // let params = this.$route.query
+        // if(params.Authorization) {
+        //     localStorage.setItem('Authorization', decodeURI(params.Authorization))
+        // }
+        document.title = "考试记录"
+    },
+    methods: {
+        onDetail(item) {
+            item.status = !item.status
+        }
+    }
+}
+</script>
+<style lang="less" scoped>
+.appRecord {
+    min-height: 100vh;
+    .container {
+        margin-bottom: 20px;
+    }
+}
+/deep/.van-cell {
+    padding: 14px 16px;
+    font-size: 16px;
+    color: var(--font-main-color);
+    .van-cell__value {
+        width: 40%;
+        text-align: left;
+        flex: auto;
+        color: var(--font-second-color);
+    }
+    .payTime {
+        color: var(--red-color);
+    }
+}
+.section {
+    margin-top: 10px;
+}
+.van-button--default {
+    border: 0;
+    color: var(--main-color);
+    font-size: 15px;
+    height: .5rem;
+    line-height: .52rem;
+}
+/deep/.van-button__text {
+    display: flex;
+}
+.arrow {
+    min-width: 1em;
+    font-size: 1.2em;
+    line-height: inherit;
+    margin-left: 5px;
+}
+</style>

+ 0 - 4
src/views/app/test.vue

@@ -5,10 +5,6 @@
       <!-- option是配置,格式是对象,getbase64Data是组件的一个方法获取裁剪完的头像 2.14新增一个获取getblobData的方法 -->
       <h5-cropper :option="option" @getbase64Data="getbase64Data" @getblobData="getblobData" @getFile="getFile"></h5-cropper>
     </div>
-    <div class="info">
-      <div>作者:居里栈栈</div>
-      <div>Wechat:812936565</div>
-    </div>
   </div>
 </template>
 

+ 44 - 34
src/views/signup/SignUpBaseInfo.vue

@@ -16,7 +16,10 @@
                 </van-uploader> -->
                 <div class="cropper">
                     <span>上传</span>
-                    <h5-cropper :option="option" @getFile="getFile"></h5-cropper>
+                    <h5-cropper 
+                        @getFile="getFile"
+                        :option="option"
+                    ></h5-cropper>
                 </div>
             </template>
         </van-field>
@@ -83,11 +86,19 @@ export default {
             fileList: [],
             option: {
                 canScale: true,
-                autoCropWidth: 120,
-                autoCropHeight: 180,
-                fixedNumber: [2, 1]
+                fixedNumber: [3, 2],
+                img: '',
+                size: 1,
+                info: true,
+                full: false,
+                canMove: true,
+                fixedBox: false,
+                original: false,
+                canMoveBox: true,
+                autoCrop: true,
+                centerBox: false,
+                high: true
             }, //配置
-            img: "http://geren.yi-school.top/images/logo.png"
         }
     },
     mounted() {
@@ -102,7 +113,6 @@ export default {
     },
     methods: {
         async getFile(file) {
-            console.log(file)
             setLoading(true)
             try {
                 let formData = new FormData()
@@ -211,18 +221,18 @@ export default {
             }
             return true
         },
-        beforeRead2(file) {
-            const isLt2M = file.size / 1024 / 1024 < 4
-            if (!isLt2M) {
-                this.$toast('上传证书大小不能超过 4MB')
-                return false
-            }
-            return true
-        },
+        // beforeRead2(file) {
+        //     const isLt2M = file.size / 1024 / 1024 < 4
+        //     if (!isLt2M) {
+        //         this.$toast('上传证书大小不能超过 4MB')
+        //         return false
+        //     }
+        //     return true
+        // },
         beforeRead(file) {
             const isLt2M = file.size / 1024 / 1024 < 2
             if (!isLt2M) {
-                this.$toast('上传证书大小不能超过 2MB')
+                this.$toast('上传图片大小不能超过 2MB')
                 return false
             }
             return true
@@ -254,25 +264,25 @@ export default {
                 return false
             }
         },
-        async afterReadOCR(file) { // 上传身份证照片识别
-            setLoading(true)
-            try {
-                let formData = new FormData()
-                formData.append('file', file.file)
-                formData.append('idCardSide', "front")
-                let res = await ocr(formData)
-                let result = res.data
-                setLoading(false)
-                if(result.code == 200) {
-                    this.idCardParse(result.data)
-                } else {
-                    this.$toast(result.msg)
-                    return false
-                }
-            } catch (err) {
-                return false
-            }
-        },
+        // async afterReadOCR(file) { // 上传身份证照片识别
+        //     setLoading(true)
+        //     try {
+        //         let formData = new FormData()
+        //         formData.append('file', file.file)
+        //         formData.append('idCardSide', "front")
+        //         let res = await ocr(formData)
+        //         let result = res.data
+        //         setLoading(false)
+        //         if(result.code == 200) {
+        //             this.idCardParse(result.data)
+        //         } else {
+        //             this.$toast(result.msg)
+        //             return false
+        //         }
+        //     } catch (err) {
+        //         return false
+        //     }
+        // },
         idCardParse(data) {
             // 身份证信息解析
             let wordsResult = data.words_result

+ 2 - 2
src/views/signup/SignUpLevel.vue

@@ -112,7 +112,7 @@
                         </van-uploader>
                     </template>
                 </van-field>
-                <p class="song-popup-tips"><i style="color: #ee0a24">*</i>支持格式:pdf,png,jpg,bmp</p>
+                <p class="song-popup-tips"><i style="color: #ee0a24">*</i>支持格式:png,jpg,bmp</p>
 
                 <div class="popup-group">
                     <span @click="onSaveCancel">取消</span>
@@ -643,7 +643,7 @@ export default {
             const isLt2M = file.size / 1024 / 1024 < 2
 
             if (!isLt2M) {
-                this.$toast('上传证书大小不能超过 2MB')
+                this.$toast('上传图片大小不能超过 2MB')
                 return false
             }
             return true

部分文件因为文件数量过多而无法显示