pay

package-lock.json

@@ -1717,16 +1717,6 @@
           "integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=",
           "dev": true
         },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz",
-          "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
         "cacache": {
           "version": "13.0.1",
           "resolved": "https://registry.npm.taobao.org/cacache/download/cacache-13.0.1.tgz",
@@ -1753,53 +1743,6 @@
             "unique-filename": "^1.1.1"
           }
         },
-        "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.1.tgz?cache=0&sync_timestamp=1618995276689&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-4.1.1.tgz",
-          "integrity": "sha1-yAs/qyi/Y3HmhjMl7uZ+YYt35q0=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
-          "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz",
-          "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-          "dev": true,
-          "optional": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-4.0.0.tgz",
-          "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-          "dev": true,
-          "optional": true
-        },
-        "loader-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
-          "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz?cache=0&sync_timestamp=1598275560784&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsource-map%2Fdownload%2Fsource-map-0.6.1.tgz",
@@ -1816,16 +1759,6 @@
             "minipass": "^3.1.1"
           }
         },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.nlark.com/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1622294050362&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz",
-          "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
         "terser-webpack-plugin": {
           "version": "2.3.8",
           "resolved": "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-2.3.8.tgz",
@@ -1842,18 +1775,6 @@
             "terser": "^4.6.12",
             "webpack-sources": "^1.4.3"
           }
-        },
-        "vue-loader-v16": {
-          "version": "npm:vue-loader@16.2.0",
-          "resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-16.2.0.tgz",
-          "integrity": "sha1-BGpTMI3Ufljv4g3ewe3sAnzjtG4=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "chalk": "^4.1.0",
-            "hash-sum": "^2.0.0",
-            "loader-utils": "^2.0.0"
-          }
         }
       }
     },
@@ -11936,6 +11857,87 @@
         }
       }
     },
+    "vue-loader-v16": {
+      "version": "npm:vue-loader@16.5.0",
+      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.5.0.tgz",
+      "integrity": "sha512-WXh+7AgFxGTgb5QAkQtFeUcHNIEq3PGVQ8WskY5ZiFbWBkOwcCPRs4w/2tVyTbh2q6TVRlO3xfvIukUtjsu62A==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "chalk": "^4.1.0",
+        "hash-sum": "^2.0.0",
+        "loader-utils": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true,
+          "optional": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true,
+          "optional": true
+        },
+        "loader-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
     "vue-pdf": {
       "version": "4.2.0",
       "resolved": "https://registry.npm.taobao.org/vue-pdf/download/vue-pdf-4.2.0.tgz",

src/components/payment/Confirmorder.vue

@@ -40,7 +40,7 @@
         v-if="isShow"
         >确定</span
       >
-      <span class="sp2" v-else>{{ discount_money }}</span>
+      <span class="sp2" v-else>-{{ discount_money }}</span>
     </div>
     <div class="total">
       <p class="p1">
@@ -49,10 +49,7 @@
       </p>
       <p class="p2">
         <span> 优惠折扣： </span>
-        <span
-          v-text="changediscount_money(this.discount_money)"
-          class="co-value"
-        ></span>
+        <span class="co-value">-¥{{ discount_money }}</span>
       </p>
       <p class="p3">
         <span> 应付： </span>
@@ -77,7 +74,7 @@ export default {
     //这里存放数据
     return {
       discount_code: "", //优惠码
-      discount_money: 0.0, // 优惠金额
+      discount_money: "0.00", // 优惠金额
       receivables_money: this.data.price, // 应收款
       loading: false,
       codeloading: false,
@@ -136,7 +133,6 @@ export default {
         discount_code: this.back_discount_code,
       })
         .then((res) => {
-          console.log(res);
           this.changeOrderNumber(
             res.id,
             this.back_discount_code,
@@ -153,6 +149,13 @@ export default {
     //更改优惠码
     changeCode() {
       this.isShow = true;
+      this.receivables_money = this.data.price;
+      this.discount_money = "0.00";
+    },
+    clearData() {
+      this.discount_code = "";
+      this.discount_money = "0.00";
+      this.receivables_money = this.data.price;
     },
     //验证优惠码
     verifyCode() {
@@ -171,6 +174,7 @@ export default {
       };
       LearnWebSI(MethodName, data).then((res) => {
         this.codeloading = false;
+        this.isShow = false;
         this.back_discount_code = res.discount_code;
         this.discount_money = res.discount_money; // 优惠金额
         this.receivables_money = res.receivables_money; // 应收款
@@ -201,7 +205,7 @@ export default {
 /* @import url(); 引入css类 */
 .Nopyment {
   .message {
-    width: 656px;
+    width: 100%;
     height: 152px;
     background: rgba(70, 70, 70, 0.03);
     border-radius: 8px;
@@ -250,6 +254,7 @@ export default {
       .p3 {
         margin-top: 10px;
       }
+      
     }
     .price {
       p {
@@ -341,4 +346,4 @@ export default {
     }
   }
 }
-</style>
+</style>

src/components/payment/Payment.vue

@@ -45,15 +45,19 @@
       </p>
       <p class="p2">
         <span> 优惠折扣： </span>
-          <span
-            v-text="changediscount_money(this.discount_money)"
-            class="co-value"
-          ></span>
+        <span
+          v-text="changediscount_money(this.discount_money)"
+          class="co-value"
+        ></span>
       </p>
       <p class="p4">
         <span></span>
         <span class="co-value useCode">
-          {{ data.discount_code ? data.discount_code : "没使用优惠码" }}
+          {{
+            data.discount_code
+              ? "优惠码：" + data.discount_code
+              : "未使用优惠码"
+          }}
         </span>
       </p>
       <p class="p3">
@@ -156,7 +160,9 @@ export default {
   //生命周期 - 创建完成（可以访问当前this实例）
   created() {},
   //生命周期 - 挂载完成（可以访问DOM元素）
-  mounted() {},
+  mounted() {
+    console.log(this.data);
+  },
   //生命周期-创建之前
   beforeCreated() {},
   //生命周期-挂载之前
@@ -177,11 +183,12 @@ export default {
 /* @import url(); 引入css类 */
 .Nopyment {
   .message {
-    width: 656px;
+    width: 100%;
     height: 152px;
     background: rgba(70, 70, 70, 0.03);
     border-radius: 8px;
     display: flex;
+    margin-bottom: 24px;
     img {
       width: 120px;
       height: 120px;
@@ -291,7 +298,7 @@ export default {
       }
     }
     .p2 {
-      margin: 16px 0 10px;
+      margin: 16px 0 8px;
     }
     .p3 {
       > span {
@@ -302,6 +309,9 @@ export default {
         color: #ff4c00;
       }
     }
+    .p4 {
+      margin-bottom: 16px;
+    }
   }
   .submitBtn {
     text-align: right;

src/views/teacher-dev/Preview.vue

@@ -83,12 +83,14 @@
     >
       <div class="dialogTitle" slot="title">商品详情</div>
       <Confirmorder
+        ref="Confirmorder"
         :data="data"
         :goods_type="401"
         :changeOrderNumber="changeOrderNumber"
       />
     </el-dialog>
     <el-dialog
+      top="50px"
       :title="'订单号：' + orderNumber"
       :visible.sync="PymentShow"
       width="720px"
@@ -184,6 +186,7 @@ export default {
     },
     closeNoPyment() {
       this.NopymentShow = false;
+      this.$refs.Confirmorder.clearData();
     },
     closePyment(str) {
       this.PymentShow = false;
@@ -305,7 +308,7 @@ export default {
             });
             this.data.fileType = this.data.tag[this.data.tag.length - 1];
             this.attachment = JSON.parse(res.data.result.attachment);
-            this.changePrice(this.data.price)
+            this.changePrice(this.data.price);
             this.loading = false;
             if (this.attachment[0].fileType == "pdf") {
               // this.attachment[0].fileRelativePath =
@@ -488,4 +491,11 @@ export default {
   .dialogTitle {
   }
 }
+</style>
+<style lang="scss">
+.tarcer-dev-Preview {
+  .el-dialog__body {
+    padding: 30px 32px;
+  }
+}
 </style>