Browse Source

激活码 文本分析入口 连线

natasha 2 years ago
parent
commit
24cd32d868

+ 18 - 19
src/components/Adult/preview/DialogueArticleViewChs/index.vue

@@ -12,7 +12,7 @@
       <div
         class="left"
         @click="submit"
-        :style="{ marginLeft: showPractice ? '97px' : '' }"
+        :style="{ marginLeft: showPractice ? '97px' : '',zIndex:'-1' }"
       >
         <img src="../../../../assets/NPC/wbfx-icon.png" alt="" />
         文本分析
@@ -147,7 +147,7 @@ export default {
     "colorBox",
     "themeColor",
     "currentTreeID",
-    "TaskModel",
+    "TaskModel"
   ],
   components: { NormalModelChs, Practice, WordModel, PhraseModel },
   data() {
@@ -167,22 +167,22 @@ export default {
         isShowEN: false,
         isHasEN: false,
         isShowPY: false,
-        isHasPY: false,
+        isHasPY: false
       },
       userAnswer: {
         normalModel: {
-          recordList: [],
+          recordList: []
         },
         writeModel: {}, //生词/取词模式
         practiceModel: {}, //练习模式
         wordModel: {
-          recordList: [],
-        },
-      },
+          recordList: []
+        }
+      }
     };
   },
   computed: {
-    activeColor: function () {
+    activeColor: function() {
       let color = "";
       if (this.themeColor == "red") {
         color = "#DE4444";
@@ -193,7 +193,7 @@ export default {
       }
 
       return color;
-    },
+    }
   },
   watch: {},
   //方法集合
@@ -203,21 +203,21 @@ export default {
         lock: true,
         text: "Loading",
         spinner: "el-icon-loading",
-        background: "rgba(0, 0, 0, 0.7)",
+        background: "rgba(0, 0, 0, 0.7)"
       });
       console.log(this.curQue);
       analysSubmit({
         tenantId: "",
-        text: this.curQue.article,
+        text: this.curQue.article
       })
-        .then((res) => {
+        .then(res => {
           window.open(
             process.env.VUE_APP_BASE_API +
               `/GCLS-TC/#/textanalysis/Result?partitionKey=${res.data.result.partitionKey}&subjectWords=${res.data.result.subjectWords}&wordTextCount=${res.data.result.textCount}&wordCount=${res.data.result.wordCount}&vocabularyTextCount=${res.data.result.vocabularyTextCount}&vocabularyCount=${res.data.result.vocabularyCount}&pinyinCount=${res.data.result.pinyinCount}&pinyinTextCount=${res.data.result.pinyinTextCount}&pinyinDifficulty=${res.data.result.pinyinDifficulty}&wordDifficulty=${res.data.result.wordDifficulty}&vocabularyDifficulty=${res.data.result.vocabularyDifficulty}&type=文本分析`
           );
           loading.close();
         })
-        .catch((res) => {
+        .catch(res => {
           loading.close();
         });
     },
@@ -262,11 +262,11 @@ export default {
     articleFullScreen() {},
     handleObj(list) {
       let pinyin = "";
-      list.forEach((item) => {
+      list.forEach(item => {
         pinyin += item.pinyin;
       });
       return pinyin;
-    },
+    }
   },
   //生命周期 - 创建完成(可以访问当前this实例)
   created() {},
@@ -279,8 +279,7 @@ export default {
     }
     if (_this.curQue) {
       _this.$nextTick(() => {
-        _this.bodyLeft =
-          _this.$refs.ArticleViewbody.getBoundingClientRect().left;
+        _this.bodyLeft = _this.$refs.ArticleViewbody.getBoundingClientRect().left;
       });
       for (let i = 0; i < _this.curQue.detail.length; i++) {
         let enStr = this.curQue.detail[i].sentencesEn.join("");
@@ -305,10 +304,10 @@ export default {
   updated() {}, //生命周期 - 更新之后
   beforeDestroy() {}, //生命周期 - 销毁之前
   destroyed() {}, //生命周期 - 销毁完成
-  activated() {}, //如果页面有keep-alive缓存功能,这个函数会触发
+  activated() {} //如果页面有keep-alive缓存功能,这个函数会触发
 };
 </script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 //@import url(); 引入公共css类
 .NPC-ArticleView {
   width: 100%;

+ 2 - 2
src/components/Adult/preview/Ligature.vue

@@ -549,7 +549,7 @@ export default {
             line-height: 150%;
             color: #000000;
             img {
-              width: 238px;
+              max-width: 238px;
               height: 158px;
             }
             .text {
@@ -627,7 +627,7 @@ export default {
           }
           div {
             img {
-              width: 238px;
+              max-width: 238px;
               height: 158px;
             }
             .text {

+ 20 - 20
src/views/TextbookDetail.vue

@@ -172,8 +172,8 @@
     <template
       v-if="
         TextbookData.is_deleted == 'false' &&
-        bookIsBuy == 'false' &&
-        TextbookData.publish_status == 0
+          bookIsBuy == 'false' &&
+          TextbookData.publish_status == 0
       "
     >
       <div class="noview-msg-box">
@@ -183,7 +183,7 @@
     <!-- 商品详情 -->
     <el-dialog
       class="buyWindow"
-      :title="$t('Key52')"
+      title=""
       :visible.sync="NopymentShow"
       width="720px"
       :before-close="closeNoPyment"
@@ -226,7 +226,7 @@ export default {
     Header,
     Confirmorder,
     Payment,
-    BookView,
+    BookView
   },
   props: {},
   data() {
@@ -244,7 +244,7 @@ export default {
       IsDownload: false, //是否可以下载
       detailSHow: true, // 除教材预览外其他内容是否显示
       bookIsBuy: "false", // 教材是否已购买
-      isData: false,
+      isData: false
     };
   },
   //计算属性 类似于data概念
@@ -307,9 +307,9 @@ export default {
           goods_name: this.TextbookData.name,
           goods_person_name_desc: this.TextbookData.author,
           goods_picture_id: this.TextbookData.picture_id,
-          goods_price: this.TextbookData.price,
+          goods_price: this.TextbookData.price
         };
-        LearnWebSI(Mname, data).then((res) => {
+        LearnWebSI(Mname, data).then(res => {
           this.enshrine = "true";
           this.$message.success(this.$t("Key575")); //"收藏成功"
         });
@@ -317,9 +317,9 @@ export default {
         let Mname = "order-collection_manager-CancelMyGoodsCollection";
         let data = {
           goods_type: 101,
-          goods_id_list: [this.TextBookId],
+          goods_id_list: [this.TextBookId]
         };
-        LearnWebSI(Mname, data).then((res) => {
+        LearnWebSI(Mname, data).then(res => {
           this.enshrine = "false";
           this.$message.success(this.$t("Key396")); //"取消收藏成功"
         });
@@ -341,9 +341,9 @@ export default {
       let Mname = "order-order_manager-CheckMyGoodsBuyStatus";
       let data = {
         goods_type: 101,
-        goods_id: this.TextBookId,
+        goods_id: this.TextBookId
       };
-      LearnWebSI(Mname, data).then((res) => {
+      LearnWebSI(Mname, data).then(res => {
         this.bookIsBuy = res.is_buy; //是否已购买 true 是 false 否
       });
     },
@@ -352,9 +352,9 @@ export default {
       let Mname = "order-collection_manager-CheckMyGoodsCollectionStatus";
       let data = {
         goods_type: 101,
-        goods_id: this.TextBookId,
+        goods_id: this.TextBookId
       };
-      LearnWebSI(Mname, data).then((res) => {
+      LearnWebSI(Mname, data).then(res => {
         this.enshrine = res.is_collection;
       });
     },
@@ -364,18 +364,18 @@ export default {
       let Mname = "book-book_manager-GetBook";
       // 获取课程详情
       TextbookAPI(Mname, {
-        id: this.TextBookId,
+        id: this.TextBookId
       })
-        .then((res) => {
+        .then(res => {
           this.TextbookData = res;
           this.loading = false;
         })
-        .catch((res) => {
+        .catch(res => {
           this.loading = false;
         });
       this.handleIsBuy();
       this.handleIsEnshrine();
-    },
+    }
   },
   //生命周期 - 创建完成(可以访问当前this实例)
   async created() {
@@ -401,8 +401,8 @@ export default {
         "Key475",
         "Key575",
         "Key612",
-        "Key613",
-      ],
+        "Key613"
+      ]
     });
     this.isData = true;
     this.getdetail();
@@ -422,7 +422,7 @@ export default {
   //生命周期-销毁完成
   destoryed() {},
   //如果页面有keep-alive缓存功能,这个函数会触发
-  activated() {},
+  activated() {}
 };
 </script>
 <style lang="scss" scoped>

+ 2 - 2
src/views/courseList.vue

@@ -125,7 +125,7 @@
                   >教材信息</el-button
                 >
                 <el-button type="text" @click="handleDiscount(scope.row)"
-                  >授权码</el-button
+                  >激活码</el-button
                 >
                 <el-button type="text" @click="handleDel(scope.row)"
                   >删除</el-button
@@ -744,7 +744,7 @@ export default {
       sessionStorage.setItem("Bookdetail", JSON.stringify(row));
       this.$router.push("/courseview?bookId=" + row.id);
     },
-    // 授权
+    // 激活
     handleDiscount(row) {
       this.$router.push("/discountCodeList?bookId=" + row.id);
     },

+ 3 - 3
src/views/discountCodeList.vue

@@ -9,7 +9,7 @@
                     style="margin-left: 10px"
                 >
                     <el-form-item>
-                        <el-form-item class="label-input" label="授权码" style="margin-right:30px;">
+                        <el-form-item class="label-input" label="激活码" style="margin-right:30px;">
                             <el-input placeholder="输入生成激活码数量" v-model="discountNumber" type="number" :oninput="numberInput"></el-input>
                         </el-form-item>
                         <el-button @click="onSubmit" size="medium" type="primary" :loading="loading">生成</el-button>
@@ -26,7 +26,7 @@
             </div>
             <div class="table-box">
                 <el-table :data="tableData" style="width: 100%" v-loading="tableloading">
-                    <el-table-column class="table-firstC" label="授权码" prop="discount_code" width="150"></el-table-column>
+                    <el-table-column class="table-firstC" label="激活码" prop="discount_code" width="150"></el-table-column>
                     <el-table-column label="状态" prop="is_used" width="150" :formatter="handleStatus"></el-table-column>
                     <el-table-column label="使用者" prop="consumer_name" width="150"></el-table-column>
                     <el-table-column label="使用时间" prop="use_time" width="200"></el-table-column>
@@ -158,7 +158,7 @@ export default {
         },
         // 删除书籍
         handleDel (row) {
-            this.$confirm("确定要删除此授权码吗?", "提示", {
+            this.$confirm("确定要删除此激活码吗?", "提示", {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
                 type: "warning",