Merge branch 'master' of http://git.quyaqu.com/huajingwen/bw_smallApp

pages/application/application.js

@@ -127,4 +127,20 @@ Page({
   onHide () {
     this.setData({hiddenThis: true})
   },
+  //FormId
+  formSubmit(e) {
+    var formId = e.detail.formId;
+    this.getFromid(formId);
+  },
+  getFromid(formId) {
+    wx.request({
+      url: app.globalData.HOST + '/user/wx/getFromid',
+      method: "POST",
+      data: Object.assign({}, app.globalData.common, { from_id: formId }),
+      success: function (res) {
+      },
+      complete: function () {
+      }
+    });
+  }
 })

pages/application/application.wxml

@@ -22,7 +22,11 @@
       <view class="content">
         <view class="title">小提示</view>
         <view class="text">回复"<text>2</text>"，去还款</view>
-        <button class="contact-btn" open-type="contact"  session-from="id={{appid}}">我知道了</button>
+
+        <form bindsubmit="formSubmit" report-submit="{{true}}" >
+          <button class="contact-btn" open-type="contact"  session-from="id={{appid}}" formType="submit">我知道了</button>
+        </form>
+
       </view>
     </view>
 </view>

pages/card/card.js

@@ -107,5 +107,21 @@ Page({
         app.noticeModal('您取消了分享')
       }
     }
+  },
+  //FormId
+  formSubmit(e) {
+    var formId = e.detail.formId;
+    this.getFromid(formId);
+  },
+  getFromid(formId) {
+    wx.request({
+      url: app.globalData.HOST + '/user/wx/getFromid',
+      method: "POST",
+      data: Object.assign({}, app.globalData.common, { from_id: formId }),
+      success: function (res) {
+      },
+      complete: function () {
+      }
+    });
   }
 })

pages/card/card.wxml

@@ -31,7 +31,11 @@
       <view class="content">
         <view class="title">小提示</view>
         <view class="text">回复"<text>1</text>"，获取贷款资格</view>
-        <button class="contact-btn" open-type="contact"  session-from="id=X_{{appid}}">我知道了</button>
+
+        <form bindsubmit="formSubmit" report-submit="{{true}}" >
+          <button class="contact-btn" open-type="contact"  session-from="id=X_{{appid}}" formType="submit">我知道了</button>
+        </form>
+        
       </view>
     </view>
 </view>

pages/details/details.js

@@ -136,5 +136,22 @@ Page({
     this.setData({hiddenThis: true})
   },
   onUnload: function () {
+  },
+  //FormId
+  formSubmit(e) {
+    var formId = e.detail.formId;
+    this.getFromid(formId);
+    console.log(formId+"formID")
+  },
+  getFromid(formId) {
+    wx.request({
+      url: app.globalData.HOST + '/user/wx/getFromid',
+      method: "POST",
+      data: Object.assign({}, app.globalData.common, { from_id: formId }),
+      success: function (res) {
+      },
+      complete: function () {
+      }
+    });
   }
 })

pages/details/details.wxml

@@ -68,7 +68,10 @@
       <view class="content">
         <view class="title">小提示</view>
         <view class="text">回复"<text>1</text>"，获取贷款资格</view>
-        <button class="contact-btn" open-type="contact"  session-from="id=Y_{{appid}}&period={{time}}&money={{money}}">我知道了</button>
+
+        <form bindsubmit="formSubmit" report-submit="{{true}}" >
+          <button class="contact-btn" open-type="contact"  session-from="id=Y_{{appid}}&period={{time}}&money={{money}}" formType="submit">我知道了</button>
+        </form>
       </view>
     </view>
 </view>

pages/find/find.js

@@ -133,5 +133,26 @@ Page({
         app.noticeModal('您取消了分享')
       }
     }
+  },
+  //FormId
+  formSubmit(e) {
+    var formId = e.detail.formId;
+    var id = e.target.dataset.id;
+    this.getFromid(formId, id); 
+    console.log(formId + "formID发现")
+  },
+  getFromid(formId, ids) {
+    wx.request({
+      url: app.globalData.HOST + '/user/wx/getFromid',
+      method: "POST",
+      data: Object.assign({}, app.globalData.common, { from_id: formId }),
+      success: function (res) {
+        wx.navigateTo({
+          url: '/pages/details/details?id=' + ids
+        })
+      },
+      complete: function () {
+      }
+    });
   }
 })

pages/getIt/getIt.js

@@ -12,6 +12,22 @@ Page({
     // console.log(tel);
     that.setData({phone_number: tel, preid: preid, from: from})
   },
+  //FormId
+  formSubmit (e) {
+    var formId = e.detail.formId;
+    this.getFromid(formId);
+  },
+  getFromid (formId) {
+    wx.request({
+      url: app.globalData.HOST + '/user/wx/getFromid',
+      method: "POST",
+      data: Object.assign({}, app.globalData.common, { from_id: formId }),
+      success: function (res) {
+      },
+      complete: function () {
+      }
+    });
+  },
   goApply () {
     var id = this.data.preid, from = this.data.from, appid = '';
     if (from == 'card') {

pages/getIt/getIt.wxml

@@ -10,7 +10,13 @@
       <view class="content">
         <view class="title">小提示</view>
         <view class="text">回复"<text>1</text>"，获取贷款资格</view>
-        <button class="contact-btn" open-type="contact"  session-from="id={{appid}}">我知道了</button>
+
+
+        <form bindsubmit="formSubmit" report-submit="{{true}}" >
+          <button class="contact-btn" open-type="contact"  session-from="id={{appid}}" formType="submit">我知道了</button>
+        </form>
+
+        
       </view>
     </view>
 </view>

pages/index/index.js

@@ -69,5 +69,26 @@ Page({
         app.noticeModal('您取消了分享')
       }
     }
+  },
+  //FormId
+  formSubmit(e) {
+    var formId = e.detail.formId;
+    var id = e.target.dataset.id;
+    this.getFromid(formId,id);
+    console.log(formId + "formID首页")
+  },
+  getFromid(formId,ids) {
+    wx.request({
+      url: app.globalData.HOST + '/user/wx/getFromid',
+      method: "POST",
+      data: Object.assign({}, app.globalData.common, { from_id: formId }),
+      success: function (res) {
+        wx.navigateTo({
+          url: '/pages/details/details?id='+ids
+        })
+      },
+      complete: function () {
+      }
+    });
   }
 })

pages/template/template.wxml

@@ -1,18 +1,22 @@
 <template name="jiefItem1">
   <view class="weui-cells weui-cells_after-title template">
-    <navigator url="/pages/details/details?id={{id}}" id="{{id}}"  hover-class="navigator-hover">
-    <view class="weui-cell borrow-list-temp">
-      <view class="weui-cell__hd">
-          <image class="icon" src="{{icon}}"/>
-      </view>
-      <view class="weui-cell__bd">
-          <view class="title">{{name}}<view class="weui-badge" wx-if="{{prod_title != null}}">{{prod_title}}</view></view>
-          <view class="desc elli">{{description}}</view>
-          <view class="desc elli" >申请人数<text class="emphasize">{{applicants}}</text> <text>{{show_day}}</text> <text class="emphasize" wx-if="{{show_day=='日利率'}}">{{day_rate}}%</text><text class="emphasize" wx:if="{{show_day!='日利率'}}">{{monthly_rate}}%</text></view>
-      </view>
-    </view>
-    <view class="weui-cell__ft weui-cell__ft_in-access"></view>
-    </navigator>
+    <form bindsubmit="formSubmit" report-submit="{{true}}" style='width:100%;height:100%;display:block;' data-id="{{id}}">
+       <!-- <navigator url="/pages/details/details?id={{id}}" id="{{id}}"  hover-class="navigator-hover">  -->
+        <button class='suspendImg'  plain="ture" hover-class="none" data-name="help" formType="submit" style="border:none !important; width:100%;height:100%;" >
+        <view class="weui-cell borrow-list-temp">
+          <view class="weui-cell__hd">
+              <image class="icon" src="{{icon}}"/>
+          </view>
+          <view class="weui-cell__bd">
+              <view class="title">{{name}}<view class="weui-badge" wx-if="{{prod_title != null}}">{{prod_title}}</view></view>
+              <view class="desc elli">{{description}}</view>
+              <view class="desc elli" >申请人数<text class="emphasize">{{applicants}}</text> <text>{{show_day}}</text> <text class="emphasize" wx-if="{{show_day=='日利率'}}">{{day_rate}}%</text><text class="emphasize" wx:if="{{show_day!='日利率'}}">{{monthly_rate}}%</text></view>
+          </view>
+        </view>
+          <view class="weui-cell__ft weui-cell__ft_in-access"></view>
+        </button> 
+       <!-- </navigator>  -->
+    </form>
   </view>
 </template>
 

pages/template/template.wxss

@@ -17,4 +17,12 @@
 .weui-cell:before{
     color: #e5e5e5;
     /*border-top: none;*/
+}
+.suspendImg{
+  margin-left: 0 !important;
+  margin-right: 0 !important;
+  padding-left: 0 !important;
+  padding-right: 0 !important;
+  text-align: left !important;
+  line-height: 100% !important;  
 }