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

dist/.gitignore

 .DS_Store
 node_modules/
-.tea/
\ No newline at end of file
+.tea/
+server/
\ No newline at end of file

dist/api.js

@@ -36,6 +36,26 @@ const apiList = {
     method:'get',
     isShowLoading: true
   },
+  submit: {
+    handle: 'submit',
+    method:'get',
+    isShowLoading: true
+  },
+  getBuyFloorList: {
+    handle: 'getBuyFloorList',
+    method:'get',
+    isShowLoading: true
+  },
+  getFloorPrize: {
+    handle: 'getFloorPrize',
+    method:'get',
+    isShowLoading: true
+  },
+  getCredits: {
+    handle: 'getCredits',
+    method:'get',
+    isShowLoading: true
+  },
   getVipInfo: {
     handle: 'getVipInfo',
     method:'get',

dist/app.js

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

dist/pages/index/index.js

@@ -23,16 +23,19 @@ Page({
     console.info(`Page onLoad with query: ${JSON.stringify(query)}`);
   },
   async init() {
+    API.getBuyFloorList();
+    // API.getFloorPrize();
+    // API.getCredits();
     const [activity, vipInfo] = await Promise.all([
       API.getActivityBaseInfoById(),
       API.getVipInfo(),
     ]);
-    // if (vipInfo.isVip && activity.data.isUserJoin) {
-    //   my.redirectTo({ url: '/pages/pagehuo_dong_ye/pagehuo_dong_ye' });
-    // } else {
-    //   my.redirectTo({ url: '/pages/pageshou_ye/pageshou_ye' });
-    // }
-    my.redirectTo({ url: '/pages/myprize/myprize' });
+    if (vipInfo.isVip && activity.data.isUserJoin) {
+      my.redirectTo({ url: '/pages/pagehuo_dong_ye/pagehuo_dong_ye' });
+    } else {
+      my.redirectTo({ url: '/pages/pageshou_ye/pageshou_ye' });
+    }
+    // my.redirectTo({ url: '/pages/myprize/myprize' });
   },
   onReady() {
     // 页面加载完成

dist/pages/pageshou_ye/pageshou_ye.js

@@ -25,10 +25,13 @@ Page({
   },
 
   handleStart() {
-    console.log('change')
-    my.redirectTo({
-      url: '/pages/pagehuo_dong_ye/pagehuo_dong_ye'
-    });
+
+      API.submit({grade:1,floor:10});
+
+    // console.log('change')
+    // my.redirectTo({
+    //   url: '/pages/pagehuo_dong_ye/pagehuo_dong_ye'
+    // });
   },
   showRuleModal() {
     this.setData({