loumengning
/
hbp
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

dev
娄梦宁 3 years ago
parent
e8d18986b4 ad1fd70e3a
commit
039d7e0c97
8 changed files with 7 additions and 7 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      application/admin/service/AdminDao.php
  2. +1
    -1
      application/admin/service/CfChannelInfoDao.php
  3. +1
    -1
      application/admin/service/CfSuplierInfoDao.php
  4. +1
    -1
      application/admin/view/order_main/add.html
  5. +1
    -1
      application/admin/view/order_main/edit.html
  6. +1
    -1
      public/static/css/app.698786fe542a37ae30fce78443ce5c30.css
  7. +0
    -1
      public/static/js/app.2fbd93103189eb2c2708.js
  8. +1
    -0
      public/static/js/app.4ea76294a6c0a4c152e8.js

+ 1
- 1
application/admin/service/AdminDao.php View File

@@ -27,7 +27,7 @@ class AdminDao
if ($info == null) {
return Util::returnArrEr("获取管理员信息失败:".$id);
}
return Util::returnArrSu($info);
return Util::returnArrSu("",$info);
}catch (Exception $e){
return Util::returnArrEr("获取管理员信息失败:".$e->getMessage());
}


+ 1
- 1
application/admin/service/CfChannelInfoDao.php View File

@@ -27,7 +27,7 @@ class CfChannelInfoDao
if ($info == null) {
return Util::returnArrEr("获取渠道信息失败:".$id);
}
return Util::returnArrSu($info);
return Util::returnArrSu("",$info);
}catch (Exception $e){
return Util::returnArrEr("获取渠道信息失败:".$e->getMessage());
}


+ 1
- 1
application/admin/service/CfSuplierInfoDao.php View File

@@ -27,7 +27,7 @@ class CfSuplierInfoDao
if ($info == null) {
return Util::returnArrEr("获取供应商信息失败:".$id);
}
return Util::returnArrSu($info);
return Util::returnArrSu("",$info);
}catch (Exception $e){
return Util::returnArrEr("获取供应商信息失败:".$e->getMessage());
}


+ 1
- 1
application/admin/view/order_main/add.html View File

@@ -1,4 +1,4 @@
<script>
window.id = ''
</script>
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>single</title><link href=/static/css/app.012eb25f31c39825c6e5dacf681aa27f.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.accdcfe0d08d2846f7d5.js></script><script type=text/javascript src=/static/js/app.2fbd93103189eb2c2708.js></script></body></html>
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>single</title><link href=/static/css/app.698786fe542a37ae30fce78443ce5c30.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.accdcfe0d08d2846f7d5.js></script><script type=text/javascript src=/static/js/app.4ea76294a6c0a4c152e8.js></script></body></html>

+ 1
- 1
application/admin/view/order_main/edit.html View File

@@ -4,4 +4,4 @@
window.id = document.getElementById('c-id').value
console.log(id)
</script>
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>single</title><link href=/static/css/app.012eb25f31c39825c6e5dacf681aa27f.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.accdcfe0d08d2846f7d5.js></script><script type=text/javascript src=/static/js/app.2fbd93103189eb2c2708.js></script></body></html>
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>single</title><link href=/static/css/app.698786fe542a37ae30fce78443ce5c30.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.accdcfe0d08d2846f7d5.js></script><script type=text/javascript src=/static/js/app.4ea76294a6c0a4c152e8.js></script></body></html>

public/static/css/app.698786fe542a37ae30fce78443ce5c30.css
File diff suppressed because it is too large
View File


+ 0
- 1
public/static/js/app.2fbd93103189eb2c2708.js
File diff suppressed because it is too large
View File


+ 1
- 0
public/static/js/app.4ea76294a6c0a4c152e8.js
File diff suppressed because it is too large
View File


Write Preview
Loading…
Cancel
Save