合并 rich-text.uvue 解决冲突

pages/component/rich-text/rich-text.uvue

@@ -24,6 +24,10 @@
           <text id='rich-text-str'>{{richTextStr}}</text>
         </view>
       </view>
+      <view class="text-box2">
+        <rich-text style="height: 80px;" :selectable="true"
+          :nodes="text"></rich-text>
+      </view>
     </view>
   </view>
   <rich-text v-if="autoTest" id="test-rich-text" :nodes="testNodes" :selectable="true" @itemclick="itemClickForTest" style="position: fixed;width: 100px;height: 100px;"></rich-text>
@@ -89,4 +93,10 @@
     padding: 20px 0;
     background-color: white;
   }
+
+  .text-box2 {
+    top: 20px;
+    background-color: white;
+  }
+
 </style>