pull/1/head
wanghousheng 1 year ago
parent 7ba4ef54b0
commit da2196f662
  1. 9
      app/admin/model/Store.php
  2. 32
      app/admin/model/user/User.php
  3. 7
      public/admin/config.js
  4. 0
      public/admin/css/app.9fd2da7c.css
  5. 0
      public/admin/css/chunk-vendors.c8ce63df.css
  6. 1
      public/admin/css/cloud.0422aa4a.css
  7. 1
      public/admin/css/menu.0e133a3b.css
  8. 0
      public/admin/css/menu.eaad26a9.css
  9. 0
      public/admin/css/setting.13b2d651.css
  10. 1
      public/admin/css/setting.77b83e9b.css
  11. 0
      public/admin/css/store.bbb0f5dd.css
  12. 0
      public/admin/css/user.a645b22a.css
  13. 2
      public/admin/index.html
  14. 1
      public/admin/js/app.263e769b.js
  15. 1
      public/admin/js/app.812754eb.js
  16. 1
      public/admin/js/app.b4cbc23b.js
  17. 6
      public/admin/js/chunk-vendors.597463c4.js
  18. 1
      public/admin/js/cloud.7bbfae1c.js
  19. 0
      public/admin/js/fail.306fabae.js
  20. 3
      public/admin/js/menu.24bd6027.js
  21. 0
      public/admin/js/menu.c38e4099.js
  22. 1
      public/admin/js/setting.3a677c15.js
  23. 0
      public/admin/js/setting.4766d8b5.js
  24. 3
      public/admin/js/store.619afaa0.js
  25. 3
      public/admin/js/store.d276c14d.js
  26. 2
      public/admin/js/user.8986244d.js
  27. 1
      public/admin/js/user.9b740835.js

@ -13,9 +13,9 @@ declare (strict_types=1);
namespace app\admin\model;
use app\admin\model\Page as PageModel;
use app\admin\model\store\User;
use app\common\model\Store as StoreModel;
use app\admin\model\store\User as StoreUserModel;
use app\admin\model\user\User;
use app\common\model\Store as StoreModel;
use app\common\model\User as UserModel;
/**
@ -62,6 +62,11 @@ class Store extends StoreModel
(new StoreUserModel)->add((int)$this['store_id'], $data);
// 新增默认首页数据
(new PageModel)->insertDefault((int)$this['store_id']);
//注册用户
$user_id = (new User())->register($data, $this['store_id']);
if ($user_id) {
(new StoreUserModel)->where(['store_id' => $this['store_id']])->save(['user_id' => $user_id]);
}
}
return $status;
});

@ -0,0 +1,32 @@
<?php
namespace app\admin\model\user;
use app\common\enum\user\UserTypeEnum;
class User extends \app\common\model\User
{
public function register($data, $storeId)
{
$user_id = 0;
if (!empty($data['mobile'])) {
$user_info = self::detail(['mobile' => $data['mobile']]);
if (!empty($user_info)) {
$user_id = $user_info['user_id'];
$this->where(['user_id' => $user_id])->save(['user_type' => UserTypeEnum::STORE]);
} else {
$add = [
'mobile' => $data['mobile'],
'nick_name' => hide_mobile($data['mobile']),
'platform' => 'MP-WEIXIN',
'last_login_time' => time(),
'store_id' => $storeId,
'user_type' => UserTypeEnum::STORE,
];
$user_id = $this->insertGetId($add);
}
}
return $user_id;
}
}

@ -1,11 +1,10 @@
window.serverConfig = {
// 系统名称
APP_NAME: '萤火商城系统2.0',
APP_NAME: 'saas',
// 必填: api地址, 换成自己的域名即可
// 例如: https://www.你的域名.com/index.php?s=/admin
BASE_API: '../index.php?s=/admin',
// BASE_API: 'http://yoshop2-pro.cn/index.php?s=/admin',
BASE_API: 'https://www.saas.njrenzhou.com/index.php?s=/admin',
// 必填: store模块的入口地址
// 例如: https://www.你的域名.com/store
STORE_URL: '../store'
STORE_URL: 'https://www.saas.njrenzhou.com/store'
}

@ -0,0 +1 @@
.my-description[data-v-1e37461c]{margin-bottom:20px;font-size:13px!important}.my-description p[data-v-1e37461c]{margin-bottom:5px}.my-description[data-v-1e37461c] .ant-alert-description{font-size:13px}.update-list[data-v-1e37461c]{overflow:hidden;font-size:14px;padding:20px 0;margin-top:20px}.log-item[data-v-1e37461c]{display:-webkit-box;display:-ms-flexbox;display:flex}.log-item:last-child .log-content[data-v-1e37461c]{padding-bottom:10px}.log-item .col-left[data-v-1e37461c]{width:200px}.log-item .col-right[data-v-1e37461c]{width:800px}.update-date[data-v-1e37461c]{position:relative;height:100%;padding-right:46px;font-size:14px;text-align:right}.update-date[data-v-1e37461c]:after{content:"";width:1px;height:100%;display:block;border-left:1px solid #ccc;margin-right:10px;position:absolute;right:0;top:22px}.update-date .dcircle[data-v-1e37461c]{width:22px;height:22px;border-radius:50%;background:#d7e6f9;position:absolute;right:0;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.update-date .dcircle .dcircle2[data-v-1e37461c]{width:10px;height:10px;border-radius:50%;background:#51a7f7}.update-date .date[data-v-1e37461c]{padding-top:3px}.log-content[data-v-1e37461c]{padding-top:3px;padding-left:45px;padding-bottom:50px;min-height:80px}.log-content .log-title[data-v-1e37461c]{margin-bottom:15px}.log-content .actions[data-v-1e37461c]{margin-left:22px;font-size:13px}.log-content .actions a[data-v-1e37461c]{margin-right:8px}.log-content .update-log[data-v-1e37461c]{white-space:pre!important;line-height:22px;color:#999;font-size:13px}.message[data-v-36b20d24]{margin-bottom:16px}.authorize[data-v-36b20d24]{padding:10px 0;font-size:12.6px}.info-item[data-v-36b20d24]{margin-bottom:15px}.info-item .label[data-v-36b20d24],.info-item .value[data-v-36b20d24]{display:inline-block}.info-item .label[data-v-36b20d24]{width:100px;text-align:right}.info-item .notes[data-v-36b20d24]{margin-left:5px;font-size:12px}

@ -1 +0,0 @@
.ant-tag[data-v-bba06524]{cursor:pointer}.ant-tag[data-v-bba06524]:hover{border:1px solid #fb9a9a;color:#fb9a9a}

@ -1 +0,0 @@
.ant-table-wrapper[data-v-4de45856] .normal .status-icon{color:#4db14d}.ant-table-wrapper[data-v-4de45856] .warning{background-color:#ffd!important}.ant-table-wrapper[data-v-4de45856] .danger{color:#dd514c;background-color:rgba(221,81,76,.115)}.ant-table-wrapper[data-v-4de45856] .danger .status-icon{color:red}.content[data-v-58c1a092]{padding:20px 30px}.content .title[data-v-58c1a092]{margin-top:50px;margin-bottom:10px;font-size:15px}.content .title[data-v-58c1a092]:first-child{margin-top:0}.content .text[data-v-58c1a092]{margin:6px 0}.content[data-v-01c45f59]{padding:20px 30px}.content .title[data-v-01c45f59]{margin-top:50px;margin-bottom:10px;font-size:15px}.content .title[data-v-01c45f59]:first-child{margin-top:0}.content .text[data-v-01c45f59]{margin:6px 0}

@ -1 +1 @@
<!DOCTYPE html><html lang="zh-cmn-Hans"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>超级管理后台</title><style>#loading-mask{position:fixed;left:0;top:0;height:100%;width:100%;background:#fff;user-select:none;z-index:9999;overflow:hidden}.loading-wrapper{position:absolute;top:50%;left:50%;transform:translate(-50%,-100%)}.loading-dot{animation:antRotate 1.2s infinite linear;transform:rotate(45deg);position:relative;display:inline-block;font-size:64px;width:64px;height:64px;box-sizing:border-box}.loading-dot i{width:22px;height:22px;position:absolute;display:block;background-color:#1890ff;border-radius:100%;transform:scale(.75);transform-origin:50% 50%;opacity:.3;animation:antSpinMove 1s infinite linear alternate}.loading-dot i:nth-child(1){top:0;left:0}.loading-dot i:nth-child(2){top:0;right:0;-webkit-animation-delay:.4s;animation-delay:.4s}.loading-dot i:nth-child(3){right:0;bottom:0;-webkit-animation-delay:.8s;animation-delay:.8s}.loading-dot i:nth-child(4){bottom:0;left:0;-webkit-animation-delay:1.2s;animation-delay:1.2s}@keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@-webkit-keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@keyframes antSpinMove{to{opacity:1}}@-webkit-keyframes antSpinMove{to{opacity:1}}</style><link href="css/menu.90dd904d.css" rel="prefetch"><link href="css/setting.226fff8e.css" rel="prefetch"><link href="css/store.9665627f.css" rel="prefetch"><link href="css/user.acbf161c.css" rel="prefetch"><link href="js/fail.510f7b9e.js" rel="prefetch"><link href="js/menu.bc5f51d7.js" rel="prefetch"><link href="js/setting.84586fb2.js" rel="prefetch"><link href="js/store.d276c14d.js" rel="prefetch"><link href="js/user.20a6e458.js" rel="prefetch"><link href="css/app.87c4b07c.css" rel="preload" as="style"><link href="css/chunk-vendors.bab836fa.css" rel="preload" as="style"><link href="js/app.812754eb.js" rel="preload" as="script"><link href="js/chunk-vendors.24aef2d9.js" rel="preload" as="script"><link href="css/chunk-vendors.bab836fa.css" rel="stylesheet"><link href="css/app.87c4b07c.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but vue-antd-pro doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"><div id="loading-mask"><div class="loading-wrapper"><span class="loading-dot loading-dot-spin"><i></i><i></i><i></i><i></i></span></div></div></div><script src="config.js"></script><script src="js/chunk-vendors.24aef2d9.js"></script><script src="js/app.812754eb.js"></script></body></html>
<!DOCTYPE html><html lang="zh-cmn-Hans"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>超级管理后台</title><style>#loading-mask{position:fixed;left:0;top:0;height:100%;width:100%;background:#fff;user-select:none;z-index:9999;overflow:hidden}.loading-wrapper{position:absolute;top:50%;left:50%;transform:translate(-50%,-100%)}.loading-dot{animation:antRotate 1.2s infinite linear;transform:rotate(45deg);position:relative;display:inline-block;font-size:64px;width:64px;height:64px;box-sizing:border-box}.loading-dot i{width:22px;height:22px;position:absolute;display:block;background-color:#1890ff;border-radius:100%;transform:scale(.75);transform-origin:50% 50%;opacity:.3;animation:antSpinMove 1s infinite linear alternate}.loading-dot i:nth-child(1){top:0;left:0}.loading-dot i:nth-child(2){top:0;right:0;-webkit-animation-delay:.4s;animation-delay:.4s}.loading-dot i:nth-child(3){right:0;bottom:0;-webkit-animation-delay:.8s;animation-delay:.8s}.loading-dot i:nth-child(4){bottom:0;left:0;-webkit-animation-delay:1.2s;animation-delay:1.2s}@keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@-webkit-keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@keyframes antSpinMove{to{opacity:1}}@-webkit-keyframes antSpinMove{to{opacity:1}}</style><link href="css/cloud.0422aa4a.css" rel="prefetch"><link href="css/menu.eaad26a9.css" rel="prefetch"><link href="css/setting.13b2d651.css" rel="prefetch"><link href="css/store.bbb0f5dd.css" rel="prefetch"><link href="css/user.a645b22a.css" rel="prefetch"><link href="js/cloud.7bbfae1c.js" rel="prefetch"><link href="js/fail.306fabae.js" rel="prefetch"><link href="js/menu.c38e4099.js" rel="prefetch"><link href="js/setting.4766d8b5.js" rel="prefetch"><link href="js/store.619afaa0.js" rel="prefetch"><link href="js/user.8986244d.js" rel="prefetch"><link href="css/app.9fd2da7c.css" rel="preload" as="style"><link href="css/chunk-vendors.c8ce63df.css" rel="preload" as="style"><link href="js/app.b4cbc23b.js" rel="preload" as="script"><link href="js/chunk-vendors.597463c4.js" rel="preload" as="script"><link href="css/chunk-vendors.c8ce63df.css" rel="stylesheet"><link href="css/app.9fd2da7c.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but vue-antd-pro doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"><div id="loading-mask"><div class="loading-wrapper"><span class="loading-dot loading-dot-spin"><i></i><i></i><i></i><i></i></span></div></div></div><script src="config.js"></script><script src="js/chunk-vendors.597463c4.js"></script><script src="js/app.b4cbc23b.js"></script></body></html>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save