Merge branch 'master' of http://www.jiyou-tech.com:3000/chenming/496_dongfengqichen_wxsmall

496_dongfengqichen/pages/agreement/agreement.wxml

@@ -5,7 +5,7 @@
     <view class="lineSty"></view>
     <image class="closeXieyi" bindtap="closeXieyi" src="{{imgUrl+'/images/closeXieyi.png'}}"></image>
     <view class="xieyiGroup">
-      <image class="xieyi" src="{{imgUrl+'/images/xieyi.png'}}"></image>
+      <image class="xieyi" src="{{imgUrl+'/images/xieyi2.png'}}"></image>
     </view>
   </view>
   <tabBar></tabBar>

496_dongfengqichen/pages/agreement/agreement.wxss

@@ -48,6 +48,6 @@
 }
 .xieyi{
   width: 100%;
-  height: 10348rpx;
+  height: 10442rpx;
   padding-bottom: 30rpx;
 }

496_dongfengqichen/pages/index/index.js

@@ -99,6 +99,9 @@ Page({
       // isRegister: app.globalData.isRegister
     })
   },
+  onShow:function(){
+    this.data.subscribeData.parentOpenid = app.globalData.friendOpenid;
+  },
   provinceChane: function (e) {//选中省
     this.setData({
       provinceValue: e.detail.value,

496_dongfengqichen/pages/myCenter/myCenter.js

@@ -111,7 +111,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
+    this.data.subscribeData.parentOpenid = app.globalData.friendOpenid;
   },
 
   /**