diff --git a/api/http.js b/api/http.js
index 9cd5832..792be50 100644
--- a/api/http.js
+++ b/api/http.js
@@ -1,9 +1,9 @@
-const baseURL = 'http://192.168.0.112:8088/api/';
-
+const baseURL= 'http://192.168.0.111:8088/api/';
+// const baseURL= "https://www.cyjyyjy.com/api/"
 export function $http(methods,url,params){
   var header = {
     'content-type': 'application/json',
-    'Authorization' :'Bearer '+ wx.getStorageSync('token') || '',
+    'Authorization':'Bearer '+ wx.getStorageSync('token') || '',
     'dept': '22'
   };
   return new Promise((resolve,reject)=>{
@@ -29,7 +29,7 @@ export function $http(methods,url,params){
         } else{
           wx.showToast({
             title: '服务器错误，请稍后再试！',
-            icon : 'none'
+            icon: 'none'
           })
           reject(err)
         }
@@ -38,7 +38,7 @@ export function $http(methods,url,params){
         wx.hideLoading();
         wx.showToast({
           title: '服务器错误，请稍后再试！',
-          icon : 'none'
+          icon: 'none'
         })
         reject(err)
       }
diff --git a/api/user.js b/api/user.js
index 1e7cbac..8e053cb 100644
--- a/api/user.js
+++ b/api/user.js
@@ -15,7 +15,7 @@ export function saleLeads(data){
 
 // 获取我的团队
 export function getMyTeam(){
-  return http.$http('get','getTeam')
+  return http.$http('post','user/myTeam')
 }
 
 // 积分动态
diff --git a/pages/companyInfo/index.wxml b/pages/companyInfo/index.wxml
index 627fb17..907ddb3 100644
--- a/pages/companyInfo/index.wxml
+++ b/pages/companyInfo/index.wxml
@@ -6,13 +6,12 @@
       <image src="../../images/title1.png"></image>
     </view>
     <view class="introduse-box">
-      <text>深圳市瑞梦思时代科技有限公司，瑞蓢国际集团旗下全资子公司，以能量家居系统、智慧健康睡眠生态系统为主打的核心品牌。当前旗下产品包括“重塑本元”、“吉祥卧”床垫，“少年强”青少年床垫，旅行垫，魔术减负能量背包等。\n</text>
-      <text>瑞梦思以“专注每一天，健康每一夜”为目标，为人们研发贯穿生活各方面的能量家居产品，让每个家庭，每个人都能从源头开始防患于未然，远离亚健康，享受真正健康轻松的幸福生活。</text>
+      <text>深圳市瑞梦思时代科技有限公司，瑞蓢国际集团旗下全资子公司，以能量家居系统、智慧健康睡眠生态系统为主打的核心品牌。当前旗下产品包括“重塑本元”、“吉祥卧”床垫，“少年强”青少年床垫，旅行垫，魔术减负能量背包等。\n瑞梦思以“专注每一天，健康每一夜”为目标，为人们研发贯穿生活各方面的能量家居产品，让每个家庭，每个人都能从源头开始防患于未然，远离亚健康，享受真正健康轻松的幸福生活。</text>
     </view>
     <view class="title-box">
       <image src="../../images/title2.png"></image>
     </view>
-    <view class="list-box acea-row row-between">
+    <view class="list-box acea-row row-around">
       <view class="item" wx:for="{{products}}" wx:key="index">
         <image src="{{item.image}}" mode="aspectFill"></image>
       </view>
diff --git a/pages/companyInfo/index.wxss b/pages/companyInfo/index.wxss
index 5f75be8..9358444 100644
--- a/pages/companyInfo/index.wxss
+++ b/pages/companyInfo/index.wxss
@@ -17,6 +17,7 @@
 .title-box{
   width: 100%;
   height: 92rpx;
+  margin: 32rpx 0;
 }
 .title-box image{
   width: 100%;
diff --git a/pages/goodsDetail/index.js b/pages/goodsDetail/index.js
index 80985a9..1ae0a32 100644
--- a/pages/goodsDetail/index.js
+++ b/pages/goodsDetail/index.js
@@ -33,8 +33,9 @@ Page({
  },
   getProductDetail(){
     store.getProductDetail(this.data.form.id).then((res)=>{
+     
+      res.data.data.storeInfo.description.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
       console.log('detail',res)
-      res.data.data.storeInfo.description.replace(/\<img/gi, '<img style="max-width:100%;height:auto;"')
       this.setData({
         detail: res.data.data
       })
diff --git a/pages/goodsDetail/index.wxml b/pages/goodsDetail/index.wxml
index 6fa9434..59f39ae 100644
--- a/pages/goodsDetail/index.wxml
+++ b/pages/goodsDetail/index.wxml
@@ -11,12 +11,12 @@
   </view>
   <view class="goods-info-box acea-row row-between">
     <view class="info-l-box">
-      <view class="name line1">{{detail.storeInfo.storeName}}</view>
-      <view class="price"><text class="fz20">￥</text>{{detail.storeInfo.price}}</view>
-      <view class="old-price">原价：￥<text class="row-line">{{detail.storeInfo.otPrice}}</text></view>
+      <view class="name line1">{{detail.storeInfo.storeName || '瑞梦思'}}</view>
+      <view class="price"><text class="fz20">￥</text>{{detail.storeInfo.price || 0}}</view>
+      <view class="old-price">原价：￥<text class="row-line">{{detail.storeInfo.otPrice || 0}}</text></view>
     </view>
     <view class="info-r-box">
-      <view>销量：{{detail.storeInfo.sales}}</view>
+      <view>销量：{{detail.storeInfo.sales || 0}}</view>
       <button open-type="share" class="share-btn acea-row row-center-wrapper">
         <image src="../../images/share.png"></image>
         <text>分享</text>
diff --git a/pages/goodsDetail/index.wxss b/pages/goodsDetail/index.wxss
index 972fcfa..57808c8 100644
--- a/pages/goodsDetail/index.wxss
+++ b/pages/goodsDetail/index.wxss
@@ -134,10 +134,10 @@
   left: 50%;
   transform: translate(-50%,-50%);
   width: 690rpx;
-  min-height: 370rpx;
+  min-height: 420rpx;
   background: #fff;
   border-radius: 12rpx;
-  font-size: 24rpx;
+  font-size: 28rpx;
   color: #1D1D1D;
 }
 .form .info-bg{
@@ -157,7 +157,7 @@
 }
 .inp-item{
   width: 100%;
-  height: 50rpx;
+  height: 72rpx;
   border: 2rpx solid #1D1D1D;
   border-radius: 8rpx;
   padding: 0rpx 30rpx;
@@ -171,7 +171,7 @@
 }
 .submit-btn2{
   position: absolute;
-  bottom: 46rpx;
+  bottom: 35rpx;
   left: 50%;
   transform: translateX(-50%);
   z-index: 3;
diff --git a/pages/home/index.wxss b/pages/home/index.wxss
index 00b67bf..14a7b0c 100644
--- a/pages/home/index.wxss
+++ b/pages/home/index.wxss
@@ -88,14 +88,14 @@
 }
 .form{
   width: 100%;
-  height: 232rpx;
-  font-size: 24rpx;
+  height: 280rpx;
+  font-size: 28rpx;
   color: #1D1D1D;
   position: relative;
 }
 .form .info-bg{
   width: 100%;
-  height: 232rpx;
+  height: 100%;
   position: absolute;
 }
 .inp-box{
@@ -106,7 +106,7 @@
 }
 .inp-item{
   width: 100%;
-  height: 50rpx;
+  height: 72rpx;
   border: 2rpx solid #1D1D1D;
   border-radius: 8rpx;
   padding: 0rpx 30rpx;
diff --git a/pages/user/cashOut/index.js b/pages/user/cashOut/index.js
index 247fa3f..cdbe294 100644
--- a/pages/user/cashOut/index.js
+++ b/pages/user/cashOut/index.js
@@ -5,7 +5,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-    brokeragePrice: 20
+    brokeragePrice: 0
   },
 
   /**
diff --git a/pages/user/cashOut/index.wxml b/pages/user/cashOut/index.wxml
index 28a1e89..d389275 100644
--- a/pages/user/cashOut/index.wxml
+++ b/pages/user/cashOut/index.wxml
@@ -4,7 +4,7 @@
     <image src="../../../images/profit.png" class="profit-bg"></image>
     <view class="profit-info">
       <view>当前可提现积分<text class="s-word">（积分比例为1:1）</text></view>
-      <view class="fz70">{{brokeragePrice}}</view>
+      <view class="fz70">{{brokeragePrice || 0}}</view>
     </view>
   </view>
   <view class="tips">注：提现需在每月20-26日进行，其他时间不可提现</view>
diff --git a/pages/user/index.js b/pages/user/index.js
index b536a71..ea1e8e4 100644
--- a/pages/user/index.js
+++ b/pages/user/index.js
@@ -1,6 +1,6 @@
 // pages/user/index.js
 const app = getApp()
-const userApi = require('../../api/user.js')
+const user = require('../../api/user.js')
 Page({
 
   /**
@@ -14,10 +14,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    // userApi.getMyTeam().then((res)=>{
-    //   console.log(res)
-    // })
-   
+    
   },
   
   /**
@@ -27,7 +24,7 @@ Page({
     this.getUserInfo()
   },
   getUserInfo(){
-    userApi.getUserInfo().then((res)=> {
+    user.getUserInfo().then((res)=> {
       this.setData({
         userInfo: res.data.data
       })
@@ -38,6 +35,11 @@ Page({
       url: '/pages/user/cashOut/index?brokeragePrice=' + this.data.userInfo.brokeragePrice,
     })
   },
+  call(){
+    wx.makePhoneCall({
+      phoneNumber: '15623111593',
+    })
+  },
   /**
    * 生命周期函数--监听页面隐藏
    */
diff --git a/pages/user/index.wxml b/pages/user/index.wxml
index 24fe7d1..9341eb6 100644
--- a/pages/user/index.wxml
+++ b/pages/user/index.wxml
@@ -67,7 +67,7 @@
     <view class="menu-item acea-row row-middle row-between">
       <view class="item-l acea-row row-middle">
         <image src="../../images/menu4.png"></image>
-        <text>官方客服电话：027-88888877</text>
+        <text bindtap="call">官方客服电话：15623111593</text>
       </view>
     </view>
   </view>
diff --git a/pages/user/myTeam/index.js b/pages/user/myTeam/index.js
index ae57f29..99de556 100644
--- a/pages/user/myTeam/index.js
+++ b/pages/user/myTeam/index.js
@@ -1,20 +1,33 @@
 // pages/user/myTeam/index.js
+const app = getApp()
+const user = require('../../../api/user.js')
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-
+    teamInfo: {},
+    loadingStatus: '没有更多了。。。'
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    this.setData({
+      userInfo: wx.getStorageSync('userInfo')
+    })
+    this.getTeam()
+  },
+  getTeam(){
+    user.getMyTeam().then((res)=>{
+      this.setData({
+        teamInfo: res.data.data
+      })
+      wx.stopPullDownRefresh()
+    })
   },
-
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
@@ -47,7 +60,7 @@ Page({
    * 页面相关事件处理函数--监听用户下拉动作
    */
   onPullDownRefresh: function () {
-
+    this.getTeam()
   },
 
   /**
diff --git a/pages/user/myTeam/index.json b/pages/user/myTeam/index.json
index 9825d33..2270d4c 100644
--- a/pages/user/myTeam/index.json
+++ b/pages/user/myTeam/index.json
@@ -1,4 +1,5 @@
 {
   "usingComponents": {},
-  "navigationBarTitleText": "我的团队"
+  "navigationBarTitleText": "我的团队",
+  "enablePullDownRefresh": true
 }
\ No newline at end of file
diff --git a/pages/user/myTeam/index.wxml b/pages/user/myTeam/index.wxml
index ef7b4e1..a0bfbb7 100644
--- a/pages/user/myTeam/index.wxml
+++ b/pages/user/myTeam/index.wxml
@@ -3,15 +3,15 @@
   <view class="data-panel-box acea-row row-between">
     <view>
       <view>今日新增</view>
-      <view class="fz40">20人</view>
+      <view class="fz40">{{teamInfo.todayNum}}人</view>
     </view>
     <view>
       <view>一级</view>
-      <view class="fz40">12人</view>
+      <view class="fz40">{{teamInfo.firstNum}}人</view>
     </view>
     <view>
       <view>二级</view>
-      <view class="fz40">8人</view>
+      <view class="fz40">{{teamInfo.secondNum}}人</view>
     </view>
   </view>
 
@@ -21,10 +21,16 @@
     <view class="h-item w180">二级积分收益</view>
   </view>
   <view class="t-body">
-    <view class="b-item acea-row row-middle row-between">
+    <view class="b-item acea-row row-middle row-between" wx:for="{{teamInfo.teamList}}" wx:key="index">
+      <view class="name">{{item.name}}</view>
+      <view class="name w180">{{item.firstNum}}积分</view>
+      <view class="name w180">{{item.secondNum}}积分</view>
+    </view>
+    <!-- <view class="b-item acea-row row-middle row-between">
       <view class="name">李元芳</view>
       <view class="name w180">500积分</view>
       <view class="name w180">9030积分</view>
-    </view>
+    </view> -->
   </view>
+  <view class="loading-status">{{loadingStatus}}</view>
 </view>