cxw-010203

contrastPackages/addEvent/index.wxml

@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<!--contrastPackages/addEvent/index.wxml-->
-<text>contrastPackages/addEvent/index.wxml</text>
-=======
 <van-search
   value="{{ searchValue }}"
   placeholder="请输入搜索关键词"
@@ -50,4 +46,3 @@
             </view>
         </van-checkbox-group>
     </view>
->>>>>>> 09cfba1debc306a62e6602a6fe21d80489bf7103

contrastPackages/brandRatio/index.wxml

@@ -1,9 +1,4 @@
-<<<<<<< HEAD
-<!--contrastPackages/brandRatio/index.wxml-->
-<text>contrastPackages/brandRatio/index.wxml</text>
-=======
 <wxs src="./filter.wxs" module="filter"></wxs>
-
 <view class="box">
     <view class="tiem_com">
         <time-custom bind:change="changeTime"></time-custom>
@@ -63,4 +58,3 @@
         </van-checkbox-group>
 </van-popup>
 <van-dialog id="van-dialog" />
->>>>>>> 09cfba1debc306a62e6602a6fe21d80489bf7103

contrastPackages/carModelsRatio/index.wxml

@@ -1,9 +1,4 @@
-<<<<<<< HEAD
-<!--contrastPackages/carModelsRatio/index.wxml-->
-<text>contrastPackages/carModelsRatio/index.wxml</text>
-=======
 <wxs src="./filter.wxs" module="filter"></wxs>
-
 <view class="box">
     <view class="tiem_com">
         <time-custom bind:change="changeTime"></time-custom>
@@ -72,4 +67,3 @@
         
     </van-popup>
     <van-dialog id="van-dialog" />
->>>>>>> 09cfba1debc306a62e6602a6fe21d80489bf7103

ec-canvas/ec-canvas.js

@@ -145,6 +145,7 @@ methods: {
                 size: true
             })
             .exec(res => {
+                if(!res[0]) return
                 const canvasNode = res[0].node
                 this.canvasNode = canvasNode
 
@@ -270,4 +271,14 @@ function wrapTouch(event) {
         touch.offsetY = touch.y;
     }
     return event;
+}
+
+function hasNode(res) {
+    if(res) {
+        return true
+    } else {
+        setTimeout(() => {
+            hasNode(res)
+        }, 1000)
+    }
 }