Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

src/components/tradePavilion/plugin/singletextbox.vue

@@ -25,11 +25,6 @@
     </div>
     <div class="diy-component-preview">
       <div class="diy-search">
-        <!-- <el-form>
-            <el-form-item :label="searchData.data.Name">
-                <el-input :placeholder="`最多输入${searchData.data.WordsLength}个字`" size="small"></el-input>
-            </el-form-item>
-        </el-form> -->
         <div style="display:flex;align-items:center;">
           <div style="color:red;" v-show="searchData.CompData.IsRequire">*</div>
           <div>{{searchData.CompData.Name}}</div>

src/components/tradePavilion/registrationAdd.vue

@@ -330,6 +330,7 @@
 </template>
 <script>
   import singletextbox from '../tradePavilion/plugin/singletextbox'
+  import multilinetext from '../tradePavilion/plugin/multilinetext'
   export default {
     data() {
       return {
@@ -354,7 +355,8 @@
       }
     },
     components: {
-      singletextbox
+      singletextbox,
+      multilinetext
     },
     mounted() {