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

@@ -4,8 +4,9 @@ import event from '../../common/event';
 import LimitModel from '../../models/limit/index';
 import helper from '../../utils/helper';
 import wx from '../../utils/wx';
-import { Actionsheet } from '../../vendors/zanui/index';
-import { stringify } from '../../vendors/query-stringify';
+import {Actionsheet} from '../../vendors/zanui/index';
+import {stringify} from '../../vendors/query-stringify';
+import commonModel from '../../models/common';
 
 let app = getApp();
 let router = global.router;
@@ -17,19 +18,28 @@ let router = global.router;
  */
 /**
  * 接口：获取用户排队信息
- * https://api.yoho.cn/?activityId=179&app_version=6.4.0&client_secret=ee1114702f3db67327afe9eeeac92b5a&client_type=iphone&fromPage=iFP_Queue&method=app.drawline.getUserActivityInfo&os_version=11.2.5&physical_channel=1&screen_size=375x667&session_key=3c9a644c3d95d9a7453c61f3009b2884&udid=1a61c0b4db7b6e27999b1237977b5347eb503956&uid=349709&v=7
+ * method=app.drawline.getUserActivityInfo
+ * activityId=179
  *
- * 接口：获取排队用户信息
- * https://api.yoho.cn/?activityId=179&app_version=6.4.0&client_secret=e8f42148d30976fb44dfff1d89ea7a60&client_type=iphone&fromPage=iFP_Queue&limit=50&method=app.drawline.getQueueList&os_version=11.2.5&physical_channel=1&screen_size=375x667&session_key=3c9a644c3d95d9a7453c61f3009b2884&sort=0&udid=1a61c0b4db7b6e27999b1237977b5347eb503956&uid=349709&v=7
  *
- * 接口：排队活动
- * https://api.yoho.cn/?activityId=179&app_version=6.4.0&client_secret=52db394bdb79e2dcf0e2a2782496ee78&client_type=iphone&fromPage=iFP_Queue&method=app.drawline.getActivityInfo&os_version=11.2.5&physical_channel=1&screen_size=375x667&session_key=3c9a644c3d95d9a7453c61f3009b2884&udid=1a61c0b4db7b6e27999b1237977b5347eb503956&uid=349709&v=7
+ * 接口：获取排队用户信息(列表)
+ * method=app.drawline.getQueueList
+ * activityId=179
+ * limit=50
+ * sort=0
+ *
+ *
+ * 接口：排队活动信息
+ * method=app.drawline.getActivityInfo
+ * activityId=179
+ *
  *
  * 接口：中奖列表
- * https://api.yoho.cn/?activityId=179&app_version=6.4.0&client_secret=936b01c80de696e81c59fee6ea64fd50&client_type=iphone&fromPage=iFP_QueueResult&limit=20&method=app.drawline.getLuckyUserList&os_version=11.2.6&page=1&physical_channel=1&screen_size=375x667&session_key=3c9a644c3d95d9a7453c61f3009b2884&udid=1a61c0b4db7b6e27999b1237977b5347eb503956&uid=349709&v=7
+ * method=app.drawline.getLuckyUserList
+ * activityId=179
+ * limit=20
+ * page=1
  *
- * 接口：添加用户分享记录
- * https://api.yoho.cn/?activityId=294&app_version=6.4.0&client_secret=e7ecfcd3410f5c8b0054c07b8366a700&client_type=iphone&fromPage=iFP_LimitPurchaseDetail&method=app.limitProduct.addUserShare&os_version=11.2.6&physical_channel=1&screen_size=375x667&session_key=d4c06294461b138058ce3aa2978cd602&udid=1a61c0b4db7b6e27999b1237977b5347eb503956&uid=349709&v=7 HTTP/1.1
  */
 
 Page(Object.assign({
@@ -363,7 +373,7 @@ Page(Object.assign({
       let pages = getCurrentPages();
       let referer = pages[pages.length - 1].route + '?' + stringify(this.data.shareInfo);
 
-      router.go('userCenter', { referer });
+      router.go('userCenter', {referer});
     }
   },
 
@@ -551,6 +561,19 @@ Page(Object.assign({
   },
 
   /**
+     * 提交formId消息模板
+     */
+  submitFormId: function(e) {
+    console.log(e);
+    commonModel.addWechatFormId({
+      formId: e.detail.formId,
+      uid: app.getUid() || 0,
+      openId: app.getUnionID() || app.getOpenID() || '',
+      miniappType: app.getMiniappType()
+    });
+  },
+
+  /**
      * 处理接口返回的图片url
      */
   formatImgUrl: function(url, mode, width, height) {

@@ -141,8 +141,10 @@
             </view>
         </block>
     </view>
-    <view class='invite-button' hidden='{{hideInviteButton}}'  bindtap='inviteFriends'>
-        邀请好友助力排队
-    </view>
+    <form bindsubmit='submitFormId' report-submit='true'>
+        <button class='invite-button' hidden='{{hideInviteButton}}' form-type='submit'  bindtap='inviteFriends'>
+            邀请好友助力排队
+        </button>
+    </form>
 </view>
 <template is="zan-actionsheet" data="{{...actionSheet}}" />
\ No newline at end of file

@@ -5,6 +5,7 @@ import LimitModel from '../../models/limit/index';
 import helper from '../../utils/helper';
 import wx from '../../utils/wx';
 import {Actionsheet} from '../../vendors/zanui/index';
+import commonModel from '../../models/common';
 
 
 let app = getApp();
@@ -200,6 +201,18 @@ Page(Object.assign({
   },
 
   /**
+     * 提交formId消息模板
+     */
+  submitFormId: function(e) {
+    commonModel.addWechatFormId({
+      formId: e.detail.formId,
+      uid: app.getUid() || 0,
+      openId: app.getUnionID() || app.getOpenID() || '',
+      miniappType: app.getMiniappType()
+    });
+  },
+
+  /**
      * 获取排队列表
      */
   getQueueList: function(actId, limit = 10) {

@@ -30,8 +30,10 @@
             </view>
         </view>
     </block>
-    <view class='invite-button' hidden='{{hideInviteButton}}'  bindtap='inviteFriends'>
-        邀请好友助力排队
-    </view>
+    <form bindsubmit='submitFormId' report-submit='true'>
+        <button class='invite-button' hidden='{{hideInviteButton}}' form-type='submit' bindtap='inviteFriends'>
+            邀请好友助力排队
+        </button>
+    </form>
 </view>
 <template is="zan-actionsheet" data="{{...actionSheet}}" />
\ No newline at end of file

@@ -33,7 +33,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 0,
+			"current": 4,
 			"list": [
 				{
 					"id": 0,