Merge branch 'master' of http://101.37.147.115:3000/bocaigroup/dandelionPlatform

* 'master' of http://101.37.147.115:3000/bocaigroup/dandelionPlatform:
  同步

app.js

@@ -1,8 +1,8 @@
 App({
 	globalData: {
 		userInfo: null,
-    // ip: 'https://test.renminshitang.com.cn/daotian/api_dev',
-		ip: "https://daotian.matripe.com.cn",
+    ip: 'https://test.renminshitang.com.cn/daotian/api_dev',
+		// ip: "https://daotian.matripe.com.cn",
 		// ip: 'http://localhost:8001',
 		sessionId: "",
 		header: {

pages/mine/addUserCard/index.js

@@ -53,7 +53,11 @@ Page({
 	 * 生命周期函数--监听页面初次渲染完成
 	 */
 	onReady: function () {},
-
+  toRealName(){
+    wx.navigateTo({
+      url: '/pages/mine/realName1/index'
+    })
+  },
 	/**
 	 * 生命周期函数--监听页面隐藏
 	 */

pages/mine/addUserCard/index.wxml

@@ -3,27 +3,24 @@
     <i class="iconfont icon-tianjia mr8"></i>
     添加身份证
   </navigator>
-</view> -->
+</view>-->
+
 <view wx:if="{{user.idcardImgFront != null && user.idcardImgFront != '' && user.idcardImgFront != 'undefined' && user.idauth - 1 == 0}}" class="mt16">
   <navigator url="/pages/mine/seeIdCard/index" class="bgsfz">
     <image src="//matripe.oss-cn-beijing.aliyuncs.com/tuiguang/ghLogo.png"></image>
     <text class="ml8 f18 c3 fw500">身份证</text>
     <view class="f12 c6 mt10" style="margin-left:32px;">{{card}}</view>
-    <view class="bottom" hover-class="thover">
-      查看身份证照片
-    </view>
+    <view class="bottom" hover-class="thover">查看身份证照片</view>
   </navigator>
 </view>
-<view wx:else class="">
-  <navigator url="../realName1/index" class="bgsfz">
+<view wx:else class>
+  <view bindtap="toRealName" class="bgsfz">
     <image src="//matripe.oss-cn-beijing.aliyuncs.com/tuiguang/ghLogo.png"></image>
     <text class="ml8 f18 c3 fw500">身份证</text>
     <text class="fr f14 c3">未添加</text>
     <view class="f12 c6 mt10" style="margin-left:32px;">添加照片以查看证件</view>
-    <view class="bottom" hover-class="thover">
-      添加并使用
+    <view class="bottom" hover-class="thover">添加并使用</view>
   </view>
-  </navigator>
 </view>
 
 <!-- <view wx:if="{{user.healthImgFront != null && user.healthImgBack != '' && user.healthAuth - 1 == 0}}" class="p10" style="padding-top:0;">
@@ -46,4 +43,4 @@
       添加并使用
     </view>
   </navigator>
-</view> -->
+</view>-->

project.private.config.json

@@ -193,5 +193,5 @@
       ]
     }
   },
-  "libVersion": "3.0.0"
+  "libVersion": "3.4.0"
 }