askbot-dragon 0.7.3 → 0.7.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "askbot-dragon",
-  "version": "0.7.3",
+  "version": "0.7.7",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",

package/src/components/actionSatisfaction.vue

@@ -2,10 +2,12 @@
   <div
       class="action-satisfaction"
   >
-    <p class="satisfaction-des" v-html="msg.content.satisfactionDes"></p>
-    <p
-        class="statisfaction-item"
-        @click="
+    <p class="satisfaction-des" v-if="msg.content.satisfactionDes" v-html="msg.content.satisfactionDes"></p>
+    <div class="statisfaction-list">
+      <div
+          class="statisfaction-item"
+          :class="isCheckSatis?'check-satisfied':''"
+          @click="
                   sendSatisfaction(
                     'USER_ACTION_TO_SATISFACTION_V2',
                     '满意',
@@ -14,12 +16,13 @@
                     msg.apiKey
                   )
                 "
-    >
-      满意<i class="arsenal_icon arsenalangle-right-solid"></i>
-    </p>
-    <p
-        class="statisfaction-item"
-        @click="
+      >
+        满意
+      </div>
+      <div
+          class="statisfaction-item"
+          :class="isCheckDissatis?'check-satisfied':''"
+          @click="
                   sendSatisfaction(
                     'USER_ACTION_TO_SATISFACTION_V2',
                     '不满意',
@@ -28,9 +31,11 @@
                     msg.apiKey
                   )
                 "
-    >
-     不满意<i class="arsenal_icon arsenalangle-right-solid"></i>
-    </p>
+      >
+        不满意
+      </div>
+    </div>
+
   </div>
 </template>
 
@@ -38,8 +43,22 @@
 export default {
   name: "actionSatisfaction",
   props:['msg'],
+  data(){
+    return{
+      isCheckSatis:false,
+      isCheckDissatis:false
+    }
+  },
   methods:{
     sendSatisfaction(type, choose, answer, answerRadio,answerApiKey){
+      if (choose==='满意'){
+        this.isCheckSatis = true
+        this.isCheckDissatis = false
+      }
+      else {
+        this.isCheckSatis = false
+        this.isCheckDissatis = true
+      }
       this.$emit('sendSatisfaction',type, choose, answer, answerRadio,answerApiKey)
     }
   }
@@ -55,18 +74,32 @@ export default {
     overflow: hidden;
     padding: 8px 0 10px 0;
     height: auto;
-    border-bottom: 1px solid #EEEEEE;
+   /* border-bottom: 1px solid #EEEEEE;*/
+  }
+  .statisfaction-list{
+    display: flex;
+    align-items: center;
   }
   .statisfaction-item{
-    padding: 8px 0;
-    height: 25px;
-    line-height: 25px;
-    background-color: #ffffff;
-    color: #366aff;
+    color: #616161;
+    min-width: 60px;
+    padding: 0 10px;
+    height: 29px;
+    background: #FFFFFF;
+    border: 1px solid #BEC5DB;
+    border-radius: 14px;
     cursor:pointer;
     display: flex;
     align-items: center;
     justify-content: space-between;
+    justify-content: center;
+  }
+  .statisfaction-item:first-child{
+    margin-right: 8px;
+  }
+  .check-satisfied{
+    border: 1px solid #BEC5DB;
+    color: #366aff;
   }
   .end{
     border-bottom-left-radius: 25px !important;

package/src/components/answerDissatisfaction.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="answer-dissatisfaction">
-    <p class="satisfaction-reply-text" v-html="msg.content.replyText"></p>
+    <p class="satisfaction-reply-text" v-if="msg.content.replyText" v-html="msg.content.replyText"></p>
     <p
         v-for="(option, index) in msg.content.replyOptions"
         class="statisfaction-item"

package/src/components/answerRadio.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="answer-radio">
-    <p class="radio-description" v-html="msg.content.description"></p>
+    <p class="radio-description" v-html="msg.content.description" v-if="msg.content.description"></p>
     <div class="options-list">
       <div
           v-for="(option, index) in msg.content.options"

package/src/components/associationIntention.vue

@@ -7,16 +7,17 @@
       <p v-html="msg.content.replace(/\#[\u4E00-\u9FA5]{1,3}\;/gi, emotion)" class="answer-rich-text"></p>
      <Recommend :msg="msg" @onRadioClickReco="onRadioClickReco"></Recommend>
     </div>
-    <div v-if="msg.type === 'answer_rich_text' && !(msg.content.recommend != undefined && msg.content.recommend.status)">
+    <div v-if="msg.type === 'answer_rich_text' && !(msg.content.recommend && msg.content.recommend.status)">
       <p v-html="$options.filters.imageStyle(msg.content.html)"></p>
     </div>
-    <div  v-else-if="msg.type == 'answer_rich_text' && (msg.content.recommend != undefined && msg.content.recommend.status)">
+    <div  v-else-if="msg.type == 'answer_rich_text' && (msg.content.recommend && msg.content.recommend.status)">
       <p v-html="$options.filters.imageStyle(msg.content.html)" class="answer-rich-text"></p>
       <Recommend :msg="msg.content" @onRadioClickReco="onRadioClickReco"></Recommend>
     </div>
     <div v-else-if="msgType === 'answer_image'" >
       <div
           class="association-img"
+          v-if="msg.content.url"
       >
         <!-- LPY 原生宽度适配有bug，弃用 -->
         <img
@@ -29,7 +30,7 @@
       <Recommend :msg="msg" @onRadioClickReco="onRadioClickReco"></Recommend>
     </div>
     <div v-else-if="msgType === 'answer_video' || msgType === 'user_video' || msgType === 'VIDEO'">
-      <div class="association-img">
+      <div class="association-img" v-if="msg.content.url">
         <ask-video :msg="msg" :url="msg.content.url" :local-url="msg.content.localUrl"
                    :progress="msg.content.progress"></ask-video>
       </div>

package/src/components/feedBack.vue

@@ -1,12 +1,12 @@
 <template>
   <div id="feedBack" class="companyNotRem" :class="{phoneClass:isPhone,companyClass:isCompany,notClick:isDisabled===true}">
-    <span :class="!positiveClick?'feed-positive-button':'feed-check-positive-button'">
-      <el-button round class="btnClass" @click="positiveFeedback(feedBack,1)"   v-html="feedBack.positiveFeedback.text" v-if="!positiveClick">{{feedBack.positiveFeedback.text}}</el-button>
-      <el-button round class="btnClassActive"  v-html="feedBack.positiveFeedback.text" v-else>{{feedBack.positiveFeedback.text}}</el-button>
+    <span :class="!positiveClick?'feed-button':'feed-check-button'" class="feed-commen">
+      <el-button plain class="btnClass" @click="positiveFeedback(feedBack,1)"   v-html="feedBack.positiveFeedback.text" v-if="!positiveClick">{{feedBack.positiveFeedback.text}}</el-button>
+      <el-button plain class="btnClassActive"  v-html="feedBack.positiveFeedback.text" v-else>{{feedBack.positiveFeedback.text}}</el-button>
     </span>
-    <span  :class="!negativeClick?'feed-negative-button':'feed-check-negative-button'">
-      <el-button round class="btnClass" @click="positiveFeedback(feedBack,2)"   v-html="feedBack.negativeFeedback.text" v-if="!negativeClick">{{feedBack.negativeFeedback.text}}</el-button>
-      <el-button round class="btnClassActive"  v-html="feedBack.negativeFeedback.text" v-else>{{feedBack.negativeFeedback.text}}</el-button>
+    <span  :class="!negativeClick?'feed-button':'feed-check-button'">
+      <el-button plain class="btnClass" @click="positiveFeedback(feedBack,2)"   v-html="feedBack.negativeFeedback.text" v-if="!negativeClick">{{feedBack.negativeFeedback.text}}</el-button>
+      <el-button plain class="btnClassActive"  v-html="feedBack.negativeFeedback.text" v-else>{{feedBack.negativeFeedback.text}}</el-button>
     </span>
   </div>
 </template>
@@ -81,45 +81,29 @@ name: "feedBack",
 
 <style scoped lang="less">
 #feedBack{
-  .feed-positive-button{
-    background: #FFFFFF;
+  padding-left: 10px;
+  .feed-commen{
     margin-right: 8px;
-    /deep/.el-button{
-      border: 1px solid #BBCDFF;
-      color: #366aff;
-      border-radius: 14px;
-      font-weight: 400;
-    }
   }
-  .feed-check-positive-button{
-    margin-right: 8px;
+  .feed-button{
     /deep/.el-button{
-      border: 1px solid #4C61E1;
-      color: #FFFFFF;
-      background-color: #4C61E1;
-      border-radius: 14px;
-      font-weight: 400;
-    }
-  }
-  .feed-check-negative-button{
-    /deep/.el-button{
-      border: 1px solid #4C61E1;
-      color: #FFFFFF;
-      background-color: #4C61E1;
+      border: 1px solid #BEC5DB;
+      color: #616161;
       border-radius: 14px;
       font-weight: 400;
     }
   }
-  .feed-negative-button{
+  .feed-check-button{
     background: #FFFFFF;
     /deep/.el-button{
-      border: 1px solid #BEC5DB;
-      color: #616161;
+      border: 1px solid #BBCDFF;
+      color: #366aff;
       border-radius: 14px;
       font-weight: 400;
     }
   }
-  /deep/.el-button.is-round{
+
+  /deep/.el-button.is-plain{
     padding: 9px 20px;
   }
 }
@@ -127,10 +111,11 @@ name: "feedBack",
   width: 100vw;
   text-align: center;
   margin: 0 auto;
-  line-height: 56px;
+  line-height: 34px;
+  height: 56px;
   .el-button{
     min-width: 60px;
-    height: 36px;
+    height: 31px;
     line-height: 0.9;
   }
 }
@@ -142,7 +127,7 @@ name: "feedBack",
   line-height: 56px;
   .el-button{
     min-width: 60px;
-    height: 36px;
+    height: 32px;
     line-height: 0.9;
   }
 }

package/src/components/formTemplate.vue

@@ -182,7 +182,10 @@
       </div>
         <div class="form-link"></div>
         <div class="form-submit-btn">
-          <el-button style="border-color: #366aff;color: white;background-color: #366aff"  round class="submitClass" size="small" @click="submitClick" :disabled="disableds">{{submitValue}}</el-button>
+          <el-button style="border-color: #366aff;color: white;background-color: #366aff"  round class="submitClass" size="small" @click="submitClick" :disabled="disableds">
+            <i class="el-icon-check" v-if="disableds"></i>
+            {{submitValue}}
+          </el-button>
         </div>
       </div>
       <div class="mobileFormClass" v-else style="padding: 10px 0;" :class="{notClick:disableds === true}">
@@ -423,7 +426,10 @@
       </div>
         <div class="form-link"></div>
         <div class="form-submit-btn">
-         <van-button  round  type="info" class="submitClass" @click="submitClick"  :disabled="disableds">{{submitValue}}</van-button>
+         <van-button  round  type="info" class="submitClass" @click="submitClick"  :disabled="disableds">
+           <i class="el-icon-check" v-if="disableds"></i>
+           {{submitValue}}
+         </van-button>
         </div>
         <van-popup v-model="fileUpload" :close-on-click-overlay="false">
           <div style="background-color: black;height: 100px;width: 100px;display: flex;justify-content: center;align-items: center" >
@@ -608,14 +614,6 @@ export default {
     {
       this.disableds=false
     }
-    if(this.submit===true)
-    {
-      this.submitValue='已提交'
-    }
-    else
-    {
-      this.submitValue='提交'
-    }
   },
   beforeMount() {
     that.defaultClick()
@@ -1150,9 +1148,6 @@ export default {
       }
         this.$emit('submitClick',this.formShow)
         this.disableds = true
-        this.submitValue = '已提交'
-
-
     },
     //日期的点击事件
     dateClick(id) {
@@ -1800,10 +1795,14 @@ export default {
     }
   }
   .submitClass{
-    width: 120px;
+    width: 100px;
     background-color: #366aff;
     color: white!important;
-    height: 36px;
+    height: 32px;
+    i{
+      margin-right: 10px;
+      font-weight: 600;
+    }
   }
   /deep/.van-radio-group--horizontal{
    .van-radio{
@@ -1857,10 +1856,14 @@ export default {
   width: 100%;
   font-size: 1em;
   .submitClass{
-    width: 120px;
+    width: 100px;
     color: white!important;
     background-color:#366aff;
     border-color: #366aff;
+    i{
+      margin-right: 10px;
+      font-weight: 600;
+    }
   }
   /deep/.el-checkbox-group{
     display: flex;

package/src/components/message/TicketMessage.vue

@@ -24,17 +24,17 @@
                           <div v-html="itemss" class="singleItem"  v-for="(itemss,inde) in items.list" :key="inde"></div>
                         </div>
                         <div class="doubleClass" v-else-if="items.type==='DOUBLE'">
-                          <div  class="doubleItem" v-for="(itemss,__index) in items.list" :key="__index" v-html="itemss">
+                          <div  class="doubleItem" v-for="(itemss,index) in items.list" :key="'__'+index" v-html="itemss">
                           </div>
                         </div>
                         <div class="tripleClass" v-else-if="items.type==='TRIPLE'">
-                          <div v-html="itemss" class="tripleItem" v-for="(itemss,___index) in items.list" :key="___index"></div>
+                          <div v-html="itemss" class="tripleItem" v-for="(itemss,index) in items.list" :key="'___'+index"></div>
                         </div>
                       </div>
                     </div>
                     <div class="button-list">
-                      <div v-for="(items,____index) in item.content.buttonList" :key="____index" class="button-item">
-                        <div @click="btnClick(items)" class="buttonClassItem">
+                      <div v-for="(items,index) in item.content.buttonList" :key="'____'+index" class="button-item">
+                        <div @click="btnClick($event,items)" class="buttonClassItem">
                           <span class="btn-name">{{items.name}}</span>
                         </div>
                       </div>
@@ -121,9 +121,11 @@
             slideLoadOn() {
                 this.$refs.swiper.slideOn();
             },
-            btnClick(items){
+            btnClick(e,items){
+              e.stopPropagation();   //表示阻止向父元素冒泡
               items.apiKey=this.content.apiKey
-                this.$emit('btnClick',items,this.content.apiKey)
+              console.debug('card_template',items)
+              this.$emit('btnClick',items,this.content.apiKey)
             },
 
             isIosOrIsAndroid(){

package/src/components/voiceComponent.vue

@@ -3,7 +3,7 @@
     <div id="voice-component-container">
       <div id="voice-component-c">
         <div class="voice-btn">
-          <i class="iconfont guoran-arsenalchess-pawn-solid1"></i>
+          <i class="iconfont arsenalchess-pawn-solid"></i>
         </div>
       </div>
       <div class="close-voice" @click="closeVoice">
@@ -44,12 +44,25 @@ export default {
   left: 0;
   #voice-component-container{
     position: relative;
+   /* .half-top-ovals{
+      width: 130%;
+      position: relative;
+      left: -15%;
+      height: 80px;
+      padding-bottom: 40px;
+      padding-right: 20px;
+      padding-left: 20px;
+     !* width: 200px;*!
+      background: lightcoral;
+      border-radius: 50% 50% 0 0;
+    }*/
     #voice-component-c{
-      height: 90px;
+      height: 200px;
       width: 130%;
       position: relative;
       left: -15%;
-      background: linear-gradient(180deg, #f2f2f2, #FFFFFF);
+      bottom: -80px;
+      background: linear-gradient(180deg, #EEF1F7, #FFFFFF);
       border: 2px solid white;
       border-radius: 100% 100% 0 0;
       border-bottom: none;
@@ -60,9 +73,11 @@ export default {
         display: flex;
         align-items: center;
         justify-content: center;
+        position: absolute;
+        top: 50px;
         i{
           color: #366aff;
-          font-size: 38px;
+          font-size: 30px;
         }
       }
     }
@@ -73,13 +88,13 @@ export default {
       display: flex;
       align-items: center;
       justify-content: center;
-      color: #999999;
+      color: #FFFFFF;
       font-size: 13px;
     }
     .close-voice{
       width: 100%;
       position: absolute;
-      top: -100px;
+      top: -20px;
       display: flex;
       align-items: center;
       justify-content: center;