12

README.md

@@ -1,18 +1,4 @@
-# CRMEB XCX v3.0
 
-#### 介绍
-  CRMEB 3.0 小程序
-
-#### 使用说明
-
-1. 配置config.js 中的 HTTP_REQUEST_URL 修改为自己的域名
-2. 配置微信开发工具中小程序的appid
-3. 前往CRMEB后台配置小程序 appid 和 AppSecret 
-3. 前往微信小程序后台配置业务，下载 合法域名
-
-### 目录结构
-
-~~~
 └─view 小程序存放根目录
   ├─api 接口统一存放目录
   │ ├─activity.js 营销接口

api/order.js

@@ -48,7 +48,13 @@ export function cartDel(ids){
 export function getOrderList(data){
   return request.get('order/list',data);
 }
-
+/**
+ * 开团列表 
+ * @param object data
+*/
+export function getRollList(data){
+  return request.get('productss',data,{noAuth:true});
+}
 /**
  * 订单确认获取订单详细信息
  * @param string cartId

api/user.js

@@ -139,7 +139,13 @@ export function userActivity(){
 export function rechargeRoutine(data){
   return request.post('recharge/routine',data)
 }
-
+/**
+ * 我的钱包
+ * 
+*/
+export function GetBalance(){
+  return request.get('user/balance');
+}
 /**
  * 
  * 地址列表

app.js

@@ -76,7 +76,7 @@ App({
     expiresTime:0,
     MyMenus:[],
     userInfo:{},
-    loginType:'routine'
+    loginType:'h5'
   },
   /**
    * 聊天事件快捷注册

app.json

@@ -1,40 +1,39 @@
 {
   "pages": [
-    
     "pages/index/index",
+    "pages/login/index",
+    
+    "pages/my_fans/index",
+    "pages/user_cash/index",
+    "pages/my_wallet/index",
+    "pages/Today_income/index",
+    "pages/user_info/index",
+   
     "pages/order_list/index",
     "pages/user/user",
-   
     "pages/goods_details/index",
     "pages/Forgotpass/index",
     "pages/user_phone/index",
-    "pages/login/index",
     "pages/order_addcart/order_addcart",
     "pages/user_address/index",
     "pages/goods_logistics/index",
     "pages/order_pay_status/index",
-    "pages/user_info/index",
     "pages/user_spread_code/index",
     "pages/goods_return/index",
     "pages/user_return_list/index",
-    "pages/user_cash/index",
     "pages/cash-audit/index",
     "pages/promoter-order/index",
     "pages/promoter-list/index",
     "pages/user_spread_user/index",
     "pages/user_integral/index",
     "pages/user_spread_money/index",
-    
     "pages/order_confirm/index",
     "pages/order_details/index",
     "pages/goods_cate/goods_cate",
-    
     "pages/goods_list/goods_list",
     "pages/user_address_list/index",
     "pages/user_pwd_edit/index",
     "pages/goods_search/index",
-    
-    
     "components/navbar/index",
     "components/orderGoods/index",
     "components/swipers/index",
@@ -48,7 +47,6 @@
     "components/address-window/index",
     "components/home/index",
     "components/write-off/index"
-    
   ],
   "subPackages": [
     {

pages/Today_income/index.js

@@ -0,0 +1,70 @@
+// pages/Today_income/index.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    parameter: {
+      'navbar': '1',
+      'return': '1',
+      'title': '今日收入',
+    }
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/Today_income/index.json

@@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+    "navbar": "/components/navbar/index"
+  }
+}

pages/Today_income/index.wxml

@@ -0,0 +1,32 @@
+<!--pages/Today_income/index.wxml-->
+<navbar parameter='{{parameter}}'></navbar>
+<view class="income">
+  <view class="income_p">累计收入 (元)</view>
+  <view class="income_p1">0.00</view>
+  <view class="income_a">
+    <view class="income_b">
+      <view class="income_p2">今日收入 (元)</view>
+      <view class="income_p3">0.00</view>
+    </view>
+    <view class="income_b">
+      <view class="income_p2">本月收入 (元)</view>
+      <view class="income_p3">0.00</view>
+    </view>
+  </view>
+</view>
+<view class="today">
+  <view class="today_a">
+    <view class="today_b">
+      <view class="today_p">待结算收入</view>
+      <view class="today_p1">￥0.00 <text class="today_icon iconfont icon-xiangyou"></text> </view>
+    </view>
+    <view class="today_b">
+      <view class="today_p">已结算收入</view>
+      <view class="today_p1">￥0.00 <text class="today_icon iconfont icon-xiangyou"></text> </view>
+    </view>
+    <view class="today_b">
+      <view class="today_p">已取消收入</view>
+      <view class="today_p1">￥0.00 <text class="today_icon iconfont icon-xiangyou"></text> </view>
+    </view>
+  </view>
+</view>

pages/goods_cate/goods_cate.wxml

@@ -10,10 +10,10 @@
      
    </view>
    <view class='conter'>
-     <scroll-view scroll-y="true" scroll-into-view="{{toView}}" style='height:{{height}}rpx;' bindscroll="scroll" scroll-with-animation='true'>
+     <view scroll-y="true" scroll-into-view="{{toView}}" style='height:{{height}}rpx;' bindscroll="scroll" scroll-with-animation='true'>
         <block wx:for="{{productList}}" wx:key>
            <view class="cartbanner"><image src="/images/commission.jpg"></image></view>
-          <view class='listw' id="b{{index}}">
+          <view class='listw'>
             
             <view class='list'>
              
@@ -24,12 +24,12 @@
                     <view class='name line2'>{{item.store_name}}</view>
                     <view class="name_p">￥{{item.price}} <text>￥2800.00</text></view>
                   </view>                 
-              </navigator>
+              </navigator> 
               </block>
               </view>
           </view>
         </block>
         <view style='height:{{height-300}}rpx;' wx:if='{{number<15}}'></view>
-    </scroll-view>
+    </view>
    </view>
 </view>

pages/goods_details/index.js

@@ -266,7 +266,7 @@ Page({
     if (productSelect) {
       this.setData({
         ["productSelect.image"]: productSelect.image,
-        ["productSelect.price"]: productSelect.price,
+        ["productSelect.price"]: productSelect.now_price,
         ["productSelect.stock"]: productSelect.stock,
         ['productSelect.unique']: productSelect.unique,
         ['productSelect.cart_num']: 1,
@@ -276,7 +276,7 @@ Page({
     } else {
       this.setData({
         ["productSelect.image"]: storeInfo.image,
-        ["productSelect.price"]: storeInfo.price,
+        ["productSelect.price"]: storeInfo.now_price,
         ["productSelect.stock"]: 0,
         ['productSelect.unique']: '',
         ['productSelect.cart_num']: 0,
@@ -547,9 +547,9 @@ Page({
   //     this.setData({ 'coupon.coupon': true })
   //   }
   // },
-  // onMyEvent: function (e) {
-  //   this.setData({ 'attribute.cartAttr': e.detail.window, isOpen: false });
-  // },
+  onMyEvent: function (e) {
+    this.setData({ 'attribute.cartAttr': e.detail.window, isOpen: false });
+  },
   /**
    * 打开属性加入购物车
    * 

pages/goods_details/index.wxml

@@ -7,8 +7,8 @@
    </view>
    <view class="product_c">
     <view class="product_p1">团购价</view>
-    <view class="product_p2">￥<text>{{storeInfo.price}}</text></view>
-    <view class="product_p3">￥<text>{{storeInfo.ot_price}}</text></view>
+    <view class="product_p2">￥<text>{{storeInfo.now_price}}</text></view>
+    <view class="product_p3">￥<text>{{storeInfo.price}}</text></view>
    </view>
   </view>
   

pages/index/index.js

@@ -1,5 +1,5 @@
 const app = getApp();
-import { getOrderList,orderData } from '../../api/order.js';
+import { getRollList } from '../../api/order.js';
 import { getIndexData, getCoupons } from '../../api/api.js';
 import Util from '../../utils/util.js';
 
@@ -24,8 +24,7 @@ Page({
     interval: 3000,
     duration: 500,
     orderStatus:1,//订单状态
-    orderList:[],//订单数组
-    
+    orderList:[],//订单数组 
     page:1,
     limit:5,
     loading:false,//是否加载中
@@ -46,7 +45,8 @@ Page({
   onLoad: function (options) {
     if (options.spid) app.globalData.spid = options.spid;
     if (options.scene) app.globalData.code = decodeURIComponent(options.scene);
-    this.getOrderList();
+    // this.getOrderList(); 
+    console.log(wx.getStorageSync('token'));
   },
   /**
    * 事件回调
@@ -58,21 +58,43 @@ Page({
   let value = opt.value != undefined ? opt.value : null;
   (action && this[action]) && this[action](value);
 },
+getIndexConfig:function(){
+  var that = this;
+  getIndexData().then(res=>{
+    that.setData({
+      imgUrls: res.data.banner,
+      bastBanner: res.data.info.bastBanner,
+      bastInfo: res.data.info.bastInfo,
+      bastList: res.data.info.bastList,
+      fastInfo: res.data.info.fastInfo,
+      firstInfo: res.data.info.firstInfo,
+      salesInfo: res.data.info.salesInfo,
+      logoUrl: res.data.logoUrl,
+      couponList: res.data.couponList,
+    });
+    wx.getSetting({
+      success(res) {
+        if (!res.authSetting['scope.userInfo']) {
+          that.setData({ window: that.data.couponList.length ? true : false });
+        } else {
+          that.setData({ window: false });
+        }
+      }
+    });
+  })
+},
    /**
-   * 获取订单列表
+   * 获取开团列表
   */
  getOrderList:function(){
   var that=this;
   if(that.data.loadend) return;
-  if(that.data.loading) return;2
-  that.setData({ loading: true, loadTitle:""});
-  getOrderList({
-    type: that.data.orderStatus,
-    page: that.data.page,
-    limit: that.data.limit,
+  if(that.data.loading) return;
+  that.setData({ loading: true, loadTitle:""}); 
+  getRollList({
+    status: that.data.orderStatus
   }).then(res=>{
-    var list = res.data || [];
-    var loadend = list.length < that.data.limit;
+    var list = res.data, loadend = list.length < that.data.limit;
     that.data.orderList = app.SplitArray(list, that.data.orderList);
     that.setData({
       orderList: that.data.orderList,
@@ -112,44 +134,15 @@ Page({
    */
   onShow: function () {
     this.getIndexConfig();
+    this.getOrderList();
     if(app.globalData.isLog && app.globalData.token) this.get_issue_coupon_list();
     if (app.globalData.isLog && this.data.isClose){
       this.setData({ loadend: false, page: 1, orderList:[]});
-      this.getOrderList();
+     
     }
   },
-  get_issue_coupon_list:function(){
-    var that = this;
-    getCoupons({page:1,limit:3}).then(res=>{
-      that.setData({ couponList: res.data });
-      if (!res.data.length) that.setData({ window: false });
-    });
-  },
-  getIndexConfig:function(){
-    var that = this;
-    getIndexData().then(res=>{
-      that.setData({
-        imgUrls: res.data.banner,
-        bastBanner: res.data.info.bastBanner,
-        bastInfo: res.data.info.bastInfo,
-        bastList: res.data.info.bastList,
-        fastInfo: res.data.info.fastInfo,
-        firstInfo: res.data.info.firstInfo,
-        salesInfo: res.data.info.salesInfo,
-        logoUrl: res.data.logoUrl,
-        couponList: res.data.couponList,
-      });
-      wx.getSetting({
-        success(res) {
-          if (!res.authSetting['scope.userInfo']) {
-            that.setData({ window: that.data.couponList.length ? true : false });
-          } else {
-            that.setData({ window: false });
-          }
-        }
-      });
-    })
-  },
+
+  
   /**
    * 生命周期函数--监听页面隐藏
    */
@@ -167,6 +160,7 @@ Page({
    */
   onPullDownRefresh: function () {
     this.getIndexConfig();
+    this.getOrderList();
     if (app.globalData.isLog && app.globalData.token) this.get_issue_coupon_list();
     wx.stopPullDownRefresh();
   },
@@ -191,7 +185,7 @@ Page({
   /**
    * 页面上拉触底事件的处理函数
    */
-  onReachBottom: function () {
-    this.getOrderList();
-  },
+  // onReachBottom: function () {
+  //   this.getOrderList();
+  // },
 })

pages/index/index.wxml

@@ -40,18 +40,20 @@
 			</view>
 
 		</view>
-
+ 
 		<view class='list'>
-			<view class='item' wx:for="{{bastList}}" wx:key>
+			<view class='item' wx:for="{{orderList}}" wx:key>
 				<navigator url='/pages/goods_details/index?id={{item.id}}'  class="list_a"  >
 					<image src="{{item.image}}" class="list_img"></image>
 					<view class="list_b">
 						<view class="list_p line2">{{item.store_name}}</view>
-						<view class="list_p1">截团：05月15日 19:00</view>
+						
+						<view class="list_p1"  wx:if='{{orderStatus == 0}}'>开团：{{item.tuan_start_time}}</view>
+						<view class="list_p1"  wx:else>截团：{{item.tuan_end_time}}</view>
 						<!-- <view class="list_p2">已售：40件<text>库存：140件</text></view> -->
 						<view class="list_c">
-							<view class="list_p3"><text>￥</text>748.00</view>
-							<view class="list_p4"><text>￥</text>748.00</view>
+							<view class="list_p3"><text>￥</text>{{item.now_price}}</view>
+							<view class="list_p4"><text>￥</text>{{item.price}}</view>
 							<view class="list_url">立即抢 <text class="iconfont icon-xiangyou"></text> </view>
 						</view>
 					</view>
@@ -63,7 +65,7 @@
 		<view class='loadingicon acea-row row-center-wrapper' wx:if="{{loading}}">
 			<text class='loading iconfont icon-jiazai' hidden='{{loading==false}}'></text>{{loadTitle}}
 		</view>
-		<view class='noCart' wx:if="{{bastList.length == 0 && page > 1}}">
+		<view class='noCart' wx:if="{{orderList.length == 0 && page > 1}}">
 			<view class='pictrue'>
 				<image src='/images/noShopper.png'></image>
 				<view class="pic_p">暂无商品~</view>

pages/login/index.js

@@ -1,4 +1,6 @@
 // pages/login/index.js
+const app = getApp();
+import { phoneLogin } from '../../api/api.js';
 Page({
 
   /**
@@ -19,6 +21,19 @@ Page({
       input_code:''
     })
   },
+  loginSubmit:function(e){
+    var that = this, data = {};
+    var datainfo = e.detail.value;
+    phoneLogin(datainfo).then(res => {
+      wx.setStorageSync('token',res.data.token);
+      return app.Tips({ title: '登录成功', icon: 'success' }, function(){
+        wx.switchTab({url:'/pages/index/index'});
+      });
+    }).catch(err => {
+      return app.Tips({ title: err });
+
+    })
+  },
   /**
    * 生命周期函数--监听页面加载
    */

pages/login/index.wxml

@@ -3,18 +3,20 @@
 <view class="login">
   <image src="/images/login_logo.png" class="login_img"></image>
 </view>
-<view class="login_a">
-  <view class="login_p">登录</view>
-  <view class="inputa">
-    <input class="input"  type="number" placeholder="手机号码"   />
-  </view>
-  <view class="inputb">
-    <input class="input"  type="password" placeholder="密码"  />
-  </view>
+<form class='form' bindsubmit='loginSubmit'>
+  <view class="login_a">
+    <view class="login_p">登录</view>
+    <view class="inputa">
+      <input class="input"  type="number" name="account" placeholder="手机号码"   />
+    </view>
+    <view class="inputb">
+      <input class="input"  type="password" name="password" placeholder="密码"  />
+    </view>
   
-  <view class="login_b">
-    <navigator class="login_url" url="#">验证码登录</navigator>
-    <navigator class="login_url" url="#">忘记了?找回密码</navigator>
+    <view class="login_b">
+      <navigator class="login_url" url="#">验证码登录</navigator>
+      <navigator class="login_url" url="#">忘记了?找回密码</navigator>
+    </view>
+    <button class="login_btn" formType="submit">登录</button>
   </view>
-  <button class="login_btn">登录</button>
-</view>
+</form>

pages/my_fans/index.js

@@ -0,0 +1,137 @@
+// pages/my_fans/index.js
+import { spreadPeople } from '../../api/user.js';
+import util from '../../utils/util.js';
+
+const app = getApp();
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    parameter: {
+      'navbar': '1',
+      'return': '1',
+      'title': '我的粉丝',
+    },
+    loading: false,//是否加载中
+    loadend: false,//是否加载完毕
+    loadTitle: '加载更多',//提示语
+    orderStatus: 0,//订单状态
+    orderList:[],//订单数组
+    page: 1,
+    limit: 10,
+    loading: false,//是否加载中
+    loadend: false,//是否加载完毕
+  },
+  onLoadFun: function () {
+    this.getOrderList();
+  },
+   /**
+   * 事件回调
+   * 
+  */
+ onChangeFun:function(e){
+  let opt = e.detail;
+  let action = opt.action || null;
+  let value = opt.value != undefined ? opt.value : null;
+  (action && this[action]) && this[action](value);
+},
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+  /**
+    * 切换类型
+   */
+  statusClick: function (e) {
+    var status = e.currentTarget.dataset.status;
+    if (status == this.data.orderStatus) return;
+    this.setData({ orderStatus: status, loadend: false, page: 1, orderList: [] });
+    this.getOrderList();
+  },
+  /**
+     * 获取订单列表
+    */
+  getOrderList: function () {
+    var that = this;
+    if (that.data.loadend) return;
+    if (that.data.loading) return;
+    that.setData({ loading: true, loadTitle: "" });
+    spreadPeople({ 
+      type: that.data.orderStatus,
+      page: that.data.page,
+      limit: that.data.limit,
+    }).then(res => {
+      var list = res.data.list || [];
+      var loadend = list.length < that.data.limit;
+      that.data.orderList = app.SplitArray(list, that.data.orderList);
+      that.setData({
+        orderList: that.data.orderList,
+        loadend: loadend,
+        loading: false,
+        loadTitle: loadend ? "我也是有底线的" : '加载更多',
+        page: that.data.page + 1,
+      });
+    }).catch(err => {
+      that.setData({ loading: false, loadTitle: "加载更多" });
+    })
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+  /**
+ * 页面上拉触底事件的处理函数
+ */
+  onReachBottom: function () {
+    this.getOrderList();
+  }
+})

pages/my_fans/index.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "navbar": "/components/navbar/index",
+    "authorize": "/components/authorize/authorize"
+  }
+}

pages/my_fans/index.wxml

@@ -0,0 +1,36 @@
+<!--pages/my_fans/index.wxml-->
+<wxs src="../subutil.wxs" module="tools" />
+<navbar parameter='{{parameter}}'></navbar> 
+<view class='my-order'>
+	<view class='nav acea-row row-around'>
+		<view class='item {{orderStatus==0 ? "on": ""}}' data-status="0" bindtap="statusClick">
+			<view>进货下级</view>
+		</view>
+		<view class='item {{orderStatus==1 ? "on": ""}}' data-status="1" bindtap="statusClick">
+			<view>我的邀请 </view>
+		</view>
+	</view>
+	<view class='list'>
+		<view class='item' wx:for="{{orderList}}" wx:key>
+			<view class="fans_a">
+				<image src="{{item.avatar}}" class="fans_img"></image>
+				<view class="fans_b">
+					<view class="fans_c">{{item.nickname}}<text>{{item.level}}</text></view>
+					<view class="fans_p2">{{tools.sub(item.phone, 3, 4)}}</view>  
+				</view>
+			</view>
+		</view>
+	</view>
+	<view class='loadingicon acea-row row-center-wrapper' wx:if="{{loading}}">
+		<text class='loading iconfont icon-jiazai' hidden='{{loading==false}}'></text>{{loadTitle}}
+	</view>
+</view>
+<view class='noCart' wx:if="{{orderList.length == 0 && page > 1}}">
+	<view class='pictrue'>
+		<image src='/images/information_icon_blank.png'></image>
+		<view class="nocatr_p">暂时没有粉丝</view>
+	</view>
+</view>
+<authorize bind:onLoadFun='onLoadFun'></authorize>
+<home></home>
+<payment payMode='{{payMode}}' pay_close="{{pay_close}}" bind:onChangeFun='onChangeFun' order_id="{{pay_order_id}}" totalPrice='{{totalPrice}}'></payment>

pages/my_fans/index.wxss

@@ -0,0 +1,135 @@
+page{
+  background-color: #fff!important;
+}
+.my-order{
+  border-top: 2rpx solid #E9E8EB;
+}
+.my-order .header {
+  height: 260rpx;
+  padding: 0 30rpx;
+}
+
+.my-order .header .picTxt {
+  height: 190rpx;
+}
+
+.my-order .header .picTxt .text {
+  color: rgba(255, 255, 255, 0.8);
+  font-size: 26rpx;
+  font-family: 'Guildford Pro';
+}
+
+.my-order .header .picTxt .text .name {
+  font-size: 34rpx;
+  font-weight: bold;
+  color: #fff;
+  margin-bottom: 20rpx;
+}
+
+.my-order .header .picTxt .pictrue {
+  width: 122rpx;
+  height: 109rpx;
+}
+
+.my-order .header .picTxt .pictrue image {
+  width: 100%;
+  height: 100%;
+}
+
+.my-order .nav {
+  /* background-color: #fff; */
+  width: 690rpx;
+  border-radius: 6rpx;
+  margin: 0rpx auto 0 auto;
+}
+
+.my-order .nav .item {
+  text-align: center;
+  font-size: 30rpx;
+  color: #0A0509;
+  padding: 29rpx 0;
+  padding-bottom: 10rpx;
+}
+
+.my-order .nav .item.on {
+  color: #FD8800;
+  /* font-weight: bold; */
+  border-bottom: 5rpx solid #e93323;
+}
+
+.my-order .nav .item .num {
+  margin-top: 18rpx;
+}
+
+.my-order .list {
+  width: 690rpx;
+  margin: 0 auto 0 auto;
+}
+.fans_a{
+  width: 600rpx;
+  margin: 55rpx auto;
+  display: flex;
+  justify-content: start;
+}
+.fans_img{
+  width: 100rpx;
+  height: 100rpx;
+  border-radius: 50%;
+}
+.fans_b{
+  margin-left: 20rpx;
+}
+.fans_c{
+  font-size: 28rpx;
+  font-family: PingFang SC, PingFang SC-Medium;
+  font-weight: 500;
+  text-align: left;
+  color: #333333;
+  padding: 8rpx 0;
+  box-sizing: border-box;
+}
+.fans_c text{
+  display: inline-block;
+  height: 36rpx;
+  background: #fd5400;
+  border-radius: 18rpx;
+  padding: 0 15rpx;
+  vertical-align: middle;
+  margin-left: 30rpx;
+  font-size: 20rpx;
+  font-family: PingFang SC, PingFang SC-Regular;
+  font-weight: 400;
+  text-align: center;
+  line-height: 36rpx;
+  color: #ffffff;
+}
+.fans_p2{
+  font-size: 24rpx;
+  font-family: PingFang SC, PingFang SC-Medium;
+  font-weight: 500;
+  text-align: left;
+  color: #cccccc;
+}
+.noCart {
+  margin-top: 171rpx;
+  padding-top: 0.1rpx;
+}
+
+.noCart .pictrue {
+  width: 292rpx;
+  height: 292rpx;
+  margin: 48rpx auto 56rpx auto; 
+}
+
+.noCart .pictrue image {
+  width: 100%;
+  height: 100%;
+}
+.nocatr_p{
+  font-size: 30rpx;
+  font-family: PingFang SC, PingFang SC-Regular;
+  font-weight: 400;
+  text-align: center;
+  color: #999999;
+  margin-top: 64rpx;
+}

pages/my_wallet/index.js

@@ -0,0 +1,82 @@
+// pages/Today_income/index.js
+import {GetBalance} from '../../api/user.js';
+const app = getApp();
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    parameter: {
+      'navbar': '1',
+      'return': '1',
+      'title': '我的钱包',
+    },
+    balanceDate:{}
+  },
+  onLoadFun:function(){
+    this.getbalance();
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+  getbalance:function(){
+    var that = this;
+    GetBalance().then(res=>{
+      this.setData({
+        balanceDate:res.data
+      })
+    });
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/my_wallet/index.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "navbar": "/components/navbar/index",
+    "authorize": "/components/authorize/authorize"
+  }
+}

pages/my_wallet/index.wxml

@@ -0,0 +1,40 @@
+<!--pages/Today_income/index.wxml-->
+<navbar parameter='{{parameter}}'></navbar>
+<view class="income">
+  <view class="income_p">当前余额 (元)</view>
+  <view class="income_p1">{{balanceDate.brokerage_price||0.00}}</view>
+  <view class="income_a">
+    <navigator url="/pages/user_spread_money/index?type=0" class="income_b">
+      <view class="income_p2"> <image src="/images/wallet_a.png"></image> 明细</view>
+    </navigator>
+    <navigator url="/pages/user_cash/index" class="income_b">
+      <view class="income_p2 wallet_img"><image src="/images/wallet_b.png"></image> 提现</view>  
+    </navigator>
+  </view>
+</view>
+<view class="today">
+  <view class="today_a">
+    <view class="today_b">
+      <view class="today_p">进账总金额</view>
+      <view class="today_p1">￥{{balanceDate.now_money||0.00}} <text class="today_icon iconfont icon-xiangyou"></text> </view>
+    </view>
+    <view class="today_b">
+      <view class="today_p">出账总金额</view>
+      <view class="today_p1">￥{{balanceDate.orderStatusSum||0.00}} <text class="today_icon iconfont icon-xiangyou"></text> </view>
+    </view>
+    <view class="today_b">
+      <view class="today_p">累计已提现</view>
+      <view class="today_p1">￥{{balanceDate.extractSum||0.00}} <text class="today_icon iconfont icon-xiangyou"></text> </view>
+    </view>
+  </view>
+</view>
+
+<view class="today">
+  <view class="today_a">
+    <navigator url="/pages/user_spread_money/index?type=1" class="today_b">
+      <view class="today_p">提现记录</view>
+      <view class="today_p1">查看我的提现记录 <text class="today_icon iconfont icon-xiangyou"></text> </view>
+    </navigator>
+  </view>
+</view>
+<authorize bind:onLoadFun='onLoadFun'></authorize>

pages/order_list/index.wxml

@@ -7,14 +7,11 @@
 		<view class='item {{orderStatus==1 ? "on": ""}}' data-status="1" bindtap="statusClick">
 			<view>待发货</view>
 		</view>
-		<view class='item {{orderStatus==2 ? "on": ""}}' data-status="2" bindtap="statusClick">
-			<view>待收货</view>
-		</view>
-		<view class='item {{orderStatus==3 ? "on": ""}}' data-status="3" bindtap="statusClick">
-			<view>待评价</view>
-		</view>
 		<view class='item {{orderStatus==4 ? "on": ""}}' data-status="4" bindtap="statusClick">
-			<view>已完成</view>
+			<view>备货中</view>
+		</view>
+		<view class='item {{orderStatus==2 ? "on": ""}}' data-status="2" bindtap="statusClick">
+			<view>已发货</view>
 		</view>
 	</view>
 	<view class='list'>
@@ -29,9 +26,8 @@
 					</view>
 					<view wx:if="{{item._status._type == 0}}" class='fontcolor'>待付款</view>
 					<view wx:elif="{{item._status._type == 1}}" class='fontcolor'>待发货</view>
-					<view wx:elif="{{item._status._type == 2}}" class='fontcolor'>待收货</view>
-					<view wx:elif="{{item._status._type == 3}}" class='fontcolor'>待评价</view>
-					<view wx:elif="{{item._status._type == 4}}" class='fontcolor'>已完成</view>
+					<view wx:elif="{{item._status._type == 2}}" class='fontcolor'>已发货</view>
+					<view wx:elif="{{item._status._type == 4}}" class='fontcolor'>备货中</view>
 				</view>
 				<view class='item-info acea-row row-between row-top' wx:for="{{item.cartInfo}}" wx:key>
 					<view class='pictrue'>

pages/subutil.wxs

@@ -0,0 +1,30 @@
+/**
+ * 处理字符串为*格式，中间显示自定义*号
+ * str 需要处理的字符串
+ * startLength 前面显示的字符串长度
+ * endLength 后面显示的字符串长度
+ */
+var sub = function(str, startLength, endLength) {
+  if (str.length == 0 || str == undefined) {
+    return "";
+  }
+  var length = str.length;
+  if (length >= startLength + endLength) {
+    //判断当字符串长度为二时,隐藏末尾
+    if (length === 2) {
+      return str.substring(0, 1) + '*';
+    } 
+    else if (3 <= length && length <= 10){
+      return str.substring(0, 1) + '**';
+    }
+    //判断字符串长度大于首尾字符串长度之和时,隐藏中间部分
+    else if (length >= 11) {
+      return str.substring(0, startLength) + "****" + str.substring(length - endLength, length);
+    } else {
+      return str
+    }
+  }
+}
+module.exports = {
+  sub: sub
+}

pages/user/user.wxml

@@ -4,60 +4,29 @@
       <view class="header_a"></view>
       <view class="header_b">
          <view class="header_c">
-            <view class="header_img" data-url='/pages/user_info/index' bindtap='goPages' ><image src="{{userInfo.avatar}}"></image></view> 
+            <view class="header_img" data-url='/pages/user_info/index' bindtap='goPages' ><image src="{{userInfo.avatar||'/images/default_image.png'}}"></image></view> 
             <view class="header_d">
-               <view class="header_p">{{userInfo.nickname || '请授权'}} <text>团长</text></view> 
-               <view class="header_p1">158****3245</view>
+               <view class="header_p">{{userInfo.nickname || '请先登录'}} <text>{{userInfo.level}}</text></view> 
+               <view class="header_p1">{{userInfo.phone}}</view> 
             </view>
          </view>
          <view class="head_a">
-            <view class="head_b">
-               <view class="head_p">0.00</view>
+            <navigator url="/pages/Today_income/index" class="head_b">
+               <view class="head_p">{{userInfo.day || 0.00}}</view>
                <view class="head_p1">今日收入</view>
-            </view>
-            <view class="head_b">
-               <view class="head_p">0.00</view>
+            </navigator>
+            <navigator url="/pages/Today_income/index" class="head_b">
+               <view class="head_p">{{userInfo.month || 0.00}}</view>
                <view class="head_p1">本月收入</view>
-            </view>
-            <view class="head_b">
-               <view class="head_p">{{userInfo.now_money || 0.00}}</view>
+            </navigator>
+            <navigator url="/pages/my_wallet/index" class="head_b">
+               <view class="head_p">{{userInfo.brokerage_price || 0.00}}</view>
                <view class="head_p1">钱包余额</view>
-            </view>
+            </navigator>
          </view>
       </view>  
-      <!-- <view class='picTxt acea-row row-between-wrapper'>
-         <view class='pictrue'><image src='{{userInfo.avatar}}'></image></view>
-         <view class='text'>
-            <view class='acea-row row-middle'>
-               <view class='name line1'>{{userInfo.nickname || '请授权'}}</view>
-               <view data-url='/pages/user_vip/index' class='member acea-row row-middle' wx:if="{{userInfo.vip}}" bindtap='goPages'>
-               <image src='{{userInfo.vip_icon}}'></image>{{userInfo.vip_name}}</view>
-            </view>
-            <view class='id' data-url='/pages/user_info/index' bindtap='goPages' wx:if='{{userInfo.phone}}'>ID：{{userInfo.uid || 0}}<text class='iconfont icon-bianji1'></text></view>
-            <view wx:else data-url='/pages/user_phone/index' bindtap='goPages'><text class="binding">绑定手机号</text></view>
-         </view>
-      </view> -->
-      <!-- <text class='iconfont icon-shezhi' data-url='/pages/user_info/index' bindtap='goPages'></text> -->
    </view>
    <view class='wrapper'>
-      <!-- <view class='nav acea-row row-middle'>
-         <view class='item' data-url='/pages/user_money/index' bindtap='goPages'>
-            <view>我的余额</view>
-            <view class='num'>{{userInfo.now_money || 0}}</view>
-         </view>
-         <view class='item' wx:if="{{userInfo.is_promoter || userInfo.statu==2}}" data-url='/pages/user_spread_user/index' bindtap='goPages'>
-            <view>当前佣金</view>
-            <view class='num'>{{userInfo.brokerage_price || 0}}</view>
-         </view>
-         <view class='item' wx:else data-url='/pages/user_integral/index' bindtap='goPages'>
-            <view>当前积分</view>
-            <view class='num'>{{userInfo.integral || 0}}</view>
-         </view>
-         <view class='item' data-url='/pages/user_coupon/index' bindtap='goPages'>
-            <view>优惠券</view>
-            <view class='num'>{{userInfo.couponCount || 0}}</view>
-         </view>
-      </view> -->
       <view class='myOrder'>
         <view class='title acea-row row-between-wrapper'>
            <view>我的订单</view>
@@ -78,7 +47,7 @@
               </view>
               <view>待发货</view>
            </view>
-           <view class='item' data-url='/pages/order_list/index?status=2' bindtap='goPages'>
+           <view class='item' data-url='/pages/order_list/index?status=4' bindtap='goPages'>
               <view class='pictrue'>
               <image src='/images/my_icon_stock.png'></image>
               <text class="order-status-num" wx:if="{{orderStatusNum.received_count > 0}}">{{ orderStatusNum.received_count }}</text>
@@ -92,20 +61,7 @@
               </view>
               <view>已发货</view>
            </view>
-            <!-- <view class='item' data-url='/pages/order_list/index?status=3' bindtap='goPages'>
-              <view class='pictrue'>
-              <image src='/images/dpj.png'></image>
-              <text class="order-status-num" wx:if="{{orderStatusNum.evaluated_count > 0}}">{{ orderStatusNum.evaluated_count }}</text>
-              </view>
-              <view>待评价</view> 
-           </view> -->
-            <!-- <view class='item' data-url='/pages/user_return_list/index' bindtap='goPages'>
-              <view class='pictrue'>
-              <image src='/images/sh.png'></image>
-              <text class="order-status-num" wx:if="{{orderStatusNum.refund_count > 0}}">{{ orderStatusNum.refund_count }}</text>
-              </view>
-              <view>售后/退款</view>
-           </view> -->
+
         </view>
       </view>
       <view class='myService'>

pages/user/user.wxss

@@ -84,13 +84,14 @@ page{
   margin-top: 5rpx;
 }
 .header_p text{
-  width:72rpx;
+  /* width:72rpx; */
   display: inline-block;
   height:36rpx;
   line-height: 36rpx;
   text-align: center;
-  background:rgba(253,84,0,1);
-  opacity:1;
+  background:rgba(253,84,0,1); 
+  opacity:1; 
+  padding:0 10rpx ;
   border-radius:20rpx;
   font-size:20rpx;
   font-family:PingFang SC;

pages/user_cash/index.js

@@ -15,20 +15,20 @@ Page({
       'navbar': '1',
       'return': '1',
       'title': '提现',
-      'color':true,
-      'class':'0'
     },
     navList: [
       { 'name': '银行卡', 'icon':'icon-yinhangqia'},
       { 'name': '微信', 'icon': 'icon-weixin2' },
       { 'name': '支付宝', 'icon': 'icon-icon34' }
       ],
-    currentTab: 0,
-    index: 0,
+    currentTab: 1,
+    index: 1,
     array: [],//提现银行
     minPrice:0.00,//最低提现金额
     userInfo:[],
-    isClone:false
+    isClone:false,
+    tipdata:'',
+    price:''
   },
   onLoadFun:function(){
     this.getUserInfo();
@@ -48,13 +48,21 @@ Page({
       that.setData({ array: array, minPrice: res.data.minPrice });
     });
   },
+  Alltip:function(){
+    var that = this
+    var tipdata =that.data.price;
+    console.log(tipdata);
+    this.setData({
+      tipdata:tipdata
+    })
+  },
   /**
    * 获取个人用户信息
   */
   getUserInfo: function () {
     var that = this;
     getUserInfo().then(res=>{
-      that.setData({ userInfo: res.data });
+      that.setData({ userInfo: res.data,price:res.data.brokerage_price });
     });
   },
   swichNav: function (e) {
@@ -66,21 +74,12 @@ Page({
   subCash: function (e) {
     var formId = e.detail.formId, that = this, value = e.detail.value;
     setFormId(formId);
-    if (that.data.currentTab == 0){//银行卡
-      if (value.name.length == 0) return app.Tips({title:'请填写持卡人姓名'});
-      if (value.cardnum.length == 0) return app.Tips({title:'请填写卡号'});
-      if (that.data.index == 0) return app.Tips({title:"请选择银行"});
-      value.extract_type = 'bank';
-      value.bankname = that.data.array[that.data.index];
-    } else if (that.data.currentTab == 1) {//微信
+    if (that.data.currentTab == 1) {//微信
       value.extract_type = 'weixin';
-      if (value.name.length == 0) return app.Tips({ title: '请填写微信号' });
-      value.weixin = value.name;
-    } else if (that.data.currentTab == 2) {//支付宝
-      value.extract_type = 'alipay';
-      if (value.name.length == 0) return app.Tips({title:'请填写账号'});
-      value.alipay_code = value.name;
-    }
+      if (value.name.length == 0) return app.Tips({ title: '请填写姓名' });
+      if (value.weixin.length == 0) return app.Tips({ title: '请填写微信号' });
+      if (value.phone.length == 0) return app.Tips({ title: '请填写手机号' });
+    } 
     if (value.money.length == 0) return app.Tips({title:'请填写提现金额'});
     if (value.money < that.data.minPrice) return app.Tips({title:'提现金额不能低于' + that.data.minPrice});
     extractCash(value).then(res=>{

pages/user_cash/index.json

@@ -3,5 +3,5 @@
     "navbar": "/components/navbar/index",
     "authorize": "/components/authorize/authorize"
   },
-  "navigationBarTextStyle": "white"
+  "navigationBarTextStyle": "black"
 }

pages/user_cash/index.wxml

@@ -1,68 +1,37 @@
 <navbar parameter='{{parameter}}'></navbar>
-<view class='cash-withdrawal'>
-   <view class='nav acea-row'>
-        <view wx:for='{{navList}}' wx:key class='item font-color' data-current="{{index}}"  bindtap="swichNav">
-            <view class='line bg-color {{currentTab==index ? "on":""}}'></view>
-            <view class='iconfont {{item.icon}} {{currentTab==index ? "on":""}}'></view>
-            <view>{{item.name}}</view>
-        </view>
-    </view>
-     <view class='wrapper'>
-        <view hidden='{{currentTab != 0}}' class='list'>
-          <form bindsubmit="subCash" report-submit='true'>
-             <view class='item acea-row row-between-wrapper'>
-                 <view class='name'>持卡人</view>
-                 <view class='input'><input placeholder='请输入持卡人姓名' placeholder-class='placeholder' name="name"></input></view>
-             </view>
-              <view class='item acea-row row-between-wrapper'>
-                 <view class='name'>卡号</view>
-                 <view class='input'><input type='number' placeholder='请填写卡号' placeholder-class='placeholder' name="cardnum"></input></view>
-             </view>
-              <view class='item acea-row row-between-wrapper'>
-                 <view class='name'>银行</view>
-                 <view class='input'>
-                     <picker bindchange="bindPickerChange" value="{{index}}" range="{{array}}">
-                        <text class='Bank'>{{array[index]}}</text>
-                        <text class='iconfont icon-qiepian38'></text>
-                     </picker>
-                 </view>
-             </view>
-             <view class='item acea-row row-between-wrapper'>
-                 <view class='name'>提现</view>
-                 <view class='input'><input placeholder='最低提现金额{{minPrice}}' placeholder-class='placeholder' name="money" type='digit'></input></view>
-             </view>
-             <view class='tip'>当前可提现金额: {{userInfo.brokerage_price}}</view>
-             <button formType="submit" class='bnt bg-color'>提现</button>
-          </form>  
-        </view>
-        <view hidden='{{currentTab != 1}}' class='list'>
-          <form bindsubmit="subCash" report-submit='true'>
-             <view class='item acea-row row-between-wrapper'>
-                 <view class='name'>账号</view>
-                 <view class='input'><input placeholder='请填写您的微信账号' placeholder-class='placeholder' name="name"></input></view>
-             </view>
-              <view class='item acea-row row-between-wrapper'>
-                 <view class='name'>提现</view>
-                 <view class='input'><input placeholder='最低提现金额{{minPrice}}' placeholder-class='placeholder' name="money" type='digit'></input></view>
-             </view>
-             <view class='tip'>当前可提现金额: {{userInfo.brokerage_price}}</view>
-             <button formType="submit" class='bnt bg-color'>提现</button>
-          </form>   
-        </view>
-        <view hidden='{{currentTab != 2}}' class='list'>
-          <form bindsubmit="subCash" report-submit='true'>
-              <view class='item acea-row row-between-wrapper'>
-                 <view class='name'>账号</view>
-                 <view class='input'><input placeholder='请填写您的支付宝账号' placeholder-class='placeholder' name="name"></input></view>
-             </view>
-              <view class='item acea-row row-between-wrapper'>
-                 <view class='name'>提现</view>
-                 <view class='input'><input placeholder='最低提现金额{{minPrice}}' placeholder-class='placeholder' name="money" type='digit'></input></view>
-             </view>
-             <view class='tip'>当前可提现金额: {{userInfo.brokerage_price}}</view>
-             <button formType="submit" class='bnt bg-color'>提现</button>
-          </form>   
-        </view>
-    </view>
-</view>
-<authorize bind:onLoadFun='onLoadFun'></authorize>
+	<view class='wrapper'>
+		<view hidden='{{currentTab != 1}}' class='list'>
+			<form bindsubmit="subCash" report-submit='true'>
+			<view class='item acea-row row-between-wrapper'>
+					<view class='name'>姓名</view>
+					<view class='input'><input placeholder='请填写您的姓名' placeholder-class='placeholder' name="name"></input></view>
+				</view>
+				<view class='item acea-row row-between-wrapper'>
+					<view class='name'>微信号</view>
+					<view class='input'><input placeholder='请填写您的微信账号' placeholder-class='placeholder' name="weixin"></input></view>
+				</view> 
+				<view class='item acea-row row-between-wrapper'>
+					<view class='name'>手机号</view>
+					<view class='input'><input placeholder='请填写您的手机号' placeholder-class='placeholder' name="phone"></input></view>
+				</view>
+				<view class='bonus item '>
+					<view class='name'>提现奖金</view>
+					<view class='input'>
+						<view class="bonus_icon">￥</view>
+						<input placeholder='在此输入提现奖金' placeholder-class='placeholder' name="money" type='digit' value="{{tipdata}}"></input>
+					</view>
+				</view>
+				<view class='tip'>当前可提现金额:￥{{userInfo.brokerage_price}} <text bindtap="Alltip" class="alltip" >全部提现</text> </view> 
+				<button formType="submit" class='bnt bg-color'>提现</button>
+				<navigator class="record" url="/pages/user_spread_money/index?type=1">提现记录</navigator>
+				<view class="record_p">预计3个工作日内到账，请及时检查确认</view>
+				<view class="record_a">
+					<view class="record_p1">提现说明</view>
+					<view class="record_p2">1、提现账款会在3个工作日内发放，并将直接到账绑定的指定账户；</view>
+					<view class="record_p2">2、根据监管要求，未实名认证用户不能进行提现操作。</view>
+				</view>
+			</form>
+		</view>
+	</view>
+
+<authorize bind:onLoadFun='onLoadFun'></authorize>

pages/user_cash/index.wxss

@@ -1,19 +1,146 @@
-page{background-color:#fff!important;}
-.cash-withdrawal .nav{height:130rpx;box-shadow:0 10rpx 10rpx #f8f8f8;}
-.cash-withdrawal .nav .item{font-size:26rpx;flex:1;text-align:center;}
-.cash-withdrawal .nav .item~.item{border-left:1px solid #f0f0f0;}
-.cash-withdrawal .nav .item .iconfont{width:40rpx;height:40rpx;border-radius:50%;border:2rpx solid #e93323;text-align:center;line-height:37rpx;margin:0 auto 6rpx auto;font-size:22rpx;box-sizing:border-box;}
-.cash-withdrawal .nav .item .iconfont.on{background-color:#e93323;color:#fff;border-color:#e93323;}
-.cash-withdrawal .nav .item .line{width:2rpx;height:20rpx;margin:0 auto;transition:height 0.3s;}
-.cash-withdrawal .nav .item .line.on{height:39rpx;}
-.cash-withdrawal .wrapper .list{padding:0 30rpx;}
-.cash-withdrawal .wrapper .list .item{border-bottom:1rpx solid #eee;height:107rpx;font-size:30rpx;color:#333;}
-.cash-withdrawal .wrapper .list .item .name{width:130rpx;}
-.cash-withdrawal .wrapper .list .item .input{width:505rpx;}
-.cash-withdrawal .wrapper .list .item .input .placeholder{color:#bbb;}
-.cash-withdrawal .wrapper .list .tip{font-size:26rpx;color:#999;margin-top:25rpx;}
-.cash-withdrawal .wrapper .list .bnt{font-size:32rpx;color:#fff;width:690rpx;height:90rpx;text-align:center;border-radius:50rpx;line-height:90rpx;margin:64rpx auto;}
-.cash-withdrawal .wrapper .list .tip2{font-size:26rpx;color:#999;text-align:center;margin:44rpx 0 20rpx 0;}
-.cash-withdrawal .wrapper .list .value{height:135rpx;line-height:135rpx;border-bottom:1rpx solid #eee;width:690rpx;margin:0 auto;}
-.cash-withdrawal .wrapper .list .value input{font-size:80rpx;color:#282828;height:135rpx;text-align:center;}
-.cash-withdrawal .wrapper .list .value .placeholder2{color:#bbb;}
+page {
+  background-color: #f4f4f4 !important;
+}
+
+ .wrapper .list {
+  width: 702rpx;
+  margin: 30rpx auto;
+  padding:10rpx 40rpx;
+  box-sizing: border-box;
+  background: #ffffff;
+}
+ .wrapper .list .item {
+  border-bottom: 1rpx solid #eee;
+  /* height: 107rpx; */
+  font-size: 30rpx;
+  padding: 38rpx 0 30rpx 0;
+  color: #333;
+}
+
+.wrapper .list .item .name {
+  width: 130rpx;
+  font-size: 32rpx;
+  font-family: PingFang SC, PingFang SC-Bold;
+  font-weight: 700;
+  text-align: left;
+  color: #1d1d1d;
+}
+.wrapper .list .item .input {
+  width: 490rpx; 
+  font-size: 26rpx;
+}
+ .wrapper .list .item .input .placeholder {
+  color: #bbb;
+}
+.bonus .name{
+  margin-top: 0rpx;
+}
+.bonus .input{
+  position: relative;
+  margin-top: 30rpx;
+}
+.bonus_icon{
+  position: absolute;
+  top: 0;
+  left: 0;
+  font-size: 60rpx;
+  font-family: PingFang SC, PingFang SC-Bold;
+  font-weight: 700;
+  text-align: left;
+  color: #1d1d1d;
+}
+.alltip{
+  font-size: 26rpx;
+  font-family: PingFang SC, PingFang SC-Regular;
+  font-weight: 400;
+  text-align: left;
+  color: #046fe9;
+  margin-left: 20rpx;
+}
+.bonus .input input{
+  padding-left: 78rpx;
+  height: 65rpx; 
+  box-sizing: border-box;
+  padding-top: 20rpx;
+}
+.wrapper .list .tip {
+  font-size: 26rpx;
+  color: #999;
+  margin-top: 25rpx;
+}
+ .wrapper .list .bnt {
+  font-size: 32rpx;
+  color: #fff;
+  width: 582rpx;
+  height: 88rpx;
+  background: #fd5400;
+  border-radius: 44px;
+  text-align: center;
+  border-radius: 50rpx;
+  line-height: 88rpx;
+  margin: 84rpx auto 20rpx auto; 
+}
+.record{
+  display: block;
+  margin: 0 auto;
+  text-align: center;
+  font-size: 30rpx;
+  font-family: PingFang SC, PingFang SC-Regular;
+  font-weight: 400;
+  color: #046fe9;
+}
+.record_p{
+  text-align: center;
+  font-size: 26rpx;
+  font-family: PingFang SC, PingFang SC-Regular;
+  font-weight: 400;
+  text-align: center;
+  color: #1d1d1d;
+  margin-top: 60rpx;
+}
+.record_a{
+  margin: 70rpx auto;
+  margin-bottom: 30rpx;
+}
+.record_p1{
+  text-align: left;
+  font-size: 30rpx;
+  font-family: PingFang SC, PingFang SC-Regular;
+  font-weight: 400;
+  text-align: left;
+  color: #1d1d1d;
+  line-height: 55rpx;
+}
+.record_p2{
+  font-size: 26rpx;
+  font-family: PingFang SC, PingFang SC-Regular;
+  font-weight: 400;
+  text-align: left;
+  color: #1d1d1d;
+  line-height: 45rpx;
+}
+ .wrapper .list .tip2 {
+  font-size: 26rpx;
+  color: #999;
+  text-align: center;
+  margin: 44rpx 0 20rpx 0;
+}
+
+ .wrapper .list .value {
+  height: 135rpx;
+  line-height: 135rpx;
+  border-bottom: 1rpx solid #eee;
+  width: 690rpx;
+  margin: 0 auto;
+}
+
+ .wrapper .list .value input {
+  font-size: 80rpx;
+  color: #282828;
+  height: 135rpx;
+  text-align: center;
+}
+
+ .wrapper .list .value .placeholder2 {
+  color: #bbb;
+}

pages/user_info/index.js

@@ -14,9 +14,7 @@ Page({
     parameter: {
       'navbar': '1',
       'return': '1',
-      'title': '个人资料',
-      'color': true,
-      'class': '0'
+      'title': '个人信息', 
     },
     userInfo:{},
     loginType: 'h5',//app.globalData.loginType

pages/user_info/index.wxml

@@ -1,7 +1,7 @@
 <navbar parameter='{{parameter}}'></navbar>
 <form bindsubmit="formSubmit" report-submit='true'>
   <view class='personal-data'>
-  <view class="wrapper">
+  <!-- <view class="wrapper">
       <view class="title">管理我的账号</view>
       <view class="wrapList">
         <view
@@ -37,13 +37,39 @@
           </view>
         </view>
       </view>
-    </view>
+    </view> -->
     <view class='list'>
+    <view class='item acea-row row-between-wrapper'>
+          <view>头像</view>
+          <view class=" acea-row row-between-wrapper {{item.uid === userInfo.uid ? 'on' : ''}}"
+          wx:for="{{switchUserInfo}}" 
+          wx:key
+          bindtap='switchAccounts'
+          data-index='{{index}}'>
+            <view class="pictrue pic_img input" catchtap='uploadpic' wx:if='{{item.uid === userInfo.uid }}'>
+                <image src='{{item.avatar}}'></image>
+                <!-- <image src='/images/alter.png' class="alter"></image> -->
+                </view>
+                <view class="pictrue" wx:else>
+                  <image src='{{item.avatar}}'></image>
+                </view>
+                <text class="iconfont input_icon icon-xiangyou"></text>
+            </view>
+          </view>
+          
+        <view class='item acea-row row-between-wrapper'>
+          <view>名字</view>
+          <view class='input acea-row row-right'><input type='text' name='nickname' value='{{userInfo.nickname}}'></input><text class="iconfont input_icon icon-xiangyou"></text></view>
+        </view>
         <view class='item acea-row row-between-wrapper'>
-          <view>昵称</view>
-          <view class='input'><input type='text' name='nickname' value='{{userInfo.nickname}}'></input></view>
+          <view>团长级别</view>
+          <view class='input'><input type='text' name='nickname' value='团长'></input></view>
         </view>
         <view class='item acea-row row-between-wrapper'>
+          <view>推荐人  </view>
+          <view class='input'><input type='text' name='nickname' value='郭磊'></input></view>
+        </view>
+        <!-- <view class='item acea-row row-between-wrapper'>
           <view>手机号码</view>
           <navigator url="/pages/user_phone/index" hover-class="none" class="input" wx:if="{{!userInfo.phone}}">
             点击绑定手机号<text class="iconfont icon-xiangyou"></text>
@@ -52,20 +78,20 @@
             <input type='text' disabled='true' name='phone' value='{{userInfo.phone}}' class='id'></input>
             <text class='iconfont icon-suozi'></text>
           </view>
-        </view>
-        <view class='item acea-row row-between-wrapper'>
+        </view> -->
+        <!-- <view class='item acea-row row-between-wrapper'>
           <view>ID号</view>
           <view class='input acea-row row-between-wrapper'>
             <input type='text' value='{{userInfo.uid}}' disabled='true' class='id'></input>
             <text class='iconfont icon-suozi'></text>
           </view> 
-        </view>
-        <view class='item acea-row row-between-wrapper'>
+        </view> -->
+        <!-- <view class='item acea-row row-between-wrapper'>
           <view>权限设置</view>
          <view class="input" bindtap="Setting">
             点击管理<text class="iconfont icon-xiangyou"></text>
           </view>
-        </view>
+        </view> -->
         <view class="item acea-row row-between-wrapper" wx:if="{{userInfo.phone && userInfo.user_type == 'h5'}}">
           <view>密码</view>
           <navigator url="/pages/user_pwd_edit/index" hover-class="none" class="input">

pages/user_integral/index.wxml

@@ -4,7 +4,7 @@
     <view class='currentScore'>当前积分</view>
     <view style='font-family: "Guildford Pro";'>{{userInfo.integral}}</view>
     <view class='line'></view>
-    <view class='nav acea-row'>
+    <view class='nav acea-row'> 
        <view class='item'>
          <view class='num'>{{userInfo.sum_integral}}</view>
          <view>累计积分</view>

pages/user_spread_money/index.js

@@ -13,8 +13,6 @@ Page({
       'navbar': '1',
       'return': '1',
       'title': '佣金明细',
-      'color': true,
-      'class': '0'
     },
     name:'',
     type:0,
@@ -49,6 +47,8 @@ Page({
       this.setData({ 'parameter.title': '提现记录', name: '提现总额', recordType: 4 });
     } else if (type == 2) {
       this.setData({ 'parameter.title': '佣金记录', name: '佣金明细', recordType: 3 });
+    }else if (type == 0) {
+      this.setData({ 'parameter.title': '全部明细', name: '全部明细', recordType: 0 });
     } else {
       wx.showToast({
         title: '参数错误',

pages/user_spread_money/index.json

@@ -2,5 +2,5 @@
   "usingComponents": {
     "navbar": "/components/navbar/index"
   },
-  "navigationBarTextStyle": "white"
+  "navigationBarTextStyle": "black"
 }

pages/user_us/index.js

@@ -0,0 +1,66 @@
+// pages/user_us/index.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/user_us/index.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

pages/user_us/index.wxml

@@ -0,0 +1,2 @@
+<!--pages/user_us/index.wxml-->
+<text>pages/user_us/index.wxml</text>

pages/user_us/index.wxss

@@ -0,0 +1 @@
+/* pages/user_us/index.wxss */

utils/Server.js

@@ -9,7 +9,7 @@ export default class Server{
     this.watcherList = [] // 订阅者
     this.app = app // 方便在Chat内部操作app
     this.debug = SERVER_DEBUG //debug
-  }
+  } 
 
   connectSocket(){
     let that = this;

utils/util.js

@@ -116,7 +116,7 @@ const wxgetUserInfo = function()
   });
 }
 
-const checkLogin = function()
+const checkLogin = function() 
 {
   let res = getApp().globalData.token ? true : false;
   let res1 = getApp().globalData.isLog;
@@ -420,6 +420,9 @@ const textByteLength = (text, num) =>{
   return [strLength, arr, rows]   //  [处理文字的总字节长度，每行显示内容的数组，行数]
 }
 
+
+
+
 /**
  * 获取分享海报
  * @param array arr2 海报素材
@@ -539,4 +542,4 @@ module.exports = {
   wxgetUserInfo: wxgetUserInfo,
   autoLogin: autoLogin,
   logout: logout
-}
+}

wxParse/html2json.js

@@ -1,16 +1,4 @@
-/**
- * html2Json 改造来自: https://github.com/Jxck/html2json
- * 
- * 
- * author: Di (微信小程序开发工程师)
- * organization: WeAppDev(微信小程序开发论坛)(http://weappdev.com)
- *               垂直微信小程序开发交流社区
- * 
- * github地址: https://github.com/icindy/wxParse
- * 
- * for: 微信小程序富文本解析
- * detail : http://weappdev.com/t/wxparse-alpha0-1-html-markdown/184
- */
+
 
 var __placeImgeUrlHttps = "https";
 var __emojisReg = '';

wxParse/htmlparser.js

@@ -1,16 +1,4 @@
-/**
- * 
- * htmlParser改造自: https://github.com/blowsie/Pure-JavaScript-HTML5-Parser
- * 
- * author: Di (微信小程序开发工程师)
- * organization: WeAppDev(微信小程序开发论坛)(http://weappdev.com)
- *               垂直微信小程序开发交流社区
- * 
- * github地址: https://github.com/icindy/wxParse
- * 
- * for: 微信小程序富文本解析
- * detail : http://weappdev.com/t/wxparse-alpha0-1-html-markdown/184
- */
+
 // Regular Expressions for parsing tags and attributes
 var startTag = /^<([-A-Za-z0-9_]+)((?:\s+[a-zA-Z_:][-a-zA-Z0-9_:.]*(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)>/,
 	endTag = /^<\/([-A-Za-z0-9_]+)[^>]*>/,

wxParse/showdown.js

@@ -1,16 +1,3 @@
-/**
- * 
- * showdown: https://github.com/showdownjs/showdown
- * 
- * author: Di (微信小程序开发工程师)
- * organization: WeAppDev(微信小程序开发论坛)(http://weappdev.com)
- *               垂直微信小程序开发交流社区
- * 
- * github地址: https://github.com/icindy/wxParse
- * 
- * for: 微信小程序富文本解析
- * detail : http://weappdev.com/t/wxparse-alpha0-1-html-markdown/184
- */
 
 function getDefaultOpts(simple) {
   'use strict';