合并提交解决提交bug

pages/index/index.wxml

@@ -105,11 +105,13 @@
             </view>
             <!-- 上传作品 -->
             <chat id="upload"
+              id="chat"
               productionData="{{productionData}}" 
               title="我的作品"
               query="上传作品"
               type="2"
               columnType="6"
+              bind:getHeight="onGetHeight"
               bind:myevent="onMyEvent"
               more="{{productionMore}}"/>
             <!-- 更改年级 -->
@@ -117,6 +119,9 @@
              id="set-grade"
              grade="{{grade}}"/>
           </view>
+          <view class="canvas-box">
+            <canvas canvas-id="myCanvas" style="width:100%; height: {{canvasHeight}}px;"></canvas>
+          </view>
       </scroll-view>
   </view>
   <view hidden="{{flag}}">