活动首页推荐数量贺活动会员价格调整。

application/admin/model/system/Recommend.php

@@ -174,7 +174,7 @@ class Recommend extends ModelBasic
                     $item['number'] = RecommendRelation::where(['recommend_id' => $item['id']])->alias('r')->join('Lecturer l', 'l.id=r.link_id')->where(['l.is_del' => 0, 'l.is_show' => 1])->count();
                     break;
                 case 7:
-                    $item['number'] = 1;
+                    $item['number'] = 2;
                     break;
                 case 11:
                     $item['number'] = RecommendRelation::where(['recommend_id' => $item['id']])->alias('r')->join('TestPaper t', 't.id=r.link_id')->where(['t.is_del' => 0, 't.is_show' => 1, 't.status' => 1])->count();
@@ -190,7 +190,7 @@ class Recommend extends ModelBasic
                     $item['number'] = RecommendRelation::where(['recommend_id' => $item['id']])->alias('r')->join('DataDownload d', 'd.id=r.link_id')->where(['d.is_del' => 0, 'd.is_show' => 1, 'd.status' => 1])->count();
                     break;
             }
-            if ($item['type'] != 7) $item['number'] = $item['show_count'] < $item['number'] ? $item['show_count'] : $item['number'];
+            $item['number'] = $item['show_count'] < $item['number'] ? $item['show_count'] : $item['number'];
             $item['grade_title'] = $item['grade_id'] > 0 ? SpecialSubject::where(['id' => $item['grade_id'], 'is_del' => 0])->value('name') : '无';
         }
         $count = self::where('is_fixed', $where['is_fixed'])->count();

application/admin/view/ump/event_registration/create.php

@@ -262,7 +262,7 @@
                                             <input v-model.trim="item.event_price" type="text" autocomplete="off" class="layui-input" @change="priceChange(item, 'event_price')">
                                         </div>
                                     </div>
-                                    <div class="layui-inline">
+                                    <div class="layui-inline" style="display: none;">
                                         <div class="layui-form-label">会员价格</div>
                                         <div class="layui-input-inline">
                                             <input v-model.trim="item.event_mer_price" type="text" autocomplete="off" class="layui-input" @change="priceChange(item, 'event_mer_price')">

application/wap/model/recommend/RecommendRelation.php

@@ -71,7 +71,7 @@ class RecommendRelation extends ModelBasic
                 ->select();
         } elseif ($type == 7) {
             //线下活动
-            $list = EventRegistration::eventRegistrationList(1, 1);
+            $list = EventRegistration::eventRegistrationList(1, 2);
         } elseif ($type == 1) {
             $list = self::alias('a')->join('__ARTICLE__ e', 'e.id=a.link_id')
                 ->where(['a.recommend_id' => $recommend_id, 'e.is_show' => 1])
@@ -178,7 +178,7 @@ class RecommendRelation extends ModelBasic
             $count = self::where('a.recommend_id', $recommend_id)->alias('a')->join("Lecturer l", 'l.id=a.link_id')
                 ->where(['l.is_show' => 1, 'l.is_del' => 0])->count();
         } else if ($type == 7) {
-            $count = EventRegistration::homeCount() > 0 ? 1 : 0;
+            $count = EventRegistration::homeCount() > 0 ? 2 : 0;
         } else if ($type == 8) {
             $count = self::where('a.recommend_id', $recommend_id)->alias('a')->join("__SPECIAL__ p", 'p.id=a.link_id')
                 ->join('__SPECIAL_SUBJECT__ j', 'j.id=p.subject_id', 'LEFT')->where(['p.is_show' => 1, 'p.status' => 1, 'p.is_pink' => 1, 'p.is_del' => 0])->count();

application/wap/view/first/activity/index.html

@@ -36,8 +36,8 @@
                 <div class="name" v-text="activity.title"></div>
                 <div class="group">
                     <div class="money" >¥<span class="num" v-text="activity.price"></span>
-                        <span class="vip-price" style="color: #0A0A0A;">¥{{ activity.member_price }}</span>
-                        <img class="vip-price-icon" src="{__WAP_PATH}zsff/images/vip.png">
+                        <!-- <span class="vip-price" style="color: #0A0A0A;">¥{{ activity.member_price }}</span>
+                        <img class="vip-price-icon" src="{__WAP_PATH}zsff/images/vip.png"> -->
                     </div>
                     <div>{{ activity.count }}人已报名</div>
                 </div>