From b965e270e24301ce85605fa80db827d2c8232c18 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Thu, 22 Sep 2016 15:27:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=8F=AD=E7=AE=A1=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=A2=9E=E5=8A=A0=E8=AF=BE=E7=A8=8B=E5=90=8D=EF=BC=8C?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=90=8D=E4=B8=8E=E7=8F=AD=E7=BA=A7=E5=90=8D?=
 =?UTF-8?q?=E4=B9=8B=E9=97=B4=E7=82=B9=E5=8F=B7=E5=90=8C=E6=97=B6=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E5=9B=BE=E6=A0=87=E5=9C=86=E5=BD=A2=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/class.html                 | 2 +-
 public/assets/wechat/class_publishissue.html    | 2 +-
 public/assets/wechat/class_publishnotice.html   | 2 +-
 public/assets/wechat/edit_class_group.html      | 2 +-
 public/assets/wechat/invite_code.html           | 2 +-
 public/assets/wechat/join_classgroup.html       | 4 ++--
 public/assets/wechat/review_class_member.html   | 4 ++--
 public/assets/wechat/select_my_coursegroup.html | 4 ++--
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/public/assets/wechat/class.html b/public/assets/wechat/class.html
index 6678456b6..789ef7018 100644
--- a/public/assets/wechat/class.html
+++ b/public/assets/wechat/class.html
@@ -1,6 +1,6 @@
 <div class="post-container">
     <div loading-spinner></div>
-    <div class="class-detail-name"><span class="course-name-width hidden inline-block">{{course.syllabus_title}}<font class="fb" style="height:39px; line-height:39px; vertical-align:top; margin:0 3px;">·</font>{{course.name}}</span><span  ng-click="invite()" class="f13 blue-title-sub">邀请码</span></div>
+    <div class="class-detail-name"><span class="course-name-width hidden inline-block">{{course.syllabus_title}}<font ng-if="course.syllabus_title != null" class="fb" style="height:39px; line-height:39px; vertical-align:top; margin:0 3px;">·</font>{{course.name}}</span><span  ng-click="invite()" class="f13 blue-title-sub">邀请码</span></div>
     <div class="tab-wrap">
         <a ng-click="tab($index+1)" ng-repeat="menu in menus" id="class_tab_1" href="javascript:void(0);" ng-class="['weixin-tab', {'class-tab-active': currentTab == $index+1}]">{{menu}}</a>
     </div>
diff --git a/public/assets/wechat/class_publishissue.html b/public/assets/wechat/class_publishissue.html
index 5a65beabf..cf030d7c5 100644
--- a/public/assets/wechat/class_publishissue.html
+++ b/public/assets/wechat/class_publishissue.html
@@ -1,7 +1,7 @@
 <div class="post-container">
     <div loading-spinner></div>
 
-    <div class="blue-title"><span class="course-name-width hidden inline-block">{{current_course.syllabus_title}}<font class="fb" style="height:39px; line-height:39px; vertical-align:top; margin:0 3px;">·</font>{{current_course.name}}</span></div>
+    <div class="blue-title"><span class="course-name-width hidden inline-block">{{current_course.syllabus_title}}<font ng-if="current_course.syllabus_title != null" class="fb" style="height:39px; line-height:39px; vertical-align:top; margin:0 3px;">·</font>{{current_course.name}}</span></div>
     <div class="course-list-row f13 c-grey3 mt30"><span class="fl ml15 c-grey3">标题</span><input class="new-class-input ml25" ng-model="issuetitle" placeholder="发起讨论，请先输入标题(限128字符)" maxlength="128"></div>
     <div class="full-width-wrap mt15 mb50"><textarea class="full-width-textarea" ng-model="issue" placeholder="请输入您的讨论内容~"></textarea></div>
     <div class="bottom-tab-wrap mt10">
diff --git a/public/assets/wechat/class_publishnotice.html b/public/assets/wechat/class_publishnotice.html
index e56c762a6..21b1deeb7 100644
--- a/public/assets/wechat/class_publishnotice.html
+++ b/public/assets/wechat/class_publishnotice.html
@@ -1,7 +1,7 @@
 <div class="post-container">
     <div loading-spinner></div>
 
-    <div class="blue-title"><span class="course-name-width hidden inline-block">{{current_course.syllabus_title}}<font class="fb" style="height:39px; line-height:39px; vertical-align:top; margin:0 3px;">·</font>{{current_course.name}}</span></div>
+    <div class="blue-title"><span class="course-name-width hidden inline-block">{{current_course.syllabus_title}}<font ng-if="current_course.syllabus_title != null" class="fb" style="height:39px; line-height:39px; vertical-align:top; margin:0 3px;">·</font>{{current_course.name}}</span></div>
     <div class="course-list-row f13 c-grey3 mt30"><span class="fl ml15 c-grey3">标题</span><input class="new-class-input ml25" ng-model="noticetitle" placeholder="发布通知，请先输入标题(限64字符)" maxlength="64"></div>
     <div class="full-width-wrap mt15 mb50"><textarea class="full-width-textarea" ng-model="notice" placeholder="请输入您的通知内容~"></textarea></div>
     <div class="bottom-tab-wrap mt10">
diff --git a/public/assets/wechat/edit_class_group.html b/public/assets/wechat/edit_class_group.html
index 4c1c612a6..d3683358e 100644
--- a/public/assets/wechat/edit_class_group.html
+++ b/public/assets/wechat/edit_class_group.html
@@ -2,7 +2,7 @@
     <div loading-spinner></div>
 
     <div class="blue-title">分班管理</div>
-    <div class="class-detail-row f13 c-grey3"><img src="images/logo.png" ng-src="{{course.img_url}}" class="fl ml10 img-circle mt4" width="30"><span class="fl mt10 ml10 ng-binding">{{course.name}}</span><div class="cl"></div> </div>
+    <div class="class-detail-row f13 c-grey3"><img src="images/logo.png" ng-src="{{course.img_url}}" class="fl ml10 img-circle mt4" width="30" height="30"><span class="fl mt10 ml10 ng-binding">{{course.syllabus_title}}<font ng-if="course.syllabus_title != null" class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{course.name}}</span><div class="cl"></div> </div>
     <form novalidate name="groupForm">
         <div class="course-list-row f13 c-grey3 mt10" ng-repeat="group in groups" ><span class="fl ml15 c-grey3">分班名称</span><input ng-change="group.change = true" required ng-class="['new-class-input ml25', {'c-grey':group.change} ]" ng-model="group.tmpname" placeholder="如：16级1班" /><a ng-click="deleteGroup($index)" class="fr mr10 c-grey6 delete-class-link">删除</a></div>
         <div class="tac"><a ng-click="addGroup()" class="link-blue2 f13 mt15 inline-block add-class-link">+新增分班</a></div>
diff --git a/public/assets/wechat/invite_code.html b/public/assets/wechat/invite_code.html
index c6d3b425f..ae30e335e 100644
--- a/public/assets/wechat/invite_code.html
+++ b/public/assets/wechat/invite_code.html
@@ -1,7 +1,7 @@
 <div class="post-container">
     <div class="qr-code-wrap">
         <div class="qr-code-box">
-            <div class="share-class-name">{{course.syllabus_title}}<font class="fb" style="height:25px; line-height:25px; vertical-align:top; margin:0 3px;">·</font>{{course.name}}</div>
+            <div class="share-class-name">{{course.syllabus_title}}<font ng-if="course.syllabus_title != null" class="fb" style="height:25px; line-height:25px; vertical-align:top; margin:0 3px;">·</font>{{course.name}}</div>
             <div class="qr-img-wrap"><img ng-src="https://mp.weixin.qq.com/cgi-bin/showqrcode?ticket={{course.qrcode}}" width="152" class="qr-code-img" /></div>
             <div class="invitation-code-wrap">邀请码：{{course.invite_code}}</div>
         </div>
diff --git a/public/assets/wechat/join_classgroup.html b/public/assets/wechat/join_classgroup.html
index dce42ee42..4b14b0153 100644
--- a/public/assets/wechat/join_classgroup.html
+++ b/public/assets/wechat/join_classgroup.html
@@ -2,13 +2,13 @@
     <div loading-spinner></div>
     <div ng-show="current_course" class="post-container" style="padding-bottom:50px;">
         <div class="blue-title">欢迎加入班级</div>
-        <div class="class-detail-row f13 c-grey3"><img src="images/logo.png" ng-src="{{current_course.img_url}}" class="fl ml10 img-circle mt4" width="30"><span class="fl mt10 ml10 ng-binding">{{current_course.name}}</span><div class="cl"></div> </div>
+        <div class="class-detail-row f13 c-grey3"><img src="images/logo.png" ng-src="{{current_course.img_url}}" class="fl ml10 img-circle mt4" width="30" height="30"><span class="fl mt10 ml10 ng-binding">{{course.syllabus_title}}<font ng-if="course.syllabus_title != null" class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{current_course.name}}</span><div class="cl"></div> </div>
         <div class="course-list-row f13 c-grey3 mt10"><span class="fl ml15">选择分班</span></div>
         <ul class="class-list f13 c-grey3">
             <li><span class="fl ml10 class-list-name hidden">暂无</span><span ng-click="selectGroup(0)" class="login-box fr mr10 mt12 img-circle" ng-class="[{'checked': selectid == 0}]"></span></li>
 
             <div ng-repeat="group in groups">
-            <li><span class="fl ml10 class-list-name hidden">{{group.course_group.name}}</span><span ng-click="selectGroup(group.course_group.id)" class="login-box fr mr10 mt12 img-circle" ng-class="[{'checked': selectid == group.course_group.id}]"></span></li>
+            <li ng-class="{'border-bottom-none':$last}"><span class="fl ml10 class-list-name hidden">{{group.course_group.name}}</span><span ng-click="selectGroup(group.course_group.id)" class="login-box fr mr10 mt12 img-circle" ng-class="[{'checked': selectid == group.course_group.id}]"></span></li>
             <!--<li class="border-bottom-none"><span class="fl ml10 class-list-name hidden">分班2</span><span  class="login-box fr mr10 mt12 img-circle" ng-class="['login-box', 'fr', 'mr10', 'mt12', {'checked': student}]"></span></li>-->
             </div>
         </ul>
diff --git a/public/assets/wechat/review_class_member.html b/public/assets/wechat/review_class_member.html
index b1f0dacc5..ee0138965 100644
--- a/public/assets/wechat/review_class_member.html
+++ b/public/assets/wechat/review_class_member.html
@@ -2,7 +2,7 @@
     <div loading-spinner></div>
     <div ng-show="current_course && current_review_member "  class="post-container" style="padding-bottom:50px;">
         <div ng-show="status==0">
-            <div class="blue-title"><span class="course-name-width hidden inline-block">{{current_course.syllabus_title}}<font class="fb" style="height:39px; line-height:39px; vertical-align:top; margin:0 3px;">·</font>{{current_course.name}}</span></div>
+            <div class="blue-title"><span class="course-name-width hidden inline-block">{{current_course.syllabus_title}}<font ng-if="current_course.syllabus_title != null" class="fb" style="height:39px; line-height:39px; vertical-align:top; margin:0 3px;">·</font>{{current_course.name}}</span></div>
             <div class="class-detail-row f13 c-grey3"><img ng-src="{{current_review_member.img_url}}" width="30" class="fl ml10 img-circle mt4" /><span class="fl mt10 ml10">{{current_review_member.realname == "" ? current_review_member.name : current_review_member.realname}}</span><img ng-src="/images/wechat/{{current_review_member.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt10" /><div class="cl"></div> </div>
             <div class="course-list-row f13 c-grey3 mt10"><span class="fl ml10">角色</span></div>
             <ul class="class-list f13 c-grey3">
@@ -29,7 +29,7 @@
     </div>
 
     <div ng-show="current_course && !current_review_member ">
-        <div class="blue-title"><span class="course-name-width hidden inline-block">{{current_course.syllabus_title}}<font class="fb" style="height:39px; line-height:39px; vertical-align:top; margin:0 3px;">·</font>{{current_course.name}}</span></div>
+        <div class="blue-title"><span class="course-name-width hidden inline-block">{{current_course.syllabus_title}}<font ng-if="current_course.syllabus_title != null" class="fb" style="height:39px; line-height:39px; vertical-align:top; margin:0 3px;">·</font>{{current_course.name}}</span></div>
         <div class="tac sn-font-grey2" style="margin-top:50px;">{{tip_2}}</div>
     </div>
 
diff --git a/public/assets/wechat/select_my_coursegroup.html b/public/assets/wechat/select_my_coursegroup.html
index cc7a65753..5bd563554 100644
--- a/public/assets/wechat/select_my_coursegroup.html
+++ b/public/assets/wechat/select_my_coursegroup.html
@@ -2,7 +2,7 @@
     <div loading-spinner></div>
     <div class="post-container" style="padding-bottom:50px;">
         <div class="blue-title">我的信息</div>
-        <div class="class-detail-row f13 c-grey3"><img ng-src="{{current_edit_member.user.img_url}}" class="fl ml10 img-circle mt4" width="30"><span class="fl mt10 ml10 ng-binding">{{current_edit_member.user.realname == "" ? current_edit_member.user.name : current_edit_member.user.realname}}</span><img ng-src="/images/wechat/{{current_edit_member.user.gender==0 ? 'male' : 'female'}}.png" class="fl ml10 mt10" width="15"><div class="cl"></div> </div>
+        <div class="class-detail-row f13 c-grey3"><img ng-src="{{current_edit_member.user.img_url}}" class="fl ml10 img-circle mt4" width="30" height="30"><span class="fl mt10 ml10 ng-binding">{{current_edit_member.user.realname == "" ? current_edit_member.user.name : current_edit_member.user.realname}}</span><img ng-src="/images/wechat/{{current_edit_member.user.gender==0 ? 'male' : 'female'}}.png" class="fl ml10 mt10" width="15"><div class="cl"></div> </div>
         <div class="course-list-row f13 c-grey3 mt10"><span class="fl ml15">角色</span></div>
         <div class="f13 ml35 mt10 c-grey3">学生</div>
         <div class="course-list-row f13 c-grey3 mt10"><span class="fl ml15">选择分班</span></div>
@@ -10,7 +10,7 @@
             <li><span class="fl ml10 class-list-name hidden">暂无</span><span ng-click="selectGroup(0)" class="login-box fr mr10 mt12 img-circle" ng-class="[{'checked': selectid == 0}]"></span></li>
 
             <div ng-repeat="group in groups">
-                <li><span class="fl ml10 class-list-name hidden">{{group.course_group.name}}</span><span ng-click="selectGroup(group.course_group.id)" class="login-box fr mr10 mt12 img-circle" ng-class="[{'checked': selectid == group.course_group.id}]"></span></li>
+                <li ng-class="{'border-bottom-none':$last}"><span class="fl ml10 class-list-name hidden">{{group.course_group.name}}</span><span ng-click="selectGroup(group.course_group.id)" class="login-box fr mr10 mt12 img-circle" ng-class="[{'checked': selectid == group.course_group.id}]"></span></li>
                 <!--<li class="border-bottom-none"><span class="fl ml10 class-list-name hidden">分班2</span><span  class="login-box fr mr10 mt12 img-circle" ng-class="['login-box', 'fr', 'mr10', 'mt12', {'checked': student}]"></span></li>-->
             </div>
         </ul>