Merge branch 'develop' of http://git.yoho.cn/fe/yoho-limited-sell-miniapp into develop

@@ -163,7 +163,9 @@ Page(Object.assign({
       };
     } else if (res.from === 'button') {
       // 用户点击分享按钮
+
       console.log(`/pages/product/detail/detail?limitProductCode=${this.data.limitProductCode}&originUid=${app.getUid()}&originUnionID=${app.getUnionID()}`);
+
       return {
         title: params.TITLE, // 分享标题
         desc: params.DESC, // 分享描述
@@ -269,12 +271,12 @@ Page(Object.assign({
           }
 
           this.setData({
-            productSkn: res.data.productSkn,
-            productName: res.data.productName,
-            price: res.data.price,
-            saleTime: res.data.saleTime,
-            reminderNum: res.data.reminderNum,
-            limitProductType: res.data.limitProductType,
+            productSkn: res.data.productSkn ? res.data.productSkn : '',
+            productName: res.data.productName ? res.data.productName : '',
+            price: res.data.price ? res.data.price : '即将开售',
+            saleTime: res.data.saleTime ? res.data.saleTime : '',
+            reminderNum: res.data.reminderNum ? res.data.reminderNum : 0,
+            limitProductType: res.data.limitProductType ? res.data.limitProductType : 4,
             showStatus: res.data.showStatus ? res.data.showStatus : 0,
             assisLimit: res.data.helpLimit ? res.data.helpLimit : 0,
             queueType: res.data.queueType ? res.data.queueType : QUEUE_TYPE.READY,
@@ -298,7 +300,7 @@ Page(Object.assign({
 
         let assisStatus = ASSIS_STATUS.SHARE;
 
-        if (this.data.assisLimit === result.data.list.length) {
+        if (result.data.list && this.data.assisLimit === result.data.list.length) {
           assisStatus = ASSIS_STATUS.ASSIS_FULL;
         } else {
           // 不是发起者
@@ -395,8 +397,8 @@ Page(Object.assign({
     detailModel.addAssist({
       userId: this.data.originUid,
       helpUserId: app.getUnionID(),
-      helpUserName: userInfo.nickName,
-      helpUserImgUrl: userInfo.avatarUrl,
+      helpUserName: userInfo.nickName ? userInfo.nickName : '',
+      helpUserImgUrl: userInfo.avatarUrl ? userInfo.avatarUrl : '',
       limitProductCode: this.data.limitProductCode
     }).then(result => {
       if (result.code === 200) {
@@ -460,6 +462,9 @@ Page(Object.assign({
   buyNow() {
     router.goUrl(`miniapp.yohobuy.com/pages/goodsDetail/goodsDetail?app=yohobuy&productSkn=${this.data.productSkn}`);
   },
+  goHelp() {
+    router.go('webview', {url: ''});
+  },
   goList() {
     router.go('home');
   },

@@ -14,7 +14,7 @@
             <block wx:if="{{saleTime}}">
                 <view class="text-time">{{saleTime}}发售</view>
             </block>
-            <block>
+            <block wx:else>
                 <view class="text-time">发售时间待定</view>
             </block>
         </view>
@@ -23,6 +23,7 @@
     <view class="detail-btn" bindtap="buyNow">查看商品详情</view>
 </view>
 <view class="line"></view>
+<image class="banner-image" bindtap="goList" src="../../../static/images/banner.png"></image>
 <view class="detail-container">
     <view class="goodsInfo">
         <view wx:for="{{productDesc}}">
@@ -46,7 +47,7 @@
                 <form bindsubmit="assisShare" report-submit='true'>
                 <view class="bottom1-action">
                     <button class="action-btn" formType="submit">邀请好友助力获取限购码</button>
-                    <view class="help">?</view>
+                    <view class="help" bindtap="goHelp">?</view>
                 </view>
                 </form>
             </action-bar>
@@ -88,7 +89,7 @@
             <action-bar wx:elif="{{assisStatus === 4}}">
                 <view class="bottom1-action">
                     <view class="action-btn">已助力</view>
-                    <view class="help">?</view>
+                    <view class="help" bindtap="goHelp">?</view>
                 </view>
             </action-bar>
 
@@ -290,7 +291,7 @@
             <action-bar>
             <view class="bottom1-action">
                 <view class="action-btn">已助力</view>
-                <view class="help">?</view>
+                <view class="help" bindtap="goHelp">?</view>
             </view>
             </action-bar>
         </block>

@@ -151,6 +151,9 @@
     font-size: 28rpx;
     background-color: #d0021b;
     right: 30rpx;
+    top:50%;
+    transform:translateY(-50%);
+
 }
 
 .top-assis-action {
@@ -254,3 +257,8 @@
     border-radius: 40rpx;
     color: white;
 }
+
+.banner-image {
+    width: 100%;
+    height: 290rpx;
+}
\ No newline at end of file

@@ -157,7 +157,7 @@ Page({
     pCtx.setTextAlign('center');
     pCtx.setFontSize(11);
     pCtx.fillText('长按扫码查看详情', 187.5 * scale, 632.5 * scale);
-    pCtx.drawImage('./images/snapshoot_tip_ic@2x.png', 87 * scale, 645.5 * scale, 9 * scale, 9 * scale);
+    pCtx.drawImage('./images/snapshoot_tip_ic@2x.png', 80 * scale, 645.5 * scale, 9 * scale, 9 * scale);
     pCtx.setFillStyle('#b0b0b0');
     pCtx.setFontSize(9);
     pCtx.fillText('或者在各大应用市场搜索 Yoho!Buy有货 下载App', 187.5 * scale, 652.5 * scale);

@@ -7,5 +7,6 @@ export default {
   snapShare: {path: '/pages/snapshootShare/snapshootShare'},
   prizeUserList: {path: '/pages/queue/prizeUserList'},
   myList: {path: '/pages/queue/myList'},
-  queueIndex: {path: '/pages/queue/index'}
+  queueIndex: {path: '/pages/queue/index'},
+  webview: {path: '/pages/webview/webview'}
 };