赵启卫 пре 2 година
родитељ
комит
726ce3b299

+ 3 - 2
application/admin/model/special/SpecialReply.php

xqd xqd
@@ -39,7 +39,7 @@ class SpecialReply extends ModelBasic
         if ($where['special_id'] > 0) $model = $model->where('r.special_id', $where['special_id']);
         if ($where['title']) {
             $model = $model->join('User u', 'u.uid=r.uid');
-            $model = $model->where('r.uid|u.nickname', 'LIKE', "%$where[title]%");
+            $model = $model->where('r.uid|u.nickname|u.realname', 'LIKE', "%$where[title]%");
         }
         if ($where['special_name']) $model = $model->where('s.title|r.id', 'LIKE', "%$where[special_name]%");
         $model = $model->join('Special s', 's.id=r.special_id');
@@ -59,7 +59,8 @@ class SpecialReply extends ModelBasic
             $value['add_time'] = date('Y-m-d H:i:s', $value['add_time']);
             $value['pics'] = json_decode($value['pics']);
             if ($value['uid']) {
-                $nickname = User::where('uid', $value['uid'])->value('nickname');
+                $userinfo = User::where('uid', $value['uid'])->field('nickname,realname')->find();
+                $nickname = $userinfo['realname'] ? $userinfo['realname'] : $userinfo['nickname'];
             } else {
                 $nickname = self::getDb('reply_false')->where('reply_id', $value['id'])->value('nickname');
             }

+ 2 - 2
application/admin/view/special/special_reply/index.php

xqd xqd
@@ -35,7 +35,7 @@
                             <div class="layui-inline">
                                 <label class="layui-form-label">用户名称</label>
                                 <div class="layui-input-inline">
-                                    <input type="text" name="title" class="layui-input" placeholder="UID、昵称">
+                                    <input type="text" name="title" class="layui-input" placeholder="UID、昵称、姓名">
                                 </div>
                             </div>
                             <div class="layui-inline">
@@ -97,7 +97,7 @@
     layList.tableList('List',"{:Url('getSpecialReplyList')}?special_id="+special_id,function (){
         return [
                 {field: 'id', title: '编号', width:'5%',align:'center'},
-                {field: 'nickname', title: '昵称', width:'7%',align:'center', style:'word-break:break-all;'},
+                {field: 'nickname', title: '姓名', width:'10%',align:'center', style:'word-break:break-all;'},
                 {field: 'title', title: '专题名称', width:'10%',align:'center', style:'word-break:break-all;'},
                 {field: 'satisfied_score', title: '满意评分', width:'6%',align:'center'},
                 {field: 'comment', title: '评论内容', toolbar:'#comment', style:'word-break:break-all;'},

+ 7 - 0
application/wap/view/first/index/index.html

xqd
@@ -659,6 +659,13 @@
                         if (bo) {
                             return $h.U({c: 'special', a: 'special_cate', q: {cate_id: item.grade_id}});
                         }
+                        if (item.id == 26) {
+                            return $h.U({
+                                c: 'special',
+                                a: 'special_cate',
+                                q: {cate_id: 35, subject_id: 33}
+                            });
+                        }
                         return $h.U({
                             c: 'index',
                             a: 'unified_list',

+ 3 - 3
application/wap/view/first/special/details.html

xqd xqd xqd
@@ -1017,7 +1017,7 @@
                         <div><span>{{ evaluateScore }}</span>分</div>
                         <div>课程评分</div>
                     </div>
-                    <button type="button" @click="userEvaluate">我要评价</button>
+                    <button type="button" @click="userEvaluate">我要答题</button>
                 </div>
                 <evaluate-list :evaluate-list="evaluateList"></evaluate-list>
                 <div v-if="evaluateLoading" class="loading">
@@ -1318,7 +1318,7 @@
                         value: 2
                     },
                     {
-                        title: '评价',
+                        title: '答题',
                         value: 5
                     }
                 ],
@@ -1332,7 +1332,7 @@
                         value: 2
                     },
                     {
-                        title: '评价',
+                        title: '答题',
                         value: 5
                     }
                 ],