Merge branch 'shipanpan' into 'master'

Shipanpan

See merge request !41

app.json

@@ -55,7 +55,7 @@
   "window":{
     "backgroundTextStyle":"light",
     "navigationBarBackgroundColor": "#fff",
-    "navigationBarTitleText": "豌豆队长",
+    "navigationBarTitleText": "豌豆教练",
     "navigationBarTextStyle":"black",
     "enablePullDownRefresh": false
   },

pages/sign/bindTel/bindTel.wxml

@@ -2,7 +2,7 @@
 	<view class="logo-view">
 		<image src="/images/my/login.png"></image>
 	</view>
-	<view class="title">豌豆队长</view>
+	<view class="title">豌豆教练</view>
 	<view class="desc">为保护您的账号资产，我们需要您的手机号授权， 以同步支付的商品信息。</view>
 	<button open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">同意授权</button>
 </view>
\ No newline at end of file

pages/sign/login/login.wxml

@@ -2,7 +2,7 @@
 	<view class="logo-view">
 		<image src="/images/my/login.png"></image>
 	</view>
-	<view class="title">豌豆队长</view>
+	<view class="title">豌豆教练</view>
 	<button class="flex-h flex-vc flex-hc" open-type="getUserInfo" bindgetuserinfo="userInfoHandler" catchtap="checkVisions">
 		<image src="/images/my/wx.png"></image>
 		微信一键注册/登录

pages/tabbar/personal/personal.wxml

@@ -11,7 +11,7 @@
 	</view>
 	<view wx:else class="head flex-h flex-vc flex-hb">
 		<view class="headLeft flex-v">
-			<view class='head_title'>欢迎来到豌豆成长</view>
+			<view class='head_title'>欢迎来到豌豆教练</view>
 			<view class="login" catchtap="goLogin">立即登录</view>
 		</view>
 	</view>