Merge branch 'xqy_act' into dev

common/methodTool.js

@@ -280,15 +280,15 @@ export default {
 						success_action_status: 200
 					},
 					success: result => {
-						if (result.statusCode === 200) {
+						// if (result.statusCode === 200) {
 							resolve(ossToken.dir);
-						} else {
-							uni.showToast({
-								title: '上传失败',
-								icon: 'none'
-							});
-							return;
-						}
+						// } else {
+						// 	uni.showToast({
+						// 		title: '上传失败',
+						// 		icon: 'none'
+						// 	});
+						// 	return;
+						// }
 					},
 					fail: error => {
 						uni.showToast({

components/bank-exam/bankExam.vue

@@ -1577,15 +1577,15 @@ export default {
 		          success_action_status: 200,
 		        },
 		        success: (result) => {
-		          if (result.statusCode === 200) {
+		        //   if (result.statusCode === 200) {
 		            resolve(ossToken.dir);
-		          } else {
-		            uni.showToast({
-		              title: "上传失败",
-		              icon: "none",
-		            });
-		            return;
-		          }
+		        //   } else {
+		        //     uni.showToast({
+		        //       title: "上传失败",
+		        //       icon: "none",
+		        //     });
+		        //     return;
+		        //   }
 		        },
 		        fail: (error) => {
 		          uni.showToast({

pages2/bank/questionBank - 副本1.vue

@@ -1593,15 +1593,15 @@ export default {
               success_action_status: 200,
             },
             success: (result) => {
-              if (result.statusCode === 200) {
+              // if (result.statusCode === 200) {
                 resolve(ossToken.dir);
-              } else {
-                uni.showToast({
-                  title: "上传失败",
-                  icon: "none",
-                });
-                return;
-              }
+              // } else {
+              //   uni.showToast({
+              //     title: "上传失败",
+              //     icon: "none",
+              //   });
+              //   return;
+              // }
             },
             fail: (error) => {
               uni.showToast({

pages2/bank/questionBank.vue

@@ -2352,15 +2352,15 @@ export default {
               success_action_status: 200,
             },
             success: (result) => {
-              if (result.statusCode === 200) {
+              // if (result.statusCode === 200) {
                 resolve(ossToken.dir);
-              } else {
-                uni.showToast({
-                  title: "上传失败",
-                  icon: "none",
-                });
-                return;
-              }
+              // } else {
+              //   uni.showToast({
+              //     title: "上传失败",
+              //     icon: "none",
+              //   });
+              //   return;
+              // }
             },
             fail: (error) => {
               uni.showToast({

pages2/bank/questionBankContinue.vue

@@ -1736,15 +1736,15 @@ export default {
               success_action_status: 200,
             },
             success: (result) => {
-              if (result.statusCode === 200) {
+              // if (result.statusCode === 200) {
                 resolve(ossToken.dir);
-              } else {
-                uni.showToast({
-                  title: "上传失败",
-                  icon: "none",
-                });
-                return;
-              }
+              // } else {
+              //   uni.showToast({
+              //     title: "上传失败",
+              //     icon: "none",
+              //   });
+              //   return;
+              // }
             },
             fail: (error) => {
               uni.showToast({

pages2/bank/questionBankExplainDetail.vue

@@ -1618,15 +1618,15 @@ export default {
               success_action_status: 200,
             },
             success: (result) => {
-              if (result.statusCode === 200) {
+              // if (result.statusCode === 200) {
                 resolve(ossToken.dir);
-              } else {
-                uni.showToast({
-                  title: "上传失败",
-                  icon: "none",
-                });
-                return;
-              }
+              // } else {
+              //   uni.showToast({
+              //     title: "上传失败",
+              //     icon: "none",
+              //   });
+              //   return;
+              // }
             },
             fail: (error) => {
               uni.showToast({

pages2/bank/questionBankTest.vue

@@ -1234,15 +1234,15 @@ export default {
               success_action_status: 200,
             },
             success: (result) => {
-              if (result.statusCode === 200) {
+              // if (result.statusCode === 200) {
                 resolve(ossToken.dir);
-              } else {
-                uni.showToast({
-                  title: "上传失败",
-                  icon: "none",
-                });
-                return;
-              }
+              // } else {
+              //   uni.showToast({
+              //     title: "上传失败",
+              //     icon: "none",
+              //   });
+              //   return;
+              // }
             },
             fail: (error) => {
               uni.showToast({

pages2/class/questionBank.vue

@@ -1027,16 +1027,16 @@ export default {
               success_action_status: 200,
             },
             success: (result) => {
-              if (result.statusCode === 200) {
+              // if (result.statusCode === 200) {
                 self.ossAvatarUrl = ossToken.dir;
                 resolve(ossToken.dir);
-              } else {
-                uni.showToast({
-                  title: "上传失败",
-                  icon: "none",
-                });
-                return;
-              }
+              // } else {
+              //   uni.showToast({
+              //     title: "上传失败",
+              //     icon: "none",
+              //   });
+              //   return;
+              // }
             },
             fail: (error) => {
               uni.showToast({

pages2/subject/collectBank.vue

@@ -1128,15 +1128,15 @@ export default {
               success_action_status: 200,
             },
             success: (result) => {
-              if (result.statusCode === 200) {
+              // if (result.statusCode === 200) {
                 resolve(ossToken.dir);
-              } else {
-                uni.showToast({
-                  title: "上传失败",
-                  icon: "none",
-                });
-                return;
-              }
+              // } else {
+              //   uni.showToast({
+              //     title: "上传失败",
+              //     icon: "none",
+              //   });
+              //   return;
+              // }
             },
             fail: (error) => {
               uni.showToast({

pages2/subject/collectTypeBank.vue

@@ -1119,15 +1119,15 @@ export default {
               success_action_status: 200,
             },
             success: (result) => {
-              if (result.statusCode === 200) {
+              // if (result.statusCode === 200) {
                 resolve(ossToken.dir);
-              } else {
-                uni.showToast({
-                  title: "上传失败",
-                  icon: "none",
-                });
-                return;
-              }
+              // } else {
+              //   uni.showToast({
+              //     title: "上传失败",
+              //     icon: "none",
+              //   });
+              //   return;
+              // }
             },
             fail: (error) => {
               uni.showToast({

pages2/subject/wrongBank.vue

@@ -1294,15 +1294,15 @@ export default {
               success_action_status: 200,
             },
             success: (result) => {
-              if (result.statusCode === 200) {
+              // if (result.statusCode === 200) {
                 resolve(ossToken.dir);
-              } else {
-                uni.showToast({
-                  title: "上传失败",
-                  icon: "none",
-                });
-                return;
-              }
+              // } else {
+              //   uni.showToast({
+              //     title: "上传失败",
+              //     icon: "none",
+              //   });
+              //   return;
+              // }
             },
             fail: (error) => {
               uni.showToast({

pages2/subject/wrongTypeBank.vue

@@ -1168,15 +1168,15 @@ export default {
               success_action_status: 200,
             },
             success: (result) => {
-              if (result.statusCode === 200) {
+              // if (result.statusCode === 200) {
                 resolve(ossToken.dir);
-              } else {
-                uni.showToast({
-                  title: "上传失败",
-                  icon: "none",
-                });
-                return;
-              }
+              // } else {
+              //   uni.showToast({
+              //     title: "上传失败",
+              //     icon: "none",
+              //   });
+              //   return;
+              // }
             },
             fail: (error) => {
               uni.showToast({

pages2/wd/avatar.vue

@@ -109,16 +109,16 @@
 								success_action_status: 200
 							},
 							success: result => {
-								if (result.statusCode === 200) {
+								// if (result.statusCode === 200) {
 									self.userInfo.avatar = ossToken.dir;
 									resolve();
-								} else {
-									uni.showToast({
-										title: '上传失败',
-										icon: 'none'
-									});
-									return;
-								}
+								// } else {
+								// 	uni.showToast({
+								// 		title: '上传失败',
+								// 		icon: 'none'
+								// 	});
+								// 	return;
+								// }
 							},
 							fail: error => {
 								uni.showToast({

pages2/wd/edu_info.vue

@@ -209,16 +209,16 @@
 								success_action_status: 200
 							},
 							success: result => {
-								if (result.statusCode === 200) {
+								// if (result.statusCode === 200) {
 									self.schoolInfo.studentStatusImg = ossToken.dir;
 									resolve();
-								} else {
-									uni.showToast({
-										title: '上传失败',
-										icon: 'none'
-									});
-									return;
-								}
+								// } else {
+								// 	uni.showToast({
+								// 		title: '上传失败',
+								// 		icon: 'none'
+								// 	});
+								// 	return;
+								// }
 							},
 							fail: error => {
 								uni.showToast({

pages5/examBank/index.vue

@@ -2232,15 +2232,15 @@ export default {
               success_action_status: 200,
             },
             success: (result) => {
-              if (result.statusCode === 200) {
+              // if (result.statusCode === 200) {
                 resolve(ossToken.dir);
-              } else {
-                uni.showToast({
-                  title: "上传失败",
-                  icon: "none",
-                });
-                return;
-              }
+              // } else {
+              //   uni.showToast({
+              //     title: "上传失败",
+              //     icon: "none",
+              //   });
+              //   return;
+              // }
             },
             fail: (error) => {
               uni.showToast({

pages5/mockExam/registrationSuccess.vue

@@ -79,7 +79,7 @@
         </view> -->
         <view class="activity_phone">
             <view class="titles">活动咨询电话</view>
-            <view class="phone_num">020-87085982 / 18565459156</view>
+            <view class="phone_num">020-87085982 / 020-87085983 / 18565459156</view>
         </view>
         <view class="exam_entry">
             参加本次活动，请添加此次活动专属微信号