12

api/user.js

@@ -89,7 +89,15 @@ export function spreadPeople(data){
 export function spreadCommission(type,data){
   return request.get('spread/commission/'+type,data);
 }
-
+/**
+ * 
+ * 今日收入明细
+ * @param int type 
+ * @param object data
+*/
+export function TodayCommission(type){
+  return request.post('user/daijiesuan',type);
+}
 /**
  * 
  * 推广佣金/提现总和
@@ -123,7 +131,14 @@ export function extractCash(data){
 export function extractBank(){
   return request.get('extract/bank');
 }
-
+/**
+ * 关于我们
+ *
+ * 
+*/
+export function getAboutus(){
+  return request.get('about_us');
+}
 /**
  * 活动状态
  * 
@@ -147,6 +162,13 @@ export function GetBalance(){
   return request.get('user/balance');
 }
 /**
+ * 今日收入
+ * 
+*/
+export function GetTodaymoney(){
+  return request.get('user/shouru');
+}
+/**
  * 
  * 地址列表
  * @param object data

app.json

@@ -1,14 +1,21 @@
 {
   "pages": [
-    "pages/index/index",
-    "pages/login/index",
+    "pages/index/index", 
+    "pages/user_pwd_edit/index",
+    "pages/user_info/index",
+    
     
+    "components/codeauthorize/codeauthorize",
+    "pages/order_receipt/index",
+    "pages/user_us/index",
+    "pages/Today_income/index",
+    "pages/my_wallet/index",
+    "pages/wallet_detail/index",
+    "pages/Today_detail/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",
@@ -32,7 +39,7 @@
     "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",
@@ -47,6 +54,8 @@
     "components/address-window/index",
     "components/home/index",
     "components/write-off/index"
+    
+    
   ],
   "subPackages": [
     {

components/authorize/authorize.js

@@ -1,5 +1,5 @@
 import Util from '../../utils/util.js';
-import { getLogo } from '../../api/api.js';
+import { getLogo,phoneLogin } from '../../api/api.js';
 import { login } from '../../api/user.js';
 
 let app = getApp();
@@ -10,6 +10,10 @@ Component({
       type: Boolean,
       value: true,
     },
+    ihidden:{
+      type: Boolean,
+      value: true,
+    },
     //是否自动登录
     isAuto: {
       type: Boolean,
@@ -24,7 +28,14 @@ Component({
     cloneIner: null,
     loading:false,
     errorSum:0,
-    errorNum:3
+    errorNum:3,
+    parameter:{
+      'navbar': '1',
+      'return': '1',
+      'title': '登录',
+      'color': true,
+      'class': '6'
+    },
   },
   attached() {
     this.get_logo_url();
@@ -35,16 +46,35 @@ Component({
       let pages = getCurrentPages();
       let currPage  = pages[pages.length - 1];
       if(this.data.isGoIndex){
-        wx.switchTab({url:'/pages/index/index'});
+        wx.reLaunch({url:'/pages/index/index'});
+        this.setData({
+          ihidden: true
+        });
       }else{
         this.setData({
-          iShidden: true
+          iShidden: true,
+          ihidden: true
         });
         if (currPage && currPage.data.iShidden != undefined){
-          currPage.setData({ iShidden:true});
+          currPage.setData({ iShidden:true,ihidden:true});
         }
       }
     },
+    loginSubmit:function(e){
+      var that = this, data = {};
+      var datainfo = e.detail.value;
+      phoneLogin(datainfo).then(res => {
+        wx.setStorageSync('userid',res.data.id);
+        var userid = wx.getStorageSync('userid');
+        that.setData({
+          ihidden:false
+        })
+        console.log(userid);
+      }).catch(err => {
+        return app.Tips({ title: err });
+  
+      })
+    },
     get_logo_url: function () {
       var that = this;
       if (wx.getStorageSync('logo_url')) return this.setData({ logo_url: wx.getStorageSync('logo_url') });
@@ -56,17 +86,24 @@ Component({
     //检测登录状态并执行自动登录
     setAuthStatus() {
       var that = this;
+      var userid = wx.getStorageSync('userid');
+      // if(userid == ''||userid == undefined ||userid == null){
+      //   return that.setData({
+      //     iShidden:false 
+      //   })
+      // }
       Util.chekWxLogin().then((res)=> {
         let pages = getCurrentPages();
         let currPage = pages[pages.length - 1];
         if (currPage && currPage.data.iShidden != undefined) { 
-          currPage.setData({ iShidden:true});
+          currPage.setData({ iShidden:true,ihidden:true});
         }
         if (res.isLogin) {
           if (!Util.checkLogin()) return Promise.reject({ authSetting: true, msg: '用户token失效', userInfo: res.userInfo});
           that.triggerEvent('onLoadFun', app.globalData.userInfo);
         }else{
           wx.showLoading({ title: '正在登录中' });
+          // userInfo.userid = userid;
           that.setUserInfo(res.userInfo,true);
         }
       }).catch(res=>{
@@ -83,14 +120,16 @@ Component({
     },
     //授权
     setUserInfo(userInfo,isLogin) {
+      var userid = wx.getStorageSync('userid');
       let that = this;
       wx.showLoading({ title: '正在登录中' });
       if (isLogin){
         that.getWxUserInfo(userInfo);
       }else{
-        Util.getCodeLogin((res)=>{
+        Util.getCodeLogin((res)=>{ 
             Util.wxgetUserInfo().then(userInfo=>{
               userInfo.code = res.code;
+              userInfo.userid = userid;
               that.getWxUserInfo(userInfo);
             }).catch(res=>{
               wx.hideLoading();
@@ -100,8 +139,10 @@ Component({
     },
     getWxUserInfo: function (userInfo){
       let that = this;
+      var userid = wx.getStorageSync('userid');
       userInfo.spread_spid = app.globalData.spid;//获取推广人ID
       userInfo.spread_code = app.globalData.code;//获取推广人分享二维码ID
+      userInfo.userid = userid;
       login(userInfo).then(res => {
         app.globalData.token = res.data.token;
         app.globalData.isLog = true;
@@ -111,7 +152,7 @@ Component({
         //取消登录提示
         wx.hideLoading();
         //关闭登录弹出窗口
-        that.setData({ iShidden: true, errorSum: 0 });
+        that.setData({ iShidden: true,ihidden: true, errorSum: 0 });
         //执行登录完成回调
         that.triggerEvent('onLoadFun', app.globalData.userInfo);
       }).catch((err) => {

components/authorize/authorize.json

@@ -1,3 +1,5 @@
 {
-  "component":true
+  "usingComponents": {
+    "navbar": "/components/navbar/index"
+  }
 }

components/authorize/authorize.wxml

@@ -1,11 +1,37 @@
 <!--pages/authorize/authorize.wxml-->
-<view class='Popup' hidden='{{iShidden}}'>
-   <image src='{{logo_url}}'></image>
-   <view class='title'>授权提醒</view>
-   <view class='tip'>请授权头像等信息，以便为您提供更好的服务</view>
-   <view class='bottom flex'>
-      <view class='item' bindtap='close'>随便逛逛</view>
-      <button class='item grant'  type="primary" open-type="getUserInfo" lang="zh_CN" bindgetuserinfo="setUserInfo">去授权</button>
-   </view>
+<view class="navlogin" hidden='{{iShidden}}'>
+   <navbar parameter='{{parameter}}' logoUrl="{{logoUrl}}" ></navbar>
+<view class="login">
+  <image src="/images/login_logo.png" class="login_img"></image>
 </view>
-<view class='mask' hidden='{{iShidden}}' catchtouchmove="true" bindtap='close'></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="/components/codeauthorize/codeauthorize">验证码登录</navigator>
+      <navigator class="login_url" url="#">忘记了?找回密码</navigator>
+    </view>
+    <button class="login_btn" formType="submit">登录</button>
+  </view>
+</form>
+</view>
+
+<view class="popup_a" hidden='{{ihidden}}'>
+  <view class='Popup'  >
+    <image src='{{logo_url}}'></image>
+    <view class='title'>授权提醒</view>
+    <view class='tip'>请授权头像等信息，以便为您提供更好的服务</view>
+    <view class='bottom flex'>
+        <view class='item' bindtap='close'>随便逛逛</view>
+        <button class='item grant'  type="primary" open-type="getUserInfo" lang="zh_CN" bindgetuserinfo="setUserInfo">去授权</button>
+    </view>
+  </view>
+  <view class='mask' hidden='{{ihidden}}' catchtouchmove="true" bindtap='close'></view>
+</view>

components/codeauthorize/codeauthorize.js

@@ -0,0 +1,220 @@
+// components/codeauthorize/codeauthorize.js
+import Util from '../../utils/util.js';
+import { getLogo, loginMobile } from '../../api/api.js';
+import { login } from '../../api/user.js';
+import { phoneRegisterReset, registerVerify } from '../../api/api.js';
+
+let app = getApp();
+
+Component({
+  properties: {
+    iShidden: {
+      type: Boolean,
+      value: true,
+    },
+    ihidden: {
+      type: Boolean,
+      value: true,
+    },
+    //是否自动登录
+    isAuto: {
+      type: Boolean,
+      value: true,
+    },
+    isGoIndex: {
+      type: Boolean,
+      value: true,
+    },
+  },
+  data: {
+    cloneIner: null,
+    loading: false,
+    errorSum: 0,
+    errorNum: 3,
+    disabled: false,
+    active: false,
+    timetext: '获取验证码',
+    userInfo: {},
+    phone: '', //手机号
+    parameter: {
+      'navbar': '1',
+      'return': '1',
+      'title': '登录',
+      'color': true,
+      'class': '6'
+    },
+  },
+  attached() {
+    this.get_logo_url();
+    this.setAuthStatus();
+  },
+  methods: {
+    getPhoneValue: function (e) {
+      this.setData({
+        phone: e.detail.value
+      })
+    },
+    /**
+   * 发送验证码
+   * 
+  */
+    code: function () {
+      let that = this;
+      if (!that.data.phone) return app.Tips({ title: '请先输入手机号' });
+
+      var type = 'mobile';
+      registerVerify(that.data.phone, type).then(res => {
+        return app.Tips({ title: '发送成功' }, function () {
+          that.setData({ disabled: true, active: true });
+          let n = 60;
+          let run = setInterval(function () {
+            n--;
+            if (n < 0) {
+              clearInterval(run);
+              that.setData({ disabled: false, active: false, timetext: '重新获取' })
+            } else {
+              that.setData({ timetext: "剩余 " + n + "s" })
+            }
+          }, 1000);
+        });
+      }).catch(err => {
+        return app.Tips({ title: err });
+      });
+    },
+
+    close() {
+      let pages = getCurrentPages();
+      let currPage = pages[pages.length - 1];
+      if (this.data.isGoIndex) {
+        wx.switchTab({ url: '/pages/index/index' });
+        this.setData({
+          ihidden: true
+        });
+      } else {
+        this.setData({
+          iShidden: true,
+          ihidden: true
+        });
+        if (currPage && currPage.data.iShidden != undefined) {
+          currPage.setData({ iShidden: true, ihidden: true });
+        }
+      }
+    },
+    loginSubmit: function (e) {
+      var that = this, data = {};
+      var datainfo = e.detail.value;
+      loginMobile(datainfo).then(res => {
+        wx.setStorageSync('userid', res.data.id);
+        var userid = wx.getStorageSync('userid');
+        that.setData({
+          ihidden: false
+        })
+        // wx.reLaunch({url: '/pages/index/index'});  
+        console.log(userid);
+        
+      }).catch(err => {
+        return app.Tips({ title: err });
+
+      })
+    },
+    get_logo_url: function () {
+      var that = this;
+      if (wx.getStorageSync('logo_url')) return this.setData({ logo_url: wx.getStorageSync('logo_url') });
+      getLogo().then(res => {
+        wx.setStorageSync('logo_url', res.data.logo_url);
+        that.setData({ logo_url: res.data.logo_url });
+      });
+    },
+    //检测登录状态并执行自动登录
+    setAuthStatus() {
+      var that = this;
+      var userid = wx.getStorageSync('userid');
+      Util.chekWxLogin().then((res) => {
+        let pages = getCurrentPages();
+        let currPage = pages[pages.length - 1];
+        if (currPage && currPage.data.iShidden != undefined) {
+          currPage.setData({ iShidden: true, ihidden: true });
+        }
+        if (res.isLogin) {
+          if (!Util.checkLogin()) return Promise.reject({ authSetting: true, msg: '用户token失效', userInfo: res.userInfo });
+          that.triggerEvent('onLoadFun', app.globalData.userInfo);
+        } else {
+          wx.showLoading({ title: '正在登录中' });
+          // userInfo.userid = userid;
+          that.setUserInfo(res.userInfo, true);
+        }
+      }).catch(res => {
+        if (res.authSetting === false) {
+          //没有授权不会自动弹出登录框
+          if (that.data.isAuto === false) return;
+          //自动弹出授权
+          that.setData({ iShidden: false });
+        } else if (res.authSetting) {
+          //授权后登录token失效了
+          that.setUserInfo(res.userInfo);
+        }
+      })
+    },
+    //授权
+    setUserInfo(userInfo, isLogin) {
+      var userid = wx.getStorageSync('userid');
+      let that = this;
+      wx.showLoading({ title: '正在登录中' });
+      if (isLogin) { 
+        that.getWxUserInfo(userInfo);
+      } else {
+        Util.getCodeLogin((res) => {
+          Util.wxgetUserInfo().then(userInfo => {
+            userInfo.code = res.code;
+            userInfo.userid = userid;
+            that.getWxUserInfo(userInfo);
+            
+          }).catch(res => {
+            wx.hideLoading();
+          });
+        });
+      }
+    },
+    getWxUserInfo: function (userInfo) {
+      let that = this;
+      var userid = wx.getStorageSync('userid');
+      userInfo.spread_spid = app.globalData.spid;//获取推广人ID
+      userInfo.spread_code = app.globalData.code;//获取推广人分享二维码ID
+      userInfo.userid = userid;//获取推广人分享二维码ID
+      login(userInfo).then(res => {
+        app.globalData.token = res.data.token;
+        app.globalData.isLog = true;
+        app.globalData.userInfo = res.data.userInfo;
+        app.globalData.expiresTime = res.data.expires_time;
+        if (res.data.cache_key) wx.setStorage({ key: 'cache_key', data: res.data.cache_key });
+        //取消登录提示
+        wx.hideLoading();
+        //关闭登录弹出窗口
+        that.setData({ ihidden: true, errorSum: 0 });
+        wx.showLoading({ title: '正在跳转页面' }); 
+            setTimeout(function () {
+              wx.reLaunch({
+                url: '/pages/index/index',
+                success: function (e) {
+                  wx.hideLoading();
+                  var page = getCurrentPages().pop();
+                  if (page == undefined || page == null) return;
+                  page.onLoad();
+                }
+              })
+            }, 1000)
+        //执行登录完成回调
+        that.triggerEvent('onLoadFun', app.globalData.userInfo);
+      }).catch((err) => {
+        wx.hideLoading();
+        that.data.errorSum++;
+        that.setData({ errorSum: that.data.errorSum });
+        if (that.data.errorSum >= that.data.errorNum) {
+          Util.Tips({ title: err });
+        } else {
+          that.setUserInfo(userInfo);
+        }
+      });
+    }
+  },
+})

components/codeauthorize/codeauthorize.json

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

components/codeauthorize/codeauthorize.wxml

@@ -0,0 +1,37 @@
+<view class="navlogin" hidden='{{iShidden}}'>
+	<navbar parameter='{{parameter}}' logoUrl="{{logoUrl}}"></navbar>
+	<view class="login">
+		<image src="/images/login_logo.png" class="login_img"></image>
+	</view>
+	<form class='form' bindsubmit='loginSubmit'>
+		<view class="login_a">
+			<view class="login_p">登录</view>
+			<view class="inputa">
+				<view class="code_number">+86</view>
+				<input name="phone" type='number' placeholder="请输入手机号" maxlength='11' name="phone" class='input' bindinput='getPhoneValue' />
+			</view>
+			<view class="inputb">
+				<input class="input" type="number" name="captcha" placeholder="验证码" />
+				<!-- <button class="code_btn">获取验证码</button> -->
+				<button class="code_btn  {{disabled === true ? 'on' : ''}}" disabled='{{disabled}}' bindtap="code">
+					{{ timetext }}
+				</button>
+			</view>
+
+			<button class="login_btn" formType="submit">登录</button>
+		</view>
+	</form>
+</view>
+
+<view class="popup_a" hidden='{{ihidden}}'>
+	<view class='Popup'>
+		<image src='{{logo_url}}'></image>
+		<view class='title'>授权提醒</view>
+		<view class='tip'>请授权头像等信息，以便为您提供更好的服务</view>
+		<view class='bottom flex'>
+			<view class='item' bindtap='close'>随便逛逛</view>
+			<button class='item grant' type="primary" open-type="getUserInfo" lang="zh_CN" bindgetuserinfo="setUserInfo">去授权</button>
+		</view>
+	</view>
+	<view class='mask' hidden='{{ihidden}}' catchtouchmove="true" bindtap='close'></view>
+</view>

components/orderGoods/index.wxml

@@ -12,8 +12,8 @@
              <view class='num'>x {{item.cart_num}}</view>
            </view>
            <view class='attr line1' wx:if="{{item.productInfo.attrInfo}}">{{item.productInfo.attrInfo.suk}}</view>
-           <view class='money font-color' wx:if="{{item.productInfo.attrInfo}}">￥{{item.productInfo.attrInfo.price}}</view>
-           <view class='money font-color' wx:else>￥{{item.productInfo.price}}</view>
+           <view class='money font-color' wx:if="{{item.productInfo.attrInfo}}">￥{{item.productInfo.attrInfo.now_price}}</view>
+           <view class='money font-color' wx:else>￥{{item.productInfo.now_price}}</view> 
            <!-- <navigator class='evaluate font-color' wx:if='{{item.is_reply==0 && evaluate==3}}' hover-class="none" url='/pages/goods_comment_con/index?unique={{item.unique}}&uni={{orderId}}'>评价</navigator>
            <view class='evaluate' wx:elif='{{item.is_reply==1 && evaluate==3}}'>已评价</view> -->
         </view>

config.js

@@ -1,8 +1,8 @@
 module.exports = {
   // 请求域名 格式： https://您的域名
-  HTTP_REQUEST_URL:'http://test.matou.hdlkeji.com',
+  HTTP_REQUEST_URL:'https://test.matou.hdlkeji.com',
   // Socket链接 暂不做配置
-  WSS_SERVER_URL:'', 
+  WSS_SERVER_URL:'',  
 
 
   // 以下配置非开发者，无需修改

pages/Today_detail/index.js

@@ -0,0 +1,114 @@
+// pages/Today_detail/index.js
+import { TodayCommission} from '../../api/user.js';
+
+const app = getApp();
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    parameter: {
+      'navbar': '1',
+      'return': '1',
+      'title': '佣金明细',
+    },
+    name:'',
+    type:0,
+    page:0,
+    limit:8,
+    recordList:[],
+    recordType:0,
+    status:false,
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    this.setData({ type: options.type });
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    var type = this.data.type;
+    if (type == 0) {
+      this.setData({ 'parameter.title': '待结算金额', name: '待结算金额', recordType: 0 });
+    } else if (type == 1) {
+      this.setData({ 'parameter.title': '已结算金额', name: '已结算金额', recordType: 1 });
+    }else {
+      wx.showToast({
+        title: '参数错误',
+        icon: 'none',
+        duration: 1000,
+        mask: true,
+        success: function (res) { setTimeout(function () { wx.navigateBack({ delta: 1, }) }, 1200) },
+      });
+    }
+    this.getRecordList();
+    this.getRecordListCount();
+  },
+  /**
+   * 获取余额使用记录
+   */
+  getRecordList: function () {
+    var that = this;
+    var page = that.data.page;
+    var limit = that.data.limit;
+    var status = that.data.status;
+    var type = that.data.recordType;
+    var recordList = that.data.recordList;
+    var recordListNew = [];
+    if (status == true) return ;
+    TodayCommission({type,page:page,limit:limit}).then(res=>{
+      var len = res.data.length;
+      var recordListData = res.data;
+      recordListNew = recordList.concat(recordListData);
+      that.setData({ status: limit > len, page: limit + page, recordList: recordListNew });
+    });
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+    this.getRecordList();
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/Today_detail/index.json

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

pages/Today_detail/index.wxml

@@ -0,0 +1,36 @@
+<!--pages/Today_detail/index.wxml-->
+<navbar parameter='{{parameter}}'></navbar>
+<view class='commission-details'>
+    <!-- <view class='promoterHeader bg-color'>
+        <view class='headerCon acea-row row-between-wrapper'>
+            <view>
+                <view class='name'>{{name}}</view>
+                <view class='money'>￥<text class='num'>{{recordCount}}</text></view>
+            </view>
+            <view class='iconfont icon-jinbi1'></view>
+        </view>
+    </view> -->
+    <view class='sign-record'>
+     <block wx:for="{{recordList}}" wx:key>
+      <view class='list'>
+          <view class='item'>
+            <view class='data'>{{item.time}}</view>
+            <view class='listn'>
+              <block wx:for="{{item.list}}" wx:for-item='child' wx:key>
+                <view class='itemn acea-row row-between-wrapper'>
+                  <view>
+                      <view class='name line1'>{{child.title}}</view>
+                      <view>{{child.add_time}}</view>
+                  </view>
+                  <view class='num font-color' wx:if="{{child.pm == 1}}">+{{child.number}}</view>
+                  <view class='num'  wx:else>-{{child.number}}</view>
+                </view>
+              </block> 
+            </view>
+          </view>
+      </view>
+     </block> 
+    </view>
+</view>
+
+

pages/Today_detail/index.wxss

@@ -0,0 +1,3 @@
+/* pages/Today_detail/index.wxss */
+.commission-details .promoterHeader .headerCon .money{font-size:36rpx;}
+.commission-details .promoterHeader .headerCon .money .num{font-family: 'Guildford Pro';}

pages/Today_income/index.js

@@ -1,4 +1,6 @@
 // pages/Today_income/index.js
+import {GetTodaymoney} from '../../api/user.js';
+const app = getApp();
 Page({
 
   /**
@@ -9,9 +11,20 @@ Page({
       'navbar': '1',
       'return': '1',
       'title': '今日收入',
-    }
+    },
+    TodayDate:{}
+  },
+  onLoadFun:function(){
+    this.getbalance();
+  },
+  getbalance:function(){
+    var that = this;
+    GetTodaymoney().then(res=>{
+      this.setData({
+        TodayDate:res.data 
+      })
+    });
   },
-
   /**
    * 生命周期函数--监听页面加载
    */

pages/Today_income/index.json

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

pages/Today_income/index.wxml

@@ -2,31 +2,28 @@
 <navbar parameter='{{parameter}}'></navbar>
 <view class="income">
   <view class="income_p">累计收入 (元)</view>
-  <view class="income_p1">0.00</view>
+  <view class="income_p1"> {{TodayDate.all || 0.00}}</view>
   <view class="income_a">
     <view class="income_b">
       <view class="income_p2">今日收入 (元)</view>
-      <view class="income_p3">0.00</view>
+      <view class="income_p3">{{TodayDate.day || 0.00}}</view>
     </view>
     <view class="income_b">
       <view class="income_p2">本月收入 (元)</view>
-      <view class="income_p3">0.00</view>
+      <view class="income_p3">{{TodayDate.month || 0.00}}</view>
     </view>
   </view>
 </view>
 <view class="today">
   <view class="today_a">
-    <view class="today_b">
+    <navigator url="/pages/Today_detail/index?type=0" 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_p1">￥{{TodayDate.daijiesuan || 0.00}} <text class="today_icon iconfont icon-xiangyou"></text> </view>
+    </navigator>
+    <navigator url="/pages/Today_detail/index?type=1" 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>
+    </navigator>
   </view>
-</view>
+</view>
+<authorize bind:onLoadFun='onLoadFun'></authorize>

pages/goods_cate/goods_cate.js

@@ -51,13 +51,13 @@ Page({
       var query = wx.createSelectorQuery().in(this);
       var idView = "#b" + i;
       query.select(idView).boundingClientRect();
-      query.exec(function (res) {
-        var top = res[0].top;
-        hightArr.push(top);
-        that.setData({
-          hightArr: hightArr
-        });
-      });
+      // query.exec(function (res) {
+      //   var top = res[0].top;
+      //   hightArr.push(top);
+      //   that.setData({
+      //     hightArr: hightArr
+      //   });
+      // });
     };
   },
   tap: function (e) {

pages/goods_cate/goods_cate.wxml

@@ -1,35 +1,34 @@
 <navbar parameter='{{parameter}}'></navbar>
 <view class='productSort'>
-   <view class='aside' style='top:{{navH}}rpx;'>
-   <view wx:for="{{productList}}" wx:for-item="item" wx:key>
-        <view class='item acea-row row-center-wrapper {{0==navActive?"on":""}}' data-index='0' data-id='b0' data-cartid='' bindtap='tap'><text>全部分类</text></view>
-      <block wx:for="{{item.children}}" wx:for-item="item" wx:key>
-          <view class='item acea-row row-center-wrapper {{index+1 ==navActive?"on":""}}' data-index='{{index+1}}' data-cartid='{{item.id}}' data-id='b{{index+1}}' bindtap='tap'><text>{{item.cate_name}}</text></view>
-      </block>
-   </view>
-     
-   </view>
-   <view class='conter'>
-     <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'>
-            
-            <view class='list'>
-             
-              <block wx:for="{{CategoryList}}" wx:key> 
-              <navigator hover-class='none' url='/pages/goods_details/index?id={{item.id}}' class='item acea-row row-left'>
-                  <view class='picture'><image src='{{item.image}}'></image></view>
-                  <view class="name_a">
-                    <view class='name line2'>{{item.store_name}}</view>
-                    <view class="name_p">￥{{item.price}} <text>￥2800.00</text></view>
-                  </view>                 
-              </navigator> 
-              </block>
-              </view>
-          </view>
-        </block>
-        <view style='height:{{height-300}}rpx;' wx:if='{{number<15}}'></view>
-    </view>
-   </view>
-</view>
+	<view class='aside' style='top:{{navH}}rpx;'>
+		<view wx:for="{{productList}}" wx:for-item="item" wx:key>
+			<view class='item acea-row row-center-wrapper {{0==navActive?"on":""}}' data-index='0' data-id='b0' data-cartid='' bindtap='tap'><text>全部分类</text></view>
+			<block wx:for="{{item.children}}" wx:for-item="item" wx:key>
+				<view class='item acea-row row-center-wrapper {{index+1 ==navActive?"on":""}}' data-index='{{index+1}}' data-cartid='{{item.id}}' data-id='b{{index+1}}' bindtap='tap'><text>{{item.cate_name}}</text></view>
+			</block>
+		</view>
+
+	</view>
+	<view class='conter'>
+		<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='listw'>
+					<view class='list'>
+						<block wx:for="{{CategoryList}}" wx:key>
+							<navigator hover-class='none' url='/pages/goods_details/index?id={{item.id}}' class='item acea-row row-left'>
+								<view class='picture'>
+									<image src='{{item.image}}'></image>
+								</view>
+								<view class="name_a">
+									<view class='name line2'>{{item.store_name}}</view>
+									<view class="name_p">￥{{item.now_price}} <text>￥{{item.price}}</text></view>
+								</view>
+							</navigator>
+						</block>
+					</view>
+				</view>
+			</block>
+			<view style='height:{{height-300}}rpx;' wx:if='{{number<15}}'></view>
+		</view>
+	</view>
+</view>

pages/goods_cate/goods_cate.wxss

@@ -79,10 +79,10 @@ page {
   height: 90rpx;
 }
 .cartbanner{
-  width: 534rpx;
+  /* width: 534rpx;
   height: 176rpx;
   background: rgba(0,0,0,0);
-  margin-top: 30rpx;
+  margin-top: 30rpx; */
 }
 .cartbanner image{
   width: 100%;

pages/goods_details/index.js

@@ -1,6 +1,6 @@
-import { getProductDetail, getProductCode, collectAdd, collectDel, postCartAdd } from '../../api/store.js';
+import { getProductDetail, getProductCode, collectAdd, collectDel, postCartAdd,getShare } from '../../api/store.js';
 import { getUserInfo, userShare } from '../../api/user.js';
-import { getCoupons } from '../../api/api.js';
+import { getCoupons,setFormId} from '../../api/api.js';
 import { getCartCounts } from '../../api/order.js';
 import WxParse from '../../wxParse/wxParse.js';
 import util from '../../utils/util.js';

pages/goods_details/index.wxml

@@ -3,7 +3,7 @@
   <view class="product_a"> 
    <productConSwiper imgUrls="{{storeInfo.slider_image}}"></productConSwiper>
    <view class="product_b">
-      <view class="product_p">截团时间：<text>05月15日 19:00</text></view>
+      <view class="product_p">截团时间：<text>{{storeInfo.tuan_end_time}}</text></view>
    </view>
    <view class="product_c">
     <view class="product_p1">团购价</view>
@@ -17,7 +17,7 @@
       <view class='money font-color'>
         <text class='num detail_a'>{{storeInfo.store_name}}</text>
         <!-- <text class='vip-money' wx:if="{{storeInfo.vip_price && storeInfo.vip_price > 0}}">￥{{storeInfo.vip_price}}</text> -->
-        <image wx:if="{{storeInfo.vip_price && storeInfo.vip_price > 0}}" src="/images/vip.png"></image>
+        <!-- <image wx:if="{{storeInfo.vip_price && storeInfo.vip_price > 0}}" src="/images/vip.png"></image> -->
       </view>
       <view class='share_a' bindtap='listenerActionSheet'> <image src="/images/icon_chare.png" class="share_img"></image> 分享</view>
     </view>

pages/index/index.js

@@ -2,6 +2,7 @@ const app = getApp();
 import { getRollList } from '../../api/order.js';
 import { getIndexData, getCoupons } from '../../api/api.js';
 import Util from '../../utils/util.js';
+import {getUserInfo} from '../../api/user.js';
 
 Page({
   /**
@@ -13,6 +14,7 @@ Page({
     loadTitle:'加载更多',//提示语
     imgUrls: [],
     bastBanner: [],
+    userInfo:{},
     bastInfo: '',
     bastList: [],
     fastInfo: '',
@@ -47,7 +49,20 @@ Page({
     if (options.scene) app.globalData.code = decodeURIComponent(options.scene);
     // this.getOrderList(); 
     console.log(wx.getStorageSync('token'));
+    
   },
+  onLoadFun:function(e){
+    
+  },
+    /**
+   * 获取个人用户信息
+  */
+ getUserInfo:function(){
+  var that=this;
+  getUserInfo().then(res=>{
+    that.setData({ userInfo: res.data, loginType: res.data.login_type, orderStatusNum: res.data.orderStatusNum});
+  });
+},
   /**
    * 事件回调
    * 
@@ -133,9 +148,9 @@ getIndexConfig:function(){
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
+    this.getUserInfo();
     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:[]});
      

pages/index/index.json

@@ -5,6 +5,7 @@
     "goodList": "/components/goodList/index",
     "promotionGood": "/components/promotionGood/index",
     "coupon-window": "/components/coupon-window/index",
-    "home": "/components/home/index"
+    "home": "/components/home/index",
+    "authorize": "/components/authorize/authorize"
   }
 }

pages/index/index.wxml

@@ -5,14 +5,14 @@
 	<view class="navheader_a">
 		<view class="navheader_b">
 			<view class="navheader_avatar">
-				<image src="/images/default_image.png"></image>
+				<image src="{{userInfo.avatar || '/images/default_image.png'}}"></image>
 			</view>
 			<view class="navhead_a">
-				<view class="nahead_p">易平的小卖铺</view>
-				<view class="nahead_p1">做一个有人情味的小卖铺~</view>
+				<view class="nahead_p">{{userInfo.nickname || '请先登录'}}</view>
+				<!-- <view class="nahead_p1">做一个有人情味的小卖铺~</view> -->
 			</view>
 		</view>
-		<view class="navhead_p2">粉丝 <text>15</text></view>
+		<view class="navhead_p2">粉丝 <text>{{userInfo.spread_count || 0}}</text></view>
 	</view>
 	<view class="search"  bindtap='setGoodsSearch'><text class="iconfont icon-xiazai5"></text>搜索你想要的商品</view>
 </view>
@@ -43,13 +43,12 @@
  
 		<view class='list'>
 			<view class='item' wx:for="{{orderList}}" wx:key>
-				<navigator url='/pages/goods_details/index?id={{item.id}}'  class="list_a"  >
+				<navigator url='/pages/goods_details/index?id={{item.id}}' wx:if='{{orderStatus == 1}}'  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"  wx:if='{{orderStatus == 0}}'>开团：{{item.tuan_start_time}}</view>
-						<view class="list_p1"  wx:else>截团：{{item.tuan_end_time}}</view>
+						<view class="list_p1" >截团：{{item.tuan_end_time}}</view>
 						<!-- <view class="list_p2">已售：40件<text>库存：140件</text></view> -->
 						<view class="list_c">
 							<view class="list_p3"><text>￥</text>{{item.now_price}}</view>
@@ -58,7 +57,21 @@
 						</view>
 					</view>
 				</navigator>
-
+				<view   class="list_a" wx:else >
+					<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">开团：{{item.tuan_start_time}}</view>
+		
+						<!-- <view class="list_p2">已售：40件<text>库存：140件</text></view> -->
+						<view class="list_c">
+							<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>
+				</view>
 			</view>
 
 		</view>
@@ -82,4 +95,5 @@
 
 </view>
 <coupon-window window='{{window}}' couponList="{{couponList}}" bind:onColse="onColse"></coupon-window>
+<!-- <authorize bind:onLoadFun='onLoadFun'></authorize> -->
 <home></home>

pages/index/index.wxss

@@ -39,7 +39,7 @@ page {
   line-height:44rpx;
   color:rgba(255,255,255,1);
   opacity:1;
-  margin-top: 17rpx;
+  margin-top: 41rpx;
 }
 .nahead_p1{
   font-size:28rpx;
@@ -63,6 +63,7 @@ page {
   font-weight:bold;
   color:rgba(255,255,255,1);
   opacity:1;
+  line-height: 117rpx;
 }
 .index .index-bg {
   /* height: 375rpx; */

pages/my_fans/index.js

@@ -21,7 +21,7 @@ Page({
     orderStatus: 0,//订单状态
     orderList:[],//订单数组
     page: 1,
-    limit: 10,
+    limit: 13,
     loading: false,//是否加载中
     loadend: false,//是否加载完毕
   },

pages/my_fans/index.wxml

@@ -1,5 +1,4 @@
 <!--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'>

pages/my_wallet/index.wxml

@@ -14,18 +14,18 @@
 </view>
 <view class="today">
   <view class="today_a">
-    <view class="today_b">
+    <navigator url="/pages/wallet_detail/index?type=3" 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">
+    </navigator>
+    <navigator url="/pages/wallet_detail/index?type=1" 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">
+    </navigator>
+    <navigator url="/pages/wallet_detail/index?type=4" 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>
+    </navigator>
   </view>
 </view>
 

pages/order_details/index.js

@@ -25,8 +25,8 @@ Page({
     status:{},//订单底部按钮状态
     isClose:false,
     payMode: [
-      { name: "微信支付", icon: "icon-weixinzhifu", value: 'weixin', title: '微信快捷支付' },
-      { name: "余额支付", icon: "icon-yuezhifu", value: 'yue', title: '可用余额:', number: 0 },
+      { name: "微信支付", icon: "icon-weixinzhifu", value: 'weixin', title: '微信快捷支付' }
+      // { name: "余额支付", icon: "icon-yuezhifu", value: 'yue', title: '可用余额:', number: 0 },
     ],
     pay_close: false,
     pay_order_id: '',

pages/order_details/index.wxml

@@ -118,8 +118,8 @@
       <view class='bnt bg-color' wx:if="{{status.class_status==1}}" bindtap='goJoinPink'>查看拼团</view>
       <navigator class='bnt cancel' wx:if="{{orderInfo.delivery_type == 'express' && status.class_status==3 && status.type==2}}" hover-class='none' url='/pages/goods_logistics/index?orderId={{orderInfo.order_id}}'>查看物流</navigator>
       <view class='bnt bg-color' wx:if="{{status.class_status==3}}" bindtap='confirmOrder'>确认收货</view>
-      <view class='bnt cancel' wx:if="{{status.type==4}}" bindtap='delOrder'>删除订单</view>
-      <view class='bnt bg-color' wx:if="{{status.class_status==5}}" bindtap='goOrderConfirm'>再次购买</view>
+      <!-- <view class='bnt cancel' wx:if="{{status.type==4}}" bindtap='delOrder'>删除订单</view> -->
+      <!-- <view class='bnt bg-color' wx:if="{{status.class_status==5}}" bindtap='goOrderConfirm'>再次购买</view> -->
    </view>
 </view>
 <home></home>

pages/order_list/index.js

@@ -12,15 +12,13 @@ Page({
       'navbar': '1',
       'return': '1',
       'title': '我的订单',
-      'color': true,
-      'class': '0'
     },
     loading:false,//是否加载中
     loadend:false,//是否加载完毕
     loadTitle:'加载更多',//提示语
     orderList:[],//订单数组
     orderData:{},//订单详细统计
-    orderStatus:0,//订单状态
+    orderStatus:-1,//订单状态
     page:1,
     limit:10,
     loading:false,//是否加载中
@@ -155,6 +153,9 @@ Page({
     var that=this;
     if(that.data.loadend) return;
     if(that.data.loading) return;
+    if(that.data.orderStatus=='-1'){
+      that.data.orderStatus=''
+    }
     that.setData({ loading: true, loadTitle:""});
     getOrderList({
       type: that.data.orderStatus,

pages/order_list/index.json

@@ -5,5 +5,5 @@
     "home": "/components/home/index",
     "payment":"/components/payment/index"
   },
-  "navigationBarTextStyle": "white"
+  "navigationBarTextStyle": "black"
 }

pages/order_list/index.wxml

@@ -1,13 +1,16 @@
 <navbar parameter='{{parameter}}'></navbar>
 <view class='my-order'>
 	<view class='nav acea-row row-around'>
+		<view class='item {{orderStatus==-1? "on": ""}}' data-status="-1" bindtap="statusClick">
+			<view>全部</view>
+		</view>
 		<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 class='item {{orderStatus==4 ? "on": ""}}' data-status="4" bindtap="statusClick">
+		<view class='item {{orderStatus==5 ? "on": ""}}' data-status="5" bindtap="statusClick">
 			<view>备货中</view>
 		</view>
 		<view class='item {{orderStatus==2 ? "on": ""}}' data-status="2" bindtap="statusClick">
@@ -51,9 +54,10 @@
 				<view class='bnt bgcolor' wx:if="{{item._status._type == 0}}" data-pay_price="{{item.pay_price}}" data-order_id="{{item.order_id}}" bindtap='goPay'>付款</view>
 				<view class='bnt bgcolor' wx:elif="{{item._status._type == 1 || item._status._type == 9}}" data-order_id="{{item.order_id}}" bindtap='goOrderDetails'>查看详情</view>
 				<view class='bnt bgcolor' wx:elif="{{item._status._type == 2 && item.delivery_type}}" data-order_id="{{item.order_id}}" bindtap='goOrderDetails'>查看详情</view>
+				<view class='bnt bgcolor' wx:elif="{{item._status._type == 4}}" data-order_id="{{item.order_id}}" bindtap='goOrderDetails'>查看详情</view>
 				<!-- <view class='bnt bg-color' wx:elif="{{item._status._type == 3}}" data-order_id="{{item.order_id}}" bindtap='goOrderDetails'>去评价</view> -->
-				<view class='bnt bg-color' wx:elif="{{item.seckill_id < 1 && item.bargain_id < 1 && item.combination_id < 1 && item._status._type == 4}}" data-order_id="{{item.order_id}}" bindtap='goOrderDetails'>再次购买</view>
-				<view class='bnt cancelBnt' wx:if='{{item._status._type == 4 }}' data-order_id="{{item.order_id}}" data-index="{{index}}" bindtap='delOrder'>删除订单</view>
+				<!-- <view class='bnt bg-color' wx:elif="{{item.seckill_id < 1 && item.bargain_id < 1 && item.combination_id < 1 && item._status._type == 4}}" data-order_id="{{item.order_id}}" bindtap='goOrderDetails'>再次购买</view>
+				<view class='bnt cancelBnt' wx:if='{{item._status._type == 4 }}' data-order_id="{{item.order_id}}" data-index="{{index}}" bindtap='delOrder'>删除订单</view> -->
 			</view>
 		</view>
 	</view>

pages/order_pay_status/index.js

@@ -67,7 +67,25 @@ Page({
     }).catch(() => {
       wx.hideLoading();
     });
-  }
-
+  },
 
+/**
+   * 
+   * 去订单回执
+  */
+ goOrderReceipt:function(e)
+ {
+   let that = this;
+   wx.showLoading({
+     title: '正在加载',
+   })
+   openOrderSubscribe().then(res => {
+     wx.hideLoading();
+     wx.navigateTo({
+       url: '/pages/order_receipt/index?orderId=' + that.data.orderId
+     });
+   }).catch(() => {
+     wx.hideLoading();
+   });
+ }
 })

pages/order_pay_status/index.wxml

@@ -39,6 +39,9 @@
     <view bindtap="goOrderDetails" wx:if="{{order_pay_info.paid==0 && status==2}}">
       <button class='returnBnt bg-color' hover-class='none'>重新支付</button>
    </view>
+   <view bindtap="goOrderReceipt" wx:if="{{order_pay_info.paid==1}}">
+      <button class='returnBnt bg-color' hover-class='none'>查看回执</button>
+   </view>
    <form bindsubmit="goIndex" report-submit='true'>
     <button  class='returnBnt cart-color' formType="submit" hover-class='none'>返回首页</button>
    </form>

pages/order_receipt/index.js

@@ -0,0 +1,380 @@
+// pages/order_receipt/index.js
+import { getUserInfo } from '../../api/user.js';
+import { getOrderDetail } from '../../api/order.js';
+const app = getApp()
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    parameter: {
+      'navbar': '1',
+      'return': '1',
+      'title': '订单回执',
+    },
+    show: true,
+    // orderId:'wx159384742516922741',
+    orderId: 'wx159374726502329057',
+    cartInfo: [],//购物车产品
+    orderInfo: { system_store: {} },//订单详情
+    windowW: '',
+    windowH: '',
+    order_id: '',
+    img: ''
+  },
+  /**
+  * 登录回调
+  * 
+ */
+  onLoadFun: function () {
+    this.getOrderInfo();
+    this.setData({
+      show: true
+    })
+
+  },
+  /**
+     * 获取订单详细信息
+     * 
+    */
+  getOrderInfo: function () {
+
+    var that = this;
+    wx.showLoading({ title: "正在加载中" });
+
+    getOrderDetail(that.data.orderId).then(res => {
+      var e = res.data;
+      that.CreateCanvas(e)
+      // console.log(productimg)
+      wx.hideLoading();
+      that.setData({
+        orderInfo: res.data,
+        order_id: res.data.order_id,
+        cartInfo: res.data.cartInfo,
+        evaluate: _type == 3 ? 3 : 0,
+        system_store: res.data.system_store
+      });
+
+    }).catch(err => {
+    });
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    var that = this
+    var orderId =options.orderId;
+    that.setData({
+      orderId:orderId
+    })
+    // 获取设备宽高，以备海报全屏显示
+    wx.getSystemInfo({
+      success: function (res) {
+        that.setData({
+          windowW: res.windowWidth,
+          windowH: res.windowHeight
+        })
+      },
+    })
+
+    // 海报背景图线上地址
+    var url = '/images/bg.png'
+    // 头部背景图片
+    var urll = '/images/receipt_bgcolor.png'
+    var orderimg = '/images/icon_receipt.png'
+    var adressimg = '/images/address_icon_location.png'
+
+    // 头部背景图片
+    var urlqCord = 'http://pic.qqtn.com/up/2019-7/2019073010080912409.jpg'
+
+
+    that.setData({
+      bgpic: url
+    })
+
+    // that.getBG(urll).then(function (locationData) {
+    that.setData({
+      propic: urll
+    })
+    that.setData({
+      orderimg: orderimg
+    })
+    that.setData({
+      adressimg: adressimg
+    })
+    // })
+    that.getBG(urlqCord).then(function (locationData) {
+      that.setData({
+        qCord: locationData
+      })
+    })
+
+
+  },
+  CreateCanvas: function (e) {
+    var that = this;
+    var productimg = e.cartInfo[0].productInfo.image;
+    console.log(productimg);
+    that.getBG(productimg).then(function (locationData) {
+      that.setData({
+        product: locationData
+      })
+      that.drawCanvas(e)
+    })
+
+  },
+  // 绘制canvas
+  drawCanvas(e) {
+    var that = this
+
+    var windowW = that.data.windowW
+    var windowH = that.data.windowH
+    var text = e.cartInfo[0].productInfo.store_name
+    if (e.cartInfo[0].productInfo.attrInfo == undefined) {
+      var texta = '';
+      console.log("1")
+    } else {
+      var texta = e.cartInfo[0].productInfo.attrInfo.suk;
+      console.log("2")
+    }
+
+    // 使用 wx.createContext 获取绘图上下文 context
+    var context = wx.createCanvasContext('firstCanvas')
+
+    // 海报背景图
+    context.drawImage(that.data.bgpic, (windowW - 380) / 2, (windowH - 560) / 2, 380, 580)
+    // 商品图片
+    context.drawImage(that.data.propic, (windowW - 380) / 2, (windowH - 560) / 2, 380, 125)
+    //支付成功icon
+    context.drawImage(that.data.orderimg, (windowW - 340) / 2, (windowH - 530) / 2, 36, 36)
+    //地址icon
+    context.drawImage(that.data.adressimg, (windowW - 348) / 2, (windowH - 250) / 2, 15, 20)
+
+    // context.drawImage(that.data.product, (windowW - 348) / 2, (windowH - 250) / 2, 15, 20)
+    context.drawImage(that.data.product, (windowW - 348) / 2, (windowH - 45) / 2, 85, 85)
+    // 商品文字描述
+    context.setFontSize(20)
+    context.setFillStyle("#fff")
+    context.fillText('下单成功', (windowW - 240) / 2, (windowH - 480) / 2)
+
+    context.setFontSize(16)
+    context.setFillStyle("#fff")
+    context.fillText('订单号', (windowW - 340) / 2, (windowH - 405) / 2)
+
+    context.setFontSize(16)
+    context.setFillStyle("#fff")
+    context.fillText(e.order_id, (windowW - 180) / 2, (windowH - 405) / 2)
+
+    context.setFontSize(16)
+    context.setFillStyle("#fff")
+    context.fillText('下单时间', (windowW - 340) / 2, (windowH - 345) / 2)
+
+
+    context.setFontSize(16)
+    context.setFillStyle("#fff")
+    context.fillText(e._add_time, (windowW - 180) / 2, (windowH - 345) / 2)
+
+    context.font = 'bold 1px sans-serif'
+    context.setFontSize(16)
+    context.setFillStyle("#333333")
+    context.fillText(e.real_name, (windowW - 270) / 2, (windowH - 245) / 2)
+
+    context.font = 'normal 1px sans-serif'
+    context.setFontSize(14)
+    context.setFillStyle("#333333")
+    context.fillText(e.user_phone, (windowW - 170) / 2, (windowH - 245) / 2)
+
+    context.setFontSize(14)
+    context.setFillStyle("#CCCCCC")
+    context.fillText(e.user_address, (windowW - 270) / 2, (windowH - 188) / 2)
+
+    context.setFontSize(10)
+    context.setFillStyle("#727C8E")
+    // context.fillText('￥99.99', (windowW + 50) / 2, (windowH + 55) / 2)
+    context.setLineWidth(0.1)
+    context.moveTo((windowW - 350) / 2, (windowH - 145) / 2); //设置线条的起始路径坐标
+    context.lineTo((windowW + 350) / 2, (windowH - 145) / 2); //设置线条的终点路径坐标
+    context.stroke(); //对当前路径进行描边
+
+    context.font = 'bold 1px sans-serif'
+    context.setFontSize(16)
+    context.setFillStyle("#333333")
+    context.fillText('商品', (windowW - 345) / 2, (windowH - 80) / 2)
+
+    // 商品名字，名字很长调用方法将文字折行，传参 文字内容text，画布context
+    var row = that.newLine(text, context)
+    var a = 24//定义行高25
+    for (var i = 0; i < row.length; i++) {
+      context.font = 'normal 1px sans-serif'
+      context.setFontSize(16)
+      context.setFillStyle("#333333")
+      context.fillText(row[i], (windowW - 150) / 2, (windowH - 0) / 2 + a * i, 320)
+    }
+
+    context.setFontSize(13)
+    context.setFillStyle("#999999")
+    context.fillText(texta, (windowW - 150) / 2, (windowH + 100) / 2)
+
+    context.setFontSize(10)
+    context.setFillStyle("#727C8E")
+    // context.fillText('￥99.99', (windowW + 50) / 2, (windowH + 55) / 2)
+    context.setLineWidth(0.1)
+    context.moveTo((windowW - 350) / 2, (windowH + 170) / 2); //设置线条的起始路径坐标
+    context.lineTo((windowW + 350) / 2, (windowH + 170) / 2); //设置线条的终点路径坐标
+    context.stroke(); //对当前路径进行描边 
+
+    context.setFontSize(15)
+    context.setFillStyle("#B1B1B1")
+    context.fillText('商品数量', (windowW - 350) / 2, (windowH + 240) / 2)
+
+    context.setFontSize(15)
+    context.setFillStyle("#1D1D1D")
+    context.fillText("x" + e.cartInfo[0].cart_num, (windowW + 290) / 2, (windowH + 240) / 2)
+
+    context.setFontSize(15)
+    context.setFillStyle("#B1B1B1")
+    context.fillText('商品总额', (windowW - 350) / 2, (windowH + 320) / 2)
+
+    context.setFontSize(15)
+    context.setFillStyle("#1D1D1D")
+    context.fillText("￥" + e.cartInfo[0].now_price, (windowW + 200) / 2, (windowH + 320) / 2) 
+
+    context.setFontSize(15)
+    context.setFillStyle("#B1B1B1")
+    context.fillText('实际付款', (windowW - 350) / 2, (windowH + 390) / 2)
+
+    context.setFontSize(18)
+    context.setFillStyle("#D0021B")
+    context.fillText("￥" + e.pay_price, (windowW + 180) / 2, (windowH +390) / 2) 
+    context.draw() 
+  },
+ 
+  // 点击保存按钮，同时将画布转化为图片
+  daochu: function () {
+    var that = this;
+    wx.canvasToTempFilePath({
+      x: 0,
+      y: 0,
+      canvasId: 'firstCanvas',
+      fileType: 'jpg',
+      quality: 1,
+      success: function (res) {
+        that.setData({
+          shareImage: res.tempFilePath
+        })
+        setTimeout(function () {
+          wx.showModal({
+            title: '提示',
+            content: '将生成的海报保存到手机相册，可以发送给微信好友或分享到朋友圈',
+            success(res) {
+              if (res.confirm) {
+                that.eventSave()
+              } else if (res.cancel) {
+                console.log('用户点击取消')
+              }
+            }
+          })
+        }, 1000)
+      }
+    })
+  },
+
+  // 将商品分享图片保存到本地
+  eventSave() {
+    wx.saveImageToPhotosAlbum({
+      filePath: this.data.shareImage,
+      success(res) {
+        wx.showToast({
+          title: '保存图片成功',
+          icon: 'success',
+          duration: 2000
+        })
+      }
+    })
+  },
+
+  //将线上图片地址下载到本地，此函数进行了封装，只有在需要转换url的时候调用即可
+  getBG(url) {
+    console.log(url + '111')
+    // Promise函数给我很大的帮助，让我能return出回调函数中的值
+    return new Promise(function (resolve) {
+      wx.downloadFile({
+        url: url,
+        success: function (res) {
+          url = res.tempFilePath
+          resolve(url);
+          console.log(url)
+        }
+      })
+    })
+  },
+
+  // canvas多文字换行
+  newLine(txt, context) {
+    var txtArr = txt.split('')
+    var temp = ''
+    var row = []
+    for (var i = 0; i < txtArr.length; i++) {
+      if (context.measureText(temp).width < 210) {
+        temp += txtArr[i]
+      } else {
+        i--
+        row.push(temp)
+        temp = ''
+      }
+    }
+    row.push(temp)
+
+    //如果数组长度大于3 则截取前三个
+    if (row.length > 2) {
+      var rowCut = row.slice(0, 2);
+      var rowPart = rowCut[1];
+      var test = "";
+      var empty = [];
+      for (var a = 0; a < rowPart.length; a++) {
+        if (context.measureText(test).width < 0) {
+          test += rowPart[a];
+        } else {
+          break;
+        }
+      }
+      empty.push(test);
+      var group = empty[0]  //这里只显示三行，超出的用...表示
+      rowCut.splice(2, 1, group);
+      row = rowCut;
+    }
+
+    return row
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+    var that = this
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  }
+})

pages/order_receipt/index.json

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

pages/order_receipt/index.wxml

@@ -0,0 +1,12 @@
+<!--pages/order_receipt/index.wxml-->
+<navbar parameter='{{parameter}}'></navbar>
+
+<view wx:if="{{ show }}" class="canvas-box">
+  <canvas style="width: {{ windowW }}px; height: {{ windowH }}px;" canvas-id="firstCanvas"></canvas>
+  <view class="post">
+   <view bindtap="getOrderInfo" class="btnSavea">重新生成</view>
+   <view bindtap="daochu" class="btnSave">保存海报</view>
+  </view>
+  
+</view>
+<authorize bind:onLoadFun='onLoadFun'> </authorize> 

pages/order_receipt/index.wxss

@@ -0,0 +1,42 @@
+.btn{
+  text-align: center;
+  margin-top: 300rpx;
+}
+.canvas-box{
+  position: fixed;
+  top: 0;
+}
+ .post{
+  position: absolute;
+  bottom: 25rpx;
+  left: 50%;
+  transform: translateX(-50%);
+  display: flex;
+  justify-content: center;
+  z-index: 11111;
+ }
+ .btnSavea{
+  width: 300rpx;
+  height: 80rpx;
+  background: #fff;
+  border-radius: 40rpx 0rpx 0rpx 40rpx;
+  text-align: center;
+  font-size: 32rpx;
+  font-family: PingFang SC, PingFang SC-Regular;
+  font-weight: 400;
+  color: #333333;
+  border-radius: 40rpx 0rpx 0rpx 40rpx;
+  line-height: 80rpx;
+ }
+.btnSave{
+  border-radius: 0rpx 40rpx 40rpx 0rpx;
+  width: 300rpx;
+  height: 80rpx;
+  line-height: 80rpx;
+  background: #fd5400;
+  text-align: center;
+  font-size: 32rpx;
+  font-family: PingFang SC, PingFang SC-Regular;
+  font-weight: 400;
+  color: #ffffff;
+}

pages/user/user.wxml

@@ -1,4 +1,5 @@
 <navbar parameter='{{parameter}}'></navbar>
+<wxs src="../subutil.wxs" module="tools" />
 <view class='user'>
    <view class='header bgcolor acea-row row-between-wrapper'>
       <view class="header_a"></view>
@@ -7,7 +8,7 @@
             <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>{{userInfo.level}}</text></view> 
-               <view class="header_p1">{{userInfo.phone}}</view> 
+               <view class="header_p1">{{tools.sub(userInfo.phone, 3, 4)}}</view> 
             </view>
          </view>
          <view class="head_a">
@@ -47,14 +48,14 @@
               </view>
               <view>待发货</view>
            </view>
-           <view class='item' data-url='/pages/order_list/index?status=4' bindtap='goPages'>
+           <view class='item' data-url='/pages/order_list/index?status=5' 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>
               </view>
               <view>备货中</view>
            </view>
-            <view class='item' data-url='/pages/order_list/index?status=3' bindtap='goPages'>
+            <view class='item' data-url='/pages/order_list/index?status=2' bindtap='goPages'>
               <view class='pictrue'>
               <image src='/images/my_icon_shipped.png'></image>
               <text class="order-status-num" wx:if="{{orderStatusNum.received_count > 0}}">{{ orderStatusNum.received_count }}</text>

pages/user/user.wxss

@@ -91,7 +91,7 @@ page{
   text-align: center;
   background:rgba(253,84,0,1); 
   opacity:1; 
-  padding:0 10rpx ;
+  padding:0 15rpx ;
   border-radius:20rpx;
   font-size:20rpx;
   font-family:PingFang SC;

pages/user_cash/index.js

@@ -84,7 +84,11 @@ Page({
     if (value.money < that.data.minPrice) return app.Tips({title:'提现金额不能低于' + that.data.minPrice});
     extractCash(value).then(res=>{
       that.getUserInfo();
-      return app.Tips({ title: res.msg, icon: 'success' });
+      return app.Tips({ title: res.msg, icon: 'success' },function(){
+        wx.redirectTo({ 
+          url: '/pages/my_wallet/index'
+        })
+      });
     }).catch(err=>{
       return app.Tips({ title: err });
     });

pages/user_info/index.js

@@ -73,6 +73,7 @@ Page({
   */
   outLogin:function(){
     if (this.data.loginType == 'h5'){
+      wx.clearStorage();
       app.globalData.token = '';
       app.globalData.isLog = false;
       app.globalData.userInfo = {};
@@ -80,12 +81,18 @@ Page({
       wx.showLoading({
         title: '正在退出登录',
       });
-      return wx.switchTab({
-        url: '/pages/index/index',
-        success: function () {
-          wx.hideLoading();
-        }
-      });
+      // wx.showLoading({ title: '正在跳转页面' }); 
+      setTimeout(function () {
+        wx.reLaunch({
+          url: '/pages/index/index',
+          success: function (e) {
+            wx.hideLoading();
+            var page = getCurrentPages().pop();
+            if (page == undefined || page == null) return;
+            page.onLoad();
+          }
+        })
+      }, 2000)
     }
   },
   /**

pages/user_info/index.wxml

@@ -1,107 +1,54 @@
 <navbar parameter='{{parameter}}'></navbar>
 <form bindsubmit="formSubmit" report-submit='true'>
-  <view class='personal-data'>
-  <!-- <view class="wrapper">
-      <view class="title">管理我的账号</view>
-      <view class="wrapList">
-        <view
-          class="item acea-row row-between-wrapper {{item.uid === userInfo.uid ? 'on' : ''}}"
-          wx:for="{{switchUserInfo}}" 
-          wx:key
-          bindtap='switchAccounts'
-          data-index='{{index}}'
-        >
-          <view class="picTxt acea-row row-between-wrapper">
-            <view class="pictrue" 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>
-            <view class="text">
-              <view class="name line1">{{ item.nickname }}</view>
-              <view class="phone" wx:if="{{item.phone && item.user_type !='h5' }}">绑定手机号：{{ item.phone }}</view>
-              <view class="phone" wx:elif="{{item.phone && item.user_type =='h5' }}">账号：{{ item.phone }}</view>
-              <view class="phone" wx:else>暂未绑定手机号</view>
-            </view>
-          </view>
-          <view
-            class="currentBnt acea-row row-center-wrapper font-color"
-           wx:if='{{item.uid === userInfo.uid}}'
-          >
-            当前账号
-          </view>
-          <view class="bnt font-color acea-row row-center-wrapper" wx:else>
-            使用账号
-          </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='团长'></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>
-          </navigator>
-          <view class='input acea-row row-between-wrapper' wx:else>
-            <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>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>
-         <view class="input" bindtap="Setting">
-            点击管理<text class="iconfont icon-xiangyou"></text>
-          </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">
-            点击修改密码<text class="iconfont icon-xiangyou"></text>
-          </navigator>
-        </view>
-    </view>
-    <button class='modifyBnt bg-color' formType="submit">保存修改</button>
-    <view class="logOut cart-color acea-row row-center-wrapper" bindtap="outLogin" wx:if="{{userInfo.phone && userInfo.user_type == 'h5'}}">退出登录</view>
-  </view>
+	<view class='personal-data'>
+		<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.level}}'></input></view>
+			</view>
+			<view class='item acea-row row-between-wrapper'>
+				<view>推荐人 </view>
+				<view class='input'><input type='text' name='nickname' value='{{userInfo.spread_name.nickname}}'></input></view>
+			</view>
+
+
+		</view>
+		<view class='personal-data'>
+			<view class='list'>
+				<view class='item acea-row row-between-wrapper'>
+					<view>登录账号</view>
+					<view class='input'><input type='text' name='nickname' value='{{userInfo.phone}}'></input></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">
+						修改<text class="input_icon iconfont icon-xiangyou"></text>
+					</navigator>
+				</view>
+
+			</view>
+		</view>
+		<button class='modifyBnt bg-color' formType="submit">保存修改</button>
+		<view class="logOut cart-color acea-row row-center-wrapper" bindtap="outLogin" wx:if="{{userInfo.phone && userInfo.user_type == 'h5'}}">退出登录</view>
+	</view>
 </form>
 
-<authorize bind:onLoadFun="onLoadFun"></authorize>
+<authorize bind:onLoadFun="onLoadFun"></authorize>

pages/user_pwd_edit/index.js

@@ -1,5 +1,6 @@
 import { phoneRegisterReset, registerVerify} from '../../api/api.js';
-
+import {userEdit} from '../../api/user.js';
+const app = getApp();
 Page({
 
   /**
@@ -9,9 +10,7 @@ Page({
     parameter: {
       'navbar': '1',
       'return': '1',
-      'title': '登录',
-      'color': true,
-      'class': '0'
+      'title': '修改登录密码',
     },
     disabled: false,
     active: false,
@@ -20,23 +19,7 @@ Page({
     phone:'',
   },
 
-  inputgetName(e) {
-    let that = this;
-    let name = e.currentTarget.dataset.name;
-    let nameMap = {}
-    if (name.indexOf('.') != -1) {
-      let nameList = name.split('.')
-      if (that.data[nameList[0]]) {
-        nameMap[nameList[0]] = that.data[nameList[0]]
-      } else {
-        nameMap[nameList[0]] = {}
-      }
-      nameMap[nameList[0]][nameList[1]] = e.detail.value
-    } else {
-      nameMap[name] = e.detail.value
-    }
-    that.setData(nameMap);
-  },
+  
 
   onLoadFun:function(e){
     let userInfo = e.detail;
@@ -44,44 +27,24 @@ Page({
     let phone = tel.substr(0, 3) + "****" + tel.substr(7);
     this.setData({ userInfo: e.detail, phone: phone});
   },
-  /**
-   * 发送验证码
-   * 
-  */
-  code: function () {
-    let that = this;
-    if (!this.data.userInfo.phone) return app.Tips({title:'手机号码不存在,无法发送验证码'});
-    registerVerify(this.data.userInfo.phone).then(res=>{
-      that.setData({disabled: true,active: true});
-      let n = 60;
-      let run = setInterval(function () {
-        n--;
-        if (n < 0) {
-          clearInterval(run);
-          that.setData({ disabled: false, active: false, timetext: '重新获取' })
-        }else{
-          that.setData({ timetext: "剩余 " + n + "s" })
-        }
-      }, 1000);
-    }).catch(err=>{
-      return app.Tips({title:err});
-    });
-  },
+
   /**
    * H5登录 修改密码
    * 
   */
-  editPwd:function(){
+ PassSubmit:function(e){
     let that = this;
-    if (!that.data.password) return app.Tips({title:'请输入新密码'});
-    if (that.data.qr_password != that.data.password) return app.Tips({title:'两次输入的密码不一致！'});
-    if (!that.data.captcha) return app.Tips({title:'请输入验证码'});
-    phoneRegisterReset({
-      account:that.data.userInfo.phone,
-      captcha:that.data.captcha,
-      password: that.data.password
-    }).then(res=>{
-      return app.Tips({title:res.msg},{tab:3,url:1});
+    var datainfo = e.detail.value;
+    console.log(datainfo);
+    if (!datainfo.old_pwd) return app.Tips({title:'请输入旧密码'});
+    if (!datainfo.pwd) return app.Tips({title:'请输入新密码'});
+    if (!datainfo.qr_pwd) return app.Tips({title:'请输入确认密码'});
+    if (datainfo.pwd != datainfo.qr_pwd) return app.Tips({title:'两次输入的密码不一致！'});
+   
+    userEdit(datainfo).then(res=>{
+      return app.Tips({title:res.msg},{tab:3,url:1},function () {
+        wx.navigateBack({ delta: 1 });
+      });
     }).catch(err=>{
       return app.Tips({title:err});
     });

pages/user_pwd_edit/index.json

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

pages/user_pwd_edit/index.wxml

@@ -1,24 +1,26 @@
 <navbar parameter='{{parameter}}'></navbar>
 <view class="ChangePassword">
-    <view class="phone">当前手机号：{{phone}}</view>
-    <view class="list">
-      <view class="item">
-        <input type='password' placeholder='设置新密码' bindblur='inputgetName' data-name='password' placeholder-class='placeholder'></input>
-      </view>
-      <view class="item">
-        <input type='password' placeholder='确认新密码' bindblur='inputgetName' data-name='qr_password' placeholder-class='placeholder'></input>
-      </view>
-      <view class="item acea-row row-between-wrapper">
-        <input type='number' placeholder='填写验证码' placeholder-class='placeholder' bindblur='inputgetName' data-name='captcha'  class="codeIput"></input>
-         <button
-              class="code font-color {{disabled === true ? 'on' : ''}}"
-              disabled='{{disabled}}'
-              bindtap="code"
-            >
-            {{ timetext }}
-          </button>
-      </view>
-    </view>
-    <view class="confirmBnt bg-color" bindtap="editPwd">确认修改</view>
-  </view>
+<form class='form' bindsubmit='PassSubmit'>
+	<view class="list">
+		<view class="item acea-row row-left">
+			<view>登录账号：</view>
+			<input type='text' disabled placeholder=''  value="{{phone}}" placeholder-class='placeholder'></input>
+		</view>
+		<view class="item acea-row row-left">
+			<view>旧密码</view>
+			<input type='password' name="old_pwd" placeholder='请输入旧密码' placeholder-class='placeholder'></input>
+		</view>
+		<view class="item acea-row row-left">
+			<view>新密码</view>
+			<input type='password' name="pwd" placeholder='确认新密码'   placeholder-class='placeholder'></input>
+		</view>
+		<view class="item acea-row row-left">
+			<view>确认新密码</view>
+			<input type='password' name="qr_pwd" placeholder='确认新密码'  placeholder-class='placeholder'></input>
+		</view>
+		<view class="pass_text">密码至少6个字符，可包含数字和字母。</view>
+	</view> 
+	<button class="confirmBnt bg-color" formType="submit">确认修改</button>
+  </form>
+</view>
 <authorize bind:onLoadFun="onLoadFun"></authorize>

pages/user_pwd_edit/index.wxss

@@ -1,11 +1,66 @@
 /*修改密码*/
-page{background-color:#fff!important;}
-.ChangePassword .phone{font-size:32rpx;font-weight:bold;text-align:center;margin-top:55rpx;}
-.ChangePassword .list{width:580rpx;margin:53rpx auto 0 auto;}
-.ChangePassword .list .item{width:100%;height:110rpx;border-bottom:2rpx solid #f0f0f0;}
-.ChangePassword .list .item input{width:100%;height:100%;font-size:32rpx;}
-.ChangePassword .list .item .placeholder{color:#b9b9bc;}
-.ChangePassword .list .item input.codeIput{width:340rpx;}
-.ChangePassword .list .item .code{font-size:32rpx;background-color:#fff;}
-.ChangePassword .list .item .code.on{color:#b9b9bc!important;}
-.ChangePassword .confirmBnt{font-size:32rpx;width:580rpx;height:90rpx;border-radius:45rpx;color:#fff;margin:92rpx auto 0 auto;text-align:center;line-height:90rpx;}
+page {
+  background-color: #fff !important;
+}
+
+.ChangePassword .phone {
+  font-size: 32rpx;
+  font-weight: bold;
+  text-align: center;
+  margin-top: 55rpx;
+}
+
+.ChangePassword .list {
+  width: 700rpx;
+  margin: 53rpx auto 0 auto;
+}
+
+.ChangePassword .list .item {
+  width: 100%;
+  height: 110rpx;
+  border-bottom: 2rpx solid #f0f0f0;
+  font-size: 30rpx;
+  line-height: 118rpx;
+}
+
+.ChangePassword .list .item input {
+  width: 450rpx;
+  height: 118rpx;
+  font-size: 30rpx;
+  margin-left: 40rpx;
+}
+.pass_text{
+  font-size: 24rpx;
+  font-family: PingFang SC, PingFang SC-Regular;
+  font-weight: 400;
+  text-align: left;
+  color: #999999;
+  margin-top: 20rpx;
+}
+.ChangePassword .list .item .placeholder {
+  color: #b9b9bc;
+}
+
+.ChangePassword .list .item input.codeIput {
+  width: 340rpx;
+}
+
+.ChangePassword .list .item .code {
+  font-size: 32rpx;
+  background-color: #fff;
+}
+
+.ChangePassword .list .item .code.on {
+  color: #b9b9bc !important;
+}
+
+.ChangePassword .confirmBnt {
+  font-size: 32rpx;
+  width: 580rpx;
+  height: 90rpx;
+  border-radius: 45rpx;
+  color: #fff;
+  margin: 92rpx auto 0 auto;
+  text-align: center;
+  line-height: 90rpx;
+}

pages/user_spread_money/index.wxml

@@ -1,6 +1,6 @@
 <navbar parameter='{{parameter}}'></navbar>
 <view class='commission-details'>
-    <view class='promoterHeader bg-color'>
+    <!-- <view class='promoterHeader bg-color'>
         <view class='headerCon acea-row row-between-wrapper'>
             <view>
                 <view class='name'>{{name}}</view>
@@ -8,7 +8,7 @@
             </view>
             <view class='iconfont icon-jinbi1'></view>
         </view>
-    </view>
+    </view> -->
     <view class='sign-record'>
      <block wx:for="{{recordList}}" wx:key>
       <view class='list'>

pages/user_us/index.js

@@ -1,13 +1,30 @@
 // pages/user_us/index.js
+import { getAboutus} from '../../api/user.js';
+const app = getApp();
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-
+    parameter: {
+      'navbar': '1',
+      'return': '1',
+      'title': '关于我们',  
+    },
+    aboutdate:''
+  },
+  onLoadFun: function () {
+    this.getAbout();
+  },
+  getAbout: function () {
+    var that = this;
+    getAboutus().then(res => {
+      that.setData({
+        aboutdate: res.data,
+      });
+    })
   },
-
   /**
    * 生命周期函数--监听页面加载
    */

pages/user_us/index.json

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

pages/user_us/index.wxml

@@ -1,2 +1,4 @@
 <!--pages/user_us/index.wxml-->
-<text>pages/user_us/index.wxml</text>
+<navbar parameter='{{parameter}}'></navbar>
+<view class="us">{{aboutdate.content}}</view>
+<authorize bind:onLoadFun="onLoadFun"></authorize>

pages/user_us/index.wxss

@@ -1 +1,6 @@
-/* pages/user_us/index.wxss */
+/* pages/user_us/index.wxss */
+.us{
+  width: 700rpx;
+  margin: 25rpx auto;
+  font-size: 34rpx;
+}

pages/wallet_detail/index.js

@@ -0,0 +1,122 @@
+// pages/wallet_detail/index.js
+import { spreadCommission, spreadCount} from '../../api/user.js';
+
+const app = getApp();
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    parameter: {
+      'navbar': '1',
+      'return': '1',
+      'title': '佣金明细',
+    },
+    name:'',
+    type:0,
+    page:0,
+    limit:8,
+    recordList:[],
+    recordType:0,
+    recordCount:0,
+    status:false,
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    this.setData({ type: options.type });
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    var type = this.data.type;
+    if (type == 1) {
+      this.setData({ 'parameter.title': '出账总金额', name: '出账总金额', recordType: 4 });
+    } else if (type == 3) {
+      this.setData({ 'parameter.title': '进账总金额', name: '进账总金额', recordType: 3 });
+    }else if (type == 4) {
+      this.setData({ 'parameter.title': '累计已提现', name: '累计已提现', recordType: 0 });
+    } else {
+      wx.showToast({
+        title: '参数错误',
+        icon: 'none',
+        duration: 1000,
+        mask: true,
+        success: function (res) { setTimeout(function () { wx.navigateBack({ delta: 1, }) }, 1200) },
+      });
+    }
+    this.getRecordList();
+    this.getRecordListCount();
+  },
+  /**
+   * 获取余额使用记录
+   */
+  getRecordList: function () {
+    var that = this;
+    var page = that.data.page;
+    var limit = that.data.limit;
+    var status = that.data.status;
+    var recordType = that.data.recordType;
+    var recordList = that.data.recordList;
+    var recordListNew = [];
+    if (status == true) return ;
+    spreadCommission(recordType,{page:page,limit:limit}).then(res=>{
+      var len = res.data.length;
+      var recordListData = res.data;
+      recordListNew = recordList.concat(recordListData);
+      that.setData({ status: limit > len, page: limit + page, recordList: recordListNew });
+    });
+  },
+  getRecordListCount:function(){
+    var that = this;
+    spreadCount(that.data.recordType).then(res=>{
+      that.setData({ recordCount: res.data.count });
+    });
+  },
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+    this.getRecordList();
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/wallet_detail/index.json

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

pages/wallet_detail/index.wxml

@@ -0,0 +1,35 @@
+<!--pages/wallet_detail/index.wxml-->
+<navbar parameter='{{parameter}}'></navbar>
+<view class='commission-details'>
+    <!-- <view class='promoterHeader bg-color'>
+        <view class='headerCon acea-row row-between-wrapper'>
+            <view>
+                <view class='name'>{{name}}</view>
+                <view class='money'>￥<text class='num'>{{recordCount}}</text></view>
+            </view>
+            <view class='iconfont icon-jinbi1'></view>
+        </view>
+    </view> -->
+    <view class='sign-record'>
+     <block wx:for="{{recordList}}" wx:key>
+      <view class='list'>
+          <view class='item'>
+            <view class='data'>{{item.time}}</view>
+            <view class='listn'>
+              <block wx:for="{{item.list}}" wx:for-item='child' wx:key>
+                <view class='itemn acea-row row-between-wrapper'>
+                  <view>
+                      <view class='name line1'>{{child.title}}</view>
+                      <view>{{child.add_time}}</view>
+                  </view>
+                  <view class='num font-color' wx:if="{{child.pm == 1}}">+{{child.number}}</view>
+                  <view class='num'  wx:else>-{{child.number}}</view>
+                </view>
+              </block> 
+            </view>
+          </view>
+      </view>
+     </block> 
+    </view>
+</view>
+

pages/wallet_detail/index.wxss

@@ -0,0 +1,2 @@
+.commission-details .promoterHeader .headerCon .money{font-size:36rpx;}
+.commission-details .promoterHeader .headerCon .money .num{font-family: 'Guildford Pro';}

project.config.json

@@ -4,10 +4,11 @@
 		"ignore": []
 	},
 	"setting": {
-		"urlCheck": false,
+		"urlCheck": true,
 		"es6": true,
 		"enhance": true,
 		"postcss": true,
+		"preloadBackgroundData": false,
 		"minified": true,
 		"newFeature": true,
 		"coverView": true,
@@ -27,7 +28,7 @@
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.8.2",
-	"appid": "wx7c67b767bf59587d",
+	"appid": "wx1a1c5aa995b6c82c",
 	"projectname": "%E5%8D%95%E5%95%86%E6%88%B7%E5%95%86%E5%9F%8E",
 	"debugOptions": {
 		"hidedInDevtools": []

utils/autuLogin.js

@@ -4,7 +4,10 @@ import { logout } from './../api/api.js';
 
 export default function authLogin(login_type){
   return new Promise((reslove, reject) => {
+    var userid = wx.getStorageSync('userid');
+    console.log(userid)
     util.autoLogin().then(userInfo => {
+      userInfo.userid = userid;
       if (login_type !== undefined) userInfo.login_type = 'routine';
       login(userInfo).then(res => {
         getApp().globalData.token = res.data.token;