Merge branch 'dev_1.3' of http://222.85.201.140:10002//xuyunhui/chain_jje_uniapp into dev1.4

common/js/env.js

@@ -1,7 +1,7 @@
 "use strict";
 
 // let baseUrl = `https://jje.admin.xinyuekj.com.cn`
-// let baseUrl = `https://jje.xinyuekj.com.cn/prod-api`
+let baseUrl = `https://jje.xinyuekj.com.cn/prod-api`
 /** 测试环境 */
 // let baseUrl = `https://jje.admin.xinyuekj.com.cn/test-api`
 /** 开发环境*/

myPages/serviceObjectAllInfo/index.vue

@@ -5,7 +5,7 @@
                 <view class="nav-info">
                     <view class="nav-desc">
                         <view class="nav-name">
-                            <view class="">宝贝头像</view>
+<!--                            <view class="">宝贝头像</view>-->
                         </view>
                     </view>
                     <view  class="arrow-right">

orderPages/bookService/index.vue

@@ -20,7 +20,7 @@
        							 }" @click="clickPeriodDateList"></u-tabs>
 		</view>
 
-		<view class="flex-col group" v-if="serviceObjectList.length>1">
+		<view class="flex-col group">
 			<view class="serob"><text>服务对象</text></view>
 			<u-grid :border="false" col="4">
 				<u-grid-item v-for="(item,index) in serviceObjectList" :key="index">

pages/login/login.vue

@@ -174,6 +174,9 @@
 						})
 
 					},
+					fail(err){
+						console.log('出错了++++++++++++++++',err)
+					}
 				})
 			},
 			getPhoneNumber(e) {