Merge remote-tracking branch 'refs/remotes/origin/tianmaoxiaoyuan' into tianmaoxiaoyuan

taobao_mini/client/pages/pagecanvas/pagecanvas.axml

@@ -4,6 +4,7 @@
   </canvas>
 </view>
 
+<end-modal a:if="{{endModalVisible}}" ></end-modal>
 <rule-modal a:if="{{ruleModalVisible}}" onModalClose="closeRuleModal"><text>{{rule}}</text></rule-modal>
 <levelup-modal a:if="{{levelupModalVisible}}" mydata="{{levelupModalData}}" onModalClose="closeLevelupModal"></levelup-modal>
 <message-modal a:if="{{messageModalVisible}}" mydata="{{messageModalData}}" onModalClose="closeMessageModal"></message-modal>

taobao_mini/client/pages/pagecanvas/pagecanvas.js

@@ -39,6 +39,7 @@ Page({
         recallCatInfo: {},
         taskModalVisible: 0,
         messageModalVisible: false,
+        endModalVisible: true,
         messageModalData: {},
         ruleModalVisible: false,
         levelupModalVisible: 0,

taobao_mini/client/pages/pagecanvas/pagecanvas.json

 {
   "usingComponents": {
+    "end-modal": "/components/endModal/endModal",
     "task-modal": "/components/comtask/comtask",
     "rule-modal": "/components/ruleModal/ruleModal",
     "levelup-modal": "/components/comlevelup/comlevelup",