diff --git a/app/Admin/Controllers/GoodsController.php b/app/Admin/Controllers/GoodsController.php
index 7fa896e..fe12bb5 100644
--- a/app/Admin/Controllers/GoodsController.php
+++ b/app/Admin/Controllers/GoodsController.php
@@ -10,7 +10,7 @@ use Dcat\Admin\Controllers\AdminController;
use App\Models\GoodsType as GoodsTypeModel;
use App\Models\Store as StoreModel;
use Dcat\Admin\Form\NestedForm;
-use App\Models\Goods as goodsModel;
+use App\Models\Goods as GoodsModel;
use App\Models\ImsCjdcMarket as MarketModel;
class GoodsController extends AdminController
@@ -22,7 +22,7 @@ class GoodsController extends AdminController
*/
protected function grid()
{
- return Grid::make(new Goods(), function (Grid $grid) {
+ return Grid::make(new Goods(), function (Grid $grid) {
$grid->id->sortable();
$grid->cover_img_url->image('',50);
$grid->name;
@@ -38,12 +38,8 @@ class GoodsController extends AdminController
$grid->price;
$grid->sort->sortable();
- // $grid->on_sale->switch();
- $grid->on_sale->switch()
-
- ->saving(function ($v) {
- return $v == 1 ? '在售' : '下架';
- });
+ $grid->on_sale->switch();
+
$grid->filter(function (Grid\Filter $filter) {
$filter->equal('id');
});
@@ -95,7 +91,7 @@ class GoodsController extends AdminController
*/
protected function form()
{
- $builder = goodsModel::with(['ImageBanners','VideoBanners']);
+ $builder = GoodsModel::with(['ImageBanners','VideoBanners']);
return Form::make($builder, function (Form $form) {
$form->hidden('id');
@@ -148,6 +144,13 @@ class GoodsController extends AdminController
$table->text('spec_key')->help('如：净含量：500克，保质期：120天，包装：12个/盒等');
$table->text('spec_value');
});
+ $form->switch('on_sale')
+ ->customFormat(function ($v) {
+ return $v == '上架' ? 1 : 0;
+ })
+ ->saving(function ($v) {
+ return $v;
+ });
});
});
}
diff --git a/app/Admin/Controllers/StoreController.php b/app/Admin/Controllers/StoreController.php
index fa90503..0274cef 100644
--- a/app/Admin/Controllers/StoreController.php
+++ b/app/Admin/Controllers/StoreController.php
@@ -10,6 +10,8 @@ use Dcat\Admin\Controllers\AdminController;
use App\Models\StoreType as StoreTypeModel;
use App\Models\LanzuMmInfo as MminfoModel;
use App\Models\ImsCjdcMarket as MarketModel;
+use App\Admin\Common\Images as QrCode;
+use App\Models\Store as StoreModel;
class StoreController extends AdminController
{
@@ -50,9 +52,6 @@ class StoreController extends AdminController
// 每页10条
$grid->paginate(10);
-
- // 二维码单独生成
-
});
}
@@ -116,55 +115,77 @@ class StoreController extends AdminController
$marketList = MarketModel::getMarket();
// 查询一级分类（店铺分类）
$storeTypeList = StoreTypeModel::getStoreTypeArray();
+ $form->column(6, function (Form $form) use($mmList,$marketList,$storeTypeList){
+ $form->hidden('id');
+ $form->select('mm_user_id')->options($mmList);
+ $form->select('market_id')->required()->options($marketList);
+ // $form->select('store_type_id')->required()->options($storeTypeList);
+ $form->text('name')->required()->maxLength(50);
+ $form->image('logo')->required();
+ $form->mobile('tel');
+ $form->text('link_name')->required();
+ $form->mobile('link_tel')->required();
+ $form->number('sort');
+ $form->switch('is_rest')
+ ->customFormat(function ($v) {
+ return $v == '休息' ? 1 : 0;
+ })
+ ->saving(function ($v) {
+ return $v;
+ });
+ $form->switch('is_open')
+ ->customFormat(function ($v) {
+ return $v == '开启' ? 1 : 0;
+ })
+ ->saving(function ($v) {
+ return $v;
+ })->default(1);
+ $form->text('address');
+ });
+ $form->column(6, function (Form $form) use($mmList,$marketList,$storeTypeList){
+ $form->image('business_license')->required();
+ $form->image('zm_img')->required();
+ $form->image('fm_img')->required();
+ $form->text('admin_id')->required();
+ $form->text('user_id')->required();
+ $form->timeRange('time1','time2','营业时间段一')->required();
+ $form->timeRange('time3','time4','营业时间段二');
+ });
+ $form->column(12, function (Form $form) use($mmList,$marketList,$storeTypeList){
- $form->hidden('id');
- $form->select('mm_user_id')->width(4)->required()->options($mmList);
- $form->select('market_id')->width(4)->required()->options($marketList);
- $form->select('store_type_id')->width(4)->required()->options($storeTypeList);
-
- $form->text('name')->width(3)->required()->maxLength(50);
- $form->image('logo')->width(2)->required();
+ $form->map('lat','lng','地址');
+ $form->textarea('introduction')->required();
+ $form->textarea('announcement');
+ $form->multipleImage('environment');
- $form->mobile('tel')->width(2);
- $form->text('link_name')->width(2)->required();
- $form->mobile('link_tel')->width(2)->required();
- $form->text('address')->width(8);
- $form->map('lat','lng','地址');
- // $form->text('coordinates')->width(4)
- // ->placeholder('输入 经纬度,如: 108.281552,22.83731')
- // ->help("通过网址 https://lbs.amap.com/console/show/picker 获取经纬度");
- $form->image('business_license')->width(2)->required();
- $form->image('zm_img')->width(2)->required();
- $form->image('fm_img')->width(2)->required();
- $form->text('admin_id')->width(2)->required();
- $form->text('user_id')->width(2)->required();
-
- // $form->text('coordinates');
- $form->textarea('introduction')->required();
- $form->textarea('announcement');
- $form->multipleImage('environment');
-
- // $form->text('expire_time');
- // $form->text('loudspeaker_imei');
- // $form->switch('is_rest');
- $form->timeRange('time1','time2','营业时间段一')->required();
- $form->timeRange('time3','time4','营业时间段二');
-
- $form->number('sort')->width(2);
- // $form->switch('is_open');
-
- $form->saving(function (Form $form){
- // 修改是否休息 1-》1 =，0=》2
- // $isOpen = $form->is_open;
+ // $form->text('expire_time');
});
- $form->saved(function (Form $form){
- if($form->isCreating()){
- // 生产二维码
+ // $form->text('coordinates')->width(4)
+ // ->placeholder('输入 经纬度,如: 108.281552,22.83731')
+ // ->help("通过网址 https://lbs.amap.com/console/show/picker 获取经纬度");
+ $form->saved(function (Form $form){
+ $id = $form->getKey();
+ //$form->isCreating() &&
+ if( !empty($id)){
+ // 生成小程序码 店铺
+ $qrCode = new QrCode();
+ $codeStore = $qrCode->createQrCode($id,'zh_cjdianc/pages/takeout/takeoutindex');//var_dump($codeStore);
+ $storeImg = $qrCode->uploadOss($codeStore,'data/code_store_img/wx_store_'.$id.'.jpg');var_dump($storeImg);
+ // 生产小程序码 收银
+ $codePAy = $qrCode->createQrCode($id,'zh_cjdianc/pages/seller/fukuan');//var_dump($codePAy);
+ $PayImg = $qrCode->uploadOss($codePAy,'data/code_minipay_img/wx_minipay_'.$id.'.jpg');var_dump($PayImg);
+
+ dd(11);
+ // 保存图片
+ $storeModel = new StoreModel();
+ $storeModel->store_applet_img = $storeImg;
+ $storeModel->cash_code_img = $PayImg;
+ $storeModel->save();
}
-
});
});
}
+
}
diff --git a/app/Models/Goods.php b/app/Models/Goods.php
index 95b4151..74b8906 100644
--- a/app/Models/Goods.php
+++ b/app/Models/Goods.php
@@ -17,6 +17,7 @@ class Goods extends Model
protected $appends = [
'cover_img_url',
];
+
protected $casts = [
'details_imgs'=>'array',
'tags'=>'array',
diff --git a/composer.lock b/composer.lock
index d8f4dbc..4b38552 100644
--- a/composer.lock
+++ b/composer.lock
@@ -165,16 +165,16 @@
},
{
"name": "dcat/laravel-admin",
- "version": "1.6.5",
+ "version": "1.7.0",
"source": {
"type": "git",
"url": "https://github.com/jqhph/dcat-admin.git",
- "reference": "684ea3da59a6caa8f00771781b7ff50d18759b81"
+ "reference": "8d66a400243146c2c80ba4805692066d7035d34a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/jqhph/dcat-admin/zipball/684ea3da59a6caa8f00771781b7ff50d18759b81",
- "reference": "684ea3da59a6caa8f00771781b7ff50d18759b81",
+ "url": "https://api.github.com/repos/jqhph/dcat-admin/zipball/8d66a400243146c2c80ba4805692066d7035d34a",
+ "reference": "8d66a400243146c2c80ba4805692066d7035d34a",
"shasum": "",
"mirrors": [
{
@@ -233,7 +233,7 @@
"laravel",
"laravel admin"
],
- "time": "2020-07-28T03:26:18+00:00"
+ "time": "2020-08-24T08:10:00+00:00"
},
{
"name": "dnoegel/php-xdg-base-dir",
@@ -6902,6 +6902,7 @@
"keywords": [
"tokenizer"
],
+ "abandoned": true,
"time": "2019-09-17T06:23:10+00:00"
},
{
diff --git a/config/wechat.php b/config/wechat.php
index 066cb60..09ed8ac 100644
--- a/config/wechat.php
+++ b/config/wechat.php
@@ -92,14 +92,14 @@ return [
/*
* 小程序
*/
- // 'mini_program' => [
- // 'default' => [
- // 'app_id' => env('WECHAT_MINI_PROGRAM_APPID', ''),
- // 'secret' => env('WECHAT_MINI_PROGRAM_SECRET', ''),
- // 'token' => env('WECHAT_MINI_PROGRAM_TOKEN', ''),
- // 'aes_key' => env('WECHAT_MINI_PROGRAM_AES_KEY', ''),
- // ],
- // ],
+ 'mini_program' => [
+ 'default' => [
+ 'app_id' => env('WECHAT_MINI_PROGRAM_APPID', ''),
+ 'secret' => env('WECHAT_MINI_PROGRAM_SECRET', ''),
+ 'token' => env('WECHAT_MINI_PROGRAM_TOKEN', ''),
+ 'aes_key' => env('WECHAT_MINI_PROGRAM_AES_KEY', ''),
+ ],
+ ],
/*
* 微信支付
diff --git a/resources/lang/zh-CN/store.php b/resources/lang/zh-CN/store.php
index 97f7d13..03ecc99 100644
--- a/resources/lang/zh-CN/store.php
+++ b/resources/lang/zh-CN/store.php
@@ -31,7 +31,7 @@ return [
'zm_img' => '身份证正面',
'fm_img' => '身份证反面',
'link_name' => '联系人姓名',
- 'link_tel' => '电话号码（手机）',
+ 'link_tel' => '手机号码',
'admin_id' => '管理员',
'loudspeaker_imei' => '喇叭终端的机器码IMEI码',
'mm_user_id' => '所属市场经理',