Merge branch 'master' of http://git.cc-lotus.info/ball-court/court-badminton

pages/my/userInfo.js

@@ -6,6 +6,7 @@ Page({
      */
     data: {
         frameStyle: { useTop: true, name: '个人信息', leftArrow: true, useBar: false },
+        icon: '/image/icon.jpg',
         form: { id: "1", img_url: "/image/icon.jpg", name: "测试", gender: '男', phone: '13174420325', email: '' },
     },
     // 返回

pages/my/userInfo.wxml

@@ -9,7 +9,7 @@
                 <view class="content">
                     <view class="label">用户头像</view>
                     <view class="value">
-                        <image class="img" src="{{form.img_url||''}}"></image>
+                        <image class="img" src="{{form.img_url||icon}}"></image>
                     </view>
                 </view>
                 <view class="content">