漏洞修复

src/components/selectClassModal/index.vue

@@ -14,7 +14,7 @@
           class="radio"
           :label="item.gradeId"
           :disabled="
-            item.studentNum > 0 && item.studentNum == item.studentUpper
+            item.studentNumAll > 0 && item.studentNumAll == item.studentUpper
           "
         >
           <div>
@@ -104,6 +104,11 @@ export default {
           goodsId: id
         })
         .then(res => {
+          if(res.rows && res.rows.length > 0){
+            res.rows = res.rows.filter(i => {
+             return !(i.studentNumAll > 0 && i.studentNumAll == i.studentUpper)
+            })
+          }
           self.gradeList = res.rows;
           if (self.gradeList.length == 0) {
             let item = {
@@ -114,7 +119,7 @@ export default {
           } else {
             let isGradeFull = self.gradeList.every(
               item =>
-                item.studentNum > 0 && item.studentNum == item.studentUpper
+                item.studentNumAll > 0 && item.studentNumAll == item.studentUpper
             );
             //所有班级都满了
             if (isGradeFull) {

src/pages/person-center/handle-order/order/index.vue

@@ -17,11 +17,7 @@
             class="el-icon-full-screen full_style"
             @click="fullscreen = !fullscreen"
           ></i>
-          <img
-            src="@/assets/img/Close@2x.png"
-            alt=""
-            @click="close()"
-          />
+          <img src="@/assets/img/Close@2x.png" alt="" @click="close()" />
         </div>
       </div>
       <div>
@@ -96,13 +92,15 @@ export default {
     },
     backData4() {
       this.$emit("backFunc", { handleOrderSn: this.$refs.step2.handleOrderSn });
-      this.close()
+      this.close();
     },
     openBoxs(index, row) {
-      this.fullscreen = false
+      this.fullscreen = false;
       this.visible = true;
       this.active = 0;
+      this.title = "新增";
       if (index == 2) {
+        this.title = "支付";
         this.active = index;
         this.$nextTick(() => {
           this.$refs.step2.comeFunc(row.handleOrderSn);
@@ -110,10 +108,10 @@ export default {
       }
     },
     close() {
-      clearInterval(this.$refs.step2.updateWxImg)
-      this.visible = false
+      clearInterval(this.$refs.step2.updateWxImg);
+      this.visible = false;
       this.active = 0;
-      this.$parent.search()
+      this.$parent.search();
     },
     backData() {
       this.active++;

src/pages/person-center/handle-order/order/step-2/index.vue

@@ -3,7 +3,7 @@
     <el-main v-loading="loading" style="padding:0px 14px;">
       <h2>
         <span style="font-size:16px;">订单详情</span>
-        <el-button type="text">查看</el-button>
+        <el-button type="text" @click="orderSee">查看</el-button>
       </h2>
       <ul class="ul_">
         <li>
@@ -106,17 +106,16 @@
         </div>
       </div>
     </el-main>
-    <public-transfer
-      ref="publicTransfer"
-      @backFunc="backFuncTransfer"
-    />
+    <public-transfer ref="publicTransfer" @backFunc="backFuncTransfer" />
+    <order-detail ref="orderDetail" />
   </div>
 </template>
 
 <script>
+import orderDetail from "../../orderDetail.vue";
 import publicTransfer from "./publicTransfer.vue";
 export default {
-  components: { publicTransfer },
+  components: { publicTransfer,orderDetail },
   data() {
     return {
       orderInfo: {},
@@ -128,6 +127,9 @@ export default {
   },
   mounted() {},
   methods: {
+    orderSee() {
+      this.$refs.orderDetail.openBoxs(this.handleOrderSn);
+    },
     //订单过期
     orderHilarity() {
       //1过期2已支付
@@ -166,7 +168,7 @@ export default {
           } else {
             clearInterval(this.updateWxImg);
             this.$emit("backFunc", 3, res.data.payStatus);
-            this.$refs.publicTransfer.visible = false
+            this.$refs.publicTransfer.visible = false;
           }
         })
         .finally(() => {

src/pages/person-center/handle-order/order/step-2/publicTransfer.vue

@@ -151,10 +151,12 @@ export default {
       var file = e.target.files[0];
       if (file === undefined) {
         self.$set(self.ruleForm, "companyPayImg", "");
+        e.target.value = "";
         return;
       }
       if (file.size > 1 * 1024 * 1024) {
         self.$message.error("图片不得大于1MB");
+        e.target.value = "";
         return;
       }
       var type = e.target.files[0].name
@@ -166,10 +168,10 @@ export default {
         e.target.value = "";
         return;
       }
-      this.$upload.upload(file, 0).then(res => {
-        self.ruleForm.companyPayImg = self.$tools.splitImgHost(res);
+      this.$upload.upload(file, 0, {}, false).then(res => {
+        self.$set(self.ruleForm,'companyPayImg',self.$tools.splitImgHost(res))
         this.$refs["ruleForm"].validateField("companyPayImg");
-      });
+      }).finally(()=>{e.target.value = "";})
     },
     openBoxs(sn, status = true) {
       this.changeStatus = status;
@@ -182,6 +184,9 @@ export default {
       };
       this.visible = true;
       this.getOrderData();
+      this.$nextTick(() => {
+        this.$refs["ruleForm"].clearValidate();
+      });
     },
     getOrderData() {
       this.$request
@@ -199,36 +204,44 @@ export default {
     submitForm() {
       this.$refs["ruleForm"].validate(valid => {
         if (valid) {
-          if (this.orderInfo.payStatus == -2) {
-            this.$request
-              .orderhandleupdateRefuseBo({
-                handleOrderSn: this.handleOrderSn,
-                ...this.ruleForm
-              })
-              .then(res => {
-                this.$message.success("提交成功");
-                this.$emit("backFunc");
-                this.visible = false;
-              })
-              .catch(err => {
-                this.$message.error(err.msg);
-              });
-          } else {
-            this.$request
-              .orderhandleresumePay({
-                payType: 2,
-                handleOrderSn: this.handleOrderSn,
-                ...this.ruleForm
-              })
-              .then(res => {
-                this.$message.success("提交成功");
-                this.$emit("backFunc");
-                this.visible = false;
-              })
-              .catch(err => {
-                this.$message.error(err.msg);
-              });
-          }
+          this.$confirm("确定提交吗?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+            .then(() => {
+              if (this.orderInfo.payStatus == -2) {
+                this.$request
+                  .orderhandleupdateRefuseBo({
+                    handleOrderSn: this.handleOrderSn,
+                    ...this.ruleForm
+                  })
+                  .then(res => {
+                    this.$message.success("提交成功");
+                    this.$emit("backFunc");
+                    this.visible = false;
+                  })
+                  .catch(err => {
+                    this.$message.error(err.msg);
+                  });
+              } else {
+                this.$request
+                  .orderhandleresumePay({
+                    payType: 2,
+                    handleOrderSn: this.handleOrderSn,
+                    ...this.ruleForm
+                  })
+                  .then(res => {
+                    this.$message.success("提交成功");
+                    this.$emit("backFunc");
+                    this.visible = false;
+                  })
+                  .catch(err => {
+                    this.$message.error(err.msg);
+                  });
+              }
+            })
+            .catch(() => {});
         } else {
           console.log("error submit!!");
           return false;
@@ -248,6 +261,7 @@ export default {
         textArea.select();
         document.execCommand("copy");
         document.body.removeChild(textArea);
+        this.$message.success("复制成功")
       };
       func(
         `企业全称：${this.orderInfo.recCompanyName}，开户银行：${
@@ -257,10 +271,11 @@ export default {
           this.orderInfo.recCompanyAccount.slice(
             0,
             6
-          )}（打款时请备注此信息），转账金额：￥${this.orderInfo.payPrice && this.orderInfo.payPrice.toLocaleString(
-          "zh-CN",
-          (undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 })
-        )}`
+          )}（打款时请备注此信息），转账金额：￥${this.orderInfo.payPrice &&
+          this.orderInfo.payPrice.toLocaleString(
+            "zh-CN",
+            (undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 })
+          )}`
       );
     }
   }

src/pages/person-center/handle-order/orderDetail.vue

@@ -21,11 +21,11 @@
         </div>
       </div>
 
-      <p style="font-size:14px;color:#333;">
-        订单编号：<span style="margin-right:14px;color:#007aff;">{{
+      <p style="font-size:14px;color:#333;font-weight:bold;">
+        订单编号：<span style="margin-right:14px;color:#007aff;font-weight:400;">{{
           orderInfo.handleOrderSn
         }}</span
-        >订单状态：<span style="margin-right:14px;color:#007aff;">{{
+        >订单状态：<span style="margin-right:14px;color:#007aff;font-weight:400;">{{
           getPayStatus(orderInfo.payStatus)
         }}</span>
       </p>
@@ -340,4 +340,8 @@ export default {
 /deep/.el-button {
   border-radius: 8px;
 }
+/deep/ .el-descriptions-item__label.is-bordered-label{
+  color: #333;
+  font-weight: bold;
+}
 </style>

src/pages/person-center/index.vue

@@ -128,7 +128,7 @@
                 </router-link>
               </div>
             </div>
-            <div class="nav__section" v-if="false">
+            <div class="nav__section">
               <div class="title">经办订单</div>
               <div class="list">
                 <router-link to="/person-center/handle-order">