askbot-dragon 0.7.13 → 0.7.17

package/package.json

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

package/src/components/askVideo.vue

@@ -9,12 +9,15 @@
           @pause="statechanged"
         /> -->
         <video
-                :src="src"
                 controls="controls"
+                :raw-controls="true"
                 x5-video-player-type="h5-page"
-                style="object-fit: contain;width: calc(100vw - 139px);height: 160px;background-color: black;border-radius: 17px;max-width: 230px;"
+                style="object-fit: contain;width: calc(100vw - 139px);height: 160px;background-color: black;border-radius: 25px;max-width: 230px;padding: 0 10px"
                 class="video-player vjs-custom-skin"
-                :id="msg.keyId"/>
+                :id="msg.keyId+'key'">
+          <source :src="videoSrc" />
+        </video>
+      <div id="output"></div>
     </div>
 </template>
 <script>
@@ -23,6 +26,7 @@
         props: ["msg", "url", "localUrl", "progress"],
         data() {
             return {
+              videoSrc:''
             }
         },
         watch: {
@@ -35,9 +39,17 @@
                 return this.url == null || this.url === "";
             },
             src() {
-                return (this.url != null && this.url !== '') ? this.url : this.localUrl;
+                return this.url ? this.url : this.localUrl;
             }
-        }
+        },
+      mounted() {
+          this.$nextTick(()=>{
+            this.videoSrc = this.url ? this.url : this.localUrl
+          })
+
+      },
+      methods:{
+      }
 
     }
 </script>

package/src/components/associationIntention.vue

@@ -22,7 +22,7 @@
         <!-- LPY 原生宽度适配有bug，弃用 -->
         <img
             :src="msg.content.url"
-            style="height: auto; width: calc(100vw - 137px);border-radius: 17px;max-width: 230px"
+            style="height: auto; width: calc(100vw - 137px);border-radius: 25px;max-width: 230px"
             @click="onImageClick(msg.content.url)"
             class="img-class"
         />
@@ -52,7 +52,7 @@
         const regex = new RegExp("<img", "gi");
         return html.replace(
             regex,
-            "<img style='max-width: 230px;' onclick='imageOnClick(this)'"
+            "<img style='max-width: 230px;border-radius: 25px;' onclick='imageOnClick(this)'"
         );
       },
     },

package/src/components/formTemplate.vue

@@ -1671,7 +1671,9 @@ export default {
       color: #366AFF;
     }
   }
-
+  /deep/.el-select-dropdown__item.selected{
+    color: #366aff;
+  }
   /deep/.el-upload-list--picture-card{
     .el-upload-list__item{
       width: 74px;
@@ -1892,6 +1894,8 @@ export default {
       display: flex;
       overflow: hidden;
       margin-right: 0;
+      display: flex;
+      align-items:center;
     }
     .el-checkbox__label{
       font-size: 1em;