Merge remote-tracking branch 'origin/sj-dev-v3' into wxl-develop-ad

business/pages/orgpotentialcustomer/index.wxml

@@ -20,7 +20,7 @@
                     </view>
                     <view class="left-box" hover-class="none" hover-stop-propagation="false">
                         <view class="center-box" hover-class="none" hover-stop-propagation="false">
-                            <view class="name" hover-class="none" hover-stop-propagation="false">{{item.name}}</view>
+                            <view class="name" hover-class="none" hover-stop-propagation="false">{{item.name?item.name:item.nickname}}</view>
                             <view class="time" hover-class="none" hover-stop-propagation="false">{{item.created_at}}</view>
                         </view>
                         <view class="phone-box" hover-class="none" hover-stop-propagation="false" bindtap="makecall" data-mobile="{{item.mobile}}">{{item.mobile}}</view>                        
@@ -31,6 +31,7 @@
                     <view class="content" hover-class="none" hover-stop-propagation="false" wx:if="{{item.source_type==2}}">来源：学校活动</view>
                     <view class="content" hover-class="none" hover-stop-propagation="false" wx:if="{{item.source_type==3}}">来源：报名咨询</view>
                     <view class="content" hover-class="none" hover-stop-propagation="false" wx:if="{{item.source_type==4}}">来源：课程报名</view>
+                    <view class="content" hover-class="none" hover-stop-propagation="false" wx:if="{{item.source_type==5}}">来源：打卡潜在客户</view>
                     <view class="btn" hover-class="none" hover-stop-propagation="false" bindtap="seeCustomerDetail" data-info="{{item}}">查看详情</view>
                 </view>
             </view>
@@ -55,7 +56,7 @@
                 <view class="content-header clearfix {{selectedCustomer.custom.length > 0 ? 'border-b-1px' : ''}}" hover-class="none" hover-stop-propagation="false">
                     <image class="avator" src="{{filter.imagify(selectedCustomer.avatar)}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
                     <view class="namemobile" hover-class="none" hover-stop-propagation="false">
-                        <view class="name" hover-class="none" hover-stop-propagation="false">{{selectedCustomer.name}}</view>
+                        <view class="name" hover-class="none" hover-stop-propagation="false">{{selectedCustomer.name?selectedCustomer.name:selectedCustomer.nickname}}</view>
                         <view class="mobiletime clearfix" hover-class="none" hover-stop-propagation="false">
                             <view class="createtime" hover-class="none" hover-stop-propagation="false">{{selectedCustomer.created_at}}</view>
                         </view>
@@ -63,16 +64,17 @@
                     <view class="mobile" hover-class="none" hover-stop-propagation="false" data-mobile="{{selectedCustomer.mobile}}" bindtap="makecall" >{{selectedCustomer.mobile}}</view>
                 </view>
                 <view class="from-info-box" hover-class="none" hover-stop-propagation="false" >
-                    <!-- <view class="from-box-item" hover-class="none" hover-stop-propagation="false" >
+                    <view class="from-box-item" hover-class="none" hover-stop-propagation="false" wx:if="{{selectedCustomer.source_txt}}">
                         <view class="name" hover-class="none" hover-stop-propagation="false" >来源:</view>
-                        <view class="text" hover-class="none" hover-stop-propagation="false" >小星星英语培训班。速成科目【的很快大厦考虑的话撒谎的】</view>
-                    </view> -->
+                        <view class="text" hover-class="none" hover-stop-propagation="false" >{{selectedCustomer.source_txt}}</view>
+                    </view>
                     <view class="from-box-item" hover-class="none" hover-stop-propagation="false" >
                         <view class="name" hover-class="none" hover-stop-propagation="false" >类型:</view>
                         <view class="text" hover-class="none" hover-stop-propagation="false" wx:if="{{selectedCustomer.source_type==1}}">领取体验课</view>
                         <view class="text" hover-class="none" hover-stop-propagation="false" wx:if="{{selectedCustomer.source_type==2}}">学校活动</view>
                         <view class="text" hover-class="none" hover-stop-propagation="false" wx:if="{{selectedCustomer.source_type==3}}">报名咨询</view>
                         <view class="text" hover-class="none" hover-stop-propagation="false" wx:if="{{selectedCustomer.source_type==4}}">课程报名</view>
+                        <view class="text" hover-class="none" hover-stop-propagation="false" wx:if="{{selectedCustomer.source_type==5}}">打卡潜在客户</view>
                     </view>
                 </view>
                 <view class="extra-info-box" hover-class="none" hover-stop-propagation="false" wx:if="{{selectedCustomer.custom.length > 0}}">

src/pages/circleindex/index.js

@@ -415,7 +415,8 @@ Page({
         page: this.data.page,
         perPage: this.data.perPage,
         class_id: this.data.id,
-        subject_type: this.data.subjectType
+        subject_type: this.data.subjectType,
+        sort_type:1
       }).then((res) => {
         const {
           code,
@@ -508,7 +509,8 @@ Page({
       unlockthemeList({
         page: this.data.page,
         perPage: this.data.perPage,
-        class_id: this.data.id
+        class_id: this.data.id,
+        sort_type:1
       }).then((res) => {
         const {
           code,

src/pages/circleindex/index.wxml

@@ -287,7 +287,10 @@
             <view class="" hover-class="none" hover-stop-propagation="false" wx:if="{{subjectType == 2}}">
                 <view class="circle-item rili mb24" hover-class="none" hover-stop-propagation="false" wx:for="{{themeList}}" wx:key="{{index}}" data-theme="{{item}}" bindtap="goRiliClock">
                     <image class="rilibg" src="{{imageRoot}}2c/circleindex/rili.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
-                    <view class="circlename" hover-class="none" hover-stop-propagation="false">{{item.title}}</view>
+                    <view class="circlename" hover-class="none" hover-stop-propagation="false">
+                        <view class="tag" hover-class="none" hover-stop-propagation="false"  wx:if="{{item.place_top_at}}">置顶</view>
+                        <view class="title" hover-class="none" hover-stop-propagation="false">{{item.title}}</view>
+                    </view>
                     <view class="static-box" hover-class="none" hover-stop-propagation="false">
                         <text class="" selectable="false" space="false" decode="false">共{{item.days}}天</text>
                         <text class="divideline" selectable="false" space="false" decode="false">|</text>
@@ -317,7 +320,10 @@
             <view class="" hover-class="none" hover-stop-propagation="false" wx:if="{{subjectType == 1}}">
                 <view class="circle-item mb24" hover-class="none" hover-stop-propagation="false" wx:for="{{themeList}}" wx:key="{{index}}" data-theme="{{item}}" bindtap="goNormalClock">
                     <image class="rilibg" src="{{imageRoot}}2c/circleindex/assignment.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
-                    <view class="circlename" hover-class="none" hover-stop-propagation="false">{{item.title}}</view>
+                    <view class="circlename" hover-class="none" hover-stop-propagation="false">
+                        <view class="tag" hover-class="none" hover-stop-propagation="false"  wx:if="{{item.place_top_at}}">置顶</view>
+                        <view class="title" hover-class="none" hover-stop-propagation="false">{{item.title}}</view>
+                    </view>
                     <view class="static-box" hover-class="none" hover-stop-propagation="false">
                         <text class="" selectable="false" space="false" decode="false">共{{item.class_students_count}}学员</text>
                         <text class="divideline" selectable="false" space="false" decode="false">|</text>
@@ -336,7 +342,10 @@
             <view class="" hover-class="none" hover-stop-propagation="false" wx:if="{{is_unlockclock}}">
                 <view class="circle-item mb24" hover-class="none" hover-stop-propagation="false" wx:for="{{themeList}}" wx:key="{{index}}" data-theme="{{item}}" bindtap="goUnlockClock">
                     <image class="rilibg" src="{{imageRoot}}2c/circleindex/unlock.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
-                    <view class="circlename" hover-class="none" hover-stop-propagation="false">{{item.title}}</view>
+                    <view class="circlename" hover-class="none" hover-stop-propagation="false">
+                        <view class="tag" hover-class="none" hover-stop-propagation="false"  wx:if="{{item.place_top_at}}">置顶</view>
+                        <view class="title" hover-class="none" hover-stop-propagation="false">{{item.title}}</view>
+                    </view>
                     <view class="static-box" hover-class="none" hover-stop-propagation="false">
                         <text class="" selectable="false" space="false" decode="false">共{{item.class_student_count}}名学员</text>
                         <text class="divideline" selectable="false" space="false" decode="false">|</text>

src/pages/schoolclasslist/index.js

@@ -251,7 +251,8 @@ Page({
         page: this.data.page,
         perPage: this.data.perPage,
         class_id: this.data.id,
-        subject_type: this.data.subjectType
+        subject_type: this.data.subjectType,
+        sort_type:1
       }).then((res) => {
         const {
           code,
@@ -344,7 +345,8 @@ Page({
       unlockthemeList({
         page: this.data.page,
         perPage: this.data.perPage,
-        class_id: this.data.id
+        class_id: this.data.id,
+        sort_type:1
       }).then((res) => {
         const {
           code,