Merge remote-tracking branch 'origin/jd_dev' into jd_dev

src/pages/forget/forget.vue

@@ -168,6 +168,6 @@
 <style>
 	@import url("../../static/css/forget.css");
 	.area picker{
-		width: 80upx;
+		width: 110upx;
 	}
 </style>

src/pages/site/site.vue

@@ -72,7 +72,7 @@
         <view class="items-v">
           <image src=".../../static/img/mail.png" mode=""></image>
           <view class="items-v-it">
-            <text v-if="userInfo"
+            <text v-if="userInfo" style="width: 80%;"
               >{{ $lang.lang.site.bindEmail }}:<span class="email">{{
                 userInfo.email || $lang.lang.site.unbind
               }}</span></text