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

taobao_mini/client/mock.js

-const mock = {
-  getUserInfo:require('../../project/src/canvas/game/mock/miniTb/tmallCat.getUserInfo.json')
-}
-
-export default mock;

taobao_mini/client/node_modules/@tbmp/mp-cloud-sdk/package.json

@@ -2,7 +2,7 @@
   "_args": [
     [
       "@tbmp/mp-cloud-sdk@1.4.2",
-      "/Users/wanghongyuan/hello_canvas/dist"
+      "/Users/wanghongyuan/new_taobao/taobao_mini/client"
     ]
   ],
   "_from": "@tbmp/mp-cloud-sdk@1.4.2",
@@ -27,7 +27,7 @@
   ],
   "_resolved": "https://registry.npm.taobao.org/@tbmp/mp-cloud-sdk/download/@tbmp/mp-cloud-sdk-1.4.2.tgz",
   "_spec": "1.4.2",
-  "_where": "/Users/wanghongyuan/hello_canvas/dist",
+  "_where": "/Users/wanghongyuan/new_taobao/taobao_mini/client",
   "author": "",
   "description": "",
   "gitHead": "c074f811312aea20c97a289aa9ac785e72de2368",

taobao_mini/client/node_modules/fyge-tbmini/package.json

 {
-  "_from": "fyge-tbmini@^1.3.7",
+  "_args": [
+    [
+      "fyge-tbmini@1.3.7",
+      "/Users/wanghongyuan/new_taobao/taobao_mini/client"
+    ]
+  ],
+  "_from": "fyge-tbmini@1.3.7",
   "_id": "fyge-tbmini@1.3.7",
   "_inBundle": false,
   "_integrity": "sha1-zp/KWSj+rRCGDOTrfo0BQxQxYqQ=",
   "_location": "/fyge-tbmini",
   "_phantomChildren": {},
   "_requested": {
-    "type": "range",
+    "type": "version",
     "registry": true,
-    "raw": "fyge-tbmini@^1.3.7",
+    "raw": "fyge-tbmini@1.3.7",
     "name": "fyge-tbmini",
     "escapedName": "fyge-tbmini",
-    "rawSpec": "^1.3.7",
+    "rawSpec": "1.3.7",
     "saveSpec": null,
-    "fetchSpec": "^1.3.7"
+    "fetchSpec": "1.3.7"
   },
   "_requiredBy": [
     "/"
   ],
   "_resolved": "https://registry.npm.taobao.org/fyge-tbmini/download/fyge-tbmini-1.3.7.tgz",
-  "_shasum": "ce9fca5928fead10860ce4eb7e8d0143143162a4",
-  "_spec": "fyge-tbmini@^1.3.7",
-  "_where": "/Users/wanghongyuan/hello_canvas/dist",
+  "_spec": "1.3.7",
+  "_where": "/Users/wanghongyuan/new_taobao/taobao_mini/client",
   "author": {
     "name": "MrKwon"
   },
-  "bundleDependencies": false,
   "dependencies": {},
-  "deprecated": false,
   "description": "淘宝小程序canvas渲染引擎",
   "devDependencies": {
     "dts-bundle": "^0.7.3",

taobao_mini/client/pages/pagecanvas/pagecanvas.js

@@ -4,7 +4,6 @@ import {
     Main
 } from './output';
 import API from '../../api';
-import mock from '../../mock';
 const app = getApp();
 const {
     tbcc
@@ -280,8 +279,8 @@ Page({
             const [myCloudName, handler] = netName.split("."); //待写，
 
             if (app.requestType == 'yapi') {
-                console.log('mock[handler]', mock[handler])
-                this.postMessage(netName, mock[handler]);
+                // console.log('mock[handler]', mock[handler])
+                // this.postMessage(netName, mock[handler]);
                 return;
             }