培训报名 和 首页banner活动报名 和列表优化

addons/weliam_smartcity/api/Goods.php

@@ -28,7 +28,7 @@ class GoodsModuleUniapp extends Uniapp {
             case 1:
                 $tableName = "rush_activity";
                 $table = tablename(PDO_NAME."rush_activity");
-                $field = 'paidid,drawid,thumbs,detail,`describe`,pv,creditmoney,threestatus,pftotherinfo,alldaylimit,daylimit,monthlimit,usedatestatus,week,day,tag,isdistri,retainage,share_title,share_image,share_desc,lp_status,lp_set,unit,is_describe_tip,bgmusic,videourl';
+                $field = 'paidid,drawid,thumbs,detail,`describe`,pv,creditmoney,threestatus,pftotherinfo,alldaylimit,daylimit,monthlimit,usedatestatus,week,day,tag,isdistri,retainage,share_title,share_image,share_desc,lp_status,lp_set,unit,is_describe_tip,bgmusic,videourl,diyformid_enroll';
                 $commentPlugin = 'rush';
                 $saletype = 1;
                 break;//抢购商品
@@ -530,6 +530,11 @@ class GoodsModuleUniapp extends Uniapp {
             $info['barset']['playdesc'] = '';
             $info['barset']['playdetail'] = '';
         }
+        // 体验报名
+        $info['is_enroll'] = 0;
+        if (isset($info['diyformid_enroll'])) {
+            $info['is_enroll'] = FormTemplate::isEnroll(2,$id);
+        }
         $this->renderSuccess('商品详细信息',$info);
     }
     /**

addons/weliam_smartcity/plugin/headline/uniapp.php

@@ -74,7 +74,8 @@ class HeadlineModuleUniapp extends Uniapp {
             a.goods_plugin,
             a.advs,
             b.name as one_name,
-            d.name as two_name
+            d.name as two_name,
+            a.diyformid
             FROM " . tablename(PDO_NAME . "headline_content")
                           . " a LEFT JOIN "
                           . tablename(PDO_NAME . "headline_class")
@@ -156,6 +157,7 @@ class HeadlineModuleUniapp extends Uniapp {
         //内容转码
         $info['content'] = htmlspecialchars_decode($info['content']);
         $info['content'] = str_replace("section","div",$info['content']);
+        $info['is_enroll'] = FormTemplate::isEnroll(3,$id);
 
         $this->renderSuccess('头条的详细信息',$info);
     }

addons/weliam_smartcity/plugin/headline/web/controller/headline.ctrl.php

@@ -216,6 +216,8 @@ class Headline_WeliamController {
             $info['display_img'] = $result['thumb'];//封面图片
             $info['content'] = $result['contents'];//具体内容
         }
+        //获取自定义表单信息
+        $diyFormList = FormTemplate::getAllDiyFormList($_W);
 
         include wl_template('headline/edit');
     }
@@ -256,6 +258,7 @@ class Headline_WeliamController {
             $data['advs'] = '';
         }
         $data['content'] = base64_encode($data['content']);
+        $data['diyformid'] = $data['diyformid'] ?: 0;
         if ($_GPC['id']) {
             //修改操作  查看是否修改
             $data['id'] = $_GPC['id'];

addons/weliam_smartcity/plugin/headline/web/view/default/headline/edit.html

@@ -123,6 +123,17 @@
                             <input class="form-control is_judge" is_judge="false" type="number" name="data[browse]" value="{$info['browse']}" placeholder="请输入初始浏览量" />
                         </div>
                     </div>
+                    <div class="form-group">
+                        <div class="col-sm-2 control-label must ">报名表单</div>
+                        <div class="col-sm-9">
+                            <select name="data[diyformid]" class="form-control chosen-select" id="s">
+                                <option value="0" >请选择报名表单</option>
+                                {loop $diyFormList $form}
+                                <option value="{$form['id']}" {if $info['diyformid'] == $form['id']}selected="selected"{/if}>{$form['title']}</option>
+                                {/loop}
+                            </select>
+                        </div>
+                    </div>
                 </div>
                 <div class="form-group">
                     <div class="col-sm-2 control-label must "></div>

addons/weliam_smartcity/sys/controller/member/campusActivities.ctrl.php

@@ -231,6 +231,7 @@ class campusActivities_WeliamController {
             $item['template_title'] = $diyForm ? $diyForm['title'] : '';
             $item['enroll_data'] = MemberEnrollData::getAll($item['id']);
         }
+        $template_type_list = FormTemplate::$template_type;
 
         include wl_template('member/campus_activities/enroll_list');
     }

addons/weliam_smartcity/sys/view/default/member/campus_activities/enroll_list.html

@@ -14,6 +14,12 @@
   .content-clamp p {
     width: 400px;
   }
+  .truncate {
+    width: 100px; /* 定义元素的宽度，根据需要进行调整 */
+    white-space: nowrap; /* 禁止文字换行 */
+    overflow: hidden; /* 超出元素宽度的部分隐藏 */
+    text-overflow: ellipsis; /* 超出元素宽度的部分显示省略号 */
+  }
 </style>
 <ul class="nav nav-tabs">
   <li  {if $_GPC['active'] == 1}class="active"{/if} ><a href="{php echo web_url('member/campusActivities/index',array('active' => 1))}">校园活动</a></li>
@@ -48,6 +54,17 @@
                    placeholder="请输入模板标题"/>
           </div>
         </div>
+        <div class="form-group form-inline">
+          <label class="col-sm-2 control-label">活动类型</label>
+          <div class="col-sm-9">
+            <div class="btn-group">
+              <a href="{php echo wl_filter_url('template_type:0');}" class="btn {if $_GPC['template_type'] == 0}btn-primary{else}btn-default{/if}">全部</a>
+              {loop $template_type_list $temp_key $temp_val}
+              <a href="{php echo wl_filter_url('template_type:'.$temp_key);}" class="btn {if $_GPC['template_type'] == $temp_key}btn-primary{else}btn-default{/if}">{$temp_val}</a>
+              {/loop}
+            </div>
+          </div>
+        </div>
         <div class="form-group">
           <label class="col-sm-2 control-label"></label>
           <div class="col-sm-9">
@@ -88,7 +105,10 @@
                 <img class="scrollLoading" src="{$form_image}" data-url="{php echo $form_image" height="50" width="50"/>
                 {/loop}
               {else}
-                {$enroll_data_row['filed_key']}：{$enroll_data_row['field_value']}
+                {$enroll_data_row['filed_key']}：
+                <div class="truncate" onmouseover="expandText(this)" onmouseout="truncateText(this)">
+                  {$enroll_data_row['field_value']}
+                </div>
               {/if}
           </td>
           {/loop}
@@ -108,5 +128,16 @@
   </div>
 </div>
 <script>
+  function expandText(element) {
+    element.style.whiteSpace = 'normal'; /* 设置文字换行 */
+    element.style.overflow = 'visible'; /* 显示全部内容 */
+    element.style.textOverflow = 'unset'; /* 取消省略号 */
+  }
+
+  function truncateText(element) {
+    element.style.whiteSpace = 'nowrap'; /* 禁止文字换行 */
+    element.style.overflow = 'hidden'; /* 隐藏超出部分 */
+    element.style.textOverflow = 'ellipsis'; /* 显示省略号 */
+  }
 </script>
 {php include wl_template('common/footer');}

addons/weliam_smartcity/web/controller/goodshouse/goodshouse.ctrl.php

@@ -157,6 +157,7 @@ class Goodshouse_WeliamController
                 if (empty($_GPC['cc_child_id']) || !is_numeric($_GPC['cc_child_id'])) wl_message('请选择商品分类');
                 $goods['cc_id']     = $_GPC['cc_id'];
                 $goods['cc_child_id'] = $_GPC['cc_child_id'];
+                $goods['diyformid_enroll'] = $_GPC['diyformid_enroll'] ?: 0;
                 if ($goods['lp_status'] == 1 && is_array($_GPC['ld'])) {
                     $lpSet  = array_values($_GPC['ld']);
                     $maxMax = max(array_column($lpSet , 'max'));
@@ -423,9 +424,7 @@ class Goodshouse_WeliamController
             $fullreducelist = pdo_getall('wlmerchant_fullreduce_list',array('aid' => $_W['aid'],'uniacid' => $_W['uniacid']),array('id','title'));
         }
         //获取自定义表单信息
-        $formWhere = ['uniacid'=>$_W['uniacid'],'aid'=>$_W['aid']];
+        $diyFormList = FormTemplate::getAllDiyFormList($_W);
-        if(is_store()) $formWhere['sid'] = $_W['storeid'];
-        $diyFormList = pdo_getall(PDO_NAME."diyform",$formWhere,['id','title'],'','create_time DESC,id DESC');
         //富文本处理
         if(is_base64($goods['detail'])) $goods['detail']   = htmlspecialchars_decode(base64_decode($goods['detail']));
         if(is_base64($goods['describe'])) $goods['describe'] = htmlspecialchars_decode(base64_decode($goods['describe']));

addons/weliam_smartcity/web/view/default/goodshouse/createactive.html

@@ -223,6 +223,19 @@
 					</label>
 				</div>
 			</div>
+			{if isset($goods['diyformid_enroll'])}
+			<div class="form-group">
+				<label class="col-sm-2 control-label">体验报名表单</label>
+				<div class="col-sm-9">
+					<select name="diyformid_enroll" class="form-control chosen-select" id="s">
+						<option value="0" >请选择报名表单</option>
+						{loop $diyFormList $form}
+						<option value="{$form['id']}" {if $goods['diyformid_enroll'] == $form['id']}selected="selected"{/if}>{$form['title']}</option>
+						{/loop}
+					</select>
+				</div>
+			</div>
+			{/if}
 	</div>
 </div>
 </div>