Merge branch 'master' of gitlab2.dui88.com:wanghongyuan/hello_taobao

dist/.tea/entryFiles-development/config$.js

+
+const g = typeof global !== 'undefined' ? global : self;
+g.appXAppJson = {
+  "app": {
+    "$homepage": "pages/pageshou_ye/pageshou_ye"
+  }
+};

dist/.tea/entryFiles-development/index$.web.js

+require('@alipay/appx-compiler/lib/sjsEnvInit');
+require('./config$');
+
+require('../../pages/pageshou_ye/pageshou_ye?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
+require('../../pages/pagehuo_dong_ye/pagehuo_dong_ye?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
+require('../../pages/pagejie_shu_ye/pagejie_shu_ye?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
+require('../../pages/pagewo_de_jiang_pin_ye_mian1/pagewo_de_jiang_pin_ye_mian1?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');

dist/.tea/entryFiles-development/index$.worker.js

+if(!self.__appxInited) {
+self.__appxInited = 1;
+
+
+require('./config$');
+
+
+  var AFAppX = self.AFAppX.getAppContext
+    ? self.AFAppX.getAppContext().AFAppX
+    : self.AFAppX;
+  self.getCurrentPages = AFAppX.getCurrentPages;
+  self.getApp = AFAppX.getApp;
+  self.Page = AFAppX.Page;
+  self.App = AFAppX.App;
+  self.my = AFAppX.bridge || AFAppX.abridge;
+  self.abridge = self.my;
+  self.Component = AFAppX.WorkerComponent || function(){};
+  self.$global = AFAppX.$global;
+  self.requirePlugin = AFAppX.requirePlugin;
+          
+
+if(AFAppX.registerApp) {
+  AFAppX.registerApp({
+    appJSON: appXAppJson,
+  });
+}
+
+
+
+function success() {
+require('../../app');
+require('../../pages/pageshou_ye/pageshou_ye?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
+require('../../pages/pagehuo_dong_ye/pagehuo_dong_ye?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
+require('../../pages/pagejie_shu_ye/pagejie_shu_ye?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
+require('../../pages/pagewo_de_jiang_pin_ye_mian1/pagewo_de_jiang_pin_ye_mian1?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
+}
+self.bootstrapApp ? self.bootstrapApp({ success }) : success();
+}
\ No newline at end of file

dist/app.json

-{"pages":["pages/pagehuo_dong_ye/pagehuo_dong_ye","pages/pagejie_shu_ye/pagejie_shu_ye","pages/pageshou_ye/pageshou_ye","pages/pagewo_de_jiang_pin_ye_mian1/pagewo_de_jiang_pin_ye_mian1"],"window":{}}
\ No newline at end of file
+{
+  "pages": [
+    "pages/pageshou_ye/pageshou_ye",
+    "pages/pagehuo_dong_ye/pagehuo_dong_ye",
+    "pages/pagejie_shu_ye/pagejie_shu_ye",
+    "pages/pagewo_de_jiang_pin_ye_mian1/pagewo_de_jiang_pin_ye_mian1"
+  ],
+  "window": {}
+}
\ No newline at end of file

dist/node_modules/@tbmp/mp-cloud-sdk/package.json

 {
-  "_from": "@tbmp/mp-cloud-sdk@1.4.1",
-  "_id": "@tbmp/mp-cloud-sdk@1.4.1",
+  "_from": "@tbmp/mp-cloud-sdk@^1.4.1",
+  "_id": "@tbmp/mp-cloud-sdk@1.4.2",
   "_inBundle": false,
-  "_integrity": "sha1-2y9tanEKqWjGd2YMYtjaSjqryd0=",
+  "_integrity": "sha1-/49BtdDaNJ6H9+f9DDBMPgt/BbQ=",
   "_location": "/@tbmp/mp-cloud-sdk",
   "_phantomChildren": {},
   "_requested": {
-    "type": "version",
+    "type": "range",
     "registry": true,
-    "raw": "@tbmp/mp-cloud-sdk@1.4.1",
+    "raw": "@tbmp/mp-cloud-sdk@^1.4.1",
     "name": "@tbmp/mp-cloud-sdk",
     "escapedName": "@tbmp%2fmp-cloud-sdk",
     "scope": "@tbmp",
-    "rawSpec": "1.4.1",
+    "rawSpec": "^1.4.1",
     "saveSpec": null,
-    "fetchSpec": "1.4.1"
+    "fetchSpec": "^1.4.1"
   },
   "_requiredBy": [
-    "#USER",
     "/"
   ],
-  "_resolved": "https://registry.npm.taobao.org/@tbmp/mp-cloud-sdk/download/@tbmp/mp-cloud-sdk-1.4.1.tgz",
-  "_shasum": "db2f6d6a710aa968c677660c62d8da4a3aabc9dd",
-  "_spec": "@tbmp/mp-cloud-sdk@1.4.1",
-  "_where": "d:\\develop\\nodejs\\sparkProject\\filaFloor\\project\\dist",
+  "_resolved": "https://registry.npm.taobao.org/@tbmp/mp-cloud-sdk/download/@tbmp/mp-cloud-sdk-1.4.2.tgz",
+  "_shasum": "ff8f41b5d0da349e87f7e7fd0c304c3e0b7f05b4",
+  "_spec": "@tbmp/mp-cloud-sdk@^1.4.1",
+  "_where": "d:\\develop\\nodejs\\sparkProject\\Floor\\project\\dist",
   "author": "",
   "bundleDependencies": false,
   "deprecated": false,
   "description": "",
-  "gitHead": "f69d455f62dcf8b82983b291a0de742bc91b3390",
+  "gitHead": "c074f811312aea20c97a289aa9ac785e72de2368",
   "license": "ISC",
   "main": "index.js",
   "name": "@tbmp/mp-cloud-sdk",
@@ -39,5 +38,5 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "types": "./types/platforms/mp/index.d.ts",
-  "version": "1.4.1"
+  "version": "1.4.2"
 }

dist/package-lock.json

@@ -4,9 +4,9 @@
     "requires": true,
     "dependencies": {
         "@tbmp/mp-cloud-sdk": {
-            "version": "1.4.1",
-            "resolved": "https://registry.npm.taobao.org/@tbmp/mp-cloud-sdk/download/@tbmp/mp-cloud-sdk-1.4.1.tgz",
-            "integrity": "sha1-2y9tanEKqWjGd2YMYtjaSjqryd0="
+            "version": "1.4.2",
+            "resolved": "https://registry.npm.taobao.org/@tbmp/mp-cloud-sdk/download/@tbmp/mp-cloud-sdk-1.4.2.tgz",
+            "integrity": "sha1-/49BtdDaNJ6H9+f9DDBMPgt/BbQ="
         }
     }
 }

dist/package.json

+{
+    "name": "",
+    "version": "1.0.0",
+    "main": "",
+    "license": "MIT",
+    "dependencies": {
+        "@tbmp/mp-cloud-sdk": "^1.4.1"
+    }
+}

dist/pages/pagehuo_dong_ye/pagehuo_dong_ye.js

@@ -6,7 +6,7 @@ Page({
   data: {},
 
   onLoad(props) {
-    this.setData(this.data || {
+    this.setData({
       resList: resList
     });
   }

dist/pages/pagejie_shu_ye/pagejie_shu_ye.js

@@ -6,7 +6,7 @@ Page({
   data: {},
 
   onLoad(props) {
-    this.setData(this.data || {
+    this.setData({
       resList: resList
     });
   }

dist/pages/pageshou_ye/pageshou_ye.axml

@@ -5,7 +5,7 @@
         <image class="gui_ze" src={{resList['0c977f31-f5f8-4b5a-9cc8-cdaf00f0e64c'].url}} />
         <view class="zhu_ti">
           <image class="tu" src={{resList['8c476736-ed81-4e91-bcb4-6b2ac884d48d'].url}} />
-          <image class="an_niu" src={{resList['84e9b0a1-0e07-4324-9073-40d28008ce1f'].url}} />
+          <image class="an_niu" onTap="handleStart" src={{resList['84e9b0a1-0e07-4324-9073-40d28008ce1f'].url}} />
           <image class="wen_an" src={{resList['7622c471-422b-4f1e-8897-785c4d91aeff'].url}} />
         </view>
       </view>
\ No newline at end of file

dist/pages/pageshou_ye/pageshou_ye.js

@@ -6,9 +6,16 @@ Page({
   data: {},
 
   onLoad(props) {
-    this.setData(this.data || {
+    this.setData({
       resList: resList
     });
+  },
+
+  handleStart(){
+    console.log('change')
+    my.redirectTo({
+      url: '/pages/pagehuo_dong_ye/pagehuo_dong_ye'
+    });
   }
 
 });
\ No newline at end of file