代码暂存

taobao_mini/client/.kaitian/compileMode.json

 {
-  "current": 0,
+  "current": null,
   "modes": [
     {
       "title": "分享进",
       "page": "pages/pageshou_ye/pageshou_ye",
-      "pageQuery": "openId=AAGK5ZCBAMaFIi626fKFCdXP&shoestype=3",
+      "pageQuery": "openId=AAGK5ZBAMaFIi626fKFCdXP&shoestype=3",
       "update": true
     }
   ]

taobao_mini/client/pages/pageshou_ye/pageshou_ye.js

@@ -54,6 +54,7 @@ Page({
     nearchaprize: "",//再召唤xx好友得奖励x
     isVip: false,
     vipLink: "",
+    clickVip:false,
     giftype: 3,//1-新手礼盒，2-惊喜礼盒，3-锦鲤礼盒，0-都不显示
     ptimgbig: "",//选中的鞋子big
 
@@ -91,7 +92,7 @@ Page({
     infobtntype: 1,//1知道了，2召唤好友，3马上去抽碎片
     infotopshow: false,//顶部恭喜你是否显示
     infotit: "",//info文案
-    
+
 
     //选鞋阶段，单选不可取消
     nselid: 1,//默认选中1,,,,psd顺序，1-机甲，2-减震，3-二次元，4-山海，5--天乘
@@ -265,14 +266,31 @@ Page({
   onMouseEvent(e) {
     if (this.main) this.main.stage.onMouseEvent(e);
   },
-  onShow(query) {
-    console.log("onshow=========>", query);
+  onShow() {
+    console.log("onshow=========>");
+
+    let clickVip = this.data.clickVip;
+    if(clickVip){
+      this.setData({
+        clickVip:false
+      });
+      this.checkBackNgift();
+    }
     // 页面显示
   },
   onHide() {
     // console.log("onhide==========>");
     // 页面隐藏
   },
+  //onshow给新手
+  async checkBackNgift(){
+    await this.checkIsVip();
+    let isvip = this.data.isVip;
+    if(isvip){
+      this.closeGift();
+      this.getOpenNgift();
+    }
+  },
   /**
  * startAni
  */
@@ -305,9 +323,9 @@ Page({
     const { nickName, avatar } = app;
     const { success, data } = await API.login({ userNick: nickName, avatar: avatar, isFollow: false }).catch(res => {
       commonToast(res && res.message);
-      if(res&&res.code=="220003"){
+      if (res && res.code == "220003") {
         this.setData({
-          actover:true
+          actover: true
         });
         this.init();
       }
@@ -365,7 +383,7 @@ Page({
     //进来提示助力
     let lselected = this.data.selected;
     let actover = this.data.actover;
-    if (!actover&&lselected == 0 && app.inviteId && app.shoestype) {//进来，提示助力弹窗
+    if (!actover && lselected == 0 && app.inviteId && app.shoestype) {//进来，提示助力弹窗
       let myid = app.openId;
       let inid = app.inviteId;
       if (myid != inid) {
@@ -723,7 +741,10 @@ Page({
       commonToast('1秒成为会员，即可为TA助力哦', 2000);
       let vipLink = this.data.vipLink;
       setTimeout(() => {
-        navigateToOutside(vipLink)
+        this.setData({
+          clickVip:true
+        });
+        navigateToOutside(vipLink);
       }, 1000)
     }
   },
@@ -1082,7 +1103,7 @@ Page({
     this.showPrizePage(success, data);
     this.changeBtnReady(true);
     this.setData({
-      canTakeRankPrize:false
+      canTakeRankPrize: false
     });
   },
   /**
@@ -1147,12 +1168,12 @@ Page({
       ptimg_v: true,
       ptimg_ani: true
     });
-    setTimeout(()=>{
-      call&call();
+    setTimeout(() => {
+      call & call();
       this.setData({
-        isduihuan:true
+        isduihuan: true
       });
-    },800);
+    }, 800);
   },
   //邀请好友
   shareAct() {
@@ -1256,6 +1277,11 @@ Page({
     navigateToOutside(url);
   },
   onShareAppMessage() {
+    // const fileId = "cloud://6A648F4EC18FB26FDECC5D98C1D978C4//分享图.png";
+    // const result1 = await getApp().cloud.file.getTempFileURL({ fileId: fileId });
+    // // console.log("ghhdhsbckdsbcdcvnjdkhd", result1);
+    // if (result1[0]) SHARE_CONFIG.imageUrl = result1[0].url;
+
     let {
       path,
       ...rest
@@ -1264,7 +1290,8 @@ Page({
     if (app.openId) {
       path = '/pages/pageshou_ye/pageshou_ye' + '?openId=' + app.openId + "&shoestype=" + this.data.shoesType;
     }
-    // console.log('path', path)
+    
+    console.log('path', path)
 
     return {
       ...rest,