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,
@@ -24,7 +24,7 @@ App({
    */
   handleQuery(query) {
     const { activityId } = query;
-    this.activityId = activityId || '5f505873738989c8b356e284';
-    // this.activityId = activityId || '5f5759b2114fbb8f6d91245c';
+    // this.activityId = activityId || '5f505873738989c8b356e284';
+    this.activityId = activityId || '5f5759b2114fbb8f6d91245c';//商家创建的测试环境活
   }
 });

dist/components/comhen_yi_han23/comhen_yi_han23.js

@@ -9,8 +9,9 @@ Component({
   },
   methods: {},
 
-  onInit(props) {
-    console.log('fuck',props)
+  
+  didMount(props) {
+    console.log('fuck onInit',this.props)
     // this.setData({
     //   resList: resList
     // });

dist/pages/pagehuo_dong_ye/pagehuo_dong_ye.js

@@ -7,8 +7,6 @@ Page({
   data: {
     // 购买楼层数
     canBuyFloor: 10,
-    // 购买记录
-    orderList: [],
     // 购买记录弹窗显示隐藏
     orderModalVisible: false,
     // 立即购买弹窗
@@ -87,11 +85,7 @@ Page({
   // 购买记录弹窗
   orderRecord() {
     // let {orderModalVisible} = this.data
-
-    // 点击弹窗时调用接口
-
-
-    // console.log('click',this.data)
+    console.log('click', this.data)
     this.setData({
       orderModalVisible: true
     })
@@ -108,28 +102,12 @@ Page({
     // 购买楼层数
     let { canBuyFloor } = this.data
     // 判断会员等级
-    let { data } = await API.getVipInfo() || {};
-    let grade = data.grade;
-    let url = data.url;
-    let gradeName = data.gradeName;
-    let gradeCredits = data.gradeCredits;
-    console.log(data, 'grade');
-
-    // await API.submit({ floor: canBuyFloor, grade: grade }).catch((res) => {
-    //   console.log('res', res);
-    //   // console.log(this.data.vipCredits, 'vip')
-    // })
-
-    // let {message,data,code,success} = await API.submit({ floor: canBuyFloor, grade: grade }) || {};
-    this.setData({
-        vipCredits: {
-          grade,
-          gradeName,
-          gradeCredits,
-          canBuyFloor
-        }
+    // let { data: { isVip, grade, gradeName, gradeCredits } } = await API.getVipInfo() || {};
+    API.getVipInfo().then(({ data: { grade } }) => {
+      API.submit({ floor: canBuyFloor, grade: grade }).catch((res) => {
+        console.log(res);
+      })
     })
-
 
     // 显示
     this.setData({

dist/pages/pagejie_shu_ye/pagejie_shu_ye.js

@@ -5,11 +5,11 @@ import API from '../../api';
 
 Page({
   data: {
-    prizeVisible:false,
-    noprizeVisible:false,
-    openPrizeStatus:0,
+    prizeVisible: false,
+    noprizeVisible: false,
+    openPrizeStatus: 0,
     // 购买记录列表
-    orderList:[],
+    orderList: [],
     // 中奖名单
     prizeMenu:'',
     // 购买列表渲染
@@ -20,7 +20,20 @@ Page({
   },
 
   onLoad(props) {
-    // console.log('fuck',JSON.parse(props.prize))
+    console.log('fuck', JSON.parse(props.data));
+
+    const { prize, openPrizeStatus, isShowPrize } = JSON.parse(props.data);
+    if (isShowPrize) {
+      if (prize) {
+        this.setData({ prizeVisible: true })
+      } else {
+        this.setData({
+          noprizeVisible: true,
+          openPrizeStatus: openPrizeStatus
+        })
+      }
+    }
+
     this.setData({
       resList: resList
     });
@@ -151,7 +164,7 @@ Page({
     }
     console.log(floorPrize,'arr')
     this.setData({
-      prizeMenu:floorPrize
+      prizeMenu: floorPrize
     })
    
   }

dist/pages/pageshou_ye/pageshou_ye.js

@@ -30,8 +30,9 @@ Page({
   },
   gotoVipPage() {
     API.getVipInfo().then(res => {
-      if (!!res.isVip)
-        navigateToOutside(res.url)
+      // res.data.isVip=true;
+      if (!res.data.isVip)
+        navigateToOutside(res.data.url)
       else
         my.redirectTo({ url: '/pages/pagehuo_dong_ye/pagehuo_dong_ye' });
     })
@@ -64,8 +65,8 @@ Page({
       API.getActivityBaseInfoById(),
       API.getVipInfo(),
     ]);
-    // vipInfo.isVip = true;
-    if (vipInfo.isVip && isUserJoin) {
+    // vipInfo..data.isVip = true;
+    if (vipInfo.data.isVip && isUserJoin) {
       if (isEnd(endTime) &&
         (openPrizeStatus == OPEN_PRIZE_STATUS.SUCCESS || openPrizeStatus == OPEN_PRIZE_STATUS.NOT_OPEN)) {//活动结束，开奖成功or不开奖
         my.redirectTo({ url: '/pages/pagejie_shu_ye/pagejie_shu_ye?data=' + JSON.stringify({ prize, openPrizeStatus, isShowPrize }) });

dist/tbcc-sdk/lib/request.js

@@ -84,7 +84,7 @@ const request = ({ cloud, cloudName, requestType = 'cloud' }) => {
     const requestCloud = () => {
       return new Promise((resolve, reject) => {
         cloud.function.invoke(_cloudName, params, handle).then(res => {
-          console.log('request Cloud callback=>', handle, res);
+          console.log('request Cloud callback=>', handle, res,JSON.stringify(res));
           // console.log('requestCloud', handle, params, res);
           hideMyLoading();
           if (res && res.success) {