版本更新

@@ -4,6 +4,7 @@
  * ------------------------------------------------------------------
  */
 var isFirst = false;
+// isFirst = true;
 
 var path = require('path');
 var gulp = require('gulp');

@@ -93,7 +93,8 @@
 
 @font-face {
   font-family: "iconfont";
-  src: url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAOsAAsAAAAAB6gAAANdAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCDBgqDDIJmATYCJAMMCwgABCAFhG0HORuvBsgOJUHBwIABAAlgPHyN/f7c3UVEk0mi+3QSQxJNJCoexUrxUhhKIyT4UsKbL89+kizTNWb3wyt7UkR96ayA4xev1q04fZzIa32ey/Gt5wc26luWy5iT9qKFAcYBBbQ3RgEFWiAJesPYlRdxn0C9YccRqxl5ZcBCYSwLxJFS3gwsUk6lpj7UCtUle4t4Yqo2XaeXAHj0vx//QUhYkFRlxtq1w/Q2kPRz+iOmhipDoM51Gx7PD3aIjBlAITZLgxuoMDODUq8YTerLqxUhjRU3GgFfqeqrzT88kiCqGbWNYAJlEz+nbQmJP1h91rUZVMPcGeAZM51XhqohJw97O/vO23paqy3T6coNhsqQ1esr3nVWF19mTZ3YnOwtWwPk5bvMfvYCQV11V+xUzZx02tPO6H02TtP0y4dn5a7M9ravfPvs/poNl43TTmVrW87O66dcKzd3myo2Tjo5rW07l6+fcXXd3KmUDdBKXH240GtvAAw49qfa2BeatkTevUsumTJX5pzRRVy781FXe+YP15YALi0+kkDHQRm8OLz2sP/U1NGjIPxKdyVpafxHpKWvbajtddvnaxmZHLP0XGY1d2wvLarJWrd3LMD6Q1DiSPHusrPgvOxtlAKDyt7bk32nH3emP+npcwo2dKU/Vj040Jn2+HTvAU5VFtOf5vZDf683NVrpbEvIO7N3IX421A40MRbmdVIPQGXQhMi7/+o3vjanTBtt4/7Vygr4/p/GIHW7aqBWorXqz7QVQMVYCK4xXLnISlup57Ntpvcth3Ju8j8aod2b/tauu8+FWl0xkhpDyGqNEIWZQZUG86hWawH1pmUebtBBQolShynjAKHVFSTNPpG1ekUU5jWqdPuGaq1Bod56OJ7ZYCyUdKqEmjFqgy3dUNkqCozlwXRQX4Lk7VyzlNT4XAWSNMo4DA4IyuYzkYCkMTZoOuQhGDOQkUQeZoDHEMeJUC2JKtSKAxQYq2MCA5myFwW0ijygrZAgzTCkDdSiG6TUSiRg3MEYnft8CUSuHaeZVNNTka6ASDSUo0PBAgS1IDKNQquea3lGo4NcCAxjQAyJiAdlgFkIhyOC1OWzVJBWWABFj5RajECzH9PWGDC/mX++Q1DPGJsjRY6i5hgx1hSNwhTxatwNAAAAAA==') format('woff2'),
+  // src: url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAScAAsAAAAACWAAAARQAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCDSAqFVIRuATYCJAMYCw4ABCAFhG0HVRshCMgOJSGRwABgYAPDUEoeHvd7PTfJSwFAEah6VmX1dTtS08QKyKgZO6MrzNCI9/9/p93MlJPWQetZqTCDwumbgGcyBbEQPyFlu+svwP9zP59X1mB57dlcIpO6qHBnQOMBDSiiLVJ4Axl/1g9uMj9DgoHJYeziMrYT6LVoIdZxQpoAzBRav0A8lEvLwSymU0oooVtZc6YW8R2MdacP2GUA39zvx3/wCTOSJtOGXj2Ir4SoXzYvA/HW/62KaoC2/ixgZpGxBRTiRa7tEdwPbsH1Sn/ByAnQr1tSftk84z7b8oJ5Gfi/BTGR5gr9eipF0vT4z4sKyfoh7izU8MvGRCj84iIkfm1BaPjDIGT+BgpOS1VRlz7cAsQOaPgtstj5d4Rm2sJiwdWa42RrY6ulpEvbeDlLtnAqJzlZk8u4aPEAP3fpSuXt24I7d4R374oNhiJLRB4nmnP7duGSfo5AlMO3tXKFgsnW7QN8sXDxwM42nki8tK3mqIFow/X54sSBO+ECS/w5TujcY2N92Rz53GqTg2ASsDfb2bYDO1l46xNX5PVv4qy63W9wW7KFIH7scBavZFt/chQu3zazYAlvehIBR+Uu3swXr1AmWrKJw5lczhUu3srnL10hZneQz3q7g0dMbgPo8EzXZ6VkJQlEttQOBNR5QVncISGLWroG2VIHRSxo/2/IU1P4BrHLsYrCmEN92IEDGOK+5UARjuM+XO64nNbYV6Wv1xw+6P43+saNYsePY6Nil50laln7B910+c7pbYU5oEojI9iIVbBZ1r9w7vTe3vnzwe/ml+vG+g0bjh3LOf5Fq1W+Hs8G/7d39kaNdr0PNHe39rU+aJrdzQN/k9GLbIudBavigso8bNUCD8vnXpHt2SvHuBru2I2kPb0Ez2yxxi1na+LP1TdyvBG18WcVp2bVxJ3d0jBLpchzG7aoZmJpcMV7ix+w9nlq8tTH3dTXBhoB2tNpCl8EQH6DA7B0MANWH8+SRKFwixEr3/mhfmPufaG81Drsa3dfAbcRm2ZBQT0Z/BVytfm/T0EB2v9GwQqxvhaxvNlBoLpmjPwJvbqLFrpGPe5LNfEewqHbRAhJlwXIui2hCm4LGn12oeq2B702Jc7uM4aGi9KDDV0AwrC9kAz6CdmwK6iCewSNSW+hGg4cenXCfsk+KyEnYmlUzqBKsqKOlEu0GspGhvAyc5C0SlVOR4UuVYRovdxDent4JSOJSIPoPkboq6U+DEORFK1VkwlgN6RSaUkdrVUgCeMhYxhdiKcnlXcjD4lWDYQjNKQcA6lEqlCHJCehpUHZtRlE6vM5EKkqKuXokrISqwhC05M3TvLmwasGKlGmqVV2Lq31qkn5YDAo3ItC01IjJUALotKDWiRdficFRILhQdbCrxPCE1Wi6so8xleor3Id9NLWqZEiR4kmanTpuVMuUe5/U28TiUqrR96mNKI8Ti8zkmnVyBipdUwdAA==') format('woff2'),
+  src: url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAT4AAsAAAAAClgAAASsAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCDdAqHBIYEATYCJAMgCxIABCAFhG0HZhv8CMgOJU2RwMBgYANAPDzt1+/cmXn+TXFL0ESrpU2IJ0LDo1hJlIqXQChfS9j//73sBlWmUDqts1JhDgrtTl9G0clkKX7SnP//fqWTxwcsrz0blBF8f6KaKgJoeIAGKGqzqch2QcpxH+AZLkzg3QR6e/SEXc8v1YCzQtgXiOdmY29wdhmVGEZoNXXImUV8g0qb3uNnAXzVvz62ITqcSapMOPL2s7w2yFxzfJVAjLCPcEc1w7vy7LidR8YpoBDfQp0fZDNyCqH/pBb3gBnxLxKsOT73fE4/r3m+7qXyKsFu97WiMnI14TZQKZJaU8s/L2qCcgLpT6INa44yomLNE1FYoxGJtRqFdKp1iGjYUBCZzQTxzCpb9YwZYJroiJcgqM/rypiRY0KSVCuurrtDPFzpFRcCvTy9RNY4f6Rf9bx1vm1zfCvnLKDR3MnqmvmLrVevaq5d0964ob9+vVGS6wzCWXT1asO8Sb4anfL4DSNorWbOiI2T1Xrt3MmbR/rp9PNH9t9/ncojMEXvUydfS9O4ES8IyuiJCh+yfPSLq081155pb7zQX3/eREEfImmYUthx7mv8NXMgvd2o8pq8GSNqe+ai2klrfJdcnXQ9dN46ivq+KUi/WOXxMUC7cEPH+nl+3ZFrHkx67lq1/hqtunlrfH3nLKS1c9er1fMX6VUFlGLvNvlRczaAAl/pYqfiykKNzovdhIC9Ud+au0eLsfOXIS92tw6DsX1VvnmTWCVilVCa7KQ9E/Fdu3CUTWQCpZxC310YsFAWsDZljLEcPkr2ITG5M/CDB/EZIlaxcoUB2M4poVJdUNnIhmrg0vTpOMg4xHjVuIau7SdM6N4dYh/+Dlk9aNWqAweqD34Vxet8O1gFTK46SjpW5R951NHxL2nLa6o75uhwwGHbNkXqS5Ljzr27tj1zxtgPCS5hHjEeu2VbmEuCc8mM0yrXMz2W5Ca28lFLeoS7vYjMGFW1eCYt0DO1Y+WISM1zL3zIuuP9804MGuJrHDMg77jlSKf+ucfXDe7EWcJ819dxHdE+OIQoLXWyR/RDx4fR+m1jPGE4wPhoukn0AiC/JQDsI/w66w5mUZ5J/NvzJaIqNpzE8qMz9nusbZgvt3ikfmuHAv7nzTChOF0MtNJ+UDk/GwowtpNxlwimtry7k42iLOcDDvdQQi8SPw0I3jn3y9Qu7lZ53NWLNiSN3ZC1DpEL/RRUBmeh1roEvZMKzh/MkxGidDhhLECYsR2SKT8gm3GOXOj3oLLkHdRmgoDeKHyuODgSZipHRr0V1Mb0GciYDaLAShaFMvKrkbEv11t2SnSmDsk2s5+JCo/0xguQgOQyjrH1M0YrCsuwssgz+XA/xHEiI8miBRmUcJOiSMkREWzYB4UbRB4o18iQ3hRIG0YfAzHMDEQCVp2toHyfXw0x6ovTmxzT9sOrg8hszIszooSLTEEuUAqp2rZltU0/RtEUCpZ3sWQiHiMf7QgnRkQMKXyTBWKgCGfKEZIki6BxbFpleP1qfknPQU+4aRspcpSooo4m2uh0j3obrHOwNMrRwIk2FOUkI1Z6kc1EmkQeOQ0wC4OQYCQlrq/NAfGSMhAA') format('woff2'),
 }
 
 .iconfont {
@@ -112,6 +113,10 @@
   content: "\e6a6";
 }
 
+.iconclose1:before {
+  content: "\e615";
+}
+
 .drop-down-item :last-child {
   border-bottom: none;
 }

@@ -30,13 +30,21 @@ Component({
       });
     },
     bindGetUserInfo(e) {
-      wx.showLoading();
-      this.getUserInfo(e.detail);
+      console.log("e:", e);
+      if (e.detail.iv && e.detail.encryptedData) {
+        wx.showLoading();
+        this.getUserInfo(e.detail);
+      } else {
+        wx.showToast({
+          title: "请允许授权",
+          icon:"none"
+        })
+      }
     },
     getUserInfo(e) {
       let _this = this;
       app.globalData.userInfo = e.userInfo;
-      console.log("before register : code = ", app.store.getItem("wxcode"))
+      // console.log("before register : code = ", app.store.getItem("wxcode"))
       app.post({
         url: app.api.register,
         sid: false,
@@ -57,7 +65,9 @@ Component({
         }
         _this.hideMask();
         _this.authComplete();
-      }).catch((err) => {})
+      }).catch((err) => {
+
+      })
     },
   }
 })

-<view class="empty-tips" wx:if="{{emptyVisible}}">
+<!-- <view class="empty-tips" wx:if="{{emptyVisible}}"> -->
+<view class="empty-tips">
 		<view class="tips">
 				<span class="iconfont iconempty"></span>
 				<view class="tips">这里空空如也~</view>

@@ -82,6 +82,7 @@
   &-item {
     position: relative;
     text-align: center;
+    width: 240px;
 
     .display {
       position: relative;
@@ -90,6 +91,7 @@
       border-radius: 70px;
       background-image: radial-gradient(circle at 0 0, #ffffff, #f2e6e6);
       @extend .fcc;
+      margin: 0 auto;
 
       .prod {
         max-width: 200px;

@@ -5,18 +5,18 @@
     <view class="tit">· 太棒了 ·</view>
     <view class="tips">
       领取
-      <span class="val">{{wishInfo.totalElasticValue}}</span>
+      <span class="val">{{wishBillInfo.totalElasticValue}}</span>
       弹力值
     </view>
     <!-- 心愿容器 -->
     <view class="wish">
-      <view wx:for="{{wishList}}" wx:key="{{index}}" class="wish-item">
+      <view wx:for="{{wishBillInfo.elasticValueList}}" wx:key="{{index}}" class="wish-item">
         <view class="display">
           <image class="prod" mode="aspectFit" src="../../image/prize/prize-{{item.tag}}.png" />
         </view>
         <view class="val">
           <image class="icon" mode="widthFix" src="../../image/oss/create-wish/cw-light.png" />
-          获得{{item.initialElasticValue}}
+          获得{{item.elasticValue}}
         </view>
       </view>
     </view>

@@ -55,12 +55,13 @@
       position: relative;
       margin: 20px auto 0;
       z-index: 1;
+      font-size: 26px;
     }
 
     .btn1 {
       @include cb(320px, 60px);
       // @include cb(360px, 72px);
-      font-size: 26px;
+
     }
 
     .btn2 {

@@ -47,7 +47,8 @@ $contentWidth:690px;
           width: 168px;
           height: 62px;
           border-radius: 10px;
-          border: solid 1px #b83138;
+          border: solid 1PX #b83138;
+          // border: solid 1px #b83138;
           color: #b93138;
           font-size: 24px;
           @extend .bb;
@@ -93,7 +94,7 @@ $contentWidth:690px;
         display: flex;
         justify-content: space-between;
         align-items: center;
-        border-bottom: solid 1px #e0e0e0;
+        border-bottom: solid 1PX #e0e0e0;
 
         .check {
           width: 26px;
@@ -150,6 +151,12 @@ $contentWidth:690px;
 
 
       }
+
+      .empty {
+        text-align: center;
+        margin-top: 100px;
+        color: #999999;
+      }
     }
 
     .btn-wrap {

@@ -56,6 +56,7 @@
           <view class="txt">导航</view>
         </view>
       </view>
+      <view wx:if="{{addressList.length <= 0}}" class="empty">该区域无门店，换一个地方试试</view>
     </scroll-view>
     <!-- 按钮 -->
     <view wx:if="{{selectedMode}}" class="btn-wrap">

@@ -4,13 +4,13 @@
 .comp-item {
   position: relative;
   width: 654px;
-  height: 585px;
+  height: 645px;
 
   // background-color: wheat;
   .bg {
     position: absolute;
     width: 654px;
-    height: 585px;
+    height: 645px;
   }
 
   .space1 {
@@ -22,7 +22,7 @@
     position: absolute;
     left: 0;
     right: 0;
-    bottom: 64px;
+    bottom: 80px;
     margin: 0 auto;
   }
 }

 Component({
+  options: {
+    styleIsolation: 'apply-shared'
+  },
   properties: {
     // 这里定义了innerText属性，属性值可以在组件使用时指定
     innerText: {

@@ -27,4 +27,16 @@
     // bottom: 100px;
     margin: 0 auto;
   }
+
+
+}
+
+.close-wrap {
+  text-align: center;
+  color: #ffffff;
+
+  .iconfont {
+    font-size: 100px;
+  }
+
 }

@@ -3,3 +3,6 @@
   <view class="space1"></view>
   <view bindtap="hideMask" class="btn">我知道了</view>
 </scroll-view>
+<view class="close-wrap">
+  <span bindtap="hideMask" class="iconfont iconclose1"></span>
+</view>

@@ -6,6 +6,7 @@
   @extend .fcc;
 
   .notice {
+    margin-top: 24px;
     width: 439px;
     height: 235px;
   }

 <view class="comp-item">
-  <image class="notice" mode="widthFix" src="../../image/oss/coupon-detail/cd-c3.png" />
+  <image class="notice" mode="widthFix" src="../../image/oss/coupon-detail/cd-c3.png?ver=1" />
 </view>

@@ -36,7 +36,7 @@ let productMap = {
     sence: 1,
     point: {
       left: 210,
-      top: 300,
+      top: 400,
     },
     tips: {
       type: "top-left",
@@ -50,11 +50,11 @@ let productMap = {
     sence: 1,
     point: {
       left: 460,
-      top: 180,
+      top: 120,
     },
     tips: {
-      type: "bottom-left",
-      point: mapFix["bottom-left"],
+      type: "bottom-right",
+      point: mapFix["bottom-right"],
     }
   },
 
@@ -98,14 +98,12 @@ let productMap = {
       top: 300,
     },
     tips: {
-      type: "top-left",
-      point: mapFix["top-left"],
+      type: "bottom-right",
+      point: mapFix["bottom-right"],
     }
   },
 
 
-
-
   // 场景3
   "P000000000000000000000000000001": {
     name: "丸美弹力蛋白眼精华素10g+10g",
@@ -127,11 +125,11 @@ let productMap = {
     sence: 3,
     point: {
       left: 380,
-      top: 180,
+      top: 280,
     },
     tips: {
-      type: "bottom-right",
-      point: mapFix["bottom-right"],
+      type: "top-right",
+      point: mapFix["top-right"],
     }
   },
 
@@ -142,11 +140,11 @@ let productMap = {
     sence: 3,
     point: {
       left: 540,
-      top: 440,
+      top: 380,
     },
     tips: {
-      type: "top-left",
-      point: mapFix["top-left"],
+      type: "bottom-left",
+      point: mapFix["bottom-left"],
     }
   },
 
@@ -177,8 +175,8 @@ let productMap = {
       top: 300,
     },
     tips: {
-      type: "top-left",
-      point: mapFix["top-left"],
+      type: "bottom-right",
+      point: mapFix["bottom-right"],
     }
   },
 

@@ -25,6 +25,7 @@ Page({
     status: 0,
     animationShake: {}, // 摇一摇动画
     aniTimeoutIndex: 0,
+    initComplete: false,
   },
   onShareAppMessage() {},
   showAuth() {
@@ -51,6 +52,7 @@ Page({
     this.initData();
   },
   initData() {
+    console.log("coop - initData");
     app.queryIndex().then((result) => {
       this.setData({
         indexInfo: app.globalData.indexInfo,
@@ -124,6 +126,10 @@ Page({
     if (this.data.tipsCommonVisible) {
       return;
     }
+    // 引导注册
+    if (this.data.tipsGuideRegisterVisible) {
+      return;
+    }
     // 自己表单
     if (wishInfo.isSelfWishBill == 1) {
       return;
@@ -175,6 +181,7 @@ Page({
             status: status,
             animationPassVisible: false
           })
+          this.queryWishbillDetail();
         }, 2000);
 
       } else if (status == 2) {
@@ -228,7 +235,8 @@ Page({
         });
         this.setData({
           wishInfo: result,
-          wishList: wishList
+          wishList: wishList,
+          initComplete: true,
         })
         console.log("wishInfo:", this.data.wishInfo);
         console.log("wishList:", this.data.wishList);
@@ -250,6 +258,7 @@ Page({
       name,
       data
     } = evt.detail;
+    console.log("name:", name);
     switch (name) {
 
       case "_evt_hide_mask":
@@ -272,7 +281,8 @@ Page({
         })
         break;
 
-      case "_evt_auth_complete:":
+      case "_evt_auth_complete":
+        this.hideMask();
         this.initData();
         break;
 

 <view class="page">
   <view wx:if="{{animationPassVisible}}" class="ani">
     <view class="mask"></view>
-    <image class="gif" mode="widthFix" src="../../image/oss/ani/pass.gif" />
+    <image class="gif" mode="widthFix" src="../../image/oss/ani/pass.gif?ver=1" />
   </view>
   <view class="app__bgc bgc"></view>
   <image class="bg" src="../../image/oss/coop/coop-bg-1.png" mode="scaleToFill" />
@@ -16,7 +16,7 @@
       <!-- 点自己链接未助力 -->
       <view bindtap="queryWishbillAssist" wx:if="{{wishInfo.isSelfWishBill == 1 || (status != 1 && wishInfo.isAssist != 1)}}" class="shake">
         <image class="ebg" mode="widthFix" src="../../image/oss/coop/coop-c2.png" />
-        <image class="coop-shake animated infinite {{animationPassVisible?'':'tada'}}" mode="widthFix" src="../../image/oss/coop/coop-shake.png" />
+        <image class="coop-shake animated infinite {{animationPassVisible || !initComplete ?'':'tada'}}" mode="widthFix" src="../../image/oss/coop/coop-shake.png" />
         <view class="space1"></view>
         <view class="cont">
           <view class="tips">
@@ -60,7 +60,7 @@
               </view>
             </view>
             <view class="tips2">
-              <text class="t1">太厉害了\n您总共摇出了{{coopInfo.totalElasticValue}}弹力值</text>
+              <text class="t1">太厉害了\n您总共摇出了{{wishInfo.helpElasticValue}}弹力值</text>
             </view>
             <!-- 奖品 -->
             <view class="wish">
@@ -87,9 +87,7 @@
             </view>
           </view>
         </view>
-        <view wx:if="{{isSelfWishBill == 1 || (status != 1 && wishInfo.isAssist != 1)}}" bindtap="onPlayTooHandler" class="play-too-btn">
-          我也要玩
-        </view>
+        <view bindtap="onPlayTooHandler" class="play-too-btn">我也要玩</view>
       </view>
     </view>
   </view>

-
 import {
   getBindtapData,
   pxToRpx,
@@ -42,16 +41,19 @@ Page({
 
       let wishInfo = this.data.wishInfo;
       let couponInfo = this.data.couponInfo;
+      if(!couponInfo){
+        return;
+      }
 
       // 设置二维码
       let qrSize = this.setCanvasSize(340);
       console.log("couponInfo:", couponInfo);
-      let codeContent = couponInfo.couponCode || '';
+      let codeContent = couponInfo && couponInfo.couponCode || '';
       this.createQrCode(codeContent, 'qrcanvas', qrSize.w, qrSize.h);
 
       // 判断是否使用
       // 自提券 使用状态（0=未使用 1=已过期，2=已使用）
-      let used = couponInfo.state != 0;
+      let used = couponInfo && couponInfo.state != 0;
 
       // 设置起止时间
       couponInfo.startDateStr = new Date(couponInfo.startDate).toString("yyyy.MM.dd");
@@ -63,24 +65,6 @@ Page({
         used: used
       })
 
-
-      // 设置坐标
-      // wx.getLocation({
-      //   type: 'gcj02',
-      //   success(res) {
-      //     let targetLocation = {
-      //       latitude: wishInfo.latitude,
-      //       longitude: wishInfo.longitude,
-      //     }
-      //     let distance = getLocalDistance(res, targetLocation).dis;
-      //     wishInfo.distance = distance;
-      //     console.log("distance:", distance);
-      //     _this.setData({
-      //       wishInfo: wishInfo
-      //     })
-      //   }
-      // })
-
     })
   },
   /**

@@ -29,17 +29,11 @@ Page({
     wishInfo: {}, // 创建后的心愿信息
     wishList: [], // 创建后的心愿单列表
     userInfo: {},
-    isPageVisible: false,
     // canShake:false,
     guideIndex: 0,
   },
   onShareAppMessage() {},
-  onShow() {
-    this.isPageVisible = true;
-  },
-  onHide() {
-    this.isPageVisible = false;
-  },
+  onShow() {},
   onLoad(options) {
     // console.log("cw -- onLoad");
     this.initData();
@@ -80,7 +74,7 @@ Page({
   initShake() {
     let _this = this;
     wx.onAccelerometerChange(function (res) {
-      if (!_this.data.isPageVisible || !_this.data.isPageVisible) {
+      if (!_this.data.tipsShakeVisible) {
         return
       }
       if (res.x > 1) { //偏移量为2时触发，有的使用1
@@ -88,10 +82,26 @@ Page({
           tipsShakeVisible: false,
           tipsCreateCompleteVisible: true
         })
+        _this.playShakeSound();
       }
     });
   },
 
+  /**
+   * 播放摇动声音
+   */
+  playShakeSound() {
+    const innerAudioContext = wx.createInnerAudioContext()
+    innerAudioContext.autoplay = true;
+    innerAudioContext.src = "https://kdcdn.oss-cn-shenzhen.aliyuncs.com/weapp/marubi/wish-list/mp3/shake.mp3";
+    innerAudioContext.onPlay(() => {
+      console.log('开始播放')
+    })
+    innerAudioContext.onError((res) => {
+      console.log(res.errMsg)
+      console.log(res.errCode)
+    })
+  },
 
   /**
    * 是否第一次进入当前页面
@@ -283,10 +293,23 @@ Page({
           url: app.api.selfAssist,
           data: {}
         }).then((result2) => {
+          let wishBillInfo = result2;
+
+          wishBillInfo.elasticValueList.forEach(element => {
+            let product = productMap[element.prizeDefineCode + ""];
+            element = Object.assign(element, product);
+          });
+
           this.setData({
             tipsShakeVisible: true,
-            wishBillInfo: result2
+            wishBillInfo: wishBillInfo
           })
+          console.log("----->");
+          console.log("wishBillInfo:", this.data.wishBillInfo);
+          console.log("wishInfo:", this.data.wishInfo);
+          console.log("wishList:", this.data.wishList);
+          console.log("taskTotalElasticValue:", this.data.taskTotalElasticValue);
+
         })
       }
     }).catch((err) => {
@@ -490,8 +513,6 @@ Page({
         this.hideMask();
         break;
 
-
-
         // 创建心愿单
       case "_evt_create_wish":
         this.hideMask();

@@ -45,7 +45,7 @@
 
       .rect {
         position: absolute;
-        z-index: 41;
+        z-index: 11;
         // background-color: wheat;
         opacity: .5;
       }
@@ -56,12 +56,12 @@
 
       .point1 {
         left: 210px;
-        top: 300px;
+        top: 400px;
       }
 
       .point2 {
         left: 460px;
-        top: 180px;
+        top: 120px;
       }
 
       .point3 {
@@ -131,12 +131,12 @@
 
       .point2 {
         left: 380px;
-        top: 180px;
+        top: 280px;
       }
 
       .point3 {
         left: 540px;
-        top: 440px;
+        top: 380px;
       }
 
       .rect1 {
@@ -259,7 +259,7 @@
       // 换一批按钮
       .change-btn {
         position: relative;
-        z-index: 9999;
+        z-index: 31;
         margin-left: 48px;
         box-shadow: 0px 6px 30px 0 rgba(126, 40, 40, 0.5);
         background-color: #ffffff;
@@ -293,7 +293,7 @@
         }
 
         .space1 {
-          height: 116px;
+          height: 100px;
         }
 
         // 心愿
@@ -444,7 +444,7 @@
   &-item-1 {
     width: 402px;
     height: 451px;
-    top: 76px;
+    top: 176px;
     left: 36px;
   }
 

@@ -117,7 +117,7 @@
   <tips-shake-comp bind:evtcomp="evtcomp"></tips-shake-comp>
 </van-popup>
 <van-popup show="{{ tipsCreateCompleteVisible }}">
-  <tips-create-complete-comp bind:evtcomp="evtcomp" wish-info="{{wishInfo}}" wish-list="{{wishList}}" wish-list="{{wishList}}" ele-val="{{taskTotalElasticValue}}" wish-bill-info="{{wishBillInfo}}"></tips-create-complete-comp>
+  <tips-create-complete-comp bind:evtcomp="evtcomp" wish-info="{{wishInfo}}" wish-list="{{wishList}}" ele-val="{{taskTotalElasticValue}}" wish-bill-info="{{wishBillInfo}}"></tips-create-complete-comp>
 </van-popup>
 <van-popup show="{{ tipsCommonVisible }}">
   <tips-common-comp bind:evtcomp="evtcomp" inner-text="{{tipsInnerText}}"></tips-common-comp>

@@ -16,7 +16,7 @@
             <view class="ipt-icon">
               <image class="icon" mode="widthFix" src="../../image/oss/register/reg-icon-mobile.png" />
             </view>
-            <input value="{{mobile}}" bindinput="bindMobileInput" class="ipt-input" placeholder="手机号" placeholder-class="placeholder" />
+            <input type="number" value="{{mobile}}" bindinput="bindMobileInput" class="ipt-input" placeholder="手机号" placeholder-class="placeholder" />
           </view>
           <!-- 滑动拼图 -->
           <view class="puzzle">
@@ -42,7 +42,7 @@
             <view class="ipt-icon">
               <image class="icon" mode="widthFix" src="../../image/oss/register/reg-icon-verify.png" />
             </view>
-            <input value="{{verifyCode}}" bindinput="bindVerifyCodeInput" class="ipt-input" placeholder="验证码" placeholder-class="placeholder" />
+            <input type="number" value="{{verifyCode}}" bindinput="bindVerifyCodeInput" class="ipt-input" placeholder="验证码" placeholder-class="placeholder" />
             <view bindtap="reqGetSmsRequest" class="ipt-verify">
               {{sendAuthCode ? "获取验证码": auth_time+"(s)"}}
             </view>

@@ -22,6 +22,7 @@
         </view>
       </view>
     </view>
+    <empty-tips wx:if="{{prizeInfo.length <= 0}}"></empty-tips>
     <!-- 查看门店需要 couponId -->
     <!-- <view class="store-btn" bindtap="onNearbyStoreHandler">
       <span class="c1">附近门店查询</span>

@@ -19,7 +19,8 @@ Page({
     let path = `/pages/coop/coop?code=${billCode}&s=share`
     return {
       title,
-      path
+      path,
+      imageUrl: 'https://kdcdn.oss-cn-shenzhen.aliyuncs.com/weapp/marubi/wish-list/share.png'
     }
   },
   onLoad(options) {

@@ -16,7 +16,7 @@ Page({
     verifyCode: "",
     birthday: "",
     password: "",
-    sex: -1,
+    sex: "",
     sexList: [{
         label: "女",
         value: 0
@@ -138,15 +138,15 @@ Page({
       } else if (!this.data.birthday) {
         this.showLog("请输入生日");
         reject();
-      } else if (!this.data.password) {
-        this.showLog("请输入登陆密码");
-        reject();
+      // } else if (!this.data.password) {
+      //   this.showLog("请输入登陆密码");
+      //   reject();
       } else if (!this.data.verifyCode) {
         this.showLog("请输入验证码");
         reject();
-      } else if (this.data.sex != 0 && this.data.sex != 1) {
-        this.showLog("请选择性别");
-        reject();
+      // } else if (this.data.sex != 0 && this.data.sex != 1) {
+      //   this.showLog("请选择性别");
+      //   reject();
       } else if (!this.data.isPlzAuth) {
         this.showLog("请完成拼图验证");
         reject();

@@ -16,7 +16,7 @@
             <view class="ipt-icon">
               <image class="icon" mode="widthFix" src="../../image/oss/register/reg-icon-mobile.png" />
             </view>
-            <input value="{{mobile}}" bindinput="bindMobileInput" class="ipt-input" placeholder="手机号" placeholder-class="placeholder" />
+            <input type="number" value="{{mobile}}" bindinput="bindMobileInput" class="ipt-input" placeholder="手机号" placeholder-class="placeholder" />
           </view>
           <!-- 名字 -->
           <view class="ipt">
@@ -35,12 +35,12 @@
             </view>
           </picker>
           <!-- 登陆密码 -->
-          <view class="ipt">
+          <!-- <view class="ipt">
             <view class="ipt-icon">
               <image class="icon" mode="widthFix" src="../../image/oss/register/reg-icon-verify.png" />
             </view>
             <input password="{{true}}" value="{{password}}" bindinput="bindPasswordInput" class="ipt-input" placeholder="登陆密码" placeholder-class="placeholder" />
-          </view>
+          </view> -->
           <!-- 滑动拼图 -->
           <view class="puzzle">
             <view class="plz">
@@ -65,18 +65,18 @@
             <view class="ipt-icon">
               <image class="icon" mode="widthFix" src="../../image/oss/register/reg-icon-verify.png" />
             </view>
-            <input value="{{verifyCode}}" bindinput="bindVerifyCodeInput" class="ipt-input" placeholder="验证码" placeholder-class="placeholder" />
+            <input type="number" value="{{verifyCode}}" bindinput="bindVerifyCodeInput" class="ipt-input" placeholder="验证码" placeholder-class="placeholder" />
             <view bindtap="reqGetSmsRequest" class="ipt-verify">
               {{sendAuthCode ? "获取验证码": auth_time+"(s)"}}
             </view>
           </view>
           <!-- 性别 -->
-          <radio-group class="radio-group" bindchange="onSexRadioChange">
+          <!-- <radio-group class="radio-group" bindchange="onSexRadioChange">
             <label class="radio" wx:for="{{sexList}}" wx:key="{{index}}">
               <radio color="#ba3138" value="{{item.value}}" checked="{{item.checked}}" />
               {{item.label}}
             </label>
-          </radio-group>
+          </radio-group> -->
         </view>
         <!-- 条款/政策 -->
         <view class="policy">

@@ -33,13 +33,15 @@ Page({
       let path = `/pages/coop/coop?code=${billCode}&s=share`
       return {
         title,
-        path
+        path,
+        imageUrl: 'https://kdcdn.oss-cn-shenzhen.aliyuncs.com/weapp/marubi/wish-list/share.png'
       }
     } else {
       //分享配置
       return {
         title: '弹弹弹 看你有多弹',
-        path: 'pages/index/index'
+        path: 'pages/index/index',
+        imageUrl: 'https://kdcdn.oss-cn-shenzhen.aliyuncs.com/weapp/marubi/wish-list/share.png'
       };
     }
   },

@@ -249,6 +249,7 @@
           margin-top: 16px;
           color: #333333;
           font-size: 24px;
+          height: 48px;
 
           .t1 {
             color: #ba3039;
@@ -344,9 +345,9 @@
   }
 
   &-item-1 {
-    width: 438px;
-    height: 426px;
-    top: 25px;
+    width: 538px;
+    height: 534px;
+    top: 28px;
     right: 2px;
   }
 
@@ -367,7 +368,7 @@
   &-item-4 {
     width: 608px;
     height: 426px;
-    top: 1574px;
+    top: 1588px;
     left: 95px;
   }
 }

@@ -68,8 +68,11 @@
           有
           <span class="t1">{{helperInfo.total}}</span>
           位好友帮忙，收集到
-          <span class="t1">{{helperInfo.totalElasticValue}}</span>
+          <span class="t1">{{helperInfo.helpElasticValue}}</span>
           弹力值！
+            总弹力值:
+          <span class="t1">{{helperInfo.totalElasticValue}}</span>
+          。
         </view>
         <scroll-view scroll-y="{{true}}" class="list">
           <view wx:for="{{helperInfo.helpers}}" wx:key="{{index}}" class="list-item">