Merge branch 'btscroll' into new_ll

src/common/MultiLineInput.vue

@@ -9,7 +9,7 @@
               :type="content.type=='number'?'tel':'text'" 
               :style="{'width':1/content.iptLis.length*100-3+'%'}" 
               :key="item.placeholder+idx" 
-              v-model="txt"
+              v-model="item.value"
               :placeholder="item.placeholder"
               @input="changeVal($event,idx,content.type)" 
               @blur="blur"
@@ -17,7 +17,7 @@
             <input v-show="content.iptLis.length==1" class="contentVal" 
               :type="content.type=='number'?'tel':'text'" 
               :placeholder="content.placeholder" 
-              v-model="txt" 
+              v-model="item.value"
               @input="changeVal($event,idx,content.type)" 
               @blur="blur"
               @click="handleClick">
@@ -76,7 +76,6 @@ export default {
       this.txt = tmpTxt
       this.content = getModelExpStr(this.msg,this.txt)
       // this.$emit('changeMultipVal',e.currentTarget.value,num)
-      
       const select = this.part.select;
       // if(!select){return}
       const newData = Object.assign({},this.part,{value:this.txt,controlType:3,valueP:this.txt});
@@ -100,6 +99,7 @@ export default {
       part:{//清空时更新
         handler(newVal,oldVal){
           this.txt = newVal.value;
+          this.content = getModelExpStr(this.msg,this.txt)
         },
         deep:true
       }

src/common/RadioSelect.vue

@@ -0,0 +1,15 @@
+<template>
+    <div class="radioSelect">
+
+    </div>
+</template>
+
+<script>
+    export default {
+        name: "RadioSelect"
+    }
+</script>
+
+<style scoped>
+
+</style>

src/components/Preview.vue

@@ -221,11 +221,12 @@ export default {
         }
         // return
         api.uploadImageThums(formData).then((res) => {//获取图片
-          let result = res.data;
-          if (result.code == 0) {//图片提交成功再保存数据
+          let data = res.data;
+          if (data.code == 0) {//图片提交成功再保存数据
             // this.showType = 'success'
             // this.submit = true
-            let reportList = []
+            let reportList = [];
+            let result = data.data;
             for(let i = 0;i < result.length;i++){
               let obg = {}
               obg.narrowImage = result[i].thumbnail.url