linwu il y a 5 mois
Parent
commit
68b402d776

+ 17 - 0
app/admin/controller/Human.php

@@ -222,6 +222,14 @@ class Human extends AdminBaseController
     public function listInstitution()
     {
         $map   = $this->dealEqualInput(['status'], $this->dealLikeInput(['name']));
+        $booth_status = input('booth_status');
+        if (!empty($booth_status)) {
+            if ($booth_status == 1) {
+                $map[] = ['booth', '<>', ''];
+            } else {
+                $map[] = ['booth', '=', ''];
+            }
+        }
         $list  = HumanInstitutionModel::where($map)
             ->order(['priority' => 'desc', 'update_time' => 'desc'])
             ->limit(input('limit'))
@@ -377,6 +385,14 @@ class Human extends AdminBaseController
     public function listEnterprise()
     {
         $map   = $this->dealEqualInput(['status'], $this->dealLikeInput(['name']));
+        $booth_status = input('booth_status');
+        if (!empty($booth_status)) {
+            if ($booth_status == 1) {
+                $map[] = ['booth', '<>', ''];
+            } else {
+                $map[] = ['booth', '=', ''];
+            }
+        }
         $list  = HumanEnterpriseModel::where($map)
             ->order(['priority' => 'desc', 'update_time' => 'desc'])
             ->limit(input('limit'))
@@ -409,6 +425,7 @@ class Human extends AdminBaseController
             'info'           => $info,
             'status_list'    => HumanEnterpriseModel::STATUS,
             'cooperate_list' => HumanInstitutionModel::COOPERATE,
+            'industry_list'       => HumanEnterpriseModel::INDUSTRY,
         ]);
     }
 

+ 19 - 0
app/admin/view/human/enterprise_form.html

@@ -22,6 +22,17 @@
                                        class="layui-input">
                             </div>
                         </div>
+                        <div class="layui-form-item">
+                            <label class="layui-form-label">行业</label>
+                            <div class="layui-input-block">
+                                <select name="industry">
+                                    <option value="">请选择行业</option>
+                                    {volist name="industry_list" id="industry"}
+                                    <option value="{$industry}" {:array_get($info,'industry')==$industry ? 'selected' : '' }>{$industry}</option>
+                                    {/volist}
+                                </select>
+                            </div>
+                        </div>
                         <div class="layui-form-item">
                             <label class="layui-form-label">业务范围</label>
                             <div class="layui-input-block">
@@ -68,6 +79,14 @@
                                        class="layui-input">
                             </div>
                         </div>
+                        <div class="layui-form-item">
+                            <label class="layui-form-label">展位</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="booth" value="{:array_get($info,'booth')}"
+                                       placeholder="请输入展位" autocomplete="off"
+                                       class="layui-input">
+                            </div>
+                        </div>
                         <div class="layui-form-item">
                             <label class="layui-form-label"><span style="color:#f90c05;">*</span>排序</label>
                             <div class="layui-input-block">

+ 12 - 0
app/admin/view/human/enterprise_list.html

@@ -19,6 +19,16 @@
                         </select>
                     </div>
                 </div>
+                <div class="layui-inline">
+                    <label class="layui-form-label">有展位</label>
+                    <div class="layui-input-block">
+                        <select name="booth_status">
+                            <option value="">全部</option>
+                            <option value="1">是</option>
+                            <option value="2">否</option>
+                        </select>
+                    </div>
+                </div>
                 <div class="layui-inline">
                     <button class="layui-btn" lay-submit lay-filter="{$lay_btn}">
                         <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -62,6 +72,8 @@
                     {type: 'checkbox', fixed: 'left'},
                     {field: 'name', title: '企业名称', width: 160},
                     {field: 'capital', title: '注册资本', width: 160},
+                    {field: 'industry', title: '行业', width: 120},
+                    {field: 'booth', title: '展位', width: 120},
                     {field: 'tel', title: '联系电话', width: 160},
                     {field: 'address', title: '企业地址'},
                     {field: 'join', title: '参会人', width: 100},

+ 8 - 0
app/admin/view/human/institution_form.html

@@ -60,6 +60,14 @@
                                        class="layui-input">
                             </div>
                         </div>
+                        <div class="layui-form-item">
+                            <label class="layui-form-label">展位</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="booth" value="{:array_get($info,'booth')}"
+                                       placeholder="请输入展位" autocomplete="off"
+                                       class="layui-input">
+                            </div>
+                        </div>
                         <div class="layui-form-item">
                             <label class="layui-form-label"><span style="color:#f90c05;">*</span>排序</label>
                             <div class="layui-input-block">

+ 11 - 0
app/admin/view/human/institution_list.html

@@ -19,6 +19,16 @@
                         </select>
                     </div>
                 </div>
+                <div class="layui-inline">
+                    <label class="layui-form-label">有展位</label>
+                    <div class="layui-input-block">
+                        <select name="booth_status">
+                            <option value="">全部</option>
+                            <option value="1">是</option>
+                            <option value="2">否</option>
+                        </select>
+                    </div>
+                </div>
                 <div class="layui-inline">
                     <button class="layui-btn" lay-submit lay-filter="{$lay_btn}">
                         <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -62,6 +72,7 @@
                     {type: 'checkbox', fixed: 'left'},
                     {field: 'name', title: '机构名称', width: 160},
                     {field: 'tel', title: '联系电话', width: 160},
+                    {field: 'booth', title: '展位', width: 120},
                     {field: 'address', title: '机构地址'},
                     {field: 'cooperate', title: '业务范围', width: 160},
                     {field: 'join', title: '参会人', width: 100},

+ 1 - 0
app/common/model/HumanEnterpriseModel.php

@@ -15,6 +15,7 @@ class HumanEnterpriseModel extends BaseModel
 
     // 常量
     const STATUS = [1 => '显示', 2 => '隐藏'];
+    const INDUSTRY = ['鞋服', '纺织', '建材', '食品', '信息技术', '智能装备', '医疗健康', '商贸物流', '文体旅游', '研发创意', '金融服务', '探索布局未来产业'];
 
     const STATUS_SHOW = 1;
     const STATUS_HIDE = 2;

+ 2 - 2
app/mobile/controller/Human.php

@@ -327,12 +327,12 @@ class Human extends MobileBaseController
     private function _listValidate()
     {
 
-        $action = $this->request->action();
+        /*$action = $this->request->action();
         if ($action != 'center') {
             if (time() < 1730736000) {
                 jump('11月5日开启,敬请期待','mobile/human/center');
             }
-        }
+        }*/
         $open_id = session('mobile.human.open_id');
 
         $institution = HumanInstitutionApplyModel::where('open_id', $open_id)->find();

+ 5 - 0
app/mobile/view/human/institution_list.html

@@ -9,6 +9,7 @@
     .lw-item .join .flex-1{flex:1;}
     .lw-item .join .mobile{display: flex;flex-direction: row;align-items: center;}
     .lw-item .address {color:#777;font-size:14px;margin-top:10px;}
+    .lw-item .booth {color:var(--red);font-size:16px;margin-top:10px;font-weight: bold;text-align: center;}
     .lw-item .tags {margin-top:10px;}
     .lw-item .tags .van-tag{margin-right:5px;}
 </style>
@@ -41,6 +42,7 @@
     >
         <div class="lw-list">
             <div class="lw-item" v-for="item in list" @click="toDetail(item.id)">
+
                 <div class="title">
                     <div style="width: 6px; height: 6px; background: #dd4250; border-radius: 50%; margin-right: 11px;"><span></span></div>
                     <div>{{item.name}}</div>
@@ -62,6 +64,9 @@
                 <div class="address">
                     机构地址:{{item.address}}
                 </div>
+                <div class="booth" v-if="item.booth">
+                    展位:{{item.booth}}
+                </div>
             </div>
         </div>
     </van-list>