合并分支

pages2/appointment/order.vue

@@ -329,20 +329,36 @@ export default {
               return
             } else {
               // await this.submitApi()
-                uni.request({
-                  url: this.commitment_electr_signature, //临时路径
-                  responseType: 'arraybuffer', //设置返回的数据格式为arraybuffer
+                uni.getFileSystemManager().readFile({
+                  filePath: this.commitment_electr_signature, //临时路径
+                  encoding: 'base64', //编码格式
                   success: res => {
-                    const base64 = "data:image/png;base64," + uni.arrayBufferToBase64(res.data)
+                    console.log('返回结果', res)
+                    const base64 = "data:image/png;base64," + res.data
                     console.log('sfs签名转成base64', base64)
                     this.baseAddress = base64
+                    // return
                     this.submits()
                   },
                   fail: err => {
-                    console.log(err)
+                    console.log('转base64错误', err)
                     this.isUploading = false
                   }
                 })
+                // uni.request({
+                //   url: this.commitment_electr_signature, //临时路径
+                //   responseType: 'arraybuffer', //设置返回的数据格式为arraybuffer
+                //   success: res => {
+                //     const base64 = "data:image/png;base64," + uni.arrayBufferToBase64(res.data)
+                //     console.log('sfs签名转成base64', base64)
+                //     this.baseAddress = base64
+                //     this.submits()
+                //   },
+                //   fail: err => {
+                //     console.log('转base64错误', err)
+                //     this.isUploading = false
+                //   }
+                // })
             }
           } else {
             this.submits()
@@ -459,26 +475,6 @@ export default {
           
       });
     },
-     //提交表单
-    // async submitApi() {
-    //   if (this.commitment_electr_signature) {
-    //     // this.commitment_electr_signature = await this.$method.uploadFile(
-    //     //   this.commitment_electr_signature,
-    //     //   0
-    //     // );
-    //      var res = await uni.request({
-    //       url: this.commitment_electr_signature, //临时路径
-    //       responseType: 'arraybuffer', //设置返回的数据格式为arraybuffer
-    //       success: res => {
-    //         const base64 = "data:image/png;base64," + uni.arrayBufferToBase64(res.data)
-    //         console.log('sfs签名转成base64', base64)
-    //         this.baseAddress = base64
-    //       }
-    //     })
-    //     console.log('----commitment_electr_signature',res, this.commitment_electr_signature)
-    //   }
-
-    // },
   },
 };
 </script>

pages2/exam/exam_appointment.vue

@@ -46,7 +46,8 @@
 								{{ item.examineeCode || '' }}
 							</view>
 						</view>
-						<view class="item">
+						<!-- fromPlat：1云学堂 2智慧考场 -->
+						<view v-if="item.fromPlat == 2" class="item">
 							<view class="left">座位号</view>
 							<view class="right">
 								{{ item.seatNumber || '' }}
@@ -98,8 +99,8 @@
 					</view>
 					<view class="item">
 						考试地点：
-						<!-- fromPlat：1云学堂 2智慧考场 -->
-						<text class="val">{{ activeList.fromPlat == 2 ? (activeList.roomAddress || '') : (activeList.applySiteAddress || '') }}</text>
+						<!-- activeList.seatNumber 有座位号就显示roomAddress，否则显示applySiteAddress -->
+						<text class="val">{{ activeList.seatNumber ? (activeList.roomAddress || '') : (activeList.applySiteAddress || '') }}</text>
 					</view>
 					<view class="item">
 						考试时间：
@@ -119,7 +120,7 @@
 							{{ activeList.examineeCode || '' }}
 						</text>
 					</view>
-					<view class="item">
+					<view v-if="activeList.fromPlat == 2" class="item">
 						座位号：
 						<text class="val">
 							{{ activeList.seatNumber || '' }}
@@ -329,7 +330,6 @@ export default {
 			// if (this.current === index) {
 			// 	return;
 			// }
-			console.log('----')
 			this.current = index;
 			var data = {};
 			if (index === 0) {

pages2/exam/signCommit.vue

@@ -136,13 +136,16 @@ export default {
             this.isUploading = false
             return
         } else {
-            uni.request({
-                url: this.commitment_electr_signature, //临时路径
-                responseType: 'arraybuffer', //设置返回的数据格式为arraybuffer
+
+            uni.getFileSystemManager().readFile({
+                filePath: this.commitment_electr_signature, //临时路径
+                encoding: 'base64', //编码格式
                 success: res => {
-                    const base64 = "data:image/png;base64," + uni.arrayBufferToBase64(res.data)
+                    console.log('返回结果', res)
+                    const base64 = "data:image/png;base64," + res.data
                     console.log('sfs签名转成base64', base64)
                     this.baseAddress = base64
+                    // return
                     this.$http({
                         url: '/apply/signReport',
                         method: 'post',
@@ -152,7 +155,7 @@ export default {
                         }
                     }).then((res) => {
                         console.log('res', res)
-                        if (res.data.data == 200) {
+                        if (res.data.code == 200) {
                             this.$u.toast('签署成功')
                             uni.navigateBack()
                         } else {
@@ -165,7 +168,7 @@ export default {
                     })
                 },
                 fail: err => {
-                    console.log(err)
+                    console.log('转base64错误', err)
                     this.isUploading = false
                 }
             })