github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2025-12-15 13:22:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

修复清除数据报错，后台首页统计默认空数据报错，修改小程序购物车管理

Browse Source
This commit is contained in:
sugar1569 2018-12-09 23:17:08 +08:00
parent f3e4de8b35
commit 02bee9f912
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/admin/controller/Index.php
View File

@ -160,7 +160,7 @@ class Index extends AuthController
->group("FROM_UNIXTIME(add_time, '%Y%m%e')")
->order('add_time asc')
->select()->toArray();
if(empty($order_list)) return false;
if(empty($order_list)) return Json::fail('无数据');
foreach ($order_list as $k=>&$v){
$order_list[$v['day']] = $v;
}

4
application/admin/controller/system/SystemCleardata.php
View File

@ -87,7 +87,7 @@ class SystemCleardata extends AuthController
}
//修改用户默认密码
public function userdate(){
SystemCleardata::ClearData('user',1);
// SystemCleardata::ClearData('user',1);
$headimgurl= WechatUser::Where('uid',1)->value('headimgurl');
$data['account']='crmeb';
$data['pwd']=md5(123456);
@ -141,7 +141,7 @@ class SystemCleardata extends AuthController
}
//递归删除文件
function delDirAndFile($dirName,$subdir=true){
if ($handle = opendir("$dirName")){
if ($handle = @opendir("$dirName")){
while(false !== ($item = readdir($handle))){
if($item != "." && $item != ".."){
if(is_dir("$dirName/$item"))

7
extend/behavior/wechat/UserBehavior.php
View File

@ -24,7 +24,12 @@ class UserBehavior
if(isset($wechatInfo['unionid']) && $wechatInfo['unionid'] != '' && WechatUser::be(['unionid'=>$wechatInfo['unionid']])){
WechatUser::edit($wechatInfo,$wechatInfo['unionid'],'unionid');
$uid = WechatUser::where('unionid',$wechatInfo['unionid'])->value('uid');
User::updateWechatUser($wechatInfo,$uid);
if(!User::be(['uid'=>$uid])){
$wechatInfo = WechatUser::where('uid',$uid)->find();
User::setWechatUser($wechatInfo);
}else{
User::updateWechatUser($wechatInfo,$uid);
}
}else if(WechatUser::be(['openid'=>$wechatInfo['openid']])){
WechatUser::edit($wechatInfo,$wechatInfo['openid'],'openid');
User::updateWechatUser($wechatInfo,WechatUser::openidToUid($wechatInfo['openid']));

3
view/crmebN/pages/buycar/buycar.wxml
View File

@ -1,7 +1,8 @@
<form>
<view class='head flex'>
<view class='txt'>购物数量({{cartNum}})</view>
<view class='btn' bindtap='btntap'>管理</view>
<view class='btn' bindtap='btntap' wx:if='{{!foothidden}}'>管理</view>
<view class='btn' bindtap='btntap' wx:if='{{foothidden}}'>取消</view>
</view>
<view class='car-list'>
<block wx:for="{{cartList}}" wx:key>