- {if !empty($config.user_image)}
+ {if !empty($config.goods_image)}
@@ -127,6 +127,32 @@
+
+
+
+
diff --git a/server/app/api/controller/Demand.php b/server/app/api/controller/Demand.php
new file mode 100644
index 00000000..be5aa56d
--- /dev/null
+++ b/server/app/api/controller/Demand.php
@@ -0,0 +1,92 @@
+ 'desc'
+ ];
+
+ $count = thisModel::where($where)->count();
+
+ $list = thisModel::field(['id', 'name', 'create_time'])
+ ->where($where)
+ ->order($order)
+ ->page($page,$limit)
+ ->select()
+ ->toArray();
+
+ $data = [
+ 'list' => $list,
+ 'page_no' => $page,
+ 'page_size' => $limit,
+ 'count' => $count,
+ ];
+ return JsonServer::success('获取成功', $data);
+ } catch (\Exception $e) {
+ return JsonServer::error('获取失败');
+ }
+ }
+
+ public function detail()
+ {
+ $id = input('id/d', 0);
+ if (!$item = thisModel::where('id', $id)->find()) {
+ return JsonServer::error('记录不存在');
+ }
+ return JsonServer::success('获取成功', $item->toArray());
+ }
+
+ public function report(): Json
+ {
+ $input = input('post.');
+
+ $rule = [
+ 'demand_id|需求' => 'require|number',
+ 'name|姓名' => 'require|min:2|max:50',
+ 'phone|手机' => 'require|mobile',
+// 'company|公司' => '',
+// 'price|报价' => '',
+ ];
+
+ $validate = Validate::rule($rule);
+ if (!$validate->check($input)) {
+ return JsonServer::error($validate->getError());
+ }
+
+ DemandReport::create([
+ 'demand_id' => $input['demand_id'],
+ 'name' => $input['name'],
+ 'phone' => $input['phone'],
+ 'company' => $input['company'] ?: '',
+ 'price' => $input['price'] ?: '',
+ 'create_time' => time(),
+ ]);
+
+ return JsonServer::success('报名成功');
+ }
+
+}
\ No newline at end of file
diff --git a/server/app/api/controller/Order.php b/server/app/api/controller/Order.php
index 8af88c06..a3b18d47 100644
--- a/server/app/api/controller/Order.php
+++ b/server/app/api/controller/Order.php
@@ -6,11 +6,33 @@ use app\api\logic\OrderInvoiceLogic;
use app\api\logic\OrderLogic;
use app\api\validate\OrderValidate;
use app\common\basics\Api;
+use app\common\server\ConfigServer;
use app\common\server\JsonServer;
class Order extends Api
{
+ public $like_not_need_login = ['contractDownload'];
+
+ /**
+ * @notes 合同下载
+ * @return \think\response\Json
+ * @throws \think\Exception
+ * @author suny
+ * @date 2021/7/13 6:11 下午
+ */
+ public function contractDownload()
+ {
+ $path = ConfigServer::get('website', 'order_contract_template');
+ return JsonServer::success('下单成功!', ['path' => $path, 'domain' => request()->domain()]);
+ }
+
+ public function contractUpload()
+ {
+
+ return JsonServer::success('上传成功!');
+ }
+
/**
* @notes 下单
* @return \think\response\Json
diff --git a/server/app/api/logic/UserLogic.php b/server/app/api/logic/UserLogic.php
index a62c8467..3242810c 100644
--- a/server/app/api/logic/UserLogic.php
+++ b/server/app/api/logic/UserLogic.php
@@ -4,6 +4,7 @@ namespace app\api\logic;
use app\api\controller\Account;
use app\common\basics\Logic;
use app\common\logic\ChatLogic;
+use app\common\model\BusinessTeam;
use app\common\model\goods\GoodsCollect;
use app\common\model\kefu\ChatRecord;
use app\common\model\kefu\ChatRelation;
@@ -75,12 +76,28 @@ class UserLogic extends Logic
if(!$user_level->isEmpty()){
$user['next_level_tips'] = '距离升级还差'.intval($user_level['growth_value'] - $user['user_growth']);
}
+
+ $team = [
+ 'id' => 0,
+ 'name' => '',
+ 'phone' => '',
+ ];
+
+ // 团队信息
+ $teamInfo = BusinessTeam::where('id', $user['team_id'])->find();
+ if (!empty($teamInfo)) {
+ $team['id'] = $teamInfo['id'] ?? 0;
+ $team['name'] = $teamInfo['name'] ?: '';
+ $team['phone'] = $teamInfo['phone'] ?: '';
+ }
+
// 是否设置支付密码
$user['hasPayPassword'] = $user['pay_password'] ? 1: 0;
$user->visible(['id','nickname','sn','avatar', 'mobile', 'hasPayPassword','next_level_tips','user_money','total_order_amount','total_recharge_amount',
'coupon','user_integral','level','wait_pay','wait_take','wait_delivery',
- 'wait_comment','after_sale', 'distribution_setting', 'distribution_code', 'notice_num', 'collect','level_name','vip']);
+ 'wait_comment','after_sale', 'distribution_setting', 'distribution_code', 'notice_num', 'collect','level_name','vip','team_id']);
$user = $user->toArray();
+ $user['team_info'] = $team;
return $user;
}
diff --git a/server/app/common/model/BusinessTeam.php b/server/app/common/model/BusinessTeam.php
new file mode 100644
index 00000000..7f307c68
--- /dev/null
+++ b/server/app/common/model/BusinessTeam.php
@@ -0,0 +1,9 @@
+\n' +
+ '
![]()
' +
+ '
x' +
+ '
';
+ $(element).prev().val(res.data[1].uri);
+ $(element).after(html);
+ $(element).css('display','none');
+ }
+ });
}
};
+
+