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

dist/app.js

@@ -6,8 +6,8 @@ cloud.init({
 });
 
 App({
-  // requestType: 'cloud', // yapi，cloud: 云函数
-  requestType: 'yapi', // yapi，cloud: 云函数
+  requestType: 'cloud', // yapi，cloud: 云函数
+  // requestType: 'yapi', // yapi，cloud: 云函数
   cloudName: 'floor', // 主云函数项目名 base clientTemplate2C
   cloud,
   tbcc,

dist/app.json

 {
   "pages": [
-    "pages/pagehuo_dong_ye/pagehuo_dong_ye",
-    "pages/pagejie_shu_ye/pagejie_shu_ye",
     "pages/pageshou_ye/pageshou_ye",
     "pages/myprize/myprize",
+    "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": {}