修改首页显示订单数量错误

application/admin/controller/Index.php

@@ -46,27 +46,22 @@ class Index extends AuthController
         $now_day = strtotime(date('Y-m-d'));//今日
         $pre_day = strtotime(date('Y-m-d',strtotime('-1 day')));//昨天时间戳
         $beforyester_day = strtotime(date('Y-m-d',strtotime('-2 day')));//前天时间戳
-        //昨天待发货数量
-        $topData['orderDeliveryNum'] = StoreOrderModel::isMainYesterdayCount($pre_day,$now_day)
-            ->where('status',0)
+        //待发货数量
+        $topData['orderDeliveryNum'] = StoreOrderModel::where('status',0)
             ->where('paid',1)
             ->where('refund_status',0)
             ->count();
-        //昨天退换货订单数
-        $topData['orderRefundNum'] = StoreOrderModel::isMainYesterdayCount($pre_day,$now_day)
-            ->where('paid',1)
-            ->where('refund_status','IN','1,2')
+        //退换货订单数
+        $topData['orderRefundNum'] = StoreOrderModel::where('paid',1)
+            ->where('refund_status','IN','1')
             ->count();
         //库存预警
         $replenishment_num = SystemConfig::getValue('store_stock') > 0 ? SystemConfig::getValue('store_stock') : 20;//库存预警界限
         $topData['stockProduct'] = StoreProduct::where('stock','<=',$replenishment_num)->where('is_del',0)->count();
         //待处理提现
         $topData['treatedExtract'] = UserExtractModel::where('status',0)->count();
-        //昨日订单数
-        $topData['orderNum'] = StoreOrderModel::isMainYesterdayCount($pre_day,$now_day)->count();
-//        //昨日交易额
-//        $orderPriceNum = StoreOrderModel::isMainYesterdayCount($pre_day,$now_day)->field('sum(pay_price) as pay_price')->find()['pay_price'];
-//        $topData['orderPriceNum'] = $orderPriceNum ? $orderPriceNum : 0;
+
+
         //订单数->日
         $now_day_order_p = StoreOrderModel::where('paid',1)->where('pay_time','gt',$now_day)->count();
         $pre_day_order_p = StoreOrderModel::where('paid',1)->where('pay_time','gt',$pre_day)->where('pay_time','lt',$now_day)->count();
@@ -537,6 +532,7 @@ class Index extends AuthController
      */
     public function userchart(){
         header('Content-type:text/json');
+
         $starday = date('Y-m-d',strtotime('-30 day'));
         $yesterday = date('Y-m-d');
 
@@ -549,7 +545,7 @@ class Index extends AuthController
         $data = [];
         $chartdata['legend'] = ['用户数'];//分类
         $chartdata['yAxis']['maxnum'] = 0;//最大值数量
-        if(empty($user_list)) return Json::fail('没有数据');
+        if(empty($user_list))return Json::fail('无数据');
         foreach ($user_list as $k=>$v){
             $data['day'][] = $v['day'];
             $data['count'][] = $v['count'];
@@ -558,6 +554,7 @@ class Index extends AuthController
         }
         $chartdata['xAxis'] = $data['day'];//X轴值
         $chartdata['series'] = $data['count'];//分类1值
+
         return Json::succ('ok',$chartdata);
     }
 

application/routine/view/crmebN/app.json

@@ -26,7 +26,6 @@
     "pages/foo-tan/foo-tan",
     "pages/buycar/buycar",
     "pages/mycut/mycut",
-    "pages/join-pink/index",
     "pages/user/user",
     "pages/integral-con/integral-con",
     "pages/orders-con/orders-con",

application/routine/view/crmebN/pages/cut-one/cut-one.js

@@ -1,465 +0,0 @@
-// pages/cut-one/cut-one.js
-var app = getApp();
-var wxh = require('../../utils/wxh.js');
-var WxParse = require('../../wxParse/wxParse.js');
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    uid: app.globalData.uid,//登录人uid
-    bargainUid:0,//参与砍价uid
-    bargainUserInfo:[],//参与人信息
-    bargainId:0,//砍价产品ID
-    status:0,// 0未参与砍价  1参与砍价 2 帮别人砍价 3 已帮别人砍价  4 砍价结束
-    count:[],//顶部人数
-    bargainUserHelp:[],//砍价帮人
-    HelpCount:0,//砍价帮总人数
-    HelpPrice:0,//剩余多少金额
-    pricePercent:0,//进度条
-    bargainUserHelpUserInfo:[],
-    url: app.globalData.urlImages,
-    hiddens: true,
-    hiddens2:true,
-    product:[],
-    countDownDay:'00',
-    countDownHour:'00',
-    countDownMinute:'00',
-    countDownSecond:'00',
-  },
-  onLoad: function (options) {
-    app.setBarColor();
-    app.globalData.openPages = '/pages/cut-one/cut-one?bargainUid=' + options.bargainUid + '&id=' + options.id;
-    app.setUserInfo();
-    if (options.id && options.bargainUid) {
-      this.setData({
-        bargainId: options.id,
-        bargainUid: options.bargainUid
-      })
-      this.getbargain();
-      this.getBargainCount();
-      this.addLookBargain();
-    } else if (options.id){
-      this.setData({
-        bargainId: options.id,
-        bargainUid: app.globalData.uid
-      })
-      this.getbargain();
-      this.getBargainCount();
-      this.addLookBargain();
-    }else {
-      wx.showToast({
-        title: '参数错误',
-        icon: 'none',
-        duration: 1000
-      })
-      setTimeout(function () {
-        wx.navigateTo({
-          url: '/pages/cut-list/cut-list'
-        })
-      }, 1200)
-    }
-  },//获取砍价产品
-  getbargain: function () {
-    var that = this;
-    wx.request({
-      url: app.globalData.url + '/routine/auth_api/get_bargain?uid=' + app.globalData.uid,
-      data: { bargainId: that.data.bargainId },
-      method: 'GET',
-      success: function (res) {
-        if (res.data.code == 200) {
-          that.setData({
-            product: res.data.data
-          })
-          that.dtime();
-          if (that.data.bargainUid == app.globalData.uid) {
-            that.setData({
-              status: 1
-            })
-            that.setBargain();
-          } else {
-            that.setData({
-              status: 2
-            })
-            that.getBargainUser();
-            that.getUserInfo();
-            that.getBargainHelpCount();
-          }
-          if (that.data.product.description) WxParse.wxParse('description', 'html', that.data.product.description, that, 0); 
-          if (that.data.product.rule) WxParse.wxParse('rule', 'html', that.data.product.rule, that, 0);
-        } else {
-          that.setData({
-            product: []
-          })
-        }
-      }
-    })
-  },//倒计时
-  dtime: function () {
-    var that = this;
-    var timeStamp = that.data.product.stop_time;
-    wxh.time2(timeStamp, that);
-  },//获取顶部人数
-  getBargainCount: function () {
-    var that = this;
-    wx.request({
-      url: app.globalData.url + '/routine/auth_api/get_bargain_count?uid=' + app.globalData.uid,
-      method: 'GET',
-      success: function (res) {
-        if (res.data.code == 200) {
-          that.setData({
-            count: res.data.data
-          })
-        } else {
-          that.setData({
-            count: []
-          })
-        }
-      }
-    })
-  },//参与砍价
-  setBargain: function () {
-    var that = this;
-    wx.request({
-      url: app.globalData.url + '/routine/auth_api/set_bargain?uid=' + app.globalData.uid,
-      data: { bargainId: that.data.bargainId },
-      method: 'GET',
-      success: function (res) {
-        if (res.data.code == 200) {
-          wx.showToast({
-            title: res.data.msg,
-            icon: 'success',
-            duration: 2000
-          })
-          that.setData({
-            status:1,
-            bargainUid: app.globalData.uid
-          })
-        } else {
-          // wx.showToast({
-          //   title: res.data.msg,
-          //   icon: 'none',
-          //   duration: 2000
-          // })
-        }
-        that.setBargainHelp();
-        that.isBargainUser();
-      }
-    })
-  },//参与砍价帮砍
-  setBargainHelp: function () {
-    var that = this;
-    wx.request({
-      url: app.globalData.url + '/routine/auth_api/set_bargain_help?uid=' + app.globalData.uid,
-      data: { 
-        bargainId: that.data.bargainId,
-        bargainUserId: that.data.bargainUid
-      },
-      method: 'GET',
-      success: function (res) {
-        if (res.data.code == 200){
-          wx.showToast({
-            title: res.data.msg,
-            icon: 'success',
-            duration: 2000
-          })
-          if (that.data.bargainUid != app.globalData.uid) {
-            that.setData({
-              status: 3,
-              bargainUserHelpUserInfo: res.data.data,
-              hiddens2: false
-            })
-          }else{
-            that.setData({
-              status: 1,
-              bargainUserHelpUserInfo: res.data.data,
-              hiddens2: false
-            })
-          }
-          that.getBargainUser();
-          that.getUserInfo();
-          that.getBargainHelpCount();
-        } else {
-          that.isBargainUserHelp();
-        }
-      }
-    })
-  },//判断当前用户是否可以砍价
-  isBargainUserHelp:function(){
-    var that = this;
-    wx.request({
-      url: app.globalData.url + '/routine/auth_api/is_bargain_user_help?uid=' + app.globalData.uid,
-      data: { 
-        bargainId: that.data.bargainId,
-        bargainUserId: that.data.bargainUid
-        },
-      method: 'GET',
-      success: function (res) {
-        if (res.data.code == 200) {
-          wx.showToast({
-            title: res.data.msg,
-            icon: 'none',
-            duration: 2000
-          })
-        } else {
-          if (that.data.bargainUid != app.globalData.uid) {
-            wx.showToast({
-              title: '您不能在帮' + that.data.bargainUserInfo.nickname + '砍价了',
-              icon: 'none',
-              duration: 2000
-            })
-            that.setData({
-              status: 3
-            })
-          } else {
-            that.setData({
-              status: 1,
-            })
-          }
-        }
-      }
-    })
-  },
-  //判断当前登录人是否参与砍价
-  isBargainUser: function () {
-    var that = this;
-    wx.request({
-      url: app.globalData.url + '/routine/auth_api/is_bargain_user?uid=' + app.globalData.uid,
-      data: { bargainId: that.data.bargainId },
-      method: 'GET',
-      success: function (res) {
-        if (res.data.code == 200) {
-          that.setData({
-            bargainUid: app.globalData.uid,
-            status: 1
-          })
-          that.getBargainUser();
-          that.getUserInfo();
-          that.getBargainHelpCount();
-        } else {
-          that.setData({
-            bargainUid: 0,
-            status:0
-          })
-        }
-      }
-    })
-  },//获取砍价帮
-  getBargainUser: function () {
-    var that = this;
-    wx.request({
-      url: app.globalData.url + '/routine/auth_api/get_bargain_user?uid=' + app.globalData.uid,
-      data: { 
-        bargainId: that.data.bargainId,
-        bargainUid: that.data.bargainUid
-      },
-      method: 'GET',
-      success: function (res) {
-        if (res.data.code == 200) {
-          that.setData({
-            bargainUserHelp: res.data.data
-          })
-        } else {
-          that.setData({
-            bargainUserHelp: []
-          })
-        }
-      }
-    })
-  },//获取当前参与砍价人的信息
-  getUserInfo:function(){
-    var that = this;
-    wx.request({
-      url: app.globalData.url + '/routine/auth_api/get_user_info_uid?uid=' + app.globalData.uid,
-      data: {
-        userId: that.data.bargainUid
-      },
-      method: 'GET',
-      success: function (res) {
-        if (res.data.code == 200) {
-          that.setData({
-            bargainUserInfo: res.data.data
-          })
-        } else {
-          wx.showToast({
-            title: res.data.msg,
-            icon: 'none',
-            duration: 2000
-          })
-          that.setData({
-            bargainUserInfo: []
-          })
-        }
-      }
-    })
-  },//获取砍价帮总人数
-  getBargainHelpCount:function(){
-    var that = this;
-    wx.request({
-      url: app.globalData.url + '/routine/auth_api/get_bargain_help_count?uid=' + app.globalData.uid,
-      data: {
-        bargainId: that.data.bargainId,
-        bargainUserId: that.data.bargainUid
-      },
-      method: 'GET',
-      success: function (res) {
-        if (res.data.code == 200) {
-          if (res.data.data.price <= 0 && app.globalData.uid == that.data.bargainUid){
-            that.setData({
-               status:4
-            })
-          }
-          that.setData({
-            HelpCount: res.data.data.count,
-            HelpPrice: res.data.data.price,
-            pricePercent: res.data.data.pricePercent
-          })
-        } else {
-          wx.showToast({
-            title: res.data.msg,
-            icon: 'none',
-            duration: 2000
-          })
-          that.setData({
-            HelpCount: 0,
-            HelpPrice:0,
-            pricePercent:0
-          })
-        }
-      }
-    })
-  },
-  getCutList:function(){
-    wx.navigateTo({
-      url: '/pages/cut-list/cut-list'
-    })
-  },//砍价成功后支付订单
-  goOrderPay:function(){
-    var that = this;
-    if (that.data.bargainUid != app.globalData.uid){
-      wx.showToast({
-        title: '参数错误',
-        icon: 'none',
-        duration: 2000
-      })
-    }else{
-      wx.request({
-        url: app.globalData.url + '/routine/auth_api/now_buy?uid=' + app.globalData.uid,
-        method: 'GET',
-        data: {
-          productId: that.data.product.product_id,
-          cartNum: that.data.product.num,
-          bargainId: that.data.product.id,
-        },
-        success: function (res) {
-          if (res.data.code == 200) {
-            wx.navigateTo({ //跳转至指定页面并关闭其他打开的所有页面（这个最好用在返回至首页的的时候）
-              url: '/pages/order-confirm/order-confirm?id=' + res.data.data.cartId
-            })
-          } else {
-            wx.showToast({
-              title: res.data.msg,
-              icon: 'none',
-              duration: 2000
-            })
-          }
-        }
-      })
-    }
-  },
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-  
-  },
-  rules:function(e){
-      this.setData({
-        hiddens:false
-      })
-  },
-  butguan:function(e){
-    this.setData({
-      hiddens: true
-    })
-  },
-  butguan2:function(e){
-    this.setData({
-      hiddens2: true
-    })
-  },
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-  
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-  
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-  
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-  
-  },
-
-  addLookBargain: function () {
-    var that = this;
-    wx.request({
-      url: app.globalData.url + '/routine/auth_api/add_look_bargain?uid=' + app.globalData.uid,
-      method: 'GET',
-      data: {
-        bargainId: that.data.bargainId,
-      },
-      success: function (res) {
-        that.getBargainCount();
-      }
-    })
-  },
-  addShareBargain:function(){
-    var that = this;
-    wx.request({
-      url: app.globalData.url + '/routine/auth_api/add_share_bargain?uid=' + app.globalData.uid,
-      method: 'GET',
-      data: {
-        bargainId: that.data.bargainId,
-      },
-      success: function (res) {
-        that.getBargainCount();
-      }
-    })
-  },
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-    var that = this;
-    return {
-      title: that.data.bargainUserInfo.nickname+'邀请您帮砍价',
-      path: '/pages/cut-one/cut-one?bargainUid=' + that.data.bargainUid + '&id=' + that.data.bargainId,
-      imageUrl: that.data.url + that.data.product.image,
-      success:function(){
-        that.addShareBargain();
-        wx.showToast({
-          title: '分享成功',
-          icon: 'success',
-          duration: 2000
-        })
-      }
-    }
-  }
-})

application/routine/view/crmebN/pages/cut-one/cut-one.json

@@ -1,3 +0,0 @@
-{
-  "navigationBarTitleText": "砍价详情"
-}

application/routine/view/crmebN/pages/cut-one/cut-one.wxml

@@ -1,134 +0,0 @@
-<view class='bg'></view> 
-<view class="cut-one">
-    <view class='cutone-bg'>
-         <view class='cutone-header'>{{count.lookCount}}<text>人查看</text>{{count.shareCount}}<text>人分享</text>{{count.userCount}}<text>人参与</text></view>
-         <view class='cutone-guize' bindtap='rules'>
-            <view class='guize-huo'>活动</view>
-            <view>规则</view>
-         </view>
-          <view class='cutone-time'>活动结束倒计时<!--<text>{{countDownDay}}</text>天 --><text>{{countDownHour}}</text>时<text>{{countDownMinute}}</text>分<text>{{countDownSecond}}</text>秒</view>
-    </view>
-    <view class='cutone-padding'>
-       <view class='cutone-k'>
-            <view  class='cutone-write'>
-                <image src='{{url}}{{product.image}}'></image>
-                <view class='write-text line2'>{{product.title}}</view>
-                <view class='flex write-money'>
-                   <view class='write-num'>最低￥<text>{{product.min_price}}</text></view>
-                   <view class='write-yuan'>原价￥{{product.price}}</view>
-                </view>
-           </view>
-        </view>
-        <!-- 参与砍价   -->
-        <!-- <view class='cutone-but' bindtap='setBargain' wx:if="{{!status}}">立即参与</view>  -->
-        <!--砍价进行中  -->
-        <view class='cutone-cut' wx:if="{{status == 1}}">已有<text>{{HelpCount}}</text>位好友成功帮您砍价</view>
-        <view class='cutone-pro' wx:if="{{status == 1}}">距离目标还有{{HelpPrice}}元</view>  
-        <!-- 进度条 -->
-         <view class="progress compressing"  wx:if="{{status == 1}}"><view class="bar" style="width: {{pricePercent}}%;"></view></view>
-         <view class='flex pro-money'  wx:if="{{status == 1}}">
-           <view class='price-y'>
-               <view>原价</view>
-               <view>￥{{product.price}}</view>
-           </view>
-           <view class='price-m'>
-               <view>目标</view>
-               <view>￥{{product.min_price}}</view>
-           </view>
-         </view>
-        <button class='cutone-but'  wx:if="{{status == 1}}" open-type='share'>喊好友帮砍一刀</button>
-         <!--帮好友砍价进行中  -->
-        <view class='cutfried flex' wx:if="{{status == 2}}"><image src='/images/banner1.jpg'></image><text>{{bargainUserInfo.nickname}} 邀请您帮忙砍价</text></view>
-        <view class='cutone-pro' wx:if="{{status == 2}}">距离目标还有{{HelpPrice}}元</view> 
-        <!-- 进度条 -->
-         <view class="progress compressing"  wx:if="{{status == 2}}"><view class="bar" style="width: {{pricePercent}}%;"></view></view>
-        <view class='flex pro-money' wx:if="{{status == 2}}">
-           <view class='price-y'>
-               <view>原价</view>
-               <view>￥{{product.price}}</view>
-           </view>
-           <view class='price-m'>
-               <view>目标</view>
-               <view>￥{{product.min_price}}</view>
-           </view>
-        </view>
-         <view class='cutone-but' bindtap='setBargainHelp' wx:if="{{status == 2}}">帮好友砍一刀</view> 
-         <!--已帮好友砍价  -->
-         <!-- 进度条 -->
-         <view class='cutone-pro' wx:if="{{status == 3}}">距离目标还有{{HelpPrice}}元</view> 
-         <view class="progress compressing"  wx:if="{{status == 3}}"><view class="bar" style="width: {{pricePercent}}%;"></view></view>
-        <view class='flex pro-money' wx:if="{{status == 3}}">
-           <view class='price-y'>
-               <view>原价</view>
-               <view>￥{{product.price}}</view>
-           </view>
-           <view class='price-m'>
-               <view>目标</view>
-               <view>￥{{product.min_price}}</view>
-           </view>
-        </view>
-         <view class='cut-over' wx:if="{{status == 3}}">已帮助好友砍价</view>
-         <view class='cutone-but' wx:if="{{status == 3}}" bindtap='setBargain'>我也要参与</view> 
-         <!--砍价结束   -->
-         <view class='cut-over' wx:if="{{status == 4}}">恭喜您成功砍到最低价，快去支付订单吧！</view>
-         <view class='cutone-but'  wx:if="{{status == 4}}" bindtap='goOrderPay'>立即支付订单</view> 
-         <view class='rebut' bindtap='getCutList' wx:if="{{status == 4}}">低价拿更多商品</view> 
-         <view class='cutone-but cutone-but2'  wx:if="{{status == 5}}">活动已结束</view> 
-         <view class='rebut' bindtap='getCutList' wx:if="{{status == 5}}">低价拿更多商品</view>    
-
-
-
-
-        <view class='cutone-list'>
-            <view class='list-title'>
-                 <text>砍价帮</text>
-            </view>
-             <view class='cutone-ul'>
-              <block wx:for="{{bargainUserHelp}}">
-                  <view class='cutone-li flex'>
-                    <view class='li-pic flex'>
-                        <image src='{{item.avatar}}'></image>
-                        <view>
-                            <view class='pic-title line'>{{item.nickname}}</view>
-                        </view>
-                    </view>
-                    <view>砍掉{{item.price}}元</view>
-                  </view>
-              </block>
-            </view> 
-            <view class='cutone-tiao'>· 只显示最近15个好友砍价纪录 ·</view>
-        </view>
-        <view class='cutone-list cutone-list2'>
-            <view class='list-title'>
-                 <text>商品详情</text>
-            </view>
-             <view class='shop-con'>
-                <template is="wxParse" data="{{wxParseData:description.nodes}}"/>
-            </view> 
-        </view>
-    </view>
-</view>
- <view class='cut-tan' hidden='{{hiddens}}'>
-      <view class='tan-title'>活动规则<icon class='iconfont icon-guanbi1 tanguan' bindtap='butguan'></icon></view>
-       <view class='tan-con'>
-          <template is="wxParse" data="{{wxParseData:rule.nodes}}"/>
-       </view>
-</view>
-<view class='zhao' hidden='{{hiddens}}' bindtap='butguan'></view>
-<view class='cut-tan2' hidden='{{hiddens2}}'>
-   <view class='tan2-bg'><icon class='iconfont icon-guanbi1 tanguan tanguan2' bindtap='butguan2'></icon></view>
-   <view class='tan2-con'>您已砍掉<text>{{bargainUserHelpUserInfo.price}}</text>元，听说分享次数越多砍价成功的机会越大哦！</view>
-   <button class='tan2-bnt' wx:if="{{status == 1}}" open-type='share'>立即分享</button>
-   <button class='tan2-bnt' wx:if="{{status == 4}}" bindtap='butguan'>立即下订单</button>
-   <button class='tan2-bnt' wx:if="{{status == 2}}" bindtap='setBargain'>我要参与</button>
-</view>
- <view class='zhao' hidden='{{hiddens2}}' bindtap='butguan2'></view> 
- <movable-area class='index-con' >
-  <movable-view class='index-area' direction="all">
-      <navigator url='/pages/index/index' hover-class='none' open-type = "switchTab" >
-      <image src='/images/home.png'></image>
-      </navigator>
-  </movable-view>
-</movable-area>
- <import src="/wxParse/wxParse.wxml"/>
-