From f85c0b54cbba01d6f2299548693f6d4900724262 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 22 Feb 2021 10:15:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=8C=E6=96=87=E6=9C=AC=E6=9B=BF=E4=BB=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test_client/src/views/question/question.vue   |  4 ++--
 .../src/views/question/questioncreate.vue     | 18 +++++++--------
 .../src/views/question/questionupdate.vue     | 18 +++++++--------
 test_mini/pages/collect/main.js               |  2 +-
 test_mini/pages/collect/main.wxml             |  6 ++---
 test_mini/pages/cuoti/index.wxml              |  6 ++---
 test_mini/pages/lianxi/main.js                |  3 ++-
 test_mini/pages/lianxi/main.wxml              | 23 +++++++++++++++----
 test_mini/pages/question/detail.js            |  2 +-
 test_mini/pages/question/detail.wxml          |  8 ++++---
 test_mini/pages/test/detail.js                |  2 +-
 test_mini/pages/test/detail.wxml              |  4 ++--
 test_mini/pages/test/test.js                  |  2 +-
 test_mini/pages/test/test.wxml                |  6 ++---
 14 files changed, 60 insertions(+), 44 deletions(-)

diff --git a/test_client/src/views/question/question.vue b/test_client/src/views/question/question.vue
index 0977916..3b0b481 100644
--- a/test_client/src/views/question/question.vue
+++ b/test_client/src/views/question/question.vue
@@ -134,11 +134,11 @@
   :visible.sync="dialogVisible"
   width="30%">
   <div>{{question.type}}</div>
-  <div v-html="question.name"></div>
+  <div >{{question.name}}</div>
   <ul id="repeat">
   <li v-for="(value,key,index) in question.options">
     {{ key }}:
-    <span v-html="value"></span>
+    <span>{{value}}</span>
   </li>
   </ul>
   <div>正确答案{{question.right}}</div>
diff --git a/test_client/src/views/question/questioncreate.vue b/test_client/src/views/question/questioncreate.vue
index e431204..06dfb70 100644
--- a/test_client/src/views/question/questioncreate.vue
+++ b/test_client/src/views/question/questioncreate.vue
@@ -30,7 +30,7 @@
           ></el-cascader>
       </el-form-item>
       <el-form-item label="题干" prop="name">
-       <tinymce2 v-model="Form.name" height="100" width="800px" />
+       <el-input v-model="Form.name" height="100" width="800px" />
       </el-form-item>
       <el-form-item label="题干图片" prop="img" >
                     <el-upload
@@ -49,22 +49,22 @@
           <el-button type="text" @click="delImg()" v-if="Form.img">删除</el-button>
         </el-form-item>
       <el-form-item label="选项A" prop="optionA" >
-        <tinymce2 v-model="Form.options.A" height="30" width="800px" :disabled="inputDisable" />
+        <el-input v-model="Form.options.A" height="30" width="800px" :disabled="inputDisable" />
       </el-form-item>
       <el-form-item label="选项B" prop="optionB" >
-        <tinymce2 v-model="Form.options.B" height="30" width="800px" :disabled="inputDisable" />
+        <el-input v-model="Form.options.B" height="30" width="800px" :disabled="inputDisable" />
       </el-form-item>
       <el-form-item label="选项C"  v-show="Form.type!='判断'">
-        <tinymce2 v-model="Form.options.C" height="30" width="800px" />
+        <el-input v-model="Form.options.C" height="30" width="800px" />
       </el-form-item>
       <el-form-item label="选项D"  v-show="Form.type!='判断'">
-        <tinymce2 v-model="Form.options.D" height="30" width="800px" />
+        <el-input v-model="Form.options.D" height="30" width="800px" />
       </el-form-item>
       <el-form-item label="选项E" v-show="Form.type!='判断'">
-        <tinymce2 v-model="Form.options.E" height="30" width="800px" />
+        <el-input v-model="Form.options.E" height="30" width="800px" />
       </el-form-item>
       <el-form-item label="选项F" v-show="Form.type!='判断'">
-        <tinymce2 v-model="Form.options.F" height="30" width="800px" />
+        <el-input v-model="Form.options.F" height="30" width="800px" />
       </el-form-item>
       <el-form-item label="正确答案" v-if="Form.type =='多选'">
         <el-checkbox-group v-model="Form.right">
@@ -104,13 +104,13 @@
   </div>
 </template>
 <script>
-import Tinymce2 from '@/components/Tinymce/index2'
+// import el-input from '@/components/Tinymce/index2'
 import { createQuestion,getQuestioncatAll } from "@/api/question";
 import { genTree, deepClone } from "@/utils";
 import { upUrl } from "@/api/file";
 import { getToken } from "@/utils/auth";
 export default {
-  components:{ Tinymce2 },
+  components:{ },
   data() {
     return {
       upHeaders: { Authorization: "JWT " + getToken() },
diff --git a/test_client/src/views/question/questionupdate.vue b/test_client/src/views/question/questionupdate.vue
index f6e80a6..31ed483 100644
--- a/test_client/src/views/question/questionupdate.vue
+++ b/test_client/src/views/question/questionupdate.vue
@@ -21,7 +21,7 @@
         ></el-cascader>
       </el-form-item>
       <el-form-item label="题干" prop="name">
-        <tinymce2 v-model="Form.name" height="100" width="800px" />
+        <el-input v-model="Form.name" height="100" width="800px" />
         <!-- <el-input v-model="Form.name" style="width:600px" type="textarea" :rows=3></el-input> -->
       </el-form-item>
       <el-form-item label="题干图片" prop="img" >
@@ -40,25 +40,25 @@
           <el-button type="text" @click="delImg()" v-if="Form.img">删除</el-button>
       </el-form-item>
       <el-form-item label="选项A" prop="optionA">
-        <tinymce2 v-model="Form.options.A" height="30" width="800px" :disabled="inputDisable" />
+        <el-input v-model="Form.options.A" height="30" width="800px" :disabled="inputDisable" />
       </el-form-item>
       <el-form-item label="选项B" prop="optionB">
-        <tinymce2 v-model="Form.options.B" height="30" width="800px" :disabled="inputDisable" />
+        <el-input v-model="Form.options.B" height="30" width="800px" :disabled="inputDisable" />
       </el-form-item>
       <el-form-item label="选项C" v-show="Form.type!='判断'">
-        <tinymce2 v-model="Form.options.C" height="30" width="800px" />
+        <el-input v-model="Form.options.C" height="30" width="800px" />
         <!-- <el-input v-model="Form.options.C" style="width:600px"></el-input> -->
       </el-form-item>
       <el-form-item label="选项D" v-show="Form.type!='判断'">
-        <tinymce2 v-model="Form.options.D" height="30" width="800px" />
+        <el-input v-model="Form.options.D" height="30" width="800px" />
         <!-- <el-input v-model="Form.options.D" style="width:600px"></el-input> -->
       </el-form-item>
       <el-form-item label="选项E" v-show="Form.type!='判断'">
-        <tinymce2 v-model="Form.options.E" height="30" width="800px" />
+        <el-input v-model="Form.options.E" height="30" width="800px" />
         <!-- <el-input v-model="Form.options.E" style="width:600px"></el-input> -->
       </el-form-item>
       <el-form-item label="选项F" v-show="Form.type!='判断'">
-        <tinymce2 v-model="Form.options.F" height="30" width="800px" />
+        <el-input v-model="Form.options.F" height="30" width="800px" />
         <!-- <el-input v-model="Form.options.F" style="width:600px"></el-input> -->
       </el-form-item>
       <el-form-item label="正确答案" v-if="Form.type =='多选'">
@@ -98,13 +98,13 @@
   </div>
 </template>
 <script>
-import Tinymce2 from '@/components/Tinymce/index2'
+// import el-input from '@/components/Tinymce/index2'
 import { createQuestion,getQuestioncatAll, getQuestion, getQuestioncatList, updateQuestion } from "@/api/question";
 import { genTree, deepClone } from "@/utils";
 import { upUrl } from "@/api/file";
 import { getToken } from "@/utils/auth";
 export default {
-  components:{ Tinymce2 },
+  components:{  },
   data() {
     return {
       upHeaders: { Authorization: "JWT " + getToken() },
diff --git a/test_mini/pages/collect/main.js b/test_mini/pages/collect/main.js
index f59c459..d5869bc 100644
--- a/test_mini/pages/collect/main.js
+++ b/test_mini/pages/collect/main.js
@@ -177,7 +177,7 @@ Page({
     for (let key in tm_current.options) {
       let option = {}
       option.key = key
-      option.value = '<p>' + tm_current.options[key].toString() + '</p>'
+      option.value = tm_current.options[key]
       if (tm_current.user_answer) {
         if (key == tm_current.user_answer || tm_current.user_answer.indexOf(key) != -1) {
           option.checked = true
diff --git a/test_mini/pages/collect/main.wxml b/test_mini/pages/collect/main.wxml
index 7523ccc..9ff2d71 100644
--- a/test_mini/pages/collect/main.wxml
+++ b/test_mini/pages/collect/main.wxml
@@ -8,7 +8,7 @@
       <span style="color:gray">  {{tm_current.questioncat_name}}</span>
     </view>
     <view class="weui-article__title">
-    <parser html="{{tm_current.name}}" domain="{{domain}}" selectable/>
+    <rich-text nodes="{{tm_current.name}}"></rich-text>
     </view>
     <view wx:if="{{tm_current.img}}" style="text-align:center"><image src="{{tm_current.img}}" mode="aspectFit"></image></view>
   </view>
@@ -17,7 +17,7 @@
       <label class="weui-cell weui-cell_active weui-check__label" wx:for="{{options}}" wx:key="key">
         <view class="weui-cell__bd">
           <view style="float:left;width:10%">{{item.key}}:</view>
-          <view style="float:left;width:90%"><parser html="{{item.value}}" domain="{{domain}}" selectable /></view>
+          <view style="float:left;width:90%"><rich-text nodes="{{item.value}}"></rich-text></view>
         </view>
         <view class="weui-cell__ft">
           <radio class="weui-check" value="{{item.key}}" checked="{{item.checked}}" />
@@ -32,7 +32,7 @@
         
         <view class="weui-cell__bd">
           <view style="float:left;width:10%">{{item.key}}:</view>
-          <view style="float:left;width:90%"><parser html="{{item.value}}" domain="{{domain}}" selectable /></view>
+          <view style="float:left;width:90%"><rich-text nodes="{{item.value}}"></rich-text></view>
         </view>
         <view class="weui-cell__hd">
           <checkbox class="weui-check" value="{{item.key}}" checked="{{item.checked}}"/>
diff --git a/test_mini/pages/cuoti/index.wxml b/test_mini/pages/cuoti/index.wxml
index 007463f..3d0e91d 100644
--- a/test_mini/pages/cuoti/index.wxml
+++ b/test_mini/pages/cuoti/index.wxml
@@ -14,7 +14,7 @@
       <span style="color:gray">  {{currentTm.questioncat_name}}</span>
     </view>
     <view class="weui-article__title">
-    <parser html="{{currentTm.name}}" domain="{{domain}}" selectable/>
+      <rich-text nodes="{{currentTm.name}}"></rich-text>
     </view>
     <view wx:if="{{currentTm.img}}" style="text-align:center"><image src="{{currentTm.img}}" mode="aspectFit"></image></view>
   </view>
@@ -23,7 +23,7 @@
       <label class="weui-cell weui-cell_active weui-check__label" wx:for="{{options}}" wx:key="key">
         <view class="weui-cell__bd">
           <view style="float:left;width:10%">{{item.key}}:</view>
-          <view style="float:left;width:90%"><parser html="{{item.value}}" domain="{{domain}}" selectable /></view>
+          <view style="float:left;width:90%"><rich-text nodes="{{item.value}}"></rich-text></view>
         </view>
         <view class="weui-cell__ft">
           <radio class="weui-check" value="{{item.key}}" checked="{{item.checked}}" />
@@ -38,7 +38,7 @@
         
         <view class="weui-cell__bd">
           <view style="float:left;width:10%">{{item.key}}:</view>
-          <view style="float:left;width:90%"><parser html="{{item.value}}" domain="{{domain}}" selectable /></view>
+          <view style="float:left;width:90%"><rich-text nodes="{{item.value}}"></rich-text></view>
         </view>
         <view class="weui-cell__hd">
           <checkbox class="weui-check" value="{{item.key}}" checked="{{item.checked}}"/>
diff --git a/test_mini/pages/lianxi/main.js b/test_mini/pages/lianxi/main.js
index ed1a607..ff4f764 100644
--- a/test_mini/pages/lianxi/main.js
+++ b/test_mini/pages/lianxi/main.js
@@ -251,7 +251,8 @@ Page({
     for (let key in tm_current.options) {
       let option = {}
       option.key = key
-      option.value = '<p>' + tm_current.options[key].toString() + '</p>'
+      // option.value = '<p>' + tm_current.options[key].toString() + '</p>'
+      option.value = tm_current.options[key]
       option.checked = false
       option.right = false
       if(option.key == tm_current.right||tm_current.right.indexOf(option.key)!=-1){
diff --git a/test_mini/pages/lianxi/main.wxml b/test_mini/pages/lianxi/main.wxml
index 0f09f70..8c7271f 100644
--- a/test_mini/pages/lianxi/main.wxml
+++ b/test_mini/pages/lianxi/main.wxml
@@ -13,7 +13,8 @@
     <span class="txlabel">{{tm_current.type}}</span>
     </view>
     <view class="weui-article__title">
-    <parser html="{{tm_current.name}}" domain="{{domain}}" selectable/>
+    <!-- <parser html="{{tm_current.name}}" domain="{{domain}}" selectable/> -->
+    <rich-text nodes="{{tm_current.name}}"></rich-text>
     </view>
     <view wx:if="{{tm_current.img}}" style="text-align:center"><image src="{{tm_current.img}}" mode="aspectFit"></image></view>
   </view>
@@ -23,11 +24,17 @@
         <view class="weui-cell__bd" >
           <view style="font-weight:bold;color:green" wx:if="{{ moShi == '看题模式' && item.right}}">
           <view style="float:left;width:10%">{{item.key}}:</view>
-          <view style="float:left;width:90%"><parser html="{{item.value}}" domain="{{domain}}" selectable /></view>
+          <view style="float:left;width:90%">
+            <!-- <parser html="{{item.value}}" domain="{{domain}}" selectable /> -->
+            <rich-text nodes="{{item.value}}"></rich-text>
+          </view>
           </view>
           <view wx:else>
           <view style="float:left;width:10%">{{item.key}}:</view>
-          <view style="float:left;width:90%"><parser html="{{item.value}}" domain="{{domain}}" selectable /></view>
+          <view style="float:left;width:90%">
+            <!-- <parser html="{{item.value}}" domain="{{domain}}" selectable /> -->
+            <rich-text nodes="{{item.value}}"></rich-text>
+          </view>
           </view>
         </view>
         <view class="weui-cell__ft">
@@ -44,11 +51,17 @@
         <view class="weui-cell__bd" >
         <view style="font-weight:bold;color:green" wx:if="{{ moShi == '看题模式' && item.right}}">
           <view style="float:left;width:10%">{{item.key}}:</view>
-          <view style="float:left;width:90%"><parser html="{{item.value}}" domain="{{domain}}" selectable /></view>
+          <view style="float:left;width:90%">
+            <rich-text nodes="{{item.value}}"></rich-text>
+            <!-- <parser html="{{item.value}}" domain="{{domain}}" selectable /> -->
+          </view>
           </view>
           <view wx:else>
           <view style="float:left;width:10%">{{item.key}}:</view>
-          <view style="float:left;width:90%"><parser html="{{item.value}}" domain="{{domain}}" selectable /></view>
+          <view style="float:left;width:90%">
+            <rich-text nodes="{{item.value}}"></rich-text>
+            <!-- <parser html="{{item.value}}" domain="{{domain}}" selectable /> -->
+          </view>
           </view>
         </view>
         <view class="weui-cell__hd">
diff --git a/test_mini/pages/question/detail.js b/test_mini/pages/question/detail.js
index a65e2a4..cbd3ecf 100644
--- a/test_mini/pages/question/detail.js
+++ b/test_mini/pages/question/detail.js
@@ -139,7 +139,7 @@ Page({
     for (let key in tm_current.options) {
       let option = {}
       option.key = key
-      option.value = '<p>' + tm_current.options[key].toString() + '</p>'
+      option.value = tm_current.options[key].toString()
       if (tm_current.user_answer) {
         if (key == tm_current.user_answer || tm_current.user_answer.indexOf(key) != -1) {
           option.checked = true
diff --git a/test_mini/pages/question/detail.wxml b/test_mini/pages/question/detail.wxml
index 32642fd..85b1199 100644
--- a/test_mini/pages/question/detail.wxml
+++ b/test_mini/pages/question/detail.wxml
@@ -8,7 +8,7 @@
       <span style="color:gray">  {{tm_current.questioncat_name}}</span>
     </view>
     <view class="weui-article__title">
-    <parser html="{{tm_current.name}}" domain="{{domain}}" selectable/>
+      <rich-text nodes="{{tm_current.name}}"></rich-text>
     </view>
     <view wx:if="{{tm_current.img}}" style="text-align:center"><image src="{{tm_current.img}}" mode="aspectFit"></image></view>
   </view>
@@ -17,7 +17,9 @@
       <label class="weui-cell weui-cell_active weui-check__label" wx:for="{{options}}" wx:key="key">
         <view class="weui-cell__bd">
           <view style="float:left;width:10%">{{item.key}}:</view>
-          <view style="float:left;width:90%"><parser html="{{item.value}}" domain="{{domain}}" selectable /></view>
+          <view style="float:left;width:90%">
+            <rich-text nodes="{{item.value}}"></rich-text>
+          </view>
         </view>
         <view class="weui-cell__ft">
           <radio class="weui-check" value="{{item.key}}" checked="{{item.checked}}" />
@@ -32,7 +34,7 @@
         
         <view class="weui-cell__bd">
           <view style="float:left;width:10%">{{item.key}}:</view>
-          <view style="float:left;width:90%"><parser html="{{item.value}}" domain="{{domain}}" selectable /></view>
+          <view style="float:left;width:90%"><rich-text nodes="{{item.value}}"></rich-text></view>
         </view>
         <view class="weui-cell__hd">
           <checkbox class="weui-check" value="{{item.key}}" checked="{{item.checked}}"/>
diff --git a/test_mini/pages/test/detail.js b/test_mini/pages/test/detail.js
index 61b5fb4..d98994a 100644
--- a/test_mini/pages/test/detail.js
+++ b/test_mini/pages/test/detail.js
@@ -118,7 +118,7 @@ Page({
     for (let key in question_options) {
       let option = {}
       option.key = key
-      option.value = '<p>' + question_options[key] + '</p>'
+      option.value = question_options[key]
       if (user_answer) {
         if (key == user_answer || user_answer.indexOf(key) != -1) {
           option.checked = true
diff --git a/test_mini/pages/test/detail.wxml b/test_mini/pages/test/detail.wxml
index abd7706..c1f1b6f 100644
--- a/test_mini/pages/test/detail.wxml
+++ b/test_mini/pages/test/detail.wxml
@@ -18,7 +18,7 @@
       <label class="weui-cell weui-cell_active weui-check__label" wx:for="{{options}}" wx:key="key">
         <view class="weui-cell__bd">
           <view style="float:left;width:10%">{{item.key}}:</view>
-          <view style="float:left;width:90%"><parser html="{{item.value}}" domain="{{domain}}" selectable /></view>
+          <view style="float:left;width:90%"><rich-text nodes="{{item.value}}"></rich-text></view>
         </view>
         <view class="weui-cell__ft">
           <radio class="weui-check" value="{{item.key}}" checked="{{item.checked}}" />
@@ -33,7 +33,7 @@
         
         <view class="weui-cell__bd">
           <view style="float:left;width:10%">{{item.key}}:</view>
-          <view style="float:left;width:90%"><parser html="{{item.value}}" domain="{{domain}}" selectable /></view>
+          <view style="float:left;width:90%"><rich-text nodes="{{item.value}}"></rich-text></view>
         </view>
         <view class="weui-cell__hd">
           <checkbox class="weui-check" value="{{item.key}}" checked="{{item.checked}}"/>
diff --git a/test_mini/pages/test/test.js b/test_mini/pages/test/test.js
index c635c40..53e5726 100644
--- a/test_mini/pages/test/test.js
+++ b/test_mini/pages/test/test.js
@@ -182,7 +182,7 @@ Page({
     for (let key in tm_current.options) {
       let option = {}
       option.key = key
-      option.value = '<p>' + tm_current.options[key].toString() + '</p>'
+      option.value = tm_current.options[key]
       if (tm_current.user_answer) {
         if (key == tm_current.user_answer || tm_current.user_answer.indexOf(key) != -1) {
           option.checked = true
diff --git a/test_mini/pages/test/test.wxml b/test_mini/pages/test/test.wxml
index 914ec6b..fbd8286 100644
--- a/test_mini/pages/test/test.wxml
+++ b/test_mini/pages/test/test.wxml
@@ -17,7 +17,7 @@
       <span style="color:gray">({{tm_current.questioncat_name}})</span>
     </view>
     <view class="weui-article__title">
-    <parser html="{{tm_current.name}}" domain="{{domain}}" selectable/>
+      <rich-text nodes="{{tm_current.name}}"></rich-text>
     </view>
     <view wx:if="{{tm_current.img}}" style="text-align:center"><image src="{{tm_current.img}}" mode="aspectFit"></image></view>
   </view>
@@ -26,7 +26,7 @@
       <label class="weui-cell weui-cell_active weui-check__label" wx:for="{{options}}" wx:key="key">
         <view class="weui-cell__bd">
           <view style="float:left;width:10%">{{item.key}}:</view>
-          <view style="float:left;width:90%"><parser html="{{item.value}}" domain="{{domain}}" selectable /></view>
+          <view style="float:left;width:90%"><rich-text nodes="{{item.value}}"></rich-text></view>
         </view>
         <view class="weui-cell__ft">
           <radio class="weui-check" value="{{item.key}}" checked="{{item.checked}}" />
@@ -41,7 +41,7 @@
         
         <view class="weui-cell__bd">
           <view style="float:left;width:10%">{{item.key}}:</view>
-          <view style="float:left;width:90%"><parser html="{{item.value}}" domain="{{domain}}" selectable /></view>
+          <view style="float:left;width:90%"><rich-text nodes="{{item.value}}"></rich-text></view>
         </view>
         <view class="weui-cell__hd">
           <checkbox class="weui-check" value="{{item.key}}" checked="{{item.checked}}"/>