mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'dev' (#115) from dev into master

Browse Source 
Reviewed-on: #115
This commit is contained in:
mkm 2024-01-13 18:30:20 +08:00
commit 53bb9da187
26 changed files with 220 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/common/dao/store/order/StoreOrderDao.php
View File

@ -74,7 +74,16 @@ class StoreOrderDao extends BaseDao
}
$query->where('is_del', 0);
});
if (isset($where['source']) && $where['source'] == 103) {
$wheres['activity_type'] = [0,98];
$wheres['source'] = [0,2,103];
$query->where($wheres);
unset($where['source']);
} else {
if(isset($where['product_type']) && $where['product_type'] !== ''){
$query->where('activity_type', $where['product_type']);
}
}
$query->when(($sysDel !== null), function ($query) use ($sysDel) {
$query->where('is_system_del', $sysDel);
})
@ -92,9 +101,6 @@ class StoreOrderDao extends BaseDao
->when(isset($where['activity_type']) && $where['activity_type'] != '', function ($query) use ($where) {
$query->where('activity_type', $where['activity_type']);
})
->when(isset($where['product_type']) && $where['product_type'] != '', function ($query) use ($where) {
$query->where('activity_type', $where['product_type']);
})
->when(isset($where['status']) && $where['status'] !== '', function ($query) use ($where) {
// 12表示信用购 先货后款
switch ($where['status']) {
@ -223,7 +229,6 @@ class StoreOrderDao extends BaseDao
$query->where('reconciliation_id', 0);
});
})->order('StoreOrder.create_time DESC');
return $query;
}

6
app/common/dao/system/merchant/MerchantIntentionDao.php
View File

@ -32,7 +32,11 @@ class MerchantIntentionDao extends BaseDao
})->when(isset($where['status']) && $where['status'] !== '', function ($query) use ($where) {
$query->where('status', (int)$where['status']);
})->when(isset($where['type']) && $where['type'] !== '', function ($query) use ($where) {
$query->where('type', (int)$where['type']);
if(is_array($where['type'])){
$query->whereOr('type',$where['type'][0])->whereOr('type',$where['type'][1]);
}else{
$query->where('type', (int)$where['type']);
}
})->when(isset($where['mer_intention_id']) && $where['mer_intention_id'] !== '', function ($query) use ($where) {
$query->where('mer_intention_id', $where['mer_intention_id']);
})->when(isset($where['category_id']) && $where['category_id'] !== '', function ($query) use ($where) {

2
app/common/model/store/product/Product.php
View File

@ -389,7 +389,7 @@ class Product extends BaseModel
}
public function merchant()
{
return $this->hasOne(Merchant::class,'mer_id','mer_id')->field('is_trader,type_id,mer_id,mer_name,mer_avatar,product_score,service_score,postage_score,service_phone,care_count,is_margin');
return $this->hasOne(Merchant::class,'mer_id','mer_id')->field('is_trader,type_id,mer_id,mer_name,mer_avatar,product_score,service_score,postage_score,service_phone,care_count,is_margin,village_id');
}
public function reply()
{

10
app/common/repositories/store/order/StoreGroupOrderRepository.php
View File

@ -65,8 +65,14 @@ class StoreGroupOrderRepository extends BaseRepository
public function getList(array $where, $page, $limit)
{
$query = StoreGroupOrder::getDB()->alias('StoreGroupOrder');
if (isset($where['product_type'])) {
$storeOrderWhere = StoreOrder::where('activity_type', $where['product_type']);
if(isset($where['source']) && $where['source'] == 103){
$wheres['activity_type']=[0,98];
$wheres['source']=[0,2,103];
}else{
$wheres['activity_type']=0;
}
if (isset($where['product_type']) ||(isset($where['source'])&& $where['source']==103)) {
$storeOrderWhere = StoreOrder::where($wheres);
$query->hasWhere('orderList', $storeOrderWhere);
}
$query->when(isset($where['paid']) && $where['paid'] !== '', function ($query) use ($where) {

22
app/common/repositories/store/order/StoreOrderRepository.php
View File

@ -628,7 +628,7 @@ class StoreOrderRepository extends BaseRepository
* @author xaboy
* @day 2020/6/10
*/
public function userOrderNumber(int $uid, $product_type = 0)
public function userOrderNumber(int $uid, $product_type = 0,$source=2)
{
//activity_type：0普通订单 98采购订单 99委托商品
//$noPay = app()->make(StoreGroupOrderRepository::class)->orderNumber($uid, $product_type);
@ -636,14 +636,20 @@ class StoreOrderRepository extends BaseRepository
if ($product_type == 98 || $product_type == 99) {
$isUser = 0;
}
$noPay = $this->dao->search(['uid' => $uid, 'is_user' => $isUser])->where($this->getOrderType(1))->whereRaw("(StoreOrder.paid=0 and StoreOrder.pay_type!=8) or (StoreOrder.paid=1 and StoreOrder.pay_type=8 and StoreOrder.status=2)")->where('activity_type', $product_type)->where('StoreOrder.is_del', 0)->count();
$noPostage = $this->dao->search(['uid' => $uid, 'is_user' => $isUser])->where($this->getOrderType(2))->where('activity_type', $product_type)->where('StoreOrder.is_del', 0)->fetchSql(false)->count();
$noDeliver = $this->dao->search(['uid' => $uid, 'is_user' => $isUser])->where($this->getOrderType(3))->where('activity_type', $product_type)->where('StoreOrder.is_del', 0)->fetchSql(false)->count();
$noComment = $this->dao->search(['uid' => $uid, 'is_user' => $isUser])->where($this->getOrderType(4))->where('activity_type', $product_type)->where('StoreOrder.is_del', 0)->fetchSql(false)->count();
$done = $this->dao->search(['uid' => $uid, 'is_user' => $isUser])->where($this->getOrderType(5))->where('activity_type', $product_type)->where('StoreOrder.is_del', 0)->fetchSql(false)->count();
$where['activity_type']=$product_type;
if($source==103){
$where['activity_type']=[0,98];
$where['source']=[0,2,103];
}
$noComment = $this->dao->search(['uid' => $uid, 'is_user' => $isUser])->where($this->getOrderType(4))->where($where)->where('StoreOrder.is_del', 0)->count();
$noPay = $this->dao->search(['uid' => $uid, 'is_user' => $isUser])->where($this->getOrderType(1))->whereRaw("(StoreOrder.paid=0 and StoreOrder.pay_type!=8) or (StoreOrder.paid=1 and StoreOrder.pay_type=8 and StoreOrder.status=2)")->where($where)->where('StoreOrder.is_del', 0)->count();
$noPostage = $this->dao->search(['uid' => $uid, 'is_user' => $isUser])->where($this->getOrderType(2))->where($where)->where('StoreOrder.is_del', 0)->fetchSql(false)->count();
$noDeliver = $this->dao->search(['uid' => $uid, 'is_user' => $isUser])->where($this->getOrderType(3))->where($where)->where('StoreOrder.is_del', 0)->fetchSql(false)->count();
$noComment = $this->dao->search(['uid' => $uid, 'is_user' => $isUser])->where($this->getOrderType(4))->where($where)->where('StoreOrder.is_del', 0)->fetchSql(false)->count();
$done = $this->dao->search(['uid' => $uid, 'is_user' => $isUser])->where($this->getOrderType(5))->where($where)->where('StoreOrder.is_del', 0)->fetchSql(false)->count();
$refund = StoreRefundOrder::alias('t1')->join('store_order t2', 't1.order_id=t2.order_id')->where('t1.uid', $uid)->where('t1.status', 3)->where('t2.activity_type', $product_type)->count();
$orderPrice = $this->dao->search(['uid' => $uid, 'is_user' => $isUser])->where($this->getOrderType(8))->where('activity_type', $product_type)->where('StoreOrder.is_del', 0)->fetchSql(false)->sum('pay_price');
$orderCount = $this->dao->search(['uid' => $uid, 'is_user' => $isUser])->where('activity_type', $product_type)->where('StoreOrder.is_del', 0)->fetchSql(false)->count();
$orderPrice = $this->dao->search(['uid' => $uid, 'is_user' => $isUser])->where($this->getOrderType(8))->where($where)->where('StoreOrder.is_del', 0)->fetchSql(false)->sum('pay_price');
$orderCount = $this->dao->search(['uid' => $uid, 'is_user' => $isUser])->where($where)->where('StoreOrder.is_del', 0)->fetchSql(false)->count();
return compact('noComment', 'done', 'refund', 'noDeliver', 'noPay', 'noPostage', 'orderPrice', 'orderCount');
}

6
app/common/repositories/store/product/ProductRepository.php
View File

@ -1348,6 +1348,12 @@ class ProductRepository extends BaseRepository
$active = app()->make(StoreActivityRepository::class)->getActivityBySpu(StoreActivityRepository::ACTIVITY_TYPE_ATMOSPHERE, $res['spu_id'], $res['cate_id'], $res['mer_id']);
if ($active) $res['atmosphere_pic'] = $active['pic'];
}
if($res['merchant']['type_name']=='个人店铺'){
$village_name=Db::name('geo_village')->where('village_id',$res['merchant']['village_id'])->value('village_name');
if($village_name){
$res['merchant']['village_name']=$village_name.'集体经营合作店铺';
}
}
return $res;
}

14
app/common/repositories/store/product/SpuRepository.php
View File

@ -34,7 +34,7 @@ use think\facade\Queue;
class SpuRepository extends BaseRepository
{
public $dao;
public $merchantFiled = 'mer_id,mer_name,mer_avatar,is_trader,mer_info,mer_keyword,type_id,long,lat,street_id';
public $merchantFiled = 'mer_id,mer_name,mer_avatar,is_trader,mer_info,mer_keyword,type_id,long,lat,street_id,village_id';
public $productFiled = 'P.bar_code,S.product_id,S.store_name,S.image,activity_id,S.keyword,S.price,S.mer_id,spu_id,S.status,store_info,brand_id,cate_id,unit_name,S.star,S.rank,S.sort,sales,S.product_type,rate,reply_count,extension_type,S.sys_labels,S.mer_labels,P.delivery_way,P.delivery_free,P.ot_price,svip_price_type,stock,mer_svip_status';
public $userInfo;
@ -162,6 +162,12 @@ class SpuRepository extends BaseRepository
$sku = $productMake->detailAttrValue($item['product']['attrValue'], $userInfo);
$item['sku'] = $sku;
}
if($item['merchant']['type_name']=='个人店铺'){
$village_name=Db::name('geo_village')->where('village_id',$item['merchant']['village_id'])->value('village_name');
if($village_name){
$item['merchant']['village_name']=$village_name.'集体经营合作店铺';
}
}
});
} else {
$list = $query->page($page, $limit)->setOption('field', [])->field($this->productFiled)->select()
@ -170,6 +176,12 @@ class SpuRepository extends BaseRepository
$sku = $productMake->detailAttrValue($item['product']['attrValue'], $userInfo);
$item['sku'] = $sku;
}
if($item['merchant']['type_name']=='个人店铺'){
$village_name=Db::name('geo_village')->where('village_id',$item['merchant']['village_id'])->value('village_name');
if($village_name){
$item['merchant']['village_name']=$village_name.'集体经营合作店铺';
}
}
});
}

3
app/common/repositories/system/financial/FinancialRepository.php
View File

@ -92,6 +92,9 @@ class FinancialRepository extends BaseRepository
'bank' => $data['bank'],
'bank_code' => $data['bank_code'],
];
if($data['bank_branch']){
$update['bank_branch'] = $data['bank_branch'];
}
break;
// case 2:
// $key = 'financial_wechat' ;

12
app/common/repositories/system/merchant/MerchantIntentionRepository.php
View File

@ -140,10 +140,20 @@ class MerchantIntentionRepository extends BaseRepository
// 用户需缴纳押金
'margin' => $margin['margin'] ?? 0,
'uid' => $intention['uid'],
'reg_admin_id' => $autoCreate ? 0: request()->adminId(),
'reg_admin_id' => 0,
'mer_intention_id' => $id,
'is_company'=>$intention['is_company'],
];
if($margin['type_code']=='PersonalStore'){
$merData['mer_address']='集体地址';
$merData['mer_avatar']='https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/oa_app/23565656.png';
$merData['mer_banner']='https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/oa_app/23565656.png';
$merData['mini_banner']='https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/oa_app/23565656.png';
$merData['create_time']=date('Y-m-d H:i:s');
$merData['update_time']=date('Y-m-d H:i:s',time()+1);
$merData['business_status']=2;
$merData['mer_settlement_agree_status']=1;
}
$data['fail_msg'] = '';
$smsData = [
'date' => date('m月d日', strtotime($intention->create_time)),

12
app/common/repositories/user/UserRepository.php
View File

@ -661,14 +661,19 @@ class UserRepository extends BaseRepository
public function registr(string $phone, ?string $pwd, $user_type = 'h5')
{
$pwd = $pwd ? $this->encodePassword($pwd) : $this->encodePassword($this->dao->defaultPwd());
$ip=app('request')->ip();
$code=Cache::get('promote_'.$ip);
$data = [
'account' => $phone,
'pwd' => $pwd,
'nickname' => substr($phone, 0, 3) . '****' . substr($phone, 7, 4),
'avatar' => '',
'phone' => $phone,
'last_ip' => app('request')->ip()
'last_ip' => $ip
];
if($code){
$data['promotion_code']=$code;
}
return $this->create($user_type, $data);
}
@ -1472,4 +1477,9 @@ class UserRepository extends BaseRepository
}
});
}
public function bindPromotionCode($promotionCode, $uid)
{
return $this->dao->update($uid, ['promotion_code' => $promotionCode, 'promoter_time' => date('Y-m-d H:i:s')]);
}
}

10
app/controller/api/Common.php
View File

@ -624,4 +624,14 @@ class Common extends BaseController
}
return app('json')->success($list);
}
/**
* 推广写入
*/
public function promote_writing()
{
$code = $this->request->param('code');
Cache::set('promote_' . app('request')->ip(), $code, 86400);
return app('json')->success();
}
}

22
app/controller/api/Statistics.php
View File

@ -487,4 +487,26 @@ class Statistics extends BaseController
$merName = $merchant['mer_name'];
return app('json')->success(compact('merName', 'count'));
}
/**
* 新供销 查询邀请的 用户注册数 商户数 交易金额
*/
public function InviteUserStatistics()
{
$parmas = $this->request->param();
$promotionCode = $parmas['promotion_code'];
$datas = [];
// 用户注册数
$datas['user_count'] = Db::name('user')->where('promotion_code', $promotionCode)->count();
$userIds = Db::name('user')->where('promotion_code', $promotionCode)->column('uid');
// 商户数
$datas['merchant_count'] = Merchant::whereIn('uid', $userIds)->count();
// 交易金额
$datas['trade_amount'] = Db::name('store_order')->whereIn('uid', $userIds)->where('paid', 1)->sum('pay_price');
return app('json')->success($datas);
}
}

60
app/controller/api/store/merchant/MerchantIntention.php
View File

@ -109,6 +109,63 @@ class MerchantIntention extends BaseController
return app('json')->success('提交成功');
}
/**
* 个人提交入驻申请
*/
public function PersonalStore()
{
$data = $this->request->params([
'phone',
'mer_name',
'company_name',
'address',
'name',
'code',
'images',
'social_credit_code',
'area_id',
'street_id',
'village_id',
'is_nmsc',
'is_company'
]);
if (!systemConfig('mer_intention_open')) {
return app('json')->fail('未开启商户入驻');
}
if ($this->userInfo) $data['uid'] = $this->userInfo->uid;
if (($this->userInfo->phone ?? false) && ($this->userInfo->phone != ($data['phone'] ?? ''))) {
throw new ValidateException('联系电话和注册手机不一致');
}
$merInfo = Db::name('merchant_intention')->where('uid', $this->userInfo->uid)->where('status', 'in',[0,1])->where('is_del',0)->find();
if ($merInfo) {
throw new ValidateException('该用户已申请商户，不可重复申请');
}
$make = app()->make(MerchantRepository::class);
if ($make->fieldExists('mer_name', $data['mer_name']))
throw new ValidateException('商户名称已存在，不可申请');
if ($make->fieldExists('mer_phone', $data['phone']))
throw new ValidateException('手机号已存在，不可申请');
$adminRepository = app()->make(MerchantAdminRepository::class);
if ($adminRepository->fieldExists('account', $data['phone']))
throw new ValidateException('手机号已是管理员，不可申请');
$mer_type_id=Db::name('merchant_type')->where('type_code','PersonalStore')->value('mer_type_id');
$data['status']=0;
$data['type']=2;
$data['mer_type_id']=$mer_type_id;
$data['merchant_category_id']=2584;
$intention = $this->repository->create($data);
if($intention){
$datas['fail_msg']='';
$datas['create_mer']=1;
$datas['status']=1;
$this->repository->updateStatus($intention->mer_intention_id, $datas);
return app('json')->success('开户成功');
}else{
return app('json')->fail('开户失败');
}
}
public function settlementApply()
{
$status = $this->request->post('status', 0);
@ -332,8 +389,7 @@ class MerchantIntention extends BaseController
public function lst()
{
[$page, $limit] = $this->getPage();
$type = $this->request->get('type', 1);
$data = $this->repository->getList(['uid' => $this->userInfo->uid, 'type' => $type], $page, $limit);
$data = $this->repository->getList(['uid' => $this->userInfo->uid,'type'=>[1,2]], $page, $limit);
return app('json')->success($data);
}

7
app/controller/api/store/order/StoreOrder.php
View File

@ -133,6 +133,7 @@ class StoreOrder extends BaseController
[$page, $limit] = $this->getPage();
$where['status'] = $this->request->param('status');
$where['product_type'] = $this->request->param('product_type', 0);
$where['source'] = $this->request->param('source', 2);
$where['search'] = $this->request->param('store_name');
$where['uid'] = $this->request->uid();
$where['is_user'] = 1;
@ -164,7 +165,8 @@ class StoreOrder extends BaseController
public function number()
{
$productType = $this->request->param('product_type', 0);
return app('json')->success($this->repository->userOrderNumber($this->request->uid(), $productType));
$source = $this->request->param('source', 2);
return app('json')->success($this->repository->userOrderNumber($this->request->uid(), $productType,$source));
}
/**
@ -177,7 +179,8 @@ class StoreOrder extends BaseController
{
[$page, $limit] = $this->getPage();
$productType = $this->request->param('product_type', 0);
$list = $groupOrderRepository->getList(['uid' => $this->request->uid(), 'paid' => 0, 'product_type' => $productType], $page, $limit);
$source = $this->request->param('source', 2);
$list = $groupOrderRepository->getList(['uid' => $this->request->uid(), 'paid' => 0, 'product_type' => $productType,'source'=>$source], $page, $limit);
return app('json')->success($list);
}

18
app/controller/api/store/product/StoreSpu.php
View File

@ -60,16 +60,28 @@ class StoreSpu extends BaseController
'mer_id',
'type_id',
'street_id',
'category_id'
'category_id',
'type_code',
'village_id'
]);
if ($where['type_id']) {
if ($where['type_id']||$where['type_code']) {
$arr = ['status' => 1, 'mer_state' => 1, 'is_del' => 0];
if ($where['street_id']) {
$arr['street_id'] = $where['street_id'];
}
if ($where['village_id']) {
$arr['village_id'] = $where['village_id'];
}
if($where['type_code']){
$mer_type_id=Db::name('merchant_type')->where('type_code',$where['type_code'])->value('mer_type_id');
if($mer_type_id){
$where['type_id'] = $mer_type_id;
}
}
$where['mer_ids'] = Merchant::getInstance()->whereIn('type_id', explode(',', $where['type_id']))->where($arr)->column('mer_id');
}
unset($where['type_id'], $where['street_id']);
unset($where['type_id'], $where['street_id'],$where['type_code'],$where['village_id']);
$where['is_gift_bag'] = 0;
$where['product_type'] = $where['product_type']??0;

7
app/controller/api/user/User.php
View File

@ -528,4 +528,11 @@ class User extends BaseController
return app('json')->success('修改成功');
}
public function bindPromotionCode()
{
$promotionCode = $this->request->param('promotion_code');
$this->repository->bindPromotionCode($promotionCode, $this->request->uid());
return app('json')->success('修改成功');
}
}

3
app/controller/merchant/system/financial/Financial.php
View File

@ -58,9 +58,8 @@ class Financial extends BaseController
*/
public function accountSave(MerchantFinancialAccountValidate $accountValidate)
{
$data = $this->request->params(['account','financial_type','name','bank','bank_code','wechat','wechat_code','alipay','alipay_code']); //idcard
$data = $this->request->params(['account','financial_type','name','bank','bank_code','wechat','wechat_code','alipay','alipay_code','bank_branch']); //idcard
$accountValidate->check($data);
$this->repository->saveAccount($this->request->merId(),$data);
return app('json')->success('保存成功');
}

4
app/listener/SendGoodsCode.php
View File

@ -18,7 +18,9 @@ class SendGoodsCode
Log::info("sendGoodsCode ============= handle监听order_id " . $this->event['order_id']);
if ($this->event['activity_type'] == 0 || in_array($this->event['source'], [0,2,103])) {
//发起物流信息返回快递员手机
$logisticsPhone = $this->sendLogistics($this->event['order_id'], $this->event['order_sn']);
if($this->event['activity_type'] !=98){
$logisticsPhone = $this->sendLogistics($this->event['order_id'], $this->event['order_sn']);
}
//生成用户的收货码
$this->generateLogisticsCode($this->event['uid'], $this->event['order_id'], $this->event['order_sn'], $logisticsPhone);
}

4
crmeb/jobs/SendGoodsCodeJob.php
View File

@ -32,7 +32,9 @@ class SendGoodsCodeJob implements JobInterface
try {
if ($this->event['activity_type'] == 0 || in_array($this->event['source'], [0,2,103])) {
//发起物流信息返回快递员手机
$logisticsPhone = $this->sendLogistics($this->event['order_id'], $this->event['order_sn']);
if($this->event['activity_type'] !=98){
$logisticsPhone = $this->sendLogistics($this->event['order_id'], $this->event['order_sn']);
}
//生成用户的收货码
$this->generateLogisticsCode($this->event['uid'], $this->event['order_id'], $this->event['order_sn'], $logisticsPhone);
}

6
public/download/assets/index-9d172a4b.js Normal file
View File

File diff suppressed because one or more lines are too long

6
public/download/assets/index-b1675540.js
View File

File diff suppressed because one or more lines are too long

2
public/download/assets/index-f1d8b582.css → public/download/assets/index-bd048ef9.css
View File

@ -1 +1 @@
.my-cion[data-v-bd303882]{display:inline-block}.icon[data-v-bd303882]{width:16px;height:16px}a[data-v-d4a8b3ad]{text-decoration:none;color:inherit}.content[data-v-d4a8b3ad]{overflow:hidden;background-color:#f49a2b;position:relative;width:100vw;height:100vh}.content .bg[data-v-d4a8b3ad]{position:absolute;top:0;left:0;z-index:1;width:100vw;height:100vh;background-color:#f49a2b}.content .download[data-v-d4a8b3ad]{position:absolute;top:60vh;left:0;z-index:100;width:100vw;height:6.25rem;display:flex;flex-direction:column;justify-content:space-between;align-items:center;font-weight:700}.content .download .btn[data-v-d4a8b3ad]{width:10.9375rem;height:2.5rem;line-height:2.5rem;background-color:#fc902e;text-align:center;color:#fff;border-radius:.25rem;box-shadow:inset 0 0 5px 1px rgba(0,0,0,.1)}.content .tip[data-v-d4a8b3ad]{position:absolute;top:0;left:0;width:100%;height:100%;z-index:10000}.content .tip uni-image[data-v-d4a8b3ad]{width:100%;height:100%}.content .tip .close[data-v-d4a8b3ad]{position:absolute;top:65vh;left:50%;transform:translate(-50%);width:9.375rem;height:5rem}
.my-cion[data-v-bd303882]{display:inline-block}.icon[data-v-bd303882]{width:16px;height:16px}a[data-v-7a448bbd]{text-decoration:none;color:inherit}.content[data-v-7a448bbd]{overflow:hidden;background-color:#f49a2b;position:relative;width:100vw;height:100vh}.content .bg[data-v-7a448bbd]{position:absolute;top:0;left:0;z-index:1;width:100vw;height:100vh;background-color:#f49a2b}.content .download[data-v-7a448bbd]{position:absolute;top:60vh;left:0;z-index:100;width:100vw;height:6.25rem;display:flex;flex-direction:column;justify-content:space-between;align-items:center;font-weight:700}.content .download .btn[data-v-7a448bbd]{width:10.9375rem;height:2.5rem;line-height:2.5rem;background-color:#fc902e;text-align:center;color:#fff;border-radius:.25rem;box-shadow:inset 0 0 5px 1px rgba(0,0,0,.1)}.content .tip[data-v-7a448bbd]{position:absolute;top:0;left:0;width:100%;height:100%;z-index:10000}.content .tip uni-image[data-v-7a448bbd]{width:100%;height:100%}.content .tip .close[data-v-7a448bbd]{position:absolute;top:65vh;left:50%;transform:translate(-50%);width:9.375rem;height:5rem}

1
public/download/assets/pages-index-index.4f5ada16.js
View File

File diff suppressed because one or more lines are too long

1
public/download/assets/pages-index-index.6b2190c9.js Normal file
View File

File diff suppressed because one or more lines are too long

2
public/download/index.html
View File

@ -14,7 +14,7 @@
<title>惠农生活</title>
<!--preload-links-->
<!--app-context-->
<script type="module" crossorigin src="./assets/index-b1675540.js"></script>
<script type="module" crossorigin src="./assets/index-9d172a4b.js"></script>
<link rel="stylesheet" href="./assets/index-44297b41.css">
</head>
<body>

5
route/api.php
View File

@ -21,6 +21,7 @@ use think\facade\Route;
Route::group('api/', function () {
Route::any('test', 'api.Auth/test');
Route::any('promote_writing', 'api.Common/promote_writing');
Route::any('applet', 'api.Common/applet');
Route::get('label_lst', 'api.Common/label_lst');
Route::any('system_group_value', 'api.Common/system_group_value');
@ -171,6 +172,7 @@ Route::group('api/', function () {
Route::post('change/phone', 'User/changePhone');
Route::post('change/info', 'User/updateBaseInfo');
Route::post('change/password', 'User/changePassword');
Route::post('change/bind_promotion_code', 'User/bindPromotionCode'); // 绑定新供销邀请码
//收藏
Route::get('/relation/product/lst', 'UserRelation/productList');
Route::get('/relation/merchant/lst', 'UserRelation/merchantList');
@ -283,6 +285,8 @@ Route::group('api/', function () {
//申请商户
Route::get('intention/lst', 'api.store.merchant.MerchantIntention/lst');
//申请个人交易
Route::post('intention/personal_store', 'api.store.merchant.MerchantIntention/PersonalStore');
//交易申请商户
Route::post('intention/business', 'api.store.merchant.MerchantIntention/businessApply');
//申请商户协议
@ -748,6 +752,7 @@ Route::group('api/', function () {
Route::get('product_stock_count1', '/ProductStockCount1');
Route::get('supply_chain_product_price', '/SupplyChainProductPrice');
Route::get('general_product_price', '/GeneralProductPrice');
Route::get('invite_user_statistics', '/InviteUserStatistics');
})->prefix('api.Statistics');
//滑块验证码