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

@@ -45,6 +45,7 @@ Page({
     yas = new Yas(app);
     let that = this;
 
+    yas.pageOpenReport();
     setTimeout(function() {
       that.getList(0, 1, 20, false);
     }, 300);
@@ -52,7 +53,7 @@ Page({
     // this.getList(0, 1, 20, false);
   },
   onShow: function() {
-    yas.pageOpenReport();
+
   },
   onPullDownRefresh: function() {
     this.setData({

@@ -569,11 +569,11 @@ Page(Object.assign({
      * 提交formId消息模板
      */
   submitFormId: function(e) {
-    console.log(e);
+    console.log('submitFormId:', { formId: e.detail.formId, uid: app.getUid() || 0, openId: app.getOpenID() || '' });
     commonModel.addWechatFormId({
       formId: e.detail.formId,
       uid: app.getUid() || 0,
-      openId: app.getUnionID() || app.getOpenID() || '',
+      openId: app.getOpenID() || '',
       miniapp_type: app.getMiniappType()
     });
   },

@@ -80,10 +80,10 @@
     <!--如果活动正在进行中-->
     <block wx:elif='{{activityInfo.isBegin === 1 && !activityInfo.isEnd}}'>
         <form bindsubmit='submitFormId' report-submit='true'>
-            <view class='button-container' bindtap='joinInQueue' form-type='submit'>
-                <view class='join-button'>
+            <view class='button-container'>
+                <button class='join-button' bindtap='joinInQueue' form-type='submit'>
                     <text>参加活动</text>
-                </view>
+                </button>
             </view>
         </form>
     </block>

@@ -170,6 +170,8 @@ image {
     display: flex;
     width: 108rpx;
     height: 108rpx;
+    margin: 0;
+    padding: 0;
     border: 4rpx solid #fff;
     border-radius: 50%;
     box-sizing: border-box;

@@ -195,10 +195,11 @@ Page(Object.assign({
      * 提交formId消息模板
      */
   submitFormId: function(e) {
+    console.log('submitFormId:', {formId: e.detail.formId, uid: app.getUid() || 0, openId: app.getOpenID() || ''});
     commonModel.addWechatFormId({
       formId: e.detail.formId,
       uid: app.getUid() || 0,
-      openId: app.getUnionID() || app.getOpenID() || '',
+      openId: app.getOpenID() || '',
       miniapp_type: app.getMiniappType()
     });
   },

@@ -33,7 +33,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 0,
+			"current": -1,
 			"list": [
 				{
 					"id": 0,
@@ -63,7 +63,7 @@
 					"id": -1,
 					"name": "限定商品排队",
 					"pathName": "pages/queue/index",
-					"query": "actId=362"
+					"query": "actId=366"
 				},
 				{
 					"id": 5,