修改问题

src/components/Personalcenter/Mycollect.vue

@@ -132,7 +132,10 @@
 
               <div class="order-btn">
                 <div class="price">
-                  ¥<span class="price_num" v-html="item.goods_price_str"></span>
+                  ¥<span
+                    class="price_num"
+                    v-html="changePrice(item.goods_price, 24, 16)"
+                  ></span>
                 </div>
                 <button
                   class="goPay"
@@ -313,11 +316,6 @@ export default {
               let obj = this.handleGoodsType(item.goods_type);
               item.className = obj.className;
               item.goods_type_root_name = obj.rootName;
-
-              let goods_price = this.handlePrice(item.goods_price);
-              item.goods_price_str = goods_price.price_str;
-              //item.goods_price = goods_price.price;
-
               // if (item.discount_money) {
               //   let dis_price = this.handlePrice(item.goods_price);
               //   item.discount_money = dis_price.price;
@@ -343,21 +341,7 @@ export default {
           _this.loading = false;
         });
     },
-    handlePrice(price) {
-      let priceArr = price.toString().split(".");
-      if (priceArr.length > 1 && priceArr[1]) {
-      } else {
-        price = priceArr[0] + ".00";
-      }
-      let price_str = this.handlePrice2(price);
-      return { price: price, price_str: price_str };
-    },
-    handlePrice2(price) {
-      price = price.toString();
-      let arr = price.split(".");
-      let str = `<span style="font-size:24px;">${arr[0]}</span>.<span style="font-size:16px;">${arr[1]}</span>`;
-      return str;
-    },
+
     handleGoodsType(type) {
       let className = "",
         rootName = "";
@@ -470,6 +454,7 @@ export default {
     reOrder(item) {
       this.isConfirmorder = true;
       this.goods_Data = item;
+
       console.log(this.goods_Data);
     },
     closeConfirmorder() {
@@ -490,6 +475,19 @@ export default {
       }
       this.getMyCollectionList();
     },
+    changePrice(price, fontSize1, fontSize2) {
+      price = price ? price : 0;
+      price = price.toFixed(2);
+      price = price.toString();
+      let arr = price.split(".");
+      let str = `<span style="font-size: ${fontSize1 ? fontSize1 : 16}px;">${
+        arr[0]
+      }</span>.<span style="font-size: ${fontSize2 ? fontSize2 : 16}px;">${
+        arr[1]
+      }</span>`;
+
+      return str;
+    },
   },
   //生命周期 - 创建完成（可以访问当前this实例）
   created() {},

src/components/Personalcenter/OrderManage.vue

@@ -77,8 +77,8 @@
                     'middle-con-p1',
                     language_type == 'AR' ? 'textLeft' : '',
                   ]"
-                  >¥{{ item.price }}</span
-                >
+                  >¥<span v-html="changePrice(item.price, 14, 14)"></span
+                ></span>
               </div>
               <div class="middle-con middle-con-discount">
                 <!-- 折扣 -->
@@ -88,8 +88,10 @@
                     'middle-con-p1',
                     language_type == 'AR' ? 'textLeft' : '',
                   ]"
-                  >¥{{ item.discount_money }}</span
-                >
+                  >¥<span
+                    v-html="changePrice(item.discount_money, 14, 14)"
+                  ></span
+                ></span>
                 <template v-if="item.discount_code">
                   <!-- 已使用优惠码 -->
                   <el-tooltip
@@ -114,8 +116,10 @@
                     'middle-con-p2',
                     language_type == 'AR' ? 'textLeft' : '',
                   ]"
-                  >¥{{ item.receivables_money }}</span
-                >
+                  >¥<span
+                    v-html="changePrice(item.receivables_money, 14, 14)"
+                  ></span
+                ></span>
               </div>
             </div>
             <div class="main-content-right">
@@ -497,18 +501,18 @@ export default {
       this.getOrderList();
     },
     // 处理价格
-    changePrice(type, item) {
-      if (item.indexOf(".") != -1) {
-        if (type == 1) {
-          return item.split(".")[0];
-        } else if (type == 2) {
-          return "." + item.split(".")[1];
-        }
-      } else {
-        if (type == 1) {
-          return item;
-        }
-      }
+    changePrice(price, fontSize1, fontSize2) {
+      price = price ? price : 0;
+      price = price.toFixed(2);
+      price = price.toString();
+      let arr = price.split(".");
+      let str = `<span style="font-size: ${fontSize1 ? fontSize1 : 16}px;">${
+        arr[0]
+      }</span>.<span style="font-size: ${fontSize2 ? fontSize2 : 16}px;">${
+        arr[1]
+      }</span>`;
+
+      return str;
     },
   },
   //生命周期 - 创建完成（可以访问当前this实例）

src/components/Personalcenter/Traincourse.vue

@@ -67,11 +67,11 @@ export default {
           name: this.$t("Key110"), //"全部",
         },
         {
-          code: "[301]",
+          code: "[302]",
           name: this.$t("Key74"), //"视频",
         },
         {
-          code: "[302]",
+          code: "[301]",
           name: this.$t("Key75"), // "直播",
         },
         {

src/components/common/Confirmorder.vue

@@ -15,8 +15,12 @@
         <p class="p3">{{ data.goods_person_name_desc }}</p>
       </div>
       <div class="price">
-        <p v-if="data.price">¥{{ data.price }}</p>
-        <p v-if="data.goods_price">¥{{ data.goods_price }}</p>
+        <p v-if="data.hasOwnProperty('price')">
+          ¥<span v-html="changePrice(data.price, 16)"></span>
+        </p>
+        <p v-if="data.hasOwnProperty('goods_price')">
+          ¥<span v-html="changePrice(data.goods_price, 16)"></span>
+        </p>
       </div>
     </div>
     <div class="promotionCode">
@@ -36,26 +40,36 @@
         v-if="isShow"
         >{{ $t("Key94") }}</span
       >
-      <span class="sp2" v-else>-{{ discount_money }}</span>
+      <template v-else>
+        <span class="sp2" v-if="discount_code_status == 1"
+          >-<span v-html="changePrice(discount_money, 16)"></span
+        ></span>
+      </template>
     </div>
     <div class="total">
       <p class="p1">
         <!-- 一件商品，总金额 -->
         <span>{{ $t("Key53") }}： </span>
-        <span class="co-value" v-if="data.price">¥{{ data.price }}</span>
-        <span class="co-value" v-if="data.goods_price"
-          >¥{{ data.goods_price }}</span
-        >
+        <span class="co-value" v-if="data.hasOwnProperty('price')"
+          >¥<span v-html="changePrice(data.price, 16)"></span
+        ></span>
+        <span class="co-value" v-if="data.hasOwnProperty('goods_price')"
+          >¥<span v-html="changePrice(data.goods_price, 16)"></span
+        ></span>
       </p>
       <p class="p2">
         <!-- 优惠折扣 -->
         <span>{{ $t("Key54") }}： </span>
-        <span class="co-value">-¥{{ discount_money }}</span>
+        <span class="co-value"
+          >-¥<span v-html="changePrice(discount_money, 16)"></span
+        ></span>
       </p>
       <p class="p3">
         <!-- 应付 -->
         <span>{{ $t("Key55") }}： </span>
-        <span class="co-value">¥{{ receivables_money }}</span>
+        <span class="co-value"
+          >¥<span v-html="changePrice(receivables_money, 24)"></span
+        ></span>
       </p>
     </div>
     <div class="submitBtn">
@@ -74,8 +88,9 @@ export default {
     //这里存放数据
     return {
       discount_code: "", //优惠码
-      discount_money: "0.00", // 优惠金额
+      discount_money: 0, // 优惠金额
       receivables_money: "", // 应收款
+      discount_code_status: 0, //优惠码状态
       back_discount_code: "",
       isShow: true,
       loading: false,
@@ -118,7 +133,7 @@ export default {
     //更改优惠码
     changeCode() {
       this.isShow = true;
-      this.discount_money = "0.00";
+      this.discount_money = 0;
       this.receivables_money = this.data.hasOwnProperty("price")
         ? this.data.price
         : this.data.goods_price;
@@ -126,7 +141,7 @@ export default {
     clearData() {
       this.isShow = true;
       this.discount_code = "";
-      this.discount_money = "0.00";
+      this.discount_money = 0;
       this.receivables_money = this.data.hasOwnProperty("price")
         ? this.data.price
         : this.data.goods_price;
@@ -155,13 +170,35 @@ export default {
         discount_code: this.discount_code.trim(),
       };
       getLearnWebContent(MethodName, data).then((res) => {
-        this.isShow = false;
         this.codeloading = false;
-        this.back_discount_code = res.discount_code;
-        this.discount_money = res.discount_money; // 优惠金额
-        this.receivables_money = res.receivables_money; // 应收款
+        this.discount_code_status = res.discount_code_status;
+        if (this.discount_code_status != 1 && this.discount_code_status != 2) {
+          this.$message.warning("优惠码无效");
+        } else {
+          if (this.discount_code_status == 2) {
+            this.$message.warning("优惠码已被使用");
+          } else {
+            this.isShow = false;
+            this.back_discount_code = res.discount_code;
+            this.discount_money = res.discount_money; // 优惠金额
+            this.receivables_money = res.receivables_money; // 应收款
+          }
+        }
       });
     },
+    changePrice(price, fontSize1, fontSize2) {
+      price = price ? price : 0;
+      price = price.toFixed(2);
+      price = price.toString();
+      let arr = price.split(".");
+      let str = `<span style="font-size: ${fontSize1 ? fontSize1 : 16}px;">${
+        arr[0]
+      }</span>.<span style="font-size: ${fontSize2 ? fontSize2 : 16}px;">${
+        arr[1]
+      }</span>`;
+
+      return str;
+    },
   },
   //生命周期 - 创建完成（可以访问当前this实例）
   created() {},

src/components/common/Modifymail.vue

@@ -67,7 +67,7 @@
               </button>
               <button
                 type="button"
-                @click.prevent="dialogVisible = false"
+                @click.prevent="cancleForm"
                 class="footer-btn-cancle"
               >
                 <!-- 取消 -->
@@ -84,7 +84,7 @@
 <script>
 import { getContent, getStaticContent } from "@/api/ajax";
 import Cookies from "js-cookie";
-import { removeToken } from "@/utils/auth";
+import { removeToken, removeConfig } from "@/utils/auth";
 import { mapGetters } from "vuex";
 export default {
   name: "Modifymailbox",
@@ -201,7 +201,6 @@ export default {
           phone_or_email: this_.ruleForm.email_new,
         };
         getStaticContent(MethodName, data).then((res) => {
-          console.log(res);
           timer = setInterval(() => {
             this_.time--;
             if (this_.time == 0) {
@@ -216,6 +215,10 @@ export default {
         this_.$message.warning(this.$t("Key508"));
       }
     },
+    cancleForm() {
+      this.$message.close();
+      this.dialogVisible = false;
+    },
     submitForm() {
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {
@@ -227,6 +230,7 @@ export default {
       });
     },
     onSubmit() {
+      let _this = this;
       let MethodName = "user_manager-UpdateMyEmail";
       let data = {
         email_old: this.ruleForm.email_old,
@@ -239,11 +243,17 @@ export default {
         this.$message.success(this.$t("Key507"));
         setTimeout(() => {
           removeToken();
+          removeConfig();
           Cookies.remove("userMessage");
           Cookies.remove("session_id");
           Cookies.remove("user_code");
           Cookies.remove("user_type");
-          this.$router.replace({ path: "/login" });
+
+          if (process.env.NODE_ENV === "development") {
+            _this.$router.replace({ path: "/login" });
+          } else {
+            window.location.href = "/";
+          }
         }, 1000);
       });
     },

src/components/common/Modifypassword.vue

@@ -125,7 +125,7 @@
 <script>
 import { getContent } from "@/api/ajax";
 import Cookies from "js-cookie";
-import { removeToken } from "@/utils/auth";
+import { removeConfig, removeToken } from "@/utils/auth";
 
 export default {
   name: "Modifymailbox",
@@ -135,8 +135,6 @@ export default {
       let _this = this;
       if (value === "") {
         callback(new Error(this.$t("Key482"))); //
-      } else if (value == _this.ruleForm.password) {
-        callback(new Error(_this.$t("Key210"))); //"新旧密码一致!"
       } else {
         callback();
       }
@@ -152,7 +150,7 @@ export default {
           callback(new Error(_this.$t("Key488")));
         } else {
           if (this.ruleForm.oldpassword !== "") {
-            this.$refs.ruleForm.validateField("oldpassword");
+            // this.$refs.ruleForm.validateField("oldpassword");
             if (value == _this.ruleForm.oldpassword) {
               callback(new Error(_this.$t("Key210")));
             }
@@ -285,6 +283,7 @@ export default {
       });
     },
     onSubmit() {
+      let _this = this;
       let MethodName = "user_manager-UpdateMyPassword";
       let data = {
         password_old: this.ruleForm.oldpassword,
@@ -296,11 +295,16 @@ export default {
         this.$message.success(this.$t("Key490"));
         setTimeout(() => {
           removeToken();
+          removeConfig();
           Cookies.remove("userMessage");
           Cookies.remove("session_id");
           Cookies.remove("user_code");
           Cookies.remove("user_type");
-          this.$router.replace({ path: "/login" });
+          if (process.env.NODE_ENV === "development") {
+            _this.$router.replace({ path: "/login" });
+          } else {
+            window.location.href = "/";
+          }
         }, 1000);
       });
     },

src/components/common/Modifyphone.vue

@@ -10,7 +10,7 @@
       <div class="registration2">
         <div class="form">
           <el-form ref="ruleForm" :model="ruleForm" :rules="rules">
-            <el-form-item prop="email_old">
+            <el-form-item prop="phone_old">
               <span slot="label" class="lable">
                 <img src="../../assets/login/singin6.png" alt="" />
                 <!-- 旧手机号 -->
@@ -83,7 +83,7 @@
 <script>
 import { getContent, getStaticContent } from "@/api/ajax";
 import Cookies from "js-cookie";
-import { removeToken } from "@/utils/auth";
+import { removeConfig, removeToken } from "@/utils/auth";
 export default {
   name: "Modifyphone",
   components: {},
@@ -91,14 +91,14 @@ export default {
     var validateOld = (rule, value, callback) => {
       let _this = this;
       if (value === "") {
-        callback(new Error(_this.$t("Key97"))); //请输入旧手机号
+        callback(new Error(_this.$t("Key492"))); //请输入旧手机号
       } else {
-        if (value == _this.ruleForm.phone_new) {
-          // 新旧手机号一致!
-          callback(new Error(_this.$t("Key491")));
-        } else {
-          callback();
-        }
+        // if (value == _this.ruleForm.phone_new) {
+        //   // 新旧手机号一致!
+        //   callback(new Error(_this.$t("Key491")));
+        // } else {
+        // }
+        callback();
       }
     };
     var validateNew = (rule, value, callback) => {
@@ -107,13 +107,16 @@ export default {
         // 手机号不能为空
         callback(new Error(_this.$t("Key492")));
       } else {
-        if (_this.ruleForm.phone_old) {
-          this.$refs.ruleForm.validateField("phone_old");
+        if (_this.ruleForm.phone_old == value) {
+          //this.$refs.ruleForm.validateField("phone_old");
+          callback(new Error(_this.$t("Key491")));
+        } else {
+          callback();
         }
-        callback();
       }
     };
     var validateCode = (rule, value, callback) => {
+      let _this = this;
       if (value === "") {
         // "验证码不能为空"
         callback(new Error(_this.$t("Key493")));
@@ -203,6 +206,7 @@ export default {
       });
     },
     onSubmit() {
+      let _this = this;
       let MethodName = "user_manager-UpdateMyPhone";
       let data = {
         phone_old: this.ruleForm.phone_old,
@@ -215,11 +219,16 @@ export default {
         this.$message.success(this.$t("Key495"));
         setTimeout(() => {
           removeToken();
+          removeConfig();
           Cookies.remove("userMessage");
           Cookies.remove("session_id");
           Cookies.remove("user_code");
           Cookies.remove("user_type");
-          this.$router.replace({ path: "/login" });
+          if (process.env.NODE_ENV === "development") {
+            _this.$router.replace({ path: "/login" });
+          } else {
+            window.location.href = "/";
+          }
         }, 1000);
       });
     },

src/components/common/Payment.vue

@@ -15,8 +15,12 @@
         <p class="p3">{{ data.goods_person_name_desc }}</p>
       </div>
       <div class="price">
-        <p v-if="data.price">¥{{ data.price }}</p>
-        <p v-if="data.goods_price">¥{{ data.goods_price }}</p>
+        <p v-if="data.price">
+          ¥<span v-html="changePrice(data.price, 16)"></span>
+        </p>
+        <p v-if="data.goods_price">
+          ¥<span v-html="changePrice(data.goods_price, 16)"></span>
+        </p>
       </div>
     </div>
     <div class="pay-platform">
@@ -37,15 +41,19 @@
       <p class="p1">
         <!-- 一件商品，总金额 -->
         <span> {{ $t("Key53") }}： </span>
-        <span class="co-value" v-if="data.price">¥{{ data.price }}</span>
+        <span class="co-value" v-if="data.price"
+          >¥<span v-html="changePrice(data.price, 16)"></span
+        ></span>
         <span class="co-value" v-if="data.goods_price"
-          >¥{{ data.goods_price }}</span
-        >
+          >¥<span v-html="changePrice(data.goods_price, 16)"></span
+        ></span>
       </p>
       <p class="p2">
         <!-- 优惠折扣 -->
         <span> {{ $t("Key54") }}： </span>
-        <span class="co-value">-¥{{ data.discount_money }}</span>
+        <span class="co-value"
+          >-¥<span v-html="changePrice(data.discount_money, 16)"></span
+        ></span>
       </p>
       <p class="p4">
         <span></span>
@@ -59,7 +67,9 @@
       <p class="p3">
         <!-- 应付： -->
         <span> {{ $t("Key55") }}： </span>
-        <span class="co-value">¥{{ data.receivables_money }}</span>
+        <span class="co-value"
+          >¥<span v-html="changePrice(data.receivables_money, 24)"></span
+        ></span>
       </p>
     </div>
     <div class="submitBtn">
@@ -122,6 +132,19 @@ export default {
           this.judgePayResult(false);
         });
     },
+    changePrice(price, fontSize1, fontSize2) {
+      price = price ? price : 0;
+      price = price.toFixed(2);
+      price = price.toString();
+      let arr = price.split(".");
+      let str = `<span style="font-size: ${fontSize1 ? fontSize1 : 16}px;">${
+        arr[0]
+      }</span>.<span style="font-size: ${fontSize2 ? fontSize2 : 16}px;">${
+        arr[1]
+      }</span>`;
+
+      return str;
+    },
   },
   //生命周期 - 创建完成（可以访问当前this实例）
   created() {},