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

dist/pages/pagejie_shu_ye/pagejie_shu_ye.js

@@ -22,9 +22,10 @@ Page({
   },
 
   onLoad(props) {
-    console.log('fuck', JSON.parse(props.data));
+    // console.log('fuck', JSON.parse(props.data));
+    const datstr = decodeURIComponent( props.data);
 
-    const { prize, openPrizeStatus, isShowPrize } = JSON.parse(props.data);
+    const { prize, openPrizeStatus, isShowPrize } = JSON.parse(datstr);
     // isShowPrize只展示一次
     if (isShowPrize) {
       // 有奖品

dist/pages/pageshou_ye/pageshou_ye.js

@@ -98,8 +98,10 @@ Page({
       // vipInfo..data.isVip = true;
       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 }) });
-      } else {
+        let datstr = JSON.stringify({ prize:prize, openPrizeStatus:prize, isShowPrize:prize });
+        datstr = encodeURIComponent(datstr);
+        my.redirectTo({ url: '/pages/pagejie_shu_ye/pagejie_shu_ye?data=' +  datstr});
+      } else {  
         my.redirectTo({ url: '/pages/pagehuo_dong_ye/pagehuo_dong_ye' });
         // my.redirectTo({ url: '/pages/pagehuo_dong_ye/pagehuo_dong_ye?data=' + JSON.stringify({endTime}) });
       }