gcj 2 lat temu
rodzic
commit
7a5e1bad11

+ 7 - 6
src/components/pyment/Confirmorder.vue

@@ -19,12 +19,12 @@
       </div>
       </div>
     </div>
     </div>
     <div class="promotionCode">
     <div class="promotionCode">
-      <span class="sp1"> <!-- 使用优惠码 -->{{ this.$t("Key475") }} </span>
-      <!-- 请输入兑换码 -->
+      <span class="sp1"> <!-- 使用授权码 -->{{ this.$t("Key791") }} </span>
+      <!-- 请输入授权码  -->
       <input
       <input
         v-model="discount_code"
         v-model="discount_code"
         type="text"
         type="text"
-        :placeholder="$t('Key109')"
+        :placeholder="$t('Key792')"
         @input="changeCode"
         @input="changeCode"
         maxlength="20"
         maxlength="20"
       />
       />
@@ -46,16 +46,17 @@
     <div class="total">
     <div class="total">
       <p class="p1">
       <p class="p1">
         <span>
         <span>
-          <!-- 一件商品,总金额:  -->
+          <!-- 一件商品,总金额不要了  -->
+          <!-- 金额  -->
 
 
-          {{ $t("Key53") }}:</span
+          {{ $t("Key790") }}:</span
         >
         >
 
 
         <span class="co-value"
         <span class="co-value"
           >¥<span v-html="changePrice(data.price, 16)"></span
           >¥<span v-html="changePrice(data.price, 16)"></span
         ></span>
         ></span>
       </p>
       </p>
-      <p class="p2">
+      <p class="p2" v-if="1 == 2">
         <span>
         <span>
           <!-- 优惠折扣 -->
           <!-- 优惠折扣 -->
           {{ $t("Key54") }}:</span
           {{ $t("Key54") }}:</span

+ 16 - 9
src/components/pyment/Payment.vue

@@ -15,7 +15,7 @@
         <p class="p3">{{ data.author }}</p>
         <p class="p3">{{ data.author }}</p>
       </div>
       </div>
       <div class="price">
       <div class="price">
-        <p>¥<span v-html="changePrice(data.price,16,16)"></span></p>
+        <p>¥<span v-html="changePrice(data.price, 16, 16)"></span></p>
       </div>
       </div>
     </div>
     </div>
     <div class="pay-platform">
     <div class="pay-platform">
@@ -34,19 +34,24 @@
     <div class="total">
     <div class="total">
       <p class="p1">
       <p class="p1">
         <span>
         <span>
-          <!-- 一件商品,总金额:  -->
-          {{ $t("Key53") }}:</span
+          <!-- 金额:  -->
+          <!-- 一件商品,总金额:不要 $t("Key53") -->
+          {{ $t("Key790") }}:</span
         >
         >
-        <span class="co-value">¥<span v-html="changePrice(data.price,16)"></span></span>
+        <span class="co-value"
+          >¥<span v-html="changePrice(data.price, 16)"></span
+        ></span>
       </p>
       </p>
-      <p class="p2">
+      <p class="p2" v-if="1 == 2">
         <span>
         <span>
           <!-- 优惠折扣 -->
           <!-- 优惠折扣 -->
           {{ $t("Key54") }}:
           {{ $t("Key54") }}:
         </span>
         </span>
-        <span class="co-value">-¥<span v-html="changePrice(data.discount_money ,16)"></span></span>
+        <span class="co-value"
+          >-¥<span v-html="changePrice(data.discount_money, 16)"></span
+        ></span>
       </p>
       </p>
-      <p class="p4">
+      <p class="p4" v-if="1 == 2">
         <span></span>
         <span></span>
         <span class="co-value useCode">
         <span class="co-value useCode">
           <!-- "没使用优惠码" -->
           <!-- "没使用优惠码" -->
@@ -58,7 +63,9 @@
           <!-- 应付  -->
           <!-- 应付  -->
           {{ $t("Key55") }}:
           {{ $t("Key55") }}:
         </span>
         </span>
-        <span class="co-value">¥<span v-html="changePrice(data.receivables_money ,24)"></span></span>
+        <span class="co-value"
+          >¥<span v-html="changePrice(data.receivables_money, 24)"></span
+        ></span>
       </p>
       </p>
     </div>
     </div>
     <div class="submitBtn">
     <div class="submitBtn">
@@ -346,7 +353,7 @@ export default {
     button {
     button {
       min-width: 120px;
       min-width: 120px;
       box-sizing: border-box;
       box-sizing: border-box;
-      padding:0 16px;
+      padding: 0 16px;
       font-size: 16px;
       font-size: 16px;
       height: 40px;
       height: 40px;
       background: #ff4d00;
       background: #ff4d00;

+ 35 - 22
src/views/TextbookDetail.vue

@@ -23,13 +23,21 @@
               <p class="p2">{{ TextbookData.org_name }}</p>
               <p class="p2">{{ TextbookData.org_name }}</p>
               <p class="p2">{{ TextbookData.author }}</p>
               <p class="p2">{{ TextbookData.author }}</p>
               <div class="text-description" v-if="TextbookData.description">
               <div class="text-description" v-if="TextbookData.description">
-                <p class="p3" :class="[showdecri?'':'overflow']">
-                    {{ TextbookData.description }}
+                <p class="p3" :class="[showdecri ? '' : 'overflow']">
+                  {{ TextbookData.description }}
                 </p>
                 </p>
-                <a class="showdecri" @click="showdecri=!showdecri">{{!showdecri?'...展开':'收起'}}</a>
+                <a class="showdecri" @click="showdecri = !showdecri">{{
+                  !showdecri ? "...展开" : "收起"
+                }}</a>
               </div>
               </div>
               <div class="operation">
               <div class="operation">
-                <span class="price" v-if="TextbookData.price>0&&TextbookData.is_free_license=='false'">
+                <span
+                  class="price"
+                  v-if="
+                    TextbookData.price > 0 &&
+                    TextbookData.is_free_license == 'false'
+                  "
+                >
                   ¥<span
                   ¥<span
                     class="price_1"
                     class="price_1"
                     v-html="changePrice(TextbookData.price, 24, 16)"
                     v-html="changePrice(TextbookData.price, 24, 16)"
@@ -375,7 +383,7 @@ export default {
       fileListAudio: [], // 教材资源视频数组
       fileListAudio: [], // 教材资源视频数组
       fileListOtheraudio: [],
       fileListOtheraudio: [],
       fileListDoc: [], // 教材资源视频数组
       fileListDoc: [], // 教材资源视频数组
-      showdecri:false, // 展开描述
+      showdecri: false, // 展开描述
     };
     };
   },
   },
   //计算属性 类似于data概念
   //计算属性 类似于data概念
@@ -460,7 +468,9 @@ export default {
     // 购买
     // 购买
     getPurchase() {
     getPurchase() {
       if (this.bookIsBuy == "true") {
       if (this.bookIsBuy == "true") {
-        this.$router.push("/courseview?bookId=" + this.TextBookId+"&showCourse=true");
+        this.$router.push(
+          "/courseview?bookId=" + this.TextBookId + "&showCourse=true"
+        );
       } else {
       } else {
         this.NopymentShow = true;
         this.NopymentShow = true;
       }
       }
@@ -694,6 +704,9 @@ export default {
         "Key741",
         "Key741",
         "Key742",
         "Key742",
         "Key743",
         "Key743",
+        "Key790",
+        "Key791",
+        "Key792",
       ],
       ],
     });
     });
     this.isData = true;
     this.isData = true;
@@ -858,30 +871,30 @@ export default {
           line-height: 150%;
           line-height: 150%;
           color: #ffffff;
           color: #ffffff;
         }
         }
-        .text-description{
-            position: relative;
+        .text-description {
+          position: relative;
         }
         }
         .p3 {
         .p3 {
           font-weight: normal;
           font-weight: normal;
           font-size: 16px;
           font-size: 16px;
           line-height: 150%;
           line-height: 150%;
           color: #ffffff;
           color: #ffffff;
-          &.overflow{
-            overflow:hidden;
-            text-overflow:ellipsis;
-            display:-webkit-box;
-            -webkit-box-orient:vertical;
-            -webkit-line-clamp:2;
+          &.overflow {
+            overflow: hidden;
+            text-overflow: ellipsis;
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 2;
           }
           }
         }
         }
-        .showdecri{
-            color: #DEEBFF;
-            background: #6e767c;
-            font-size: 16px;
-            line-height: 150%;
-            position: absolute;
-            right: 0;
-            bottom: 0;
+        .showdecri {
+          color: #deebff;
+          background: #6e767c;
+          font-size: 16px;
+          line-height: 150%;
+          position: absolute;
+          right: 0;
+          bottom: 0;
         }
         }
         .price {
         .price {
           font-size: 24px;
           font-size: 24px;